diff --git a/.idea/.idea.Aaru/.idea/contentModel.xml b/.idea/.idea.Aaru/.idea/contentModel.xml
index c84ea25c3..df5381d34 100644
--- a/.idea/.idea.Aaru/.idea/contentModel.xml
+++ b/.idea/.idea.Aaru/.idea/contentModel.xml
@@ -3,8 +3,9 @@
   <component name="ContentModelStore">
     <e p="$APPLICATION_PLUGINS_DIR$/puppet/lib/stubs" t="IncludeRecursive" />
     <e p="$USER_HOME$/.Rider2019.3/system/extResources" t="IncludeRecursive" />
-    <e p="$USER_HOME$/.Rider2019.3/system/resharper-host/local/Transient/ReSharperHost/v193/SolutionCaches/_Aaru.-120348315.00" t="ExcludeRecursive" />
+    <e p="$USER_HOME$/.Rider2019.3/system/resharper-host/local/Transient/ReSharperHost/v193/SolutionCaches/_Aaru.232757112.00" t="ExcludeRecursive" />
     <e p="$USER_HOME$/.config/git/ignore" t="IncludeRecursive" />
+    <e p="$USER_HOME$/.nuget/packages/sqlitepclraw.lib.e_sqlite3.linux/1.1.12/runtimes/linux-x64/native/libe_sqlite3.so" t="Include" />
     <e p="$PROJECT_DIR$" t="IncludeFlat">
       <e p=".git/info/exclude" t="IncludeRecursive" />
       <e p=".git/modules/Aaru.Checksums/info/exclude" t="IncludeRecursive" />
@@ -19,9 +20,8 @@
       <e p=".github/ISSUE_TEMPLATE.md" t="Include" />
       <e p=".github/PULL_REQUEST_TEMPLATE.md" t="Include" />
       <e p=".travis.yml" t="Include" />
-      <e p="CONTRIBUTING.md" t="Include" />
-      <e p="Changelog.md" t="Include" />
       <e p="Aaru" t="IncludeRecursive">
+        <e p="Aaru.csproj" t="IncludeRecursive" />
         <e p="Commands" t="Include">
           <e p="Configure.cs" t="Include" />
           <e p="Database" t="Include">
@@ -66,7 +66,6 @@
           </e>
           <e p="Remote.cs" t="Include" />
         </e>
-        <e p="Aaru.csproj" t="IncludeRecursive" />
         <e p="Info.plist" t="Include" />
         <e p="MacIcon.icns" t="Include" />
         <e p="Main.cs" t="Include" />
@@ -86,13 +85,136 @@
       </e>
       <e p="Aaru.Checksums" t="IncludeRecursive">
         <e p="Aaru.Checksums.csproj" t="IncludeRecursive" />
+        <e p="Adler32Context.cs" t="Include" />
+        <e p="CDChecksums.cs" t="Include" />
+        <e p="CRC16CCITTContext.cs" t="Include" />
+        <e p="CRC16Context.cs" t="Include" />
+        <e p="CRC16IBMContext.cs" t="Include" />
+        <e p="CRC32Context.cs" t="Include" />
+        <e p="CRC64Context.cs" t="Include" />
+        <e p="FletcherContext.cs" t="Include" />
+        <e p="MD5Context.cs" t="Include" />
+        <e p="ReedSolomon.cs" t="Include" />
+        <e p="Register.cs" t="Include" />
+        <e p="SHA1Context.cs" t="Include" />
+        <e p="SHA256Context.cs" t="Include" />
+        <e p="SHA384Context.cs" t="Include" />
+        <e p="SHA512Context.cs" t="Include" />
+        <e p="SpamSumContext.cs" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="net461" t="Include">
+              <e p="Aaru.Checksums.AssemblyInfo.cs" t="Include" />
+            </e>
+            <e p="netcoreapp2.0" t="Include">
+              <e p="Aaru.Checksums.AssemblyInfo.cs" t="Include" />
+            </e>
+            <e p="netstandard2.0" t="Include">
+              <e p="Aaru.Checksums.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
       </e>
       <e p="Aaru.CommonTypes" t="IncludeRecursive">
+        <e p=".gitignore" t="Include" />
         <e p="Aaru.CommonTypes.csproj" t="IncludeRecursive" />
+        <e p="Enums" t="Include">
+          <e p="DeviceType.cs" t="Include" />
+          <e p="ErrorNumber.cs" t="Include" />
+          <e p="Images.cs" t="Include" />
+        </e>
+        <e p="Exceptions" t="Include">
+          <e p="Images.cs" t="Include" />
+        </e>
+        <e p="Extents" t="Include">
+          <e p="ExtentsByte.cs" t="Include" />
+          <e p="ExtentsConverter.cs" t="Include" />
+          <e p="ExtentsInt.cs" t="Include" />
+          <e p="ExtentsLong.cs" t="Include" />
+          <e p="ExtentsSByte.cs" t="Include" />
+          <e p="ExtentsShort.cs" t="Include" />
+          <e p="ExtentsUInt.cs" t="Include" />
+          <e p="ExtentsULong.cs" t="Include" />
+          <e p="ExtentsUShort.cs" t="Include" />
+        </e>
+        <e p="Filters.cs" t="Include" />
+        <e p="Geometry.cs" t="Include" />
+        <e p="Interfaces" t="Include">
+          <e p="IArchive.cs" t="Include" />
+          <e p="IChecksum.cs" t="Include" />
+          <e p="IFilesystem.cs" t="Include" />
+          <e p="IFilter.cs" t="Include" />
+          <e p="IFloppyImage.cs" t="Include" />
+          <e p="IMediaImage.cs" t="Include" />
+          <e p="IOpticalMediaImage.cs" t="Include" />
+          <e p="IPartition.cs" t="Include" />
+          <e p="IPartitionableMediaImage.cs" t="Include" />
+          <e p="IPluginRegister.cs" t="Include" />
+          <e p="IReadOnlyFilesystem.cs" t="Include" />
+          <e p="ITapeImage.cs" t="Include" />
+          <e p="IVerifiableImage.cs" t="Include" />
+          <e p="IVerifiableSectorsImage.cs" t="Include" />
+          <e p="IWritableFloppyImage.cs" t="Include" />
+          <e p="IWritableImage.cs" t="Include" />
+          <e p="IWritableOpticalImage.cs" t="Include" />
+          <e p="IWritableTapeImage.cs" t="Include" />
+        </e>
+        <e p="Interop" t="Include">
+          <e p="DetectOS.cs" t="Include" />
+          <e p="PlatformID.cs" t="Include" />
+          <e p="Version.cs" t="Include" />
+        </e>
+        <e p="MediaType.cs" t="Include" />
+        <e p="MediaTypeFromDevice.cs" t="Include" />
+        <e p="Metadata" t="Include">
+          <e p="CdOffset.cs" t="Include" />
+          <e p="DeviceReport.cs" t="Include" />
+          <e p="DeviceReportV2.cs" t="Include" />
+          <e p="Dimensions.cs" t="Include" />
+          <e p="MediaType.cs" t="Include" />
+          <e p="Resume.cs" t="Include" />
+          <e p="Statistics.cs" t="Include" />
+          <e p="Version.cs" t="Include" />
+        </e>
+        <e p="Partition.cs" t="Include" />
+        <e p="PluginBase.cs" t="Include" />
+        <e p="Structs" t="Include">
+          <e p="Devices" t="Include">
+            <e p="ATA" t="Include">
+              <e p="Identify.cs" t="Include" />
+            </e>
+            <e p="SCSI" t="Include">
+              <e p="Enums.cs" t="Include" />
+              <e p="Inquiry.cs" t="Include" />
+              <e p="Modes" t="Include">
+                <e p="2A.cs" t="Include" />
+              </e>
+            </e>
+          </e>
+          <e p="Filesystems.cs" t="Include" />
+          <e p="Images.cs" t="Include" />
+          <e p="TapeFile.cs" t="Include" />
+          <e p="TapePartition.cs" t="Include" />
+        </e>
+        <e p="bin" t="ExcludeRecursive" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="net461" t="Include">
+              <e p="Aaru.CommonTypes.AssemblyInfo.cs" t="Include" />
+            </e>
+            <e p="netcoreapp2.0" t="Include">
+              <e p="Aaru.CommonTypes.AssemblyInfo.cs" t="Include" />
+            </e>
+            <e p="netstandard2.0" t="Include">
+              <e p="Aaru.CommonTypes.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
       </e>
       <e p="Aaru.Compression" t="IncludeRecursive">
