diff --git a/BinaryObjectScanner.FileType/BinaryObjectScanner.FileType.csproj b/BinaryObjectScanner.FileType/BinaryObjectScanner.FileType.csproj
deleted file mode 100644
index a6e1295c..00000000
--- a/BinaryObjectScanner.FileType/BinaryObjectScanner.FileType.csproj
+++ /dev/null
@@ -1,38 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <!-- Assembly Properties -->
-    <TargetFrameworks>net48;net6.0;net7.0</TargetFrameworks>
-    <RuntimeIdentifiers>win-x86;win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
-    <Version>2.8</Version>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-
-    <!-- Package Properties -->
-    <Authors>Matt Nadareski</Authors>
-    <Product>BurnOutSharp</Product>
-    <Copyright>Copyright (c)2022-2023 Matt Nadareski</Copyright>
-    <PackageProjectUrl>https://github.com/SabreTools/</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/mnadareski/BurnOutSharp</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <IncludeSource>true</IncludeSource>
-    <IncludeSymbols>true</IncludeSymbols>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)'!='net48'">
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\BinaryObjectScanner\BinaryObjectScanner.csproj" />
-    <ProjectReference Include="..\BinaryObjectScanner.Compression\BinaryObjectScanner.Compression.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="OpenMcdf" Version="2.2.1.12" />
-    <PackageReference Include="SabreTools.Matching" Version="1.1.0" />
-    <PackageReference Include="SharpCompress" Version="0.32.2" />
-    <PackageReference Include="UnshieldSharp" Version="1.6.9" />
-  </ItemGroup>
-
-</Project>
diff --git a/BinaryObjectScanner/BinaryObjectScanner.csproj b/BinaryObjectScanner/BinaryObjectScanner.csproj
index 980cb7e1..f344261e 100644
--- a/BinaryObjectScanner/BinaryObjectScanner.csproj
+++ b/BinaryObjectScanner/BinaryObjectScanner.csproj
@@ -29,11 +29,13 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="OpenMcdf" Version="2.2.1.12" />
     <PackageReference Include="SabreTools.IO" Version="1.1.1" />
     <PackageReference Include="SabreTools.Matching" Version="1.1.0" />
     <PackageReference Include="SabreTools.Serialization" Version="1.1.5" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
     <PackageReference Include="SharpZipLib" Version="1.4.1" />
+    <PackageReference Include="UnshieldSharp" Version="1.6.9" />
     <PackageReference Include="WiseUnpacker" Version="1.0.4" />
   </ItemGroup>
 
