diff --git a/Aaru.Archives/Aaru.Archives.csproj b/Aaru.Archives/Aaru.Archives.csproj
index dc1fe8e06..540392a5b 100644
--- a/Aaru.Archives/Aaru.Archives.csproj
+++ b/Aaru.Archives/Aaru.Archives.csproj
@@ -7,7 +7,6 @@
     <RootNamespace>Aaru.Archives</RootNamespace>
     <AssemblyName>Aaru.Archives</AssemblyName>
     <ReleaseVersion>$(Version)</ReleaseVersion>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <Version>6.0.0-alpha8</Version>
     <Company>Claunia.com</Company>
@@ -42,9 +41,6 @@
     <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
     <NrtShowRevision>true</NrtShowRevision>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Register.cs"/>
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="..\LICENSE.LGPL">
       <Link>LICENSE.LGPL</Link>
diff --git a/Aaru.Checksums b/Aaru.Checksums
index 36af5bd9c..b0ae29077 160000
--- a/Aaru.Checksums
+++ b/Aaru.Checksums
@@ -1 +1 @@
-Subproject commit 36af5bd9c3c60e9b15e5b5f820b54f7dc0a8d293
+Subproject commit b0ae29077ec5a3b143ef631e62395b6fdbf975c8
diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes
index de20a7198..4194929a5 160000
--- a/Aaru.CommonTypes
+++ b/Aaru.CommonTypes
@@ -1 +1 @@
-Subproject commit de20a7198298aaecbe3835c7a6956c3e078a2405
+Subproject commit 4194929a5f0510681da6a876c66f1f3011e10fd9
diff --git a/Aaru.Compression/cuetools.net b/Aaru.Compression/cuetools.net
index becd5fde9..e2c5bb319 160000
--- a/Aaru.Compression/cuetools.net
+++ b/Aaru.Compression/cuetools.net
@@ -1 +1 @@
-Subproject commit becd5fde95b0e336740487ecde6d7add067cee83
+Subproject commit e2c5bb3199c66cb2e17fd3a083564759e7dda703
diff --git a/Aaru.Console b/Aaru.Console
index bf91032e0..72ff6760c 160000
--- a/Aaru.Console
+++ b/Aaru.Console
@@ -1 +1 @@
-Subproject commit bf91032e03b2b8ea4c0b70e99a7c67846939dd39
+Subproject commit 72ff6760c11adf044d66ff7fc5919cc9abd1fb00
diff --git a/Aaru.Core/Aaru.Core.csproj b/Aaru.Core/Aaru.Core.csproj
index e21b26de0..da772568d 100644
--- a/Aaru.Core/Aaru.Core.csproj
+++ b/Aaru.Core/Aaru.Core.csproj
@@ -7,7 +7,6 @@
     <RootNamespace>Aaru.Core</RootNamespace>
     <AssemblyName>Aaru.Core</AssemblyName>
     <ReleaseVersion>$(Version)</ReleaseVersion>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <Version>6.0.0-alpha8</Version>
     <Company>Claunia.com</Company>
@@ -42,98 +41,6 @@
     <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
     <NrtShowRevision>true</NrtShowRevision>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Devices\Dumping\CompactDisc\CdiReady.cs" />
-    <Compile Include="Devices\Dumping\CompactDisc\Data.cs" />
-    <Compile Include="Devices\Dumping\CompactDisc\Dump.cs" />
-    <Compile Include="Devices\Dumping\CompactDisc\Error.cs" />
-    <Compile Include="Devices\Dumping\CompactDisc\LeadOuts.cs" />
-    <Compile Include="Devices\Dumping\CompactDisc\Offset.cs" />
-    <Compile Include="Devices\Dumping\CompactDisc\Plextor.cs" />
-    <Compile Include="Devices\Dumping\CompactDisc\Pregap.cs" />
-    <Compile Include="Devices\Dumping\CompactDisc\Recordable.cs" />
-    <Compile Include="Devices\Dumping\CompactDisc\Subchannel.cs" />
-    <Compile Include="Devices\Dumping\CompactDisc\Tags.cs" />
-    <Compile Include="Devices\Dumping\CompactDisc\Tracks.cs" />
-    <Compile Include="Devices\Dumping\CompactDisc\Trim.cs" />
-    <Compile Include="Devices\Dumping\Dump.cs" />
-    <Compile Include="Devices\Dumping\LinearMemory\Retrode.cs" />
-    <Compile Include="Devices\Dumping\Metadata.cs" />
-    <Compile Include="Devices\Dumping\MiniDisc.cs" />
-    <Compile Include="Devices\Dumping\PlayStationPortable\MemoryStick.cs" />
-    <Compile Include="Devices\Dumping\PlayStationPortable\PlayStationPortable.cs" />
-    <Compile Include="Devices\Dumping\PlayStationPortable\UMD.cs" />
-    <Compile Include="Devices\Dumping\Sbc\Data.cs" />
-    <Compile Include="Devices\Dumping\Sbc\Error.cs" />
-    <Compile Include="Devices\Dumping\Sbc\Dump.cs" />
-    <Compile Include="Devices\Dumping\Sbc\Optical.cs" />
-    <Compile Include="Devices\Dumping\Sbc\Trim.cs" />
-    <Compile Include="Devices\Info\DeviceInfo.cs" />
-    <Compile Include="Devices\Info\Plextor.cs" />
-    <Compile Include="Devices\Info\Properties.cs" />
-    <Compile Include="Devices\Report\DeviceReport.cs" />
-    <Compile Include="Devices\Report\GdRomSwapTrick.cs" />
-    <Compile Include="Devices\Report\Scsi.cs" />
-    <Compile Include="Devices\Report\MMC.cs" />
-    <Compile Include="Devices\Report\SSC.cs" />
-    <Compile Include="Devices\Scanning\MediaScan.cs" />
-    <Compile Include="Entropy.cs" />
-    <Compile Include="GetPluginBase.cs" />
-    <Compile Include="Graphics\BlockMap.cs" />
-    <Compile Include="Graphics\Spiral.cs" />
-    <Compile Include="ImageInfo.cs" />
-    <Compile Include="Logging\ErrorLog.cs" />
-    <Compile Include="Logging\SubchannelLog.cs" />
-    <Compile Include="Media\CompactDisc.cs" />
-    <Compile Include="Media\Detection\MMC.cs" />
-    <Compile Include="Media\Info\CompactDisc.cs" />
-    <Compile Include="Media\Info\ScsiInfo.cs" />
-    <Compile Include="Media\Info\XgdInfo.cs" />
-    <Compile Include="Options.cs" />
-    <Compile Include="ImageFormat.cs" />
-    <Compile Include="Error.cs" />
-    <Compile Include="PrintScsiModePages.cs" />
-    <Compile Include="Sidecar\Files.cs" />
-    <Compile Include="Spectre.cs" />
-    <Compile Include="Statistics.cs" />
-    <Compile Include="Checksum.cs" />
-    <Compile Include="Logging\IBGLog.cs" />
-    <Compile Include="Logging\MHDDLog.cs" />
-    <Compile Include="Devices\Scanning\ATA.cs" />
-    <Compile Include="Devices\Scanning\SecureDigital.cs" />
-    <Compile Include="Devices\Scanning\NVMe.cs" />
-    <Compile Include="Devices\Scanning\SCSI.cs" />
-    <Compile Include="Devices\Dumping\ATA.cs" />
-    <Compile Include="Devices\Dumping\NVMe.cs" />
-    <Compile Include="Devices\Dumping\SCSI.cs" />
-    <Compile Include="Devices\Dumping\SecureDigital.cs" />
-    <Compile Include="DataFile.cs" />
-    <Compile Include="Filesystems.cs" />
-    <Compile Include="Devices\Scanning\ScanResults.cs" />
-    <Compile Include="Devices\Report\ATA.cs" />
-    <Compile Include="Devices\Report\FireWire.cs" />
-    <Compile Include="Devices\Report\USB.cs" />
-    <Compile Include="Devices\Report\SecureDigital.cs" />
-    <Compile Include="Remote.cs" />
-    <Compile Include="Devices\Report\PCMCIA.cs" />
-    <Compile Include="Devices\Reader.cs" />
-    <Compile Include="Devices\ReaderATA.cs" />
-    <Compile Include="Devices\ReaderSCSI.cs" />
-    <Compile Include="Devices\Dumping\SSC.cs" />
-    <Compile Include="Devices\Dumping\MMC.cs" />
-    <Compile Include="Devices\Dumping\XGD.cs" />
-    <Compile Include="Devices\Dumping\ResumeSupport.cs" />
-    <Compile Include="Partitions.cs" />
-    <Compile Include="Sidecar\Events.cs" />
-    <Compile Include="Sidecar\Helpers.cs" />
-    <Compile Include="Sidecar\Sidecar.cs" />
-    <Compile Include="Sidecar\OpticalDisc.cs" />
-    <Compile Include="Sidecar\BlockMedia.cs" />
-    <Compile Include="Sidecar\LinearMedia.cs" />
-    <Compile Include="Sidecar\AudioMedia.cs" />
-    <Compile Include="Sidecar\BlockTape.cs" />
-    <Compile Include="Logging\DumpLog.cs" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Aaru.Archives\Aaru.Archives.csproj" />
     <ProjectReference Include="..\Aaru.Console\Aaru.Console.csproj" />
