diff --git a/samples/browser/sample-browser.vcxproj b/samples/browser/sample-browser.vcxproj
index 50ec6c13a8..277d01296b 100644
--- a/samples/browser/sample-browser.vcxproj
+++ b/samples/browser/sample-browser.vcxproj
@@ -161,9 +161,6 @@ copy ..\..\gameplay\res\logo_powered_white.png res</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <None Include="bar-descriptor.xml">
-      <SubType>Designer</SubType>
-    </None>
     <None Include="game.config">
       <SubType>Designer</SubType>
     </None>
@@ -196,7 +193,6 @@ copy ..\..\gameplay\res\logo_powered_white.png res</Command>
     <None Include="res\common\forms\formZOrder.form" />
     <None Include="res\common\gamepad.form" />
     <None Include="res\common\gamepad.theme" />
-    <None Include="res\common\grid.material" />
     <None Include="res\common\inputs.form" />
     <None Include="res\common\light.form" />
     <None Include="res\common\light.material" />
diff --git a/samples/browser/sample-browser.vcxproj.filters b/samples/browser/sample-browser.vcxproj.filters
index 0cdd154d27..023c6ce47d 100644
--- a/samples/browser/sample-browser.vcxproj.filters
+++ b/samples/browser/sample-browser.vcxproj.filters
@@ -33,11 +33,16 @@
     <Filter Include="res\common\audio">
       <UniqueIdentifier>{7da0c58a-d770-4181-8781-f9948df5bdd3}</UniqueIdentifier>
     </Filter>
+    <Filter Include="res\common\water">
+      <UniqueIdentifier>{e6d4de4b-95e9-4893-a8a9-ce00291995cb}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="res\common\particles">
+      <UniqueIdentifier>{98333a4d-224e-4f83-ac60-baca4885bf82}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <None Include="game.config" />
     <None Include="icon.png" />
-    <None Include="bar-descriptor.xml" />
     <None Include="res\common\forms\formBasicControls.form">
       <Filter>res\common\forms</Filter>
     </None>
@@ -143,9 +148,6 @@
     <None Include="res\common\gamepad.theme">
       <Filter>res\common</Filter>
     </None>
-    <None Include="res\common\grid.material">
-      <Filter>res\common</Filter>
-    </None>
     <None Include="res\common\inputs.form">
       <Filter>res\common</Filter>
     </None>
@@ -254,17 +256,6 @@
     <None Include="res\common\fonts\neuropol.gpb">
       <Filter>res\common\fonts</Filter>
     </None>
-    <None Include="res\common\particles\editor.form" />
-    <None Include="res\common\particles\editor.theme" />
-    <None Include="res\common\particles\explosion.particle" />
-    <None Include="res\common\particles\fire.particle" />
-    <None Include="res\common\particles\grid.material" />
-    <None Include="res\common\particles\smoke.particle" />
-    <None Include="res\common\water\pond.gpb" />
-    <None Include="res\common\water\watersample.frag" />
-    <None Include="res\common\water\watersample.material" />
-    <None Include="res\common\water\watersample.scene" />
-    <None Include="res\common\water\watersample.vert" />
     <None Include="res\common\audio\background.form">
       <Filter>res\common\audio</Filter>
     </None>
@@ -283,6 +274,39 @@
     <None Include="res\common\audio\sample.audio">
       <Filter>res\common\audio</Filter>
     </None>
+    <None Include="res\common\water\watersample.vert">
+      <Filter>res\common\water</Filter>
+    </None>
+    <None Include="res\common\water\watersample.frag">
+      <Filter>res\common\water</Filter>
+    </None>
+    <None Include="res\common\water\watersample.material">
+      <Filter>res\common\water</Filter>
+    </None>
+    <None Include="res\common\water\watersample.scene">
+      <Filter>res\common\water</Filter>
+    </None>
+    <None Include="res\common\particles\editor.form">
+      <Filter>res\common\particles</Filter>
+    </None>
+    <None Include="res\common\particles\editor.theme">
+      <Filter>res\common\particles</Filter>
+    </None>
+    <None Include="res\common\particles\explosion.particle">
+      <Filter>res\common\particles</Filter>
+    </None>
+    <None Include="res\common\particles\fire.particle">
+      <Filter>res\common\particles</Filter>
+    </None>
+    <None Include="res\common\particles\smoke.particle">
+      <Filter>res\common\particles</Filter>
+    </None>
+    <None Include="res\common\water\pond.gpb">
+      <Filter>res\common\water</Filter>
+    </None>
+    <None Include="res\common\particles\grid.material">
+      <Filter>res\common</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\MeshPrimitiveSample.h">
@@ -345,9 +369,6 @@
     <ClInclude Include="src\WaterSample.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="src\ParticlesSample.h" />
-    <ClInclude Include="src\FontSample.h" />
-    <ClInclude Include="src\SpriteSample.h" />
     <ClInclude Include="src\SceneCreateSample.h">
       <Filter>src</Filter>
     </ClInclude>
@@ -357,6 +378,15 @@
     <ClInclude Include="src\AudioSample.h">
       <Filter>src</Filter>
     </ClInclude>
+    <ClInclude Include="src\ParticlesSample.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\SpriteSample.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\FontSample.h">
+      <Filter>src</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\MeshPrimitiveSample.cpp">
@@ -419,9 +449,6 @@
     <ClCompile Include="src\WaterSample.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="src\ParticlesSample.cpp" />
