diff --git a/src/hello/hello.d b/src/hello/hello.d
index c8ae8f3..1707dfe 100644
--- a/src/hello/hello.d
+++ b/src/hello/hello.d
@@ -9,8 +9,8 @@ import hello.scratch;
 import hulk.bootinfo;
 import hulk.header;
 import hulk.pagetable;
-import hos.cpu;
-import hos.memory;
+import hulk.cpu;
+import hulk.memory;
 import ldc.llvmasm;
 
 __gshared EFI_SYSTEM_TABLE * st;
diff --git a/src/hulk/acpi.d b/src/hulk/acpi.d
index 2763dd1..dc97893 100644
--- a/src/hulk/acpi.d
+++ b/src/hulk/acpi.d
@@ -5,7 +5,7 @@ module hulk.acpi;
 
 import hulk.hurl;
 import hulk.klog;
-import hos.memory;
+import hulk.memory;
 
 struct acpi
 {
diff --git a/src/hos/cpu.d b/src/hulk/cpu.d
similarity index 95%
rename from src/hos/cpu.d
rename to src/hulk/cpu.d
index 10ee1ac..023adda 100644
--- a/src/hos/cpu.d
+++ b/src/hulk/cpu.d
@@ -1,3 +1,8 @@
+/**
+ * CPU functionality.
+ */
+module hulk.cpu;
+
 import ldc.llvmasm;
 
 void cli()
diff --git a/src/hulk/fb.d b/src/hulk/fb.d
index 0a3f87b..84c9363 100644
--- a/src/hulk/fb.d
+++ b/src/hulk/fb.d
@@ -3,7 +3,7 @@
  */
 module hulk.fb;
 
-import hos.memory;
+import hulk.memory;
 import hulk.kfont;
 
 /**
diff --git a/src/hulk/hulk.d b/src/hulk/hulk.d
index 412c3c2..0762198 100644
--- a/src/hulk/hulk.d
+++ b/src/hulk/hulk.d
@@ -6,7 +6,7 @@ module hulk.hulk;
 import hulk.header;
 import hulk.fb;
 import hulk.console;
-import hos.memory;
+import hulk.memory;
 import ldc.attributes;
 import hulk.kfont;
 import hulk.klog;
@@ -15,7 +15,7 @@ import hulk.hippo;
 import hulk.pci;
 import hulk.gdt;
 import hulk.idt;
-import hos.cpu;
+import hulk.cpu;
 import ldc.llvmasm;
 import hulk.pic;
 import hulk.acpi;
diff --git a/src/hulk/hurl.d b/src/hulk/hurl.d
index c3aac5e..5716424 100644
--- a/src/hulk/hurl.d
+++ b/src/hulk/hurl.d
@@ -6,9 +6,9 @@
 module hulk.hurl;
 
 public import hulk.pagetable;
-import hos.cpu;
+import hulk.cpu;
 import hulk.hippo;
-import hos.memory;
+import hulk.memory;
 import hulk.klog;
 import hulk.header;
 import hulk.linker_addresses;
diff --git a/src/hos/memory.d b/src/hulk/memory.d
similarity index 95%
rename from src/hos/memory.d
rename to src/hulk/memory.d
index ff1da4a..ddfac5d 100644
--- a/src/hos/memory.d
+++ b/src/hulk/memory.d
@@ -1,3 +1,8 @@
+/**
+ * Memory-related functions.
+ */
+module hulk.memory;
+
 import ldc.llvmasm;
 
 void memset(void * dest, ubyte v, size_t n)
diff --git a/src/hulk/pci.d b/src/hulk/pci.d
index 8fb8c11..a3af72e 100644
--- a/src/hulk/pci.d
+++ b/src/hulk/pci.d
@@ -1,6 +1,6 @@
 module hulk.pci;
 
-import hos.cpu;
+import hulk.cpu;
 import hulk.klog;
 
 struct pci
diff --git a/src/hulk/pic.d b/src/hulk/pic.d
index ffc8ca6..613101a 100644
--- a/src/hulk/pic.d
+++ b/src/hulk/pic.d
@@ -3,7 +3,7 @@
  */
 module hulk.pic;
 
-import hos.cpu;
+import hulk.cpu;
 
 struct pic
 {