diff --git a/DEPS b/DEPS
index 614dd6b..0cec0b0 100644
--- a/DEPS
+++ b/DEPS
@@ -1,6 +1,6 @@
 deps = {
   "third_party/gyp":
-      "http://gyp.googlecode.com/svn/trunk@1767",
+      "http://gyp.googlecode.com/svn/trunk@1806",
 
   "tests/third_party/googletest":
       "http://googletest.googlecode.com/svn/trunk@629",
diff --git a/build/gyp_angle b/build/gyp_angle
index b8fb237..ca53322 100644
--- a/build/gyp_angle
+++ b/build/gyp_angle
@@ -29,6 +29,7 @@
   args.append('.');
   # Add common.gypi to the include path.
   args.append('-I' + os.path.join(script_dir, 'common.gypi'))
+  args.append('--no-parallel')
   # Add all.gyp as the main gyp file to be generated.
   args.append(os.path.join(script_dir, 'all.gyp'))
   sys.exit(gyp.main(args))
diff --git a/projects/build/All.vcxproj.filters b/projects/build/All.vcxproj.filters
deleted file mode 100644
index 96788b2..0000000
--- a/projects/build/All.vcxproj.filters
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\build">
-      <UniqueIdentifier>{D5519164-BF26-36DA-740B-76CEFC1827F4}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\build\all.gyp">
-      <Filter>..\..\build</Filter>
-    </None>
-  </ItemGroup>
-</Project>
diff --git a/projects/samples/es_util.vcxproj.filters b/projects/samples/es_util.vcxproj.filters
index c9050fe..9149c3f 100644
--- a/projects/samples/es_util.vcxproj.filters
+++ b/projects/samples/es_util.vcxproj.filters
@@ -1,52 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\samples">
-      <UniqueIdentifier>{C211F48C-152B-ADFE-63E3-597A16DC94A5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\samples\gles2_book">
+    <Filter Include="gles2_book">
       <UniqueIdentifier>{01DCD872-C931-E1FA-4F9F-EBFA79587BB6}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\samples\gles2_book\Common">
+    <Filter Include="gles2_book\Common">
       <UniqueIdentifier>{F86A273C-85A3-22AB-C7FA-A36F586D586C}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\samples\gles2_book\Common\Win32">
+    <Filter Include="gles2_book\Common\Win32">
       <UniqueIdentifier>{D4B5535A-60F0-1479-5C4E-3F50DD3EC1A1}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\samples\samples.gyp">
-      <Filter>..\..\samples</Filter>
-    </None>
+    <None Include="..\..\samples\samples.gyp"/>
     <ClCompile Include="..\..\samples\gles2_book\Common\esTransform.c">
-      <Filter>..\..\samples\gles2_book\Common</Filter>
+      <Filter>gles2_book\Common</Filter>
     </ClCompile>
     <ClCompile Include="..\..\samples\gles2_book\Common\esUtil.c">
-      <Filter>..\..\samples\gles2_book\Common</Filter>
+      <Filter>gles2_book\Common</Filter>
     </ClCompile>
     <ClInclude Include="..\..\samples\gles2_book\Common\esUtil_win.h">
-      <Filter>..\..\samples\gles2_book\Common</Filter>
+      <Filter>gles2_book\Common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\samples\gles2_book\Common\esUtil.h">
-      <Filter>..\..\samples\gles2_book\Common</Filter>
+      <Filter>gles2_book\Common</Filter>
     </ClInclude>
     <ClCompile Include="..\..\samples\gles2_book\Common\esShader.c">
-      <Filter>..\..\samples\gles2_book\Common</Filter>
+      <Filter>gles2_book\Common</Filter>
     </ClCompile>
     <ClCompile Include="..\..\samples\gles2_book\Common\esShapes.c">
-      <Filter>..\..\samples\gles2_book\Common</Filter>
+      <Filter>gles2_book\Common</Filter>
     </ClCompile>
     <ClCompile Include="..\..\samples\gles2_book\Common\Win32\esUtil_win32.c">
-      <Filter>..\..\samples\gles2_book\Common\Win32</Filter>
+      <Filter>gles2_book\Common\Win32</Filter>
     </ClCompile>
     <ClCompile Include="..\..\samples\gles2_book\Common\Win32\esUtil_TGA.c">
-      <Filter>..\..\samples\gles2_book\Common\Win32</Filter>
+      <Filter>gles2_book\Common\Win32</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/projects/samples/essl_to_glsl.vcxproj.filters b/projects/samples/essl_to_glsl.vcxproj.filters
index 910cc85..2d54f3c 100644
--- a/projects/samples/essl_to_glsl.vcxproj.filters
+++ b/projects/samples/essl_to_glsl.vcxproj.filters
@@ -1,25 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\samples">
-      <UniqueIdentifier>{C211F48C-152B-ADFE-63E3-597A16DC94A5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\samples\translator">
+    <Filter Include="translator">
       <UniqueIdentifier>{502101C2-1680-5126-1D2E-39419A1AE009}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\samples\samples.gyp">
-      <Filter>..\..\samples</Filter>
-    </None>
+    <None Include="..\..\samples\samples.gyp"/>
     <ClCompile Include="..\..\samples\translator\translator.cpp">
-      <Filter>..\..\samples\translator</Filter>
+      <Filter>translator</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/projects/samples/essl_to_hlsl.vcxproj.filters b/projects/samples/essl_to_hlsl.vcxproj.filters
index 910cc85..2d54f3c 100644
--- a/projects/samples/essl_to_hlsl.vcxproj.filters
+++ b/projects/samples/essl_to_hlsl.vcxproj.filters
@@ -1,25 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\samples">
-      <UniqueIdentifier>{C211F48C-152B-ADFE-63E3-597A16DC94A5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\samples\translator">
+    <Filter Include="translator">
       <UniqueIdentifier>{502101C2-1680-5126-1D2E-39419A1AE009}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\samples\samples.gyp">
-      <Filter>..\..\samples</Filter>
-    </None>
+    <None Include="..\..\samples\samples.gyp"/>
     <ClCompile Include="..\..\samples\translator\translator.cpp">
-      <Filter>..\..\samples\translator</Filter>
+      <Filter>translator</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/projects/samples/hello_triangle.vcxproj.filters b/projects/samples/hello_triangle.vcxproj.filters
index 569d202..fb51e0b 100644
--- a/projects/samples/hello_triangle.vcxproj.filters
+++ b/projects/samples/hello_triangle.vcxproj.filters
@@ -1,28 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\samples">
-      <UniqueIdentifier>{C211F48C-152B-ADFE-63E3-597A16DC94A5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\samples\gles2_book">
+    <Filter Include="gles2_book">
       <UniqueIdentifier>{01DCD872-C931-E1FA-4F9F-EBFA79587BB6}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\samples\gles2_book\Hello_Triangle">
+    <Filter Include="gles2_book\Hello_Triangle">
       <UniqueIdentifier>{9D2F13F3-FC32-C08C-E571-9135FA793FC5}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\samples\samples.gyp">
-      <Filter>..\..\samples</Filter>
-    </None>
+    <None Include="..\..\samples\samples.gyp"/>
     <ClCompile Include="..\..\samples\gles2_book\Hello_Triangle\Hello_Triangle.c">
-      <Filter>..\..\samples\gles2_book\Hello_Triangle</Filter>
+      <Filter>gles2_book\Hello_Triangle</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/projects/samples/mip_map_2d.vcxproj.filters b/projects/samples/mip_map_2d.vcxproj.filters
index 62a1694..ed136fe 100644
--- a/projects/samples/mip_map_2d.vcxproj.filters
+++ b/projects/samples/mip_map_2d.vcxproj.filters
@@ -1,28 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\samples">
-      <UniqueIdentifier>{C211F48C-152B-ADFE-63E3-597A16DC94A5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\samples\gles2_book">
+    <Filter Include="gles2_book">
       <UniqueIdentifier>{01DCD872-C931-E1FA-4F9F-EBFA79587BB6}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\samples\gles2_book\MipMap2D">
+    <Filter Include="gles2_book\MipMap2D">
       <UniqueIdentifier>{FE8C9EA3-68C6-B350-A0FB-AA34D954630D}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\samples\samples.gyp">
-      <Filter>..\..\samples</Filter>
-    </None>
+    <None Include="..\..\samples\samples.gyp"/>
     <ClCompile Include="..\..\samples\gles2_book\MipMap2D\MipMap2D.c">
-      <Filter>..\..\samples\gles2_book\MipMap2D</Filter>
+      <Filter>gles2_book\MipMap2D</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/projects/samples/multi_texture.vcxproj.filters b/projects/samples/multi_texture.vcxproj.filters
index 3867cbe..a4e3b90 100644
--- a/projects/samples/multi_texture.vcxproj.filters
+++ b/projects/samples/multi_texture.vcxproj.filters
@@ -1,34 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\samples">
-      <UniqueIdentifier>{C211F48C-152B-ADFE-63E3-597A16DC94A5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\samples\gles2_book">
+    <Filter Include="gles2_book">
       <UniqueIdentifier>{01DCD872-C931-E1FA-4F9F-EBFA79587BB6}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\samples\gles2_book\MultiTexture">
+    <Filter Include="gles2_book\MultiTexture">
       <UniqueIdentifier>{B094F5D0-1DD1-94CB-CEBD-6C2EB17B4D5A}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\samples\samples.gyp">
-      <Filter>..\..\samples</Filter>
-    </None>
+    <None Include="..\..\samples\samples.gyp"/>
     <None Include="..\..\samples\gles2_book\MultiTexture\lightmap.tga">
-      <Filter>..\..\samples\gles2_book\MultiTexture</Filter>
+      <Filter>gles2_book\MultiTexture</Filter>
     </None>
     <None Include="..\..\samples\gles2_book\MultiTexture\basemap.tga">
-      <Filter>..\..\samples\gles2_book\MultiTexture</Filter>
+      <Filter>gles2_book\MultiTexture</Filter>
     </None>
     <ClCompile Include="..\..\samples\gles2_book\MultiTexture\MultiTexture.c">
-      <Filter>..\..\samples\gles2_book\MultiTexture</Filter>
+      <Filter>gles2_book\MultiTexture</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/projects/samples/particle_system.vcxproj.filters b/projects/samples/particle_system.vcxproj.filters
index 75df154..161008f 100644
--- a/projects/samples/particle_system.vcxproj.filters
+++ b/projects/samples/particle_system.vcxproj.filters
@@ -1,31 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\samples">
-      <UniqueIdentifier>{C211F48C-152B-ADFE-63E3-597A16DC94A5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\samples\gles2_book">
+    <Filter Include="gles2_book">
       <UniqueIdentifier>{01DCD872-C931-E1FA-4F9F-EBFA79587BB6}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\samples\gles2_book\ParticleSystem">
+    <Filter Include="gles2_book\ParticleSystem">
       <UniqueIdentifier>{05979F6F-F708-2C87-17F3-3B3AA4892DDF}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\samples\samples.gyp">
-      <Filter>..\..\samples</Filter>
-    </None>
+    <None Include="..\..\samples\samples.gyp"/>
     <ClCompile Include="..\..\samples\gles2_book\ParticleSystem\ParticleSystem.c">
-      <Filter>..\..\samples\gles2_book\ParticleSystem</Filter>
+      <Filter>gles2_book\ParticleSystem</Filter>
     </ClCompile>
     <None Include="..\..\samples\gles2_book\ParticleSystem\smoke.tga">
-      <Filter>..\..\samples\gles2_book\ParticleSystem</Filter>
+      <Filter>gles2_book\ParticleSystem</Filter>
     </None>
   </ItemGroup>
 </Project>
diff --git a/projects/samples/post_sub_buffer.vcxproj.filters b/projects/samples/post_sub_buffer.vcxproj.filters
index 737a46f..ba99906 100644
--- a/projects/samples/post_sub_buffer.vcxproj.filters
+++ b/projects/samples/post_sub_buffer.vcxproj.filters
@@ -1,28 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\samples">
-      <UniqueIdentifier>{C211F48C-152B-ADFE-63E3-597A16DC94A5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\samples\gles2_book">
+    <Filter Include="gles2_book">
       <UniqueIdentifier>{01DCD872-C931-E1FA-4F9F-EBFA79587BB6}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\samples\gles2_book\PostSubBuffer">
+    <Filter Include="gles2_book\PostSubBuffer">
       <UniqueIdentifier>{17D314C7-49C3-F5A0-BCF4-1020B498EFB0}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\samples\samples.gyp">
-      <Filter>..\..\samples</Filter>
-    </None>
+    <None Include="..\..\samples\samples.gyp"/>
     <ClCompile Include="..\..\samples\gles2_book\PostSubBuffer\PostSubBuffer.c">
-      <Filter>..\..\samples\gles2_book\PostSubBuffer</Filter>
+      <Filter>gles2_book\PostSubBuffer</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/projects/samples/simple_texture_2d.vcxproj.filters b/projects/samples/simple_texture_2d.vcxproj.filters
index f5e9650..99725d5 100644
--- a/projects/samples/simple_texture_2d.vcxproj.filters
+++ b/projects/samples/simple_texture_2d.vcxproj.filters
@@ -1,28 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\samples">
-      <UniqueIdentifier>{C211F48C-152B-ADFE-63E3-597A16DC94A5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\samples\gles2_book">
+    <Filter Include="gles2_book">
       <UniqueIdentifier>{01DCD872-C931-E1FA-4F9F-EBFA79587BB6}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\samples\gles2_book\Simple_Texture2D">
+    <Filter Include="gles2_book\Simple_Texture2D">
       <UniqueIdentifier>{12DC1366-B2CC-905F-8FDB-F9EC2B9570C0}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\samples\samples.gyp">
-      <Filter>..\..\samples</Filter>
-    </None>
+    <None Include="..\..\samples\samples.gyp"/>
     <ClCompile Include="..\..\samples\gles2_book\Simple_Texture2D\Simple_Texture2D.c">
-      <Filter>..\..\samples\gles2_book\Simple_Texture2D</Filter>
+      <Filter>gles2_book\Simple_Texture2D</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/projects/samples/simple_texture_cubemap.vcxproj.filters b/projects/samples/simple_texture_cubemap.vcxproj.filters
index 2360f68..af5c612 100644
--- a/projects/samples/simple_texture_cubemap.vcxproj.filters
+++ b/projects/samples/simple_texture_cubemap.vcxproj.filters
@@ -1,28 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\samples">
-      <UniqueIdentifier>{C211F48C-152B-ADFE-63E3-597A16DC94A5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\samples\gles2_book">
+    <Filter Include="gles2_book">
       <UniqueIdentifier>{01DCD872-C931-E1FA-4F9F-EBFA79587BB6}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\samples\gles2_book\Simple_TextureCubemap">
+    <Filter Include="gles2_book\Simple_TextureCubemap">
       <UniqueIdentifier>{E6068AEE-B813-7A24-A3AB-2C3EF8FC381E}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\samples\samples.gyp">
-      <Filter>..\..\samples</Filter>
-    </None>
+    <None Include="..\..\samples\samples.gyp"/>
     <ClCompile Include="..\..\samples\gles2_book\Simple_TextureCubemap\Simple_TextureCubemap.c">
-      <Filter>..\..\samples\gles2_book\Simple_TextureCubemap</Filter>
+      <Filter>gles2_book\Simple_TextureCubemap</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/projects/samples/simple_vertex_shader.vcxproj.filters b/projects/samples/simple_vertex_shader.vcxproj.filters
index b7fb976..33036b9 100644
--- a/projects/samples/simple_vertex_shader.vcxproj.filters
+++ b/projects/samples/simple_vertex_shader.vcxproj.filters
@@ -1,28 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\samples">
-      <UniqueIdentifier>{C211F48C-152B-ADFE-63E3-597A16DC94A5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\samples\gles2_book">
+    <Filter Include="gles2_book">
       <UniqueIdentifier>{01DCD872-C931-E1FA-4F9F-EBFA79587BB6}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\samples\gles2_book\Simple_VertexShader">
+    <Filter Include="gles2_book\Simple_VertexShader">
       <UniqueIdentifier>{13D4600F-2070-2CFD-75DC-23AE9927F5C9}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\samples\samples.gyp">
-      <Filter>..\..\samples</Filter>
-    </None>
+    <None Include="..\..\samples\samples.gyp"/>
     <ClCompile Include="..\..\samples\gles2_book\Simple_VertexShader\Simple_VertexShader.c">
-      <Filter>..\..\samples\gles2_book\Simple_VertexShader</Filter>
+      <Filter>gles2_book\Simple_VertexShader</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/projects/samples/stencil_test.vcxproj.filters b/projects/samples/stencil_test.vcxproj.filters
index 3ac59d4..67e0ab9 100644
--- a/projects/samples/stencil_test.vcxproj.filters
+++ b/projects/samples/stencil_test.vcxproj.filters
@@ -1,28 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\samples">
-      <UniqueIdentifier>{C211F48C-152B-ADFE-63E3-597A16DC94A5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\samples\gles2_book">
+    <Filter Include="gles2_book">
       <UniqueIdentifier>{01DCD872-C931-E1FA-4F9F-EBFA79587BB6}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\samples\gles2_book\Stencil_Test">
+    <Filter Include="gles2_book\Stencil_Test">
       <UniqueIdentifier>{2D7B8D12-C3D0-2175-2129-3AE9CF950A5E}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\samples\samples.gyp">
-      <Filter>..\..\samples</Filter>
-    </None>
+    <None Include="..\..\samples\samples.gyp"/>
     <ClCompile Include="..\..\samples\gles2_book\Stencil_Test\Stencil_Test.c">
-      <Filter>..\..\samples\gles2_book\Stencil_Test</Filter>
+      <Filter>gles2_book\Stencil_Test</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/projects/samples/texture_wrap.vcxproj.filters b/projects/samples/texture_wrap.vcxproj.filters
index 8bda6ea..fef3ef0 100644
--- a/projects/samples/texture_wrap.vcxproj.filters
+++ b/projects/samples/texture_wrap.vcxproj.filters
@@ -1,28 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\samples">
-      <UniqueIdentifier>{C211F48C-152B-ADFE-63E3-597A16DC94A5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\samples\gles2_book">
+    <Filter Include="gles2_book">
       <UniqueIdentifier>{01DCD872-C931-E1FA-4F9F-EBFA79587BB6}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\samples\gles2_book\TextureWrap">
+    <Filter Include="gles2_book\TextureWrap">
       <UniqueIdentifier>{5F6A5AB7-398C-61AB-1A2A-396E85CA0134}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\samples\samples.gyp">
-      <Filter>..\..\samples</Filter>
-    </None>
+    <None Include="..\..\samples\samples.gyp"/>
     <ClCompile Include="..\..\samples\gles2_book\TextureWrap\TextureWrap.c">
-      <Filter>..\..\samples\gles2_book\TextureWrap</Filter>
+      <Filter>gles2_book\TextureWrap</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/projects/src/commit_id.vcxproj.filters b/projects/src/commit_id.vcxproj.filters
index 93e45e1..1496302 100644
--- a/projects/src/commit_id.vcxproj.filters
+++ b/projects/src/commit_id.vcxproj.filters
@@ -1,25 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\src">
-      <UniqueIdentifier>{8CDEE807-BC53-E450-C8B8-4DEBB66742D4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\src\_excluded_files">
+    <Filter Include="_excluded_files">
       <UniqueIdentifier>{158E591E-B6EA-0C85-8F5A-18EAFA09B4CE}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\src\angle.gyp">
-      <Filter>..\..\src</Filter>
-    </None>
+    <None Include="..\..\src\angle.gyp"/>
     <None Include="..\..\src\commit_id.bat">
-      <Filter>..\..\src\_excluded_files</Filter>
+      <Filter>_excluded_files</Filter>
     </None>
   </ItemGroup>
 </Project>
diff --git a/projects/src/copy_compiler_dll.vcxproj.filters b/projects/src/copy_compiler_dll.vcxproj.filters
index 274ed00..66954a4 100644
--- a/projects/src/copy_compiler_dll.vcxproj.filters
+++ b/projects/src/copy_compiler_dll.vcxproj.filters
@@ -1,25 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\src">
-      <UniqueIdentifier>{8CDEE807-BC53-E450-C8B8-4DEBB66742D4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\src\_excluded_files">
+    <Filter Include="_excluded_files">
       <UniqueIdentifier>{158E591E-B6EA-0C85-8F5A-18EAFA09B4CE}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\src\angle.gyp">
-      <Filter>..\..\src</Filter>
-    </None>
+    <None Include="..\..\src\angle.gyp"/>
     <None Include="..\..\src\copy_compiler_dll.bat">
-      <Filter>..\..\src\_excluded_files</Filter>
+      <Filter>_excluded_files</Filter>
     </None>
   </ItemGroup>
 </Project>
diff --git a/projects/src/libEGL.vcxproj.filters b/projects/src/libEGL.vcxproj.filters
index 23199f6..027c415 100644
--- a/projects/src/libEGL.vcxproj.filters
+++ b/projects/src/libEGL.vcxproj.filters
@@ -1,103 +1,92 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\src">
-      <UniqueIdentifier>{8CDEE807-BC53-E450-C8B8-4DEBB66742D4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\src\libEGL">
+    <Filter Include="libEGL">
       <UniqueIdentifier>{D633941D-C923-DFCE-3A9B-DCF851CC7DBA}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\src\common">
+    <Filter Include="common">
       <UniqueIdentifier>{2F5FD094-EF52-77F7-7AA8-4327A01BF747}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\src\angle.gyp">
-      <Filter>..\..\src</Filter>
-    </None>
+    <None Include="..\..\src\angle.gyp"/>
     <ClInclude Include="..\..\src\libEGL\main.h">
-      <Filter>..\..\src\libEGL</Filter>
+      <Filter>libEGL</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libEGL\Surface.h">
-      <Filter>..\..\src\libEGL</Filter>
+      <Filter>libEGL</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libEGL\Surface.cpp">
-      <Filter>..\..\src\libEGL</Filter>
+      <Filter>libEGL</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libEGL\Config.cpp">
-      <Filter>..\..\src\libEGL</Filter>
+      <Filter>libEGL</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libEGL\resource.h">
-      <Filter>..\..\src\libEGL</Filter>
+      <Filter>libEGL</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libEGL\Display.h">
-      <Filter>..\..\src\libEGL</Filter>
+      <Filter>libEGL</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libEGL\main.cpp">
-      <Filter>..\..\src\libEGL</Filter>
+      <Filter>libEGL</Filter>
     </ClCompile>
     <None Include="..\..\src\libEGL\libEGL.def">
-      <Filter>..\..\src\libEGL</Filter>
+      <Filter>libEGL</Filter>
     </None>
     <ClCompile Include="..\..\src\libEGL\Display.cpp">
-      <Filter>..\..\src\libEGL</Filter>
+      <Filter>libEGL</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libEGL\Config.h">
-      <Filter>..\..\src\libEGL</Filter>
+      <Filter>libEGL</Filter>
     </ClInclude>
     <ResourceCompile Include="..\..\src\libEGL\libEGL.rc">
-      <Filter>..\..\src\libEGL</Filter>
+      <Filter>libEGL</Filter>
     </ResourceCompile>
     <ClCompile Include="..\..\src\libEGL\libEGL.cpp">
-      <Filter>..\..\src\libEGL</Filter>
+      <Filter>libEGL</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\common\mathutil.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\common\event_tracer.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\common\RefCountObject.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\common\version.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\common\utilities.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\common\event_tracer.cpp">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\common\system.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\common\RefCountObject.cpp">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\common\mathutil.cpp">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\common\utilities.cpp">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\common\commit.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\common\debug.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\common\debug.cpp">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\common\angleutils.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/projects/src/libGLESv2.vcxproj.filters b/projects/src/libGLESv2.vcxproj.filters
index 3795aa4..c4a8fe6 100644
--- a/projects/src/libGLESv2.vcxproj.filters
+++ b/projects/src/libGLESv2.vcxproj.filters
@@ -1,772 +1,761 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\src">
-      <UniqueIdentifier>{8CDEE807-BC53-E450-C8B8-4DEBB66742D4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\src\libGLESv2">
+    <Filter Include="libGLESv2">
       <UniqueIdentifier>{A62A9415-2E9D-A6D2-631D-1F25A5CD626F}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\src\libGLESv2\renderer">
+    <Filter Include="libGLESv2\renderer">
       <UniqueIdentifier>{AC4EF684-2900-10EA-3D11-A6DF0901358C}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\src\libGLESv2\renderer\d3d11">
+    <Filter Include="libGLESv2\renderer\d3d11">
       <UniqueIdentifier>{10FB1414-88D2-B512-6D76-522749905268}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\src\libGLESv2\renderer\d3d11\shaders">
+    <Filter Include="libGLESv2\renderer\d3d11\shaders">
       <UniqueIdentifier>{467D5622-06CC-2CF1-19E5-3CDD46A4008C}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled">
+    <Filter Include="libGLESv2\renderer\d3d11\shaders\compiled">
       <UniqueIdentifier>{F444E9E6-7D51-0546-F1E4-B6C8FCDA5FC6}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\src\libGLESv2\renderer\d3d9">
+    <Filter Include="libGLESv2\renderer\d3d9">
       <UniqueIdentifier>{8BB193D2-4A8B-A094-A81E-D5E262AB1F92}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\src\libGLESv2\renderer\d3d9\shaders">
+    <Filter Include="libGLESv2\renderer\d3d9\shaders">
       <UniqueIdentifier>{467D5622-06CC-2CF1-19E5-3CDD46A4008C}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\src\libGLESv2\renderer\d3d9\shaders\compiled">
+    <Filter Include="libGLESv2\renderer\d3d9\shaders\compiled">
       <UniqueIdentifier>{F444E9E6-7D51-0546-F1E4-B6C8FCDA5FC6}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\src\common">
+    <Filter Include="common">
       <UniqueIdentifier>{2F5FD094-EF52-77F7-7AA8-4327A01BF747}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\src\third_party">
+    <Filter Include="third_party">
       <UniqueIdentifier>{D6C6CEA7-AAD0-03AD-2394-AC6FCBF8A498}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\src\third_party\murmurhash">
+    <Filter Include="third_party\murmurhash">
       <UniqueIdentifier>{FBF5769C-D63C-9100-0719-0B97CE76B013}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\src\angle.gyp">
-      <Filter>..\..\src</Filter>
-    </None>
+    <None Include="..\..\src\angle.gyp"/>
     <ClInclude Include="..\..\src\libGLESv2\resource.h">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\libGLESv2.cpp">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\Buffer.h">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\Shader.h">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\validationES2.cpp">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\BinaryStream.h">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\VertexAttribute.h">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\precompiled.cpp">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\validationES3.h">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\Program.h">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\Sampler.h">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\HandleAllocator.cpp">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\HandleAllocator.h">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\precompiled.h">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\formatutils.cpp">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\Context.h">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\Query.h">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\ResourceManager.h">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClInclude>
     <ResourceCompile Include="..\..\src\libGLESv2\libGLESv2.rc">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ResourceCompile>
     <ClCompile Include="..\..\src\libGLESv2\RenderbufferProxySet.cpp">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\Texture.h">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\Context.cpp">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\Fence.cpp">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\ProgramBinary.h">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\ProgramBinary.cpp">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\validationES2.h">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\Fence.h">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\validationES.cpp">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\Sampler.cpp">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\Renderbuffer.cpp">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\angletypes.h">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\Uniform.h">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\Query.cpp">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\Buffer.cpp">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\Program.cpp">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\Shader.cpp">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\Uniform.cpp">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\main.cpp">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\main.h">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\Framebuffer.h">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\Float16ToFloat32.cpp">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClCompile>
     <None Include="..\..\src\libGLESv2\libGLESv2.def">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </None>
     <ClCompile Include="..\..\src\libGLESv2\validationES3.cpp">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\ResourceManager.cpp">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\Texture.cpp">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\VertexArray.cpp">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\constants.h">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\Renderbuffer.h">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\VertexArray.h">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\formatutils.h">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\angletypes.cpp">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\Framebuffer.cpp">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\RenderbufferProxySet.h">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\validationES.h">
-      <Filter>..\..\src\libGLESv2</Filter>
+      <Filter>libGLESv2</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\IndexDataManager.h">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\renderer\copyimage.cpp">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\renderer\Renderer.h">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\renderer\IndexDataManager.cpp">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\renderer\SwapChain.h">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\renderer\loadimageSSE2.cpp">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\renderer\TextureStorage.h">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\renderer\Image.cpp">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\renderer\imageformats.h">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\renderer\IndexBuffer.cpp">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\renderer\BufferStorage.cpp">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\renderer\ShaderExecutable.h">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\QueryImpl.h">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\ShaderCache.h">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\renderer\VertexBuffer.cpp">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\renderer\copyimage.h">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\IndexBuffer.h">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\loadimage.h">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\IndexRangeCache.h">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\FenceImpl.h">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\renderer\loadimage.cpp">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\renderer\Image.h">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\generatemip.h">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\RenderTarget.h">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\vertexconversion.h">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\renderer\VertexDataManager.cpp">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\renderer\VertexDataManager.h">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\renderer\IndexRangeCache.cpp">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\renderer\BufferStorage.h">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\VertexBuffer.h">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\renderer\Renderer.cpp">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\renderer\TextureStorage.cpp">
-      <Filter>..\..\src\libGLESv2\renderer</Filter>
+      <Filter>libGLESv2\renderer</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\InputLayoutCache.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Clear11.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\RenderTarget11.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\PixelTransfer11.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\InputLayoutCache.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\renderer11_utils.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\BufferStorage11.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\TextureStorage11.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\renderer11_utils.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\ShaderExecutable11.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\SwapChain11.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\VertexBuffer11.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\TextureStorage11.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\SwapChain11.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\ShaderExecutable11.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\RenderStateCache.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Query11.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\VertexBuffer11.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Fence11.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Renderer11.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Renderer11.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\IndexBuffer11.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Clear11.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\IndexBuffer11.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\formatutils11.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Fence11.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\RenderTarget11.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Blit11.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\PixelTransfer11.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Query11.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Image11.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\formatutils11.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Blit11.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Image11.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\RenderStateCache.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\BufferStorage11.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11</Filter>
+      <Filter>libGLESv2\renderer\d3d11</Filter>
     </ClCompile>
     <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\generate_shaders.bat">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders</Filter>
     </None>
     <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\BufferToTexture11.hlsl">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders</Filter>
     </None>
     <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Swizzle11.hlsl">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders</Filter>
     </None>
     <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Passthrough2D11.hlsl">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders</Filter>
     </None>
     <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Passthrough3D11.hlsl">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders</Filter>
     </None>
     <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Clear11.hlsl">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders</Filter>
     </None>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr2di11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_gs.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr2dui11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlei2dps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba3d11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg2d11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthrough3d11gs.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearfloat11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr3di11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlei2darrayps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlumalpha2d11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg2di11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlei3dps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb3di11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearuint11vs.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba3dui11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlum3d11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzleui2darrayps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlum2d11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_2f.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_1ui.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr3dui11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearfloat11vs.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr3d11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughdepth2d11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb2dui11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_4ui.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr2d11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlumalpha3d11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlef2darrayps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb3d11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg3di11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg2dui11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearsint11vs.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_2i.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzleui2dps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg3d11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba2dui11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_vs.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_4i.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthrough2d11vs.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_2ui.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlef2dps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlef3dps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba2di11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_4f.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba2d11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb2di11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba3di11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb2d11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearuint11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearsint11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_1i.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_1f.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg3dui11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthrough3d11vs.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzleui3dps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb3dui11ps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d11\shaders\compiled</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\VertexDeclarationCache.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\renderer9_utils.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\IndexBuffer9.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Image9.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\IndexBuffer9.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\ShaderExecutable9.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\VertexDeclarationCache.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Blit9.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\RenderTarget9.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\ShaderExecutable9.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\BufferStorage9.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Renderer9.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\TextureStorage9.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\SwapChain9.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\formatutils9.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Query9.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Fence9.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Fence9.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Blit9.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\SwapChain9.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\BufferStorage9.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\VertexBuffer9.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Renderer9.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\renderer9_utils.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\RenderTarget9.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\formatutils9.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\TextureStorage9.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\VertexBuffer9.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Query9.cpp">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Image9.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9</Filter>
+      <Filter>libGLESv2\renderer\d3d9</Filter>
     </ClInclude>
     <None Include="..\..\src\libGLESv2\renderer\d3d9\shaders\Blit.vs">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9\shaders</Filter>
+      <Filter>libGLESv2\renderer\d3d9\shaders</Filter>
     </None>
     <None Include="..\..\src\libGLESv2\renderer\d3d9\shaders\generate_shaders.bat">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9\shaders</Filter>
+      <Filter>libGLESv2\renderer\d3d9\shaders</Filter>
     </None>
     <None Include="..\..\src\libGLESv2\renderer\d3d9\shaders\Blit.ps">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9\shaders</Filter>
+      <Filter>libGLESv2\renderer\d3d9\shaders</Filter>
     </None>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\shaders\compiled\luminanceps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d9\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\shaders\compiled\passthroughps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d9\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\shaders\compiled\flipyvs.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d9\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\shaders\compiled\componentmaskps.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d9\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\shaders\compiled\standardvs.h">
-      <Filter>..\..\src\libGLESv2\renderer\d3d9\shaders\compiled</Filter>
+      <Filter>libGLESv2\renderer\d3d9\shaders\compiled</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\common\RefCountObject.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\common\mathutil.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\common\event_tracer.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\common\event_tracer.cpp">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\common\commit.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\common\RefCountObject.cpp">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\common\utilities.cpp">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\common\mathutil.cpp">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\common\debug.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\common\debug.cpp">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\common\version.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\common\system.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\common\utilities.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\common\angleutils.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\third_party\murmurhash\MurmurHash3.cpp">
-      <Filter>..\..\src\third_party\murmurhash</Filter>
+      <Filter>third_party\murmurhash</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\third_party\murmurhash\MurmurHash3.h">
-      <Filter>..\..\src\third_party\murmurhash</Filter>
+      <Filter>third_party\murmurhash</Filter>
     </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/projects/src/preprocessor.vcxproj.filters b/projects/src/preprocessor.vcxproj.filters
index 0ccfdde..298d553 100644
--- a/projects/src/preprocessor.vcxproj.filters
+++ b/projects/src/preprocessor.vcxproj.filters
@@ -1,103 +1,92 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\src">
-      <UniqueIdentifier>{8CDEE807-BC53-E450-C8B8-4DEBB66742D4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\src\compiler">
+    <Filter Include="compiler">
       <UniqueIdentifier>{041FFD28-E4BD-ABC0-5AF7-A6D1560FAC0E}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\src\compiler\preprocessor">
+    <Filter Include="compiler\preprocessor">
       <UniqueIdentifier>{56A90BCD-B311-1BEE-A8AC-25D8344BCE41}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\src\angle.gyp">
-      <Filter>..\..\src</Filter>
-    </None>
+    <None Include="..\..\src\angle.gyp"/>
     <ClCompile Include="..\..\src\compiler\preprocessor\ExpressionParser.cpp">
-      <Filter>..\..\src\compiler\preprocessor</Filter>
+      <Filter>compiler\preprocessor</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\preprocessor\Input.cpp">
-      <Filter>..\..\src\compiler\preprocessor</Filter>
+      <Filter>compiler\preprocessor</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\preprocessor\length_limits.h">
-      <Filter>..\..\src\compiler\preprocessor</Filter>
+      <Filter>compiler\preprocessor</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\preprocessor\Tokenizer.cpp">
-      <Filter>..\..\src\compiler\preprocessor</Filter>
+      <Filter>compiler\preprocessor</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\preprocessor\Tokenizer.h">
-      <Filter>..\..\src\compiler\preprocessor</Filter>
+      <Filter>compiler\preprocessor</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\preprocessor\Lexer.h">
-      <Filter>..\..\src\compiler\preprocessor</Filter>
+      <Filter>compiler\preprocessor</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\preprocessor\DirectiveHandlerBase.cpp">
-      <Filter>..\..\src\compiler\preprocessor</Filter>
+      <Filter>compiler\preprocessor</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\preprocessor\Token.h">
-      <Filter>..\..\src\compiler\preprocessor</Filter>
+      <Filter>compiler\preprocessor</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\preprocessor\Lexer.cpp">
-      <Filter>..\..\src\compiler\preprocessor</Filter>
+      <Filter>compiler\preprocessor</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\preprocessor\Preprocessor.h">
-      <Filter>..\..\src\compiler\preprocessor</Filter>
+      <Filter>compiler\preprocessor</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\preprocessor\ExpressionParser.h">
-      <Filter>..\..\src\compiler\preprocessor</Filter>
+      <Filter>compiler\preprocessor</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\preprocessor\MacroExpander.h">
-      <Filter>..\..\src\compiler\preprocessor</Filter>
+      <Filter>compiler\preprocessor</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\preprocessor\Macro.h">
-      <Filter>..\..\src\compiler\preprocessor</Filter>
+      <Filter>compiler\preprocessor</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\preprocessor\Token.cpp">
-      <Filter>..\..\src\compiler\preprocessor</Filter>
+      <Filter>compiler\preprocessor</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\preprocessor\Macro.cpp">
-      <Filter>..\..\src\compiler\preprocessor</Filter>
+      <Filter>compiler\preprocessor</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\preprocessor\DiagnosticsBase.cpp">
-      <Filter>..\..\src\compiler\preprocessor</Filter>
+      <Filter>compiler\preprocessor</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\preprocessor\pp_utils.h">
-      <Filter>..\..\src\compiler\preprocessor</Filter>
+      <Filter>compiler\preprocessor</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\preprocessor\Preprocessor.cpp">
-      <Filter>..\..\src\compiler\preprocessor</Filter>
+      <Filter>compiler\preprocessor</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\preprocessor\Input.h">
-      <Filter>..\..\src\compiler\preprocessor</Filter>
+      <Filter>compiler\preprocessor</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\preprocessor\SourceLocation.h">
-      <Filter>..\..\src\compiler\preprocessor</Filter>
+      <Filter>compiler\preprocessor</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\preprocessor\numeric_lex.h">
-      <Filter>..\..\src\compiler\preprocessor</Filter>
+      <Filter>compiler\preprocessor</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\preprocessor\DirectiveParser.h">
-      <Filter>..\..\src\compiler\preprocessor</Filter>
+      <Filter>compiler\preprocessor</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\preprocessor\DirectiveParser.cpp">
-      <Filter>..\..\src\compiler\preprocessor</Filter>
+      <Filter>compiler\preprocessor</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\preprocessor\DiagnosticsBase.h">
-      <Filter>..\..\src\compiler\preprocessor</Filter>
+      <Filter>compiler\preprocessor</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\preprocessor\MacroExpander.cpp">
-      <Filter>..\..\src\compiler\preprocessor</Filter>
+      <Filter>compiler\preprocessor</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\preprocessor\DirectiveHandlerBase.h">
-      <Filter>..\..\src\compiler\preprocessor</Filter>
+      <Filter>compiler\preprocessor</Filter>
     </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/projects/src/translator.vcxproj.filters b/projects/src/translator.vcxproj.filters
index 620c6d1..44853d3 100644
--- a/projects/src/translator.vcxproj.filters
+++ b/projects/src/translator.vcxproj.filters
@@ -1,436 +1,425 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\src">
-      <UniqueIdentifier>{8CDEE807-BC53-E450-C8B8-4DEBB66742D4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\src\third_party">
+    <Filter Include="third_party">
       <UniqueIdentifier>{D6C6CEA7-AAD0-03AD-2394-AC6FCBF8A498}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\src\third_party\compiler">
+    <Filter Include="third_party\compiler">
       <UniqueIdentifier>{041FFD28-E4BD-ABC0-5AF7-A6D1560FAC0E}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\src\common">
+    <Filter Include="common">
       <UniqueIdentifier>{2F5FD094-EF52-77F7-7AA8-4327A01BF747}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\src\compiler">
+    <Filter Include="compiler">
       <UniqueIdentifier>{041FFD28-E4BD-ABC0-5AF7-A6D1560FAC0E}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\src\compiler\translator">
+    <Filter Include="compiler\translator">
       <UniqueIdentifier>{502101C2-1680-5126-1D2E-39419A1AE009}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\src\compiler\translator\_excluded_files">
+    <Filter Include="compiler\translator\_excluded_files">
       <UniqueIdentifier>{158E591E-B6EA-0C85-8F5A-18EAFA09B4CE}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\src\compiler\translator\timing">
+    <Filter Include="compiler\translator\timing">
       <UniqueIdentifier>{E1BE6BE7-5019-57F8-5C7D-26FC8CE74904}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\src\compiler\translator\depgraph">
+    <Filter Include="compiler\translator\depgraph">
       <UniqueIdentifier>{233BE2B2-4E73-B3F0-20B8-25A55D8E5238}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\src\angle.gyp">
-      <Filter>..\..\src</Filter>
-    </None>
+    <None Include="..\..\src\angle.gyp"/>
     <ClCompile Include="..\..\src\third_party\compiler\ArrayBoundsClamper.cpp">
-      <Filter>..\..\src\third_party\compiler</Filter>
+      <Filter>third_party\compiler</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\third_party\compiler\ArrayBoundsClamper.h">
-      <Filter>..\..\src\third_party\compiler</Filter>
+      <Filter>third_party\compiler</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\common\RefCountObject.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\common\mathutil.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\common\event_tracer.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\common\event_tracer.cpp">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\common\commit.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\common\system.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\common\utilities.cpp">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\common\RefCountObject.cpp">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\common\mathutil.cpp">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\common\debug.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\common\debug.cpp">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\common\version.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\common\utilities.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\common\angleutils.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\BaseTypes.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\HLSLLayoutEncoder.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\InfoSink.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\OutputESSL.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\compilerdebug.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\Common.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\ValidateLimitations.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\util.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\OutputGLSL.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\BuiltInFunctionEmulator.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\glslang_lex.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\OutputGLSL.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\FlagStd140Structs.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\MapLongVariableNames.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\TranslatorHLSL.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\OutputGLSLBase.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\PoolAlloc.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\BuiltInFunctionEmulator.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\ShaderVariable.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\ParseContext.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\ValidateOutputs.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\RemoveTree.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\UnfoldShortCircuit.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\TranslatorGLSL.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\SymbolTable.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\InitializeDll.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\PoolAlloc.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\InitializeGlobals.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\BlockLayoutEncoder.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\osinclude.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\Initialize.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\ossource_win.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\HLSLLayoutEncoder.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\QualifierAlive.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\ConstantUnion.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\Diagnostics.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\ParseContext.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\QualifierAlive.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\Diagnostics.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\VersionGLSL.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\HashNames.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\util.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\ShaderLang.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\DirectiveHandler.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\ValidateOutputs.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\NodeSearch.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\TranslatorESSL.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\TranslatorESSL.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\InitializeDll.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\InitializeGLPosition.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\localintermediate.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\ShHandle.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\OutputGLSLBase.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\ForLoopUnroll.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\InitializeGLPosition.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\ShaderVariable.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\Pragma.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\intermediate.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\VariablePacker.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\InitializeParseContext.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\TranslatorHLSL.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\OutputESSL.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\parseConst.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\RenameFunction.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\ValidateLimitations.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\Types.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\InfoSink.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\RemoveTree.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <None Include="..\..\src\compiler\translator\glslang.y">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </None>
     <ClCompile Include="..\..\src\compiler\translator\VersionGLSL.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\DetectCallDepth.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <None Include="..\..\src\compiler\translator\glslang.l">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </None>
     <ClInclude Include="..\..\src\compiler\translator\VariablePacker.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\glslang.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\DetectCallDepth.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\InitializeParseContext.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\SearchSymbol.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\MapLongVariableNames.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\CodeGen.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\IntermTraverse.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\intermOut.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\glslang_tab.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\ForLoopUnroll.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\SearchSymbol.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\BlockLayoutEncoder.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\MMap.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\OutputHLSL.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\TranslatorGLSL.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\SymbolTable.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\DetectDiscontinuity.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\DirectiveHandler.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\VariableInfo.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\FlagStd140Structs.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\OutputHLSL.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\DetectDiscontinuity.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\glslang_tab.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\UnfoldShortCircuit.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\compilerdebug.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\Intermediate.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\ExtensionBehavior.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\VariableInfo.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\Compiler.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\Initialize.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\ossource_posix.cpp">
-      <Filter>..\..\src\compiler\translator\_excluded_files</Filter>
+      <Filter>compiler\translator\_excluded_files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\timing\RestrictVertexShaderTiming.cpp">
-      <Filter>..\..\src\compiler\translator\timing</Filter>
+      <Filter>compiler\translator\timing</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\timing\RestrictFragmentShaderTiming.cpp">
-      <Filter>..\..\src\compiler\translator\timing</Filter>
+      <Filter>compiler\translator\timing</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\timing\RestrictVertexShaderTiming.h">
-      <Filter>..\..\src\compiler\translator\timing</Filter>
+      <Filter>compiler\translator\timing</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\timing\RestrictFragmentShaderTiming.h">
-      <Filter>..\..\src\compiler\translator\timing</Filter>
+      <Filter>compiler\translator\timing</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\depgraph\DependencyGraph.h">
-      <Filter>..\..\src\compiler\translator\depgraph</Filter>
+      <Filter>compiler\translator\depgraph</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\depgraph\DependencyGraphOutput.h">
-      <Filter>..\..\src\compiler\translator\depgraph</Filter>
+      <Filter>compiler\translator\depgraph</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\depgraph\DependencyGraphBuilder.h">
-      <Filter>..\..\src\compiler\translator\depgraph</Filter>
+      <Filter>compiler\translator\depgraph</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\depgraph\DependencyGraphTraverse.cpp">
-      <Filter>..\..\src\compiler\translator\depgraph</Filter>
+      <Filter>compiler\translator\depgraph</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\depgraph\DependencyGraphOutput.cpp">
-      <Filter>..\..\src\compiler\translator\depgraph</Filter>
+      <Filter>compiler\translator\depgraph</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\depgraph\DependencyGraph.cpp">
-      <Filter>..\..\src\compiler\translator\depgraph</Filter>
+      <Filter>compiler\translator\depgraph</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\depgraph\DependencyGraphBuilder.cpp">
-      <Filter>..\..\src\compiler\translator\depgraph</Filter>
+      <Filter>compiler\translator\depgraph</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/projects/src/translator_static.vcxproj.filters b/projects/src/translator_static.vcxproj.filters
index 620c6d1..44853d3 100644
--- a/projects/src/translator_static.vcxproj.filters
+++ b/projects/src/translator_static.vcxproj.filters
@@ -1,436 +1,425 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..">
-      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\src">
-      <UniqueIdentifier>{8CDEE807-BC53-E450-C8B8-4DEBB66742D4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\src\third_party">
+    <Filter Include="third_party">
       <UniqueIdentifier>{D6C6CEA7-AAD0-03AD-2394-AC6FCBF8A498}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\src\third_party\compiler">
+    <Filter Include="third_party\compiler">
       <UniqueIdentifier>{041FFD28-E4BD-ABC0-5AF7-A6D1560FAC0E}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\src\common">
+    <Filter Include="common">
       <UniqueIdentifier>{2F5FD094-EF52-77F7-7AA8-4327A01BF747}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\src\compiler">
+    <Filter Include="compiler">
       <UniqueIdentifier>{041FFD28-E4BD-ABC0-5AF7-A6D1560FAC0E}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\src\compiler\translator">
+    <Filter Include="compiler\translator">
       <UniqueIdentifier>{502101C2-1680-5126-1D2E-39419A1AE009}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\src\compiler\translator\_excluded_files">
+    <Filter Include="compiler\translator\_excluded_files">
       <UniqueIdentifier>{158E591E-B6EA-0C85-8F5A-18EAFA09B4CE}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\src\compiler\translator\timing">
+    <Filter Include="compiler\translator\timing">
       <UniqueIdentifier>{E1BE6BE7-5019-57F8-5C7D-26FC8CE74904}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\src\compiler\translator\depgraph">
+    <Filter Include="compiler\translator\depgraph">
       <UniqueIdentifier>{233BE2B2-4E73-B3F0-20B8-25A55D8E5238}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\src\angle.gyp">
-      <Filter>..\..\src</Filter>
-    </None>
+    <None Include="..\..\src\angle.gyp"/>
     <ClCompile Include="..\..\src\third_party\compiler\ArrayBoundsClamper.cpp">
-      <Filter>..\..\src\third_party\compiler</Filter>
+      <Filter>third_party\compiler</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\third_party\compiler\ArrayBoundsClamper.h">
-      <Filter>..\..\src\third_party\compiler</Filter>
+      <Filter>third_party\compiler</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\common\RefCountObject.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\common\mathutil.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\common\event_tracer.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\common\event_tracer.cpp">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\common\commit.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\common\system.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\common\utilities.cpp">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\common\RefCountObject.cpp">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\common\mathutil.cpp">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\common\debug.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\common\debug.cpp">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\common\version.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\common\utilities.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\common\angleutils.h">
-      <Filter>..\..\src\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\BaseTypes.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\HLSLLayoutEncoder.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\InfoSink.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\OutputESSL.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\compilerdebug.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\Common.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\ValidateLimitations.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\util.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\OutputGLSL.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\BuiltInFunctionEmulator.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\glslang_lex.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\OutputGLSL.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\FlagStd140Structs.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\MapLongVariableNames.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\TranslatorHLSL.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\OutputGLSLBase.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\PoolAlloc.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\BuiltInFunctionEmulator.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\ShaderVariable.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\ParseContext.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\ValidateOutputs.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\RemoveTree.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\UnfoldShortCircuit.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\TranslatorGLSL.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\SymbolTable.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\InitializeDll.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\PoolAlloc.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\InitializeGlobals.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\BlockLayoutEncoder.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\osinclude.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\Initialize.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\ossource_win.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\HLSLLayoutEncoder.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\QualifierAlive.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\ConstantUnion.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\Diagnostics.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\ParseContext.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\QualifierAlive.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\Diagnostics.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\VersionGLSL.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\HashNames.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\util.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\ShaderLang.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\DirectiveHandler.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\ValidateOutputs.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\NodeSearch.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\TranslatorESSL.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\TranslatorESSL.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\InitializeDll.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\InitializeGLPosition.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\localintermediate.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\ShHandle.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\OutputGLSLBase.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\ForLoopUnroll.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\InitializeGLPosition.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\ShaderVariable.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\Pragma.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\intermediate.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\VariablePacker.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\InitializeParseContext.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\TranslatorHLSL.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\OutputESSL.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\parseConst.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\RenameFunction.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\ValidateLimitations.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\Types.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\InfoSink.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\RemoveTree.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <None Include="..\..\src\compiler\translator\glslang.y">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </None>
     <ClCompile Include="..\..\src\compiler\translator\VersionGLSL.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\DetectCallDepth.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <None Include="..\..\src\compiler\translator\glslang.l">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </None>
     <ClInclude Include="..\..\src\compiler\translator\VariablePacker.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\glslang.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\DetectCallDepth.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\InitializeParseContext.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\SearchSymbol.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\MapLongVariableNames.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\CodeGen.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\IntermTraverse.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\intermOut.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\glslang_tab.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\ForLoopUnroll.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\SearchSymbol.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\BlockLayoutEncoder.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\MMap.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\OutputHLSL.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\TranslatorGLSL.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\SymbolTable.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\DetectDiscontinuity.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\DirectiveHandler.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\VariableInfo.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\FlagStd140Structs.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\OutputHLSL.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\DetectDiscontinuity.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\glslang_tab.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\UnfoldShortCircuit.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\compilerdebug.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\Intermediate.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\ExtensionBehavior.h">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\VariableInfo.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\Compiler.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\Initialize.cpp">
-      <Filter>..\..\src\compiler\translator</Filter>
+      <Filter>compiler\translator</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\ossource_posix.cpp">
-      <Filter>..\..\src\compiler\translator\_excluded_files</Filter>
+      <Filter>compiler\translator\_excluded_files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\timing\RestrictVertexShaderTiming.cpp">
-      <Filter>..\..\src\compiler\translator\timing</Filter>
+      <Filter>compiler\translator\timing</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\timing\RestrictFragmentShaderTiming.cpp">
-      <Filter>..\..\src\compiler\translator\timing</Filter>
+      <Filter>compiler\translator\timing</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\compiler\translator\timing\RestrictVertexShaderTiming.h">
-      <Filter>..\..\src\compiler\translator\timing</Filter>
+      <Filter>compiler\translator\timing</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\timing\RestrictFragmentShaderTiming.h">
-      <Filter>..\..\src\compiler\translator\timing</Filter>
+      <Filter>compiler\translator\timing</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\depgraph\DependencyGraph.h">
-      <Filter>..\..\src\compiler\translator\depgraph</Filter>
+      <Filter>compiler\translator\depgraph</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\depgraph\DependencyGraphOutput.h">
-      <Filter>..\..\src\compiler\translator\depgraph</Filter>
+      <Filter>compiler\translator\depgraph</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\compiler\translator\depgraph\DependencyGraphBuilder.h">
-      <Filter>..\..\src\compiler\translator\depgraph</Filter>
+      <Filter>compiler\translator\depgraph</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\compiler\translator\depgraph\DependencyGraphTraverse.cpp">
-      <Filter>..\..\src\compiler\translator\depgraph</Filter>
+      <Filter>compiler\translator\depgraph</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\depgraph\DependencyGraphOutput.cpp">
-      <Filter>..\..\src\compiler\translator\depgraph</Filter>
+      <Filter>compiler\translator\depgraph</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\depgraph\DependencyGraph.cpp">
-      <Filter>..\..\src\compiler\translator\depgraph</Filter>
+      <Filter>compiler\translator\depgraph</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\compiler\translator\depgraph\DependencyGraphBuilder.cpp">
-      <Filter>..\..\src\compiler\translator\depgraph</Filter>
+      <Filter>compiler\translator\depgraph</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>