17 files changed, 15 insertions, 15 deletions
diff --git a/src/user/driver/ansiterm.c b/src/user/app/init/driver/ansiterm.c
index 4b9f0d0..df7fb23 100644
--- a/src/user/driver/ansiterm.c
+++ b/src/user/app/init/driver/ansiterm.c
@@ -1,4 +1,4 @@
-#include <user/driver/driver.h>
+#include <user/app/init/driver/driver.h>
 #include <shared/syscalls.h>
 #include <stdbool.h>
 
diff --git a/src/user/driver/driver.h b/src/user/app/init/driver/driver.h
index d6e7343..d6e7343 100644
--- a/src/user/driver/driver.h
+++ b/src/user/app/init/driver/driver.h
diff --git a/src/user/driver/ps2.c b/src/user/app/init/driver/ps2.c
index fd81882..bc7f4f0 100644
--- a/src/user/driver/ps2.c
+++ b/src/user/app/init/driver/ps2.c
@@ -1,4 +1,4 @@
-#include <user/driver/driver.h>
+#include <user/app/init/driver/driver.h>
 #include <shared/container/ring.h>
 #include <shared/syscalls.h>
 #include <stdbool.h>
diff --git a/src/user/fs/tar.c b/src/user/app/init/driver/tar.c
index 60deccd..60deccd 100644
--- a/src/user/fs/tar.c
+++ b/src/user/app/init/driver/tar.c
diff --git a/src/user/fs/tar.h b/src/user/app/init/driver/tar.h
index c1dee78..c1dee78 100644
--- a/src/user/fs/tar.h
+++ b/src/user/app/init/driver/tar.h
diff --git a/src/user/driver/termcook.c b/src/user/app/init/driver/termcook.c
index 56ac77c..4142322 100644
--- a/src/user/driver/termcook.c
+++ b/src/user/app/init/driver/termcook.c
@@ -1,6 +1,6 @@
 #include <shared/syscalls.h>
 #include <user/lib/stdlib.h>
-#include <user/driver/driver.h>
+#include <user/app/init/driver/driver.h>
 
 static void w_output(handle_t output, const char *buf, size_t len) {
 	size_t pos = 0;
diff --git a/src/user/driver/tmpfs.c b/src/user/app/init/driver/tmpfs.c
index 6e5b45e..6e5b45e 100644
--- a/src/user/driver/tmpfs.c
+++ b/src/user/app/init/driver/tmpfs.c
diff --git a/src/user/app/main.c b/src/user/app/init/main.c
index 9f4d50c..a2c5e46 100644
--- a/src/user/app/main.c
+++ b/src/user/app/init/main.c
@@ -1,13 +1,13 @@
 #include <shared/flags.h>
 #include <shared/syscalls.h>
 #include <stdint.h>
-#include <user/app/shell.h>
-#include <user/driver/driver.h>
-#include <user/fs/misc.h>
-#include <user/fs/tar.h>
+#include <user/app/init/shell.h>
+#include <user/app/init/driver/driver.h>
+#include <user/lib/fs/misc.h>
+#include <user/app/init/driver/tar.h>
 #include <user/lib/elfload.h>
 #include <user/lib/stdlib.h>
-#include <user/tests/main.h>
+#include <user/app/init/tests/main.h>
 
 __attribute__((visibility("hidden")))
 extern char _image_base[];
diff --git a/src/user/app/shell.c b/src/user/app/init/shell.c
index 9085aed..cda8a65 100644
--- a/src/user/app/shell.c
+++ b/src/user/app/init/shell.c
@@ -1,9 +1,9 @@
 #include <shared/syscalls.h>
 #include <stdbool.h>
-#include <user/app/shell.h>
+#include <user/app/init/shell.h>
 #include <user/lib/elfload.h>
 #include <user/lib/stdlib.h>
-#include <user/tests/main.h>
+#include <user/app/init/tests/main.h>
 
 static bool isspace(char c) {
 	return c == ' ' || c == '\t' || c == '\n';
diff --git a/src/user/app/shell.h b/src/user/app/init/shell.h
index fb27410..fb27410 100644
--- a/src/user/app/shell.h
+++ b/src/user/app/init/shell.h
diff --git a/src/user/tests/main.c b/src/user/app/init/tests/main.c
index 97714e7..5db6324 100644
--- a/src/user/tests/main.c
+++ b/src/user/app/init/tests/main.c
@@ -4,7 +4,7 @@
 #include <shared/flags.h>
 #include <shared/syscalls.h>
 #include <user/lib/stdlib.h>
-#include <user/tests/main.h>
+#include <user/app/init/tests/main.h>
 
 static void run_forked(void (*fn)()) {
 	if (!fork()) {
diff --git a/src/user/tests/main.h b/src/user/app/init/tests/main.h
index ed11c5e..ed11c5e 100644
--- a/src/user/tests/main.h
+++ b/src/user/app/init/tests/main.h
diff --git a/src/user/tests/pipe.c b/src/user/app/init/tests/pipe.c
index 2e964f9..e7724e9 100644
--- a/src/user/tests/pipe.c
+++ b/src/user/app/init/tests/pipe.c
@@ -1,6 +1,6 @@
 #define TEST_MACROS
 #include <user/lib/stdlib.h>
-#include <user/tests/main.h>
+#include <user/app/init/tests/main.h>
 #include <shared/flags.h>
 #include <shared/syscalls.h>
 
diff --git a/src/user/tests/semaphore.c b/src/user/app/init/tests/semaphore.c
index 836edf5..0bfa979 100644
--- a/src/user/tests/semaphore.c
+++ b/src/user/app/init/tests/semaphore.c
@@ -1,7 +1,7 @@
 #define TEST_MACROS
 #include <user/lib/esemaphore.h>
 #include <user/lib/stdlib.h>
-#include <user/tests/main.h>
+#include <user/app/init/tests/main.h>
 #include <shared/flags.h>
 #include <shared/syscalls.h>
 
diff --git a/src/user/tests/stress.c b/src/user/app/init/tests/stress.c
index 5d29e87..9223d01 100644
--- a/src/user/tests/stress.c
+++ b/src/user/app/init/tests/stress.c
@@ -1,6 +1,6 @@
 #define TEST_MACROS
 #include <user/lib/stdlib.h>
-#include <user/tests/main.h>
+#include <user/app/init/tests/main.h>
 #include <shared/flags.h>
 #include <shared/syscalls.h>
 
diff --git a/src/user/fs/misc.c b/src/user/lib/fs/misc.c
index fa1115d..9522cfa 100644
--- a/src/user/fs/misc.c
+++ b/src/user/lib/fs/misc.c
@@ -1,4 +1,4 @@
-#include <user/fs/misc.h>
+#include <user/lib/fs/misc.h>
 #include <user/lib/stdlib.h>
 #include <shared/flags.h>
 #include <shared/mem.h>
diff --git a/src/user/fs/misc.h b/src/user/lib/fs/misc.h
index 3a8b071..3a8b071 100644
--- a/src/user/fs/misc.h
+++ b/src/user/lib/fs/misc.h