-        <e p="AppleRle.cs" t="Include" />
         <e p="Aaru.Compression.csproj" t="IncludeRecursive" />
+        <e p="AppleRle.cs" t="Include" />
         <e p="TeleDiskLzh.cs" t="Include" />
         <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
@@ -110,9 +232,26 @@
         </e>
       </e>
       <e p="Aaru.Console" t="IncludeRecursive">
+        <e p=".gitignore" t="Include" />
         <e p="Aaru.Console.csproj" t="IncludeRecursive" />
+        <e p="DicConsole.cs" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="net461" t="Include">
+              <e p="Aaru.Console.AssemblyInfo.cs" t="Include" />
+            </e>
+            <e p="netcoreapp2.0" t="Include">
+              <e p="Aaru.Console.AssemblyInfo.cs" t="Include" />
+            </e>
+            <e p="netstandard2.0" t="Include">
+              <e p="Aaru.Console.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
       </e>
       <e p="Aaru.Core" t="IncludeRecursive">
+        <e p="Aaru.Core.csproj" t="IncludeRecursive" />
         <e p="Checksum.cs" t="Include" />
         <e p="DataFile.cs" t="Include" />
         <e p="Delegates.cs" t="Include" />
@@ -170,8 +309,7 @@
             <e p="SecureDigital.cs" t="Include" />
           </e>
         </e>
-        <e p="Aaru.Core.csproj" t="IncludeRecursive" />
-        <e p="Aaru.Core.csproj.DotSettings" t="Include" />
+        <e p="DiscImageChef.Core.csproj.DotSettings" t="Include" />
         <e p="Entropy.cs" t="Include" />
         <e p="Error.cs" t="Include" />
         <e p="Filesystems.cs" t="Include" />
@@ -225,9 +363,9 @@
         </e>
       </e>
       <e p="Aaru.Database" t="IncludeRecursive">
+        <e p="Aaru.Database.csproj" t="IncludeRecursive" />
         <e p="Context.cs" t="Include" />
         <e p="ContextFactory.cs" t="Include" />
-        <e p="Aaru.Database.csproj" t="IncludeRecursive" />
         <e p="Migrations" t="Include">
           <e p="20181126222301_DeviceReportV2.Designer.cs" t="Include" />
           <e p="20181126222301_DeviceReportV2.cs" t="Include" />
@@ -317,9 +455,169 @@
         </e>
       </e>
       <e p="Aaru.Decoders" t="IncludeRecursive">
+        <e p=".gitignore" t="Include" />
+        <e p="ATA" t="Include">
+          <e p="Identify.cs" t="Include" />
+          <e p="Registers.cs" t="Include" />
+        </e>
         <e p="Aaru.Decoders.csproj" t="IncludeRecursive" />