diff --git a/Aaru.Database/Aaru.Database.csproj b/Aaru.Database/Aaru.Database.csproj
index 154bf8aad..07ca651cd 100644
--- a/Aaru.Database/Aaru.Database.csproj
+++ b/Aaru.Database/Aaru.Database.csproj
@@ -6,7 +6,6 @@
     <RootNamespace>Aaru.Database</RootNamespace>
     <AssemblyName>Aaru.Database</AssemblyName>
     <ReleaseVersion>$(Version)</ReleaseVersion>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <Version>6.0.0-alpha8</Version>
     <Company>Claunia.com</Company>
@@ -57,96 +56,6 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Design" Version="2.0.0-preview1-final"/>
     <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3" PrivateAssets="all"/>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Context.cs"/>
-    <Compile Include="ContextFactory.cs"/>
-    <Compile Include="Migrations\20181126222301_DeviceReportV2.cs"/>
-    <Compile Include="Migrations\20181126222301_DeviceReportV2.Designer.cs"/>
-    <Compile Include="Migrations\20181127001622_AddDeviceBasicFields.cs"/>
-    <Compile Include="Migrations\20181127001622_AddDeviceBasicFields.Designer.cs"/>
-    <Compile Include="Migrations\20181127013131_CorrectReportsDbSet.cs"/>
-    <Compile Include="Migrations\20181127013131_CorrectReportsDbSet.Designer.cs"/>
-    <Compile Include="Migrations\20181221015906_NameValueStatistics.cs"/>
-    <Compile Include="Migrations\20181221015906_NameValueStatistics.Designer.cs"/>
-    <Compile Include="Migrations\20181221032605_MediaStatistics.cs"/>
-    <Compile Include="Migrations\20181221032605_MediaStatistics.Designer.cs"/>
-    <Compile Include="Migrations\20181221034941_SeenDevicesStatistics.cs"/>
-    <Compile Include="Migrations\20181221034941_SeenDevicesStatistics.Designer.cs"/>
-    <Compile Include="Migrations\20181221040408_OperatingSystemStatistics.cs"/>
-    <Compile Include="Migrations\20181221040408_OperatingSystemStatistics.Designer.cs"/>
-    <Compile Include="Migrations\20181221041242_VersionStatistics.cs"/>
-    <Compile Include="Migrations\20181221041242_VersionStatistics.Designer.cs"/>
-    <Compile Include="Migrations\20181221125353_AddStatsCounters.cs"/>
-    <Compile Include="Migrations\20181221125353_AddStatsCounters.Designer.cs"/>
-    <Compile Include="Migrations\20181223183913_FixUnsignedFields.cs"/>
-    <Compile Include="Migrations\20181223183913_FixUnsignedFields.Designer.cs"/>
-    <Compile Include="Migrations\20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.cs"/>
-    <Compile Include="Migrations\20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.Designer.cs"/>
-    <Compile Include="Migrations\20181224044809_StoreUsbIdsInDatabase.cs"/>
-    <Compile Include="Migrations\20181224044809_StoreUsbIdsInDatabase.Designer.cs"/>
-    <Compile Include="Migrations\20181224172147_FixUsbIdsAndIndexes.cs"/>
-    <Compile Include="Migrations\20181224172147_FixUsbIdsAndIndexes.Designer.cs"/>
-    <Compile Include="Migrations\20181225002740_AddCdOffsets.cs"/>
-    <Compile Include="Migrations\20181225002740_AddCdOffsets.Designer.cs"/>
-    <Compile Include="Migrations\20181225152947_StoreMmcGetConfigurationResponse.cs"/>
-    <Compile Include="Migrations\20181225152947_StoreMmcGetConfigurationResponse.Designer.cs"/>
-    <Compile Include="Migrations\20181225214500_StoreReadResultsInReportDatabase.cs"/>
-    <Compile Include="Migrations\20181225214500_StoreReadResultsInReportDatabase.Designer.cs"/>
-    <Compile Include="Migrations\20190102061236_AddMultisessionLeadTest.cs"/>
-    <Compile Include="Migrations\20190102061236_AddMultisessionLeadTest.Designer.cs"/>
-    <Compile Include="Migrations\20190102230036_AddOptimalReadMultipleCount.cs"/>
-    <Compile Include="Migrations\20190102230036_AddOptimalReadMultipleCount.Designer.cs"/>
-    <Compile Include="Migrations\20190108013456_AddChangeableScsiModes.cs"/>
-    <Compile Include="Migrations\20190108013456_AddChangeableScsiModes.Designer.cs"/>
-    <Compile Include="Migrations\20190525183723_IdForDensityCode.cs"/>
-    <Compile Include="Migrations\20190525183723_IdForDensityCode.Designer.cs"/>
-    <Compile Include="Migrations\20191103000828_MakeFieldsUnsigned.cs"/>
-    <Compile Include="Migrations\20191103000828_MakeFieldsUnsigned.Designer.cs"/>
-    <Compile Include="Migrations\20191207175444_SyncWithServerChanges.cs"/>
-    <Compile Include="Migrations\20191207175444_SyncWithServerChanges.Designer.cs"/>
-    <Compile Include="Migrations\20191207183522_AddNameCountModel.cs"/>
-    <Compile Include="Migrations\20191207183522_AddNameCountModel.Designer.cs"/>
-    <Compile Include="Migrations\20191207184342_AddRemoteStats.cs"/>
-    <Compile Include="Migrations\20191207184342_AddRemoteStats.Designer.cs"/>
-    <Compile Include="Migrations\20200710140320_FixIndexes.cs"/>
-    <Compile Include="Migrations\20200710140320_FixIndexes.Designer.cs"/>
-    <Compile Include="Migrations\20200710164101_AddCanReadGdRomUsingSwapDisc.cs"/>
-    <Compile Include="Migrations\20200710164101_AddCanReadGdRomUsingSwapDisc.Designer.cs"/>
-    <Compile Include="Migrations\20200710170129_AddGdRomSwapDiscCapabilities.cs"/>
-    <Compile Include="Migrations\20200710170129_AddGdRomSwapDiscCapabilities.Designer.cs"/>
-    <Compile Include="Migrations\20200710192426_MakeCanReadGdRomUsingSwapDiscNullable.cs"/>
-    <Compile Include="Migrations\20200710192426_MakeCanReadGdRomUsingSwapDiscNullable.Designer.cs"/>
-    <Compile Include="Migrations\20200710194507_AddAudioFieldsToGdromReadCapabilities.cs"/>
-    <Compile Include="Migrations\20200710194507_AddAudioFieldsToGdromReadCapabilities.Designer.cs"/>
-    <Compile Include="Migrations\20200711182425_AddFieldsForF1hCommand06hSubcommand.cs"/>
-    <Compile Include="Migrations\20200711182425_AddFieldsForF1hCommand06hSubcommand.Designer.cs"/>
-    <Compile Include="Migrations\20200711230202_FixGdRomCapabilitiesFieldName.cs"/>
-    <Compile Include="Migrations\20200711230202_FixGdRomCapabilitiesFieldName.Designer.cs"/>
-    <Compile Include="Migrations\20211208214543_AddNesHeaders.cs"/>
-    <Compile Include="Migrations\20211208214543_AddNesHeaders.Designer.cs"/>
-    <Compile Include="Migrations\AaruContextModelSnapshot.cs"/>
-    <Compile Include="Models\BaseModel.cs"/>
-    <Compile Include="Models\BaseOperatingSystem.cs"/>
-    <Compile Include="Models\CdOffset.cs"/>
-    <Compile Include="Models\Command.cs"/>
-    <Compile Include="Models\Device.cs"/>
-    <Compile Include="Models\DeviceStat.cs"/>
-    <Compile Include="Models\Filesystem.cs"/>
-    <Compile Include="Models\Filter.cs"/>
-    <Compile Include="Models\Media.cs"/>
-    <Compile Include="Models\MediaFormat.cs"/>
-    <Compile Include="Models\NameCountModel.cs"/>
-    <Compile Include="Models\NesHeaderInfo.cs"/>
-    <Compile Include="Models\OperatingSystem.cs"/>
-    <Compile Include="Models\Partition.cs"/>
-    <Compile Include="Models\RemoteApplication.cs"/>
-    <Compile Include="Models\RemoteArchitecture.cs"/>
-    <Compile Include="Models\RemoteOperatingSystem.cs"/>
-    <Compile Include="Models\Report.cs"/>
-    <Compile Include="Models\UsbProduct.cs"/>
-    <Compile Include="Models\UsbVendor.cs"/>
-    <Compile Include="Models\Version.cs"/>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj"/>
     <ProjectReference Include="..\Aaru.Decoders\Aaru.Decoders.csproj"/>
diff --git a/Aaru.Decoders b/Aaru.Decoders
index 3c8898a6e..a60a43132 160000
--- a/Aaru.Decoders
+++ b/Aaru.Decoders
@@ -1 +1 @@
-Subproject commit 3c8898a6ec8439c6df6e688bab7ecb1e7a352adc
+Subproject commit a60a431326e60c8e930ab7ed22a5e6448b473afc
diff --git a/Aaru.Devices/Aaru.Devices.csproj b/Aaru.Devices/Aaru.Devices.csproj
index 56e12ef51..46cd51327 100644
--- a/Aaru.Devices/Aaru.Devices.csproj
+++ b/Aaru.Devices/Aaru.Devices.csproj
@@ -7,7 +7,6 @@
     <RootNamespace>Aaru.Devices</RootNamespace>
     <AssemblyName>Aaru.Devices</AssemblyName>
     <ReleaseVersion>$(Version)</ReleaseVersion>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <Version>6.0.0-alpha8</Version>
     <Company>Claunia.com</Company>
