diff --git a/.editorconfig b/Aaru.CommonTypes/.editorconfig
similarity index 100%
rename from .editorconfig
rename to Aaru.CommonTypes/.editorconfig
diff --git a/.gitignore b/Aaru.CommonTypes/.gitignore
similarity index 100%
rename from .gitignore
rename to Aaru.CommonTypes/.gitignore
diff --git a/Aaru.CommonTypes.csproj b/Aaru.CommonTypes/Aaru.CommonTypes.csproj
similarity index 100%
rename from Aaru.CommonTypes.csproj
rename to Aaru.CommonTypes/Aaru.CommonTypes.csproj
diff --git a/Aaru.CommonTypes.csproj.DotSettings b/Aaru.CommonTypes/Aaru.CommonTypes.csproj.DotSettings
similarity index 100%
rename from Aaru.CommonTypes.csproj.DotSettings
rename to Aaru.CommonTypes/Aaru.CommonTypes.csproj.DotSettings
diff --git a/AaruMetadata/ATA.cs b/Aaru.CommonTypes/AaruMetadata/ATA.cs
similarity index 100%
rename from AaruMetadata/ATA.cs
rename to Aaru.CommonTypes/AaruMetadata/ATA.cs
diff --git a/AaruMetadata/AaruMetadata.cs b/Aaru.CommonTypes/AaruMetadata/AaruMetadata.cs
similarity index 100%
rename from AaruMetadata/AaruMetadata.cs
rename to Aaru.CommonTypes/AaruMetadata/AaruMetadata.cs
diff --git a/AaruMetadata/Advertisement.cs b/Aaru.CommonTypes/AaruMetadata/Advertisement.cs
similarity index 100%
rename from AaruMetadata/Advertisement.cs
rename to Aaru.CommonTypes/AaruMetadata/Advertisement.cs
diff --git a/AaruMetadata/Architecture.cs b/Aaru.CommonTypes/AaruMetadata/Architecture.cs
similarity index 100%
rename from AaruMetadata/Architecture.cs
rename to Aaru.CommonTypes/AaruMetadata/Architecture.cs
diff --git a/AaruMetadata/AudioMedia.cs b/Aaru.CommonTypes/AaruMetadata/AudioMedia.cs
similarity index 100%
rename from AaruMetadata/AudioMedia.cs
rename to Aaru.CommonTypes/AaruMetadata/AudioMedia.cs
diff --git a/AaruMetadata/AudioVideo.cs b/Aaru.CommonTypes/AaruMetadata/AudioVideo.cs
similarity index 100%
rename from AaruMetadata/AudioVideo.cs
rename to Aaru.CommonTypes/AaruMetadata/AudioVideo.cs
diff --git a/AaruMetadata/Barcode.cs b/Aaru.CommonTypes/AaruMetadata/Barcode.cs
similarity index 100%
rename from AaruMetadata/Barcode.cs
rename to Aaru.CommonTypes/AaruMetadata/Barcode.cs
diff --git a/AaruMetadata/BlockMedia.cs b/Aaru.CommonTypes/AaruMetadata/BlockMedia.cs
similarity index 100%
rename from AaruMetadata/BlockMedia.cs
rename to Aaru.CommonTypes/AaruMetadata/BlockMedia.cs
diff --git a/AaruMetadata/Book.cs b/Aaru.CommonTypes/AaruMetadata/Book.cs
similarity index 100%
rename from AaruMetadata/Book.cs
rename to Aaru.CommonTypes/AaruMetadata/Book.cs
diff --git a/AaruMetadata/Checksum.cs b/Aaru.CommonTypes/AaruMetadata/Checksum.cs
similarity index 100%
rename from AaruMetadata/Checksum.cs
rename to Aaru.CommonTypes/AaruMetadata/Checksum.cs
diff --git a/AaruMetadata/Contents.cs b/Aaru.CommonTypes/AaruMetadata/Contents.cs
similarity index 100%
rename from AaruMetadata/Contents.cs
rename to Aaru.CommonTypes/AaruMetadata/Contents.cs
diff --git a/AaruMetadata/Dimensions.cs b/Aaru.CommonTypes/AaruMetadata/Dimensions.cs
similarity index 100%
rename from AaruMetadata/Dimensions.cs
rename to Aaru.CommonTypes/AaruMetadata/Dimensions.cs
diff --git a/AaruMetadata/Dump.cs b/Aaru.CommonTypes/AaruMetadata/Dump.cs
similarity index 100%
rename from AaruMetadata/Dump.cs
rename to Aaru.CommonTypes/AaruMetadata/Dump.cs
diff --git a/AaruMetadata/DumpHardware.cs b/Aaru.CommonTypes/AaruMetadata/DumpHardware.cs
similarity index 100%
rename from AaruMetadata/DumpHardware.cs
rename to Aaru.CommonTypes/AaruMetadata/DumpHardware.cs
diff --git a/AaruMetadata/FileSystem.cs b/Aaru.CommonTypes/AaruMetadata/FileSystem.cs
similarity index 100%
rename from AaruMetadata/FileSystem.cs
rename to Aaru.CommonTypes/AaruMetadata/FileSystem.cs
diff --git a/AaruMetadata/Language.cs b/Aaru.CommonTypes/AaruMetadata/Language.cs
similarity index 100%
rename from AaruMetadata/Language.cs
rename to Aaru.CommonTypes/AaruMetadata/Language.cs
diff --git a/AaruMetadata/Layers.cs b/Aaru.CommonTypes/AaruMetadata/Layers.cs
similarity index 100%
rename from AaruMetadata/Layers.cs
rename to Aaru.CommonTypes/AaruMetadata/Layers.cs
diff --git a/AaruMetadata/LinearMedia.cs b/Aaru.CommonTypes/AaruMetadata/LinearMedia.cs
similarity index 100%
rename from AaruMetadata/LinearMedia.cs
rename to Aaru.CommonTypes/AaruMetadata/LinearMedia.cs
diff --git a/AaruMetadata/Magazine.cs b/Aaru.CommonTypes/AaruMetadata/Magazine.cs
similarity index 100%
rename from AaruMetadata/Magazine.cs
rename to Aaru.CommonTypes/AaruMetadata/Magazine.cs
diff --git a/AaruMetadata/MultiMediaCard.cs b/Aaru.CommonTypes/AaruMetadata/MultiMediaCard.cs
similarity index 100%
rename from AaruMetadata/MultiMediaCard.cs
rename to Aaru.CommonTypes/AaruMetadata/MultiMediaCard.cs
diff --git a/AaruMetadata/OpticalDisc.cs b/Aaru.CommonTypes/AaruMetadata/OpticalDisc.cs
similarity index 100%
rename from AaruMetadata/OpticalDisc.cs
rename to Aaru.CommonTypes/AaruMetadata/OpticalDisc.cs
diff --git a/AaruMetadata/PCI.cs b/Aaru.CommonTypes/AaruMetadata/PCI.cs
similarity index 100%
rename from AaruMetadata/PCI.cs
rename to Aaru.CommonTypes/AaruMetadata/PCI.cs
diff --git a/AaruMetadata/PCMCIA.cs b/Aaru.CommonTypes/AaruMetadata/PCMCIA.cs
similarity index 100%
rename from AaruMetadata/PCMCIA.cs
rename to Aaru.CommonTypes/AaruMetadata/PCMCIA.cs
diff --git a/AaruMetadata/PS3.cs b/Aaru.CommonTypes/AaruMetadata/PS3.cs
similarity index 100%
rename from AaruMetadata/PS3.cs
rename to Aaru.CommonTypes/AaruMetadata/PS3.cs
diff --git a/AaruMetadata/Partition.cs b/Aaru.CommonTypes/AaruMetadata/Partition.cs
similarity index 100%
rename from AaruMetadata/Partition.cs
rename to Aaru.CommonTypes/AaruMetadata/Partition.cs
diff --git a/AaruMetadata/ReleaseType.cs b/Aaru.CommonTypes/AaruMetadata/ReleaseType.cs
similarity index 100%
rename from AaruMetadata/ReleaseType.cs
rename to Aaru.CommonTypes/AaruMetadata/ReleaseType.cs
diff --git a/AaruMetadata/RequiredOperatingSystem.cs b/Aaru.CommonTypes/AaruMetadata/RequiredOperatingSystem.cs
similarity index 100%
rename from AaruMetadata/RequiredOperatingSystem.cs
rename to Aaru.CommonTypes/AaruMetadata/RequiredOperatingSystem.cs
diff --git a/AaruMetadata/SCSI.cs b/Aaru.CommonTypes/AaruMetadata/SCSI.cs
similarity index 100%
rename from AaruMetadata/SCSI.cs
rename to Aaru.CommonTypes/AaruMetadata/SCSI.cs
diff --git a/AaruMetadata/Scanning.cs b/Aaru.CommonTypes/AaruMetadata/Scanning.cs
similarity index 100%
rename from AaruMetadata/Scanning.cs
rename to Aaru.CommonTypes/AaruMetadata/Scanning.cs
diff --git a/AaruMetadata/SecureDigital.cs b/Aaru.CommonTypes/AaruMetadata/SecureDigital.cs
similarity index 100%
rename from AaruMetadata/SecureDigital.cs
rename to Aaru.CommonTypes/AaruMetadata/SecureDigital.cs
diff --git a/AaruMetadata/Sequence.cs b/Aaru.CommonTypes/AaruMetadata/Sequence.cs
similarity index 100%
rename from AaruMetadata/Sequence.cs
rename to Aaru.CommonTypes/AaruMetadata/Sequence.cs
diff --git a/AaruMetadata/Tape.cs b/Aaru.CommonTypes/AaruMetadata/Tape.cs
similarity index 100%
rename from AaruMetadata/Tape.cs
rename to Aaru.CommonTypes/AaruMetadata/Tape.cs
diff --git a/AaruMetadata/USB.cs b/Aaru.CommonTypes/AaruMetadata/USB.cs
similarity index 100%
rename from AaruMetadata/USB.cs
rename to Aaru.CommonTypes/AaruMetadata/USB.cs
diff --git a/AaruMetadata/UserManual.cs b/Aaru.CommonTypes/AaruMetadata/UserManual.cs
similarity index 100%
rename from AaruMetadata/UserManual.cs
rename to Aaru.CommonTypes/AaruMetadata/UserManual.cs
diff --git a/AaruMetadata/Xbox.cs b/Aaru.CommonTypes/AaruMetadata/Xbox.cs
similarity index 100%
rename from AaruMetadata/Xbox.cs
rename to Aaru.CommonTypes/AaruMetadata/Xbox.cs
diff --git a/Delegates.cs b/Aaru.CommonTypes/Delegates.cs
similarity index 100%
rename from Delegates.cs
rename to Aaru.CommonTypes/Delegates.cs
diff --git a/Enums/DeviceType.cs b/Aaru.CommonTypes/Enums/DeviceType.cs
similarity index 100%
rename from Enums/DeviceType.cs
rename to Aaru.CommonTypes/Enums/DeviceType.cs
diff --git a/Enums/ErrorNumber.cs b/Aaru.CommonTypes/Enums/ErrorNumber.cs
similarity index 100%
rename from Enums/ErrorNumber.cs
rename to Aaru.CommonTypes/Enums/ErrorNumber.cs
diff --git a/Enums/Images.cs b/Aaru.CommonTypes/Enums/Images.cs
similarity index 100%
rename from Enums/Images.cs
rename to Aaru.CommonTypes/Enums/Images.cs
diff --git a/Enums/Nes.cs b/Aaru.CommonTypes/Enums/Nes.cs
similarity index 100%
rename from Enums/Nes.cs
rename to Aaru.CommonTypes/Enums/Nes.cs
diff --git a/Extents/ExtentsByte.cs b/Aaru.CommonTypes/Extents/ExtentsByte.cs
similarity index 100%
rename from Extents/ExtentsByte.cs
rename to Aaru.CommonTypes/Extents/ExtentsByte.cs
diff --git a/Extents/ExtentsConverter.cs b/Aaru.CommonTypes/Extents/ExtentsConverter.cs
similarity index 100%
rename from Extents/ExtentsConverter.cs
rename to Aaru.CommonTypes/Extents/ExtentsConverter.cs
diff --git a/Extents/ExtentsInt.cs b/Aaru.CommonTypes/Extents/ExtentsInt.cs
similarity index 100%
rename from Extents/ExtentsInt.cs
rename to Aaru.CommonTypes/Extents/ExtentsInt.cs
diff --git a/Extents/ExtentsLong.cs b/Aaru.CommonTypes/Extents/ExtentsLong.cs
similarity index 100%
rename from Extents/ExtentsLong.cs
rename to Aaru.CommonTypes/Extents/ExtentsLong.cs
diff --git a/Extents/ExtentsSByte.cs b/Aaru.CommonTypes/Extents/ExtentsSByte.cs
similarity index 100%
rename from Extents/ExtentsSByte.cs
rename to Aaru.CommonTypes/Extents/ExtentsSByte.cs
diff --git a/Extents/ExtentsShort.cs b/Aaru.CommonTypes/Extents/ExtentsShort.cs
similarity index 100%
rename from Extents/ExtentsShort.cs
rename to Aaru.CommonTypes/Extents/ExtentsShort.cs
diff --git a/Extents/ExtentsUInt.cs b/Aaru.CommonTypes/Extents/ExtentsUInt.cs
similarity index 100%
rename from Extents/ExtentsUInt.cs
rename to Aaru.CommonTypes/Extents/ExtentsUInt.cs
diff --git a/Extents/ExtentsULong.cs b/Aaru.CommonTypes/Extents/ExtentsULong.cs
similarity index 100%
rename from Extents/ExtentsULong.cs
rename to Aaru.CommonTypes/Extents/ExtentsULong.cs
diff --git a/Extents/ExtentsUShort.cs b/Aaru.CommonTypes/Extents/ExtentsUShort.cs
similarity index 100%
rename from Extents/ExtentsUShort.cs
rename to Aaru.CommonTypes/Extents/ExtentsUShort.cs
diff --git a/Geometry.cs b/Aaru.CommonTypes/Geometry.cs
similarity index 100%
rename from Geometry.cs
rename to Aaru.CommonTypes/Geometry.cs
diff --git a/Interfaces/IArchive.cs b/Aaru.CommonTypes/Interfaces/IArchive.cs
similarity index 100%
rename from Interfaces/IArchive.cs
rename to Aaru.CommonTypes/Interfaces/IArchive.cs
diff --git a/Interfaces/IBaseImage.cs b/Aaru.CommonTypes/Interfaces/IBaseImage.cs
similarity index 100%
rename from Interfaces/IBaseImage.cs
rename to Aaru.CommonTypes/Interfaces/IBaseImage.cs
diff --git a/Interfaces/IBaseWritableImage.cs b/Aaru.CommonTypes/Interfaces/IBaseWritableImage.cs
similarity index 100%
rename from Interfaces/IBaseWritableImage.cs
rename to Aaru.CommonTypes/Interfaces/IBaseWritableImage.cs
diff --git a/Interfaces/IByteAddressableImage.cs b/Aaru.CommonTypes/Interfaces/IByteAddressableImage.cs
similarity index 100%
rename from Interfaces/IByteAddressableImage.cs
rename to Aaru.CommonTypes/Interfaces/IByteAddressableImage.cs
diff --git a/Interfaces/IChecksum.cs b/Aaru.CommonTypes/Interfaces/IChecksum.cs
similarity index 100%
rename from Interfaces/IChecksum.cs
rename to Aaru.CommonTypes/Interfaces/IChecksum.cs
diff --git a/Interfaces/IFilesystem.cs b/Aaru.CommonTypes/Interfaces/IFilesystem.cs
similarity index 100%
rename from Interfaces/IFilesystem.cs
rename to Aaru.CommonTypes/Interfaces/IFilesystem.cs
diff --git a/Interfaces/IFilter.cs b/Aaru.CommonTypes/Interfaces/IFilter.cs
similarity index 100%
rename from Interfaces/IFilter.cs
rename to Aaru.CommonTypes/Interfaces/IFilter.cs
diff --git a/Interfaces/IFloppyImage.cs b/Aaru.CommonTypes/Interfaces/IFloppyImage.cs
similarity index 100%
rename from Interfaces/IFloppyImage.cs
rename to Aaru.CommonTypes/Interfaces/IFloppyImage.cs
diff --git a/Interfaces/IFluxImage.cs b/Aaru.CommonTypes/Interfaces/IFluxImage.cs
similarity index 100%
rename from Interfaces/IFluxImage.cs
rename to Aaru.CommonTypes/Interfaces/IFluxImage.cs
diff --git a/Interfaces/IMediaGraph.cs b/Aaru.CommonTypes/Interfaces/IMediaGraph.cs
similarity index 100%
rename from Interfaces/IMediaGraph.cs
rename to Aaru.CommonTypes/Interfaces/IMediaGraph.cs
diff --git a/Interfaces/IMediaImage.cs b/Aaru.CommonTypes/Interfaces/IMediaImage.cs
similarity index 100%
rename from Interfaces/IMediaImage.cs
rename to Aaru.CommonTypes/Interfaces/IMediaImage.cs
diff --git a/Interfaces/IOpticalMediaImage.cs b/Aaru.CommonTypes/Interfaces/IOpticalMediaImage.cs
similarity index 100%
rename from Interfaces/IOpticalMediaImage.cs
rename to Aaru.CommonTypes/Interfaces/IOpticalMediaImage.cs
diff --git a/Interfaces/IPartition.cs b/Aaru.CommonTypes/Interfaces/IPartition.cs
similarity index 100%
rename from Interfaces/IPartition.cs
rename to Aaru.CommonTypes/Interfaces/IPartition.cs
diff --git a/Interfaces/IPartitionableMediaImage.cs b/Aaru.CommonTypes/Interfaces/IPartitionableMediaImage.cs
similarity index 100%
rename from Interfaces/IPartitionableMediaImage.cs
rename to Aaru.CommonTypes/Interfaces/IPartitionableMediaImage.cs
diff --git a/Interfaces/IPluginRegister.cs b/Aaru.CommonTypes/Interfaces/IPluginRegister.cs
similarity index 100%
rename from Interfaces/IPluginRegister.cs
rename to Aaru.CommonTypes/Interfaces/IPluginRegister.cs
diff --git a/Interfaces/IReadOnlyFilesystem.cs b/Aaru.CommonTypes/Interfaces/IReadOnlyFilesystem.cs
similarity index 100%
rename from Interfaces/IReadOnlyFilesystem.cs
rename to Aaru.CommonTypes/Interfaces/IReadOnlyFilesystem.cs
diff --git a/Interfaces/ITapeImage.cs b/Aaru.CommonTypes/Interfaces/ITapeImage.cs
similarity index 100%
rename from Interfaces/ITapeImage.cs
rename to Aaru.CommonTypes/Interfaces/ITapeImage.cs
diff --git a/Interfaces/IVerifiableImage.cs b/Aaru.CommonTypes/Interfaces/IVerifiableImage.cs
similarity index 100%
rename from Interfaces/IVerifiableImage.cs
rename to Aaru.CommonTypes/Interfaces/IVerifiableImage.cs
diff --git a/Interfaces/IVerifiableSectorsImage.cs b/Aaru.CommonTypes/Interfaces/IVerifiableSectorsImage.cs
similarity index 100%
rename from Interfaces/IVerifiableSectorsImage.cs
rename to Aaru.CommonTypes/Interfaces/IVerifiableSectorsImage.cs
diff --git a/Interfaces/IWritableFloppyImage.cs b/Aaru.CommonTypes/Interfaces/IWritableFloppyImage.cs
similarity index 100%
rename from Interfaces/IWritableFloppyImage.cs
rename to Aaru.CommonTypes/Interfaces/IWritableFloppyImage.cs
diff --git a/Interfaces/IWritableFluxImage.cs b/Aaru.CommonTypes/Interfaces/IWritableFluxImage.cs
similarity index 100%
rename from Interfaces/IWritableFluxImage.cs
rename to Aaru.CommonTypes/Interfaces/IWritableFluxImage.cs
diff --git a/Interfaces/IWritableImage.cs b/Aaru.CommonTypes/Interfaces/IWritableImage.cs
similarity index 100%
rename from Interfaces/IWritableImage.cs
rename to Aaru.CommonTypes/Interfaces/IWritableImage.cs
diff --git a/Interfaces/IWritableOpticalImage.cs b/Aaru.CommonTypes/Interfaces/IWritableOpticalImage.cs
similarity index 100%
rename from Interfaces/IWritableOpticalImage.cs
rename to Aaru.CommonTypes/Interfaces/IWritableOpticalImage.cs
diff --git a/Interfaces/IWritableTapeImage.cs b/Aaru.CommonTypes/Interfaces/IWritableTapeImage.cs
similarity index 100%
rename from Interfaces/IWritableTapeImage.cs
rename to Aaru.CommonTypes/Interfaces/IWritableTapeImage.cs
diff --git a/Interop/DetectOS.cs b/Aaru.CommonTypes/Interop/DetectOS.cs
similarity index 100%
rename from Interop/DetectOS.cs
rename to Aaru.CommonTypes/Interop/DetectOS.cs
diff --git a/Interop/PlatformID.cs b/Aaru.CommonTypes/Interop/PlatformID.cs
similarity index 100%
rename from Interop/PlatformID.cs
rename to Aaru.CommonTypes/Interop/PlatformID.cs
diff --git a/Interop/Version.cs b/Aaru.CommonTypes/Interop/Version.cs
similarity index 100%
rename from Interop/Version.cs
rename to Aaru.CommonTypes/Interop/Version.cs
diff --git a/Localization/Localization.Designer.cs b/Aaru.CommonTypes/Localization/Localization.Designer.cs
similarity index 100%
rename from Localization/Localization.Designer.cs
rename to Aaru.CommonTypes/Localization/Localization.Designer.cs
diff --git a/Localization/Localization.es.resx b/Aaru.CommonTypes/Localization/Localization.es.resx
similarity index 100%
rename from Localization/Localization.es.resx
rename to Aaru.CommonTypes/Localization/Localization.es.resx
diff --git a/Localization/Localization.resx b/Aaru.CommonTypes/Localization/Localization.resx
similarity index 100%
rename from Localization/Localization.resx
rename to Aaru.CommonTypes/Localization/Localization.resx
diff --git a/MediaType.cs b/Aaru.CommonTypes/MediaType.cs
similarity index 100%
rename from MediaType.cs
rename to Aaru.CommonTypes/MediaType.cs
diff --git a/MediaType.csv b/Aaru.CommonTypes/MediaType.csv
similarity index 100%
rename from MediaType.csv
rename to Aaru.CommonTypes/MediaType.csv
diff --git a/MediaTypeFromDevice/FromAta.cs b/Aaru.CommonTypes/MediaTypeFromDevice/FromAta.cs
similarity index 100%
rename from MediaTypeFromDevice/FromAta.cs
rename to Aaru.CommonTypes/MediaTypeFromDevice/FromAta.cs
diff --git a/MediaTypeFromDevice/FromMmc.cs b/Aaru.CommonTypes/MediaTypeFromDevice/FromMmc.cs
similarity index 100%
rename from MediaTypeFromDevice/FromMmc.cs
rename to Aaru.CommonTypes/MediaTypeFromDevice/FromMmc.cs
diff --git a/MediaTypeFromDevice/FromOdc.cs b/Aaru.CommonTypes/MediaTypeFromDevice/FromOdc.cs
similarity index 100%
rename from MediaTypeFromDevice/FromOdc.cs
rename to Aaru.CommonTypes/MediaTypeFromDevice/FromOdc.cs
diff --git a/MediaTypeFromDevice/FromSbc.cs b/Aaru.CommonTypes/MediaTypeFromDevice/FromSbc.cs
similarity index 100%
rename from MediaTypeFromDevice/FromSbc.cs
rename to Aaru.CommonTypes/MediaTypeFromDevice/FromSbc.cs
diff --git a/MediaTypeFromDevice/FromScsi.cs b/Aaru.CommonTypes/MediaTypeFromDevice/FromScsi.cs
similarity index 100%
rename from MediaTypeFromDevice/FromScsi.cs
rename to Aaru.CommonTypes/MediaTypeFromDevice/FromScsi.cs
diff --git a/MediaTypeFromDevice/FromSsc.cs b/Aaru.CommonTypes/MediaTypeFromDevice/FromSsc.cs
similarity index 100%
rename from MediaTypeFromDevice/FromSsc.cs
rename to Aaru.CommonTypes/MediaTypeFromDevice/FromSsc.cs
diff --git a/Metadata/CdOffset.cs b/Aaru.CommonTypes/Metadata/CdOffset.cs
similarity index 100%
rename from Metadata/CdOffset.cs
rename to Aaru.CommonTypes/Metadata/CdOffset.cs
diff --git a/Metadata/DeviceReport.cs b/Aaru.CommonTypes/Metadata/DeviceReport.cs
similarity index 100%
rename from Metadata/DeviceReport.cs
rename to Aaru.CommonTypes/Metadata/DeviceReport.cs
diff --git a/Metadata/MediaType.cs b/Aaru.CommonTypes/Metadata/MediaType.cs
similarity index 100%
rename from Metadata/MediaType.cs
rename to Aaru.CommonTypes/Metadata/MediaType.cs
diff --git a/Metadata/Resume.cs b/Aaru.CommonTypes/Metadata/Resume.cs
similarity index 100%
rename from Metadata/Resume.cs
rename to Aaru.CommonTypes/Metadata/Resume.cs
diff --git a/Metadata/Statistics.cs b/Aaru.CommonTypes/Metadata/Statistics.cs
similarity index 100%
rename from Metadata/Statistics.cs
rename to Aaru.CommonTypes/Metadata/Statistics.cs
diff --git a/Metadata/Version.cs b/Aaru.CommonTypes/Metadata/Version.cs
similarity index 100%
rename from Metadata/Version.cs
rename to Aaru.CommonTypes/Metadata/Version.cs
diff --git a/Metadata/cicm.cs b/Aaru.CommonTypes/Metadata/cicm.cs
similarity index 100%
rename from Metadata/cicm.cs
rename to Aaru.CommonTypes/Metadata/cicm.cs
diff --git a/Partition.cs b/Aaru.CommonTypes/Partition.cs
similarity index 100%
rename from Partition.cs
rename to Aaru.CommonTypes/Partition.cs
diff --git a/PluginRegister.cs b/Aaru.CommonTypes/PluginRegister.cs
similarity index 100%
rename from PluginRegister.cs
rename to Aaru.CommonTypes/PluginRegister.cs
diff --git a/Structs/Devices/ATA/Identify.cs b/Aaru.CommonTypes/Structs/Devices/ATA/Identify.cs
similarity index 100%
rename from Structs/Devices/ATA/Identify.cs
rename to Aaru.CommonTypes/Structs/Devices/ATA/Identify.cs
diff --git a/Structs/Devices/SCSI/Enums.cs b/Aaru.CommonTypes/Structs/Devices/SCSI/Enums.cs
similarity index 100%
rename from Structs/Devices/SCSI/Enums.cs
rename to Aaru.CommonTypes/Structs/Devices/SCSI/Enums.cs
diff --git a/Structs/Devices/SCSI/Inquiry.cs b/Aaru.CommonTypes/Structs/Devices/SCSI/Inquiry.cs
similarity index 100%
rename from Structs/Devices/SCSI/Inquiry.cs
rename to Aaru.CommonTypes/Structs/Devices/SCSI/Inquiry.cs
diff --git a/Structs/Devices/SCSI/Modes/2A.cs b/Aaru.CommonTypes/Structs/Devices/SCSI/Modes/2A.cs
similarity index 100%
rename from Structs/Devices/SCSI/Modes/2A.cs
rename to Aaru.CommonTypes/Structs/Devices/SCSI/Modes/2A.cs
diff --git a/Structs/Filesystems.cs b/Aaru.CommonTypes/Structs/Filesystems.cs
similarity index 100%
rename from Structs/Filesystems.cs
rename to Aaru.CommonTypes/Structs/Filesystems.cs
diff --git a/Structs/Images.cs b/Aaru.CommonTypes/Structs/Images.cs
similarity index 100%
rename from Structs/Images.cs
rename to Aaru.CommonTypes/Structs/Images.cs
diff --git a/Structs/TapeFile.cs b/Aaru.CommonTypes/Structs/TapeFile.cs
similarity index 100%
rename from Structs/TapeFile.cs
rename to Aaru.CommonTypes/Structs/TapeFile.cs
diff --git a/Structs/TapePartition.cs b/Aaru.CommonTypes/Structs/TapePartition.cs
similarity index 100%
rename from Structs/TapePartition.cs
rename to Aaru.CommonTypes/Structs/TapePartition.cs