diff --git a/win32/glslang/OGLCompilersDLL/OGLCompiler.vcxproj b/win32/glslang/OGLCompilersDLL/OGLCompiler.vcxproj
index 95b0cd8e..760ea1c3 100644
--- a/win32/glslang/OGLCompilersDLL/OGLCompiler.vcxproj
+++ b/win32/glslang/OGLCompilersDLL/OGLCompiler.vcxproj
@@ -412,8 +412,8 @@
     <Lib />
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\shaders\glslang\OGLCompilersDLL\InitializeDll.cpp" />
-    <ClInclude Include="..\..\..\shaders\glslang\OGLCompilersDLL\InitializeDll.h" />
+    <ClCompile Include="..\..\..\external\glslang\OGLCompilersDLL\InitializeDll.cpp" />
+    <ClInclude Include="..\..\..\external\glslang\OGLCompilersDLL\InitializeDll.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/win32/glslang/OGLCompilersDLL/OGLCompiler.vcxproj.filters b/win32/glslang/OGLCompilersDLL/OGLCompiler.vcxproj.filters
index 535c6b5d..9ea7337f 100644
--- a/win32/glslang/OGLCompilersDLL/OGLCompiler.vcxproj.filters
+++ b/win32/glslang/OGLCompilersDLL/OGLCompiler.vcxproj.filters
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\..\..\shaders\glslang\OGLCompilersDLL\InitializeDll.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\OGLCompilersDLL\InitializeDll.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\shaders\glslang\OGLCompilersDLL\InitializeDll.h" />
+    <ClInclude Include="..\..\..\external\glslang\OGLCompilersDLL\InitializeDll.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source">
diff --git a/win32/glslang/SPIRV/SPIRV.vcxproj b/win32/glslang/SPIRV/SPIRV.vcxproj
index 9e188986..b88e1b8f 100644
--- a/win32/glslang/SPIRV/SPIRV.vcxproj
+++ b/win32/glslang/SPIRV/SPIRV.vcxproj
@@ -167,7 +167,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\SPIRV\..;..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\SPIRV\..;..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Debug/</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -185,10 +185,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\SPIRV\..;..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\SPIRV\..;..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\SPIRV\..;..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\SPIRV\..;..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -201,7 +201,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\SPIRV\..;..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\SPIRV\..;..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Debug/</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -219,10 +219,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\SPIRV\..;..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\SPIRV\..;..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\SPIRV\..;..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\SPIRV\..;..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -233,7 +233,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\SPIRV\..;..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\SPIRV\..;..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Release/</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -251,10 +251,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\SPIRV\..;..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\SPIRV\..;..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\SPIRV\..;..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\SPIRV\..;..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -267,7 +267,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\SPIRV\..;..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\SPIRV\..;..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Release/</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -285,10 +285,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\SPIRV\..;..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\SPIRV\..;..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\SPIRV\..;..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\SPIRV\..;..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -302,7 +302,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\SPIRV\..;..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\SPIRV\..;..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>MinSizeRel/</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -320,10 +320,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\SPIRV\..;..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\SPIRV\..;..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\SPIRV\..;..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\SPIRV\..;..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -336,7 +336,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\SPIRV\..;..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\SPIRV\..;..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>MinSizeRel/</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -354,10 +354,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\SPIRV\..;..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\SPIRV\..;..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\SPIRV\..;..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\SPIRV\..;..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -371,7 +371,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\SPIRV\..;..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\SPIRV\..;..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>RelWithDebInfo/</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -388,10 +388,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\SPIRV\..;..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\SPIRV\..;..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\SPIRV\..;..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\SPIRV\..;..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -404,7 +404,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\SPIRV\..;..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\SPIRV\..;..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>RelWithDebInfo/</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -421,10 +421,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\SPIRV\..;..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\SPIRV\..;..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\SPIRV\..;..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\SPIRV\..;..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -437,29 +437,29 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\shaders\glslang\SPIRV\GlslangToSpv.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\SPIRV\InReadableOrder.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\SPIRV\Logger.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\SPIRV\SpvBuilder.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\SPIRV\SpvPostProcess.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\SPIRV\doc.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\SPIRV\SpvTools.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\SPIRV\disassemble.cpp" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\bitutils.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\spirv.hpp" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\GLSL.std.450.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\GLSL.ext.EXT.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\GLSL.ext.KHR.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\GlslangToSpv.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\hex_float.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\Logger.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\SpvBuilder.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\spvIR.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\doc.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\SpvTools.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\disassemble.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\GLSL.ext.AMD.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\GLSL.ext.NV.h" />
+    <ClCompile Include="..\..\..\external\glslang\SPIRV\GlslangToSpv.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\SPIRV\InReadableOrder.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\SPIRV\Logger.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\SPIRV\SpvBuilder.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\SPIRV\SpvPostProcess.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\SPIRV\doc.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\SPIRV\SpvTools.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\SPIRV\disassemble.cpp" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\bitutils.h" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\spirv.hpp" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\GLSL.std.450.h" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\GLSL.ext.EXT.h" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\GLSL.ext.KHR.h" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\GlslangToSpv.h" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\hex_float.h" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\Logger.h" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\SpvBuilder.h" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\spvIR.h" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\doc.h" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\SpvTools.h" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\disassemble.h" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\GLSL.ext.AMD.h" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\GLSL.ext.NV.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\hlsl\HLSL.vcxproj">
diff --git a/win32/glslang/SPIRV/SPIRV.vcxproj.filters b/win32/glslang/SPIRV/SPIRV.vcxproj.filters
index 84bab99a..95df8e7e 100644
--- a/win32/glslang/SPIRV/SPIRV.vcxproj.filters
+++ b/win32/glslang/SPIRV/SPIRV.vcxproj.filters
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\..\..\shaders\glslang\SPIRV\GlslangToSpv.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\SPIRV\InReadableOrder.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\SPIRV\Logger.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\SPIRV\SpvBuilder.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\SPIRV\SpvPostProcess.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\SPIRV\doc.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\SPIRV\SpvTools.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\SPIRV\disassemble.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\SPIRV\GlslangToSpv.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\SPIRV\InReadableOrder.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\SPIRV\Logger.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\SPIRV\SpvBuilder.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\SPIRV\SpvPostProcess.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\SPIRV\doc.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\SPIRV\SpvTools.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\SPIRV\disassemble.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\bitutils.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\spirv.hpp" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\GLSL.std.450.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\GLSL.ext.EXT.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\GLSL.ext.KHR.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\GlslangToSpv.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\hex_float.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\Logger.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\SpvBuilder.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\spvIR.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\doc.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\SpvTools.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\disassemble.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\GLSL.ext.AMD.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\GLSL.ext.NV.h" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\bitutils.h" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\spirv.hpp" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\GLSL.std.450.h" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\GLSL.ext.EXT.h" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\GLSL.ext.KHR.h" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\GlslangToSpv.h" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\hex_float.h" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\Logger.h" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\SpvBuilder.h" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\spvIR.h" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\doc.h" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\SpvTools.h" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\disassemble.h" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\GLSL.ext.AMD.h" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\GLSL.ext.NV.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source">
diff --git a/win32/glslang/SPIRV/SPVRemapper.vcxproj b/win32/glslang/SPIRV/SPVRemapper.vcxproj
index d87d0a5f..2e9f9d2c 100644
--- a/win32/glslang/SPIRV/SPVRemapper.vcxproj
+++ b/win32/glslang/SPIRV/SPVRemapper.vcxproj
@@ -201,10 +201,10 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\shaders\glslang\SPIRV\SPVRemapper.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\SPIRV\doc.cpp" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\SPVRemapper.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\SPIRV\doc.h" />
+    <ClCompile Include="..\..\..\external\glslang\SPIRV\SPVRemapper.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\SPIRV\doc.cpp" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\SPVRemapper.h" />
+    <ClInclude Include="..\..\..\external\glslang\SPIRV\doc.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/win32/glslang/glslang/OSDependent/Windows/OSDependent.vcxproj b/win32/glslang/glslang/OSDependent/Windows/OSDependent.vcxproj
index ac2fee8e..b84bc3a5 100644
--- a/win32/glslang/glslang/OSDependent/Windows/OSDependent.vcxproj
+++ b/win32/glslang/glslang/OSDependent/Windows/OSDependent.vcxproj
@@ -412,8 +412,8 @@
     <Lib />
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\..\shaders\glslang\glslang\OSDependent\Windows\ossource.cpp" />
-    <ClInclude Include="..\..\..\..\..\shaders\glslang\glslang\OSDependent\osinclude.h" />
+    <ClCompile Include="..\..\..\..\..\external\glslang\glslang\OSDependent\Windows\ossource.cpp" />
+    <ClInclude Include="..\..\..\..\..\external\glslang\glslang\OSDependent\osinclude.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/win32/glslang/glslang/OSDependent/Windows/OSDependent.vcxproj.filters b/win32/glslang/glslang/OSDependent/Windows/OSDependent.vcxproj.filters
index 8972574d..a6eafd29 100644
--- a/win32/glslang/glslang/OSDependent/Windows/OSDependent.vcxproj.filters
+++ b/win32/glslang/glslang/OSDependent/Windows/OSDependent.vcxproj.filters
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\..\shaders\glslang\glslang\OSDependent\Windows\ossource.cpp" />
+    <ClCompile Include="..\..\..\..\..\external\glslang\glslang\OSDependent\Windows\ossource.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\..\shaders\glslang\glslang\OSDependent\osinclude.h" />
+    <ClInclude Include="..\..\..\..\..\external\glslang\glslang\OSDependent\osinclude.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source">
diff --git a/win32/glslang/glslang/glslang.vcxproj b/win32/glslang/glslang/glslang.vcxproj
index df52f076..9fb8c548 100644
--- a/win32/glslang/glslang/glslang.vcxproj
+++ b/win32/glslang/glslang/glslang.vcxproj
@@ -168,7 +168,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Debug/</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -186,10 +186,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -202,7 +202,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Debug/</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -220,10 +220,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -234,7 +234,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Release/</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -252,10 +252,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -268,7 +268,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>Release/</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -287,10 +287,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -301,7 +301,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>MinSizeRel/</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -319,10 +319,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -335,7 +335,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>MinSizeRel/</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -353,10 +353,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -367,7 +367,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>RelWithDebInfo/</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -384,10 +384,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -400,7 +400,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AssemblerListingLocation>RelWithDebInfo/</AssemblerListingLocation>
       <CompileAs>CompileAsCpp</CompileAs>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -417,10 +417,10 @@
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
-      <AdditionalIncludeDirectories>..\..\..\shaders\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\external\glslang\glslang\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
       <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@@ -430,8 +430,8 @@
     <Lib />
   </ItemDefinitionGroup>
   <ItemGroup>