diff --git a/BinaryObjectScanner.FileType/AACSMediaKeyBlock.cs b/BinaryObjectScanner/FileType/AACSMediaKeyBlock.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/AACSMediaKeyBlock.cs
rename to BinaryObjectScanner/FileType/AACSMediaKeyBlock.cs
diff --git a/BinaryObjectScanner.FileType/BDPlusSVM.cs b/BinaryObjectScanner/FileType/BDPlusSVM.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/BDPlusSVM.cs
rename to BinaryObjectScanner/FileType/BDPlusSVM.cs
diff --git a/BinaryObjectScanner.FileType/BFPK.cs b/BinaryObjectScanner/FileType/BFPK.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/BFPK.cs
rename to BinaryObjectScanner/FileType/BFPK.cs
diff --git a/BinaryObjectScanner.FileType/BSP.cs b/BinaryObjectScanner/FileType/BSP.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/BSP.cs
rename to BinaryObjectScanner/FileType/BSP.cs
diff --git a/BinaryObjectScanner.FileType/BZip2.cs b/BinaryObjectScanner/FileType/BZip2.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/BZip2.cs
rename to BinaryObjectScanner/FileType/BZip2.cs
diff --git a/BinaryObjectScanner.FileType/CFB.cs b/BinaryObjectScanner/FileType/CFB.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/CFB.cs
rename to BinaryObjectScanner/FileType/CFB.cs
diff --git a/BinaryObjectScanner.FileType/Executable.cs b/BinaryObjectScanner/FileType/Executable.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/Executable.cs
rename to BinaryObjectScanner/FileType/Executable.cs
diff --git a/BinaryObjectScanner.FileType/GCF.cs b/BinaryObjectScanner/FileType/GCF.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/GCF.cs
rename to BinaryObjectScanner/FileType/GCF.cs
diff --git a/BinaryObjectScanner.FileType/GZIP.cs b/BinaryObjectScanner/FileType/GZIP.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/GZIP.cs
rename to BinaryObjectScanner/FileType/GZIP.cs
diff --git a/BinaryObjectScanner.FileType/InstallShieldArchiveV3.cs b/BinaryObjectScanner/FileType/InstallShieldArchiveV3.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/InstallShieldArchiveV3.cs
rename to BinaryObjectScanner/FileType/InstallShieldArchiveV3.cs
diff --git a/BinaryObjectScanner.FileType/InstallShieldCAB.cs b/BinaryObjectScanner/FileType/InstallShieldCAB.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/InstallShieldCAB.cs
rename to BinaryObjectScanner/FileType/InstallShieldCAB.cs
diff --git a/BinaryObjectScanner.FileType/LDSCRYPT.cs b/BinaryObjectScanner/FileType/LDSCRYPT.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/LDSCRYPT.cs
rename to BinaryObjectScanner/FileType/LDSCRYPT.cs
diff --git a/BinaryObjectScanner.FileType/MPQ.cs b/BinaryObjectScanner/FileType/MPQ.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/MPQ.cs
rename to BinaryObjectScanner/FileType/MPQ.cs
diff --git a/BinaryObjectScanner.FileType/MicrosoftCAB.cs b/BinaryObjectScanner/FileType/MicrosoftCAB.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/MicrosoftCAB.cs
rename to BinaryObjectScanner/FileType/MicrosoftCAB.cs
diff --git a/BinaryObjectScanner.FileType/MicrosoftLZ.cs b/BinaryObjectScanner/FileType/MicrosoftLZ.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/MicrosoftLZ.cs
rename to BinaryObjectScanner/FileType/MicrosoftLZ.cs
diff --git a/BinaryObjectScanner.FileType/PAK.cs b/BinaryObjectScanner/FileType/PAK.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/PAK.cs
rename to BinaryObjectScanner/FileType/PAK.cs
diff --git a/BinaryObjectScanner.FileType/PFF.cs b/BinaryObjectScanner/FileType/PFF.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/PFF.cs
rename to BinaryObjectScanner/FileType/PFF.cs
diff --git a/BinaryObjectScanner.FileType/PKZIP.cs b/BinaryObjectScanner/FileType/PKZIP.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/PKZIP.cs
rename to BinaryObjectScanner/FileType/PKZIP.cs
diff --git a/BinaryObjectScanner.FileType/PLJ.cs b/BinaryObjectScanner/FileType/PLJ.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/PLJ.cs
rename to BinaryObjectScanner/FileType/PLJ.cs
diff --git a/BinaryObjectScanner.FileType/Quantum.cs b/BinaryObjectScanner/FileType/Quantum.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/Quantum.cs
rename to BinaryObjectScanner/FileType/Quantum.cs
diff --git a/BinaryObjectScanner.FileType/RAR.cs b/BinaryObjectScanner/FileType/RAR.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/RAR.cs
rename to BinaryObjectScanner/FileType/RAR.cs
diff --git a/BinaryObjectScanner.FileType/SFFS.cs b/BinaryObjectScanner/FileType/SFFS.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/SFFS.cs
rename to BinaryObjectScanner/FileType/SFFS.cs
diff --git a/BinaryObjectScanner.FileType/SGA.cs b/BinaryObjectScanner/FileType/SGA.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/SGA.cs
rename to BinaryObjectScanner/FileType/SGA.cs
diff --git a/BinaryObjectScanner.FileType/SevenZip.cs b/BinaryObjectScanner/FileType/SevenZip.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/SevenZip.cs
rename to BinaryObjectScanner/FileType/SevenZip.cs
diff --git a/BinaryObjectScanner.FileType/TapeArchive.cs b/BinaryObjectScanner/FileType/TapeArchive.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/TapeArchive.cs
rename to BinaryObjectScanner/FileType/TapeArchive.cs
diff --git a/BinaryObjectScanner.FileType/Textfile.cs b/BinaryObjectScanner/FileType/Textfile.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/Textfile.cs
rename to BinaryObjectScanner/FileType/Textfile.cs
diff --git a/BinaryObjectScanner.FileType/VBSP.cs b/BinaryObjectScanner/FileType/VBSP.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/VBSP.cs
rename to BinaryObjectScanner/FileType/VBSP.cs
diff --git a/BinaryObjectScanner.FileType/VPK.cs b/BinaryObjectScanner/FileType/VPK.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/VPK.cs
rename to BinaryObjectScanner/FileType/VPK.cs
diff --git a/BinaryObjectScanner.FileType/WAD.cs b/BinaryObjectScanner/FileType/WAD.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/WAD.cs
rename to BinaryObjectScanner/FileType/WAD.cs
diff --git a/BinaryObjectScanner.FileType/XZ.cs b/BinaryObjectScanner/FileType/XZ.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/XZ.cs
rename to BinaryObjectScanner/FileType/XZ.cs
diff --git a/BinaryObjectScanner.FileType/XZP.cs b/BinaryObjectScanner/FileType/XZP.cs
similarity index 100%
rename from BinaryObjectScanner.FileType/XZP.cs
rename to BinaryObjectScanner/FileType/XZP.cs
diff --git a/BurnOutSharp.sln b/BurnOutSharp.sln
index ee244047..192b8a52 100644
--- a/BurnOutSharp.sln
+++ b/BurnOutSharp.sln
@@ -22,8 +22,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BinaryObjectScanner.Utiliti
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BinaryObjectScanner.Compression", "BinaryObjectScanner.Compression\BinaryObjectScanner.Compression.csproj", "{B55206B2-58FD-4A47-AADC-74982FEA8FAD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BinaryObjectScanner.FileType", "BinaryObjectScanner.FileType\BinaryObjectScanner.FileType.csproj", "{6733368B-63D4-4921-AE13-FD1A53C5180C}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -50,10 +48,6 @@ Global
 		{B55206B2-58FD-4A47-AADC-74982FEA8FAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B55206B2-58FD-4A47-AADC-74982FEA8FAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B55206B2-58FD-4A47-AADC-74982FEA8FAD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6733368B-63D4-4921-AE13-FD1A53C5180C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6733368B-63D4-4921-AE13-FD1A53C5180C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6733368B-63D4-4921-AE13-FD1A53C5180C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6733368B-63D4-4921-AE13-FD1A53C5180C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/BurnOutSharp/BurnOutSharp.csproj b/BurnOutSharp/BurnOutSharp.csproj
index 3e7e3ee1..ca9db730 100644
--- a/BurnOutSharp/BurnOutSharp.csproj
+++ b/BurnOutSharp/BurnOutSharp.csproj
@@ -48,10 +48,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </ProjectReference>
-    <ProjectReference Include="..\BinaryObjectScanner.FileType\BinaryObjectScanner.FileType.csproj">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
     <ProjectReference Include="..\BinaryObjectScanner.Utilities\BinaryObjectScanner.Utilities.csproj">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
diff --git a/Test/Test.csproj b/Test/Test.csproj
index 022e256c..c725cae0 100644
--- a/Test/Test.csproj
+++ b/Test/Test.csproj
@@ -8,9 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\BurnOutSharp\BurnOutSharp.csproj" />
-    <ProjectReference Include="..\BinaryObjectScanner.FileType\BinaryObjectScanner.FileType.csproj" />
+    <ProjectReference Include="..\BinaryObjectScanner\BinaryObjectScanner.csproj" />
     <ProjectReference Include="..\BinaryObjectScanner.Utilities\BinaryObjectScanner.Utilities.csproj" />
+    <ProjectReference Include="..\BurnOutSharp\BurnOutSharp.csproj" />
   </ItemGroup>
 
   <ItemGroup>