+        <e p="Blu-ray" t="Include">
+          <e p="BCA.cs" t="Include" />
+          <e p="Cartridge.cs" t="Include" />
+          <e p="DDS.cs" t="Include" />
+          <e p="DI.cs" t="Include" />
+          <e p="Spare.cs" t="Include" />
+        </e>
+        <e p="CD" t="Include">
+          <e p="ATIP.cs" t="Include" />
+          <e p="CDTextOnLeadIn.cs" t="Include" />
+          <e p="Enums.cs" t="Include" />
+          <e p="FullTOC.cs" t="Include" />
+          <e p="PMA.cs" t="Include" />
+          <e p="Sector.cs" t="Include" />
+          <e p="Session.cs" t="Include" />
+          <e p="TOC.cs" t="Include" />
+        </e>
+        <e p="DVD" t="Include">
+          <e p="AACS.cs" t="Include" />
+          <e p="ADIP.cs" t="Include" />
+          <e p="BCA.cs" t="Include" />
+          <e p="CPRM.cs" t="Include" />
+          <e p="CSS&amp;CPRM.cs" t="Include" />
+          <e p="Cartridge.cs" t="Include" />
+          <e p="DDS.cs" t="Include" />
+          <e p="DMI.cs" t="Include" />
+          <e p="Enums.cs" t="Include" />
+          <e p="Layers.cs" t="Include" />
+          <e p="PFI.cs" t="Include" />
+          <e p="PRI.cs" t="Include" />
+          <e p="RMD.cs" t="Include" />
+          <e p="Spare.cs" t="Include" />
+          <e p="UDI.cs" t="Include" />
+        </e>
+        <e p="Floppy" t="Include">
+          <e p="Amiga.cs" t="Include" />
+          <e p="Apple2.cs" t="Include" />
+          <e p="AppleSony.cs" t="Include" />
+          <e p="Commodore.cs" t="Include" />
+          <e p="Enums.cs" t="Include" />
+          <e p="ISO.cs" t="Include" />
+          <e p="Perpendicular.cs" t="Include" />
+          <e p="System34.cs" t="Include" />
+          <e p="System3740.cs" t="Include" />
+        </e>
+        <e p="LisaTag.cs" t="Include" />
+        <e p="MMC" t="Include">
+          <e p="CID.cs" t="Include" />
+          <e p="CSD.cs" t="Include" />
+          <e p="ExtendedCSD.cs" t="Include" />
+          <e p="OCR.cs" t="Include" />
+          <e p="VendorString.cs" t="Include" />
+        </e>
+        <e p="PCMCIA" t="Include">
+          <e p="CIS.cs" t="Include" />
+          <e p="Enums.cs" t="Include" />
+          <e p="Types.cs" t="Include" />
+          <e p="VendorCode.cs" t="Include" />
+        </e>
+        <e p="SCSI" t="Include">
+          <e p="DiscStructureCapabilities.cs" t="Include" />
+          <e p="EVPD.cs" t="Include" />
+          <e p="Inquiry.cs" t="Include" />
+          <e p="MMC" t="Include">
+            <e p="AACS.cs" t="Include" />
+            <e p="CPRM.cs" t="Include" />
+            <e p="DiscInformation.cs" t="Include" />
+            <e p="Enums.cs" t="Include" />
+            <e p="Features.cs" t="Include" />
+            <e p="Hybrid.cs" t="Include" />
+            <e p="WriteProtect.cs" t="Include" />
+          </e>
+          <e p="Modes" t="Include">
+            <e p="00_SFF.cs" t="Include" />
+            <e p="01.cs" t="Include" />
+            <e p="01_MMC.cs" t="Include" />
+            <e p="02.cs" t="Include" />
+            <e p="03.cs" t="Include" />
+            <e p="04.cs" t="Include" />
+            <e p="05.cs" t="Include" />
+            <e p="06.cs" t="Include" />
+            <e p="07.cs" t="Include" />
+            <e p="07_MMC.cs" t="Include" />
+            <e p="08.cs" t="Include" />
+            <e p="0A.cs" t="Include" />
+            <e p="0B.cs" t="Include" />
+            <e p="0C.cs" t="Include" />
+            <e p="0D.cs" t="Include" />
+            <e p="0E.cs" t="Include" />
+            <e p="0F.cs" t="Include" />
+            <e p="10.cs" t="Include" />
+            <e p="10_SSC.cs" t="Include" />
+            <e p="11.cs" t="Include" />
+            <e p="12_13_14.cs" t="Include" />
+            <e p="1A.cs" t="Include" />
+            <e p="1B.cs" t="Include" />
+            <e p="1C.cs" t="Include" />
+            <e p="1C_SFF.cs" t="Include" />
+            <e p="1D.cs" t="Include" />
+            <e p="21_Certance.cs" t="Include" />
+            <e p="22_Certance.cs" t="Include" />
+            <e p="24_IBM.cs" t="Include" />
+            <e p="2A.cs" t="Include" />
+            <e p="2F_IBM.cs" t="Include" />
+            <e p="30_Apple.cs" t="Include" />
+            <e p="3B_HP.cs" t="Include" />
+            <e p="3C_HP.cs" t="Include" />
+            <e p="3D_HP.cs" t="Include" />
+            <e p="3D_IBM.cs" t="Include" />
+            <e p="3E_Fujitsu.cs" t="Include" />
+            <e p="3E_HP.cs" t="Include" />
+            <e p="Headers.cs" t="Include" />
+            <e p="Mode10.cs" t="Include" />
+            <e p="Mode6.cs" t="Include" />
+            <e p="Structs.cs" t="Include" />
+          </e>
+          <e p="SSC" t="Include">
+            <e p="BlockLimits.cs" t="Include" />
+            <e p="DensitySupport.cs" t="Include" />
+          </e>
+          <e p="Sense.cs" t="Include" />
+          <e p="Types.cs" t="Include" />
+          <e p="VendorString.cs" t="Include" />
+        </e>
+        <e p="SecureDigital" t="Include">
+          <e p="CID.cs" t="Include" />
+          <e p="CSD.cs" t="Include" />
+          <e p="OCR.cs" t="Include" />
+          <e p="SCR.cs" t="Include" />
+          <e p="VendorString.cs" t="Include" />
+        </e>
+        <e p="Sega" t="Include">
+          <e p="CD.cs" t="Include" />
+          <e p="Dreamcast.cs" t="Include" />
+          <e p="Saturn.cs" t="Include" />
+        </e>
+        <e p="Xbox" t="Include">
+          <e p="DMI.cs" t="Include" />
+          <e p="SS.cs" t="Include" />
+        </e>
+        <e p="bin" t="ExcludeRecursive" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="net461" t="Include">
+              <e p="Aaru.Decoders.AssemblyInfo.cs" t="Include" />
+            </e>
+            <e p="netcoreapp2.0" t="Include">
+              <e p="Aaru.Decoders.AssemblyInfo.cs" t="Include" />
+            </e>
+            <e p="netstandard2.0" t="Include">
+              <e p="Aaru.Decoders.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
       </e>
       <e p="Aaru.Devices" t="IncludeRecursive">
+        <e p="Aaru.Devices.csproj" t="IncludeRecursive" />
         <e p="Command.cs" t="Include" />
         <e p="Device" t="Include">
           <e p="AtaCommands" t="Include">
@@ -361,7 +659,6 @@
           </e>
           <e p="Variables.cs" t="Include" />
         </e>
-        <e p="Aaru.Devices.csproj" t="IncludeRecursive" />
         <e p="Enums.cs" t="Include" />
         <e p="FreeBSD" t="Include">
           <e p="Command.cs" t="Include" />
@@ -408,6 +705,7 @@
         </e>
       </e>
       <e p="Aaru.DiscImages" t="IncludeRecursive">
+        <e p="Aaru.DiscImages.csproj" t="IncludeRecursive" />
         <e p="Alcohol120" t="Include">
           <e p="Alcohol120.cs" t="Include" />
           <e p="Constants.cs" t="Include" />
@@ -620,11 +918,11 @@
           <e p="Structs.cs" t="Include" />
           <e p="Verify.cs" t="Include" />
         </e>
-        <e p="Aaru" t="Include">
+        <e p="DiscImageChef" t="Include">
           <e p="CdEcc.cs" t="Include" />
           <e p="ClauniaSubchannelTransform.cs" t="Include" />
           <e p="Constants.cs" t="Include" />
-          <e p="Aaru.cs" t="Include" />
+          <e p="DiscImageChef.cs" t="Include" />
           <e p="Enums.cs" t="Include" />
           <e p="Helpers.cs" t="Include" />
           <e p="Identify.cs" t="Include" />
@@ -635,7 +933,6 @@
           <e p="Verify.cs" t="Include" />
           <e p="Write.cs" t="Include" />
         </e>
-        <e p="Aaru.DiscImages.csproj" t="IncludeRecursive" />
         <e p="DiscJuggler" t="Include">
           <e p="DiscJuggler.cs" t="Include" />
           <e p="Helpers.cs" t="Include" />
@@ -981,11 +1278,32 @@
         </e>
       </e>
       <e p="Aaru.Dto" t="IncludeRecursive">
+        <e p=".gitignore" t="Include" />
         <e p="Aaru.Dto.csproj" t="IncludeRecursive" />
+        <e p="CdOffsetDto.cs" t="Include" />
+        <e p="DeviceDto.cs" t="Include" />
+        <e p="SyncDto.cs" t="Include" />
+        <e p="UsbProductDto.cs" t="Include" />
+        <e p="UsbVendorDto.cs" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="net461" t="Include">
+              <e p="Aaru.Dto.AssemblyInfo.cs" t="Include" />
+            </e>
+            <e p="netcoreapp2.0" t="Include">
+              <e p="Aaru.Dto.AssemblyInfo.cs" t="Include" />
+            </e>
+            <e p="netstandard2.0" t="Include">
+              <e p="Aaru.Dto.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
       </e>
       <e p="Aaru.Filesystems" t="IncludeRecursive">
         <e p="AODOS.cs" t="Include" />
         <e p="APFS.cs" t="Include" />
+        <e p="Aaru.Filesystems.csproj" t="IncludeRecursive" />
         <e p="Acorn.cs" t="Include" />
         <e p="AmigaDOS.cs" t="Include" />
         <e p="AppleCommon" t="Include">
@@ -1038,7 +1356,6 @@
           <e p="cpmdefs.xml" t="Include" />
         </e>
         <e p="Cram.cs" t="Include" />