-    <None Include="..\..\..\shaders\glslang\glslang\MachineIndependent\glslang.y" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\MachineIndependent\glslang_tab.cpp">
+    <None Include="..\..\..\external\glslang\glslang\MachineIndependent\glslang.y" />
+    <ClCompile Include="..\..\..\external\glslang\glslang\MachineIndependent\glslang_tab.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -473,7 +473,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\MachineIndependent\attribute.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\MachineIndependent\attribute.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -515,7 +515,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\MachineIndependent\Constant.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\MachineIndependent\Constant.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -557,7 +557,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\MachineIndependent\iomapper.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\MachineIndependent\iomapper.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -599,7 +599,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\MachineIndependent\InfoSink.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\MachineIndependent\InfoSink.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -641,7 +641,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\MachineIndependent\Initialize.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\MachineIndependent\Initialize.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -683,7 +683,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\MachineIndependent\IntermTraverse.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\MachineIndependent\IntermTraverse.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -725,7 +725,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\MachineIndependent\Intermediate.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\MachineIndependent\Intermediate.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -767,7 +767,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\MachineIndependent\ParseContextBase.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\MachineIndependent\ParseContextBase.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -809,7 +809,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\MachineIndependent\ParseHelper.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\MachineIndependent\ParseHelper.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -851,7 +851,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\MachineIndependent\PoolAlloc.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\MachineIndependent\PoolAlloc.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -893,7 +893,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\MachineIndependent\RemoveTree.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\MachineIndependent\RemoveTree.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -935,7 +935,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\MachineIndependent\Scan.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\MachineIndependent\Scan.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -977,7 +977,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\MachineIndependent\ShaderLang.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\MachineIndependent\ShaderLang.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -1019,7 +1019,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\MachineIndependent\SymbolTable.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\MachineIndependent\SymbolTable.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -1061,7 +1061,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\MachineIndependent\Versions.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\MachineIndependent\Versions.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -1103,7 +1103,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\MachineIndependent\intermOut.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\MachineIndependent\intermOut.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -1145,7 +1145,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\MachineIndependent\limits.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\MachineIndependent\limits.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -1187,7 +1187,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\MachineIndependent\linkValidate.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\MachineIndependent\linkValidate.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -1229,7 +1229,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\MachineIndependent\parseConst.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\MachineIndependent\parseConst.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -1271,7 +1271,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\MachineIndependent\reflection.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\MachineIndependent\reflection.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -1313,7 +1313,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\MachineIndependent\preprocessor\Pp.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\MachineIndependent\preprocessor\Pp.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -1355,7 +1355,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\MachineIndependent\preprocessor\PpAtom.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpAtom.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -1397,7 +1397,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\MachineIndependent\preprocessor\PpContext.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpContext.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -1439,7 +1439,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\MachineIndependent\preprocessor\PpScanner.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpScanner.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -1481,7 +1481,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\MachineIndependent\preprocessor\PpTokens.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpTokens.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -1523,7 +1523,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\MachineIndependent\propagateNoContraction.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\MachineIndependent\propagateNoContraction.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -1565,7 +1565,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\GenericCodeGen\CodeGen.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\GenericCodeGen\CodeGen.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -1607,7 +1607,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\GenericCodeGen\Link.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\GenericCodeGen\Link.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -1649,7 +1649,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\StandAlone\ResourceLimits.cpp">
+    <ClCompile Include="..\..\..\external\glslang\StandAlone\ResourceLimits.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -1691,7 +1691,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\glslang\MachineIndependent\pch.cpp">
+    <ClCompile Include="..\..\..\external\glslang\glslang\MachineIndependent\pch.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
@@ -1725,37 +1725,37 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\Public\ShaderLang.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\Include\arrays.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\Include\BaseTypes.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\Include\Common.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\Include\ConstantUnion.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\Include\InfoSink.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\Include\InitializeGlobals.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\Include\intermediate.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\Include\PoolAlloc.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\Include\ResourceLimits.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\Include\revision.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\Include\ShHandle.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\Include\Types.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\MachineIndependent\attribute.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\MachineIndependent\glslang_tab.cpp.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\MachineIndependent\gl_types.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\MachineIndependent\Initialize.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\MachineIndependent\iomapper.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\MachineIndependent\LiveTraverser.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\MachineIndependent\localintermediate.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\MachineIndependent\ParseHelper.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\MachineIndependent\reflection.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\MachineIndependent\RemoveTree.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\MachineIndependent\Scan.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\MachineIndependent\ScanContext.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\MachineIndependent\SymbolTable.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\MachineIndependent\Versions.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\MachineIndependent\parseVersions.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\MachineIndependent\propagateNoContraction.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\MachineIndependent\preprocessor\PpContext.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslang\MachineIndependent\preprocessor\PpTokens.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\Public\ShaderLang.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\Include\arrays.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\Include\BaseTypes.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\Include\Common.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\Include\ConstantUnion.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\Include\InfoSink.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\Include\InitializeGlobals.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\Include\intermediate.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\Include\PoolAlloc.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\Include\ResourceLimits.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\Include\revision.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\Include\ShHandle.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\Include\Types.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\MachineIndependent\attribute.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\MachineIndependent\glslang_tab.cpp.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\MachineIndependent\gl_types.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\MachineIndependent\Initialize.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\MachineIndependent\iomapper.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\MachineIndependent\LiveTraverser.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\MachineIndependent\localintermediate.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\MachineIndependent\ParseHelper.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\MachineIndependent\reflection.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\MachineIndependent\RemoveTree.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\MachineIndependent\Scan.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\MachineIndependent\ScanContext.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\MachineIndependent\SymbolTable.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\MachineIndependent\Versions.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\MachineIndependent\parseVersions.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\MachineIndependent\propagateNoContraction.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpContext.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpTokens.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\hlsl\HLSL.vcxproj">
diff --git a/win32/glslang/glslang/glslang.vcxproj.filters b/win32/glslang/glslang/glslang.vcxproj.filters
index f0f29ce3..434bdc58 100644
--- a/win32/glslang/glslang/glslang.vcxproj.filters
+++ b/win32/glslang/glslang/glslang.vcxproj.filters
@@ -1,72 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\..\..\shaders\glslang\glslangMachineIndependent\glslang_tab.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangMachineIndependent\attribute.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangMachineIndependent\Constant.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangMachineIndependent\iomapper.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangMachineIndependent\InfoSink.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangMachineIndependent\Initialize.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangMachineIndependent\IntermTraverse.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangMachineIndependent\Intermediate.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangMachineIndependent\ParseContextBase.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangMachineIndependent\ParseHelper.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangMachineIndependent\PoolAlloc.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangMachineIndependent\RemoveTree.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangMachineIndependent\Scan.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangMachineIndependent\ShaderLang.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangMachineIndependent\SymbolTable.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangMachineIndependent\Versions.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangMachineIndependent\intermOut.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangMachineIndependent\limits.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangMachineIndependent\linkValidate.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangMachineIndependent\parseConst.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangMachineIndependent\reflection.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangMachineIndependent\preprocessor\Pp.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangMachineIndependent\preprocessor\PpAtom.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangMachineIndependent\preprocessor\PpContext.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangMachineIndependent\preprocessor\PpScanner.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangMachineIndependent\preprocessor\PpTokens.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangMachineIndependent\propagateNoContraction.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangGenericCodeGen\CodeGen.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangGenericCodeGen\Link.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\glslangMachineIndependent\pch.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangMachineIndependent\glslang_tab.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangMachineIndependent\attribute.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangMachineIndependent\Constant.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangMachineIndependent\iomapper.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangMachineIndependent\InfoSink.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangMachineIndependent\Initialize.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangMachineIndependent\IntermTraverse.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangMachineIndependent\Intermediate.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangMachineIndependent\ParseContextBase.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangMachineIndependent\ParseHelper.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangMachineIndependent\PoolAlloc.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangMachineIndependent\RemoveTree.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangMachineIndependent\Scan.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangMachineIndependent\ShaderLang.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangMachineIndependent\SymbolTable.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangMachineIndependent\Versions.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangMachineIndependent\intermOut.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangMachineIndependent\limits.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangMachineIndependent\linkValidate.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangMachineIndependent\parseConst.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangMachineIndependent\reflection.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangMachineIndependent\preprocessor\Pp.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangMachineIndependent\preprocessor\PpAtom.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangMachineIndependent\preprocessor\PpContext.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangMachineIndependent\preprocessor\PpScanner.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangMachineIndependent\preprocessor\PpTokens.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangMachineIndependent\propagateNoContraction.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangGenericCodeGen\CodeGen.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangGenericCodeGen\Link.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\glslangMachineIndependent\pch.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\shaders\glslang\glslangPublic\ShaderLang.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangInclude\arrays.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangInclude\BaseTypes.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangInclude\Common.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangInclude\ConstantUnion.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangInclude\InfoSink.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangInclude\InitializeGlobals.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangInclude\intermediate.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangInclude\PoolAlloc.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangInclude\ResourceLimits.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangInclude\revision.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangInclude\ShHandle.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangInclude\Types.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangMachineIndependent\attribute.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangMachineIndependent\glslang_tab.cpp.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangMachineIndependent\gl_types.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangMachineIndependent\Initialize.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangMachineIndependent\iomapper.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangMachineIndependent\LiveTraverser.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangMachineIndependent\localintermediate.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangMachineIndependent\ParseHelper.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangMachineIndependent\reflection.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangMachineIndependent\RemoveTree.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangMachineIndependent\Scan.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangMachineIndependent\ScanContext.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangMachineIndependent\SymbolTable.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangMachineIndependent\Versions.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangMachineIndependent\parseVersions.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangMachineIndependent\propagateNoContraction.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangMachineIndependent\preprocessor\PpContext.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\glslangMachineIndependent\preprocessor\PpTokens.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangPublic\ShaderLang.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangInclude\arrays.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangInclude\BaseTypes.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangInclude\Common.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangInclude\ConstantUnion.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangInclude\InfoSink.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangInclude\InitializeGlobals.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangInclude\intermediate.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangInclude\PoolAlloc.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangInclude\ResourceLimits.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangInclude\revision.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangInclude\ShHandle.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangInclude\Types.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangMachineIndependent\attribute.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangMachineIndependent\glslang_tab.cpp.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangMachineIndependent\gl_types.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangMachineIndependent\Initialize.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangMachineIndependent\iomapper.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangMachineIndependent\LiveTraverser.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangMachineIndependent\localintermediate.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangMachineIndependent\ParseHelper.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangMachineIndependent\reflection.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangMachineIndependent\RemoveTree.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangMachineIndependent\Scan.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangMachineIndependent\ScanContext.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangMachineIndependent\SymbolTable.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangMachineIndependent\Versions.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangMachineIndependent\parseVersions.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangMachineIndependent\propagateNoContraction.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangMachineIndependent\preprocessor\PpContext.h" />
+    <ClInclude Include="..\..\..\external\glslang\glslangMachineIndependent\preprocessor\PpTokens.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\..\shaders\glslang\glslangMachineIndependent\glslang.y" />
+    <None Include="..\..\..\external\glslang\glslangMachineIndependent\glslang.y" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="GenericCodeGen">
diff --git a/win32/glslang/hlsl/HLSL.vcxproj b/win32/glslang/hlsl/HLSL.vcxproj
index e1240424..041d5976 100644
--- a/win32/glslang/hlsl/HLSL.vcxproj
+++ b/win32/glslang/hlsl/HLSL.vcxproj
@@ -412,7 +412,7 @@
     <Lib />
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\shaders\glslang\hlsl\hlslAttributes.cpp">
+    <ClCompile Include="..\..\..\external\glslang\hlsl\hlslAttributes.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -454,7 +454,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\hlsl\hlslParseHelper.cpp">
+    <ClCompile Include="..\..\..\external\glslang\hlsl\hlslParseHelper.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -496,7 +496,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\hlsl\hlslScanContext.cpp">
+    <ClCompile Include="..\..\..\external\glslang\hlsl\hlslScanContext.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -538,7 +538,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\hlsl\hlslOpMap.cpp">
+    <ClCompile Include="..\..\..\external\glslang\hlsl\hlslOpMap.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -580,7 +580,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\hlsl\hlslTokenStream.cpp">
+    <ClCompile Include="..\..\..\external\glslang\hlsl\hlslTokenStream.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -622,7 +622,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\hlsl\hlslGrammar.cpp">
+    <ClCompile Include="..\..\..\external\glslang\hlsl\hlslGrammar.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -664,7 +664,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\hlsl\hlslParseables.cpp">
+    <ClCompile Include="..\..\..\external\glslang\hlsl\hlslParseables.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pch.h</ForcedIncludeFiles>
@@ -706,7 +706,7 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="..\..\..\shaders\glslang\hlsl\pch.cpp">
+    <ClCompile Include="..\..\..\external\glslang\hlsl\pch.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalOptions) /Zm300</AdditionalOptions>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
@@ -740,14 +740,14 @@
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
       <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">$(IntDir)\pch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClInclude Include="..\..\..\shaders\glslang\hlsl\hlslAttributes.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\hlsl\hlslParseHelper.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\hlsl\hlslTokens.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\hlsl\hlslScanContext.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\hlsl\hlslOpMap.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\hlsl\hlslTokenStream.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\hlsl\hlslGrammar.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\hlsl\hlslParseables.h" />
