diff --git a/Makefile b/Makefile
index fbdbff8..22df814 100644
--- a/Makefile
+++ b/Makefile
@@ -95,17 +95,17 @@ $(BUILD_DIR)/io.o:
 
 
 $(BUILD_DIR)/idt.o:
-	$(CPP) -c $(SRC_DIR)/kernel/idt/idt.cpp -o $(BUILD_DIR)/idt.o $(CFLAGS) -fno-exceptions -fno-rtti
+	$(CPP) -c $(SRC_DIR)/kernel/interrupts/idt/idt.cpp -o $(BUILD_DIR)/idt.o $(CFLAGS) -fno-exceptions -fno-rtti
 
 $(BUILD_DIR)/gdtc.o:
 	$(CPP) -c $(SRC_DIR)/kernel/gdt/gdtc.cpp -o $(BUILD_DIR)/gdtc.o $(CFLAGS) -fno-exceptions -fno-rtti
 
 
 $(BUILD_DIR)/pic.o:
-	$(CPP) -c $(SRC_DIR)/kernel/pic/pic.cpp -o $(BUILD_DIR)/pic.o $(CFLAGS) -fno-exceptions -fno-rtti
+	$(CPP) -c $(SRC_DIR)/kernel/drivers/pic/pic.cpp -o $(BUILD_DIR)/pic.o $(CFLAGS) -fno-exceptions -fno-rtti
 
 $(BUILD_DIR)/string.o:
-	$(CC) -c $(SRC_DIR)/libc/include/string.c  -o $(BUILD_DIR)/string.o $(CFLAGS) -std=gnu99
+	$(CC) -c $(SRC_DIR)/lib/include/string.c  -o $(BUILD_DIR)/string.o $(CFLAGS) -std=gnu99
 
 $(BUILD_DIR)/PhysicalMemoryManager.o:
 	$(CPP) -c $(SRC_DIR)/kernel/memory/PhysicalMemoryManager.cpp  -o $(BUILD_DIR)/PhysicalMemoryManager.o $(CFLAGS) -fno-exceptions -fno-rtti
@@ -114,7 +114,7 @@ $(BUILD_DIR)/pci.o:
 	$(CPP) -c $(SRC_DIR)/kernel/drivers/IO/PCI/pci.cpp  -o $(BUILD_DIR)/pci.o $(CFLAGS) -fno-exceptions -fno-rtti
 
 $(BUILD_DIR)/pcidevice.o:
-	$(CPP) -c $(SRC_DIR)/kernel/pci/pciDevice.cpp  -o $(BUILD_DIR)/pcidevice.o $(CFLAGS) -fno-exceptions -fno-rtti
+	$(CPP) -c $(SRC_DIR)/kernel/drivers/pci/pciDevice.cpp  -o $(BUILD_DIR)/pcidevice.o $(CFLAGS) -fno-exceptions -fno-rtti
 
 $(BUILD_DIR)/atapiDevice.o:
 	$(CPP) -c $(SRC_DIR)/kernel/drivers/IO/atapi/atapiDevice.cpp  -o $(BUILD_DIR)/atapiDevice.o $(CFLAGS) -fno-exceptions -fno-rtti
@@ -127,7 +127,7 @@ $(BUILD_DIR)/rsdp.o:
 	$(CPP) -c $(SRC_DIR)/kernel/drivers/ACPI/rsdp.cpp  -o $(BUILD_DIR)/rsdp.o $(CFLAGS) -fno-exceptions -fno-rtti
 
 $(BUILD_DIR)/pit.o:
-	$(CPP) -c $(SRC_DIR)/kernel/pit.cpp  -o $(BUILD_DIR)/pit.o $(CFLAGS) -fno-exceptions -fno-rtti
+	$(CPP) -c $(SRC_DIR)/kernel/drivers/pit/pit.cpp  -o $(BUILD_DIR)/pit.o $(CFLAGS) -fno-exceptions -fno-rtti
 
 
 $(BUILD_DIR)/keyboard.o:
diff --git a/source/kernel/boot.s b/source/kernel/boot.s
index 3015e8d..7cccd17 100644
--- a/source/kernel/boot.s
+++ b/source/kernel/boot.s
@@ -24,7 +24,7 @@ stack_top:
 .include "./source/kernel/gdt/gdt.s"
 .include "./source/kernel/irs_table.s"
 .include "./source/kernel/irq_table.s"
-.include "./source/kernel/idt/idt.s"
+.include "./source/kernel/interrupts/idt/idt.s"
 .include "./source/kernel/memory/paging.s"
 
 
diff --git a/source/kernel/bootloader/multiboot.h b/source/kernel/boot/multiboot.h
similarity index 100%
rename from source/kernel/bootloader/multiboot.h
rename to source/kernel/boot/multiboot.h
diff --git a/source/kernel/bootcheck.h b/source/kernel/bootcheck.h
index 62765a5..70c0354 100644
--- a/source/kernel/bootcheck.h
+++ b/source/kernel/bootcheck.h
@@ -1,5 +1,5 @@
 #pragma once 
-#include "bootloader/multiboot.h"
+#include "boot/multiboot.h"
 #define CHECK_FLAG(flags, bit) ((flags) & (1 <<(bit)))
 
 #include "tty/kterm.h"
diff --git a/source/kernel/drivers/ACPI/rsdp.h b/source/kernel/drivers/ACPI/rsdp.h
index 1bac440..cb3ac24 100644
--- a/source/kernel/drivers/ACPI/rsdp.h
+++ b/source/kernel/drivers/ACPI/rsdp.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <stdint.h>
 #include "./../../tty/kterm.h"