-        <e p="Aaru.Filesystems.csproj" t="IncludeRecursive" />
         <e p="ECMA67.cs" t="Include" />
         <e p="EFS.cs" t="Include" />
         <e p="F2FS.cs" t="Include" />
@@ -1189,10 +1506,10 @@
         </e>
       </e>
       <e p="Aaru.Filters" t="IncludeRecursive">
+        <e p="Aaru.Filters.csproj" t="IncludeRecursive" />
         <e p="AppleDouble.cs" t="Include" />
         <e p="AppleSingle.cs" t="Include" />
         <e p="BZip2.cs" t="Include" />
-        <e p="Aaru.Filters.csproj" t="IncludeRecursive" />
         <e p="ForcedSeekStream.cs" t="Include" />
         <e p="GZip.cs" t="Include" />
         <e p="LZip.cs" t="Include" />
@@ -1218,6 +1535,7 @@
         </e>
       </e>
       <e p="Aaru.Gui" t="IncludeRecursive">
+        <e p="Aaru.Gui.csproj" t="IncludeRecursive" />
         <e p="Assets" t="Include">
           <e p="Icons" t="Include">
             <e p="oxygen" t="Include">
@@ -1523,7 +1841,6 @@
           <e p="dlgStatistics.xeto" t="Include" />
           <e p="dlgStatistics.xeto.cs" t="Include" />
         </e>
-        <e p="Aaru.Gui.csproj" t="IncludeRecursive" />
         <e p="Forms" t="Include">
           <e p="frmConsole.xeto" t="Include" />
           <e p="frmConsole.xeto.cs" t="Include" />
@@ -1599,16 +1916,44 @@
         </e>
       </e>
       <e p="Aaru.Helpers" t="IncludeRecursive">
+        <e p=".gitignore" t="Include" />
         <e p="Aaru.Helpers.csproj" t="IncludeRecursive" />
+        <e p="ArrayFill.cs" t="Include" />
+        <e p="ArrayIsEmpty.cs" t="Include" />
+        <e p="BigEndianBitConverter.cs" t="Include" />
+        <e p="BitEndian.cs" t="Include" />
+        <e p="CHS.cs" t="Include" />
+        <e p="CompareBytes.cs" t="Include" />
+        <e p="CountBits.cs" t="Include" />
+        <e p="DateHandlers.cs" t="Include" />
+        <e p="Marshal.cs" t="Include" />
+        <e p="MarshallingPropertiesAttribute.cs" t="Include" />
+        <e p="PrintHex.cs" t="Include" />
+        <e p="StringHandlers.cs" t="Include" />
+        <e p="Swapping.cs" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="net461" t="Include">
+              <e p="Aaru.Helpers.AssemblyInfo.cs" t="Include" />
+            </e>
+            <e p="netcoreapp2.0" t="Include">
+              <e p="Aaru.Helpers.AssemblyInfo.cs" t="Include" />
+            </e>
+            <e p="netstandard2.0" t="Include">
+              <e p="Aaru.Helpers.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
       </e>
       <e p="Aaru.Partitions" t="IncludeRecursive">
+        <e p="Aaru.Partitions.csproj" t="IncludeRecursive" />
         <e p="Acorn.cs" t="Include" />
         <e p="AppleMap.cs" t="Include" />
         <e p="Apricot.cs" t="Include" />
         <e p="Atari.cs" t="Include" />
         <e p="BSD.cs" t="Include" />
         <e p="DEC.cs" t="Include" />
-        <e p="Aaru.Partitions.csproj" t="IncludeRecursive" />
         <e p="DragonFlyBSD.cs" t="Include" />
         <e p="GPT.cs" t="Include" />
         <e p="Human68k.cs" t="Include" />
@@ -1659,6 +2004,9 @@
         </e>
       </e>
       <e p="Aaru.sln" t="IncludeFlat" />
+      <e p="CICMMetadata/dotnet/cicm.cs" t="Include" />
+      <e p="CONTRIBUTING.md" t="Include" />
+      <e p="Changelog.md" t="Include" />
       <e p="LICENSE" t="Include" />
       <e p="LICENSE.LGPL" t="Include" />
       <e p="LICENSE.MIT" t="Include" />
diff --git a/.idea/.idea.Aaru/riderModule.iml b/.idea/.idea.Aaru/riderModule.iml
index b236c21fd..d9bc89780 100644
--- a/.idea/.idea.Aaru/riderModule.iml
+++ b/.idea/.idea.Aaru/riderModule.iml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="RIDER_MODULE" version="4">
   <component name="NewModuleRootManager">
+    <content url="file://$USER_HOME$/.nuget/packages/sqlitepclraw.lib.e_sqlite3.linux/1.1.12/runtimes/linux-x64/native/libe_sqlite3.so" />
     <content url="file://$MODULE_DIR$/../.." />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="R User Library" level="project" />
diff --git a/Aaru.Checksums b/Aaru.Checksums
index 07321ebc1..068386b79 160000
--- a/Aaru.Checksums
+++ b/Aaru.Checksums
@@ -1 +1 @@
-Subproject commit 07321ebc19620efaa04c2e0883b0516e58a924ae
+Subproject commit 068386b791f2eb441db4bce85be601aefa6cda17
diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes
index 50492d0a8..3ad46f114 160000
--- a/Aaru.CommonTypes
+++ b/Aaru.CommonTypes
@@ -1 +1 @@
-Subproject commit 50492d0a810fe2d08e29ed01169abeddc3820ba5
+Subproject commit 3ad46f114711d1eb3aa7607d8349522acbb09ca4
diff --git a/Aaru.Core/Aaru.Core.csproj b/Aaru.Core/Aaru.Core.csproj
index 13e8ea032..c12de104e 100644
--- a/Aaru.Core/Aaru.Core.csproj
+++ b/Aaru.Core/Aaru.Core.csproj
@@ -121,49 +121,49 @@
     <Compile Include="Logging\DumpLog.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\DiscImageChef.Console\DiscImageChef.Console.csproj">
+    <ProjectReference Include="..\Aaru.Console\Aaru.Console.csproj">
       <Project>{ccaa7afe-c094-4d82-a66d-630de8a3f545}</Project>
       <Name>DiscImageChef.Console</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Database\DiscImageChef.Database.csproj" />
-    <ProjectReference Include="..\DiscImageChef.Dto\DiscImageChef.Dto.csproj" />
-    <ProjectReference Include="..\DiscImageChef.Filesystems\DiscImageChef.Filesystems.csproj">
+    <ProjectReference Include="..\Aaru.Database\Aaru.Database.csproj" />
+    <ProjectReference Include="..\Aaru.Dto\Aaru.Dto.csproj" />
+    <ProjectReference Include="..\Aaru.Filesystems\Aaru.Filesystems.csproj">
       <Project>{D7016DF2-5A5E-4524-B40D-BA2D59576688}</Project>
       <Name>DiscImageChef.Filesystems</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Partitions\DiscImageChef.Partitions.csproj">
+    <ProjectReference Include="..\Aaru.Partitions\Aaru.Partitions.csproj">
       <Project>{DA7AB65D-B5BA-4003-8893-A51BB071BA2F}</Project>
       <Name>DiscImageChef.Partitions</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.DiscImages\DiscImageChef.DiscImages.csproj">
