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.

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 {
 

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>

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 {
 

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 {
 

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 {
 

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 {
 

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

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 {
 

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 {
 

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 {
 

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 {

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 {

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 {

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {

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 {
 

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 {

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 {

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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)

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 {
 

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 {
 

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 {
 

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>

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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>

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 {

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 {
 

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 {
 

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 {
 

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 {
 

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