+    <ClInclude Include="..\..\..\external\glslang\hlsl\hlslAttributes.h" />
+    <ClInclude Include="..\..\..\external\glslang\hlsl\hlslParseHelper.h" />
+    <ClInclude Include="..\..\..\external\glslang\hlsl\hlslTokens.h" />
+    <ClInclude Include="..\..\..\external\glslang\hlsl\hlslScanContext.h" />
+    <ClInclude Include="..\..\..\external\glslang\hlsl\hlslOpMap.h" />
+    <ClInclude Include="..\..\..\external\glslang\hlsl\hlslTokenStream.h" />
+    <ClInclude Include="..\..\..\external\glslang\hlsl\hlslGrammar.h" />
+    <ClInclude Include="..\..\..\external\glslang\hlsl\hlslParseables.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/win32/glslang/hlsl/HLSL.vcxproj.filters b/win32/glslang/hlsl/HLSL.vcxproj.filters
index 18d82d98..2d858122 100644
--- a/win32/glslang/hlsl/HLSL.vcxproj.filters
+++ b/win32/glslang/hlsl/HLSL.vcxproj.filters
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\..\..\shaders\glslang\hlsl\hlslAttributes.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\hlsl\hlslParseHelper.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\hlsl\hlslScanContext.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\hlsl\hlslOpMap.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\hlsl\hlslTokenStream.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\hlsl\hlslGrammar.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\hlsl\hlslParseables.cpp" />
-    <ClCompile Include="..\..\..\shaders\glslang\hlsl\pch.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\hlsl\hlslAttributes.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\hlsl\hlslParseHelper.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\hlsl\hlslScanContext.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\hlsl\hlslOpMap.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\hlsl\hlslTokenStream.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\hlsl\hlslGrammar.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\hlsl\hlslParseables.cpp" />
+    <ClCompile Include="..\..\..\external\glslang\hlsl\pch.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\shaders\glslang\hlsl\hlslAttributes.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\hlsl\hlslParseHelper.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\hlsl\hlslTokens.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\hlsl\hlslScanContext.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\hlsl\hlslOpMap.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\hlsl\hlslTokenStream.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\hlsl\hlslGrammar.h" />
-    <ClInclude Include="..\..\..\shaders\glslang\hlsl\hlslParseables.h" />
+    <ClInclude Include="..\..\..\external\glslang\hlsl\hlslAttributes.h" />
+    <ClInclude Include="..\..\..\external\glslang\hlsl\hlslParseHelper.h" />
+    <ClInclude Include="..\..\..\external\glslang\hlsl\hlslTokens.h" />
+    <ClInclude Include="..\..\..\external\glslang\hlsl\hlslScanContext.h" />
+    <ClInclude Include="..\..\..\external\glslang\hlsl\hlslOpMap.h" />
+    <ClInclude Include="..\..\..\external\glslang\hlsl\hlslTokenStream.h" />
+    <ClInclude Include="..\..\..\external\glslang\hlsl\hlslGrammar.h" />
+    <ClInclude Include="..\..\..\external\glslang\hlsl\hlslParseables.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source">
diff --git a/win32/snes9xw.vcxproj b/win32/snes9xw.vcxproj
index c4810078..d6690cbb 100644
--- a/win32/snes9xw.vcxproj
+++ b/win32/snes9xw.vcxproj
@@ -117,7 +117,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)zlib\src;$(ProjectDir)..\unzip;$(ProjectDir)libpng\src;$(ProjectDir)..\apu\bapu;$(ProjectDir)..\shaders\glslang</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)zlib\src;$(ProjectDir)..\unzip;$(ProjectDir)libpng\src;$(ProjectDir)..\apu\bapu;$(ProjectDir)..\external\glslang</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;ALLOW_CPU_OVERCLOCK;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;NETPLAY_SUPPORT;D3D_DEBUG_INFO;DIRECTDRAW_SUPPORT;USE_SLANG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <StructMemberAlignment>Default</StructMemberAlignment>
@@ -166,7 +166,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)zlib\src;$(ProjectDir)..\unzip;$(ProjectDir)libpng\src;$(ProjectDir)..\apu\bapu;$(ProjectDir)..\shaders\glslang</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)zlib\src;$(ProjectDir)..\unzip;$(ProjectDir)libpng\src;$(ProjectDir)..\apu\bapu;$(ProjectDir)..\external\glslang</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;ALLOW_CPU_OVERCLOCK;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;NETPLAY_SUPPORT;D3D_DEBUG_INFO;DIRECTDRAW_SUPPORT;USE_SLANG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <StructMemberAlignment>Default</StructMemberAlignment>
@@ -220,7 +220,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)zlib\src;$(ProjectDir)..\unzip;$(ProjectDir)libpng\src;$(ProjectDir)..\apu\bapu;$(ProjectDir)..\shaders\glslang;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)zlib\src;$(ProjectDir)..\unzip;$(ProjectDir)libpng\src;$(ProjectDir)..\apu\bapu;$(ProjectDir)..\external\glslang;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;ALLOW_CPU_OVERCLOCK;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;NETPLAY_SUPPORT;DIRECTDRAW_SUPPORT;USE_SLANG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -273,7 +273,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)zlib\src;$(ProjectDir)..\unzip;$(ProjectDir)libpng\src;$(ProjectDir)..\apu\bapu;$(ProjectDir)..\shaders\glslang;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\;$(ProjectDir)..\..\;$(ProjectDir)zlib\src;$(ProjectDir)..\unzip;$(ProjectDir)libpng\src;$(ProjectDir)..\apu\bapu;$(ProjectDir)..\external\glslang;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;ALLOW_CPU_OVERCLOCK;HAVE_LIBPNG;JMA_SUPPORT;ZLIB;UNZIP_SUPPORT;__WIN32__;NETPLAY_SUPPORT;DIRECTDRAW_SUPPORT;USE_SLANG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -411,13 +411,13 @@
     <ClInclude Include="..\shaders\glsl.h" />
     <ClInclude Include="..\shaders\shader_helpers.h" />
     <ClInclude Include="..\shaders\shader_platform.h" />
