diff --git a/.gitmodules b/.gitmodules
index 5d8a50f7..d1439a8d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,21 @@
 [submodule "CICMMetadata"]
 	path = CICMMetadata
 	url = https://github.com/claunia/CICMMetadata.git
+[submodule "Aaru.Checksums"]
+	path = Aaru.Checksums
+	url = https://github.com/aaru-dps/Aaru.Checksums.git
+[submodule "Aaru.CommonTypes"]
+	path = Aaru.CommonTypes
+	url = https://github.com/aaru-dps/Aaru.CommonTypes.git
+[submodule "Aaru.Console"]
+	path = Aaru.Console
+	url = https://github.com/aaru-dps/Aaru.Console.git
+[submodule "Aaru.Decoders"]
+	path = Aaru.Decoders
+	url = https://github.com/aaru-dps/Aaru.Decoders.git
+[submodule "Aaru.Dto"]
+	path = Aaru.Dto
+	url = https://github.com/aaru-dps/Aaru.Dto.git
+[submodule "Aaru.Helpers"]
+	path = Aaru.Helpers
+	url = https://github.com/aaru-dps/Aaru.Helpers.git
diff --git a/.idea/.idea.DiscImageChef.Server/.idea/vcs.xml b/.idea/.idea.DiscImageChef.Server/.idea/vcs.xml
index 6bb85030..873ade2d 100644
--- a/.idea/.idea.DiscImageChef.Server/.idea/vcs.xml
+++ b/.idea/.idea.DiscImageChef.Server/.idea/vcs.xml
@@ -7,11 +7,12 @@
   </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/Aaru.Checksums" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/Aaru.CommonTypes" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/Aaru.Console" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/Aaru.Decoders" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/Aaru.Dto" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/Aaru.Helpers" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/CICMMetadata" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/DiscImageChef.CommonTypes" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/DiscImageChef.Console" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/DiscImageChef.Decoders" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/DiscImageChef.Dto" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/DiscImageChef.Helpers" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Aaru.Checksums b/Aaru.Checksums
new file mode 160000
index 00000000..bf19f92f
--- /dev/null
+++ b/Aaru.Checksums
@@ -0,0 +1 @@
+Subproject commit bf19f92f86069f9c3d14a7e1656b006356f9cff5
diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes
new file mode 160000
index 00000000..342a779c
--- /dev/null
+++ b/Aaru.CommonTypes
@@ -0,0 +1 @@
+Subproject commit 342a779c5ce8a9df533c56d90eccba1cc506c0cf
diff --git a/Aaru.Console b/Aaru.Console
new file mode 160000
index 00000000..01cb8e74
--- /dev/null
+++ b/Aaru.Console
@@ -0,0 +1 @@
+Subproject commit 01cb8e7426fc2a711ea0a2f8237902e444d396e7
diff --git a/Aaru.Decoders b/Aaru.Decoders
new file mode 160000
index 00000000..b7c9b6b1
--- /dev/null
+++ b/Aaru.Decoders
@@ -0,0 +1 @@
+Subproject commit b7c9b6b1fb5304359ab5fe5256860a4c400743c8
diff --git a/Aaru.Dto b/Aaru.Dto
new file mode 160000
index 00000000..e1af6ba0
--- /dev/null
+++ b/Aaru.Dto
@@ -0,0 +1 @@
+Subproject commit e1af6ba0da9b15c218af1638416922e5c412243c
diff --git a/Aaru.Helpers b/Aaru.Helpers
new file mode 160000
index 00000000..afa99999
--- /dev/null
+++ b/Aaru.Helpers
@@ -0,0 +1 @@
+Subproject commit afa99999a8b9b668d79a539925240e222ff90bfa
diff --git a/DiscImageChef.Server.Task/DiscImageChef.Server.Task.csproj b/DiscImageChef.Server.Task/DiscImageChef.Server.Task.csproj
index 28b10439..cfe6f9f7 100644
--- a/DiscImageChef.Server.Task/DiscImageChef.Server.Task.csproj
+++ b/DiscImageChef.Server.Task/DiscImageChef.Server.Task.csproj
@@ -30,7 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\DiscImageChef.Helpers\DiscImageChef.Helpers.csproj" />
+    <ProjectReference Include="..\Aaru.Helpers\Aaru.Helpers.csproj" />
     <ProjectReference Include="..\DiscImageChef.Server\DiscImageChef.Server.csproj" />
   </ItemGroup>
 
