From 5603c7ec2b07dbc772fe2c20a9e9e176c5465c57 Mon Sep 17 00:00:00 2001
From: "marcel.braun" <marcel.braun@ost.ch>
Date: Mon, 30 Mar 2026 21:22:22 +0200
Subject: Move everything in kernel into kernel namespace

---
 kernel/include/kernel/devices/block_device.hpp     |  4 ++--
 .../include/kernel/devices/block_device_utils.hpp  |  4 ++--
 kernel/include/kernel/devices/device.hpp           |  4 ++--
 .../storage/ram_disk/ram_disk_controller.hpp       |  4 ++--
 .../devices/storage/ram_disk/ram_disk_device.hpp   |  4 ++--
 .../kernel/devices/storage/storage_controller.hpp  |  4 ++--
 .../kernel/devices/storage/storage_management.hpp  |  4 ++--
 kernel/include/kernel/filesystem/dentry.hpp        |  4 ++--
 .../kernel/filesystem/devfs/devfs_filesystem.hpp   |  4 ++--
 .../kernel/filesystem/devfs/devfs_root_inode.hpp   |  4 ++--
 kernel/include/kernel/filesystem/device_inode.hpp  |  4 ++--
 .../ext2/ext2_block_group_descriptor.hpp           |  4 ++--
 .../kernel/filesystem/ext2/ext2_filesystem.hpp     |  4 ++--
 .../include/kernel/filesystem/ext2/ext2_inode.hpp  |  4 ++--
 .../ext2/ext2_linked_directory_entry.hpp           |  4 ++--
 .../kernel/filesystem/ext2/ext2_superblock.hpp     |  4 ++--
 .../kernel/filesystem/file_descriptor_table.hpp    |  4 ++--
 kernel/include/kernel/filesystem/filesystem.hpp    |  4 ++--
 kernel/include/kernel/filesystem/inode.hpp         |  4 ++--
 kernel/include/kernel/filesystem/mount.hpp         |  4 ++--
 kernel/include/kernel/filesystem/mount_table.hpp   |  4 ++--
 .../kernel/filesystem/open_file_description.hpp    |  4 ++--
 .../kernel/filesystem/rootfs/rootfs_filesystem.hpp |  4 ++--
 .../kernel/filesystem/rootfs/rootfs_inode.hpp      |  4 ++--
 kernel/include/kernel/filesystem/vfs.hpp           |  4 ++--
 kernel/include/kernel/memory/heap_allocator.hpp    |  2 --
 kernel/src/devices/block_device.cpp                |  4 ++--
 kernel/src/devices/block_device_utils.cpp          |  4 ++--
 kernel/src/devices/device.cpp                      |  4 ++--
 .../storage/ram_disk/ram_disk_controller.cpp       |  4 ++--
 .../devices/storage/ram_disk/ram_disk_device.cpp   |  4 ++--
 kernel/src/devices/storage/storage_controller.cpp  |  4 ++--
 kernel/src/devices/storage/storage_management.cpp  |  4 ++--
 kernel/src/filesystem/dentry.cpp                   |  4 ++--
 kernel/src/filesystem/devfs/devfs_filesystem.cpp   |  4 ++--
 kernel/src/filesystem/devfs/devfs_root_inode.cpp   |  4 ++--
 kernel/src/filesystem/device_inode.cpp             |  4 ++--
 kernel/src/filesystem/ext2/ext2_filesystem.cpp     |  4 ++--
 kernel/src/filesystem/ext2/ext2_inode.cpp          |  4 ++--
 kernel/src/filesystem/file_descriptor_table.cpp    |  4 ++--
 kernel/src/filesystem/filesystem.cpp               |  4 ++--
 kernel/src/filesystem/inode.cpp                    |  4 ++--
 kernel/src/filesystem/mount.cpp                    |  4 ++--
 kernel/src/filesystem/mount_table.cpp              |  4 ++--
 kernel/src/filesystem/open_file_description.cpp    |  4 ++--
 kernel/src/filesystem/rootfs/rootfs_filesystem.cpp |  4 ++--
 kernel/src/filesystem/rootfs/rootfs_inode.cpp      |  4 ++--
 kernel/src/filesystem/vfs.cpp                      |  4 ++--
 kernel/src/main.cpp                                | 28 +++++++++++-----------
 49 files changed, 108 insertions(+), 110 deletions(-)

diff --git a/kernel/include/kernel/devices/block_device.hpp b/kernel/include/kernel/devices/block_device.hpp
index e2026dd..619b815 100644
--- a/kernel/include/kernel/devices/block_device.hpp
+++ b/kernel/include/kernel/devices/block_device.hpp
@@ -7,7 +7,7 @@
 
 #include <cstddef>
 