+    <ProjectReference Include="..\Aaru.DiscImages\Aaru.DiscImages.csproj">
       <Project>{74032CBC-339B-42F3-AF6F-E96C261F3E6A}</Project>
       <Name>DiscImageChef.DiscImages</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Filters\DiscImageChef.Filters.csproj">
+    <ProjectReference Include="..\Aaru.Filters\Aaru.Filters.csproj">
       <Project>{D571B8EF-903D-4353-BDD5-B834F9F029EF}</Project>
       <Name>DiscImageChef.Filters</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Settings\DiscImageChef.Settings.csproj">
+    <ProjectReference Include="..\Aaru.Settings\Aaru.Settings.csproj">
       <Project>{5C4C7BAA-CF60-4233-84ED-39CB2312AF38}</Project>
       <Name>DiscImageChef.Settings</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Devices\DiscImageChef.Devices.csproj">
+    <ProjectReference Include="..\Aaru.Devices\Aaru.Devices.csproj">
       <Project>{57BB2341-AB62-48FD-91B8-46F5A2F9ED51}</Project>
       <Name>DiscImageChef.Devices</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.CommonTypes\DiscImageChef.CommonTypes.csproj">
+    <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj">
       <Project>{F2B84194-26EB-4227-B1C5-6602517E85AE}</Project>
       <Name>DiscImageChef.CommonTypes</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Checksums\DiscImageChef.Checksums.csproj">
+    <ProjectReference Include="..\Aaru.Checksums\Aaru.Checksums.csproj">
       <Project>{CC48B324-A532-4A45-87A6-6F91F7141E8D}</Project>
       <Name>DiscImageChef.Checksums</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Decoders\DiscImageChef.Decoders.csproj">
+    <ProjectReference Include="..\Aaru.Decoders\Aaru.Decoders.csproj">
       <Project>{0BEB3088-B634-4289-AE17-CDF2D25D00D5}</Project>
       <Name>DiscImageChef.Decoders</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Helpers\DiscImageChef.Helpers.csproj">
+    <ProjectReference Include="..\Aaru.Helpers\Aaru.Helpers.csproj">
       <Project>{F8BDF57B-1571-4CD0-84B3-B422088D359A}</Project>
       <Name>DiscImageChef.Helpers</Name>
     </ProjectReference>
diff --git a/Aaru.Database/Aaru.Database.csproj b/Aaru.Database/Aaru.Database.csproj
index 4760813e2..e0698adff 100644
--- a/Aaru.Database/Aaru.Database.csproj
+++ b/Aaru.Database/Aaru.Database.csproj
@@ -131,8 +131,8 @@
     <Compile Include="Models\Version.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\DiscImageChef.CommonTypes\DiscImageChef.CommonTypes.csproj" />
-    <ProjectReference Include="..\DiscImageChef.Decoders\DiscImageChef.Decoders.csproj" />
+    <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj" />
+    <ProjectReference Include="..\Aaru.Decoders\Aaru.Decoders.csproj" />
   </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>
diff --git a/Aaru.Decoders b/Aaru.Decoders
index 04710531d..fc5a74418 160000
--- a/Aaru.Decoders
+++ b/Aaru.Decoders
@@ -1 +1 @@
-Subproject commit 04710531d1ee4ca0b383f6719c0040c8b60b5662
+Subproject commit fc5a74418f2a73adf9115add5c3f6afc6caede4a
diff --git a/Aaru.Devices/Aaru.Devices.csproj b/Aaru.Devices/Aaru.Devices.csproj
index 7de34da2e..37fbe3910 100644
--- a/Aaru.Devices/Aaru.Devices.csproj
+++ b/Aaru.Devices/Aaru.Devices.csproj
@@ -121,16 +121,16 @@
     </MonoDevelop>
   </ProjectExtensions>
   <ItemGroup>
-    <ProjectReference Include="..\DiscImageChef.CommonTypes\DiscImageChef.CommonTypes.csproj" />
-    <ProjectReference Include="..\DiscImageChef.Console\DiscImageChef.Console.csproj">
+    <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj" />
+    <ProjectReference Include="..\Aaru.Console\Aaru.Console.csproj">
       <Project>{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}</Project>
       <Name>DiscImageChef.Console</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Decoders\DiscImageChef.Decoders.csproj">
+    <ProjectReference Include="..\Aaru.Decoders\Aaru.Decoders.csproj">
       <Project>{0BEB3088-B634-4289-AE17-CDF2D25D00D5}</Project>
       <Name>DiscImageChef.Decoders</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Helpers\DiscImageChef.Helpers.csproj">
+    <ProjectReference Include="..\Aaru.Helpers\Aaru.Helpers.csproj">
       <Project>{F8BDF57B-1571-4CD0-84B3-B422088D359A}</Project>
       <Name>DiscImageChef.Helpers</Name>
     </ProjectReference>
diff --git a/Aaru.DiscImages/Aaru.DiscImages.csproj b/Aaru.DiscImages/Aaru.DiscImages.csproj
index 1985294b6..c71649a5e 100644
--- a/Aaru.DiscImages/Aaru.DiscImages.csproj
+++ b/Aaru.DiscImages/Aaru.DiscImages.csproj
@@ -508,31 +508,31 @@
     <Compile Include="RayDIM\RayDIM.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\DiscImageChef.CommonTypes\DiscImageChef.CommonTypes.csproj">
+    <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj">
       <Project>{F2B84194-26EB-4227-B1C5-6602517E85AE}</Project>
       <Name>DiscImageChef.CommonTypes</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Checksums\DiscImageChef.Checksums.csproj">
+    <ProjectReference Include="..\Aaru.Checksums\Aaru.Checksums.csproj">
       <Project>{CC48B324-A532-4A45-87A6-6F91F7141E8D}</Project>
       <Name>DiscImageChef.Checksums</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Compression\DiscImageChef.Compression.csproj">
+    <ProjectReference Include="..\Aaru.Compression\Aaru.Compression.csproj">
       <Project>{858398d1-7321-4763-8bab-56bbfec74e29}</Project>
       <Name>DiscImageChef.Compression</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Helpers\DiscImageChef.Helpers.csproj">
+    <ProjectReference Include="..\Aaru.Helpers\Aaru.Helpers.csproj">
       <Project>{F8BDF57B-1571-4CD0-84B3-B422088D359A}</Project>
       <Name>DiscImageChef.Helpers</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Console\DiscImageChef.Console.csproj">
+    <ProjectReference Include="..\Aaru.Console\Aaru.Console.csproj">
       <Project>{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}</Project>
       <Name>DiscImageChef.Console</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Decoders\DiscImageChef.Decoders.csproj">
+    <ProjectReference Include="..\Aaru.Decoders\Aaru.Decoders.csproj">
       <Project>{0BEB3088-B634-4289-AE17-CDF2D25D00D5}</Project>
       <Name>DiscImageChef.Decoders</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Filters\DiscImageChef.Filters.csproj">
+    <ProjectReference Include="..\Aaru.Filters\Aaru.Filters.csproj">
       <Project>{D571B8EF-903D-4353-BDD5-B834F9F029EF}</Project>
       <Name>DiscImageChef.Filters</Name>
     </ProjectReference>
