diff --git a/src/kits/storage/Jamfile b/src/kits/storage/Jamfile
index 6da570c572..e3e8b70cbc 100644
--- a/src/kits/storage/Jamfile
+++ b/src/kits/storage/Jamfile
@@ -11,6 +11,7 @@ UseArchHeaders $(TARGET_ARCH) ;
 # for libbe_test
 UsePublicHeaders [ FDirName add-ons registrar ] ;
 
+SEARCH_SOURCE += [ FDirName $(SUBDIR) disk_device ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) mime ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) sniffer ] ;
 
diff --git a/src/kits/storage/DiskDevice.cpp b/src/kits/storage/disk_device/DiskDevice.cpp
similarity index 100%
rename from src/kits/storage/DiskDevice.cpp
rename to src/kits/storage/disk_device/DiskDevice.cpp
diff --git a/src/kits/storage/DiskDeviceList.cpp b/src/kits/storage/disk_device/DiskDeviceList.cpp
similarity index 100%
rename from src/kits/storage/DiskDeviceList.cpp
rename to src/kits/storage/disk_device/DiskDeviceList.cpp
diff --git a/src/kits/storage/DiskDevicePrivate.cpp b/src/kits/storage/disk_device/DiskDevicePrivate.cpp
similarity index 100%
rename from src/kits/storage/DiskDevicePrivate.cpp
rename to src/kits/storage/disk_device/DiskDevicePrivate.cpp
diff --git a/src/kits/storage/DiskDeviceRoster.cpp b/src/kits/storage/disk_device/DiskDeviceRoster.cpp
similarity index 100%
rename from src/kits/storage/DiskDeviceRoster.cpp
rename to src/kits/storage/disk_device/DiskDeviceRoster.cpp
diff --git a/src/kits/storage/DiskDeviceTypes.cpp b/src/kits/storage/disk_device/DiskDeviceTypes.cpp
similarity index 100%
rename from src/kits/storage/DiskDeviceTypes.cpp
rename to src/kits/storage/disk_device/DiskDeviceTypes.cpp
diff --git a/src/kits/storage/DiskDeviceVisitor.cpp b/src/kits/storage/disk_device/DiskDeviceVisitor.cpp
similarity index 100%
rename from src/kits/storage/DiskDeviceVisitor.cpp
rename to src/kits/storage/disk_device/DiskDeviceVisitor.cpp
diff --git a/src/kits/storage/DiskScannerAddOn.cpp b/src/kits/storage/disk_device/DiskScannerAddOn.cpp
similarity index 100%
rename from src/kits/storage/DiskScannerAddOn.cpp
rename to src/kits/storage/disk_device/DiskScannerAddOn.cpp
diff --git a/src/kits/storage/DiskSystem.cpp b/src/kits/storage/disk_device/DiskSystem.cpp
similarity index 100%
rename from src/kits/storage/DiskSystem.cpp
rename to src/kits/storage/disk_device/DiskSystem.cpp
diff --git a/src/kits/storage/DiskSystemAddOn.cpp b/src/kits/storage/disk_device/DiskSystemAddOn.cpp
similarity index 100%
rename from src/kits/storage/DiskSystemAddOn.cpp
rename to src/kits/storage/disk_device/DiskSystemAddOn.cpp
diff --git a/src/kits/storage/DiskSystemAddOnManager.cpp b/src/kits/storage/disk_device/DiskSystemAddOnManager.cpp
similarity index 100%
rename from src/kits/storage/DiskSystemAddOnManager.cpp
rename to src/kits/storage/disk_device/DiskSystemAddOnManager.cpp
diff --git a/src/kits/storage/DiskSystemAddOnManager.h b/src/kits/storage/disk_device/DiskSystemAddOnManager.h
similarity index 100%
rename from src/kits/storage/DiskSystemAddOnManager.h
rename to src/kits/storage/disk_device/DiskSystemAddOnManager.h
diff --git a/src/kits/storage/MutablePartition.cpp b/src/kits/storage/disk_device/MutablePartition.cpp
similarity index 100%
rename from src/kits/storage/MutablePartition.cpp
rename to src/kits/storage/disk_device/MutablePartition.cpp
diff --git a/src/kits/storage/Partition.cpp b/src/kits/storage/disk_device/Partition.cpp
similarity index 100%
rename from src/kits/storage/Partition.cpp
rename to src/kits/storage/disk_device/Partition.cpp
diff --git a/src/kits/storage/PartitionDelegate.cpp b/src/kits/storage/disk_device/PartitionDelegate.cpp
similarity index 100%
rename from src/kits/storage/PartitionDelegate.cpp
rename to src/kits/storage/disk_device/PartitionDelegate.cpp
diff --git a/src/kits/storage/PartitionDelegate.h b/src/kits/storage/disk_device/PartitionDelegate.h
similarity index 100%
rename from src/kits/storage/PartitionDelegate.h
rename to src/kits/storage/disk_device/PartitionDelegate.h
diff --git a/src/kits/storage/PartitioningDialog.cpp b/src/kits/storage/disk_device/PartitioningDialog.cpp
similarity index 100%
rename from src/kits/storage/PartitioningDialog.cpp
rename to src/kits/storage/disk_device/PartitioningDialog.cpp
diff --git a/src/kits/storage/PartitioningDialog.h b/src/kits/storage/disk_device/PartitioningDialog.h
similarity index 100%
rename from src/kits/storage/PartitioningDialog.h
rename to src/kits/storage/disk_device/PartitioningDialog.h
diff --git a/src/kits/storage/PartitioningInfo.cpp b/src/kits/storage/disk_device/PartitioningInfo.cpp
similarity index 100%
rename from src/kits/storage/PartitioningInfo.cpp
rename to src/kits/storage/disk_device/PartitioningInfo.cpp