@@ -42,68 +41,6 @@
     <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
     <NrtShowRevision>true</NrtShowRevision>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Device\ScsiCommands\MediaTek.cs"/>
-    <Compile Include="Device\ScsiCommands\MiniDisc.cs"/>
-    <Compile Include="Device\ScsiCommands\Optical.cs"/>
-    <Compile Include="Linux\Device.cs"/>
-    <Compile Include="Linux\Extern.cs"/>
-    <Compile Include="Linux\Structs.cs"/>
-    <Compile Include="Linux\Enums.cs"/>
-    <Compile Include="Enums.cs"/>
-    <Compile Include="Localization\Localization.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Localization.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Remote\Command.cs"/>
-    <Compile Include="Remote\Consts.cs"/>
-    <Compile Include="Remote\Device.cs"/>
-    <Compile Include="Remote\Enums.cs"/>
-    <Compile Include="Remote\Remote.cs"/>
-    <Compile Include="Remote\Structs.cs"/>
-    <Compile Include="Windows\Device.cs"/>
-    <Compile Include="Windows\Extern.cs"/>
-    <Compile Include="Windows\ListDevices.cs"/>
-    <Compile Include="Windows\Structs.cs"/>
-    <Compile Include="Windows\Enums.cs"/>
-    <Compile Include="Windows\Command.cs"/>
-    <Compile Include="Linux\Command.cs"/>
-    <Compile Include="Device\Constructor.cs"/>
-    <Compile Include="Device\Variables.cs"/>
-    <Compile Include="Device\Destructor.cs"/>
-    <Compile Include="Device\Commands.cs"/>
-    <Compile Include="Device\ScsiCommands\MMC.cs"/>
-    <Compile Include="Device\ScsiCommands\SPC.cs"/>
-    <Compile Include="Device\ScsiCommands\SBC.cs"/>
-    <Compile Include="Device\ScsiCommands\Pioneer.cs"/>
-    <Compile Include="Device\ScsiCommands\Plextor.cs"/>
-    <Compile Include="Device\ScsiCommands\NEC.cs"/>
-    <Compile Include="Device\ScsiCommands\HL-DT-ST.cs"/>
-    <Compile Include="Device\ScsiCommands\SSC.cs"/>
-    <Compile Include="Device\ScsiCommands\SMC.cs"/>
-    <Compile Include="Device\ScsiCommands\Adaptec.cs"/>
-    <Compile Include="Device\ScsiCommands\ArchiveCorp.cs"/>
-    <Compile Include="Device\ScsiCommands\Certance.cs"/>
-    <Compile Include="Device\ScsiCommands\Fujitsu.cs"/>
-    <Compile Include="Device\ScsiCommands\HP.cs"/>
-    <Compile Include="Device\ScsiCommands\Plasmon.cs"/>
-    <Compile Include="Device\ScsiCommands\SyQuest.cs"/>
-    <Compile Include="Device\AtaCommands\AtaCHS.cs"/>
-    <Compile Include="Device\AtaCommands\Atapi.cs"/>
-    <Compile Include="Device\AtaCommands\Ata28.cs"/>
-    <Compile Include="Device\AtaCommands\Ata48.cs"/>
-    <Compile Include="Device\AtaCommands\Smart.cs"/>
-    <Compile Include="Device\AtaCommands\Cfa.cs"/>
-    <Compile Include="Device\AtaCommands\MCPT.cs"/>
-    <Compile Include="Device\MmcCommands\MMC.cs"/>
-    <Compile Include="Device\MmcCommands\SecureDigital.cs"/>
-    <Compile Include="Device\ScsiCommands\Kreon.cs"/>
-    <Compile Include="Device\List.cs"/>
-    <Compile Include="Linux\ListDevices.cs"/>
-    <Compile Include="Windows\Usb.cs"/>
-    <Compile Include="Windows\UsbFunctions.cs"/>
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="System.Management" Version="7.0.0"/>
     <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3" PrivateAssets="all"/>
diff --git a/Aaru.Dto b/Aaru.Dto
index 3e80d99e2..699fa9a8a 160000
--- a/Aaru.Dto
+++ b/Aaru.Dto
@@ -1 +1 @@
-Subproject commit 3e80d99e27b605f8e47a2d3bf3261712f9e72362
+Subproject commit 699fa9a8ad4a87cce0afe042fedf9ab06c0931a8
diff --git a/Aaru.Filesystems/Aaru.Filesystems.csproj b/Aaru.Filesystems/Aaru.Filesystems.csproj
index ae7bf7dfa..14d15b6f1 100644
--- a/Aaru.Filesystems/Aaru.Filesystems.csproj
+++ b/Aaru.Filesystems/Aaru.Filesystems.csproj
@@ -7,7 +7,6 @@
     <RootNamespace>Aaru.Filesystems</RootNamespace>
     <AssemblyName>Aaru.Filesystems</AssemblyName>
     <ReleaseVersion>$(Version)</ReleaseVersion>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <Version>6.0.0-alpha8</Version>
     <Company>Claunia.com</Company>
@@ -48,178 +47,6 @@
     <PackageReference Include="System.ValueTuple" Version="4.5.0"/>
     <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3" PrivateAssets="all"/>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AppleCommon\Consts.cs"/>
