*rename

2 files changed, 180 insertions, 178 deletions

diff --git a/Build/Asura/Asura.vcxproj b/Build/Asura/Asura.vcxproj
index 24858bc..a389591 100644
--- a/Build/Asura/Asura.vcxproj
+++ b/Build/Asura/Asura.vcxproj
@@ -115,81 +115,81 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\Source\Asura\AE.h" />
-    <ClInclude Include="..\..\Source\Asura\AE_Component.h" />
-    <ClInclude Include="..\..\Source\Asura\AE_GameObject.h" />
-    <ClInclude Include="..\..\Source\Asura\AE_Layer.h" />
-    <ClInclude Include="..\..\Source\Asura\AE_Object.h" />
-    <ClInclude Include="..\..\Source\Asura\AE_ObjectPool.h" />
-    <ClInclude Include="..\..\Source\Asura\AE_Prefab.h" />
-    <ClInclude Include="..\..\Source\Asura\AE_Scene.h" />
-    <ClInclude Include="..\..\Source\Asura\AE_Transform.h" />
-    <ClInclude Include="..\..\Source\Asura\AE_Type.h" />
-    <ClInclude Include="..\..\Source\Asura\AI\AE_BehaviorTree.h" />
-    <ClInclude Include="..\..\Source\Asura\AI\AE_StateMachine.h" />
-    <ClInclude Include="..\..\Source\Asura\Audio\AE_Sound.h" />
-    <ClInclude Include="..\..\Source\Asura\Audio\AE_Source.h" />
-    <ClInclude Include="..\..\Source\Asura\Containers\AE_Map.h" />
-    <ClInclude Include="..\..\Source\Asura\Containers\AE_Stack.h" />
-    <ClInclude Include="..\..\Source\Asura\Containers\AE_String.h" />
-    <ClInclude Include="..\..\Source\Asura\Containers\AE_StringMap.h" />
-    <ClInclude Include="..\..\Source\Asura\Exceptions\AE_Exception.h" />
-    <ClInclude Include="..\..\Source\Asura\FileSystem\AE_Asset.h" />
-    <ClInclude Include="..\..\Source\Asura\Font\AE_TrueTypeFont.h" />
-    <ClInclude Include="..\..\Source\Asura\Graphics\AE_Canvas.h" />
-    <ClInclude Include="..\..\Source\Asura\Graphics\AE_Graphic.h" />
-    <ClInclude Include="..\..\Source\Asura\Graphics\AE_Image.h" />
-    <ClInclude Include="..\..\Source\Asura\Graphics\AE_Material.h" />
-    <ClInclude Include="..\..\Source\Asura\Graphics\AE_Shader.h" />
-    <ClInclude Include="..\..\Source\Asura\Graphics\AE_Sprite.h" />
-    <ClInclude Include="..\..\Source\Asura\Graphics\Animations\AE_Animation.h" />
-    <ClInclude Include="..\..\Source\Asura\Graphics\Effects\AE_ParticleSystem.h" />
-    <ClInclude Include="..\..\Source\Asura\Input\AE_Keyboard.h" />
-    <ClInclude Include="..\..\Source\Asura\Math\AE_Functions.h" />
-    <ClInclude Include="..\..\Source\Asura\Math\AE_Matrix44.h" />
-    <ClInclude Include="..\..\Source\Asura\Math\AE_Vector2.h" />
-    <ClInclude Include="..\..\Source\Asura\Math\AE_Vector3.h" />
-    <ClInclude Include="..\..\Source\Asura\Math\AE_Vector4.h" />
-    <ClInclude Include="..\..\Source\Asura\Profiler\AE_Stats.h" />
-    <ClInclude Include="..\..\Source\Asura\Time\AE_Timer.h" />
+    <ClInclude Include="..\..\Source\Asura\Asura.h" />
+    <ClInclude Include="..\..\Source\Asura\Component.h" />
+    <ClInclude Include="..\..\Source\Asura\GameObject.h" />
+    <ClInclude Include="..\..\Source\Asura\Layer.h" />
+    <ClInclude Include="..\..\Source\Asura\Object.h" />
+    <ClInclude Include="..\..\Source\Asura\ObjectPool.h" />
+    <ClInclude Include="..\..\Source\Asura\Prefab.h" />
+    <ClInclude Include="..\..\Source\Asura\Scene.h" />
+    <ClInclude Include="..\..\Source\Asura\Transform.h" />
+    <ClInclude Include="..\..\Source\Asura\Type.h" />
+    <ClInclude Include="..\..\Source\Asura\AI\BehaviorTree.h" />
+    <ClInclude Include="..\..\Source\Asura\AI\StateMachine.h" />
+    <ClInclude Include="..\..\Source\Asura\Audio\Sound.h" />
+    <ClInclude Include="..\..\Source\Asura\Audio\Source.h" />
+    <ClInclude Include="..\..\Source\Asura\Containers\Map.h" />
+    <ClInclude Include="..\..\Source\Asura\Containers\Stack.h" />
+    <ClInclude Include="..\..\Source\Asura\Containers\String.h" />
+    <ClInclude Include="..\..\Source\Asura\Containers\StringMap.h" />
+    <ClInclude Include="..\..\Source\Asura\Exceptions\Exception.h" />
+    <ClInclude Include="..\..\Source\Asura\FileSystem\Asset.h" />
+    <ClInclude Include="..\..\Source\Asura\Font\TrueTypeFont.h" />
+    <ClInclude Include="..\..\Source\Asura\Graphics\Canvas.h" />
+    <ClInclude Include="..\..\Source\Asura\Graphics\Graphic.h" />
+    <ClInclude Include="..\..\Source\Asura\Graphics\Image.h" />
+    <ClInclude Include="..\..\Source\Asura\Graphics\Material.h" />
+    <ClInclude Include="..\..\Source\Asura\Graphics\Shader.h" />
+    <ClInclude Include="..\..\Source\Asura\Graphics\Sprite.h" />
+    <ClInclude Include="..\..\Source\Asura\Graphics\Animations\Animation.h" />
+    <ClInclude Include="..\..\Source\Asura\Graphics\Effects\ParticleSystem.h" />
+    <ClInclude Include="..\..\Source\Asura\Input\Keyboard.h" />
+    <ClInclude Include="..\..\Source\Asura\Math\Functions.h" />
+    <ClInclude Include="..\..\Source\Asura\Math\Matrix44.h" />
+    <ClInclude Include="..\..\Source\Asura\Math\Vector2.h" />
+    <ClInclude Include="..\..\Source\Asura\Math\Vector3.h" />
+    <ClInclude Include="..\..\Source\Asura\Math\Vector4.h" />
+    <ClInclude Include="..\..\Source\Asura\Profiler\Stats.h" />
+    <ClInclude Include="..\..\Source\Asura\Time\Timer.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\Source\Asura\AE_Component.cpp" />
-    <ClCompile Include="..\..\Source\Asura\AE_GameObject.cpp" />
-    <ClCompile Include="..\..\Source\Asura\AE_Layer.cpp" />
-    <ClCompile Include="..\..\Source\Asura\AE_Object.cpp" />
-    <ClCompile Include="..\..\Source\Asura\AE_ObjectPool.cpp" />
-    <ClCompile Include="..\..\Source\Asura\AE_Prefab.cpp" />
-    <ClCompile Include="..\..\Source\Asura\AE_Scene.cpp" />
-    <ClCompile Include="..\..\Source\Asura\AE_Transform.cpp" />
-    <ClCompile Include="..\..\Source\Asura\AI\AE_BehaviorTree.cpp" />
-    <ClCompile Include="..\..\Source\Asura\AI\AE_StateMachine.cpp" />
-    <ClCompile Include="..\..\Source\Asura\Audio\AE_Sound.cpp" />
-    <ClCompile Include="..\..\Source\Asura\Audio\AE_Source.cpp" />
-    <ClCompile Include="..\..\Source\Asura\Containers\AE_Map.cpp" />
-    <ClCompile Include="..\..\Source\Asura\Containers\AE_Stack.cpp" />
-    <ClCompile Include="..\..\Source\Asura\Containers\AE_String.cpp" />
-    <ClCompile Include="..\..\Source\Asura\Containers\AE_StringMap.cpp" />
-    <ClCompile Include="..\..\Source\Asura\Exceptions\AE_Exception.cpp" />
-    <ClCompile Include="..\..\Source\Asura\FileSystem\AE_Asset.cpp" />
-    <ClCompile Include="..\..\Source\Asura\Font\AE_TrueTypeFont.cpp" />
-    <ClCompile Include="..\..\Source\Asura\Graphics\AE_Canvas.cpp" />
-    <ClCompile Include="..\..\Source\Asura\Graphics\AE_Graphic.cpp" />
-    <ClCompile Include="..\..\Source\Asura\Graphics\AE_Image.cpp" />
-    <ClCompile Include="..\..\Source\Asura\Graphics\AE_Material.cpp" />
-    <ClCompile Include="..\..\Source\Asura\Graphics\AE_Shader.cpp" />
-    <ClCompile Include="..\..\Source\Asura\Graphics\AE_Sprite.cpp" />
-    <ClCompile Include="..\..\Source\Asura\Graphics\Animations\AE_Animation.cpp" />
-    <ClCompile Include="..\..\Source\Asura\Graphics\Effects\AE_ParticleSystem.cpp" />
-    <ClCompile Include="..\..\Source\Asura\GUI\AE_Button.cpp" />
-    <ClCompile Include="..\..\Source\Asura\Input\AE_Keyboard.cpp" />
-    <ClCompile Include="..\..\Source\Asura\Math\AE_Functions.cpp" />
-    <ClCompile Include="..\..\Source\Asura\Math\AE_Matrix44.cpp" />
-    <ClCompile Include="..\..\Source\Asura\Math\AE_Vector2.cpp" />
-    <ClCompile Include="..\..\Source\Asura\Math\AE_Vector3.cpp" />
-    <ClCompile Include="..\..\Source\Asura\Math\AE_Vector4.cpp" />
-    <ClCompile Include="..\..\Source\Asura\Profiler\AE_Stats.cpp" />
-    <ClCompile Include="..\..\Source\Asura\Time\AE_Timer.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Component.cpp" />
+    <ClCompile Include="..\..\Source\Asura\GameObject.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Layer.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Object.cpp" />
+    <ClCompile Include="..\..\Source\Asura\ObjectPool.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Prefab.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Scene.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Transform.cpp" />
+    <ClCompile Include="..\..\Source\Asura\AI\BehaviorTree.cpp" />
+    <ClCompile Include="..\..\Source\Asura\AI\StateMachine.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Audio\Sound.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Audio\Source.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Containers\Map.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Containers\Stack.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Containers\String.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Containers\StringMap.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Exceptions\Exception.cpp" />
+    <ClCompile Include="..\..\Source\Asura\FileSystem\Asset.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Font\TrueTypeFont.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Graphics\Canvas.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Graphics\Graphic.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Graphics\Image.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Graphics\Material.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Graphics\Shader.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Graphics\Sprite.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Graphics\Animations\Animation.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Graphics\Effects\ParticleSystem.cpp" />
+    <ClCompile Include="..\..\Source\Asura\GUI\Button.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Input\Keyboard.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Math\Functions.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Math\Matrix44.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Math\Vector2.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Math\Vector3.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Math\Vector4.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Profiler\Stats.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Time\Timer.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\Source\Asura\GUI\README.md" />
diff --git a/Build/Asura/Asura.vcxproj.filters b/Build/Asura/Asura.vcxproj.filters
index 61d3a65..9b628b9 100644
--- a/Build/Asura/Asura.vcxproj.filters
+++ b/Build/Asura/Asura.vcxproj.filters
@@ -45,189 +45,191 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\Source\Asura\AE.h" />
-    <ClInclude Include="..\..\Source\Asura\AE_Component.h" />
-    <ClInclude Include="..\..\Source\Asura\AE_GameObject.h" />
-    <ClInclude Include="..\..\Source\Asura\AE_Layer.h" />
-    <ClInclude Include="..\..\Source\Asura\AE_Object.h" />
-    <ClInclude Include="..\..\Source\Asura\AE_Prefab.h" />
-    <ClInclude Include="..\..\Source\Asura\AE_Scene.h" />
-    <ClInclude Include="..\..\Source\Asura\AI\AE_BehaviorTree.h">
+    <ClInclude Include="..\..\Source\Asura\AI\BehaviorTree.h">
       <Filter>AI</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\AI\AE_StateMachine.h">
