diff --git a/OpenGLEngine/MeshGenerator.h b/OpenGLEngine/MeshGenerator.h
index 108a183..9bdc5e1 100644
--- a/OpenGLEngine/MeshGenerator.h
+++ b/OpenGLEngine/MeshGenerator.h
@@ -2,6 +2,8 @@
 
 #include <type_traits>
 
+#include <glm/glm.hpp>
+
 #include "MeshFactory.h"
 #include "Mesh.h"
 #include "BuiltinTypes.h"
@@ -10,6 +12,7 @@
 
 namespace charcoal
 {
+	using namespace glm;
 	namespace builtin
 	{
 		// Uses MeshFactory to generate meshes for the builtin vertex types.
@@ -25,6 +28,107 @@ namespace charcoal
 				return mesh;
 			}
 
+			template <typename VertexType, typename IndexType>
+			Mesh<VertexType, IndexType>* gen_plane_p(const DrawMode& draw_mode, float width, float depth)
+			{
+				Mesh<VertexType, IndexType>* mesh;
+				
+				float x = width / 2.0f;
+				float z = depth / 2.0f;
+
+				Position pos0(-x, 0.0f,  z);
+				Position pos1(-x, 0.0f, -z);
+				Position pos2( x, 0.0f,  z);
+				Position pos3( x, 0.0f, -z);
+
+				switch (draw_mode)
+				{
+				case DrawMode::DRAW_POINTS:
+					mesh = MeshFactory<VertexType, IndexType>::create_mesh(4, 4);
+					mesh->vertices[0].set_position(pos0);
+					mesh->vertices[1].set_position(pos1);
+					mesh->vertices[2].set_position(pos2);
+					mesh->vertices[3].set_position(pos3);
+					mesh->indices[0] = 0;
+					mesh->indices[1] = 1;
+					mesh->indices[2] = 2;
+					mesh->indices[3] = 3;
+					break;
+				case DrawMode::DRAW_LINE_STRIP:
+					mesh = MeshFactory<VertexType, IndexType>::create_mesh(4, 5);
+					mesh->vertices[0].set_position(pos0);
+					mesh->vertices[1].set_position(pos1);
+					mesh->vertices[2].set_position(pos2);
+					mesh->vertices[3].set_position(pos3);
+					mesh->indices[0] = 0;
+					mesh->indices[1] = 1;
+					mesh->indices[2] = 3;
+					mesh->indices[3] = 2;
+					mesh->indices[4] = 0;
+					break;
+				case DrawMode::DRAW_LINE_LOOP:
+					mesh = MeshFactory<VertexType, IndexType>::create_mesh(4, 4);
+					mesh->vertices[0].set_position(pos0);
+					mesh->vertices[1].set_position(pos1);
+					mesh->vertices[2].set_position(pos2);
+					mesh->vertices[3].set_position(pos3);
+					mesh->indices[0] = 0;
+					mesh->indices[1] = 1;
+					mesh->indices[2] = 3;
+					mesh->indices[3] = 2;
+					break;
+				case DrawMode::DRAW_LINES:
+					mesh = MeshFactory<VertexType, IndexType>::create_mesh(4, 8);
+					mesh->vertices[0].set_position(pos0);
+					mesh->vertices[1].set_position(pos1);
+					mesh->vertices[2].set_position(pos2);
+					mesh->vertices[3].set_position(pos3);
+					mesh->indices[0] = 0;
+					mesh->indices[1] = 1;
+					mesh->indices[2] = 1;
+					mesh->indices[3] = 3;
+					mesh->indices[4] = 3;
+					mesh->indices[5] = 2;
+					mesh->indices[6] = 2;
+					mesh->indices[7] = 0;
+					break;
+				case DrawMode::DRAW_TRIANGLE_STRIP:
+				case DrawMode::DRAW_TRIANGLE_FAN:
+					mesh = MeshFactory<VertexType, IndexType>::create_mesh(4, 4);
+					mesh->vertices[0].set_position(pos0);
+					mesh->vertices[1].set_position(pos1);
+					mesh->vertices[2].set_position(pos2);
+					mesh->vertices[3].set_position(pos3);
+					mesh->indices[0] = 0;
+					mesh->indices[1] = 1;
+					mesh->indices[2] = 3;
+					mesh->indices[3] = 2;
+					break;
+				case DrawMode::DRAW_TRIANGLES:
+					mesh = MeshFactory<VertexType, IndexType>::create_mesh(4, 6);
+					mesh->vertices[0].set_position(pos0);
+					mesh->vertices[1].set_position(pos1);
+					mesh->vertices[2].set_position(pos2);
+					mesh->vertices[3].set_position(pos3);
+					mesh->indices[0] = 0;
+					mesh->indices[1] = 1;
+					mesh->indices[2] = 3;
+					mesh->indices[3] = 3;
+					mesh->indices[4] = 1;
+					mesh->indices[5] = 2;
+					break;
+				case DrawMode::DRAW_LINE_STRIP_ADJACENCY:
+				case DrawMode::DRAW_LINES_ADJACENCY:
+				case DrawMode::DRAW_TRIANGLE_STRIP_ADJACENCY:
+				case DrawMode::DRAW_TRIANGLES_ADJACENCY:
+				case DrawMode::DRAW_PATCHES:
+				default:
+					throw EXCEPTION("Unable to gen_plane_p for current draw mode: " + std::string(draw_mode));
+				}
+
+				return mesh;
+			}
+
 			template <typename VertexType, typename IndexType>
 			Mesh<VertexType, IndexType>* gen_cube_p(const DrawMode& draw_mode, float width, float height, float depth)
 			{
diff --git a/OpenGLEngine/OpenGLEngine.vcxproj.filters b/OpenGLEngine/OpenGLEngine.vcxproj.filters
index ab29a17..7e969a6 100644
--- a/OpenGLEngine/OpenGLEngine.vcxproj.filters
+++ b/OpenGLEngine/OpenGLEngine.vcxproj.filters
@@ -25,18 +25,6 @@
     <Filter Include="Source Files\Engine">
       <UniqueIdentifier>{c38724ea-6e5b-4561-bb97-74da2a031319}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\Engine\Rendering">
-      <UniqueIdentifier>{51327f54-6f84-477f-8db8-883b91ebc5c2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Engine\Application">
-      <UniqueIdentifier>{2d1806dc-3a5d-4237-b7e3-4fe6d6576dc2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Engine\Application">
-      <UniqueIdentifier>{e8ae51e5-5508-47c6-804c-6d13408b8d13}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Engine\Rendering">
-      <UniqueIdentifier>{1bb31cb4-7b36-47b6-b9ee-3d5de57f8f0c}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Source Files\Example\Application">
       <UniqueIdentifier>{3f9911e0-108f-4258-99c4-3f56e80ac27e}</UniqueIdentifier>
     </Filter>
@@ -58,61 +46,85 @@
     <Filter Include="Source Files\Engine\builtin">
       <UniqueIdentifier>{233b4bce-fc64-4ad1-994e-c986befa7ff2}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\Engine\builtin\Shaders">
-      <UniqueIdentifier>{ca004137-6425-4863-b91a-cf32988855be}</UniqueIdentifier>
+    <Filter Include="Header Files\Engine\Baseline">
+      <UniqueIdentifier>{c67a5bf1-f6fb-4148-904d-9f96a3c34c88}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\Engine\builtin\Basic">
-      <UniqueIdentifier>{f3f94b58-31cf-4a57-bc2a-0c3a33a6b9ee}</UniqueIdentifier>
+    <Filter Include="Header Files\Engine\Baseline\Rendering">
+      <UniqueIdentifier>{51327f54-6f84-477f-8db8-883b91ebc5c2}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\Engine\builtin\Lit">
-      <UniqueIdentifier>{fa76cc6e-e866-4987-8263-85abac1ac2c6}</UniqueIdentifier>
+    <Filter Include="Header Files\Engine\Baseline\Application">
+      <UniqueIdentifier>{2d1806dc-3a5d-4237-b7e3-4fe6d6576dc2}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\Engine\builtin\Textured">
-      <UniqueIdentifier>{2e0e6381-fca9-42aa-87a9-04495a753104}</UniqueIdentifier>
+    <Filter Include="Source Files\Engine\Baseline">
+      <UniqueIdentifier>{5c0adf5c-83f0-46f0-89c8-83cdf8f0090d}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\Engine\builtin\Basic">
-      <UniqueIdentifier>{283b2135-b031-48f0-b3cc-564a864e13bd}</UniqueIdentifier>
+    <Filter Include="Source Files\Engine\Baseline\Rendering">
+      <UniqueIdentifier>{1bb31cb4-7b36-47b6-b9ee-3d5de57f8f0c}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\Engine\builtin\Lit">
-      <UniqueIdentifier>{a67acfda-71a8-46cf-8207-bfdece4228ac}</UniqueIdentifier>
+    <Filter Include="Source Files\Engine\Baseline\Application">
+      <UniqueIdentifier>{e8ae51e5-5508-47c6-804c-6d13408b8d13}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\Engine\builtin\Textured">
-      <UniqueIdentifier>{4c6497d4-160a-45a1-a23b-7bf905de0824}</UniqueIdentifier>
+    <Filter Include="Header Files\Engine\builtin\General">
+      <UniqueIdentifier>{9cd2885f-9d3b-439c-b206-e3d53f6d7191}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\Engine\builtin\LitShadowed">
+    <Filter Include="Header Files\Engine\builtin\Scenes">
+      <UniqueIdentifier>{b3bc2383-d099-4fac-a51c-d2d4a8e7dea3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Engine\builtin\Scenes\LitShadowed">
       <UniqueIdentifier>{2f2c0657-4ba3-4314-86dd-a600f533f746}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\Engine\builtin\LitShadowed">
+    <Filter Include="Header Files\Engine\builtin\Scenes\Basic">
+      <UniqueIdentifier>{f3f94b58-31cf-4a57-bc2a-0c3a33a6b9ee}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Engine\builtin\Scenes\Lit">
+      <UniqueIdentifier>{fa76cc6e-e866-4987-8263-85abac1ac2c6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Engine\builtin\Scenes\Textured">
+      <UniqueIdentifier>{2e0e6381-fca9-42aa-87a9-04495a753104}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Engine\builtin\General">
+      <UniqueIdentifier>{a9e42739-f380-4358-83e5-f994cab7e55c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Engine\builtin\Scenes">
+      <UniqueIdentifier>{f9faae2c-4381-4a2e-a0be-27920a52dc4d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Engine\builtin\Scenes\Lit">
+      <UniqueIdentifier>{a67acfda-71a8-46cf-8207-bfdece4228ac}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Engine\builtin\Scenes\Basic">
+      <UniqueIdentifier>{283b2135-b031-48f0-b3cc-564a864e13bd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Engine\builtin\Scenes\LitShadowed">
       <UniqueIdentifier>{ca87b30d-8b69-4c09-90a5-1fe317322c4c}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\Engine\builtin\Scenes\Textured">
+      <UniqueIdentifier>{4c6497d4-160a-45a1-a23b-7bf905de0824}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Engine\builtin\Scenes\Shaders">
+      <UniqueIdentifier>{ca004137-6425-4863-b91a-cf32988855be}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp">
       <Filter>Source Files\Example</Filter>
     </ClCompile>
-    <ClCompile Include="stdafx.cpp">
-      <Filter>Source Files\Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="Util.cpp">
-      <Filter>Source Files\Engine</Filter>
-    </ClCompile>
     <ClCompile Include="Application.cpp">
-      <Filter>Source Files\Engine\Application</Filter>
+      <Filter>Source Files\Engine\Baseline\Application</Filter>
     </ClCompile>
     <ClCompile Include="FPS.cpp">
-      <Filter>Source Files\Engine\Application</Filter>
+      <Filter>Source Files\Engine\Baseline\Application</Filter>
     </ClCompile>
     <ClCompile Include="GLFWInputManager.cpp">
-      <Filter>Source Files\Engine\Application</Filter>
+      <Filter>Source Files\Engine\Baseline\Application</Filter>
     </ClCompile>
     <ClCompile Include="InputManager.cpp">
-      <Filter>Source Files\Engine\Application</Filter>
+      <Filter>Source Files\Engine\Baseline\Application</Filter>
     </ClCompile>
     <ClCompile Include="ShaderProgram.cpp">
-      <Filter>Source Files\Engine\Rendering</Filter>
+      <Filter>Source Files\Engine\Baseline\Rendering</Filter>
     </ClCompile>
     <ClCompile Include="Shader.cpp">
-      <Filter>Source Files\Engine\Rendering</Filter>
+      <Filter>Source Files\Engine\Baseline\Rendering</Filter>
     </ClCompile>
     <ClCompile Include="MyBatch.cpp">
       <Filter>Source Files\Example\Rendering</Filter>
@@ -121,13 +133,10 @@
       <Filter>Source Files\Example\Application</Filter>
     </ClCompile>
     <ClCompile Include="Camera2D.cpp">
-      <Filter>Source Files\Engine\Rendering</Filter>
+      <Filter>Source Files\Engine\Baseline\Rendering</Filter>
     </ClCompile>
     <ClCompile Include="Camera3D.cpp">
-      <Filter>Source Files\Engine\Rendering</Filter>
-    </ClCompile>
-    <ClCompile Include="Poseable.cpp">
-      <Filter>Source Files\Engine</Filter>
+      <Filter>Source Files\Engine\Baseline\Rendering</Filter>
     </ClCompile>
     <ClCompile Include="MySimple2DScene.cpp">
       <Filter>Source Files\Example\Application</Filter>
@@ -141,91 +150,88 @@
     <ClCompile Include="MySimpleCubeScene.cpp">
       <Filter>Source Files\Example\Application</Filter>
     </ClCompile>
-    <ClCompile Include="GLUtil.cpp">
-      <Filter>Source Files\Engine\builtin</Filter>
-    </ClCompile>
     <ClCompile Include="MyBuiltinCubeScene.cpp">
       <Filter>Source Files\Example\Application</Filter>
     </ClCompile>
-    <ClCompile Include="AutoPrerenderingScene.cpp">
-      <Filter>Source Files\Engine\builtin</Filter>
-    </ClCompile>
     <ClCompile Include="MyBuiltinLitScene.cpp">
       <Filter>Source Files\Example\Application</Filter>
     </ClCompile>
     <ClCompile Include="VertexFragmentShaderProgram.cpp">
-      <Filter>Source Files\Engine\Rendering</Filter>
+      <Filter>Source Files\Engine\Baseline\Rendering</Filter>
     </ClCompile>
     <ClCompile Include="BasicBatch.cpp">
-      <Filter>Source Files\Engine\builtin\Basic</Filter>
+      <Filter>Source Files\Engine\builtin\Scenes\Basic</Filter>
     </ClCompile>
     <ClCompile Include="BasicScene.cpp">
-      <Filter>Source Files\Engine\builtin\Basic</Filter>
+      <Filter>Source Files\Engine\builtin\Scenes\Basic</Filter>
     </ClCompile>
     <ClCompile Include="LitBatch.cpp">
-      <Filter>Source Files\Engine\builtin\Lit</Filter>
+      <Filter>Source Files\Engine\builtin\Scenes\Lit</Filter>
     </ClCompile>
     <ClCompile Include="LitScene.cpp">
-      <Filter>Source Files\Engine\builtin\Lit</Filter>
+      <Filter>Source Files\Engine\builtin\Scenes\Lit</Filter>
     </ClCompile>
     <ClCompile Include="TexturedBatch.cpp">
-      <Filter>Source Files\Engine\builtin\Textured</Filter>
+      <Filter>Source Files\Engine\builtin\Scenes\Textured</Filter>
     </ClCompile>
     <ClCompile Include="TexturedScene.cpp">
-      <Filter>Source Files\Engine\builtin\Textured</Filter>
+      <Filter>Source Files\Engine\builtin\Scenes\Textured</Filter>
     </ClCompile>
     <ClCompile Include="MyBuiltinTexturedScene.cpp">
       <Filter>Source Files\Example\Application</Filter>
     </ClCompile>
-    <ClCompile Include="Sampler.cpp">
-      <Filter>Source Files\Engine</Filter>
-    </ClCompile>
     <ClCompile Include="LitShadowedBatch.cpp">
-      <Filter>Source Files\Engine\builtin\LitShadowed</Filter>
+      <Filter>Source Files\Engine\builtin\Scenes\LitShadowed</Filter>
     </ClCompile>
     <ClCompile Include="LitShadowedScene.cpp">
-      <Filter>Source Files\Engine\builtin\LitShadowed</Filter>
+      <Filter>Source Files\Engine\builtin\Scenes\LitShadowed</Filter>
     </ClCompile>
     <ClCompile Include="MyBuiltinLitShadowedScene.cpp">
       <Filter>Source Files\Example\Application</Filter>
     </ClCompile>
+    <ClCompile Include="Poseable.cpp">
+      <Filter>Source Files\Engine\Baseline</Filter>
+    </ClCompile>
+    <ClCompile Include="Sampler.cpp">
+      <Filter>Source Files\Engine\Baseline</Filter>
+    </ClCompile>
+    <ClCompile Include="stdafx.cpp">
+      <Filter>Source Files\Engine\Baseline</Filter>
+    </ClCompile>
+    <ClCompile Include="Util.cpp">
+      <Filter>Source Files\Engine\Baseline</Filter>
+    </ClCompile>
+    <ClCompile Include="AutoPrerenderingScene.cpp">
+      <Filter>Source Files\Engine\builtin\General</Filter>
+    </ClCompile>
+    <ClCompile Include="GLUtil.cpp">
+      <Filter>Source Files\Engine\builtin\General</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Exception.h">
-      <Filter>Header Files\Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="MeshFactory.h">
-      <Filter>Header Files\Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="stdafx.h">
-      <Filter>Header Files\Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="Util.h">
-      <Filter>Header Files\Engine</Filter>
-    </ClInclude>
     <ClInclude Include="Application.h">
-      <Filter>Header Files\Engine\Application</Filter>
+      <Filter>Header Files\Engine\Baseline\Application</Filter>
     </ClInclude>
     <ClInclude Include="FPS.h">
-      <Filter>Header Files\Engine\Application</Filter>
+      <Filter>Header Files\Engine\Baseline\Application</Filter>
     </ClInclude>
     <ClInclude Include="GLFWInputManager.h">
-      <Filter>Header Files\Engine\Application</Filter>
+      <Filter>Header Files\Engine\Baseline\Application</Filter>
     </ClInclude>
     <ClInclude Include="InputManager.h">
-      <Filter>Header Files\Engine\Application</Filter>
+      <Filter>Header Files\Engine\Baseline\Application</Filter>
     </ClInclude>
     <ClInclude Include="Scene.h">
-      <Filter>Header Files\Engine\Application</Filter>
+      <Filter>Header Files\Engine\Baseline\Application</Filter>
     </ClInclude>
     <ClInclude Include="ShaderProgram.h">
-      <Filter>Header Files\Engine\Rendering</Filter>
+      <Filter>Header Files\Engine\Baseline\Rendering</Filter>
     </ClInclude>
     <ClInclude Include="Camera.h">
-      <Filter>Header Files\Engine\Rendering</Filter>
+      <Filter>Header Files\Engine\Baseline\Rendering</Filter>
     </ClInclude>
     <ClInclude Include="Batch.h">
-      <Filter>Header Files\Engine\Rendering</Filter>
+      <Filter>Header Files\Engine\Baseline\Rendering</Filter>
     </ClInclude>
     <ClInclude Include="MyBatch.h">
       <Filter>Header Files\Example\Rendering</Filter>
@@ -234,16 +240,10 @@
       <Filter>Header Files\Example\Application</Filter>
     </ClInclude>
     <ClInclude Include="Camera2D.h">
-      <Filter>Header Files\Engine\Rendering</Filter>
+      <Filter>Header Files\Engine\Baseline\Rendering</Filter>
     </ClInclude>
     <ClInclude Include="Camera3D.h">
-      <Filter>Header Files\Engine\Rendering</Filter>
-    </ClInclude>
-    <ClInclude Include="Poseable.h">
-      <Filter>Header Files\Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="constants.h">
-      <Filter>Header Files\Engine</Filter>
+      <Filter>Header Files\Engine\Baseline\Rendering</Filter>
     </ClInclude>
     <ClInclude Include="MySimple2DScene.h">
       <Filter>Header Files\Example\Application</Filter>
@@ -263,125 +263,143 @@
     <ClInclude Include="MySimpleCubeScene.h">
       <Filter>Header Files\Example\Application</Filter>
     </ClInclude>
-    <ClInclude Include="DrawMode.h">
-      <Filter>Header Files\Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="Renderable.h">
-      <Filter>Header Files\Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="Mesh.h">
-      <Filter>Header Files\Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="MeshGenerator.h">
-      <Filter>Header Files\Engine\builtin</Filter>
-    </ClInclude>
-    <ClInclude Include="GLUtil.h">
-      <Filter>Header Files\Engine\builtin</Filter>
-    </ClInclude>
     <ClInclude Include="VertexFragmentShaderProgram.h">
-      <Filter>Header Files\Engine\Rendering</Filter>
+      <Filter>Header Files\Engine\Baseline\Rendering</Filter>
     </ClInclude>
     <ClInclude Include="MyBuiltinCubeScene.h">
       <Filter>Header Files\Example\Application</Filter>
     </ClInclude>
-    <ClInclude Include="Prerenderable.h">
-      <Filter>Header Files\Engine\builtin</Filter>
-    </ClInclude>
-    <ClInclude Include="BuiltinCamera2D.h">
-      <Filter>Header Files\Engine\builtin</Filter>
-    </ClInclude>
-    <ClInclude Include="AutoPrerenderingScene.h">
-      <Filter>Header Files\Engine\builtin</Filter>
-    </ClInclude>
-    <ClInclude Include="BuiltinCamera3D.h">
-      <Filter>Header Files\Engine\builtin</Filter>
-    </ClInclude>
-    <ClInclude Include="PoseableBatch.h">
-      <Filter>Header Files\Engine\builtin</Filter>
-    </ClInclude>
-    <ClInclude Include="BuiltinTypes.h">
-      <Filter>Header Files\Engine\builtin</Filter>
-    </ClInclude>
-    <ClInclude Include="BuiltinBatch.h">
-      <Filter>Header Files\Engine\builtin</Filter>
-    </ClInclude>
-    <ClInclude Include="Batched.h">
-      <Filter>Header Files\Engine\builtin</Filter>
-    </ClInclude>
     <ClInclude Include="MyBuiltinLitScene.h">
       <Filter>Header Files\Example\Application</Filter>
     </ClInclude>
     <ClInclude Include="BasicBatch.h">
-      <Filter>Header Files\Engine\builtin\Basic</Filter>
+      <Filter>Header Files\Engine\builtin\Scenes\Basic</Filter>
     </ClInclude>
     <ClInclude Include="BasicScene.h">
-      <Filter>Header Files\Engine\builtin\Basic</Filter>
+      <Filter>Header Files\Engine\builtin\Scenes\Basic</Filter>
     </ClInclude>
     <ClInclude Include="BasicShaderProgram.h">
-      <Filter>Header Files\Engine\builtin\Basic</Filter>
+      <Filter>Header Files\Engine\builtin\Scenes\Basic</Filter>
     </ClInclude>
     <ClInclude Include="LitBatch.h">
-      <Filter>Header Files\Engine\builtin\Lit</Filter>
+      <Filter>Header Files\Engine\builtin\Scenes\Lit</Filter>
     </ClInclude>
     <ClInclude Include="LitScene.h">
-      <Filter>Header Files\Engine\builtin\Lit</Filter>
+      <Filter>Header Files\Engine\builtin\Scenes\Lit</Filter>
     </ClInclude>
     <ClInclude Include="LitShaderProgram.h">
-      <Filter>Header Files\Engine\builtin\Lit</Filter>
+      <Filter>Header Files\Engine\builtin\Scenes\Lit</Filter>
     </ClInclude>
     <ClInclude Include="TexturedBatch.h">
-      <Filter>Header Files\Engine\builtin\Textured</Filter>
+      <Filter>Header Files\Engine\builtin\Scenes\Textured</Filter>
     </ClInclude>
     <ClInclude Include="TexturedScene.h">
-      <Filter>Header Files\Engine\builtin\Textured</Filter>
+      <Filter>Header Files\Engine\builtin\Scenes\Textured</Filter>
     </ClInclude>
     <ClInclude Include="TexturedShaderProgram.h">
-      <Filter>Header Files\Engine\builtin\Textured</Filter>
+      <Filter>Header Files\Engine\builtin\Scenes\Textured</Filter>
     </ClInclude>
     <ClInclude Include="MyBuiltinTexturedScene.h">
       <Filter>Header Files\Example\Application</Filter>
     </ClInclude>
     <ClInclude Include="Shader.h">
-      <Filter>Header Files\Engine\Rendering</Filter>
-    </ClInclude>
-    <ClInclude Include="Texture.h">
-      <Filter>Header Files\Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="Sampler.h">
-      <Filter>Header Files\Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="TextureRenderable.h">
-      <Filter>Header Files\Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="TextureFactory.h">
-      <Filter>Header Files\Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="TextureGenerator.h">
-      <Filter>Header Files\Engine\builtin</Filter>
+      <Filter>Header Files\Engine\Baseline\Rendering</Filter>
     </ClInclude>
     <ClInclude Include="LitShadowedBatch.h">
-      <Filter>Header Files\Engine\builtin\LitShadowed</Filter>
+      <Filter>Header Files\Engine\builtin\Scenes\LitShadowed</Filter>
     </ClInclude>
     <ClInclude Include="LitShadowedScene.h">
-      <Filter>Header Files\Engine\builtin\LitShadowed</Filter>
+      <Filter>Header Files\Engine\builtin\Scenes\LitShadowed</Filter>
     </ClInclude>
     <ClInclude Include="LitShadowedShaderProgram.h">
-      <Filter>Header Files\Engine\builtin\LitShadowed</Filter>
+      <Filter>Header Files\Engine\builtin\Scenes\LitShadowed</Filter>
     </ClInclude>
     <ClInclude Include="MyBuiltinLitShadowedScene.h">
       <Filter>Header Files\Example\Application</Filter>
     </ClInclude>
     <ClInclude Include="BasicTypes.h">
-      <Filter>Header Files\Engine\builtin\Basic</Filter>
+      <Filter>Header Files\Engine\builtin\Scenes\Basic</Filter>
     </ClInclude>
     <ClInclude Include="LitTypes.h">
-      <Filter>Header Files\Engine\builtin\Lit</Filter>
+      <Filter>Header Files\Engine\builtin\Scenes\Lit</Filter>
     </ClInclude>
     <ClInclude Include="TexturedTypes.h">
-      <Filter>Header Files\Engine\builtin\Textured</Filter>
+      <Filter>Header Files\Engine\builtin\Scenes\Textured</Filter>
     </ClInclude>
     <ClInclude Include="LitShadowedTypes.h">
-      <Filter>Header Files\Engine\builtin\LitShadowed</Filter>
+      <Filter>Header Files\Engine\builtin\Scenes\LitShadowed</Filter>
+    </ClInclude>
+    <ClInclude Include="constants.h">
+      <Filter>Header Files\Engine\Baseline</Filter>
+    </ClInclude>
+    <ClInclude Include="DrawMode.h">
+      <Filter>Header Files\Engine\Baseline</Filter>
+    </ClInclude>
+    <ClInclude Include="Exception.h">
+      <Filter>Header Files\Engine\Baseline</Filter>
+    </ClInclude>
+    <ClInclude Include="Mesh.h">
+      <Filter>Header Files\Engine\Baseline</Filter>
+    </ClInclude>
+    <ClInclude Include="MeshFactory.h">
+      <Filter>Header Files\Engine\Baseline</Filter>
+    </ClInclude>
+    <ClInclude Include="Poseable.h">
+      <Filter>Header Files\Engine\Baseline</Filter>
+    </ClInclude>
+    <ClInclude Include="Renderable.h">
+      <Filter>Header Files\Engine\Baseline</Filter>
+    </ClInclude>
+    <ClInclude Include="Sampler.h">
+      <Filter>Header Files\Engine\Baseline</Filter>
+    </ClInclude>
+    <ClInclude Include="stdafx.h">
+      <Filter>Header Files\Engine\Baseline</Filter>
+    </ClInclude>
+    <ClInclude Include="Texture.h">
+      <Filter>Header Files\Engine\Baseline</Filter>
+    </ClInclude>
+    <ClInclude Include="TextureFactory.h">
+      <Filter>Header Files\Engine\Baseline</Filter>
+    </ClInclude>
+    <ClInclude Include="TextureRenderable.h">
+      <Filter>Header Files\Engine\Baseline</Filter>
+    </ClInclude>
+    <ClInclude Include="Util.h">
+      <Filter>Header Files\Engine\Baseline</Filter>
+    </ClInclude>
+    <ClInclude Include="AutoPrerenderingScene.h">
+      <Filter>Header Files\Engine\builtin\General</Filter>
+    </ClInclude>
+    <ClInclude Include="Batched.h">
+      <Filter>Header Files\Engine\builtin\General</Filter>
+    </ClInclude>
+    <ClInclude Include="BuiltinBatch.h">
+      <Filter>Header Files\Engine\builtin\General</Filter>
+    </ClInclude>
+    <ClInclude Include="BuiltinCamera2D.h">
+      <Filter>Header Files\Engine\builtin\General</Filter>
+    </ClInclude>
+    <ClInclude Include="BuiltinCamera3D.h">
+      <Filter>Header Files\Engine\builtin\General</Filter>
+    </ClInclude>
+    <ClInclude Include="BuiltinTypes.h">
+      <Filter>Header Files\Engine\builtin\General</Filter>
+    </ClInclude>
+    <ClInclude Include="GLUtil.h">
+      <Filter>Header Files\Engine\builtin\General</Filter>
+    </ClInclude>
+    <ClInclude Include="MeshGenerator.h">
+      <Filter>Header Files\Engine\builtin\General</Filter>
+    </ClInclude>
+    <ClInclude Include="PoseableBatch.h">
+      <Filter>Header Files\Engine\builtin\General</Filter>
+    </ClInclude>
+    <ClInclude Include="Prerenderable.h">
+      <Filter>Header Files\Engine\builtin\General</Filter>
+    </ClInclude>
+    <ClInclude Include="TextureGenerator.h">
+      <Filter>Header Files\Engine\builtin\General</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
@@ -398,28 +416,28 @@
       <Filter>Source Files\Example\Rendering\Shader Code</Filter>
     </None>
     <None Include="BasicFS.glsl">
-      <Filter>Source Files\Engine\builtin\Shaders</Filter>
+      <Filter>Source Files\Engine\builtin\Scenes\Shaders</Filter>
     </None>
     <None Include="BasicVS.glsl">
-      <Filter>Source Files\Engine\builtin\Shaders</Filter>
+      <Filter>Source Files\Engine\builtin\Scenes\Shaders</Filter>
     </None>
     <None Include="LitVS.glsl">
-      <Filter>Source Files\Engine\builtin\Shaders</Filter>
+      <Filter>Source Files\Engine\builtin\Scenes\Shaders</Filter>
     </None>
     <None Include="LitFS.glsl">
-      <Filter>Source Files\Engine\builtin\Shaders</Filter>
+      <Filter>Source Files\Engine\builtin\Scenes\Shaders</Filter>
     </None>
     <None Include="TexturedVS.glsl">
-      <Filter>Source Files\Engine\builtin\Shaders</Filter>
+      <Filter>Source Files\Engine\builtin\Scenes\Shaders</Filter>
     </None>
     <None Include="TexturedFS.glsl">
-      <Filter>Source Files\Engine\builtin\Shaders</Filter>
+      <Filter>Source Files\Engine\builtin\Scenes\Shaders</Filter>
     </None>
     <None Include="LitShadowedFS.glsl">
-      <Filter>Source Files\Engine\builtin\Shaders</Filter>
+      <Filter>Source Files\Engine\builtin\Scenes\Shaders</Filter>
     </None>
     <None Include="LitShadowedVS.glsl">
-      <Filter>Source Files\Engine\builtin\Shaders</Filter>
+      <Filter>Source Files\Engine\builtin\Scenes\Shaders</Filter>
     </None>
   </ItemGroup>
 </Project>
\ No newline at end of file