diff --git a/platform/Windows/build.vcxproj b/platform/Windows/build.vcxproj
index 2a59774bf..55209e246 100644
--- a/platform/Windows/build.vcxproj
+++ b/platform/Windows/build.vcxproj
@@ -206,7 +206,7 @@
     <ClCompile Include="..\..\source\build\src\colmatch.cpp" />
     <ClCompile Include="..\..\source\build\src\common.cpp" />
     <ClCompile Include="..\..\source\build\src\compat.cpp" />
-    <ClCompile Include="..\..\source\build\src\crc32.cpp" />
+    <ClCompile Include="..\..\source\thirdparty\src\crc32.cpp" />
     <ClCompile Include="..\..\source\build\src\defs.cpp" />
     <ClCompile Include="..\..\source\build\src\dynamicgtk.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -230,7 +230,7 @@
     <ClCompile Include="..\..\source\build\src\klzw.cpp" />
     <ClCompile Include="..\..\source\build\src\kplib.cpp" />
     <ClCompile Include="..\..\source\thirdparty\src\lz4.c" />
-    <ClCompile Include="..\..\source\build\src\md4.cpp" />
+    <ClCompile Include="..\..\source\thirdparty\src\md4.cpp" />
     <ClCompile Include="..\..\source\build\src\mdsprite.cpp" />
     <ClCompile Include="..\..\source\build\src\mhk.cpp" />
     <ClCompile Include="..\..\source\build\src\mingw_main.cpp">
