diff --git a/.gitignore b/.gitignore
index c7fefb6e..1fbf8160 100644
--- a/.gitignore
+++ b/.gitignore
@@ -359,3 +359,5 @@ MigrationBackup/
 *.vcxproj.filters
 *.sln
 *.csproj
+
+*.filters
diff --git a/SHADE_Application/SHADE_Application.vcxproj b/SHADE_Application/SHADE_Application.vcxproj
deleted file mode 100644
index 0a7457a0..00000000
--- a/SHADE_Application/SHADE_Application.vcxproj
+++ /dev/null
@@ -1,132 +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|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{BDC70008-29DE-FE9D-7255-8ABFDEAACF25}</ProjectGuid>
-    <IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>SHADE_Application</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\bin\Debug\</OutDir>
-    <IntDir>..\bin_int\Debug\SHADE_Application\</IntDir>
-    <TargetName>SHADE_Application</TargetName>
-    <TargetExt>.exe</TargetExt>
-    <IncludePath>..\Dependencies\spdlog\include;$(VULKAN_SDK)\include;..\Dependencies\VMA\include;$(VULKAN_SDK)\Source\SPIRV-Reflect;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\bin\Release\</OutDir>
-    <IntDir>..\bin_int\Release\SHADE_Application\</IntDir>
-    <TargetName>SHADE_Application</TargetName>
-    <TargetExt>.exe</TargetExt>
-    <IncludePath>..\Dependencies\spdlog\include;$(VULKAN_SDK)\include;..\Dependencies\VMA\include;$(VULKAN_SDK)\Source\SPIRV-Reflect;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>SBpch.h</PrecompiledHeaderFile>
-      <WarningLevel>Level4</WarningLevel>
-      <DisableSpecificWarnings>4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <PreprocessorDefinitions>NOMINMAX;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\SHADE_Engine\src;src;..\Dependencies\dotnet\include;..\Dependencies\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpp20</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\Dependencies\spdlog\lib;..\Dependencies\SDL\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>SBpch.h</PrecompiledHeaderFile>
-      <WarningLevel>Level4</WarningLevel>
-      <DisableSpecificWarnings>4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <PreprocessorDefinitions>NOMINMAX;_RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\SHADE_Engine\src;src;..\Dependencies\dotnet\include;..\Dependencies\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <Optimization>Full</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpp20</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\Dependencies\spdlog\lib;..\Dependencies\SDL\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="src\Application\SBApplication.h" />
-    <ClInclude Include="src\SBpch.h" />
-    <ClInclude Include="src\Scenes\SBTestScene.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\Application\SBApplication.cpp" />
-    <ClCompile Include="src\SBpch.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="src\Scenes\SBTestScene.cpp" />
-    <ClCompile Include="src\WinMain.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\SHADE_Engine\SHADE_Engine.vcxproj">
-      <Project>{3F92E998-2BF5-783D-D47A-B1F3C0BC44C0}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\SHADE_Managed\SHADE_Managed.vcxproj">
-      <Project>{16DB1400-829B-9036-4BD6-D9B3B755D512}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/SHADE_Engine/SHADE_Engine.vcxproj b/SHADE_Engine/SHADE_Engine.vcxproj
deleted file mode 100644
index 37ddf8f5..00000000
--- a/SHADE_Engine/SHADE_Engine.vcxproj
+++ /dev/null
@@ -1,349 +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|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{3F92E998-2BF5-783D-D47A-B1F3C0BC44C0}</ProjectGuid>
-    <IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>SHADE_Engine</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\bin\Debug\</OutDir>
-    <IntDir>..\bin_int\Debug\SHADE_Engine\</IntDir>
-    <TargetName>SHADE_Engine</TargetName>
-    <TargetExt>.dll</TargetExt>
-    <IncludePath>..\Dependencies\assimp\include;..\Dependencies\imgui;..\Dependencies\imguizmo;..\Dependencies\imnodes;..\Dependencies\msdf;..\Dependencies\msdf\msdfgen;..\Dependencies\spdlog\include;..\Dependencies\tracy;..\Dependencies\VMA\include;..\Dependencies\yamlcpp\include;..\Dependencies\SDL\include;..\Dependencies\RTTR\include;..\Dependencies\reactphysics3d\include;$(VULKAN_SDK)\include;$(VULKAN_SDK)\Source\SPIRV-Reflect;..\Dependencies\dotnet\include;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\bin\Release\</OutDir>
-    <IntDir>..\bin_int\Release\SHADE_Engine\</IntDir>
-    <TargetName>SHADE_Engine</TargetName>
-    <TargetExt>.dll</TargetExt>
-    <IncludePath>..\Dependencies\assimp\include;..\Dependencies\imgui;..\Dependencies\imguizmo;..\Dependencies\imnodes;..\Dependencies\msdf;..\Dependencies\msdf\msdfgen;..\Dependencies\spdlog\include;..\Dependencies\tracy;..\Dependencies\VMA\include;..\Dependencies\yamlcpp\include;..\Dependencies\SDL\include;..\Dependencies\RTTR\include;..\Dependencies\reactphysics3d\include;$(VULKAN_SDK)\include;$(VULKAN_SDK)\Source\SPIRV-Reflect;..\Dependencies\dotnet\include;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>SHpch.h</PrecompiledHeaderFile>
-      <WarningLevel>Level4</WarningLevel>
-      <DisableSpecificWarnings>4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <PreprocessorDefinitions>_LIB;_GLFW_INCLUDE_NONE;MSDFGEN_USE_CPP11;NOMINMAX;SH_API_EXPORT;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpp20</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>vulkan-1.lib;SDL2.lib;SDL2main.lib;shaderc_shared.lib;shlwapi.lib;assimp-vc142-mtd.lib;librttr_core_d.lib;spdlogd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>libs;$(VULKAN_SDK)\Lib;..\Dependencies\assimp\lib\Debug;..\Dependencies\assimp\lib\Release;..\Dependencies\RTTR\lib;..\Dependencies\SDL\lib;..\Dependencies\spdlog\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ImportLibrary>..\bin\Debug\SHADE_Engine.lib</ImportLibrary>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy  /s /r /y /q "$(SolutionDir)/Dependencies/spdlog/bin" "$(OutDir)"
-xcopy  /r /y /q "$(SolutionDir)/Dependencies/SDL/lib/SDL2.dll" "$(OutDir)"
-xcopy  /s /r /y /q "$(SolutionDir)/Dependencies/dotnet/bin" "$(OutDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>SHpch.h</PrecompiledHeaderFile>
-      <WarningLevel>Level4</WarningLevel>
-      <DisableSpecificWarnings>4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <PreprocessorDefinitions>_LIB;_GLFW_INCLUDE_NONE;MSDFGEN_USE_CPP11;NOMINMAX;SH_API_EXPORT;_RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <Optimization>Full</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpp20</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>vulkan-1.lib;SDL2.lib;SDL2main.lib;shaderc_shared.lib;shlwapi.lib;assimp-vc142-mt.lib;librttr_core.lib;spdlog.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>libs;$(VULKAN_SDK)\Lib;..\Dependencies\assimp\lib\Debug;..\Dependencies\assimp\lib\Release;..\Dependencies\RTTR\lib;..\Dependencies\SDL\lib;..\Dependencies\spdlog\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ImportLibrary>..\bin\Release\SHADE_Engine.lib</ImportLibrary>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy  /s /r /y /q "$(SolutionDir)/Dependencies/spdlog/bin" "$(OutDir)"
-xcopy  /r /y /q "$(SolutionDir)/Dependencies/SDL/lib/SDL2.dll" "$(OutDir)"
-xcopy  /s /r /y /q "$(SolutionDir)/Dependencies/dotnet/bin" "$(OutDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="src\Common\SHCommonTypes.h" />
-    <ClInclude Include="src\ECS_Base\Components\SHComponent.h" />
-    <ClInclude Include="src\ECS_Base\Components\SHComponentGroup.h" />
-    <ClInclude Include="src\ECS_Base\Entity\SHEntity.h" />
-    <ClInclude Include="src\ECS_Base\Events\SHEntityCreationEvent.h" />
-    <ClInclude Include="src\ECS_Base\Events\SHEntityDestroyedEvent.h" />
-    <ClInclude Include="src\ECS_Base\General\SHFamily.h" />
-    <ClInclude Include="src\ECS_Base\General\SHHandleGenerator.h" />
-    <ClInclude Include="src\ECS_Base\General\SHSparseBase.h" />
-    <ClInclude Include="src\ECS_Base\General\SHSparseSet.h" />
-    <ClInclude Include="src\ECS_Base\General\SHSparseSetContainer.h" />
-    <ClInclude Include="src\ECS_Base\Managers\SHComponentManager.h" />
-    <ClInclude Include="src\ECS_Base\Managers\SHEntityManager.h" />
-    <ClInclude Include="src\ECS_Base\Managers\SHSystemManager.h" />
-    <ClInclude Include="src\ECS_Base\SHECSMacros.h" />
-    <ClInclude Include="src\ECS_Base\System\SHFixedSystemRoutine.h" />
-    <ClInclude Include="src\ECS_Base\System\SHRoutineStats.h" />
-    <ClInclude Include="src\ECS_Base\System\SHSystem.h" />
-    <ClInclude Include="src\ECS_Base\System\SHSystemRoutine.h" />
-    <ClInclude Include="src\ECS_Base\UnitTesting\SHECSUnitTest.h" />
-    <ClInclude Include="src\ECS_Base\UnitTesting\SHTestComponents.h" />
-    <ClInclude Include="src\ECS_Base\UnitTesting\SHTestSystems.h" />
-    <ClInclude Include="src\Engine\SHEngine.h" />
-    <ClInclude Include="src\Events\SHEvent.h" />
-    <ClInclude Include="src\Events\SHEventDefines.h" />
-    <ClInclude Include="src\Events\SHEventManager.hpp" />
-    <ClInclude Include="src\Events\SHEventReceiver.h" />
-    <ClInclude Include="src\FRC\SHFramerateController.h" />
-    <ClInclude Include="src\Filesystem\SHFileSystem.h" />
-    <ClInclude Include="src\Graphics\Buffers\SHVkBuffer.h" />
-    <ClInclude Include="src\Graphics\Commands\SHCommandPoolResetMode.h" />
-    <ClInclude Include="src\Graphics\Commands\SHVkCommandBuffer.h" />
-    <ClInclude Include="src\Graphics\Commands\SHVkCommandPool.h" />
-    <ClInclude Include="src\Graphics\Debugging\SHValidationLayersQuery.h" />
-    <ClInclude Include="src\Graphics\Debugging\SHVkDebugMessenger.h" />
-    <ClInclude Include="src\Graphics\Debugging\SHVulkanDebugUtil.h" />
-    <ClInclude Include="src\Graphics\Descriptors\SHDescriptorPoolManager.h" />
-    <ClInclude Include="src\Graphics\Descriptors\SHDescriptorPoolStorage.h" />
-    <ClInclude Include="src\Graphics\Descriptors\SHDescriptorSetUpdater.h" />
-    <ClInclude Include="src\Graphics\Descriptors\SHVkDescriptorPool.h" />
-    <ClInclude Include="src\Graphics\Descriptors\SHVkDescriptorSetGroup.h" />
-    <ClInclude Include="src\Graphics\Descriptors\SHVkDescriptorSetLayout.h" />
-    <ClInclude Include="src\Graphics\Devices\SHVkLogicalDevice.h" />
-    <ClInclude Include="src\Graphics\Devices\SHVkPhysicalDevice.h" />
-    <ClInclude Include="src\Graphics\Devices\SHVkPhysicalDeviceLibrary.h" />
-    <ClInclude Include="src\Graphics\Framebuffer\SHVkFramebuffer.h" />
-    <ClInclude Include="src\Graphics\Images\SHImageViewDetails.h" />
-    <ClInclude Include="src\Graphics\Images\SHVkImage.h" />
-    <ClInclude Include="src\Graphics\Images\SHVkImageView.h" />
-    <ClInclude Include="src\Graphics\Images\SHVkSampler.h" />
-    <ClInclude Include="src\Graphics\Instance\SHVkInstance.h" />
-    <ClInclude Include="src\Graphics\MiddleEnd\Interface\SHGraphicsSystem.h" />
-    <ClInclude Include="src\Graphics\MiddleEnd\Interface\SHRenderTarget.h" />
-    <ClInclude Include="src\Graphics\MiddleEnd\PerFrame\SHPerFrameData.h" />
-    <ClInclude Include="src\Graphics\MiddleEnd\PerFrame\SHRenderContext.h" />
-    <ClInclude Include="src\Graphics\MiddleEnd\Shaders\SHShaderModuleLibrary.h" />
-    <ClInclude Include="src\Graphics\MiddleEnd\Shaders\SHShaderSourceLibrary.h" />
-    <ClInclude Include="src\Graphics\MiddleEnd\Shaders\SHShaderType.h" />
-    <ClInclude Include="src\Graphics\Pipeline\SHPipelineLayoutParams.h" />
-    <ClInclude Include="src\Graphics\Pipeline\SHPipelineState.h" />
-    <ClInclude Include="src\Graphics\Pipeline\SHPipelineType.h" />
-    <ClInclude Include="src\Graphics\Pipeline\SHPushConstantInterface.h" />
-    <ClInclude Include="src\Graphics\Pipeline\SHVkPipeline.h" />
-    <ClInclude Include="src\Graphics\Pipeline\SHVkPipelineLayout.h" />
-    <ClInclude Include="src\Graphics\Queues\SHVkQueue.h" />
-    <ClInclude Include="src\Graphics\RenderGraph\SHRenderGraph.h" />
-    <ClInclude Include="src\Graphics\Renderpass\SHVkAttachDescGen.h" />
-    <ClInclude Include="src\Graphics\Renderpass\SHVkAttachment.h" />
-    <ClInclude Include="src\Graphics\Renderpass\SHVkRenderpass.h" />
-    <ClInclude Include="src\Graphics\Renderpass\SHVkSubpassDescription.h" />
-    <ClInclude Include="src\Graphics\Renderpass\SHVkSubpassParams.h" />
-    <ClInclude Include="src\Graphics\SHVkUtil.h" />
-    <ClInclude Include="src\Graphics\SHVulkanDefines.h" />
-    <ClInclude Include="src\Graphics\SHVulkanIncludes.h" />
-    <ClInclude Include="src\Graphics\Shaders\BlockInterface\SHShaderBlockInterface.h" />
-    <ClInclude Include="src\Graphics\Shaders\SHShaderReflected.h" />
-    <ClInclude Include="src\Graphics\Shaders\SHVkShaderModule.h" />
-    <ClInclude Include="src\Graphics\Shaders\spirv-reflect\spirv_reflect.h" />
-    <ClInclude Include="src\Graphics\Swapchain\SHSwapchainParams.h" />
-    <ClInclude Include="src\Graphics\Swapchain\SHVkSwapchain.h" />
-    <ClInclude Include="src\Graphics\Synchronization\SHVkFence.h" />
-    <ClInclude Include="src\Graphics\Synchronization\SHVkSemaphore.h" />
-    <ClInclude Include="src\Graphics\VertexDescriptors\SHVertexAttribute.h" />
-    <ClInclude Include="src\Graphics\Windowing\SHWindow.h" />
-    <ClInclude Include="src\Graphics\Windowing\SHWindowMap.h" />
-    <ClInclude Include="src\Graphics\Windowing\Surface\SHVkSurface.h" />
-    <ClInclude Include="src\Math\Geometry\SHBoundingBox.h" />
-    <ClInclude Include="src\Math\Geometry\SHShape.h" />
-    <ClInclude Include="src\Math\SHMath.h" />
-    <ClInclude Include="src\Math\SHMathHelpers.h" />
-    <ClInclude Include="src\Math\SHMathHelpers.hpp" />
-    <ClInclude Include="src\Math\SHMatrix.h" />
-    <ClInclude Include="src\Math\SHQuaternion.h" />
-    <ClInclude Include="src\Math\Transform\SHTransform.h" />
-    <ClInclude Include="src\Math\Transform\SHTransformComponent.h" />
-    <ClInclude Include="src\Math\Transform\SHTransformSystem.h" />
-    <ClInclude Include="src\Math\Vector\SHVec2.h" />
-    <ClInclude Include="src\Math\Vector\SHVec3.h" />
-    <ClInclude Include="src\Math\Vector\SHVec4.h" />
-    <ClInclude Include="src\Meta\SHIsDetected.h" />
-    <ClInclude Include="src\Resource\Handle.h" />
-    <ClInclude Include="src\Resource\Handle.hpp" />
-    <ClInclude Include="src\Resource\ResourceLibrary.h" />
-    <ClInclude Include="src\Resource\ResourceLibrary.hpp" />
-    <ClInclude Include="src\Resource\SparseSet.h" />
-    <ClInclude Include="src\Resource\SparseSet.hpp" />
-    <ClInclude Include="src\SHCommonTypes.h" />
-    <ClInclude Include="src\SH_API.h" />
-    <ClInclude Include="src\SHpch.h" />
-    <ClInclude Include="src\Scene\SHScene.h" />
-    <ClInclude Include="src\Scene\SHSceneGraph.h" />
-    <ClInclude Include="src\Scene\SHSceneManager.h" />
-    <ClInclude Include="src\Scripting\SHDotNetRuntime.h" />
-    <ClInclude Include="src\Scripting\SHDotNetRuntime.hpp" />
-    <ClInclude Include="src\Scripting\SHScriptEngine.h" />
-    <ClInclude Include="src\Tools\SHException.h" />
-    <ClInclude Include="src\Tools\SHExceptionHandler.h" />
-    <ClInclude Include="src\Tools\SHFileUtilties.h" />
-    <ClInclude Include="src\Tools\SHLogger.h" />
-    <ClInclude Include="src\Tools\SHStringUtils.h" />
-    <ClInclude Include="src\Tools\SHStringUtils.hpp" />
-    <ClInclude Include="src\Tools\SHUtilities.h" />
-    <ClInclude Include="src\Tools\SHUtilities.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\ECS_Base\Components\SHComponent.cpp" />
-    <ClCompile Include="src\ECS_Base\Components\SHComponentGroup.cpp" />
-    <ClCompile Include="src\ECS_Base\Entity\SHEntity.cpp" />
-    <ClCompile Include="src\ECS_Base\Managers\SHComponentManager.cpp" />
-    <ClCompile Include="src\ECS_Base\Managers\SHEntityManager.cpp" />
-    <ClCompile Include="src\ECS_Base\Managers\SHSystemManager.cpp" />
-    <ClCompile Include="src\ECS_Base\System\SHFixedSystemRoutine.cpp" />
-    <ClCompile Include="src\ECS_Base\System\SHSystemRoutine.cpp" />
-    <ClCompile Include="src\ECS_Base\UnitTesting\SHECSUnitTest.cpp" />
-    <ClCompile Include="src\Engine\SHEngine.cpp" />
-    <ClCompile Include="src\FRC\SHFramerateController.cpp" />
-    <ClCompile Include="src\Filesystem\SHFileSystem.cpp" />
-    <ClCompile Include="src\Graphics\Buffers\SHVkBuffer.cpp" />
-    <ClCompile Include="src\Graphics\Commands\SHVkCommandBuffer.cpp" />
-    <ClCompile Include="src\Graphics\Commands\SHVkCommandPool.cpp" />
-    <ClCompile Include="src\Graphics\Debugging\SHValidationLayersQuery.cpp" />
-    <ClCompile Include="src\Graphics\Debugging\SHVkDebugMessenger.cpp" />
-    <ClCompile Include="src\Graphics\Debugging\SHVulkanDebugUtil.cpp" />
-    <ClCompile Include="src\Graphics\Descriptors\SHDescriptorPoolManager.cpp" />
-    <ClCompile Include="src\Graphics\Descriptors\SHDescriptorPoolStorage.cpp" />
-    <ClCompile Include="src\Graphics\Descriptors\SHDescriptorSetUpdater.cpp" />
-    <ClCompile Include="src\Graphics\Descriptors\SHVkDescriptorPool.cpp" />
-    <ClCompile Include="src\Graphics\Descriptors\SHVkDescriptorSetGroup.cpp" />
-    <ClCompile Include="src\Graphics\Descriptors\SHVkDescriptorSetLayout.cpp" />
-    <ClCompile Include="src\Graphics\Devices\SHVkLogicalDevice.cpp" />
-    <ClCompile Include="src\Graphics\Devices\SHVkPhysicalDevice.cpp" />
-    <ClCompile Include="src\Graphics\Devices\SHVkPhysicalDeviceLibrary.cpp" />
-    <ClCompile Include="src\Graphics\Framebuffer\SHVkFramebuffer.cpp" />
-    <ClCompile Include="src\Graphics\Images\SHVkImage.cpp" />
-    <ClCompile Include="src\Graphics\Images\SHVkImageView.cpp" />
-    <ClCompile Include="src\Graphics\Images\SHVkSampler.cpp" />
-    <ClCompile Include="src\Graphics\Instance\SHVkInstance.cpp" />
-    <ClCompile Include="src\Graphics\MiddleEnd\Interface\SHGraphicsSystem.cpp" />
-    <ClCompile Include="src\Graphics\MiddleEnd\Interface\SHRenderTarget.cpp" />
-    <ClCompile Include="src\Graphics\MiddleEnd\PerFrame\SHPerFrameData.cpp" />
-    <ClCompile Include="src\Graphics\MiddleEnd\PerFrame\SHRenderContext.cpp" />
-    <ClCompile Include="src\Graphics\MiddleEnd\Shaders\SHShaderModuleLibrary.cpp" />
-    <ClCompile Include="src\Graphics\MiddleEnd\Shaders\SHShaderSourceLibrary.cpp" />
-    <ClCompile Include="src\Graphics\Pipeline\SHPipelineState.cpp" />
-    <ClCompile Include="src\Graphics\Pipeline\SHPushConstantInterface.cpp" />
-    <ClCompile Include="src\Graphics\Pipeline\SHVkPipeline.cpp" />
-    <ClCompile Include="src\Graphics\Pipeline\SHVkPipelineLayout.cpp" />
-    <ClCompile Include="src\Graphics\Queues\SHVkQueue.cpp" />
-    <ClCompile Include="src\Graphics\RenderGraph\SHRenderGraph.cpp" />
-    <ClCompile Include="src\Graphics\Renderpass\SHVkAttachDescGen.cpp" />
-    <ClCompile Include="src\Graphics\Renderpass\SHVkRenderpass.cpp" />
-    <ClCompile Include="src\Graphics\Renderpass\SHVkSubpassParams.cpp" />
-    <ClCompile Include="src\Graphics\SHVkUtil.cpp" />
-    <ClCompile Include="src\Graphics\SHVulkanIncludes.cpp" />
-    <ClCompile Include="src\Graphics\Shaders\BlockInterface\SHShaderBlockInterface.cpp" />
-    <ClCompile Include="src\Graphics\Shaders\SHShaderReflected.cpp" />
-    <ClCompile Include="src\Graphics\Shaders\SHVkShaderModule.cpp" />
-    <ClCompile Include="src\Graphics\Shaders\spirv-reflect\spirv_reflect.cpp" />
-    <ClCompile Include="src\Graphics\Swapchain\SHVkSwapchain.cpp" />
-    <ClCompile Include="src\Graphics\Synchronization\SHVkFence.cpp" />
-    <ClCompile Include="src\Graphics\Synchronization\SHVkSemaphore.cpp" />
-    <ClCompile Include="src\Graphics\VertexDescriptors\SHVertexAttribute.cpp" />
-    <ClCompile Include="src\Graphics\Windowing\SHWIndowMap.cpp" />
-    <ClCompile Include="src\Graphics\Windowing\SHWindow.cpp" />
-    <ClCompile Include="src\Graphics\Windowing\Surface\SHVkSurface.cpp" />
-    <ClCompile Include="src\Math\Geometry\SHBoundingBox.cpp" />
-    <ClCompile Include="src\Math\Geometry\SHShape.cpp" />
-    <ClCompile Include="src\Math\SHMathHelpers.cpp" />
-    <ClCompile Include="src\Math\SHMatrix.cpp" />
-    <ClCompile Include="src\Math\SHQuaternion.cpp" />
-    <ClCompile Include="src\Math\Transform\SHTransform.cpp" />
-    <ClCompile Include="src\Math\Transform\SHTransformComponent.cpp" />
-    <ClCompile Include="src\Math\Transform\SHTransformSystem.cpp" />
-    <ClCompile Include="src\Math\Vector\SHVec2.cpp" />
-    <ClCompile Include="src\Math\Vector\SHVec3.cpp" />
-    <ClCompile Include="src\Math\Vector\SHVec4.cpp" />
-    <ClCompile Include="src\Resource\ResourceLibrary.cpp" />
-    <ClCompile Include="src\SHpch.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="src\Scene\SHSceneGraph.cpp" />
-    <ClCompile Include="src\Scene\SHSceneManager.cpp" />
-    <ClCompile Include="src\Scripting\SHDotNetRuntime.cpp" />
-    <ClCompile Include="src\Scripting\SHScriptEngine.cpp" />
-    <ClCompile Include="src\Tools\SHException.cpp" />
-    <ClCompile Include="src\Tools\SHExceptionHandler.cpp" />
-    <ClCompile Include="src\Tools\SHFileUtilties.cpp" />
-    <ClCompile Include="src\Tools\SHLogger.cpp" />
-    <ClCompile Include="src\Tools\SHStringUtils.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Dependencies\yamlcpp\yaml-cpp.vcxproj">
-      <Project>{88F1A057-74BE-FB62-9DD7-E90A890331F1}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\Dependencies\msdf\msdfgen\msdfgen.vcxproj">
-      <Project>{8900D8DD-F5DF-5679-FEF7-E14F6A56BDDA}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\Dependencies\msdf\msdf-atlas-gen.vcxproj">
-      <Project>{38BD587B-248B-4C81-0D1F-BDA7F98B28E6}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\Dependencies\reactphysics3d\reactphysics3d.vcxproj">
-      <Project>{2ECAB41A-1A98-A820-032C-1947EF988485}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\Dependencies\imgui\ImGui.vcxproj">
-      <Project>{C0FF640D-2C14-8DBE-F595-301E616989EF}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/SHADE_Engine/SHADE_Engine.vcxproj.filters b/SHADE_Engine/SHADE_Engine.vcxproj.filters
deleted file mode 100644
index f52aebb0..00000000
--- a/SHADE_Engine/SHADE_Engine.vcxproj.filters
+++ /dev/null
@@ -1,746 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Common">
-      <UniqueIdentifier>{8EEA3EAC-7A8C-6982-6347-7DD64F88F0D2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ECS_Base">
-      <UniqueIdentifier>{1AB26817-067F-C322-2F98-B1CA1BC4F8B0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ECS_Base\Components">
-      <UniqueIdentifier>{EFD23933-5B34-1741-E4A1-5DF350024E00}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ECS_Base\Entity">
-      <UniqueIdentifier>{261D0942-92A8-7606-9BB9-F9FA07C4D206}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ECS_Base\Events">
-      <UniqueIdentifier>{BEBC9142-2A48-FF06-3359-82FB9F635B07}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ECS_Base\General">
-      <UniqueIdentifier>{07FEB307-F3F6-D259-1C29-B8DE0881B265}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ECS_Base\Managers">
-      <UniqueIdentifier>{37718753-A387-85E9-ECFE-100B58545671}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ECS_Base\System">
-      <UniqueIdentifier>{EE037863-5A8F-E527-63A0-681CCFAA4128}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ECS_Base\UnitTesting">
-      <UniqueIdentifier>{078AA1A3-F318-2B6D-9C37-3F6888A53B13}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Engine">
-      <UniqueIdentifier>{DBC7D3B0-C769-FE86-B024-12DB9C6585D7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Events">
-      <UniqueIdentifier>{3A8963B1-262B-8E87-0FE6-A1DBFB2615D8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="FRC">
-      <UniqueIdentifier>{80E7870B-ECF0-877C-756C-9E7CE174937C}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Filesystem">
-      <UniqueIdentifier>{8A8E2B37-7646-6D84-DF4D-46E0CB240875}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Graphics">
-      <UniqueIdentifier>{1653CE33-0220-293F-2B39-17E717655ECD}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Graphics\Buffers">
-      <UniqueIdentifier>{92C817CE-7EC1-3620-A7F3-1BA5934B162C}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Graphics\Commands">
-      <UniqueIdentifier>{17C745C0-83DD-4356-CC54-CF7738AA14DE}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Graphics\Debugging">
-      <UniqueIdentifier>{51443AC7-3D28-FB1C-A688-F56F928BE59E}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Graphics\Descriptors">
-      <UniqueIdentifier>{573A6CF2-43C9-F5BB-ECE7-09B7D8550662}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Graphics\Devices">
-      <UniqueIdentifier>{08DBDC43-F4D3-FB95-1D06-E11A095EDBA1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Graphics\Framebuffer">
-      <UniqueIdentifier>{4AD5CA42-3664-540C-DF82-6807CBF064B2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Graphics\Images">
-      <UniqueIdentifier>{FB5EE099-67EA-4D5E-70FB-D052DC05AA5E}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Graphics\Instance">
-      <UniqueIdentifier>{BA26540B-263D-52A1-6FB4-DDC2DB092329}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Graphics\MiddleEnd">
-      <UniqueIdentifier>{4B204703-3704-0859-A064-02AC8C67F2DA}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Graphics\MiddleEnd\Interface">
-      <UniqueIdentifier>{EBA1D3FF-D75C-C3AB-8014-3CF66CAE0D3C}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Graphics\MiddleEnd\PerFrame">
-      <UniqueIdentifier>{8CDBA7C9-F8E8-D5AF-81CF-D19AEDDBA166}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Graphics\MiddleEnd\Shaders">
-      <UniqueIdentifier>{2460C057-1070-6C28-7929-D14665585BC1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Graphics\Pipeline">
-      <UniqueIdentifier>{FBD334F8-67EA-328E-B061-BEAF1CB70316}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Graphics\Queues">
-      <UniqueIdentifier>{1DD51CAD-8960-8A71-9271-0D66FE7BE671}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Graphics\RenderGraph">
-      <UniqueIdentifier>{57DAB30C-4369-3DD6-EC87-51D1D8F54D7C}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Graphics\Renderpass">
-      <UniqueIdentifier>{9C0DAFD9-086F-8CE7-91DC-D299FD3CC3A6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Graphics\Shaders">
-      <UniqueIdentifier>{EF2D07CC-DB26-261E-0459-0BA3F0B0052A}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Graphics\Shaders\BlockInterface">
-      <UniqueIdentifier>{3AEF06DD-A6D2-151D-AFD5-43591B38DC6D}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Graphics\Shaders\spirv-reflect">
-      <UniqueIdentifier>{245F5AB0-1085-2417-F9CA-A9E2E58F49E3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Graphics\Swapchain">
-      <UniqueIdentifier>{03DB39DE-EFBE-FA33-581F-F5864422E5B5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Graphics\Synchronization">
-      <UniqueIdentifier>{576DF841-4392-47C2-6CDD-2C52586146E0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Graphics\VertexDescriptors">
-      <UniqueIdentifier>{75F29FE5-6102-4CB6-CABB-B0D4B6EA3A4F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Graphics\Windowing">
-      <UniqueIdentifier>{5BAB2A92-478F-EBE7-B0EF-E53A9CF2D569}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Graphics\Windowing\Surface">
-      <UniqueIdentifier>{B3B14D12-9FC1-F9E2-087B-5E01F4A9E87B}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Math">
-      <UniqueIdentifier>{AFF4887C-9B2B-8A0D-4418-7010302E060F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Math\Geometry">
-      <UniqueIdentifier>{EAD6C33D-5697-3F74-1FD2-88F18B518450}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Math\Vector">
-      <UniqueIdentifier>{F1B75745-5D6D-D03A-E661-CA115216C73E}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Meta">
-      <UniqueIdentifier>{AC05897C-983C-8A0D-4129-70102D3F060F}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource">
-      <UniqueIdentifier>{ED6CDF9B-D939-3AA7-0253-284FEE7E6F35}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Scene">
-      <UniqueIdentifier>{B3F7140E-1F0C-3DBF-E88D-E01E546139F0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Scripting">
-      <UniqueIdentifier>{985A7358-04C5-27CF-4D03-D974B9AC0524}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Tools">
-      <UniqueIdentifier>{16CF2D0E-82E3-55BF-4B65-F91EB73852F0}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\Common\SHCommonTypes.h">
-      <Filter>Common</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ECS_Base\Components\SHComponent.h">
-      <Filter>ECS_Base\Components</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ECS_Base\Components\SHComponentGroup.h">
-      <Filter>ECS_Base\Components</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ECS_Base\Entity\SHEntity.h">
-      <Filter>ECS_Base\Entity</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ECS_Base\Events\SHEntityCreationEvent.h">
-      <Filter>ECS_Base\Events</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ECS_Base\Events\SHEntityDestroyedEvent.h">
-      <Filter>ECS_Base\Events</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ECS_Base\General\SHFamily.h">
-      <Filter>ECS_Base\General</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ECS_Base\General\SHHandleGenerator.h">
-      <Filter>ECS_Base\General</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ECS_Base\General\SHSparseBase.h">
-      <Filter>ECS_Base\General</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ECS_Base\General\SHSparseSet.h">
-      <Filter>ECS_Base\General</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ECS_Base\General\SHSparseSetContainer.h">
-      <Filter>ECS_Base\General</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ECS_Base\Managers\SHComponentManager.h">
-      <Filter>ECS_Base\Managers</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ECS_Base\Managers\SHEntityManager.h">
-      <Filter>ECS_Base\Managers</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ECS_Base\Managers\SHSystemManager.h">
-      <Filter>ECS_Base\Managers</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ECS_Base\SHECSMacros.h">
-      <Filter>ECS_Base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ECS_Base\System\SHFixedSystemRoutine.h">
-      <Filter>ECS_Base\System</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ECS_Base\System\SHRoutineStats.h">
-      <Filter>ECS_Base\System</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ECS_Base\System\SHSystem.h">
-      <Filter>ECS_Base\System</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ECS_Base\System\SHSystemRoutine.h">
-      <Filter>ECS_Base\System</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ECS_Base\UnitTesting\SHECSUnitTest.h">
-      <Filter>ECS_Base\UnitTesting</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ECS_Base\UnitTesting\SHTestComponents.h">
-      <Filter>ECS_Base\UnitTesting</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ECS_Base\UnitTesting\SHTestSystems.h">
-      <Filter>ECS_Base\UnitTesting</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Engine\SHEngine.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Events\SHEvent.h">
-      <Filter>Events</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Events\SHEventDefines.h">
-      <Filter>Events</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Events\SHEventManager.hpp">
-      <Filter>Events</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Events\SHEventReceiver.h">
-      <Filter>Events</Filter>
-    </ClInclude>
-    <ClInclude Include="src\FRC\SHFramerateController.h">
-      <Filter>FRC</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Filesystem\SHFileSystem.h">
-      <Filter>Filesystem</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Buffers\SHVkBuffer.h">
-      <Filter>Graphics\Buffers</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Commands\SHCommandPoolResetMode.h">
-      <Filter>Graphics\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Commands\SHVkCommandBuffer.h">
-      <Filter>Graphics\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Commands\SHVkCommandPool.h">
-      <Filter>Graphics\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Debugging\SHValidationLayersQuery.h">
-      <Filter>Graphics\Debugging</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Debugging\SHVkDebugMessenger.h">
-      <Filter>Graphics\Debugging</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Debugging\SHVulkanDebugUtil.h">
-      <Filter>Graphics\Debugging</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Descriptors\SHDescriptorPoolManager.h">
-      <Filter>Graphics\Descriptors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Descriptors\SHDescriptorPoolStorage.h">
-      <Filter>Graphics\Descriptors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Descriptors\SHDescriptorSetUpdater.h">
-      <Filter>Graphics\Descriptors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Descriptors\SHVkDescriptorPool.h">
-      <Filter>Graphics\Descriptors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Descriptors\SHVkDescriptorSetGroup.h">
-      <Filter>Graphics\Descriptors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Descriptors\SHVkDescriptorSetLayout.h">
-      <Filter>Graphics\Descriptors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Devices\SHVkLogicalDevice.h">
-      <Filter>Graphics\Devices</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Devices\SHVkPhysicalDevice.h">
-      <Filter>Graphics\Devices</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Devices\SHVkPhysicalDeviceLibrary.h">
-      <Filter>Graphics\Devices</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Framebuffer\SHVkFramebuffer.h">
-      <Filter>Graphics\Framebuffer</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Images\SHImageViewDetails.h">
-      <Filter>Graphics\Images</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Images\SHVkImage.h">
-      <Filter>Graphics\Images</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Images\SHVkImageView.h">
-      <Filter>Graphics\Images</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Images\SHVkSampler.h">
-      <Filter>Graphics\Images</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Instance\SHVkInstance.h">
-      <Filter>Graphics\Instance</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\MiddleEnd\Interface\SHGraphicsSystem.h">
-      <Filter>Graphics\MiddleEnd\Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\MiddleEnd\Interface\SHRenderTarget.h">
-      <Filter>Graphics\MiddleEnd\Interface</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\MiddleEnd\PerFrame\SHPerFrameData.h">
-      <Filter>Graphics\MiddleEnd\PerFrame</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\MiddleEnd\PerFrame\SHRenderContext.h">
-      <Filter>Graphics\MiddleEnd\PerFrame</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\MiddleEnd\Shaders\SHShaderModuleLibrary.h">
-      <Filter>Graphics\MiddleEnd\Shaders</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\MiddleEnd\Shaders\SHShaderSourceLibrary.h">
-      <Filter>Graphics\MiddleEnd\Shaders</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\MiddleEnd\Shaders\SHShaderType.h">
-      <Filter>Graphics\MiddleEnd\Shaders</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Pipeline\SHPipelineLayoutParams.h">
-      <Filter>Graphics\Pipeline</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Pipeline\SHPipelineState.h">
-      <Filter>Graphics\Pipeline</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Pipeline\SHPipelineType.h">
-      <Filter>Graphics\Pipeline</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Pipeline\SHPushConstantInterface.h">
-      <Filter>Graphics\Pipeline</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Pipeline\SHVkPipeline.h">
-      <Filter>Graphics\Pipeline</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Pipeline\SHVkPipelineLayout.h">
-      <Filter>Graphics\Pipeline</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Queues\SHVkQueue.h">
-      <Filter>Graphics\Queues</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\RenderGraph\SHRenderGraph.h">
-      <Filter>Graphics\RenderGraph</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Renderpass\SHVkAttachDescGen.h">
-      <Filter>Graphics\Renderpass</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Renderpass\SHVkAttachment.h">
-      <Filter>Graphics\Renderpass</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Renderpass\SHVkRenderpass.h">
-      <Filter>Graphics\Renderpass</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Renderpass\SHVkSubpassDescription.h">
-      <Filter>Graphics\Renderpass</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Renderpass\SHVkSubpassParams.h">
-      <Filter>Graphics\Renderpass</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\SHVkUtil.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\SHVulkanDefines.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\SHVulkanIncludes.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Shaders\BlockInterface\SHShaderBlockInterface.h">
-      <Filter>Graphics\Shaders\BlockInterface</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Shaders\SHShaderReflected.h">
-      <Filter>Graphics\Shaders</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Shaders\SHVkShaderModule.h">
-      <Filter>Graphics\Shaders</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Shaders\spirv-reflect\spirv_reflect.h">
-      <Filter>Graphics\Shaders\spirv-reflect</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Swapchain\SHSwapchainParams.h">
-      <Filter>Graphics\Swapchain</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Swapchain\SHVkSwapchain.h">
-      <Filter>Graphics\Swapchain</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Synchronization\SHVkFence.h">
-      <Filter>Graphics\Synchronization</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Synchronization\SHVkSemaphore.h">
-      <Filter>Graphics\Synchronization</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\VertexDescriptors\SHVertexAttribute.h">
-      <Filter>Graphics\VertexDescriptors</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Windowing\SHWindow.h">
-      <Filter>Graphics\Windowing</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Windowing\SHWindowMap.h">
-      <Filter>Graphics\Windowing</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Graphics\Windowing\Surface\SHVkSurface.h">
-      <Filter>Graphics\Windowing\Surface</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Math\Geometry\SHBoundingBox.h">
-      <Filter>Math\Geometry</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Math\Geometry\SHShape.h">
-      <Filter>Math\Geometry</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Math\SHMath.h">
-      <Filter>Math</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Math\SHMathHelpers.h">
-      <Filter>Math</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Math\SHMathHelpers.hpp">
-      <Filter>Math</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Math\SHMatrix.h">
-      <Filter>Math</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Math\SHQuaternion.h">
-      <Filter>Math</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Math\Transform\SHTransform.h">
-      <Filter>Math</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Math\Vector\SHVec2.h">
-      <Filter>Math\Vector</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Math\Vector\SHVec3.h">
-      <Filter>Math\Vector</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Math\Vector\SHVec4.h">
-      <Filter>Math\Vector</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Meta\SHIsDetected.h">
-      <Filter>Meta</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Resource\Handle.h">
-      <Filter>Resource</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Resource\Handle.hpp">
-      <Filter>Resource</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Resource\ResourceLibrary.h">
-      <Filter>Resource</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Resource\ResourceLibrary.hpp">
-      <Filter>Resource</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Resource\SparseSet.h">
-      <Filter>Resource</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Resource\SparseSet.hpp">
-      <Filter>Resource</Filter>
-    </ClInclude>
-    <ClInclude Include="src\SHCommonTypes.h" />
-    <ClInclude Include="src\SH_API.h" />
-    <ClInclude Include="src\SHpch.h" />
-    <ClInclude Include="src\Scene\SHScene.h">
-      <Filter>Scene</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Scene\SHSceneGraph.h">
-      <Filter>Scene</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Scene\SHSceneManager.h">
-      <Filter>Scene</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Scripting\SHDotNetRuntime.h">
-      <Filter>Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Scripting\SHDotNetRuntime.hpp">
-      <Filter>Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Scripting\SHScriptEngine.h">
-      <Filter>Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Tools\SHException.h">
-      <Filter>Tools</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Tools\SHExceptionHandler.h">
-      <Filter>Tools</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Tools\SHFileUtilties.h">
-      <Filter>Tools</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Tools\SHLogger.h">
-      <Filter>Tools</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Tools\SHStringUtils.h">
-      <Filter>Tools</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Tools\SHStringUtils.hpp">
-      <Filter>Tools</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Tools\SHUtilities.h">
-      <Filter>Tools</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Tools\SHUtilities.hpp">
-      <Filter>Tools</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Math\Transform\SHTransformComponent.h" />
-    <ClInclude Include="src\Math\Transform\SHTransformSystem.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\ECS_Base\Components\SHComponent.cpp">
-      <Filter>ECS_Base\Components</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ECS_Base\Components\SHComponentGroup.cpp">
-      <Filter>ECS_Base\Components</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ECS_Base\Entity\SHEntity.cpp">
-      <Filter>ECS_Base\Entity</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ECS_Base\Managers\SHComponentManager.cpp">
-      <Filter>ECS_Base\Managers</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ECS_Base\Managers\SHEntityManager.cpp">
-      <Filter>ECS_Base\Managers</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ECS_Base\Managers\SHSystemManager.cpp">
-      <Filter>ECS_Base\Managers</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ECS_Base\System\SHFixedSystemRoutine.cpp">
-      <Filter>ECS_Base\System</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ECS_Base\System\SHSystemRoutine.cpp">
-      <Filter>ECS_Base\System</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ECS_Base\UnitTesting\SHECSUnitTest.cpp">
-      <Filter>ECS_Base\UnitTesting</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Engine\SHEngine.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="src\FRC\SHFramerateController.cpp">
-      <Filter>FRC</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Filesystem\SHFileSystem.cpp">
-      <Filter>Filesystem</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Buffers\SHVkBuffer.cpp">
-      <Filter>Graphics\Buffers</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Commands\SHVkCommandBuffer.cpp">
-      <Filter>Graphics\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Commands\SHVkCommandPool.cpp">
-      <Filter>Graphics\Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Debugging\SHValidationLayersQuery.cpp">
-      <Filter>Graphics\Debugging</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Debugging\SHVkDebugMessenger.cpp">
-      <Filter>Graphics\Debugging</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Debugging\SHVulkanDebugUtil.cpp">
-      <Filter>Graphics\Debugging</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Descriptors\SHDescriptorPoolManager.cpp">
-      <Filter>Graphics\Descriptors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Descriptors\SHDescriptorPoolStorage.cpp">
-      <Filter>Graphics\Descriptors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Descriptors\SHDescriptorSetUpdater.cpp">
-      <Filter>Graphics\Descriptors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Descriptors\SHVkDescriptorPool.cpp">
-      <Filter>Graphics\Descriptors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Descriptors\SHVkDescriptorSetGroup.cpp">
-      <Filter>Graphics\Descriptors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Descriptors\SHVkDescriptorSetLayout.cpp">
-      <Filter>Graphics\Descriptors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Devices\SHVkLogicalDevice.cpp">
-      <Filter>Graphics\Devices</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Devices\SHVkPhysicalDevice.cpp">
-      <Filter>Graphics\Devices</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Devices\SHVkPhysicalDeviceLibrary.cpp">
-      <Filter>Graphics\Devices</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Framebuffer\SHVkFramebuffer.cpp">
-      <Filter>Graphics\Framebuffer</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Images\SHVkImage.cpp">
-      <Filter>Graphics\Images</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Images\SHVkImageView.cpp">
-      <Filter>Graphics\Images</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Images\SHVkSampler.cpp">
-      <Filter>Graphics\Images</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Instance\SHVkInstance.cpp">
-      <Filter>Graphics\Instance</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\MiddleEnd\Interface\SHGraphicsSystem.cpp">
-      <Filter>Graphics\MiddleEnd\Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\MiddleEnd\Interface\SHRenderTarget.cpp">
-      <Filter>Graphics\MiddleEnd\Interface</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\MiddleEnd\PerFrame\SHPerFrameData.cpp">
-      <Filter>Graphics\MiddleEnd\PerFrame</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\MiddleEnd\PerFrame\SHRenderContext.cpp">
-      <Filter>Graphics\MiddleEnd\PerFrame</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\MiddleEnd\Shaders\SHShaderModuleLibrary.cpp">
-      <Filter>Graphics\MiddleEnd\Shaders</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\MiddleEnd\Shaders\SHShaderSourceLibrary.cpp">
-      <Filter>Graphics\MiddleEnd\Shaders</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Pipeline\SHPipelineState.cpp">
-      <Filter>Graphics\Pipeline</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Pipeline\SHPushConstantInterface.cpp">
-      <Filter>Graphics\Pipeline</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Pipeline\SHVkPipeline.cpp">
-      <Filter>Graphics\Pipeline</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Pipeline\SHVkPipelineLayout.cpp">
-      <Filter>Graphics\Pipeline</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Queues\SHVkQueue.cpp">
-      <Filter>Graphics\Queues</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\RenderGraph\SHRenderGraph.cpp">
-      <Filter>Graphics\RenderGraph</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Renderpass\SHVkAttachDescGen.cpp">
-      <Filter>Graphics\Renderpass</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Renderpass\SHVkRenderpass.cpp">
-      <Filter>Graphics\Renderpass</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Renderpass\SHVkSubpassParams.cpp">
-      <Filter>Graphics\Renderpass</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\SHVkUtil.cpp">
-      <Filter>Graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\SHVulkanIncludes.cpp">
-      <Filter>Graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Shaders\BlockInterface\SHShaderBlockInterface.cpp">
-      <Filter>Graphics\Shaders\BlockInterface</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Shaders\SHShaderReflected.cpp">
-      <Filter>Graphics\Shaders</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Shaders\SHVkShaderModule.cpp">
-      <Filter>Graphics\Shaders</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Shaders\spirv-reflect\spirv_reflect.cpp">
-      <Filter>Graphics\Shaders\spirv-reflect</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Swapchain\SHVkSwapchain.cpp">
-      <Filter>Graphics\Swapchain</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Synchronization\SHVkFence.cpp">
-      <Filter>Graphics\Synchronization</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Synchronization\SHVkSemaphore.cpp">
-      <Filter>Graphics\Synchronization</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\VertexDescriptors\SHVertexAttribute.cpp">
-      <Filter>Graphics\VertexDescriptors</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Windowing\SHWIndowMap.cpp">
-      <Filter>Graphics\Windowing</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Windowing\SHWindow.cpp">
-      <Filter>Graphics\Windowing</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Graphics\Windowing\Surface\SHVkSurface.cpp">
-      <Filter>Graphics\Windowing\Surface</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Math\Geometry\SHBoundingBox.cpp">
-      <Filter>Math\Geometry</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Math\Geometry\SHShape.cpp">
-      <Filter>Math\Geometry</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Math\SHMathHelpers.cpp">
-      <Filter>Math</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Math\SHMatrix.cpp">
-      <Filter>Math</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Math\SHQuaternion.cpp">
-      <Filter>Math</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Math\Transform\SHTransform.cpp">
-      <Filter>Math</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Math\Vector\SHVec2.cpp">
-      <Filter>Math\Vector</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Math\Vector\SHVec3.cpp">
-      <Filter>Math\Vector</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Math\Vector\SHVec4.cpp">
-      <Filter>Math\Vector</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Resource\ResourceLibrary.cpp">
-      <Filter>Resource</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SHpch.cpp" />
-    <ClCompile Include="src\Scene\SHSceneGraph.cpp">
-      <Filter>Scene</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Scene\SHSceneManager.cpp">
-      <Filter>Scene</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Scripting\SHDotNetRuntime.cpp">
-      <Filter>Scripting</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Scripting\SHScriptEngine.cpp">
-      <Filter>Scripting</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Tools\SHException.cpp">
-      <Filter>Tools</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Tools\SHExceptionHandler.cpp">
-      <Filter>Tools</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Tools\SHFileUtilties.cpp">
-      <Filter>Tools</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Tools\SHLogger.cpp">
-      <Filter>Tools</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Tools\SHStringUtils.cpp">
-      <Filter>Tools</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Math\Transform\SHTransformComponent.cpp" />
-    <ClCompile Include="src\Math\Transform\SHTransformSystem.cpp" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/SHADE_Engine/src/Math/SHMath.h b/SHADE_Engine/src/Math/SHMath.h
index 55bf73a9..5fcea9fc 100644
--- a/SHADE_Engine/src/Math/SHMath.h
+++ b/SHADE_Engine/src/Math/SHMath.h
@@ -9,4 +9,4 @@
 #include "SHQuaternion.h"
 #include "SHMatrix.h"
 
-#include "SHTransform.h"
\ No newline at end of file
+#include "Transform/SHTransform.h"
\ No newline at end of file