diff --git a/Aaru.Dto b/Aaru.Dto
index 02fdefc9e..c00bf00cc 160000
--- a/Aaru.Dto
+++ b/Aaru.Dto
@@ -1 +1 @@
-Subproject commit 02fdefc9e69d7c3cc14ead94d0cf41b5dd1c8b97
+Subproject commit c00bf00ccfa17eb1ab89369e02573f6960d34ace
diff --git a/Aaru.EntityFramework/Aaru.EntityFramework.csproj b/Aaru.EntityFramework/Aaru.EntityFramework.csproj
index b46eee658..48ae202cd 100644
--- a/Aaru.EntityFramework/Aaru.EntityFramework.csproj
+++ b/Aaru.EntityFramework/Aaru.EntityFramework.csproj
@@ -10,7 +10,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\DiscImageChef.Database\DiscImageChef.Database.csproj" />
+      <ProjectReference Include="..\Aaru.Database\Aaru.Database.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/Aaru.Filesystems/Aaru.Filesystems.csproj b/Aaru.Filesystems/Aaru.Filesystems.csproj
index c95f4aa9b..a22b7e50f 100644
--- a/Aaru.Filesystems/Aaru.Filesystems.csproj
+++ b/Aaru.Filesystems/Aaru.Filesystems.csproj
@@ -217,31 +217,31 @@
     <Compile Include="ISO9660\Consts\CDi.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\DiscImageChef.Checksums\DiscImageChef.Checksums.csproj">
+    <ProjectReference Include="..\Aaru.Checksums\Aaru.Checksums.csproj">
       <Project>{CC48B324-A532-4A45-87A6-6F91F7141E8D}</Project>
       <Name>DiscImageChef.Checksums</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.CommonTypes\DiscImageChef.CommonTypes.csproj">
+    <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj">
       <Project>{F2B84194-26EB-4227-B1C5-6602517E85AE}</Project>
       <Name>DiscImageChef.CommonTypes</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Helpers\DiscImageChef.Helpers.csproj">
+    <ProjectReference Include="..\Aaru.Helpers\Aaru.Helpers.csproj">
       <Project>{F8BDF57B-1571-4CD0-84B3-B422088D359A}</Project>
       <Name>DiscImageChef.Helpers</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Partitions\DiscImageChef.Partitions.csproj">
+    <ProjectReference Include="..\Aaru.Partitions\Aaru.Partitions.csproj">
       <Project>{DA7AB65D-B5BA-4003-8893-A51BB071BA2F}</Project>
       <Name>DiscImageChef.Partitions</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.DiscImages\DiscImageChef.DiscImages.csproj">
+    <ProjectReference Include="..\Aaru.DiscImages\Aaru.DiscImages.csproj">
       <Project>{74032CBC-339B-42F3-AF6F-E96C261F3E6A}</Project>
       <Name>DiscImageChef.DiscImages</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Console\DiscImageChef.Console.csproj">
+    <ProjectReference Include="..\Aaru.Console\Aaru.Console.csproj">
       <Project>{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}</Project>
       <Name>DiscImageChef.Console</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Decoders\DiscImageChef.Decoders.csproj">
+    <ProjectReference Include="..\Aaru.Decoders\Aaru.Decoders.csproj">
       <Project>{0BEB3088-B634-4289-AE17-CDF2D25D00D5}</Project>
       <Name>DiscImageChef.Decoders</Name>
     </ProjectReference>
diff --git a/Aaru.Filters/Aaru.Filters.csproj b/Aaru.Filters/Aaru.Filters.csproj
index dd0572794..dfbe3f173 100644
--- a/Aaru.Filters/Aaru.Filters.csproj
+++ b/Aaru.Filters/Aaru.Filters.csproj
@@ -64,12 +64,12 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\DiscImageChef.CommonTypes\DiscImageChef.CommonTypes.csproj" />
-    <ProjectReference Include="..\DiscImageChef.Console\DiscImageChef.Console.csproj">
+    <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj" />
+    <ProjectReference Include="..\Aaru.Console\Aaru.Console.csproj">
       <Project>{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}</Project>
       <Name>DiscImageChef.Console</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Helpers\DiscImageChef.Helpers.csproj">
+    <ProjectReference Include="..\Aaru.Helpers\Aaru.Helpers.csproj">
       <Project>{F8BDF57B-1571-4CD0-84B3-B422088D359A}</Project>
       <Name>DiscImageChef.Helpers</Name>
     </ProjectReference>
diff --git a/Aaru.Gtk/Aaru.Gtk.csproj b/Aaru.Gtk/Aaru.Gtk.csproj
index 18eea61b8..6dba492bf 100644
--- a/Aaru.Gtk/Aaru.Gtk.csproj
+++ b/Aaru.Gtk/Aaru.Gtk.csproj
@@ -23,10 +23,10 @@
         <NrtShowRevision>true</NrtShowRevision>
     </PropertyGroup>
     <ItemGroup>
-        <ProjectReference Include="..\DiscImageChef.Core\DiscImageChef.Core.csproj" />
-        <ProjectReference Include="..\DiscImageChef.Database\DiscImageChef.Database.csproj" />
-        <ProjectReference Include="..\DiscImageChef.Gui\DiscImageChef.Gui.csproj" />
-        <ProjectReference Include="..\DiscImageChef.Settings\DiscImageChef.Settings.csproj" />
+        <ProjectReference Include="..\Aaru.Core\Aaru.Core.csproj" />
+        <ProjectReference Include="..\Aaru.Database\Aaru.Database.csproj" />
+        <ProjectReference Include="..\Aaru.Gui\Aaru.Gui.csproj" />
+        <ProjectReference Include="..\Aaru.Settings\Aaru.Settings.csproj" />
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="Eto.Platform.Gtk" Version="2.5.0-rc.4" />
diff --git a/Aaru.Gui.XamMac/Aaru.Gui.XamMac.csproj b/Aaru.Gui.XamMac/Aaru.Gui.XamMac.csproj
index 4f30179f9..f2b67d1b3 100644
--- a/Aaru.Gui.XamMac/Aaru.Gui.XamMac.csproj
+++ b/Aaru.Gui.XamMac/Aaru.Gui.XamMac.csproj
@@ -100,19 +100,19 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\DiscImageChef.Core\DiscImageChef.Core.csproj">
+    <ProjectReference Include="..\Aaru.Core\Aaru.Core.csproj">
       <Project>{679659b8-25d0-4279-b632-56ef8f94adc0}</Project>
       <Name>DiscImageChef.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Database\DiscImageChef.Database.csproj">
+    <ProjectReference Include="..\Aaru.Database\Aaru.Database.csproj">
       <Project>{fa0749b5-efe0-4148-9545-cd420b45bc36}</Project>
       <Name>DiscImageChef.Database</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Gui\DiscImageChef.Gui.csproj">
+    <ProjectReference Include="..\Aaru.Gui\Aaru.Gui.csproj">
       <Project>{cf61ad81-3f98-4e7b-8f00-9957a6cde5fa}</Project>
       <Name>DiscImageChef.Gui</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Settings\DiscImageChef.Settings.csproj">
+    <ProjectReference Include="..\Aaru.Settings\Aaru.Settings.csproj">
       <Project>{5c4c7baa-cf60-4233-84ed-39cb2312af38}</Project>
       <Name>DiscImageChef.Settings</Name>
     </ProjectReference>