+    <ClInclude Include="..\..\Source\Asura\AI\StateMachine.h">
       <Filter>AI</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\Graphics\AE_Canvas.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\Graphics\AE_Image.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\Graphics\AE_Shader.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\Graphics\AE_Sprite.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\Graphics\Animations\AE_Animation.h">
-      <Filter>Graphics\Animations</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\Graphics\Effects\AE_ParticleSystem.h">
-      <Filter>Graphics\Effects</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\Audio\AE_Sound.h">
+    <ClInclude Include="..\..\Source\Asura\Audio\Sound.h">
       <Filter>Audio</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\Audio\AE_Source.h">
+    <ClInclude Include="..\..\Source\Asura\Audio\Source.h">
       <Filter>Audio</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\Containers\AE_Map.h">
+    <ClInclude Include="..\..\Source\Asura\Containers\Map.h">
       <Filter>Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\Containers\AE_Stack.h">
+    <ClInclude Include="..\..\Source\Asura\Containers\Stack.h">
       <Filter>Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\Containers\AE_String.h">
+    <ClInclude Include="..\..\Source\Asura\Containers\String.h">
       <Filter>Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\Containers\AE_StringMap.h">
+    <ClInclude Include="..\..\Source\Asura\Containers\StringMap.h">
       <Filter>Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\Exceptions\AE_Exception.h">
