67 files changed, 41 insertions, 601 deletions

diff --git a/.nvim.lua b/.nvim.lua
index ad007bb..c9a3e0a 100644
--- a/.nvim.lua
+++ b/.nvim.lua
@@ -35,6 +35,15 @@ vim.filetype.add({
   }
 })
 
+require("neo-tree").setup({
+  nesting_rules = {
+    ['*.hpp'] = {
+      pattern = "(.*).hpp",
+      files = { "%1.cpp" }
+    }
+  }
+})
+
 -- Debugging
 local dap = require("dap")
 local qemu_job_id = nil
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 80844ee..79c4971 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -13,8 +13,9 @@
         "--header-insertion=iwyu"
     ],
     "explorer.fileNesting.enabled": true,
+    "explorer.fileNesting.expand": false,
     "explorer.fileNesting.patterns": {
-        "*.hpp": "${capture}.cpp, ${capture}.test.cpp"
+        "*.hpp": "${capture}.cpp, ${capture}.test.cpp, ${capture}.S"
     },
     "files.associations": {
         "**/kstd/include/kstd/**": "cpp",
diff --git a/arch/x86_64/CMakeLists.txt b/arch/x86_64/CMakeLists.txt
index 9e346ef..20a48f9 100644
--- a/arch/x86_64/CMakeLists.txt
+++ b/arch/x86_64/CMakeLists.txt
@@ -5,8 +5,16 @@
 add_library("x86_64" OBJECT)
 add_library("arch::lib" ALIAS "x86_64")
 
+target_include_directories("x86_64" PUBLIC
+    "${CMAKE_CURRENT_SOURCE_DIR}"
+)
+
+target_link_libraries("x86_64" PUBLIC
+    "kapi::lib"
+    "multiboot2::lib"
+)
+
 target_sources("x86_64" PRIVATE
-    # Platform-dependent KAPI implementation
     "kapi/boot_modules.cpp"
     "kapi/cio.cpp"
     "kapi/cpu.cpp"
@@ -14,39 +22,41 @@ target_sources("x86_64" PRIVATE
     "kapi/interrupts.cpp"
     "kapi/memory.cpp"
     "kapi/system.cpp"
+)
 
+target_sources("x86_64" PRIVATE
     # CPU Initialization
-    "src/cpu/initialization.cpp"
-    "src/cpu/interrupts.cpp"
-    "src/cpu/interrupt_stubs.S"
+    "arch/cpu/initialization.cpp"
+    "arch/cpu/interrupts.cpp"
+    "arch/cpu/interrupts.S"
 
     # Bus Initialization
-    "src/bus/isa.cpp"
+    "arch/bus/isa.cpp"
 
     # Low-level bootstrap
-    "src/boot/boot32.S"
-    "src/boot/entry64.s"
-    "src/boot/initialize_runtime.cpp"
-    "src/boot/multiboot.s"
+    "arch/boot/boot32.S"
+    "arch/boot/entry64.s"
+    "arch/boot/initialize_runtime.cpp"
+    "arch/boot/multiboot.s"
 
     # Debug interfaces
-    "src/debug/qemu_output.cpp"
+    "arch/debug/qemu_output.cpp"
 
     # Devices
-    "src/devices/init.cpp"
-    "src/devices/legacy_pit.cpp"
-    "src/devices/local_apic.cpp"
+    "arch/devices/init.cpp"
+    "arch/devices/legacy_pit.cpp"
+    "arch/devices/local_apic.cpp"
 
     # Memory management
-    "src/memory/kernel_mapper.cpp"
-    "src/memory/higher_half_mapper.cpp"
-    "src/memory/mmu.cpp"
-    "src/memory/page_table.cpp"
-    "src/memory/region_allocator.cpp"
+    "arch/memory/kernel_mapper.cpp"
+    "arch/memory/higher_half_mapper.cpp"
+    "arch/memory/mmu.cpp"
+    "arch/memory/page_table.cpp"
+    "arch/memory/region_allocator.cpp"
 
     # VGA text mode
-    "src/vga/text/buffer.cpp"
-    "src/vga/text/device.cpp"
+    "arch/vga/text/buffer.cpp"
+    "arch/vga/text/device.cpp"
 )
 
 file(GLOB_RECURSE ARCH_HEADERS
diff --git a/arch/x86_64/include/arch/boot/boot.hpp b/arch/x86_64/arch/boot/boot.hpp
index 7df61c4..7df61c4 100644
--- a/arch/x86_64/include/arch/boot/boot.hpp
+++ b/arch/x86_64/arch/boot/boot.hpp
diff --git a/arch/x86_64/src/boot/boot32.S b/arch/x86_64/arch/boot/boot32.S
index e6fcd85..e6fcd85 100644
--- a/arch/x86_64/src/boot/boot32.S
+++ b/arch/x86_64/arch/boot/boot32.S
diff --git a/arch/x86_64/src/boot/entry64.s b/arch/x86_64/arch/boot/entry64.s
index 29fb778..29fb778 100644
--- a/arch/x86_64/src/boot/entry64.s
+++ b/arch/x86_64/arch/boot/entry64.s
diff --git a/arch/x86_64/src/boot/initialize_runtime.cpp b/arch/x86_64/arch/boot/initialize_runtime.cpp
index b08c13c..b08c13c 100644
--- a/arch/x86_64/src/boot/initialize_runtime.cpp
+++ b/arch/x86_64/arch/boot/initialize_runtime.cpp
diff --git a/arch/x86_64/include/arch/boot/ld.hpp b/arch/x86_64/arch/boot/ld.hpp
index 988723d..988723d 100644
--- a/arch/x86_64/include/arch/boot/ld.hpp
+++ b/arch/x86_64/arch/boot/ld.hpp
diff --git a/arch/x86_64/src/boot/multiboot.s b/arch/x86_64/arch/boot/multiboot.s
index 37d8afe..37d8afe 100644
--- a/arch/x86_64/src/boot/multiboot.s
+++ b/arch/x86_64/arch/boot/multiboot.s
diff --git a/arch/x86_64/src/bus/isa.cpp b/arch/x86_64/arch/bus/isa.cpp
index f6cc72d..f6cc72d 100644
--- a/arch/x86_64/src/bus/isa.cpp
+++ b/arch/x86_64/arch/bus/isa.cpp
diff --git a/arch/x86_64/include/arch/bus/isa.hpp b/arch/x86_64/arch/bus/isa.hpp
index e56f56a..e56f56a 100644
--- a/arch/x86_64/include/arch/bus/isa.hpp
+++ b/arch/x86_64/arch/bus/isa.hpp
diff --git a/arch/x86_64/include/arch/cpu/control_register.hpp b/arch/x86_64/arch/cpu/control_register.hpp
index 9cedc35..9cedc35 100644
--- a/arch/x86_64/include/arch/cpu/control_register.hpp
+++ b/arch/x86_64/arch/cpu/control_register.hpp
diff --git a/arch/x86_64/include/arch/cpu/global_descriptor_table.hpp b/arch/x86_64/arch/cpu/global_descriptor_table.hpp
index b17c509..b17c509 100644
--- a/arch/x86_64/include/arch/cpu/global_descriptor_table.hpp
+++ b/arch/x86_64/arch/cpu/global_descriptor_table.hpp
diff --git a/arch/x86_64/src/cpu/initialization.cpp b/arch/x86_64/arch/cpu/initialization.cpp
index 1be9c82..1be9c82 100644
--- a/arch/x86_64/src/cpu/initialization.cpp
+++ b/arch/x86_64/arch/cpu/initialization.cpp
diff --git a/arch/x86_64/include/arch/cpu/initialization.hpp b/arch/x86_64/arch/cpu/initialization.hpp
index 564c544..564c544 100644
--- a/arch/x86_64/include/arch/cpu/initialization.hpp
+++ b/arch/x86_64/arch/cpu/initialization.hpp
diff --git a/arch/x86_64/src/cpu/interrupt_stubs.S b/arch/x86_64/arch/cpu/interrupts.S
index e59bdd2..e59bdd2 100644
--- a/arch/x86_64/src/cpu/interrupt_stubs.S
+++ b/arch/x86_64/arch/cpu/interrupts.S
diff --git a/arch/x86_64/src/cpu/interrupts.cpp b/arch/x86_64/arch/cpu/interrupts.cpp
index f40422f..f40422f 100644
--- a/arch/x86_64/src/cpu/interrupts.cpp
+++ b/arch/x86_64/arch/cpu/interrupts.cpp
diff --git a/arch/x86_64/include/arch/cpu/interrupts.hpp b/arch/x86_64/arch/cpu/interrupts.hpp
index 6162f56..6162f56 100644
--- a/arch/x86_64/include/arch/cpu/interrupts.hpp
+++ b/arch/x86_64/arch/cpu/interrupts.hpp
diff --git a/arch/x86_64/include/arch/cpu/legacy_pic.hpp b/arch/x86_64/arch/cpu/legacy_pic.hpp
index 56ca9c4..56ca9c4 100644
--- a/arch/x86_64/include/arch/cpu/legacy_pic.hpp
+++ b/arch/x86_64/arch/cpu/legacy_pic.hpp
diff --git a/arch/x86_64/include/arch/cpu/model_specific_register.hpp b/arch/x86_64/arch/cpu/model_specific_register.hpp
index bd4aff9..bd4aff9 100644
--- a/arch/x86_64/include/arch/cpu/model_specific_register.hpp
+++ b/arch/x86_64/arch/cpu/model_specific_register.hpp
diff --git a/arch/x86_64/include/arch/cpu/registers.hpp b/arch/x86_64/arch/cpu/registers.hpp
index 58633f6..58633f6 100644
--- a/arch/x86_64/include/arch/cpu/registers.hpp
+++ b/arch/x86_64/arch/cpu/registers.hpp
diff --git a/arch/x86_64/include/arch/cpu/segment_descriptor.hpp b/arch/x86_64/arch/cpu/segment_descriptor.hpp
index 9570670..9570670 100644
--- a/arch/x86_64/include/arch/cpu/segment_descriptor.hpp
+++ b/arch/x86_64/arch/cpu/segment_descriptor.hpp
diff --git a/arch/x86_64/include/arch/cpu/segment_selector.hpp b/arch/x86_64/arch/cpu/segment_selector.hpp
index 1a78c47..1a78c47 100644
--- a/arch/x86_64/include/arch/cpu/segment_selector.hpp
+++ b/arch/x86_64/arch/cpu/segment_selector.hpp
diff --git a/arch/x86_64/include/arch/cpu/task_state_segment.hpp b/arch/x86_64/arch/cpu/task_state_segment.hpp
index 57729dd..57729dd 100644
--- a/arch/x86_64/include/arch/cpu/task_state_segment.hpp
+++ b/arch/x86_64/arch/cpu/task_state_segment.hpp
diff --git a/arch/x86_64/src/debug/qemu_output.cpp b/arch/x86_64/arch/debug/qemu_output.cpp
index 71acede..71acede 100644
--- a/arch/x86_64/src/debug/qemu_output.cpp
+++ b/arch/x86_64/arch/debug/qemu_output.cpp
diff --git a/arch/x86_64/include/arch/debug/qemu_output.hpp b/arch/x86_64/arch/debug/qemu_output.hpp
index 5ddd4be..5ddd4be 100644
--- a/arch/x86_64/include/arch/debug/qemu_output.hpp
+++ b/arch/x86_64/arch/debug/qemu_output.hpp
diff --git a/arch/x86_64/include/arch/device_io/port_io.hpp b/arch/x86_64/arch/device_io/port_io.hpp
index 4c8d66a..4c8d66a 100644
--- a/arch/x86_64/include/arch/device_io/port_io.hpp
+++ b/arch/x86_64/arch/device_io/port_io.hpp
diff --git a/arch/x86_64/src/devices/init.cpp b/arch/x86_64/arch/devices/init.cpp
index c30e8cf..c30e8cf 100644
--- a/arch/x86_64/src/devices/init.cpp
+++ b/arch/x86_64/arch/devices/init.cpp
diff --git a/arch/x86_64/include/arch/devices/init.hpp b/arch/x86_64/arch/devices/init.hpp
index c5fbf37..c5fbf37 100644
--- a/arch/x86_64/include/arch/devices/init.hpp
+++ b/arch/x86_64/arch/devices/init.hpp
diff --git a/arch/x86_64/src/devices/legacy_pit.cpp b/arch/x86_64/arch/devices/legacy_pit.cpp
index d542d47..d542d47 100644
--- a/arch/x86_64/src/devices/legacy_pit.cpp
+++ b/arch/x86_64/arch/devices/legacy_pit.cpp
diff --git a/arch/x86_64/include/arch/devices/legacy_pit.hpp b/arch/x86_64/arch/devices/legacy_pit.hpp
index 356895c..356895c 100644
--- a/arch/x86_64/include/arch/devices/legacy_pit.hpp
+++ b/arch/x86_64/arch/devices/legacy_pit.hpp
diff --git a/arch/x86_64/src/devices/local_apic.cpp b/arch/x86_64/arch/devices/local_apic.cpp
index 660921b..660921b 100644
--- a/arch/x86_64/src/devices/local_apic.cpp
+++ b/arch/x86_64/arch/devices/local_apic.cpp
diff --git a/arch/x86_64/include/arch/devices/local_apic.hpp b/arch/x86_64/arch/devices/local_apic.hpp
index f8f080d..f8f080d 100644
--- a/arch/x86_64/include/arch/devices/local_apic.hpp
+++ b/arch/x86_64/arch/devices/local_apic.hpp
diff --git a/arch/x86_64/src/memory/higher_half_mapper.cpp b/arch/x86_64/arch/memory/higher_half_mapper.cpp
index 75adb3c..75adb3c 100644
--- a/arch/x86_64/src/memory/higher_half_mapper.cpp
+++ b/arch/x86_64/arch/memory/higher_half_mapper.cpp
diff --git a/arch/x86_64/include/arch/memory/higher_half_mapper.hpp b/arch/x86_64/arch/memory/higher_half_mapper.hpp
index 9b02ee6..9b02ee6 100644
--- a/arch/x86_64/include/arch/memory/higher_half_mapper.hpp
+++ b/arch/x86_64/arch/memory/higher_half_mapper.hpp
diff --git a/arch/x86_64/src/memory/kernel_mapper.cpp b/arch/x86_64/arch/memory/kernel_mapper.cpp
index 74272a0..74272a0 100644
--- a/arch/x86_64/src/memory/kernel_mapper.cpp
+++ b/arch/x86_64/arch/memory/kernel_mapper.cpp
diff --git a/arch/x86_64/include/arch/memory/kernel_mapper.hpp b/arch/x86_64/arch/memory/kernel_mapper.hpp
index adbf688..adbf688 100644
--- a/arch/x86_64/include/arch/memory/kernel_mapper.hpp
+++ b/arch/x86_64/arch/memory/kernel_mapper.hpp
diff --git a/arch/x86_64/src/memory/mmu.cpp b/arch/x86_64/arch/memory/mmu.cpp
index 2b53fa4..2b53fa4 100644
--- a/arch/x86_64/src/memory/mmu.cpp
+++ b/arch/x86_64/arch/memory/mmu.cpp
diff --git a/arch/x86_64/include/arch/memory/mmu.hpp b/arch/x86_64/arch/memory/mmu.hpp
index 64373f4..64373f4 100644
--- a/arch/x86_64/include/arch/memory/mmu.hpp
+++ b/arch/x86_64/arch/memory/mmu.hpp
diff --git a/arch/x86_64/src/memory/page_table.cpp b/arch/x86_64/arch/memory/page_table.cpp
index 2180420..2180420 100644
--- a/arch/x86_64/src/memory/page_table.cpp
+++ b/arch/x86_64/arch/memory/page_table.cpp
diff --git a/arch/x86_64/include/arch/memory/page_table.hpp b/arch/x86_64/arch/memory/page_table.hpp
index ce3d3a1..ce3d3a1 100644
--- a/arch/x86_64/include/arch/memory/page_table.hpp
+++ b/arch/x86_64/arch/memory/page_table.hpp
diff --git a/arch/x86_64/include/arch/memory/page_utilities.hpp b/arch/x86_64/arch/memory/page_utilities.hpp
index 068e824..068e824 100644
--- a/arch/x86_64/include/arch/memory/page_utilities.hpp
+++ b/arch/x86_64/arch/memory/page_utilities.hpp
diff --git a/arch/x86_64/src/memory/region_allocator.cpp b/arch/x86_64/arch/memory/region_allocator.cpp
index 4086a10..4086a10 100644
--- a/arch/x86_64/src/memory/region_allocator.cpp
+++ b/arch/x86_64/arch/memory/region_allocator.cpp
diff --git a/arch/x86_64/include/arch/memory/region_allocator.hpp b/arch/x86_64/arch/memory/region_allocator.hpp
index 5d9da2e..5d9da2e 100644
--- a/arch/x86_64/include/arch/memory/region_allocator.hpp
+++ b/arch/x86_64/arch/memory/region_allocator.hpp
diff --git a/arch/x86_64/include/arch/vga/crtc.hpp b/arch/x86_64/arch/vga/crtc.hpp
index a8bec93..a8bec93 100644
--- a/