6 files changed, 32 insertions, 32 deletions
diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index 0d6c4ba9..9bb2efd8 100644
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -40,10 +40,10 @@ target_sources("kernel_lib" PRIVATE
 
     # Device Subsystem
     "kernel/devices/block_device_utils.cpp"
-    "kernel/devices/root_bus.cpp"
 
     # Bus Sumbsystem
     "kernel/bus/boot_modules.cpp"
+    "kernel/bus/root.cpp"
 
     # Driver Subsystem
     "kernel/drivers/storage/ram_disk.cpp"
diff --git a/kernel/kapi/devices.cpp b/kernel/kapi/devices.cpp
index b0f384ab..5e08874e 100644
--- a/kernel/kapi/devices.cpp
+++ b/kernel/kapi/devices.cpp
@@ -1,6 +1,6 @@
 #include <kapi/devices.hpp>
 
-#include <kernel/devices/root_bus.hpp>
+#include <kernel/bus/root.hpp>
 #include <kernel/drivers/init.hpp>
 
 #include <kapi/system.hpp>
@@ -16,7 +16,7 @@ namespace kapi::devices
 {
   namespace
   {
-    auto constinit root_bus = kstd::shared_ptr<kernel::devices::root_bus>{};
+    auto constinit root_bus = kstd::shared_ptr<kernel::bus::root>{};
     auto constinit device_tree = kstd::flat_map<kstd::string, kstd::weak_ptr<device>>{};
   }  // namespace
 
@@ -31,7 +31,7 @@ namespace kapi::devices
     interface_registry::init();
     kernel::drivers::init();
 
-    root_bus = kstd::make_shared<kernel::devices::root_bus>();
+    root_bus = kstd::make_shared<kernel::bus::root>();
     device_registry::get().add(root_bus);
   }
 
diff --git a/kernel/kernel/bus/root.cpp b/kernel/kernel/bus/root.cpp
new file mode 100644
index 00000000..ac70e5a2
--- /dev/null
+++ b/kernel/kernel/bus/root.cpp
@@ -0,0 +1,12 @@
+#include <kernel/bus/root.hpp>
+
+#include <kapi/devices.hpp>
+
+namespace kernel::bus
+{
+
+  root::root()
+      : kapi::devices::bus{"root"}
+  {}
+
+}  // namespace kernel::bus
+\ No newline at end of file
diff --git a/kernel/kernel/bus/root.hpp b/kernel/kernel/bus/root.hpp
new file mode 100644
index 00000000..c7f8e738
--- /dev/null
+++ b/kernel/kernel/bus/root.hpp
@@ -0,0 +1,16 @@
+#ifndef TEACHOS_KERNEL_BUS_ROOT_HPP
+#define TEACHOS_KERNEL_BUS_ROOT_HPP
+
+#include <kapi/devices/bus.hpp>
+
+namespace kernel::bus
+{
+
+  struct root final : kapi::devices::bus
+  {
+    root();
+  };
+
+}  // namespace kernel::bus
+
+#endif
+\ No newline at end of file
diff --git a/kernel/kernel/devices/root_bus.cpp b/kernel/kernel/devices/root_bus.cpp
deleted file mode 100644
index 9a0b0776..00000000
--- a/kernel/kernel/devices/root_bus.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <kernel/devices/root_bus.hpp>
-
-#include <kapi/devices.hpp>
-
-namespace kernel::devices
-{
-
-  root_bus::root_bus()
-      : kapi::devices::bus{"system"}
-  {}
-
-}  // namespace kernel::devices
-\ No newline at end of file
diff --git a/kernel/kernel/devices/root_bus.hpp b/kernel/kernel/devices/root_bus.hpp
deleted file mode 100644
index c8fee520..00000000
--- a/kernel/kernel/devices/root_bus.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef TEACHOS_KERNEL_DEVICES_ROOT_BUS_HPP
-#define TEACHOS_KERNEL_DEVICES_ROOT_BUS_HPP
-
-#include <kapi/devices/bus.hpp>
-
-namespace kernel::devices
-{
-
-  struct root_bus final : kapi::devices::bus
-  {
-    root_bus();
-  };
-
-}  // namespace kernel::devices
-
-#endif
-\ No newline at end of file