+    <ClInclude Include="..\..\Source\Asura\Exceptions\Exception.h">
       <Filter>Exceptions</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\FileSystem\AE_Asset.h">
+    <ClInclude Include="..\..\Source\Asura\FileSystem\Asset.h">
       <Filter>FileSystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\Font\AE_TrueTypeFont.h">
+    <ClInclude Include="..\..\Source\Asura\Font\TrueTypeFont.h">
       <Filter>Font</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\Input\AE_Keyboard.h">
+    <ClInclude Include="..\..\Source\Asura\Graphics\Canvas.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura\Graphics\Graphic.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura\Graphics\Image.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura\Graphics\Material.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura\Graphics\Shader.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura\Graphics\Sprite.h">
+      <Filter>Graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura\Graphics\Effects\ParticleSystem.h">
+      <Filter>Graphics\Effects</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura\Graphics\Animations\Animation.h">
+      <Filter>Graphics\Animations</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\Asura\Input\Keyboard.h">
       <Filter>Input</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\Math\AE_Functions.h">
+    <ClInclude Include="..\..\Source\Asura\Math\Functions.h">
       <Filter>Math</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\Math\AE_Matrix44.h">
+    <ClInclude Include="..\..\Source\Asura\Math\Matrix44.h">
       <Filter>Math</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\Math\AE_Vector2.h">