-    <ClCompile Include="src\FontSample.cpp" />
-    <ClCompile Include="src\SpriteSample.cpp" />
     <ClCompile Include="src\SceneCreateSample.cpp">
       <Filter>src</Filter>
     </ClCompile>
@@ -431,6 +458,15 @@
     <ClCompile Include="src\AudioSample.cpp">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="src\ParticlesSample.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SpriteSample.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\FontSample.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Image Include="res\common\terrain\dirt.dds">
@@ -490,12 +526,24 @@
     <Image Include="res\png\logo.png">
       <Filter>res\png</Filter>
     </Image>
-    <Image Include="res\common\particles\editor.png" />
-    <Image Include="res\common\particles\explosion.png" />
-    <Image Include="res\common\particles\fire.png" />
-    <Image Include="res\common\particles\smoke.png" />
-    <Image Include="res\common\water\water_normal.png" />
-    <Image Include="res\common\water\water_sample.png" />
+    <Image Include="res\common\water\water_normal.png">
+      <Filter>res\common\water</Filter>
+    </Image>
+    <Image Include="res\common\water\water_sample.png">
+      <Filter>res\common\water</Filter>
+    </Image>
+    <Image Include="res\common\particles\editor.png">
+      <Filter>res\common\particles</Filter>
+    </Image>
+    <Image Include="res\common\particles\explosion.png">
+      <Filter>res\common\particles</Filter>
+    </Image>
+    <Image Include="res\common\particles\fire.png">
+      <Filter>res\common\particles</Filter>
+    </Image>
+    <Image Include="res\common\particles\smoke.png">
+      <Filter>res\common\particles</Filter>
+    </Image>
   </ItemGroup>
   <ItemGroup>
     <Media Include="res\common\footsteps.wav">
diff --git a/samples/character/sample-character.vcxproj b/samples/character/sample-character.vcxproj
index 89af4586c8..b002a9967e 100644
--- a/samples/character/sample-character.vcxproj
+++ b/samples/character/sample-character.vcxproj
@@ -164,9 +164,6 @@ copy .\game.dxt.config .\game.config</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <None Include="bar-descriptor.xml">
-      <SubType>Designer</SubType>
-    </None>
     <None Include="game.config">
       <SubType>Designer</SubType>
     </None>
diff --git a/samples/character/sample-character.vcxproj.filters b/samples/character/sample-character.vcxproj.filters
index cb3a0c5bca..684bad5b5e 100644
--- a/samples/character/sample-character.vcxproj.filters
+++ b/samples/character/sample-character.vcxproj.filters
@@ -16,7 +16,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="icon.png" />
-    <None Include="bar-descriptor.xml" />
     <None Include="game.config" />
     <None Include="game.dxt.config" />
     <None Include="res\common\arial.gpb">
diff --git a/samples/racer/sample-racer.vcxproj b/samples/racer/sample-racer.vcxproj
index 23f3b73c51..5309fa2394 100644
--- a/samples/racer/sample-racer.vcxproj
+++ b/samples/racer/sample-racer.vcxproj
@@ -158,9 +158,10 @@ copy .\game.dxt.config .\game.config</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <None Include="bar-descriptor.xml">
-      <SubType>Designer</SubType>
-    </None>
+    <None Include="game.atc.config" />
+    <None Include="game.dxt.config" />
+    <None Include="game.png.config" />
+    <None Include="game.pvr.config" />
     <None Include="icon.png" />
     <None Include="res\common\background_track.ogg" />
     <None Include="res\common\engine_loop.ogg" />
diff --git a/samples/racer/sample-racer.vcxproj.filters b/samples/racer/sample-racer.vcxproj.filters
index 54b002388d..84ccddd1dd 100644
--- a/samples/racer/sample-racer.vcxproj.filters
+++ b/samples/racer/sample-racer.vcxproj.filters
@@ -14,7 +14,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="icon.png" />
-    <None Include="bar-descriptor.xml" />
     <None Include="res\shaders\colored.frag">
       <Filter>res\shaders</Filter>
     </None>
@@ -99,6 +98,10 @@
     <None Include="res\common\racer.scene">
       <Filter>res\common</Filter>
     </None>
+    <None Include="game.atc.config" />
+    <None Include="game.dxt.config" />
+    <None Include="game.png.config" />
+    <None Include="game.pvr.config" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\RacerGame.h">
diff --git a/samples/spaceship/sample-spaceship.vcxproj b/samples/spaceship/sample-spaceship.vcxproj
index 23944c7641..927391bb89 100644
--- a/samples/spaceship/sample-spaceship.vcxproj
+++ b/samples/spaceship/sample-spaceship.vcxproj
@@ -165,7 +165,6 @@ copy ..\..\gameplay\res\logo_powered_white.png res</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <None Include="bar-descriptor.xml" />
     <None Include="game.config" />
     <None Include="icon.png" />
     <None Include="res\airstrip.gpb" />
diff --git a/samples/spaceship/sample-spaceship.vcxproj.filters b/samples/spaceship/sample-spaceship.vcxproj.filters
index eca788f1c7..707b155f9d 100644
--- a/samples/spaceship/sample-spaceship.vcxproj.filters
+++ b/samples/spaceship/sample-spaceship.vcxproj.filters
@@ -12,7 +12,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="bar-descriptor.xml" />
     <None Include="icon.png" />
     <None Include="game.config" />
     <None Include="res\airstrip.gpb">