diff --git a/.idea/.idea.Aaru/.idea/contentModel.xml b/.idea/.idea.Aaru/.idea/contentModel.xml
index dfa9d1dab..5cf6e9556 100644
--- a/.idea/.idea.Aaru/.idea/contentModel.xml
+++ b/.idea/.idea.Aaru/.idea/contentModel.xml
@@ -1375,6 +1375,21 @@
       </e>
       <e p="Aaru.Images" t="IncludeRecursive">
         <e p="Aaru.Images.csproj" t="IncludeRecursive" />
+        <e p="AaruFormat" t="Include">
+          <e p="AaruFormat.cs" t="Include" />
+          <e p="CdEcc.cs" t="Include" />
+          <e p="ClauniaSubchannelTransform.cs" t="Include" />
+          <e p="Constants.cs" t="Include" />
+          <e p="Enums.cs" t="Include" />
+          <e p="Helpers.cs" t="Include" />
+          <e p="Identify.cs" t="Include" />
+          <e p="Properties.cs" t="Include" />
+          <e p="Read.cs" t="Include" />
+          <e p="Structs.cs" t="Include" />
+          <e p="Tape.cs" t="Include" />
+          <e p="Verify.cs" t="Include" />
+          <e p="Write.cs" t="Include" />
+        </e>
         <e p="Alcohol120" t="Include">
           <e p="Alcohol120.cs" t="Include" />
           <e p="Constants.cs" t="Include" />
@@ -1587,21 +1602,6 @@
           <e p="Structs.cs" t="Include" />
           <e p="Verify.cs" t="Include" />
         </e>
-        <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="DiscImageChef.cs" t="Include" />
-          <e p="Enums.cs" t="Include" />
-          <e p="Helpers.cs" t="Include" />
-          <e p="Identify.cs" t="Include" />
-          <e p="Properties.cs" t="Include" />
-          <e p="Read.cs" t="Include" />
-          <e p="Structs.cs" t="Include" />
-          <e p="Tape.cs" t="Include" />
-          <e p="Verify.cs" t="Include" />
-          <e p="Write.cs" t="Include" />
-        </e>
         <e p="DiscJuggler" t="Include">
           <e p="DiscJuggler.cs" t="Include" />
           <e p="Helpers.cs" t="Include" />
diff --git a/Aaru.Checksums b/Aaru.Checksums
index d350a4463..973589684 160000
--- a/Aaru.Checksums
+++ b/Aaru.Checksums
@@ -1 +1 @@
-Subproject commit d350a446320b15283d98dd5c207a7d7d835cb78c
+Subproject commit 9735896846a40cf4f0ee6019259bda80b55f7d97
diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes
index 5858e12e7..3aee85906 160000
--- a/Aaru.CommonTypes
+++ b/Aaru.CommonTypes
@@ -1 +1 @@
-Subproject commit 5858e12e728646b6c454b9542147048523048cb9
+Subproject commit 3aee85906641e16ef575509f9496bda78058f848
diff --git a/Aaru.Console b/Aaru.Console
index f88ccf06f..fbfbdca90 160000
--- a/Aaru.Console
+++ b/Aaru.Console
@@ -1 +1 @@
-Subproject commit f88ccf06f5df9816ab0a388fbcdccaa41ac3078f
+Subproject commit fbfbdca90e7895f0c23e78e607a665b7a10a1107
diff --git a/Aaru.Decoders b/Aaru.Decoders
index 7d9781a33..8f1f38aad 160000
--- a/Aaru.Decoders
+++ b/Aaru.Decoders
@@ -1 +1 @@
-Subproject commit 7d9781a33ea3e1a5b52eba017c15b6cf8112e863
+Subproject commit 8f1f38aad1d6e9759ef62fac91bb80fa787901cd
diff --git a/Aaru.Dto b/Aaru.Dto
index 1a788f948..b05987103 160000
--- a/Aaru.Dto
+++ b/Aaru.Dto
@@ -1 +1 @@
-Subproject commit 1a788f948a18adf12fe500aecc647410e8951445
+Subproject commit b059871037472d15858ae54d9243211060453b77
diff --git a/Aaru.Helpers b/Aaru.Helpers
index c8e7a167b..9f2dfcf4a 160000
--- a/Aaru.Helpers
+++ b/Aaru.Helpers
@@ -1 +1 @@
-Subproject commit c8e7a167b73c115586d790e377ddab015e7616cd
+Subproject commit 9f2dfcf4a378054acdc72d0ebcadf27af613fef6
diff --git a/Aaru.Images/Aaru.Images.csproj b/Aaru.Images/Aaru.Images.csproj
index 05fd66514..4f8a2a7fe 100644
--- a/Aaru.Images/Aaru.Images.csproj
+++ b/Aaru.Images/Aaru.Images.csproj
@@ -211,19 +211,19 @@
     <Compile Include="DiscFerret\Read.cs" />
     <Compile Include="DiscFerret\Structs.cs" />
     <Compile Include="DiscFerret\Verify.cs" />