diff --git a/DiscImageChef.Server.sln b/DiscImageChef.Server.sln
index d3ebb86b..be7ed683 100644
--- a/DiscImageChef.Server.sln
+++ b/DiscImageChef.Server.sln
@@ -5,19 +5,19 @@ VisualStudioVersion = 16.0.28922.388
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscImageChef.Server", "DiscImageChef.Server\DiscImageChef.Server.csproj", "{911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscImageChef.CommonTypes", "DiscImageChef.CommonTypes\DiscImageChef.CommonTypes.csproj", "{F2B84194-26EB-4227-B1C5-6602517E85AE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscImageChef.Decoders", "DiscImageChef.Decoders\DiscImageChef.Decoders.csproj", "{0BEB3088-B634-4289-AE17-CDF2D25D00D5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscImageChef.Dto", "DiscImageChef.Dto\DiscImageChef.Dto.csproj", "{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscImageChef.Helpers", "DiscImageChef.Helpers\DiscImageChef.Helpers.csproj", "{F8BDF57B-1571-4CD0-84B3-B422088D359A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscImageChef.Console", "DiscImageChef.Console\DiscImageChef.Console.csproj", "{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscImageChef.Server.Task", "DiscImageChef.Server.Task\DiscImageChef.Server.Task.csproj", "{79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscImageChef.Checksums", "DiscImageChef.Checksums\DiscImageChef.Checksums.csproj", "{CC48B324-A532-4A45-87A6-6F91F7141E8D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aaru.Checksums", "Aaru.Checksums\Aaru.Checksums.csproj", "{CC48B324-A532-4A45-87A6-6F91F7141E8D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aaru.CommonTypes", "Aaru.CommonTypes\Aaru.CommonTypes.csproj", "{F2B84194-26EB-4227-B1C5-6602517E85AE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aaru.Console", "Aaru.Console\Aaru.Console.csproj", "{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aaru.Decoders", "Aaru.Decoders\Aaru.Decoders.csproj", "{0BEB3088-B634-4289-AE17-CDF2D25D00D5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aaru.Dto", "Aaru.Dto\Aaru.Dto.csproj", "{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aaru.Helpers", "Aaru.Helpers\Aaru.Helpers.csproj", "{F8BDF57B-1571-4CD0-84B3-B422088D359A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -29,10 +29,22 @@ Global
 		{911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{911ADDF5-E5FA-445D-88CD-C7F8FFDBE645}.Release|Any CPU.Build.0 = Release|Any CPU
+		{79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CC48B324-A532-4A45-87A6-6F91F7141E8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CC48B324-A532-4A45-87A6-6F91F7141E8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CC48B324-A532-4A45-87A6-6F91F7141E8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CC48B324-A532-4A45-87A6-6F91F7141E8D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F2B84194-26EB-4227-B1C5-6602517E85AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F2B84194-26EB-4227-B1C5-6602517E85AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F2B84194-26EB-4227-B1C5-6602517E85AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F2B84194-26EB-4227-B1C5-6602517E85AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0BEB3088-B634-4289-AE17-CDF2D25D00D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0BEB3088-B634-4289-AE17-CDF2D25D00D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0BEB3088-B634-4289-AE17-CDF2D25D00D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -45,18 +57,6 @@ Global
 		{F8BDF57B-1571-4CD0-84B3-B422088D359A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F8BDF57B-1571-4CD0-84B3-B422088D359A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F8BDF57B-1571-4CD0-84B3-B422088D359A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}.Release|Any CPU.Build.0 = Release|Any CPU
-		{79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{79D6A54E-47B6-4D0A-ABEB-4FA7B5ADF4B2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CC48B324-A532-4A45-87A6-6F91F7141E8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CC48B324-A532-4A45-87A6-6F91F7141E8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CC48B324-A532-4A45-87A6-6F91F7141E8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CC48B324-A532-4A45-87A6-6F91F7141E8D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/DiscImageChef.Server/DiscImageChef.Server.csproj b/DiscImageChef.Server/DiscImageChef.Server.csproj
index 46c9c3b3..bc56dc0e 100644
--- a/DiscImageChef.Server/DiscImageChef.Server.csproj
+++ b/DiscImageChef.Server/DiscImageChef.Server.csproj
@@ -23,11 +23,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\DiscImageChef.CommonTypes\DiscImageChef.CommonTypes.csproj" />
-    <ProjectReference Include="..\DiscImageChef.Console\DiscImageChef.Console.csproj" />
-    <ProjectReference Include="..\DiscImageChef.Decoders\DiscImageChef.Decoders.csproj" />
-    <ProjectReference Include="..\DiscImageChef.Dto\DiscImageChef.Dto.csproj" />
-    <ProjectReference Include="..\DiscImageChef.Helpers\DiscImageChef.Helpers.csproj" />
+    <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj" />
+    <ProjectReference Include="..\Aaru.Console\Aaru.Console.csproj" />
+    <ProjectReference Include="..\Aaru.Decoders\Aaru.Decoders.csproj" />
+    <ProjectReference Include="..\Aaru.Dto\Aaru.Dto.csproj" />
+    <ProjectReference Include="..\Aaru.Helpers\Aaru.Helpers.csproj" />
   </ItemGroup>
 
   <ItemGroup>