diff --git a/init/init.c b/init/init.c
index 32d5291..daca9a8 100644
--- a/init/init.c
+++ b/init/init.c
@@ -1,9 +1,9 @@
 #include <limits.h>
-#include <process/process.h>
+#include <process.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
-#include <terminal/terminal.h>
+#include <terminal.h>
 
 #define MUTEX 2000
 
diff --git a/liballoc/alloc/.gitignore b/liballoc/.gitignore
similarity index 100%
rename from liballoc/alloc/.gitignore
rename to liballoc/.gitignore
diff --git a/liballoc/alloc/src.mk b/liballoc/alloc/src.mk
deleted file mode 100644
index 17322b7..0000000
--- a/liballoc/alloc/src.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-c += alloc/liballoc.c
-
-o += alloc/liballoc.o
diff --git a/liballoc/alloc/liballoc.c b/liballoc/liballoc.c
similarity index 99%
rename from liballoc/alloc/liballoc.c
rename to liballoc/liballoc.c
index 6c7741d..9ed3ba4 100644
--- a/liballoc/alloc/liballoc.c
+++ b/liballoc/liballoc.c
@@ -1,7 +1,7 @@
 /* liballoc breaks when optimized too aggressively, for eg. clang's -Oz */
 #pragma clang optimize off
 
-#include <alloc/liballoc.h>
+#include <liballoc.h>
 #include <m/system.h>
 
 #define LIBALLOC_MUTEX 500
diff --git a/liballoc/alloc/liballoc.h b/liballoc/liballoc.h
similarity index 100%
rename from liballoc/alloc/liballoc.h
rename to liballoc/liballoc.h
diff --git a/liballoc/src.mk b/liballoc/src.mk
index cd9623f..2b54e80 100644
--- a/liballoc/src.mk
+++ b/liballoc/src.mk
@@ -1 +1,3 @@
-include alloc/src.mk
+c += liballoc.c
+
+o += liballoc.o
diff --git a/libmsl/init/__premain.c b/libmsl/init/__premain.c
index ccaed44..53a3eb2 100644
--- a/libmsl/init/__premain.c
+++ b/libmsl/init/__premain.c
@@ -1,4 +1,4 @@
-#include <alloc/liballoc.h>
+#include <liballoc.h>
 #include <m/system.h>
 #include <stdint.h>
 
diff --git a/libprocess/process/.gitignore b/libprocess/.gitignore
similarity index 100%
rename from libprocess/process/.gitignore
rename to libprocess/.gitignore
diff --git a/libprocess/process/process.c b/libprocess/process.c
similarity index 88%
rename from libprocess/process/process.c
rename to libprocess/process.c
index b6dda7f..1780dd9 100644
--- a/libprocess/process/process.c
+++ b/libprocess/process.c
@@ -1,7 +1,7 @@
-#include <alloc/liballoc.h>
+#include <liballoc.h>
 #include <m/status.h>
 #include <m/system.h>
-#include <process/process.h>
+#include <process.h>
 #include <stddef.h>
 #include <stdint.h>
 
diff --git a/libprocess/process/process.h b/libprocess/process.h
similarity index 100%
rename from libprocess/process/process.h
rename to libprocess/process.h
diff --git a/libprocess/process/src.mk b/libprocess/process/src.mk
deleted file mode 100644
index ea3cd1d..0000000
--- a/libprocess/process/src.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-c += process/process.c
-
-o += process/process.o
diff --git a/libprocess/src.mk b/libprocess/src.mk
index b5dd9d0..bbd77b0 100644
--- a/libprocess/src.mk
+++ b/libprocess/src.mk
@@ -1 +1,3 @@
-include process/src.mk
+c += process.c
+
+o += process.o
diff --git a/libterminal/terminal/.gitignore b/libterminal/.gitignore
similarity index 100%
rename from libterminal/terminal/.gitignore
rename to libterminal/.gitignore
diff --git a/libterminal/src.mk b/libterminal/src.mk
index d12e283..d1eb465 100644
--- a/libterminal/src.mk
+++ b/libterminal/src.mk
@@ -1 +1,3 @@
-include terminal/src.mk
+c += terminal.c
+
+o += terminal.o
diff --git a/libterminal/terminal/terminal.c b/libterminal/terminal.c
similarity index 75%
rename from libterminal/terminal/terminal.c
rename to libterminal/terminal.c
index 91b7ed3..7f457b8 100644
--- a/libterminal/terminal/terminal.c
+++ b/libterminal/terminal.c
@@ -1,7 +1,6 @@
 #include <m/system.h>
 #include <stddef.h>
-#include <terminal/device.h>
-#include <terminal/terminal.h>
+#include <terminal.h>
 
 void terminal_print (const char* string, size_t len) {
   device_do (TERMINAL_DEVICE, TERMINAL_PUTSTR, (void*)string, &len, NULL, NULL);
diff --git a/libterminal/terminal/terminal.h b/libterminal/terminal.h
similarity index 77%
rename from libterminal/terminal/terminal.h
rename to libterminal/terminal.h
index 78b552f..a1d536a 100644
--- a/libterminal/terminal/terminal.h
+++ b/libterminal/terminal.h
@@ -1,8 +1,11 @@
 #ifndef _LIBTERMINAL_TERMINAL_TERMINAL_H
 #define _LIBTERMINAL_TERMINAL_TERMINAL_H
 
+#include <m/terminal_device.h>
 #include <stddef.h>
 
+#define TERMINAL_DEVICE 1
+
 void terminal_print (const char* string, size_t len);
 
 #endif // _LIBTERMINAL_TERMINAL_TERMINAL_H
diff --git a/libterminal/terminal/device.h b/libterminal/terminal/device.h
deleted file mode 100644
index 369d6c9..0000000
--- a/libterminal/terminal/device.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _LIBTERMINAL_TERMINAL_DEVICE_H
-#define _LIBTERMINAL_TERMINAL_DEVICE_H
-
-#define TERMINAL_DEVICE 1
-
-#include <m/terminal_device.h>
-
-#endif // _LIBTERMINAL_TERMINAL_DEVICE_H
diff --git a/libterminal/terminal/src.mk b/libterminal/terminal/src.mk
deleted file mode 100644
index e568022..0000000
--- a/libterminal/terminal/src.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-c += terminal/terminal.c
-
-o += terminal/terminal.o