diff --git a/vs12/Returngeance/Returngeance.vcxproj b/vs12/Returngeance/Returngeance.vcxproj
index 93ac2a5..305fd09 100755
--- a/vs12/Returngeance/Returngeance.vcxproj
+++ b/vs12/Returngeance/Returngeance.vcxproj
@@ -114,10 +114,8 @@
     <ClInclude Include="..\..\src\Color.h" />
     <ClInclude Include="..\..\src\Component.h" />
     <ClInclude Include="..\..\src\Components\BallSocketConstraint.h" />
-    <ClInclude Include="..\..\src\Components\Bounds.h" />
     <ClInclude Include="..\..\src\Components\BoxShape.h" />
     <ClInclude Include="..\..\src\Components\Camera.h" />
-    <ClInclude Include="..\..\src\Components\Collision.h" />
     <ClInclude Include="..\..\src\Components\CompoundShape.h" />
     <ClInclude Include="..\..\src\Components\DirectionalLight.h" />
     <ClInclude Include="..\..\src\Components\FreeSteering.h" />
@@ -128,12 +126,10 @@
     <ClInclude Include="..\..\src\Components\ParticleEmitter.h" />
     <ClInclude Include="..\..\src\Components\Physics.h" />
     <ClInclude Include="..\..\src\Components\PointLight.h" />
-    <ClInclude Include="..\..\src\Components\PowerUp.h" />
     <ClInclude Include="..\..\src\Components\SliderConstraint.h" />
     <ClInclude Include="..\..\src\Components\SoundEmitter.h" />
     <ClInclude Include="..\..\src\Components\SphereShape.h" />
     <ClInclude Include="..\..\src\Components\Sprite.h" />
-    <ClInclude Include="..\..\src\Components\Stat.h" />
     <ClInclude Include="..\..\src\Components\StaticMeshShape.h" />
     <ClInclude Include="..\..\src\Components\Template.h" />
     <ClInclude Include="..\..\src\Components\Transform.h" />
diff --git a/vs12/Returngeance/Returngeance.vcxproj.filters b/vs12/Returngeance/Returngeance.vcxproj.filters
index 03449ab..d24a694 100755
--- a/vs12/Returngeance/Returngeance.vcxproj.filters
+++ b/vs12/Returngeance/Returngeance.vcxproj.filters
@@ -4,35 +4,49 @@
     <ClCompile Include="..\..\src\main.cpp" />
     <ClCompile Include="..\..\src\GameWorld.cpp" />
     <ClCompile Include="..\..\src\World.cpp" />
-    <ClCompile Include="..\..\src\Renderer.cpp" />
-    <ClCompile Include="..\..\src\Camera.cpp" />
-    <ClCompile Include="..\..\src\Model.cpp" />
-    <ClCompile Include="..\..\src\Skybox.cpp" />
-    <ClCompile Include="..\..\src\CubemapTexture.cpp" />
-    <ClCompile Include="..\..\src\Texture.cpp" />
     <ClCompile Include="..\..\src\ShaderProgram.cpp" />
-    <ClCompile Include="..\..\src\OBJ.cpp" />
     <ClCompile Include="..\..\src\PrecompiledHeader.cpp" />
     <ClCompile Include="..\..\src\Systems\RenderSystem.cpp">
-      <Filter>Systems</Filter>
+      <Filter>Rendering\Systems</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\Systems\TransformSystem.cpp">
-      <Filter>Systems</Filter>
+    <ClCompile Include="..\..\src\Renderer.cpp">
+      <Filter>Rendering</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\Systems\InputSystem.cpp">
-      <Filter>Systems</Filter>
+    <ClCompile Include="..\..\src\Skybox.cpp">
+      <Filter>Rendering</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\Systems\FreeSteeringSystem.cpp">
-      <Filter>Systems</Filter>
+    <ClCompile Include="..\..\src\Texture.cpp">
+      <Filter>Rendering</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\OBJ.cpp">
+      <Filter>Rendering</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Model.cpp">
+      <Filter>Rendering</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Camera.cpp">
+      <Filter>Rendering</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\CubemapTexture.cpp">
+      <Filter>Rendering</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\Systems\PhysicsSystem.cpp">
-      <Filter>Systems</Filter>
+      <Filter>Physics\Systems</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Systems\TransformSystem.cpp">
+      <Filter>Base\Systems</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\Systems\DebugSystem.cpp">
-      <Filter>Systems</Filter>
+      <Filter>Base\Systems</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\Systems\SoundSystem.cpp">
-      <Filter>Systems</Filter>
+      <Filter>Audio\Systems</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Systems\InputSystem.cpp">
+      <Filter>Input\Systems</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Systems\FreeSteeringSystem.cpp">
+      <Filter>Input\Systems</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -42,11 +56,59 @@
     <Filter Include="Shaders">
       <UniqueIdentifier>{8974329a-5c12-4b94-86e7-5931555bc129}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Components">
