diff --git a/Makefile b/Makefile
index a83b0c7..5f7cbd5 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,7 @@ $(BUILD_DIR)/kterm.o:
 	$(CPP) -c $(SRC_DIR)/kernel/tty/kterm.cpp  -o $(BUILD_DIR)/kterm.o $(CFLAGS) -fno-exceptions -fno-rtti
 
 $(BUILD_DIR)/boot.o:
-	$(AS) $(SRC_DIR)/kernel//boot.S -o $(BUILD_DIR)/boot.o
+	$(AS) $(SRC_DIR)/kernel/boot.S -o $(BUILD_DIR)/boot.o
 
 $(BUILD_DIR)/crti.o:
 	$(AS) $(SRC_DIR)/kernel/crti.s -o $(BUILD_DIR)/crti.o
@@ -84,7 +84,7 @@ $(BUILD_DIR)/crtn.o:
 	$(AS) $(SRC_DIR)/kernel/crtn.s -o $(BUILD_DIR)/crtn.o
 
 $(BUILD_DIR)/io.o:
-		$(CPP) -c $(SRC_DIR)/kernel/io.cpp  -o $(BUILD_DIR)/io.o $(CFLAGS) -fno-exceptions -fno-rtti
+		$(CPP) -c $(SRC_DIR)/kernel/drivers/IO/io.cpp  -o $(BUILD_DIR)/io.o $(CFLAGS) -fno-exceptions -fno-rtti
 
 $(BUILD_DIR)/PageDirectory.o:
 	$(CPP) -c $(SRC_DIR)/kernel/memory/PageDirectory.cpp -o $(BUILD_DIR)/PageDirectory.o $(CFLAGS) -fno-exceptions -fno-rtti 
@@ -106,17 +106,17 @@ $(BUILD_DIR)/PhysicalMemoryManager.o:
 	$(CPP) -c $(SRC_DIR)/kernel/memory/PhysicalMemoryManager.cpp  -o $(BUILD_DIR)/PhysicalMemoryManager.o $(CFLAGS) -fno-exceptions -fno-rtti
 
 $(BUILD_DIR)/pci.o:
-	$(CPP) -c $(SRC_DIR)/kernel/pci.cpp  -o $(BUILD_DIR)/pci.o $(CFLAGS) -fno-exceptions -fno-rtti
+	$(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
 
 $(BUILD_DIR)/atapiDevice.o:
-	$(CPP) -c $(SRC_DIR)/kernel/drivers/atapi/atapiDevice.cpp  -o $(BUILD_DIR)/atapiDevice.o $(CFLAGS) -fno-exceptions -fno-rtti
+	$(CPP) -c $(SRC_DIR)/kernel/drivers/IO/atapi/atapiDevice.cpp  -o $(BUILD_DIR)/atapiDevice.o $(CFLAGS) -fno-exceptions -fno-rtti
 
 
 $(BUILD_DIR)/ataDevice.o:
-	$(CPP) -c $(SRC_DIR)/kernel/drivers/ata/ataDevice.cpp  -o $(BUILD_DIR)/ataDevice.o $(CFLAGS) -fno-exceptions -fno-rtti
+	$(CPP) -c $(SRC_DIR)/kernel/drivers/IO/ata/ataDevice.cpp  -o $(BUILD_DIR)/ataDevice.o $(CFLAGS) -fno-exceptions -fno-rtti
 
 $(BUILD_DIR)/rsdp.o:
-	$(CPP) -c $(SRC_DIR)/kernel/drivers/rsdp/rsdp.cpp  -o $(BUILD_DIR)/rsdp.o $(CFLAGS) -fno-exceptions -fno-rtti
+	$(CPP) -c $(SRC_DIR)/kernel/drivers/ACPI/rsdp.cpp  -o $(BUILD_DIR)/rsdp.o $(CFLAGS) -fno-exceptions -fno-rtti
diff --git a/src/kernel/boot.S b/src/kernel/boot.S
index 0c79b10..ee4698e 100644
--- a/src/kernel/boot.S
+++ b/src/kernel/boot.S
@@ -24,7 +24,7 @@ stack_top:
 .include "./src/kernel/irs_table.s"
 .include "./src/kernel/irq_table.s"
 .include "./src/kernel/idt/idt.s"
-.include "./src/kernel/paging.s"
+.include "./src/kernel/memory/paging.s"
 
 
 .global _start
diff --git a/src/kernel/drivers/rsdp/rsdp.cpp b/src/kernel/drivers/ACPI/rsdp.cpp
similarity index 100%
rename from src/kernel/drivers/rsdp/rsdp.cpp
rename to src/kernel/drivers/ACPI/rsdp.cpp
diff --git a/src/kernel/drivers/rsdp/rsdp.h b/src/kernel/drivers/ACPI/rsdp.h
similarity index 100%
rename from src/kernel/drivers/rsdp/rsdp.h
rename to src/kernel/drivers/ACPI/rsdp.h
diff --git a/src/kernel/pci.cpp b/src/kernel/drivers/IO/PCI/pci.cpp
similarity index 100%
rename from src/kernel/pci.cpp
rename to src/kernel/drivers/IO/PCI/pci.cpp
diff --git a/src/kernel/pci.h b/src/kernel/drivers/IO/PCI/pci.h
similarity index 92%
rename from src/kernel/pci.h
rename to src/kernel/drivers/IO/PCI/pci.h
index fdfe5f2..9f2bba2 100644
--- a/src/kernel/pci.h
+++ b/src/kernel/drivers/IO/PCI/pci.h
@@ -1,8 +1,8 @@
 #pragma once
 #include <stdint.h>
-#include "io.h"
-#include "tty/kterm.h"
-#include "pci/pciDevice.h"
+#include "../io.h"
+#include "../../../tty/kterm.h"
+#include "../../../pci/pciDevice.h"
 
 // Configuration Space Access Mechanism #1
 #define CONFIG_ADDRESS 0xCF8 // Configuration adress that is to be accessed
diff --git a/src/kernel/drivers/ata/ataDevice.cpp b/src/kernel/drivers/IO/ata/ataDevice.cpp
similarity index 100%
rename from src/kernel/drivers/ata/ataDevice.cpp
rename to src/kernel/drivers/IO/ata/ataDevice.cpp
diff --git a/src/kernel/drivers/ata/ataDevice.h b/src/kernel/drivers/IO/ata/ataDevice.h
similarity index 76%
rename from src/kernel/drivers/ata/ataDevice.h
rename to src/kernel/drivers/IO/ata/ataDevice.h
index 0c8abd7..89bfe7d 100644
--- a/src/kernel/drivers/ata/ataDevice.h
+++ b/src/kernel/drivers/IO/ata/ataDevice.h
@@ -1,10 +1,10 @@
 #pragma once
 #include <stdint.h>
-#include "../../io.h"
-#include "../../ide/ideCommands.h"
-#include "../../ide/sampleIDE.definitions.h"
+#include "../io.h"
+#include "../../../ide/ideCommands.h"
+#include "../../../ide/sampleIDE.definitions.h"
 
-#include "../../tty/kterm.h"
+#include "../../../tty/kterm.h"
 
 /*
 * This first driver wil make use of IO ports.
diff --git a/src/kernel/drivers/atapi/atapiDevice.cpp b/src/kernel/drivers/IO/atapi/atapiDevice.cpp
similarity index 100%
rename from src/kernel/drivers/atapi/atapiDevice.cpp
rename to src/kernel/drivers/IO/atapi/atapiDevice.cpp
diff --git a/src/kernel/drivers/atapi/atapiDevice.h b/src/kernel/drivers/IO/atapi/atapiDevice.h
similarity index 76%
rename from src/kernel/drivers/atapi/atapiDevice.h
rename to src/kernel/drivers/IO/atapi/atapiDevice.h
index 51b7ffe..37d516e 100644
--- a/src/kernel/drivers/atapi/atapiDevice.h
+++ b/src/kernel/drivers/IO/atapi/atapiDevice.h
@@ -1,10 +1,10 @@
 #pragma once
 #include <stdint.h>
-#include "../../io.h"
-#include "../../ide/ideCommands.h"
-#include "../../ide/sampleIDE.definitions.h"
+#include "../io.h"
+#include "../../../ide/ideCommands.h"
+#include "../../../ide/sampleIDE.definitions.h"
 
-#include "../../tty/kterm.h"
+#include "../../../tty/kterm.h"
 
 /*
 * This first driver wil make use of IO ports.
diff --git a/src/kernel/io.cpp b/src/kernel/drivers/IO/io.cpp
similarity index 100%
rename from src/kernel/io.cpp
rename to src/kernel/drivers/IO/io.cpp
diff --git a/src/kernel/io.h b/src/kernel/drivers/IO/io.h
similarity index 100%
rename from src/kernel/io.h
rename to src/kernel/drivers/IO/io.h
diff --git a/src/kernel/vga/VBE.h b/src/kernel/drivers/VGA/VBE.h
similarity index 100%
rename from src/kernel/vga/VBE.h
rename to src/kernel/drivers/VGA/VBE.h
diff --git a/src/kernel/vga/colors.h b/src/kernel/drivers/VGA/colors.h
similarity index 100%
rename from src/kernel/vga/colors.h
rename to src/kernel/drivers/VGA/colors.h
diff --git a/src/kernel/idt/idt.h b/src/kernel/idt/idt.h
index 04173d3..48c026c 100644
--- a/src/kernel/idt/idt.h
+++ b/src/kernel/idt/idt.h
@@ -2,7 +2,7 @@
 
 #include "stdint.h"
 #include "stddef.h"
-#include "../vga/colors.h"
+#include "../drivers/VGA/colors.h"
 #include "../pic/pic.h"
 
 #include "../tty/kterm.h"
diff --git a/src/kernel/kernel.h b/src/kernel/kernel.h
index 5542a5c..fe75fb4 100644
--- a/src/kernel/kernel.h
+++ b/src/kernel/kernel.h
@@ -4,7 +4,7 @@ extern "C"{
 }
 
 
-#include "vga/VBE.h"
+#include "drivers/VGA/VBE.h"
 #include "tty/kterm.h"
 
 #include "./bootloader/multiboot.h"
@@ -14,18 +14,17 @@ extern "C"{
 #include "gdt/gdtc.h"
 #include "idt/idt.h"
 
-#include "io.h"
+#include "drivers/IO/io.h"
 #include "time.h"
 #include "cpu.h"
 #include "serial.h"
-#include "pci.h"
+#include "drivers/IO/PCI/pci.h"
 #include "ide/ide.h"
-//#include "drivers/atapi/atapiDevice.h"
-#include "drivers/ata/ataDevice.h"
+#include "./drivers/IO/ata/ataDevice.h"
 #include "./PartitionTable/MBR/MasterBootRecord.h"
 #include "./filesytems/FAT32/BiosParameterBlock.h"
 #include "./filesytems/FAT32/ExtendBootRecord.h"
-#include "./drivers/rsdp/rsdp.h"
+#include "drivers/ACPI/rsdp.h"
 
 
 #define CHECK_FLAG(flags, bit) ((flags) & (1 <<(bit)))
diff --git a/src/kernel/paging.s b/src/kernel/memory/paging.s
similarity index 100%
rename from src/kernel/paging.s
rename to src/kernel/memory/paging.s
diff --git a/src/kernel/pic/pic.h b/src/kernel/pic/pic.h
index 9560cea..fa06d3d 100644
--- a/src/kernel/pic/pic.h
+++ b/src/kernel/pic/pic.h
@@ -1,5 +1,5 @@
 #pragma once 
-#include "../io.h"
+#include "../drivers/IO/io.h"
 
 #define PIC1		0x20		/* IO base address for master PIC */
 #define PIC2		0xA0		/* IO base address for slave PIC */
diff --git a/src/kernel/serial.h b/src/kernel/serial.h
index 71d0da1..edc2185 100644
--- a/src/kernel/serial.h
+++ b/src/kernel/serial.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "tty/kterm.h"
-#include "io.h"
+#include "drivers/IO/io.h"
 #define PORT 0x3f8 
 inline static int init_serial() {
    outb(PORT + 1, 0x00);    // Disable all interrupts
diff --git a/src/kernel/ports/serial.cpp b/src/kernel/serial/serial.cpp
similarity index 100%
rename from src/kernel/ports/serial.cpp
rename to src/kernel/serial/serial.cpp
diff --git a/src/kernel/ports/serial.h b/src/kernel/serial/serial.h
similarity index 100%
rename from src/kernel/ports/serial.h
rename to src/kernel/serial/serial.h
diff --git a/src/kernel/tty/kterm.h b/src/kernel/tty/kterm.h
index 4f048d0..0753294 100644
--- a/src/kernel/tty/kterm.h
+++ b/src/kernel/tty/kterm.h
@@ -4,8 +4,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "../vga/colors.h"
-#include "../io.h"
+#include "../drivers/VGA/colors.h"
+#include "../drivers/IO/io.h"
 
 extern "C"{
     #include "./../../libc/include/string.h"