-    <ClInclude Include="..\shaders\SPIRV-Cross\spirv.hpp" />
-    <ClInclude Include="..\shaders\SPIRV-Cross\spirv_cfg.hpp" />
-    <ClInclude Include="..\shaders\SPIRV-Cross\spirv_common.hpp" />
-    <ClInclude Include="..\shaders\SPIRV-Cross\spirv_cross.hpp" />
-    <ClInclude Include="..\shaders\SPIRV-Cross\spirv_cross_parsed_ir.hpp" />
-    <ClInclude Include="..\shaders\SPIRV-Cross\spirv_glsl.hpp" />
-    <ClInclude Include="..\shaders\SPIRV-Cross\spirv_parser.hpp" />
+    <ClInclude Include="..\external\SPIRV-Cross\spirv.hpp" />
+    <ClInclude Include="..\external\SPIRV-Cross\spirv_cfg.hpp" />
+    <ClInclude Include="..\external\SPIRV-Cross\spirv_common.hpp" />
+    <ClInclude Include="..\external\SPIRV-Cross\spirv_cross.hpp" />
+    <ClInclude Include="..\external\SPIRV-Cross\spirv_cross_parsed_ir.hpp" />
+    <ClInclude Include="..\external\SPIRV-Cross\spirv_glsl.hpp" />
+    <ClInclude Include="..\external\SPIRV-Cross\spirv_parser.hpp" />
     <ClInclude Include="..\statemanager.h" />
     <ClInclude Include="..\sha256.h" />
     <ClInclude Include="..\bml.h" />