-    <Compile Include="AppleCommon\Enums.cs"/>
-    <Compile Include="AppleCommon\Info.cs"/>
-    <Compile Include="AppleCommon\Structs.cs"/>
-    <Compile Include="AppleHFS\AppleHFS.cs"/>
-    <Compile Include="AppleHFS\Consts.cs"/>
-    <Compile Include="AppleHFS\Enums.cs"/>
-    <Compile Include="AppleHFS\Info.cs"/>
-    <Compile Include="AppleHFS\Structs.cs"/>
-    <Compile Include="Authors.cs"/>
-    <Compile Include="FATX\Consts.cs"/>
-    <Compile Include="FATX\Dir.cs"/>
-    <Compile Include="FATX\FATX.cs"/>
-    <Compile Include="FATX\File.cs"/>
-    <Compile Include="FATX\Info.cs"/>
-    <Compile Include="FATX\Structs.cs"/>
-    <Compile Include="FATX\Super.cs"/>
-    <Compile Include="FAT\BPB.cs"/>
-    <Compile Include="FAT\Consts.cs"/>
-    <Compile Include="FAT\Dir.cs"/>
-    <Compile Include="FAT\FAT.cs"/>
-    <Compile Include="FAT\File.cs"/>
-    <Compile Include="FAT\Info.cs"/>
-    <Compile Include="FAT\Structs.cs"/>
-    <Compile Include="FAT\Super.cs"/>
-    <Compile Include="FAT\Xattr.cs"/>
-    <Compile Include="HPOFS\Consts.cs"/>
-    <Compile Include="HPOFS\HPOFS.cs"/>
-    <Compile Include="HPOFS\Info.cs"/>
-    <Compile Include="HPOFS\Structs.cs"/>
-    <Compile Include="ISO9660\Consts\Internal.cs"/>
-    <Compile Include="ISO9660\Date.cs"/>
-    <Compile Include="ISO9660\Dir.cs"/>
-    <Compile Include="ISO9660\File.cs"/>
-    <Compile Include="ISO9660\Mode2.cs"/>
-    <Compile Include="ISO9660\PathTable.cs"/>
-    <Compile Include="ISO9660\Super.cs"/>
-    <Compile Include="ISO9660\Xattr.cs"/>
-    <Compile Include="Localization\Localization.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Localization.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Opera\Consts.cs"/>
-    <Compile Include="Opera\Dir.cs"/>
-    <Compile Include="Opera\File.cs"/>
-    <Compile Include="Opera\Info.cs"/>
-    <Compile Include="Opera\Opera.cs"/>
-    <Compile Include="Opera\Structs.cs"/>
-    <Compile Include="Opera\Super.cs"/>
-    <Compile Include="PCFX.cs"/>
-    <Compile Include="AmigaDOS.cs"/>
-    <Compile Include="AppleHFSPlus.cs"/>
-    <Compile Include="BFS.cs"/>
-    <Compile Include="ext2FS.cs"/>
-    <Compile Include="extFS.cs"/>
-    <Compile Include="FFS.cs"/>
-    <Compile Include="HPFS.cs"/>
-    <Compile Include="MinixFS.cs"/>
-    <Compile Include="NTFS.cs"/>
-    <Compile Include="ODS.cs"/>
-    <Compile Include="PCEngine.cs"/>
-    <Compile Include="ProDOS.cs"/>
-    <Compile Include="ReFS.cs"/>
-    <Compile Include="Register.cs"/>
-    <Compile Include="SolarFS.cs"/>
-    <Compile Include="Symbian.cs"/>
-    <Compile Include="SysV.cs"/>
-    <Compile Include="UNIXBFS.cs"/>
-    <Compile Include="Acorn.cs"/>
-    <Compile Include="Nintendo.cs"/>
-    <Compile Include="BTRFS.cs"/>
-    <Compile Include="APFS.cs"/>
-    <Compile Include="LisaFS\LisaFS.cs"/>
-    <Compile Include="LisaFS\Consts.cs"/>
-    <Compile Include="LisaFS\Structs.cs"/>
-    <Compile Include="LisaFS\Info.cs"/>
-    <Compile Include="LisaFS\Super.cs"/>
-    <Compile Include="LisaFS\Xattr.cs"/>
-    <Compile Include="LisaFS\Dir.cs"/>
-    <Compile Include="LisaFS\File.cs"/>
-    <Compile Include="LisaFS\Extent.cs"/>
-    <Compile Include="UCSDPascal\UCSDPascal.cs"/>
-    <Compile Include="UCSDPascal\Consts.cs"/>
-    <Compile Include="UCSDPascal\File.cs"/>
-    <Compile Include="UCSDPascal\Info.cs"/>
-    <Compile Include="UCSDPascal\Structs.cs"/>
-    <Compile Include="UCSDPascal\Super.cs"/>
-    <Compile Include="UCSDPascal\Dir.cs"/>
-    <Compile Include="AppleMFS\AppleMFS.cs"/>
-    <Compile Include="AppleMFS\Consts.cs"/>
-    <Compile Include="AppleMFS\Dir.cs"/>
-    <Compile Include="AppleMFS\File.cs"/>
-    <Compile Include="AppleMFS\Info.cs"/>
-    <Compile Include="AppleMFS\Structs.cs"/>
-    <Compile Include="AppleMFS\Super.cs"/>
-    <Compile Include="AppleMFS\Xattr.cs"/>
-    <Compile Include="exFAT.cs"/>
-    <Compile Include="CPM\Info.cs"/>
-    <Compile Include="CPM\CPM.cs"/>
-    <Compile Include="CPM\Structs.cs"/>
-    <Compile Include="CPM\Definitions.cs"/>
-    <Compile Include="CPM\Dir.cs"/>
-    <Compile Include="CPM\Super.cs"/>
-    <Compile Include="CPM\Consts.cs"/>
-    <Compile Include="CPM\File.cs"/>
-    <Compile Include="CPM\Xattr.cs"/>
-    <Compile Include="QNX4.cs"/>
-    <Compile Include="QNX6.cs"/>
-    <Compile Include="JFS.cs"/>
-    <Compile Include="F2FS.cs"/>
-    <Compile Include="NILFS2.cs"/>
-    <Compile Include="Reiser.cs"/>
-    <Compile Include="Reiser4.cs"/>
-    <Compile Include="XFS.cs"/>
-    <Compile Include="PFS.cs"/>
-    <Compile Include="SFS.cs"/>
-    <Compile Include="VMfs.cs"/>
-    <Compile Include="VxFS.cs"/>
-    <Compile Include="Squash.cs"/>
-    <Compile Include="Cram.cs"/>
-    <Compile Include="CBM.cs"/>
-    <Compile Include="UDF.cs"/>
-    <Compile Include="ECMA67.cs"/>
-    <Compile Include="Xia.cs"/>
-    <Compile Include="ZFS.cs"/>
-    <Compile Include="AppleDOS\Dir.cs"/>
-    <Compile Include="AppleDOS\File.cs"/>
-    <Compile Include="AppleDOS\Info.cs"/>
-    <Compile Include="AppleDOS\AppleDOS.cs"/>
-    <Compile Include="AppleDOS\Structs.cs"/>
-    <Compile Include="AppleDOS\Super.cs"/>
-    <Compile Include="AppleDOS\Xattr.cs"/>
-    <Compile Include="AtheOS.cs"/>
-    <Compile Include="HAMMER.cs"/>
-    <Compile Include="Fossil.cs"/>
-    <Compile Include="EFS.cs"/>
-    <Compile Include="UNICOS.cs"/>
-    <Compile Include="RBF.cs"/>
-    <Compile Include="AODOS.cs"/>
-    <Compile Include="RT11.cs"/>
-    <Compile Include="LIF.cs"/>
-    <Compile Include="Locus.cs"/>
-    <Compile Include="dump.cs"/>
-    <Compile Include="MicroDOS.cs"/>
-    <Compile Include="ISO9660\Info.cs"/>
-    <Compile Include="ISO9660\ISO9660.cs"/>
-    <Compile Include="ISO9660\Structs\ISO.cs"/>
-    <Compile Include="ISO9660\Structs\RRIP.cs"/>
-    <Compile Include="ISO9660\Structs\SUSP.cs"/>
-    <Compile Include="ISO9660\Structs\Amiga.cs"/>
-    <Compile Include="ISO9660\Structs\HighSierra.cs"/>
-    <Compile Include="ISO9660\Structs\Apple.cs"/>
-    <Compile Include="ISO9660\Structs\ElTorito.cs"/>
-    <Compile Include="ISO9660\Structs\XA.cs"/>
-    <Compile Include="ISO9660\Structs\Ziso.cs"/>
-    <Compile Include="ISO9660\Structs\Joliet.cs"/>
-    <Compile Include="ISO9660\Structs\Internal.cs"/>
-    <Compile Include="ISO9660\Consts\ISO.cs"/>
-    <Compile Include="ISO9660\Consts\HighSierra.cs"/>
-    <Compile Include="ISO9660\Consts\XA.cs"/>
-    <Compile Include="ISO9660\Consts\ElTorito.cs"/>
-    <Compile Include="ISO9660\Consts\Apple.cs"/>
-    <Compile Include="ISO9660\Consts\RRIP.cs"/>
-    <Compile Include="ISO9660\Consts\Amiga.cs"/>
-    <Compile Include="ISO9660\Consts\SUSP.cs"/>
-    <Compile Include="ISO9660\Consts\Ziso.cs"/>
-    <Compile Include="ISO9660\Consts\AAIP.cs"/>
-    <Compile Include="ISO9660\Structs\CDi.cs"/>
-    <Compile Include="ISO9660\Consts\CDi.cs"/>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Aaru.Checksums\Aaru.Checksums.csproj"/>
     <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj"/>
diff --git a/Aaru.Filters/Aaru.Filters.csproj b/Aaru.Filters/Aaru.Filters.csproj
index 78beb4d70..e441bc940 100644
--- a/Aaru.Filters/Aaru.Filters.csproj
+++ b/Aaru.Filters/Aaru.Filters.csproj
@@ -7,7 +7,6 @@
     <RootNamespace>Aaru.Filters</RootNamespace>
     <AssemblyName>Aaru.Filters</AssemblyName>
     <ReleaseVersion>$(Version)</ReleaseVersion>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <Version>6.0.0-alpha8</Version>
     <Company>Claunia.com</Company>
@@ -42,27 +41,6 @@
     <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
     <NrtShowRevision>true</NrtShowRevision>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Authors.cs"/>
-    <Compile Include="Localization\Localization.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Localization.resx</DependentUpon>
-    </Compile>
-    <Compile Include="OffsetStream.cs"/>
-    <Compile Include="Register.cs"/>
-    <Compile Include="SplitJoinStream.cs"/>
-    <Compile Include="ZZZNoFilter.cs"/>
-    <Compile Include="ForcedSeekStream.cs"/>
-    <Compile Include="GZip.cs"/>
-    <Compile Include="AppleSingle.cs"/>
-    <Compile Include="AppleDouble.cs"/>
-    <Compile Include="MacBinary.cs"/>
-    <Compile Include="BZip2.cs"/>
-    <Compile Include="PCExchange.cs"/>
-    <Compile Include="LZip.cs"/>
-    <Compile Include="XZ.cs"/>
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="..\LICENSE.LGPL">
       <Link>LICENSE.LGPL</Link>
diff --git a/Aaru.Helpers b/Aaru.Helpers
index c9e8b4dd0..e4ca717ef 160000
--- a/Aaru.Helpers
+++ b/Aaru.Helpers
@@ -1 +1 @@
-Subproject commit c9e8b4dd0fddd6a1c222e583090efdfbf6c178dc
+Subproject commit e4ca717ef56a83f2b862bba42e8bab121267a6b3
diff --git a/Aaru.Images/Aaru.Images.csproj b/Aaru.Images/Aaru.Images.csproj
index a72988952..4f262ad2e 100644
--- a/Aaru.Images/Aaru.Images.csproj
+++ b/Aaru.Images/Aaru.Images.csproj
@@ -7,7 +7,6 @@
     <RootNamespace>Aaru.DiscImages</RootNamespace>
     <AssemblyName>Aaru.Images</AssemblyName>
     <ReleaseVersion>$(Version)</ReleaseVersion>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <Version>6.0.0-alpha8</Version>
     <Company>Claunia.com</Company>
@@ -52,477 +51,6 @@
     <PackageReference Include="System.ValueTuple" Version="4.5.0"/>
     <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3" PrivateAssets="all"/>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Alcohol120\Alcohol120.cs"/>
