diff --git a/.editorconfig b/Aaru.Decoders/.editorconfig
similarity index 100%
rename from .editorconfig
rename to Aaru.Decoders/.editorconfig
diff --git a/.gitignore b/Aaru.Decoders/.gitignore
similarity index 100%
rename from .gitignore
rename to Aaru.Decoders/.gitignore
diff --git a/ATA/Identify.cs b/Aaru.Decoders/ATA/Identify.cs
similarity index 100%
rename from ATA/Identify.cs
rename to Aaru.Decoders/ATA/Identify.cs
diff --git a/ATA/Registers.cs b/Aaru.Decoders/ATA/Registers.cs
similarity index 100%
rename from ATA/Registers.cs
rename to Aaru.Decoders/ATA/Registers.cs
diff --git a/Aaru.Decoders.csproj b/Aaru.Decoders/Aaru.Decoders.csproj
similarity index 100%
rename from Aaru.Decoders.csproj
rename to Aaru.Decoders/Aaru.Decoders.csproj
diff --git a/Aaru.Decoders.csproj.DotSettings b/Aaru.Decoders/Aaru.Decoders.csproj.DotSettings
similarity index 100%
rename from Aaru.Decoders.csproj.DotSettings
rename to Aaru.Decoders/Aaru.Decoders.csproj.DotSettings
diff --git a/Bluray/BCA.cs b/Aaru.Decoders/Bluray/BCA.cs
similarity index 100%
rename from Bluray/BCA.cs
rename to Aaru.Decoders/Bluray/BCA.cs
diff --git a/Bluray/Cartridge.cs b/Aaru.Decoders/Bluray/Cartridge.cs
similarity index 100%
rename from Bluray/Cartridge.cs
rename to Aaru.Decoders/Bluray/Cartridge.cs
diff --git a/Bluray/DDS.cs b/Aaru.Decoders/Bluray/DDS.cs
similarity index 100%
rename from Bluray/DDS.cs
rename to Aaru.Decoders/Bluray/DDS.cs
diff --git a/Bluray/DI.cs b/Aaru.Decoders/Bluray/DI.cs
similarity index 100%
rename from Bluray/DI.cs
rename to Aaru.Decoders/Bluray/DI.cs
diff --git a/Bluray/Spare.cs b/Aaru.Decoders/Bluray/Spare.cs
similarity index 100%
rename from Bluray/Spare.cs
rename to Aaru.Decoders/Bluray/Spare.cs
diff --git a/CD/ATIP.cs b/Aaru.Decoders/CD/ATIP.cs
similarity index 100%
rename from CD/ATIP.cs
rename to Aaru.Decoders/CD/ATIP.cs
diff --git a/CD/CDTextOnLeadIn.cs b/Aaru.Decoders/CD/CDTextOnLeadIn.cs
similarity index 100%
rename from CD/CDTextOnLeadIn.cs
rename to Aaru.Decoders/CD/CDTextOnLeadIn.cs
diff --git a/CD/Enums.cs b/Aaru.Decoders/CD/Enums.cs
similarity index 100%
rename from CD/Enums.cs
rename to Aaru.Decoders/CD/Enums.cs
diff --git a/CD/FullTOC.cs b/Aaru.Decoders/CD/FullTOC.cs
similarity index 100%
rename from CD/FullTOC.cs
rename to Aaru.Decoders/CD/FullTOC.cs
diff --git a/CD/PMA.cs b/Aaru.Decoders/CD/PMA.cs
similarity index 100%
rename from CD/PMA.cs
rename to Aaru.Decoders/CD/PMA.cs
diff --git a/CD/Sector.cs b/Aaru.Decoders/CD/Sector.cs
similarity index 100%
rename from CD/Sector.cs
rename to Aaru.Decoders/CD/Sector.cs
diff --git a/CD/SectorBuilder.cs b/Aaru.Decoders/CD/SectorBuilder.cs
similarity index 100%
rename from CD/SectorBuilder.cs
rename to Aaru.Decoders/CD/SectorBuilder.cs
diff --git a/CD/Session.cs b/Aaru.Decoders/CD/Session.cs
similarity index 100%
rename from CD/Session.cs
rename to Aaru.Decoders/CD/Session.cs
diff --git a/CD/Subchannel.cs b/Aaru.Decoders/CD/Subchannel.cs
similarity index 100%
rename from CD/Subchannel.cs
rename to Aaru.Decoders/CD/Subchannel.cs
diff --git a/CD/TOC.cs b/Aaru.Decoders/CD/TOC.cs
similarity index 100%
rename from CD/TOC.cs
rename to Aaru.Decoders/CD/TOC.cs
diff --git a/DVD/AACS.cs b/Aaru.Decoders/DVD/AACS.cs
similarity index 100%
rename from DVD/AACS.cs
rename to Aaru.Decoders/DVD/AACS.cs
diff --git a/DVD/ADIP.cs b/Aaru.Decoders/DVD/ADIP.cs
similarity index 100%
rename from DVD/ADIP.cs
rename to Aaru.Decoders/DVD/ADIP.cs
diff --git a/DVD/BCA.cs b/Aaru.Decoders/DVD/BCA.cs
similarity index 100%
rename from DVD/BCA.cs
rename to Aaru.Decoders/DVD/BCA.cs
diff --git a/DVD/CPRM.cs b/Aaru.Decoders/DVD/CPRM.cs
similarity index 100%
rename from DVD/CPRM.cs
rename to Aaru.Decoders/DVD/CPRM.cs
diff --git a/DVD/CSS&CPRM.cs b/Aaru.Decoders/DVD/CSS&CPRM.cs
similarity index 100%
rename from DVD/CSS&CPRM.cs
rename to Aaru.Decoders/DVD/CSS&CPRM.cs
diff --git a/DVD/Cartridge.cs b/Aaru.Decoders/DVD/Cartridge.cs
similarity index 100%
rename from DVD/Cartridge.cs
rename to Aaru.Decoders/DVD/Cartridge.cs
diff --git a/DVD/DDS.cs b/Aaru.Decoders/DVD/DDS.cs
similarity index 100%
rename from DVD/DDS.cs
rename to Aaru.Decoders/DVD/DDS.cs
diff --git a/DVD/DMI.cs b/Aaru.Decoders/DVD/DMI.cs
similarity index 100%
rename from DVD/DMI.cs
rename to Aaru.Decoders/DVD/DMI.cs
diff --git a/DVD/Enums.cs b/Aaru.Decoders/DVD/Enums.cs
similarity index 100%
rename from DVD/Enums.cs
rename to Aaru.Decoders/DVD/Enums.cs
diff --git a/DVD/Layers.cs b/Aaru.Decoders/DVD/Layers.cs
similarity index 100%
rename from DVD/Layers.cs
rename to Aaru.Decoders/DVD/Layers.cs
diff --git a/DVD/PFI.cs b/Aaru.Decoders/DVD/PFI.cs
similarity index 100%
rename from DVD/PFI.cs
rename to Aaru.Decoders/DVD/PFI.cs
diff --git a/DVD/PRI.cs b/Aaru.Decoders/DVD/PRI.cs
similarity index 100%
rename from DVD/PRI.cs
rename to Aaru.Decoders/DVD/PRI.cs
diff --git a/DVD/RMD.cs b/Aaru.Decoders/DVD/RMD.cs
similarity index 100%
rename from DVD/RMD.cs
rename to Aaru.Decoders/DVD/RMD.cs
diff --git a/DVD/Sector.cs b/Aaru.Decoders/DVD/Sector.cs
similarity index 100%
rename from DVD/Sector.cs
rename to Aaru.Decoders/DVD/Sector.cs
diff --git a/DVD/Spare.cs b/Aaru.Decoders/DVD/Spare.cs
similarity index 100%
rename from DVD/Spare.cs
rename to Aaru.Decoders/DVD/Spare.cs
diff --git a/DVD/UDI.cs b/Aaru.Decoders/DVD/UDI.cs
similarity index 100%
rename from DVD/UDI.cs
rename to Aaru.Decoders/DVD/UDI.cs
diff --git a/Floppy/Amiga.cs b/Aaru.Decoders/Floppy/Amiga.cs
similarity index 100%
rename from Floppy/Amiga.cs
rename to Aaru.Decoders/Floppy/Amiga.cs
diff --git a/Floppy/Apple2.cs b/Aaru.Decoders/Floppy/Apple2.cs
similarity index 100%
rename from Floppy/Apple2.cs
rename to Aaru.Decoders/Floppy/Apple2.cs
diff --git a/Floppy/AppleSony.cs b/Aaru.Decoders/Floppy/AppleSony.cs
similarity index 100%
rename from Floppy/AppleSony.cs
rename to Aaru.Decoders/Floppy/AppleSony.cs
diff --git a/Floppy/Commodore.cs b/Aaru.Decoders/Floppy/Commodore.cs
similarity index 100%
rename from Floppy/Commodore.cs
rename to Aaru.Decoders/Floppy/Commodore.cs
diff --git a/Floppy/Enums.cs b/Aaru.Decoders/Floppy/Enums.cs
similarity index 100%
rename from Floppy/Enums.cs
rename to Aaru.Decoders/Floppy/Enums.cs
diff --git a/Floppy/ISO.cs b/Aaru.Decoders/Floppy/ISO.cs
similarity index 100%
rename from Floppy/ISO.cs
rename to Aaru.Decoders/Floppy/ISO.cs
diff --git a/Floppy/Perpendicular.cs b/Aaru.Decoders/Floppy/Perpendicular.cs
similarity index 100%
rename from Floppy/Perpendicular.cs
rename to Aaru.Decoders/Floppy/Perpendicular.cs
diff --git a/Floppy/System34.cs b/Aaru.Decoders/Floppy/System34.cs
similarity index 100%
rename from Floppy/System34.cs
rename to Aaru.Decoders/Floppy/System34.cs
diff --git a/Floppy/System3740.cs b/Aaru.Decoders/Floppy/System3740.cs
similarity index 100%
rename from Floppy/System3740.cs
rename to Aaru.Decoders/Floppy/System3740.cs
diff --git a/LisaTag.cs b/Aaru.Decoders/LisaTag.cs
similarity index 100%
rename from LisaTag.cs
rename to Aaru.Decoders/LisaTag.cs
diff --git a/Localization/Localization.Designer.cs b/Aaru.Decoders/Localization/Localization.Designer.cs
similarity index 100%
rename from Localization/Localization.Designer.cs
rename to Aaru.Decoders/Localization/Localization.Designer.cs
diff --git a/Localization/Localization.es.resx b/Aaru.Decoders/Localization/Localization.es.resx
similarity index 100%
rename from Localization/Localization.es.resx
rename to Aaru.Decoders/Localization/Localization.es.resx
diff --git a/Localization/Localization.resx b/Aaru.Decoders/Localization/Localization.resx
similarity index 100%
rename from Localization/Localization.resx
rename to Aaru.Decoders/Localization/Localization.resx
diff --git a/MMC/CID.cs b/Aaru.Decoders/MMC/CID.cs
similarity index 100%
rename from MMC/CID.cs
rename to Aaru.Decoders/MMC/CID.cs
diff --git a/MMC/CSD.cs b/Aaru.Decoders/MMC/CSD.cs
similarity index 100%
rename from MMC/CSD.cs
rename to Aaru.Decoders/MMC/CSD.cs
diff --git a/MMC/ExtendedCSD.cs b/Aaru.Decoders/MMC/ExtendedCSD.cs
similarity index 100%
rename from MMC/ExtendedCSD.cs
rename to Aaru.Decoders/MMC/ExtendedCSD.cs
diff --git a/MMC/OCR.cs b/Aaru.Decoders/MMC/OCR.cs
similarity index 100%
rename from MMC/OCR.cs
rename to Aaru.Decoders/MMC/OCR.cs
diff --git a/MMC/VendorString.cs b/Aaru.Decoders/MMC/VendorString.cs
similarity index 100%
rename from MMC/VendorString.cs
rename to Aaru.Decoders/MMC/VendorString.cs
diff --git a/PCMCIA/CIS.cs b/Aaru.Decoders/PCMCIA/CIS.cs
similarity index 100%
rename from PCMCIA/CIS.cs
rename to Aaru.Decoders/PCMCIA/CIS.cs
diff --git a/PCMCIA/Enums.cs b/Aaru.Decoders/PCMCIA/Enums.cs
similarity index 100%
rename from PCMCIA/Enums.cs
rename to Aaru.Decoders/PCMCIA/Enums.cs
diff --git a/PCMCIA/Types.cs b/Aaru.Decoders/PCMCIA/Types.cs
similarity index 100%
rename from PCMCIA/Types.cs
rename to Aaru.Decoders/PCMCIA/Types.cs
diff --git a/PCMCIA/VendorCode.cs b/Aaru.Decoders/PCMCIA/VendorCode.cs
similarity index 100%
rename from PCMCIA/VendorCode.cs
rename to Aaru.Decoders/PCMCIA/VendorCode.cs
diff --git a/SCSI/DiscStructureCapabilities.cs b/Aaru.Decoders/SCSI/DiscStructureCapabilities.cs
similarity index 100%
rename from SCSI/DiscStructureCapabilities.cs
rename to Aaru.Decoders/SCSI/DiscStructureCapabilities.cs
diff --git a/SCSI/EVPD.cs b/Aaru.Decoders/SCSI/EVPD.cs
similarity index 100%
rename from SCSI/EVPD.cs
rename to Aaru.Decoders/SCSI/EVPD.cs
diff --git a/SCSI/Inquiry.cs b/Aaru.Decoders/SCSI/Inquiry.cs
similarity index 100%
rename from SCSI/Inquiry.cs
rename to Aaru.Decoders/SCSI/Inquiry.cs
diff --git a/SCSI/MMC/AACS.cs b/Aaru.Decoders/SCSI/MMC/AACS.cs
similarity index 100%
rename from SCSI/MMC/AACS.cs
rename to Aaru.Decoders/SCSI/MMC/AACS.cs
diff --git a/SCSI/MMC/CPRM.cs b/Aaru.Decoders/SCSI/MMC/CPRM.cs
similarity index 100%
rename from SCSI/MMC/CPRM.cs
rename to Aaru.Decoders/SCSI/MMC/CPRM.cs
diff --git a/SCSI/MMC/DiscInformation.cs b/Aaru.Decoders/SCSI/MMC/DiscInformation.cs
similarity index 100%
rename from SCSI/MMC/DiscInformation.cs
rename to Aaru.Decoders/SCSI/MMC/DiscInformation.cs
diff --git a/SCSI/MMC/Enums.cs b/Aaru.Decoders/SCSI/MMC/Enums.cs
similarity index 100%
rename from SCSI/MMC/Enums.cs
rename to Aaru.Decoders/SCSI/MMC/Enums.cs
diff --git a/SCSI/MMC/Features.cs b/Aaru.Decoders/SCSI/MMC/Features.cs
similarity index 100%
rename from SCSI/MMC/Features.cs
rename to Aaru.Decoders/SCSI/MMC/Features.cs
diff --git a/SCSI/MMC/Hybrid.cs b/Aaru.Decoders/SCSI/MMC/Hybrid.cs
similarity index 100%
rename from SCSI/MMC/Hybrid.cs
rename to Aaru.Decoders/SCSI/MMC/Hybrid.cs
diff --git a/SCSI/MMC/TrackInformation.cs b/Aaru.Decoders/SCSI/MMC/TrackInformation.cs
similarity index 100%
rename from SCSI/MMC/TrackInformation.cs
rename to Aaru.Decoders/SCSI/MMC/TrackInformation.cs
diff --git a/SCSI/MMC/WriteProtect.cs b/Aaru.Decoders/SCSI/MMC/WriteProtect.cs
similarity index 100%
rename from SCSI/MMC/WriteProtect.cs
rename to Aaru.Decoders/SCSI/MMC/WriteProtect.cs
diff --git a/SCSI/Modes/00_SFF.cs b/Aaru.Decoders/SCSI/Modes/00_SFF.cs
similarity index 100%
rename from SCSI/Modes/00_SFF.cs
rename to Aaru.Decoders/SCSI/Modes/00_SFF.cs
diff --git a/SCSI/Modes/01.cs b/Aaru.Decoders/SCSI/Modes/01.cs
similarity index 100%
rename from SCSI/Modes/01.cs
rename to Aaru.Decoders/SCSI/Modes/01.cs
diff --git a/SCSI/Modes/01_MMC.cs b/Aaru.Decoders/SCSI/Modes/01_MMC.cs
similarity index 100%
rename from SCSI/Modes/01_MMC.cs
rename to Aaru.Decoders/SCSI/Modes/01_MMC.cs
diff --git a/SCSI/Modes/02.cs b/Aaru.Decoders/SCSI/Modes/02.cs
similarity index 100%
rename from SCSI/Modes/02.cs
rename to Aaru.Decoders/SCSI/Modes/02.cs
diff --git a/SCSI/Modes/03.cs b/Aaru.Decoders/SCSI/Modes/03.cs
similarity index 100%
rename from SCSI/Modes/03.cs
rename to Aaru.Decoders/SCSI/Modes/03.cs
diff --git a/SCSI/Modes/04.cs b/Aaru.Decoders/SCSI/Modes/04.cs
similarity index 100%
rename from SCSI/Modes/04.cs
rename to Aaru.Decoders/SCSI/Modes/04.cs
diff --git a/SCSI/Modes/05.cs b/Aaru.Decoders/SCSI/Modes/05.cs
similarity index 100%
rename from SCSI/Modes/05.cs
rename to Aaru.Decoders/SCSI/Modes/05.cs
diff --git a/SCSI/Modes/06.cs b/Aaru.Decoders/SCSI/Modes/06.cs
similarity index 100%
rename from SCSI/Modes/06.cs
rename to Aaru.Decoders/SCSI/Modes/06.cs
diff --git a/SCSI/Modes/07.cs b/Aaru.Decoders/SCSI/Modes/07.cs
similarity index 100%
rename from SCSI/Modes/07.cs
rename to Aaru.Decoders/SCSI/Modes/07.cs
diff --git a/SCSI/Modes/07_MMC.cs b/Aaru.Decoders/SCSI/Modes/07_MMC.cs
similarity index 100%
rename from SCSI/Modes/07_MMC.cs
rename to Aaru.Decoders/SCSI/Modes/07_MMC.cs
diff --git a/SCSI/Modes/08.cs b/Aaru.Decoders/SCSI/Modes/08.cs
similarity index 100%
rename from SCSI/Modes/08.cs
rename to Aaru.Decoders/SCSI/Modes/08.cs
diff --git a/SCSI/Modes/0A.cs b/Aaru.Decoders/SCSI/Modes/0A.cs
similarity index 100%
rename from SCSI/Modes/0A.cs
rename to Aaru.Decoders/SCSI/Modes/0A.cs
diff --git a/SCSI/Modes/0B.cs b/Aaru.Decoders/SCSI/Modes/0B.cs
similarity index 100%
rename from SCSI/Modes/0B.cs
rename to Aaru.Decoders/SCSI/Modes/0B.cs
diff --git a/SCSI/Modes/0C.cs b/Aaru.Decoders/SCSI/Modes/0C.cs
similarity index 100%
rename from SCSI/Modes/0C.cs
rename to Aaru.Decoders/SCSI/Modes/0C.cs
diff --git a/SCSI/Modes/0D.cs b/Aaru.Decoders/SCSI/Modes/0D.cs
similarity index 100%
rename from SCSI/Modes/0D.cs
rename to Aaru.Decoders/SCSI/Modes/0D.cs
diff --git a/SCSI/Modes/0E.cs b/Aaru.Decoders/SCSI/Modes/0E.cs
similarity index 100%
rename from SCSI/Modes/0E.cs
rename to Aaru.Decoders/SCSI/Modes/0E.cs
diff --git a/SCSI/Modes/0F.cs b/Aaru.Decoders/SCSI/Modes/0F.cs
similarity index 100%
rename from SCSI/Modes/0F.cs
rename to Aaru.Decoders/SCSI/Modes/0F.cs
diff --git a/SCSI/Modes/10.cs b/Aaru.Decoders/SCSI/Modes/10.cs
similarity index 100%
rename from SCSI/Modes/10.cs
rename to Aaru.Decoders/SCSI/Modes/10.cs
diff --git a/SCSI/Modes/10_SSC.cs b/Aaru.Decoders/SCSI/Modes/10_SSC.cs
similarity index 100%
rename from SCSI/Modes/10_SSC.cs
rename to Aaru.Decoders/SCSI/Modes/10_SSC.cs
diff --git a/SCSI/Modes/11.cs b/Aaru.Decoders/SCSI/Modes/11.cs
similarity index 100%
rename from SCSI/Modes/11.cs
rename to Aaru.Decoders/SCSI/Modes/11.cs
diff --git a/SCSI/Modes/12_13_14.cs b/Aaru.Decoders/SCSI/Modes/12_13_14.cs
similarity index 100%
rename from SCSI/Modes/12_13_14.cs
rename to Aaru.Decoders/SCSI/Modes/12_13_14.cs
diff --git a/SCSI/Modes/1A.cs b/Aaru.Decoders/SCSI/Modes/1A.cs
similarity index 100%
rename from SCSI/Modes/1A.cs
rename to Aaru.Decoders/SCSI/Modes/1A.cs
diff --git a/SCSI/Modes/1B.cs b/Aaru.Decoders/SCSI/Modes/1B.cs
similarity index 100%
rename from SCSI/Modes/1B.cs
rename to Aaru.Decoders/SCSI/Modes/1B.cs
diff --git a/SCSI/Modes/1C.cs b/Aaru.Decoders/SCSI/Modes/1C.cs
similarity index 100%
rename from SCSI/Modes/1C.cs
rename to Aaru.Decoders/SCSI/Modes/1C.cs
diff --git a/SCSI/Modes/1C_SFF.cs b/Aaru.Decoders/SCSI/Modes/1C_SFF.cs
similarity index 100%
rename from SCSI/Modes/1C_SFF.cs
rename to Aaru.Decoders/SCSI/Modes/1C_SFF.cs
diff --git a/SCSI/Modes/1D.cs b/Aaru.Decoders/SCSI/Modes/1D.cs
similarity index 100%
rename from SCSI/Modes/1D.cs
rename to Aaru.Decoders/SCSI/Modes/1D.cs
diff --git a/SCSI/Modes/21_Certance.cs b/Aaru.Decoders/SCSI/Modes/21_Certance.cs
similarity index 100%
rename from SCSI/Modes/21_Certance.cs
rename to Aaru.Decoders/SCSI/Modes/21_Certance.cs
diff --git a/SCSI/Modes/22_Certance.cs b/Aaru.Decoders/SCSI/Modes/22_Certance.cs
similarity index 100%
rename from SCSI/Modes/22_Certance.cs
rename to Aaru.Decoders/SCSI/Modes/22_Certance.cs
diff --git a/SCSI/Modes/24_IBM.cs b/Aaru.Decoders/SCSI/Modes/24_IBM.cs
similarity index 100%
rename from SCSI/Modes/24_IBM.cs
rename to Aaru.Decoders/SCSI/Modes/24_IBM.cs
diff --git a/SCSI/Modes/2A.cs b/Aaru.Decoders/SCSI/Modes/2A.cs
similarity index 100%
rename from SCSI/Modes/2A.cs
rename to Aaru.Decoders/SCSI/Modes/2A.cs
diff --git a/SCSI/Modes/2F_IBM.cs b/Aaru.Decoders/SCSI/Modes/2F_IBM.cs
similarity index 100%
rename from SCSI/Modes/2F_IBM.cs
rename to Aaru.Decoders/SCSI/Modes/2F_IBM.cs
diff --git a/SCSI/Modes/30_Apple.cs b/Aaru.Decoders/SCSI/Modes/30_Apple.cs
similarity index 100%
rename from SCSI/Modes/30_Apple.cs
rename to Aaru.Decoders/SCSI/Modes/30_Apple.cs
diff --git a/SCSI/Modes/3B_HP.cs b/Aaru.Decoders/SCSI/Modes/3B_HP.cs
similarity index 100%
rename from SCSI/Modes/3B_HP.cs
rename to Aaru.Decoders/SCSI/Modes/3B_HP.cs
diff --git a/SCSI/Modes/3C_HP.cs b/Aaru.Decoders/SCSI/Modes/3C_HP.cs
similarity index 100%
rename from SCSI/Modes/3C_HP.cs
rename to Aaru.Decoders/SCSI/Modes/3C_HP.cs
diff --git a/SCSI/Modes/3D_HP.cs b/Aaru.Decoders/SCSI/Modes/3D_HP.cs
similarity index 100%
rename from SCSI/Modes/3D_HP.cs
rename to Aaru.Decoders/SCSI/Modes/3D_HP.cs
diff --git a/SCSI/Modes/3D_IBM.cs b/Aaru.Decoders/SCSI/Modes/3D_IBM.cs
similarity index 100%
rename from SCSI/Modes/3D_IBM.cs
rename to Aaru.Decoders/SCSI/Modes/3D_IBM.cs
diff --git a/SCSI/Modes/3E_Fujitsu.cs b/Aaru.Decoders/SCSI/Modes/3E_Fujitsu.cs
similarity index 100%
rename from SCSI/Modes/3E_Fujitsu.cs
rename to Aaru.Decoders/SCSI/Modes/3E_Fujitsu.cs
diff --git a/SCSI/Modes/3E_HP.cs b/Aaru.Decoders/SCSI/Modes/3E_HP.cs
similarity index 100%
rename from SCSI/Modes/3E_HP.cs
rename to Aaru.Decoders/SCSI/Modes/3E_HP.cs
diff --git a/SCSI/Modes/Headers.cs b/Aaru.Decoders/SCSI/Modes/Headers.cs
similarity index 100%
rename from SCSI/Modes/Headers.cs
rename to Aaru.Decoders/SCSI/Modes/Headers.cs
diff --git a/SCSI/Modes/Mode10.cs b/Aaru.Decoders/SCSI/Modes/Mode10.cs
similarity index 100%
rename from SCSI/Modes/Mode10.cs
rename to Aaru.Decoders/SCSI/Modes/Mode10.cs
diff --git a/SCSI/Modes/Mode6.cs b/Aaru.Decoders/SCSI/Modes/Mode6.cs
similarity index 100%
rename from SCSI/Modes/Mode6.cs
rename to Aaru.Decoders/SCSI/Modes/Mode6.cs
diff --git a/SCSI/Modes/Structs.cs b/Aaru.Decoders/SCSI/Modes/Structs.cs
similarity index 100%
rename from SCSI/Modes/Structs.cs
rename to Aaru.Decoders/SCSI/Modes/Structs.cs
diff --git a/SCSI/SSC/BlockLimits.cs b/Aaru.Decoders/SCSI/SSC/BlockLimits.cs
similarity index 100%
rename from SCSI/SSC/BlockLimits.cs
rename to Aaru.Decoders/SCSI/SSC/BlockLimits.cs
diff --git a/SCSI/SSC/DensitySupport.cs b/Aaru.Decoders/SCSI/SSC/DensitySupport.cs
similarity index 100%
rename from SCSI/SSC/DensitySupport.cs
rename to Aaru.Decoders/SCSI/SSC/DensitySupport.cs
diff --git a/SCSI/Sense.cs b/Aaru.Decoders/SCSI/Sense.cs
similarity index 100%
rename from SCSI/Sense.cs
rename to Aaru.Decoders/SCSI/Sense.cs
diff --git a/SCSI/Types.cs b/Aaru.Decoders/SCSI/Types.cs
similarity index 100%
rename from SCSI/Types.cs
rename to Aaru.Decoders/SCSI/Types.cs
diff --git a/SCSI/VendorString.cs b/Aaru.Decoders/SCSI/VendorString.cs
similarity index 100%
rename from SCSI/VendorString.cs
rename to Aaru.Decoders/SCSI/VendorString.cs
diff --git a/SecureDigital/CID.cs b/Aaru.Decoders/SecureDigital/CID.cs
similarity index 100%
rename from SecureDigital/CID.cs
rename to Aaru.Decoders/SecureDigital/CID.cs
diff --git a/SecureDigital/CSD.cs b/Aaru.Decoders/SecureDigital/CSD.cs
similarity index 100%
rename from SecureDigital/CSD.cs
rename to Aaru.Decoders/SecureDigital/CSD.cs
diff --git a/SecureDigital/OCR.cs b/Aaru.Decoders/SecureDigital/OCR.cs
similarity index 100%
rename from SecureDigital/OCR.cs
rename to Aaru.Decoders/SecureDigital/OCR.cs
diff --git a/SecureDigital/SCR.cs b/Aaru.Decoders/SecureDigital/SCR.cs
similarity index 100%
rename from SecureDigital/SCR.cs
rename to Aaru.Decoders/SecureDigital/SCR.cs
diff --git a/SecureDigital/VendorString.cs b/Aaru.Decoders/SecureDigital/VendorString.cs
similarity index 100%
rename from SecureDigital/VendorString.cs
rename to Aaru.Decoders/SecureDigital/VendorString.cs
diff --git a/Sega/CD.cs b/Aaru.Decoders/Sega/CD.cs
similarity index 100%
rename from Sega/CD.cs
rename to Aaru.Decoders/Sega/CD.cs
diff --git a/Sega/Dreamcast.cs b/Aaru.Decoders/Sega/Dreamcast.cs
similarity index 100%
rename from Sega/Dreamcast.cs
rename to Aaru.Decoders/Sega/Dreamcast.cs
diff --git a/Sega/Saturn.cs b/Aaru.Decoders/Sega/Saturn.cs
similarity index 100%
rename from Sega/Saturn.cs
rename to Aaru.Decoders/Sega/Saturn.cs
diff --git a/Xbox/DMI.cs b/Aaru.Decoders/Xbox/DMI.cs
similarity index 100%
rename from Xbox/DMI.cs
rename to Aaru.Decoders/Xbox/DMI.cs
diff --git a/Xbox/SS.cs b/Aaru.Decoders/Xbox/SS.cs
similarity index 100%
rename from Xbox/SS.cs
rename to Aaru.Decoders/Xbox/SS.cs