Projects in 'build' and Slang API separation (#1624)

* #include an absolute path didn't work - because paths were taken to always be relative.

* Move reflection to reflection-api.

* Slight reorg to pull out potentially Slang internal functions from the reflection API impls.

* Remove visual studio projects

* Fix for slang-binaries copy.

* Add the visual studio projects in build/visual-studio

* Remove miniz project.

* Differentiate the linePath from the filePath.

* Improve comment in premake5.lua + to kick of CI.

* Kick CI.

47 files changed, 3060 insertions, 4298 deletions

diff --git a/source/core/core.vcxproj b/build/visual-studio/core/core.vcxproj
index 528c7c590..7c97eed01 100644
--- a/source/core/core.vcxproj
+++ b/build/visual-studio/core/core.vcxproj
@@ -66,26 +66,26 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>..\..\bin\windows-x86\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\debug\core\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\debug\core\</IntDir>
     <TargetName>core</TargetName>
     <TargetExt>.lib</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>..\..\bin\windows-x64\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\debug\core\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\debug\core\</IntDir>
     <TargetName>core</TargetName>
     <TargetExt>.lib</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>..\..\bin\windows-x86\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\release\core\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\release\core\</IntDir>
     <TargetName>core</TargetName>
     <TargetExt>.lib</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>..\..\bin\windows-x64\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\release\core\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\release\core\</IntDir>
     <TargetName>core</TargetName>
     <TargetExt>.lib</TargetExt>
   </PropertyGroup>
@@ -170,92 +170,92 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="slang-allocator.h" />
-    <ClInclude Include="slang-array-view.h" />
-    <ClInclude Include="slang-array.h" />
-    <ClInclude Include="slang-basic.h" />
-    <ClInclude Include="slang-blob.h" />
-    <ClInclude Include="slang-byte-encode-util.h" />
-    <ClInclude Include="slang-char-util.h" />
-    <ClInclude Include="slang-common.h" />
-    <ClInclude Include="slang-dictionary.h" />
-    <ClInclude Include="slang-downstream-compiler.h" />
-    <ClInclude Include="slang-exception.h" />
-    <ClInclude Include="slang-free-list.h" />
-    <ClInclude Include="slang-gcc-compiler-util.h" />
-    <ClInclude Include="slang-hash.h" />
-    <ClInclude Include="slang-hex-dump-util.h" />
-    <ClInclude Include="slang-io.h" />
-    <ClInclude Include="slang-linked-list.h" />
-    <ClInclude Include="slang-list.h" />
-    <ClInclude Include="slang-math.h" />
-    <ClInclude Include="slang-memory-arena.h" />
-    <ClInclude Include="slang-name-convention-util.h" />
-    <ClInclude Include="slang-nvrtc-compiler.h" />
-    <ClInclude Include="slang-offset-container.h" />
-    <ClInclude Include="slang-platform.h" />
-    <ClInclude Include="slang-process-util.h" />
-    <ClInclude Include="slang-random-generator.h" />
-    <ClInclude Include="slang-render-api-util.h" />
-    <ClInclude Include="slang-riff.h" />
-    <ClInclude Include="slang-secure-crt.h" />
-    <ClInclude Include="slang-semantic-version.h" />
-    <ClInclude Include="slang-shared-library.h" />
-    <ClInclude Include="slang-short-list.h" />
-    <ClInclude Include="slang-smart-pointer.h" />
-    <ClInclude Include="slang-std-writers.h" />
-    <ClInclude Include="slang-stream.h" />
-    <ClInclude Include="slang-string-slice-pool.h" />
-    <ClInclude Include="slang-string-util.h" />
-    <ClInclude Include="slang-string.h" />
-    <ClInclude Include="slang-test-tool-util.h" />
-    <ClInclude Include="slang-text-io.h" />
-    <ClInclude Include="slang-token-reader.h" />
-    <ClInclude Include="slang-type-text-util.h" />
-    <ClInclude Include="slang-type-traits.h" />
-    <ClInclude Include="slang-uint-set.h" />
-    <ClInclude Include="slang-visual-studio-compiler-util.h" />
-    <ClInclude Include="slang-writer.h" />
-    <ClInclude Include="slang-zip-file-system.h" />
-    <ClInclude Include="windows\slang-win-visual-studio-util.h" />
+    <ClInclude Include="..\..\..\source\core\slang-allocator.h" />
+    <ClInclude Include="..\..\..\source\core\slang-array-view.h" />
+    <ClInclude Include="..\..\..\source\core\slang-array.h" />
+    <ClInclude Include="..\..\..\source\core\slang-basic.h" />
+    <ClInclude Include="..\..\..\source\core\slang-blob.h" />
+    <ClInclude Include="..\..\..\source\core\slang-byte-encode-util.h" />
+    <ClInclude Include="..\..\..\source\core\slang-char-util.h" />
+    <ClInclude Include="..\..\..\source\core\slang-common.h" />
+    <ClInclude Include="..\..\..\source\core\slang-dictionary.h" />
+    <ClInclude Include="..\..\..\source\core\slang-downstream-compiler.h" />
+    <ClInclude Include="..\..\..\source\core\slang-exception.h" />
+    <ClInclude Include="..\..\..\source\core\slang-free-list.h" />
+    <ClInclude Include="..\..\..\source\core\slang-gcc-compiler-util.h" />
+    <ClInclude Include="..\..\..\source\core\slang-hash.h" />
+    <ClInclude Include="..\..\..\source\core\slang-hex-dump-util.h" />
+    <ClInclude Include="..\..\..\source\core\slang-io.h" />
+    <ClInclude Include="..\..\..\source\core\slang-linked-list.h" />
+    <ClInclude Include="..\..\..\source\core\slang-list.h" />
+    <ClInclude Include="..\..\..\source\core\slang-math.h" />
+    <ClInclude Include="..\..\..\source\core\slang-memory-arena.h" />
+    <ClInclude Include="..\..\..\source\core\slang-name-convention-util.h" />
+    <ClInclude Include="..\..\..\source\core\slang-nvrtc-compiler.h" />
+    <ClInclude Include="..\..\..\source\core\slang-offset-container.h" />
+    <ClInclude Include="..\..\..\source\core\slang-platform.h" />
+    <ClInclude Include="..\..\..\source\core\slang-process-util.h" />
+    <ClInclude Include="..\..\..\source\core\slang-random-generator.h" />
+    <ClInclude Include="..\..\..\source\core\slang-render-api-util.h" />
+    <ClInclude Include="..\..\..\source\core\slang-riff.h" />
+    <ClInclude Include="..\..\..\source\core\slang-secure-crt.h" />
+    <ClInclude Include="..\..\..\source\core\slang-semantic-version.h" />
+    <ClInclude Include="..\..\..\source\core\slang-shared-library.h" />
+    <ClInclude Include="..\..\..\source\core\slang-short-list.h" />
+    <ClInclude Include="..\..\..\source\core\slang-smart-pointer.h" />
+    <ClInclude Include="..\..\..\source\core\slang-std-writers.h" />
+    <ClInclude Include="..\..\..\source\core\slang-stream.h" />
+    <ClInclude Include="..\..\..\source\core\slang-string-slice-pool.h" />
+    <ClInclude Include="..\..\..\source\core\slang-string-util.h" />
+    <ClInclude Include="..\..\..\source\core\slang-string.h" />
+    <ClInclude Include="..\..\..\source\core\slang-test-tool-util.h" />
+    <ClInclude Include="..\..\..\source\core\slang-text-io.h" />
+    <ClInclude Include="..\..\..\source\core\slang-token-reader.h" />
+    <ClInclude Include="..\..\..\source\core\slang-type-text-util.h" />
+    <ClInclude Include="..\..\..\source\core\slang-type-traits.h" />
+    <ClInclude Include="..\..\..\source\core\slang-uint-set.h" />
+    <ClInclude Include="..\..\..\source\core\slang-visual-studio-compiler-util.h" />
+    <ClInclude Include="..\..\..\source\core\slang-writer.h" />
+    <ClInclude Include="..\..\..\source\core\slang-zip-file-system.h" />
+    <ClInclude Include="..\..\..\source\core\windows\slang-win-visual-studio-util.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="slang-blob.cpp" />
-    <ClCompile Include="slang-byte-encode-util.cpp" />
-    <ClCompile Include="slang-char-util.cpp" />
-    <ClCompile Include="slang-downstream-compiler.cpp" />
-    <ClCompile Include="slang-free-list.cpp" />
-    <ClCompile Include="slang-gcc-compiler-util.cpp" />
-    <ClCompile Include="slang-hex-dump-util.cpp" />
-    <ClCompile Include="slang-io.cpp" />
-    <ClCompile Include="slang-memory-arena.cpp" />
-    <ClCompile Include="slang-name-convention-util.cpp" />
-    <ClCompile Include="slang-nvrtc-compiler.cpp" />
-    <ClCompile Include="slang-offset-container.cpp" />
-    <ClCompile Include="slang-platform.cpp" />
-    <ClCompile Include="slang-random-generator.cpp" />
-    <ClCompile Include="slang-render-api-util.cpp" />
-    <ClCompile Include="slang-riff.cpp" />
-    <ClCompile Include="slang-semantic-version.cpp" />
-    <ClCompile Include="slang-shared-library.cpp" />
-    <ClCompile Include="slang-std-writers.cpp" />
-    <ClCompile Include="slang-stream.cpp" />
-    <ClCompile Include="slang-string-slice-pool.cpp" />
-    <ClCompile Include="slang-string-util.cpp" />
-    <ClCompile Include="slang-string.cpp" />
-    <ClCompile Include="slang-test-tool-util.cpp" />
-    <ClCompile Include="slang-text-io.cpp" />
-    <ClCompile Include="slang-token-reader.cpp" />
-    <ClCompile Include="slang-type-text-util.cpp" />
-    <ClCompile Include="slang-uint-set.cpp" />
-    <ClCompile Include="slang-visual-studio-compiler-util.cpp" />
-    <ClCompile Include="slang-writer.cpp" />
-    <ClCompile Include="slang-zip-file-system.cpp" />
-    <ClCompile Include="windows\slang-win-process-util.cpp" />
-    <ClCompile Include="windows\slang-win-visual-studio-util.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-blob.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-byte-encode-util.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-char-util.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-downstream-compiler.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-free-list.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-gcc-compiler-util.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-hex-dump-util.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-io.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-memory-arena.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-name-convention-util.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-nvrtc-compiler.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-offset-container.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-platform.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-random-generator.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-render-api-util.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-riff.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-semantic-version.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-shared-library.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-std-writers.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-stream.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-string-slice-pool.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-string-util.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-string.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-test-tool-util.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-text-io.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-token-reader.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-type-text-util.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-uint-set.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-visual-studio-compiler-util.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-writer.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-zip-file-system.cpp" />
+    <ClCompile Include="..\..\..\source\core\windows\slang-win-process-util.cpp" />
+    <ClCompile Include="..\..\..\source\core\windows\slang-win-visual-studio-util.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <Natvis Include="core.natvis" />
+    <Natvis Include="..\..\..\source\core\core.natvis" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/build/visual-studio/core/core.vcxproj.filters b/build/visual-studio/core/core.vcxproj.filters
new file mode 100644
index 000000000..9a680cb39
--- /dev/null
+++ b/build/visual-studio/core/core.vcxproj.filters
@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{21EB8090-0D4E-1035-B6D3-48EBA215DCB7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\source\core\slang-allocator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-array-view.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-array.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-basic.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-blob.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-byte-encode-util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-char-util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-dictionary.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-downstream-compiler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-exception.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-free-list.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-gcc-compiler-util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-hash.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-hex-dump-util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-io.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-linked-list.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-list.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-math.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-memory-arena.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-name-convention-util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-nvrtc-compiler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-offset-container.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-platform.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-process-util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-random-generator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-render-api-util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-riff.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-secure-crt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-semantic-version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-shared-library.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-short-list.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-smart-pointer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-std-writers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-stream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-string-slice-pool.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-string-util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-string.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-test-tool-util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-text-io.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-token-reader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-type-text-util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-type-traits.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-uint-set.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-visual-studio-compiler-util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-writer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\slang-zip-file-system.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\core\windows\slang-win-visual-studio-util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\source\core\slang-blob.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-byte-encode-util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-char-util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-downstream-compiler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-free-list.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-gcc-compiler-util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-hex-dump-util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-io.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-memory-arena.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-name-convention-util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-nvrtc-compiler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-offset-container.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-platform.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-random-generator.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-render-api-util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-riff.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-semantic-version.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-shared-library.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-std-writers.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-stream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-string-slice-pool.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-string-util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-string.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-test-tool-util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-text-io.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-token-reader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-type-text-util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-uint-set.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-visual-studio-compiler-util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-writer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\slang-zip-file-system.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\windows\slang-win-process-util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\core\windows\slang-win-visual-studio-util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Natvis Include="..\..\..\source\core\core.natvis">
+      <Filter>Source Files</Filter>
+    </Natvis>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/examples/cpu-hello-world/cpu-hello-world.vcxproj b/build/visual-studio/cpu-hello-world/cpu-hello-world.vcxproj
index d150aa51d..72c9eac45 100644
--- a/examples/cpu-hello-world/cpu-hello-world.vcxproj
+++ b/build/visual-studio/cpu-hello-world/cpu-hello-world.vcxproj
@@ -67,29 +67,29 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\windows-x86\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\debug\cpu-hello-world\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\debug\cpu-hello-world\</IntDir>
     <TargetName>cpu-hello-world</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\windows-x64\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\debug\cpu-hello-world\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\debug\cpu-hello-world\</IntDir>
     <TargetName>cpu-hello-world</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\windows-x86\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\release\cpu-hello-world\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\release\cpu-hello-world\</IntDir>
     <TargetName>cpu-hello-world</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\windows-x64\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\release\cpu-hello-world\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\release\cpu-hello-world\</IntDir>
     <TargetName>cpu-hello-world</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
@@ -98,7 +98,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -113,7 +113,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -128,7 +128,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -147,7 +147,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -162,19 +162,19 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="main.cpp" />
+    <ClCompile Include="..\..\..\examples\cpu-hello-world\main.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="shader.slang" />
+    <None Include="..\..\..\examples\cpu-hello-world\shader.slang" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\source\slang\slang.vcxproj">
+    <ProjectReference Include="..\slang\slang.vcxproj">
       <Project>{DB00DA62-0533-4AFD-B59F-A67D5B3A0808}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\source\core\core.vcxproj">
+    <ProjectReference Include="..\core\core.vcxproj">
       <Project>{F9BE7957-8399-899E-0C49-E714FDDD4B65}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\tools\gfx\gfx.vcxproj">
+    <ProjectReference Include="..\gfx\gfx.vcxproj">
       <Project>{222F7498-B40C-4F3F-A704-DDEB91A4484A}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/examples/cpu-hello-world/cpu-hello-world.vcxproj.filters b/build/visual-studio/cpu-hello-world/cpu-hello-world.vcxproj.filters
index 1ceeb57d7..ea71bfe9d 100644
--- a/examples/cpu-hello-world/cpu-hello-world.vcxproj.filters
+++ b/build/visual-studio/cpu-hello-world/cpu-hello-world.vcxproj.filters
@@ -6,12 +6,12 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="..\..\..\examples\cpu-hello-world\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="shader.slang">
+    <None Include="..\..\..\examples\cpu-hello-world\shader.slang">
       <Filter>Source Files</Filter>
     </None>
   </ItemGroup>
diff --git a/tools/gfx/gfx.vcxproj b/build/visual-studio/gfx/gfx.vcxproj
index 327f6d629..9a188c070 100644
--- a/tools/gfx/gfx.vcxproj
+++ b/build/visual-studio/gfx/gfx.vcxproj
@@ -67,26 +67,26 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>..\..\bin\windows-x86\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\debug\gfx\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\debug\gfx\</IntDir>
     <TargetName>gfx</TargetName>
     <TargetExt>.lib</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>..\..\bin\windows-x64\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\debug\gfx\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\debug\gfx\</IntDir>
     <TargetName>gfx</TargetName>
     <TargetExt>.lib</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>..\..\bin\windows-x86\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\release\gfx\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\release\gfx\</IntDir>
     <TargetName>gfx</TargetName>
     <TargetExt>.lib</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>..\..\bin\windows-x64\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\release\gfx\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\release\gfx\</IntDir>
     <TargetName>gfx</TargetName>
     <TargetExt>.lib</TargetExt>
   </PropertyGroup>
@@ -95,7 +95,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\external;..\..\source;..\..\external\imgui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\external;..\..\..\source;..\..\..\external\imgui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -105,7 +105,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
     <PostBuildEvent>
-      <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x86/" "../../bin/windows-x86/debug/"</Command>
+      <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x86/" "../../../bin/windows-x86/debug/"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -113,7 +113,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\external;..\..\source;..\..\external\imgui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\external;..\..\..\source;..\..\..\external\imgui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -123,7 +123,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
     <PostBuildEvent>
-      <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x64/" "../../bin/windows-x64/debug/"</Command>
+      <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x64/" "../../../bin/windows-x64/debug/"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -131,7 +131,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\external;..\..\source;..\..\external\imgui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\external;..\..\..\source;..\..\..\external\imgui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -145,7 +145,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
     <PostBuildEvent>
-      <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x86/" "../../bin/windows-x86/release/"</Command>
+      <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x86/" "../../../bin/windows-x86/release/"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -153,7 +153,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\external;..\..\source;..\..\external\imgui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\external;..\..\..\source;..\..\..\external\imgui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -167,54 +167,54 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
     <PostBuildEvent>
-      <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x64/" "../../bin/windows-x64/release/"</Command>
+      <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x64/" "../../../bin/windows-x64/release/"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="d3d\d3d-util.h" />
-    <ClInclude Include="d3d11\render-d3d11.h" />
-    <ClInclude Include="d3d12\circular-resource-heap-d3d12.h" />
-    <ClInclude Include="d3d12\descriptor-heap-d3d12.h" />
-    <ClInclude Include="d3d12\render-d3d12.h" />
-    <ClInclude Include="d3d12\resource-d3d12.h" />
-    <ClInclude Include="flag-combiner.h" />
-    <ClInclude Include="gui.h" />
-    <ClInclude Include="model.h" />
-    <ClInclude Include="nvapi\nvapi-include.h" />
-    <ClInclude Include="nvapi\nvapi-util.h" />
-    <ClInclude Include="open-gl\render-gl.h" />
-    <ClInclude Include="render.h" />
-    <ClInclude Include="surface.h" />
-    <ClInclude Include="vector-math.h" />
-    <ClInclude Include="vulkan\render-vk.h" />
-    <ClInclude Include="vulkan\vk-api.h" />
-    <ClInclude Include="vulkan\vk-device-queue.h" />
-    <ClInclude Include="vulkan\vk-module.h" />
-    <ClInclude Include="vulkan\vk-swap-chain.h" />
-    <ClInclude Include="vulkan\vk-util.h" />
-    <ClInclude Include="window.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d\d3d-util.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d11\render-d3d11.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\circular-resource-heap-d3d12.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\descriptor-heap-d3d12.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\render-d3d12.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\resource-d3d12.h" />
+    <ClInclude Include="..\..\..\tools\gfx\flag-combiner.h" />
+    <ClInclude Include="..\..\..\tools\gfx\gui.h" />
+    <ClInclude Include="..\..\..\tools\gfx\model.h" />
+    <ClInclude Include="..\..\..\tools\gfx\nvapi\nvapi-include.h" />
+    <ClInclude Include="..\..\..\tools\gfx\nvapi\nvapi-util.h" />
+    <ClInclude Include="..\..\..\tools\gfx\open-gl\render-gl.h" />
+    <ClInclude Include="..\..\..\tools\gfx\render.h" />
+    <ClInclude Include="..\..\..\tools\gfx\surface.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vector-math.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\render-vk.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-api.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-device-queue.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-module.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-swap-chain.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-util.h" />
+    <ClInclude Include="..\..\..\tools\gfx\window.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="d3d\d3d-util.cpp" />
-    <ClCompile Include="d3d11\render-d3d11.cpp" />
-    <ClCompile Include="d3d12\circular-resource-heap-d3d12.cpp" />
-    <ClCompile Include="d3d12\descriptor-heap-d3d12.cpp" />
-    <ClCompile Include="d3d12\render-d3d12.cpp" />
-    <ClCompile Include="d3d12\resource-d3d12.cpp" />
-    <ClCompile Include="flag-combiner.cpp" />
-    <ClCompile Include="gui.cpp" />
-    <ClCompile Include="model.cpp" />
-    <ClCompile Include="nvapi\nvapi-util.cpp" />
-    <ClCompile Include="open-gl\render-gl.cpp" />
-    <ClCompile Include="render.cpp" />
-    <ClCompile Include="surface.cpp" />
-    <ClCompile Include="vulkan\render-vk.cpp" />
-    <ClCompile Include="vulkan\vk-api.cpp" />
-    <ClCompile Include="vulkan\vk-device-queue.cpp" />
-    <ClCompile Include="vulkan\vk-module.cpp" />
-    <ClCompile Include="vulkan\vk-swap-chain.cpp" />
-    <ClCompile Include="vulkan\vk-util.cpp" />
-    <ClCompile Include="windows\win-window.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\d3d\d3d-util.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\d3d11\render-d3d11.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\circular-resource-heap-d3d12.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\descriptor-heap-d3d12.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\render-d3d12.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\resource-d3d12.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\flag-combiner.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\gui.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\model.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\nvapi\nvapi-util.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\open-gl\render-gl.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\render.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\surface.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\render-vk.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-api.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-device-queue.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-module.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-swap-chain.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-util.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\windows\win-window.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/build/visual-studio/gfx/gfx.vcxproj.filters b/build/visual-studio/gfx/gfx.vcxproj.filters
new file mode 100644
index 000000000..2044ede93
--- /dev/null
+++ b/build/visual-studio/gfx/gfx.vcxproj.filters
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{21EB8090-0D4E-1035-B6D3-48EBA215DCB7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\tools\gfx\d3d\d3d-util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\d3d11\render-d3d11.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\circular-resource-heap-d3d12.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\descriptor-heap-d3d12.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\render-d3d12.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\resource-d3d12.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\flag-combiner.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\gui.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\model.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\nvapi\nvapi-include.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\nvapi\nvapi-util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\open-gl\render-gl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\render.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\surface.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vector-math.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\render-vk.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-api.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-device-queue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-module.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-swap-chain.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\window.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\tools\gfx\d3d\d3d-util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\d3d11\render-d3d11.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\circular-resource-heap-d3d12.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\descriptor-heap-d3d12.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\render-d3d12.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\resource-d3d12.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\flag-combiner.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\gui.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\model.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\nvapi\nvapi-util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\open-gl\render-gl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\render.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\surface.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\render-vk.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-api.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-device-queue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-module.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-swap-chain.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\windows\win-window.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/examples/gpu-printing/gpu-printing.vcxproj b/build/visual-studio/gpu-printing/gpu-printing.vcxproj
index 1cb664892..1640b22e8 100644
--- a/examples/gpu-printing/gpu-printing.vcxproj
+++ b/build/visual-studio/gpu-printing/gpu-printing.vcxproj
@@ -67,29 +67,29 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\windows-x86\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\debug\gpu-printing\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\debug\gpu-printing\</IntDir>
     <TargetName>gpu-printing</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\windows-x64\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\debug\gpu-printing\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\debug\gpu-printing\</IntDir>
     <TargetName>gpu-printing</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\windows-x86\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\release\gpu-printing\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\release\gpu-printing\</IntDir>
     <TargetName>gpu-printing</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\windows-x64\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\release\gpu-printing\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\release\gpu-printing\</IntDir>
     <TargetName>gpu-printing</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
@@ -98,7 +98,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -113,7 +113,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -128,7 +128,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -147,7 +147,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -162,25 +162,25 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="gpu-printing-ops.h" />
-    <ClInclude Include="gpu-printing.h" />
+    <ClInclude Include="..\..\..\examples\gpu-printing\gpu-printing-ops.h" />
+    <ClInclude Include="..\..\..\examples\gpu-printing\gpu-printing.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="gpu-printing.cpp" />
-    <ClCompile Include="main.cpp" />
+    <ClCompile Include="..\..\..\examples\gpu-printing\gpu-printing.cpp" />
+    <ClCompile Include="..\..\..\examples\gpu-printing\main.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="kernels.slang" />
-    <None Include="printing.slang" />
+    <None Include="..\..\..\examples\gpu-printing\kernels.slang" />
+    <None Include="..\..\..\examples\gpu-printing\printing.slang" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\source\slang\slang.vcxproj">
+    <ProjectReference Include="..\slang\slang.vcxproj">
       <Project>{DB00DA62-0533-4AFD-B59F-A67D5B3A0808}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\source\core\core.vcxproj">
+    <ProjectReference Include="..\core\core.vcxproj">
       <Project>{F9BE7957-8399-899E-0C49-E714FDDD4B65}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\tools\gfx\gfx.vcxproj">
+    <ProjectReference Include="..\gfx\gfx.vcxproj">
       <Project>{222F7498-B40C-4F3F-A704-DDEB91A4484A}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/examples/gpu-printing/gpu-printing.vcxproj.filters b/build/visual-studio/gpu-printing/gpu-printing.vcxproj.filters
index 7b1743f46..5f7207f25 100644
--- a/examples/gpu-printing/gpu-printing.vcxproj.filters
+++ b/build/visual-studio/gpu-printing/gpu-printing.vcxproj.filters
@@ -9,26 +9,26 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="gpu-printing-ops.h">
+    <ClInclude Include="..\..\..\examples\gpu-printing\gpu-printing-ops.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="gpu-printing.h">
+    <ClInclude Include="..\..\..\examples\gpu-printing\gpu-printing.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="gpu-printing.cpp">
+    <ClCompile Include="..\..\..\examples\gpu-printing\gpu-printing.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="..\..\..\examples\gpu-printing\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="kernels.slang">
+    <None Include="..\..\..\examples\gpu-printing\kernels.slang">
       <Filter>Source Files</Filter>
     </None>
-    <None Include="printing.slang">
+    <None Include="..\..\..\examples\gpu-printing\printing.slang">
       <Filter>Source Files</Filter>
     </None>
   </ItemGroup>
diff --git a/examples/hello-world/hello-world.vcxproj b/build/visual-studio/hello-world/hello-world.vcxproj
index db6f52a86..9984aca49 100644
--- a/examples/hello-world/hello-world.vcxproj
+++ b/build/visual-studio/hello-world/hello-world.vcxproj
@@ -67,29 +67,29 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\windows-x86\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\debug\hello-world\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\debug\hello-world\</IntDir>
     <TargetName>hello-world</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\windows-x64\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\debug\hello-world\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\debug\hello-world\</IntDir>
     <TargetName>hello-world</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\windows-x86\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\release\hello-world\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\release\hello-world\</IntDir>
     <TargetName>hello-world</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\windows-x64\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\release\hello-world\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\release\hello-world\</IntDir>
     <TargetName>hello-world</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
@@ -98,7 +98,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -113,7 +113,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -128,7 +128,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -147,7 +147,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -162,19 +162,19 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="main.cpp" />
+    <ClCompile Include="..\..\..\examples\hello-world\main.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="shaders.slang" />
+    <None Include="..\..\..\examples\hello-world\shaders.slang" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\source\slang\slang.vcxproj">
+    <ProjectReference Include="..\slang\slang.vcxproj">
       <Project>{DB00DA62-0533-4AFD-B59F-A67D5B3A0808}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\source\core\core.vcxproj">
+    <ProjectReference Include="..\core\core.vcxproj">
       <Project>{F9BE7957-8399-899E-0C49-E714FDDD4B65}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\tools\gfx\gfx.vcxproj">
+    <ProjectReference Include="..\gfx\gfx.vcxproj">
       <Project>{222F7498-B40C-4F3F-A704-DDEB91A4484A}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/examples/hello-world/hello-world.vcxproj.filters b/build/visual-studio/hello-world/hello-world.vcxproj.filters
index a02cb79fc..9399d6c61 100644
--- a/examples/hello-world/hello-world.vcxproj.filters
+++ b/build/visual-studio/hello-world/hello-world.vcxproj.filters
@@ -6,12 +6,12 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="..\..\..\examples\hello-world\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="shaders.slang">
+    <None Include="..\..\..\examples\hello-world\shaders.slang">
       <Filter>Source Files</Filter>
     </None>
   </ItemGroup>
diff --git a/examples/heterogeneous-hello-world/heterogeneous-hello-world.vcxproj b/build/visual-studio/heterogeneous-hello-world/heterogeneous-hello-world.vcxproj
index 8a53a719a..b5de40a53 100644
--- a/examples/heterogeneous-hello-world/heterogeneous-hello-world.vcxproj
+++ b/build/visual-studio/heterogeneous-hello-world/heterogeneous-hello-world.vcxproj
@@ -67,29 +67,29 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\windows-x86\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\debug\heterogeneous-hello-world\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\debug\heterogeneous-hello-world\</IntDir>
     <TargetName>heterogeneous-hello-world</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\windows-x64\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\debug\heterogeneous-hello-world\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\debug\heterogeneous-hello-world\</IntDir>
     <TargetName>heterogeneous-hello-world</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\windows-x86\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\release\heterogeneous-hello-world\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\release\heterogeneous-hello-world\</IntDir>
     <TargetName>heterogeneous-hello-world</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\windows-x64\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\release\heterogeneous-hello-world\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\release\heterogeneous-hello-world\</IntDir>
     <TargetName>heterogeneous-hello-world</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
@@ -98,7 +98,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -113,7 +113,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -128,7 +128,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -147,7 +147,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -162,20 +162,20 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="shader.cpp" />
+    <ClCompile Include="..\..\..\examples\heterogeneous-hello-world\main.cpp" />
+    <ClCompile Include="..\..\..\examples\heterogeneous-hello-world\shader.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="shader.slang" />
+    <None Include="..\..\..\examples\heterogeneous-hello-world\shader.slang" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\source\slang\slang.vcxproj">
+    <ProjectReference Include="..\slang\slang.vcxproj">
       <Project>{DB00DA62-0533-4AFD-B59F-A67D5B3A0808}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\source\core\core.vcxproj">
+    <ProjectReference Include="..\core\core.vcxproj">
       <Project>{F9BE7957-8399-899E-0C49-E714FDDD4B65}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\tools\gfx\gfx.vcxproj">
+    <ProjectReference Include="..\gfx\gfx.vcxproj">
       <Project>{222F7498-B40C-4F3F-A704-DDEB91A4484A}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/examples/heterogeneous-hello-world/heterogeneous-hello-world.vcxproj.filters b/build/visual-studio/heterogeneous-hello-world/heterogeneous-hello-world.vcxproj.filters
index 0d3970688..67b3afa91 100644
--- a/examples/heterogeneous-hello-world/heterogeneous-hello-world.vcxproj.filters
+++ b/build/visual-studio/heterogeneous-hello-world/heterogeneous-hello-world.vcxproj.filters
@@ -6,15 +6,15 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="..\..\..\examples\heterogeneous-hello-world\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="shader.cpp">
+    <ClCompile Include="..\..\..\examples\heterogeneous-hello-world\shader.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="shader.slang">
+    <None Include="..\..\..\examples\heterogeneous-hello-world\shader.slang">
       <Filter>Source Files</Filter>
     </None>
   </ItemGroup>
diff --git a/source/miniz/miniz.vcxproj b/build/visual-studio/miniz/miniz.vcxproj
index 334b33c06..0ce8e2054 100644
--- a/source/miniz/miniz.vcxproj
+++ b/build/visual-studio/miniz/miniz.vcxproj
@@ -66,26 +66,26 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>..\..\bin\windows-x86\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\debug\miniz\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\debug\miniz\</IntDir>
     <TargetName>miniz</TargetName>
     <TargetExt>.lib</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>..\..\bin\windows-x64\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\debug\miniz\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\debug\miniz\</IntDir>
     <TargetName>miniz</TargetName>
     <TargetExt>.lib</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>..\..\bin\windows-x86\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\release\miniz\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\release\miniz\</IntDir>
     <TargetName>miniz</TargetName>
     <TargetExt>.lib</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>..\..\bin\windows-x64\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\release\miniz\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\release\miniz\</IntDir>
     <TargetName>miniz</TargetName>
     <TargetExt>.lib</TargetExt>
   </PropertyGroup>
@@ -154,10 +154,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\external\miniz\miniz.c" />
-    <ClCompile Include="..\..\external\miniz\miniz_tdef.c" />
-    <ClCompile Include="..\..\external\miniz\miniz_tinfl.c" />
-    <ClCompile Include="..\..\external\miniz\miniz_zip.c" />
+    <ClCompile Include="..\..\..\external\miniz\miniz.c" />
+    <ClCompile Include="..\..\..\external\miniz\miniz_tdef.c" />
+    <ClCompile Include="..\..\..\external\miniz\miniz_tinfl.c" />
+    <ClCompile Include="..\..\..\external\miniz\miniz_zip.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/examples/model-viewer/model-viewer.vcxproj b/build/visual-studio/model-viewer/model-viewer.vcxproj
index 97896612d..f1e17ddca 100644
--- a/examples/model-viewer/model-viewer.vcxproj
+++ b/build/visual-studio/model-viewer/model-viewer.vcxproj
@@ -67,29 +67,29 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\windows-x86\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\debug\model-viewer\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\debug\model-viewer\</IntDir>
     <TargetName>model-viewer</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\windows-x64\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\debug\model-viewer\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\debug\model-viewer\</IntDir>
     <TargetName>model-viewer</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\windows-x86\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\release\model-viewer\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\release\model-viewer\</IntDir>
     <TargetName>model-viewer</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\windows-x64\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\release\model-viewer\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\release\model-viewer\</IntDir>
     <TargetName>model-viewer</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
@@ -98,7 +98,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -113,7 +113,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -128,7 +128,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -147,7 +147,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -162,19 +162,19 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="main.cpp" />
+    <ClCompile Include="..\..\..\examples\model-viewer\main.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="shaders.slang" />
+    <None Include="..\..\..\examples\model-viewer\shaders.slang" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\source\slang\slang.vcxproj">
+    <ProjectReference Include="..\slang\slang.vcxproj">
       <Project>{DB00DA62-0533-4AFD-B59F-A67D5B3A0808}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\source\core\core.vcxproj">
+    <ProjectReference Include="..\core\core.vcxproj">
       <Project>{F9BE7957-8399-899E-0C49-E714FDDD4B65}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\tools\gfx\gfx.vcxproj">
+    <ProjectReference Include="..\gfx\gfx.vcxproj">
       <Project>{222F7498-B40C-4F3F-A704-DDEB91A4484A}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/examples/model-viewer/model-viewer.vcxproj.filters b/build/visual-studio/model-viewer/model-viewer.vcxproj.filters
index a02cb79fc..a113f30bd 100644
--- a/examples/model-viewer/model-viewer.vcxproj.filters
+++ b/build/visual-studio/model-viewer/model-viewer.vcxproj.filters
@@ -6,12 +6,12 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="..\..\..\examples\model-viewer\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="shaders.slang">
+    <None Include="..\..\..\examples\model-viewer\shaders.slang">
       <Filter>Source Files</Filter>
     </None>
   </ItemGroup>
diff --git a/tools/render-test/render-test-tool.vcxproj b/build/visual-studio/render-test-tool/render-test-tool.vcxproj
index cd05a53a2..c55e7af5e 100644
--- a/tools/render-test/render-test-tool.vcxproj
+++ b/build/visual-studio/render-test-tool/render-test-tool.vcxproj
@@ -68,29 +68,29 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\windows-x86\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\debug\render-test-tool\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\debug\render-test-tool\</IntDir>
     <TargetName>render-test-tool</TargetName>
     <TargetExt>.dll</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\windows-x64\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\debug\render-test-tool\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\debug\render-test-tool\</IntDir>
     <TargetName>render-test-tool</TargetName>
     <TargetExt>.dll</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\windows-x86\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\release\render-test-tool\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\release\render-test-tool\</IntDir>
     <TargetName>render-test-tool</TargetName>
     <TargetExt>.dll</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\windows-x64\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\release\render-test-tool\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\release\render-test-tool\</IntDir>
     <TargetName>render-test-tool</TargetName>
     <TargetExt>.dll</TargetExt>
   </PropertyGroup>
@@ -99,7 +99,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_DEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\external;..\..\source;..\gfx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\external;..\..\..\source;..\..\..\tools\gfx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -107,10 +107,10 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>..\..\bin\windows-x86\debug\render-test-tool.lib</ImportLibrary>
+      <ImportLibrary>..\..\..\bin\windows-x86\debug\render-test-tool.lib</ImportLibrary>
     </Link>
     <PostBuildEvent>
-      <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x86/" "../../bin/windows-x86/debug/" "windows-x86"</Command>
+      <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x86/" "../../../bin/windows-x86/debug/" "windows-x86"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -118,7 +118,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_DEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\external;..\..\source;..\gfx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\external;..\..\..\source;..\..\..\tools\gfx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -126,10 +126,10 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>..\..\bin\windows-x64\debug\render-test-tool.lib</ImportLibrary>
+      <ImportLibrary>..\..\..\bin\windows-x64\debug\render-test-tool.lib</ImportLibrary>
     </Link>
     <PostBuildEvent>
-      <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x64/" "../../bin/windows-x64/debug/" "windows-x64"</Command>
+      <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x64/" "../../../bin/windows-x64/debug/" "windows-x64"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -137,7 +137,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>NDEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\external;..\..\source;..\gfx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\external;..\..\..\source;..\..\..\tools\gfx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -149,10 +149,10 @@
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <ImportLibrary>..\..\bin\windows-x86\release\render-test-tool.lib</ImportLibrary>
+      <ImportLibrary>..\..\..\bin\windows-x86\release\render-test-tool.lib</ImportLibrary>
     </Link>
     <PostBuildEvent>
-      <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x86/" "../../bin/windows-x86/release/" "windows-x86"</Command>
+      <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x86/" "../../../bin/windows-x86/release/" "windows-x86"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -160,7 +160,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>NDEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\external;..\..\source;..\gfx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\external;..\..\..\source;..\..\..\tools\gfx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -172,39 +172,39 @@
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <ImportLibrary>..\..\bin\windows-x64\release\render-test-tool.lib</ImportLibrary>
+      <ImportLibrary>..\..\..\bin\windows-x64\release\render-test-tool.lib</ImportLibrary>
     </Link>
     <PostBuildEvent>
-      <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x64/" "../../bin/windows-x64/release/" "windows-x64"</Command>
+      <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x64/" "../../../bin/windows-x64/release/" "windows-x64"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="bind-location.h" />
-    <ClInclude Include="cpu-compute-util.h" />
-    <ClInclude Include="options.h" />
-    <ClInclude Include="png-serialize-util.h" />
-    <ClInclude Include="shader-input-layout.h" />
-    <ClInclude Include="shader-renderer-util.h" />
-    <ClInclude Include="slang-support.h" />
-    <ClInclude Include="window.h" />
+    <ClInclude Include="..\..\..\tools\render-test\bind-location.h" />
+    <ClInclude Include="..\..\..\tools\render-test\cpu-compute-util.h" />
+    <ClInclude Include="..\..\..\tools\render-test\options.h" />
+    <ClInclude Include="..\..\..\tools\render-test\png-serialize-util.h" />
+    <ClInclude Include="..\..\..\tools\render-test\shader-input-layout.h" />
+    <ClInclude Include="..\..\..\tools\render-test\shader-renderer-util.h" />
+    <ClInclude Include="..\..\..\tools\render-test\slang-support.h" />
+    <ClInclude Include="..\..\..\tools\render-test\window.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="bind-location.cpp" />
-    <ClCompile Include="cpu-compute-util.cpp" />
-    <ClCompile Include="options.cpp" />
-    <ClCompile Include="png-serialize-util.cpp" />
-    <ClCompile Include="render-test-main.cpp" />
-    <ClCompile Include="shader-input-layout.cpp" />
-    <ClCompile Include="shader-renderer-util.cpp" />
-    <ClCompile Include="slang-support.cpp" />
-    <ClCompile Include="window.cpp" />
-    <ClCompile Include="windows\win-window.cpp" />
+    <ClCompile Include="..\..\..\tools\render-test\bind-location.cpp" />
+    <ClCompile Include="..\..\..\tools\render-test\cpu-compute-util.cpp" />
+    <ClCompile Include="..\..\..\tools\render-test\options.cpp" />
+    <ClCompile Include="..\..\..\tools\render-test\png-serialize-util.cpp" />
+    <ClCompile Include="..\..\..\tools\render-test\render-test-main.cpp" />
+    <ClCompile Include="..\..\..\tools\render-test\shader-input-layout.cpp" />
+    <ClCompile Include="..\..\..\tools\render-test\shader-renderer-util.cpp" />
+    <ClCompile Include="..\..\..\tools\render-test\slang-support.cpp" />
+    <ClCompile Include="..\..\..\tools\render-test\window.cpp" />
+    <ClCompile Include="..\..\..\tools\render-test\windows\win-window.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\source\core\core.vcxproj">
+    <ProjectReference Include="..\core\core.vcxproj">
       <Project>{F9BE7957-8399-899E-0C49-E714FDDD4B65}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\source\slang\slang.vcxproj">
+    <ProjectReference Include="..\slang\slang.vcxproj">
       <Project>{DB00DA62-0533-4AFD-B59F-A67D5B3A0808}</Project>
     </ProjectReference>
     <ProjectReference Include="..\gfx\gfx.vcxproj">
diff --git a/tools/render-test/render-test-tool.vcxproj.filters b/build/visual-studio/render-test-tool/render-test-tool.vcxproj.filters
index 36b384bb0..1c0d82cdd 100644
--- a/tools/render-test/render-test-tool.vcxproj.filters
+++ b/build/visual-studio/render-test-tool/render-test-tool.vcxproj.filters
@@ -9,60 +9,60 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="bind-location.h">
+    <ClInclude Include="..\..\..\tools\render-test\bind-location.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="cpu-compute-util.h">
+    <ClInclude Include="..\..\..\tools\render-test\cpu-compute-util.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="options.h">
+    <ClInclude Include="..\..\..\tools\render-test\options.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="png-serialize-util.h">
+    <ClInclude Include="..\..\..\tools\render-test\png-serialize-util.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="shader-input-layout.h">
+    <ClInclude Include="..\..\..\tools\render-test\shader-input-layout.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="shader-renderer-util.h">
+    <ClInclude Include="..\..\..\tools\render-test\shader-renderer-util.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="slang-support.h">
+    <ClInclude Include="..\..\..\tools\render-test\slang-support.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="window.h">
+    <ClInclude Include="..\..\..\tools\render-test\window.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="bind-location.cpp">
+    <ClCompile Include="..\..\..\tools\render-test\bind-location.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="cpu-compute-util.cpp">
+    <ClCompile Include="..\..\..\tools\render-test\cpu-compute-util.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="options.cpp">
+    <ClCompile Include="..\..\..\tools\render-test\options.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="png-serialize-util.cpp">
+    <ClCompile Include="..\..\..\tools\render-test\png-serialize-util.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="render-test-main.cpp">
+    <ClCompile Include="..\..\..\tools\render-test\render-test-main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="shader-input-layout.cpp">
+    <ClCompile Include="..\..\..\tools\render-test\shader-input-layout.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="shader-renderer-util.cpp">
+    <ClCompile Include="..\..\..\tools\render-test\shader-renderer-util.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="slang-support.cpp">
+    <ClCompile Include="..\..\..\tools\render-test\slang-support.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="window.cpp">
+    <ClCompile Include="..\..\..\tools\render-test\window.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="windows\win-window.cpp">
+    <ClCompile Include="..\..\..\tools\render-test\windows\win-window.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/source/slang/run-generators.vcxproj b/build/visual-studio/run-generators/run-generators.vcxproj
index e38f9dc2d..d326efb61 100644
--- a/source/slang/run-generators.vcxproj
+++ b/build/visual-studio/run-generators/run-generators.vcxproj
@@ -19,7 +19,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{811F1997-6DDA-0843-1692-818D022C53D3}</ProjectGuid>
+    <ProjectGuid>{E145B2B8-CD13-A6BE-B6A7-16E5A2148223}</ProjectGuid>
     <IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>run-generators</RootNamespace>
@@ -66,26 +66,26 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>..\..\bin\windows-x86\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\debug\run-generators\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\debug\run-generators\</IntDir>
     <TargetName>run-generators</TargetName>
     <TargetExt>.lib</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>..\..\bin\windows-x64\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\debug\run-generators\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\debug\run-generators\</IntDir>
     <TargetName>run-generators</TargetName>
     <TargetExt>.lib</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>..\..\bin\windows-x86\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\release\run-generators\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\release\run-generators\</IntDir>
     <TargetName>run-generators</TargetName>
     <TargetExt>.lib</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>..\..\bin\windows-x64\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\release\run-generators\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\release\run-generators\</IntDir>
     <TargetName>run-generators</TargetName>
     <TargetExt>.lib</TargetExt>
   </PropertyGroup>
@@ -154,90 +154,90 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\prelude\slang-cpp-scalar-intrinsics.h" />
-    <ClInclude Include="..\..\prelude\slang-cpp-types.h" />
+    <ClInclude Include="..\..\..\prelude\slang-cpp-scalar-intrinsics.h" />
+    <ClInclude Include="..\..\..\prelude\slang-cpp-types.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\core\slang-string.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-string.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="..\..\prelude\slang-cpp-prelude.h">
+    <CustomBuild Include="..\..\..\prelude\slang-cpp-prelude.h">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"../../bin/windows-x86/debug/slang-embed" %(Identity)</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"../../bin/windows-x64/debug/slang-embed" %(Identity)</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"../../bin/windows-x86/release/slang-embed" %(Identity)</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"../../bin/windows-x64/release/slang-embed" %(Identity)</Command>
-      <Outputs>../../prelude/slang-cpp-prelude.h.cpp</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"../../../bin/windows-x86/debug/slang-embed" %(Identity)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"../../../bin/windows-x64/debug/slang-embed" %(Identity)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"../../../bin/windows-x86/release/slang-embed" %(Identity)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"../../../bin/windows-x64/release/slang-embed" %(Identity)</Command>
+      <Outputs>../../../prelude/slang-cpp-prelude.h.cpp</Outputs>
       <Message>slang-embed %(Identity)</Message>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/windows-x86/debug/slang-embed.exe</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/windows-x64/debug/slang-embed.exe</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/windows-x86/release/slang-embed.exe</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/windows-x64/release/slang-embed.exe</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../bin/windows-x86/debug/slang-embed.exe</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../bin/windows-x64/debug/slang-embed.exe</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../bin/windows-x86/release/slang-embed.exe</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../bin/windows-x64/release/slang-embed.exe</AdditionalInputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\prelude\slang-cuda-prelude.h">
+    <CustomBuild Include="..\..\..\prelude\slang-cuda-prelude.h">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"../../bin/windows-x86/debug/slang-embed" %(Identity)</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"../../bin/windows-x64/debug/slang-embed" %(Identity)</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"../../bin/windows-x86/release/slang-embed" %(Identity)</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"../../bin/windows-x64/release/slang-embed" %(Identity)</Command>
-      <Outputs>../../prelude/slang-cuda-prelude.h.cpp</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"../../../bin/windows-x86/debug/slang-embed" %(Identity)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"../../../bin/windows-x64/debug/slang-embed" %(Identity)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"../../../bin/windows-x86/release/slang-embed" %(Identity)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"../../../bin/windows-x64/release/slang-embed" %(Identity)</Command>
+      <Outputs>../../../prelude/slang-cuda-prelude.h.cpp</Outputs>
       <Message>slang-embed %(Identity)</Message>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/windows-x86/debug/slang-embed.exe</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/windows-x64/debug/slang-embed.exe</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/windows-x86/release/slang-embed.exe</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/windows-x64/release/slang-embed.exe</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../bin/windows-x86/debug/slang-embed.exe</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../bin/windows-x64/debug/slang-embed.exe</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../bin/windows-x86/release/slang-embed.exe</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../bin/windows-x64/release/slang-embed.exe</AdditionalInputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\prelude\slang-hlsl-prelude.h">
+    <CustomBuild Include="..\..\..\prelude\slang-hlsl-prelude.h">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"../../bin/windows-x86/debug/slang-embed" %(Identity)</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"../../bin/windows-x64/debug/slang-embed" %(Identity)</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"../../bin/windows-x86/release/slang-embed" %(Identity)</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"../../bin/windows-x64/release/slang-embed" %(Identity)</Command>
-      <Outputs>../../prelude/slang-hlsl-prelude.h.cpp</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"../../../bin/windows-x86/debug/slang-embed" %(Identity)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"../../../bin/windows-x64/debug/slang-embed" %(Identity)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"../../../bin/windows-x86/release/slang-embed" %(Identity)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"../../../bin/windows-x64/release/slang-embed" %(Identity)</Command>
+      <Outputs>../../../prelude/slang-hlsl-prelude.h.cpp</Outputs>
       <Message>slang-embed %(Identity)</Message>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/windows-x86/debug/slang-embed.exe</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/windows-x64/debug/slang-embed.exe</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/windows-x86/release/slang-embed.exe</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/windows-x64/release/slang-embed.exe</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../bin/windows-x86/debug/slang-embed.exe</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../bin/windows-x64/debug/slang-embed.exe</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../bin/windows-x86/release/slang-embed.exe</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../bin/windows-x64/release/slang-embed.exe</AdditionalInputs>
     </CustomBuild>
-    <CustomBuild Include="core.meta.slang">
+    <CustomBuild Include="..\..\..\source\slang\core.meta.slang">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"../../bin/windows-x86/debug/slang-generate" %(Identity)</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"../../bin/windows-x64/debug/slang-generate" %(Identity)</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"../../bin/windows-x86/release/slang-generate" %(Identity)</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"../../bin/windows-x64/release/slang-generate" %(Identity)</Command>
-      <Outputs>core.meta.slang.h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"../../../bin/windows-x86/debug/slang-generate" %(Identity)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"../../../bin/windows-x64/debug/slang-generate" %(Identity)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"../../../bin/windows-x86/release/slang-generate" %(Identity)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"../../../bin/windows-x64/release/slang-generate" %(Identity)</Command>
+      <Outputs>../../../source/slang/core.meta.slang.h</Outputs>
       <Message>slang-generate %(Identity)</Message>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/windows-x86/debug/slang-generate.exe</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/windows-x64/debug/slang-generate.exe</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/windows-x86/release/slang-generate.exe</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/windows-x64/release/slang-generate.exe</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../bin/windows-x86/debug/slang-generate.exe</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../bin/windows-x64/debug/slang-generate.exe</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../bin/windows-x86/release/slang-generate.exe</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../bin/windows-x64/release/slang-generate.exe</AdditionalInputs>
     </CustomBuild>
-    <CustomBuild Include="hlsl.meta.slang">
+    <CustomBuild Include="..\..\..\source\slang\hlsl.meta.slang">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"../../bin/windows-x86/debug/slang-generate" %(Identity)</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"../../bin/windows-x64/debug/slang-generate" %(Identity)</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"../../bin/windows-x86/release/slang-generate" %(Identity)</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"../../bin/windows-x64/release/slang-generate" %(Identity)</Command>
-      <Outputs>hlsl.meta.slang.h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"../../../bin/windows-x86/debug/slang-generate" %(Identity)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"../../../bin/windows-x64/debug/slang-generate" %(Identity)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"../../../bin/windows-x86/release/slang-generate" %(Identity)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"../../../bin/windows-x64/release/slang-generate" %(Identity)</Command>
+      <Outputs>../../../source/slang/hlsl.meta.slang.h</Outputs>
       <Message>slang-generate %(Identity)</Message>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/windows-x86/debug/slang-generate.exe</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/windows-x64/debug/slang-generate.exe</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/windows-x86/release/slang-generate.exe</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/windows-x64/release/slang-generate.exe</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../bin/windows-x86/debug/slang-generate.exe</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../bin/windows-x64/debug/slang-generate.exe</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../bin/windows-x86/release/slang-generate.exe</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../bin/windows-x64/release/slang-generate.exe</AdditionalInputs>
     </CustomBuild>
-    <CustomBuild Include="slang-ast-reflect.h">
+    <CustomBuild Include="..\..\..\source\slang\slang-ast-reflect.h">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"../../bin/windows-x86/debug/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"../../bin/windows-x64/debug/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"../../bin/windows-x86/release/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"../../bin/windows-x64/release/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS</Command>
-      <Outputs>slang-generated-obj.h;slang-generated-obj-macro.h;slang-generated-ast.h;slang-generated-ast-macro.h;slang-generated-value.h;slang-generated-value-macro.h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"../../../bin/windows-x86/debug/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"../../../bin/windows-x64/debug/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"../../../bin/windows-x86/release/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"../../../bin/windows-x64/release/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS</Command>
+      <Outputs>../../../source/slang/slang-generated-obj.h;../../../source/slang/slang-generated-obj-macro.h;../../../source/slang/slang-generated-ast.h;../../../source/slang/slang-generated-ast-macro.h;../../../source/slang/slang-generated-value.h;../../../source/slang/slang-generated-value-macro.h</Outputs>
       <Message>C++ Extractor %(Identity)</Message>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/windows-x86/debug/slang-cpp-extractor.exe;slang-ast-support-types.h;slang-ast-base.h;slang-ast-decl.h;slang-ast-expr.h;slang-ast-modifier.h;slang-ast-stmt.h;slang-ast-type.h;slang-ast-val.h</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/windows-x64/debug/slang-cpp-extractor.exe;slang-ast-support-types.h;slang-ast-base.h;slang-ast-decl.h;slang-ast-expr.h;slang-ast-modifier.h;slang-ast-stmt.h;slang-ast-type.h;slang-ast-val.h</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/windows-x86/release/slang-cpp-extractor.exe;slang-ast-support-types.h;slang-ast-base.h;slang-ast-decl.h;slang-ast-expr.h;slang-ast-modifier.h;slang-ast-stmt.h;slang-ast-type.h;slang-ast-val.h</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/windows-x64/release/slang-cpp-extractor.exe;slang-ast-support-types.h;slang-ast-base.h;slang-ast-decl.h;slang-ast-expr.h;slang-ast-modifier.h;slang-ast-stmt.h;slang-ast-type.h;slang-ast-val.h</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../bin/windows-x86/debug/slang-cpp-extractor.exe;../../../source/slang/slang-ast-support-types.h;../../../source/slang/slang-ast-base.h;../../../source/slang/slang-ast-decl.h;../../../source/slang/slang-ast-expr.h;../../../source/slang/slang-ast-modifier.h;../../../source/slang/slang-ast-stmt.h;../../../source/slang/slang-ast-type.h;../../../source/slang/slang-ast-val.h</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../bin/windows-x64/debug/slang-cpp-extractor.exe;../../../source/slang/slang-ast-support-types.h;../../../source/slang/slang-ast-base.h;../../../source/slang/slang-ast-decl.h;../../../source/slang/slang-ast-expr.h;../../../source/slang/slang-ast-modifier.h;../../../source/slang/slang-ast-stmt.h;../../../source/slang/slang-ast-type.h;../../../source/slang/slang-ast-val.h</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../bin/windows-x86/release/slang-cpp-extractor.exe;../../../source/slang/slang-ast-support-types.h;../../../source/slang/slang-ast-base.h;../../../source/slang/slang-ast-decl.h;../../../source/slang/slang-ast-expr.h;../../../source/slang/slang-ast-modifier.h;../../../source/slang/slang-ast-stmt.h;../../../source/slang/slang-ast-type.h;../../../source/slang/slang-ast-val.h</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../bin/windows-x64/release/slang-cpp-extractor.exe;../../../source/slang/slang-ast-support-types.h;../../../source/slang/slang-ast-base.h;../../../source/slang/slang-ast-decl.h;../../../source/slang/slang-ast-expr.h;../../../source/slang/slang-ast-modifier.h;../../../source/slang/slang-ast-stmt.h;../../../source/slang/slang-ast-type.h;../../../source/slang/slang-ast-val.h</AdditionalInputs>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/source/slang/run-generators.vcxproj.filters b/build/visual-studio/run-generators/run-generators.vcxproj.filters
index e8ec8394a..17a7477ed 100644
--- a/source/slang/run-generators.vcxproj.filters
+++ b/build/visual-studio/run-generators/run-generators.vcxproj.filters
@@ -9,35 +9,35 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\prelude\slang-cpp-scalar-intrinsics.h">
+    <ClInclude Include="..\..\..\prelude\slang-cpp-scalar-intrinsics.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\prelude\slang-cpp-types.h">
+    <ClInclude Include="..\..\..\prelude\slang-cpp-types.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\core\slang-string.cpp">
+    <ClCompile Include="..\..\..\source\core\slang-string.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="..\..\prelude\slang-cpp-prelude.h">
+    <CustomBuild Include="..\..\..\prelude\slang-cpp-prelude.h">
       <Filter>Header Files</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\prelude\slang-cuda-prelude.h">
+    <CustomBuild Include="..\..\..\prelude\slang-cuda-prelude.h">
       <Filter>Header Files</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\prelude\slang-hlsl-prelude.h">
+    <CustomBuild Include="..\..\..\prelude\slang-hlsl-prelude.h">
       <Filter>Header Files</Filter>
     </CustomBuild>
-    <CustomBuild Include="core.meta.slang">
+    <CustomBuild Include="..\..\..\source\slang\core.meta.slang">
       <Filter>Source Files</Filter>
     </CustomBuild>
-    <CustomBuild Include="hlsl.meta.slang">
+    <CustomBuild Include="..\..\..\source\slang\hlsl.meta.slang">
       <Filter>Source Files</Filter>
     </CustomBuild>
-    <CustomBuild Include="slang-ast-reflect.h">
+    <CustomBuild Include="..\..\..\source\slang\slang-ast-reflect.h">
       <Filter>Header Files</Filter>
     </CustomBuild>
   </ItemGroup>
diff --git a/tools/slang-cpp-extractor/slang-cpp-extractor.vcxproj b/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj
index 319632499..ff2403239 100644
--- a/tools/slang-cpp-extractor/slang-cpp-extractor.vcxproj
+++ b/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj
@@ -67,29 +67,29 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\windows-x86\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\debug\slang-cpp-extractor\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\debug\slang-cpp-extractor\</IntDir>
     <TargetName>slang-cpp-extractor</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\windows-x64\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\debug\slang-cpp-extractor\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\debug\slang-cpp-extractor\</IntDir>
     <TargetName>slang-cpp-extractor</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\windows-x86\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\release\slang-cpp-extractor\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\release\slang-cpp-extractor\</IntDir>
     <TargetName>slang-cpp-extractor</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\windows-x64\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\release\slang-cpp-extractor\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\release\slang-cpp-extractor\</IntDir>
     <TargetName>slang-cpp-extractor</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
@@ -98,7 +98,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -113,7 +113,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -128,7 +128,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -147,7 +147,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -162,27 +162,27 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\source\slang\slang-diagnostics.h" />
-    <ClInclude Include="..\..\source\slang\slang-file-system.h" />
-    <ClInclude Include="..\..\source\slang\slang-lexer.h" />
-    <ClInclude Include="..\..\source\slang\slang-name.h" />
-    <ClInclude Include="..\..\source\slang\slang-source-loc.h" />
-    <ClInclude Include="..\..\source\slang\slang-token.h" />
-    <ClInclude Include="slang-cpp-extractor-diagnostic-defs.h" />
-    <ClInclude Include="slang-cpp-extractor-diagnostics.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-diagnostics.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-file-system.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-lexer.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-name.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-source-loc.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-token.h" />
+    <ClInclude Include="..\..\..\tools\slang-cpp-extractor\slang-cpp-extractor-diagnostic-defs.h" />
+    <ClInclude Include="..\..\..\tools\slang-cpp-extractor\slang-cpp-extractor-diagnostics.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\source\slang\slang-diagnostics.cpp" />
-    <ClCompile Include="..\..\source\slang\slang-file-system.cpp" />
-    <ClCompile Include="..\..\source\slang\slang-lexer.cpp" />
-    <ClCompile Include="..\..\source\slang\slang-name.cpp" />
-    <ClCompile Include="..\..\source\slang\slang-source-loc.cpp" />
-    <ClCompile Include="..\..\source\slang\slang-token.cpp" />
-    <ClCompile Include="slang-cpp-extractor-diagnostics.cpp" />
-    <ClCompile Include="slang-cpp-extractor-main.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-diagnostics.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-file-system.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-lexer.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-name.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-source-loc.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-token.cpp" />
+    <ClCompile Include="..\..\..\tools\slang-cpp-extractor\slang-cpp-extractor-diagnostics.cpp" />
+    <ClCompile Include="..\..\..\tools\slang-cpp-extractor\slang-cpp-extractor-main.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\source\core\core.vcxproj">
+    <ProjectReference Include="..\core\core.vcxproj">
       <Project>{F9BE7957-8399-899E-0C49-E714FDDD4B65}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/tools/slang-cpp-extractor/slang-cpp-extractor.vcxproj.filters b/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj.filters
index e5097b221..83789882f 100644
--- a/tools/slang-cpp-extractor/slang-cpp-extractor.vcxproj.filters
+++ b/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj.filters
@@ -9,54 +9,54 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\source\slang\slang-diagnostics.h">
+    <ClInclude Include="..\..\..\source\slang\slang-diagnostics.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\slang\slang-file-system.h">
+    <ClInclude Include="..\..\..\source\slang\slang-file-system.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\slang\slang-lexer.h">
+    <ClInclude Include="..\..\..\source\slang\slang-lexer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\slang\slang-name.h">
+    <ClInclude Include="..\..\..\source\slang\slang-name.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\slang\slang-source-loc.h">
+    <ClInclude Include="..\..\..\source\slang\slang-source-loc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\slang\slang-token.h">
+    <ClInclude Include="..\..\..\source\slang\slang-token.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="slang-cpp-extractor-diagnostic-defs.h">
+    <ClInclude Include="..\..\..\tools\slang-cpp-extractor\slang-cpp-extractor-diagnostic-defs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="slang-cpp-extractor-diagnostics.h">
+    <ClInclude Include="..\..\..\tools\slang-cpp-extractor\slang-cpp-extractor-diagnostics.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\source\slang\slang-diagnostics.cpp">
+    <ClCompile Include="..\..\..\source\slang\slang-diagnostics.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\slang\slang-file-system.cpp">
+    <ClCompile Include="..\..\..\source\slang\slang-file-system.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\slang\slang-lexer.cpp">
+    <ClCompile Include="..\..\..\source\slang\slang-lexer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\slang\slang-name.cpp">
+    <ClCompile Include="..\..\..\source\slang\slang-name.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\slang\slang-source-loc.cpp">
+    <ClCompile Include="..\..\..\source\slang\slang-source-loc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\slang\slang-token.cpp">
+    <ClCompile Include="..\..\..\source\slang\slang-token.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="slang-cpp-extractor-diagnostics.cpp">
+    <ClCompile Include="..\..\..\tools\slang-cpp-extractor\slang-cpp-extractor-diagnostics.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="slang-cpp-extractor-main.cpp">
+    <ClCompile Include="..\..\..\tools\slang-cpp-extractor\slang-cpp-extractor-main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/tools/slang-embed/slang-embed.vcxproj b/build/visual-studio/slang-embed/slang-embed.vcxproj
index 67ddcd6e8..85feb094a 100644
--- a/tools/slang-embed/slang-embed.vcxproj
+++ b/build/visual-studio/slang-embed/slang-embed.vcxproj
@@ -67,29 +67,29 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\windows-x86\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\debug\slang-embed\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\debug\slang-embed\</IntDir>
     <TargetName>slang-embed</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\windows-x64\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\debug\slang-embed\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\debug\slang-embed\</IntDir>
     <TargetName>slang-embed</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\windows-x86\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\release\slang-embed\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\release\slang-embed\</IntDir>
     <TargetName>slang-embed</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\windows-x64\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\release\slang-embed\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\release\slang-embed\</IntDir>
     <TargetName>slang-embed</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
@@ -158,10 +158,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="slang-embed.cpp" />
+    <ClCompile Include="..\..\..\tools\slang-embed\slang-embed.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\source\core\core.vcxproj">
+    <ProjectReference Include="..\core\core.vcxproj">
       <Project>{F9BE7957-8399-899E-0C49-E714FDDD4B65}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/tools/slang-embed/slang-embed.vcxproj.filters b/build/visual-studio/slang-embed/slang-embed.vcxproj.filters
index 56c2872ac..b0e124ebd 100644
--- a/tools/slang-embed/slang-embed.vcxproj.filters
+++ b/build/visual-studio/slang-embed/slang-embed.vcxproj.filters
@@ -6,7 +6,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="slang-embed.cpp">
+    <ClCompile Include="..\..\..\tools\slang-embed\slang-embed.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/tools/slang-generate/slang-generate.vcxproj b/build/visual-studio/slang-generate/slang-generate.vcxproj
index 39bcef167..f0238aa27 100644
--- a/tools/slang-generate/slang-generate.vcxproj
+++ b/build/visual-studio/slang-generate/slang-generate.vcxproj
@@ -67,29 +67,29 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\windows-x86\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\debug\slang-generate\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\debug\slang-generate\</IntDir>
     <TargetName>slang-generate</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\windows-x64\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\debug\slang-generate\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\debug\slang-generate\</IntDir>
     <TargetName>slang-generate</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\windows-x86\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\release\slang-generate\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\release\slang-generate\</IntDir>
     <TargetName>slang-generate</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\windows-x64\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\release\slang-generate\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\release\slang-generate\</IntDir>
     <TargetName>slang-generate</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
@@ -158,10 +158,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="main.cpp" />
+    <ClCompile Include="..\..\..\tools\slang-generate\main.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\source\core\core.vcxproj">
+    <ProjectReference Include="..\core\core.vcxproj">
       <Project>{F9BE7957-8399-899E-0C49-E714FDDD4B65}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/tools/slang-generate/slang-generate.vcxproj.filters b/build/visual-studio/slang-generate/slang-generate.vcxproj.filters
index e9ae1c092..74def4b00 100644
--- a/tools/slang-generate/slang-generate.vcxproj.filters
+++ b/build/visual-studio/slang-generate/slang-generate.vcxproj.filters
@@ -6,7 +6,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="..\..\..\tools\slang-generate\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/tools/slang-reflection-test/slang-reflection-test-tool.vcxproj b/build/visual-studio/slang-reflection-test-tool/slang-reflection-test-tool.vcxproj
index 51018db26..372771e63 100644
--- a/tools/slang-reflection-test/slang-reflection-test-tool.vcxproj
+++ b/build/visual-studio/slang-reflection-test-tool/slang-reflection-test-tool.vcxproj
@@ -67,29 +67,29 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\windows-x86\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\debug\slang-reflection-test-tool\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\debug\slang-reflection-test-tool\</IntDir>
     <TargetName>slang-reflection-test-tool</TargetName>
     <TargetExt>.dll</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\windows-x64\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\debug\slang-reflection-test-tool\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\debug\slang-reflection-test-tool\</IntDir>
     <TargetName>slang-reflection-test-tool</TargetName>
     <TargetExt>.dll</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\windows-x86\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\release\slang-reflection-test-tool\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\release\slang-reflection-test-tool\</IntDir>
     <TargetName>slang-reflection-test-tool</TargetName>
     <TargetExt>.dll</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\windows-x64\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\release\slang-reflection-test-tool\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\release\slang-reflection-test-tool\</IntDir>
     <TargetName>slang-reflection-test-tool</TargetName>
     <TargetExt>.dll</TargetExt>
   </PropertyGroup>
@@ -98,7 +98,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_DEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -106,7 +106,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>..\..\bin\windows-x86\debug\slang-reflection-test-tool.lib</ImportLibrary>
+      <ImportLibrary>..\..\..\bin\windows-x86\debug\slang-reflection-test-tool.lib</ImportLibrary>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -114,7 +114,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_DEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -122,7 +122,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>..\..\bin\windows-x64\debug\slang-reflection-test-tool.lib</ImportLibrary>
+      <ImportLibrary>..\..\..\bin\windows-x64\debug\slang-reflection-test-tool.lib</ImportLibrary>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -130,7 +130,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>NDEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -142,7 +142,7 @@
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <ImportLibrary>..\..\bin\windows-x86\release\slang-reflection-test-tool.lib</ImportLibrary>
+      <ImportLibrary>..\..\..\bin\windows-x86\release\slang-reflection-test-tool.lib</ImportLibrary>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -150,7 +150,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>NDEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -162,17 +162,17 @@
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <ImportLibrary>..\..\bin\windows-x64\release\slang-reflection-test-tool.lib</ImportLibrary>
+      <ImportLibrary>..\..\..\bin\windows-x64\release\slang-reflection-test-tool.lib</ImportLibrary>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="slang-reflection-test-main.cpp" />
+    <ClCompile Include="..\..\..\tools\slang-reflection-test\slang-reflection-test-main.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\source\core\core.vcxproj">
+    <ProjectReference Include="..\core\core.vcxproj">
       <Project>{F9BE7957-8399-899E-0C49-E714FDDD4B65}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\source\slang\slang.vcxproj">
+    <ProjectReference Include="..\slang\slang.vcxproj">
       <Project>{DB00DA62-0533-4AFD-B59F-A67D5B3A0808}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/tools/slang-reflection-test/slang-reflection-test-tool.vcxproj.filters b/build/visual-studio/slang-reflection-test-tool/slang-reflection-test-tool.vcxproj.filters
index 2e5dbea25..e44b7e3b8 100644
--- a/tools/slang-reflection-test/slang-reflection-test-tool.vcxproj.filters
+++ b/build/visual-studio/slang-reflection-test-tool/slang-reflection-test-tool.vcxproj.filters
@@ -6,7 +6,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="slang-reflection-test-main.cpp">
+    <ClCompile Include="..\..\..\tools\slang-reflection-test\slang-reflection-test-main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/tools/slang-test/slang-test.vcxproj b/build/visual-studio/slang-test/slang-test.vcxproj
index c667d294f..4a56eb437 100644
--- a/tools/slang-test/slang-test.vcxproj
+++ b/build/visual-studio/slang-test/slang-test.vcxproj
@@ -67,29 +67,29 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\windows-x86\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\debug\slang-test\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\debug\slang-test\</IntDir>
     <TargetName>slang-test</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\windows-x64\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\debug\slang-test\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\debug\slang-test\</IntDir>
     <TargetName>slang-test</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\windows-x86\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\release\slang-test\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\release\slang-test\</IntDir>
     <TargetName>slang-test</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\windows-x64\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\release\slang-test\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\release\slang-test\</IntDir>
     <TargetName>slang-test</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
@@ -98,7 +98,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -113,7 +113,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -128,7 +128,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -147,7 +147,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -162,38 +162,38 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="directory-util.h" />
-    <ClInclude Include="options.h" />
-    <ClInclude Include="slangc-tool.h" />
-    <ClInclude Include="test-context.h" />
-    <ClInclude Include="test-reporter.h" />
+    <ClInclude Include="..\..\..\tools\slang-test\directory-util.h" />
+    <ClInclude Include="..\..\..\tools\slang-test\options.h" />
+    <ClInclude Include="..\..\..\tools\slang-test\slangc-tool.h" />
+    <ClInclude Include="..\..\..\tools\slang-test\test-context.h" />
+    <ClInclude Include="..\..\..\tools\slang-test\test-reporter.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="directory-util.cpp" />
-    <ClCompile Include="options.cpp" />
-    <ClCompile Include="slang-test-main.cpp" />
-    <ClCompile Include="slangc-tool.cpp" />
-    <ClCompile Include="test-context.cpp" />
-    <ClCompile Include="test-reporter.cpp" />
-    <ClCompile Include="unit-offset-container.cpp" />
-    <ClCompile Include="unit-test-byte-encode.cpp" />
-    <ClCompile Include="unit-test-compression.cpp" />
-    <ClCompile Include="unit-test-find-type-by-name.cpp" />
-    <ClCompile Include="unit-test-free-list.cpp" />
-    <ClCompile Include="unit-test-memory-arena.cpp" />
-    <ClCompile Include="unit-test-path.cpp" />
-    <ClCompile Include="unit-test-riff.cpp" />
-    <ClCompile Include="unit-test-short-list.cpp" />
-    <ClCompile Include="unit-test-string.cpp" />
+    <ClCompile Include="..\..\..\tools\slang-test\directory-util.cpp" />
+    <ClCompile Include="..\..\..\tools\slang-test\options.cpp" />
+    <ClCompile Include="..\..\..\tools\slang-test\slang-test-main.cpp" />
+    <ClCompile Include="..\..\..\tools\slang-test\slangc-tool.cpp" />
+    <ClCompile Include="..\..\..\tools\slang-test\test-context.cpp" />
+    <ClCompile Include="..\..\..\tools\slang-test\test-reporter.cpp" />
+    <ClCompile Include="..\..\..\tools\slang-test\unit-offset-container.cpp" />
+    <ClCompile Include="..\..\..\tools\slang-test\unit-test-byte-encode.cpp" />
+    <ClCompile Include="..\..\..\tools\slang-test\unit-test-compression.cpp" />
+    <ClCompile Include="..\..\..\tools\slang-test\unit-test-find-type-by-name.cpp" />
+    <ClCompile Include="..\..\..\tools\slang-test\unit-test-free-list.cpp" />
+    <ClCompile Include="..\..\..\tools\slang-test\unit-test-memory-arena.cpp" />
+    <ClCompile Include="..\..\..\tools\slang-test\unit-test-path.cpp" />
+    <ClCompile Include="..\..\..\tools\slang-test\unit-test-riff.cpp" />
+    <ClCompile Include="..\..\..\tools\slang-test\unit-test-short-list.cpp" />
+    <ClCompile Include="..\..\..\tools\slang-test\unit-test-string.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\source\core\core.vcxproj">
+    <ProjectReference Include="..\core\core.vcxproj">
       <Project>{F9BE7957-8399-899E-0C49-E714FDDD4B65}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\source\slang\slang.vcxproj">
+    <ProjectReference Include="..\slang\slang.vcxproj">
       <Project>{DB00DA62-0533-4AFD-B59F-A67D5B3A0808}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\source\miniz\miniz.vcxproj">
+    <ProjectReference Include="..\miniz\miniz.vcxproj">
       <Project>{E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/tools/slang-test/slang-test.vcxproj.filters b/build/visual-studio/slang-test/slang-test.vcxproj.filters
index e31239bc6..8718a4d86 100644
--- a/tools/slang-test/slang-test.vcxproj.filters
+++ b/build/visual-studio/slang-test/slang-test.vcxproj.filters
@@ -9,69 +9,69 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="directory-util.h">
+    <ClInclude Include="..\..\..\tools\slang-test\directory-util.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="options.h">
+    <ClInclude Include="..\..\..\tools\slang-test\options.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="slangc-tool.h">
+    <ClInclude Include="..\..\..\tools\slang-test\slangc-tool.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="test-context.h">
+    <ClInclude Include="..\..\..\tools\slang-test\test-context.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="test-reporter.h">
+    <ClInclude Include="..\..\..\tools\slang-test\test-reporter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="directory-util.cpp">
+    <ClCompile Include="..\..\..\tools\slang-test\directory-util.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="options.cpp">
+    <ClCompile Include="..\..\..\tools\slang-test\options.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="slang-test-main.cpp">
+    <ClCompile Include="..\..\..\tools\slang-test\slang-test-main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="slangc-tool.cpp">
+    <ClCompile Include="..\..\..\tools\slang-test\slangc-tool.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="test-context.cpp">
+    <ClCompile Include="..\..\..\tools\slang-test\test-context.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="test-reporter.cpp">
+    <ClCompile Include="..\..\..\tools\slang-test\test-reporter.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="unit-offset-container.cpp">
+    <ClCompile Include="..\..\..\tools\slang-test\unit-offset-container.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="unit-test-byte-encode.cpp">
+    <ClCompile Include="..\..\..\tools\slang-test\unit-test-byte-encode.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="unit-test-compression.cpp">
+    <ClCompile Include="..\..\..\tools\slang-test\unit-test-compression.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="unit-test-find-type-by-name.cpp">
+    <ClCompile Include="..\..\..\tools\slang-test\unit-test-find-type-by-name.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="unit-test-free-list.cpp">
+    <ClCompile Include="..\..\..\tools\slang-test\unit-test-free-list.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="unit-test-memory-arena.cpp">
+    <ClCompile Include="..\..\..\tools\slang-test\unit-test-memory-arena.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="unit-test-path.cpp">
+    <ClCompile Include="..\..\..\tools\slang-test\unit-test-path.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="unit-test-riff.cpp">
+    <ClCompile Include="..\..\..\tools\slang-test\unit-test-riff.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="unit-test-short-list.cpp">
+    <ClCompile Include="..\..\..\tools\slang-test\unit-test-short-list.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="unit-test-string.cpp">
+    <ClCompile Include="..\..\..\tools\slang-test\unit-test-string.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/build/visual-studio/slang/slang.vcxproj b/build/visual-studio/slang/slang.vcxproj
new file mode 100644
index 000000000..21c80b11e
--- /dev/null
+++ b/build/visual-studio/slang/slang.vcxproj
@@ -0,0 +1,443 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{DB00DA62-0533-4AFD-B59F-A67D5B3A0808}</ProjectGuid>
+    <IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>slang</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>..\..\..\bin\windows-x86\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\debug\slang\</IntDir>
+    <TargetName>slang</TargetName>
+    <TargetExt>.dll</TargetExt>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>..\..\..\bin\windows-x64\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\debug\slang\</IntDir>
+    <TargetName>slang</TargetName>
+    <TargetExt>.dll</TargetExt>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>..\..\..\bin\windows-x86\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\release\slang\</IntDir>
+    <TargetName>slang</TargetName>
+    <TargetExt>.dll</TargetExt>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>..\..\..\bin\windows-x64\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\release\slang\</IntDir>
+    <TargetName>slang</TargetName>
+    <TargetExt>.dll</TargetExt>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <PreprocessorDefinitions>_DEBUG;SLANG_DYNAMIC_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\external\spirv-headers\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <Optimization>Disabled</Optimization>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ImportLibrary>..\..\..\bin\windows-x86\debug\slang.lib</ImportLibrary>
+      <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
+    </Link>
+    <PostBuildEvent>
+      <Command>IF EXIST ..\..\..\external\slang-binaries\bin\windows-x86\slang-glslang.dll\ (xcopy /Q /E /Y /I ..\..\..\external\slang-binaries\bin\windows-x86\slang-glslang.dll ..\..\..\bin\windows-x86\debug &gt; nul) ELSE (xcopy /Q /Y /I ..\..\..\external\slang-binaries\bin\windows-x86\slang-glslang.dll ..\..\..\bin\windows-x86\debug &gt; nul)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <PreprocessorDefinitions>_DEBUG;SLANG_DYNAMIC_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\external\spirv-headers\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <Optimization>Disabled</Optimization>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ImportLibrary>..\..\..\bin\windows-x64\debug\slang.lib</ImportLibrary>
+      <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
+    </Link>
+    <PostBuildEvent>
+      <Command>IF EXIST ..\..\..\external\slang-binaries\bin\windows-x64\slang-glslang.dll\ (xcopy /Q /E /Y /I ..\..\..\external\slang-binaries\bin\windows-x64\slang-glslang.dll ..\..\..\bin\windows-x64\debug &gt; nul) ELSE (xcopy /Q /Y /I ..\..\..\external\slang-binaries\bin\windows-x64\slang-glslang.dll ..\..\..\bin\windows-x64\debug &gt; nul)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <PreprocessorDefinitions>NDEBUG;SLANG_DYNAMIC_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\external\spirv-headers\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <Optimization>Full</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <ImportLibrary>..\..\..\bin\windows-x86\release\slang.lib</ImportLibrary>
+      <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
+    </Link>
+    <PostBuildEvent>
+      <Command>IF EXIST ..\..\..\external\slang-binaries\bin\windows-x86\slang-glslang.dll\ (xcopy /Q /E /Y /I ..\..\..\external\slang-binaries\bin\windows-x86\slang-glslang.dll ..\..\..\bin\windows-x86\release &gt; nul) ELSE (xcopy /Q /Y /I ..\..\..\external\slang-binaries\bin\windows-x86\slang-glslang.dll ..\..\..\bin\windows-x86\release &gt; nul)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <PreprocessorDefinitions>NDEBUG;SLANG_DYNAMIC_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\external\spirv-headers\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <Optimization>Full</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <ImportLibrary>..\..\..\bin\windows-x64\release\slang.lib</ImportLibrary>
+      <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
+    </Link>
+    <PostBuildEvent>
+      <Command>IF EXIST ..\..\..\external\slang-binaries\bin\windows-x64\slang-glslang.dll\ (xcopy /Q /E /Y /I ..\..\..\external\slang-binaries\bin\windows-x64\slang-glslang.dll ..\..\..\bin\windows-x64\release &gt; nul) ELSE (xcopy /Q /Y /I ..\..\..\external\slang-binaries\bin\windows-x64\slang-glslang.dll ..\..\..\bin\windows-x64\release &gt; nul)</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\slang.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ast-all.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ast-base.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ast-builder.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ast-decl.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ast-dump.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ast-expr.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ast-modifier.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ast-reflect.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ast-stmt.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ast-support-types.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ast-type.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ast-val.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-check-impl.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-check.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-compiler.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-diagnostic-defs.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-diagnostics.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-emit-c-like.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-emit-cpp.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-emit-cuda.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-emit-glsl.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-emit-hlsl.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-emit-precedence.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-emit-source-writer.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-emit.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-file-system.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-glsl-extension-tracker.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-hlsl-intrinsic-set.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-image-format-defs.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-include-system.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-any-value-marshalling.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-augment-make-existential.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-bind-existentials.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-byte-address-legalize.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-clone.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-collect-global-uniforms.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-constexpr.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-dce.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-dominators.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-entry-point-raw-ptr-params.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-entry-point-uniforms.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-explicit-global-context.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-explicit-global-init.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-generics-lowering-context.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-glsl-legalize.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-hoist-local-types.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-inline.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-inst-defs.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-insts.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-layout.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-legalize-varying-params.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-link.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-lower-existential.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-lower-generic-call.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-lower-generic-function.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-lower-generic-type.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-lower-generics.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-lower-tuple-types.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-missing-return.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-restructure-scoping.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-restructure.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-sccp.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-specialize-arrays.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-specialize-dispatch.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-specialize-dynamic-associatedtype-lookup.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-specialize-function-call.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-specialize-resources.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-specialize.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-ssa.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-string-hash.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-strip-witness-tables.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-strip.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-synthesize-active-mask.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-type-set.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-union.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-validate.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-witness-table-wrapper.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-wrap-structured-buffers.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-legalize-types.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-lexer.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-lookup.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-lower-to-ir.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-mangle.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-mangled-lexer.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-name.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-options.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-parameter-binding.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-parser.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-preprocessor.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-profile-defs.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-profile.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ref-object-reflect.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-repro.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-serialize-ast-type-info.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-serialize-ast.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-serialize-container.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-serialize-factory.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-serialize-ir-types.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-serialize-ir.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-serialize-misc-type-info.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-serialize-reflection.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-serialize-source-loc.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-serialize-type-info.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-serialize-types.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-serialize-value-type-info.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-serialize.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-source-loc.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-syntax.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-token-defs.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-token.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-type-layout.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-type-system-shared.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-value-reflect.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-visitor.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\prelude\slang-cpp-prelude.h.cpp" />
+    <ClCompile Include="..\..\..\prelude\slang-cuda-prelude.h.cpp" />
+    <ClCompile Include="..\..\..\prelude\slang-hlsl-prelude.h.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-api.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ast-builder.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ast-decl.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ast-dump.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ast-reflect.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ast-substitutions.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ast-type.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ast-val.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-check-conformance.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-check-constraint.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-check-conversion.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-check-decl.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-check-expr.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-check-modifier.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-check-overload.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-check-shader.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-check-stmt.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-check-type.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-check.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-compiler.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-diagnostics.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-dxc-support.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-emit-c-like.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-emit-cpp.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-emit-cuda.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-emit-glsl.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-emit-hlsl.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-emit-precedence.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-emit-source-writer.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-emit-spirv.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-emit.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-file-system.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-glsl-extension-tracker.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-hlsl-intrinsic-set.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-include-system.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-any-value-marshalling.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-augment-make-existential.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-bind-existentials.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-byte-address-legalize.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-clone.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-collect-global-uniforms.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-constexpr.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-dce.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-deduplicate.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-dominators.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-entry-point-raw-ptr-params.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-entry-point-uniforms.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-explicit-global-context.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-explicit-global-init.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-generics-lowering-context.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-glsl-legalize.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-hoist-local-types.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-inline.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-layout.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-legalize-types.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-legalize-varying-params.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-link.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-lower-existential.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-lower-generic-call.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-lower-generic-function.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-lower-generic-type.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-lower-generics.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-lower-tuple-types.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-missing-return.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-restructure-scoping.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-restructure.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-sccp.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-specialize-arrays.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-specialize-dispatch.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-specialize-dynamic-associatedtype-lookup.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-specialize-function-call.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-specialize-resources.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-specialize.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-ssa.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-string-hash.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-strip-witness-tables.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-strip.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-synthesize-active-mask.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-type-set.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-union.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-validate.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-witness-table-wrapper.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-wrap-structured-buffers.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-legalize-types.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-lexer.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-lookup.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-lower-to-ir.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-mangle.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-mangled-lexer.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-name.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-options.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-parameter-binding.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-parser.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-preprocessor.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-profile.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ref-object-reflect.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-reflection-api.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-repro.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-serialize-ast.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-serialize-container.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-serialize-factory.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-serialize-ir-types.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-serialize-ir.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-serialize-reflection.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-serialize-source-loc.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-serialize-types.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-serialize.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-source-loc.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-stdlib.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-syntax.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-token.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-type-layout.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-type-system-shared.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-value-reflect.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\source\slang\core.meta.slang" />
+    <None Include="..\..\..\source\slang\hlsl.meta.slang" />
+  </ItemGroup>
+  <ItemGroup>
+    <Natvis Include="..\..\..\source\core\core.natvis" />
+    <Natvis Include="..\..\..\source\slang\slang.natvis" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\core\core.vcxproj">
+      <Project>{F9BE7957-8399-899E-0C49-E714FDDD4B65}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/build/visual-studio/slang/slang.vcxproj.filters b/build/visual-studio/slang/slang.vcxproj.filters
new file mode 100644
index 000000000..d83093235
--- /dev/null
+++ b/build/visual-studio/slang/slang.vcxproj.filters
@@ -0,0 +1,736 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{21EB8090-0D4E-1035-B6D3-48EBA215DCB7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\slang.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ast-all.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ast-base.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ast-builder.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ast-decl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ast-dump.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ast-expr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ast-modifier.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ast-reflect.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ast-stmt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ast-support-types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ast-type.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ast-val.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-check-impl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-check.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-compiler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-diagnostic-defs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-diagnostics.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-emit-c-like.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-emit-cpp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-emit-cuda.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-emit-glsl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-emit-hlsl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-emit-precedence.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-emit-source-writer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-emit.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-file-system.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-glsl-extension-tracker.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-hlsl-intrinsic-set.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-image-format-defs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-include-system.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-any-value-marshalling.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-augment-make-existential.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-bind-existentials.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-byte-address-legalize.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-clone.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-collect-global-uniforms.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-constexpr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-dce.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-dominators.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-entry-point-raw-ptr-params.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-entry-point-uniforms.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-explicit-global-context.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-explicit-global-init.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-generics-lowering-context.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-glsl-legalize.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-hoist-local-types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-inline.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-inst-defs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-insts.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-layout.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-legalize-varying-params.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-link.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-lower-existential.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-lower-generic-call.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-lower-generic-function.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-lower-generic-type.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-lower-generics.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-lower-tuple-types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-missing-return.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-restructure-scoping.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-restructure.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-sccp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-specialize-arrays.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-specialize-dispatch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-specialize-dynamic-associatedtype-lookup.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-specialize-function-call.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-specialize-resources.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-specialize.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-ssa.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-string-hash.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-strip-witness-tables.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-strip.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-synthesize-active-mask.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-type-set.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-union.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-validate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-witness-table-wrapper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-wrap-structured-buffers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-legalize-types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-lexer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-lookup.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-lower-to-ir.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-mangle.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-mangled-lexer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-name.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-options.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-parameter-binding.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-parser.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-preprocessor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-profile-defs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-profile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ref-object-reflect.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-repro.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-serialize-ast-type-info.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-serialize-ast.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-serialize-container.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-serialize-factory.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-serialize-ir-types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-serialize-ir.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-serialize-misc-type-info.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-serialize-reflection.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-serialize-source-loc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-serialize-type-info.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-serialize-types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-serialize-value-type-info.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-serialize.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-source-loc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-syntax.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-token-defs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-token.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-type-layout.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-type-system-shared.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-value-reflect.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-visitor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\prelude\slang-cpp-prelude.h.cpp">
+      <Filter>Header Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\prelude\slang-cuda-prelude.h.cpp">
+      <Filter>Header Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\prelude\slang-hlsl-prelude.h.cpp">
+      <Filter>Header Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-api.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ast-builder.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ast-decl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ast-dump.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ast-reflect.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ast-substitutions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ast-type.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ast-val.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-check-conformance.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-check-constraint.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-check-conversion.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-check-decl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-check-expr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-check-modifier.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-check-overload.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-check-shader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-check-stmt.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-check-type.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-check.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-compiler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-diagnostics.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-dxc-support.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-emit-c-like.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-emit-cpp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-emit-cuda.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-emit-glsl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-emit-hlsl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-emit-precedence.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-emit-source-writer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-emit-spirv.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-emit.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-file-system.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-glsl-extension-tracker.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-hlsl-intrinsic-set.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-include-system.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-any-value-marshalling.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-augment-make-existential.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-bind-existentials.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-byte-address-legalize.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-clone.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-collect-global-uniforms.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-constexpr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-dce.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-deduplicate.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-dominators.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-entry-point-raw-ptr-params.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-entry-point-uniforms.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-explicit-global-context.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-explicit-global-init.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-generics-lowering-context.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-glsl-legalize.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-hoist-local-types.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-inline.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-layout.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-legalize-types.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-legalize-varying-params.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-link.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-lower-existential.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-lower-generic-call.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-lower-generic-function.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-lower-generic-type.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-lower-generics.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-lower-tuple-types.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-missing-return.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-restructure-scoping.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-restructure.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-sccp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-specialize-arrays.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-specialize-dispatch.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-specialize-dynamic-associatedtype-lookup.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-specialize-function-call.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-specialize-resources.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-specialize.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-ssa.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-string-hash.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-strip-witness-tables.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-strip.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-synthesize-active-mask.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-type-set.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-union.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-validate.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-witness-table-wrapper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-wrap-structured-buffers.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-legalize-types.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-lexer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-lookup.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-lower-to-ir.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-mangle.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-mangled-lexer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-name.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-options.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-parameter-binding.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-parser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-preprocessor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-profile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ref-object-reflect.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-reflection-api.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-repro.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-serialize-ast.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-serialize-container.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-serialize-factory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-serialize-ir-types.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-serialize-ir.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-serialize-reflection.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-serialize-source-loc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-serialize-types.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-serialize.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-source-loc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-stdlib.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-syntax.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-token.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-type-layout.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-type-system-shared.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-value-reflect.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\source\slang\core.meta.slang">
+      <Filter>Source Files</Filter>
+    </None>
+    <None Include="..\..\..\source\slang\hlsl.meta.slang">
+      <Filter>Source Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Natvis Include="..\..\..\source\core\core.natvis">
+      <Filter>Source Files</Filter>
+    </Natvis>
+    <Natvis Include="..\..\..\source\slang\slang.natvis">
+      <Filter>Source Files</Filter>
+    </Natvis>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/source/slangc/slangc.vcxproj b/build/visual-studio/slangc/slangc.vcxproj
index 77a7dcea5..b05f61ae7 100644
--- a/source/slangc/slangc.vcxproj
+++ b/build/visual-studio/slangc/slangc.vcxproj
@@ -67,29 +67,29 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\windows-x86\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\debug\slangc\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\debug\slangc\</IntDir>
     <TargetName>slangc</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\windows-x64\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\debug\slangc\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\debug\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\debug\slangc\</IntDir>
     <TargetName>slangc</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\windows-x86\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\release\slangc\</IntDir>
+    <OutDir>..\..\..\bin\windows-x86\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x86\release\slangc\</IntDir>
     <TargetName>slangc</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\windows-x64\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\release\slangc\</IntDir>
+    <OutDir>..\..\..\bin\windows-x64\release\</OutDir>
+    <IntDir>..\..\..\intermediate\windows-x64\release\slangc\</IntDir>
     <TargetName>slangc</TargetName>
     <TargetExt>.exe</TargetExt>
   </PropertyGroup>
@@ -158,7 +158,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="main.cpp" />
+    <ClCompile Include="..\..\..\source\slangc\main.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\core\core.vcxproj">
diff --git a/source/slangc/slangc.vcxproj.filters b/build/visual-studio/slangc/slangc.vcxproj.filters
index e9ae1c092..216e5673a 100644
--- a/source/slangc/slangc.vcxproj.filters
+++ b/build/visual-studio/slangc/slangc.vcxproj.filters
@@ -6,7 +6,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="..\..\..\source\slangc\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/premake5.lua b/premake5.lua
index bc0154319..2cdaf45ef 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -154,7 +154,7 @@ if enableCuda then
 end
 
 -- Is true when the target is really windows (ie not something on top of windows like cygwin)
-local isTargetWindows = (os.target() == "windows") and not (targetDetail == "mingw" or targetDetail == "cygwin")
+isTargetWindows = (os.target() == "windows") and not (targetDetail == "mingw" or targetDetail == "cygwin")
 
 -- Even if we have the nvapi path, we only want to currently enable on windows targets
 
@@ -163,7 +163,6 @@ enableNvapi = not not (os.isdir(nvapiPath) and isTargetWindows and _OPTIONS["ena
 if enableNvapi then
     printf("Enabled NVAPI")
 end
-
 overrideModule = {}
 local overrideModulePath = _OPTIONS["override-module"]
 if overrideModulePath then
@@ -201,9 +200,13 @@ workspace "slang"
     -- and configuration options, e.g. `bin/windows-x64/debug/`
     targetdir("bin/" .. targetName .. "/%{cfg.buildcfg:lower()}")
 
+    -- C++11 
+    cppdialect "C++11"
     -- Statically link to the C/C++ runtime rather than create a DLL dependency.
-    flags { "StaticRuntime", "C++11" }
-
+    staticruntime "On"
+    
+    -- Statically link to the C/C++ runtime rather than create a DLL dependency.
+    
     -- Once we've set up the common settings, we will make some tweaks
     -- that only apply in a subset of cases. Each call to `filter()`
     -- changes the "active" filter for subsequent commands. In
@@ -315,6 +318,24 @@ function addSourceDir(path)
 end
 
 --
+-- A function to return a name to place project files under 
+-- in build directory
+--
+-- This is complicated in so far as when this is used (with location for example)
+-- we can't use Tokens 
+-- https://github.com/premake/premake-core/wiki/Tokens
+
+function getBuildLocationName()
+    if not not targetDetail then
+        return targetDetail
+    elseif isTargetWindows then
+        return "visual-studio"
+    else
+        return os.target()
+    end 
+end
+
+--
 -- Next we will define a helper routine that all of our
 -- projects will bottleneck through. Here `name` is
 -- the name for the project (and the base name for
@@ -326,10 +347,8 @@ end
 --
 --      baseSlangProject("slangc", "source/slangc")
 --
--- NOTE! This function does not add any source from the sourceDir
--- add the source after calling this function with 'addSourceDir', or 
--- use `baseSlangProjectAddFiles`
---
+-- NOTE! This function will add any source from the sourceDir, *if* it's specified. 
+-- Pass nil if adding files is not wanted.
 function baseSlangProject(name, sourceDir)
 
     -- Start a new project in premake. This switches
@@ -344,30 +363,24 @@ function baseSlangProject(name, sourceDir)
     -- projects. If we don't have a stable UUID, then the
     -- output files might have spurious diffs whenever we
     -- re-run premake generation.
-    uuid(os.uuid(name .. '|' .. sourceDir))
-
-    -- Set the location where the project file will be placed.
-    -- We set the project files to reside in their source
-    -- directory, because in Visual Studio the default
-    -- working directory when launching a project in the
-    -- debugger is its project directory. This ensures that
-    -- examples will work as expected for VS users.
-    --
-    -- TODO: consider only setting this for examples, since
-    -- it is less relevant to other projects.
-    --
-
-    location(sourceDir)
     
-    if os.target() == "windows" then
+    if sourceDir then
+        uuid(os.uuid(name .. '|' .. sourceDir))
     else
-        location "intermediate/project/%{prj.name}"
+        -- If we don't have a sourceDir, the name will have to be enough
+        uuid(os.uuid(name))
     end
+
+    -- Location could do with a better name than 'other' - but it seems as if %{cfg.buildcfg:lower()} and similar variables
+    -- is not available for location to expand. 
+    location("build/" .. getBuildLocationName() .. "/" .. name)
+
     
     -- The intermediate ("object") directory will use a similar
     -- naming scheme to the output directory, but will also use
     -- the project name to avoid cases where multiple projects
     -- have source files with the same name.
+    --
     objdir("intermediate/" .. targetName .. "/%{cfg.buildcfg:lower()}/%{prj.name}")
     
     -- All of our projects are written in C++.
@@ -404,25 +417,19 @@ function baseSlangProject(name, sourceDir)
     if overrideModule.addBaseProjectOptions then
         overrideModule.addBaseProjectOptions()
     end
-end
-
-function baseSlangProjectAddFiles(name, sourceDir)
-    
-    --
-    -- Set up the base project
-    --
-
-    baseSlangProject(name, sourceDir)
     
     --
     -- Add the files in the sourceDir
     -- NOTE! This doesn't recursively add files in subdirectories
     --
     
-    addSourceDir(sourceDir)
+    if not not sourceDir then
+        addSourceDir(sourceDir)
+    end
 end
 
--- We can now use the `baseSlangProjectAddFiles()` subroutine to
+
+-- We can now use the `baseSlangProject()` subroutine to
 -- define helpers for the different categories of project
 -- in our source tree.
 --
@@ -445,7 +452,7 @@ function tool(name)
     -- Now we invoke our shared project configuration logic,
     -- specifying that the project lives under the `tools/` path.
     --
-    baseSlangProjectAddFiles(name, "tools/" .. name)
+    baseSlangProject(name, "tools/" .. name)
     
     -- Finally, we set the project "kind" to produce a console
     -- application. This is a reasonable default for tools,
@@ -459,7 +466,7 @@ end
 -- "Standard" projects will be those that go to make the binary
 -- packages for slang: the shared libraries and executables.
 --
-function standardProject(name)
+function standardProject(name, sourceDir)
     -- Because Premake is stateful, any `group()` call by another
     -- project would still be in effect when we create a project
     -- here (e.g., if somebody had called `tool()` before
@@ -468,16 +475,15 @@ function standardProject(name)
     --
     group ""
 
-    -- A standard project has its code under `source/`
-    --
-    baseSlangProjectAddFiles(name, "source/" .. name)
+    baseSlangProject(name, sourceDir)
 end
 
+
 function toolSharedLibrary(name)
     group "test-tool"
     -- specifying that the project lives under the `tools/` path.
     --
-    baseSlangProjectAddFiles(name .. "-tool", "tools/" .. name)
+    baseSlangProject(name .. "-tool", "tools/" .. name)
     
     defines { "SLANG_SHARED_LIBRARY_TOOL" }
    
@@ -491,7 +497,7 @@ function example(name)
     group "examples"
 
     -- They have their source code under `examples/<project-name>/`
-    baseSlangProjectAddFiles(name, "examples/" .. name)
+    baseSlangProject(name, "examples/" .. name)
 
     -- By default, all of our examples are GUI applications. One some
     -- platforms there is no meaningful distinction between GUI and
@@ -574,7 +580,7 @@ example "cpu-hello-world"
 -- and the various tool projects. It's build is pretty simple:
 --
 
-standardProject "core"
+standardProject("core", "source/core")
     uuid "F9BE7957-8399-899E-0C49-E714FDDD4B65"
     kind "StaticLib"
 
@@ -793,12 +799,12 @@ tool "gfx"
 -- it also depends on `core`:
 --
 
-standardProject "slangc"
+standardProject("slangc", "source/slangc")
     uuid "D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7"
     kind "ConsoleApp"
     links { "core", "slang" }
     
-generatorProject("run-generators", "source/slang/")
+generatorProject("run-generators", nil)
     
     -- We make 'source/slang' the location of the source, to make paths to source
     -- relative to that
@@ -954,7 +960,7 @@ generatorProject("run-generators", "source/slang/")
 -- First up is the `slang` dynamic library project:
 --
 
-standardProject "slang"
+standardProject("slang", "source/slang")
     uuid "DB00DA62-0533-4AFD-B59F-A67D5B3A0808"
     kind "SharedLib"
     links { "core" }
@@ -1002,7 +1008,7 @@ standardProject "slang"
     if not buildGlslang then
         filter { "system:windows" }
             postbuildcommands {
-                "{COPY} ../../external/slang-binaries/bin/" .. targetName .. "/slang-glslang.dll %{cfg.targetdir}"
+                "{COPY} ../../../external/slang-binaries/bin/" .. targetName .. "/slang-glslang.dll %{cfg.targetdir}"
             }
 
         filter { "system:linux" }
@@ -1058,10 +1064,11 @@ if enableProfile then
 
 end
 
-standardProject "miniz"
+standardProject("miniz", nil)
     uuid "E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F"
     kind "StaticLib"
 
+    -- Add the files explicitly
     files
     {
         "external/miniz/miniz.c",
@@ -1077,7 +1084,7 @@ standardProject "miniz"
 
 if buildGlslang then
 
-standardProject "slang-spirv-tools"
+standardProject("slang-spirv-tools", nil)
     uuid "C36F6185-49B3-467E-8388-D0E9BF5F7BB8"
     kind "StaticLib"
     includedirs { "external/spirv-tools", "external/spirv-tools/include", "external/spirv-headers/include",  "external/spirv-tools-generated"}
@@ -1103,7 +1110,7 @@ standardProject "slang-spirv-tools"
 -- The following is a tailored build of glslang that pulls in the pieces we care
 -- about whle trying to leave out the rest:
 --
-standardProject "slang-glslang"
+standardProject("slang-glslang", nil)
     uuid "C495878A-832C-485B-B347-0998A90CC936"
     kind "SharedLib"
     includedirs { "external/glslang", "external/spirv-tools", "external/spirv-tools/include", "external/spirv-headers/include",  "external/spirv-tools-generated", "external/glslang-generated" }
diff --git a/slang.sln b/slang.sln
index dc52f6d78..9ffa3b4d3 100644
--- a/slang.sln
+++ b/slang.sln
@@ -1,55 +1,55 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "source\core\core.vcxproj", "{F9BE7957-8399-899E-0C49-E714FDDD4B65}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "build\visual-studio\core\core.vcxproj", "{F9BE7957-8399-899E-0C49-E714FDDD4B65}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{EB5FC2C6-D72D-B6CC-C0C1-26F3AC2E9231}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpu-hello-world", "examples\cpu-hello-world\cpu-hello-world.vcxproj", "{4B47A364-37C4-96A7-6041-97BB4C1D333B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpu-hello-world", "build\visual-studio\cpu-hello-world\cpu-hello-world.vcxproj", "{4B47A364-37C4-96A7-6041-97BB4C1D333B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpu-printing", "examples\gpu-printing\gpu-printing.vcxproj", "{57C81DD3-4304-213D-AC16-39349871C957}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpu-printing", "build\visual-studio\gpu-printing\gpu-printing.vcxproj", "{57C81DD3-4304-213D-AC16-39349871C957}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hello-world", "examples\hello-world\hello-world.vcxproj", "{010BE414-ED5B-CF56-16C0-BD18027062C0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hello-world", "build\visual-studio\hello-world\hello-world.vcxproj", "{010BE414-ED5B-CF56-16C0-BD18027062C0}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "heterogeneous-hello-world", "examples\heterogeneous-hello-world\heterogeneous-hello-world.vcxproj", "{150CAA5A-0177-6A66-AA92-CFCB96DC2D49}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "heterogeneous-hello-world", "build\visual-studio\heterogeneous-hello-world\heterogeneous-hello-world.vcxproj", "{150CAA5A-0177-6A66-AA92-CFCB96DC2D49}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "model-viewer", "examples\model-viewer\model-viewer.vcxproj", "{2F8724C6-1BC3-2730-84D5-3F277030D04A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "model-viewer", "build\visual-studio\model-viewer\model-viewer.vcxproj", "{2F8724C6-1BC3-2730-84D5-3F277030D04A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "generator", "generator", "{F3AB4ED5-5F37-BC99-6848-3F8ED452189A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "run-generators", "source\slang\run-generators.vcxproj", "{811F1997-6DDA-0843-1692-818D022C53D3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "run-generators", "build\visual-studio\run-generators\run-generators.vcxproj", "{E145B2B8-CD13-A6BE-B6A7-16E5A2148223}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CA8A30D1-8FA9-4330-B7F7-84709246D8DC} = {CA8A30D1-8FA9-4330-B7F7-84709246D8DC}
 		{66174227-8541-41FC-A6DF-4764FC66F78E} = {66174227-8541-41FC-A6DF-4764FC66F78E}
 		{7F773DD9-EB8F-2403-B43C-B49C2014B99C} = {7F773DD9-EB8F-2403-B43C-B49C2014B99C}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniz", "source\miniz\miniz.vcxproj", "{E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniz", "build\visual-studio\miniz\miniz.vcxproj", "{E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang", "source\slang\slang.vcxproj", "{DB00DA62-0533-4AFD-B59F-A67D5B3A0808}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang", "build\visual-studio\slang\slang.vcxproj", "{DB00DA62-0533-4AFD-B59F-A67D5B3A0808}"
 	ProjectSection(ProjectDependencies) = postProject
-		{811F1997-6DDA-0843-1692-818D022C53D3} = {811F1997-6DDA-0843-1692-818D022C53D3}
+		{E145B2B8-CD13-A6BE-B6A7-16E5A2148223} = {E145B2B8-CD13-A6BE-B6A7-16E5A2148223}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slangc", "source\slangc\slangc.vcxproj", "{D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slangc", "build\visual-studio\slangc\slangc.vcxproj", "{D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test-tool", "test-tool", "{57B5AA5E-C340-1823-CC51-9B17385C7423}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "render-test-tool", "tools\render-test\render-test-tool.vcxproj", "{61F7EB00-7281-4BF3-9470-7C2EA92620C3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "render-test-tool", "build\visual-studio\render-test-tool\render-test-tool.vcxproj", "{61F7EB00-7281-4BF3-9470-7C2EA92620C3}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-reflection-test-tool", "tools\slang-reflection-test\slang-reflection-test-tool.vcxproj", "{C5ACCA6E-C04D-4B36-8516-3752B3C13C2F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-reflection-test-tool", "build\visual-studio\slang-reflection-test-tool\slang-reflection-test-tool.vcxproj", "{C5ACCA6E-C04D-4B36-8516-3752B3C13C2F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{FD47AE19-69FD-260F-F2F1-20E65EA61D13}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gfx", "tools\gfx\gfx.vcxproj", "{222F7498-B40C-4F3F-A704-DDEB91A4484A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gfx", "build\visual-studio\gfx\gfx.vcxproj", "{222F7498-B40C-4F3F-A704-DDEB91A4484A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-cpp-extractor", "tools\slang-cpp-extractor\slang-cpp-extractor.vcxproj", "{CA8A30D1-8FA9-4330-B7F7-84709246D8DC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-cpp-extractor", "build\visual-studio\slang-cpp-extractor\slang-cpp-extractor.vcxproj", "{CA8A30D1-8FA9-4330-B7F7-84709246D8DC}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-embed", "tools\slang-embed\slang-embed.vcxproj", "{7F773DD9-EB8F-2403-B43C-B49C2014B99C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-embed", "build\visual-studio\slang-embed\slang-embed.vcxproj", "{7F773DD9-EB8F-2403-B43C-B49C2014B99C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-generate", "tools\slang-generate\slang-generate.vcxproj", "{66174227-8541-41FC-A6DF-4764FC66F78E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-generate", "build\visual-studio\slang-generate\slang-generate.vcxproj", "{66174227-8541-41FC-A6DF-4764FC66F78E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-test", "tools\slang-test\slang-test.vcxproj", "{0C768A18-1D25-4000-9F37-DA5FE99E3B64}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-test", "build\visual-studio\slang-test\slang-test.vcxproj", "{0C768A18-1D25-4000-9F37-DA5FE99E3B64}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -107,14 +107,14 @@ Global
 		{2F8724C6-1BC3-2730-84D5-3F277030D04A}.Release|Win32.Build.0 = Release|Win32
 		{2F8724C6-1BC3-2730-84D5-3F277030D04A}.Release|x64.ActiveCfg = Release|x64
 		{2F8724C6-1BC3-2730-84D5-3F277030D04A}.Release|x64.Build.0 = Release|x64
-		{811F1997-6DDA-0843-1692-818D022C53D3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{811F1997-6DDA-0843-1692-818D022C53D3}.Debug|Win32.Build.0 = Debug|Win32
-		{811F1997-6DDA-0843-1692-818D022C53D3}.Debug|x64.ActiveCfg = Debug|x64
-		{811F1997-6DDA-0843-1692-818D022C53D3}.Debug|x64.Build.0 = Debug|x64
-		{811F1997-6DDA-0843-1692-818D022C53D3}.Release|Win32.ActiveCfg = Release|Win32
-		{811F1997-6DDA-0843-1692-818D022C53D3}.Release|Win32.Build.0 = Release|Win32
-		{811F1997-6DDA-0843-1692-818D022C53D3}.Release|x64.ActiveCfg = Release|x64
-		{811F1997-6DDA-0843-1692-818D022C53D3}.Release|x64.Build.0 = Release|x64
+		{E145B2B8-CD13-A6BE-B6A7-16E5A2148223}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E145B2B8-CD13-A6BE-B6A7-16E5A2148223}.Debug|Win32.Build.0 = Debug|Win32
+		{E145B2B8-CD13-A6BE-B6A7-16E5A2148223}.Debug|x64.ActiveCfg = Debug|x64
+		{E145B2B8-CD13-A6BE-B6A7-16E5A2148223}.Debug|x64.Build.0 = Debug|x64
+		{E145B2B8-CD13-A6BE-B6A7-16E5A2148223}.Release|Win32.ActiveCfg = Release|Win32
+		{E145B2B8-CD13-A6BE-B6A7-16E5A2148223}.Release|Win32.Build.0 = Release|Win32
+		{E145B2B8-CD13-A6BE-B6A7-16E5A2148223}.Release|x64.ActiveCfg = Release|x64
+		{E145B2B8-CD13-A6BE-B6A7-16E5A2148223}.Release|x64.Build.0 = Release|x64
 		{E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F}.Debug|Win32.Build.0 = Debug|Win32
 		{E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F}.Debug|x64.ActiveCfg = Debug|x64
@@ -205,7 +205,7 @@ Global
 		{010BE414-ED5B-CF56-16C0-BD18027062C0} = {EB5FC2C6-D72D-B6CC-C0C1-26F3AC2E9231}
 		{150CAA5A-0177-6A66-AA92-CFCB96DC2D49} = {EB5FC2C6-D72D-B6CC-C0C1-26F3AC2E9231}
 		{2F8724C6-1BC3-2730-84D5-3F277030D04A} = {EB5FC2C6-D72D-B6CC-C0C1-26F3AC2E9231}
-		{811F1997-6DDA-0843-1692-818D022C53D3} = {F3AB4ED5-5F37-BC99-6848-3F8ED452189A}
+		{E145B2B8-CD13-A6BE-B6A7-16E5A2148223} = {F3AB4ED5-5F37-BC99-6848-3F8ED452189A}
 		{61F7EB00-7281-4BF3-9470-7C2EA92620C3} = {57B5AA5E-C340-1823-CC51-9B17385C7423}
 		{C5ACCA6E-C04D-4B36-8516-3752B3C13C2F} = {57B5AA5E-C340-1823-CC51-9B17385C7423}
 		{222F7498-B40C-4F3F-A704-DDEB91A4484A} = {FD47AE19-69FD-260F-F2F1-20E65EA61D13}
diff --git a/source/core/core.vcxproj.filters b/source/core/core.vcxproj.filters
deleted file mode 100644
index fc5cede9e..000000000
--- a/source/core/core.vcxproj.filters
+++ /dev/null
@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{21EB8090-0D4E-1035-B6D3-48EBA215DCB7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="slang-allocator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-array-view.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-array.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-basic.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-blob.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-byte-encode-util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-char-util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-common.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-dictionary.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-downstream-compiler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-exception.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-free-list.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-gcc-compiler-util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-hash.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-hex-dump-util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-io.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-linked-list.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-list.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-math.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-memory-arena.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-name-convention-util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-nvrtc-compiler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-offset-container.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-platform.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-process-util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-random-generator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-render-api-util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-riff.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-secure-crt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-semantic-version.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-shared-library.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-short-list.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-smart-pointer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-std-writers.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-stream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-string-slice-pool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-string-util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-string.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-test-tool-util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-text-io.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-token-reader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-type-text-util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-type-traits.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-uint-set.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-visual-studio-compiler-util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-writer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-zip-file-system.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="windows\slang-win-visual-studio-util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="slang-blob.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-byte-encode-util.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-char-util.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-downstream-compiler.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-free-list.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-gcc-compiler-util.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-hex-dump-util.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-io.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-memory-arena.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-name-convention-util.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-nvrtc-compiler.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-offset-container.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-platform.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-random-generator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-render-api-util.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-riff.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-semantic-version.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-shared-library.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-std-writers.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-stream.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-string-slice-pool.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-string-util.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-string.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-test-tool-util.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-text-io.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-token-reader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-type-text-util.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-uint-set.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-visual-studio-compiler-util.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-writer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-zip-file-system.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="windows\slang-win-process-util.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="windows\slang-win-visual-studio-util.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Natvis Include="core.natvis">
-      <Filter>Source Files</Filter>
-    </Natvis>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/source/slang-glslang/slang-glslang.vcxproj b/source/slang-glslang/slang-glslang.vcxproj
deleted file mode 100644
index 5a6508f1d..000000000
--- a/source/slang-glslang/slang-glslang.vcxproj
+++ /dev/null
@@ -1,435 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C495878A-832C-485B-B347-0998A90CC936}</ProjectGuid>
-    <IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>slang-glslang</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\windows-x86\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\debug\slang-glslang\</IntDir>
-    <TargetName>slang-glslang</TargetName>
-    <TargetExt>.dll</TargetExt>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\windows-x64\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\debug\slang-glslang\</IntDir>
-    <TargetName>slang-glslang</TargetName>
-    <TargetExt>.dll</TargetExt>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\windows-x86\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\release\slang-glslang\</IntDir>
-    <TargetName>slang-glslang</TargetName>
-    <TargetExt>.dll</TargetExt>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\windows-x64\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\release\slang-glslang\</IntDir>
-    <TargetName>slang-glslang</TargetName>
-    <TargetExt>.dll</TargetExt>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>_DEBUG;ENABLE_OPT=1;AMD_EXTENSIONS;NV_EXTENSIONS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\external\glslang;..\..\external\spirv-tools;..\..\external\spirv-tools\include;..\..\external\spirv-headers\include;..\..\external\spirv-tools\build;..\..\external\spirv-tools-generated;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <ObjectFileName>$(IntDir)/%(RelativeDir)/$(Configuration)/</ObjectFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>..\..\bin\windows-x86\debug\slang-glslang.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>_DEBUG;ENABLE_OPT=1;AMD_EXTENSIONS;NV_EXTENSIONS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\external\glslang;..\..\external\spirv-tools;..\..\external\spirv-tools\include;..\..\external\spirv-headers\include;..\..\external\spirv-tools\build;..\..\external\spirv-tools-generated;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <ObjectFileName>$(IntDir)/%(RelativeDir)/$(Configuration)/</ObjectFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>..\..\bin\windows-x64\debug\slang-glslang.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>NDEBUG;ENABLE_OPT=1;AMD_EXTENSIONS;NV_EXTENSIONS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\external\glslang;..\..\external\spirv-tools;..\..\external\spirv-tools\include;..\..\external\spirv-headers\include;..\..\external\spirv-tools\build;..\..\external\spirv-tools-generated;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <Optimization>Full</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <ObjectFileName>$(IntDir)/%(RelativeDir)/$(Configuration)/</ObjectFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <ImportLibrary>..\..\bin\windows-x86\release\slang-glslang.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>NDEBUG;ENABLE_OPT=1;AMD_EXTENSIONS;NV_EXTENSIONS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\external\glslang;..\..\external\spirv-tools;..\..\external\spirv-tools\include;..\..\external\spirv-headers\include;..\..\external\spirv-tools\build;..\..\external\spirv-tools-generated;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <Optimization>Full</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <ObjectFileName>$(IntDir)/%(RelativeDir)/$(Configuration)/</ObjectFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <ImportLibrary>..\..\bin\windows-x64\release\slang-glslang.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\external\glslang\OGLCompilersDLL\InitializeDll.h" />
-    <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.ext.AMD.h" />
-    <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.ext.EXT.h" />
-    <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.ext.KHR.h" />
-    <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.ext.NV.h" />
-    <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.std.450.h" />
-    <ClInclude Include="..\..\external\glslang\SPIRV\GlslangToSpv.h" />
-    <ClInclude Include="..\..\external\glslang\SPIRV\Logger.h" />
-    <ClInclude Include="..\..\external\glslang\SPIRV\SPVRemapper.h" />
-    <ClInclude Include="..\..\external\glslang\SPIRV\SpvBuilder.h" />
-    <ClInclude Include="..\..\external\glslang\SPIRV\SpvTools.h" />
-    <ClInclude Include="..\..\external\glslang\SPIRV\bitutils.h" />
-    <ClInclude Include="..\..\external\glslang\SPIRV\disassemble.h" />
-    <ClInclude Include="..\..\external\glslang\SPIRV\doc.h" />
-    <ClInclude Include="..\..\external\glslang\SPIRV\hex_float.h" />
-    <ClInclude Include="..\..\external\glslang\SPIRV\spirv.hpp" />
-    <ClInclude Include="..\..\external\glslang\SPIRV\spvIR.h" />
-    <ClInclude Include="..\..\external\glslang\StandAlone\DirStackFileIncluder.h" />
-    <ClInclude Include="..\..\external\glslang\StandAlone\ResourceLimits.h" />
-    <ClInclude Include="..\..\external\glslang\StandAlone\Worklist.h" />
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\Initialize.h" />
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\LiveTraverser.h" />
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\ParseHelper.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\attribute.h" />
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\gl_types.h" />
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\glslang_tab.cpp.h" />
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\iomapper.h" />
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\localintermediate.h" />
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\parseVersions.h" />
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\pch.h" />
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpContext.h" />
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpTokens.h" />
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\propagateNoContraction.h" />
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\reflection.h" />
-    <ClInclude Include="..\..\external\glslang\glslang\OSDependent\osinclude.h" />
-    <ClInclude Include="slang-glslang.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\external\glslang\OGLCompilersDLL\InitializeDll.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\SPVRemapper.cpp" />
-    <ClCompile Include="..\..\external\glslang\SPIRV\SpvBuilder.cpp" />
-    <ClCompile Include="..\..\external\glslang\SPIRV\SpvPostProcess.cpp" />
-    <ClCompile Include="..\..\external\glslang\SPIRV\SpvTools.cpp" />
-    <ClCompile Include="..\..\external\glslang\SPIRV\disassemble.cpp" />
-    <ClCompile Include="..\..\external\glslang\SPIRV\doc.cpp" />
-    <ClCompile Include="..\..\external\glslang\StandAlone\ResourceLimits.cpp" />
-    <ClCompile Include="..\..\external\glslang\StandAlone\spirv-remap.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\GenericCodeGen\CodeGen.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\GenericCodeGen\Link.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Constant.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\InfoSink.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Initialize.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\IntermTraverse.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Intermediate.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\ParseContextBase.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\ParseHelper.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\PoolAlloc.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\RemoveTree.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Scan.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\ShaderLang.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\SymbolTable.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Versions.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\attribute.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\glslang_tab.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\intermOut.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\iomapper.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\limits.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\linkValidate.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\parseConst.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\pch.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\Pp.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpAtom.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpContext.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpScanner.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpTokens.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\propagateNoContraction.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\reflection.cpp" />
-    <ClCompile Include="..\..\external\glslang\glslang\OSDependent\Windows\ossource.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\assembly_grammar.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\binary.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\diagnostic.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\disassemble.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\enum_string_mapping.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\extensions.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\ext_inst.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\libspirv.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\name_mapper.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opcode.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\operand.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\aggressive_dead_code_elim_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\amd_ext_to_khr.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\basic_block.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\block_merge_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\block_merge_util.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\build_module.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\ccp_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\cfg.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\cfg_cleanup_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\code_sink.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\combine_access_chains.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\compact_ids_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\composite.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\constants.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\const_folding_rules.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\convert_to_half_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\copy_prop_arrays.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\dead_branch_elim_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\dead_insert_elim_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\dead_variable_elimination.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\decompose_initialized_variables_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\decoration_manager.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\def_use_manager.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\desc_sroa.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\dominator_analysis.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\dominator_tree.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\eliminate_dead_constant_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\eliminate_dead_functions_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\eliminate_dead_functions_util.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\eliminate_dead_members_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\feature_manager.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\fix_storage_class.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\flatten_decoration_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\fold.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\folding_rules.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\fold_spec_constant_op_and_composite_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\freeze_spec_constant_value_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\function.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\generate_webgpu_initializers_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\graphics_robust_access_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\if_conversion.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\inline_exhaustive_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\inline_opaque_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\inline_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\instruction.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\instruction_list.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\instrument_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\inst_bindless_check_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\inst_buff_addr_check_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\ir_context.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\ir_loader.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\legalize_vector_shuffle_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\licm_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\local_access_chain_convert_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\local_redundancy_elimination.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\local_single_block_elim_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\local_single_store_elim_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\loop_dependence.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\loop_dependence_helpers.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\loop_descriptor.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\loop_fission.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\loop_fusion.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\loop_fusion_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\loop_peeling.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\loop_unroller.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\loop_unswitch_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\loop_utils.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\mem_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\merge_return_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\module.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\optimizer.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\pass_manager.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\pch_source_opt.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\private_to_local_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\process_lines_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\propagator.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\reduce_load_size.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\redundancy_elimination.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\register_pressure.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\relax_float_ops_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\remove_duplicates_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\replace_invalid_opc.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\scalar_analysis.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\scalar_analysis_simplification.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\scalar_replacement_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\set_spec_constant_default_value_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\simplification_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\split_invalid_unreachable_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\ssa_rewrite_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\strength_reduction_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\strip_atomic_counter_memory_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\strip_debug_info_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\strip_reflect_info_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\struct_cfg_analysis.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\types.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\type_manager.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\unify_const_pass.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\upgrade_memory_model.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\value_number_table.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\vector_dce.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\workaround1209.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\wrap_opkill.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\parsed_operand.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\pch_source.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\print.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\software_version.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\spirv_endian.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\spirv_fuzzer_options.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\spirv_optimizer_options.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\spirv_reducer_options.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\spirv_target_env.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\spirv_validator_options.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\table.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\text.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\text_handler.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\util\bit_vector.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\util\parse_number.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\util\string_utils.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\util\timer.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\basic_block.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\construct.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\function.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\instruction.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_adjacency.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_annotation.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_arithmetics.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_atomics.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_barriers.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_bitwise.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_builtins.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_capability.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_cfg.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_composites.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_constants.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_conversion.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_debug.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_decorations.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_derivatives.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_execution_limitations.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_extensions.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_function.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_id.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_image.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_instruction.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_interfaces.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_layout.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_literals.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_logicals.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_memory.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_memory_semantics.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_misc.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_mode_setting.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_non_uniform.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_primitives.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_scopes.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_small_type_uses.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_type.cpp" />
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validation_state.cpp" />
-    <ClCompile Include="slang-glslang.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/source/slang-glslang/slang-glslang.vcxproj.filters b/source/slang-glslang/slang-glslang.vcxproj.filters
deleted file mode 100644
index a922440de..000000000
--- a/source/slang-glslang/slang-glslang.vcxproj.filters
+++ /dev/null
@@ -1,798 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{21EB8090-0D4E-1035-B6D3-48EBA215DCB7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\spirv-tools">
-      <UniqueIdentifier>{0f17aa89-8c4d-488f-9577-c32b50f9b081}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\spirv-tools\val">
-      <UniqueIdentifier>{79d3e53a-e1bb-41a8-9a8c-65ed15905fce}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\spirv-tools\opt">
-      <UniqueIdentifier>{cbc707d5-9925-4cfc-a98f-24edb5d66cfa}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\spirv-tools\util">
-      <UniqueIdentifier>{525e4d11-95f7-4087-af42-3148dd340ae1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\glslang">
-      <UniqueIdentifier>{b2f07a8e-0eda-425b-b3d1-bf3e95a84878}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\external\glslang\OGLCompilersDLL\InitializeDll.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.ext.AMD.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.ext.EXT.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.ext.KHR.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.ext.NV.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.std.450.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\SPIRV\GlslangToSpv.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\SPIRV\Logger.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\SPIRV\SPVRemapper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\SPIRV\SpvBuilder.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\SPIRV\SpvTools.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\SPIRV\bitutils.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\SPIRV\disassemble.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\SPIRV\doc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\SPIRV\hex_float.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\SPIRV\spirv.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\SPIRV\spvIR.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\StandAlone\DirStackFileIncluder.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\StandAlone\ResourceLimits.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\StandAlone\Worklist.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\Initialize.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\LiveTraverser.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\ParseHelper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\RemoveTree.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\Scan.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\ScanContext.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\SymbolTable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\Versions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\attribute.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\gl_types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\glslang_tab.cpp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\iomapper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\localintermediate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\parseVersions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\pch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpContext.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpTokens.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\propagateNoContraction.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\reflection.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\external\glslang\glslang\OSDependent\osinclude.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-glslang.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="slang-glslang.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\assembly_grammar.cpp">
-      <Filter>Source Files\spirv-tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\binary.cpp">
-      <Filter>Source Files\spirv-tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\diagnostic.cpp">
-      <Filter>Source Files\spirv-tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\disassemble.cpp">
-      <Filter>Source Files\spirv-tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\enum_string_mapping.cpp">
-      <Filter>Source Files\spirv-tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\ext_inst.cpp">
-      <Filter>Source Files\spirv-tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\extensions.cpp">
-      <Filter>Source Files\spirv-tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\libspirv.cpp">
-      <Filter>Source Files\spirv-tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\name_mapper.cpp">
-      <Filter>Source Files\spirv-tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opcode.cpp">
-      <Filter>Source Files\spirv-tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\operand.cpp">
-      <Filter>Source Files\spirv-tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\parsed_operand.cpp">
-      <Filter>Source Files\spirv-tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\pch_source.cpp">
-      <Filter>Source Files\spirv-tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\print.cpp">
-      <Filter>Source Files\spirv-tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\software_version.cpp">
-      <Filter>Source Files\spirv-tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\spirv_endian.cpp">
-      <Filter>Source Files\spirv-tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\spirv_fuzzer_options.cpp">
-      <Filter>Source Files\spirv-tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\spirv_optimizer_options.cpp">
-      <Filter>Source Files\spirv-tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\spirv_reducer_options.cpp">
-      <Filter>Source Files\spirv-tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\spirv_target_env.cpp">
-      <Filter>Source Files\spirv-tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\spirv_validator_options.cpp">
-      <Filter>Source Files\spirv-tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\table.cpp">
-      <Filter>Source Files\spirv-tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\text.cpp">
-      <Filter>Source Files\spirv-tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\text_handler.cpp">
-      <Filter>Source Files\spirv-tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\aggressive_dead_code_elim_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\amd_ext_to_khr.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\basic_block.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\block_merge_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\block_merge_util.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\build_module.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\ccp_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\cfg.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\cfg_cleanup_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\code_sink.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\combine_access_chains.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\compact_ids_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\composite.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\const_folding_rules.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\constants.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\convert_to_half_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\copy_prop_arrays.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\dead_branch_elim_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\dead_insert_elim_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\dead_variable_elimination.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\decompose_initialized_variables_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\decoration_manager.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\def_use_manager.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\desc_sroa.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\dominator_analysis.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\dominator_tree.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\eliminate_dead_constant_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\eliminate_dead_functions_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\eliminate_dead_functions_util.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\eliminate_dead_members_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\feature_manager.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\fix_storage_class.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\flatten_decoration_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\fold.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\fold_spec_constant_op_and_composite_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\folding_rules.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\freeze_spec_constant_value_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\function.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\generate_webgpu_initializers_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\graphics_robust_access_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\if_conversion.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\inline_exhaustive_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\inline_opaque_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\inline_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\inst_bindless_check_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\inst_buff_addr_check_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\instruction.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\instruction_list.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\instrument_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\ir_context.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\ir_loader.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\legalize_vector_shuffle_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\licm_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\local_access_chain_convert_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\local_redundancy_elimination.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\local_single_block_elim_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\local_single_store_elim_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\loop_dependence.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\loop_dependence_helpers.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\loop_descriptor.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\loop_fission.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\loop_fusion.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\loop_fusion_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\loop_peeling.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\loop_unroller.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\loop_unswitch_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\loop_utils.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\mem_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\merge_return_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\module.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\optimizer.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\pass_manager.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\pch_source_opt.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\private_to_local_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\process_lines_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\propagator.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\reduce_load_size.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\redundancy_elimination.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\register_pressure.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\relax_float_ops_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\remove_duplicates_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\replace_invalid_opc.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\scalar_analysis.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\scalar_analysis_simplification.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\scalar_replacement_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\set_spec_constant_default_value_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\simplification_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\split_invalid_unreachable_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\ssa_rewrite_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\strength_reduction_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\strip_atomic_counter_memory_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\strip_debug_info_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\strip_reflect_info_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\struct_cfg_analysis.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\type_manager.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\types.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\unify_const_pass.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\upgrade_memory_model.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\value_number_table.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\vector_dce.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\workaround1209.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\opt\wrap_opkill.cpp">
-      <Filter>Source Files\spirv-tools\opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\basic_block.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\construct.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\function.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\instruction.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_adjacency.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_annotation.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_arithmetics.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_atomics.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_barriers.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_bitwise.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_builtins.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_capability.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_cfg.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_composites.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_constants.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_conversion.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_debug.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_decorations.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_derivatives.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_execution_limitations.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_extensions.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_function.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_id.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_image.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_instruction.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_interfaces.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_layout.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_literals.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_logicals.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_memory.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_memory_semantics.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_misc.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_mode_setting.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_non_uniform.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_primitives.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_scopes.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_small_type_uses.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validate_type.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\val\validation_state.cpp">
-      <Filter>Source Files\spirv-tools\val</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\util\bit_vector.cpp">
-      <Filter>Source Files\spirv-tools\util</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\util\parse_number.cpp">
-      <Filter>Source Files\spirv-tools\util</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\util\string_utils.cpp">
-      <Filter>Source Files\spirv-tools\util</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\spirv-tools\source\util\timer.cpp">
-      <Filter>Source Files\spirv-tools\util</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\attribute.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\GenericCodeGen\CodeGen.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Constant.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\SPIRV\disassemble.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\SPIRV\doc.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\glslang_tab.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\SPIRV\GlslangToSpv.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\InfoSink.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Initialize.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\OGLCompilersDLL\InitializeDll.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\SPIRV\InReadableOrder.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Intermediate.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\intermOut.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\IntermTraverse.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\iomapper.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\limits.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\GenericCodeGen\Link.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\linkValidate.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\SPIRV\Logger.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\OSDependent\Windows\ossource.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\parseConst.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\ParseContextBase.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\ParseHelper.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\pch.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\PoolAlloc.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\Pp.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpAtom.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpContext.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpScanner.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpTokens.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\propagateNoContraction.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\reflection.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\RemoveTree.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\StandAlone\ResourceLimits.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Scan.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\ShaderLang.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\StandAlone\spirv-remap.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\SPIRV\SpvBuilder.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\SPIRV\SpvPostProcess.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\SPIRV\SPVRemapper.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\SPIRV\SpvTools.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\SymbolTable.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Versions.cpp">
-      <Filter>Source Files\glslang</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/source/slang/slang-api.cpp b/source/slang/slang-api.cpp
new file mode 100644
index 000000000..ea6c7820b
--- /dev/null
+++ b/source/slang/slang-api.cpp
@@ -0,0 +1,698 @@
+// slang-api.cpp
+
+#include "slang-compiler.h"
+
+#include "slang-repro.h"
+
+#include "../../slang-tag-version.h"
+
+// implementation of C interface
+
+SLANG_API SlangSession* spCreateSession(const char*)
+{
+    Slang::ComPtr<slang::IGlobalSession> globalSession;
+    if (SLANG_FAILED(slang_createGlobalSession(SLANG_API_VERSION, globalSession.writeRef())))
+    {
+        return nullptr;
+    }
+    // Will be returned with a refcount of 1
+    return globalSession.detach();
+}
+
+SLANG_API SlangResult slang_createGlobalSession(
+    SlangInt                apiVersion,
+    slang::IGlobalSession** outGlobalSession)
+{
+    Slang::ComPtr<slang::IGlobalSession> globalSession;
+    SLANG_RETURN_ON_FAIL(slang_createGlobalSessionWithoutStdLib(apiVersion, globalSession.writeRef()));
+    SLANG_RETURN_ON_FAIL(globalSession->compileStdLib());
+    *outGlobalSession = globalSession.detach();
+    return SLANG_OK;
+}
+
+SLANG_API SlangResult slang_createGlobalSessionWithoutStdLib(
+    SlangInt                apiVersion,
+    slang::IGlobalSession** outGlobalSession)
+{
+    if (apiVersion != 0)
+        return SLANG_E_NOT_IMPLEMENTED;
+
+    // Create the session
+    Slang::Session* globalSession = new Slang::Session();
+    // Put an interface ref on it
+    Slang::ComPtr<slang::IGlobalSession> result(globalSession);
+
+    // Initialize it
+    globalSession->init();
+
+    *outGlobalSession = result.detach();
+    return SLANG_OK;
+}
+
+SLANG_API void spDestroySession(
+    SlangSession*   inSession)
+{
+    if (!inSession) return;
+
+    Slang::Session* session = Slang::asInternal(inSession);
+    // It is assumed there is only a single reference on the session (the one placed
+    // with spCreateSession) if this function is called
+    SLANG_ASSERT(session->debugGetReferenceCount() == 1);
+    // Release
+    session->release();
+}
+
+SLANG_API const char* spGetBuildTagString()
+{
+    return SLANG_TAG_VERSION;
+}
+
+SLANG_API void spAddBuiltins(
+    SlangSession*   session,
+    char const*     sourcePath,
+    char const*     sourceString)
+{
+    session->addBuiltins(sourcePath, sourceString);
+}
+
+SLANG_API void spSessionSetSharedLibraryLoader(
+    SlangSession*               session,
+    ISlangSharedLibraryLoader* loader)
+{
+    session->setSharedLibraryLoader(loader);
+}
+
+SLANG_API ISlangSharedLibraryLoader* spSessionGetSharedLibraryLoader(
+    SlangSession*               session)
+{
+    return session->getSharedLibraryLoader();
+}
+
+SLANG_API SlangResult spSessionCheckCompileTargetSupport(
+    SlangSession*                session,
+    SlangCompileTarget           target)
+{
+    return session->checkCompileTargetSupport(target);
+}
+
+SLANG_API SlangResult spSessionCheckPassThroughSupport(
+    SlangSession*       session,
+    SlangPassThrough    passThrough)
+{
+    return session->checkPassThroughSupport(passThrough);
+}
+
+SLANG_API SlangCompileRequest* spCreateCompileRequest(
+    SlangSession* session)
+{
+    slang::ICompileRequest* request = nullptr;
+    // Will return with suitable ref count
+    session->createCompileRequest(&request);
+    return request;
+}
+
+SLANG_API SlangProfileID spFindProfile(
+    SlangSession* session,
+    char const*     name)
+{
+    return session->findProfile(name);
+}
+
+/* !!!!!!!!!!!!!!!!!!SlangCompileRequest API!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
+
+/*!
+@brief Destroy a compile request.
+*/
+SLANG_API void spDestroyCompileRequest(
+    slang::ICompileRequest*    request)
+{
+    if (request)
+    {
+        request->release();
+    }
+}
+
+/* All other functions just call into the ICompileResult interface. */
+
+SLANG_API void spSetFileSystem(
+    slang::ICompileRequest*    request,
+    ISlangFileSystem*       fileSystem)
+{
+    SLANG_ASSERT(request);
+    request->setFileSystem(fileSystem);
+}
+
+SLANG_API void spSetCompileFlags(
+    slang::ICompileRequest*    request,
+    SlangCompileFlags       flags)
+{
+    SLANG_ASSERT(request);
+    request->setCompileFlags(flags);
+}
+
+SLANG_API void spSetDumpIntermediates(
+    slang::ICompileRequest*    request,
+    int                     enable)
+{
+    SLANG_ASSERT(request);
+    request->setDumpIntermediates(enable);
+}
+
+SLANG_API void spSetDumpIntermediatePrefix(
+    slang::ICompileRequest*    request,
+    const char* prefix)
+{
+    SLANG_ASSERT(request);
+    request->setDumpIntermediatePrefix(prefix);
+}
+
+SLANG_API void spSetLineDirectiveMode(
+    slang::ICompileRequest*    request,
+    SlangLineDirectiveMode  mode)
+{
+    SLANG_ASSERT(request);
+    request->setLineDirectiveMode(mode);
+}
+
+SLANG_API void spSetCommandLineCompilerMode(
+    slang::ICompileRequest* request)
+{
+    SLANG_ASSERT(request);
+    request->setCommandLineCompilerMode();
+}
+
+SLANG_API void spSetCodeGenTarget(
+    slang::ICompileRequest*    request,
+    SlangCompileTarget target)
+{
+    SLANG_ASSERT(request);
+    request->setCodeGenTarget(target);
+}
+
+SLANG_API int spAddCodeGenTarget(
+    slang::ICompileRequest*    request,
+    SlangCompileTarget      target)
+{
+    SLANG_ASSERT(request);
+    return request->addCodeGenTarget(target);
+}
+
+SLANG_API void spSetTargetProfile(
+    slang::ICompileRequest*    request,
+    int                     targetIndex,
+    SlangProfileID          profile)
+{
+    SLANG_ASSERT(request);
+    request->setTargetProfile(targetIndex, profile);
+}
+
+SLANG_API void spSetTargetFlags(
+    slang::ICompileRequest*    request,
+    int                     targetIndex,
+    SlangTargetFlags        flags)
+{
+    SLANG_ASSERT(request);
+    request->setTargetFlags(targetIndex, flags);
+}
+
+SLANG_API void spSetTargetFloatingPointMode(
+    slang::ICompileRequest*    request,
+    int                     targetIndex,
+    SlangFloatingPointMode  mode)
+{
+    SLANG_ASSERT(request);
+    request->setTargetFloatingPointMode(targetIndex, mode);
+}
+
+SLANG_API void spSetMatrixLayoutMode(
+    slang::ICompileRequest*    request,
+    SlangMatrixLayoutMode   mode)
+{
+    SLANG_ASSERT(request);
+    request->setMatrixLayoutMode(mode);
+}
+
+SLANG_API void spSetTargetMatrixLayoutMode(
+    slang::ICompileRequest*    request,
+    int                     targetIndex,
+    SlangMatrixLayoutMode   mode)
+{
+    SLANG_ASSERT(request);
+    request->setTargetMatrixLayoutMode(targetIndex, mode);
+}
+
+SLANG_API void spSetDebugInfoLevel(
+    slang::ICompileRequest*    request,
+    SlangDebugInfoLevel     level)
+{
+    SLANG_ASSERT(request);
+    request->setDebugInfoLevel(level);
+}
+
+SLANG_API void spSetOptimizationLevel(
+    slang::ICompileRequest*    request,
+    SlangOptimizationLevel  level)
+{
+    SLANG_ASSERT(request);
+    request->setOptimizationLevel(level);
+}
+
+SLANG_API void spSetOutputContainerFormat(
+    slang::ICompileRequest*    request,
+    SlangContainerFormat    format)
+{
+    SLANG_ASSERT(request);
+    request->setOutputContainerFormat(format);
+}
+
+SLANG_API void spSetPassThrough(
+    slang::ICompileRequest*    request,
+    SlangPassThrough        passThrough)
+{
+    SLANG_ASSERT(request);
+    request->setPassThrough(passThrough);
+}
+
+SLANG_API void spSetDiagnosticCallback(
+    slang::ICompileRequest*    request,
+    SlangDiagnosticCallback callback,
+    void const*             userData)
+{
+    SLANG_ASSERT(request);
+    request->setDiagnosticCallback(callback, userData);
+}
+
+SLANG_API void spSetWriter(
+    slang::ICompileRequest*    request,
+    SlangWriterChannel      chan,
+    ISlangWriter*           writer)
+{
+    SLANG_ASSERT(request);
+    request->setWriter(chan, writer);
+}
+
+SLANG_API ISlangWriter* spGetWriter(
+    slang::ICompileRequest*    request,
+    SlangWriterChannel      chan)
+{
+    SLANG_ASSERT(request);
+    return request->getWriter(chan);
+}
+
+SLANG_API void spAddSearchPath(
+    slang::ICompileRequest*    request,
+    const char*             path)
+{
+    SLANG_ASSERT(request);
+    request->addSearchPath(path);
+}
+
+SLANG_API void spAddPreprocessorDefine(
+    slang::ICompileRequest*    request,
+    const char*             key,
+    const char*             value)
+{
+    SLANG_ASSERT(request);
+    request->addPreprocessorDefine(key, value);
+}
+
+SLANG_API char const* spGetDiagnosticOutput(
+    slang::ICompileRequest*    request)
+{
+    SLANG_ASSERT(request);
+    return request->getDiagnosticOutput();
+}
+
+SLANG_API SlangResult spGetDiagnosticOutputBlob(
+    slang::ICompileRequest*    request,
+    ISlangBlob**            outBlob)
+{
+    SLANG_ASSERT(request);
+    return request->getDiagnosticOutputBlob(outBlob);
+}
+
+// New-fangled compilation API
+
+SLANG_API int spAddTranslationUnit(
+    slang::ICompileRequest*    request,
+    SlangSourceLanguage     language,
+    char const*             inName)
+{
+    SLANG_ASSERT(request);
+    return request->addTranslationUnit(language, inName);
+}
+
+SLANG_API void spSetDefaultModuleName(
+    slang::ICompileRequest*    request,
+    const char* defaultModuleName)
+{
+    SLANG_ASSERT(request);
+    request->setDefaultModuleName(defaultModuleName);
+}
+
+SLANG_API SlangResult spAddLibraryReference(
+    slang::ICompileRequest*    request,
+    const void* libData,
+    size_t libDataSize)
+{
+    SLANG_ASSERT(request);
+    return request->addLibraryReference(libData, libDataSize);
+}
+
+SLANG_API void spTranslationUnit_addPreprocessorDefine(
+    slang::ICompileRequest*    request,
+    int                     translationUnitIndex,
+    const char*             key,
+    const char*             value)
+{
+    SLANG_ASSERT(request);
+    request->addTranslationUnitPreprocessorDefine(translationUnitIndex, key, value);
+}
+
+SLANG_API void spAddTranslationUnitSourceFile(
+    slang::ICompileRequest*    request,
+    int                     translationUnitIndex,
+    char const*             path)
+{
+    SLANG_ASSERT(request);
+    request->addTranslationUnitSourceFile(translationUnitIndex, path);
+}
+
+SLANG_API void spAddTranslationUnitSourceString(
+    slang::ICompileRequest*    request,
+    int                     translationUnitIndex,
+    char const*             path,
+    char const*             source)
+{
+    SLANG_ASSERT(request);
+    request->addTranslationUnitSourceString(translationUnitIndex, path, source);
+}
+
+SLANG_API void spAddTranslationUnitSourceStringSpan(
+    slang::ICompileRequest*    request,
+    int                     translationUnitIndex,
+    char const*             path,
+    char const*             sourceBegin,
+    char const*             sourceEnd)
+{
+    SLANG_ASSERT(request);
+    request->addTranslationUnitSourceStringSpan(translationUnitIndex, path, sourceBegin, sourceEnd);
+}
+
+SLANG_API void spAddTranslationUnitSourceBlob(
+    slang::ICompileRequest*    request,
+    int                     translationUnitIndex,
+    char const*             path,
+    ISlangBlob*             sourceBlob)
+{
+    SLANG_ASSERT(request);
+    request->addTranslationUnitSourceBlob(translationUnitIndex, path, sourceBlob);
+}
+
+SLANG_API int spAddEntryPoint(
+    slang::ICompileRequest*    request,
+    int                     translationUnitIndex,
+    char const*             name,
+    SlangStage              stage)
+{
+    SLANG_ASSERT(request);
+    return request->addEntryPoint(translationUnitIndex, name, stage);
+}
+
+SLANG_API int spAddEntryPointEx(
+    slang::ICompileRequest*    request,
+    int                     translationUnitIndex,
+    char const*             name,
+    SlangStage              stage,
+    int                     genericParamTypeNameCount,
+    char const **           genericParamTypeNames)
+{
+    SLANG_ASSERT(request);
+    return request->addEntryPointEx(translationUnitIndex, name, stage, genericParamTypeNameCount, genericParamTypeNames);
+}
+
+SLANG_API SlangResult spSetGlobalGenericArgs(
+    slang::ICompileRequest*    request,
+    int                     genericArgCount,
+    char const**            genericArgs)
+{
+    SLANG_ASSERT(request);
+    return request->setGlobalGenericArgs(genericArgCount, genericArgs);
+}
+
+SLANG_API SlangResult spSetTypeNameForGlobalExistentialTypeParam(
+    slang::ICompileRequest*    request,
+    int                     slotIndex,
+    char const*             typeName)
+{
+    SLANG_ASSERT(request);
+    return request->setTypeNameForGlobalExistentialTypeParam(slotIndex, typeName);
+}
+
+SLANG_API SlangResult spSetTypeNameForEntryPointExistentialTypeParam(
+    slang::ICompileRequest*    request,
+    int                     entryPointIndex,
+    int                     slotIndex,
+    char const*             typeName)
+{
+    SLANG_ASSERT(request);
+    return request->setTypeNameForEntryPointExistentialTypeParam(entryPointIndex, slotIndex, typeName);
+}
+
+SLANG_API SlangResult spCompile(
+    slang::ICompileRequest*    request)
+{
+    SLANG_ASSERT(request);
+    return request->compile();
+}
+
+SLANG_API int
+spGetDependencyFileCount(
+    slang::ICompileRequest*    request)
+{
+    SLANG_ASSERT(request);
+    return request->getDependencyFileCount();
+}
+
+SLANG_API char const*
+spGetDependencyFilePath(
+    slang::ICompileRequest*    request,
+    int                     index)
+{
+    SLANG_ASSERT(request);
+    return request->getDependencyFilePath(index);
+}
+
+SLANG_API int
+spGetTranslationUnitCount(
+    slang::ICompileRequest*    request)
+{
+    SLANG_ASSERT(request);
+    return request->getTranslationUnitCount();
+}
+
+SLANG_API void const* spGetEntryPointCode(
+    slang::ICompileRequest*    request,
+    int                     entryPointIndex,
+    size_t*                 outSize)
+{
+    SLANG_ASSERT(request);
+    return request->getEntryPointCode(entryPointIndex, outSize);
+}
+
+SLANG_API SlangResult spGetEntryPointCodeBlob(
+    slang::ICompileRequest*    request,
+    int                     entryPointIndex,
+    int                     targetIndex,
+    ISlangBlob**            outBlob)
+{
+    SLANG_ASSERT(request);
+    return request->getEntryPointCodeBlob(entryPointIndex, targetIndex, outBlob);
+}
+
+SLANG_API SlangResult spGetEntryPointHostCallable(
+    slang::ICompileRequest*    request,
+    int                     entryPointIndex,
+    int                     targetIndex,
+    ISlangSharedLibrary**   outSharedLibrary)
+{
+    SLANG_ASSERT(request);
+    return request->getEntryPointHostCallable(entryPointIndex, targetIndex, outSharedLibrary);
+}
+
+SLANG_API SlangResult spGetTargetCodeBlob(
+    slang::ICompileRequest* request,
+    int targetIndex,
+    ISlangBlob** outBlob)
+{
+    SLANG_ASSERT(request);
+    return request->getTargetCodeBlob(targetIndex, outBlob);
+}
+
+SLANG_API SlangResult spGetTargetHostCallable(
+    slang::ICompileRequest* request,
+    int targetIndex,
+    ISlangSharedLibrary** outSharedLibrary)
+{
+    SLANG_ASSERT(request);
+    return request->getTargetHostCallable(targetIndex, outSharedLibrary);
+}
+
+SLANG_API char const* spGetEntryPointSource(
+    slang::ICompileRequest*    request,
+    int                     entryPointIndex)
+{
+    SLANG_ASSERT(request);
+    return request->getEntryPointSource(entryPointIndex);
+}
+
+SLANG_API void const* spGetCompileRequestCode(
+    slang::ICompileRequest*    request,
+    size_t*                 outSize)
+{
+    SLANG_ASSERT(request);
+    return request->getCompileRequestCode(outSize);
+}
+
+SLANG_API SlangResult spGetContainerCode(
+    slang::ICompileRequest*    request,
+    ISlangBlob**            outBlob)
+{
+    SLANG_ASSERT(request);
+    return request->getContainerCode(outBlob);
+}
+
+SLANG_API SlangResult spLoadRepro(
+    slang::ICompileRequest* request,
+    ISlangFileSystem* fileSystem,
+    const void* data,
+    size_t size)
+{
+    SLANG_ASSERT(request);
+    return request->loadRepro(fileSystem, data, size);
+}
+
+SLANG_API SlangResult spSaveRepro(
+    slang::ICompileRequest* request,
+    ISlangBlob** outBlob)
+{
+    SLANG_ASSERT(request);
+    return request->saveRepro(outBlob);
+}
+
+SLANG_API SlangResult spEnableReproCapture(
+    slang::ICompileRequest* request)
+{
+    SLANG_ASSERT(request);
+    return request->enableReproCapture();
+}
+
+SLANG_API SlangResult spCompileRequest_getProgram(
+    slang::ICompileRequest*    request,
+    slang::IComponentType** outProgram)
+{
+    SLANG_ASSERT(request);
+    return request->getProgram(outProgram);
+}
+
+SLANG_API SlangResult spCompileRequest_getModule(
+    slang::ICompileRequest*    request,
+    SlangInt                translationUnitIndex,
+    slang::IModule**        outModule)
+{
+    SLANG_ASSERT(request);
+    return request->getModule(translationUnitIndex, outModule);
+}
+
+SLANG_API SlangResult spCompileRequest_getSession(
+    slang::ICompileRequest* request,
+    slang::ISession** outSession)
+{
+    SLANG_ASSERT(request);
+    return request->getSession(outSession);
+}
+
+SLANG_API SlangResult spCompileRequest_getEntryPoint(
+    slang::ICompileRequest*    request,
+    SlangInt                entryPointIndex,
+    slang::IComponentType** outEntryPoint)
+{
+    SLANG_ASSERT(request);
+    return request->getEntryPoint(entryPointIndex, outEntryPoint);
+}
+
+// Get the output code associated with a specific translation unit
+SLANG_API char const* spGetTranslationUnitSource(
+    slang::ICompileRequest*    /*request*/,
+    int                     /*translationUnitIndex*/)
+{
+    fprintf(stderr, "DEPRECATED: spGetTranslationUnitSource()\n");
+    return nullptr;
+}
+
+SLANG_API SlangResult spProcessCommandLineArguments(
+    SlangCompileRequest*    request,
+    char const* const*      args,
+    int                     argCount)
+{
+    return request->processCommandLineArguments(args, argCount);
+}
+
+// Reflection API
+
+SLANG_API SlangReflection* spGetReflection(
+    slang::ICompileRequest*    request)
+{
+    SLANG_ASSERT(request);
+    return request->getReflection();
+}
+
+// ... rest of reflection API implementation is in `Reflection.cpp`
+
+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!! Session !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
+
+SLANG_API SlangResult spExtractRepro(SlangSession* session, const void* reproData, size_t reproDataSize, ISlangMutableFileSystem* fileSystem)
+{
+    using namespace Slang;
+    SLANG_UNUSED(session);
+
+    List<uint8_t> buffer;
+    {
+        MemoryStreamBase memoryStream(FileAccess::Read, reproData, reproDataSize);
+        SLANG_RETURN_ON_FAIL(ReproUtil::loadState(&memoryStream, buffer));
+    }
+
+    MemoryOffsetBase base;
+    base.set(buffer.getBuffer(), buffer.getCount());
+
+    ReproUtil::RequestState* requestState = ReproUtil::getRequest(buffer);
+    return ReproUtil::extractFiles(base, requestState, fileSystem);
+}
+
+SLANG_API SlangResult spLoadReproAsFileSystem(
+    SlangSession* session,
+    const void* reproData,
+    size_t reproDataSize,
+    ISlangFileSystem* replaceFileSystem,
+    ISlangFileSystemExt** outFileSystem)
+{
+    using namespace Slang;
+
+    SLANG_UNUSED(session);
+
+    MemoryStreamBase stream(FileAccess::Read, reproData, reproDataSize);
+
+    List<uint8_t> buffer;
+    SLANG_RETURN_ON_FAIL(ReproUtil::loadState(&stream, buffer));
+
+    auto requestState = ReproUtil::getRequest(buffer);
+    MemoryOffsetBase base;
+    base.set(buffer.getBuffer(), buffer.getCount());
+
+    RefPtr<CacheFileSystem> cacheFileSystem;
+    SLANG_RETURN_ON_FAIL(ReproUtil::loadFileSystem(base, requestState, replaceFileSystem, cacheFileSystem));
+
+    *outFileSystem = cacheFileSystem.detach();
+    return SLANG_OK;
+}
+
diff --git a/source/slang/slang-compiler.cpp b/source/slang/slang-compiler.cpp
index 0d92fbacc..158aac141 100755
--- a/source/slang/slang-compiler.cpp
+++ b/source/slang/slang-compiler.cpp
@@ -17,7 +17,6 @@
 #include "slang-parser.h"
 #include "slang-preprocessor.h"
 #include "slang-type-layout.h"
-#include "slang-reflection.h"
 #include "slang-emit.h"
 
 #include "slang-glsl-extension-tracker.h"
diff --git a/source/slang/slang-reflection.cpp b/source/slang/slang-reflection-api.cpp
index 42355ca02..61990b7d0 100644
--- a/source/slang/slang-reflection.cpp
+++ b/source/slang/slang-reflection-api.cpp
@@ -1,5 +1,9 @@
-// slang-reflection.cpp
-#include "slang-reflection.h"
+// slang-reflection-api.cpp
+
+#include "../core/slang-basic.h"
+#include "slang-syntax.h"
+
+#include "../../slang.h"
 
 #include "slang-compiler.h"
 #include "slang-type-layout.h"
@@ -12,16 +16,10 @@
 // Slang developers can switch this when debugging.
 #define SLANG_REFLECTION_UNEXPECTED() do {} while(0)
 
-// Implementation to back public-facing reflection API
-
-using namespace Slang;
-
+namespace Slang
+{
 
 // Conversion routines to help with strongly-typed reflection API
-static inline Session* convert(SlangSession* session)
-{
-    return (Session*)session;
-}
 
 static inline UserDefinedAttribute* convert(SlangReflectionUserAttribute* attrib)
 {
@@ -31,6 +29,7 @@ static inline SlangReflectionUserAttribute* convert(UserDefinedAttribute* attrib
 {
     return (SlangReflectionUserAttribute*)attrib;
 }
+
 static inline Type* convert(SlangReflectionType* type)
 {
     return (Type*) type;
@@ -96,9 +95,9 @@ static inline SlangReflection* convert(ProgramLayout* program)
     return (SlangReflection*) program;
 }
 
-// user attaribute
+// user attribute
 
-unsigned int getUserAttributeCount(Decl* decl)
+static unsigned int getUserAttributeCount(Decl* decl)
 {
     unsigned int count = 0;
     for (auto x : decl->getModifiersOfType<UserDefinedAttribute>())
@@ -109,7 +108,7 @@ unsigned int getUserAttributeCount(Decl* decl)
     return count;
 }
 
-SlangReflectionUserAttribute* findUserAttributeByName(Session* session, Decl* decl, const char* name)
+static SlangReflectionUserAttribute* findUserAttributeByName(Session* session, Decl* decl, const char* name)
 {
     auto nameObj = session->tryGetNameObj(name);
     for (auto x : decl->getModifiersOfType<UserDefinedAttribute>())
@@ -120,7 +119,7 @@ SlangReflectionUserAttribute* findUserAttributeByName(Session* session, Decl* de
     return nullptr;
 }
 
-SlangReflectionUserAttribute* getUserAttributeByIndex(Decl* decl, unsigned int index)
+static SlangReflectionUserAttribute* getUserAttributeByIndex(Decl* decl, unsigned int index)
 {
     unsigned int id = 0;
     for (auto x : decl->getModifiersOfType<UserDefinedAttribute>())
@@ -132,6 +131,119 @@ SlangReflectionUserAttribute* getUserAttributeByIndex(Decl* decl, unsigned int i
     return nullptr;
 }
 
+
+// Attempt "do what I mean" remapping from the parameter category the user asked about,
+// over to a parameter category that they might have meant.
+static SlangParameterCategory maybeRemapParameterCategory(
+    TypeLayout*             typeLayout,
+    SlangParameterCategory  category)
+{
+    // Do we have an entry for the category they asked about? Then use that.
+    if (typeLayout->FindResourceInfo(LayoutResourceKind(category)))
+        return category;
+
+    // Do we have an entry for the `DescriptorTableSlot` category?
+    if (typeLayout->FindResourceInfo(LayoutResourceKind::DescriptorTableSlot))
+    {
+        // Is the category they were asking about one that makes sense for the type
+        // of this variable?
+        Type* type = typeLayout->getType();
+        while (auto arrayType = as<ArrayExpressionType>(type))
+            type = arrayType->baseType;
+        switch (spReflectionType_GetKind(convert(type)))
+        {
+            case SLANG_TYPE_KIND_CONSTANT_BUFFER:
+                if (category == SLANG_PARAMETER_CATEGORY_CONSTANT_BUFFER)
+                    return SLANG_PARAMETER_CATEGORY_DESCRIPTOR_TABLE_SLOT;
+                break;
+
+            case SLANG_TYPE_KIND_RESOURCE:
+                if (category == SLANG_PARAMETER_CATEGORY_SHADER_RESOURCE)
+                    return SLANG_PARAMETER_CATEGORY_DESCRIPTOR_TABLE_SLOT;
+                break;
+
+            case SLANG_TYPE_KIND_SAMPLER_STATE:
+                if (category == SLANG_PARAMETER_CATEGORY_SAMPLER_STATE)
+                    return SLANG_PARAMETER_CATEGORY_DESCRIPTOR_TABLE_SLOT;
+                break;
+
+                // TODO: implement more helpers here
+
+            default:
+                break;
+        }
+    }
+
+    return category;
+}
+
+// Helpers for getting parameter count
+
+static unsigned getParameterCount(RefPtr<TypeLayout> typeLayout)
+{
+    if (auto parameterGroupLayout = as<ParameterGroupTypeLayout>(typeLayout))
+    {
+        typeLayout = parameterGroupLayout->offsetElementTypeLayout;
+    }
+
+    if (auto structLayout = as<StructTypeLayout>(typeLayout))
+    {
+        return (unsigned)structLayout->fields.getCount();
+    }
+
+    return 0;
+}
+
+static VarLayout* getParameterByIndex(RefPtr<TypeLayout> typeLayout, unsigned index)
+{
+    if (auto parameterGroupLayout = as<ParameterGroupTypeLayout>(typeLayout))
+    {
+        typeLayout = parameterGroupLayout->offsetElementTypeLayout;
+    }
+
+    if (auto structLayout = as<StructTypeLayout>(typeLayout))
+    {
+        return structLayout->fields[index];
+    }
+
+    return 0;
+}
+
+static SlangParameterCategory getParameterCategory(
+    LayoutResourceKind kind)
+{
+    return SlangParameterCategory(kind);
+}
+
+static SlangParameterCategory getParameterCategory(
+    TypeLayout*  typeLayout)
+{
+    auto resourceInfoCount = typeLayout->resourceInfos.getCount();
+    if (resourceInfoCount == 1)
+    {
+        return getParameterCategory(typeLayout->resourceInfos[0].kind);
+    }
+    else if (resourceInfoCount == 0)
+    {
+        // TODO: can this ever happen?
+        return SLANG_PARAMETER_CATEGORY_NONE;
+    }
+    return SLANG_PARAMETER_CATEGORY_MIXED;
+}
+
+static bool hasDefaultConstantBuffer(ScopeLayout* layout)
+{
+    auto typeLayout = layout->parametersLayout->getTypeLayout();
+    return as<ParameterGroupTypeLayout>(typeLayout) != nullptr;
+}
+
+
+} // namespace Slang
+
+using namespace Slang;
+
+// Implementation to back public-facing reflection API
+
 SLANG_API char const* spReflectionUserAttribute_GetName(SlangReflectionUserAttribute* attrib)
 {
     auto userAttr = convert(attrib);
@@ -189,11 +301,8 @@ SLANG_API const char* spReflectionUserAttribute_GetArgumentValueString(SlangRefl
     return nullptr;
 }
 
-
-
 // type Reflection
 
-
 SLANG_API SlangTypeKind spReflectionType_GetKind(SlangReflectionType* inType)
 {
     auto type = convert(inType);
@@ -857,28 +966,6 @@ SLANG_API SlangReflectionVariableLayout* spReflectionTypeLayout_getContainerVarL
     return nullptr;
 }
 
-static SlangParameterCategory getParameterCategory(
-    LayoutResourceKind kind)
-{
-    return SlangParameterCategory(kind);
-}
-
-static SlangParameterCategory getParameterCategory(
-    TypeLayout*  typeLayout)
-{
-    auto resourceInfoCount = typeLayout->resourceInfos.getCount();
-    if(resourceInfoCount == 1)
-    {
-        return getParameterCategory(typeLayout->resourceInfos[0].kind);
-    }
-    else if(resourceInfoCount == 0)
-    {
-        // TODO: can this ever happen?
-        return SLANG_PARAMETER_CATEGORY_NONE;
-    }
-    return SLANG_PARAMETER_CATEGORY_MIXED;
-}
-
 SLANG_API SlangParameterCategory spReflectionTypeLayout_GetParameterCategory(SlangReflectionTypeLayout* inTypeLayout)
 {
     auto typeLayout = convert(inTypeLayout);
@@ -1908,7 +1995,7 @@ SLANG_API SlangReflectionUserAttribute* spReflectionVariable_FindUserAttributeBy
 {
     auto varDecl = convert(inVar);
     if (!varDecl) return 0;
-    return findUserAttributeByName(convert(session), varDecl, name);
+    return findUserAttributeByName(asInternal(session), varDecl, name);
 }
 
 // Variable Layout Reflection
@@ -1929,54 +2016,6 @@ SLANG_API SlangReflectionTypeLayout* spReflectionVariableLayout_GetTypeLayout(Sl
     return convert(varLayout->getTypeLayout());
 }
 
-namespace Slang
-{
-    // Attempt "do what I mean" remapping from the parameter category the user asked about,
-    // over to a parameter category that they might have meant.
-    static SlangParameterCategory maybeRemapParameterCategory(
-        TypeLayout*             typeLayout,
-        SlangParameterCategory  category)
-    {
-        // Do we have an entry for the category they asked about? Then use that.
-        if (typeLayout->FindResourceInfo(LayoutResourceKind(category)))
-            return category;
-
-        // Do we have an entry for the `DescriptorTableSlot` category?
-        if (typeLayout->FindResourceInfo(LayoutResourceKind::DescriptorTableSlot))
-        {
-            // Is the category they were asking about one that makes sense for the type
-            // of this variable?
-            Type* type = typeLayout->getType();
-            while (auto arrayType = as<ArrayExpressionType>(type))
-                type = arrayType->baseType;
-            switch (spReflectionType_GetKind(convert(type)))
-            {
-            case SLANG_TYPE_KIND_CONSTANT_BUFFER:
-                if(category == SLANG_PARAMETER_CATEGORY_CONSTANT_BUFFER)
-                    return SLANG_PARAMETER_CATEGORY_DESCRIPTOR_TABLE_SLOT;
-                break;
-
-            case SLANG_TYPE_KIND_RESOURCE:
-                if(category == SLANG_PARAMETER_CATEGORY_SHADER_RESOURCE)
-                    return SLANG_PARAMETER_CATEGORY_DESCRIPTOR_TABLE_SLOT;
-                break;
-
-            case SLANG_TYPE_KIND_SAMPLER_STATE:
-                if(category == SLANG_PARAMETER_CATEGORY_SAMPLER_STATE)
-                    return SLANG_PARAMETER_CATEGORY_DESCRIPTOR_TABLE_SLOT;
-                break;
-
-            // TODO: implement more helpers here
-
-            default:
-                break;
-            }
-        }
-
-        return category;
-    }
-}
-
 SLANG_API size_t spReflectionVariableLayout_GetOffset(SlangReflectionVariableLayout* inVarLayout, SlangParameterCategory category)
 {
     auto varLayout = convert(inVarLayout);
@@ -2121,40 +2160,7 @@ SLANG_API unsigned spReflectionParameter_GetBindingSpace(SlangReflectionParamete
             spReflectionVariableLayout_GetTypeLayout(varLayout)));
 }
 
-// Helpers for getting parameter count
 
-namespace Slang
-{
-    static unsigned getParameterCount(RefPtr<TypeLayout> typeLayout)
-    {
-        if(auto parameterGroupLayout = as<ParameterGroupTypeLayout>(typeLayout))
-        {
-            typeLayout = parameterGroupLayout->offsetElementTypeLayout;
-        }
-
-        if(auto structLayout = as<StructTypeLayout>(typeLayout))
-        {
-            return (unsigned) structLayout->fields.getCount();
-        }
-
-        return 0;
-    }
-
-    static VarLayout* getParameterByIndex(RefPtr<TypeLayout> typeLayout, unsigned index)
-    {
-        if(auto parameterGroupLayout = as<ParameterGroupTypeLayout>(typeLayout))
-        {
-            typeLayout = parameterGroupLayout->offsetElementTypeLayout;
-        }
-
-        if(auto structLayout = as<StructTypeLayout>(typeLayout))
-        {
-            return structLayout->fields[index];
-        }
-
-        return 0;
-    }
-}
 
 // Entry Point Reflection
 
@@ -2262,13 +2268,6 @@ SLANG_API SlangReflectionVariableLayout* spReflectionEntryPoint_getResultVarLayo
     return convert(entryPointLayout->resultLayout);
 }
 
-
-static bool hasDefaultConstantBuffer(ScopeLayout* layout)
-{
-    auto typeLayout = layout->parametersLayout->getTypeLayout();
-    return as<ParameterGroupTypeLayout>(typeLayout) != nullptr;
-}
-
 SLANG_API int spReflectionEntryPoint_hasDefaultConstantBuffer(
     SlangReflectionEntryPoint* inEntryPoint)
 {
diff --git a/source/slang/slang-reflection.h b/source/slang/slang-reflection.h
deleted file mode 100644
index ea3021bd6..000000000
--- a/source/slang/slang-reflection.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef SLANG_REFLECTION_H
-#define SLANG_REFLECTION_H
-
-#include "../core/slang-basic.h"
-#include "slang-syntax.h"
-
-#include "../../slang.h"
-
-namespace Slang {
-
-class ProgramLayout;
-class TypeLayout;
-
-//
-
-SlangTypeKind getReflectionTypeKind(Type* type);
-
-SlangTypeKind getReflectionParameterCategory(TypeLayout* typeLayout);
-
-UInt getReflectionFieldCount(Type* type);
-UInt getReflectionFieldByIndex(Type* type, UInt index);
-UInt getReflectionFieldByIndex(TypeLayout* typeLayout, UInt index);
-
-}
-
-#endif // SLANG_REFLECTION_H
diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp
index d31b0302b..254a37c24 100644
--- a/source/slang/slang.cpp
+++ b/source/slang/slang.cpp
@@ -1,5 +1,4 @@
 #include "../../slang.h"
-#include "../../slang-tag-version.h"
 
 #include "../core/slang-io.h"
 #include "../core/slang-string-util.h"
@@ -11,7 +10,7 @@
 #include "slang-mangle.h"
 #include "slang-parser.h"
 #include "slang-preprocessor.h"
-#include "slang-reflection.h"
+
 #include "slang-type-layout.h"
 
 #include "slang-options.h"
@@ -3259,117 +3258,6 @@ Session::~Session()
 
 }
 
-// implementation of C interface
-
-SLANG_API SlangSession* spCreateSession(const char*)
-{
-    Slang::ComPtr<slang::IGlobalSession> globalSession;
-    if (SLANG_FAILED(slang_createGlobalSession(SLANG_API_VERSION, globalSession.writeRef())))
-    {
-        return nullptr;
-    }
-    // Will be returned with a refcount of 1
-    return globalSession.detach();
-}
-
-SLANG_API SlangResult slang_createGlobalSession(
-    SlangInt                apiVersion,
-    slang::IGlobalSession** outGlobalSession)
-{
-    Slang::ComPtr<slang::IGlobalSession> globalSession;
-    SLANG_RETURN_ON_FAIL(slang_createGlobalSessionWithoutStdLib(apiVersion, globalSession.writeRef()));
-    SLANG_RETURN_ON_FAIL(globalSession->compileStdLib());
-    *outGlobalSession = globalSession.detach();
-    return SLANG_OK;
-}
-
-SLANG_API SlangResult slang_createGlobalSessionWithoutStdLib(
-    SlangInt                apiVersion,
-    slang::IGlobalSession** outGlobalSession)
-{
-    if (apiVersion != 0)
-        return SLANG_E_NOT_IMPLEMENTED;
-
-    // Create the session
-    Slang::Session* globalSession = new Slang::Session();
-    // Put an interface ref on it
-    Slang::ComPtr<slang::IGlobalSession> result(globalSession);
-
-    // Initialize it
-    globalSession->init();
-
-    *outGlobalSession = result.detach();
-    return SLANG_OK;
-}
-
-SLANG_API void spDestroySession(
-    SlangSession*   inSession)
-{
-    if(!inSession) return;
-
-    Slang::Session* session = Slang::asInternal(inSession);
-    // It is assumed there is only a single reference on the session (the one placed
-    // with spCreateSession) if this function is called
-    SLANG_ASSERT(session->debugGetReferenceCount() == 1);
-    // Release
-    session->release();
-}
-
-SLANG_API const char* spGetBuildTagString()
-{
-    return SLANG_TAG_VERSION;
-}
-
-SLANG_API void spAddBuiltins(
-    SlangSession*   session,
-    char const*     sourcePath,
-    char const*     sourceString)
-{
-    session->addBuiltins(sourcePath, sourceString);
-}
-
-SLANG_API void spSessionSetSharedLibraryLoader(
-    SlangSession*               session,
-    ISlangSharedLibraryLoader* loader)
-{
-    session->setSharedLibraryLoader(loader);
-}
-
-SLANG_API ISlangSharedLibraryLoader* spSessionGetSharedLibraryLoader(
-    SlangSession*               session)
-{
-    return session->getSharedLibraryLoader();
-}
-
-SLANG_API SlangResult spSessionCheckCompileTargetSupport(
-    SlangSession*                session,
-    SlangCompileTarget           target)
-{
-    return session->checkCompileTargetSupport(target);
-}
-
-SLANG_API SlangResult spSessionCheckPassThroughSupport(
-    SlangSession*       session,
-    SlangPassThrough    passThrough)
-{
-    return session->checkPassThroughSupport(passThrough);
-}
-
-SLANG_API SlangCompileRequest* spCreateCompileRequest(
-    SlangSession* session)
-{
-    slang::ICompileRequest* request = nullptr;
-    // Will return with suitable ref count
-    session->createCompileRequest(&request);
-    return request;
-}
-
-SLANG_API SlangProfileID spFindProfile(
-    SlangSession* session,
-    char const*     name)
-{
-    return session->findProfile(name);
-}
 
 /* !!!!!!!!!!!!!!!!!! EndToEndCompileRequestImpl !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
 
@@ -4065,582 +3953,4 @@ SlangResult EndToEndCompileRequest::getEntryPoint(SlangInt entryPointIndex, slan
 
 } // namespace Slang
 
-/* !!!!!!!!!!!!!!!!!!SlangCompileRequest API!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
-
-/*!
-@brief Destroy a compile request.
-*/
-SLANG_API void spDestroyCompileRequest(
-    slang::ICompileRequest*    request)
-{
-    if (request)
-    {
-        request->release();
-    }
-}
-
-/* All other functions just call into the ICompileResult interface. */
-
-SLANG_API void spSetFileSystem(
-    slang::ICompileRequest*    request,
-    ISlangFileSystem*       fileSystem)
-{
-    SLANG_ASSERT(request);
-    request->setFileSystem(fileSystem);
-}
-
-SLANG_API void spSetCompileFlags(
-    slang::ICompileRequest*    request,
-    SlangCompileFlags       flags)
-{
-    SLANG_ASSERT(request);
-    request->setCompileFlags(flags);
-}
-
-SLANG_API void spSetDumpIntermediates(
-    slang::ICompileRequest*    request,
-    int                     enable)
-{
-    SLANG_ASSERT(request);
-    request->setDumpIntermediates(enable);
-}
-
-SLANG_API void spSetDumpIntermediatePrefix(
-    slang::ICompileRequest*    request,
-    const char* prefix)
-{
-    SLANG_ASSERT(request);
-    request->setDumpIntermediatePrefix(prefix);
-}
-
-SLANG_API void spSetLineDirectiveMode(
-    slang::ICompileRequest*    request,
-    SlangLineDirectiveMode  mode)
-{
-    SLANG_ASSERT(request);
-    request->setLineDirectiveMode(mode);
-}
-
-SLANG_API void spSetCommandLineCompilerMode(
-    slang::ICompileRequest* request)
-{
-    SLANG_ASSERT(request);
-    request->setCommandLineCompilerMode();
-}
-
-SLANG_API void spSetCodeGenTarget(
-    slang::ICompileRequest*    request,
-    SlangCompileTarget target)
-{
-    SLANG_ASSERT(request);
-    request->setCodeGenTarget(target);
-}
-
-SLANG_API int spAddCodeGenTarget(
-    slang::ICompileRequest*    request,
-    SlangCompileTarget      target)
-{
-    SLANG_ASSERT(request);
-    return request->addCodeGenTarget(target);
-}
-
-SLANG_API void spSetTargetProfile(
-    slang::ICompileRequest*    request,
-    int                     targetIndex,
-    SlangProfileID          profile)
-{
-    SLANG_ASSERT(request);
-    request->setTargetProfile(targetIndex, profile);
-}
-
-SLANG_API void spSetTargetFlags(
-    slang::ICompileRequest*    request,
-    int                     targetIndex,
-    SlangTargetFlags        flags)
-{
-    SLANG_ASSERT(request);
-    request->setTargetFlags(targetIndex, flags);
-}
-
-SLANG_API void spSetTargetFloatingPointMode(
-    slang::ICompileRequest*    request,
-    int                     targetIndex,
-    SlangFloatingPointMode  mode)
-{
-    SLANG_ASSERT(request);
-    request->setTargetFloatingPointMode(targetIndex, mode);
-}
-
-SLANG_API void spSetMatrixLayoutMode(
-    slang::ICompileRequest*    request,
-    SlangMatrixLayoutMode   mode)
-{
-    SLANG_ASSERT(request);
-    request->setMatrixLayoutMode(mode);
-}
-
-SLANG_API void spSetTargetMatrixLayoutMode(
-    slang::ICompileRequest*    request,
-    int                     targetIndex,
-    SlangMatrixLayoutMode   mode)
-{
-    SLANG_ASSERT(request);
-    request->setTargetMatrixLayoutMode(targetIndex, mode);
-}
-
-SLANG_API void spSetDebugInfoLevel(
-    slang::ICompileRequest*    request,
-    SlangDebugInfoLevel     level)
-{
-    SLANG_ASSERT(request);
-    request->setDebugInfoLevel(level);
-}
-
-SLANG_API void spSetOptimizationLevel(
-    slang::ICompileRequest*    request,
-    SlangOptimizationLevel  level)
-{
-    SLANG_ASSERT(request);
-    request->setOptimizationLevel(level);
-}
-
-SLANG_API void spSetOutputContainerFormat(
-    slang::ICompileRequest*    request,
-    SlangContainerFormat    format)
-{
-    SLANG_ASSERT(request);
-    request->setOutputContainerFormat(format);
-}
-
-SLANG_API void spSetPassThrough(
-    slang::ICompileRequest*    request,
-    SlangPassThrough        passThrough)
-{
-    SLANG_ASSERT(request);
-    request->setPassThrough(passThrough);
-}
-
-SLANG_API void spSetDiagnosticCallback(
-    slang::ICompileRequest*    request,
-    SlangDiagnosticCallback callback,
-    void const*             userData)
-{
-    SLANG_ASSERT(request);
-    request->setDiagnosticCallback(callback, userData);
-}
-
-SLANG_API void spSetWriter(
-    slang::ICompileRequest*    request,
-    SlangWriterChannel      chan, 
-    ISlangWriter*           writer)
-{
-    SLANG_ASSERT(request);
-    request->setWriter(chan, writer);
-}
-
-SLANG_API ISlangWriter* spGetWriter(
-    slang::ICompileRequest*    request,
-    SlangWriterChannel      chan)
-{
-    SLANG_ASSERT(request);
-    return request->getWriter(chan);
-}
-
-SLANG_API void spAddSearchPath(
-    slang::ICompileRequest*    request,
-    const char*             path)
-{
-    SLANG_ASSERT(request);
-    request->addSearchPath(path);
-}
-
-SLANG_API void spAddPreprocessorDefine(
-    slang::ICompileRequest*    request,
-    const char*             key,
-    const char*             value)
-{
-    SLANG_ASSERT(request);
-    request->addPreprocessorDefine(key, value);
-}
-
-SLANG_API char const* spGetDiagnosticOutput(
-    slang::ICompileRequest*    request)
-{
-    SLANG_ASSERT(request);
-    return request->getDiagnosticOutput();
-}
-
-SLANG_API SlangResult spGetDiagnosticOutputBlob(
-    slang::ICompileRequest*    request,
-    ISlangBlob**            outBlob)
-{
-    SLANG_ASSERT(request);
-    return request->getDiagnosticOutputBlob(outBlob);
-}
-
-// New-fangled compilation API
-
-SLANG_API int spAddTranslationUnit(
-    slang::ICompileRequest*    request,
-    SlangSourceLanguage     language,
-    char const*             inName)
-{
-    SLANG_ASSERT(request);
-    return request->addTranslationUnit(language, inName);
-}
-
-SLANG_API void spSetDefaultModuleName(
-    slang::ICompileRequest*    request,
-    const char* defaultModuleName)
-{
-    SLANG_ASSERT(request);
-    request->setDefaultModuleName(defaultModuleName);
-}
-
-SLANG_API SlangResult spAddLibraryReference(
-    slang::ICompileRequest*    request,
-    const void* libData,
-    size_t libDataSize)
-{
-    SLANG_ASSERT(request);
-    return request->addLibraryReference(libData, libDataSize);
-}
-
-SLANG_API void spTranslationUnit_addPreprocessorDefine(
-    slang::ICompileRequest*    request,
-    int                     translationUnitIndex,
-    const char*             key,
-    const char*             value)
-{
-    SLANG_ASSERT(request);
-    request->addTranslationUnitPreprocessorDefine(translationUnitIndex, key, value);
-}
-
-SLANG_API void spAddTranslationUnitSourceFile(
-    slang::ICompileRequest*    request,
-    int                     translationUnitIndex,
-    char const*             path)
-{
-    SLANG_ASSERT(request);
-    request->addTranslationUnitSourceFile(translationUnitIndex, path);
-}
-
-SLANG_API void spAddTranslationUnitSourceString(
-    slang::ICompileRequest*    request,
-    int                     translationUnitIndex,
-    char const*             path,
-    char const*             source)
-{
-    SLANG_ASSERT(request);
-    request->addTranslationUnitSourceString(translationUnitIndex, path, source);
-}
-
-SLANG_API void spAddTranslationUnitSourceStringSpan(
-    slang::ICompileRequest*    request,
-    int                     translationUnitIndex,
-    char const*             path,
-    char const*             sourceBegin,
-    char const*             sourceEnd)
-{
-    SLANG_ASSERT(request);
-    request->addTranslationUnitSourceStringSpan(translationUnitIndex, path, sourceBegin, sourceEnd);
-}
-
-SLANG_API void spAddTranslationUnitSourceBlob(
-    slang::ICompileRequest*    request,
-    int                     translationUnitIndex,
-    char const*             path,
-    ISlangBlob*             sourceBlob)
-{
-    SLANG_ASSERT(request);
-    request->addTranslationUnitSourceBlob(translationUnitIndex, path, sourceBlob);
-}
-
-SLANG_API int spAddEntryPoint(
-    slang::ICompileRequest*    request,
-    int                     translationUnitIndex,
-    char const*             name,
-    SlangStage              stage)
-{
-    SLANG_ASSERT(request);
-    return request->addEntryPoint(translationUnitIndex, name, stage);
-}
-
-SLANG_API int spAddEntryPointEx(
-    slang::ICompileRequest*    request,
-    int                     translationUnitIndex,
-    char const*             name,
-    SlangStage              stage,
-    int                     genericParamTypeNameCount,
-    char const **           genericParamTypeNames)
-{
-    SLANG_ASSERT(request);
-    return request->addEntryPointEx(translationUnitIndex, name, stage, genericParamTypeNameCount, genericParamTypeNames);
-}
-
-SLANG_API SlangResult spSetGlobalGenericArgs(
-    slang::ICompileRequest*    request,
-    int                     genericArgCount,
-    char const**            genericArgs)
-{
-    SLANG_ASSERT(request);
-    return request->setGlobalGenericArgs(genericArgCount, genericArgs);
-}
-
-SLANG_API SlangResult spSetTypeNameForGlobalExistentialTypeParam(
-    slang::ICompileRequest*    request,
-    int                     slotIndex,
-    char const*             typeName)
-{
-    SLANG_ASSERT(request);
-    return request->setTypeNameForGlobalExistentialTypeParam(slotIndex, typeName);
-}
-
-SLANG_API SlangResult spSetTypeNameForEntryPointExistentialTypeParam(
-    slang::ICompileRequest*    request,
-    int                     entryPointIndex,
-    int                     slotIndex,
-    char const*             typeName)
-{
-    SLANG_ASSERT(request);
-    return request->setTypeNameForEntryPointExistentialTypeParam(entryPointIndex, slotIndex, typeName);
-}
-
-SLANG_API SlangResult spCompile(
-    slang::ICompileRequest*    request)
-{
-    SLANG_ASSERT(request);
-    return request->compile();
-}
-
-SLANG_API int
-spGetDependencyFileCount(
-    slang::ICompileRequest*    request)
-{
-    SLANG_ASSERT(request);
-    return request->getDependencyFileCount();
-}
-
-SLANG_API char const*
-spGetDependencyFilePath(
-    slang::ICompileRequest*    request,
-    int                     index)
-{
-    SLANG_ASSERT(request);
-    return request->getDependencyFilePath(index);
-}
-
-SLANG_API int
-spGetTranslationUnitCount(
-    slang::ICompileRequest*    request)
-{
-    SLANG_ASSERT(request);
-    return request->getTranslationUnitCount();
-}
-
-SLANG_API void const* spGetEntryPointCode(
-    slang::ICompileRequest*    request,
-    int                     entryPointIndex,
-    size_t*                 outSize)
-{
-    SLANG_ASSERT(request);
-    return request->getEntryPointCode(entryPointIndex, outSize);
-}
-
-SLANG_API SlangResult spGetEntryPointCodeBlob(
-        slang::ICompileRequest*    request,
-        int                     entryPointIndex,
-        int                     targetIndex,
-        ISlangBlob**            outBlob)
-{
-    SLANG_ASSERT(request);
-    return request->getEntryPointCodeBlob(entryPointIndex, targetIndex, outBlob);
-}
-
-SLANG_API SlangResult spGetEntryPointHostCallable(
-    slang::ICompileRequest*    request,
-    int                     entryPointIndex,
-    int                     targetIndex,
-    ISlangSharedLibrary**   outSharedLibrary)
-{
-    SLANG_ASSERT(request);
-    return request->getEntryPointHostCallable(entryPointIndex, targetIndex, outSharedLibrary);
-}
-
-SLANG_API SlangResult spGetTargetCodeBlob(
-    slang::ICompileRequest* request,
-    int targetIndex,
-    ISlangBlob** outBlob)
-{
-    SLANG_ASSERT(request);
-    return request->getTargetCodeBlob(targetIndex, outBlob);
-}
-
-SLANG_API SlangResult spGetTargetHostCallable(
-    slang::ICompileRequest* request,
-    int targetIndex,
-    ISlangSharedLibrary** outSharedLibrary)
-{
-    SLANG_ASSERT(request);
-    return request->getTargetHostCallable(targetIndex, outSharedLibrary);
-}
-
-SLANG_API char const* spGetEntryPointSource(
-    slang::ICompileRequest*    request,
-    int                     entryPointIndex)
-{
-    SLANG_ASSERT(request);
-    return request->getEntryPointSource(entryPointIndex);
-}
-
-SLANG_API void const* spGetCompileRequestCode(
-    slang::ICompileRequest*    request,
-    size_t*                 outSize)
-{
-    SLANG_ASSERT(request);
-    return request->getCompileRequestCode(outSize);
-}
-
-SLANG_API SlangResult spGetContainerCode(
-    slang::ICompileRequest*    request,
-    ISlangBlob**            outBlob)
-{
-    SLANG_ASSERT(request);
-    return request->getContainerCode(outBlob);
-}
-
-SLANG_API SlangResult spLoadRepro(
-    slang::ICompileRequest* request,
-    ISlangFileSystem* fileSystem,
-    const void* data,
-    size_t size)
-{
-    SLANG_ASSERT(request);
-    return request->loadRepro(fileSystem, data, size);
-}
-
-SLANG_API SlangResult spSaveRepro(
-    slang::ICompileRequest* request,
-    ISlangBlob** outBlob)
-{
-    SLANG_ASSERT(request);
-    return request->saveRepro(outBlob);
-}
-
-SLANG_API SlangResult spEnableReproCapture(
-    slang::ICompileRequest* request)
-{
-    SLANG_ASSERT(request);
-    return request->enableReproCapture();
-}
-
-SLANG_API SlangResult spCompileRequest_getProgram(
-    slang::ICompileRequest*    request,
-    slang::IComponentType** outProgram)
-{
-    SLANG_ASSERT(request);
-    return request->getProgram(outProgram);
-}
-
-SLANG_API SlangResult spCompileRequest_getModule(
-    slang::ICompileRequest*    request,
-    SlangInt                translationUnitIndex,
-    slang::IModule**        outModule)
-{
-    SLANG_ASSERT(request);
-    return request->getModule(translationUnitIndex, outModule);
-}
-
-SLANG_API SlangResult spCompileRequest_getSession(
-    slang::ICompileRequest* request,
-    slang::ISession** outSession)
-{
-    SLANG_ASSERT(request);
-    return request->getSession(outSession);
-}
-
-SLANG_API SlangResult spCompileRequest_getEntryPoint(
-    slang::ICompileRequest*    request,
-    SlangInt                entryPointIndex,
-    slang::IComponentType** outEntryPoint)
-{
-    SLANG_ASSERT(request);
-    return request->getEntryPoint(entryPointIndex, outEntryPoint);
-}
-
-// Get the output code associated with a specific translation unit
-SLANG_API char const* spGetTranslationUnitSource(
-    slang::ICompileRequest*    /*request*/,
-    int                     /*translationUnitIndex*/)
-{
-    fprintf(stderr, "DEPRECATED: spGetTranslationUnitSource()\n");
-    return nullptr;
-}
-
-SLANG_API SlangResult spProcessCommandLineArguments(
-    SlangCompileRequest*    request,
-    char const* const*      args,
-    int                     argCount)
-{
-    return request->processCommandLineArguments(args, argCount);
-}
-
-// Reflection API
-
-SLANG_API SlangReflection* spGetReflection(
-    slang::ICompileRequest*    request)
-{
-    SLANG_ASSERT(request);
-    return request->getReflection();
-}
-
-// ... rest of reflection API implementation is in `Reflection.cpp`
-
-/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!! Session !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
-
-SLANG_API SlangResult spExtractRepro(SlangSession* session, const void* reproData, size_t reproDataSize, ISlangMutableFileSystem* fileSystem)
-{
-    using namespace Slang;
-    SLANG_UNUSED(session);
-
-    List<uint8_t> buffer;
-    {
-        MemoryStreamBase memoryStream(FileAccess::Read, reproData, reproDataSize);
-        SLANG_RETURN_ON_FAIL(ReproUtil::loadState(&memoryStream, buffer));
-    }
-
-    MemoryOffsetBase base;
-    base.set(buffer.getBuffer(), buffer.getCount());
-
-    ReproUtil::RequestState* requestState = ReproUtil::getRequest(buffer);
-    return ReproUtil::extractFiles(base, requestState, fileSystem);
-}
-
-SLANG_API SlangResult spLoadReproAsFileSystem(
-    SlangSession* session,
-    const void* reproData,
-    size_t reproDataSize,
-    ISlangFileSystem* replaceFileSystem,
-    ISlangFileSystemExt** outFileSystem)
-{
-    using namespace Slang;
-
-    SLANG_UNUSED(session);
-    
-    MemoryStreamBase stream(FileAccess::Read, reproData, reproDataSize);
-
-    List<uint8_t> buffer;
-    SLANG_RETURN_ON_FAIL(ReproUtil::loadState(&stream, buffer));
-
-    auto requestState = ReproUtil::getRequest(buffer);
-    MemoryOffsetBase base;
-    base.set(buffer.getBuffer(), buffer.getCount());
-
-    RefPtr<CacheFileSystem> cacheFileSystem;
-    SLANG_RETURN_ON_FAIL(ReproUtil::loadFileSystem(base, requestState, replaceFileSystem, cacheFileSystem));
-
-    *outFileSystem = cacheFileSystem.detach();
-    return SLANG_OK;
-}
-
 
diff --git a/source/slang/slang.vcxproj b/source/slang/slang.vcxproj
deleted file mode 100644
index 08c1f03a4..000000000
--- a/source/slang/slang.vcxproj
+++ /dev/null
@@ -1,443 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{DB00DA62-0533-4AFD-B59F-A67D5B3A0808}</ProjectGuid>
-    <IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>slang</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\windows-x86\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\debug\slang\</IntDir>
-    <TargetName>slang</TargetName>
-    <TargetExt>.dll</TargetExt>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\windows-x64\debug\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\debug\slang\</IntDir>
-    <TargetName>slang</TargetName>
-    <TargetExt>.dll</TargetExt>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\windows-x86\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x86\release\slang\</IntDir>
-    <TargetName>slang</TargetName>
-    <TargetExt>.dll</TargetExt>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\windows-x64\release\</OutDir>
-    <IntDir>..\..\intermediate\windows-x64\release\slang\</IntDir>
-    <TargetName>slang</TargetName>
-    <TargetExt>.dll</TargetExt>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <PreprocessorDefinitions>_DEBUG;SLANG_DYNAMIC_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\external\spirv-headers\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>..\..\bin\windows-x86\debug\slang.lib</ImportLibrary>
-      <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
-    </Link>
-    <PostBuildEvent>
-      <Command>IF EXIST ..\..\external\slang-binaries\bin\windows-x86\slang-glslang.dll\ (xcopy /Q /E /Y /I ..\..\external\slang-binaries\bin\windows-x86\slang-glslang.dll ..\..\bin\windows-x86\debug &gt; nul) ELSE (xcopy /Q /Y /I ..\..\external\slang-binaries\bin\windows-x86\slang-glslang.dll ..\..\bin\windows-x86\debug &gt; nul)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <PreprocessorDefinitions>_DEBUG;SLANG_DYNAMIC_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\external\spirv-headers\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>..\..\bin\windows-x64\debug\slang.lib</ImportLibrary>
-      <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
-    </Link>
-    <PostBuildEvent>
-      <Command>IF EXIST ..\..\external\slang-binaries\bin\windows-x64\slang-glslang.dll\ (xcopy /Q /E /Y /I ..\..\external\slang-binaries\bin\windows-x64\slang-glslang.dll ..\..\bin\windows-x64\debug &gt; nul) ELSE (xcopy /Q /Y /I ..\..\external\slang-binaries\bin\windows-x64\slang-glslang.dll ..\..\bin\windows-x64\debug &gt; nul)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <PreprocessorDefinitions>NDEBUG;SLANG_DYNAMIC_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\external\spirv-headers\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <Optimization>Full</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <ImportLibrary>..\..\bin\windows-x86\release\slang.lib</ImportLibrary>
-      <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
-    </Link>
-    <PostBuildEvent>
-      <Command>IF EXIST ..\..\external\slang-binaries\bin\windows-x86\slang-glslang.dll\ (xcopy /Q /E /Y /I ..\..\external\slang-binaries\bin\windows-x86\slang-glslang.dll ..\..\bin\windows-x86\release &gt; nul) ELSE (xcopy /Q /Y /I ..\..\external\slang-binaries\bin\windows-x86\slang-glslang.dll ..\..\bin\windows-x86\release &gt; nul)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <PreprocessorDefinitions>NDEBUG;SLANG_DYNAMIC_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\external\spirv-headers\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <Optimization>Full</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <ImportLibrary>..\..\bin\windows-x64\release\slang.lib</ImportLibrary>
-      <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
-    </Link>
-    <PostBuildEvent>
-      <Command>IF EXIST ..\..\external\slang-binaries\bin\windows-x64\slang-glslang.dll\ (xcopy /Q /E /Y /I ..\..\external\slang-binaries\bin\windows-x64\slang-glslang.dll ..\..\bin\windows-x64\release &gt; nul) ELSE (xcopy /Q /Y /I ..\..\external\slang-binaries\bin\windows-x64\slang-glslang.dll ..\..\bin\windows-x64\release &gt; nul)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\slang.h" />
-    <ClInclude Include="slang-ast-all.h" />
-    <ClInclude Include="slang-ast-base.h" />
-    <ClInclude Include="slang-ast-builder.h" />
-    <ClInclude Include="slang-ast-decl.h" />
-    <ClInclude Include="slang-ast-dump.h" />
-    <ClInclude Include="slang-ast-expr.h" />
-    <ClInclude Include="slang-ast-modifier.h" />
-    <ClInclude Include="slang-ast-reflect.h" />
-    <ClInclude Include="slang-ast-stmt.h" />
-    <ClInclude Include="slang-ast-support-types.h" />
-    <ClInclude Include="slang-ast-type.h" />
-    <ClInclude Include="slang-ast-val.h" />
-    <ClInclude Include="slang-check-impl.h" />
-    <ClInclude Include="slang-check.h" />
-    <ClInclude Include="slang-compiler.h" />
-    <ClInclude Include="slang-diagnostic-defs.h" />
-    <ClInclude Include="slang-diagnostics.h" />
-    <ClInclude Include="slang-emit-c-like.h" />
-    <ClInclude Include="slang-emit-cpp.h" />
-    <ClInclude Include="slang-emit-cuda.h" />
-    <ClInclude Include="slang-emit-glsl.h" />
-    <ClInclude Include="slang-emit-hlsl.h" />
-    <ClInclude Include="slang-emit-precedence.h" />
-    <ClInclude Include="slang-emit-source-writer.h" />
-    <ClInclude Include="slang-emit.h" />
-    <ClInclude Include="slang-file-system.h" />
-    <ClInclude Include="slang-glsl-extension-tracker.h" />
-    <ClInclude Include="slang-hlsl-intrinsic-set.h" />
-    <ClInclude Include="slang-image-format-defs.h" />
-    <ClInclude Include="slang-include-system.h" />
-    <ClInclude Include="slang-ir-any-value-marshalling.h" />
-    <ClInclude Include="slang-ir-augment-make-existential.h" />
-    <ClInclude Include="slang-ir-bind-existentials.h" />
-    <ClInclude Include="slang-ir-byte-address-legalize.h" />
-    <ClInclude Include="slang-ir-clone.h" />
-    <ClInclude Include="slang-ir-collect-global-uniforms.h" />
-    <ClInclude Include="slang-ir-constexpr.h" />
-    <ClInclude Include="slang-ir-dce.h" />
-    <ClInclude Include="slang-ir-dominators.h" />
-    <ClInclude Include="slang-ir-entry-point-raw-ptr-params.h" />
-    <ClInclude Include="slang-ir-entry-point-uniforms.h" />
-    <ClInclude Include="slang-ir-explicit-global-context.h" />
-    <ClInclude Include="slang-ir-explicit-global-init.h" />
-    <ClInclude Include="slang-ir-generics-lowering-context.h" />
-    <ClInclude Include="slang-ir-glsl-legalize.h" />
-    <ClInclude Include="slang-ir-hoist-local-types.h" />
-    <ClInclude Include="slang-ir-inline.h" />
-    <ClInclude Include="slang-ir-inst-defs.h" />
-    <ClInclude Include="slang-ir-insts.h" />
-    <ClInclude Include="slang-ir-layout.h" />
-    <ClInclude Include="slang-ir-legalize-varying-params.h" />
-    <ClInclude Include="slang-ir-link.h" />
-    <ClInclude Include="slang-ir-lower-existential.h" />
-    <ClInclude Include="slang-ir-lower-generic-call.h" />
-    <ClInclude Include="slang-ir-lower-generic-function.h" />
-    <ClInclude Include="slang-ir-lower-generic-type.h" />
-    <ClInclude Include="slang-ir-lower-generics.h" />
-    <ClInclude Include="slang-ir-lower-tuple-types.h" />
-    <ClInclude Include="slang-ir-missing-return.h" />
-    <ClInclude Include="slang-ir-restructure-scoping.h" />
-    <ClInclude Include="slang-ir-restructure.h" />
-    <ClInclude Include="slang-ir-sccp.h" />
-    <ClInclude Include="slang-ir-specialize-arrays.h" />
-    <ClInclude Include="slang-ir-specialize-dispatch.h" />
-    <ClInclude Include="slang-ir-specialize-dynamic-associatedtype-lookup.h" />
-    <ClInclude Include="slang-ir-specialize-function-call.h" />
-    <ClInclude Include="slang-ir-specialize-resources.h" />
-    <ClInclude Include="slang-ir-specialize.h" />
-    <ClInclude Include="slang-ir-ssa.h" />
-    <ClInclude Include="slang-ir-string-hash.h" />
-    <ClInclude Include="slang-ir-strip-witness-tables.h" />
-    <ClInclude Include="slang-ir-strip.h" />
-    <ClInclude Include="slang-ir-synthesize-active-mask.h" />
-    <ClInclude Include="slang-ir-type-set.h" />
-    <ClInclude Include="slang-ir-union.h" />
-    <ClInclude Include="slang-ir-validate.h" />
-    <ClInclude Include="slang-ir-witness-table-wrapper.h" />
-    <ClInclude Include="slang-ir-wrap-structured-buffers.h" />
-    <ClInclude Include="slang-ir.h" />
-    <ClInclude Include="slang-legalize-types.h" />
-    <ClInclude Include="slang-lexer.h" />
-    <ClInclude Include="slang-lookup.h" />
-    <ClInclude Include="slang-lower-to-ir.h" />
-    <ClInclude Include="slang-mangle.h" />
-    <ClInclude Include="slang-mangled-lexer.h" />
-    <ClInclude Include="slang-name.h" />
-    <ClInclude Include="slang-options.h" />
-    <ClInclude Include="slang-parameter-binding.h" />
-    <ClInclude Include="slang-parser.h" />
-    <ClInclude Include="slang-preprocessor.h" />
-    <ClInclude Include="slang-profile-defs.h" />
-    <ClInclude Include="slang-profile.h" />
-    <ClInclude Include="slang-ref-object-reflect.h" />
-    <ClInclude Include="slang-reflection.h" />
-    <ClInclude Include="slang-repro.h" />
-    <ClInclude Include="slang-serialize-ast-type-info.h" />
-    <ClInclude Include="slang-serialize-ast.h" />
-    <ClInclude Include="slang-serialize-container.h" />
-    <ClInclude Include="slang-serialize-factory.h" />
-    <ClInclude Include="slang-serialize-ir-types.h" />
-    <ClInclude Include="slang-serialize-ir.h" />
-    <ClInclude Include="slang-serialize-misc-type-info.h" />
-    <ClInclude Include="slang-serialize-reflection.h" />
-    <ClInclude Include="slang-serialize-source-loc.h" />
-    <ClInclude Include="slang-serialize-type-info.h" />
-    <ClInclude Include="slang-serialize-types.h" />
-    <ClInclude Include="slang-serialize-value-type-info.h" />
-    <ClInclude Include="slang-serialize.h" />
-    <ClInclude Include="slang-source-loc.h" />
-    <ClInclude Include="slang-syntax.h" />
-    <ClInclude Include="slang-token-defs.h" />
-    <ClInclude Include="slang-token.h" />
-    <ClInclude Include="slang-type-layout.h" />
-    <ClInclude Include="slang-type-system-shared.h" />
-    <ClInclude Include="slang-value-reflect.h" />
-    <ClInclude Include="slang-visitor.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\prelude\slang-cpp-prelude.h.cpp" />
-    <ClCompile Include="..\..\prelude\slang-cuda-prelude.h.cpp" />
-    <ClCompile Include="..\..\prelude\slang-hlsl-prelude.h.cpp" />
-    <ClCompile Include="slang-ast-builder.cpp" />
-    <ClCompile Include="slang-ast-decl.cpp" />
-    <ClCompile Include="slang-ast-dump.cpp" />
-    <ClCompile Include="slang-ast-reflect.cpp" />
-    <ClCompile Include="slang-ast-substitutions.cpp" />
-    <ClCompile Include="slang-ast-type.cpp" />
-    <ClCompile Include="slang-ast-val.cpp" />
-    <ClCompile Include="slang-check-conformance.cpp" />
-    <ClCompile Include="slang-check-constraint.cpp" />
-    <ClCompile Include="slang-check-conversion.cpp" />
-    <ClCompile Include="slang-check-decl.cpp" />
-    <ClCompile Include="slang-check-expr.cpp" />
-    <ClCompile Include="slang-check-modifier.cpp" />
-    <ClCompile Include="slang-check-overload.cpp" />
-    <ClCompile Include="slang-check-shader.cpp" />
-    <ClCompile Include="slang-check-stmt.cpp" />
-    <ClCompile Include="slang-check-type.cpp" />
-    <ClCompile Include="slang-check.cpp" />
-    <ClCompile Include="slang-compiler.cpp" />
-    <ClCompile Include="slang-diagnostics.cpp" />
-    <ClCompile Include="slang-dxc-support.cpp" />
-    <ClCompile Include="slang-emit-c-like.cpp" />
-    <ClCompile Include="slang-emit-cpp.cpp" />
-    <ClCompile Include="slang-emit-cuda.cpp" />
-    <ClCompile Include="slang-emit-glsl.cpp" />
-    <ClCompile Include="slang-emit-hlsl.cpp" />
-    <ClCompile Include="slang-emit-precedence.cpp" />
-    <ClCompile Include="slang-emit-source-writer.cpp" />
-    <ClCompile Include="slang-emit-spirv.cpp" />
-    <ClCompile Include="slang-emit.cpp" />
-    <ClCompile Include="slang-file-system.cpp" />
-    <ClCompile Include="slang-glsl-extension-tracker.cpp" />
-    <ClCompile Include="slang-hlsl-intrinsic-set.cpp" />
-    <ClCompile Include="slang-include-system.cpp" />
-    <ClCompile Include="slang-ir-any-value-marshalling.cpp" />
-    <ClCompile Include="slang-ir-augment-make-existential.cpp" />
-    <ClCompile Include="slang-ir-bind-existentials.cpp" />
-    <ClCompile Include="slang-ir-byte-address-legalize.cpp" />
-    <ClCompile Include="slang-ir-clone.cpp" />
-    <ClCompile Include="slang-ir-collect-global-uniforms.cpp" />
-    <ClCompile Include="slang-ir-constexpr.cpp" />
-    <ClCompile Include="slang-ir-dce.cpp" />
-    <ClCompile Include="slang-ir-deduplicate.cpp" />
-    <ClCompile Include="slang-ir-dominators.cpp" />
-    <ClCompile Include="slang-ir-entry-point-raw-ptr-params.cpp" />
-    <ClCompile Include="slang-ir-entry-point-uniforms.cpp" />
-    <ClCompile Include="slang-ir-explicit-global-context.cpp" />
-    <ClCompile Include="slang-ir-explicit-global-init.cpp" />
-    <ClCompile Include="slang-ir-generics-lowering-context.cpp" />
-    <ClCompile Include="slang-ir-glsl-legalize.cpp" />
-    <ClCompile Include="slang-ir-hoist-local-types.cpp" />
-    <ClCompile Include="slang-ir-inline.cpp" />
-    <ClCompile Include="slang-ir-layout.cpp" />
-    <ClCompile Include="slang-ir-legalize-types.cpp" />
-    <ClCompile Include="slang-ir-legalize-varying-params.cpp" />
-    <ClCompile Include="slang-ir-link.cpp" />
-    <ClCompile Include="slang-ir-lower-existential.cpp" />
-    <ClCompile Include="slang-ir-lower-generic-call.cpp" />
-    <ClCompile Include="slang-ir-lower-generic-function.cpp" />
-    <ClCompile Include="slang-ir-lower-generic-type.cpp" />
-    <ClCompile Include="slang-ir-lower-generics.cpp" />
-    <ClCompile Include="slang-ir-lower-tuple-types.cpp" />
-    <ClCompile Include="slang-ir-missing-return.cpp" />
-    <ClCompile Include="slang-ir-restructure-scoping.cpp" />
-    <ClCompile Include="slang-ir-restructure.cpp" />
-    <ClCompile Include="slang-ir-sccp.cpp" />
-    <ClCompile Include="slang-ir-specialize-arrays.cpp" />
-    <ClCompile Include="slang-ir-specialize-dispatch.cpp" />
-    <ClCompile Include="slang-ir-specialize-dynamic-associatedtype-lookup.cpp" />
-    <ClCompile Include="slang-ir-specialize-function-call.cpp" />
-    <ClCompile Include="slang-ir-specialize-resources.cpp" />
-    <ClCompile Include="slang-ir-specialize.cpp" />
-    <ClCompile Include="slang-ir-ssa.cpp" />
-    <ClCompile Include="slang-ir-string-hash.cpp" />
-    <ClCompile Include="slang-ir-strip-witness-tables.cpp" />
-    <ClCompile Include="slang-ir-strip.cpp" />
-    <ClCompile Include="slang-ir-synthesize-active-mask.cpp" />
-    <ClCompile Include="slang-ir-type-set.cpp" />
-    <ClCompile Include="slang-ir-union.cpp" />
-    <ClCompile Include="slang-ir-validate.cpp" />
-    <ClCompile Include="slang-ir-witness-table-wrapper.cpp" />
-    <ClCompile Include="slang-ir-wrap-structured-buffers.cpp" />
-    <ClCompile Include="slang-ir.cpp" />
-    <ClCompile Include="slang-legalize-types.cpp" />
-    <ClCompile Include="slang-lexer.cpp" />
-    <ClCompile Include="slang-lookup.cpp" />
-    <ClCompile Include="slang-lower-to-ir.cpp" />
-    <ClCompile Include="slang-mangle.cpp" />
-    <ClCompile Include="slang-mangled-lexer.cpp" />
-    <ClCompile Include="slang-name.cpp" />
-    <ClCompile Include="slang-options.cpp" />
-    <ClCompile Include="slang-parameter-binding.cpp" />
-    <ClCompile Include="slang-parser.cpp" />
-    <ClCompile Include="slang-preprocessor.cpp" />
-    <ClCompile Include="slang-profile.cpp" />
-    <ClCompile Include="slang-ref-object-reflect.cpp" />
-    <ClCompile Include="slang-reflection.cpp" />
-    <ClCompile Include="slang-repro.cpp" />
-    <ClCompile Include="slang-serialize-ast.cpp" />
-    <ClCompile Include="slang-serialize-container.cpp" />
-    <ClCompile Include="slang-serialize-factory.cpp" />
-    <ClCompile Include="slang-serialize-ir-types.cpp" />
-    <ClCompile Include="slang-serialize-ir.cpp" />
-    <ClCompile Include="slang-serialize-reflection.cpp" />
-    <ClCompile Include="slang-serialize-source-loc.cpp" />
-    <ClCompile Include="slang-serialize-types.cpp" />
-    <ClCompile Include="slang-serialize.cpp" />
-    <ClCompile Include="slang-source-loc.cpp" />
-    <ClCompile Include="slang-stdlib.cpp" />
-    <ClCompile Include="slang-syntax.cpp" />
-    <ClCompile Include="slang-token.cpp" />
-    <ClCompile Include="slang-type-layout.cpp" />
-    <ClCompile Include="slang-type-system-shared.cpp" />
-    <ClCompile Include="slang-value-reflect.cpp" />
-    <ClCompile Include="slang.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="core.meta.slang" />
-    <None Include="hlsl.meta.slang" />
-  </ItemGroup>
-  <ItemGroup>
-    <Natvis Include="..\core\core.natvis" />
-    <Natvis Include="slang.natvis" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\core\core.vcxproj">
-      <Project>{F9BE7957-8399-899E-0C49-E714FDDD4B65}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/source/slang/slang.vcxproj.filters b/source/slang/slang.vcxproj.filters
deleted file mode 100644
index 8659054c7..000000000
--- a/source/slang/slang.vcxproj.filters
+++ /dev/null
@@ -1,736 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{21EB8090-0D4E-1035-B6D3-48EBA215DCB7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\slang.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ast-all.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ast-base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ast-builder.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ast-decl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ast-dump.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ast-expr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ast-modifier.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ast-reflect.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ast-stmt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ast-support-types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ast-type.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ast-val.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-check-impl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-check.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-compiler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-diagnostic-defs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-diagnostics.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-emit-c-like.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-emit-cpp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-emit-cuda.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-emit-glsl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-emit-hlsl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-emit-precedence.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-emit-source-writer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-emit.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-file-system.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-glsl-extension-tracker.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-hlsl-intrinsic-set.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-image-format-defs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-include-system.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-any-value-marshalling.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-augment-make-existential.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-bind-existentials.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-byte-address-legalize.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-clone.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-collect-global-uniforms.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-constexpr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-dce.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-dominators.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-entry-point-raw-ptr-params.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-entry-point-uniforms.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-explicit-global-context.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-explicit-global-init.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-generics-lowering-context.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-glsl-legalize.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-hoist-local-types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-inline.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-inst-defs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-insts.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-layout.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-legalize-varying-params.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-link.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-lower-existential.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-lower-generic-call.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-lower-generic-function.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-lower-generic-type.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-lower-generics.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-lower-tuple-types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-missing-return.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-restructure-scoping.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-restructure.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-sccp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-specialize-arrays.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-specialize-dispatch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-specialize-dynamic-associatedtype-lookup.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-specialize-function-call.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-specialize-resources.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-specialize.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-ssa.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-string-hash.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-strip-witness-tables.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-strip.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-synthesize-active-mask.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-type-set.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-union.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-validate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-witness-table-wrapper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir-wrap-structured-buffers.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ir.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-legalize-types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-lexer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-lookup.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-lower-to-ir.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-mangle.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-mangled-lexer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-name.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-options.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-parameter-binding.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-parser.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-preprocessor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-profile-defs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-profile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-ref-object-reflect.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-reflection.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-repro.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-serialize-ast-type-info.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-serialize-ast.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-serialize-container.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-serialize-factory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-serialize-ir-types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-serialize-ir.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-serialize-misc-type-info.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-serialize-reflection.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-serialize-source-loc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-serialize-type-info.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-serialize-types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-serialize-value-type-info.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-serialize.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-source-loc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-syntax.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-token-defs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-token.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-type-layout.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-type-system-shared.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-value-reflect.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="slang-visitor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\prelude\slang-cpp-prelude.h.cpp">
-      <Filter>Header Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\prelude\slang-cuda-prelude.h.cpp">
-      <Filter>Header Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\prelude\slang-hlsl-prelude.h.cpp">
-      <Filter>Header Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ast-builder.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ast-decl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ast-dump.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ast-reflect.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ast-substitutions.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ast-type.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ast-val.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-check-conformance.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-check-constraint.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-check-conversion.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-check-decl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-check-expr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-check-modifier.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-check-overload.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-check-shader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-check-stmt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-check-type.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-check.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-compiler.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-diagnostics.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-dxc-support.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-emit-c-like.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-emit-cpp.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-emit-cuda.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-emit-glsl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-emit-hlsl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-emit-precedence.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-emit-source-writer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-emit-spirv.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-emit.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-file-system.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-glsl-extension-tracker.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-hlsl-intrinsic-set.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-include-system.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-any-value-marshalling.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-augment-make-existential.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-bind-existentials.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-byte-address-legalize.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-clone.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-collect-global-uniforms.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-constexpr.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-dce.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-deduplicate.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-dominators.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-entry-point-raw-ptr-params.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-entry-point-uniforms.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-explicit-global-context.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-explicit-global-init.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-generics-lowering-context.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-glsl-legalize.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-hoist-local-types.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-inline.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-layout.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-legalize-types.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-legalize-varying-params.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-link.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-lower-existential.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-lower-generic-call.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-lower-generic-function.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-lower-generic-type.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-lower-generics.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-lower-tuple-types.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-missing-return.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-restructure-scoping.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-restructure.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-sccp.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-specialize-arrays.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-specialize-dispatch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-specialize-dynamic-associatedtype-lookup.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-specialize-function-call.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-specialize-resources.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-specialize.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-ssa.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-string-hash.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-strip-witness-tables.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-strip.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-synthesize-active-mask.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-type-set.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-union.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-validate.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-witness-table-wrapper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir-wrap-structured-buffers.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ir.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-legalize-types.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-lexer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-lookup.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-lower-to-ir.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-mangle.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-mangled-lexer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-name.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-options.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-parameter-binding.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-parser.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-preprocessor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-profile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-ref-object-reflect.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-reflection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-repro.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-serialize-ast.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-serialize-container.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-serialize-factory.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-serialize-ir-types.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-serialize-ir.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-serialize-reflection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-serialize-source-loc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-serialize-types.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-serialize.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-source-loc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-stdlib.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-syntax.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-token.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-type-layout.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-type-system-shared.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang-value-reflect.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="slang.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="core.meta.slang">
-      <Filter>Source Files</Filter>
-    </None>
-    <None Include="hlsl.meta.slang">
-      <Filter>Source Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Natvis Include="..\core\core.natvis">
-      <Filter>Source Files</Filter>
-    </Natvis>
-    <Natvis Include="slang.natvis">
-      <Filter>Source Files</Filter>
-    </Natvis>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/tools/gfx/gfx.vcxproj.filters b/tools/gfx/gfx.vcxproj.filters
deleted file mode 100644
index f5fba2295..000000000
--- a/tools/gfx/gfx.vcxproj.filters
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{21EB8090-0D4E-1035-B6D3-48EBA215DCB7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="d3d\d3d-util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="d3d11\render-d3d11.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="d3d12\circular-resource-heap-d3d12.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="d3d12\descriptor-heap-d3d12.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="d3d12\render-d3d12.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="d3d12\resource-d3d12.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="flag-combiner.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="gui.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="model.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="nvapi\nvapi-include.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="nvapi\nvapi-util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="open-gl\render-gl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="render.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="surface.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vector-math.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vulkan\render-vk.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vulkan\vk-api.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vulkan\vk-device-queue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vulkan\vk-module.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vulkan\vk-swap-chain.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="vulkan\vk-util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="window.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="d3d\d3d-util.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="d3d11\render-d3d11.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="d3d12\circular-resource-heap-d3d12.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="d3d12\descriptor-heap-d3d12.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="d3d12\render-d3d12.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="d3d12\resource-d3d12.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="flag-combiner.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gui.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="model.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="nvapi\nvapi-util.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="open-gl\render-gl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="render.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="surface.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vulkan\render-vk.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vulkan\vk-api.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vulkan\vk-device-queue.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vulkan\vk-module.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vulkan\vk-swap-chain.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vulkan\vk-util.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="windows\win-window.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/tools/slang-generate/main.cpp b/tools/slang-generate/main.cpp
index 796bbd59d..8e4824065 100644
--- a/tools/slang-generate/main.cpp
+++ b/tools/slang-generate/main.cpp
@@ -47,6 +47,8 @@ struct Node
 struct SourceFile : public RefObject
 {
     String inputPath;
+    String linePath;            ///< The path to this file for #line output
+
     StringSpan   text;
     Node* node = nullptr;
     SourceFile() = default;
@@ -658,7 +660,7 @@ void emitTemplateNodes(
             if (lineIndex >= 0)
             {
                 StringBuilder buf;
-                buf << "SLANG_RAW(\"#line " << (lineIndex + 1) << " \\\"" << sourceFile->inputPath << "\\\"\")\n";
+                buf << "SLANG_RAW(\"#line " << (lineIndex + 1) << " \\\"" << sourceFile->linePath << "\\\"\")\n";
 
                 emit(stream, buf.getUnownedSlice());
             }
@@ -806,7 +808,13 @@ SourceFile* parseSourceFile(const String& path)
     StringSpan span = StringSpan(input, inputEnd);
 
     SourceFile* sourceFile = new SourceFile();
+
     sourceFile->inputPath = path;
+
+    // We use the fileName as the line path, as the path as passed to the command could contain a complicated
+    // depending on the project location.
+    sourceFile->linePath = Path::getFileName(path);
+
     sourceFile->text = span;
 
     Node* node = parseSourceFile(sourceFile);