-    <Compile Include="Alcohol120\Constants.cs"/>
-    <Compile Include="Alcohol120\Enums.cs"/>
-    <Compile Include="Alcohol120\Helpers.cs"/>
-    <Compile Include="Alcohol120\Identify.cs"/>
-    <Compile Include="Alcohol120\Properties.cs"/>
-    <Compile Include="Alcohol120\Read.cs"/>
-    <Compile Include="Alcohol120\Structs.cs"/>
-    <Compile Include="Alcohol120\Verify.cs"/>
-    <Compile Include="Alcohol120\Write.cs"/>
-    <Compile Include="Anex86\Anex86.cs"/>
-    <Compile Include="Anex86\Identify.cs"/>
-    <Compile Include="Anex86\Properties.cs"/>
-    <Compile Include="Anex86\Read.cs"/>
-    <Compile Include="Anex86\Structs.cs"/>
-    <Compile Include="Anex86\Unsupported.cs"/>
-    <Compile Include="Anex86\Write.cs"/>
-    <Compile Include="Apple2MG\Constants.cs"/>
-    <Compile Include="Apple2MG\Enums.cs"/>
-    <Compile Include="Apple2MG\Helpers.cs"/>
-    <Compile Include="Apple2MG\Identify.cs"/>
-    <Compile Include="Apple2MG\Properties.cs"/>
-    <Compile Include="Apple2MG\Read.cs"/>
-    <Compile Include="Apple2MG\Structs.cs"/>
-    <Compile Include="Apple2MG\Unsupported.cs"/>
-    <Compile Include="Apple2MG\Write.cs"/>
-    <Compile Include="AppleDOS\Constants.cs"/>
-    <Compile Include="AppleDOS\Identify.cs"/>
-    <Compile Include="AppleDOS\Properties.cs"/>
-    <Compile Include="AppleDOS\Read.cs"/>
-    <Compile Include="AppleDOS\Unsupported.cs"/>
-    <Compile Include="AppleDOS\Write.cs"/>
-    <Compile Include="AppleNIB\Constants.cs"/>
-    <Compile Include="AppleNIB\Identify.cs"/>
-    <Compile Include="AppleNIB\Properties.cs"/>
-    <Compile Include="AppleNIB\Read.cs"/>
-    <Compile Include="AppleNIB\Unsupported.cs"/>
-    <Compile Include="Apridisk\Compression.cs"/>
-    <Compile Include="Apridisk\Constants.cs"/>
-    <Compile Include="Apridisk\Enums.cs"/>
-    <Compile Include="Apridisk\Helpers.cs"/>
-    <Compile Include="Apridisk\Identify.cs"/>
-    <Compile Include="Apridisk\Properties.cs"/>
-    <Compile Include="Apridisk\Read.cs"/>
-    <Compile Include="Apridisk\Structs.cs"/>
-    <Compile Include="Apridisk\Unsupported.cs"/>
-    <Compile Include="Apridisk\Write.cs"/>
-    <Compile Include="Authors.cs"/>
-    <Compile Include="BlindWrite4\Constants.cs"/>
-    <Compile Include="BlindWrite4\Enums.cs"/>
-    <Compile Include="BlindWrite4\Identify.cs"/>
-    <Compile Include="BlindWrite4\Properties.cs"/>
-    <Compile Include="BlindWrite4\Read.cs"/>
-    <Compile Include="BlindWrite4\Structs.cs"/>
-    <Compile Include="BlindWrite4\Verify.cs"/>
-    <Compile Include="BlindWrite5\Constants.cs"/>
-    <Compile Include="BlindWrite5\Enums.cs"/>
-    <Compile Include="BlindWrite5\Helpers.cs"/>
-    <Compile Include="BlindWrite5\Identify.cs"/>
-    <Compile Include="BlindWrite5\Properties.cs"/>
-    <Compile Include="BlindWrite5\Read.cs"/>
-    <Compile Include="BlindWrite5\Structs.cs"/>
-    <Compile Include="BlindWrite5\Verify.cs"/>
-    <Compile Include="BLU\Constants.cs"/>
-    <Compile Include="BLU\Identify.cs"/>
-    <Compile Include="BLU\Properties.cs"/>
-    <Compile Include="BLU\Read.cs"/>
-    <Compile Include="BLU\Unsupported.cs"/>
-    <Compile Include="BLU\Verify.cs"/>
-    <Compile Include="BLU\Write.cs"/>
-    <Compile Include="ByteAddressable\AtariLynx.cs"/>
-    <Compile Include="ByteAddressable\GameBoy.cs"/>
-    <Compile Include="ByteAddressable\GameBoyAdvance.cs"/>
-    <Compile Include="ByteAddressable\MasterSystem.cs"/>
-    <Compile Include="ByteAddressable\NES.cs"/>
-    <Compile Include="ByteAddressable\Nintendo64.cs"/>
-    <Compile Include="ByteAddressable\SegaMegaDrive.cs"/>
-    <Compile Include="ByteAddressable\SuperNintendo.cs"/>
-    <Compile Include="CDRDAO\Constants.cs"/>
-    <Compile Include="CDRDAO\Helpers.cs"/>
-    <Compile Include="CDRDAO\Identify.cs"/>
-    <Compile Include="CDRDAO\Properties.cs"/>
-    <Compile Include="CDRDAO\Read.cs"/>
-    <Compile Include="CDRDAO\Structs.cs"/>
-    <Compile Include="CDRDAO\Verify.cs"/>
-    <Compile Include="CDRDAO\Write.cs"/>
-    <Compile Include="CDRWin\Constants.cs"/>
-    <Compile Include="CDRWin\Helpers.cs"/>
-    <Compile Include="CDRWin\Identify.cs"/>
-    <Compile Include="CDRWin\Properties.cs"/>
-    <Compile Include="CDRWin\Read.cs"/>
-    <Compile Include="CDRWin\Structs.cs"/>
-    <Compile Include="CDRWin\Verify.cs"/>
-    <Compile Include="CDRWin\Write.cs"/>
-    <Compile Include="CHD\Constants.cs"/>
-    <Compile Include="CHD\Enums.cs"/>
-    <Compile Include="CHD\Helpers.cs"/>
-    <Compile Include="CHD\Identify.cs"/>
-    <Compile Include="CHD\Properties.cs"/>
-    <Compile Include="CHD\Read.cs"/>
-    <Compile Include="CHD\Structs.cs"/>
-    <Compile Include="CHD\Verify.cs"/>
-    <Compile Include="CisCopy\Enums.cs"/>
-    <Compile Include="CisCopy\Identify.cs"/>
-    <Compile Include="CisCopy\Properties.cs"/>
-    <Compile Include="CisCopy\Read.cs"/>
-    <Compile Include="CisCopy\Unsupported.cs"/>
-    <Compile Include="CisCopy\Write.cs"/>
-    <Compile Include="CloneCD\Constants.cs"/>
-    <Compile Include="CloneCD\Helpers.cs"/>
-    <Compile Include="CloneCD\Identify.cs"/>
-    <Compile Include="CloneCD\Properties.cs"/>
-    <Compile Include="CloneCD\Read.cs"/>
-    <Compile Include="CloneCD\Verify.cs"/>
-    <Compile Include="CloneCD\Write.cs"/>
-    <Compile Include="CopyQM\Constants.cs"/>
-    <Compile Include="CopyQM\Identify.cs"/>
-    <Compile Include="CopyQM\Properties.cs"/>
-    <Compile Include="CopyQM\Read.cs"/>
-    <Compile Include="CopyQM\Structs.cs"/>
-    <Compile Include="CopyQM\Unsupported.cs"/>
-    <Compile Include="CopyTape\Constants.cs"/>
-    <Compile Include="CopyTape\CopyTape.cs"/>
-    <Compile Include="CopyTape\Identify.cs"/>
-    <Compile Include="CopyTape\Properties.cs"/>
-    <Compile Include="CopyTape\Read.cs"/>
-    <Compile Include="CopyTape\Unsupported.cs"/>
-    <Compile Include="CopyTape\Write.cs"/>
-    <Compile Include="CPCDSK\Constants.cs"/>
-    <Compile Include="CPCDSK\Helpers.cs"/>
-    <Compile Include="CPCDSK\Identify.cs"/>
-    <Compile Include="CPCDSK\Properties.cs"/>
-    <Compile Include="CPCDSK\Read.cs"/>
-    <Compile Include="CPCDSK\Structs.cs"/>
-    <Compile Include="CPCDSK\Unsupported.cs"/>
-    <Compile Include="D88\Constants.cs"/>
-    <Compile Include="D88\Enums.cs"/>
-    <Compile Include="D88\Identify.cs"/>
-    <Compile Include="D88\Properties.cs"/>
-    <Compile Include="D88\Read.cs"/>
-    <Compile Include="D88\Structs.cs"/>
-    <Compile Include="D88\Unsupported.cs"/>
-    <Compile Include="DART\Constants.cs"/>
-    <Compile Include="DART\Identify.cs"/>
-    <Compile Include="DART\Properties.cs"/>
-    <Compile Include="DART\Read.cs"/>
-    <Compile Include="DART\Structs.cs"/>
-    <Compile Include="DART\Unsupported.cs"/>
-    <Compile Include="DIM\Constants.cs"/>
-    <Compile Include="DIM\Enums.cs"/>
-    <Compile Include="DIM\Identify.cs"/>
-    <Compile Include="DIM\Properties.cs"/>
-    <Compile Include="DIM\Read.cs"/>
-    <Compile Include="DIM\Unsupported.cs"/>
-    <Compile Include="DiscFerret\Constants.cs"/>
-    <Compile Include="DiscFerret\DiscFerret.cs"/>
-    <Compile Include="DiscFerret\Identify.cs"/>
-    <Compile Include="DiscFerret\Properties.cs"/>
-    <Compile Include="DiscFerret\Read.cs"/>
-    <Compile Include="DiscFerret\Structs.cs"/>
-    <Compile Include="DiscFerret\Verify.cs"/>
-    <Compile Include="AaruFormat\CdEcc.cs"/>
-    <Compile Include="AaruFormat\ClauniaSubchannelTransform.cs"/>
-    <Compile Include="AaruFormat\Constants.cs"/>
-    <Compile Include="AaruFormat\AaruFormat.cs"/>
-    <Compile Include="AaruFormat\Enums.cs"/>
-    <Compile Include="AaruFormat\Helpers.cs"/>
-    <Compile Include="AaruFormat\Identify.cs"/>
-    <Compile Include="AaruFormat\Properties.cs"/>
-    <Compile Include="AaruFormat\Read.cs"/>
-    <Compile Include="AaruFormat\Structs.cs"/>
-    <Compile Include="AaruFormat\Tape.cs"/>
-    <Compile Include="AaruFormat\Verify.cs"/>
-    <Compile Include="AaruFormat\Write.cs"/>
-    <Compile Include="DiscJuggler\Helpers.cs"/>
-    <Compile Include="DiscJuggler\Identify.cs"/>
-    <Compile Include="DiscJuggler\Properties.cs"/>
-    <Compile Include="DiscJuggler\Read.cs"/>
-    <Compile Include="DiscJuggler\Verify.cs"/>
-    <Compile Include="DiskCopy42\Constants.cs"/>
-    <Compile Include="DiskCopy42\Helpers.cs"/>
-    <Compile Include="DiskCopy42\Identify.cs"/>
-    <Compile Include="DiskCopy42\Properties.cs"/>
-    <Compile Include="DiskCopy42\Read.cs"/>
-    <Compile Include="DiskCopy42\Structs.cs"/>
-    <Compile Include="DiskCopy42\Unsupported.cs"/>
-    <Compile Include="DiskCopy42\Verify.cs"/>
-    <Compile Include="DiskCopy42\Write.cs"/>
-    <Compile Include="DiskDupe\Constants.cs"/>
-    <Compile Include="DiskDupe\DiskDupe.cs"/>
-    <Compile Include="DiskDupe\Helpers.cs"/>
-    <Compile Include="DiskDupe\Identify.cs"/>
-    <Compile Include="DiskDupe\Properties.cs"/>
-    <Compile Include="DiskDupe\Read.cs"/>
-    <Compile Include="DiskDupe\Structs.cs"/>
-    <Compile Include="DiskDupe\Unsupported.cs"/>
-    <Compile Include="DriDiskCopy\Constants.cs"/>
-    <Compile Include="DriDiskCopy\Enums.cs"/>
-    <Compile Include="DriDiskCopy\Identify.cs"/>
-    <Compile Include="DriDiskCopy\Properties.cs"/>
-    <Compile Include="DriDiskCopy\Read.cs"/>
-    <Compile Include="DriDiskCopy\Structs.cs"/>
-    <Compile Include="DriDiskCopy\Unsupported.cs"/>
-    <Compile Include="DriDiskCopy\Write.cs"/>
-    <Compile Include="GDI\Constants.cs"/>
-    <Compile Include="GDI\Identify.cs"/>
-    <Compile Include="GDI\Properties.cs"/>
-    <Compile Include="GDI\Read.cs"/>
-    <Compile Include="GDI\Structs.cs"/>
-    <Compile Include="GDI\Unsupported.cs"/>
-    <Compile Include="GDI\Verify.cs"/>
-    <Compile Include="HDCopy\HDCopy.cs"/>
-    <Compile Include="HDCopy\Helpers.cs"/>
-    <Compile Include="HDCopy\Identify.cs"/>
-    <Compile Include="HDCopy\Properties.cs"/>
-    <Compile Include="HDCopy\Read.cs"/>
-    <Compile Include="HDCopy\Structs.cs"/>
-    <Compile Include="HDCopy\Unsupported.cs"/>
-    <Compile Include="IMD\Constants.cs"/>
-    <Compile Include="IMD\Enums.cs"/>
-    <Compile Include="IMD\Identify.cs"/>
-    <Compile Include="IMD\Properties.cs"/>
-    <Compile Include="IMD\Read.cs"/>
-    <Compile Include="IMD\Unsupported.cs"/>
-    <Compile Include="KryoFlux\Constants.cs"/>
-    <Compile Include="KryoFlux\Enums.cs"/>
-    <Compile Include="KryoFlux\Identify.cs"/>
-    <Compile Include="KryoFlux\KryoFlux.cs"/>
-    <Compile Include="Apple2MG\Apple2MG.cs"/>
-    <Compile Include="CDRWin\CDRWin.cs"/>
-    <Compile Include="DiskCopy42\DiskCopy42.cs"/>
-    <Compile Include="KryoFlux\Properties.cs"/>
-    <Compile Include="KryoFlux\Read.cs"/>
-    <Compile Include="KryoFlux\Structs.cs"/>
-    <Compile Include="KryoFlux\Verify.cs"/>
-    <Compile Include="Localization\Localization.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Localization.resx</DependentUpon>
-    </Compile>
-    <Compile Include="MaxiDisk\Enums.cs"/>
-    <Compile Include="MaxiDisk\Identify.cs"/>
-    <Compile Include="MaxiDisk\Properties.cs"/>
-    <Compile Include="MaxiDisk\Read.cs"/>
-    <Compile Include="MaxiDisk\Structs.cs"/>
-    <Compile Include="MaxiDisk\Unsupported.cs"/>
-    <Compile Include="MaxiDisk\Write.cs"/>
-    <Compile Include="NDIF\Constants.cs"/>
-    <Compile Include="NDIF\Identify.cs"/>
-    <Compile Include="NDIF\Properties.cs"/>
-    <Compile Include="NDIF\Read.cs"/>
-    <Compile Include="NDIF\Structs.cs"/>
-    <Compile Include="NDIF\Unsupported.cs"/>
-    <Compile Include="Nero\Constants.cs"/>
-    <Compile Include="Nero\Enums.cs"/>
-    <Compile Include="Nero\Helpers.cs"/>
-    <Compile Include="Nero\Identify.cs"/>
-    <Compile Include="Nero\Nero.cs"/>
-    <Compile Include="Nero\Properties.cs"/>
-    <Compile Include="Nero\Read.cs"/>
-    <Compile Include="Nero\Structs.cs"/>
-    <Compile Include="Nero\Verify.cs"/>
-    <Compile Include="NHDr0\Constants.cs"/>
-    <Compile Include="NHDr0\Identify.cs"/>
-    <Compile Include="NHDr0\Properties.cs"/>
-    <Compile Include="NHDr0\Read.cs"/>
-    <Compile Include="NHDr0\Structs.cs"/>
-    <Compile Include="NHDr0\Unsupported.cs"/>
-    <Compile Include="NHDr0\Write.cs"/>
-    <Compile Include="Parallels\Constants.cs"/>
-    <Compile Include="Parallels\Identify.cs"/>
-    <Compile Include="Parallels\Properties.cs"/>
-    <Compile Include="Parallels\Read.cs"/>
-    <Compile Include="Parallels\Structs.cs"/>
-    <Compile Include="Parallels\Unsupported.cs"/>
-    <Compile Include="Parallels\Write.cs"/>
-    <Compile Include="PartClone\Constants.cs"/>
-    <Compile Include="PartClone\Helpers.cs"/>
-    <Compile Include="PartClone\Identify.cs"/>
-    <Compile Include="PartClone\Properties.cs"/>
-    <Compile Include="PartClone\Read.cs"/>
-    <Compile Include="PartClone\Structs.cs"/>
-    <Compile Include="PartClone\Unsupported.cs"/>
-    <Compile Include="PartClone\Verify.cs"/>
-    <Compile Include="Partimage\Constants.cs"/>
-    <Compile Include="Partimage\Enums.cs"/>
-    <Compile Include="Partimage\Helpers.cs"/>
-    <Compile Include="Partimage\Identify.cs"/>
-    <Compile Include="Partimage\Properties.cs"/>
-    <Compile Include="Partimage\Read.cs"/>
-    <Compile Include="Partimage\Structs.cs"/>
-    <Compile Include="Partimage\Unsupported.cs"/>
-    <Compile Include="Partimage\Verify.cs"/>
-    <Compile Include="QCOW2\Constants.cs"/>
-    <Compile Include="QCOW2\Identify.cs"/>
-    <Compile Include="QCOW2\Properties.cs"/>
-    <Compile Include="QCOW2\Read.cs"/>
-    <Compile Include="QCOW2\Structs.cs"/>
-    <Compile Include="QCOW2\Unsupported.cs"/>
-    <Compile Include="QCOW2\Write.cs"/>
-    <Compile Include="QCOW\Constants.cs"/>
-    <Compile Include="QCOW\Identify.cs"/>
-    <Compile Include="QCOW\Properties.cs"/>
-    <Compile Include="QCOW\Read.cs"/>
-    <Compile Include="QCOW\Structs.cs"/>
-    <Compile Include="QCOW\Unsupported.cs"/>
-    <Compile Include="QCOW\Write.cs"/>
-    <Compile Include="QED\Constants.cs"/>
-    <Compile Include="QED\Helpers.cs"/>
-    <Compile Include="QED\Identify.cs"/>
-    <Compile Include="QED\Properties.cs"/>
-    <Compile Include="QED\Read.cs"/>
-    <Compile Include="QED\Structs.cs"/>
-    <Compile Include="QED\Unsupported.cs"/>
-    <Compile Include="QED\Write.cs"/>
-    <Compile Include="RayDIM\Constants.cs"/>
-    <Compile Include="RayDIM\Enums.cs"/>
-    <Compile Include="RayDIM\Identify.cs"/>
-    <Compile Include="RayDIM\Properties.cs"/>
-    <Compile Include="RayDIM\Read.cs"/>
-    <Compile Include="RayDIM\Structs.cs"/>
-    <Compile Include="RayDIM\Unsupported.cs"/>
-    <Compile Include="RayDIM\Write.cs"/>
-    <Compile Include="Register.cs"/>
-    <Compile Include="RsIde\Constants.cs"/>
-    <Compile Include="RsIde\Enums.cs"/>
-    <Compile Include="RsIde\Helpers.cs"/>
-    <Compile Include="RsIde\Identify.cs"/>
-    <Compile Include="RsIde\Properties.cs"/>
-    <Compile Include="RsIde\Read.cs"/>
-    <Compile Include="RsIde\Structs.cs"/>
-    <Compile Include="RsIde\Unsupported.cs"/>
-    <Compile Include="RsIde\Write.cs"/>
-    <Compile Include="SaveDskF\Constants.cs"/>
-    <Compile Include="SaveDskF\Identify.cs"/>
-    <Compile Include="SaveDskF\Properties.cs"/>
-    <Compile Include="SaveDskF\Read.cs"/>
-    <Compile Include="SaveDskF\Structs.cs"/>
-    <Compile Include="SaveDskF\Unsupported.cs"/>
-    <Compile Include="SaveDskF\Verify.cs"/>
-    <Compile Include="SaveDskF\Write.cs"/>
-    <Compile Include="SuperCardPro\Constants.cs"/>
-    <Compile Include="SuperCardPro\Enums.cs"/>
-    <Compile Include="SuperCardPro\Helpers.cs"/>
-    <Compile Include="SuperCardPro\Identify.cs"/>
-    <Compile Include="SuperCardPro\Properties.cs"/>
-    <Compile Include="SuperCardPro\Read.cs"/>
-    <Compile Include="SuperCardPro\Structs.cs"/>
-    <Compile Include="SuperCardPro\SuperCardPro.cs"/>
-    <Compile Include="SuperCardPro\Verify.cs"/>
-    <Compile Include="T98\Identify.cs"/>
-    <Compile Include="T98\Properties.cs"/>
-    <Compile Include="T98\Read.cs"/>
-    <Compile Include="T98\Unsupported.cs"/>
-    <Compile Include="T98\Write.cs"/>
-    <Compile Include="TeleDisk\Constants.cs"/>
-    <Compile Include="TeleDisk\Helpers.cs"/>
-    <Compile Include="TeleDisk\Identify.cs"/>
-    <Compile Include="TeleDisk\Properties.cs"/>
-    <Compile Include="TeleDisk\Read.cs"/>
-    <Compile Include="TeleDisk\Structs.cs"/>
-    <Compile Include="TeleDisk\TeleDisk.cs"/>
-    <Compile Include="TeleDisk\Unsupported.cs"/>
-    <Compile Include="TeleDisk\Verify.cs"/>
-    <Compile Include="UDIF\Constants.cs"/>
-    <Compile Include="UDIF\Identify.cs"/>
-    <Compile Include="UDIF\Properties.cs"/>
-    <Compile Include="UDIF\Read.cs"/>
-    <Compile Include="UDIF\Structs.cs"/>
-    <Compile Include="UDIF\Unsupported.cs"/>
-    <Compile Include="UDIF\Write.cs"/>
-    <Compile Include="UkvFdi\Constants.cs"/>
-    <Compile Include="UkvFdi\Enums.cs"/>
-    <Compile Include="UkvFdi\Helpers.cs"/>
-    <Compile Include="UkvFdi\Identify.cs"/>
-    <Compile Include="UkvFdi\Properties.cs"/>
-    <Compile Include="UkvFdi\Read.cs"/>
-    <Compile Include="UkvFdi\Structs.cs"/>
-    <Compile Include="UkvFdi\Unsupported.cs"/>
-    <Compile Include="VDI\Constants.cs"/>
-    <Compile Include="VDI\Enums.cs"/>
-    <Compile Include="VDI\Identify.cs"/>
-    <Compile Include="VDI\Properties.cs"/>
-    <Compile Include="VDI\Read.cs"/>
-    <Compile Include="VDI\Structs.cs"/>
-    <Compile Include="VDI\Unsupported.cs"/>
-    <Compile Include="VDI\Write.cs"/>
-    <Compile Include="VHDX\Constants.cs"/>
-    <Compile Include="VHDX\Helpers.cs"/>
-    <Compile Include="VHDX\Identify.cs"/>
-    <Compile Include="VHDX\Properties.cs"/>
-    <Compile Include="VHDX\Read.cs"/>
-    <Compile Include="VHDX\Structs.cs"/>
-    <Compile Include="VHDX\Unsupported.cs"/>
-    <Compile Include="VHD\Constants.cs"/>
-    <Compile Include="VHD\Helpers.cs"/>
-    <Compile Include="VHD\Identify.cs"/>
-    <Compile Include="VHD\Properties.cs"/>
-    <Compile Include="VHD\Read.cs"/>
-    <Compile Include="VHD\Structs.cs"/>
-    <Compile Include="VHD\Unsupported.cs"/>
-    <Compile Include="VHD\VHD.cs"/>
-    <Compile Include="VHD\Write.cs"/>
-    <Compile Include="Virtual98\Constants.cs"/>
-    <Compile Include="Virtual98\Identify.cs"/>
-    <Compile Include="Virtual98\Properties.cs"/>
-    <Compile Include="Virtual98\Read.cs"/>
-    <Compile Include="Virtual98\Structs.cs"/>
-    <Compile Include="Virtual98\Unsupported.cs"/>
-    <Compile Include="Virtual98\Write.cs"/>
-    <Compile Include="VMware\Constants.cs"/>
-    <Compile Include="VMware\Identify.cs"/>
-    <Compile Include="VMware\Properties.cs"/>
-    <Compile Include="VMware\Read.cs"/>
-    <Compile Include="VMware\Structs.cs"/>
-    <Compile Include="VMware\Unsupported.cs"/>
-    <Compile Include="VMware\Write.cs"/>
-    <Compile Include="WCDiskImage\Identify.cs"/>
-    <Compile Include="WCDiskImage\Properties.cs"/>
-    <Compile Include="WCDiskImage\Read.cs"/>
-    <Compile Include="WCDiskImage\Structs.cs"/>
-    <Compile Include="WCDiskImage\Unsupported.cs"/>
-    <Compile Include="WCDiskImage\WCDiskImage.cs"/>
-    <Compile Include="ZZZRawImage\Constants.cs"/>
-    <Compile Include="ZZZRawImage\Helpers.cs"/>
-    <Compile Include="ZZZRawImage\Identify.cs"/>
-    <Compile Include="ZZZRawImage\Properties.cs"/>
-    <Compile Include="ZZZRawImage\Read.cs"/>
-    <Compile Include="ZZZRawImage\Verify.cs"/>
-    <Compile Include="ZZZRawImage\Write.cs"/>
-    <Compile Include="ZZZRawImage\ZZZRawImage.cs"/>
-    <Compile Include="CDRDAO\CDRDAO.cs"/>
-    <Compile Include="GDI\GDI.cs"/>
-    <Compile Include="BLU\BLU.cs"/>
-    <Compile Include="CopyQM\CopyQM.cs"/>
-    <Compile Include="BlindWrite4\BlindWrite4.cs"/>
-    <Compile Include="BlindWrite5\BlindWrite5.cs"/>
-    <Compile Include="DIM\DIM.cs"/>
-    <Compile Include="CPCDSK\CPCDSK.cs"/>
-    <Compile Include="QCOW\QCOW.cs"/>
-    <Compile Include="QED\QED.cs"/>
-    <Compile Include="QCOW2\QCOW2.cs"/>
-    <Compile Include="Parallels\Parallels.cs"/>
-    <Compile Include="VDI\VDI.cs"/>
-    <Compile Include="VHDX\VHDX.cs"/>
-    <Compile Include="VMware\VMware.cs"/>
-    <Compile Include="UDIF\UDIF.cs"/>
-    <Compile Include="NDIF\NDIF.cs"/>
-    <Compile Include="DART\DART.cs"/>
-    <Compile Include="CHD\CHD.cs"/>
-    <Compile Include="AppleNIB\AppleNIB.cs"/>
-    <Compile Include="CloneCD\CloneCD.cs"/>
-    <Compile Include="DiscJuggler\DiscJuggler.cs"/>
-    <Compile Include="SaveDskF\SaveDskF.cs"/>
-    <Compile Include="AppleDOS\AppleDOS.cs"/>
-    <Compile Include="D88\D88.cs"/>
-    <Compile Include="T98\T98.cs"/>
-    <Compile Include="NHDr0\NHDr0.cs"/>
-    <Compile Include="Virtual98\Virtual98.cs"/>
-    <Compile Include="IMD\IMD.cs"/>
-    <Compile Include="CisCopy\CisCopy.cs"/>
-    <Compile Include="DriDiskCopy\DriDiskCopy.cs"/>
-    <Compile Include="RsIde\RsIde.cs"/>
-    <Compile Include="UkvFdi\UkvFdi.cs"/>
-    <Compile Include="PartClone\PartClone.cs"/>
-    <Compile Include="Partimage\Partimage.cs"/>
-    <Compile Include="Apridisk\Apridisk.cs"/>
-    <Compile Include="MaxiDisk\MaxiDisk.cs"/>
-    <Compile Include="RayDIM\RayDIM.cs"/>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj"/>
     <ProjectReference Include="..\Aaru.Checksums\Aaru.Checksums.csproj"/>
