diff --git a/NDecrypt.N3DS/CIATool.cs b/NDecrypt.Core/N3DS/CIATool.cs
similarity index 100%
rename from NDecrypt.N3DS/CIATool.cs
rename to NDecrypt.Core/N3DS/CIATool.cs
diff --git a/NDecrypt.N3DS/CommonOperations.cs b/NDecrypt.Core/N3DS/CommonOperations.cs
similarity index 100%
rename from NDecrypt.N3DS/CommonOperations.cs
rename to NDecrypt.Core/N3DS/CommonOperations.cs
diff --git a/NDecrypt.N3DS/Constants.cs b/NDecrypt.Core/N3DS/Constants.cs
similarity index 100%
rename from NDecrypt.N3DS/Constants.cs
rename to NDecrypt.Core/N3DS/Constants.cs
diff --git a/NDecrypt.N3DS/DecryptArgs.cs b/NDecrypt.Core/N3DS/DecryptArgs.cs
similarity index 100%
rename from NDecrypt.N3DS/DecryptArgs.cs
rename to NDecrypt.Core/N3DS/DecryptArgs.cs
diff --git a/NDecrypt.N3DS/Enums.cs b/NDecrypt.Core/N3DS/Enums.cs
similarity index 100%
rename from NDecrypt.N3DS/Enums.cs
rename to NDecrypt.Core/N3DS/Enums.cs
diff --git a/NDecrypt.N3DS/Extensions.cs b/NDecrypt.Core/N3DS/Extensions.cs
similarity index 100%
rename from NDecrypt.N3DS/Extensions.cs
rename to NDecrypt.Core/N3DS/Extensions.cs
diff --git a/NDecrypt.N3DS/PartitionKeys.cs b/NDecrypt.Core/N3DS/PartitionKeys.cs
similarity index 100%
rename from NDecrypt.N3DS/PartitionKeys.cs
rename to NDecrypt.Core/N3DS/PartitionKeys.cs
diff --git a/NDecrypt.N3DS/ThreeDSTool.cs b/NDecrypt.Core/N3DS/ThreeDSTool.cs
similarity index 100%
rename from NDecrypt.N3DS/ThreeDSTool.cs
rename to NDecrypt.Core/N3DS/ThreeDSTool.cs
diff --git a/NDecrypt.Core/NDecrypt.Core.csproj b/NDecrypt.Core/NDecrypt.Core.csproj
index cba0d2f..e43337a 100644
--- a/NDecrypt.Core/NDecrypt.Core.csproj
+++ b/NDecrypt.Core/NDecrypt.Core.csproj
@@ -39,6 +39,8 @@
     <PackageReference Include="BouncyCastle.NetCore" Version="1.9.0" />
     <PackageReference Include="SabreTools.Hashing" Version="1.2.1" />
     <PackageReference Include="SabreTools.IO" Version="1.4.12" />
+    <PackageReference Include="SabreTools.Models" Version="1.4.10" />
+    <PackageReference Include="SabreTools.Serialization" Version="1.6.8" />
   </ItemGroup>
 
 </Project>
