diff --git a/Makefile b/Makefile
index 99b7c873..f0582498 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 build:
 	mkdir -p out
 	make --quiet -C Input build
-	make --quiet -C Disk build
+	make --quiet -C Storage build
 	make --quiet -C Audio build
 	make --quiet -C FileSystem build
 	make --quiet -C Generic build
@@ -14,7 +14,7 @@ prepare:
 clean:
 	rm -rf out
 	make -C Input clean
-	make -C Disk clean
+	make -C Storage clean
 	make -C Audio clean
 	make -C FileSystem clean
 	make -C Generic clean
diff --git a/Disk/AHCI/AHCI.cpp b/Storage/AHCI/AHCI.cpp
similarity index 100%
rename from Disk/AHCI/AHCI.cpp
rename to Storage/AHCI/AHCI.cpp
diff --git a/Disk/AHCI/Makefile b/Storage/AHCI/Makefile
similarity index 100%
rename from Disk/AHCI/Makefile
rename to Storage/AHCI/Makefile
diff --git a/Disk/AHCI/linker.ld b/Storage/AHCI/linker.ld
similarity index 100%
rename from Disk/AHCI/linker.ld
rename to Storage/AHCI/linker.ld
diff --git a/Disk/ATA/ATA.cpp b/Storage/ATA/ATA.cpp
similarity index 100%
rename from Disk/ATA/ATA.cpp
rename to Storage/ATA/ATA.cpp
diff --git a/Disk/ATA/Makefile b/Storage/ATA/Makefile
similarity index 100%
rename from Disk/ATA/Makefile
rename to Storage/ATA/Makefile
diff --git a/Disk/ATA/linker.ld b/Storage/ATA/linker.ld
similarity index 100%
rename from Disk/ATA/linker.ld
rename to Storage/ATA/linker.ld
diff --git a/Disk/Makefile b/Storage/Makefile
similarity index 100%
rename from Disk/Makefile
rename to Storage/Makefile