diff --git a/Aaru.Partitions/Aaru.Partitions.csproj b/Aaru.Partitions/Aaru.Partitions.csproj
index cb1087e15..b6af36dbc 100644
--- a/Aaru.Partitions/Aaru.Partitions.csproj
+++ b/Aaru.Partitions/Aaru.Partitions.csproj
@@ -7,7 +7,6 @@
     <RootNamespace>Aaru.Partitions</RootNamespace>
     <AssemblyName>Aaru.Partitions</AssemblyName>
     <ReleaseVersion>$(Version)</ReleaseVersion>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <Version>6.0.0-alpha8</Version>
     <Company>Claunia.com</Company>
@@ -43,36 +42,6 @@
     <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
     <NrtShowRevision>true</NrtShowRevision>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="AppleMap.cs"/>
-    <Compile Include="Atari.cs"/>
-    <Compile Include="Authors.cs"/>
-    <Compile Include="Localization\Localization.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Localization.resx</DependentUpon>
-    </Compile>
-    <Compile Include="MBR.cs"/>
-    <Compile Include="NeXT.cs"/>
-    <Compile Include="RDB.cs"/>
-    <Compile Include="Register.cs"/>
-    <Compile Include="Sun.cs"/>
-    <Compile Include="GPT.cs"/>
-    <Compile Include="RioKarma.cs"/>
-    <Compile Include="BSD.cs"/>
-    <Compile Include="PC98.cs"/>
-    <Compile Include="DEC.cs"/>
-    <Compile Include="SGI.cs"/>
-    <Compile Include="Acorn.cs"/>
-    <Compile Include="DragonFlyBSD.cs"/>
-    <Compile Include="VTOC.cs"/>
-    <Compile Include="Human68k.cs"/>
-    <Compile Include="Xbox.cs"/>
-    <Compile Include="UNIX.cs"/>
-    <Compile Include="XENIX.cs"/>
-    <Compile Include="Plan9.cs"/>
-    <Compile Include="Apricot.cs"/>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj"/>
     <ProjectReference Include="..\Aaru.Helpers\Aaru.Helpers.csproj"/>
