diff --git a/CharcoalBuiltin/CharcoalBuiltin.vcxproj b/CharcoalBuiltin/CharcoalBuiltin.vcxproj
index 974deaa..3d4cc9a 100644
--- a/CharcoalBuiltin/CharcoalBuiltin.vcxproj
+++ b/CharcoalBuiltin/CharcoalBuiltin.vcxproj
@@ -163,7 +163,6 @@ copy "$(ProjectDir)*.h" "$(SolutionDir)include\charcoal-builtin\"</Command>
     <ClInclude Include="BuiltinCamera2D.h" />
     <ClInclude Include="BuiltinCamera3D.h" />
     <ClInclude Include="BuiltinTypes.h" />
-    <ClInclude Include="FileUtil.h" />
     <ClInclude Include="GLUtil.h" />
     <ClInclude Include="ImageScene.h" />
     <ClInclude Include="ImageShaderProgram.h" />
diff --git a/CharcoalBuiltin/CharcoalBuiltin.vcxproj.filters b/CharcoalBuiltin/CharcoalBuiltin.vcxproj.filters
index 361191a..4658e95 100644
--- a/CharcoalBuiltin/CharcoalBuiltin.vcxproj.filters
+++ b/CharcoalBuiltin/CharcoalBuiltin.vcxproj.filters
@@ -13,144 +13,183 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
+    <Filter Include="Header Files\Scenes">
+      <UniqueIdentifier>{808e9376-c6b7-4d65-806e-935f34d5ec4a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Scenes\Basic">
+      <UniqueIdentifier>{1dbc28a4-b52f-4171-a385-79490dfa9b0a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Scenes\Image">
+      <UniqueIdentifier>{4a034e10-73da-44fe-8308-b6a63b41c920}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Scenes\Lit">
+      <UniqueIdentifier>{b2538cf1-c4a2-40b6-9cef-8a937208aaf2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Scenes\LitShadowed">
+      <UniqueIdentifier>{f255fa90-53ea-4a64-9d44-ca9d9013bc3f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Scenes\Textured">
+      <UniqueIdentifier>{2c58c0aa-d1ef-4d03-825c-0b8a08672e78}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\General">
+      <UniqueIdentifier>{5df56e70-8319-4228-b684-c38dd8730bd2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\General">
+      <UniqueIdentifier>{38a6019a-d441-4f64-a1d3-00b15fce2106}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Scenes">
+      <UniqueIdentifier>{49e6ab0e-f7a1-45ca-812a-44bc15016b45}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Scenes\Basic">
+      <UniqueIdentifier>{e167753a-dc8e-4c92-ad62-22b272484656}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Scenes\Image">
+      <UniqueIdentifier>{2823fbc0-59e9-4b79-a7a5-15fd5de29516}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Scenes\Lit">
+      <UniqueIdentifier>{f3e1fe4f-dd8b-44ff-b427-379d34eb5b02}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Scenes\LitShadowed">
+      <UniqueIdentifier>{f6f4656e-2a26-4232-b147-a83a2a766e6a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Scenes\Textured">
+      <UniqueIdentifier>{5f931ae6-23b1-43df-a4d8-e7f134d755c8}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="AutoPrerenderingScene.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="BasicBatch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="BasicScene.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="GLUtil.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\General</Filter>
     </ClCompile>
-    <ClCompile Include="ImageScene.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LitBatch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LitScene.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LitShadowedBatch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LitShadowedScene.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TexturedBatch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TexturedScene.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="AutoPrerenderingScene.cpp">
+      <Filter>Source Files\General</Filter>
     </ClCompile>
     <ClCompile Include="TextureGenerator.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\General</Filter>
+    </ClCompile>
+    <ClCompile Include="BasicBatch.cpp">
+      <Filter>Source Files\Scenes\Basic</Filter>
+    </ClCompile>
+    <ClCompile Include="BasicScene.cpp">
+      <Filter>Source Files\Scenes\Basic</Filter>
+    </ClCompile>
+    <ClCompile Include="ImageScene.cpp">
+      <Filter>Source Files\Scenes\Image</Filter>
+    </ClCompile>
+    <ClCompile Include="LitBatch.cpp">
+      <Filter>Source Files\Scenes\Lit</Filter>
+    </ClCompile>
+    <ClCompile Include="LitScene.cpp">
+      <Filter>Source Files\Scenes\Lit</Filter>
+    </ClCompile>
+    <ClCompile Include="LitShadowedBatch.cpp">
+      <Filter>Source Files\Scenes\LitShadowed</Filter>
+    </ClCompile>
+    <ClCompile Include="LitShadowedScene.cpp">
+      <Filter>Source Files\Scenes\LitShadowed</Filter>
+    </ClCompile>
+    <ClCompile Include="TexturedBatch.cpp">
+      <Filter>Source Files\Scenes\Textured</Filter>
+    </ClCompile>
+    <ClCompile Include="TexturedScene.cpp">
+      <Filter>Source Files\Scenes\Textured</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="AutoPrerenderingScene.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="BasicBatch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="BasicScene.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="BasicShaderProgram.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="BasicTypes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Batched.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="BuiltinBatch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="BuiltinCamera2D.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="BuiltinCamera3D.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="BuiltinTypes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FileUtil.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="GLUtil.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ImageScene.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ImageShaderProgram.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ImageTypes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="LitBatch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="LitScene.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="LitShaderProgram.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="LitShadowedBatch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="LitShadowedScene.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="LitShadowedShaderProgram.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="LitShadowedTypes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="LitTypes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MeshGenerator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Poseable2DBatch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PoseableBatch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SpriteBatch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="TexturedBatch.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files\Scenes\Textured</Filter>
     </ClInclude>
     <ClInclude Include="TexturedScene.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files\Scenes\Textured</Filter>
     </ClInclude>
     <ClInclude Include="TexturedShaderProgram.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files\Scenes\Textured</Filter>
     </ClInclude>
     <ClInclude Include="TexturedTypes.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files\Scenes\Textured</Filter>
+    </ClInclude>
+    <ClInclude Include="LitShaderProgram.h">
+      <Filter>Header Files\Scenes\LitShadowed</Filter>
+    </ClInclude>
+    <ClInclude Include="LitShadowedBatch.h">
+      <Filter>Header Files\Scenes\LitShadowed</Filter>
+    </ClInclude>
+    <ClInclude Include="LitShadowedScene.h">
+      <Filter>Header Files\Scenes\LitShadowed</Filter>
+    </ClInclude>
+    <ClInclude Include="LitShadowedShaderProgram.h">
+      <Filter>Header Files\Scenes\LitShadowed</Filter>
+    </ClInclude>
+    <ClInclude Include="LitShadowedTypes.h">
+      <Filter>Header Files\Scenes\LitShadowed</Filter>
+    </ClInclude>
+    <ClInclude Include="BasicBatch.h">
+      <Filter>Header Files\Scenes\Basic</Filter>
+    </ClInclude>
+    <ClInclude Include="BasicScene.h">
+      <Filter>Header Files\Scenes\Basic</Filter>
+    </ClInclude>
+    <ClInclude Include="BasicShaderProgram.h">
+      <Filter>Header Files\Scenes\Basic</Filter>
+    </ClInclude>
+    <ClInclude Include="BasicTypes.h">
+      <Filter>Header Files\Scenes\Basic</Filter>
+    </ClInclude>
+    <ClInclude Include="ImageScene.h">
+      <Filter>Header Files\Scenes\Image</Filter>
+    </ClInclude>
+    <ClInclude Include="ImageShaderProgram.h">
+      <Filter>Header Files\Scenes\Image</Filter>
+    </ClInclude>
+    <ClInclude Include="ImageTypes.h">
+      <Filter>Header Files\Scenes\Image</Filter>
+    </ClInclude>
+    <ClInclude Include="LitBatch.h">
+      <Filter>Header Files\Scenes\Lit</Filter>
+    </ClInclude>
+    <ClInclude Include="LitScene.h">
+      <Filter>Header Files\Scenes\Lit</Filter>
+    </ClInclude>
+    <ClInclude Include="LitTypes.h">
+      <Filter>Header Files\Scenes\Lit</Filter>
+    </ClInclude>
+    <ClInclude Include="AutoPrerenderingScene.h">
+      <Filter>Header Files\General</Filter>
+    </ClInclude>
+    <ClInclude Include="Batched.h">
+      <Filter>Header Files\General</Filter>
+    </ClInclude>
+    <ClInclude Include="BuiltinBatch.h">
+      <Filter>Header Files\General</Filter>
+    </ClInclude>
+    <ClInclude Include="BuiltinCamera2D.h">
+      <Filter>Header Files\General</Filter>
+    </ClInclude>
+    <ClInclude Include="BuiltinCamera3D.h">
+      <Filter>Header Files\General</Filter>
+    </ClInclude>
+    <ClInclude Include="BuiltinTypes.h">
+      <Filter>Header Files\General</Filter>
+    </ClInclude>
+    <ClInclude Include="GLUtil.h">
+      <Filter>Header Files\General</Filter>
+    </ClInclude>
+    <ClInclude Include="MeshGenerator.h">
+      <Filter>Header Files\General</Filter>
+    </ClInclude>
+    <ClInclude Include="Poseable2DBatch.h">
+      <Filter>Header Files\General</Filter>
+    </ClInclude>
+    <ClInclude Include="PoseableBatch.h">
+      <Filter>Header Files\General</Filter>
+    </ClInclude>
+    <ClInclude Include="SpriteBatch.h">
+      <Filter>Header Files\General</Filter>
     </ClInclude>
     <ClInclude Include="TextureGenerator.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files\General</Filter>
     </ClInclude>
     <ClInclude Include="WithCamera.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files\General</Filter>
     </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/CharcoalBuiltin/FileUtil.h b/CharcoalBuiltin/FileUtil.h
deleted file mode 100644
index 7731837..0000000
--- a/CharcoalBuiltin/FileUtil.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-class FileUtil
-{
-public:
-	class File
-	{
-	public:
-		File(const std::string& path);
-
-		unsigned long get_size();
-
-		char* get_contents();
-
-	private:
-		const std::string m_path;
-	};
-};
\ No newline at end of file
diff --git a/Example/Example.vcxproj.filters b/Example/Example.vcxproj.filters
index 5c90522..0b1d25a 100644
--- a/Example/Example.vcxproj.filters
+++ b/Example/Example.vcxproj.filters
@@ -56,15 +56,18 @@
     <ClInclude Include="MyApplication.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="MyBasicScene.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="MyBasicShaderProgram.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="MyBatch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="MySimpleShaderProgram.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MyBasicScene.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="MyBuiltinCubeScene.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -89,8 +92,5 @@
     <ClInclude Include="MySimpleCubeScene.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="MySimpleShaderProgram.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file