diff --git a/Aaru.Gui/Aaru.Gui.csproj b/Aaru.Gui/Aaru.Gui.csproj
index fc88ffcb5..c929a5a72 100644
--- a/Aaru.Gui/Aaru.Gui.csproj
+++ b/Aaru.Gui/Aaru.Gui.csproj
@@ -25,9 +25,9 @@
         <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" />
     </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\DiscImageChef.Core\DiscImageChef.Core.csproj" />
-        <ProjectReference Include="..\DiscImageChef.Devices\DiscImageChef.Devices.csproj" />
-        <ProjectReference Include="..\DiscImageChef.Checksums\DiscImageChef.Checksums.csproj" />
+        <ProjectReference Include="..\Aaru.Core\Aaru.Core.csproj" />
+        <ProjectReference Include="..\Aaru.Devices\Aaru.Devices.csproj" />
+        <ProjectReference Include="..\Aaru.Checksums\Aaru.Checksums.csproj" />
     </ItemGroup>
     <ItemGroup>
         <EmbeddedResource Include="Assets\Logos\Media\AIT1.png" />
diff --git a/Aaru.Helpers b/Aaru.Helpers
index 13010087f..85407751c 160000
--- a/Aaru.Helpers
+++ b/Aaru.Helpers
@@ -1 +1 @@
-Subproject commit 13010087fbcacbffae7a61c283552a39c4c2c11f
+Subproject commit 85407751cbe0d8dd843b5e6dcb5ffe3c3f509614
diff --git a/Aaru.Metadata/Aaru.Metadata.csproj b/Aaru.Metadata/Aaru.Metadata.csproj
index 553a5d32b..1064ad15f 100644
--- a/Aaru.Metadata/Aaru.Metadata.csproj
+++ b/Aaru.Metadata/Aaru.Metadata.csproj
@@ -59,19 +59,19 @@
     <Compile Include="Version.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\DiscImageChef.CommonTypes\DiscImageChef.CommonTypes.csproj">
+    <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj">
       <Project>{F2B84194-26EB-4227-B1C5-6602517E85AE}</Project>
       <Name>DiscImageChef.CommonTypes</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Decoders\DiscImageChef.Decoders.csproj">
+    <ProjectReference Include="..\Aaru.Decoders\Aaru.Decoders.csproj">
       <Project>{0BEB3088-B634-4289-AE17-CDF2D25D00D5}</Project>
       <Name>DiscImageChef.Decoders</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Helpers\DiscImageChef.Helpers.csproj">
+    <ProjectReference Include="..\Aaru.Helpers\Aaru.Helpers.csproj">
       <Project>{F8BDF57B-1571-4CD0-84B3-B422088D359A}</Project>
       <Name>DiscImageChef.Helpers</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Interop\DiscImageChef.Interop.csproj">
+    <ProjectReference Include="..\Aaru.Interop\Aaru.Interop.csproj">
       <Project>{9183f2e0-a879-4f23-9ee3-c6908f1332b2}</Project>
       <Name>DiscImageChef.Interop</Name>
     </ProjectReference>
diff --git a/Aaru.Partitions/Aaru.Partitions.csproj b/Aaru.Partitions/Aaru.Partitions.csproj
index a58b63683..24504d81f 100644
--- a/Aaru.Partitions/Aaru.Partitions.csproj
+++ b/Aaru.Partitions/Aaru.Partitions.csproj
@@ -71,23 +71,23 @@
     <Compile Include="Apricot.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\DiscImageChef.CommonTypes\DiscImageChef.CommonTypes.csproj">
+    <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj">
       <Project>{F2B84194-26EB-4227-B1C5-6602517E85AE}</Project>
       <Name>DiscImageChef.CommonTypes</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Helpers\DiscImageChef.Helpers.csproj">
+    <ProjectReference Include="..\Aaru.Helpers\Aaru.Helpers.csproj">
       <Project>{F8BDF57B-1571-4CD0-84B3-B422088D359A}</Project>
       <Name>DiscImageChef.Helpers</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.DiscImages\DiscImageChef.DiscImages.csproj">
+    <ProjectReference Include="..\Aaru.DiscImages\Aaru.DiscImages.csproj">
       <Project>{74032CBC-339B-42F3-AF6F-E96C261F3E6A}</Project>
       <Name>DiscImageChef.DiscImages</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Checksums\DiscImageChef.Checksums.csproj">
+    <ProjectReference Include="..\Aaru.Checksums\Aaru.Checksums.csproj">
       <Project>{CC48B324-A532-4A45-87A6-6F91F7141E8D}</Project>
       <Name>DiscImageChef.Checksums</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Console\DiscImageChef.Console.csproj">
+    <ProjectReference Include="..\Aaru.Console\Aaru.Console.csproj">
       <Project>{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}</Project>
       <Name>DiscImageChef.Console</Name>
     </ProjectReference>
diff --git a/Aaru.Settings/Aaru.Settings.csproj b/Aaru.Settings/Aaru.Settings.csproj
index ca49883c6..d2c3c3ebd 100644
--- a/Aaru.Settings/Aaru.Settings.csproj
+++ b/Aaru.Settings/Aaru.Settings.csproj
@@ -57,7 +57,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\DiscImageChef.CommonTypes\DiscImageChef.CommonTypes.csproj" />
+    <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj" />
   </ItemGroup>
     <ItemGroup Condition="$(TargetFramework.StartsWith('netcoreapp')) == true">
         <PackageReference Include="Microsoft.Win32.Registry" Version="4.6.0" />
diff --git a/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj b/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj
index 560df307b..c3e2387b7 100644
--- a/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj
+++ b/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj
@@ -82,19 +82,19 @@
     <Compile Include="DecodeATARegisters.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\DiscImageChef.Console\DiscImageChef.Console.csproj">
+    <ProjectReference Include="..\Aaru.Console\Aaru.Console.csproj">
       <Project>{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}</Project>
       <Name>DiscImageChef.Console</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Devices\DiscImageChef.Devices.csproj">
+    <ProjectReference Include="..\Aaru.Devices\Aaru.Devices.csproj">
       <Project>{57BB2341-AB62-48FD-91B8-46F5A2F9ED51}</Project>
       <Name>DiscImageChef.Devices</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Decoders\DiscImageChef.Decoders.csproj">
+    <ProjectReference Include="..\Aaru.Decoders\Aaru.Decoders.csproj">
       <Project>{0BEB3088-B634-4289-AE17-CDF2D25D00D5}</Project>
       <Name>DiscImageChef.Decoders</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Helpers\DiscImageChef.Helpers.csproj">
+    <ProjectReference Include="..\Aaru.Helpers\Aaru.Helpers.csproj">
       <Project>{F8BDF57B-1571-4CD0-84B3-B422088D359A}</Project>
       <Name>DiscImageChef.Helpers</Name>
     </ProjectReference>
diff --git a/Aaru.Tests/Aaru.Tests.csproj b/Aaru.Tests/Aaru.Tests.csproj
index 7be75e5a6..bfb58f4f6 100644
--- a/Aaru.Tests/Aaru.Tests.csproj
+++ b/Aaru.Tests/Aaru.Tests.csproj
@@ -149,31 +149,31 @@
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\DiscImageChef.Checksums\DiscImageChef.Checksums.csproj">
+    <ProjectReference Include="..\Aaru.Checksums\Aaru.Checksums.csproj">
       <Project>{CC48B324-A532-4A45-87A6-6F91F7141E8D}</Project>
       <Name>DiscImageChef.Checksums</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Filters\DiscImageChef.Filters.csproj">
