diff --git a/src/kernel/pci.cpp b/src/kernel/Drivers/PCI/pci.cpp
similarity index 100%
rename from src/kernel/pci.cpp
rename to src/kernel/Drivers/PCI/pci.cpp
diff --git a/src/kernel/pci.h b/src/kernel/Drivers/PCI/pci.h
similarity index 100%
rename from src/kernel/pci.h
rename to src/kernel/Drivers/PCI/pci.h
diff --git a/src/kernel/pic/pic.cpp b/src/kernel/Drivers/PIC/pic.cpp
similarity index 100%
rename from src/kernel/pic/pic.cpp
rename to src/kernel/Drivers/PIC/pic.cpp
diff --git a/src/kernel/pic/pic.h b/src/kernel/Drivers/PIC/pic.h
similarity index 100%
rename from src/kernel/pic/pic.h
rename to src/kernel/Drivers/PIC/pic.h
diff --git a/src/kernel/pit.cpp b/src/kernel/Drivers/PIT/pit.cpp
similarity index 100%
rename from src/kernel/pit.cpp
rename to src/kernel/Drivers/PIT/pit.cpp
diff --git a/src/kernel/pit.h b/src/kernel/Drivers/PIT/pit.h
similarity index 100%
rename from src/kernel/pit.h
rename to src/kernel/Drivers/PIT/pit.h
diff --git a/src/kernel/keyboard/keyboard.cpp b/src/kernel/Drivers/PS-2/keyboard.cpp
similarity index 100%
rename from src/kernel/keyboard/keyboard.cpp
rename to src/kernel/Drivers/PS-2/keyboard.cpp
diff --git a/src/kernel/keyboard/keyboard.h b/src/kernel/Drivers/PS-2/keyboard.h
similarity index 100%
rename from src/kernel/keyboard/keyboard.h
rename to src/kernel/Drivers/PS-2/keyboard.h
diff --git a/src/kernel/ports/serial.cpp b/src/kernel/Drivers/Serial/serial.cpp
similarity index 100%
rename from src/kernel/ports/serial.cpp
rename to src/kernel/Drivers/Serial/serial.cpp
diff --git a/src/kernel/ports/serial.h b/src/kernel/Drivers/Serial/serial.h
similarity index 100%
rename from src/kernel/ports/serial.h
rename to src/kernel/Drivers/Serial/serial.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/drivers/cmos/cmos.cpp b/src/kernel/Drivers/cmos/cmos.cpp
similarity index 100%
rename from src/kernel/drivers/cmos/cmos.cpp
rename to src/kernel/Drivers/cmos/cmos.cpp
diff --git a/src/kernel/filesystems/FAT/FAT16.cpp b/src/kernel/FileSystem/FAT/FAT16.cpp
similarity index 100%
rename from src/kernel/filesystems/FAT/FAT16.cpp
rename to src/kernel/FileSystem/FAT/FAT16.cpp
diff --git a/src/kernel/filesystems/FAT/FAT16.h b/src/kernel/FileSystem/FAT/FAT16.h
similarity index 100%
rename from src/kernel/filesystems/FAT/FAT16.h
rename to src/kernel/FileSystem/FAT/FAT16.h
diff --git a/src/kernel/idt/idt.cpp b/src/kernel/Interrupts/idt/idt.cpp
similarity index 100%
rename from src/kernel/idt/idt.cpp
rename to src/kernel/Interrupts/idt/idt.cpp
diff --git a/src/kernel/idt/idt.h b/src/kernel/Interrupts/idt/idt.h
similarity index 100%
rename from src/kernel/idt/idt.h
rename to src/kernel/Interrupts/idt/idt.h
diff --git a/src/kernel/idt/idt.s b/src/kernel/Interrupts/idt/idt.s
similarity index 100%
rename from src/kernel/idt/idt.s
rename to src/kernel/Interrupts/idt/idt.s
diff --git a/src/kernel/idt/scancodes/set1.h b/src/kernel/Interrupts/idt/scancodes/set1.h
similarity index 100%
rename from src/kernel/idt/scancodes/set1.h
rename to src/kernel/Interrupts/idt/scancodes/set1.h
diff --git a/src/kernel/boot.s b/src/kernel/KernelLauncher/boot.s
similarity index 100%
rename from src/kernel/boot.s
rename to src/kernel/KernelLauncher/boot.s
diff --git a/src/kernel/bootcheck.h b/src/kernel/KernelLauncher/bootcheck.h
similarity index 100%
rename from src/kernel/bootcheck.h
rename to src/kernel/KernelLauncher/bootcheck.h
diff --git a/src/kernel/crti.s b/src/kernel/KernelLauncher/crti.s
similarity index 100%
rename from src/kernel/crti.s
rename to src/kernel/KernelLauncher/crti.s
diff --git a/src/kernel/crtn.s b/src/kernel/KernelLauncher/crtn.s
similarity index 100%
rename from src/kernel/crtn.s
rename to src/kernel/KernelLauncher/crtn.s
diff --git a/src/kernel/gdt/gdt.s b/src/kernel/Memory/GDT/gdt.s
similarity index 100%
rename from src/kernel/gdt/gdt.s
rename to src/kernel/Memory/GDT/gdt.s
diff --git a/src/kernel/gdt/gdtc.cpp b/src/kernel/Memory/GDT/gdtc.cpp
similarity index 100%
rename from src/kernel/gdt/gdtc.cpp
rename to src/kernel/Memory/GDT/gdtc.cpp
diff --git a/src/kernel/gdt/gdtc.h b/src/kernel/Memory/GDT/gdtc.h
similarity index 100%
rename from src/kernel/gdt/gdtc.h
rename to src/kernel/Memory/GDT/gdtc.h
diff --git a/src/kernel/memory/memory.cpp b/src/kernel/Memory/memory.cpp
similarity index 100%
rename from src/kernel/memory/memory.cpp
rename to src/kernel/Memory/memory.cpp
diff --git a/src/kernel/memory/memory.h b/src/kernel/Memory/memory.h
similarity index 100%
rename from src/kernel/memory/memory.h
rename to src/kernel/Memory/memory.h
diff --git a/src/kernel/memory/memoryinfo.h b/src/kernel/Memory/memoryinfo.h
similarity index 100%
rename from src/kernel/memory/memoryinfo.h
rename to src/kernel/Memory/memoryinfo.h
diff --git a/src/kernel/memory/paging.cpp b/src/kernel/Memory/paging.cpp
similarity index 100%
rename from src/kernel/memory/paging.cpp
rename to src/kernel/Memory/paging.cpp
diff --git a/src/kernel/memory/paging.definitions.h b/src/kernel/Memory/paging.definitions.h
similarity index 100%
rename from src/kernel/memory/paging.definitions.h
rename to src/kernel/Memory/paging.definitions.h
diff --git a/src/kernel/memory/paging.h b/src/kernel/Memory/paging.h
similarity index 100%
rename from src/kernel/memory/paging.h
rename to src/kernel/Memory/paging.h
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/sv-terminal/superVisorTerminal.cpp b/src/kernel/SuperVisorTerminal/superVisorTerminal.cpp
similarity index 100%
rename from src/kernel/sv-terminal/superVisorTerminal.cpp
rename to src/kernel/SuperVisorTerminal/superVisorTerminal.cpp
diff --git a/src/kernel/sv-terminal/superVisorTerminal.h b/src/kernel/SuperVisorTerminal/superVisorTerminal.h
similarity index 100%
rename from src/kernel/sv-terminal/superVisorTerminal.h
rename to src/kernel/SuperVisorTerminal/superVisorTerminal.h
diff --git a/src/kernel/tty/kterm.cpp b/src/kernel/Terminal/kterm.cpp
similarity index 100%
rename from src/kernel/tty/kterm.cpp
rename to src/kernel/Terminal/kterm.cpp
diff --git a/src/kernel/tty/kterm.h b/src/kernel/Terminal/kterm.h
similarity index 100%
rename from src/kernel/tty/kterm.h
rename to src/kernel/Terminal/kterm.h
diff --git a/src/kernel/kstructures/bitmap.h b/src/kernel/bitmap.h
similarity index 100%
rename from src/kernel/kstructures/bitmap.h
rename to src/kernel/bitmap.h
diff --git a/src/kernel/bootloader/multiboot.h b/src/kernel/multiboot.h
similarity index 100%
rename from src/kernel/bootloader/multiboot.h
rename to src/kernel/multiboot.h