+    <ClInclude Include="..\..\Source\Asura\Math\Vector2.h">
       <Filter>Math</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\Math\AE_Vector3.h">
+    <ClInclude Include="..\..\Source\Asura\Math\Vector3.h">
       <Filter>Math</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\Math\AE_Vector4.h">
+    <ClInclude Include="..\..\Source\Asura\Math\Vector4.h">
       <Filter>Math</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\Time\AE_Timer.h">
-      <Filter>Time</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\Profiler\AE_Stats.h">
+    <ClInclude Include="..\..\Source\Asura\Profiler\Stats.h">
       <Filter>Profiler</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\Graphics\AE_Graphic.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\AE_ObjectPool.h" />
-    <ClInclude Include="..\..\Source\Asura\Graphics\AE_Material.h">
-      <Filter>Graphics</Filter>
+    <ClInclude Include="..\..\Source\Asura\Time\Timer.h">
+      <Filter>Time</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Asura\AE_Type.h" />
+    <ClInclude Include="..\..\Source\Asura\Asura.h" />
+    <ClInclude Include="..\..\Source\Asura\Component.h" />
+    <ClInclude Include="..\..\Source\Asura\GameObject.h" />
+    <ClInclude Include="..\..\Source\Asura\Layer.h" />
+    <ClInclude Include="..\..\Source\Asura\Object.h" />
+    <ClInclude Include="..\..\Source\Asura\ObjectPool.h" />
+    <ClInclude Include="..\..\Source\Asura\Prefab.h" />
+    <ClInclude Include="..\..\Source\Asura\Scene.h" />
+    <ClInclude Include="..\..\Source\Asura\Transform.h" />
+    <ClInclude Include="..\..\Source\Asura\Type.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\Source\Asura\AE_Component.cpp" />
-    <ClCompile Include="..\..\Source\Asura\AE_GameObject.cpp" />
-    <ClCompile Include="..\..\Source\Asura\AE_Layer.cpp" />
-    <ClCompile Include="..\..\Source\Asura\AE_Object.cpp" />
-    <ClCompile Include="..\..\Source\Asura\AE_Prefab.cpp" />
-    <ClCompile Include="..\..\Source\Asura\AE_Scene.cpp" />
-    <ClCompile Include="..\..\Source\Asura\AI\AE_BehaviorTree.cpp">
+    <ClCompile Include="..\..\Source\Asura\AI\BehaviorTree.cpp">
       <Filter>AI</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\AI\AE_StateMachine.cpp">
