diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index 385f6a5d07..e0f4a050a2 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -82,6 +82,15 @@ set(KERNEL_SOURCES
     Graphics/VGACompatibleAdapter.cpp
     Graphics/GenericFramebufferDevice.cpp
     SanCov.cpp
+    Storage/ATA/AHCIController.cpp
+    Storage/ATA/AHCIPort.cpp
+    Storage/ATA/AHCIPortHandler.cpp
+    Storage/ATA/ATADevice.cpp
+    Storage/ATA/ATADiskDevice.cpp
+    Storage/ATA/ATAPIDiscDevice.cpp
+    Storage/ATA/BMIDEChannel.cpp
+    Storage/ATA/IDEController.cpp
+    Storage/ATA/IDEChannel.cpp
     Storage/Partition/DiskPartition.cpp
     Storage/Partition/DiskPartitionMetadata.cpp
     Storage/Partition/EBRPartitionTable.cpp
@@ -89,15 +98,6 @@ set(KERNEL_SOURCES
     Storage/Partition/MBRPartitionTable.cpp
     Storage/Partition/PartitionTable.cpp
     Storage/StorageDevice.cpp
-    Storage/AHCIController.cpp
-    Storage/AHCIPort.cpp
-    Storage/AHCIPortHandler.cpp
-    Storage/ATADevice.cpp
-    Storage/ATADiskDevice.cpp
-    Storage/ATAPIDiscDevice.cpp
-    Storage/BMIDEChannel.cpp
-    Storage/IDEController.cpp
-    Storage/IDEChannel.cpp
     Storage/RamdiskController.cpp
     Storage/RamdiskDevice.cpp
     Storage/StorageManagement.cpp
diff --git a/Kernel/Storage/AHCI.h b/Kernel/Storage/ATA/AHCI.h
similarity index 100%
rename from Kernel/Storage/AHCI.h
rename to Kernel/Storage/ATA/AHCI.h
diff --git a/Kernel/Storage/AHCIController.cpp b/Kernel/Storage/ATA/AHCIController.cpp
similarity index 98%
rename from Kernel/Storage/AHCIController.cpp
rename to Kernel/Storage/ATA/AHCIController.cpp
index e57534c37d..1524fbfa1c 100644
--- a/Kernel/Storage/AHCIController.cpp
+++ b/Kernel/Storage/ATA/AHCIController.cpp
@@ -10,8 +10,8 @@
 #include <AK/Types.h>
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Memory/MemoryManager.h>
-#include <Kernel/Storage/AHCIController.h>
-#include <Kernel/Storage/AHCIPortHandler.h>
+#include <Kernel/Storage/ATA/AHCIController.h>
+#include <Kernel/Storage/ATA/AHCIPortHandler.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/AHCIController.h b/Kernel/Storage/ATA/AHCIController.h
similarity index 95%
rename from Kernel/Storage/AHCIController.h
rename to Kernel/Storage/ATA/AHCIController.h
index 5a83e58449..726696949d 100644
--- a/Kernel/Storage/AHCIController.h
+++ b/Kernel/Storage/ATA/AHCIController.h
@@ -10,8 +10,8 @@
 #include <AK/RefPtr.h>
 #include <AK/Types.h>
 #include <Kernel/Sections.h>
-#include <Kernel/Storage/AHCI.h>
-#include <Kernel/Storage/ATAController.h>
+#include <Kernel/Storage/ATA/AHCI.h>
+#include <Kernel/Storage/ATA/ATAController.h>
 #include <Kernel/Storage/StorageDevice.h>
 
 namespace Kernel {
diff --git a/Kernel/Storage/AHCIPort.cpp b/Kernel/Storage/ATA/AHCIPort.cpp
similarity index 99%
rename from Kernel/Storage/AHCIPort.cpp
rename to Kernel/Storage/ATA/AHCIPort.cpp
index d439cc296a..9114541d88 100644
--- a/Kernel/Storage/AHCIPort.cpp
+++ b/Kernel/Storage/ATA/AHCIPort.cpp
@@ -12,9 +12,9 @@
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Memory/ScatterGatherList.h>
 #include <Kernel/Memory/TypedMapping.h>
-#include <Kernel/Storage/AHCIPort.h>
-#include <Kernel/Storage/ATA.h>
-#include <Kernel/Storage/ATADiskDevice.h>
+#include <Kernel/Storage/ATA/AHCIPort.h>
+#include <Kernel/Storage/ATA/ATA.h>
+#include <Kernel/Storage/ATA/ATADiskDevice.h>
 #include <Kernel/Storage/StorageManagement.h>
 #include <Kernel/WorkQueue.h>
 
diff --git a/Kernel/Storage/AHCIPort.h b/Kernel/Storage/ATA/AHCIPort.h
similarity index 97%
rename from Kernel/Storage/AHCIPort.h
rename to Kernel/Storage/ATA/AHCIPort.h
index ad866054f0..c99eccde29 100644
--- a/Kernel/Storage/AHCIPort.h
+++ b/Kernel/Storage/ATA/AHCIPort.h
@@ -20,9 +20,9 @@
 #include <Kernel/PhysicalAddress.h>
 #include <Kernel/Random.h>
 #include <Kernel/Sections.h>
-#include <Kernel/Storage/AHCI.h>
-#include <Kernel/Storage/AHCIPortHandler.h>
-#include <Kernel/Storage/ATADevice.h>
+#include <Kernel/Storage/ATA/AHCI.h>
+#include <Kernel/Storage/ATA/AHCIPortHandler.h>
+#include <Kernel/Storage/ATA/ATADevice.h>
 #include <Kernel/WaitQueue.h>
 
 namespace Kernel {
diff --git a/Kernel/Storage/AHCIPortHandler.cpp b/Kernel/Storage/ATA/AHCIPortHandler.cpp
similarity index 98%
rename from Kernel/Storage/AHCIPortHandler.cpp
rename to Kernel/Storage/ATA/AHCIPortHandler.cpp
index 1dc74190b9..56d2559e4b 100644
--- a/Kernel/Storage/AHCIPortHandler.cpp
+++ b/Kernel/Storage/ATA/AHCIPortHandler.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <Kernel/CommandLine.h>
-#include <Kernel/Storage/AHCIPortHandler.h>
+#include <Kernel/Storage/ATA/AHCIPortHandler.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/AHCIPortHandler.h b/Kernel/Storage/ATA/AHCIPortHandler.h
similarity index 96%
rename from Kernel/Storage/AHCIPortHandler.h
rename to Kernel/Storage/ATA/AHCIPortHandler.h
index 1ef4786ede..f44c992605 100644
--- a/Kernel/Storage/AHCIPortHandler.h
+++ b/Kernel/Storage/ATA/AHCIPortHandler.h
@@ -15,8 +15,8 @@
 #include <Kernel/PhysicalAddress.h>
 #include <Kernel/Random.h>
 #include <Kernel/Sections.h>
-#include <Kernel/Storage/AHCIController.h>
-#include <Kernel/Storage/AHCIPort.h>
+#include <Kernel/Storage/ATA/AHCIController.h>
+#include <Kernel/Storage/ATA/AHCIPort.h>
 #include <Kernel/Storage/StorageDevice.h>
 #include <Kernel/WaitQueue.h>
 
diff --git a/Kernel/Storage/ATA.h b/Kernel/Storage/ATA/ATA.h
similarity index 100%
rename from Kernel/Storage/ATA.h
rename to Kernel/Storage/ATA/ATA.h
diff --git a/Kernel/Storage/ATAController.h b/Kernel/Storage/ATA/ATAController.h
similarity index 100%
rename from Kernel/Storage/ATAController.h
rename to Kernel/Storage/ATA/ATAController.h
diff --git a/Kernel/Storage/ATADevice.cpp b/Kernel/Storage/ATA/ATADevice.cpp
similarity index 87%
rename from Kernel/Storage/ATADevice.cpp
rename to Kernel/Storage/ATA/ATADevice.cpp
index 3fe516908f..7e24a0cc68 100644
--- a/Kernel/Storage/ATADevice.cpp
+++ b/Kernel/Storage/ATA/ATADevice.cpp
@@ -6,9 +6,9 @@
 
 #include <AK/StringView.h>
 #include <Kernel/Sections.h>
-#include <Kernel/Storage/ATADevice.h>
-#include <Kernel/Storage/IDEChannel.h>
-#include <Kernel/Storage/IDEController.h>
+#include <Kernel/Storage/ATA/ATADevice.h>
+#include <Kernel/Storage/ATA/IDEChannel.h>
+#include <Kernel/Storage/ATA/IDEController.h>
 #include <Kernel/Storage/StorageManagement.h>
 
 namespace Kernel {
diff --git a/Kernel/Storage/ATADevice.h b/Kernel/Storage/ATA/ATADevice.h
similarity index 96%
rename from Kernel/Storage/ATADevice.h
rename to Kernel/Storage/ATA/ATADevice.h
index 5e59f8e4ba..9c32d2d110 100644
--- a/Kernel/Storage/ATADevice.h
+++ b/Kernel/Storage/ATA/ATADevice.h
@@ -8,7 +8,7 @@
 
 #include <Kernel/Interrupts/IRQHandler.h>
 #include <Kernel/Locking/Mutex.h>
-#include <Kernel/Storage/ATAController.h>
+#include <Kernel/Storage/ATA/ATAController.h>
 #include <Kernel/Storage/StorageDevice.h>
 
 namespace Kernel {
diff --git a/Kernel/Storage/ATADiskDevice.cpp b/Kernel/Storage/ATA/ATADiskDevice.cpp
similarity index 92%
rename from Kernel/Storage/ATADiskDevice.cpp
rename to Kernel/Storage/ATA/ATADiskDevice.cpp
index 5eea1374c8..3d7af895be 100644
--- a/Kernel/Storage/ATADiskDevice.cpp
+++ b/Kernel/Storage/ATA/ATADiskDevice.cpp
@@ -7,9 +7,9 @@
 #include <AK/StringView.h>
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/Sections.h>
-#include <Kernel/Storage/ATADiskDevice.h>
-#include <Kernel/Storage/IDEChannel.h>
-#include <Kernel/Storage/IDEController.h>
+#include <Kernel/Storage/ATA/ATADiskDevice.h>
+#include <Kernel/Storage/ATA/IDEChannel.h>
+#include <Kernel/Storage/ATA/IDEController.h>
 #include <Kernel/Storage/StorageManagement.h>
 
 namespace Kernel {
diff --git a/Kernel/Storage/ATADiskDevice.h b/Kernel/Storage/ATA/ATADiskDevice.h
similarity index 95%
rename from Kernel/Storage/ATADiskDevice.h
rename to Kernel/Storage/ATA/ATADiskDevice.h
index ba52385306..6a5492f838 100644
--- a/Kernel/Storage/ATADiskDevice.h
+++ b/Kernel/Storage/ATA/ATADiskDevice.h
@@ -8,7 +8,7 @@
 
 #include <Kernel/Interrupts/IRQHandler.h>
 #include <Kernel/Locking/Mutex.h>
-#include <Kernel/Storage/ATADevice.h>
+#include <Kernel/Storage/ATA/ATADevice.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/ATAPIDiscDevice.cpp b/Kernel/Storage/ATA/ATAPIDiscDevice.cpp
similarity index 91%
rename from Kernel/Storage/ATAPIDiscDevice.cpp
rename to Kernel/Storage/ATA/ATAPIDiscDevice.cpp
index a94ffb5308..7c60f54a14 100644
--- a/Kernel/Storage/ATAPIDiscDevice.cpp
+++ b/Kernel/Storage/ATA/ATAPIDiscDevice.cpp
@@ -7,9 +7,9 @@
 #include <AK/StringView.h>
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/Sections.h>
-#include <Kernel/Storage/ATAPIDiscDevice.h>
-#include <Kernel/Storage/IDEChannel.h>
-#include <Kernel/Storage/IDEController.h>
+#include <Kernel/Storage/ATA/ATAPIDiscDevice.h>
+#include <Kernel/Storage/ATA/IDEChannel.h>
+#include <Kernel/Storage/ATA/IDEController.h>
 #include <Kernel/Storage/StorageManagement.h>
 
 namespace Kernel {
diff --git a/Kernel/Storage/ATAPIDiscDevice.h b/Kernel/Storage/ATA/ATAPIDiscDevice.h
similarity index 95%
rename from Kernel/Storage/ATAPIDiscDevice.h
rename to Kernel/Storage/ATA/ATAPIDiscDevice.h
index d7775bf20a..0556fb97d1 100644
--- a/Kernel/Storage/ATAPIDiscDevice.h
+++ b/Kernel/Storage/ATA/ATAPIDiscDevice.h
@@ -8,7 +8,7 @@
 
 #include <Kernel/Interrupts/IRQHandler.h>
 #include <Kernel/Locking/Mutex.h>
-#include <Kernel/Storage/ATADevice.h>
+#include <Kernel/Storage/ATA/ATADevice.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/BMIDEChannel.cpp b/Kernel/Storage/ATA/BMIDEChannel.cpp
similarity index 98%
rename from Kernel/Storage/BMIDEChannel.cpp
rename to Kernel/Storage/ATA/BMIDEChannel.cpp
index 732b8baa41..8acf1dce5d 100644
--- a/Kernel/Storage/BMIDEChannel.cpp
+++ b/Kernel/Storage/ATA/BMIDEChannel.cpp
@@ -6,9 +6,9 @@
 
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Sections.h>
-#include <Kernel/Storage/ATA.h>
-#include <Kernel/Storage/BMIDEChannel.h>
-#include <Kernel/Storage/IDEController.h>
+#include <Kernel/Storage/ATA/ATA.h>
+#include <Kernel/Storage/ATA/BMIDEChannel.h>
+#include <Kernel/Storage/ATA/IDEController.h>
 #include <Kernel/WorkQueue.h>
 
 namespace Kernel {
diff --git a/Kernel/Storage/BMIDEChannel.h b/Kernel/Storage/ATA/BMIDEChannel.h
similarity index 97%
rename from Kernel/Storage/BMIDEChannel.h
rename to Kernel/Storage/ATA/BMIDEChannel.h
index c72e0a3da5..5f948149e5 100644
--- a/Kernel/Storage/BMIDEChannel.h
+++ b/Kernel/Storage/ATA/BMIDEChannel.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <AK/OwnPtr.h>
-#include <Kernel/Storage/IDEChannel.h>
+#include <Kernel/Storage/ATA/IDEChannel.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/IDEChannel.cpp b/Kernel/Storage/ATA/IDEChannel.cpp
similarity index 99%
rename from Kernel/Storage/IDEChannel.cpp
rename to Kernel/Storage/ATA/IDEChannel.cpp
index bc3012f45b..ef66424870 100644
--- a/Kernel/Storage/IDEChannel.cpp
+++ b/Kernel/Storage/ATA/IDEChannel.cpp
@@ -11,10 +11,10 @@
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Process.h>
 #include <Kernel/Sections.h>
-#include <Kernel/Storage/ATA.h>
-#include <Kernel/Storage/ATADiskDevice.h>
-#include <Kernel/Storage/IDEChannel.h>
-#include <Kernel/Storage/IDEController.h>
+#include <Kernel/Storage/ATA/ATA.h>
+#include <Kernel/Storage/ATA/ATADiskDevice.h>
+#include <Kernel/Storage/ATA/IDEChannel.h>
+#include <Kernel/Storage/ATA/IDEController.h>
 #include <Kernel/WorkQueue.h>
 
 namespace Kernel {
diff --git a/Kernel/Storage/IDEChannel.h b/Kernel/Storage/ATA/IDEChannel.h
similarity index 99%
rename from Kernel/Storage/IDEChannel.h
rename to Kernel/Storage/ATA/IDEChannel.h
index 0d8ac71d6b..ec14e00f7d 100644
--- a/Kernel/Storage/IDEChannel.h
+++ b/Kernel/Storage/ATA/IDEChannel.h
@@ -25,7 +25,7 @@
 #include <Kernel/Memory/PhysicalPage.h>
 #include <Kernel/PhysicalAddress.h>
 #include <Kernel/Random.h>
-#include <Kernel/Storage/ATADevice.h>
+#include <Kernel/Storage/ATA/ATADevice.h>
 #include <Kernel/Storage/StorageDevice.h>
 #include <Kernel/WaitQueue.h>
 
diff --git a/Kernel/Storage/IDEController.cpp b/Kernel/Storage/ATA/IDEController.cpp
similarity index 98%
rename from Kernel/Storage/IDEController.cpp
rename to Kernel/Storage/ATA/IDEController.cpp
index 4566962813..8f70083fc5 100644
--- a/Kernel/Storage/IDEController.cpp
+++ b/Kernel/Storage/ATA/IDEController.cpp
@@ -10,9 +10,9 @@
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/FileSystem/ProcFS.h>
 #include <Kernel/Sections.h>
-#include <Kernel/Storage/ATADiskDevice.h>
-#include <Kernel/Storage/BMIDEChannel.h>
-#include <Kernel/Storage/IDEController.h>
+#include <Kernel/Storage/ATA/ATADiskDevice.h>
+#include <Kernel/Storage/ATA/BMIDEChannel.h>
+#include <Kernel/Storage/ATA/IDEController.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Storage/IDEController.h b/Kernel/Storage/ATA/IDEController.h
similarity index 94%
rename from Kernel/Storage/IDEController.h
rename to Kernel/Storage/ATA/IDEController.h
index f87158ea32..cea3540e9f 100644
--- a/Kernel/Storage/IDEController.h
+++ b/Kernel/Storage/ATA/IDEController.h
@@ -9,8 +9,8 @@
 #include <AK/OwnPtr.h>
 #include <AK/RefPtr.h>
 #include <AK/Types.h>
-#include <Kernel/Storage/ATAController.h>
-#include <Kernel/Storage/IDEChannel.h>
+#include <Kernel/Storage/ATA/ATAController.h>
+#include <Kernel/Storage/ATA/IDEChannel.h>
 #include <Kernel/Storage/StorageDevice.h>
 
 namespace Kernel {
diff --git a/Kernel/Storage/StorageManagement.cpp b/Kernel/Storage/StorageManagement.cpp
index 9c1b6035a8..bed09b1f35 100644
--- a/Kernel/Storage/StorageManagement.cpp
+++ b/Kernel/Storage/StorageManagement.cpp
@@ -13,8 +13,8 @@
 #include <Kernel/Devices/BlockDevice.h>
 #include <Kernel/FileSystem/Ext2FileSystem.h>
 #include <Kernel/Panic.h>
-#include <Kernel/Storage/AHCIController.h>
-#include <Kernel/Storage/IDEController.h>
+#include <Kernel/Storage/ATA/AHCIController.h>
+#include <Kernel/Storage/ATA/IDEController.h>
 #include <Kernel/Storage/Partition/EBRPartitionTable.h>
 #include <Kernel/Storage/Partition/GUIDPartitionTable.h>
 #include <Kernel/Storage/Partition/MBRPartitionTable.h>