-      <UniqueIdentifier>{e3f795ca-331e-4905-b423-93f651d93c09}</UniqueIdentifier>
+    <Filter Include="Rendering">
+      <UniqueIdentifier>{aca514ec-84de-423c-a270-ec4399904c5a}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Systems">
-      <UniqueIdentifier>{1a6674dd-e1ce-4a28-a6e8-3f28468bb2f0}</UniqueIdentifier>
+    <Filter Include="Rendering\Components">
+      <UniqueIdentifier>{fcbc3469-7049-4c07-9d76-f8f1e872f042}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Rendering\Systems">
+      <UniqueIdentifier>{f6c5fd1d-7180-42b7-b973-a91bfc3ea189}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Physics">
+      <UniqueIdentifier>{d08cc18b-b7d8-47a7-91af-7283052e4c97}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Physics\Components">
+      <UniqueIdentifier>{1c5d571e-55f4-498b-b64a-2f28ac2cd9b0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Physics\Systems">
+      <UniqueIdentifier>{635843f6-c94e-4798-8201-db64d11e2a03}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Base">
+      <UniqueIdentifier>{3bd82924-397c-4c5a-959c-971612269374}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Base\Components">
+      <UniqueIdentifier>{c17ff66a-f9f5-4329-a05d-e7bf8a140dd3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Base\Systems">
+      <UniqueIdentifier>{caa1e07f-fa19-4706-bf59-de74a0290763}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Audio">
+      <UniqueIdentifier>{444e18d8-8ab6-413b-b9b0-59a6309e0511}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Audio\Components">
+      <UniqueIdentifier>{a2db813b-1d08-4d48-97ac-2faaff29a1cc}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Audio\Systems">
+      <UniqueIdentifier>{44c41b41-b706-4d88-8d50-abdeb2a828fe}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Input">
+      <UniqueIdentifier>{30c6d948-459c-4fc7-b44d-ecbe5f34203e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Input\Components">
+      <UniqueIdentifier>{8bcc0a31-3e0d-4342-8d10-ec8edfa03abd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Input\Systems">
+      <UniqueIdentifier>{93ce6550-7614-46b4-a554-0eec26e6fbf6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Particle System">
+      <UniqueIdentifier>{0bb544bb-1b0a-487f-88d6-f8ab8a2795f4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Particle System\Components">
+      <UniqueIdentifier>{a6ca6194-3aa5-46cc-ac05-206f9a400dec}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Particle System\Systems">
+      <UniqueIdentifier>{9f45f029-46c8-4c0d-b44c-dc9bffd3c6a6}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -56,48 +118,6 @@
     <ClInclude Include="..\..\src\Entity.h" />
     <ClInclude Include="..\..\src\Component.h" />
     <ClInclude Include="..\..\src\System.h" />
-    <ClInclude Include="..\..\src\Components\Camera.h">
-      <Filter>Components</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\Components\Collision.h">
-      <Filter>Components</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\Components\DirectionalLight.h">
-      <Filter>Components</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\Components\Input.h">
-      <Filter>Components</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\Components\Model.h">
-      <Filter>Components</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\Components\ParticleEmitter.h">
-      <Filter>Components</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\Components\PointLight.h">
-      <Filter>Components</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\Components\PowerUp.h">
-      <Filter>Components</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\Components\SoundEmitter.h">
-      <Filter>Components</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\Components\Sprite.h">
-      <Filter>Components</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\Components\Stat.h">
-      <Filter>Components</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\Components\Template.h">
-      <Filter>Components</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\Components\Transform.h">
-      <Filter>Components</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\Components\Bounds.h">
-      <Filter>Components</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\Util\GLError.h">
       <Filter>Util</Filter>
     </ClInclude>
@@ -106,71 +126,115 @@
     </ClInclude>
     <ClInclude Include="..\..\src\Color.h" />
     <ClInclude Include="..\..\src\Engine.h" />
-    <ClInclude Include="..\..\src\Renderer.h" />
     <ClInclude Include="..\..\src\PrecompiledHeader.h" />
-    <ClInclude Include="..\..\src\Camera.h" />
-    <ClInclude Include="..\..\src\Model.h" />
-    <ClInclude Include="..\..\src\Skybox.h" />
-    <ClInclude Include="..\..\src\CubemapTexture.h" />
-    <ClInclude Include="..\..\src\Texture.h" />
     <ClInclude Include="..\..\src\ShaderProgram.h" />
-    <ClInclude Include="..\..\src\OBJ.h" />
-    <ClInclude Include="..\..\src\Systems\RenderSystem.h">
-      <Filter>Systems</Filter>
+    <ClInclude Include="..\..\src\Components\Model.h">
+      <Filter>Rendering\Components</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\Systems\TransformSystem.h">
-      <Filter>Systems</Filter>
+    <ClInclude Include="..\..\src\Components\Sprite.h">
+      <Filter>Rendering\Components</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\Systems\InputSystem.h">
-      <Filter>Systems</Filter>
+    <ClInclude Include="..\..\src\Renderer.h">
+      <Filter>Rendering</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\Systems\FreeSteeringSystem.h">
-      <Filter>Systems</Filter>
+    <ClInclude Include="..\..\src\Skybox.h">
+      <Filter>Rendering</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\Components\FreeSteering.h">
-      <Filter>Components</Filter>
+    <ClInclude Include="..\..\src\Texture.h">
+      <Filter>Rendering</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\Components\Physics.h">
-      <Filter>Components</Filter>
+    <ClInclude Include="..\..\src\OBJ.h">
+      <Filter>Rendering</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\Components\SphereShape.h">
-      <Filter>Components</Filter>
+    <ClInclude Include="..\..\src\Model.h">
+      <Filter>Rendering</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Camera.h">
+      <Filter>Rendering</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\CubemapTexture.h">
+      <Filter>Rendering</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\Components\BoxShape.h">
-      <Filter>Components</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\Systems\PhysicsSystem.h">
-      <Filter>Systems</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\Systems\DebugSystem.h">
-      <Filter>Systems</Filter>
+      <Filter>Physics\Components</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\Components\CompoundShape.h">
-      <Filter>Components</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\Components\SliderConstraint.h">
-      <Filter>Components</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\Components\HingeConstraint.h">
-      <Filter>Components</Filter>
+      <Filter>Physics\Components</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\Components\BallSocketConstraint.h">
-      <Filter>Components</Filter>
+      <Filter>Physics\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Components\HingeConstraint.h">
+      <Filter>Physics\Components</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\Components\MeshShape.h">
-     <Filter>Components</Filter>
+      <Filter>Physics\Components</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\Components\Vehicle.h">
-      <Filter>Components</Filter>
+    <ClInclude Include="..\..\src\Components\SliderConstraint.h">
+      <Filter>Physics\Components</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\Components\Wheel.h">
-    <Filter>Components</Filter>
+    <ClInclude Include="..\..\src\Components\SphereShape.h">
+      <Filter>Physics\Components</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\Components\StaticMeshShape.h">
-      <Filter>Components</Filter>
+      <Filter>Physics\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Components\Vehicle.h">
+      <Filter>Physics\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Components\Wheel.h">
+      <Filter>Physics\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Components\Physics.h">
+      <Filter>Physics\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Systems\PhysicsSystem.h">
+      <Filter>Physics\Systems</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Components\Transform.h">
+      <Filter>Base\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Components\Template.h">
+      <Filter>Base\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Components\Camera.h">
+      <Filter>Rendering\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Systems\TransformSystem.h">
+      <Filter>Base\Systems</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Systems\DebugSystem.h">
+      <Filter>Base\Systems</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\Systems\SoundSystem.h">
-      <Filter>Systems</Filter>
+      <Filter>Audio\Systems</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Components\SoundEmitter.h">
+      <Filter>Audio\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Systems\RenderSystem.h">
+      <Filter>Rendering\Systems</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Systems\InputSystem.h">
+      <Filter>Input\Systems</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Systems\FreeSteeringSystem.h">
+      <Filter>Input\Systems</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Components\Input.h">
+      <Filter>Input\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Components\FreeSteering.h">
+      <Filter>Input\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Components\ParticleEmitter.h">
+      <Filter>Particle System\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Components\PointLight.h">
+      <Filter>Rendering\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Components\DirectionalLight.h">
+      <Filter>Rendering\Components</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>