+    <ProjectReference Include="..\Aaru.Filters\Aaru.Filters.csproj">
       <Project>{D571B8EF-903D-4353-BDD5-B834F9F029EF}</Project>
       <Name>DiscImageChef.Filters</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.DiscImages\DiscImageChef.DiscImages.csproj">
+    <ProjectReference Include="..\Aaru.DiscImages\Aaru.DiscImages.csproj">
       <Project>{74032CBC-339B-42F3-AF6F-E96C261F3E6A}</Project>
       <Name>DiscImageChef.DiscImages</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Filesystems\DiscImageChef.Filesystems.csproj">
+    <ProjectReference Include="..\Aaru.Filesystems\Aaru.Filesystems.csproj">
       <Project>{D7016DF2-5A5E-4524-B40D-BA2D59576688}</Project>
       <Name>DiscImageChef.Filesystems</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.CommonTypes\DiscImageChef.CommonTypes.csproj">
+    <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj">
       <Project>{F2B84194-26EB-4227-B1C5-6602517E85AE}</Project>
       <Name>DiscImageChef.CommonTypes</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Partitions\DiscImageChef.Partitions.csproj">
+    <ProjectReference Include="..\Aaru.Partitions\Aaru.Partitions.csproj">
       <Project>{DA7AB65D-B5BA-4003-8893-A51BB071BA2F}</Project>
       <Name>DiscImageChef.Partitions</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Core\DiscImageChef.Core.csproj">
+    <ProjectReference Include="..\Aaru.Core\Aaru.Core.csproj">
       <Project>{679659B8-25D0-4279-B632-56EF8F94ADC0}</Project>
       <Name>DiscImageChef.Core</Name>
     </ProjectReference>
diff --git a/Aaru.Wpf/Aaru.Wpf.csproj b/Aaru.Wpf/Aaru.Wpf.csproj
index 1b85934b2..f076321d7 100644
--- a/Aaru.Wpf/Aaru.Wpf.csproj
+++ b/Aaru.Wpf/Aaru.Wpf.csproj
@@ -81,19 +81,19 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\DiscImageChef.Core\DiscImageChef.Core.csproj">
+    <ProjectReference Include="..\Aaru.Core\Aaru.Core.csproj">
       <Project>{679659b8-25d0-4279-b632-56ef8f94adc0}</Project>
       <Name>DiscImageChef.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Database\DiscImageChef.Database.csproj">
+    <ProjectReference Include="..\Aaru.Database\Aaru.Database.csproj">
       <Project>{fa0749b5-efe0-4148-9545-cd420b45bc36}</Project>
       <Name>DiscImageChef.Database</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Gui\DiscImageChef.Gui.csproj">
+    <ProjectReference Include="..\Aaru.Gui\Aaru.Gui.csproj">
       <Project>{cf61ad81-3f98-4e7b-8f00-9957a6cde5fa}</Project>
       <Name>DiscImageChef.Gui</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Settings\DiscImageChef.Settings.csproj">
+    <ProjectReference Include="..\Aaru.Settings\Aaru.Settings.csproj">
       <Project>{5c4c7baa-cf60-4233-84ed-39cb2312af38}</Project>
       <Name>DiscImageChef.Settings</Name>
     </ProjectReference>
diff --git a/Aaru/Aaru.csproj b/Aaru/Aaru.csproj
index 9e5b3ebb0..5cc57e08b 100644
--- a/Aaru/Aaru.csproj
+++ b/Aaru/Aaru.csproj
@@ -194,52 +194,52 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\DiscImageChef.Checksums\DiscImageChef.Checksums.csproj">
+    <ProjectReference Include="..\Aaru.Checksums\Aaru.Checksums.csproj">
       <Project>{CC48B324-A532-4A45-87A6-6F91F7141E8D}</Project>
       <Name>DiscImageChef.Checksums</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Database\DiscImageChef.Database.csproj" />
-    <ProjectReference Include="..\DiscImageChef.Helpers\DiscImageChef.Helpers.csproj">
+    <ProjectReference Include="..\Aaru.Database\Aaru.Database.csproj" />
+    <ProjectReference Include="..\Aaru.Helpers\Aaru.Helpers.csproj">
       <Project>{F8BDF57B-1571-4CD0-84B3-B422088D359A}</Project>
       <Name>DiscImageChef.Helpers</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.DiscImages\DiscImageChef.DiscImages.csproj">
+    <ProjectReference Include="..\Aaru.DiscImages\Aaru.DiscImages.csproj">
       <Project>{74032CBC-339B-42F3-AF6F-E96C261F3E6A}</Project>
       <Name>DiscImageChef.DiscImages</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.CommonTypes\DiscImageChef.CommonTypes.csproj">
+    <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj">
       <Project>{F2B84194-26EB-4227-B1C5-6602517E85AE}</Project>
       <Name>DiscImageChef.CommonTypes</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Partitions\DiscImageChef.Partitions.csproj">
+    <ProjectReference Include="..\Aaru.Partitions\Aaru.Partitions.csproj">
       <Project>{DA7AB65D-B5BA-4003-8893-A51BB071BA2F}</Project>
       <Name>DiscImageChef.Partitions</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Filesystems\DiscImageChef.Filesystems.csproj">
+    <ProjectReference Include="..\Aaru.Filesystems\Aaru.Filesystems.csproj">
       <Project>{D7016DF2-5A5E-4524-B40D-BA2D59576688}</Project>
       <Name>DiscImageChef.Filesystems</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Decoders\DiscImageChef.Decoders.csproj">
+    <ProjectReference Include="..\Aaru.Decoders\Aaru.Decoders.csproj">
       <Project>{0BEB3088-B634-4289-AE17-CDF2D25D00D5}</Project>
       <Name>DiscImageChef.Decoders</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Devices\DiscImageChef.Devices.csproj">
+    <ProjectReference Include="..\Aaru.Devices\Aaru.Devices.csproj">
       <Project>{57BB2341-AB62-48FD-91B8-46F5A2F9ED51}</Project>
       <Name>DiscImageChef.Devices</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Console\DiscImageChef.Console.csproj">
+    <ProjectReference Include="..\Aaru.Console\Aaru.Console.csproj">
       <Project>{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}</Project>
       <Name>DiscImageChef.Console</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Settings\DiscImageChef.Settings.csproj">
+    <ProjectReference Include="..\Aaru.Settings\Aaru.Settings.csproj">
       <Project>{5C4C7BAA-CF60-4233-84ED-39CB2312AF38}</Project>
       <Name>DiscImageChef.Settings</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Filters\DiscImageChef.Filters.csproj">
+    <ProjectReference Include="..\Aaru.Filters\Aaru.Filters.csproj">
       <Project>{D571B8EF-903D-4353-BDD5-B834F9F029EF}</Project>
       <Name>DiscImageChef.Filters</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DiscImageChef.Core\DiscImageChef.Core.csproj">
+    <ProjectReference Include="..\Aaru.Core\Aaru.Core.csproj">
       <Project>{679659B8-25D0-4279-B632-56EF8F94ADC0}</Project>
       <Name>DiscImageChef.Core</Name>
     </ProjectReference>