diff --git a/BurnOutSharp/FileType/BFPK.cs b/BinaryObjectScanner.FileType/BFPK.cs
similarity index 90%
rename from BurnOutSharp/FileType/BFPK.cs
rename to BinaryObjectScanner.FileType/BFPK.cs
index e5e4450a..415e77eb 100644
--- a/BurnOutSharp/FileType/BFPK.cs
+++ b/BinaryObjectScanner.FileType/BFPK.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using BinaryObjectScanner.Interfaces;
 
-namespace BurnOutSharp.FileType
+namespace BinaryObjectScanner.FileType
 {
     /// <summary>
     /// BFPK custom archive format
@@ -27,7 +27,7 @@ namespace BurnOutSharp.FileType
             try
             {
                 // Create the wrapper
-                BinaryObjectScanner.Wrappers.BFPK bfpk = BinaryObjectScanner.Wrappers.BFPK.Create(stream);
+                Wrappers.BFPK bfpk = Wrappers.BFPK.Create(stream);
                 if (bfpk == null)
                     return null;
 
diff --git a/BurnOutSharp/FileType/BSP.cs b/BinaryObjectScanner.FileType/BSP.cs
similarity index 90%
rename from BurnOutSharp/FileType/BSP.cs
rename to BinaryObjectScanner.FileType/BSP.cs
index 07203545..b259b355 100644
--- a/BurnOutSharp/FileType/BSP.cs
+++ b/BinaryObjectScanner.FileType/BSP.cs
@@ -2,7 +2,7 @@ using System;
 using System.IO;
 using BinaryObjectScanner.Interfaces;
 
-namespace BurnOutSharp.FileType
+namespace BinaryObjectScanner.FileType
 {
     /// <summary>
     /// Half-Life Level
@@ -27,7 +27,7 @@ namespace BurnOutSharp.FileType
             try
             {
                 // Create the wrapper
-                BinaryObjectScanner.Wrappers.BSP bsp = BinaryObjectScanner.Wrappers.BSP.Create(stream);
+                Wrappers.BSP bsp = Wrappers.BSP.Create(stream);
                 if (bsp == null)
                     return null;
 
diff --git a/BurnOutSharp/FileType/BZip2.cs b/BinaryObjectScanner.FileType/BZip2.cs
similarity index 97%
rename from BurnOutSharp/FileType/BZip2.cs
rename to BinaryObjectScanner.FileType/BZip2.cs
index 083879c0..788947ff 100644
--- a/BurnOutSharp/FileType/BZip2.cs
+++ b/BinaryObjectScanner.FileType/BZip2.cs
@@ -4,7 +4,7 @@ using BinaryObjectScanner.Interfaces;
 using SharpCompress.Compressors;
 using SharpCompress.Compressors.BZip2;
 
-namespace BurnOutSharp.FileType
+namespace BinaryObjectScanner.FileType
 {
     /// <summary>
     /// bzip2 archive
diff --git a/BinaryObjectScanner.FileType/BinaryObjectScanner.FileType.csproj b/BinaryObjectScanner.FileType/BinaryObjectScanner.FileType.csproj
index 333e0f2b..e8fa6f94 100644
--- a/BinaryObjectScanner.FileType/BinaryObjectScanner.FileType.csproj
+++ b/BinaryObjectScanner.FileType/BinaryObjectScanner.FileType.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net48;net6.0;net7.0</TargetFrameworks>
@@ -20,4 +20,15 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\BinaryObjectScanner.Interfaces\BinaryObjectScanner.Interfaces.csproj" />
+    <ProjectReference Include="..\BinaryObjectScanner.Wrappers\BinaryObjectScanner.Wrappers.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="OpenMcdf" Version="2.2.1.12" />
+    <PackageReference Include="SharpCompress" Version="0.32.2" />
+    <PackageReference Include="UnshieldSharp" Version="1.6.9" />
+  </ItemGroup>
+
 </Project>
diff --git a/BurnOutSharp/FileType/CFB.cs b/BinaryObjectScanner.FileType/CFB.cs
similarity index 99%
rename from BurnOutSharp/FileType/CFB.cs
rename to BinaryObjectScanner.FileType/CFB.cs
index b69169c8..89a8cdb0 100644
--- a/BurnOutSharp/FileType/CFB.cs
+++ b/BinaryObjectScanner.FileType/CFB.cs
@@ -4,7 +4,7 @@ using System.Text;
 using BinaryObjectScanner.Interfaces;
 using OpenMcdf;
 
-namespace BurnOutSharp.FileType
+namespace BinaryObjectScanner.FileType
 {
     /// <summary>
     /// Compound File Binary
diff --git a/BurnOutSharp/FileType/GCF.cs b/BinaryObjectScanner.FileType/GCF.cs
similarity index 90%
rename from BurnOutSharp/FileType/GCF.cs
rename to BinaryObjectScanner.FileType/GCF.cs
index 47d292f2..2eaf0f9f 100644
--- a/BurnOutSharp/FileType/GCF.cs
+++ b/BinaryObjectScanner.FileType/GCF.cs
@@ -2,7 +2,7 @@ using System;
 using System.IO;
 using BinaryObjectScanner.Interfaces;
 
-namespace BurnOutSharp.FileType
+namespace BinaryObjectScanner.FileType
 {
     /// <summary>
     /// Half-Life Game Cache File
@@ -27,7 +27,7 @@ namespace BurnOutSharp.FileType
             try
             {
                 // Create the wrapper
-                BinaryObjectScanner.Wrappers.GCF gcf = BinaryObjectScanner.Wrappers.GCF.Create(stream);
+                Wrappers.GCF gcf = Wrappers.GCF.Create(stream);
                 if (gcf == null)
                     return null;
 
diff --git a/BurnOutSharp/FileType/GZIP.cs b/BinaryObjectScanner.FileType/GZIP.cs
similarity index 97%
rename from BurnOutSharp/FileType/GZIP.cs
rename to BinaryObjectScanner.FileType/GZIP.cs
index 46125465..be406487 100644
--- a/BurnOutSharp/FileType/GZIP.cs
+++ b/BinaryObjectScanner.FileType/GZIP.cs
@@ -4,7 +4,7 @@ using BinaryObjectScanner.Interfaces;
 using SharpCompress.Archives;
 using SharpCompress.Archives.GZip;
 
-namespace BurnOutSharp.FileType
+namespace BinaryObjectScanner.FileType
 {
     /// <summary>
     /// gzip archive
diff --git a/BurnOutSharp/FileType/InstallShieldArchiveV3.cs b/BinaryObjectScanner.FileType/InstallShieldArchiveV3.cs
similarity index 98%
rename from BurnOutSharp/FileType/InstallShieldArchiveV3.cs
rename to BinaryObjectScanner.FileType/InstallShieldArchiveV3.cs
index e535c31c..f58c0bc0 100644
--- a/BurnOutSharp/FileType/InstallShieldArchiveV3.cs
+++ b/BinaryObjectScanner.FileType/InstallShieldArchiveV3.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using BinaryObjectScanner.Interfaces;
 using UnshieldSharp.Archive;
 
-namespace BurnOutSharp.FileType
+namespace BinaryObjectScanner.FileType
 {
     /// <summary>
     /// InstallShield archive v3
diff --git a/BurnOutSharp/FileType/InstallShieldCAB.cs b/BinaryObjectScanner.FileType/InstallShieldCAB.cs
similarity index 98%
rename from BurnOutSharp/FileType/InstallShieldCAB.cs
rename to BinaryObjectScanner.FileType/InstallShieldCAB.cs
index 812c20aa..511c068d 100644
--- a/BurnOutSharp/FileType/InstallShieldCAB.cs
+++ b/BinaryObjectScanner.FileType/InstallShieldCAB.cs
@@ -4,7 +4,7 @@ using System.Text.RegularExpressions;
 using BinaryObjectScanner.Interfaces;
 using UnshieldSharp.Cabinet;
 
-namespace BurnOutSharp.FileType
+namespace BinaryObjectScanner.FileType
 {
     /// <summary>
     /// InstallShield cabinet file
diff --git a/BurnOutSharp/FileType/MicrosoftCAB.cs b/BinaryObjectScanner.FileType/MicrosoftCAB.cs
similarity index 97%
rename from BurnOutSharp/FileType/MicrosoftCAB.cs
rename to BinaryObjectScanner.FileType/MicrosoftCAB.cs
index 4e476cdd..a8efa838 100644
--- a/BurnOutSharp/FileType/MicrosoftCAB.cs
+++ b/BinaryObjectScanner.FileType/MicrosoftCAB.cs
@@ -3,7 +3,7 @@ using System.IO;
 using BinaryObjectScanner.Interfaces;
 using BinaryObjectScanner.Wrappers;
 
-namespace BurnOutSharp.FileType
+namespace BinaryObjectScanner.FileType
 {
     /// <summary>
     /// Microsoft cabinet file
diff --git a/BurnOutSharp/FileType/MicrosoftLZ.cs b/BinaryObjectScanner.FileType/MicrosoftLZ.cs
similarity index 98%
rename from BurnOutSharp/FileType/MicrosoftLZ.cs
rename to BinaryObjectScanner.FileType/MicrosoftLZ.cs
index 5aedec4b..cd2b72ec 100644
--- a/BurnOutSharp/FileType/MicrosoftLZ.cs
+++ b/BinaryObjectScanner.FileType/MicrosoftLZ.cs
@@ -3,7 +3,7 @@ using System.IO;
 using BinaryObjectScanner.Compression;
 using BinaryObjectScanner.Interfaces;
 
-namespace BurnOutSharp.FileType
+namespace BinaryObjectScanner.FileType
 {
     /// <summary>
     /// Microsoft LZ-compressed Files (LZ32)
diff --git a/BurnOutSharp/FileType/PAK.cs b/BinaryObjectScanner.FileType/PAK.cs
similarity index 90%
rename from BurnOutSharp/FileType/PAK.cs
rename to BinaryObjectScanner.FileType/PAK.cs
index 106b24d2..9e6a4157 100644
--- a/BurnOutSharp/FileType/PAK.cs
+++ b/BinaryObjectScanner.FileType/PAK.cs
@@ -2,7 +2,7 @@ using System;
 using System.IO;
 using BinaryObjectScanner.Interfaces;
 
-namespace BurnOutSharp.FileType
+namespace BinaryObjectScanner.FileType
 {
     /// <summary>
     /// Half-Life Package File
@@ -27,7 +27,7 @@ namespace BurnOutSharp.FileType
             try
             {
                 // Create the wrapper
-                BinaryObjectScanner.Wrappers.PAK pak = BinaryObjectScanner.Wrappers.PAK.Create(stream);
+                Wrappers.PAK pak = Wrappers.PAK.Create(stream);
                 if (pak == null)
                     return null;
 
diff --git a/BurnOutSharp/FileType/PFF.cs b/BinaryObjectScanner.FileType/PFF.cs
similarity index 90%
rename from BurnOutSharp/FileType/PFF.cs
rename to BinaryObjectScanner.FileType/PFF.cs
index 9756bcf1..eef2f973 100644
--- a/BurnOutSharp/FileType/PFF.cs
+++ b/BinaryObjectScanner.FileType/PFF.cs
@@ -2,7 +2,7 @@ using System;
 using System.IO;
 using BinaryObjectScanner.Interfaces;
 
-namespace BurnOutSharp.FileType
+namespace BinaryObjectScanner.FileType
 {
     /// <summary>
     /// NovaLogic Game Archive Format
@@ -27,7 +27,7 @@ namespace BurnOutSharp.FileType
             try
             {
                 // Create the wrapper
-                BinaryObjectScanner.Wrappers.PFF pff = BinaryObjectScanner.Wrappers.PFF.Create(stream);
+                Wrappers.PFF pff = Wrappers.PFF.Create(stream);
                 if (pff == null)
                     return null;
 
diff --git a/BurnOutSharp/FileType/PKZIP.cs b/BinaryObjectScanner.FileType/PKZIP.cs
similarity index 98%
rename from BurnOutSharp/FileType/PKZIP.cs
rename to BinaryObjectScanner.FileType/PKZIP.cs
index 55bb5ff0..44ca12cc 100644
--- a/BurnOutSharp/FileType/PKZIP.cs
+++ b/BinaryObjectScanner.FileType/PKZIP.cs
@@ -4,7 +4,7 @@ using BinaryObjectScanner.Interfaces;
 using SharpCompress.Archives;
 using SharpCompress.Archives.Zip;
 
-namespace BurnOutSharp.FileType
+namespace BinaryObjectScanner.FileType
 {
     /// <summary>
     /// PKWARE ZIP archive and derivatives
diff --git a/BurnOutSharp/FileType/RAR.cs b/BinaryObjectScanner.FileType/RAR.cs
similarity index 97%
rename from BurnOutSharp/FileType/RAR.cs
rename to BinaryObjectScanner.FileType/RAR.cs
index 1a168076..297070f2 100644
--- a/BurnOutSharp/FileType/RAR.cs
+++ b/BinaryObjectScanner.FileType/RAR.cs
@@ -4,7 +4,7 @@ using BinaryObjectScanner.Interfaces;
 using SharpCompress.Archives;
 using SharpCompress.Archives.Rar;
 
-namespace BurnOutSharp.FileType
+namespace BinaryObjectScanner.FileType
 {
     /// <summary>
     /// RAR archive
diff --git a/BurnOutSharp/FileType/SGA.cs b/BinaryObjectScanner.FileType/SGA.cs
similarity index 90%
rename from BurnOutSharp/FileType/SGA.cs
rename to BinaryObjectScanner.FileType/SGA.cs
index db69f012..9da85e0a 100644
--- a/BurnOutSharp/FileType/SGA.cs
+++ b/BinaryObjectScanner.FileType/SGA.cs
@@ -2,7 +2,7 @@ using System;
 using System.IO;
 using BinaryObjectScanner.Interfaces;
 
-namespace BurnOutSharp.FileType
+namespace BinaryObjectScanner.FileType
 {
     /// <summary>
     /// SGA game archive
@@ -27,7 +27,7 @@ namespace BurnOutSharp.FileType
             try
             {
                 // Create the wrapper
-                BinaryObjectScanner.Wrappers.SGA sga = BinaryObjectScanner.Wrappers.SGA.Create(stream);
+                Wrappers.SGA sga = Wrappers.SGA.Create(stream);
                 if (sga == null)
                     return null;
 
diff --git a/BurnOutSharp/FileType/SevenZip.cs b/BinaryObjectScanner.FileType/SevenZip.cs
similarity index 98%
rename from BurnOutSharp/FileType/SevenZip.cs
rename to BinaryObjectScanner.FileType/SevenZip.cs
index 3598b60d..0b1539bb 100644
--- a/BurnOutSharp/FileType/SevenZip.cs
+++ b/BinaryObjectScanner.FileType/SevenZip.cs
@@ -4,7 +4,7 @@ using BinaryObjectScanner.Interfaces;
 using SharpCompress.Archives;
 using SharpCompress.Archives.SevenZip;
 
-namespace BurnOutSharp.FileType
+namespace BinaryObjectScanner.FileType
 {
     /// <summary>
     /// 7-zip archive
diff --git a/BurnOutSharp/FileType/TapeArchive.cs b/BinaryObjectScanner.FileType/TapeArchive.cs
similarity index 97%
rename from BurnOutSharp/FileType/TapeArchive.cs
rename to BinaryObjectScanner.FileType/TapeArchive.cs
index 53b4eb58..6901831b 100644
--- a/BurnOutSharp/FileType/TapeArchive.cs
+++ b/BinaryObjectScanner.FileType/TapeArchive.cs
@@ -4,7 +4,7 @@ using BinaryObjectScanner.Interfaces;
 using SharpCompress.Archives;
 using SharpCompress.Archives.Tar;
 
-namespace BurnOutSharp.FileType
+namespace BinaryObjectScanner.FileType
 {
     /// <summary>
     /// Tape archive
diff --git a/BurnOutSharp/FileType/VBSP.cs b/BinaryObjectScanner.FileType/VBSP.cs
similarity index 90%
rename from BurnOutSharp/FileType/VBSP.cs
rename to BinaryObjectScanner.FileType/VBSP.cs
index bf46152e..99d3d031 100644
--- a/BurnOutSharp/FileType/VBSP.cs
+++ b/BinaryObjectScanner.FileType/VBSP.cs
@@ -2,7 +2,7 @@ using System;
 using System.IO;
 using BinaryObjectScanner.Interfaces;
 
-namespace BurnOutSharp.FileType
+namespace BinaryObjectScanner.FileType
 {
     /// <summary>
     /// Half-Life 2 Level
@@ -27,7 +27,7 @@ namespace BurnOutSharp.FileType
             try
             {
                 // Create the wrapper
-                BinaryObjectScanner.Wrappers.VBSP vbsp = BinaryObjectScanner.Wrappers.VBSP.Create(stream);
+                Wrappers.VBSP vbsp = Wrappers.VBSP.Create(stream);
                 if (vbsp == null)
                     return null;
 
diff --git a/BurnOutSharp/FileType/VPK.cs b/BinaryObjectScanner.FileType/VPK.cs
similarity index 90%
rename from BurnOutSharp/FileType/VPK.cs
rename to BinaryObjectScanner.FileType/VPK.cs
index 1a5cb172..3a6ba94a 100644
--- a/BurnOutSharp/FileType/VPK.cs
+++ b/BinaryObjectScanner.FileType/VPK.cs
@@ -2,7 +2,7 @@ using System;
 using System.IO;
 using BinaryObjectScanner.Interfaces;
 
-namespace BurnOutSharp.FileType
+namespace BinaryObjectScanner.FileType
 {
     /// <summary>
     /// Valve Package File
@@ -27,7 +27,7 @@ namespace BurnOutSharp.FileType
             try
             {
                 // Create the wrapper
-                BinaryObjectScanner.Wrappers.VPK vpk = BinaryObjectScanner.Wrappers.VPK.Create(stream);
+                Wrappers.VPK vpk = Wrappers.VPK.Create(stream);
                 if (vpk == null)
                     return null;
 
diff --git a/BurnOutSharp/FileType/WAD.cs b/BinaryObjectScanner.FileType/WAD.cs
similarity index 90%
rename from BurnOutSharp/FileType/WAD.cs
rename to BinaryObjectScanner.FileType/WAD.cs
index e399fdfb..ca6cd65a 100644
--- a/BurnOutSharp/FileType/WAD.cs
+++ b/BinaryObjectScanner.FileType/WAD.cs
@@ -2,7 +2,7 @@ using System;
 using System.IO;
 using BinaryObjectScanner.Interfaces;
 
-namespace BurnOutSharp.FileType
+namespace BinaryObjectScanner.FileType
 {
     /// <summary>
     /// Half-Life Texture Package File
@@ -27,7 +27,7 @@ namespace BurnOutSharp.FileType
             try
             {
                 // Create the wrapper
-                BinaryObjectScanner.Wrappers.WAD wad = BinaryObjectScanner.Wrappers.WAD.Create(stream);
+                Wrappers.WAD wad = Wrappers.WAD.Create(stream);
                 if (wad == null)
                     return null;
 
diff --git a/BurnOutSharp/FileType/XZ.cs b/BinaryObjectScanner.FileType/XZ.cs
similarity index 97%
rename from BurnOutSharp/FileType/XZ.cs
rename to BinaryObjectScanner.FileType/XZ.cs
index 71ce2567..2cc50fd5 100644
--- a/BurnOutSharp/FileType/XZ.cs
+++ b/BinaryObjectScanner.FileType/XZ.cs
@@ -3,7 +3,7 @@ using System.IO;
 using BinaryObjectScanner.Interfaces;
 using SharpCompress.Compressors.Xz;
 
-namespace BurnOutSharp.FileType
+namespace BinaryObjectScanner.FileType
 {
     /// <summary>
     /// xz archive
diff --git a/BurnOutSharp/FileType/XZP.cs b/BinaryObjectScanner.FileType/XZP.cs
similarity index 90%
rename from BurnOutSharp/FileType/XZP.cs
rename to BinaryObjectScanner.FileType/XZP.cs
index 85a2090b..6e05f52f 100644
--- a/BurnOutSharp/FileType/XZP.cs
+++ b/BinaryObjectScanner.FileType/XZP.cs
@@ -2,7 +2,7 @@ using System;
 using System.IO;
 using BinaryObjectScanner.Interfaces;
 
-namespace BurnOutSharp.FileType
+namespace BinaryObjectScanner.FileType
 {
     /// <summary>
     /// XBox Package File
@@ -27,7 +27,7 @@ namespace BurnOutSharp.FileType
             try
             {
                 // Create the wrapper
-                BinaryObjectScanner.Wrappers.XZP xzp = BinaryObjectScanner.Wrappers.XZP.Create(stream);
+                Wrappers.XZP xzp = Wrappers.XZP.Create(stream);
                 if (xzp == null)
                     return null;
 
diff --git a/BinaryObjectScanner.Packer/BinaryObjectScanner.Packer.csproj b/BinaryObjectScanner.Packer/BinaryObjectScanner.Packer.csproj
index 83923aeb..9c393728 100644
--- a/BinaryObjectScanner.Packer/BinaryObjectScanner.Packer.csproj
+++ b/BinaryObjectScanner.Packer/BinaryObjectScanner.Packer.csproj
@@ -21,6 +21,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="SharpZipLib" Version="1.4.1" />
     <PackageReference Include="WiseUnpacker" Version="1.0.4" />
   </ItemGroup>
 
diff --git a/BurnOutSharp/BurnOutSharp.csproj b/BurnOutSharp/BurnOutSharp.csproj
index 40f15905..d8b99554 100644
--- a/BurnOutSharp/BurnOutSharp.csproj
+++ b/BurnOutSharp/BurnOutSharp.csproj
@@ -23,15 +23,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenMcdf" Version="2.2.1.12" />
-    <PackageReference Include="SharpCompress" Version="0.32.2" />
-    <PackageReference Include="SharpZipLib" Version="1.4.1" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
     <PackageReference Include="Teronis.MSBuild.Packaging.ProjectBuildInPackage" Version="1.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="UnshieldSharp" Version="1.6.9" />
   </ItemGroup>
 
   <!-- These are needed for dealing with submodules -->
diff --git a/BurnOutSharp/Scanner.cs b/BurnOutSharp/Scanner.cs
index 49c60d40..a0bde6eb 100644
--- a/BurnOutSharp/Scanner.cs
+++ b/BurnOutSharp/Scanner.cs
@@ -424,37 +424,37 @@ namespace BurnOutSharp
         {
             switch (fileType)
             {
-                case SupportedFileType.BFPK: return new FileType.BFPK();
-                case SupportedFileType.BSP: return new FileType.BSP();
-                case SupportedFileType.BZip2: return new FileType.BZip2();
-                case SupportedFileType.CFB: return new FileType.CFB();
-                //case SupportedFileType.CIA: return new FileType.CIA();
-                //case SupportedFileType.Executable: return new FileType.Executable();
-                case SupportedFileType.GCF: return new FileType.GCF();
-                case SupportedFileType.GZIP: return new FileType.GZIP();
-                case SupportedFileType.InstallShieldArchiveV3: return new FileType.InstallShieldArchiveV3();
-                case SupportedFileType.InstallShieldCAB: return new FileType.InstallShieldCAB();
-                case SupportedFileType.MicrosoftCAB: return new FileType.MicrosoftCAB();
-                case SupportedFileType.MicrosoftLZ: return new FileType.MicrosoftLZ();
+                case SupportedFileType.BFPK: return new BinaryObjectScanner.FileType.BFPK();
+                case SupportedFileType.BSP: return new BinaryObjectScanner.FileType.BSP();
+                case SupportedFileType.BZip2: return new BinaryObjectScanner.FileType.BZip2();
+                case SupportedFileType.CFB: return new BinaryObjectScanner.FileType.CFB();
+                //case SupportedFileType.CIA: return new BinaryObjectScanner.FileType.CIA();
+                //case SupportedFileType.Executable: return new BinaryObjectScanner.FileType.Executable();
+                case SupportedFileType.GCF: return new BinaryObjectScanner.FileType.GCF();
+                case SupportedFileType.GZIP: return new BinaryObjectScanner.FileType.GZIP();
+                case SupportedFileType.InstallShieldArchiveV3: return new BinaryObjectScanner.FileType.InstallShieldArchiveV3();
+                case SupportedFileType.InstallShieldCAB: return new BinaryObjectScanner.FileType.InstallShieldCAB();
+                case SupportedFileType.MicrosoftCAB: return new BinaryObjectScanner.FileType.MicrosoftCAB();
+                case SupportedFileType.MicrosoftLZ: return new BinaryObjectScanner.FileType.MicrosoftLZ();
                 case SupportedFileType.MPQ: return new FileType.MPQ();
-                //case SupportedFileType.N3DS: return new FileType.N3DS();
-                //case SupportedFileType.NCF: return new FileType.NCF();
-                //case SupportedFileType.Nitro: return new FileType.Nitro();
-                case SupportedFileType.PAK: return new FileType.PAK();
-                case SupportedFileType.PFF: return new FileType.PFF();
-                case SupportedFileType.PKZIP: return new FileType.PKZIP();
-                //case SupportedFileType.PLJ: return new FileType.PLJ();
-                //case SupportedFileType.Quantum: return new FileType.Quantum();
-                case SupportedFileType.RAR: return new FileType.RAR();
-                case SupportedFileType.SevenZip: return new FileType.SevenZip();
+                //case SupportedFileType.N3DS: return new BinaryObjectScanner.FileType.N3DS();
+                //case SupportedFileType.NCF: return new BinaryObjectScanner.FileType.NCF();
+                //case SupportedFileType.Nitro: return new BinaryObjectScanner.FileType.Nitro();
+                case SupportedFileType.PAK: return new BinaryObjectScanner.FileType.PAK();
+                case SupportedFileType.PFF: return new BinaryObjectScanner.FileType.PFF();
+                case SupportedFileType.PKZIP: return new BinaryObjectScanner.FileType.PKZIP();
+                //case SupportedFileType.PLJ: return new BinaryObjectScanner.FileType.PLJ();
+                //case SupportedFileType.Quantum: return new BinaryObjectScanner.FileType.Quantum();
+                case SupportedFileType.RAR: return new BinaryObjectScanner.FileType.RAR();
+                case SupportedFileType.SevenZip: return new BinaryObjectScanner.FileType.SevenZip();
                 case SupportedFileType.SFFS: return new FileType.SFFS();
-                case SupportedFileType.SGA: return new FileType.SGA();
-                case SupportedFileType.TapeArchive: return new FileType.TapeArchive();
-                case SupportedFileType.VBSP: return new FileType.VBSP();
-                case SupportedFileType.VPK: return new FileType.VPK();
-                case SupportedFileType.WAD: return new FileType.WAD();
-                case SupportedFileType.XZ: return new FileType.XZ();
-                case SupportedFileType.XZP: return new FileType.XZP();
+                case SupportedFileType.SGA: return new BinaryObjectScanner.FileType.SGA();
+                case SupportedFileType.TapeArchive: return new BinaryObjectScanner.FileType.TapeArchive();
+                case SupportedFileType.VBSP: return new BinaryObjectScanner.FileType.VBSP();
+                case SupportedFileType.VPK: return new BinaryObjectScanner.FileType.VPK();
+                case SupportedFileType.WAD: return new BinaryObjectScanner.FileType.WAD();
+                case SupportedFileType.XZ: return new BinaryObjectScanner.FileType.XZ();
+                case SupportedFileType.XZP: return new BinaryObjectScanner.FileType.XZP();
                 default: return null;
             }
         }
diff --git a/BurnOutSharp/Tools/FileTypeTools.cs b/BurnOutSharp/Tools/FileTypeTools.cs
index 60d0ae1f..577403f4 100644
--- a/BurnOutSharp/Tools/FileTypeTools.cs
+++ b/BurnOutSharp/Tools/FileTypeTools.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using BinaryObjectScanner.FileType;
 using BinaryObjectScanner.Matching;
 using BinaryObjectScanner.Utilities;
 using BinaryObjectScanner.Wrappers;
@@ -792,13 +793,13 @@ namespace BurnOutSharp.Tools
             {
                 case SupportedFileType.AACSMediaKeyBlock: return AACSMediaKeyBlock.Create(data);
                 case SupportedFileType.BDPlusSVM: return BDPlusSVM.Create(data);
-                case SupportedFileType.BFPK: return BFPK.Create(data);
-                case SupportedFileType.BSP: return BSP.Create(data);
+                case SupportedFileType.BFPK: return BinaryObjectScanner.Wrappers.BFPK.Create(data);
+                case SupportedFileType.BSP: return BinaryObjectScanner.Wrappers.BSP.Create(data);
                 //case SupportedFileType.BZip2: return BZip2.Create(data);
-                case SupportedFileType.CFB: return CFB.Create(data);
+                case SupportedFileType.CFB: return BinaryObjectScanner.Wrappers.CFB.Create(data);
                 case SupportedFileType.CIA: return CIA.Create(data);
                 case SupportedFileType.Executable: return DetermineExecutableType(data);
-                case SupportedFileType.GCF: return GCF.Create(data);
+                case SupportedFileType.GCF: return BinaryObjectScanner.Wrappers.GCF.Create(data);
                 //case SupportedFileType.GZIP: return GZIP.Create(data);
                 //case SupportedFileType.IniFile: return IniFile.Create(data);
                 //case SupportedFileType.InstallShieldArchiveV3: return InstallShieldArchiveV3.Create(data);
@@ -810,22 +811,22 @@ namespace BurnOutSharp.Tools
                 case SupportedFileType.N3DS: return N3DS.Create(data);
                 case SupportedFileType.NCF: return NCF.Create(data);
                 case SupportedFileType.Nitro: return Nitro.Create(data);
-                case SupportedFileType.PAK: return PAK.Create(data);
-                case SupportedFileType.PFF: return PFF.Create(data);
+                case SupportedFileType.PAK: return BinaryObjectScanner.Wrappers.PAK.Create(data);
+                case SupportedFileType.PFF: return BinaryObjectScanner.Wrappers.PFF.Create(data);
                 //case SupportedFileType.PKZIP: return PKZIP.Create(data);
                 case SupportedFileType.PLJ: return PlayJAudioFile.Create(data);
                 case SupportedFileType.Quantum: return Quantum.Create(data);
                 //case SupportedFileType.RAR: return RAR.Create(data);
                 //case SupportedFileType.SevenZip: return SevenZip.Create(data);
                 //case SupportedFileType.SFFS: return SFFS.Create(data);
-                case SupportedFileType.SGA: return SGA.Create(data);
+                case SupportedFileType.SGA: return BinaryObjectScanner.Wrappers.SGA.Create(data);
                 //case SupportedFileType.TapeArchive: return TapeArchive.Create(data);
                 //case SupportedFileType.Textfile: return Textfile.Create(data);
-                case SupportedFileType.VBSP: return VBSP.Create(data);
-                case SupportedFileType.VPK: return VPK.Create(data);
-                case SupportedFileType.WAD: return WAD.Create(data);
+                case SupportedFileType.VBSP: return BinaryObjectScanner.Wrappers.VBSP.Create(data);
+                case SupportedFileType.VPK: return BinaryObjectScanner.Wrappers.VPK.Create(data);
+                case SupportedFileType.WAD: return BinaryObjectScanner.Wrappers.WAD.Create(data);
                 //case SupportedFileType.XZ: return XZ.Create(data);
-                case SupportedFileType.XZP: return XZP.Create(data);
+                case SupportedFileType.XZP: return BinaryObjectScanner.Wrappers.XZP.Create(data);
                 default: return null;
             }
         }
diff --git a/Test/Extractor.cs b/Test/Extractor.cs
index 3cf35538..71a51c3e 100644
--- a/Test/Extractor.cs
+++ b/Test/Extractor.cs
@@ -214,7 +214,7 @@ namespace Test
                                 if (strData == null)
                                     return;
 
-                                string decoded = BurnOutSharp.FileType.CFB.DecodeStreamName(e.Name).TrimEnd('\0');
+                                string decoded = BinaryObjectScanner.FileType.CFB.DecodeStreamName(e.Name).TrimEnd('\0');
                                 byte[] nameBytes = Encoding.UTF8.GetBytes(e.Name);
 
                                 // UTF-8 encoding of 0x4840.
diff --git a/Test/Test.csproj b/Test/Test.csproj
index 9af4eeb4..d5dd38a0 100644
--- a/Test/Test.csproj
+++ b/Test/Test.csproj
@@ -10,12 +10,18 @@
   <ItemGroup>
     <ProjectReference Include="..\BurnOutSharp\BurnOutSharp.csproj" />
     <ProjectReference Include="..\BinaryObjectScanner.Builders\BinaryObjectScanner.Builders.csproj" />
+    <ProjectReference Include="..\BinaryObjectScanner.FileType\BinaryObjectScanner.FileType.csproj" />
     <ProjectReference Include="..\BinaryObjectScanner.Matching\BinaryObjectScanner.Matching.csproj" />
     <ProjectReference Include="..\BinaryObjectScanner.Models\BinaryObjectScanner.Models.csproj" />
     <ProjectReference Include="..\BinaryObjectScanner.Utilities\BinaryObjectScanner.Utilities.csproj" />
     <ProjectReference Include="..\BinaryObjectScanner.Wrappers\BinaryObjectScanner.Wrappers.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="OpenMcdf" Version="2.2.1.12" />
+    <PackageReference Include="UnshieldSharp" Version="1.6.9" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Update="App.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>