@@ -536,11 +536,11 @@
     <ClCompile Include="..\shaders\glsl.cpp" />
     <ClCompile Include="..\shaders\shader_helpers.cpp" />
     <ClCompile Include="..\shaders\slang.cpp" />
-    <ClCompile Include="..\shaders\SPIRV-Cross\spirv_cfg.cpp" />
-    <ClCompile Include="..\shaders\SPIRV-Cross\spirv_cross.cpp" />
-    <ClCompile Include="..\shaders\SPIRV-Cross\spirv_cross_parsed_ir.cpp" />
-    <ClCompile Include="..\shaders\SPIRV-Cross\spirv_glsl.cpp" />
-    <ClCompile Include="..\shaders\SPIRV-Cross\spirv_parser.cpp" />
+    <ClCompile Include="..\external\SPIRV-Cross\spirv_cfg.cpp" />
+    <ClCompile Include="..\external\SPIRV-Cross\spirv_cross.cpp" />
+    <ClCompile Include="..\external\SPIRV-Cross\spirv_cross_parsed_ir.cpp" />
+    <ClCompile Include="..\external\SPIRV-Cross\spirv_glsl.cpp" />
+    <ClCompile Include="..\external\SPIRV-Cross\spirv_parser.cpp" />
     <ClCompile Include="..\snapshot.cpp" />
     <ClCompile Include="..\snes9x.cpp" />
     <ClCompile Include="..\spc7110.cpp" />