+    <ClCompile Include="..\..\Source\Asura\AI\StateMachine.cpp">
       <Filter>AI</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\Graphics\AE_Canvas.cpp">
-      <Filter>Graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\Graphics\AE_Image.cpp">
-      <Filter>Graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\Graphics\AE_Shader.cpp">
-      <Filter>Graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\Graphics\AE_Sprite.cpp">
-      <Filter>Graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\Graphics\Animations\AE_Animation.cpp">
-      <Filter>Graphics\Animations</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\Graphics\Effects\AE_ParticleSystem.cpp">
-      <Filter>Graphics\Effects</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\Audio\AE_Sound.cpp">
+    <ClCompile Include="..\..\Source\Asura\Audio\Sound.cpp">
       <Filter>Audio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\Audio\AE_Source.cpp">
+    <ClCompile Include="..\..\Source\Asura\Audio\Source.cpp">
       <Filter>Audio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\Containers\AE_Map.cpp">
+    <ClCompile Include="..\..\Source\Asura\Containers\Map.cpp">
       <Filter>Containers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\Containers\AE_Stack.cpp">
+    <ClCompile Include="..\..\Source\Asura\Containers\Stack.cpp">
       <Filter>Containers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\Containers\AE_String.cpp">
+    <ClCompile Include="..\..\Source\Asura\Containers\String.cpp">
       <Filter>Containers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\Containers\AE_StringMap.cpp">
+    <ClCompile Include="..\..\Source\Asura\Containers\StringMap.cpp">
       <Filter>Containers</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\Exceptions\AE_Exception.cpp">
+    <ClCompile Include="..\..\Source\Asura\Exceptions\Exception.cpp">
       <Filter>Exceptions</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\FileSystem\AE_Asset.cpp">
+    <ClCompile Include="..\..\Source\Asura\FileSystem\Asset.cpp">
       <Filter>FileSystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\Font\AE_TrueTypeFont.cpp">
+    <ClCompile Include="..\..\Source\Asura\Font\TrueTypeFont.cpp">
       <Filter>Font</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\GUI\AE_Button.cpp">
+    <ClCompile Include="..\..\Source\Asura\Graphics\Canvas.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura\Graphics\Graphic.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura\Graphics\Image.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura\Graphics\Material.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura\Graphics\Shader.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura\Graphics\Sprite.cpp">
+      <Filter>Graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura\Graphics\Effects\ParticleSystem.cpp">
+      <Filter>Graphics\Effects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura\Graphics\Animations\Animation.cpp">
+      <Filter>Graphics\Animations</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\Asura\GUI\Button.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\Input\AE_Keyboard.cpp">
+    <ClCompile Include="..\..\Source\Asura\Input\Keyboard.cpp">
       <Filter>Input</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\Math\AE_Functions.cpp">
+    <ClCompile Include="..\..\Source\Asura\Math\Functions.cpp">
       <Filter>Math</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\Math\AE_Matrix44.cpp">
+    <ClCompile Include="..\..\Source\Asura\Math\Matrix44.cpp">
       <Filter>Math</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\Math\AE_Vector2.cpp">
+    <ClCompile Include="..\..\Source\Asura\Math\Vector2.cpp">
       <Filter>Math</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\Math\AE_Vector3.cpp">
+    <ClCompile Include="..\..\Source\Asura\Math\Vector3.cpp">
       <Filter>Math</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\Math\AE_Vector4.cpp">
+    <ClCompile Include="..\..\Source\Asura\Math\Vector4.cpp">
       <Filter>Math</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\Time\AE_Timer.cpp">
-      <Filter>Time</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\Profiler\AE_Stats.cpp">
+    <ClCompile Include="..\..\Source\Asura\Profiler\Stats.cpp">
       <Filter>Profiler</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\Graphics\AE_Graphic.cpp">
-      <Filter>Graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\Asura\AE_ObjectPool.cpp" />
-    <ClCompile Include="..\..\Source\Asura\Graphics\AE_Material.cpp">
-      <Filter>Graphics</Filter>
+    <ClCompile Include="..\..\Source\Asura\Time\Timer.cpp">
+      <Filter>Time</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Source\Asura\Component.cpp" />
+    <ClCompile Include="..\..\Source\Asura\GameObject.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Layer.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Object.cpp" />
+    <ClCompile Include="..\..\Source\Asura\ObjectPool.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Prefab.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Scene.cpp" />
+    <ClCompile Include="..\..\Source\Asura\Transform.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\Source\Asura\GUI\README.md">