diff --git a/Aaru.Settings/Aaru.Settings.csproj b/Aaru.Settings/Aaru.Settings.csproj
index 8b5db0ac8..b64e7a9a1 100644
--- a/Aaru.Settings/Aaru.Settings.csproj
+++ b/Aaru.Settings/Aaru.Settings.csproj
@@ -7,7 +7,6 @@
     <RootNamespace>Aaru.Settings</RootNamespace>
     <AssemblyName>Aaru.Settings</AssemblyName>
     <ReleaseVersion>$(Version)</ReleaseVersion>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <Version>6.0.0-alpha8</Version>
     <Company>Claunia.com</Company>
@@ -42,9 +41,6 @@
     <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
     <NrtShowRevision>true</NrtShowRevision>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Settings.cs"/>
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="..\LICENSE.LGPL">
       <Link>LICENSE.LGPL</Link>
diff --git a/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj b/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj
index 8b4dcce83..b2b25389b 100644
--- a/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj
+++ b/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj
@@ -6,7 +6,6 @@
     <RootNamespace>Aaru.Tests.Devices</RootNamespace>
     <AssemblyName>Aaru.Tests.Devices</AssemblyName>
     <ReleaseVersion>$(Version)</ReleaseVersion>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <TargetFramework>net7.0</TargetFramework>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <Version>6.0.0-alpha8</Version>
