diff --git a/Makefile b/Makefile
index 5891c9b..c6d91ed 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ $(BUILDDIR):
 
 $(BUILDDIR)/%.o: $(SRC)/%.c
 	mkdir -p $(dir $@)
-	$(CC) -g -c -Isrc $< $(CC_PROBLEMATIC_FLAGS) $(CC_FLAGS) -o $@
+	$(CC) -g -c -Iinclude $< $(CC_PROBLEMATIC_FLAGS) $(CC_FLAGS) -o $@
 
 limine/limine:
 	rm -rf limine
diff --git a/src/config.h b/include/config.h
similarity index 100%
rename from src/config.h
rename to include/config.h
diff --git a/src/idt/idt.h b/include/idt/idt.h
similarity index 100%
rename from src/idt/idt.h
rename to include/idt/idt.h
diff --git a/src/io/kbd/ps2.h b/include/io/kbd/ps2.h
similarity index 100%
rename from src/io/kbd/ps2.h
rename to include/io/kbd/ps2.h
diff --git a/src/io/serial/serial.h b/include/io/serial/serial.h
similarity index 100%
rename from src/io/serial/serial.h
rename to include/io/serial/serial.h
diff --git a/src/io/term/flanterm.h b/include/io/term/flanterm.h
similarity index 100%
rename from src/io/term/flanterm.h
rename to include/io/term/flanterm.h
diff --git a/src/io/term/flanterm_backends/fb.h b/include/io/term/flanterm_backends/fb.h
similarity index 100%
rename from src/io/term/flanterm_backends/fb.h
rename to include/io/term/flanterm_backends/fb.h
diff --git a/src/io/term/flanterm_backends/fb_private.h b/include/io/term/flanterm_backends/fb_private.h
similarity index 100%
rename from src/io/term/flanterm_backends/fb_private.h
rename to include/io/term/flanterm_backends/fb_private.h
diff --git a/src/io/term/flanterm_private.h b/include/io/term/flanterm_private.h
similarity index 100%
rename from src/io/term/flanterm_private.h
rename to include/io/term/flanterm_private.h
diff --git a/src/io/term/nanoprintf.h b/include/io/term/nanoprintf.h
similarity index 100%
rename from src/io/term/nanoprintf.h
rename to include/io/term/nanoprintf.h
diff --git a/src/io/term/term.h b/include/io/term/term.h
similarity index 100%
rename from src/io/term/term.h
rename to include/io/term/term.h
diff --git a/src/kernel.h b/include/kernel.h
similarity index 94%
rename from src/kernel.h
rename to include/kernel.h
index bf5c324..58784aa 100644
--- a/src/kernel.h
+++ b/include/kernel.h
@@ -15,9 +15,9 @@ enum ErrorCodes {
 #define CLEAR_INTERRUPTS __asm__ volatile("cli")
 #define SET_INTERRUPTS __asm__ volatile("sti")
 
-#include "io/serial/serial.h"
-#include "io/term/term.h"
-#include "idt/idt.h"
+#include <io/serial/serial.h>
+#include <io/term/term.h>
+#include <idt/idt.h>
 #include <stdbool.h>
 
 extern volatile uint64_t ticks;
diff --git a/src/limine.h b/include/limine.h
similarity index 100%
rename from src/limine.h
rename to include/limine.h
diff --git a/src/mem/gdt/gdt.h b/include/mem/gdt.h
similarity index 100%
rename from src/mem/gdt/gdt.h
rename to include/mem/gdt.h
diff --git a/src/mem/heap/kheap.h b/include/mem/kheap.h
similarity index 100%
rename from src/mem/heap/kheap.h
rename to include/mem/kheap.h
diff --git a/src/mem/paging/paging.h b/include/mem/paging.h
similarity index 98%
rename from src/mem/paging/paging.h
rename to include/mem/paging.h
index dd55c99..91fc061 100644
--- a/src/mem/paging/paging.h
+++ b/include/mem/paging.h
@@ -11,7 +11,7 @@
 
 #include <stdint.h>
 #include <limine.h>
-#include "mem/heap/kheap.h"
+#include <mem/kheap.h>
 #include <kernel.h>
 
 void paging_init(struct boot_context boot_ctx);
diff --git a/src/mem/paging/pmm.h b/include/mem/pmm.h
similarity index 100%
rename from src/mem/paging/pmm.h
rename to include/mem/pmm.h
diff --git a/src/mem/misc/utils.h b/include/mem/utils.h
similarity index 100%
rename from src/mem/misc/utils.h
rename to include/mem/utils.h
diff --git a/src/mem/paging/vmm.h b/include/mem/vmm.h
similarity index 100%
rename from src/mem/paging/vmm.h
rename to include/mem/vmm.h
diff --git a/src/sched/process.h b/include/sched/process.h
similarity index 97%
rename from src/sched/process.h
rename to include/sched/process.h
index c6b6ecf..02a313a 100644
--- a/src/sched/process.h
+++ b/include/sched/process.h
@@ -8,7 +8,7 @@
 #define PROCESS_H
 
 #include <stddef.h>
-#include "config.h"
+#include <config.h>
 #include <stdint.h>
 
 typedef enum {
diff --git a/src/sched/scheduler.h b/include/sched/scheduler.h
similarity index 100%
rename from src/sched/scheduler.h
rename to include/sched/scheduler.h
diff --git a/src/sched/spinlock.h b/include/sched/spinlock.h
similarity index 100%
rename from src/sched/spinlock.h
rename to include/sched/spinlock.h
diff --git a/src/string/string.h b/include/string/string.h
similarity index 100%
rename from src/string/string.h
rename to include/string/string.h
diff --git a/src/time/timer.h b/include/time/timer.h
similarity index 100%
rename from src/time/timer.h
rename to include/time/timer.h
diff --git a/limine.conf b/limine.conf
index 3849b94..71825ed 100644
--- a/limine.conf
+++ b/limine.conf
@@ -1,6 +1,8 @@
 timeout: 3
+interface_branding: Welcome to the PepperOS disk!
 
 /PepperOS
 	protocol: limine
-
+	
+	comment: Default configuration (warning: spicy)
 	path: boot():/boot/pepperk
diff --git a/src/debug/misc.c b/src/debug/misc.c
index 36f8d88..044e63f 100644
--- a/src/debug/misc.c
+++ b/src/debug/misc.c
@@ -5,8 +5,8 @@
  */
 
 #include <kernel.h>
-#include "limine.h"
-#include "string/string.h"
+#include <limine.h>
+#include <string/string.h>
 #include <stddef.h>
 
 extern struct boot_context boot_ctx;
diff --git a/src/debug/panic.c b/src/debug/panic.c
index 2915cf7..5fc2069 100644
--- a/src/debug/panic.c
+++ b/src/debug/panic.c
@@ -5,9 +5,9 @@
  */
 
 #include <stddef.h>
-#include "idt/idt.h"
-#include "io/serial/serial.h"
-#include "kernel.h"
+#include <idt/idt.h>
+#include <io/serial/serial.h>
+#include <kernel.h>
 
 extern struct init_status init;
 extern int panic_count;
diff --git a/src/debug/stacktrace.c b/src/debug/stacktrace.c
index 91910e8..696d5b6 100644
--- a/src/debug/stacktrace.c
+++ b/src/debug/stacktrace.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdint.h>
-#include "kernel.h"
+#include <kernel.h>
 #include <stddef.h>
 
 extern struct init_status init;
diff --git a/src/idt/idt.c b/src/idt/idt.c
index f70959f..51b0eca 100644
--- a/src/idt/idt.c
+++ b/src/idt/idt.c
@@ -4,16 +4,16 @@
  * @license GPL-3.0-only
  */
 
-#include "idt.h"
+#include <idt/idt.h>
 #include <stdint.h>
 #include <stddef.h>
-#include "io/serial/serial.h"
-#include "io/kbd/ps2.h"
+#include <io/serial/serial.h>
+#include <io/kbd/ps2.h>
 #include <kernel.h>
 #include <stdbool.h>
-#include "sched/scheduler.h"
-#include "config.h"
-#include "sched/process.h"
+#include <sched/scheduler.h>
+#include <config.h>
+#include <sched/process.h>
 
 struct interrupt_descriptor idt[256];
 struct idtr idt_reg;
diff --git a/src/io/kbd/ps2.c b/src/io/kbd/ps2.c
index 25b18b2..e47d8a8 100644
--- a/src/io/kbd/ps2.c
+++ b/src/io/kbd/ps2.c
@@ -4,10 +4,10 @@
  * @license GPL-3.0-only
  */
 
-#include "io/serial/serial.h"
-#include "ps2.h"
+#include <io/serial/serial.h>
+#include <io/kbd/ps2.h>
 #include <stdint.h>
-#include "io/term/term.h"
+#include <io/term/term.h>
 #include <kernel.h>
 #include <stddef.h>
 
diff --git a/src/io/serial/serial.c b/src/io/serial/serial.c
index 0b37f9c..95ea78f 100644
--- a/src/io/serial/serial.c
+++ b/src/io/serial/serial.c
@@ -5,7 +5,7 @@
  */
  
 #include <kernel.h>
-#include "serial.h"
+#include <io/serial/serial.h>
 
 extern struct init_status init;
 
diff --git a/src/io/term/flanterm.c b/src/io/term/flanterm.c
index 0b9a31b..647af64 100644
--- a/src/io/term/flanterm.c
+++ b/src/io/term/flanterm.c
@@ -41,7 +41,7 @@
 #define FLANTERM_IN_FLANTERM
 #endif
 
-#include "flanterm.h"
+#include <io/term/flanterm.h>
 
 // Tries to implement this standard for terminfo
 // https://man7.org/linux/man-pages/man4/console_codes.4.html
diff --git a/src/io/term/flanterm_backends/fb.c b/src/io/term/flanterm_backends/fb.c
index 5f05b82..775981c 100644
--- a/src/io/term/flanterm_backends/fb.c
+++ b/src/io/term/flanterm_backends/fb.c
@@ -51,8 +51,8 @@
 #define FLANTERM_IN_FLANTERM
 #endif
 
-#include "../flanterm.h"
-#include "fb.h"
+#include <io/term/flanterm.h>
+#include <io/term/flanterm_backends/fb.h>
 
 void *memset(void *, int, size_t);
 void *memcpy(void *, const void *, size_t);
diff --git a/src/io/term/term.c b/src/io/term/term.c
index 8367a51..785151d 100644
--- a/src/io/term/term.c
+++ b/src/io/term/term.c
@@ -13,18 +13,18 @@ because this shitty implementation will be replaced one day by Flanterm
 
 #include <stddef.h>
 #include <kernel.h>
-#include "term.h"
-#include "config.h"
-#include "flanterm.h"
-#include "flanterm_backends/fb.h"
-#include "mem/heap/kheap.h"
-#include "limine.h"
+#include <io/term/term.h>
+#include <config.h>
+#include <io/term/flanterm.h>
+#include <io/term/flanterm_backends/fb.h>
+#include <mem/kheap.h>
+#include <limine.h>
 #include <stdarg.h>
-#include "sched/spinlock.h"
-#include "io/serial/serial.h"
+#include <sched/spinlock.h>
+#include <io/serial/serial.h>
 
 #define NANOPRINTF_IMPLEMENTATION
-#include "nanoprintf.h"
+#include <io/term/nanoprintf.h>
 
 extern struct flanterm_context* ft_ctx;
 extern struct init_status init;
diff --git a/src/kmain.c b/src/kmain.c
index d76801c..37daa7f 100644
--- a/src/kmain.c
+++ b/src/kmain.c
@@ -4,27 +4,26 @@
  * @license GPL-3.0-only
  */
 
-#include <stdbool.h>
+#include <stdbool.h>	
 #include <stddef.h>
 #include <limine.h>
-#include "io/term/term.h"
-#include "io/term/term.h"
-#include "io/serial/serial.h"
-#include "mem/gdt/gdt.h"
-#include "mem/misc/utils.h"
-#include "idt/idt.h"
-#include "kernel.h"
-#include "time/timer.h"
-#include "io/kbd/ps2.h"
-#include "mem/paging/pmm.h"
-#include "mem/paging/paging.h"
-#include "mem/paging/vmm.h"
-#include "mem/heap/kheap.h"
-#include "sched/process.h"
-#include "sched/scheduler.h"
-#include "config.h"
-#include "io/term/flanterm.h"
-#include "io/term/flanterm_backends/fb.h"
+#include <io/term/term.h>
+#include <io/serial/serial.h>
+#include <mem/gdt.h>
+#include <mem/utils.h>
+#include <idt/idt.h>
+#include <kernel.h>
+#include <time/timer.h>
+#include <io/kbd/ps2.h>
+#include <mem/pmm.h>
+#include <mem/paging.h>
+#include <mem/vmm.h>
+#include <mem/kheap.h>
+#include <sched/process.h>
+#include <sched/scheduler.h>
+#include <config.h>
+#include <io/term/flanterm.h>
+#include <io/term/flanterm_backends/fb.h>
 
 // Limine version used
 __attribute__((used, section(".limine_requests")))
diff --git a/src/mem/gdt/gdt.c b/src/mem/gdt.c
similarity index 98%
rename from src/mem/gdt/gdt.c
rename to src/mem/gdt.c
index 175cab1..3fe0c06 100644
--- a/src/mem/gdt/gdt.c
+++ b/src/mem/gdt.c
@@ -4,9 +4,9 @@
  * @license GPL-3.0-only
  */
 
-#include "gdt.h"
+#include <mem/gdt.h>
 #include <stdint.h>
-#include "io/serial/serial.h"
+#include <io/serial/serial.h>
 #include <kernel.h>
 
 // Descriptors are 8-byte wide (64bits)
diff --git a/src/mem/heap/kheap.c b/src/mem/kheap.c
similarity index 97%
rename from src/mem/heap/kheap.c
rename to src/mem/kheap.c
index 9adb0d2..20f302c 100644
--- a/src/mem/heap/kheap.c
+++ b/src/mem/kheap.c
@@ -4,13 +4,13 @@
  * @license GPL-3.0-only
  */
 
-#include "kheap.h"
-#include "mem/paging/paging.h"
-#include "mem/paging/pmm.h"
+#include <mem/kheap.h>
+#include <mem/paging.h>
+#include <mem/pmm.h>
 #include <stddef.h>
 #include <kernel.h>
-#include "sched/process.h"
-#include "config.h"
+#include <sched/process.h>
+#include <config.h>
 
 extern uint64_t kernel_phys_base;
 extern uint64_t kernel_virt_base;
diff --git a/src/mem/paging/paging.c b/src/mem/paging.c
similarity index 99%
rename from src/mem/paging/paging.c
rename to src/mem/paging.c
index f1b6afe..b1de8a5 100644
--- a/src/mem/paging/paging.c
+++ b/src/mem/paging.c
@@ -4,12 +4,12 @@
  * @license GPL-3.0-only
  */
 
-#include "paging.h"
-#include "pmm.h"
+#include <mem/paging.h>
+#include <mem/pmm.h>
 #include <kernel.h>
 #include <stddef.h>
 #include <limine.h>
-#include "config.h"
+#include <config.h>
 
 /*
 Paging on x86 uses four different page table levels:
diff --git a/src/mem/paging/pmm.c b/src/mem/pmm.c
similarity index 98%
rename from src/mem/paging/pmm.c
rename to src/mem/pmm.c
index 2d8dc2c..81f7cfd 100644
--- a/src/mem/paging/pmm.c
+++ b/src/mem/pmm.c
@@ -11,13 +11,13 @@ it will probably need to get some info from Limine,
 to see which pages are used by kernel/bootloader/mmio/fb etc.
 */
 
-#include "paging.h"
+#include <mem/paging.h>
 #include <limine.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <kernel.h>
-#include "mem/misc/utils.h"
-#include "pmm.h"
+#include <mem/utils.h>
+#include <mem/pmm.h>
 
 /*
 First we'll have to discover the physical memory layout,
diff --git a/src/mem/misc/utils.c b/src/mem/utils.c
similarity index 98%
rename from src/mem/misc/utils.c
rename to src/mem/utils.c
index 81c7b29..49fb38a 100644
--- a/src/mem/misc/utils.c
+++ b/src/mem/utils.c
@@ -7,8 +7,8 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <limine.h>
-#include "kernel.h"
-#include "string/string.h"
+#include <kernel.h>
+#include <string/string.h>
 
 // We won't be linked to standard library, but still need the basic mem* functions
 // so everything goes allright with the compiler
diff --git a/src/mem/paging/vmm.c b/src/mem/vmm.c
similarity index 96%
rename from src/mem/paging/vmm.c
rename to src/mem/vmm.c
index 8a52b4a..647d49b 100644
--- a/src/mem/paging/vmm.c
+++ b/src/mem/vmm.c
@@ -13,10 +13,10 @@ in a specified virtual space
 compared to the PMM which allocs/frees 4kb frames ("physical pages").
 */
 
-#include "vmm.h"
-#include "paging.h"
+#include <mem/vmm.h>
+#include <mem/paging.h>
 #include <stddef.h>
-#include "pmm.h"
+#include <mem/pmm.h>
 #include <kernel.h>
 
 void* vmm_pt_root = 0;
diff --git a/src/sched/process.c b/src/sched/process.c
index dc1d2df..5c2f600 100644
--- a/src/sched/process.c
+++ b/src/sched/process.c
@@ -5,15 +5,15 @@
  */
 
 #include <stddef.h>
-#include "process.h"
-#include "mem/heap/kheap.h"
-#include "kernel.h"
-#include "string/string.h"
-#include "mem/gdt/gdt.h"
-#include "config.h"
-#include "io/serial/serial.h"
+#include <sched/process.h>
+#include <mem/kheap.h>
+#include <kernel.h>
+#include <string/string.h>
+#include <mem/gdt.h>
+#include <config.h>
+#include <io/serial/serial.h>
 
-#include "io/term/flanterm.h"
+#include <io/term/flanterm.h>
 extern struct flanterm_context* ft_ctx;
 
 struct process_t* processes_list;
diff --git a/src/sched/scheduler.c b/src/sched/scheduler.c
index 381b601..932bcf2 100644
--- a/src/sched/scheduler.c
+++ b/src/sched/scheduler.c
@@ -4,11 +4,11 @@
  * @license GPL-3.0-only
  */
 
-#include "kernel.h"
-#include "process.h"
-#include "mem/paging/paging.h"
+#include <kernel.h>
+#include <sched/process.h>
+#include <mem/paging.h>
 #include <stdint.h>
-#include "io/serial/serial.h"
+#include <io/serial/serial.h>
 
 extern struct process_t* processes_list;
 extern struct process_t* current_process;
diff --git a/src/sched/spinlock.c b/src/sched/spinlock.c
index 2a50ecd..efe4213 100644
--- a/src/sched/spinlock.c
+++ b/src/sched/spinlock.c
@@ -6,8 +6,8 @@
 
 #include <stdatomic.h>
 #include <stdbool.h>
-#include "kernel.h"
-#include "spinlock.h"
+#include <kernel.h>
+#include <sched/spinlock.h>
 
 /*
  * spinlock_acquire - Lock a lock
diff --git a/src/time/timer.c b/src/time/timer.c
index bea150b..6bd6e75 100644
--- a/src/time/timer.c
+++ b/src/time/timer.c
@@ -5,9 +5,9 @@
  */
 
 #include <stdint.h>
-#include "io/serial/serial.h"
+#include <io/serial/serial.h>
 #include <kernel.h>
-#include "config.h"
+#include <config.h>
 
 /*
 For now, the timer module will be using the PIC.