diff --git a/win32/snes9xw.vcxproj.filters b/win32/snes9xw.vcxproj.filters
index fa98da5b..8e6a967d 100644
--- a/win32/snes9xw.vcxproj.filters
+++ b/win32/snes9xw.vcxproj.filters
@@ -237,7 +237,7 @@
     <ClInclude Include="..\shaders\shader_helpers.h">
       <Filter>Shaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\shaders\shader_platform.h">
+    <ClInclude Include="..\shaders\hshader_platform.h">
       <Filter>Shaders</Filter>
     </ClInclude>
     <ClInclude Include="gl_core_3_1.h">
@@ -249,25 +249,25 @@
     <ClInclude Include="image_functions.h">
       <Filter>GUI\VideoDriver</Filter>
     </ClInclude>
-    <ClInclude Include="..\shaders\SPIRV-Cross\spirv.hpp">
+    <ClInclude Include="..\external\SPIRV-Cross\spirv.hpp">
       <Filter>Shaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\shaders\SPIRV-Cross\spirv_cfg.hpp">
+    <ClInclude Include="..\external\SPIRV-Cross\spirv_cfg.hpp">
       <Filter>Shaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\shaders\SPIRV-Cross\spirv_common.hpp">
+    <ClInclude Include="..\external\SPIRV-Cross\spirv_common.hpp">
       <Filter>Shaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\shaders\SPIRV-Cross\spirv_cross.hpp">
