diff --git a/cocos2dx-uphone.sln b/cocos2dx-uphone.sln
index 0471dd8a33..b7965052d9 100644
--- a/cocos2dx-uphone.sln
+++ b/cocos2dx-uphone.sln
@@ -27,7 +27,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CocosDenshion_uphone", "Coc
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cocosTemplate", "template\cocosTemplate.vcproj", "{A2338E7B-155B-4A3B-AB4B-518ECDD26564}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_uphone", "test_uphone\proj.uphone\test_uphone.vcproj", "{33819ACD-9774-4E68-AFBE-7A88BBA7B19D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_uphone", "tests\proj.uphone\test_uphone.vcproj", "{33819ACD-9774-4E68-AFBE-7A88BBA7B19D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{6AC43F51-A036-4653-B910-BDDC346D15E7} = {6AC43F51-A036-4653-B910-BDDC346D15E7}
 		{83C75293-906B-432E-80B9-A0041043E380} = {83C75293-906B-432E-80B9-A0041043E380}
diff --git a/cocos2dx-win32.sln b/cocos2dx-win32.sln
index bba5edb89d..9b6a008b5e 100644
--- a/cocos2dx-win32.sln
+++ b/cocos2dx-win32.sln
@@ -19,7 +19,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestAudioEngine-win32", "Te
 		{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-win32", "test_uphone\proj.win32\test-win32.vcproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-win32", "tests\proj.win32\test-win32.vcproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}
 		{207BC7A9-CCF1-4F2F-A04D-45F72242AE25} = {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}
diff --git a/test_win32/AppDelegate.cpp b/test_win32/AppDelegate.cpp
deleted file mode 100644
index 1238007be7..0000000000
--- a/test_win32/AppDelegate.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-#include "AppDelegate.h"
-#include "tests/controller.h"
-
-using namespace cocos2d;
-
-AppDelegate::AppDelegate()
-:m_pMainWnd(NULL)
-{
-}
-
-AppDelegate::~AppDelegate()
-{
-    CCX_SAFE_DELETE(m_pMainWnd);
-}
-
-
-bool AppDelegate::applicationDidFinishLaunching()
-{
-	// create window
-	if (!(m_pMainWnd = new CCXEGLView() || 
-        ! m_pMainWnd->Create(L"Cocos2dx-win32", 320, 480) )
-	{
-        CCX_SAFE_DELETE(m_pMainWnd);
-		return false;
-	}
-
-	// init director
-	CCDirector * pDirector = CCDirector::sharedDirector();
-	pDirector->setOpenGLView(m_pMainWnd);
-	pDirector->setDeviceOrientation(kCCDeviceOrientationLandscapeLeft);
-	// pDirector->setDeviceOrientation(kCCDeviceOrientationPortrait);
-	pDirector->setDisplayFPS(true);
-
-	CCScene * pScene = CCScene::node();
-	CCLayer * pLayer = new TestController();
-	pLayer->autorelease();
-
-	pScene->addChild(pLayer);
-	pDirector->runWithScene(pScene);
-
-	return true;
-}
-
-void AppDelegate::applicationDidEnterBackground()
-{
-	CCDirector::sharedDirector()->stopAnimation();
-}
-
-void AppDelegate::applicationWillEnterForeground()
-{
-	CCDirector::sharedDirector()->startAnimation();
-}
diff --git a/test_win32/AppDelegate.h b/test_win32/AppDelegate.h
deleted file mode 100644
index d86cf59a84..0000000000
--- a/test_win32/AppDelegate.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef __APP_DELEGATE_H__
-#define __APP_DELEGATE_H__
-
-#include "cocos2d.h"
-
-class AppDelegate : public cocos2d::CCXApplication
-{
-public:
-	AppDelegate();
-	~AppDelegate();
-	virtual bool applicationDidFinishLaunching();
-	virtual void applicationDidEnterBackground();
-	virtual void applicationWillEnterForeground();
-
-protected:
-	cocos2d::CCXEGLView *m_pMainWnd;
-};
-
-#endif	// __APP_DELEGATE_H__
\ No newline at end of file
diff --git a/test_win32/copy_res.bat b/test_win32/copy_res.bat
deleted file mode 100644
index d587654045..0000000000
--- a/test_win32/copy_res.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-echo off
-xcopy /E /Y %CD%\Res\*.* %1 
diff --git a/test_win32/main.cpp b/test_win32/main.cpp
deleted file mode 100644
index 848ea590c8..0000000000
--- a/test_win32/main.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "main.h"
-#include "AppDelegate.h"
-
-HINSTANCE g_hInstance;
-
-int APIENTRY _tWinMain(HINSTANCE hInstance,
-					   HINSTANCE hPrevInstance,
-					   LPTSTR    lpCmdLine,
-					   int       nCmdShow)
-{
-	UNREFERENCED_PARAMETER(hPrevInstance);
-	UNREFERENCED_PARAMETER(lpCmdLine);
-
-	g_hInstance = hInstance;
-
-	int nRet = 0;
-	AppDelegate app;
-	nRet = app.Run();
-
-	return nRet;
-}
diff --git a/test_win32/main.h b/test_win32/main.h
deleted file mode 100644
index f5ad256d5c..0000000000
--- a/test_win32/main.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef __MAIN_H__
-#define __MAIN_H__
-
-#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
-// Windows Header Files:
-#include <windows.h>
-
-// C RunTime Header Files
-#include <stdlib.h>
-#include <malloc.h>
-#include <memory.h>
-#include <tchar.h>
-
-extern HINSTANCE g_hInstance;
-
-#endif	// __WINMAIN_H__
diff --git a/test_win32/test-win32.vcproj b/test_win32/test-win32.vcproj
deleted file mode 100644
index 77099717ca..0000000000
--- a/test_win32/test-win32.vcproj
+++ /dev/null
@@ -1,843 +0,0 @@
-<?xml version="1.0" encoding="gb2312"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="test-win32"
-	ProjectGUID="{76A39BB2-9B84-4C65-98A5-654D86B86F2A}"
-	RootNamespace="test_win32"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\cocos2dx;..\cocos2dx\include;..\;..\chipmunk\include\chipmunk;.\tests;..\cocos2dx\platform\win32\third_party\OGLES\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4244;4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libcocos2d.lib libgles_cm.lib libBox2d.lib"
-				OutputFile="$(OutDir)\test.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy_res.bat $(OutDir)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\cocos2dx;..\cocos2dx\include;..\;..\chipmunk\include\chipmunk;.\tests;..\cocos2dx\platform\win32\third_party\OGLES\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4244;4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libcocos2d.lib libgles_cm.lib libBox2d.lib"
-				OutputFile="$(OutDir)\test.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="copy_res.bat $(OutDir)"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="include"
-			>
-			<File
-				RelativePath=".\AppDelegate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\main.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="source"
-			>
-			<File
-				RelativePath=".\AppDelegate.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\main.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="tests"
-			>
-			<File
-				RelativePath=".\tests\controller.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\tests\controller.h"
-				>
-			</File>
-			<File
-				RelativePath=".\tests\testBasic.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\tests\testBasic.h"
-				>
-			</File>
-			<File
-				RelativePath=".\tests\testResource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\tests\tests.h"
-				>
-			</File>
-			<Filter
-				Name="ActionsTest"
-				>
-				<File
-					RelativePath=".\tests\ActionsTest\ActionsTest.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\ActionsTest\ActionsTest.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="TransitionsTest"
-				>
-				<File
-					RelativePath=".\tests\TransitionsTest\TransitionsTest.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\TransitionsTest\TransitionsTest.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="ProgressActionsTest"
-				>
-				<File
-					RelativePath=".\tests\ProgressActionsTest\ProgressActionsTest.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\ProgressActionsTest\ProgressActionsTest.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="EffectsTest"
-				>
-				<File
-					RelativePath=".\tests\EffectsTest\EffectsTest.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\EffectsTest\EffectsTest.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="ClickAndMoveTest"
-				>
-				<File
-					RelativePath=".\tests\ClickAndMoveTest\ClickAndMoveTest.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\ClickAndMoveTest\ClickAndMoveTest.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="RotateWorldTest"
-				>
-				<File
-					RelativePath=".\tests\RotateWorldTest\RotateWorldTest.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\RotateWorldTest\RotateWorldTest.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="ParticleTest"
-				>
-				<File
-					RelativePath=".\tests\ParticleTest\ParticleTest.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\ParticleTest\ParticleTest.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="EaseActionsTest"
-				>
-				<File
-					RelativePath=".\tests\EaseActionsTest\EaseActionsTest.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\EaseActionsTest\EaseActionsTest.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="MotionStreakTest"
-				>
-				<File
-					RelativePath=".\tests\MotionStreakTest\MotionStreakTest.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\MotionStreakTest\MotionStreakTest.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="DrawPrimitivesTest"
-				>
-				<File
-					RelativePath=".\tests\DrawPrimitivesTest\DrawPrimitivesTest.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\DrawPrimitivesTest\DrawPrimitivesTest.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="CocosNodeTest"
-				>
-				<File
-					RelativePath=".\tests\CocosNodeTest\CocosNodeTest.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\CocosNodeTest\CocosNodeTest.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="TouchesTest"
-				>
-				<File
-					RelativePath=".\tests\TouchesTest\Ball.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\TouchesTest\Ball.h"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\TouchesTest\Paddle.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\TouchesTest\Paddle.h"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\TouchesTest\TouchesTest.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\TouchesTest\TouchesTest.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="MenuTest"
-				>
-				<File
-					RelativePath=".\tests\MenuTest\MenuTest.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\MenuTest\MenuTest.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="ActionManagerTest"
-				>
-				<File
-					RelativePath=".\tests\ActionManagerTest\ActionManagerTest.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\ActionManagerTest\ActionManagerTest.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="LayerTest"
-				>
-				<File
-					RelativePath=".\tests\LayerTest\LayerTest.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\LayerTest\LayerTest.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="SceneTest"
-				>
-				<File
-					RelativePath=".\tests\SceneTest\SceneTest.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\SceneTest\SceneTest.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="ParallaxTest"
-				>
-				<File
-					RelativePath=".\tests\ParallaxTest\ParallaxTest.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\ParallaxTest\ParallaxTest.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="TileMapTest"
-				>
-				<File
-					RelativePath=".\tests\TileMapTest\TileMapTest.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\TileMapTest\TileMapTest.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="IntervalTest"
-				>
-				<File
-					RelativePath=".\tests\IntervalTest\IntervalTest.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\IntervalTest\IntervalTest.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="AtlasTest"
-				>
-				<File
-					RelativePath=".\tests\AtlasTest\AtlasTest.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\AtlasTest\AtlasTest.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="SpriteTest"
-				>
-				<File
-					RelativePath=".\tests\SpriteTest\SpriteTest.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\SpriteTest\SpriteTest.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="SchedulerTest"
-				>
-				<File
-					RelativePath=".\tests\SchedulerTest\SchedulerTest.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\SchedulerTest\SchedulerTest.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="RenderTextureTest"
-				>
-				<File
-					RelativePath=".\tests\RenderTextureTest\RenderTextureTest.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\RenderTextureTest\RenderTextureTest.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="ChipmunkTest"
-				>
-				<File
-					RelativePath=".\tests\ChipmunkTest\Bounce.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\ChipmunkTest\ChipmunkDemo.h"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\ChipmunkTest\cocos2dChipmunkDemo.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\ChipmunkTest\cocos2dChipmunkDemo.h"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\ChipmunkTest\drawSpace.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\ChipmunkTest\drawSpace.h"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\ChipmunkTest\Joints.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\ChipmunkTest\LogoSmash.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\ChipmunkTest\MagnetsElectric.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\ChipmunkTest\OneWay.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\ChipmunkTest\Planet.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\ChipmunkTest\Player.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\ChipmunkTest\Plink.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\ChipmunkTest\Pump.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\ChipmunkTest\PyramidStack.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\ChipmunkTest\PyramidTopple.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\ChipmunkTest\Query.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\ChipmunkTest\Sensors.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\ChipmunkTest\Simple.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\ChipmunkTest\Springies.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\ChipmunkTest\TheoJansen.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\ChipmunkTest\Tumble.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\ChipmunkTest\UnsafeOps.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Box2dTest"
-				>
-				<File
-					RelativePath=".\tests\Box2DTest\Box2dTest.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\Box2DTest\Box2dTest.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Box2DTestBed"
-				>
-				<File
-					RelativePath=".\tests\Box2DTestBed\Box2dView.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\Box2DTestBed\Box2dView.h"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\Box2DTestBed\GLES-Render.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\Box2DTestBed\GLES-Render.h"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\Box2DTestBed\Test.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\Box2DTestBed\Test.h"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\Box2DTestBed\TestEntries.cpp"
-					>
-				</File>
-				<Filter
-					Name="Tests"
-					>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\ApplyForce.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\BodyTypes.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\Breakable.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\Bridge.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\Cantilever.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\Chain.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\CharacterCollision.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\CollisionFiltering.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\CollisionProcessing.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\CompoundShapes.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\Confined.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\ContinuousTest.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\DistanceTest.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\Dominos.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\DynamicTreeTest.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\EdgeShapes.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\ElasticBody.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\Gears.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\LineJoint.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\OneSidedPlatform.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\PolyCollision.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\PolyShapes.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\Prismatic.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\Pulleys.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\Pyramid.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\RayCast.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\Revolute.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\SensorTest.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\ShapeEditing.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\SliderCrank.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\SphereStack.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\TheoJansen.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\TimeOfImpact.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\VaryingFriction.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\VaryingRestitution.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\VerticalStack.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tests\Box2DTestBed\Tests\Web.h"
-						>
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="EffectsAdvancedTest"
-				>
-				<File
-					RelativePath=".\tests\EffectsAdvancedTest\EffectsAdvancedTest.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\EffectsAdvancedTest\EffectsAdvancedTest.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="HiResTest"
-				>
-				<File
-					RelativePath=".\tests\HiResTest\HiResTest.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\tests\HiResTest\HiResTest.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/test_uphone/AppDelegate.cpp b/tests/AppDelegate.cpp
similarity index 95%
rename from test_uphone/AppDelegate.cpp
rename to tests/AppDelegate.cpp
index 114324787d..a31ce6449c 100644
--- a/test_uphone/AppDelegate.cpp
+++ b/tests/AppDelegate.cpp
@@ -41,7 +41,7 @@ bool AppDelegate::applicationDidFinishLaunching()
 	// pDirector->setDeviceOrientation(kCCDeviceOrientationPortrait);
     pDirector->setDisplayFPS(true);
 
-#if defined(CCX_PLPATFORM_UPHONE)
+#if defined(CCX_PLATFORM_UPHONE)
     // set the resource path
     CCFileUtils::setResourcePath("/NEWPLUS/TDA_DATA/Data/cocos2d_tests/");
 #endif
diff --git a/test_uphone/AppDelegate.h b/tests/AppDelegate.h
similarity index 100%
rename from test_uphone/AppDelegate.h
rename to tests/AppDelegate.h
diff --git a/test_uphone/Res/Images/atlastest.png.REMOVED.git-id b/tests/Res/Images/atlastest.png.REMOVED.git-id
similarity index 100%
rename from test_uphone/Res/Images/atlastest.png.REMOVED.git-id
rename to tests/Res/Images/atlastest.png.REMOVED.git-id
diff --git a/test_uphone/Res/Images/background1.png.REMOVED.git-id b/tests/Res/Images/background1.png.REMOVED.git-id
similarity index 100%
rename from test_uphone/Res/Images/background1.png.REMOVED.git-id
rename to tests/Res/Images/background1.png.REMOVED.git-id
diff --git a/test_uphone/Res/Images/background2.png.REMOVED.git-id b/tests/Res/Images/background2.png.REMOVED.git-id
similarity index 100%
rename from test_uphone/Res/Images/background2.png.REMOVED.git-id
rename to tests/Res/Images/background2.png.REMOVED.git-id
diff --git a/test_uphone/Res/Images/grossini_dance_atlas-mono.png.REMOVED.git-id b/tests/Res/Images/grossini_dance_atlas-mono.png.REMOVED.git-id
similarity index 100%
rename from test_uphone/Res/Images/grossini_dance_atlas-mono.png.REMOVED.git-id
rename to tests/Res/Images/grossini_dance_atlas-mono.png.REMOVED.git-id
diff --git a/test_uphone/Res/TileMaps/hexa-tiles.png.REMOVED.git-id b/tests/Res/TileMaps/hexa-tiles.png.REMOVED.git-id
similarity index 100%
rename from test_uphone/Res/TileMaps/hexa-tiles.png.REMOVED.git-id
rename to tests/Res/TileMaps/hexa-tiles.png.REMOVED.git-id
diff --git a/test_uphone/Res/TileMaps/ortho-test1.png.REMOVED.git-id b/tests/Res/TileMaps/ortho-test1.png.REMOVED.git-id
similarity index 100%
rename from test_uphone/Res/TileMaps/ortho-test1.png.REMOVED.git-id
rename to tests/Res/TileMaps/ortho-test1.png.REMOVED.git-id
diff --git a/test_uphone/Res/animations/grossini.plist.xml b/tests/Res/animations/grossini.plist.xml
similarity index 100%
rename from test_uphone/Res/animations/grossini.plist.xml
rename to tests/Res/animations/grossini.plist.xml
diff --git a/test_uphone/Res/fonts/bitmapFontTest.png.REMOVED.git-id b/tests/Res/fonts/bitmapFontTest.png.REMOVED.git-id
similarity index 100%
rename from test_uphone/Res/fonts/bitmapFontTest.png.REMOVED.git-id
rename to tests/Res/fonts/bitmapFontTest.png.REMOVED.git-id
diff --git a/test_uphone/Res/fonts/bitmapFontTest2.png.REMOVED.git-id b/tests/Res/fonts/bitmapFontTest2.png.REMOVED.git-id
similarity index 100%
rename from test_uphone/Res/fonts/bitmapFontTest2.png.REMOVED.git-id
rename to tests/Res/fonts/bitmapFontTest2.png.REMOVED.git-id
diff --git a/test_uphone/framework.uphone/NewDeleteOp.cpp b/tests/framework.uphone/NewDeleteOp.cpp
similarity index 100%
rename from test_uphone/framework.uphone/NewDeleteOp.cpp
rename to tests/framework.uphone/NewDeleteOp.cpp
diff --git a/test_uphone/framework.uphone/TG3AppDllEntry.cpp b/tests/framework.uphone/TG3AppDllEntry.cpp
similarity index 100%
rename from test_uphone/framework.uphone/TG3AppDllEntry.cpp
rename to tests/framework.uphone/TG3AppDllEntry.cpp
diff --git a/test_uphone/framework.uphone/TG3AppDllEntry.h b/tests/framework.uphone/TG3AppDllEntry.h
similarity index 100%
rename from test_uphone/framework.uphone/TG3AppDllEntry.h
rename to tests/framework.uphone/TG3AppDllEntry.h
diff --git a/test_uphone/framework.uphone/main.cpp b/tests/framework.uphone/main.cpp
similarity index 100%
rename from test_uphone/framework.uphone/main.cpp
rename to tests/framework.uphone/main.cpp
diff --git a/test_uphone/framework.win32/main.cpp b/tests/framework.win32/main.cpp
similarity index 100%
rename from test_uphone/framework.win32/main.cpp
rename to tests/framework.win32/main.cpp
diff --git a/test_uphone/framework.win32/main.h b/tests/framework.win32/main.h
similarity index 100%
rename from test_uphone/framework.win32/main.h
rename to tests/framework.win32/main.h
diff --git a/test_uphone/pack/TestUphone.TG3_IProc b/tests/pack/TestUphone.TG3_IProc
similarity index 100%
rename from test_uphone/pack/TestUphone.TG3_IProc
rename to tests/pack/TestUphone.TG3_IProc
diff --git a/test_uphone/proj.uphone/Makefile.ARM b/tests/proj.uphone/Makefile.ARM
similarity index 100%
rename from test_uphone/proj.uphone/Makefile.ARM
rename to tests/proj.uphone/Makefile.ARM
diff --git a/test_uphone/proj.uphone/copy_res.bat b/tests/proj.uphone/copy_res.bat
similarity index 100%
rename from test_uphone/proj.uphone/copy_res.bat
rename to tests/proj.uphone/copy_res.bat
diff --git a/test_uphone/proj.uphone/test_uphone.vcproj b/tests/proj.uphone/test_uphone.vcproj
similarity index 95%
rename from test_uphone/proj.uphone/test_uphone.vcproj
rename to tests/proj.uphone/test_uphone.vcproj
index 5245983d4b..6d7045fde8 100644
--- a/test_uphone/proj.uphone/test_uphone.vcproj
+++ b/tests/proj.uphone/test_uphone.vcproj
@@ -17,7 +17,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../PRJ_TG3/LIB/Win32Lib"
+			OutputDirectory="../../../PRJ_TG3/LIB/Win32Lib"
 			IntermediateDirectory="Debug"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
diff --git a/test_uphone/proj.uphone/test_uphone.vcproj.user b/tests/proj.uphone/test_uphone.vcproj.user
similarity index 100%
rename from test_uphone/proj.uphone/test_uphone.vcproj.user
rename to tests/proj.uphone/test_uphone.vcproj.user
diff --git a/test_uphone/proj.uphone/test_uphone_Arm.TMK3 b/tests/proj.uphone/test_uphone_Arm.TMK3
similarity index 100%
rename from test_uphone/proj.uphone/test_uphone_Arm.TMK3
rename to tests/proj.uphone/test_uphone_Arm.TMK3
diff --git a/test_uphone/proj.win32/copy_res.bat b/tests/proj.win32/copy_res.bat
similarity index 100%
rename from test_uphone/proj.win32/copy_res.bat
rename to tests/proj.win32/copy_res.bat
diff --git a/test_uphone/proj.win32/test-win32.vcproj b/tests/proj.win32/test-win32.vcproj
similarity index 100%
rename from test_uphone/proj.win32/test-win32.vcproj
rename to tests/proj.win32/test-win32.vcproj
diff --git a/test_uphone/proj.win32/test-win32.vcproj.user b/tests/proj.win32/test-win32.vcproj.user
similarity index 100%
rename from test_uphone/proj.win32/test-win32.vcproj.user
rename to tests/proj.win32/test-win32.vcproj.user
diff --git a/test_uphone/tests/AccelerometerTest/AccelerometerTest.cpp b/tests/tests/AccelerometerTest/AccelerometerTest.cpp
similarity index 100%
rename from test_uphone/tests/AccelerometerTest/AccelerometerTest.cpp
rename to tests/tests/AccelerometerTest/AccelerometerTest.cpp
diff --git a/test_uphone/tests/AccelerometerTest/AccelerometerTest.h b/tests/tests/AccelerometerTest/AccelerometerTest.h
similarity index 100%
rename from test_uphone/tests/AccelerometerTest/AccelerometerTest.h
rename to tests/tests/AccelerometerTest/AccelerometerTest.h
diff --git a/test_uphone/tests/ActionManagerTest/ActionManagerTest.cpp b/tests/tests/ActionManagerTest/ActionManagerTest.cpp
similarity index 100%
rename from test_uphone/tests/ActionManagerTest/ActionManagerTest.cpp
rename to tests/tests/ActionManagerTest/ActionManagerTest.cpp
diff --git a/test_uphone/tests/ActionManagerTest/ActionManagerTest.h b/tests/tests/ActionManagerTest/ActionManagerTest.h
similarity index 100%
rename from test_uphone/tests/ActionManagerTest/ActionManagerTest.h
rename to tests/tests/ActionManagerTest/ActionManagerTest.h
diff --git a/test_uphone/tests/ActionsTest/ActionsTest.cpp b/tests/tests/ActionsTest/ActionsTest.cpp
similarity index 100%
rename from test_uphone/tests/ActionsTest/ActionsTest.cpp
rename to tests/tests/ActionsTest/ActionsTest.cpp
diff --git a/test_uphone/tests/ActionsTest/ActionsTest.h b/tests/tests/ActionsTest/ActionsTest.h
similarity index 100%
rename from test_uphone/tests/ActionsTest/ActionsTest.h
rename to tests/tests/ActionsTest/ActionsTest.h
diff --git a/test_uphone/tests/AtlasTest/AtlasTest.cpp b/tests/tests/AtlasTest/AtlasTest.cpp
similarity index 100%
rename from test_uphone/tests/AtlasTest/AtlasTest.cpp
rename to tests/tests/AtlasTest/AtlasTest.cpp
diff --git a/test_uphone/tests/AtlasTest/AtlasTest.h b/tests/tests/AtlasTest/AtlasTest.h
similarity index 100%
rename from test_uphone/tests/AtlasTest/AtlasTest.h
rename to tests/tests/AtlasTest/AtlasTest.h
diff --git a/test_uphone/tests/Box2DTest/Box2dTest.cpp b/tests/tests/Box2DTest/Box2dTest.cpp
similarity index 100%
rename from test_uphone/tests/Box2DTest/Box2dTest.cpp
rename to tests/tests/Box2DTest/Box2dTest.cpp
diff --git a/test_uphone/tests/Box2DTest/Box2dTest.h b/tests/tests/Box2DTest/Box2dTest.h
similarity index 100%
rename from test_uphone/tests/Box2DTest/Box2dTest.h
rename to tests/tests/Box2DTest/Box2dTest.h
diff --git a/test_uphone/tests/Box2DTestBed/Box2dView.cpp b/tests/tests/Box2DTestBed/Box2dView.cpp
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Box2dView.cpp
rename to tests/tests/Box2DTestBed/Box2dView.cpp
diff --git a/test_uphone/tests/Box2DTestBed/Box2dView.h b/tests/tests/Box2DTestBed/Box2dView.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Box2dView.h
rename to tests/tests/Box2DTestBed/Box2dView.h
diff --git a/test_uphone/tests/Box2DTestBed/GLES-Render.cpp b/tests/tests/Box2DTestBed/GLES-Render.cpp
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/GLES-Render.cpp
rename to tests/tests/Box2DTestBed/GLES-Render.cpp
diff --git a/test_uphone/tests/Box2DTestBed/GLES-Render.h b/tests/tests/Box2DTestBed/GLES-Render.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/GLES-Render.h
rename to tests/tests/Box2DTestBed/GLES-Render.h
diff --git a/test_uphone/tests/Box2DTestBed/Test.cpp b/tests/tests/Box2DTestBed/Test.cpp
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Test.cpp
rename to tests/tests/Box2DTestBed/Test.cpp
diff --git a/test_uphone/tests/Box2DTestBed/Test.h b/tests/tests/Box2DTestBed/Test.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Test.h
rename to tests/tests/Box2DTestBed/Test.h
diff --git a/test_uphone/tests/Box2DTestBed/TestEntries.cpp b/tests/tests/Box2DTestBed/TestEntries.cpp
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/TestEntries.cpp
rename to tests/tests/Box2DTestBed/TestEntries.cpp
diff --git a/test_uphone/tests/Box2DTestBed/Tests/ApplyForce.h b/tests/tests/Box2DTestBed/Tests/ApplyForce.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/ApplyForce.h
rename to tests/tests/Box2DTestBed/Tests/ApplyForce.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/BodyTypes.h b/tests/tests/Box2DTestBed/Tests/BodyTypes.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/BodyTypes.h
rename to tests/tests/Box2DTestBed/Tests/BodyTypes.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/Breakable.h b/tests/tests/Box2DTestBed/Tests/Breakable.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/Breakable.h
rename to tests/tests/Box2DTestBed/Tests/Breakable.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/Bridge.h b/tests/tests/Box2DTestBed/Tests/Bridge.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/Bridge.h
rename to tests/tests/Box2DTestBed/Tests/Bridge.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/Cantilever.h b/tests/tests/Box2DTestBed/Tests/Cantilever.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/Cantilever.h
rename to tests/tests/Box2DTestBed/Tests/Cantilever.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/Chain.h b/tests/tests/Box2DTestBed/Tests/Chain.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/Chain.h
rename to tests/tests/Box2DTestBed/Tests/Chain.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/CharacterCollision.h b/tests/tests/Box2DTestBed/Tests/CharacterCollision.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/CharacterCollision.h
rename to tests/tests/Box2DTestBed/Tests/CharacterCollision.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/CollisionFiltering.h b/tests/tests/Box2DTestBed/Tests/CollisionFiltering.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/CollisionFiltering.h
rename to tests/tests/Box2DTestBed/Tests/CollisionFiltering.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/CollisionProcessing.h b/tests/tests/Box2DTestBed/Tests/CollisionProcessing.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/CollisionProcessing.h
rename to tests/tests/Box2DTestBed/Tests/CollisionProcessing.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/CompoundShapes.h b/tests/tests/Box2DTestBed/Tests/CompoundShapes.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/CompoundShapes.h
rename to tests/tests/Box2DTestBed/Tests/CompoundShapes.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/Confined.h b/tests/tests/Box2DTestBed/Tests/Confined.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/Confined.h
rename to tests/tests/Box2DTestBed/Tests/Confined.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/ContinuousTest.h b/tests/tests/Box2DTestBed/Tests/ContinuousTest.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/ContinuousTest.h
rename to tests/tests/Box2DTestBed/Tests/ContinuousTest.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/DistanceTest.h b/tests/tests/Box2DTestBed/Tests/DistanceTest.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/DistanceTest.h
rename to tests/tests/Box2DTestBed/Tests/DistanceTest.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/Dominos.h b/tests/tests/Box2DTestBed/Tests/Dominos.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/Dominos.h
rename to tests/tests/Box2DTestBed/Tests/Dominos.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/DynamicTreeTest.h b/tests/tests/Box2DTestBed/Tests/DynamicTreeTest.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/DynamicTreeTest.h
rename to tests/tests/Box2DTestBed/Tests/DynamicTreeTest.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/EdgeShapes.h b/tests/tests/Box2DTestBed/Tests/EdgeShapes.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/EdgeShapes.h
rename to tests/tests/Box2DTestBed/Tests/EdgeShapes.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/ElasticBody.h b/tests/tests/Box2DTestBed/Tests/ElasticBody.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/ElasticBody.h
rename to tests/tests/Box2DTestBed/Tests/ElasticBody.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/Gears.h b/tests/tests/Box2DTestBed/Tests/Gears.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/Gears.h
rename to tests/tests/Box2DTestBed/Tests/Gears.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/LineJoint.h b/tests/tests/Box2DTestBed/Tests/LineJoint.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/LineJoint.h
rename to tests/tests/Box2DTestBed/Tests/LineJoint.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/OneSidedPlatform.h b/tests/tests/Box2DTestBed/Tests/OneSidedPlatform.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/OneSidedPlatform.h
rename to tests/tests/Box2DTestBed/Tests/OneSidedPlatform.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/PolyCollision.h b/tests/tests/Box2DTestBed/Tests/PolyCollision.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/PolyCollision.h
rename to tests/tests/Box2DTestBed/Tests/PolyCollision.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/PolyShapes.h b/tests/tests/Box2DTestBed/Tests/PolyShapes.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/PolyShapes.h
rename to tests/tests/Box2DTestBed/Tests/PolyShapes.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/Prismatic.h b/tests/tests/Box2DTestBed/Tests/Prismatic.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/Prismatic.h
rename to tests/tests/Box2DTestBed/Tests/Prismatic.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/Pulleys.h b/tests/tests/Box2DTestBed/Tests/Pulleys.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/Pulleys.h
rename to tests/tests/Box2DTestBed/Tests/Pulleys.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/Pyramid.h b/tests/tests/Box2DTestBed/Tests/Pyramid.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/Pyramid.h
rename to tests/tests/Box2DTestBed/Tests/Pyramid.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/RayCast.h b/tests/tests/Box2DTestBed/Tests/RayCast.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/RayCast.h
rename to tests/tests/Box2DTestBed/Tests/RayCast.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/Revolute.h b/tests/tests/Box2DTestBed/Tests/Revolute.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/Revolute.h
rename to tests/tests/Box2DTestBed/Tests/Revolute.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/SensorTest.h b/tests/tests/Box2DTestBed/Tests/SensorTest.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/SensorTest.h
rename to tests/tests/Box2DTestBed/Tests/SensorTest.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/ShapeEditing.h b/tests/tests/Box2DTestBed/Tests/ShapeEditing.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/ShapeEditing.h
rename to tests/tests/Box2DTestBed/Tests/ShapeEditing.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/SliderCrank.h b/tests/tests/Box2DTestBed/Tests/SliderCrank.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/SliderCrank.h
rename to tests/tests/Box2DTestBed/Tests/SliderCrank.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/SphereStack.h b/tests/tests/Box2DTestBed/Tests/SphereStack.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/SphereStack.h
rename to tests/tests/Box2DTestBed/Tests/SphereStack.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/TheoJansen.h b/tests/tests/Box2DTestBed/Tests/TheoJansen.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/TheoJansen.h
rename to tests/tests/Box2DTestBed/Tests/TheoJansen.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/TimeOfImpact.h b/tests/tests/Box2DTestBed/Tests/TimeOfImpact.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/TimeOfImpact.h
rename to tests/tests/Box2DTestBed/Tests/TimeOfImpact.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/VaryingFriction.h b/tests/tests/Box2DTestBed/Tests/VaryingFriction.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/VaryingFriction.h
rename to tests/tests/Box2DTestBed/Tests/VaryingFriction.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/VaryingRestitution.h b/tests/tests/Box2DTestBed/Tests/VaryingRestitution.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/VaryingRestitution.h
rename to tests/tests/Box2DTestBed/Tests/VaryingRestitution.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/VerticalStack.h b/tests/tests/Box2DTestBed/Tests/VerticalStack.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/VerticalStack.h
rename to tests/tests/Box2DTestBed/Tests/VerticalStack.h
diff --git a/test_uphone/tests/Box2DTestBed/Tests/Web.h b/tests/tests/Box2DTestBed/Tests/Web.h
similarity index 100%
rename from test_uphone/tests/Box2DTestBed/Tests/Web.h
rename to tests/tests/Box2DTestBed/Tests/Web.h
diff --git a/test_uphone/tests/ChipmunkTest/Bounce.cpp b/tests/tests/ChipmunkTest/Bounce.cpp
similarity index 100%
rename from test_uphone/tests/ChipmunkTest/Bounce.cpp
rename to tests/tests/ChipmunkTest/Bounce.cpp
diff --git a/test_uphone/tests/ChipmunkTest/ChipmunkDemo.h b/tests/tests/ChipmunkTest/ChipmunkDemo.h
similarity index 100%
rename from test_uphone/tests/ChipmunkTest/ChipmunkDemo.h
rename to tests/tests/ChipmunkTest/ChipmunkDemo.h
diff --git a/test_uphone/tests/ChipmunkTest/Joints.cpp b/tests/tests/ChipmunkTest/Joints.cpp
similarity index 100%
rename from test_uphone/tests/ChipmunkTest/Joints.cpp
rename to tests/tests/ChipmunkTest/Joints.cpp
diff --git a/test_uphone/tests/ChipmunkTest/LogoSmash.cpp b/tests/tests/ChipmunkTest/LogoSmash.cpp
similarity index 100%
rename from test_uphone/tests/ChipmunkTest/LogoSmash.cpp
rename to tests/tests/ChipmunkTest/LogoSmash.cpp
diff --git a/test_uphone/tests/ChipmunkTest/MagnetsElectric.cpp b/tests/tests/ChipmunkTest/MagnetsElectric.cpp
similarity index 100%
rename from test_uphone/tests/ChipmunkTest/MagnetsElectric.cpp
rename to tests/tests/ChipmunkTest/MagnetsElectric.cpp
diff --git a/test_uphone/tests/ChipmunkTest/OneWay.cpp b/tests/tests/ChipmunkTest/OneWay.cpp
similarity index 100%
rename from test_uphone/tests/ChipmunkTest/OneWay.cpp
rename to tests/tests/ChipmunkTest/OneWay.cpp
diff --git a/test_uphone/tests/ChipmunkTest/Planet.cpp b/tests/tests/ChipmunkTest/Planet.cpp
similarity index 100%
rename from test_uphone/tests/ChipmunkTest/Planet.cpp
rename to tests/tests/ChipmunkTest/Planet.cpp
diff --git a/test_uphone/tests/ChipmunkTest/Player.cpp b/tests/tests/ChipmunkTest/Player.cpp
similarity index 100%
rename from test_uphone/tests/ChipmunkTest/Player.cpp
rename to tests/tests/ChipmunkTest/Player.cpp
diff --git a/test_uphone/tests/ChipmunkTest/Plink.cpp b/tests/tests/ChipmunkTest/Plink.cpp
similarity index 100%
rename from test_uphone/tests/ChipmunkTest/Plink.cpp
rename to tests/tests/ChipmunkTest/Plink.cpp
diff --git a/test_uphone/tests/ChipmunkTest/Pump.cpp b/tests/tests/ChipmunkTest/Pump.cpp
similarity index 100%
rename from test_uphone/tests/ChipmunkTest/Pump.cpp
rename to tests/tests/ChipmunkTest/Pump.cpp
diff --git a/test_uphone/tests/ChipmunkTest/PyramidStack.cpp b/tests/tests/ChipmunkTest/PyramidStack.cpp
similarity index 100%
rename from test_uphone/tests/ChipmunkTest/PyramidStack.cpp
rename to tests/tests/ChipmunkTest/PyramidStack.cpp
diff --git a/test_uphone/tests/ChipmunkTest/PyramidTopple.cpp b/tests/tests/ChipmunkTest/PyramidTopple.cpp
similarity index 100%
rename from test_uphone/tests/ChipmunkTest/PyramidTopple.cpp
rename to tests/tests/ChipmunkTest/PyramidTopple.cpp
diff --git a/test_uphone/tests/ChipmunkTest/Query.cpp b/tests/tests/ChipmunkTest/Query.cpp
similarity index 100%
rename from test_uphone/tests/ChipmunkTest/Query.cpp
rename to tests/tests/ChipmunkTest/Query.cpp
diff --git a/test_uphone/tests/ChipmunkTest/Sensors.cpp b/tests/tests/ChipmunkTest/Sensors.cpp
similarity index 100%
rename from test_uphone/tests/ChipmunkTest/Sensors.cpp
rename to tests/tests/ChipmunkTest/Sensors.cpp
diff --git a/test_uphone/tests/ChipmunkTest/Simple.cpp b/tests/tests/ChipmunkTest/Simple.cpp
similarity index 100%
rename from test_uphone/tests/ChipmunkTest/Simple.cpp
rename to tests/tests/ChipmunkTest/Simple.cpp
diff --git a/test_uphone/tests/ChipmunkTest/Springies.cpp b/tests/tests/ChipmunkTest/Springies.cpp
similarity index 100%
rename from test_uphone/tests/ChipmunkTest/Springies.cpp
rename to tests/tests/ChipmunkTest/Springies.cpp
diff --git a/test_uphone/tests/ChipmunkTest/TheoJansen.cpp b/tests/tests/ChipmunkTest/TheoJansen.cpp
similarity index 100%
rename from test_uphone/tests/ChipmunkTest/TheoJansen.cpp
rename to tests/tests/ChipmunkTest/TheoJansen.cpp
diff --git a/test_uphone/tests/ChipmunkTest/Tumble.cpp b/tests/tests/ChipmunkTest/Tumble.cpp
similarity index 100%
rename from test_uphone/tests/ChipmunkTest/Tumble.cpp
rename to tests/tests/ChipmunkTest/Tumble.cpp
diff --git a/test_uphone/tests/ChipmunkTest/UnsafeOps.cpp b/tests/tests/ChipmunkTest/UnsafeOps.cpp
similarity index 100%
rename from test_uphone/tests/ChipmunkTest/UnsafeOps.cpp
rename to tests/tests/ChipmunkTest/UnsafeOps.cpp
diff --git a/test_uphone/tests/ChipmunkTest/cocos2dChipmunkDemo.cpp b/tests/tests/ChipmunkTest/cocos2dChipmunkDemo.cpp
similarity index 100%
rename from test_uphone/tests/ChipmunkTest/cocos2dChipmunkDemo.cpp
rename to tests/tests/ChipmunkTest/cocos2dChipmunkDemo.cpp
diff --git a/test_uphone/tests/ChipmunkTest/cocos2dChipmunkDemo.h b/tests/tests/ChipmunkTest/cocos2dChipmunkDemo.h
similarity index 100%
rename from test_uphone/tests/ChipmunkTest/cocos2dChipmunkDemo.h
rename to tests/tests/ChipmunkTest/cocos2dChipmunkDemo.h
diff --git a/test_uphone/tests/ChipmunkTest/drawSpace.cpp b/tests/tests/ChipmunkTest/drawSpace.cpp
similarity index 100%
rename from test_uphone/tests/ChipmunkTest/drawSpace.cpp
rename to tests/tests/ChipmunkTest/drawSpace.cpp
diff --git a/test_uphone/tests/ChipmunkTest/drawSpace.h b/tests/tests/ChipmunkTest/drawSpace.h
similarity index 100%
rename from test_uphone/tests/ChipmunkTest/drawSpace.h
rename to tests/tests/ChipmunkTest/drawSpace.h
diff --git a/test_uphone/tests/ClickAndMoveTest/ClickAndMoveTest.cpp b/tests/tests/ClickAndMoveTest/ClickAndMoveTest.cpp
similarity index 100%
rename from test_uphone/tests/ClickAndMoveTest/ClickAndMoveTest.cpp
rename to tests/tests/ClickAndMoveTest/ClickAndMoveTest.cpp
diff --git a/test_uphone/tests/ClickAndMoveTest/ClickAndMoveTest.h b/tests/tests/ClickAndMoveTest/ClickAndMoveTest.h
similarity index 100%
rename from test_uphone/tests/ClickAndMoveTest/ClickAndMoveTest.h
rename to tests/tests/ClickAndMoveTest/ClickAndMoveTest.h
diff --git a/test_uphone/tests/CocosNodeTest/CocosNodeTest.cpp b/tests/tests/CocosNodeTest/CocosNodeTest.cpp
similarity index 100%
rename from test_uphone/tests/CocosNodeTest/CocosNodeTest.cpp
rename to tests/tests/CocosNodeTest/CocosNodeTest.cpp
diff --git a/test_uphone/tests/CocosNodeTest/CocosNodeTest.h b/tests/tests/CocosNodeTest/CocosNodeTest.h
similarity index 100%
rename from test_uphone/tests/CocosNodeTest/CocosNodeTest.h
rename to tests/tests/CocosNodeTest/CocosNodeTest.h
diff --git a/test_uphone/tests/DrawPrimitivesTest/DrawPrimitivesTest.cpp b/tests/tests/DrawPrimitivesTest/DrawPrimitivesTest.cpp
similarity index 100%
rename from test_uphone/tests/DrawPrimitivesTest/DrawPrimitivesTest.cpp
rename to tests/tests/DrawPrimitivesTest/DrawPrimitivesTest.cpp
diff --git a/test_uphone/tests/DrawPrimitivesTest/DrawPrimitivesTest.h b/tests/tests/DrawPrimitivesTest/DrawPrimitivesTest.h
similarity index 100%
rename from test_uphone/tests/DrawPrimitivesTest/DrawPrimitivesTest.h
rename to tests/tests/DrawPrimitivesTest/DrawPrimitivesTest.h
diff --git a/test_uphone/tests/EaseActionsTest/EaseActionsTest.cpp b/tests/tests/EaseActionsTest/EaseActionsTest.cpp
similarity index 100%
rename from test_uphone/tests/EaseActionsTest/EaseActionsTest.cpp
rename to tests/tests/EaseActionsTest/EaseActionsTest.cpp
diff --git a/test_uphone/tests/EaseActionsTest/EaseActionsTest.h b/tests/tests/EaseActionsTest/EaseActionsTest.h
similarity index 100%
rename from test_uphone/tests/EaseActionsTest/EaseActionsTest.h
rename to tests/tests/EaseActionsTest/EaseActionsTest.h
diff --git a/test_uphone/tests/EffectsAdvancedTest/EffectsAdvancedTest.cpp b/tests/tests/EffectsAdvancedTest/EffectsAdvancedTest.cpp
similarity index 100%
rename from test_uphone/tests/EffectsAdvancedTest/EffectsAdvancedTest.cpp
rename to tests/tests/EffectsAdvancedTest/EffectsAdvancedTest.cpp
diff --git a/test_uphone/tests/EffectsAdvancedTest/EffectsAdvancedTest.h b/tests/tests/EffectsAdvancedTest/EffectsAdvancedTest.h
similarity index 100%
rename from test_uphone/tests/EffectsAdvancedTest/EffectsAdvancedTest.h
rename to tests/tests/EffectsAdvancedTest/EffectsAdvancedTest.h
diff --git a/test_uphone/tests/EffectsTest/EffectsTest.cpp b/tests/tests/EffectsTest/EffectsTest.cpp
similarity index 100%
rename from test_uphone/tests/EffectsTest/EffectsTest.cpp
rename to tests/tests/EffectsTest/EffectsTest.cpp
diff --git a/test_uphone/tests/EffectsTest/EffectsTest.h b/tests/tests/EffectsTest/EffectsTest.h
similarity index 100%
rename from test_uphone/tests/EffectsTest/EffectsTest.h
rename to tests/tests/EffectsTest/EffectsTest.h
diff --git a/test_uphone/tests/HiResTest/HiResTest.cpp b/tests/tests/HiResTest/HiResTest.cpp
similarity index 100%
rename from test_uphone/tests/HiResTest/HiResTest.cpp
rename to tests/tests/HiResTest/HiResTest.cpp
diff --git a/test_uphone/tests/HiResTest/HiResTest.h b/tests/tests/HiResTest/HiResTest.h
similarity index 100%
rename from test_uphone/tests/HiResTest/HiResTest.h
rename to tests/tests/HiResTest/HiResTest.h
diff --git a/test_uphone/tests/IntervalTest/IntervalTest.cpp b/tests/tests/IntervalTest/IntervalTest.cpp
similarity index 100%
rename from test_uphone/tests/IntervalTest/IntervalTest.cpp
rename to tests/tests/IntervalTest/IntervalTest.cpp
diff --git a/test_uphone/tests/IntervalTest/IntervalTest.h b/tests/tests/IntervalTest/IntervalTest.h
similarity index 100%
rename from test_uphone/tests/IntervalTest/IntervalTest.h
rename to tests/tests/IntervalTest/IntervalTest.h
diff --git a/test_uphone/tests/LayerTest/LayerTest.cpp b/tests/tests/LayerTest/LayerTest.cpp
similarity index 100%
rename from test_uphone/tests/LayerTest/LayerTest.cpp
rename to tests/tests/LayerTest/LayerTest.cpp
diff --git a/test_uphone/tests/LayerTest/LayerTest.h b/tests/tests/LayerTest/LayerTest.h
similarity index 100%
rename from test_uphone/tests/LayerTest/LayerTest.h
rename to tests/tests/LayerTest/LayerTest.h
diff --git a/test_uphone/tests/MenuTest/MenuTest.cpp b/tests/tests/MenuTest/MenuTest.cpp
similarity index 100%
rename from test_uphone/tests/MenuTest/MenuTest.cpp
rename to tests/tests/MenuTest/MenuTest.cpp
diff --git a/test_uphone/tests/MenuTest/MenuTest.h b/tests/tests/MenuTest/MenuTest.h
similarity index 100%
rename from test_uphone/tests/MenuTest/MenuTest.h
rename to tests/tests/MenuTest/MenuTest.h
diff --git a/test_uphone/tests/MotionStreakTest/MotionStreakTest.cpp b/tests/tests/MotionStreakTest/MotionStreakTest.cpp
similarity index 100%
rename from test_uphone/tests/MotionStreakTest/MotionStreakTest.cpp
rename to tests/tests/MotionStreakTest/MotionStreakTest.cpp
diff --git a/test_uphone/tests/MotionStreakTest/MotionStreakTest.h b/tests/tests/MotionStreakTest/MotionStreakTest.h
similarity index 100%
rename from test_uphone/tests/MotionStreakTest/MotionStreakTest.h
rename to tests/tests/MotionStreakTest/MotionStreakTest.h
diff --git a/test_uphone/tests/ParallaxTest/ParallaxTest.cpp b/tests/tests/ParallaxTest/ParallaxTest.cpp
similarity index 100%
rename from test_uphone/tests/ParallaxTest/ParallaxTest.cpp
rename to tests/tests/ParallaxTest/ParallaxTest.cpp
diff --git a/test_uphone/tests/ParallaxTest/ParallaxTest.h b/tests/tests/ParallaxTest/ParallaxTest.h
similarity index 100%
rename from test_uphone/tests/ParallaxTest/ParallaxTest.h
rename to tests/tests/ParallaxTest/ParallaxTest.h
diff --git a/test_uphone/tests/ParticleTest/ParticleTest.cpp b/tests/tests/ParticleTest/ParticleTest.cpp
similarity index 100%
rename from test_uphone/tests/ParticleTest/ParticleTest.cpp
rename to tests/tests/ParticleTest/ParticleTest.cpp
diff --git a/test_uphone/tests/ParticleTest/ParticleTest.h b/tests/tests/ParticleTest/ParticleTest.h
similarity index 100%
rename from test_uphone/tests/ParticleTest/ParticleTest.h
rename to tests/tests/ParticleTest/ParticleTest.h
diff --git a/test_uphone/tests/ProgressActionsTest/ProgressActionsTest.cpp b/tests/tests/ProgressActionsTest/ProgressActionsTest.cpp
similarity index 100%
rename from test_uphone/tests/ProgressActionsTest/ProgressActionsTest.cpp
rename to tests/tests/ProgressActionsTest/ProgressActionsTest.cpp
diff --git a/test_uphone/tests/ProgressActionsTest/ProgressActionsTest.h b/tests/tests/ProgressActionsTest/ProgressActionsTest.h
similarity index 100%
rename from test_uphone/tests/ProgressActionsTest/ProgressActionsTest.h
rename to tests/tests/ProgressActionsTest/ProgressActionsTest.h
diff --git a/test_uphone/tests/RenderTextureTest/RenderTextureTest.cpp b/tests/tests/RenderTextureTest/RenderTextureTest.cpp
similarity index 100%
rename from test_uphone/tests/RenderTextureTest/RenderTextureTest.cpp
rename to tests/tests/RenderTextureTest/RenderTextureTest.cpp
diff --git a/test_uphone/tests/RenderTextureTest/RenderTextureTest.h b/tests/tests/RenderTextureTest/RenderTextureTest.h
similarity index 100%
rename from test_uphone/tests/RenderTextureTest/RenderTextureTest.h
rename to tests/tests/RenderTextureTest/RenderTextureTest.h
diff --git a/test_uphone/tests/RotateWorldTest/RotateWorldTest.cpp b/tests/tests/RotateWorldTest/RotateWorldTest.cpp
similarity index 100%
rename from test_uphone/tests/RotateWorldTest/RotateWorldTest.cpp
rename to tests/tests/RotateWorldTest/RotateWorldTest.cpp
diff --git a/test_uphone/tests/RotateWorldTest/RotateWorldTest.h b/tests/tests/RotateWorldTest/RotateWorldTest.h
similarity index 100%
rename from test_uphone/tests/RotateWorldTest/RotateWorldTest.h
rename to tests/tests/RotateWorldTest/RotateWorldTest.h
diff --git a/test_uphone/tests/SceneTest/SceneTest.cpp b/tests/tests/SceneTest/SceneTest.cpp
similarity index 100%
rename from test_uphone/tests/SceneTest/SceneTest.cpp
rename to tests/tests/SceneTest/SceneTest.cpp
diff --git a/test_uphone/tests/SceneTest/SceneTest.h b/tests/tests/SceneTest/SceneTest.h
similarity index 100%
rename from test_uphone/tests/SceneTest/SceneTest.h
rename to tests/tests/SceneTest/SceneTest.h
diff --git a/test_uphone/tests/SchedulerTest/SchedulerTest.cpp b/tests/tests/SchedulerTest/SchedulerTest.cpp
similarity index 100%
rename from test_uphone/tests/SchedulerTest/SchedulerTest.cpp
rename to tests/tests/SchedulerTest/SchedulerTest.cpp
diff --git a/test_uphone/tests/SchedulerTest/SchedulerTest.h b/tests/tests/SchedulerTest/SchedulerTest.h
similarity index 100%
rename from test_uphone/tests/SchedulerTest/SchedulerTest.h
rename to tests/tests/SchedulerTest/SchedulerTest.h
diff --git a/test_uphone/tests/SpriteTest/SpriteTest.cpp b/tests/tests/SpriteTest/SpriteTest.cpp
similarity index 100%
rename from test_uphone/tests/SpriteTest/SpriteTest.cpp
rename to tests/tests/SpriteTest/SpriteTest.cpp
diff --git a/test_uphone/tests/SpriteTest/SpriteTest.h b/tests/tests/SpriteTest/SpriteTest.h
similarity index 100%
rename from test_uphone/tests/SpriteTest/SpriteTest.h
rename to tests/tests/SpriteTest/SpriteTest.h
diff --git a/test_uphone/tests/TileMapTest/TileMapTest.cpp b/tests/tests/TileMapTest/TileMapTest.cpp
similarity index 100%
rename from test_uphone/tests/TileMapTest/TileMapTest.cpp
rename to tests/tests/TileMapTest/TileMapTest.cpp
diff --git a/test_uphone/tests/TileMapTest/TileMapTest.h b/tests/tests/TileMapTest/TileMapTest.h
similarity index 100%
rename from test_uphone/tests/TileMapTest/TileMapTest.h
rename to tests/tests/TileMapTest/TileMapTest.h
diff --git a/test_uphone/tests/TouchesTest/Ball.cpp b/tests/tests/TouchesTest/Ball.cpp
similarity index 100%
rename from test_uphone/tests/TouchesTest/Ball.cpp
rename to tests/tests/TouchesTest/Ball.cpp
diff --git a/test_uphone/tests/TouchesTest/Ball.h b/tests/tests/TouchesTest/Ball.h
similarity index 100%
rename from test_uphone/tests/TouchesTest/Ball.h
rename to tests/tests/TouchesTest/Ball.h
diff --git a/test_uphone/tests/TouchesTest/Paddle.cpp b/tests/tests/TouchesTest/Paddle.cpp
similarity index 100%
rename from test_uphone/tests/TouchesTest/Paddle.cpp
rename to tests/tests/TouchesTest/Paddle.cpp
diff --git a/test_uphone/tests/TouchesTest/Paddle.h b/tests/tests/TouchesTest/Paddle.h
similarity index 100%
rename from test_uphone/tests/TouchesTest/Paddle.h
rename to tests/tests/TouchesTest/Paddle.h
diff --git a/test_uphone/tests/TouchesTest/TouchesTest.cpp b/tests/tests/TouchesTest/TouchesTest.cpp
similarity index 100%
rename from test_uphone/tests/TouchesTest/TouchesTest.cpp
rename to tests/tests/TouchesTest/TouchesTest.cpp
diff --git a/test_uphone/tests/TouchesTest/TouchesTest.h b/tests/tests/TouchesTest/TouchesTest.h
similarity index 100%
rename from test_uphone/tests/TouchesTest/TouchesTest.h
rename to tests/tests/TouchesTest/TouchesTest.h
diff --git a/test_uphone/tests/TransitionsTest/TransitionsTest.cpp b/tests/tests/TransitionsTest/TransitionsTest.cpp
similarity index 100%
rename from test_uphone/tests/TransitionsTest/TransitionsTest.cpp
rename to tests/tests/TransitionsTest/TransitionsTest.cpp
diff --git a/test_uphone/tests/TransitionsTest/TransitionsTest.h b/tests/tests/TransitionsTest/TransitionsTest.h
similarity index 100%
rename from test_uphone/tests/TransitionsTest/TransitionsTest.h
rename to tests/tests/TransitionsTest/TransitionsTest.h
diff --git a/test_uphone/tests/controller.cpp b/tests/tests/controller.cpp
similarity index 100%
rename from test_uphone/tests/controller.cpp
rename to tests/tests/controller.cpp
diff --git a/test_uphone/tests/controller.h b/tests/tests/controller.h
similarity index 100%
rename from test_uphone/tests/controller.h
rename to tests/tests/controller.h
diff --git a/test_uphone/tests/testBasic.cpp b/tests/tests/testBasic.cpp
similarity index 100%
rename from test_uphone/tests/testBasic.cpp
rename to tests/tests/testBasic.cpp
diff --git a/test_uphone/tests/testBasic.h b/tests/tests/testBasic.h
similarity index 100%
rename from test_uphone/tests/testBasic.h
rename to tests/tests/testBasic.h
diff --git a/test_uphone/tests/testResource.h b/tests/tests/testResource.h
similarity index 100%
rename from test_uphone/tests/testResource.h
rename to tests/tests/testResource.h
diff --git a/test_uphone/tests/tests.h b/tests/tests/tests.h
similarity index 100%
rename from test_uphone/tests/tests.h
rename to tests/tests/tests.h