diff --git a/.gitmodules b/.gitmodules
index ccc42e96e..0a8499607 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -20,7 +20,7 @@
 	path = Aaru.Helpers
 	url = https://github.com/aaru-dps/Aaru.Helpers
 [submodule "cuetools.net"]
-	path = cuetools.net
+	path = Aaru.Compression/cuetools.net
 	url = https://github.com/gchudov/cuetools.net
 [submodule "Aaru.Decryption"]
 	path = Aaru.Decryption
diff --git a/Aaru.Compression/Aaru.Compression.csproj b/Aaru.Compression/Aaru.Compression.csproj
index a75acc40b..a63bcde12 100644
--- a/Aaru.Compression/Aaru.Compression.csproj
+++ b/Aaru.Compression/Aaru.Compression.csproj
@@ -63,9 +63,22 @@
     <Reference Include="System.Data"/>
     <Reference Include="System.Xml"/>
   </ItemGroup>
+  <PropertyGroup>
+    <DefaultItemExcludes>
+      $(DefaultItemExcludes);cuetools.net/**/*
+    </DefaultItemExcludes>
+  </PropertyGroup>
   <ItemGroup>
-    <Compile Include="AppleRle.cs"/>
-    <Compile Include="TeleDiskLzh.cs"/>
+    <Compile Include="AppleRle.cs" />
+    <Compile Include="TeleDiskLzh.cs" />
+    <Compile Include="cuetools.net/CUETools.Codecs/*.cs" />
+    <Compile Include="cuetools.net/CUETools.Codecs/CommandLine/*.cs" />
+    <Compile Include="cuetools.net/CUETools.Codecs/CRC/*.cs" />
+    <Compile Include="cuetools.net/CUETools.Codecs/NULL/*.cs" />
+    <Compile Include="cuetools.net/CUETools.Codecs/ViewModel/*.cs" />
+    <Compile Include="cuetools.net/CUETools.Codecs/WAV/*.cs" />
+    <Compile Include="cuetools.net/CUETools.Codecs.Flake/*.cs" />
+    <Compile Include="cuetools.net/CUETools.Codecs.Flake/Properties/*.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="..\LICENSE.LGPL">
@@ -73,7 +86,9 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" PrivateAssets="all"/>
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
+    <PackageReference Include="System.Resources.Extensions" Version="5.0.0" />
+    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" PrivateAssets="all" />
   </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
          Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/cuetools.net b/Aaru.Compression/cuetools.net
similarity index 100%
rename from cuetools.net
rename to Aaru.Compression/cuetools.net
diff --git a/Aaru.Images/Aaru.Images.csproj b/Aaru.Images/Aaru.Images.csproj
index 265ee2e0e..ae586999c 100644
--- a/Aaru.Images/Aaru.Images.csproj
+++ b/Aaru.Images/Aaru.Images.csproj
@@ -555,8 +555,6 @@
       <Project>{D571B8EF-903D-4353-BDD5-B834F9F029EF}</Project>
       <Name>Aaru.Filters</Name>
     </ProjectReference>
-    <ProjectReference Include="..\cuetools.net\CUETools.Codecs.Flake\CUETools.Codecs.Flake.csproj"/>
-    <ProjectReference Include="..\cuetools.net\CUETools.Codecs\CUETools.Codecs.csproj"/>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="..\LICENSE.LGPL">
diff --git a/Aaru.sln b/Aaru.sln
index f0e018b2b..a885f8511 100644
--- a/Aaru.sln
+++ b/Aaru.sln
@@ -34,14 +34,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Database", "Aaru.Datab
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Dto", "Aaru.Dto\Aaru.Dto.csproj", "{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CUETools.Codecs", "cuetools.net\CUETools.Codecs\CUETools.Codecs.csproj", "{D1F69B02-A6A4-4EF2-A916-815BACC18F71}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Tests", "Aaru.Tests\Aaru.Tests.csproj", "{B2A2CCF8-150D-4A00-BCB5-1B0CBCFA95D5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Tests.Devices", "Aaru.Tests.Devices\Aaru.Tests.Devices.csproj", "{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CUETools.Codecs.Flake", "cuetools.net\CUETools.Codecs.Flake\CUETools.Codecs.Flake.csproj", "{69FAC887-A3DE-4C23-84A5-9C5F64E4C3E1}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Decryption", "Aaru.Decryption\Aaru.Decryption.csproj", "{B609D333-80C5-4503-BF46-8B9B91F04E97}"
 EndProject
 Global
@@ -180,14 +176,6 @@ Global
 		{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Release|x86.ActiveCfg = Release|Any CPU
 		{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Release|x86.Build.0 = Release|Any CPU
-		{D1F69B02-A6A4-4EF2-A916-815BACC18F71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D1F69B02-A6A4-4EF2-A916-815BACC18F71}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D1F69B02-A6A4-4EF2-A916-815BACC18F71}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D1F69B02-A6A4-4EF2-A916-815BACC18F71}.Debug|x86.Build.0 = Debug|Any CPU
-		{D1F69B02-A6A4-4EF2-A916-815BACC18F71}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D1F69B02-A6A4-4EF2-A916-815BACC18F71}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D1F69B02-A6A4-4EF2-A916-815BACC18F71}.Release|x86.ActiveCfg = Release|Any CPU
-		{D1F69B02-A6A4-4EF2-A916-815BACC18F71}.Release|x86.Build.0 = Release|Any CPU
 		{B2A2CCF8-150D-4A00-BCB5-1B0CBCFA95D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B2A2CCF8-150D-4A00-BCB5-1B0CBCFA95D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B2A2CCF8-150D-4A00-BCB5-1B0CBCFA95D5}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -204,14 +192,6 @@ Global
 		{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Release|x86.ActiveCfg = Release|Any CPU
 		{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Release|x86.Build.0 = Release|Any CPU
-		{69FAC887-A3DE-4C23-84A5-9C5F64E4C3E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{69FAC887-A3DE-4C23-84A5-9C5F64E4C3E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{69FAC887-A3DE-4C23-84A5-9C5F64E4C3E1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{69FAC887-A3DE-4C23-84A5-9C5F64E4C3E1}.Debug|x86.Build.0 = Debug|Any CPU
-		{69FAC887-A3DE-4C23-84A5-9C5F64E4C3E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{69FAC887-A3DE-4C23-84A5-9C5F64E4C3E1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{69FAC887-A3DE-4C23-84A5-9C5F64E4C3E1}.Release|x86.ActiveCfg = Release|Any CPU
-		{69FAC887-A3DE-4C23-84A5-9C5F64E4C3E1}.Release|x86.Build.0 = Release|Any CPU
 		{B609D333-80C5-4503-BF46-8B9B91F04E97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B609D333-80C5-4503-BF46-8B9B91F04E97}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B609D333-80C5-4503-BF46-8B9B91F04E97}.Debug|x86.ActiveCfg = Debug|Any CPU