diff --git a/NDecrypt.Nitro/Constants.cs b/NDecrypt.Core/Nitro/Constants.cs
similarity index 100%
rename from NDecrypt.Nitro/Constants.cs
rename to NDecrypt.Core/Nitro/Constants.cs
diff --git a/NDecrypt.Nitro/DSTool.cs b/NDecrypt.Core/Nitro/DSTool.cs
similarity index 100%
rename from NDecrypt.Nitro/DSTool.cs
rename to NDecrypt.Core/Nitro/DSTool.cs
diff --git a/NDecrypt.Nitro/Enums.cs b/NDecrypt.Core/Nitro/Enums.cs
similarity index 100%
rename from NDecrypt.Nitro/Enums.cs
rename to NDecrypt.Core/Nitro/Enums.cs
diff --git a/NDecrypt.N3DS/NDecrypt.N3DS.csproj b/NDecrypt.N3DS/NDecrypt.N3DS.csproj
deleted file mode 100644
index 416fa9a..0000000
--- a/NDecrypt.N3DS/NDecrypt.N3DS.csproj
+++ /dev/null
@@ -1,47 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <!-- Assembly Properties -->
-    <TargetFrameworks>net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
-    <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
-    <LangVersion>latest</LangVersion>
-    <Nullable>enable</Nullable>
-    <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <VersionPrefix>0.2.5</VersionPrefix>
-
-    <!-- Package Properties -->
-    <Authors>Matt Nadareski</Authors>
-    <Description>3DS encryption and decryption code</Description>
-    <Copyright>Copyright (c) Matt Nadareski 2019-2024</Copyright>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageProjectUrl>https://github.com/SabreTools/</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/SabreTools/NDecrypt</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-  </PropertyGroup>
-
-  <!-- Support All Frameworks -->
-  <PropertyGroup Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR $(TargetFramework.StartsWith(`net4`))">
-    <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith(`netcoreapp`)) OR $(TargetFramework.StartsWith(`net5`))">
-    <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64</RuntimeIdentifiers>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith(`net6`)) OR $(TargetFramework.StartsWith(`net7`)) OR $(TargetFramework.StartsWith(`net8`))">
-    <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(RuntimeIdentifier.StartsWith(`osx-arm`))">
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\NDecrypt.Core\NDecrypt.Core.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="SabreTools.Models" Version="1.4.10" />
-    <PackageReference Include="SabreTools.Serialization" Version="1.6.8" />
-  </ItemGroup>
-
-</Project>
diff --git a/NDecrypt.Nitro/NDecrypt.Nitro.csproj b/NDecrypt.Nitro/NDecrypt.Nitro.csproj
deleted file mode 100644
index 3024b21..0000000
--- a/NDecrypt.Nitro/NDecrypt.Nitro.csproj
+++ /dev/null
@@ -1,47 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <!-- Assembly Properties -->
-        <TargetFrameworks>net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
-        <CheckEolTargetFramework>false</CheckEolTargetFramework>
-        <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
-        <LangVersion>latest</LangVersion>
-        <Nullable>enable</Nullable>
-        <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
-        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <VersionPrefix>0.2.5</VersionPrefix>
-
-        <!-- Package Properties -->
-        <Authors>Matt Nadareski</Authors>
-        <Description>NDS encryption and decryption code</Description>
-        <Copyright>Copyright (c) Matt Nadareski 2019-2024</Copyright>
-        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <PackageProjectUrl>https://github.com/SabreTools/</PackageProjectUrl>
-        <RepositoryUrl>https://github.com/SabreTools/NDecrypt</RepositoryUrl>
-        <RepositoryType>git</RepositoryType>
-    </PropertyGroup>
-
-    <!-- Support All Frameworks -->
-    <PropertyGroup Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR $(TargetFramework.StartsWith(`net4`))">
-        <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
-    </PropertyGroup>
-    <PropertyGroup Condition="$(TargetFramework.StartsWith(`netcoreapp`)) OR $(TargetFramework.StartsWith(`net5`))">
-        <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64</RuntimeIdentifiers>
-    </PropertyGroup>
-    <PropertyGroup Condition="$(TargetFramework.StartsWith(`net6`)) OR $(TargetFramework.StartsWith(`net7`)) OR $(TargetFramework.StartsWith(`net8`))">
-        <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
-    </PropertyGroup>
-    <PropertyGroup Condition="$(RuntimeIdentifier.StartsWith(`osx-arm`))">
-        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\NDecrypt.Core\NDecrypt.Core.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="SabreTools.Models" Version="1.4.10" />
-        <PackageReference Include="SabreTools.Serialization" Version="1.6.8" />
-    </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/NDecrypt.sln b/NDecrypt.sln
index b782c69..1e7ee5e 100644
--- a/NDecrypt.sln
+++ b/NDecrypt.sln
@@ -12,10 +12,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NDecrypt", "NDecrypt\NDecry
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NDecrypt.Core", "NDecrypt.Core\NDecrypt.Core.csproj", "{91C54370-5741-4742-B2E9-EC498551AD1C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NDecrypt.N3DS", "NDecrypt.N3DS\NDecrypt.N3DS.csproj", "{F0A33533-B248-4D62-95CC-47DFC9721A11}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NDecrypt.Nitro", "NDecrypt.Nitro\NDecrypt.Nitro.csproj", "{1D2AE261-86FE-44E4-A7D3-C43AA5FB8523}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -30,14 +26,6 @@ Global
 		{91C54370-5741-4742-B2E9-EC498551AD1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{91C54370-5741-4742-B2E9-EC498551AD1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{91C54370-5741-4742-B2E9-EC498551AD1C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F0A33533-B248-4D62-95CC-47DFC9721A11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F0A33533-B248-4D62-95CC-47DFC9721A11}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F0A33533-B248-4D62-95CC-47DFC9721A11}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F0A33533-B248-4D62-95CC-47DFC9721A11}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1D2AE261-86FE-44E4-A7D3-C43AA5FB8523}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1D2AE261-86FE-44E4-A7D3-C43AA5FB8523}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1D2AE261-86FE-44E4-A7D3-C43AA5FB8523}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1D2AE261-86FE-44E4-A7D3-C43AA5FB8523}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/NDecrypt/NDecrypt.csproj b/NDecrypt/NDecrypt.csproj
index 2bead6e..6699d1f 100644
--- a/NDecrypt/NDecrypt.csproj
+++ b/NDecrypt/NDecrypt.csproj
@@ -39,8 +39,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\NDecrypt.Core\NDecrypt.Core.csproj" />
-    <ProjectReference Include="..\NDecrypt.N3DS\NDecrypt.N3DS.csproj" />
-    <ProjectReference Include="..\NDecrypt.Nitro\NDecrypt.Nitro.csproj" />
   </ItemGroup>
 
 </Project>