:: commit c2bf4835efcf9a6bb89ff389b98aa07ce842aa9c

diff --git a/limine.bin b/limine.bin
index 41dc7cc6..12871eac 100644
Binary files a/limine.bin and b/limine.bin differ
diff --git a/stage2/lib/blib.c b/stage2/lib/blib.c
index c347ea1b..4247ec5e 100644
--- a/stage2/lib/blib.c
+++ b/stage2/lib/blib.c
@@ -7,7 +7,7 @@
 #include <lib/term.h>
 #include <lib/real.h>
 #include <lib/cio.h>
-#include <lib/e820.h>
+#include <sys/e820.h>
 #include <lib/print.h>
 
 uint8_t bcd_to_int(uint8_t val) {
diff --git a/stage2/lib/memmap.c b/stage2/lib/memmap.c
index 321fea73..696e7e0c 100644
--- a/stage2/lib/memmap.c
+++ b/stage2/lib/memmap.c
@@ -2,7 +2,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <lib/memmap.h>
-#include <lib/e820.h>
+#include <sys/e820.h>
 #include <lib/blib.h>
 #include <lib/print.h>
 
diff --git a/stage2/lib/memmap.h b/stage2/lib/memmap.h
index 9e252614..f80e6d88 100644
--- a/stage2/lib/memmap.h
+++ b/stage2/lib/memmap.h
@@ -2,7 +2,7 @@
 #define __LIB__MEMMAP_H__
 
 #include <stdint.h>
-#include <lib/e820.h>
+#include <sys/e820.h>
 
 void init_memmap(void);
 void *ext_mem_balloc(size_t count);
diff --git a/stage2/main.c b/stage2/main.c
index d2bf6a60..10fbad1f 100644
--- a/stage2/main.c
+++ b/stage2/main.c
@@ -20,7 +20,7 @@ asm (
 #include <lib/libc.h>
 #include <lib/part.h>
 #include <lib/config.h>
-#include <lib/e820.h>
+#include <sys/e820.h>
 #include <lib/memmap.h>
 #include <lib/print.h>
 #include <fs/file.h>
diff --git a/stage2/protos/stivale.c b/stage2/protos/stivale.c
index 55a8c60e..2a74e41a 100644
--- a/stage2/protos/stivale.c
+++ b/stage2/protos/stivale.c
@@ -13,7 +13,7 @@
 #include <lib/real.h>
 #include <drivers/vbe.h>
 #include <lib/term.h>
-#include <drivers/pic.h>
+#include <sys/pic.h>
 #include <fs/file.h>
 #include <mm/vmm64.h>
 #include <stivale/stivale.h>
diff --git a/stage2/protos/stivale.h b/stage2/protos/stivale.h
index 85f6f734..d390fe91 100644
--- a/stage2/protos/stivale.h
+++ b/stage2/protos/stivale.h
@@ -4,7 +4,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <lib/memmap.h>
-#include <lib/e820.h>
+#include <sys/e820.h>
 #include <mm/vmm64.h>
 
 void stivale_load(char *cmdline, int boot_drive);
diff --git a/stage2/protos/stivale2.c b/stage2/protos/stivale2.c
index 9a4f5c50..695fc727 100644
--- a/stage2/protos/stivale2.c
+++ b/stage2/protos/stivale2.c
@@ -14,10 +14,10 @@
 #include <lib/rand.h>
 #include <lib/real.h>
 #include <lib/libc.h>
-#include <lib/smp.h>
+#include <sys/smp.h>
 #include <drivers/vbe.h>
 #include <lib/term.h>
-#include <drivers/pic.h>
+#include <sys/pic.h>
 #include <fs/file.h>
 #include <stivale/stivale2.h>
 
diff --git a/stage2/lib/e820.c b/stage2/sys/e820.c
similarity index 97%
rename from stage2/lib/e820.c
rename to stage2/sys/e820.c
index 13ae08c1..b757b83e 100644
--- a/stage2/lib/e820.c
+++ b/stage2/sys/e820.c
@@ -1,6 +1,6 @@
 #include <stdint.h>
 #include <stddef.h>
-#include <lib/e820.h>
+#include <sys/e820.h>
 #include <lib/real.h>
 #include <lib/blib.h>
 #include <lib/print.h>
diff --git a/stage2/lib/e820.h b/stage2/sys/e820.h
similarity index 100%
rename from stage2/lib/e820.h
rename to stage2/sys/e820.h
diff --git a/stage2/drivers/lapic.h b/stage2/sys/lapic.h
similarity index 100%
rename from stage2/drivers/lapic.h
rename to stage2/sys/lapic.h
diff --git a/stage2/drivers/pic.c b/stage2/sys/pic.c
similarity index 96%
rename from stage2/drivers/pic.c
rename to stage2/sys/pic.c
index 7c2d7cd3..3dda8932 100644
--- a/stage2/drivers/pic.c
+++ b/stage2/sys/pic.c
@@ -1,7 +1,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdbool.h>
-#include <drivers/pic.h>
+#include <sys/pic.h>
 #include <lib/cio.h>
 
 void pic_eoi(int irq) {
diff --git a/stage2/drivers/pic.h b/stage2/sys/pic.h
similarity index 100%
rename from stage2/drivers/pic.h
rename to stage2/sys/pic.h
diff --git a/stage2/lib/smp.c b/stage2/sys/smp.c
similarity index 98%
rename from stage2/lib/smp.c
rename to stage2/sys/smp.c
index f63316a2..bfb1f789 100644
--- a/stage2/lib/smp.c
+++ b/stage2/sys/smp.c
@@ -5,8 +5,8 @@
 #include <lib/cio.h>
 #include <lib/blib.h>
 #include <lib/print.h>
-#include <lib/smp.h>
-#include <drivers/lapic.h>
+#include <sys/smp.h>
+#include <sys/lapic.h>
 #include <mm/vmm64.h>
 
 struct madt {
diff --git a/stage2/lib/smp.h b/stage2/sys/smp.h
similarity index 100%
rename from stage2/lib/smp.h
rename to stage2/sys/smp.h
diff --git a/stage2/lib/smp_trampoline.asm b/stage2/sys/smp_trampoline.asm
similarity index 100%
rename from stage2/lib/smp_trampoline.asm
rename to stage2/sys/smp_trampoline.asm