diff --git a/build/vs2010/Lol.sln b/build/vs2010/Lol.sln
index eb122bf7..adb193df 100644
--- a/build/vs2010/Lol.sln
+++ b/build/vs2010/Lol.sln
@@ -96,7 +96,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Touky", "Touky", "{9EA99B18
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ToukyDemo", "..\..\people\touky\private\ToukyDemo.vcxproj", "{EE203B88-44CF-4859-9D42-7A5F43FECB52}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BtPhysTest", "..\..\test\BtPhysTest.vcxproj", "{EE203B88-44CF-4859-9D42-7A1F43FECB52}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btphystest", "..\..\test\btphystest.vcxproj", "{EE203B88-44CF-4859-9D42-7A1F43FECB52}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "08_fbo", "..\..\tutorial\08_fbo.vcxproj", "{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}"
 EndProject
@@ -126,9 +126,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Benlitz", "Benlitz", "{B583
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benlitzTest1", "..\..\people\benlitz\test1\benlitzTest1.vcxproj", "{FAF82AD2-D9F4-4694-9A01-103BC5B771B4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MeshViewer", "..\..\test\MeshViewer.vcxproj", "{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "meshviewer", "..\..\test\meshviewer.vcxproj", "{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tactics", "..\..\people\touky\private\Tactics\Tactics.vcxproj", "{25493FC8-75AC-4703-AD58-AB0C4A0FB79C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tactics", "..\..\people\touky\private\tactics\tactics.vcxproj", "{25493FC8-75AC-4703-AD58-AB0C4A0FB79C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/test/Makefile.am b/test/Makefile.am
index 92d89f70..539d5644 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -31,21 +31,19 @@ benchsuite_SOURCES = benchsuite.cpp \
 benchsuite_CPPFLAGS = $(AM_CPPFLAGS)
 benchsuite_DEPENDENCIES = @LOL_DEPENDENCIES@
 
-btphystest_SOURCES = BtPhysTest.cpp BtPhysTest.h PhysicObject.h \
-    Physics/Src/EasyPhysics.cpp Physics/Include/EasyPhysics.h \
-    Physics/Include/LolBtPhysicsIntegration.h Physics/Include/LolPhysics.h \
-    Physics/Src/EasyCharacterController.cpp \
-    Physics/Include/EasyCharacterController.h \
-    Physics/Src/EasyConstraint.cpp \
-    Physics/Include/EasyConstraint.h \
-    Physics/Src/BulletCharacterController.cpp \
-    Physics/Include/BulletCharacterController.h
+btphystest_SOURCES = \
+    btphystest.cpp btphystest.h physicobject.h \
+    physics/easyphysics.cpp physics/easyphysics.h \
+    physics/lolbtphysicsintegration.h physics/lolphysics.h \
+    physics/easycharactercontroller.cpp physics/easycharactercontroller.h \
+    physics/easyconstraint.cpp physics/easyconstraint.h \
+    physics/bulletcharactercontroller.cpp physics/bulletcharactercontroller.h
 btphystest_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/bullet \
     -DHAVE_PHYS_USE_BULLET
 btphystest_DEPENDENCIES = @LOL_DEPENDENCIES@
 
-meshviewer_SOURCES = MeshViewer.cpp \
-    shinyMVTexture.lolfx shinyfur.lolfx
+meshviewer_SOURCES = meshviewer.cpp \
+    shinymvtexture.lolfx shinyfur.lolfx
 meshviewer_CPPFLAGS = $(AM_CPPFLAGS)
 meshviewer_DEPENDENCIES = @LOL_DEPENDENCIES@
 
diff --git a/test/BtPhysTest.cpp b/test/btphystest.cpp
similarity index 99%
rename from test/BtPhysTest.cpp
rename to test/btphystest.cpp
index 6a4ce935..cde9dbd3 100644
--- a/test/BtPhysTest.cpp
+++ b/test/btphystest.cpp
@@ -33,10 +33,10 @@ using namespace lol;
 #define HAVE_PHYS_USE_BULLET
 #endif /* HAVE_PHYS_USE_BULLET */
 
-#include "Physics/Include/LolPhysics.h"
-#include "Physics/Include/EasyPhysics.h"
-#include "PhysicObject.h"
-#include "BtPhysTest.h"
+#include "physics/include/lolphysics.h"
+#include "physics/include/easyphysics.h"
+#include "physicobject.h"
+#include "btphystest.h"
 
 using namespace lol::phys;
 
diff --git a/test/BtPhysTest.h b/test/btphystest.h
similarity index 100%
rename from test/BtPhysTest.h
rename to test/btphystest.h
diff --git a/test/BtPhysTest.vcxproj b/test/btphystest.vcxproj
similarity index 95%
rename from test/BtPhysTest.vcxproj
rename to test/btphystest.vcxproj
index 5effcfa9..3297e99c 100644
--- a/test/BtPhysTest.vcxproj
+++ b/test/btphystest.vcxproj
@@ -35,7 +35,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="BtPhysTest.h" />
+    <ClInclude Include="btphystest.h" />
     <ClInclude Include="PhysicObject.h" />
     <ClInclude Include="Physics\Include\BulletCharacterController.h" />
     <ClInclude Include="Physics\Include\EasyCharacterController.h" />
@@ -45,7 +45,7 @@
     <ClInclude Include="Physics\Include\LolPhysics.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="BtPhysTest.cpp" />
+    <ClCompile Include="btphystest.cpp" />
     <ClCompile Include="Physics\Src\BulletCharacterController.cpp" />
     <ClCompile Include="Physics\Src\EasyCharacterController.cpp" />
     <ClCompile Include="Physics\Src\EasyConstraint.cpp" />
diff --git a/test/BtPhysTest.vcxproj.filters b/test/btphystest.vcxproj.filters
similarity index 100%
rename from test/BtPhysTest.vcxproj.filters
rename to test/btphystest.vcxproj.filters
diff --git a/test/MeshViewerBuffer.txt b/test/data/mesh-buffer.txt
similarity index 100%
rename from test/MeshViewerBuffer.txt
rename to test/data/mesh-buffer.txt
diff --git a/test/data/MeshViewerTestTexture.png b/test/data/test-texture.png
similarity index 100%
rename from test/data/MeshViewerTestTexture.png
rename to test/data/test-texture.png
diff --git a/test/MeshViewer.cpp b/test/meshviewer.cpp
similarity index 98%
rename from test/MeshViewer.cpp
rename to test/meshviewer.cpp
index 9803e956..ad895a67 100644
--- a/test/MeshViewer.cpp
+++ b/test/meshviewer.cpp
@@ -24,7 +24,7 @@ using namespace lol;
 static int const TEXTURE_WIDTH = 256;
 
 LOLFX_RESOURCE_DECLARE(shinyfur);
-LOLFX_RESOURCE_DECLARE(shinyMVTexture);
+LOLFX_RESOURCE_DECLARE(shinymvtexture);
 
 #define    IPT_CAM_RESET          "Cam_Center"
 #define    IPT_CAM_FORWARD        "Cam_Forward"
@@ -69,7 +69,7 @@ public:
             m_camera->SetOrtho((float)video_size.x, (float)video_size.y, .1f, 1000.f);
     }
 
-    MeshViewer(char const *file_name = "MeshViewerBuffer.txt")
+    MeshViewer(char const *file_name = "data/mesh-buffer.txt")
       : m_file_name(file_name)
     {
         //Input setup
@@ -331,10 +331,10 @@ public:
 
         if (!DefaultTexture)
         {
-            m_texture_shader = Shader::Create(LOLFX_RESOURCE_NAME(shinyMVTexture));
+            m_texture_shader = Shader::Create(LOLFX_RESOURCE_NAME(shinymvtexture));
             m_texture_uni = m_texture_shader->GetUniformLocation("u_Texture");
-            //m_image = new Image("data/MeshViewerTestTexture.png");
-            DefaultTexture = Tiler::Register("data/MeshViewerTestTexture.png", ivec2(0), ivec2(0,1));
+            //m_image = new Image("data/test-texture.png");
+            DefaultTexture = Tiler::Register("data/test-texture.png", ivec2(0), ivec2(0,1));
 
             //ivec2 size = m_image->GetSize();
             //// m_image->GetFormat()
diff --git a/test/MeshViewer.vcxproj b/test/meshviewer.vcxproj
similarity index 93%
rename from test/MeshViewer.vcxproj
rename to test/meshviewer.vcxproj
index d4f7936c..1b6292d4 100644
--- a/test/MeshViewer.vcxproj
+++ b/test/meshviewer.vcxproj
@@ -35,7 +35,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="MeshViewer.cpp" />
+    <ClCompile Include="meshviewer.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)\..\..\src\lolcore.vcxproj">
@@ -46,13 +46,13 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="MeshViewerBuffer.txt">
+    <None Include="data\mesh-buffer.txt">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </None>
   </ItemGroup>
   <ItemGroup>
     <LolFxCompile Include="shinyfur.lolfx" />
-    <LolFxCompile Include="shinyMVTexture.lolfx" />
+    <LolFxCompile Include="shinymvtexture.lolfx" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}</ProjectGuid>
@@ -74,4 +74,4 @@
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(SolutionDir)\Lol.Fx.targets" />
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/test/PhysicObject.h b/test/physicobject.h
similarity index 98%
rename from test/PhysicObject.h
rename to test/physicobject.h
index e878d7a1..b94884f5 100644
--- a/test/PhysicObject.h
+++ b/test/physicobject.h
@@ -13,9 +13,9 @@
 
 #include "core.h"
 #include "easymesh/easymesh.h"
-#include "Physics/Include/EasyPhysics.h"
-#include "Physics/Include/EasyCharacterController.h"
-#include "Physics/Include/EasyConstraint.h"
+#include "physics/include/easyphysics.h"
+#include "physics/include/easycharactercontroller.h"
+#include "physics/include/easyconstraint.h"
 
 using namespace lol;
 using namespace lol::phys;
diff --git a/test/Physics/Src/BulletCharacterController.cpp b/test/physics/bulletcharactercontroller.cpp
similarity index 98%
rename from test/Physics/Src/BulletCharacterController.cpp
rename to test/physics/bulletcharactercontroller.cpp
index 7a5e8dc9..e0a803d8 100644
--- a/test/Physics/Src/BulletCharacterController.cpp
+++ b/test/physics/bulletcharactercontroller.cpp
@@ -19,10 +19,10 @@
 #ifdef HAVE_PHYS_USE_BULLET
 #include "core.h"
 #include <stdio.h>
-#include "../Include/LolBtPhysicsIntegration.h"
-#include "../Include/LolPhysics.h"
-#include "../Include/EasyCharacterController.h"
-#include "../Include/BulletCharacterController.h"
+#include "../include/lolbtphysicsintegration.h"
+#include "../include/lolphysics.h"
+#include "../include/easycharactercontroller.h"
+#include "../include/bulletcharactercontroller.h"
 //#include "LinearMath/btIDebugDraw.h"
 //#include "BulletCollision/CollisionDispatch/btGhostObject.h"
 //#include "BulletCollision/CollisionShapes/btMultiSphereShape.h"
diff --git a/test/Physics/Include/BulletCharacterController.h b/test/physics/bulletcharactercontroller.h
similarity index 99%
rename from test/Physics/Include/BulletCharacterController.h
rename to test/physics/bulletcharactercontroller.h
index 6ab111f3..aabf0a8e 100644
--- a/test/Physics/Include/BulletCharacterController.h
+++ b/test/physics/bulletcharactercontroller.h
@@ -20,7 +20,7 @@
 
 #ifdef HAVE_PHYS_USE_BULLET
 #include "core.h"
-#include "EasyPhysics.h"
+#include "easyphysics.h"
 //#include "BulletDynamics\Character\btCharacterControllerInterface.h"
 #endif
 
diff --git a/test/Physics/Src/EasyCharacterController.cpp b/test/physics/easycharactercontroller.cpp
similarity index 97%
rename from test/Physics/Src/EasyCharacterController.cpp
rename to test/physics/easycharactercontroller.cpp
index 14f3df5d..7ec41dd4 100644
--- a/test/Physics/Src/EasyCharacterController.cpp
+++ b/test/physics/easycharactercontroller.cpp
@@ -14,9 +14,9 @@
 #   include "config.h"
 #endif
 
-#include "../Include/LolBtPhysicsIntegration.h"
-#include "../Include/LolPhysics.h"
-#include "../Include/EasyCharacterController.h"
+#include "../include/lolbtphysicsintegration.h"
+#include "../include/lolphysics.h"
+#include "../include/easycharactercontroller.h"
 
 namespace lol
 {
diff --git a/test/Physics/Include/EasyCharacterController.h b/test/physics/easycharactercontroller.h
similarity index 98%
rename from test/Physics/Include/EasyCharacterController.h
rename to test/physics/easycharactercontroller.h
index 080a9690..c81fcb62 100644
--- a/test/Physics/Include/EasyCharacterController.h
+++ b/test/physics/easycharactercontroller.h
@@ -22,8 +22,8 @@
 
 #ifdef HAVE_PHYS_USE_BULLET
 #include "core.h"
-#include "EasyPhysics.h"
-#include "BulletCharacterController.h"
+#include "easyphysics.h"
+#include "bulletcharactercontroller.h"
 #include <BulletDynamics/Character/btKinematicCharacterController.h>
 #endif
 
diff --git a/test/Physics/Src/EasyConstraint.cpp b/test/physics/easyconstraint.cpp
similarity index 89%
rename from test/Physics/Src/EasyConstraint.cpp
rename to test/physics/easyconstraint.cpp
index f6ec7b33..6a67b13a 100644
--- a/test/Physics/Src/EasyConstraint.cpp
+++ b/test/physics/easyconstraint.cpp
@@ -3,9 +3,9 @@
 #   include "config.h"
 #endif
 
-#include "../Include/LolBtPhysicsIntegration.h"
-#include "../Include/LolPhysics.h"
-#include "../Include/EasyConstraint.h"
+#include "../include/lolbtphysicsintegration.h"
+#include "../include/lolphysics.h"
+#include "../include/easyconstraint.h"
 
 namespace lol
 {
diff --git a/test/Physics/Include/EasyConstraint.h b/test/physics/easyconstraint.h
similarity index 99%
rename from test/Physics/Include/EasyConstraint.h
rename to test/physics/easyconstraint.h
index 54145366..e8b321e7 100644
--- a/test/Physics/Include/EasyConstraint.h
+++ b/test/physics/easyconstraint.h
@@ -19,7 +19,7 @@
 
 #ifdef HAVE_PHYS_USE_BULLET
 #include "core.h"
-#include "EasyPhysics.h"
+#include "easyphysics.h"
 #endif
 
 namespace lol
diff --git a/test/Physics/Src/EasyPhysics.cpp b/test/physics/easyphysics.cpp
similarity index 99%
rename from test/Physics/Src/EasyPhysics.cpp
rename to test/physics/easyphysics.cpp
index 9d5294c7..4bc69431 100644
--- a/test/Physics/Src/EasyPhysics.cpp
+++ b/test/physics/easyphysics.cpp
@@ -14,8 +14,8 @@
 #   include "config.h"
 #endif
 
-#include "../Include/LolBtPhysicsIntegration.h"
-#include "../Include/LolPhysics.h"
+#include "../include/lolbtphysicsintegration.h"
+#include "../include/lolphysics.h"
 
 namespace lol
 {
diff --git a/test/Physics/Include/EasyPhysics.h b/test/physics/easyphysics.h
similarity index 100%
rename from test/Physics/Include/EasyPhysics.h
rename to test/physics/easyphysics.h
diff --git a/test/Physics/Include/LolBtPhysicsIntegration.h b/test/physics/lolbtphysicsintegration.h
similarity index 100%
rename from test/Physics/Include/LolBtPhysicsIntegration.h
rename to test/physics/lolbtphysicsintegration.h
diff --git a/test/Physics/Include/LolPhysics.h b/test/physics/lolphysics.h
similarity index 99%
rename from test/Physics/Include/LolPhysics.h
rename to test/physics/lolphysics.h
index 422b6187..d75fe6a4 100644
--- a/test/Physics/Include/LolPhysics.h
+++ b/test/physics/lolphysics.h
@@ -13,9 +13,9 @@
 #include <bullet/btBulletDynamicsCommon.h>
 #include <bullet/btBulletCollisionCommon.h>
 #include <BulletDynamics/Character/btKinematicCharacterController.h>
-#include "LolBtPhysicsIntegration.h"
-#include "EasyPhysics.h"
-#include "EasyConstraint.h"
+#include "lolbtphysicsintegration.h"
+#include "easyphysics.h"
+#include "easyconstraint.h"
 #endif
 
 namespace lol
diff --git a/test/shinyMVTexture.lolfx b/test/shinymvtexture.lolfx
similarity index 100%
rename from test/shinyMVTexture.lolfx
rename to test/shinymvtexture.lolfx