@@ -27,51 +26,6 @@
     <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
     <NrtShowRevision>true</NrtShowRevision>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Localization\Localization.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Localization.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Main.cs"/>
-    <Compile Include="Device.cs"/>
-    <Compile Include="Command.cs"/>
-    <Compile Include="SCSI.cs"/>
-    <Compile Include="ATA.cs"/>
-    <Compile Include="NVMe.cs"/>
-    <Compile Include="SCSI_MMC\GdRom.cs"/>
-    <Compile Include="SCSI_MMC\LeadOutTrap.cs"/>
-    <Compile Include="SCSI_MMC\MediaTek.cs"/>
-    <Compile Include="SCSI_MMC\SCSI_MMC.cs"/>
-    <Compile Include="SecureDigital.cs"/>
-    <Compile Include="SCSI\Adaptec.cs"/>
-    <Compile Include="SCSI\ArchiveCorp.cs"/>
-    <Compile Include="SCSI\Certance.cs"/>
-    <Compile Include="SCSI\Fujitsu.cs"/>
-    <Compile Include="SCSI\HL-DT-ST.cs"/>
-    <Compile Include="SCSI\HP.cs"/>
-    <Compile Include="SCSI\Kreon.cs"/>
-    <Compile Include="SCSI\MMC.cs"/>
-    <Compile Include="SCSI\NEC.cs"/>
-    <Compile Include="SCSI\Pioneer.cs"/>
-    <Compile Include="SCSI\Plasmon.cs"/>
-    <Compile Include="SCSI\Plextor.cs"/>
-    <Compile Include="SCSI\SBC.cs"/>
-    <Compile Include="SCSI\SMC.cs"/>
-    <Compile Include="SCSI\SPC.cs"/>
-    <Compile Include="SCSI\SSC.cs"/>
-    <Compile Include="SCSI\SyQuest.cs"/>
-    <Compile Include="ATA\Ata28.cs"/>
-    <Compile Include="ATA\Ata48.cs"/>
-    <Compile Include="ATA\AtaCHS.cs"/>
-    <Compile Include="ATA\Atapi.cs"/>
-    <Compile Include="ATA\Cfa.cs"/>
-    <Compile Include="ATA\MCPT.cs"/>
-    <Compile Include="ATA\Smart.cs"/>
-    <Compile Include="SecureDigital\SecureDigital.cs"/>
-    <Compile Include="SecureDigital\MultiMediaCard.cs"/>
-    <Compile Include="DecodeATARegisters.cs"/>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Aaru.Console\Aaru.Console.csproj"/>
     <ProjectReference Include="..\Aaru.Devices\Aaru.Devices.csproj"/>
diff --git a/Aaru/Aaru.csproj b/Aaru/Aaru.csproj
index 49fe9f4b2..c87b3fedb 100644
--- a/Aaru/Aaru.csproj
+++ b/Aaru/Aaru.csproj
@@ -7,7 +7,6 @@
     <RootNamespace>Aaru</RootNamespace>
     <AssemblyName>aaru</AssemblyName>
     <ReleaseVersion>$(Version)</ReleaseVersion>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <TargetFramework>net7.0</TargetFramework>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <Version>6.0.0-alpha8</Version>
@@ -34,46 +33,6 @@
     <InternalsVisibleTo Include="Aaru.Tests"/>
     <InternalsVisibleTo Include="Aaru.Tests.Devices"/>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Commands\Database\DatabaseFamily.cs"/>
-    <Compile Include="Commands\Database\Statistics.cs"/>
-    <Compile Include="Commands\Database\Update.cs"/>
-    <Compile Include="Commands\Device\DeviceFamily.cs"/>
-    <Compile Include="Commands\Device\Info.cs"/>
-    <Compile Include="Commands\Device\DeviceReport.cs"/>
-    <Compile Include="Commands\Device\List.cs"/>
-    <Compile Include="Commands\Filesystem\Info.cs"/>
-    <Compile Include="Commands\Filesystem\ExtractFiles.cs"/>
-    <Compile Include="Commands\Filesystem\FilesystemFamily.cs"/>
-    <Compile Include="Commands\Filesystem\Options.cs"/>
-    <Compile Include="Commands\Filesystem\Ls.cs"/>
-    <Compile Include="Commands\Formats.cs"/>
-    <Compile Include="Commands\Image\Checksum.cs"/>
-    <Compile Include="Commands\Image\Compare.cs"/>
-    <Compile Include="Commands\Image\Convert.cs"/>
-    <Compile Include="Commands\Image\CreateSidecar.cs"/>
-    <Compile Include="Commands\Image\Decode.cs"/>
-    <Compile Include="Commands\Image\Entropy.cs"/>
-    <Compile Include="Commands\Image\ImageFamily.cs"/>
-    <Compile Include="Commands\Image\Info.cs"/>
-    <Compile Include="Commands\Image\Options.cs"/>
-    <Compile Include="Commands\Image\Print.cs"/>
-    <Compile Include="Commands\Image\Verify.cs"/>
-    <Compile Include="Commands\ListNamespaces.cs"/>
-    <Compile Include="Commands\Media\Dump.cs"/>
-    <Compile Include="Commands\Media\MediaFamily.cs"/>
-    <Compile Include="Commands\Media\Info.cs"/>
-    <Compile Include="Commands\Media\Scan.cs"/>
-    <Compile Include="Commands\Archive\ArchiveFamily.cs"/>
-    <Compile Include="Commands\Archive\Info.cs"/>
-    <Compile Include="Commands\Remote.cs"/>
-    <Compile Include="Main.cs"/>
-    <Compile Include="Commands\Configure.cs"/>
-    <Compile Include="Commands\ListEncodings.cs"/>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Commands\"/>
-  </ItemGroup>
   <ItemGroup>
     <None Remove="Packaging.Targets"/>
   </ItemGroup>