diff --git a/BlockCache.cpp b/Device/BlockCache.cpp
similarity index 100%
rename from BlockCache.cpp
rename to Device/BlockCache.cpp
diff --git a/BlockCache.h b/Device/BlockCache.h
similarity index 100%
rename from BlockCache.h
rename to Device/BlockCache.h
diff --git a/BlockDevice.cpp b/Device/BlockDevice.cpp
similarity index 100%
rename from BlockDevice.cpp
rename to Device/BlockDevice.cpp
diff --git a/BlockDevice.h b/Device/BlockDevice.h
similarity index 100%
rename from BlockDevice.h
rename to Device/BlockDevice.h
diff --git a/DavexDiskImage.cpp b/Device/DavexDiskImage.cpp
similarity index 100%
rename from DavexDiskImage.cpp
rename to Device/DavexDiskImage.cpp
diff --git a/DavexDiskImage.h b/Device/DavexDiskImage.h
similarity index 100%
rename from DavexDiskImage.h
rename to Device/DavexDiskImage.h
diff --git a/DiskCopy42Image.cpp b/Device/DiskCopy42Image.cpp
similarity index 100%
rename from DiskCopy42Image.cpp
rename to Device/DiskCopy42Image.cpp
diff --git a/DiskCopy42Image.h b/Device/DiskCopy42Image.h
similarity index 100%
rename from DiskCopy42Image.h
rename to Device/DiskCopy42Image.h
diff --git a/MappedFile.cpp b/Device/MappedFile.cpp
similarity index 100%
rename from MappedFile.cpp
rename to Device/MappedFile.cpp
diff --git a/MappedFile.h b/Device/MappedFile.h
similarity index 100%
rename from MappedFile.h
rename to Device/MappedFile.h
diff --git a/RawDevice.cpp b/Device/RawDevice.cpp
similarity index 100%
rename from RawDevice.cpp
rename to Device/RawDevice.cpp
diff --git a/RawDevice.h b/Device/RawDevice.h
similarity index 100%
rename from RawDevice.h
rename to Device/RawDevice.h
diff --git a/UniversalDiskImage.cpp b/Device/UniversalDiskImage.cpp
similarity index 100%
rename from UniversalDiskImage.cpp
rename to Device/UniversalDiskImage.cpp
diff --git a/UniversalDiskImage.h b/Device/UniversalDiskImage.h
similarity index 100%
rename from UniversalDiskImage.h
rename to Device/UniversalDiskImage.h