-#include "../../../libc/include/mem.h"
+#include "../../../lib/include/mem.h"
 struct RSDPTR {
     char signature[8];
     uint8_t Checksum ;
diff --git a/source/kernel/drivers/IO/PCI/pci.h b/source/kernel/drivers/IO/PCI/pci.h
index 9f2bba2..d9a86f4 100644
--- a/source/kernel/drivers/IO/PCI/pci.h
+++ b/source/kernel/drivers/IO/PCI/pci.h
@@ -2,7 +2,7 @@
 #include <stdint.h>
 #include "../io.h"
 #include "../../../tty/kterm.h"
-#include "../../../pci/pciDevice.h"
+#include "../../pci/pciDevice.h"
 
 // Configuration Space Access Mechanism #1
 #define CONFIG_ADDRESS 0xCF8 // Configuration adress that is to be accessed
diff --git a/source/kernel/drivers/IO/ata/ataDevice.h b/source/kernel/drivers/IO/ata/ataDevice.h
index 89bfe7d..ab8822b 100644
--- a/source/kernel/drivers/IO/ata/ataDevice.h
+++ b/source/kernel/drivers/IO/ata/ataDevice.h
@@ -1,8 +1,8 @@
 #pragma once
 #include <stdint.h>
 #include "../io.h"
-#include "../../../ide/ideCommands.h"
-#include "../../../ide/sampleIDE.definitions.h"
+#include "../../ide/ideCommands.h"
+#include "../../ide/sampleIDE.definitions.h"
 
 #include "../../../tty/kterm.h"
 
diff --git a/source/kernel/drivers/IO/atapi/atapiDevice.h b/source/kernel/drivers/IO/atapi/atapiDevice.h
index 37d516e..ba06167 100644
--- a/source/kernel/drivers/IO/atapi/atapiDevice.h
+++ b/source/kernel/drivers/IO/atapi/atapiDevice.h
@@ -1,8 +1,8 @@
 #pragma once
 #include <stdint.h>
 #include "../io.h"
-#include "../../../ide/ideCommands.h"
-#include "../../../ide/sampleIDE.definitions.h"
+#include "../../ide/ideCommands.h"
+#include "../../ide/sampleIDE.definitions.h"
 
 #include "../../../tty/kterm.h"
 
diff --git a/source/kernel/ide/ide.h b/source/kernel/drivers/ide/ide.h
similarity index 98%
rename from source/kernel/ide/ide.h
rename to source/kernel/drivers/ide/ide.h
index ce2ebc1..516f7c7 100644
--- a/source/kernel/ide/ide.h
+++ b/source/kernel/drivers/ide/ide.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <stdint.h> 
 #include "../pci/pciDevice.h"
-#include "../tty/kterm.h"
+#include "../../tty/kterm.h"
 #include "ideCommands.h"
 #include "sampleIDE.h"
 
diff --git a/source/kernel/ide/ideCommands.h b/source/kernel/drivers/ide/ideCommands.h
similarity index 100%
rename from source/kernel/ide/ideCommands.h
rename to source/kernel/drivers/ide/ideCommands.h
diff --git a/source/kernel/ide/sampleIDE.definitions.h b/source/kernel/drivers/ide/sampleIDE.definitions.h
similarity index 100%
rename from source/kernel/ide/sampleIDE.definitions.h
rename to source/kernel/drivers/ide/sampleIDE.definitions.h
diff --git a/source/kernel/ide/sampleIDE.h b/source/kernel/drivers/ide/sampleIDE.h
similarity index 99%
rename from source/kernel/ide/sampleIDE.h
rename to source/kernel/drivers/ide/sampleIDE.h
index 5e805e3..ad978b5 100644
--- a/source/kernel/ide/sampleIDE.h
+++ b/source/kernel/drivers/ide/sampleIDE.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <stdint.h> 
-#include "../tty/kterm.h"
+#include "../../tty/kterm.h"
 #include "sampleIDE.definitions.h"
 #include "ideCommands.h"
 
diff --git a/source/kernel/pci/pciDevice.cpp b/source/kernel/drivers/pci/pciDevice.cpp
similarity index 100%
rename from source/kernel/pci/pciDevice.cpp
rename to source/kernel/drivers/pci/pciDevice.cpp
diff --git a/source/kernel/pci/pciDevice.h b/source/kernel/drivers/pci/pciDevice.h
similarity index 100%
rename from source/kernel/pci/pciDevice.h
rename to source/kernel/drivers/pci/pciDevice.h
diff --git a/source/kernel/pic/pic.cpp b/source/kernel/drivers/pic/pic.cpp
similarity index 100%
rename from source/kernel/pic/pic.cpp
rename to source/kernel/drivers/pic/pic.cpp
diff --git a/source/kernel/pic/pic.h b/source/kernel/drivers/pic/pic.h
similarity index 95%
rename from source/kernel/pic/pic.h
rename to source/kernel/drivers/pic/pic.h
index fa06d3d..9f05d73 100644
--- a/source/kernel/pic/pic.h
+++ b/source/kernel/drivers/pic/pic.h
@@ -1,5 +1,5 @@
 #pragma once 
-#include "../drivers/IO/io.h"
+#include "../IO/io.h"
 
 #define PIC1		0x20		/* IO base address for master PIC */
 #define PIC2		0xA0		/* IO base address for slave PIC */
diff --git a/source/kernel/pit.cpp b/source/kernel/drivers/pit/pit.cpp
similarity index 96%
rename from source/kernel/pit.cpp
rename to source/kernel/drivers/pit/pit.cpp
index d2b6527..d345517 100644
--- a/source/kernel/pit.cpp
+++ b/source/kernel/drivers/pit/pit.cpp
@@ -1,5 +1,5 @@
 #include "pit.h"
-#include "tty/kterm.h"
+#include "../../tty/kterm.h"
 uint32_t pit_tick = 0;
 
 
diff --git a/source/kernel/pit.h b/source/kernel/drivers/pit/pit.h
similarity index 89%
rename from source/kernel/pit.h
rename to source/kernel/drivers/pit/pit.h
index 0bc988f..268937a 100644
--- a/source/kernel/pit.h
+++ b/source/kernel/drivers/pit/pit.h
@@ -1,6 +1,6 @@
 #pragma once 
 #include <stdint.h>
-#include "drivers/IO/io.h"
+#include "../IO/io.h"
 #define PIT_DATA_0 0x40
 #define PIT_DATA_1 0x41
 #define PIT_DATA_2 0x42
diff --git a/source/kernel/filesystems/EXT2/SuperBlock.h b/source/kernel/filesystem/EXT2/SuperBlock.h
similarity index 100%
rename from source/kernel/filesystems/EXT2/SuperBlock.h
rename to source/kernel/filesystem/EXT2/SuperBlock.h
diff --git a/source/kernel/filesystems/FAT/BiosParameterBlock.h b/source/kernel/filesystem/FAT/BiosParameterBlock.h
similarity index 100%
rename from source/kernel/filesystems/FAT/BiosParameterBlock.h
rename to source/kernel/filesystem/FAT/BiosParameterBlock.h
diff --git a/source/kernel/filesystems/FAT/DirectoryEntry.h b/source/kernel/filesystem/FAT/DirectoryEntry.h
similarity index 100%
rename from source/kernel/filesystems/FAT/DirectoryEntry.h
rename to source/kernel/filesystem/FAT/DirectoryEntry.h
diff --git a/source/kernel/filesystems/FAT/ExtendBootRecord.h b/source/kernel/filesystem/FAT/ExtendBootRecord.h
similarity index 100%
rename from source/kernel/filesystems/FAT/ExtendBootRecord.h
rename to source/kernel/filesystem/FAT/ExtendBootRecord.h
diff --git a/source/kernel/idt/idt.cpp b/source/kernel/interrupts/idt/idt.cpp
similarity index 99%
rename from source/kernel/idt/idt.cpp
rename to source/kernel/interrupts/idt/idt.cpp
index 393902b..6184dd8 100644
--- a/source/kernel/idt/idt.cpp
+++ b/source/kernel/interrupts/idt/idt.cpp
@@ -1,6 +1,6 @@
 #include "idt.h"
-#include "../pit.h"
-#include "../keyboard/keyboard.h"
+#include "../../drivers/pit/pit.h"
+#include "../../keyboard/keyboard.h"
 
 IDT_entry idt_table[256];
 IDT_ptr idt_ptr;
diff --git a/source/kernel/idt/idt.h b/source/kernel/interrupts/idt/idt.h
similarity index 94%
rename from source/kernel/idt/idt.h
rename to source/kernel/interrupts/idt/idt.h
index 48c026c..b09d7c6 100644
--- a/source/kernel/idt/idt.h
+++ b/source/kernel/interrupts/idt/idt.h
@@ -2,10 +2,10 @@
 
 #include "stdint.h"
 #include "stddef.h"
-#include "../drivers/VGA/colors.h"
-#include "../pic/pic.h"
+#include "../../drivers/VGA/colors.h"
+#include "../../drivers/pic/pic.h"
 
-#include "../tty/kterm.h"
+#include "../../tty/kterm.h"
 
 
 extern "C" {
diff --git a/source/kernel/idt/idt.s b/source/kernel/interrupts/idt/idt.s
similarity index 100%
rename from source/kernel/idt/idt.s
rename to source/kernel/interrupts/idt/idt.s
diff --git a/source/kernel/idt/scancodes/set1.h b/source/kernel/interrupts/idt/scancodes/set1.h
similarity index 100%
rename from source/kernel/idt/scancodes/set1.h
rename to source/kernel/interrupts/idt/scancodes/set1.h
diff --git a/source/kernel/kernel.h b/source/kernel/kernel.h
index ac164a3..30285b9 100644
--- a/source/kernel/kernel.h
+++ b/source/kernel/kernel.h
@@ -1,14 +1,14 @@
 #pragma once
 extern "C" 
 {
-   #include "../libc/include/string.h" 
+   #include "../lib/include/string.h" 
 }
 
 
 #include "drivers/VGA/VBE.h"
 #include "tty/kterm.h"
 
-#include "./bootloader/multiboot.h"
+#include "./boot/multiboot.h"
 #include "bootinfo.h"
 
 #include "memory/memory.h"
@@ -16,21 +16,21 @@ extern "C"
 #include "bootcheck.h"
 
 #include "gdt/gdtc.h"
-#include "idt/idt.h"
+#include "interrupts/idt/idt.h"
 
 #include "drivers/IO/io.h"
 #include "time.h"
-#include "pit.h"
+#include "drivers/pit/pit.h"
 
 #include "cpu.h"
 #include "serial.h"
 #include "drivers/IO/PCI/pci.h"
-#include "ide/ide.h"
+#include "drivers/ide/ide.h"
 #include "./drivers/IO/ata/ataDevice.h"
 #include "./PartitionTable/MBR/MasterBootRecord.h"
-#include "./filesystems/FAT/BiosParameterBlock.h"
-#include "./filesystems/FAT/ExtendBootRecord.h"
-#include "./filesystems/FAT/DirectoryEntry.h"
+#include "./filesystem/FAT/BiosParameterBlock.h"
+#include "./filesystem/FAT/ExtendBootRecord.h"
+#include "./filesystem/FAT/DirectoryEntry.h"
 #include "drivers/ACPI/rsdp.h"
 
 
diff --git a/source/kernel/memory/memory.h b/source/kernel/memory/memory.h
index 2d0d309..9f344b1 100644
--- a/source/kernel/memory/memory.h
+++ b/source/kernel/memory/memory.h
@@ -3,9 +3,9 @@
 #include <stddef.h>
 
 #include "memoryinfo.h"
-#include "../bootloader/multiboot.h"
+#include "../boot/multiboot.h"
 #include "../tty/kterm.h"
-#include "../../libc/include/mem.h"
+#include "../../lib/include/mem.h"
 #include "../kstructures/bitmap.h"
 
 #define BLOCK_SIZE 4092
diff --git a/source/kernel/sv-terminal/superVisorTerminal.h b/source/kernel/sv-terminal/superVisorTerminal.h
index 5d4519d..752f289 100644
--- a/source/kernel/sv-terminal/superVisorTerminal.h
+++ b/source/kernel/sv-terminal/superVisorTerminal.h
@@ -1,7 +1,7 @@
 #pragma once 
 #include "../tty/kterm.h"
 #include "../time.h"
-#include "../pit.h"
+#include "../drivers/pit/pit.h"
 #include "../keyboard/keyboard.h"
 #include "../memory/memory.h"
 #include "../bootinfo.h"
diff --git a/source/kernel/tty/kterm.h b/source/kernel/tty/kterm.h
index 0753294..71e45c4 100644
--- a/source/kernel/tty/kterm.h
+++ b/source/kernel/tty/kterm.h
@@ -8,7 +8,7 @@
 #include "../drivers/IO/io.h"
 
 extern "C"{
-    #include "./../../libc/include/string.h"
+    #include "./../../lib/include/string.h"
 }
 
 void kterm_init();
diff --git a/source/libc/include/mem.h b/source/lib/include/mem.h
similarity index 100%
rename from source/libc/include/mem.h
rename to source/lib/include/mem.h
diff --git a/source/libc/include/string.c b/source/lib/include/string.c
similarity index 100%
rename from source/libc/include/string.c
rename to source/lib/include/string.c
diff --git a/source/libc/include/string.h b/source/lib/include/string.h
similarity index 100%
rename from source/libc/include/string.h
rename to source/lib/include/string.h