7 files changed, 22 insertions, 21 deletions
diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index 7733c1b..97a0267 100644
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -1,14 +1,15 @@
 add_executable("kernel"
-    "src/main.cpp"
+    # Platform-independent KAPI implementation
+    "kapi/cio.cpp"
+    "kapi/memory.cpp"
+    "kapi/system.cpp"
 
     # KSTD OS Implementation
-    "src/kstd/os.cpp"
-    "src/kstd/print.cpp"
+    "kstd/os.cpp"
+    "kstd/print.cpp"
 
-    # Platform Independent KAPI implementation
-    "src/kapi/cio.cpp"
-    "src/kapi/memory.cpp"
-    "src/kapi/system.cpp"
+    # Kernel Implementation
+    "src/main.cpp"
 )
 
 target_include_directories("kernel" PRIVATE
diff --git a/kernel/src/kapi/cio.cpp b/kernel/kapi/cio.cpp
index 01c6420..d447a6a 100644
--- a/kernel/src/kapi/cio.cpp
+++ b/kernel/kapi/cio.cpp
@@ -4,7 +4,7 @@
 #include <string_view>
 #include <utility>
 
-namespace teachos::cio
+namespace kapi::cio
 {
   namespace
   {
@@ -33,4 +33,4 @@ namespace teachos::cio
     active_device->write(stream, text);
   }
 
-}  // namespace teachos::cio
+}  // namespace kapi::cio
diff --git a/kernel/src/kapi/memory.cpp b/kernel/kapi/memory.cpp
index ebd4c15..7c9b1da 100644
--- a/kernel/src/kapi/memory.cpp
+++ b/kernel/kapi/memory.cpp
@@ -6,7 +6,7 @@
 #include <optional>
 #include <utility>
 
-namespace teachos::memory
+namespace kapi::memory
 {
 
   namespace
@@ -91,4 +91,4 @@ namespace teachos::memory
     return active_page_mapper->unmap(page);
   }
 
-}  // namespace teachos::memory
-\ No newline at end of file
+}  // namespace kapi::memory
+\ No newline at end of file
diff --git a/kernel/src/kapi/system.cpp b/kernel/kapi/system.cpp
index cdde049..a17d9b9 100644
--- a/kernel/src/kapi/system.cpp
+++ b/kernel/kapi/system.cpp
@@ -7,7 +7,7 @@
 #include <source_location>
 #include <string_view>
 
-namespace teachos::system
+namespace kapi::system
 {
 
   [[gnu::weak]]
@@ -18,4 +18,4 @@ namespace teachos::system
     cpu::halt();
   }
 
-}  // namespace teachos::system
+}  // namespace kapi::system
diff --git a/kernel/src/kstd/os.cpp b/kernel/kstd/os.cpp
index 5280f9c..21254c4 100644
--- a/kernel/src/kstd/os.cpp
+++ b/kernel/kstd/os.cpp
@@ -10,7 +10,7 @@ namespace kstd::os
 
   auto panic(std::string_view message, std::source_location location) -> void
   {
-    teachos::system::panic(message, location);
+    kapi::system::panic(message, location);
   }
 
 }  // namespace kstd::os
 \ No newline at end of file
diff --git a/kernel/src/kstd/print.cpp b/kernel/kstd/print.cpp
index 2665b9a..c7d26ba 100644
--- a/kernel/src/kstd/print.cpp
+++ b/kernel/kstd/print.cpp
@@ -16,7 +16,7 @@ namespace kstd::os
   {
     struct write_buffer
     {
-      using output_stream = teachos::cio::output_stream;
+      using output_stream = kapi::cio::output_stream;
 
       constexpr auto static size = 128uz;
 
@@ -39,7 +39,7 @@ namespace kstd::os
         if (m_position > 0)
         {
           std::string_view chunk{m_buffer.data(), m_position};
-          teachos::cio::write(m_stream, chunk);
+          kapi::cio::write(m_stream, chunk);
           m_position = 0;
         }
       }
@@ -67,8 +67,8 @@ namespace kstd::os
 
   auto vprint(print_sink sink, std::string_view format, kstd::format_args args) -> void
   {
-    auto writer = write_buffer{(sink == print_sink::stderr) ? teachos::cio::output_stream::stderr
-                                                            : teachos::cio::output_stream::stdout};
+    auto writer = write_buffer{(sink == print_sink::stderr) ? kapi::cio::output_stream::stderr
+                                                            : kapi::cio::output_stream::stdout};
     auto context = kstd::format_context{.writer = write_buffer::callback, .user_data = &writer};
 
     auto current = format.begin();
diff --git a/kernel/src/main.cpp b/kernel/src/main.cpp
index f1e5dd0..8732fa2 100644
--- a/kernel/src/main.cpp
+++ b/kernel/src/main.cpp
@@ -6,11 +6,11 @@
 
 auto main() -> int
 {
-  teachos::cio::init();
+  kapi::cio::init();
   kstd::println("[OS] IO subsystem initialized.");
 
-  teachos::memory::init();
+  kapi::memory::init();
   kstd::println("[OS] Memory subsystem initialized.");
 
-  teachos::system::panic("Returning from kernel main!");
+  kapi::system::panic("Returning from kernel main!");
 }