Kernel: Move the Storage directory to be a new directory under Devices

The Storage subsystem, like the Audio and HID subsystems, exposes Unix
device files (for example, in the /dev directory). To ensure consistency
across the repository, we should make the Storage subsystem to reside in
the Kernel/Devices directory like the two other mentioned subsystems.

59 files changed, 133 insertions, 133 deletions

diff --git a/Kernel/Arch/aarch64/RPi/SDHostController.h b/Kernel/Arch/aarch64/RPi/SDHostController.h
index cdd6b9d3b5..74f5e835b0 100644
--- a/Kernel/Arch/aarch64/RPi/SDHostController.h
+++ b/Kernel/Arch/aarch64/RPi/SDHostController.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <Kernel/Storage/SD/Registers.h>
-#include <Kernel/Storage/SD/SDHostController.h>
+#include <Kernel/Devices/Storage/SD/Registers.h>
+#include <Kernel/Devices/Storage/SD/SDHostController.h>
 
 namespace Kernel::RPi {
 
diff --git a/Kernel/Arch/init.cpp b/Kernel/Arch/init.cpp
index d69d101bef..cf1577e293 100644
--- a/Kernel/Arch/init.cpp
+++ b/Kernel/Arch/init.cpp
@@ -26,6 +26,7 @@
 #include <Kernel/Devices/KCOVDevice.h>
 #include <Kernel/Devices/PCISerialDevice.h>
 #include <Kernel/Devices/SerialDevice.h>
+#include <Kernel/Devices/Storage/StorageManagement.h>
 #include <Kernel/FileSystem/SysFS/Registry.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.h>
 #include <Kernel/FileSystem/VirtualFileSystem.h>
@@ -46,7 +47,6 @@
 #include <Kernel/Random.h>
 #include <Kernel/Scheduler.h>
 #include <Kernel/Sections.h>
-#include <Kernel/Storage/StorageManagement.h>
 #include <Kernel/TTY/ConsoleManagement.h>
 #include <Kernel/TTY/PTYMultiplexer.h>
 #include <Kernel/TTY/VirtualConsole.h>
diff --git a/Kernel/Arch/x86_64/ISABus/IDEController.cpp b/Kernel/Arch/x86_64/ISABus/IDEController.cpp
index da19c4dc43..e15b2a61c0 100644
--- a/Kernel/Arch/x86_64/ISABus/IDEController.cpp
+++ b/Kernel/Arch/x86_64/ISABus/IDEController.cpp
@@ -8,10 +8,10 @@
 #include <AK/Types.h>
 #include <Kernel/Arch/x86_64/ISABus/IDEController.h>
 #include <Kernel/Bus/PCI/API.h>
+#include <Kernel/Devices/Storage/ATA/ATADiskDevice.h>
+#include <Kernel/Devices/Storage/ATA/GenericIDE/Channel.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Sections.h>
-#include <Kernel/Storage/ATA/ATADiskDevice.h>
-#include <Kernel/Storage/ATA/GenericIDE/Channel.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Arch/x86_64/ISABus/IDEController.h b/Kernel/Arch/x86_64/ISABus/IDEController.h
index 1e094e190a..7a3c9b4b5f 100644
--- a/Kernel/Arch/x86_64/ISABus/IDEController.h
+++ b/Kernel/Arch/x86_64/ISABus/IDEController.h
@@ -8,9 +8,9 @@
 
 #include <AK/OwnPtr.h>
 #include <AK/Types.h>
+#include <Kernel/Devices/Storage/ATA/GenericIDE/Controller.h>
+#include <Kernel/Devices/Storage/StorageDevice.h>
 #include <Kernel/Library/LockRefPtr.h>
-#include <Kernel/Storage/ATA/GenericIDE/Controller.h>
-#include <Kernel/Storage/StorageDevice.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Arch/x86_64/PCI/IDELegacyModeController.cpp b/Kernel/Arch/x86_64/PCI/IDELegacyModeController.cpp
index 7760bcb8eb..c044594575 100644
--- a/Kernel/Arch/x86_64/PCI/IDELegacyModeController.cpp
+++ b/Kernel/Arch/x86_64/PCI/IDELegacyModeController.cpp
@@ -8,10 +8,10 @@
 #include <AK/Types.h>
 #include <Kernel/Arch/x86_64/PCI/IDELegacyModeController.h>
 #include <Kernel/Bus/PCI/API.h>
+#include <Kernel/Devices/Storage/ATA/ATADiskDevice.h>
+#include <Kernel/Devices/Storage/ATA/GenericIDE/Channel.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Sections.h>
-#include <Kernel/Storage/ATA/ATADiskDevice.h>
-#include <Kernel/Storage/ATA/GenericIDE/Channel.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Arch/x86_64/PCI/IDELegacyModeController.h b/Kernel/Arch/x86_64/PCI/IDELegacyModeController.h
index f23591ee9b..815e7f099e 100644
--- a/Kernel/Arch/x86_64/PCI/IDELegacyModeController.h
+++ b/Kernel/Arch/x86_64/PCI/IDELegacyModeController.h
@@ -8,9 +8,9 @@
 
 #include <AK/OwnPtr.h>
 #include <AK/Types.h>
+#include <Kernel/Devices/Storage/ATA/GenericIDE/Controller.h>
+#include <Kernel/Devices/Storage/StorageDevice.h>
 #include <Kernel/Library/LockRefPtr.h>
-#include <Kernel/Storage/ATA/GenericIDE/Controller.h>
-#include <Kernel/Storage/StorageDevice.h>
 
 namespace Kernel {
 
diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index 67694bbb50..059cdba19d 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -72,6 +72,27 @@ set(KERNEL_SOURCES
     Devices/Generic/RandomDevice.cpp
     Devices/Generic/SelfTTYDevice.cpp
     Devices/Generic/ZeroDevice.cpp
+    Devices/Storage/ATA/AHCI/Controller.cpp
+    Devices/Storage/ATA/AHCI/Port.cpp
+    Devices/Storage/ATA/AHCI/InterruptHandler.cpp
+    Devices/Storage/ATA/GenericIDE/Controller.cpp
+    Devices/Storage/ATA/GenericIDE/Channel.cpp
+    Devices/Storage/ATA/ATAController.cpp
+    Devices/Storage/ATA/ATADevice.cpp
+    Devices/Storage/ATA/ATADiskDevice.cpp
+    Devices/Storage/ATA/ATAPort.cpp
+    Devices/Storage/NVMe/NVMeController.cpp
+    Devices/Storage/NVMe/NVMeNameSpace.cpp
+    Devices/Storage/NVMe/NVMeInterruptQueue.cpp
+    Devices/Storage/NVMe/NVMePollQueue.cpp
+    Devices/Storage/NVMe/NVMeQueue.cpp
+    Devices/Storage/SD/PCISDHostController.cpp
+    Devices/Storage/SD/SDHostController.cpp
+    Devices/Storage/SD/SDMemoryCard.cpp
+    Devices/Storage/DiskPartition.cpp
+    Devices/Storage/StorageController.cpp
+    Devices/Storage/StorageDevice.cpp
+    Devices/Storage/StorageManagement.cpp
     Graphics/Bochs/GraphicsAdapter.cpp
     Graphics/Bochs/QEMUDisplayConnector.cpp
     Graphics/Console/BootFramebufferConsole.cpp
@@ -100,27 +121,6 @@ set(KERNEL_SOURCES
     IOWindow.cpp
     Jail.cpp
     SanCov.cpp
-    Storage/ATA/AHCI/Controller.cpp
-    Storage/ATA/AHCI/Port.cpp
-    Storage/ATA/AHCI/InterruptHandler.cpp
-    Storage/ATA/GenericIDE/Controller.cpp
-    Storage/ATA/GenericIDE/Channel.cpp
-    Storage/ATA/ATAController.cpp
-    Storage/ATA/ATADevice.cpp
-    Storage/ATA/ATADiskDevice.cpp
-    Storage/ATA/ATAPort.cpp
-    Storage/NVMe/NVMeController.cpp
-    Storage/NVMe/NVMeNameSpace.cpp
-    Storage/NVMe/NVMeInterruptQueue.cpp
-    Storage/NVMe/NVMePollQueue.cpp
-    Storage/NVMe/NVMeQueue.cpp
-    Storage/SD/PCISDHostController.cpp
-    Storage/SD/SDHostController.cpp
-    Storage/SD/SDMemoryCard.cpp
-    Storage/DiskPartition.cpp
-    Storage/StorageController.cpp
-    Storage/StorageDevice.cpp
-    Storage/StorageManagement.cpp
     DoubleBuffer.cpp
     FileSystem/AnonymousFile.cpp
     FileSystem/BlockBasedFileSystem.cpp
diff --git a/Kernel/Storage/ATA/AHCI/Controller.cpp b/Kernel/Devices/Storage/ATA/AHCI/Controller.cpp
index 100b98dac9..6b78fda40b 100644
--- a/Kernel/Storage/ATA/AHCI/Controller.cpp
+++ b/Kernel/Devices/Storage/ATA/AHCI/Controller.cpp
@@ -11,10 +11,10 @@
 #include <Kernel/Arch/Delay.h>
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/CommandLine.h>
+#include <Kernel/Devices/Storage/ATA/AHCI/Controller.h>
+#include <Kernel/Devices/Storage/ATA/AHCI/InterruptHandler.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Memory/MemoryManager.h>
-#include <Kernel/Storage/ATA/AHCI/Controller.h>
-#include <Kernel/Storage/ATA/AHCI/InterruptHandler.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/ATA/AHCI/Controller.h b/Kernel/Devices/Storage/ATA/AHCI/Controller.h
index b2405c703c..b9bb9df615 100644
--- a/Kernel/Storage/ATA/AHCI/Controller.h
+++ b/Kernel/Devices/Storage/ATA/AHCI/Controller.h
@@ -8,12 +8,12 @@
 
 #include <AK/OwnPtr.h>
 #include <AK/Types.h>
+#include <Kernel/Devices/Storage/ATA/AHCI/Definitions.h>
+#include <Kernel/Devices/Storage/ATA/ATAController.h>
+#include <Kernel/Devices/Storage/StorageDevice.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Memory/TypedMapping.h>
 #include <Kernel/Sections.h>
-#include <Kernel/Storage/ATA/AHCI/Definitions.h>
-#include <Kernel/Storage/ATA/ATAController.h>
-#include <Kernel/Storage/StorageDevice.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/ATA/AHCI/Definitions.h b/Kernel/Devices/Storage/ATA/AHCI/Definitions.h
index ffab5a4912..ffab5a4912 100644
--- a/Kernel/Storage/ATA/AHCI/Definitions.h
+++ b/Kernel/Devices/Storage/ATA/AHCI/Definitions.h
diff --git a/Kernel/Storage/ATA/AHCI/InterruptHandler.cpp b/Kernel/Devices/Storage/ATA/AHCI/InterruptHandler.cpp
index 1b8915bcc7..fa67241a85 100644
--- a/Kernel/Storage/ATA/AHCI/InterruptHandler.cpp
+++ b/Kernel/Devices/Storage/ATA/AHCI/InterruptHandler.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Storage/ATA/AHCI/InterruptHandler.h>
+#include <Kernel/Devices/Storage/ATA/AHCI/InterruptHandler.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/ATA/AHCI/InterruptHandler.h b/Kernel/Devices/Storage/ATA/AHCI/InterruptHandler.h
index 97203dcc93..56b25f6633 100644
--- a/Kernel/Storage/ATA/AHCI/InterruptHandler.h
+++ b/Kernel/Devices/Storage/ATA/AHCI/InterruptHandler.h
@@ -7,6 +7,9 @@
 #pragma once
 
 #include <Kernel/Devices/Device.h>
+#include <Kernel/Devices/Storage/ATA/AHCI/Controller.h>
+#include <Kernel/Devices/Storage/ATA/AHCI/Port.h>
+#include <Kernel/Devices/Storage/StorageDevice.h>
 #include <Kernel/Interrupts/PCIIRQHandler.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Locking/Mutex.h>
@@ -14,9 +17,6 @@
 #include <Kernel/PhysicalAddress.h>
 #include <Kernel/Random.h>
 #include <Kernel/Sections.h>
-#include <Kernel/Storage/ATA/AHCI/Controller.h>
-#include <Kernel/Storage/ATA/AHCI/Port.h>
-#include <Kernel/Storage/StorageDevice.h>
 #include <Kernel/WaitQueue.h>
 
 namespace Kernel {
diff --git a/Kernel/Storage/ATA/AHCI/Port.cpp b/Kernel/Devices/Storage/ATA/AHCI/Port.cpp
index 6497820a0f..9055151cf3 100644
--- a/Kernel/Storage/ATA/AHCI/Port.cpp
+++ b/Kernel/Devices/Storage/ATA/AHCI/Port.cpp
@@ -9,14 +9,14 @@
 
 #include <AK/Atomic.h>
 #include <Kernel/Arch/Delay.h>
+#include <Kernel/Devices/Storage/ATA/AHCI/Port.h>
+#include <Kernel/Devices/Storage/ATA/ATADiskDevice.h>
+#include <Kernel/Devices/Storage/ATA/Definitions.h>
+#include <Kernel/Devices/Storage/StorageManagement.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Memory/ScatterGatherList.h>
 #include <Kernel/Memory/TypedMapping.h>
-#include <Kernel/Storage/ATA/AHCI/Port.h>
-#include <Kernel/Storage/ATA/ATADiskDevice.h>
-#include <Kernel/Storage/ATA/Definitions.h>
-#include <Kernel/Storage/StorageManagement.h>
 #include <Kernel/WorkQueue.h>
 
 namespace Kernel {
diff --git a/Kernel/Storage/ATA/AHCI/Port.h b/Kernel/Devices/Storage/ATA/AHCI/Port.h
index 8818d36190..84a3684f43 100644
--- a/Kernel/Storage/ATA/AHCI/Port.h
+++ b/Kernel/Devices/Storage/ATA/AHCI/Port.h
@@ -9,6 +9,10 @@
 #include <AK/OwnPtr.h>
 #include <AK/RefPtr.h>
 #include <Kernel/Devices/Device.h>
+#include <Kernel/Devices/Storage/ATA/AHCI/Definitions.h>
+#include <Kernel/Devices/Storage/ATA/AHCI/InterruptHandler.h>
+#include <Kernel/Devices/Storage/ATA/ATADevice.h>
+#include <Kernel/Devices/Storage/ATA/Definitions.h>
 #include <Kernel/Interrupts/IRQHandler.h>
 #include <Kernel/Library/LockWeakPtr.h>
 #include <Kernel/Library/LockWeakable.h>
@@ -20,10 +24,6 @@
 #include <Kernel/PhysicalAddress.h>
 #include <Kernel/Random.h>
 #include <Kernel/Sections.h>
-#include <Kernel/Storage/ATA/AHCI/Definitions.h>
-#include <Kernel/Storage/ATA/AHCI/InterruptHandler.h>
-#include <Kernel/Storage/ATA/ATADevice.h>
-#include <Kernel/Storage/ATA/Definitions.h>
 #include <Kernel/WaitQueue.h>
 
 namespace Kernel {
diff --git a/Kernel/Storage/ATA/ATAController.cpp b/Kernel/Devices/Storage/ATA/ATAController.cpp
index 042bb16fde..8631d91172 100644
--- a/Kernel/Storage/ATA/ATAController.cpp
+++ b/Kernel/Devices/Storage/ATA/ATAController.cpp
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Storage/ATA/ATAController.h>
-#include <Kernel/Storage/StorageManagement.h>
+#include <Kernel/Devices/Storage/ATA/ATAController.h>
+#include <Kernel/Devices/Storage/StorageManagement.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/ATA/ATAController.h b/Kernel/Devices/Storage/ATA/ATAController.h
index d86f840cad..19fab7fe52 100644
--- a/Kernel/Storage/ATA/ATAController.h
+++ b/Kernel/Devices/Storage/ATA/ATAController.h
@@ -9,8 +9,8 @@
 #include <AK/OwnPtr.h>
 #include <AK/Types.h>
 #include <Kernel/Devices/BlockDevice.h>
+#include <Kernel/Devices/Storage/StorageController.h>
 #include <Kernel/Library/LockRefPtr.h>
-#include <Kernel/Storage/StorageController.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/ATA/ATADevice.cpp b/Kernel/Devices/Storage/ATA/ATADevice.cpp
index f78bed2286..e5c373b9c5 100644
--- a/Kernel/Storage/ATA/ATADevice.cpp
+++ b/Kernel/Devices/Storage/ATA/ATADevice.cpp
@@ -5,9 +5,9 @@
  */
 
 #include <AK/StringView.h>
+#include <Kernel/Devices/Storage/ATA/ATADevice.h>
+#include <Kernel/Devices/Storage/StorageManagement.h>
 #include <Kernel/Sections.h>
-#include <Kernel/Storage/ATA/ATADevice.h>
-#include <Kernel/Storage/StorageManagement.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/ATA/ATADevice.h b/Kernel/Devices/Storage/ATA/ATADevice.h
index 18d95df5f3..95b33d59dd 100644
--- a/Kernel/Storage/ATA/ATADevice.h
+++ b/Kernel/Devices/Storage/ATA/ATADevice.h
@@ -6,10 +6,10 @@
 
 #pragma once
 
+#include <Kernel/Devices/Storage/ATA/ATAController.h>
+#include <Kernel/Devices/Storage/StorageDevice.h>
 #include <Kernel/Interrupts/IRQHandler.h>
 #include <Kernel/Locking/Mutex.h>
-#include <Kernel/Storage/ATA/ATAController.h>
-#include <Kernel/Storage/StorageDevice.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/ATA/ATADiskDevice.cpp b/Kernel/Devices/Storage/ATA/ATADiskDevice.cpp
index 7944687566..ef0d3db0cf 100644
--- a/Kernel/Storage/ATA/ATADiskDevice.cpp
+++ b/Kernel/Devices/Storage/ATA/ATADiskDevice.cpp
@@ -6,9 +6,9 @@
 
 #include <AK/StringView.h>
 #include <Kernel/Devices/DeviceManagement.h>
+#include <Kernel/Devices/Storage/ATA/ATADiskDevice.h>
+#include <Kernel/Devices/Storage/StorageManagement.h>
 #include <Kernel/Sections.h>
-#include <Kernel/Storage/ATA/ATADiskDevice.h>
-#include <Kernel/Storage/StorageManagement.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/ATA/ATADiskDevice.h b/Kernel/Devices/Storage/ATA/ATADiskDevice.h
index d1b0ac2f5a..9576a6eab1 100644
--- a/Kernel/Storage/ATA/ATADiskDevice.h
+++ b/Kernel/Devices/Storage/ATA/ATADiskDevice.h
@@ -6,9 +6,9 @@
 
 #pragma once
 
+#include <Kernel/Devices/Storage/ATA/ATADevice.h>
 #include <Kernel/Interrupts/IRQHandler.h>
 #include <Kernel/Locking/Mutex.h>
-#include <Kernel/Storage/ATA/ATADevice.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/ATA/ATAPort.cpp b/Kernel/Devices/Storage/ATA/ATAPort.cpp
index 9a4824ce58..e4fac44a0d 100644
--- a/Kernel/Storage/ATA/ATAPort.cpp
+++ b/Kernel/Devices/Storage/ATA/ATAPort.cpp
@@ -6,9 +6,9 @@
 
 #include <Kernel/Arch/CPU.h>
 #include <Kernel/Arch/Delay.h>
-#include <Kernel/Storage/ATA/ATADiskDevice.h>
-#include <Kernel/Storage/ATA/ATAPort.h>
-#include <Kernel/Storage/ATA/Definitions.h>
+#include <Kernel/Devices/Storage/ATA/ATADiskDevice.h>
+#include <Kernel/Devices/Storage/ATA/ATAPort.h>
+#include <Kernel/Devices/Storage/ATA/Definitions.h>
 #include <Kernel/WorkQueue.h>
 
 namespace Kernel {
diff --git a/Kernel/Storage/ATA/ATAPort.h b/Kernel/Devices/Storage/ATA/ATAPort.h
index ef6942d1af..3b05ef8cbc 100644
--- a/Kernel/Storage/ATA/ATAPort.h
+++ b/Kernel/Devices/Storage/ATA/ATAPort.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <Kernel/Storage/ATA/ATADevice.h>
+#include <Kernel/Devices/Storage/ATA/ATADevice.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/ATA/Definitions.h b/Kernel/Devices/Storage/ATA/Definitions.h
index 18eddcbf62..18eddcbf62 100644
--- a/Kernel/Storage/ATA/Definitions.h
+++ b/Kernel/Devices/Storage/ATA/Definitions.h
diff --git a/Kernel/Storage/ATA/GenericIDE/Channel.cpp b/Kernel/Devices/Storage/ATA/GenericIDE/Channel.cpp
index 9d41a2ba4c..cec52e8fd0 100644
--- a/Kernel/Storage/ATA/GenericIDE/Channel.cpp
+++ b/Kernel/Devices/Storage/ATA/GenericIDE/Channel.cpp
@@ -9,14 +9,14 @@
 #include <AK/StringView.h>
 #include <Kernel/Arch/Delay.h>
 #include <Kernel/Bus/PCI/API.h>
+#include <Kernel/Devices/Storage/ATA/ATADiskDevice.h>
+#include <Kernel/Devices/Storage/ATA/Definitions.h>
+#include <Kernel/Devices/Storage/ATA/GenericIDE/Channel.h>
+#include <Kernel/Devices/Storage/ATA/GenericIDE/Controller.h>
 #include <Kernel/IOWindow.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Process.h>
 #include <Kernel/Sections.h>
-#include <Kernel/Storage/ATA/ATADiskDevice.h>
-#include <Kernel/Storage/ATA/Definitions.h>
-#include <Kernel/Storage/ATA/GenericIDE/Channel.h>
-#include <Kernel/Storage/ATA/GenericIDE/Controller.h>
 #include <Kernel/WorkQueue.h>
 
 namespace Kernel {
diff --git a/Kernel/Storage/ATA/GenericIDE/Channel.h b/Kernel/Devices/Storage/ATA/GenericIDE/Channel.h
index 6eaa369e87..57dfba3bfb 100644
--- a/Kernel/Storage/ATA/GenericIDE/Channel.h
+++ b/Kernel/Devices/Storage/ATA/GenericIDE/Channel.h
@@ -19,6 +19,9 @@
 
 #include <AK/Error.h>
 #include <Kernel/Devices/Device.h>
+#include <Kernel/Devices/Storage/ATA/ATADevice.h>
+#include <Kernel/Devices/Storage/ATA/ATAPort.h>
+#include <Kernel/Devices/Storage/StorageDevice.h>
 #include <Kernel/IOWindow.h>
 #include <Kernel/Interrupts/IRQHandler.h>
 #include <Kernel/Library/LockRefPtr.h>
@@ -26,9 +29,6 @@
 #include <Kernel/Memory/PhysicalPage.h>
 #include <Kernel/PhysicalAddress.h>
 #include <Kernel/Random.h>
-#include <Kernel/Storage/ATA/ATADevice.h>
-#include <Kernel/Storage/ATA/ATAPort.h>
-#include <Kernel/Storage/StorageDevice.h>
 #include <Kernel/WaitQueue.h>
 
 namespace Kernel {
diff --git a/Kernel/Storage/ATA/GenericIDE/Controller.cpp b/Kernel/Devices/Storage/ATA/GenericIDE/Controller.cpp
index 33f96007ba..8a92f97f51 100644
--- a/Kernel/Storage/ATA/GenericIDE/Controller.cpp
+++ b/Kernel/Devices/Storage/ATA/GenericIDE/Controller.cpp
@@ -7,11 +7,11 @@
 #include <AK/OwnPtr.h>
 #include <AK/Types.h>
 #include <Kernel/Bus/PCI/API.h>
+#include <Kernel/Devices/Storage/ATA/ATADiskDevice.h>
+#include <Kernel/Devices/Storage/ATA/GenericIDE/Channel.h>
+#include <Kernel/Devices/Storage/ATA/GenericIDE/Controller.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Sections.h>
-#include <Kernel/Storage/ATA/ATADiskDevice.h>
-#include <Kernel/Storage/ATA/GenericIDE/Channel.h>
-#include <Kernel/Storage/ATA/GenericIDE/Controller.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/ATA/GenericIDE/Controller.h b/Kernel/Devices/Storage/ATA/GenericIDE/Controller.h
index 56f6b378a1..b8af2bf83f 100644
--- a/Kernel/Storage/ATA/GenericIDE/Controller.h
+++ b/Kernel/Devices/Storage/ATA/GenericIDE/Controller.h
@@ -8,9 +8,9 @@
 
 #include <AK/OwnPtr.h>
 #include <AK/Types.h>
+#include <Kernel/Devices/Storage/ATA/ATAController.h>
+#include <Kernel/Devices/Storage/StorageDevice.h>
 #include <Kernel/Library/LockRefPtr.h>
-#include <Kernel/Storage/ATA/ATAController.h>
-#include <Kernel/Storage/StorageDevice.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/DiskPartition.cpp b/Kernel/Devices/Storage/DiskPartition.cpp
index 8c23c97be1..cf570a4016 100644
--- a/Kernel/Storage/DiskPartition.cpp
+++ b/Kernel/Devices/Storage/DiskPartition.cpp
@@ -6,8 +6,8 @@
 
 #include <Kernel/Debug.h>
 #include <Kernel/Devices/DeviceManagement.h>
+#include <Kernel/Devices/Storage/DiskPartition.h>
 #include <Kernel/FileSystem/OpenFileDescription.h>
-#include <Kernel/Storage/DiskPartition.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/DiskPartition.h b/Kernel/Devices/Storage/DiskPartition.h
index ebb78f6f6e..ebb78f6f6e 100644
--- a/Kernel/Storage/DiskPartition.h
+++ b/Kernel/Devices/Storage/DiskPartition.h
diff --git a/Kernel/Storage/NVMe/NVMeController.cpp b/Kernel/Devices/Storage/NVMe/NVMeController.cpp
index d2753e9af0..239dc17c01 100644
--- a/Kernel/Storage/NVMe/NVMeController.cpp
+++ b/Kernel/Devices/Storage/NVMe/NVMeController.cpp
@@ -13,10 +13,10 @@
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/Devices/Device.h>
+#include <Kernel/Devices/Storage/NVMe/NVMeController.h>
+#include <Kernel/Devices/Storage/StorageManagement.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Sections.h>
-#include <Kernel/Storage/NVMe/NVMeController.h>
-#include <Kernel/Storage/StorageManagement.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/NVMe/NVMeController.h b/Kernel/Devices/Storage/NVMe/NVMeController.h
index 072e97aeb7..96fdc6003d 100644
--- a/Kernel/Storage/NVMe/NVMeController.h
+++ b/Kernel/Devices/Storage/NVMe/NVMeController.h
@@ -11,14 +11,14 @@
 #include <AK/Tuple.h>
 #include <AK/Types.h>
 #include <Kernel/Bus/PCI/Device.h>
+#include <Kernel/Devices/Storage/NVMe/NVMeDefinitions.h>
+#include <Kernel/Devices/Storage/NVMe/NVMeNameSpace.h>
+#include <Kernel/Devices/Storage/NVMe/NVMeQueue.h>
+#include <Kernel/Devices/Storage/StorageController.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Library/NonnullLockRefPtr.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Memory/TypedMapping.h>
-#include <Kernel/Storage/NVMe/NVMeDefinitions.h>
-#include <Kernel/Storage/NVMe/NVMeNameSpace.h>
-#include <Kernel/Storage/NVMe/NVMeQueue.h>
-#include <Kernel/Storage/StorageController.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/NVMe/NVMeDefinitions.h b/Kernel/Devices/Storage/NVMe/NVMeDefinitions.h
index 249a089576..249a089576 100644
--- a/Kernel/Storage/NVMe/NVMeDefinitions.h
+++ b/Kernel/Devices/Storage/NVMe/NVMeDefinitions.h
diff --git a/Kernel/Storage/NVMe/NVMeInterruptQueue.cpp b/Kernel/Devices/Storage/NVMe/NVMeInterruptQueue.cpp
index d962a2686c..9b8c177773 100644
--- a/Kernel/Storage/NVMe/NVMeInterruptQueue.cpp
+++ b/Kernel/Devices/Storage/NVMe/NVMeInterruptQueue.cpp
@@ -5,8 +5,8 @@
  */
 
 #include <Kernel/Devices/BlockDevice.h>
-#include <Kernel/Storage/NVMe/NVMeDefinitions.h>
-#include <Kernel/Storage/NVMe/NVMeInterruptQueue.h>
+#include <Kernel/Devices/Storage/NVMe/NVMeDefinitions.h>
+#include <Kernel/Devices/Storage/NVMe/NVMeInterruptQueue.h>
 #include <Kernel/WorkQueue.h>
 
 namespace Kernel {
diff --git a/Kernel/Storage/NVMe/NVMeInterruptQueue.h b/Kernel/Devices/Storage/NVMe/NVMeInterruptQueue.h
index 4ca53913c8..f8fc9790ff 100644
--- a/Kernel/Storage/NVMe/NVMeInterruptQueue.h
+++ b/Kernel/Devices/Storage/NVMe/NVMeInterruptQueue.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
+#include <Kernel/Devices/Storage/NVMe/NVMeQueue.h>
 #include <Kernel/Interrupts/PCIIRQHandler.h>
-#include <Kernel/Storage/NVMe/NVMeQueue.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/NVMe/NVMeNameSpace.cpp b/Kernel/Devices/Storage/NVMe/NVMeNameSpace.cpp
index 48e5d2551a..6444910310 100644
--- a/Kernel/Storage/NVMe/NVMeNameSpace.cpp
+++ b/Kernel/Devices/Storage/NVMe/NVMeNameSpace.cpp
@@ -6,9 +6,9 @@
 
 #include <AK/NonnullOwnPtr.h>
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Storage/NVMe/NVMeController.h>
-#include <Kernel/Storage/NVMe/NVMeNameSpace.h>
-#include <Kernel/Storage/StorageManagement.h>
+#include <Kernel/Devices/Storage/NVMe/NVMeController.h>
+#include <Kernel/Devices/Storage/NVMe/NVMeNameSpace.h>
+#include <Kernel/Devices/Storage/StorageManagement.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/NVMe/NVMeNameSpace.h b/Kernel/Devices/Storage/NVMe/NVMeNameSpace.h
index 92081b7338..98009194b4 100644
--- a/Kernel/Storage/NVMe/NVMeNameSpace.h
+++ b/Kernel/Devices/Storage/NVMe/NVMeNameSpace.h
@@ -9,12 +9,12 @@
 #include <AK/OwnPtr.h>
 #include <AK/Types.h>
 #include <AK/kmalloc.h>
+#include <Kernel/Devices/Storage/NVMe/NVMeDefinitions.h>
+#include <Kernel/Devices/Storage/NVMe/NVMeQueue.h>
+#include <Kernel/Devices/Storage/StorageDevice.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Library/NonnullLockRefPtr.h>
 #include <Kernel/Locking/Spinlock.h>
-#include <Kernel/Storage/NVMe/NVMeDefinitions.h>
-#include <Kernel/Storage/NVMe/NVMeQueue.h>
-#include <Kernel/Storage/StorageDevice.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/NVMe/NVMePollQueue.cpp b/Kernel/Devices/Storage/NVMe/NVMePollQueue.cpp
index 4037d8276c..677996a492 100644
--- a/Kernel/Storage/NVMe/NVMePollQueue.cpp
+++ b/Kernel/Devices/Storage/NVMe/NVMePollQueue.cpp
@@ -6,8 +6,8 @@
 
 #include <Kernel/Arch/Delay.h>
 #include <Kernel/Devices/BlockDevice.h>
-#include <Kernel/Storage/NVMe/NVMeDefinitions.h>
-#include <Kernel/Storage/NVMe/NVMePollQueue.h>
+#include <Kernel/Devices/Storage/NVMe/NVMeDefinitions.h>
+#include <Kernel/Devices/Storage/NVMe/NVMePollQueue.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/NVMe/NVMePollQueue.h b/Kernel/Devices/Storage/NVMe/NVMePollQueue.h
index 9df05a6e77..7329f2df74 100644
--- a/Kernel/Storage/NVMe/NVMePollQueue.h
+++ b/Kernel/Devices/Storage/NVMe/NVMePollQueue.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <Kernel/Storage/NVMe/NVMeQueue.h>
+#include <Kernel/Devices/Storage/NVMe/NVMeQueue.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/NVMe/NVMeQueue.cpp b/Kernel/Devices/Storage/NVMe/NVMeQueue.cpp
index 5f282d6a85..d9040d0109 100644
--- a/Kernel/Storage/NVMe/NVMeQueue.cpp
+++ b/Kernel/Devices/Storage/NVMe/NVMeQueue.cpp
@@ -5,11 +5,11 @@
  */
 
 #include <Kernel/Arch/Delay.h>
+#include <Kernel/Devices/Storage/NVMe/NVMeController.h>
+#include <Kernel/Devices/Storage/NVMe/NVMeInterruptQueue.h>
+#include <Kernel/Devices/Storage/NVMe/NVMePollQueue.h>
+#include <Kernel/Devices/Storage/NVMe/NVMeQueue.h>
 #include <Kernel/StdLib.h>
-#include <Kernel/Storage/NVMe/NVMeController.h>
-#include <Kernel/Storage/NVMe/NVMeInterruptQueue.h>
-#include <Kernel/Storage/NVMe/NVMePollQueue.h>
-#include <Kernel/Storage/NVMe/NVMeQueue.h>
 
 namespace Kernel {
 ErrorOr<NonnullLockRefPtr<NVMeQueue>> NVMeQueue::try_create(NVMeController& device, u16 qid, u8 irq, u32 q_depth, OwnPtr<Memory::Region> cq_dma_region, OwnPtr<Memory::Region> sq_dma_region, Memory::TypedMapping<DoorbellRegister volatile> db_regs, QueueType queue_type)
diff --git a/Kernel/Storage/NVMe/NVMeQueue.h b/Kernel/Devices/Storage/NVMe/NVMeQueue.h
index f291712b91..1a0d61c8c6 100644
--- a/Kernel/Storage/NVMe/NVMeQueue.h
+++ b/Kernel/Devices/Storage/NVMe/NVMeQueue.h
@@ -11,13 +11,13 @@
 #include <AK/OwnPtr.h>
 #include <AK/Types.h>
 #include <Kernel/Bus/PCI/Device.h>
+#include <Kernel/Devices/Storage/NVMe/NVMeDefinitions.h>
 #include <Kernel/Interrupts/IRQHandler.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Library/NonnullLockRefPtr.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Memory/TypedMapping.h>
-#include <Kernel/Storage/NVMe/NVMeDefinitions.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/SD/Commands.h b/Kernel/Devices/Storage/SD/Commands.h
index f62acc45b7..f62acc45b7 100644
--- a/Kernel/Storage/SD/Commands.h
+++ b/Kernel/Devices/Storage/SD/Commands.h
diff --git a/Kernel/Storage/SD/PCISDHostController.cpp b/Kernel/Devices/Storage/SD/PCISDHostController.cpp
index 3c9fa401d2..9f0bfc0b1e 100644
--- a/Kernel/Storage/SD/PCISDHostController.cpp
+++ b/Kernel/Devices/Storage/SD/PCISDHostController.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <Kernel/Bus/PCI/API.h>
-#include <Kernel/Storage/SD/PCISDHostController.h>
+#include <Kernel/Devices/Storage/SD/PCISDHostController.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/SD/PCISDHostController.h b/Kernel/Devices/Storage/SD/PCISDHostController.h
index b629b945d6..ef6426e8fa 100644
--- a/Kernel/Storage/SD/PCISDHostController.h
+++ b/Kernel/Devices/Storage/SD/PCISDHostController.h
@@ -8,8 +8,8 @@
 
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/PCI/Device.h>
+#include <Kernel/Devices/Storage/SD/SDHostController.h>
 #include <Kernel/Memory/TypedMapping.h>
-#include <Kernel/Storage/SD/SDHostController.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/SD/Registers.h b/Kernel/Devices/Storage/SD/Registers.h
index cd077ab2d6..cd077ab2d6 100644
--- a/Kernel/Storage/SD/Registers.h
+++ b/Kernel/Devices/Storage/SD/Registers.h
diff --git a/Kernel/Storage/SD/SDHostController.cpp b/Kernel/Devices/Storage/SD/SDHostController.cpp
index b21acdabb1..227eb6511b 100644
--- a/Kernel/Storage/SD/SDHostController.cpp
+++ b/Kernel/Devices/Storage/SD/SDHostController.cpp
@@ -7,10 +7,10 @@
 #include <AK/Format.h>
 #include <AK/StdLibExtras.h>
 #include <Kernel/Devices/DeviceManagement.h>
+#include <Kernel/Devices/Storage/SD/Commands.h>
+#include <Kernel/Devices/Storage/SD/SDHostController.h>
+#include <Kernel/Devices/Storage/StorageManagement.h>
 #include <Kernel/Panic.h>
-#include <Kernel/Storage/SD/Commands.h>
-#include <Kernel/Storage/SD/SDHostController.h>
-#include <Kernel/Storage/StorageManagement.h>
 #include <Kernel/Time/TimeManagement.h>
 #if ARCH(AARCH64)
 #    include <Kernel/Arch/aarch64/RPi/SDHostController.h>
diff --git a/Kernel/Storage/SD/SDHostController.h b/Kernel/Devices/Storage/SD/SDHostController.h
index aae11b13f6..1d6d5af050 100644
--- a/Kernel/Storage/SD/SDHostController.h
+++ b/Kernel/Devices/Storage/SD/SDHostController.h
@@ -10,10 +10,10 @@
 #include <AK/Function.h>
 #include <AK/Result.h>
 #include <AK/Types.h>
+#include <Kernel/Devices/Storage/SD/Commands.h>
+#include <Kernel/Devices/Storage/SD/Registers.h>
+#include <Kernel/Devices/Storage/SD/SDMemoryCard.h>
 #include <Kernel/Locking/Mutex.h>
-#include <Kernel/Storage/SD/Commands.h>
-#include <Kernel/Storage/SD/Registers.h>
-#include <Kernel/Storage/SD/SDMemoryCard.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/SD/SDMemoryCard.cpp b/Kernel/Devices/Storage/SD/SDMemoryCard.cpp
index bf1745fd3f..8e4a76a8d5 100644
--- a/Kernel/Storage/SD/SDMemoryCard.cpp
+++ b/Kernel/Devices/Storage/SD/SDMemoryCard.cpp
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Storage/SD/Commands.h>
-#include <Kernel/Storage/SD/SDHostController.h>
-#include <Kernel/Storage/SD/SDMemoryCard.h>
+#include <Kernel/Devices/Storage/SD/Commands.h>
+#include <Kernel/Devices/Storage/SD/SDHostController.h>
+#include <Kernel/Devices/Storage/SD/SDMemoryCard.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/SD/SDMemoryCard.h b/Kernel/Devices/Storage/SD/SDMemoryCard.h
index 08cf332b0a..98985d35f3 100644
--- a/Kernel/Storage/SD/SDMemoryCard.h
+++ b/Kernel/Devices/Storage/SD/SDMemoryCard.h
@@ -9,9 +9,9 @@
 #include <AK/Function.h>
 #include <AK/Result.h>
 #include <AK/Types.h>
+#include <Kernel/Devices/Storage/SD/Registers.h>
+#include <Kernel/Devices/Storage/StorageDevice.h>
 #include <Kernel/Locking/Mutex.h>
-#include <Kernel/Storage/SD/Registers.h>
-#include <Kernel/Storage/StorageDevice.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/StorageController.cpp b/Kernel/Devices/Storage/StorageController.cpp
index 6aec6ecd98..2e104bc277 100644
--- a/Kernel/Storage/StorageController.cpp
+++ b/Kernel/Devices/Storage/StorageController.cpp
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Storage/StorageController.h>
-#include <Kernel/Storage/StorageManagement.h>
+#include <Kernel/Devices/Storage/StorageController.h>
+#include <Kernel/Devices/Storage/StorageManagement.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/StorageController.h b/Kernel/Devices/Storage/StorageController.h
index 70b7426cab..70b7426cab 100644
--- a/Kernel/Storage/StorageController.h
+++ b/Kernel/Devices/Storage/StorageController.h
diff --git a/Kernel/Storage/StorageDevice.cpp b/Kernel/Devices/Storage/StorageDevice.cpp
index 4b171270c1..7edb89be7f 100644
--- a/Kernel/Storage/StorageDevice.cpp
+++ b/Kernel/Devices/Storage/StorageDevice.cpp
@@ -8,13 +8,13 @@
 #include <Kernel/API/Ioctl.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Devices/DeviceManagement.h>
+#include <Kernel/Devices/Storage/StorageDevice.h>
+#include <Kernel/Devices/Storage/StorageManagement.h>
 #include <Kernel/FileSystem/OpenFileDescription.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/DeviceIdentifiers/BlockDevicesDirectory.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/DeviceIdentifiers/SymbolicLinkDeviceComponent.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Devices/Storage/DeviceDirectory.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Devices/Storage/Directory.h>
-#include <Kernel/Storage/StorageDevice.h>
-#include <Kernel/Storage/StorageManagement.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/StorageDevice.h b/Kernel/Devices/Storage/StorageDevice.h
index 978212f167..52e916587e 100644
--- a/Kernel/Storage/StorageDevice.h
+++ b/Kernel/Devices/Storage/StorageDevice.h
@@ -8,10 +8,10 @@
 
 #include <AK/IntrusiveList.h>
 #include <Kernel/Devices/BlockDevice.h>
+#include <Kernel/Devices/Storage/DiskPartition.h>
+#include <Kernel/Devices/Storage/StorageController.h>
 #include <Kernel/Interrupts/IRQHandler.h>
 #include <Kernel/Locking/Mutex.h>
-#include <Kernel/Storage/DiskPartition.h>
-#include <Kernel/Storage/StorageController.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/StorageManagement.cpp b/Kernel/Devices/Storage/StorageManagement.cpp
index cf9c589298..590db613f0 100644
--- a/Kernel/Storage/StorageManagement.cpp
+++ b/Kernel/Devices/Storage/StorageManagement.cpp
@@ -22,15 +22,15 @@
 #include <Kernel/CommandLine.h>
 #include <Kernel/Devices/BlockDevice.h>
 #include <Kernel/Devices/DeviceManagement.h>
+#include <Kernel/Devices/Storage/ATA/AHCI/Controller.h>
+#include <Kernel/Devices/Storage/ATA/GenericIDE/Controller.h>
+#include <Kernel/Devices/Storage/NVMe/NVMeController.h>
+#include <Kernel/Devices/Storage/SD/PCISDHostController.h>
+#include <Kernel/Devices/Storage/SD/SDHostController.h>
+#include <Kernel/Devices/Storage/StorageManagement.h>
 #include <Kernel/FileSystem/Ext2FS/FileSystem.h>
 #include <Kernel/FileSystem/VirtualFileSystem.h>
 #include <Kernel/Panic.h>
-#include <Kernel/Storage/ATA/AHCI/Controller.h>
-#include <Kernel/Storage/ATA/GenericIDE/Controller.h>
-#include <Kernel/Storage/NVMe/NVMeController.h>
-#include <Kernel/Storage/SD/PCISDHostController.h>
-#include <Kernel/Storage/SD/SDHostController.h>
-#include <Kernel/Storage/StorageManagement.h>
 #include <LibPartition/EBRPartitionTable.h>
 #include <LibPartition/GUIDPartitionTable.h>
 #include <LibPartition/MBRPartitionTable.h>
diff --git a/Kernel/Storage/StorageManagement.h b/Kernel/Devices/Storage/StorageManagement.h
index bf106775fa..832f16ddff 100644
--- a/Kernel/Storage/StorageManagement.h
+++ b/Kernel/Devices/Storage/StorageManagement.h
@@ -8,12 +8,12 @@
 
 #include <AK/IntrusiveList.h>
 #include <AK/Types.h>
+#include <Kernel/Devices/Storage/DiskPartition.h>
+#include <Kernel/Devices/Storage/SD/SDHostController.h>
+#include <Kernel/Devices/Storage/StorageController.h>
+#include <Kernel/Devices/Storage/StorageDevice.h>
 #include <Kernel/FileSystem/FileSystem.h>
 #include <Kernel/Library/NonnullLockRefPtr.h>
-#include <Kernel/Storage/DiskPartition.h>
-#include <Kernel/Storage/SD/SDHostController.h>
-#include <Kernel/Storage/StorageController.h>
-#include <Kernel/Storage/StorageDevice.h>
 #include <LibPartition/PartitionTable.h>
 
 namespace Kernel {
diff --git a/Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/Directory.cpp b/Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/Directory.cpp
index 1d897e153b..3960bc4021 100644
--- a/Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/Directory.cpp
+++ b/Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/Directory.cpp
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <Kernel/Devices/Storage/StorageDevice.h>
 #include <Kernel/FileSystem/SysFS/RootDirectory.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Devices/Directory.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/Directory.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/DeviceDirectory.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/Directory.h>
 #include <Kernel/Sections.h>
-#include <Kernel/Storage/StorageDevice.h>
 
 namespace Kernel {
 
diff --git a/Kernel/FileSystem/SysFS/Subsystems/Devices/Storage/DeviceDirectory.cpp b/Kernel/FileSystem/SysFS/Subsystems/Devices/Storage/DeviceDirectory.cpp
index a5f284de3a..4dbe502173 100644
--- a/Kernel/FileSystem/SysFS/Subsystems/Devices/Storage/DeviceDirectory.cpp
+++ b/Kernel/FileSystem/SysFS/Subsystems/Devices/Storage/DeviceDirectory.cpp
@@ -6,10 +6,10 @@
 
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/PCI/Access.h>
+#include <Kernel/Devices/Storage/StorageDevice.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Devices/Storage/DeviceAttribute.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Devices/Storage/DeviceDirectory.h>
 #include <Kernel/Sections.h>
-#include <Kernel/Storage/StorageDevice.h>
 
 namespace Kernel {
 
diff --git a/Kernel/FileSystem/SysFS/Subsystems/Devices/Storage/DeviceDirectory.h b/Kernel/FileSystem/SysFS/Subsystems/Devices/Storage/DeviceDirectory.h
index b06ed67ad9..b7cb1c5b3d 100644
--- a/Kernel/FileSystem/SysFS/Subsystems/Devices/Storage/DeviceDirectory.h
+++ b/Kernel/FileSystem/SysFS/Subsystems/Devices/Storage/DeviceDirectory.h
@@ -6,9 +6,9 @@
 
 #pragma once
 
+#include <Kernel/Devices/Storage/StorageDevice.h>
 #include <Kernel/FileSystem/SysFS/Component.h>
 #include <Kernel/KString.h>
-#include <Kernel/Storage/StorageDevice.h>
 
 namespace Kernel {
 
diff --git a/Kernel/FileSystem/SysFS/Subsystems/Devices/Storage/Directory.cpp b/Kernel/FileSystem/SysFS/Subsystems/Devices/Storage/Directory.cpp
index 8bd4c2ace8..24a5cae233 100644
--- a/Kernel/FileSystem/SysFS/Subsystems/Devices/Storage/Directory.cpp
+++ b/Kernel/FileSystem/SysFS/Subsystems/Devices/Storage/Directory.cpp
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <Kernel/Devices/Storage/StorageDevice.h>
 #include <Kernel/FileSystem/SysFS/RootDirectory.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Devices/Directory.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Devices/Storage/DeviceDirectory.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Devices/Storage/Directory.h>
 #include <Kernel/Sections.h>
-#include <Kernel/Storage/StorageDevice.h>
 
 namespace Kernel {
 
diff --git a/Userland/Libraries/LibPartition/PartitionTable.h b/Userland/Libraries/LibPartition/PartitionTable.h
index cfe828491e..58590c6ced 100644
--- a/Userland/Libraries/LibPartition/PartitionTable.h
+++ b/Userland/Libraries/LibPartition/PartitionTable.h
@@ -10,7 +10,7 @@
 #include <LibPartition/DiskPartitionMetadata.h>
 
 #ifdef KERNEL
-#    include <Kernel/Storage/StorageDevice.h>
+#    include <Kernel/Devices/Storage/StorageDevice.h>
 #else
 #    include <LibCore/Forward.h>
 #endif