Import libultraship as a submodule (#1943)

Co-authored-by: briaguya <briaguya> Co-authored-by: Christopher Leggett <chris@leggett.dev> Co-authored-by: David Chavez <davi@dcvz.io>
author: briaguya <70942617+briaguya-ai@users.noreply.github.com> 2022-11-14 05:22:34 -0500
committer: GitHub <noreply@github.com> 2022-11-14 11:22:34 +0100
commit: 477a616d481a651919ce2444e158e63f54e1ef8e (patch)
tree: a02c950ef2d74feb87874bf0a8daf7e21e561966
parent: fa5bfdf44a077374e83bf7ade42c4da264e9f658 (diff)
25 files changed, 3 insertions, 2796 deletions
diff --git a/ZAPD/CMakeLists.txt b/ZAPD/CMakeLists.txt
index cf49ef6..c169a75 100644
--- a/ZAPD/CMakeLists.txt
+++ b/ZAPD/CMakeLists.txt
@@ -21,8 +21,8 @@ set(Header_Files
 source_group("Header Files" FILES ${Header_Files})
 
 set(Header_Files__Libraries
-    "../../libultraship/libultraship/Lib/stb/stb_image.h"
-    "../../libultraship/libultraship/Lib/stb/stb_image_write.h"
+    "../../libultraship/extern/stb/stb_image.h"
+    "../../libultraship/extern/stb/stb_image_write.h"
     "ctpl_stl.h"
 )
 source_group("Header Files\\Libraries" FILES ${Header_Files__Libraries})
@@ -332,7 +332,7 @@ endif()
 find_package(PNG REQUIRED)
 
 target_include_directories(${PROJECT_NAME} PRIVATE
-	${CMAKE_CURRENT_SOURCE_DIR}/../../ZAPDTR/ZAPDUtils
+	${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/ZAPDUtils
 	${CMAKE_CURRENT_SOURCE_DIR}/../../ZAPDTR/lib/tinyxml2
 	${CMAKE_CURRENT_SOURCE_DIR}/../../ZAPDTR/lib/libgfxd
 	${PNG_PNG_INCLUDE_DIR}/
diff --git a/ZAPD/ZAPD.vcxproj b/ZAPD/ZAPD.vcxproj
deleted file mode 100644
index 9369e97..0000000
--- a/ZAPD/ZAPD.vcxproj
+++ /dev/null
@@ -1,381 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\OTRExporter\packages\YY.NuGet.Import.Helper.1.0.0.4\build\native\YY.NuGet.Import.Helper.props" Condition="Exists('..\..\OTRExporter\packages\YY.NuGet.Import.Helper.1.0.0.4\build\native\YY.NuGet.Import.Helper.props')" />
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36}</ProjectGuid>
-    <RootNamespace>ZAPD</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectName>ZAPD</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LibraryPath>$(OutDir);$(ProjectDir)..\lib\libgfxd;$(ProjectDir)..\..\OTRExporter\packages\libpng-v142.1.6.37.2\build\native\lib\x64\v142\Debug\;$(ProjectDir)..\..\libultraship\libultraship\;$(ProjectDir)..\..\StormLib\bin\StormLib\x64\DebugUS\;$(LibraryPath)</LibraryPath>
-    <IncludePath>$(ProjectDir)..\ZAPDUtils;$(ProjectDir)..\lib\tinyxml2;$(ProjectDir)..\lib\libgfxd;$(ProjectDir)..\lib\elfio;$(ProjectDir)..\lib\stb;$(ProjectDir);$(ProjectDir)..\..\StormLib\src\;$(IncludePath)</IncludePath>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules />
-    <CodeAnalysisRuleAssemblies />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>$(ProjectDir)..\ZAPDUtils;$(ProjectDir)..\lib\tinyxml2;$(ProjectDir)..\lib\libgfxd;$(ProjectDir)..\lib\elfio;$(ProjectDir)..\lib\stb;$(ProjectDir);$(ProjectDir)..\..\StormLib\src\;$(IncludePath)</IncludePath>
-    <LibraryPath>$(OutDir);$(ProjectDir)..\lib\libgfxd;$(ProjectDir)..\..\OTRExporter\packages\libpng-v142.1.6.37.2\build\native\lib\x64\v142\Debug\;$(ProjectDir)..\..\libultraship\libultraship\;$(ProjectDir)..\..\StormLib\bin\StormLib\x64\ReleaseUS\;$(LibraryPath)</LibraryPath>
-    <PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules />
-    <CodeAnalysisRuleAssemblies />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>$(SolutionDir)ZAPD\lib\tinyxml2;$(SolutionDir)ZAPD\lib\libgfxd;$(SolutionDir)ZAPD\lib\elfio;$(SolutionDir)ZAPD\lib\stb;$(ProjectDir);$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)ZAPD\lib\libgfxd;$(SolutionDir)x64\Debug;$(SolutionDir)packages\libpng.1.6.28.1\build\native\lib\x64\v140\dynamic\Debug;$(LibraryPath)</LibraryPath>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules />
-    <CodeAnalysisRuleAssemblies />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules />
-    <CodeAnalysisRuleAssemblies />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <Profile>true</Profile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <Profile>true</Profile>
-      <AdditionalDependencies>ZAPDUtils.lib;/WHOLEARCHIVE:OTRExporter.lib;libultraship.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-    </Link>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>ZAPDUtils.lib;/WHOLEARCHIVE:OTRExporter.lib;libultraship.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-    </Link>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\lib\libgfxd\gfxd.c" />
-    <ClCompile Include="..\lib\libgfxd\uc.c" />
-    <ClCompile Include="..\lib\libgfxd\uc_f3d.c" />
-    <ClCompile Include="..\lib\libgfxd\uc_f3db.c" />
-    <ClCompile Include="..\lib\libgfxd\uc_f3dex.c" />
-    <ClCompile Include="..\lib\libgfxd\uc_f3dex2.c" />
-    <ClCompile Include="..\lib\libgfxd\uc_f3dexb.c" />
-    <ClCompile Include="Declaration.cpp" />
-    <ClCompile Include="FileWorker.cpp" />
-    <ClCompile Include="GameConfig.cpp" />
-    <ClCompile Include="Globals.cpp" />
-    <ClCompile Include="ImageBackend.cpp" />
-    <ClCompile Include="Main.cpp" />
-    <ClCompile Include="OtherStructs\SkinLimbStructs.cpp" />
-    <ClCompile Include="OutputFormatter.cpp" />
-    <ClCompile Include="Overlays\ZOverlay.cpp" />
-    <ClCompile Include="WarningHandler.cpp" />
-    <ClCompile Include="yaz0\yaz0.cpp" />
-    <ClCompile Include="ZArray.cpp" />
-    <ClCompile Include="ZAudio.cpp" />
-    <ClCompile Include="ZAudioDecode.cpp" />
-    <ClCompile Include="ZBackground.cpp" />
-    <ClCompile Include="ZCutsceneMM.cpp" />
-    <ClCompile Include="ZLimb.cpp" />
-    <ClCompile Include="ZMtx.cpp" />
-    <ClCompile Include="ZPath.cpp" />
-    <ClCompile Include="ZPlayerAnimationData.cpp" />
-    <ClCompile Include="ZRom.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetActorCutsceneList.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetAnimatedMaterialList.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetCsCamera.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetMinimapChests.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetMinimapList.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetWorldMapVisited.cpp" />
-    <ClCompile Include="ZRoom\Commands\Unused1D.cpp" />
-    <ClCompile Include="ZScalar.cpp" />
-    <ClCompile Include="ZAnimation.cpp" />
-    <ClCompile Include="ZBlob.cpp" />
-    <ClCompile Include="ZCollision.cpp" />
-    <ClCompile Include="ZCutscene.cpp" />
-    <ClCompile Include="ZDisplayList.cpp" />
-    <ClCompile Include="ZFile.cpp" />
-    <ClCompile Include="ZSkeleton.cpp" />
-    <ClCompile Include="ZResource.cpp" />
-    <ClCompile Include="ZRoom\Commands\EndMarker.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetActorList.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetAlternateHeaders.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetCameraSettings.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetCollisionHeader.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetCutscenes.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetEchoSettings.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetEntranceList.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetExitList.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetLightingSettings.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetLightList.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetMesh.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetObjectList.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetPathways.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetRoomBehavior.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetRoomList.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetSkyboxModifier.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetSkyboxSettings.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetSoundSettings.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetSpecialObjects.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetStartPositionList.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetTimeSettings.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetTransitionActorList.cpp" />
-    <ClCompile Include="ZRoom\Commands\SetWind.cpp" />
-    <ClCompile Include="ZRoom\Commands\Unused09.cpp" />
-    <ClCompile Include="ZRoom\Commands\ZRoomCommandUnk.cpp" />
-    <ClCompile Include="ZRoom\ZRoom.cpp" />
-    <ClCompile Include="ZRoom\ZRoomCommand.cpp" />
-    <ClCompile Include="ZString.cpp" />
-    <ClCompile Include="ZSymbol.cpp" />
-    <ClCompile Include="ZText.cpp" />
-    <ClCompile Include="ZTexture.cpp" />
-    <ClCompile Include="ZTextureAnimation.cpp" />
-    <ClCompile Include="ZVector.cpp" />
-    <ClCompile Include="ZVtx.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\lib\elfio\elfio\elfio.hpp" />
-    <ClInclude Include="..\lib\elfio\elfio\elfio_dump.hpp" />
-    <ClInclude Include="..\lib\elfio\elfio\elfio_dynamic.hpp" />
-    <ClInclude Include="..\lib\elfio\elfio\elfio_header.hpp" />
-    <ClInclude Include="..\lib\elfio\elfio\elfio_note.hpp" />
-    <ClInclude Include="..\lib\elfio\elfio\elfio_relocation.hpp" />
-    <ClInclude Include="..\lib\elfio\elfio\elfio_section.hpp" />
-    <ClInclude Include="..\lib\elfio\elfio\elfio_segment.hpp" />
-    <ClInclude Include="..\lib\elfio\elfio\elfio_strings.hpp" />
-    <ClInclude Include="..\lib\elfio\elfio\elfio_symbols.hpp" />
-    <ClInclude Include="..\lib\elfio\elfio\elfio_utils.hpp" />
-    <ClInclude Include="..\lib\elfio\elfio\elf_types.hpp" />
-    <ClInclude Include="..\lib\libgfxd\gbi.h" />
-    <ClInclude Include="..\lib\libgfxd\gfxd.h" />
-    <ClInclude Include="..\lib\libgfxd\priv.h" />
-    <ClInclude Include="..\lib\stb\stb_image.h" />
-    <ClInclude Include="..\lib\stb\stb_image_write.h" />
-    <ClInclude Include="..\lib\stb\tinyxml2.h" />
-    <ClInclude Include="CRC32.h" />
-    <ClInclude Include="ctpl_stl.h" />
-    <ClInclude Include="Declaration.h" />
-    <ClInclude Include="FileWorker.h" />
-    <ClInclude Include="GameConfig.h" />
-    <ClInclude Include="Globals.h" />
-    <ClInclude Include="ImageBackend.h" />
-    <ClInclude Include="OtherStructs\SkinLimbStructs.h" />
-    <ClInclude Include="OutputFormatter.h" />
-    <ClInclude Include="Overlays\ZOverlay.h" />
-    <ClInclude Include="WarningHandler.h" />
-    <ClInclude Include="yaz0\readwrite.h" />
-    <ClInclude Include="yaz0\yaz0.h" />
-    <ClInclude Include="ZAnimation.h" />
-    <ClInclude Include="ZArray.h" />
-    <ClInclude Include="ZAudio.h" />
-    <ClInclude Include="ZBackground.h" />
-    <ClInclude Include="ZBlob.h" />
-    <ClInclude Include="ZCollision.h" />
-    <ClInclude Include="ZCutscene.h" />
-    <ClInclude Include="ZCutsceneMM.h" />
-    <ClInclude Include="ZDisplayList.h" />
-    <ClInclude Include="ZFile.h" />
-    <ClInclude Include="ZLimb.h" />
-    <ClInclude Include="ZMtx.h" />
-    <ClInclude Include="ZPath.h" />
-    <ClInclude Include="ZPlayerAnimationData.h" />
-    <ClInclude Include="ZRom.h" />
-    <ClInclude Include="ZRoom\Commands\SetActorCutsceneList.h" />
-    <ClInclude Include="ZRoom\Commands\SetAnimatedMaterialList.h" />
-    <ClInclude Include="ZRoom\Commands\SetCsCamera.h" />
-    <ClInclude Include="ZRoom\Commands\SetMinimapChests.h" />
-    <ClInclude Include="ZRoom\Commands\SetMinimapList.h" />
-    <ClInclude Include="ZRoom\Commands\SetWorldMapVisited.h" />
-    <ClInclude Include="ZRoom\Commands\Unused1D.h" />
-    <ClInclude Include="ZScalar.h" />
-    <ClInclude Include="ZSkeleton.h" />
-    <ClInclude Include="ZResource.h" />
-    <ClInclude Include="ZRoom\Commands\EndMarker.h" />
-    <ClInclude Include="ZRoom\Commands\SetActorList.h" />
-    <ClInclude Include="ZRoom\Commands\SetAlternateHeaders.h" />
-    <ClInclude Include="ZRoom\Commands\SetCameraSettings.h" />
-    <ClInclude Include="ZRoom\Commands\SetCollisionHeader.h" />
-    <ClInclude Include="ZRoom\Commands\SetCutscenes.h" />
-    <ClInclude Include="ZRoom\Commands\SetEchoSettings.h" />
-    <ClInclude Include="ZRoom\Commands\SetEntranceList.h" />
-    <ClInclude Include="ZRoom\Commands\SetExitList.h" />
-    <ClInclude Include="ZRoom\Commands\SetLightingSettings.h" />
-    <ClInclude Include="ZRoom\Commands\SetLightList.h" />
-    <ClInclude Include="ZRoom\Commands\SetMesh.h" />
-    <ClInclude Include="ZRoom\Commands\SetObjectList.h" />
-    <ClInclude Include="ZRoom\Commands\SetPathways.h" />
-    <ClInclude Include="ZRoom\Commands\SetRoomBehavior.h" />
-    <ClInclude Include="ZRoom\Commands\SetRoomList.h" />
-    <ClInclude Include="ZRoom\Commands\SetSkyboxModifier.h" />
-    <ClInclude Include="ZRoom\Commands\SetSkyboxSettings.h" />
-    <ClInclude Include="ZRoom\Commands\SetSoundSettings.h" />
-    <ClInclude Include="ZRoom\Commands\SetSpecialObjects.h" />
-    <ClInclude Include="ZRoom\Commands\SetStartPositionList.h" />
-    <ClInclude Include="ZRoom\Commands\SetTimeSettings.h" />
-    <ClInclude Include="ZRoom\Commands\SetTransitionActorList.h" />
-    <ClInclude Include="ZRoom\Commands\SetWind.h" />
-    <ClInclude Include="ZRoom\Commands\Unused09.h" />
-    <ClInclude Include="ZRoom\Commands\ZRoomCommandUnk.h" />
-    <ClInclude Include="ZRoom\ZRoom.h" />
-    <ClInclude Include="ZRoom\ZRoomCommand.h" />
-    <ClInclude Include="ZString.h" />
-    <ClInclude Include="ZSymbol.h" />
-    <ClInclude Include="ZText.h" />
-    <ClInclude Include="ZTexture.h" />
-    <ClInclude Include="ZTextureAnimation.h" />
-    <ClInclude Include="ZVector.h" />
-    <ClInclude Include="ZVtx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="..\SymbolMap_OoTMqDbg.txt">
-      <DeploymentContent>true</DeploymentContent>
-    </Text>
-    <Text Include="any\any\zlib.static.txt" />
-    <Text Include="NuGet\libpng.static.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\OTRExporter\packages\zlib.v120.windesktop.msvcstl.dyn.rt-dyn.1.2.8.8\build\native\zlib.v120.windesktop.msvcstl.dyn.rt-dyn.targets" Condition="Exists('..\..\OTRExporter\packages\zlib.v120.windesktop.msvcstl.dyn.rt-dyn.1.2.8.8\build\native\zlib.v120.windesktop.msvcstl.dyn.rt-dyn.targets')" />
-    <Import Project="..\..\OTRExporter\packages\zlib.v140.windesktop.msvcstl.dyn.rt-dyn.1.2.8.8\build\native\zlib.v140.windesktop.msvcstl.dyn.rt-dyn.targets" Condition="Exists('..\..\OTRExporter\packages\zlib.v140.windesktop.msvcstl.dyn.rt-dyn.1.2.8.8\build\native\zlib.v140.windesktop.msvcstl.dyn.rt-dyn.targets')" />
-    <Import Project="..\..\OTRExporter\packages\YY.NuGet.Import.Helper.1.0.0.4\build\native\YY.NuGet.Import.Helper.targets" Condition="Exists('..\..\OTRExporter\packages\YY.NuGet.Import.Helper.1.0.0.4\build\native\YY.NuGet.Import.Helper.targets')" />
-    <Import Project="..\..\OTRExporter\packages\zlib.static.1.2.5\build\native\zlib.static.targets" Condition="Exists('..\..\OTRExporter\packages\zlib.static.1.2.5\build\native\zlib.static.targets')" />
-    <Import Project="..\..\OTRExporter\packages\libpng.static.1.6.37\build\native\libpng.static.targets" Condition="Exists('..\..\OTRExporter\packages\libpng.static.1.6.37\build\native\libpng.static.targets')" />
-  </ImportGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\OTRExporter\packages\zlib.v120.windesktop.msvcstl.dyn.rt-dyn.1.2.8.8\build\native\zlib.v120.windesktop.msvcstl.dyn.rt-dyn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\OTRExporter\packages\zlib.v120.windesktop.msvcstl.dyn.rt-dyn.1.2.8.8\build\native\zlib.v120.windesktop.msvcstl.dyn.rt-dyn.targets'))" />
-    <Error Condition="!Exists('..\..\OTRExporter\packages\zlib.v140.windesktop.msvcstl.dyn.rt-dyn.1.2.8.8\build\native\zlib.v140.windesktop.msvcstl.dyn.rt-dyn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\OTRExporter\packages\zlib.v140.windesktop.msvcstl.dyn.rt-dyn.1.2.8.8\build\native\zlib.v140.windesktop.msvcstl.dyn.rt-dyn.targets'))" />
-    <Error Condition="!Exists('..\..\OTRExporter\packages\YY.NuGet.Import.Helper.1.0.0.4\build\native\YY.NuGet.Import.Helper.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\OTRExporter\packages\YY.NuGet.Import.Helper.1.0.0.4\build\native\YY.NuGet.Import.Helper.props'))" />
-    <Error Condition="!Exists('..\..\OTRExporter\packages\YY.NuGet.Import.Helper.1.0.0.4\build\native\YY.NuGet.Import.Helper.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\OTRExporter\packages\YY.NuGet.Import.Helper.1.0.0.4\build\native\YY.NuGet.Import.Helper.targets'))" />
-    <Error Condition="!Exists('..\..\OTRExporter\packages\zlib.static.1.2.5\build\native\zlib.static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\OTRExporter\packages\zlib.static.1.2.5\build\native\zlib.static.targets'))" />
-    <Error Condition="!Exists('..\..\OTRExporter\packages\libpng.static.1.6.37\build\native\libpng.static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\OTRExporter\packages\libpng.static.1.6.37\build\native\libpng.static.targets'))" />
-  </Target>
-</Project>
-\ No newline at end of file
diff --git a/ZAPD/ZAPD.vcxproj.filters b/ZAPD/ZAPD.vcxproj.filters
deleted file mode 100644
index 82fa8ac..0000000
--- a/ZAPD/ZAPD.vcxproj.filters
+++ /dev/null
@@ -1,596 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="Source Files\Libraries">
-      <UniqueIdentifier>{02148456-5068-4613-8478-f10addc58e70}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Libraries">
-      <UniqueIdentifier>{bcab3136-95ba-4839-833c-43d78ad6e335}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Libraries\elfio">
-      <UniqueIdentifier>{dc06ed84-f6fe-4277-80f3-d62bd5cdbb98}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Z64">
-      <UniqueIdentifier>{6049c045-bc38-4221-b29e-ca6d4d8af4aa}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Z64\ZRoom">
-      <UniqueIdentifier>{490e3a08-047b-48d3-ab53-3a860a3b92aa}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Z64\ZRoom\Commands">
-      <UniqueIdentifier>{26c06845-8e8e-4b79-ad18-07c4f9c0f801}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Z64">
-      <UniqueIdentifier>{d45c420d-2378-47ac-92c5-80db9475c195}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Z64\ZRoom">
-      <UniqueIdentifier>{03cc56a2-e0e8-4167-80a0-98fb900a959a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Z64\ZRoom\Commands">
-      <UniqueIdentifier>{73db0879-6df8-4f6a-8cc2-a1f836e9e796}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Libraries\fbx">
-      <UniqueIdentifier>{be9a5be0-ec6a-4200-8e39-bb58c7da7aa8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Libraries\libgfxd">
-      <UniqueIdentifier>{7ee79d97-c6a8-4e82-93ef-37981f4d7838}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Libraries\libgfxd">
-      <UniqueIdentifier>{85600275-99fe-491d-8189-bcc3dc1a8903}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="any">
-      <UniqueIdentifier>{ba9990b0-1082-48bb-874c-6108534b5455}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="any\any">
-      <UniqueIdentifier>{ce9d91b0-ba20-4296-bc2d-8630965bb392}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="NuGet">
-      <UniqueIdentifier>{730beb67-6d59-4849-9d9b-702c4a565fc0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Yaz0">
-      <UniqueIdentifier>{b26457d2-cdb8-4c92-9ed7-a55bf6d3619e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Yaz0">
-      <UniqueIdentifier>{9651a041-1019-4486-9e90-1dccfa9471e9}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\ZRoom.cpp">
-      <Filter>Source Files\Z64\ZRoom</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetEchoSettings.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\ZRoomCommand.cpp">
-      <Filter>Source Files\Z64\ZRoom</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetSoundSettings.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetWind.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetTimeSettings.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetSpecialObjects.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetRoomBehavior.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetSkyboxSettings.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetCameraSettings.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetSkyboxModifier.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetActorList.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetEntranceList.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetStartPositionList.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="Globals.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetAlternateHeaders.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetExitList.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\EndMarker.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetCollisionHeader.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetRoomList.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetObjectList.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetMesh.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\Unused09.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetLightingSettings.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetTransitionActorList.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetPathways.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetCutscenes.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZAnimation.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
-    <ClCompile Include="ZBlob.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
-    <ClCompile Include="ZCutscene.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
-    <ClCompile Include="ZDisplayList.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
-    <ClCompile Include="ZFile.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
-    <ClCompile Include="ZResource.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
-    <ClCompile Include="ZTexture.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
-    <ClCompile Include="Overlays\ZOverlay.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
-    <ClCompile Include="ZSkeleton.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetLightList.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\ZRoomCommandUnk.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZCollision.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
-    <ClCompile Include="ZScalar.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
-    <ClCompile Include="ZVector.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
-    <ClCompile Include="ZArray.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
-    <ClCompile Include="ZVtx.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
-    <ClCompile Include="ZLimb.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
-    <ClCompile Include="OutputFormatter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ZSymbol.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib\libgfxd\gfxd.c">
-      <Filter>Source Files\Libraries\libgfxd</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib\libgfxd\uc.c">
-      <Filter>Source Files\Libraries\libgfxd</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib\libgfxd\uc_f3d.c">
-      <Filter>Source Files\Libraries\libgfxd</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib\libgfxd\uc_f3db.c">
-      <Filter>Source Files\Libraries\libgfxd</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib\libgfxd\uc_f3dex.c">
-      <Filter>Source Files\Libraries\libgfxd</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib\libgfxd\uc_f3dex2.c">
-      <Filter>Source Files\Libraries\libgfxd</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib\libgfxd\uc_f3dexb.c">
-      <Filter>Source Files\Libraries\libgfxd</Filter>
-    </ClCompile>
-    <ClCompile Include="ZMtx.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetWorldMapVisited.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\Unused1D.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetActorCutsceneList.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetCsCamera.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetMinimapChests.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetMinimapList.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZCutsceneMM.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
-    <ClCompile Include="ZBackground.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRoom\Commands\SetAnimatedMaterialList.cpp">
-      <Filter>Source Files\Z64\ZRoom\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ZPath.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
-    <ClCompile Include="Declaration.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ImageBackend.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ZString.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
-    <ClCompile Include="GameConfig.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ZTextureAnimation.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
-    <ClCompile Include="OtherStructs\SkinLimbStructs.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
-    <ClCompile Include="ZPlayerAnimationData.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
-    <ClCompile Include="WarningHandler.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ZText.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
-    <ClCompile Include="ZRom.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
-    <ClCompile Include="yaz0\yaz0.cpp">
-      <Filter>Source Files\Yaz0</Filter>
-    </ClCompile>
-    <ClCompile Include="FileWorker.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ZAudio.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
-    <ClCompile Include="ZAudioDecode.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="ZRoom\ZRoom.h">
-      <Filter>Header Files\Z64\ZRoom</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\ZRoomCommand.h">
-      <Filter>Header Files\Z64\ZRoom</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetEchoSettings.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetSoundSettings.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetWind.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetTimeSettings.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetSpecialObjects.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetRoomBehavior.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetSkyboxSettings.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetCameraSettings.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetSkyboxModifier.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetActorList.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetEntranceList.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetStartPositionList.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="..\lib\elfio\elfio\elf_types.hpp">
-      <Filter>Header Files\Libraries\elfio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\lib\elfio\elfio\elfio.hpp">
-      <Filter>Header Files\Libraries\elfio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\lib\elfio\elfio\elfio_dump.hpp">
-      <Filter>Header Files\Libraries\elfio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\lib\elfio\elfio\elfio_dynamic.hpp">
-      <Filter>Header Files\Libraries\elfio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\lib\elfio\elfio\elfio_header.hpp">
-      <Filter>Header Files\Libraries\elfio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\lib\elfio\elfio\elfio_note.hpp">
-      <Filter>Header Files\Libraries\elfio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\lib\elfio\elfio\elfio_relocation.hpp">
-      <Filter>Header Files\Libraries\elfio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\lib\elfio\elfio\elfio_section.hpp">
-      <Filter>Header Files\Libraries\elfio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\lib\elfio\elfio\elfio_segment.hpp">
-      <Filter>Header Files\Libraries\elfio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\lib\elfio\elfio\elfio_strings.hpp">
-      <Filter>Header Files\Libraries\elfio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\lib\elfio\elfio\elfio_symbols.hpp">
-      <Filter>Header Files\Libraries\elfio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\lib\elfio\elfio\elfio_utils.hpp">
-      <Filter>Header Files\Libraries\elfio</Filter>
-    </ClInclude>
-    <ClInclude Include="Globals.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetAlternateHeaders.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetExitList.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\EndMarker.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetCollisionHeader.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetRoomList.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetObjectList.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetMesh.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\Unused09.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetLightingSettings.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetTransitionActorList.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetPathways.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetCutscenes.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="..\lib\stb\stb_image.h">
-      <Filter>Header Files\Libraries</Filter>
-    </ClInclude>
-    <ClInclude Include="..\lib\stb\stb_image_write.h">
-      <Filter>Header Files\Libraries</Filter>
-    </ClInclude>
-    <ClInclude Include="Overlays\ZOverlay.h">
-      <Filter>Header Files\Z64</Filter>
-    </ClInclude>
-    <ClInclude Include="ZTexture.h">
-      <Filter>Header Files\Z64</Filter>
-    </ClInclude>
-    <ClInclude Include="ZAnimation.h">
-      <Filter>Header Files\Z64</Filter>
-    </ClInclude>
-    <ClInclude Include="ZBlob.h">
-      <Filter>Header Files\Z64</Filter>
-    </ClInclude>
-    <ClInclude Include="ZCutscene.h">
-      <Filter>Header Files\Z64</Filter>
-    </ClInclude>
-    <ClInclude Include="ZDisplayList.h">
-      <Filter>Header Files\Z64</Filter>
-    </ClInclude>
-    <ClInclude Include="ZFile.h">
-      <Filter>Header Files\Z64</Filter>
-    </ClInclude>
-    <ClInclude Include="ZResource.h">
-      <Filter>Header Files\Z64</Filter>
-    </ClInclude>
-    <ClInclude Include="ZSkeleton.h">
-      <Filter>Header Files\Z64</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetLightList.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\ZRoomCommandUnk.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZCollision.h">
-      <Filter>Header Files\Z64</Filter>
-    </ClInclude>
-    <ClInclude Include="ZScalar.h">
-      <Filter>Header Files\Z64</Filter>
-    </ClInclude>
-    <ClInclude Include="ZVector.h">
-      <Filter>Header Files\Z64</Filter>
-    </ClInclude>
-    <ClInclude Include="..\lib\stb\tinyxml2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ZArray.h">
-      <Filter>Header Files\Z64</Filter>
-    </ClInclude>
-    <ClInclude Include="ZVtx.h">
-      <Filter>Header Files\Z64</Filter>
-    </ClInclude>
-    <ClInclude Include="CRC32.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ZLimb.h">
-      <Filter>Header Files\Z64</Filter>
-    </ClInclude>
-    <ClInclude Include="OutputFormatter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ZSymbol.h">
-      <Filter>Header Files\Z64</Filter>
-    </ClInclude>
-    <ClInclude Include="..\lib\libgfxd\gbi.h">
-      <Filter>Header Files\Libraries\libgfxd</Filter>
-    </ClInclude>
-    <ClInclude Include="..\lib\libgfxd\gfxd.h">
-      <Filter>Header Files\Libraries\libgfxd</Filter>
-    </ClInclude>
-    <ClInclude Include="..\lib\libgfxd\priv.h">
-      <Filter>Header Files\Libraries\libgfxd</Filter>
-    </ClInclude>
-    <ClInclude Include="ZMtx.h">
-      <Filter>Header Files\Z64</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetWorldMapVisited.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetActorCutsceneList.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\Unused1D.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetCsCamera.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetMinimapChests.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetMinimapList.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ZCutsceneMM.h">
-      <Filter>Header Files\Z64</Filter>
-    </ClInclude>
-    <ClInclude Include="ZBackground.h">
-      <Filter>Header Files\Z64</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRoom\Commands\SetAnimatedMaterialList.h">
-      <Filter>Header Files\Z64\ZRoom\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ImageBackend.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ZPath.h">
-      <Filter>Header Files\Z64</Filter>
-    </ClInclude>
-    <ClInclude Include="Declaration.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ZString.h">
-      <Filter>Header Files\Z64</Filter>
-    </ClInclude>
-    <ClInclude Include="GameConfig.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ZTextureAnimation.h">
-      <Filter>Header Files\Z64</Filter>
-    </ClInclude>
-    <ClInclude Include="OtherStructs\SkinLimbStructs.h">
-      <Filter>Header Files\Z64</Filter>
-    </ClInclude>
-    <ClInclude Include="ZPlayerAnimationData.h">
-      <Filter>Header Files\Z64</Filter>
-    </ClInclude>
-    <ClInclude Include="WarningHandler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ZText.h">
-      <Filter>Header Files\Z64</Filter>
-    </ClInclude>
-    <ClInclude Include="ZRom.h">
-      <Filter>Header Files\Z64</Filter>
-    </ClInclude>
-    <ClInclude Include="yaz0\readwrite.h">
-      <Filter>Header Files\Yaz0</Filter>
-    </ClInclude>
-    <ClInclude Include="yaz0\yaz0.h">
-      <Filter>Header Files\Yaz0</Filter>
-    </ClInclude>
-    <ClInclude Include="FileWorker.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ctpl_stl.h">
-      <Filter>Header Files\Libraries</Filter>
-    </ClInclude>
-    <ClInclude Include="ZAudio.h">
-      <Filter>Header Files\Z64</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="..\SymbolMap_OoTMqDbg.txt">
-      <Filter>Resource Files</Filter>
-    </Text>
-    <Text Include="any\any\zlib.static.txt">
-      <Filter>any\any</Filter>
-    </Text>
-    <Text Include="NuGet\libpng.static.txt">
-      <Filter>NuGet</Filter>
-    </Text>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-</Project>
-\ No newline at end of file
diff --git a/ZAPDUtils/CMakeLists.txt b/ZAPDUtils/CMakeLists.txt
deleted file mode 100644
index 68e8359..0000000
--- a/ZAPDUtils/CMakeLists.txt
+++ /dev/null
@@ -1,218 +0,0 @@
-set(PROJECT_NAME ZAPDUtils)
-
-################################################################################
-# Source groups
-################################################################################
-set(Header_Files
-    "Color3b.h"
-    "StrHash.h"
-    "Vec2f.h"
-    "Vec3f.h"
-    "Vec3s.h"
-)
-source_group("Header Files" FILES ${Header_Files})
-
-set(Header_Files__Utils
-    "Utils/BinaryReader.h"
-    "Utils/BinaryWriter.h"
-    "Utils/BitConverter.h"
-    "Utils/Directory.h"
-    "Utils/File.h"
-    "Utils/MemoryStream.h"
-    "Utils/Path.h"
-    "Utils/Stream.h"
-    "Utils/StringHelper.h"
-)
-source_group("Header Files\\Utils" FILES ${Header_Files__Utils})
-
-set(Source_Files__Libraries
-    "../lib/tinyxml2/tinyxml2.cpp"
-)
-source_group("Source Files\\Libraries" FILES ${Source_Files__Libraries})
-
-set(Source_Files__Utils
-    "Utils/BinaryReader.cpp"
-    "Utils/BinaryWriter.cpp"
-    "Utils/MemoryStream.cpp"
-    "Utils/StringHelper.cpp"
-)
-source_group("Source Files\\Utils" FILES ${Source_Files__Utils})
-
-set(ALL_FILES
-    ${Header_Files}
-    ${Header_Files__Utils}
-    ${Source_Files__Libraries}
-    ${Source_Files__Utils}
-)
-
-################################################################################
-# Target
-################################################################################
-add_library(${PROJECT_NAME} STATIC ${ALL_FILES})
-
-if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
-use_props(${PROJECT_NAME} "${CMAKE_CONFIGURATION_TYPES}" "${DEFAULT_CXX_PROPS}")
-endif()
-
-set(ROOT_NAMESPACE ZAPDUtils)
-
-if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
-	set_target_properties(${PROJECT_NAME} PROPERTIES
-		VS_GLOBAL_KEYWORD "Win32Proj"
-	)
-	if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
-		set_target_properties(${PROJECT_NAME} PROPERTIES
-			INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE"
-		)
-	elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
-		set_target_properties(${PROJECT_NAME} PROPERTIES
-			INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE"
-		)
-	endif()
-endif()
-################################################################################
-# MSVC runtime library
-################################################################################
-if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
-	get_property(MSVC_RUNTIME_LIBRARY_DEFAULT TARGET ${PROJECT_NAME} PROPERTY MSVC_RUNTIME_LIBRARY)
-	if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
-		string(CONCAT "MSVC_RUNTIME_LIBRARY_STR"
-			$<$<CONFIG:Debug>:
-				MultiThreadedDebug
-			>
-			$<$<CONFIG:Release>:
-				MultiThreaded
-			>
-			$<$<NOT:$<OR:$<CONFIG:Debug>,$<CONFIG:Release>>>:${MSVC_RUNTIME_LIBRARY_DEFAULT}>
-		)
-	elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
-		string(CONCAT "MSVC_RUNTIME_LIBRARY_STR"
-			MultiThreaded
-		)
-	endif()
-	set_target_properties(${PROJECT_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY ${MSVC_RUNTIME_LIBRARY_STR})
-endif()
-################################################################################
-# Compile definitions
-################################################################################
-if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
-	if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
-		target_compile_definitions(${PROJECT_NAME} PRIVATE
-			"$<$<CONFIG:Debug>:"
-				"_DEBUG;"
-				"_MBCS"
-			">"
-			"$<$<CONFIG:Release>:"
-				"NDEBUG;"
-				"UNICODE;"
-				"_UNICODE"
-			">"
-			"_CONSOLE;"
-			"_CRT_SECURE_NO_WARNINGS"
-			STORMLIB_NO_AUTO_LINK
-		)
-	elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
-		target_compile_definitions(${PROJECT_NAME} PRIVATE
-			"$<$<CONFIG:Debug>:"
-				"_DEBUG"
-			">"
-			"$<$<CONFIG:Release>:"
-				"NDEBUG"
-			">"
-			"WIN32;"
-			"_CONSOLE;"
-			"_CRT_SECURE_NO_WARNINGS;"
-			"UNICODE;"
-			"_UNICODE"
-			STORMLIB_NO_AUTO_LINK
-		)
-	endif()
-endif()
-
-if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|AppleClang")
-	target_compile_definitions(${PROJECT_NAME} PRIVATE
-		"$<$<CONFIG:Debug>:"
-				"_DEBUG"
-		">"
-		"$<$<CONFIG:Release>:"
-			"NDEBUG"
-		">"
-		"_CONSOLE;"
-		"_CRT_SECURE_NO_WARNINGS;"
-		"UNICODE;"
-		"_UNICODE"
-	)
-endif()
-
-################################################################################
-# Compile and link options
-################################################################################
-if(MSVC)
-    if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
-        target_compile_options(${PROJECT_NAME} PRIVATE
-            $<$<CONFIG:Release>:
-                /Oi;
-                /Gy
-            >
-            /permissive-;
-            /MP;
-            /sdl;
-            /W3;
-            ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT};
-            ${DEFAULT_CXX_EXCEPTION_HANDLING}
-        )
-    elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
-        target_compile_options(${PROJECT_NAME} PRIVATE
-            $<$<CONFIG:Debug>:
-                /O2;
-                /Ot
-            >
-            $<$<CONFIG:Release>:
-                /Gy
-            >
-            /permissive-;
-            /MP;
-            /Oi;
-            /sdl;
-            /W3;
-            ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT};
-            ${DEFAULT_CXX_EXCEPTION_HANDLING}
-        )
-    endif()
-    if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
-        target_link_options(${PROJECT_NAME} PRIVATE
-            $<$<CONFIG:Release>:
-                /OPT:REF;
-                /OPT:ICF
-            >
-            /SUBSYSTEM:CONSOLE
-        )
-    elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
-        target_link_options(${PROJECT_NAME} PRIVATE
-            $<$<CONFIG:Release>:
-                /OPT:REF;
-                /OPT:ICF
-            >
-            /SUBSYSTEM:CONSOLE
-        )
-    endif()
-endif()
-
-if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|AppleClang")
-	target_compile_options(${PROJECT_NAME} PRIVATE
-		-Wall -Wextra -Wno-error
-        -Wno-unused-parameter
-        -Wno-unused-function
-        -Wno-unused-variable
-		-Wno-missing-field-initializers
-        -Wno-parentheses
-        -Wno-narrowing
-        $<$<COMPILE_LANGUAGE:CXX>:-Wno-deprecated-enum-enum-conversion>
-	)
-endif()
-################################################################################
-# Dependencies
-################################################################################
-# Link with other targets.
-
-
diff --git a/ZAPDUtils/Color3b.h b/ZAPDUtils/Color3b.h
deleted file mode 100644
index 507c099..0000000
--- a/ZAPDUtils/Color3b.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include <cstdint>
-
-struct Color3b
-{
-	uint8_t r, g, b;
-
-	Color3b()
-	{
-		r = 0;
-		g = 0;
-		b = 0;
-	};
-	Color3b(uint8_t nR, uint8_t nG, uint8_t nB)
-	{
-		r = nR;
-		g = nG;
-		b = nB;
-	};
-};
-\ No newline at end of file
diff --git a/ZAPDUtils/StrHash.h b/ZAPDUtils/StrHash.h
deleted file mode 100644
index c611bdd..0000000
--- a/ZAPDUtils/StrHash.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <cstdio>
-#include <cstdlib>
-
-typedef uint32_t strhash;
-
-[[maybe_unused]] static strhash CRC32B(unsigned char* message, int32_t size)
-{
-	int32_t byte = 0, crc = 0;
-	int32_t mask = 0;
-
-	crc = 0xFFFFFFFF;
-
-	for (int32_t i = 0; i < size; i++)
-	{
-		byte = message[i];
-		crc = crc ^ byte;
-
-		for (int32_t j = 7; j >= 0; j--)
-		{
-			mask = -(crc & 1);
-			crc = (crc >> 1) ^ (0xEDB88320 & mask);
-		}
-	}
-
-	return ~(uint32_t)(crc);
-}
-
-[[maybe_unused]] constexpr static strhash CRC32BCT(const char* message, int32_t size)
-{
-	int32_t byte = 0, crc = 0;
-	int32_t mask = 0;
-
-	crc = 0xFFFFFFFF;
-
-	for (int32_t i = 0; i < size; i++)
-	{
-		byte = message[i];
-		crc = crc ^ byte;
-
-		for (int32_t j = 7; j >= 0; j--)
-		{
-			mask = -(crc & 1);
-			crc = (crc >> 1) ^ (0xEDB88320 & mask);
-		}
-	}
-
-	return ~(uint32_t)(crc);
-}
-\ No newline at end of file
diff --git a/ZAPDUtils/Utils/BinaryReader.cpp b/ZAPDUtils/Utils/BinaryReader.cpp
deleted file mode 100644
index 092124a..0000000
--- a/ZAPDUtils/Utils/BinaryReader.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-#include "BinaryReader.h"
-#include <cmath>
-#include <stdexcept>
-#include "Stream.h"
-
-BinaryReader::BinaryReader(Stream* nStream)
-{
-	stream.reset(nStream);
-}
-
-BinaryReader::BinaryReader(std::shared_ptr<Stream> nStream)
-{
-	stream = nStream;
-}
-
-void BinaryReader::Close()
-{
-	stream->Close();
-}
-
-void BinaryReader::SetEndianness(Endianness endianness)
-{
-	this->endianness = endianness;
-}
-
-Endianness BinaryReader::GetEndianness() const
-{
-	return endianness;
-}
-
-void BinaryReader::Seek(uint32_t offset, SeekOffsetType seekType)
-{
-	stream->Seek(offset, seekType);
-}
-
-uint32_t BinaryReader::GetBaseAddress()
-{
-	return stream->GetBaseAddress();
-}
-
-void BinaryReader::Read(int32_t length)
-{
-	stream->Read(length);
-}
-
-void BinaryReader::Read(char* buffer, int32_t length)
-{
-	stream->Read(buffer, length);
-}
-
-char BinaryReader::ReadChar()
-{
-	return (char)stream->ReadByte();
-}
-
-int8_t BinaryReader::ReadByte()
-{
-	return stream->ReadByte();
-}
-
-uint8_t BinaryReader::ReadUByte()
-{
-	return (uint8_t)stream->ReadByte();
-}
-
-int16_t BinaryReader::ReadInt16()
-{
-	int16_t result = 0;
-
-	stream->Read((char*)&result, sizeof(int16_t));
-
-	if (endianness != Endianness::Native)
-		result = BSWAP16(result);
-
-	return result;
-}
-
-int32_t BinaryReader::ReadInt32()
-{
-	int32_t result = 0;
-
-	stream->Read((char*)&result, sizeof(int32_t));
-
-	if (endianness != Endianness::Native)
-		result = BSWAP32(result);
-
-	return result;
-}
-
-uint16_t BinaryReader::ReadUInt16()
-{
-	uint16_t result = 0;
-
-	stream->Read((char*)&result, sizeof(uint16_t));
-
-	if (endianness != Endianness::Native)
-		result = BSWAP16(result);
-
-	return result;
-}
-
-uint32_t BinaryReader::ReadUInt32()
-{
-	uint32_t result = 0;
-
-	stream->Read((char*)&result, sizeof(uint32_t));
-
-	if (endianness != Endianness::Native)
-		result = BSWAP32(result);
-
-	return result;
-}
-
-uint64_t BinaryReader::ReadUInt64()
-{
-	uint64_t result = 0;
-
-	stream->Read((char*)&result, sizeof(uint64_t));
-
-	if (endianness != Endianness::Native)
-		result = BSWAP64(result);
-
-	return result;
-}
-
-float BinaryReader::ReadSingle()
-{
-	float result = NAN;
-
-	stream->Read((char*)&result, sizeof(float));
-
-	if (endianness != Endianness::Native)
-	{
-		float tmp;
-		char* dst = (char*)&tmp;
-		char* src = (char*)&result;
-		dst[3] = src[0]; dst[2] = src[1]; dst[1] = src[2]; dst[0] = src[3];
-		result = tmp;
-	}
-
-	if (std::isnan(result))
-		throw std::runtime_error("BinaryReader::ReadSingle(): Error reading stream");
-
-	return result;
-}
-
-double BinaryReader::ReadDouble()
-{
-	double result = NAN;
-
-	stream->Read((char*)&result, sizeof(double));
-
-	if (endianness != Endianness::Native)
-	{
-		double tmp;
-		char* dst = (char*)&tmp;
-		char* src = (char*)&result;
-		dst[7] = src[0]; dst[6] = src[1]; dst[5] = src[2]; dst[4] = src[3];
-		dst[3] = src[4]; dst[2] = src[5]; dst[1] = src[6]; dst[0] = src[7];
-		result = tmp;
-	}
-
-	if (std::isnan(result))
-		throw std::runtime_error("BinaryReader::ReadDouble(): Error reading stream");
-
-	return result;
-}
-
-Vec3f BinaryReader::ReadVec3f()
-{
-	return Vec3f();
-}
-
-Vec3s BinaryReader::ReadVec3s()
-{
-	return Vec3s(0, 0, 0);
-}
-
-Vec3s BinaryReader::ReadVec3b()
-{
-	return Vec3s(0, 0, 0);
-}
-
-Vec2f BinaryReader::ReadVec2f()
-{
-	return Vec2f();
-}
-
-Color3b BinaryReader::ReadColor3b()
-{
-	return Color3b();
-}
-
-std::string BinaryReader::ReadString()
-{
-	std::string res;
-	int numChars = ReadInt32();
-
-	for (int i = 0; i < numChars; i++)
-		res += ReadChar();
-
-	return res;
-}
-\ No newline at end of file
diff --git a/ZAPDUtils/Utils/BinaryReader.h b/ZAPDUtils/Utils/BinaryReader.h
deleted file mode 100644
index 0b18351..0000000
--- a/ZAPDUtils/Utils/BinaryReader.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#pragma once
-
-#include <array>
-#include <memory>
-#include <string>
-#include <vector>
-#include "../Color3b.h"
-#include "../Vec2f.h"
-#include "../Vec3f.h"
-#include "../Vec3s.h"
-#include "BitConverter.h"
-#include "Stream.h"
-
-class BinaryReader
-{
-public:
-	BinaryReader(Stream* nStream);
-	BinaryReader(std::shared_ptr<Stream> nStream);
-
-	void Close();
-
-	void SetEndianness(Endianness endianness);
-	Endianness GetEndianness() const;
-
-	void Seek(uint32_t offset, SeekOffsetType seekType);
-	uint32_t GetBaseAddress();
-
-	void Read(int32_t length);
-	void Read(char* buffer, int32_t length);
-	char ReadChar();
-	int8_t ReadByte();
-	int16_t ReadInt16();
-	int32_t ReadInt32();
-	uint8_t ReadUByte();
-	uint16_t ReadUInt16();
-	uint32_t ReadUInt32();
-	uint64_t ReadUInt64();
-	float ReadSingle();
-	double ReadDouble();
-	Vec3f ReadVec3f();
-	Vec3s ReadVec3s();
-	Vec3s ReadVec3b();
-	Vec2f ReadVec2f();
-	Color3b ReadColor3b();
-	std::string ReadString();
-
-protected:
-	std::shared_ptr<Stream> stream;
-	Endianness endianness = Endianness::Native;
-};
-\ No newline at end of file
diff --git a/ZAPDUtils/Utils/BinaryWriter.cpp b/ZAPDUtils/Utils/BinaryWriter.cpp
deleted file mode 100644
index 34bcad0..0000000
--- a/ZAPDUtils/Utils/BinaryWriter.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-#include "BinaryWriter.h"
-
-BinaryWriter::BinaryWriter(Stream* nStream)
-{
-	stream.reset(nStream);
-}
-
-BinaryWriter::BinaryWriter(std::shared_ptr<Stream> nStream)
-{
-	stream = nStream;
-}
-
-void BinaryWriter::SetEndianness(Endianness endianness)
-{
-	this->endianness = endianness;
-}
-
-void BinaryWriter::Close()
-{
-	stream->Close();
-}
-
-std::shared_ptr<Stream> BinaryWriter::GetStream()
-{
-	return stream;
-}
-
-uint64_t BinaryWriter::GetBaseAddress()
-{
-	return stream->GetBaseAddress();
-}
-
-uint64_t BinaryWriter::GetLength()
-{
-	return stream->GetLength();
-}
-
-void BinaryWriter::Seek(int32_t offset, SeekOffsetType seekType)
-{
-	stream->Seek(offset, seekType);
-}
-
-void BinaryWriter::Write(int8_t value)
-{
-	stream->Write((char*)&value, sizeof(int8_t));
-}
-
-void BinaryWriter::Write(uint8_t value)
-{
-	stream->Write((char*)&value, sizeof(uint8_t));
-}
-
-void BinaryWriter::Write(int16_t value)
-{
-	if (endianness != Endianness::Native)
-		value = BSWAP16(value);
-
-	stream->Write((char*)&value, sizeof(int16_t));
-}
-
-void BinaryWriter::Write(uint16_t value)
-{
-	if (endianness != Endianness::Native)
-		value = BSWAP16(value);
-
-	stream->Write((char*)&value, sizeof(uint16_t));
-}
-
-void BinaryWriter::Write(int32_t value)
-{
-	if (endianness != Endianness::Native)
-		value = BSWAP32(value);
-
-	stream->Write((char*)&value, sizeof(int32_t));
-}
-
-void BinaryWriter::Write(int32_t valueA, int32_t valueB)
-{
-	Write(valueA);
-	Write(valueB);
-}
-
-void BinaryWriter::Write(uint32_t value)
-{
-	if (endianness != Endianness::Native)
-		value = BSWAP32(value);
-
-	stream->Write((char*)&value, sizeof(uint32_t));
-}
-
-void BinaryWriter::Write(int64_t value)
-{
-	if (endianness != Endianness::Native)
-		value = BSWAP64(value);
-
-	stream->Write((char*)&value, sizeof(int64_t));
-}
-
-void BinaryWriter::Write(uint64_t value)
-{
-	if (endianness != Endianness::Native)
-		value = BSWAP64(value);
-
-	stream->Write((char*)&value, sizeof(uint64_t));
-}
-
-void BinaryWriter::Write(float value)
-{
-	if (endianness != Endianness::Native)
-	{
-		float tmp;
-		char* dst = (char*)&tmp;
-		char* src = (char*)&value;
-		dst[3] = src[0]; dst[2] = src[1]; dst[1] = src[2]; dst[0] = src[3];
-		value = tmp;
-	}
-
-	stream->Write((char*)&value, sizeof(float));
-}
-
-void BinaryWriter::Write(double value)
-{
-	if (endianness != Endianness::Native)
-	{
-		double tmp;
-		char* dst = (char*)&tmp;
-		char* src = (char*)&value;
-		dst[7] = src[0]; dst[6] = src[1]; dst[5] = src[2]; dst[4] = src[3];
-		dst[3] = src[4]; dst[2] = src[5]; dst[1] = src[6]; dst[0] = src[7];
-		value = tmp;
-	}
-
-	stream->Write((char*)&value, sizeof(double));
-}
-
-void BinaryWriter::Write(const std::string& str)
-{
-	int strLen = str.size();
-	Write(strLen);
-
-	for (char c : str)
-		stream->WriteByte(c);
-}
-
-void BinaryWriter::Write(char* srcBuffer, size_t length)
-{
-	stream->Write(srcBuffer, length);
-}
diff --git a/ZAPDUtils/Utils/BinaryWriter.h b/ZAPDUtils/Utils/BinaryWriter.h
deleted file mode 100644
index 67c8fcd..0000000
--- a/ZAPDUtils/Utils/BinaryWriter.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#pragma once
-
-#include <array>
-#include <memory>
-#include <string>
-#include <vector>
-#include "BitConverter.h"
-#include "Stream.h"
-
-class BinaryWriter
-{
-public:
-	BinaryWriter(Stream* nStream);
-	BinaryWriter(std::shared_ptr<Stream> nStream);
-
-	void SetEndianness(Endianness endianness);
-
-	std::shared_ptr<Stream> GetStream();
-	uint64_t GetBaseAddress();
-	uint64_t GetLength();
-	void Seek(int32_t offset, SeekOffsetType seekType);
-	void Close();
-
-	void Write(int8_t value);
-	void Write(uint8_t value);
-	void Write(int16_t value);
-	void Write(uint16_t value);
-	void Write(int32_t value);
-	void Write(int32_t valueA, int32_t valueB);
-	void Write(uint32_t value);
-	void Write(int64_t value);
-	void Write(uint64_t value);
-	void Write(float value);
-	void Write(double value);
-	void Write(const std::string& str);
-	void Write(char* srcBuffer, size_t length);
-
-protected:
-	std::shared_ptr<Stream> stream;
-	Endianness endianness = Endianness::Native;
-};
-\ No newline at end of file
diff --git a/ZAPDUtils/Utils/BitConverter.h b/ZAPDUtils/Utils/BitConverter.h
deleted file mode 100644
index b62891d..0000000
--- a/ZAPDUtils/Utils/BitConverter.h
+++ /dev/null
@@ -1,184 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <limits>
-#include <vector>
-#include <cstring>
-
-#ifdef _MSC_VER
-#define BSWAP16 _byteswap_ushort
-#define BSWAP32 _byteswap_ulong
-#define BSWAP64 _byteswap_uint64
-#else
-#define BSWAP16 __builtin_bswap16
-#define BSWAP32 __builtin_bswap32
-#define BSWAP64 __builtin_bswap64
-#endif
-
-enum class Endianness
-{
-	Little = 0,
-	Big = 1,
-
-#if (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)) || defined(__BIG_ENDIAN__)
-    Native = Big,
-#else
-    Native = Little,
-#endif
-};
-
-class BitConverter
-{
-public:
-	static inline int8_t ToInt8BE(const uint8_t* data, int32_t offset)
-	{
-		return (uint8_t)data[offset + 0];
-	}
-
-	static inline int8_t ToInt8BE(const std::vector<uint8_t>& data, int32_t offset)
-	{
-		return (uint8_t)data[offset + 0];
-	}
-
-	static inline uint8_t ToUInt8BE(const uint8_t* data, int32_t offset)
-	{
-		return (uint8_t)data[offset + 0];
-	}
-
-	static inline uint8_t ToUInt8BE(const std::vector<uint8_t>& data, int32_t offset)
-	{
-		return (uint8_t)data[offset + 0];
-	}
-
-	static inline int16_t ToInt16BE(const uint8_t* data, int32_t offset)
-	{
-		return ((uint16_t)data[offset + 0] << 8) + (uint16_t)data[offset + 1];
-	}
-
-	static inline int16_t ToInt16BE(const std::vector<uint8_t>& data, int32_t offset)
-	{
-		return ((uint16_t)data[offset + 0] << 8) + (uint16_t)data[offset + 1];
-	}
-
-	static inline uint16_t ToUInt16BE(const uint8_t* data, int32_t offset)
-	{
-		return ((uint16_t)data[offset + 0] << 8) + (uint16_t)data[offset + 1];
-	}
-
-	static inline uint16_t ToUInt16BE(const std::vector<uint8_t>& data, int32_t offset)
-	{
-		return ((uint16_t)data[offset + 0] << 8) + (uint16_t)data[offset + 1];
-	}
-
-	static inline int32_t ToInt32BE(const uint8_t* data, int32_t offset)
-	{
-		return ((uint32_t)data[offset + 0] << 24) + ((uint32_t)data[offset + 1] << 16) +
-			   ((uint32_t)data[offset + 2] << 8) + (uint32_t)data[offset + 3];
-	}
-
-	static inline int32_t ToInt32BE(const std::vector<uint8_t>& data, int32_t offset)
-	{
-		return ((uint32_t)data[offset + 0] << 24) + ((uint32_t)data[offset + 1] << 16) +
-			   ((uint32_t)data[offset + 2] << 8) + (uint32_t)data[offset + 3];
-	}
-
-	static inline uint32_t ToUInt32BE(const uint8_t* data, int32_t offset)
-	{
-		return ((uint32_t)data[offset + 0] << 24) + ((uint32_t)data[offset + 1] << 16) +
-			   ((uint32_t)data[offset + 2] << 8) + (uint32_t)data[offset + 3];
-	}
-
-	static inline uint32_t ToUInt32BE(const std::vector<uint8_t>& data, int32_t offset)
-	{
-		return ((uint32_t)data[offset + 0] << 24) + ((uint32_t)data[offset + 1] << 16) +
-			   ((uint32_t)data[offset + 2] << 8) + (uint32_t)data[offset + 3];
-	}
-
-	static inline int64_t ToInt64BE(const uint8_t* data, int32_t offset)
-	{
-		return ((uint64_t)data[offset + 0] << 56) + ((uint64_t)data[offset + 1] << 48) +
-			   ((uint64_t)data[offset + 2] << 40) + ((uint64_t)data[offset + 3] << 32) +
-			   ((uint64_t)data[offset + 4] << 24) + ((uint64_t)data[offset + 5] << 16) +
-			   ((uint64_t)data[offset + 6] << 8) + ((uint64_t)data[offset + 7]);
-	}
-
-	static inline int64_t ToInt64BE(const std::vector<uint8_t>& data, int32_t offset)
-	{
-		return ((uint64_t)data[offset + 0] << 56) + ((uint64_t)data[offset + 1] << 48) +
-			   ((uint64_t)data[offset + 2] << 40) + ((uint64_t)data[offset + 3] << 32) +
-			   ((uint64_t)data[offset + 4] << 24) + ((uint64_t)data[offset + 5] << 16) +
-			   ((uint64_t)data[offset + 6] << 8) + ((uint64_t)data[offset + 7]);
-	}
-
-	static inline uint64_t ToUInt64BE(const uint8_t* data, int32_t offset)
-	{
-		return ((uint64_t)data[offset + 0] << 56) + ((uint64_t)data[offset + 1] << 48) +
-			   ((uint64_t)data[offset + 2] << 40) + ((uint64_t)data[offset + 3] << 32) +
-			   ((uint64_t)data[offset + 4] << 24) + ((uint64_t)data[offset + 5] << 16) +
-			   ((uint64_t)data[offset + 6] << 8) + ((uint64_t)data[offset + 7]);
-	}
-
-	static inline uint64_t ToUInt64BE(const std::vector<uint8_t>& data, int32_t offset)
-	{
-		return ((uint64_t)data[offset + 0] << 56) + ((uint64_t)data[offset + 1] << 48) +
-			   ((uint64_t)data[offset + 2] << 40) + ((uint64_t)data[offset + 3] << 32) +
-			   ((uint64_t)data[offset + 4] << 24) + ((uint64_t)data[offset + 5] << 16) +
-			   ((uint64_t)data[offset + 6] << 8) + ((uint64_t)data[offset + 7]);
-	}
-
-	static inline float ToFloatBE(const uint8_t* data, int32_t offset)
-	{
-		float value;
-		uint32_t floatData = ((uint32_t)data[offset + 0] << 24) +
-							 ((uint32_t)data[offset + 1] << 16) +
-							 ((uint32_t)data[offset + 2] << 8) + (uint32_t)data[offset + 3];
-		static_assert(sizeof(uint32_t) == sizeof(float), "expected 32-bit float");
-		std::memcpy(&value, &floatData, sizeof(value));
-		return value;
-	}
-
-	static inline float ToFloatBE(const std::vector<uint8_t>& data, int32_t offset)
-	{
-		float value;
-		uint32_t floatData = ((uint32_t)data[offset + 0] << 24) +
-							 ((uint32_t)data[offset + 1] << 16) +
-							 ((uint32_t)data[offset + 2] << 8) + (uint32_t)data[offset + 3];
-		static_assert(sizeof(uint32_t) == sizeof(float), "expected 32-bit float");
-		std::memcpy(&value, &floatData, sizeof(value));
-		return value;
-	}
-
-	static inline double ToDoubleBE(const uint8_t* data, int32_t offset)
-	{
-		double value;
-		uint64_t floatData =
-			((uint64_t)data[offset + 0] << 56) + ((uint64_t)data[offset + 1] << 48) +
-			((uint64_t)data[offset + 2] << 40) + ((uint64_t)data[offset + 3] << 32) +
-			((uint64_t)data[offset + 4] << 24) + ((uint64_t)data[offset + 5] << 16) +
-			((uint64_t)data[offset + 6] << 8) + ((uint64_t)data[offset + 7]);
-		static_assert(sizeof(uint64_t) == sizeof(double), "expected 64-bit double");
-		// Checks if the float format on the platform the ZAPD binary is running on supports the
-		// same float format as the object file.
-		static_assert(std::numeric_limits<float>::is_iec559,
-		              "expected IEC559 floats on host machine");
-		std::memcpy(&value, &floatData, sizeof(value));
-		return value;
-	}
-
-	static inline double ToDoubleBE(const std::vector<uint8_t>& data, int32_t offset)
-	{
-		double value;
-		uint64_t floatData =
-			((uint64_t)data[offset + 0] << 56) + ((uint64_t)data[offset + 1] << 48) +
-			((uint64_t)data[offset + 2] << 40) + ((uint64_t)data[offset + 3] << 32) +
-			((uint64_t)data[offset + 4] << 24) + ((uint64_t)data[offset + 5] << 16) +
-			((uint64_t)data[offset + 6] << 8) + ((uint64_t)data[offset + 7]);
-		static_assert(sizeof(uint64_t) == sizeof(double), "expected 64-bit double");
-		// Checks if the float format on the platform the ZAPD binary is running on supports the
-		// same float format as the object file.
-		static_assert(std::numeric_limits<double>::is_iec559,
-		              "expected IEC559 doubles on host machine");
-		std::memcpy(&value, &floatData, sizeof(value));
-		return value;
-	}
-};
diff --git a/ZAPDUtils/Utils/Directory.h b/ZAPDUtils/Utils/Directory.h
deleted file mode 100644
index ea792d8..0000000
--- a/ZAPDUtils/Utils/Directory.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#pragma once
-
-#include <string>
-#include <vector>
-#include "StringHelper.h"
-#include <iostream>
-
-#if __has_include(<filesystem>)
-#include <filesystem>
-namespace fs = std::filesystem;
-#else
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
-#endif
-
-#undef GetCurrentDirectory
-#undef CreateDirectory
-
-class Directory
-{
-public:
-	#ifndef PATH_HACK
-	static std::string GetCurrentDirectory() { return fs::current_path().string(); }
-	#endif
-
-	static bool Exists(const fs::path& path) { return fs::exists(path); }
-
-	// Stupid hack because of Windows.h
-	static void MakeDirectory(const std::string& path)
-	{
-		CreateDirectory(path);
-	}
-
-	static void CreateDirectory(const std::string& path)
-	{
-		try
-		{
-			fs::create_directories(path);
-		}
-		catch (...)
-		{
-		}
-	}
-
-	static std::vector<std::string> ListFiles(const std::string& dir)
-	{
-		std::vector<std::string> lst;
-
-		if (Exists(dir))
-		{
-			for (auto& p : fs::recursive_directory_iterator(dir))
-			{
-				if (!p.is_directory())
-					lst.push_back(p.path().generic_string());
-			}
-		}
-
-		return lst;
-	}
-};
diff --git a/ZAPDUtils/Utils/File.h b/ZAPDUtils/Utils/File.h
deleted file mode 100644
index f3448bd..0000000
--- a/ZAPDUtils/Utils/File.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#pragma once
-
-#include <cstdio>
-#include <fstream>
-#include <iostream>
-#include <string>
-#include <vector>
-#include "Path.h"
-#include "Utils/StringHelper.h"
-#include "Utils/Directory.h"
-
-
-class File
-{
-public:
-	static bool Exists(const fs::path& filePath)
-	{
-		std::ifstream file(filePath, std::ios::in | std::ios::binary | std::ios::ate);
-		return file.good();
-	}
-
-	static std::vector<uint8_t> ReadAllBytes(const fs::path& filePath)
-	{
-		std::ifstream file(filePath, std::ios::in | std::ios::binary | std::ios::ate);
-
-		if (!file)
-			return std::vector<uint8_t>();
-
-		int32_t fileSize = (int32_t)file.tellg();
-		file.seekg(0);
-		char* data = new char[fileSize];
-		file.read(data, fileSize);
-		std::vector<uint8_t> result = std::vector<uint8_t>(data, data + fileSize);
-		delete[] data;
-
-		return result;
-	};
-
-	static std::string ReadAllText(const fs::path& filePath)
-	{
-		std::ifstream file(filePath, std::ios::in | std::ios::binary | std::ios::ate);
-		int32_t fileSize = (int32_t)file.tellg();
-		file.seekg(0);
-		char* data = new char[fileSize + 1];
-		memset(data, 0, fileSize + 1);
-		file.read(data, fileSize);
-		std::string str = std::string((const char*)data);
-		delete[] data;
-
-		return str;
-	};
-
-	static std::vector<std::string> ReadAllLines(const fs::path& filePath)
-	{
-		std::string text = ReadAllText(filePath);
-		std::vector<std::string> lines = StringHelper::Split(text, "\n");
-
-		return lines;
-	};
-
-	static void WriteAllBytes(const fs::path& filePath, const std::vector<uint8_t>& data)
-	{
-		std::ofstream file(filePath, std::ios::binary);
-		file.write((char*)data.data(), data.size());
-	};
-
-	static void WriteAllBytes(const std::string& filePath, const std::vector<char>& data)
-	{
-		if (!Directory::Exists(Path::GetDirectoryName(filePath)))
-			Directory::MakeDirectory(Path::GetDirectoryName(filePath).string());
-
-		std::ofstream file(filePath, std::ios::binary);
-		file.write((char*)data.data(), data.size());
-	};
-
-	static void WriteAllBytes(const std::string& filePath, const char* data, int dataSize)
-	{
-		std::ofstream file(filePath, std::ios::binary);
-		file.write((char*)data, dataSize);
-	};
-
-	static void WriteAllText(const fs::path& filePath, const std::string& text)
-	{
-		std::ofstream file(filePath, std::ios::out);
-		file.write(text.c_str(), text.size());
-	}
-};
diff --git a/ZAPDUtils/Utils/MemoryStream.cpp b/ZAPDUtils/Utils/MemoryStream.cpp
deleted file mode 100644
index 1c70c00..0000000
--- a/ZAPDUtils/Utils/MemoryStream.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-#include "MemoryStream.h"
-#include <cstring>
-
-#ifndef _MSC_VER
-#define memcpy_s(dest, destSize, source, sourceSize) memcpy(dest, source, destSize)
-#endif
-
-MemoryStream::MemoryStream()
-{
-	buffer = std::vector<char>();
-	//buffer.reserve(1024 * 16);
-	bufferSize = 0;
-	baseAddress = 0;
-}
-
-MemoryStream::MemoryStream(char* nBuffer, size_t nBufferSize) : MemoryStream()
-{
-	buffer = std::vector<char>(nBuffer, nBuffer + nBufferSize);
-	bufferSize = nBufferSize;
-	baseAddress = 0;
-}
-
-MemoryStream::~MemoryStream()
-{
-}
-
-uint64_t MemoryStream::GetLength()
-{
-	return buffer.size();
-}
-
-void MemoryStream::Seek(int32_t offset, SeekOffsetType seekType)
-{
-	if (seekType == SeekOffsetType::Start)
-		baseAddress = offset;
-	else if (seekType == SeekOffsetType::Current)
-		baseAddress += offset;
-	else if (seekType == SeekOffsetType::End)
-		baseAddress = bufferSize - 1 - offset;
-}
-
-std::unique_ptr<char[]> MemoryStream::Read(size_t length)
-{
-	std::unique_ptr<char[]> result = std::make_unique<char[]>(length);
-
-	memcpy_s(result.get(), length, &buffer[baseAddress], length);
-	baseAddress += length;
-
-	return result;
-}
-
-void MemoryStream::Read(const char* dest, size_t length)
-{
-	memcpy_s((void*)dest, length, &buffer[baseAddress], length);
-	baseAddress += length;
-}
-
-int8_t MemoryStream::ReadByte()
-{
-	return buffer[baseAddress++];
-}
-
-void MemoryStream::Write(char* srcBuffer, size_t length)
-{
-	if (baseAddress + length >= buffer.size())
-	{
-		buffer.resize(baseAddress + length);
-		bufferSize += length;
-	}
-
-	memcpy_s(&buffer[baseAddress], length, srcBuffer, length);
-	baseAddress += length;
-}
-
-void MemoryStream::WriteByte(int8_t value)
-{
-	if (baseAddress >= buffer.size())
-	{
-		buffer.resize(baseAddress + 1);
-		bufferSize = baseAddress;
-	}
-
-	buffer[baseAddress++] = value;
-}
-
-std::vector<char> MemoryStream::ToVector()
-{
-	return buffer;
-}
-
-void MemoryStream::Flush()
-{
-}
-
-void MemoryStream::Close()
-{
-}
-\ No newline at end of file
diff --git a/ZAPDUtils/Utils/MemoryStream.h b/ZAPDUtils/Utils/MemoryStream.h
deleted file mode 100644
index 5a17bb0..0000000
--- a/ZAPDUtils/Utils/MemoryStream.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <vector>
-#include "Stream.h"
-
-class MemoryStream : public Stream
-{
-public:
-	MemoryStream();
-	MemoryStream(char* nBuffer, size_t nBufferSize);
-	~MemoryStream();
-
-	uint64_t GetLength() override;
-
-	void Seek(int32_t offset, SeekOffsetType seekType) override;
-
-	std::unique_ptr<char[]> Read(size_t length) override;
-	void Read(const char* dest, size_t length) override;
-	int8_t ReadByte() override;
-
-	void Write(char* srcBuffer, size_t length) override;
-	void WriteByte(int8_t value) override;
-
-	std::vector<char> ToVector();
-
-	void Flush() override;
-	void Close() override;
-
-protected:
-	std::vector<char> buffer;
-	std::size_t bufferSize;
-};
-\ No newline at end of file
diff --git a/ZAPDUtils/Utils/Path.h b/ZAPDUtils/Utils/Path.h
deleted file mode 100644
index 0f7ef27..0000000
--- a/ZAPDUtils/Utils/Path.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#pragma once
-
-#include <iostream>
-#include <string>
-#include "Utils/StringHelper.h"
-
-#if __has_include(<filesystem>)
-#include <filesystem>
-namespace fs = std::filesystem;
-#else
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
-#endif
-
-class Path
-{
-public:
-	static std::string GetFileName(const fs::path& input)
-	{
-		// https://en.cppreference.com/w/cpp/filesystem/path/filename
-		return input.filename().string();
-	};
-
-	static std::string GetFileNameWithoutExtension(const fs::path& input)
-	{
-		// https://en.cppreference.com/w/cpp/filesystem/path/stem
-		return input.stem().string();
-	};
-
-	static std::string GetFileNameExtension(const std::string& input)
-	{
-		return input.substr(input.find_last_of("."), input.length());
-	};
-
-	static fs::path GetPath(const std::string& input)
-	{
-		std::vector<std::string> split = StringHelper::Split(input, "/");
-		fs::path output;
-
-		for (std::string str : split)
-		{
-			if (str.find_last_of(".") == std::string::npos)
-				output /= str;
-		}
-
-		return output;
-	};
-
-	static fs::path GetDirectoryName(const fs::path& path) { return path.parent_path(); };
-};
diff --git a/ZAPDUtils/Utils/Stream.h b/ZAPDUtils/Utils/Stream.h
deleted file mode 100644
index e72d794..0000000
--- a/ZAPDUtils/Utils/Stream.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <memory>
-
-enum class SeekOffsetType
-{
-	Start,
-	Current,
-	End
-};
-
-class Stream
-{
-public:
-	virtual ~Stream() = default;
-	virtual uint64_t GetLength() = 0;
-	uint64_t GetBaseAddress() { return baseAddress; }
-
-	virtual void Seek(int32_t offset, SeekOffsetType seekType) = 0;
-
-	virtual std::unique_ptr<char[]> Read(size_t length) = 0;
-	virtual void Read(const char* dest, size_t length) = 0;
-	virtual int8_t ReadByte() = 0;
-
-	virtual void Write(char* destBuffer, size_t length) = 0;
-	virtual void WriteByte(int8_t value) = 0;
-
-	virtual void Flush() = 0;
-	virtual void Close() = 0;
-
-protected:
-	uint64_t baseAddress;
-};
-\ No newline at end of file
diff --git a/ZAPDUtils/Utils/StringHelper.cpp b/ZAPDUtils/Utils/StringHelper.cpp
deleted file mode 100644
index 26a8af3..0000000
--- a/ZAPDUtils/Utils/StringHelper.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-#include "StringHelper.h"
-
-#pragma optimize("2", on)
-#define _CRT_SECURE_NO_WARNINGS
-
-#ifndef _MSC_VER
-#define vsprintf_s vsprintf
-#endif
-
-std::vector<std::string> StringHelper::Split(std::string s, const std::string& delimiter)
-{
-    size_t pos_start = 0, pos_end, delim_len = delimiter.length();
-    std::string token;
-    std::vector<std::string> res;
-
-    while ((pos_end = s.find(delimiter, pos_start)) != std::string::npos) {
-        token = s.substr(pos_start, pos_end - pos_start);
-        pos_start = pos_end + delim_len;
-        res.push_back(token);
-    }
-
-    res.push_back(s.substr(pos_start));
-    return res;
-}
-
-std::string StringHelper::Strip(std::string s, const std::string& delimiter)
-{
-	size_t pos = 0;
-	std::string token;
-
-	while ((pos = s.find(delimiter)) != std::string::npos)
-	{
-		token = s.substr(0, pos);
-		s.erase(pos, pos + delimiter.length());
-	}
-
-	return s;
-}
-
-std::string StringHelper::Replace(std::string str, const std::string& from,
-                                            const std::string& to)
-{
-	size_t start_pos = str.find(from);
-
-	while (start_pos != std::string::npos)
-	{
-		str.replace(start_pos, from.length(), to);
-		start_pos = str.find(from);
-	}
-
-	return str;
-}
-
-void StringHelper::ReplaceOriginal(std::string& str, const std::string& from, const std::string& to)
-{
-	size_t start_pos = str.find(from);
-
-	while (start_pos != std::string::npos)
-	{
-		str.replace(start_pos, from.length(), to);
-		start_pos = str.find(from);
-	}
-}
-
-bool StringHelper::StartsWith(const std::string& s, const std::string& input)
-{
-#if __cplusplus >= 202002L
-	return s.starts_with(input.c_str());
-#else
-	return s.rfind(input, 0) == 0;
-#endif
-}
-
-bool StringHelper::Contains(const std::string& s, const std::string& input)
-{
-	return s.find(input) != std::string::npos;
-}
-
-bool StringHelper::EndsWith(const std::string& s, const std::string& input)
-{
-	size_t inputLen = strlen(input.c_str());
-	return s.rfind(input) == (s.size() - inputLen);
-}
-
-std::string StringHelper::Sprintf(const char* format, ...)
-{
-	char buffer[32768];
-	// char buffer[2048];
-	std::string output;
-	va_list va;
-
-	va_start(va, format);
-	vsprintf_s(buffer, format, va);
-	va_end(va);
-
-	output = buffer;
-	return output;
-}
-
-std::string StringHelper::Implode(std::vector<std::string>& elements,
-                                            const char* const separator)
-{
-	return "";
-
-	// return std::accumulate(std::begin(elements), std::end(elements), std::string(),
-	//[separator](std::string& ss, std::string& s) {
-	// return ss.empty() ? s : ss + separator + s;
-	//});
-}
-
-int64_t StringHelper::StrToL(const std::string& str, int32_t base)
-{
-	return std::strtoull(str.c_str(), nullptr, base);
-}
-
-std::string StringHelper::BoolStr(bool b)
-{
-	return b ? "true" : "false";
-}
-
-bool StringHelper::HasOnlyDigits(const std::string& str)
-{
-	return std::all_of(str.begin(), str.end(), ::isdigit);
-}
-
-bool StringHelper::IEquals(const std::string& a, const std::string& b)
-{
-	return std::equal(a.begin(), a.end(), b.begin(), b.end(),
-	                    [](char a, char b) { return tolower(a) == tolower(b); });
-}
diff --git a/ZAPDUtils/Utils/StringHelper.h b/ZAPDUtils/Utils/StringHelper.h
deleted file mode 100644
index b737a2f..0000000
--- a/ZAPDUtils/Utils/StringHelper.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include <algorithm>
-#include <cstdarg>
-#include <cstring>
-#include <numeric>
-#include <string>
-#include <vector>
-
-class StringHelper
-{
-public:
-	static std::vector<std::string> Split(std::string s, const std::string& delimiter);
-	static std::string Strip(std::string s, const std::string& delimiter);
-	static std::string Replace(std::string str, const std::string& from, const std::string& to);
-	static void ReplaceOriginal(std::string& str, const std::string& from, const std::string& to);
-	static bool StartsWith(const std::string& s, const std::string& input);
-	static bool Contains(const std::string& s, const std::string& input);
-	static bool EndsWith(const std::string& s, const std::string& input);
-	static std::string Sprintf(const char* format, ...);
-	static std::string Implode(std::vector<std::string>& elements, const char* const separator);
-	static int64_t StrToL(const std::string& str, int32_t base = 10);
-	static std::string BoolStr(bool b);
-	static bool HasOnlyDigits(const std::string& str);
-	static bool IEquals(const std::string& a, const std::string& b);
-};
-\ No newline at end of file
diff --git a/ZAPDUtils/Utils/vt.h b/ZAPDUtils/Utils/vt.h
deleted file mode 100644
index 23f4244..0000000
--- a/ZAPDUtils/Utils/vt.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef VT_H
-#define VT_H
-
-// clang-format off
-#define VT_COLOR_BLACK       0
-#define VT_COLOR_RED         1
-#define VT_COLOR_GREEN       2
-#define VT_COLOR_YELLOW      3
-#define VT_COLOR_BLUE        4
-#define VT_COLOR_PURPLE      5
-#define VT_COLOR_CYAN        6
-#define VT_COLOR_WHITE       7
-#define VT_COLOR_LIGHTGRAY   8
-#define VT_COLOR_DARKGRAY    9
-
-#define VT_COLOR_FOREGROUND  3
-#define VT_COLOR_BACKGROUND  4
-// clang-format on
-
-#define VT_COLOR_EXPAND0(type, color) #type #color
-#define VT_COLOR_EXPAND1(type, color) VT_COLOR_EXPAND0(type, color)
-#define VT_COLOR(type, color) VT_COLOR_EXPAND1(VT_COLOR_##type, VT_COLOR_##color)
-
-#define VT_ESC "\x1b"
-#define VT_CSI "["
-#define VT_CUP(x, y) VT_ESC VT_CSI y ";" x "H"
-#define VT_ED(n) VT_ESC VT_CSI #n "J"
-#define VT_SGR(n) VT_ESC VT_CSI n "m"
-
-// Add more macros if necessary
-#define VT_COL(back, fore) VT_SGR(VT_COLOR(BACKGROUND, back) ";" VT_COLOR(FOREGROUND, fore))
-#define VT_FGCOL(color) VT_SGR(VT_COLOR(FOREGROUND, color))
-#define VT_BGCOL(color) VT_SGR(VT_COLOR(BACKGROUND, color))
-
-// Bold
-#define VT_BOLD "1"
-
-// Bold color support
-#define VT_BOLD_FGCOL(color) VT_SGR(VT_BOLD ";" VT_COLOR(FOREGROUND, color))
-#define VT_BOLD_BGCOL(color) VT_SGR(VT_BOLD ";" VT_COLOR(BACKGROUND, color))
-
-#define VT_RST VT_SGR("")
-#define VT_CLS VT_ED(2)
-
-#endif
diff --git a/ZAPDUtils/Vec2f.h b/ZAPDUtils/Vec2f.h
deleted file mode 100644
index 73e9259..0000000
--- a/ZAPDUtils/Vec2f.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include <cstdint>
-
-struct Vec2f
-{
-	float x, y;
-
-	Vec2f()
-	{
-		x = 0;
-		y = 0;
-	};
-	Vec2f(float nX, float nY)
-	{
-		x = nX;
-		y = nY;
-	};
-};
-\ No newline at end of file
diff --git a/ZAPDUtils/Vec3f.h b/ZAPDUtils/Vec3f.h
deleted file mode 100644
index 844b152..0000000
--- a/ZAPDUtils/Vec3f.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-struct Vec3f
-{
-	float x, y, z;
-
-	Vec3f()
-	{
-		x = 0;
-		y = 0;
-		z = 0;
-	};
-	Vec3f(float nX, float nY, float nZ)
-	{
-		x = nX;
-		y = nY;
-		z = nZ;
-	};
-};
-\ No newline at end of file
diff --git a/ZAPDUtils/Vec3s.h b/ZAPDUtils/Vec3s.h
deleted file mode 100644
index 05816ed..0000000
--- a/ZAPDUtils/Vec3s.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include <cstdint>
-
-struct Vec3s
-{
-	int16_t x, y, z;
-
-	Vec3s()
-	{
-		x = 0;
-		y = 0;
-		z = 0;
-	};
-	Vec3s(int16_t nX, int16_t nY, int16_t nZ)
-	{
-		x = nX;
-		y = nY;
-		z = nZ;
-	};
-};
-\ No newline at end of file
diff --git a/ZAPDUtils/ZAPDUtils.vcxproj b/ZAPDUtils/ZAPDUtils.vcxproj
deleted file mode 100644
index 164f4bb..0000000
--- a/ZAPDUtils/ZAPDUtils.vcxproj
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectGuid>{a2e01c3e-d647-45d1-9788-043debc1a908}</ProjectGuid>
-    <RootNamespace>ZAPDUtils</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules />
-    <CodeAnalysisRuleAssemblies />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules />
-    <CodeAnalysisRuleAssemblies />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules />
-    <CodeAnalysisRuleAssemblies />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules />
-    <CodeAnalysisRuleAssemblies />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <LanguageStandard_C>Default</LanguageStandard_C>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="Color3b.h" />
-    <ClInclude Include="StrHash.h" />
-    <ClInclude Include="Utils\BinaryReader.h" />
-    <ClInclude Include="Utils\BinaryWriter.h" />
-    <ClInclude Include="Utils\BitConverter.h" />
-    <ClInclude Include="Utils\Directory.h" />
-    <ClInclude Include="Utils\File.h" />
-    <ClInclude Include="Utils\MemoryStream.h" />
-    <ClInclude Include="Utils\Path.h" />
-    <ClInclude Include="Utils\Stream.h" />
-    <ClInclude Include="Utils\StringHelper.h" />
-    <ClInclude Include="Vec2f.h" />
-    <ClInclude Include="Vec3f.h" />
-    <ClInclude Include="Vec3s.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\lib\tinyxml2\tinyxml2.cpp" />
-    <ClCompile Include="Utils\BinaryReader.cpp" />
-    <ClCompile Include="Utils\BinaryWriter.cpp" />
-    <ClCompile Include="Utils\MemoryStream.cpp" />
-    <ClCompile Include="Utils\StringHelper.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
-\ No newline at end of file
diff --git a/ZAPDUtils/ZAPDUtils.vcxproj.filters b/ZAPDUtils/ZAPDUtils.vcxproj.filters
deleted file mode 100644
index 3c46d19..0000000
--- a/ZAPDUtils/ZAPDUtils.vcxproj.filters
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="Header Files\Utils">
-      <UniqueIdentifier>{d8c2c1e7-b065-4b0f-86a2-46ab46eedc0b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Source Files\Utils">
-      <UniqueIdentifier>{e047919d-7186-49ca-b115-e48fbb5c8743}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Libraries">
-      <UniqueIdentifier>{3de9dd46-0dfd-4d48-9f20-9f24e5b80fe0}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Utils\BinaryWriter.h">
-      <Filter>Header Files\Utils</Filter>
-    </ClInclude>
-    <ClInclude Include="Utils\BitConverter.h">
-      <Filter>Header Files\Utils</Filter>
-    </ClInclude>
-    <ClInclude Include="Utils\Directory.h">
-      <Filter>Header Files\Utils</Filter>
-    </ClInclude>
-    <ClInclude Include="Utils\File.h">
-      <Filter>Header Files\Utils</Filter>
-    </ClInclude>
-    <ClInclude Include="Utils\MemoryStream.h">
-      <Filter>Header Files\Utils</Filter>
-    </ClInclude>
-    <ClInclude Include="Utils\Path.h">
-      <Filter>Header Files\Utils</Filter>
-    </ClInclude>
-    <ClInclude Include="Utils\Stream.h">
-      <Filter>Header Files\Utils</Filter>
-    </ClInclude>
-    <ClInclude Include="Utils\StringHelper.h">
-      <Filter>Header Files\Utils</Filter>
-    </ClInclude>
-    <ClInclude Include="Vec3s.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Utils\BinaryReader.h">
-      <Filter>Header Files\Utils</Filter>
-    </ClInclude>
-    <ClInclude Include="Color3b.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="StrHash.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Vec2f.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Vec3f.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Utils\BinaryWriter.cpp">
-      <Filter>Source Files\Utils</Filter>
-    </ClCompile>
-    <ClCompile Include="Utils\MemoryStream.cpp">
-      <Filter>Source Files\Utils</Filter>
-    </ClCompile>
-    <ClCompile Include="Utils\BinaryReader.cpp">
-      <Filter>Source Files\Utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib\tinyxml2\tinyxml2.cpp">
-      <Filter>Source Files\Libraries</Filter>
-    </ClCompile>
-    <ClCompile Include="Utils\StringHelper.cpp">
-      <Filter>Source Files\Utils</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
-\ No newline at end of file
author	briaguya <70942617+briaguya-ai@users.noreply.github.com>	2022-11-14 05:22:34 -0500
committer	GitHub <noreply@github.com>	2022-11-14 11:22:34 +0100
commit	477a616d481a651919ce2444e158e63f54e1ef8e (patch)
tree	a02c950ef2d74feb87874bf0a8daf7e21e561966
parent	fa5bfdf44a077374e83bf7ade42c4da264e9f658 (diff)