+    <ClInclude Include="..\external\SPIRV-Cross\spirv_cross.hpp">
       <Filter>Shaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\shaders\SPIRV-Cross\spirv_cross_parsed_ir.hpp">
+    <ClInclude Include="..\external\SPIRV-Cross\spirv_cross_parsed_ir.hpp">
       <Filter>Shaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\shaders\SPIRV-Cross\spirv_glsl.hpp">
+    <ClInclude Include="..\external\SPIRV-Cross\spirv_glsl.hpp">
       <Filter>Shaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\shaders\SPIRV-Cross\spirv_parser.hpp">
+    <ClInclude Include="..\external\SPIRV-Cross\spirv_parser.hpp">
       <Filter>Shaders</Filter>
     </ClInclude>
     <ClInclude Include="CWaveOut.h">
@@ -608,19 +608,19 @@
     <ClCompile Include="..\shaders\slang.cpp">
       <Filter>Shaders</Filter>
     </ClCompile>
-    <ClCompile Include="..\shaders\SPIRV-Cross\spirv_cfg.cpp">
+    <ClCompile Include="..\external\SPIRV-Cross\spirv_cfg.cpp">
       <Filter>Shaders</Filter>
     </ClCompile>
-    <ClCompile Include="..\shaders\SPIRV-Cross\spirv_cross.cpp">
+    <ClCompile Include="..\external\SPIRV-Cross\spirv_cross.cpp">
       <Filter>Shaders</Filter>
     </ClCompile>
-    <ClCompile Include="..\shaders\SPIRV-Cross\spirv_cross_parsed_ir.cpp">
+    <ClCompile Include="..\external\SPIRV-Cross\spirv_cross_parsed_ir.cpp">
       <Filter>Shaders</Filter>
     </ClCompile>
-    <ClCompile Include="..\shaders\SPIRV-Cross\spirv_glsl.cpp">
+    <ClCompile Include="..\external\SPIRV-Cross\spirv_glsl.cpp">
       <Filter>Shaders</Filter>
     </ClCompile>
-    <ClCompile Include="..\shaders\SPIRV-Cross\spirv_parser.cpp">
+    <ClCompile Include="..\external\SPIRV-Cross\spirv_parser.cpp">
       <Filter>Shaders</Filter>
     </ClCompile>
     <ClCompile Include="CWaveOut.cpp">