-    <Compile Include="Aaru\CdEcc.cs" />
-    <Compile Include="Aaru\ClauniaSubchannelTransform.cs" />
-    <Compile Include="Aaru\Constants.cs" />
-    <Compile Include="Aaru\Aaru.cs" />
-    <Compile Include="Aaru\Enums.cs" />
-    <Compile Include="Aaru\Helpers.cs" />
-    <Compile Include="Aaru\Identify.cs" />
-    <Compile Include="Aaru\Properties.cs" />
-    <Compile Include="Aaru\Read.cs" />
-    <Compile Include="Aaru\Structs.cs" />
-    <Compile Include="Aaru\Tape.cs" />
-    <Compile Include="Aaru\Verify.cs" />
-    <Compile Include="Aaru\Write.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" />
diff --git a/Aaru.Images/DiscImageChef/DiscImageChef.cs b/Aaru.Images/AaruFormat/AaruFormat.cs
similarity index 98%
rename from Aaru.Images/DiscImageChef/DiscImageChef.cs
rename to Aaru.Images/AaruFormat/AaruFormat.cs
index 1bde03f2e..00e140978 100644
--- a/Aaru.Images/DiscImageChef/DiscImageChef.cs
+++ b/Aaru.Images/AaruFormat/AaruFormat.cs
@@ -81,7 +81,7 @@ using SharpCompress.Compressors.LZMA;
 
 namespace Aaru.DiscImages
 {
-    public partial class DiscImageChef : IWritableOpticalImage, IVerifiableImage, IWritableTapeImage
+    public partial class AaruFormat : IWritableOpticalImage, IVerifiableImage, IWritableTapeImage
     {
         bool alreadyWrittenZero;
         /// <summary>Cache of uncompressed blocks.</summary>
@@ -164,7 +164,7 @@ namespace Aaru.DiscImages
         bool  writingLong;
         ulong writtenSectors;
 
-        public DiscImageChef()
+        public AaruFormat()
         {
             imageInfo = new ImageInfo
             {
diff --git a/Aaru.Images/DiscImageChef/CdEcc.cs b/Aaru.Images/AaruFormat/CdEcc.cs
similarity index 99%
rename from Aaru.Images/DiscImageChef/CdEcc.cs
rename to Aaru.Images/AaruFormat/CdEcc.cs
index 9200dff88..20937a0c2 100644
--- a/Aaru.Images/DiscImageChef/CdEcc.cs
+++ b/Aaru.Images/AaruFormat/CdEcc.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
 
 namespace Aaru.DiscImages
 {
-    public partial class DiscImageChef
+    public partial class AaruFormat
     {
         byte[] eccBTable;
         byte[] eccFTable;
diff --git a/Aaru.Images/DiscImageChef/ClauniaSubchannelTransform.cs b/Aaru.Images/AaruFormat/ClauniaSubchannelTransform.cs
similarity index 99%
rename from Aaru.Images/DiscImageChef/ClauniaSubchannelTransform.cs
rename to Aaru.Images/AaruFormat/ClauniaSubchannelTransform.cs
index af188536d..00aaea827 100644
--- a/Aaru.Images/DiscImageChef/ClauniaSubchannelTransform.cs
+++ b/Aaru.Images/AaruFormat/ClauniaSubchannelTransform.cs
@@ -35,7 +35,7 @@ using Aaru.Console;
 
 namespace Aaru.DiscImages
 {
-    public partial class DiscImageChef
+    public partial class AaruFormat
     {
         static byte[] ClauniaSubchannelTransform(byte[] interleaved)
         {
diff --git a/Aaru.Images/DiscImageChef/Constants.cs b/Aaru.Images/AaruFormat/Constants.cs
similarity index 98%
rename from Aaru.Images/DiscImageChef/Constants.cs
rename to Aaru.Images/AaruFormat/Constants.cs
index ec9829723..793ea855f 100644
--- a/Aaru.Images/DiscImageChef/Constants.cs
+++ b/Aaru.Images/AaruFormat/Constants.cs
@@ -32,7 +32,7 @@
 
 namespace Aaru.DiscImages
 {
-    public partial class DiscImageChef
+    public partial class AaruFormat
     {
         /// <summary>Magic identidier = "DICMFMT".</summary>
         const ulong DIC_MAGIC = 0x544D52464D434944;
diff --git a/Aaru.Images/DiscImageChef/Enums.cs b/Aaru.Images/AaruFormat/Enums.cs
similarity index 99%
rename from Aaru.Images/DiscImageChef/Enums.cs
rename to Aaru.Images/AaruFormat/Enums.cs
index cfeb5866b..dba522ef8 100644
--- a/Aaru.Images/DiscImageChef/Enums.cs
+++ b/Aaru.Images/AaruFormat/Enums.cs
@@ -32,7 +32,7 @@
 
 namespace Aaru.DiscImages
 {
-    public partial class DiscImageChef
+    public partial class AaruFormat
     {
         /// <summary>List of known compression types</summary>
         enum CompressionType : ushort
diff --git a/Aaru.Images/DiscImageChef/Helpers.cs b/Aaru.Images/AaruFormat/Helpers.cs
similarity index 99%
rename from Aaru.Images/DiscImageChef/Helpers.cs
rename to Aaru.Images/AaruFormat/Helpers.cs
index eada03bc5..d1dc2e541 100644
--- a/Aaru.Images/DiscImageChef/Helpers.cs
+++ b/Aaru.Images/AaruFormat/Helpers.cs
@@ -40,7 +40,7 @@ using Aaru.Helpers;
 
 namespace Aaru.DiscImages
 {
-    public partial class DiscImageChef
+    public partial class AaruFormat
     {
         /// <summary>Checks for media tags that may contain metadata and sets it up if not already set</summary>
         void SetMetadataFromTags()
diff --git a/Aaru.Images/DiscImageChef/Identify.cs b/Aaru.Images/AaruFormat/Identify.cs
similarity index 98%
rename from Aaru.Images/DiscImageChef/Identify.cs
rename to Aaru.Images/AaruFormat/Identify.cs
index fac9197c5..1ff06e52c 100644
--- a/Aaru.Images/DiscImageChef/Identify.cs
+++ b/Aaru.Images/AaruFormat/Identify.cs
@@ -36,7 +36,7 @@ using Aaru.Helpers;
 
 namespace Aaru.DiscImages
 {
-    public partial class DiscImageChef
+    public partial class AaruFormat
     {
         public bool Identify(IFilter imageFilter)
         {
diff --git a/Aaru.Images/DiscImageChef/Properties.cs b/Aaru.Images/AaruFormat/Properties.cs
similarity index 99%
rename from Aaru.Images/DiscImageChef/Properties.cs
rename to Aaru.Images/AaruFormat/Properties.cs
index c8ab7088f..825306a9c 100644
--- a/Aaru.Images/DiscImageChef/Properties.cs
+++ b/Aaru.Images/AaruFormat/Properties.cs
@@ -40,7 +40,7 @@ using Schemas;
 
 namespace Aaru.DiscImages
 {
-    public partial class DiscImageChef
+    public partial class AaruFormat
     {
         public ImageInfo              Info         => imageInfo;
         public string                 Name         => "DiscImageChef format";
diff --git a/Aaru.Images/DiscImageChef/Read.cs b/Aaru.Images/AaruFormat/Read.cs
similarity index 99%
rename from Aaru.Images/DiscImageChef/Read.cs
rename to Aaru.Images/AaruFormat/Read.cs
index f4e65e4ed..d688fcaac 100644
--- a/Aaru.Images/DiscImageChef/Read.cs
+++ b/Aaru.Images/AaruFormat/Read.cs
@@ -54,7 +54,7 @@ using TrackType = Aaru.CommonTypes.Enums.TrackType;
 
 namespace Aaru.DiscImages
 {
-    public partial class DiscImageChef
+    public partial class AaruFormat
     {
         public bool Open(IFilter imageFilter)
         {
diff --git a/Aaru.Images/DiscImageChef/Structs.cs b/Aaru.Images/AaruFormat/Structs.cs
similarity index 99%
rename from Aaru.Images/DiscImageChef/Structs.cs
rename to Aaru.Images/AaruFormat/Structs.cs
index ce59d7854..504587889 100644
--- a/Aaru.Images/DiscImageChef/Structs.cs
+++ b/Aaru.Images/AaruFormat/Structs.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Enums;
 
 namespace Aaru.DiscImages
 {
-    public partial class DiscImageChef
+    public partial class AaruFormat
     {
         /// <summary>Header, at start of file</summary>
         [StructLayout(LayoutKind.Sequential, Pack = 1, CharSet = CharSet.Unicode)]
diff --git a/Aaru.Images/DiscImageChef/Tape.cs b/Aaru.Images/AaruFormat/Tape.cs
similarity index 98%
rename from Aaru.Images/DiscImageChef/Tape.cs
rename to Aaru.Images/AaruFormat/Tape.cs
index 0ec364968..d1089e8e1 100644
--- a/Aaru.Images/DiscImageChef/Tape.cs
+++ b/Aaru.Images/AaruFormat/Tape.cs
@@ -36,7 +36,7 @@ using Aaru.CommonTypes.Structs;
 
 namespace Aaru.DiscImages
 {
-    public partial class DiscImageChef
+    public partial class AaruFormat
     {
         public List<TapeFile>      Files          { get; private set; }
         public List<TapePartition> TapePartitions { get; private set; }
diff --git a/Aaru.Images/DiscImageChef/Verify.cs b/Aaru.Images/AaruFormat/Verify.cs
similarity index 99%
rename from Aaru.Images/DiscImageChef/Verify.cs
rename to Aaru.Images/AaruFormat/Verify.cs
index 5d7eff67d..8d66cdb5d 100644
--- a/Aaru.Images/DiscImageChef/Verify.cs
+++ b/Aaru.Images/AaruFormat/Verify.cs
@@ -39,7 +39,7 @@ using Aaru.Helpers;
 
 namespace Aaru.DiscImages
 {
-    public partial class DiscImageChef
+    public partial class AaruFormat
     {
         public bool? VerifyMediaImage()
         {
diff --git a/Aaru.Images/DiscImageChef/Write.cs b/Aaru.Images/AaruFormat/Write.cs
similarity index 99%
rename from Aaru.Images/DiscImageChef/Write.cs
rename to Aaru.Images/AaruFormat/Write.cs
index be4b7afeb..a517f9fc8 100644
--- a/Aaru.Images/DiscImageChef/Write.cs
+++ b/Aaru.Images/AaruFormat/Write.cs
@@ -55,7 +55,7 @@ using TrackType = Aaru.CommonTypes.Enums.TrackType;
 
 namespace Aaru.DiscImages
 {
-    public partial class DiscImageChef
+    public partial class AaruFormat
     {
         public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
                            uint sectorSize)
@@ -271,8 +271,8 @@ namespace Aaru.DiscImages
             header.application             = "DiscImageChef";
             header.imageMajorVersion       = DICF_VERSION;
             header.imageMinorVersion       = 0;
-            header.applicationMajorVersion = (byte)typeof(DiscImageChef).Assembly.GetName().Version.Major;
-            header.applicationMinorVersion = (byte)typeof(DiscImageChef).Assembly.GetName().Version.Minor;
+            header.applicationMajorVersion = (byte)typeof(AaruFormat).Assembly.GetName().Version.Major;
+            header.applicationMinorVersion = (byte)typeof(AaruFormat).Assembly.GetName().Version.Minor;
 
             index = new List<IndexEntry>();