-namespace devices
+namespace kernel::devices
 {
   /**
    * @brief Base interface for block-addressable devices.
@@ -92,6 +92,6 @@ namespace devices
 
     size_t m_block_size;
   };
-}  // namespace devices
+}  // namespace kernel::devices
 
 #endif
\ No newline at end of file
diff --git a/kernel/include/kernel/devices/block_device_utils.hpp b/kernel/include/kernel/devices/block_device_utils.hpp
index 5ec69d1..bb49d04 100644
--- a/kernel/include/kernel/devices/block_device_utils.hpp
+++ b/kernel/include/kernel/devices/block_device_utils.hpp
@@ -7,11 +7,11 @@
 
 #include <cstddef>
 
-namespace devices::block_device_utils
+namespace kernel::devices::block_device_utils
 {
   auto read(kstd::shared_ptr<devices::device> const & device, void * buffer, size_t offset, size_t size) -> size_t;
   auto write(kstd::shared_ptr<devices::device> const & device, void const * buffer, size_t offset, size_t size)
       -> size_t;
-}  // namespace devices::block_device_utils
+}  // namespace kernel::devices::block_device_utils
 
 #endif
\ No newline at end of file
diff --git a/kernel/include/kernel/devices/device.hpp b/kernel/include/kernel/devices/device.hpp
index 66cb7f8..67fa5ad 100644
--- a/kernel/include/kernel/devices/device.hpp
+++ b/kernel/include/kernel/devices/device.hpp
@@ -5,7 +5,7 @@
 
 #include <cstddef>
 
-namespace devices
+namespace kernel::devices
 {
   /**
    * @brief Base device identified by a major, minor number and name.
@@ -57,6 +57,6 @@ namespace devices
     size_t m_minor;
     kstd::string m_name;
   };
-}  // namespace devices
+}  // namespace kernel::devices
 
 #endif
\ No newline at end of file
diff --git a/kernel/include/kernel/devices/storage/ram_disk/ram_disk_controller.hpp b/kernel/include/kernel/devices/storage/ram_disk/ram_disk_controller.hpp
index 6f022e3..40763bf 100644
--- a/kernel/include/kernel/devices/storage/ram_disk/ram_disk_controller.hpp
+++ b/kernel/include/kernel/devices/storage/ram_disk/ram_disk_controller.hpp
@@ -5,7 +5,7 @@
 
 #include "kernel/devices/storage/storage_controller.hpp"
 
-namespace devices::storage::ram_disk
+namespace kernel::devices::storage::ram_disk
 {
   /**
    * @brief Storage controller that exposes boot modules as RAM-disk devices.
@@ -26,6 +26,6 @@ namespace devices::storage::ram_disk
   private:
     kapi::boot_modules::boot_module_registry const * m_boot_module_registry;
   };
-}  // namespace devices::storage::ram_disk
+}  // namespace kernel::devices::storage::ram_disk
 
 #endif
\ No newline at end of file
diff --git a/kernel/include/kernel/devices/storage/ram_disk/ram_disk_device.hpp b/kernel/include/kernel/devices/storage/ram_disk/ram_disk_device.hpp
index c323f4b..75ff50b 100644
--- a/kernel/include/kernel/devices/storage/ram_disk/ram_disk_device.hpp
+++ b/kernel/include/kernel/devices/storage/ram_disk/ram_disk_device.hpp
@@ -7,7 +7,7 @@
 
 #include <cstddef>
 
-namespace devices::storage::ram_disk
+namespace kernel::devices::storage::ram_disk
 {
   /**
    * @brief Block device for a boot module.
@@ -47,6 +47,6 @@ namespace devices::storage::ram_disk
 
     kapi::boot_modules::boot_module m_boot_module{};
   };
-}  // namespace devices::storage::ram_disk
+}  // namespace kernel::devices::storage::ram_disk
 
 #endif
\ No newline at end of file
diff --git a/kernel/include/kernel/devices/storage/storage_controller.hpp b/kernel/include/kernel/devices/storage/storage_controller.hpp
index 58585fa..5639160 100644
--- a/kernel/include/kernel/devices/storage/storage_controller.hpp
+++ b/kernel/include/kernel/devices/storage/storage_controller.hpp
@@ -8,7 +8,7 @@
 
 #include <cstddef>
 
-namespace devices::storage
+namespace kernel::devices::storage
 {
   /**
    * @brief Base interface for storage controllers.
@@ -66,6 +66,6 @@ namespace devices::storage
     size_t m_minors_per_device{};
     kstd::vector<kstd::shared_ptr<devices::device>> m_devices{};
   };
-}  // namespace devices::storage
+}  // namespace kernel::devices::storage
 
 #endif
\ No newline at end of file
diff --git a/kernel/include/kernel/devices/storage/storage_management.hpp b/kernel/include/kernel/devices/storage/storage_management.hpp
index 413820e..b6d1318 100644
--- a/kernel/include/kernel/devices/storage/storage_management.hpp
+++ b/kernel/include/kernel/devices/storage/storage_management.hpp
@@ -9,7 +9,7 @@
 
 #include <cstddef>
 
-namespace devices::storage
+namespace kernel::devices::storage
 {
   /**
    * @brief Global storage subsystem manager.
@@ -72,6 +72,6 @@ namespace devices::storage
 
     kstd::vector<kstd::shared_ptr<storage_controller>> m_controllers{};
   };
-}  // namespace devices::storage
+}  // namespace kernel::devices::storage
 
 #endif
\ No newline at end of file
diff --git a/kernel/include/kernel/filesystem/dentry.hpp b/kernel/include/kernel/filesystem/dentry.hpp
index c28246f..fc85a7d 100644
--- a/kernel/include/kernel/filesystem/dentry.hpp
+++ b/kernel/include/kernel/filesystem/dentry.hpp
@@ -10,7 +10,7 @@
 #include <cstdint>
 #include <string_view>
 
-namespace filesystem
+namespace kernel::filesystem
 {
   struct dentry
   {
@@ -38,6 +38,6 @@ namespace filesystem
     kstd::shared_ptr<inode> m_inode;
     uint32_t m_flags{0};
   };
-}  // namespace filesystem
+}  // namespace kernel::filesystem
 
 #endif
\ No newline at end of file
diff --git a/kernel/include/kernel/filesystem/devfs/devfs_filesystem.hpp b/kernel/include/kernel/filesystem/devfs/devfs_filesystem.hpp
index 5559c2a..2330915 100644
--- a/kernel/include/kernel/filesystem/devfs/devfs_filesystem.hpp
+++ b/kernel/include/kernel/filesystem/devfs/devfs_filesystem.hpp
@@ -10,7 +10,7 @@
 
 #include <string_view>
 
-namespace filesystem::devfs
+namespace kernel::filesystem::devfs
 {
   struct devfs_filesystem : filesystem
   {
@@ -20,6 +20,6 @@ namespace filesystem::devfs
   private:
     auto build_device_inode_table() -> void;
   };
-}  // namespace filesystem::devfs
+}  // namespace kernel::filesystem::devfs
 
 #endif
\ No newline at end of file
diff --git a/kernel/include/kernel/filesystem/devfs/devfs_root_inode.hpp b/kernel/include/kernel/filesystem/devfs/devfs_root_inode.hpp
index b1d37ab..206fc13 100644
--- a/kernel/include/kernel/filesystem/devfs/devfs_root_inode.hpp
+++ b/kernel/include/kernel/filesystem/devfs/devfs_root_inode.hpp
@@ -5,7 +5,7 @@
 
 #include <cstddef>
 
-namespace filesystem::devfs
+namespace kernel::filesystem::devfs
 {
   struct devfs_root_inode : inode
   {
@@ -14,6 +14,6 @@ namespace filesystem::devfs
     auto read(void * buffer, size_t offset, size_t size) const -> size_t override;
     auto write(void const * buffer, size_t offset, size_t size) -> size_t override;
   };
-}  // namespace filesystem::devfs
+}  // namespace kernel::filesystem::devfs
 
 #endif
\ No newline at end of file
diff --git a/kernel/include/kernel/filesystem/device_inode.hpp b/kernel/include/kernel/filesystem/device_inode.hpp
index 0477969..7f044b0 100644
--- a/kernel/include/kernel/filesystem/device_inode.hpp
+++ b/kernel/include/kernel/filesystem/device_inode.hpp
@@ -8,7 +8,7 @@
 
 #include <cstddef>
 
-namespace filesystem
+namespace kernel::filesystem
 {
   struct device_inode : inode
   {
@@ -22,6 +22,6 @@ namespace filesystem
   private:
     kstd::shared_ptr<devices::device> m_device;
   };
-}  // namespace filesystem
+}  // namespace kernel::filesystem
 
 #endif
\ No newline at end of file
diff --git a/kernel/include/kernel/filesystem/ext2/ext2_block_group_descriptor.hpp b/kernel/include/kernel/filesystem/ext2/ext2_block_group_descriptor.hpp
index b0966da..0de7428 100644
--- a/kernel/include/kernel/filesystem/ext2/ext2_block_group_descriptor.hpp
+++ b/kernel/include/kernel/filesystem/ext2/ext2_block_group_descriptor.hpp
@@ -4,7 +4,7 @@
 #include <array>
 #include <cstdint>
 
-namespace filesystem::ext2
+namespace kernel::filesystem::ext2
 {
   struct ext2_block_group_descriptor
   {
@@ -17,5 +17,5 @@ namespace filesystem::ext2
     std::array<uint8_t, 2> padding;
     std::array<uint8_t, 12> reserved;  // NOLINT(readability-magic-numbers)
   };
-}  // namespace filesystem::ext2
+}  // namespace kernel::filesystem::ext2
 #endif  // EXT2_BLOCK_GROUP_DESCRIPTOR_HPP
\ No newline at end of file
diff --git a/kernel/include/kernel/filesystem/ext2/ext2_filesystem.hpp b/kernel/include/kernel/filesystem/ext2/ext2_filesystem.hpp
index 1445e5a..753aea1 100644
--- a/kernel/include/kernel/filesystem/ext2/ext2_filesystem.hpp
+++ b/kernel/include/kernel/filesystem/ext2/ext2_filesystem.hpp
@@ -9,7 +9,7 @@
 
 #include <string_view>
 
-namespace filesystem::ext2
+namespace kernel::filesystem::ext2
 {
   struct ext2_filesystem : filesystem
   {
@@ -18,6 +18,6 @@ namespace filesystem::ext2
 
   private:
   };
-}  // namespace filesystem::ext2
+}  // namespace kernel::filesystem::ext2
 
 #endif
diff --git a/kernel/include/kernel/filesystem/ext2/ext2_inode.hpp b/kernel/include/kernel/filesystem/ext2/ext2_inode.hpp
index c35f84c..2054227 100644
--- a/kernel/include/kernel/filesystem/ext2/ext2_inode.hpp
+++ b/kernel/include/kernel/filesystem/ext2/ext2_inode.hpp
@@ -9,7 +9,7 @@
 #include <cstddef>
 #include <cstdint>
 
-namespace filesystem::ext2
+namespace kernel::filesystem::ext2
 {
   struct ext2_inode : inode
   {
@@ -39,6 +39,6 @@ namespace filesystem::ext2
     // uint8_t osd2[12]; // TODO BA-FS26 really correct?
     std::array<uint8_t, 12> osd2;  // NOLINT(readability-magic-numbers)
   };
-}  // namespace filesystem::ext2
+}  // namespace kernel::filesystem::ext2
 
 #endif
\ No newline at end of file
diff --git a/kernel/include/kernel/filesystem/ext2/ext2_linked_directory_entry.hpp b/kernel/include/kernel/filesystem/ext2/ext2_linked_directory_entry.hpp
index 3128617..84e47e8 100644
--- a/kernel/include/kernel/filesystem/ext2/ext2_linked_directory_entry.hpp
+++ b/kernel/include/kernel/filesystem/ext2/ext2_linked_directory_entry.hpp
@@ -4,7 +4,7 @@
 #include <array>
 #include <cstdint>
 
-namespace filesystem::ext2
+namespace kernel::filesystem::ext2
 {
   struct ext2_linked_directory_entry
   {
@@ -15,6 +15,6 @@ namespace filesystem::ext2
     uint8_t pad;
     std::array<uint8_t, 255> name;  // NOLINT(readability-magic-numbers)
   };
-}  // namespace filesystem::ext2
+}  // namespace kernel::filesystem::ext2
 
 #endif
\ No newline at end of file
diff --git a/kernel/include/kernel/filesystem/ext2/ext2_superblock.hpp b/kernel/include/kernel/filesystem/ext2/ext2_superblock.hpp
index cd77cd4..aa93e68 100644
--- a/kernel/include/kernel/filesystem/ext2/ext2_superblock.hpp
+++ b/kernel/include/kernel/filesystem/ext2/ext2_superblock.hpp
@@ -4,7 +4,7 @@
 #include <array>
 #include <cstdint>
 
-namespace filesystem::ext2
+namespace kernel::filesystem::ext2
 {
   struct ext2_superblock
   {
@@ -72,5 +72,5 @@ namespace filesystem::ext2
     uint32_t first_meta_bg;
     std::array<uint8_t, 760> unused;  // NOLINT(readability-magic-numbers)
   };
-}  // namespace filesystem::ext2
+}  // namespace kernel::filesystem::ext2
 #endif
\ No newline at end of file
diff --git a/kernel/include/kernel/filesystem/file_descriptor_table.hpp b/kernel/include/kernel/filesystem/file_descriptor_table.hpp
index bc6fb24..91e2960 100644
--- a/kernel/include/kernel/filesystem/file_descriptor_table.hpp
+++ b/kernel/include/kernel/filesystem/file_descriptor_table.hpp
@@ -6,7 +6,7 @@
 #include <kstd/memory>
 #include <kstd/vector>
 
-namespace filesystem
+namespace kernel::filesystem
 {
   struct file_descriptor_table
   {
@@ -24,6 +24,6 @@ namespace filesystem
 
     kstd::vector<kstd::shared_ptr<open_file_description>> m_open_files{};
   };
-}  // namespace filesystem
+}  // namespace kernel::filesystem
 
 #endif
\ No newline at end of file
diff --git a/kernel/include/kernel/filesystem/filesystem.hpp b/kernel/include/kernel/filesystem/filesystem.hpp
index e069ced..c50a86c 100644
--- a/kernel/include/kernel/filesystem/filesystem.hpp
+++ b/kernel/include/kernel/filesystem/filesystem.hpp
@@ -9,7 +9,7 @@
 
 #include <string_view>
 
-namespace filesystem
+namespace kernel::filesystem
 {
   struct filesystem
   {
@@ -26,6 +26,6 @@ namespace filesystem
     kstd::vector<kstd::shared_ptr<inode>> m_inodes{};
   };
 
-}  // namespace filesystem
+}  // namespace kernel::filesystem
 
 #endif
\ No newline at end of file
diff --git a/kernel/include/kernel/filesystem/inode.hpp b/kernel/include/kernel/filesystem/inode.hpp
index 6d8f0d4..d97b5ab 100644
--- a/kernel/include/kernel/filesystem/inode.hpp
+++ b/kernel/include/kernel/filesystem/inode.hpp
@@ -3,7 +3,7 @@
 
 #include <cstddef>
 
-namespace filesystem
+namespace kernel::filesystem
 {
   struct inode
   {
@@ -28,6 +28,6 @@ namespace filesystem
   private:
     inode_kind m_kind{inode_kind::regular};
   };
-}  // namespace filesystem
+}  // namespace kernel::filesystem
 
 #endif
diff --git a/kernel/include/kernel/filesystem/mount.hpp b/kernel/include/kernel/filesystem/mount.hpp
index 0f37687..a054750 100644
--- a/kernel/include/kernel/filesystem/mount.hpp
+++ b/kernel/include/kernel/filesystem/mount.hpp
@@ -9,7 +9,7 @@
 
 #include <string_view>
 
-namespace filesystem
+namespace kernel::filesystem
 {
   struct mount
   {
@@ -28,6 +28,6 @@ namespace filesystem
     kstd::shared_ptr<dentry> m_root_dentry;
     kstd::shared_ptr<filesystem> m_filesystem{};
   };
-}  // namespace filesystem
+}  // namespace kernel::filesystem
 
 #endif
diff --git a/kernel/include/kernel/filesystem/mount_table.hpp b/kernel/include/kernel/filesystem/mount_table.hpp
index 2cd66ea..6dc2218 100644
--- a/kernel/include/kernel/filesystem/mount_table.hpp
+++ b/kernel/include/kernel/filesystem/mount_table.hpp
@@ -8,7 +8,7 @@
 
 #include <string_view>
 
-namespace filesystem
+namespace kernel::filesystem
 {
   struct mount_table
   {
@@ -20,6 +20,6 @@ namespace filesystem
   private:
     kstd::vector<kstd::shared_ptr<mount>> m_mounts;
   };
-}  // namespace filesystem
+}  // namespace kernel::filesystem
 
 #endif
diff --git a/kernel/include/kernel/filesystem/open_file_description.hpp b/kernel/include/kernel/filesystem/open_file_description.hpp
index e17f9fe..45719cf 100644
--- a/kernel/include/kernel/filesystem/open_file_description.hpp
+++ b/kernel/include/kernel/filesystem/open_file_description.hpp
@@ -7,7 +7,7 @@
 
 #include <cstddef>
 
-namespace filesystem
+namespace kernel::filesystem
 {
   struct open_file_description
   {
@@ -23,6 +23,6 @@ namespace filesystem
     size_t m_offset;
   };
 
-}  // namespace filesystem
+}  // namespace kernel::filesystem
 
 #endif
\ No newline at end of file
diff --git a/kernel/include/kernel/filesystem/rootfs/rootfs_filesystem.hpp b/kernel/include/kernel/filesystem/rootfs/rootfs_filesystem.hpp
index b3e03a9..b91f728 100644
--- a/kernel/include/kernel/filesystem/rootfs/rootfs_filesystem.hpp
+++ b/kernel/include/kernel/filesystem/rootfs/rootfs_filesystem.hpp
@@ -11,13 +11,13 @@
 
 #include <string_view>
 
-namespace filesystem::rootfs
+namespace kernel::filesystem::rootfs
 {
   struct rootfs_filesystem : filesystem
   {
     auto mount(kstd::shared_ptr<devices::device> const & device) -> int override;
     auto lookup(kstd::shared_ptr<inode> const & parent, std::string_view name) -> kstd::shared_ptr<inode> override;
   };
-}  // namespace filesystem::rootfs
+}  // namespace kernel::filesystem::rootfs
 
 #endif
diff --git a/kernel/include/kernel/filesystem/rootfs/rootfs_inode.hpp b/kernel/include/kernel/filesystem/rootfs/rootfs_inode.hpp
index de4fb7c..26e7f88 100644
--- a/kernel/include/kernel/filesystem/rootfs/rootfs_inode.hpp
+++ b/kernel/include/kernel/filesystem/rootfs/rootfs_inode.hpp
@@ -11,7 +11,7 @@
 #include <string_view>
 #include <utility>
 
-namespace filesystem::rootfs
+namespace kernel::filesystem::rootfs
 {
   struct rootfs_inode : inode
   {
@@ -26,6 +26,6 @@ namespace filesystem::rootfs
   private:
     kstd::vector<std::pair<kstd::string, kstd::shared_ptr<rootfs_inode>>> m_children;
   };
-}  // namespace filesystem::rootfs
+}  // namespace kernel::filesystem::rootfs
 
 #endif
diff --git a/kernel/include/kernel/filesystem/vfs.hpp b/kernel/include/kernel/filesystem/vfs.hpp
index 9bee104..5823a83 100644
--- a/kernel/include/kernel/filesystem/vfs.hpp
+++ b/kernel/include/kernel/filesystem/vfs.hpp
@@ -10,7 +10,7 @@
 
 #include <string_view>
 
-namespace filesystem
+namespace kernel::filesystem
 {
   struct vfs
   {
@@ -32,6 +32,6 @@ namespace filesystem
 
     mount_table m_mount_table;
   };
-}  // namespace filesystem
+}  // namespace kernel::filesystem
 
 #endif
\ No newline at end of file
diff --git a/kernel/include/kernel/memory/heap_allocator.hpp b/kernel/include/kernel/memory/heap_allocator.hpp
index 55de7e4..fd39bef 100644
--- a/kernel/include/kernel/memory/heap_allocator.hpp
+++ b/kernel/include/kernel/memory/heap_allocator.hpp
@@ -3,8 +3,6 @@
 
 #include <kstd/units>
 
-#include <new>
-
 namespace kernel::memory
 {
 
diff --git a/kernel/src/devices/block_device.cpp b/kernel/src/devices/block_device.cpp
index 3402814..cfe2eb2 100644
--- a/kernel/src/devices/block_device.cpp
+++ b/kernel/src/devices/block_device.cpp
@@ -8,7 +8,7 @@
 
 #include <cstddef>
 
-namespace devices
+namespace kernel::devices
 {
   block_device::block_device(size_t major, size_t minor, kstd::string const & name, size_t block_size)
       : device(major, minor, name)
@@ -40,4 +40,4 @@ namespace devices
   {
     return size();
   }
-}  // namespace devices
\ No newline at end of file
+}  // namespace kernel::devices
\ No newline at end of file
diff --git a/kernel/src/devices/block_device_utils.cpp b/kernel/src/devices/block_device_utils.cpp
index 9d3af1b..5469087 100644
--- a/kernel/src/devices/block_device_utils.cpp
+++ b/kernel/src/devices/block_device_utils.cpp
@@ -12,7 +12,7 @@
 #include <algorithm>
 #include <cstddef>
 
-namespace devices::block_device_utils
+namespace kernel::devices::block_device_utils
 {
 
   using block_op = void (*)(size_t idx, size_t off, size_t len, size_t done, devices::block_device * device,
@@ -100,4 +100,4 @@ namespace devices::block_device_utils
                           });
   }
 
-}  // namespace devices::block_device_utils
\ No newline at end of file
+}  // namespace kernel::devices::block_device_utils
\ No newline at end of file
diff --git a/kernel/src/devices/device.cpp b/kernel/src/devices/device.cpp
index 287f14b..1e7589e 100644
--- a/kernel/src/devices/device.cpp
+++ b/kernel/src/devices/device.cpp
@@ -4,7 +4,7 @@
 
 #include <cstddef>
 
-namespace devices
+namespace kernel::devices
 {
   device::device(size_t major, size_t minor, kstd::string const & name)
       : m_major(major)
@@ -26,4 +26,4 @@ namespace devices
   {
     return m_name;
   }
-}  // namespace devices
\ No newline at end of file
+}  // namespace kernel::devices
\ No newline at end of file
diff --git a/kernel/src/devices/storage/ram_disk/ram_disk_controller.cpp b/kernel/src/devices/storage/ram_disk/ram_disk_controller.cpp
index f3e9f70..26eb10b 100644
--- a/kernel/src/devices/storage/ram_disk/ram_disk_controller.cpp
+++ b/kernel/src/devices/storage/ram_disk/ram_disk_controller.cpp
@@ -9,7 +9,7 @@
 #include <algorithm>
 #include <cstddef>
 
-namespace devices::storage::ram_disk
+namespace kernel::devices::storage::ram_disk
 {
   ram_disk_controller::ram_disk_controller(kapi::boot_modules::boot_module_registry const * registry)
       : m_boot_module_registry(registry)
@@ -24,4 +24,4 @@ namespace devices::storage::ram_disk
       m_devices.push_back(kstd::make_shared<ram_disk_device>(module, m_major, minor));
     });
   }
-}  // namespace devices::storage::ram_disk
\ No newline at end of file
+}  // namespace kernel::devices::storage::ram_disk
\ No newline at end of file
diff --git a/kernel/src/devices/storage/ram_disk/ram_disk_device.cpp b/kernel/src/devices/storage/ram_disk/ram_disk_device.cpp
index bf329cb..72e8025 100644
--- a/kernel/src/devices/storage/ram_disk/ram_disk_device.cpp
+++ b/kernel/src/devices/storage/ram_disk/ram_disk_device.cpp
@@ -10,7 +10,7 @@
 
 #include <cstddef>
 
-namespace devices::storage::ram_disk
+namespace kernel::devices::storage::ram_disk
 {
   namespace
   {
@@ -63,4 +63,4 @@ namespace devices::storage::ram_disk
   {
     return m_boot_module.size;
   }
-}  // namespace devices::storage::ram_disk
\ No newline at end of file
+}  // namespace kernel::devices::storage::ram_disk
\ No newline at end of file
diff --git a/kernel/src/devices/storage/storage_controller.cpp b/kernel/src/devices/storage/storage_controller.cpp
index e415436..3d13b66 100644
--- a/kernel/src/devices/storage/storage_controller.cpp
+++ b/kernel/src/devices/storage/storage_controller.cpp
@@ -8,7 +8,7 @@
 #include <algorithm>
 #include <cstddef>
 
-namespace devices::storage
+namespace kernel::devices::storage
 {
   auto storage_controller::set_ids(size_t major, size_t minors_per_dev) -> void
   {
@@ -41,4 +41,4 @@ namespace devices::storage
   {
     return m_devices;
   }
-}  // namespace devices::storage
\ No newline at end of file
+}  // namespace kernel::devices::storage
\ No newline at end of file
diff --git a/kernel/src/devices/storage/storage_management.cpp b/kernel/src/devices/storage/storage_management.cpp
index 56216b0..2bc57c4 100644
--- a/kernel/src/devices/storage/storage_management.cpp
+++ b/kernel/src/devices/storage/storage_management.cpp
@@ -14,7 +14,7 @@
 #include <cstddef>
 #include <optional>
 
-namespace devices::storage
+namespace kernel::devices::storage
 {
   namespace
   {
@@ -82,4 +82,4 @@ namespace devices::storage
     return device_by_major_minor(START_MAJOR, 0);
   }
 
-}  // namespace devices::storage
\ No newline at end of file
+}  // namespace kernel::devices::storage
\ No newline at end of file
diff --git a/kernel/src/filesystem/dentry.cpp b/kernel/src/filesystem/dentry.cpp
index 76949f2..2f99e91 100644
--- a/kernel/src/filesystem/dentry.cpp
+++ b/kernel/src/filesystem/dentry.cpp
@@ -10,7 +10,7 @@
 #include <cstdint>
 #include <string_view>
 
-namespace filesystem
+namespace kernel::filesystem
 {
   dentry::dentry(kstd::shared_ptr<dentry> const & parent, kstd::shared_ptr<inode> const & node, std::string_view name)
       : m_name(name)
@@ -58,4 +58,4 @@ namespace filesystem
   {
     return (m_flags & static_cast<uint32_t>(flag)) != 0;
   }
-}  // namespace filesystem
\ No newline at end of file
+}  // namespace kernel::filesystem
\ No newline at end of file
diff --git a/kernel/src/filesystem/devfs/devfs_filesystem.cpp b/kernel/src/filesystem/devfs/devfs_filesystem.cpp
index c4cd81a..df977b8 100644
--- a/kernel/src/filesystem/devfs/devfs_filesystem.cpp
+++ b/kernel/src/filesystem/devfs/devfs_filesystem.cpp
@@ -11,7 +11,7 @@
 #include <algorithm>
 #include <string_view>
 
-namespace filesystem::devfs
+namespace kernel::filesystem::devfs
 {
   auto devfs_filesystem::mount(kstd::shared_ptr<devices::device> const &) -> int
   {
@@ -55,4 +55,4 @@ namespace filesystem::devfs
                             [&](auto const & device) { m_inodes.push_back(kstd::make_shared<device_inode>(device)); });
     });
   }
-}  // namespace filesystem::devfs
\ No newline at end of file
+}  // namespace kernel::filesystem::devfs
\ No newline at end of file
diff --git a/kernel/src/filesystem/devfs/devfs_root_inode.cpp b/kernel/src/filesystem/devfs/devfs_root_inode.cpp
index 53441b0..a7308dc 100644
--- a/kernel/src/filesystem/devfs/devfs_root_inode.cpp
+++ b/kernel/src/filesystem/devfs/devfs_root_inode.cpp
@@ -4,7 +4,7 @@
 
 #include <cstddef>
 
-namespace filesystem::devfs
+namespace kernel::filesystem::devfs
 {
   devfs_root_inode::devfs_root_inode()
       : inode(inode_kind::directory)
@@ -19,4 +19,4 @@ namespace filesystem::devfs
   {
     return 0;
   }
-}  // namespace filesystem::devfs
\ No newline at end of file
+}  // namespace kernel::filesystem::devfs
\ No newline at end of file
diff --git a/kernel/src/filesystem/device_inode.cpp b/kernel/src/filesystem/device_inode.cpp
index da062fc..d574d8f 100644
--- a/kernel/src/filesystem/device_inode.cpp
+++ b/kernel/src/filesystem/device_inode.cpp
@@ -12,7 +12,7 @@
 
 #include <cstddef>
 
-namespace filesystem
+namespace kernel::filesystem
 {
   device_inode::device_inode(kstd::shared_ptr<devices::device> const & device)
       : inode(inode_kind::device)
@@ -53,4 +53,4 @@ namespace filesystem
     return m_device;
   }
 
-}  // namespace filesystem
\ No newline at end of file
+}  // namespace kernel::filesystem
\ No newline at end of file
diff --git a/kernel/src/filesystem/ext2/ext2_filesystem.cpp b/kernel/src/filesystem/ext2/ext2_filesystem.cpp
index ea6fe0d..036b80e 100644
--- a/kernel/src/filesystem/ext2/ext2_filesystem.cpp
+++ b/kernel/src/filesystem/ext2/ext2_filesystem.cpp
@@ -13,7 +13,7 @@
 #include <cstdint>
 #include <string_view>
 
-namespace filesystem::ext2
+namespace kernel::filesystem::ext2
 {
   namespace
   {
@@ -69,4 +69,4 @@ namespace filesystem::ext2
 
     return kstd::make_shared<ext2_inode>();
   }
-}  // namespace filesystem::ext2
+}  // namespace kernel::filesystem::ext2
diff --git a/kernel/src/filesystem/ext2/ext2_inode.cpp b/kernel/src/filesystem/ext2/ext2_inode.cpp
index 3cc0fb2..142502e 100644
--- a/kernel/src/filesystem/ext2/ext2_inode.cpp
+++ b/kernel/src/filesystem/ext2/ext2_inode.cpp
@@ -4,7 +4,7 @@
 
 #include <cstddef>
 
-namespace filesystem::ext2
+namespace kernel::filesystem::ext2
 {
   ext2_inode::ext2_inode()
       : inode(inode_kind::regular)
@@ -21,4 +21,4 @@ namespace filesystem::ext2
     // TODO BA-FS26 implement
     return 0;
   }
-}  // namespace filesystem::ext2
\ No newline at end of file
+}  // namespace kernel::filesystem::ext2
\ No newline at end of file
diff --git a/kernel/src/filesystem/file_descriptor_table.cpp b/kernel/src/filesystem/file_descriptor_table.cpp
index 6eb3845..287aea2 100644
--- a/kernel/src/filesystem/file_descriptor_table.cpp
+++ b/kernel/src/filesystem/file_descriptor_table.cpp
@@ -10,7 +10,7 @@
 #include <cstddef>
 #include <optional>
 
-namespace filesystem
+namespace kernel::filesystem
 {
   namespace
   {
@@ -87,4 +87,4 @@ namespace filesystem
 
     m_open_files.at(index) = nullptr;
   }
-}  // namespace filesystem
\ No newline at end of file
+}  // namespace kernel::filesystem
\ No newline at end of file
diff --git a/kernel/src/filesystem/filesystem.cpp b/kernel/src/filesystem/filesystem.cpp
index 0e33d95..c891d00 100644
--- a/kernel/src/filesystem/filesystem.cpp
+++ b/kernel/src/filesystem/filesystem.cpp
@@ -5,7 +5,7 @@
 
 #include <kstd/memory>
 
-namespace filesystem
+namespace kernel::filesystem
 {
   auto filesystem::mount(kstd::shared_ptr<devices::device> const & device) -> int
   {
@@ -21,4 +21,4 @@ namespace filesystem
   {
     return m_root_inode;
   }
-}  // namespace filesystem
\ No newline at end of file
+}  // namespace kernel::filesystem
\ No newline at end of file
diff --git a/kernel/src/filesystem/inode.cpp b/kernel/src/filesystem/inode.cpp
index de3282f..1cbead8 100644
--- a/kernel/src/filesystem/inode.cpp
+++ b/kernel/src/filesystem/inode.cpp
@@ -1,6 +1,6 @@
 #include "kernel/filesystem/inode.hpp"
 
-namespace filesystem
+namespace kernel::filesystem
 {
   inode::inode(inode_kind kind)
       : m_kind(kind)
@@ -20,4 +20,4 @@ namespace filesystem
   {
     return m_kind == inode_kind::device;
   }
-}  // namespace filesystem
\ No newline at end of file
+}  // namespace kernel::filesystem
\ No newline at end of file
diff --git a/kernel/src/filesystem/mount.cpp b/kernel/src/filesystem/mount.cpp
index afc07fa..f9e709c 100644
--- a/kernel/src/filesystem/mount.cpp
+++ b/kernel/src/filesystem/mount.cpp
@@ -10,7 +10,7 @@
 
 #include <string_view>
 
-namespace filesystem
+namespace kernel::filesystem
 {
   mount::mount(kstd::shared_ptr<dentry> const & mount_dentry, kstd::shared_ptr<dentry> const & root_dentry,
                kstd::shared_ptr<filesystem> const & fs, std::string_view mount_path)
@@ -44,4 +44,4 @@ namespace filesystem
   {
     return m_mount_path.view();
   }
-}  // namespace filesystem
\ No newline at end of file
+}  // namespace kernel::filesystem
\ No newline at end of file
diff --git a/kernel/src/filesystem/mount_table.cpp b/kernel/src/filesystem/mount_table.cpp
index b9e57d4..737434e 100644
--- a/kernel/src/filesystem/mount_table.cpp
+++ b/kernel/src/filesystem/mount_table.cpp
@@ -7,7 +7,7 @@
 #include <cstddef>
 #include <string_view>
 
-namespace filesystem
+namespace kernel::filesystem
 {
   void mount_table::add_mount(kstd::shared_ptr<mount> mount)
   {
@@ -35,4 +35,4 @@ namespace filesystem
 
     return mount_with_longest_prefix;
   }
-}  // namespace filesystem
\ No newline at end of file
+}  // namespace kernel::filesystem
\ No newline at end of file
diff --git a/kernel/src/filesystem/open_file_description.cpp b/kernel/src/filesystem/open_file_description.cpp
index 93c38ac..8c04225 100644
--- a/kernel/src/filesystem/open_file_description.cpp
+++ b/kernel/src/filesystem/open_file_description.cpp
@@ -7,7 +7,7 @@
 
 #include <cstddef>
 
-namespace filesystem
+namespace kernel::filesystem
 {
   open_file_description::open_file_description(kstd::shared_ptr<inode> const & inode)
       : m_inode(inode)
@@ -32,4 +32,4 @@ namespace filesystem
     m_offset += written_bytes;
     return written_bytes;
   }
-}  // namespace filesystem
\ No newline at end of file
+}  // namespace kernel::filesystem
\ No newline at end of file
diff --git a/kernel/src/filesystem/rootfs/rootfs_filesystem.cpp b/kernel/src/filesystem/rootfs/rootfs_filesystem.cpp
index 22502aa..804e211 100644
--- a/kernel/src/filesystem/rootfs/rootfs_filesystem.cpp
+++ b/kernel/src/filesystem/rootfs/rootfs_filesystem.cpp
@@ -8,7 +8,7 @@
 
 #include <string_view>
 
-namespace filesystem::rootfs
+namespace kernel::filesystem::rootfs
 {
   auto rootfs_filesystem::mount(kstd::shared_ptr<devices::device> const &) -> int
   {
@@ -26,4 +26,4 @@ namespace filesystem::rootfs
       return rfs_inode->lookup_child(name);
     return nullptr;
   }
-}  // namespace filesystem::rootfs
+}  // namespace kernel::filesystem::rootfs
diff --git a/kernel/src/filesystem/rootfs/rootfs_inode.cpp b/kernel/src/filesystem/rootfs/rootfs_inode.cpp
index 9bbfbce..f44f06c 100644
--- a/kernel/src/filesystem/rootfs/rootfs_inode.cpp
+++ b/kernel/src/filesystem/rootfs/rootfs_inode.cpp
@@ -10,7 +10,7 @@
 #include <string_view>
 #include <utility>
 
-namespace filesystem::rootfs
+namespace kernel::filesystem::rootfs
 {
   rootfs_inode::rootfs_inode()
       : inode(inode_kind::directory)
@@ -36,4 +36,4 @@ namespace filesystem::rootfs
     auto it = std::ranges::find_if(m_children, [&](auto const & pair) { return pair.first == name; });
     return (it != m_children.end()) ? it->second : nullptr;
   }
-}  // namespace filesystem::rootfs
+}  // namespace kernel::filesystem::rootfs
diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index 7a90531..2dbdb12 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -17,7 +17,7 @@
 #include <ranges>
 #include <string_view>
 
-namespace filesystem
+namespace kernel::filesystem
 {
   namespace
   {
@@ -161,4 +161,4 @@ namespace filesystem
     return current_dentry;
   }
 
-}  // namespace filesystem
\ No newline at end of file
+}  // namespace kernel::filesystem
\ No newline at end of file
diff --git a/kernel/src/main.cpp b/kernel/src/main.cpp
index bb6d57d..2dd9fd9 100644
--- a/kernel/src/main.cpp
+++ b/kernel/src/main.cpp
@@ -24,7 +24,7 @@
 
 auto test_device_names() -> void
 {
-  auto storage_mgmt = devices::storage::storage_management::get();
+  auto storage_mgmt = kernel::devices::storage::storage_management::get();
   std::ranges::for_each(storage_mgmt.all_controllers(), [](auto const & controller) {
     std::ranges::for_each(controller->all_devices(),
                           [](auto const & device) { kstd::println("{}", device->name().view()); });
@@ -34,13 +34,13 @@ auto test_device_names() -> void
 auto test_file_description_manually() -> void
 {
   // setup
-  auto fd_table = filesystem::file_descriptor_table::get();
-  auto storage_mgmt = devices::storage::storage_management::get();
+  auto fd_table = kernel::filesystem::file_descriptor_table::get();
+  auto storage_mgmt = kernel::devices::storage::storage_management::get();
   auto device = storage_mgmt.device_by_major_minor(1, 0);
 
-  auto dev_node = kstd::make_shared<filesystem::device_inode>(device);
+  auto dev_node = kstd::make_shared<kernel::filesystem::device_inode>(device);
 
-  auto ofd = kstd::make_shared<filesystem::open_file_description>(dev_node);
+  auto ofd = kstd::make_shared<kernel::filesystem::open_file_description>(dev_node);
   auto fd_index = fd_table.add_file(ofd);
 
   // use: read two bytes and write two again
@@ -66,7 +66,7 @@ auto test_file_description_manually() -> void
   fd_table.remove_file(fd_index);
 
   // use: read four bytes again -> two old bytes two new bytes
-  auto ofd1 = kstd::make_shared<filesystem::open_file_description>(dev_node);
+  auto ofd1 = kstd::make_shared<kernel::filesystem::open_file_description>(dev_node);
   fd_index = fd_table.add_file(ofd1);
   auto fd1 = fd_table.get_file(fd_index);
 
@@ -85,14 +85,14 @@ auto test_device_with_vfs() -> void
 {
   // TODO BA-FS26
 
-  auto vfs = filesystem::vfs::get();
+  auto vfs = kernel::filesystem::vfs::get();
   auto ofd = vfs.open("/dev/ram0");
   if (!ofd)
   {
     kstd::os::panic("test code failed");
   }
 
-  auto fd_table = filesystem::file_descriptor_table::get();
+  auto fd_table = kernel::filesystem::file_descriptor_table::get();
   auto fd = fd_table.add_file(ofd);
   kstd::vector<std::byte> buffer{2};
   auto file = fd_table.get_file(fd);
@@ -110,8 +110,8 @@ auto test_file_lookup() -> void
 {
   // TODO BA-FS26 implement a more complete test with multiple files and directories and mounts etc.
 
-  auto vfs = filesystem::vfs::get();
-  auto storage_mgmt = devices::storage::storage_management::get();
+  auto vfs = kernel::filesystem::vfs::get();
+  auto storage_mgmt = kernel::devices::storage::storage_management::get();
 
   auto ofd1 = vfs.open("/a/b/c");
   auto ofd2 = vfs.open("/dev/ram0");
@@ -126,7 +126,7 @@ auto test_file_lookup() -> void
     kstd::os::panic("test code failed");
   }
 
-  auto new_filesystem = kstd::make_shared<filesystem::ext2::ext2_filesystem>();
+  auto new_filesystem = kstd::make_shared<kernel::filesystem::ext2::ext2_filesystem>();
   auto device = storage_mgmt.device_by_major_minor(1, 16);
   new_filesystem->mount(device);
   if (vfs.do_mount("/a/b", new_filesystem) != 0)
@@ -182,13 +182,13 @@ auto main() -> int
   kapi::boot_modules::init();
   kstd::println("[OS] Boot module registry initialized.");
 
-  devices::storage::storage_management::init();
+  kernel::devices::storage::storage_management::init();
   kstd::println("[OS] Storage management initialized.");
 
-  filesystem::file_descriptor_table::init();
+  kernel::filesystem::file_descriptor_table::init();
   kstd::println("[OS] Global file descriptor table initialized.");
 
-  filesystem::vfs::init();
+  kernel::filesystem::vfs::init();
   kstd::println("[OS] Virtual filesystem initialized.");
 
   run_test_code();
-- 
cgit v1.2.3