diff --git a/platform/Windows/build.vcxproj.filters b/platform/Windows/build.vcxproj.filters
index f35a9aeb6..ea149cbd9 100644
--- a/platform/Windows/build.vcxproj.filters
+++ b/platform/Windows/build.vcxproj.filters
@@ -1,125 +1,419 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\..\source\build\src\2d.cpp" />
-    <ClCompile Include="..\..\source\build\src\a-c.cpp" />
-    <ClCompile Include="..\..\source\build\src\animvpx.cpp" />
-    <ClCompile Include="..\..\source\build\src\baselayer.cpp" />
-    <ClCompile Include="..\..\source\build\src\cache1d.cpp" />
-    <ClCompile Include="..\..\source\build\src\clip.cpp" />
-    <ClCompile Include="..\..\source\build\src\colmatch.cpp" />
-    <ClCompile Include="..\..\source\build\src\common.cpp" />
-    <ClCompile Include="..\..\source\build\src\compat.cpp" />
-    <ClCompile Include="..\..\source\build\src\crc32.cpp" />
-    <ClCompile Include="..\..\source\build\src\defs.cpp" />
-    <ClCompile Include="..\..\source\build\src\dynamicgtk.cpp" />
-    <ClCompile Include="..\..\source\build\src\engine.cpp" />
-    <ClCompile Include="..\..\source\thirdparty\src\fix16.cpp" />
-    <ClCompile Include="..\..\source\thirdparty\src\fix16_str.cpp" />
-    <ClCompile Include="..\..\source\build\src\glbuild.cpp" />
-    <ClCompile Include="..\..\source\build\src\glsurface.cpp" />
-    <ClCompile Include="..\..\source\build\src\gtkbits.cpp" />
-    <ClCompile Include="..\..\source\build\src\hash.cpp" />
-    <ClCompile Include="..\..\source\build\src\hightile.cpp" />
-    <ClCompile Include="..\..\source\build\src\klzw.cpp" />
-    <ClCompile Include="..\..\source\build\src\kplib.cpp" />
-    <ClCompile Include="..\..\source\thirdparty\src\lz4.c" />
-    <ClCompile Include="..\..\source\build\src\md4.cpp" />
-    <ClCompile Include="..\..\source\build\src\mdsprite.cpp" />
-    <ClCompile Include="..\..\source\build\src\mhk.cpp" />
-    <ClCompile Include="..\..\source\build\src\mingw_main.cpp" />
-    <ClCompile Include="..\..\source\thirdparty\src\miniz.c" />
-    <ClCompile Include="..\..\source\thirdparty\src\miniz_tdef.c" />
-    <ClCompile Include="..\..\source\thirdparty\src\miniz_tinfl.c" />
-    <ClCompile Include="..\..\source\build\src\mmulti_null.cpp" />
-    <ClCompile Include="..\..\source\build\src\mutex.cpp" />
-    <ClCompile Include="..\..\source\build\src\osd.cpp" />
-    <ClCompile Include="..\..\source\build\src\palette.cpp" />
-    <ClCompile Include="..\..\source\build\src\pngwrite.cpp" />
-    <ClCompile Include="..\..\source\build\src\polymost.cpp" />
-    <ClCompile Include="..\..\source\build\src\pragmas.cpp" />
-    <ClCompile Include="..\..\source\build\src\rawinput.cpp" />
-    <ClCompile Include="..\..\source\build\src\rev.cpp" />
-    <ClCompile Include="..\..\source\build\src\screenshot.cpp" />
-    <ClCompile Include="..\..\source\build\src\scriptfile.cpp" />
-    <ClCompile Include="..\..\source\build\src\sdlayer.cpp" />
-    <ClCompile Include="..\..\source\build\src\sdlkeytrans.cpp" />
-    <ClCompile Include="..\..\source\build\src\smalltextfont.cpp" />
-    <ClCompile Include="..\..\source\build\src\softsurface.cpp" />
-    <ClCompile Include="..\..\source\build\src\texcache.cpp" />
-    <ClCompile Include="..\..\source\build\src\textfont.cpp" />
-    <ClCompile Include="..\..\source\build\src\tiles.cpp" />
-    <ClCompile Include="..\..\source\build\src\timer.cpp" />
-    <ClCompile Include="..\..\source\build\src\voxmodel.cpp" />
-    <ClCompile Include="..\..\source\build\src\winbits.cpp" />
-    <ClCompile Include="..\..\source\thirdparty\src\xxhash.c" />
-    <ClCompile Include="..\..\source\glbackend\glbackend.cpp" />
-    <ClCompile Include="..\..\source\glbackend\gl_hwtexture.cpp" />
-    <ClCompile Include="..\..\source\glbackend\gl_samplers.cpp" />
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Header Files\MSVC">
+      <UniqueIdentifier>{4afb83fc-a68c-4ed0-9ff2-7def56e98cb6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="GL Interface">
+      <UniqueIdentifier>{0f5687fd-82dc-4f52-89ef-0264c994211c}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\source\build\include\a.h" />
-    <ClInclude Include="..\..\source\build\include\animvpx.h" />
-    <ClInclude Include="..\..\source\build\include\baselayer.h" />
-    <ClInclude Include="..\..\source\build\include\build.h" />
-    <ClInclude Include="..\..\source\build\include\buildtypes.h" />
-    <ClInclude Include="..\..\source\build\include\cache1d.h" />
-    <ClInclude Include="..\..\source\build\include\clip.h" />
-    <ClInclude Include="..\..\source\build\include\collections.h" />
-    <ClInclude Include="..\..\source\build\include\colmatch.h" />
-    <ClInclude Include="..\..\source\build\include\common.h" />
-    <ClInclude Include="..\..\source\build\include\compat.h" />
-    <ClInclude Include="..\..\source\thirdparty\include\crc32.h" />
-    <ClInclude Include="..\..\source\build\include\debugbreak.h" />
-    <ClInclude Include="..\..\source\build\include\dxdidf.h" />
-    <ClInclude Include="..\..\source\build\include\dynamicgtk.h" />
-    <ClInclude Include="..\..\source\thirdparty\include\fix16.h" />
-    <ClInclude Include="..\..\source\thirdparty\include\fix16.hpp" />
-    <ClInclude Include="..\..\source\thirdparty\include\fix16_int64.h" />
-    <ClInclude Include="..\..\source\build\include\glbuild.h" />
-    <ClInclude Include="..\..\source\build\include\glsurface.h" />
-    <ClInclude Include="..\..\source\build\include\gtkbits.h" />
-    <ClInclude Include="..\..\source\build\include\hash.h" />
-    <ClInclude Include="..\..\source\build\include\hightile.h" />
-    <ClInclude Include="..\..\source\build\include\klzw.h" />
-    <ClInclude Include="..\..\source\build\include\kplib.h" />
-    <ClInclude Include="..\..\source\thirdparty\include\libdivide.h" />
-    <ClInclude Include="..\..\source\thirdparty\include\lz4.h" />
-    <ClInclude Include="..\..\source\thirdparty\include\md4.h" />
-    <ClInclude Include="..\..\source\build\include\mdsprite.h" />
-    <ClInclude Include="..\..\source\thirdparty\include\miniz.h" />
-    <ClInclude Include="..\..\source\build\include\mmulti.h" />
-    <ClInclude Include="..\..\source\build\include\osd.h" />
-    <ClInclude Include="..\..\source\build\include\osxbits.h" />
-    <ClInclude Include="..\..\source\build\include\palette.h" />
-    <ClInclude Include="..\..\source\build\include\pngwrite.h" />
-    <ClInclude Include="..\..\source\build\include\polymer.h" />
-    <ClInclude Include="..\..\source\build\include\polymost.h" />
-    <ClInclude Include="..\..\source\build\include\pragmas.h" />
-    <ClInclude Include="..\..\source\build\include\print.h" />
-    <ClInclude Include="..\..\source\build\include\prlights.h" />
-    <ClInclude Include="..\..\source\build\include\rawinput.h" />
-    <ClInclude Include="..\..\source\build\include\renderlayer.h" />
-    <ClInclude Include="..\..\source\build\include\scancodes.h" />
-    <ClInclude Include="..\..\source\build\include\scriptfile.h" />
-    <ClInclude Include="..\..\source\build\include\sdlayer.h" />
-    <ClInclude Include="..\..\source\build\include\sdl_inc.h" />
-    <ClInclude Include="..\..\source\thirdparty\include\sjson.h" />
-    <ClInclude Include="..\..\source\build\include\softsurface.h" />
-    <ClInclude Include="..\..\source\build\include\texcache.h" />
-    <ClInclude Include="..\..\source\build\include\timer.h" />
-    <ClInclude Include="..\..\source\build\include\tracker.hpp" />
-    <ClInclude Include="..\..\source\build\include\vfs.h" />
-    <ClInclude Include="..\..\source\build\include\winbits.h" />
-    <ClInclude Include="..\..\source\build\include\winlayer.h" />
-    <ClInclude Include="..\..\source\thirdparty\include\xxhash.h" />
-    <ClInclude Include="..\..\source\build\src\engine_priv.h" />
-    <ClInclude Include="..\..\source\glbackend\glbackend.h" />
-    <ClInclude Include="..\..\source\glbackend\gl_hwtexture.h" />
-    <ClInclude Include="..\..\source\glbackend\gl_samplers.h" />
+    <ClCompile Include="..\..\source\build\src\2d.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\a-c.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\animvpx.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\baselayer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\cache1d.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\clip.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\colmatch.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\compat.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\crc32.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\defs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\dynamicgtk.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\engine.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\fix16.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\fix16_str.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\glbuild.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\glsurface.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\gtkbits.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\hash.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\hightile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\klzw.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\kplib.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\lunatic.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\lz4.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\md4.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\mdsprite.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\mhk.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\mingw_main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\miniz.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\mmulti_null.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\mutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\osd.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\palette.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\pngwrite.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\polymer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\polymost.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\pragmas.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\rawinput.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\rev.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\screenshot.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\scriptfile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\sdlayer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\sdlayer12.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\sdlkeytrans.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\smalltextfont.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\softsurface.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\texcache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\textfont.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\tiles.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\voxmodel.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\wiibits.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\winbits.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\winlayer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\xxhash.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\miniz_tdef.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\miniz_tinfl.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\common.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\vfs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\glbackend\glbackend.cpp">
+      <Filter>GL Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\build\src\timer.cpp">
+      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\source\glbackend\gl_samplers.cpp">
+      <Filter>GL Interface</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\glbackend\gl_hwtexture.cpp">
+      <Filter>GL Interface</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="..\..\source\build\src\polymost1Frag.glsl" />
-    <CustomBuild Include="..\..\source\build\src\polymost1Vert.glsl" />
+    <ClInclude Include="..\..\source\build\include\msvc\inttypes.h">
+      <Filter>Header Files\MSVC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\msvc\stdint.h">
+      <Filter>Header Files\MSVC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\a.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\animvpx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\baselayer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\build.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\buildtypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\cache1d.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\clip.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\colmatch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\compat.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\crc32.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\dxdidf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\dynamicgtk.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\editor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\src\engine_priv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\fix16.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\fix16.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\fix16_int64.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\glbuild.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\glsurface.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\gtkbits.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\hash.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\hightile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\jwzgles.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\jwzglesI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\klzw.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\kplib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\thirdparty\include\libdivide.h">
+      <Filter>Third Party</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\thirdparty\include\lz4.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\thirdparty\include\md4.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\mdsprite.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\thirdparty\include\miniz.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\mmulti.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\osd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\osxbits.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\palette.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\pngwrite.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\polymer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\polymost.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\pragmas.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\pragmas_arm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\pragmas_ppc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\pragmas_x86_gcc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\pragmas_x86_msvc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\prlights.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\rawinput.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\renderlayer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\scancodes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\scriptfile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\sdl_inc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\sdlayer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\thirdparty\include\sjson.h">
+      <Filter>Third Party</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\softsurface.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\texcache.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\tracker.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\winbits.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\winlayer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\xxhash.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\debugbreak.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\collections.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\print.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\vfs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\build\include\timer.h">
+      <Filter>Header Files</Filter>
+
+      <Filter>GL Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\glbackend\gl_samplers.h">
+      <Filter>GL Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\glbackend\gl_hwtexture.h">
+      <Filter>GL Interface</Filter>
+    </ClInclude>
   </ItemGroup>
-</Project>
\ No newline at end of file
+  <ItemGroup>
+    <CustomBuild Include="..\..\source\build\src\polymost1Frag.glsl">
+      <Filter>Source Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\source\build\src\polymost1Vert.glsl">
+      <Filter>Source Files</Filter>
+    </CustomBuild>
+  </ItemGroup>
+</Project>
diff --git a/source/build/include/crc32.h b/source/thirdparty/include/crc32.h
similarity index 100%
rename from source/build/include/crc32.h
rename to source/thirdparty/include/crc32.h
diff --git a/source/build/include/md4.h b/source/thirdparty/include/md4.h
similarity index 100%
rename from source/build/include/md4.h
rename to source/thirdparty/include/md4.h
diff --git a/source/build/src/crc32.cpp b/source/thirdparty/src/crc32.cpp
similarity index 100%
rename from source/build/src/crc32.cpp
rename to source/thirdparty/src/crc32.cpp
diff --git a/source/build/src/md4.cpp b/source/thirdparty/src/md4.cpp
similarity index 100%
rename from source/build/src/md4.cpp
rename to source/thirdparty/src/md4.cpp