diff --git a/tests/Android.mk b/samples/cpp-tests/Android.mk similarity index 100% rename from tests/Android.mk rename to samples/cpp-tests/Android.mk diff --git a/tests/CMakeLists.txt b/samples/cpp-tests/CMakeLists.txt similarity index 100% rename from tests/CMakeLists.txt rename to samples/cpp-tests/CMakeLists.txt diff --git a/tests/Classes/AccelerometerTest/AccelerometerTest.cpp b/samples/cpp-tests/Classes/AccelerometerTest/AccelerometerTest.cpp similarity index 100% rename from tests/Classes/AccelerometerTest/AccelerometerTest.cpp rename to samples/cpp-tests/Classes/AccelerometerTest/AccelerometerTest.cpp diff --git a/tests/Classes/AccelerometerTest/AccelerometerTest.h b/samples/cpp-tests/Classes/AccelerometerTest/AccelerometerTest.h similarity index 100% rename from tests/Classes/AccelerometerTest/AccelerometerTest.h rename to samples/cpp-tests/Classes/AccelerometerTest/AccelerometerTest.h diff --git a/tests/Classes/ActionManagerTest/ActionManagerTest.cpp b/samples/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.cpp similarity index 100% rename from tests/Classes/ActionManagerTest/ActionManagerTest.cpp rename to samples/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.cpp diff --git a/tests/Classes/ActionManagerTest/ActionManagerTest.h b/samples/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.h similarity index 100% rename from tests/Classes/ActionManagerTest/ActionManagerTest.h rename to samples/cpp-tests/Classes/ActionManagerTest/ActionManagerTest.h diff --git a/tests/Classes/ActionsEaseTest/ActionsEaseTest.cpp b/samples/cpp-tests/Classes/ActionsEaseTest/ActionsEaseTest.cpp similarity index 100% rename from tests/Classes/ActionsEaseTest/ActionsEaseTest.cpp rename to samples/cpp-tests/Classes/ActionsEaseTest/ActionsEaseTest.cpp diff --git a/tests/Classes/ActionsEaseTest/ActionsEaseTest.h b/samples/cpp-tests/Classes/ActionsEaseTest/ActionsEaseTest.h similarity index 100% rename from tests/Classes/ActionsEaseTest/ActionsEaseTest.h rename to samples/cpp-tests/Classes/ActionsEaseTest/ActionsEaseTest.h diff --git a/tests/Classes/ActionsProgressTest/ActionsProgressTest.cpp b/samples/cpp-tests/Classes/ActionsProgressTest/ActionsProgressTest.cpp similarity index 100% rename from tests/Classes/ActionsProgressTest/ActionsProgressTest.cpp rename to samples/cpp-tests/Classes/ActionsProgressTest/ActionsProgressTest.cpp diff --git a/tests/Classes/ActionsProgressTest/ActionsProgressTest.h b/samples/cpp-tests/Classes/ActionsProgressTest/ActionsProgressTest.h similarity index 100% rename from tests/Classes/ActionsProgressTest/ActionsProgressTest.h rename to samples/cpp-tests/Classes/ActionsProgressTest/ActionsProgressTest.h diff --git a/tests/Classes/ActionsTest/ActionsTest.cpp b/samples/cpp-tests/Classes/ActionsTest/ActionsTest.cpp similarity index 100% rename from tests/Classes/ActionsTest/ActionsTest.cpp rename to samples/cpp-tests/Classes/ActionsTest/ActionsTest.cpp diff --git a/tests/Classes/ActionsTest/ActionsTest.h b/samples/cpp-tests/Classes/ActionsTest/ActionsTest.h similarity index 100% rename from tests/Classes/ActionsTest/ActionsTest.h rename to samples/cpp-tests/Classes/ActionsTest/ActionsTest.h diff --git a/tests/Classes/AppDelegate.cpp b/samples/cpp-tests/Classes/AppDelegate.cpp similarity index 100% rename from tests/Classes/AppDelegate.cpp rename to samples/cpp-tests/Classes/AppDelegate.cpp diff --git a/tests/Classes/AppDelegate.h b/samples/cpp-tests/Classes/AppDelegate.h similarity index 100% rename from tests/Classes/AppDelegate.h rename to samples/cpp-tests/Classes/AppDelegate.h diff --git a/tests/Classes/BaseTest.cpp b/samples/cpp-tests/Classes/BaseTest.cpp similarity index 100% rename from tests/Classes/BaseTest.cpp rename to samples/cpp-tests/Classes/BaseTest.cpp diff --git a/tests/Classes/BaseTest.h b/samples/cpp-tests/Classes/BaseTest.h similarity index 100% rename from tests/Classes/BaseTest.h rename to samples/cpp-tests/Classes/BaseTest.h diff --git a/tests/Classes/Box2DTest/Box2dTest.cpp b/samples/cpp-tests/Classes/Box2DTest/Box2dTest.cpp similarity index 100% rename from tests/Classes/Box2DTest/Box2dTest.cpp rename to samples/cpp-tests/Classes/Box2DTest/Box2dTest.cpp diff --git a/tests/Classes/Box2DTest/Box2dTest.h b/samples/cpp-tests/Classes/Box2DTest/Box2dTest.h similarity index 100% rename from tests/Classes/Box2DTest/Box2dTest.h rename to samples/cpp-tests/Classes/Box2DTest/Box2dTest.h diff --git a/tests/Classes/Box2DTestBed/Box2dView.cpp b/samples/cpp-tests/Classes/Box2DTestBed/Box2dView.cpp similarity index 100% rename from tests/Classes/Box2DTestBed/Box2dView.cpp rename to samples/cpp-tests/Classes/Box2DTestBed/Box2dView.cpp diff --git a/tests/Classes/Box2DTestBed/Box2dView.h b/samples/cpp-tests/Classes/Box2DTestBed/Box2dView.h similarity index 100% rename from tests/Classes/Box2DTestBed/Box2dView.h rename to samples/cpp-tests/Classes/Box2DTestBed/Box2dView.h diff --git a/tests/Classes/Box2DTestBed/GLES-Render.cpp b/samples/cpp-tests/Classes/Box2DTestBed/GLES-Render.cpp similarity index 100% rename from tests/Classes/Box2DTestBed/GLES-Render.cpp rename to samples/cpp-tests/Classes/Box2DTestBed/GLES-Render.cpp diff --git a/tests/Classes/Box2DTestBed/GLES-Render.h b/samples/cpp-tests/Classes/Box2DTestBed/GLES-Render.h similarity index 100% rename from tests/Classes/Box2DTestBed/GLES-Render.h rename to samples/cpp-tests/Classes/Box2DTestBed/GLES-Render.h diff --git a/tests/Classes/Box2DTestBed/Test.cpp b/samples/cpp-tests/Classes/Box2DTestBed/Test.cpp similarity index 100% rename from tests/Classes/Box2DTestBed/Test.cpp rename to samples/cpp-tests/Classes/Box2DTestBed/Test.cpp diff --git a/tests/Classes/Box2DTestBed/Test.h b/samples/cpp-tests/Classes/Box2DTestBed/Test.h similarity index 100% rename from tests/Classes/Box2DTestBed/Test.h rename to samples/cpp-tests/Classes/Box2DTestBed/Test.h diff --git a/tests/Classes/Box2DTestBed/TestEntries.cpp b/samples/cpp-tests/Classes/Box2DTestBed/TestEntries.cpp similarity index 100% rename from tests/Classes/Box2DTestBed/TestEntries.cpp rename to samples/cpp-tests/Classes/Box2DTestBed/TestEntries.cpp diff --git a/tests/Classes/Box2DTestBed/Tests/AddPair.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/AddPair.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/AddPair.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/AddPair.h diff --git a/tests/Classes/Box2DTestBed/Tests/ApplyForce.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/ApplyForce.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/ApplyForce.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/ApplyForce.h diff --git a/tests/Classes/Box2DTestBed/Tests/BodyTypes.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/BodyTypes.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/BodyTypes.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/BodyTypes.h diff --git a/tests/Classes/Box2DTestBed/Tests/Breakable.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/Breakable.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/Breakable.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/Breakable.h diff --git a/tests/Classes/Box2DTestBed/Tests/Bridge.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/Bridge.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/Bridge.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/Bridge.h diff --git a/tests/Classes/Box2DTestBed/Tests/BulletTest.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/BulletTest.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/BulletTest.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/BulletTest.h diff --git a/tests/Classes/Box2DTestBed/Tests/Cantilever.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/Cantilever.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/Cantilever.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/Cantilever.h diff --git a/tests/Classes/Box2DTestBed/Tests/Car.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/Car.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/Car.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/Car.h diff --git a/tests/Classes/Box2DTestBed/Tests/Chain.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/Chain.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/Chain.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/Chain.h diff --git a/tests/Classes/Box2DTestBed/Tests/CharacterCollision.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/CharacterCollision.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/CharacterCollision.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/CharacterCollision.h diff --git a/tests/Classes/Box2DTestBed/Tests/CollisionFiltering.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/CollisionFiltering.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/CollisionFiltering.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/CollisionFiltering.h diff --git a/tests/Classes/Box2DTestBed/Tests/CollisionProcessing.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/CollisionProcessing.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/CollisionProcessing.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/CollisionProcessing.h diff --git a/tests/Classes/Box2DTestBed/Tests/CompoundShapes.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/CompoundShapes.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/CompoundShapes.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/CompoundShapes.h diff --git a/tests/Classes/Box2DTestBed/Tests/Confined.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/Confined.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/Confined.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/Confined.h diff --git a/tests/Classes/Box2DTestBed/Tests/ContinuousTest.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/ContinuousTest.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/ContinuousTest.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/ContinuousTest.h diff --git a/tests/Classes/Box2DTestBed/Tests/ConvexHull.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/ConvexHull.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/ConvexHull.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/ConvexHull.h diff --git a/tests/Classes/Box2DTestBed/Tests/ConveyorBelt.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/ConveyorBelt.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/ConveyorBelt.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/ConveyorBelt.h diff --git a/tests/Classes/Box2DTestBed/Tests/DistanceTest.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/DistanceTest.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/DistanceTest.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/DistanceTest.h diff --git a/tests/Classes/Box2DTestBed/Tests/Dominos.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/Dominos.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/Dominos.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/Dominos.h diff --git a/tests/Classes/Box2DTestBed/Tests/DumpShell.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/DumpShell.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/DumpShell.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/DumpShell.h diff --git a/tests/Classes/Box2DTestBed/Tests/DynamicTreeTest.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/DynamicTreeTest.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/DynamicTreeTest.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/DynamicTreeTest.h diff --git a/tests/Classes/Box2DTestBed/Tests/EdgeShapes.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/EdgeShapes.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/EdgeShapes.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/EdgeShapes.h diff --git a/tests/Classes/Box2DTestBed/Tests/EdgeTest.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/EdgeTest.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/EdgeTest.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/EdgeTest.h diff --git a/tests/Classes/Box2DTestBed/Tests/Gears.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/Gears.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/Gears.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/Gears.h diff --git a/tests/Classes/Box2DTestBed/Tests/Mobile.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/Mobile.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/Mobile.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/Mobile.h diff --git a/tests/Classes/Box2DTestBed/Tests/MobileBalanced.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/MobileBalanced.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/MobileBalanced.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/MobileBalanced.h diff --git a/tests/Classes/Box2DTestBed/Tests/MotorJoint.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/MotorJoint.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/MotorJoint.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/MotorJoint.h diff --git a/tests/Classes/Box2DTestBed/Tests/OneSidedPlatform.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/OneSidedPlatform.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/OneSidedPlatform.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/OneSidedPlatform.h diff --git a/tests/Classes/Box2DTestBed/Tests/Pinball.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/Pinball.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/Pinball.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/Pinball.h diff --git a/tests/Classes/Box2DTestBed/Tests/PolyCollision.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/PolyCollision.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/PolyCollision.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/PolyCollision.h diff --git a/tests/Classes/Box2DTestBed/Tests/PolyShapes.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/PolyShapes.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/PolyShapes.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/PolyShapes.h diff --git a/tests/Classes/Box2DTestBed/Tests/Prismatic.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/Prismatic.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/Prismatic.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/Prismatic.h diff --git a/tests/Classes/Box2DTestBed/Tests/Pulleys.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/Pulleys.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/Pulleys.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/Pulleys.h diff --git a/tests/Classes/Box2DTestBed/Tests/Pyramid.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/Pyramid.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/Pyramid.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/Pyramid.h diff --git a/tests/Classes/Box2DTestBed/Tests/RayCast.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/RayCast.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/RayCast.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/RayCast.h diff --git a/tests/Classes/Box2DTestBed/Tests/Revolute.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/Revolute.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/Revolute.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/Revolute.h diff --git a/tests/Classes/Box2DTestBed/Tests/Rope.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/Rope.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/Rope.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/Rope.h diff --git a/tests/Classes/Box2DTestBed/Tests/RopeJoint.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/RopeJoint.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/RopeJoint.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/RopeJoint.h diff --git a/tests/Classes/Box2DTestBed/Tests/SensorTest.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/SensorTest.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/SensorTest.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/SensorTest.h diff --git a/tests/Classes/Box2DTestBed/Tests/ShapeEditing.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/ShapeEditing.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/ShapeEditing.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/ShapeEditing.h diff --git a/tests/Classes/Box2DTestBed/Tests/SliderCrank.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/SliderCrank.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/SliderCrank.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/SliderCrank.h diff --git a/tests/Classes/Box2DTestBed/Tests/SphereStack.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/SphereStack.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/SphereStack.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/SphereStack.h diff --git a/tests/Classes/Box2DTestBed/Tests/TheoJansen.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/TheoJansen.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/TheoJansen.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/TheoJansen.h diff --git a/tests/Classes/Box2DTestBed/Tests/Tiles.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/Tiles.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/Tiles.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/Tiles.h diff --git a/tests/Classes/Box2DTestBed/Tests/TimeOfImpact.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/TimeOfImpact.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/TimeOfImpact.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/TimeOfImpact.h diff --git a/tests/Classes/Box2DTestBed/Tests/Tumbler.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/Tumbler.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/Tumbler.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/Tumbler.h diff --git a/tests/Classes/Box2DTestBed/Tests/VaryingFriction.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/VaryingFriction.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/VaryingFriction.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/VaryingFriction.h diff --git a/tests/Classes/Box2DTestBed/Tests/VaryingRestitution.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/VaryingRestitution.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/VaryingRestitution.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/VaryingRestitution.h diff --git a/tests/Classes/Box2DTestBed/Tests/VerticalStack.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/VerticalStack.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/VerticalStack.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/VerticalStack.h diff --git a/tests/Classes/Box2DTestBed/Tests/Web.h b/samples/cpp-tests/Classes/Box2DTestBed/Tests/Web.h similarity index 100% rename from tests/Classes/Box2DTestBed/Tests/Web.h rename to samples/cpp-tests/Classes/Box2DTestBed/Tests/Web.h diff --git a/tests/Classes/BugsTest/Bug-1159.cpp b/samples/cpp-tests/Classes/BugsTest/Bug-1159.cpp similarity index 100% rename from tests/Classes/BugsTest/Bug-1159.cpp rename to samples/cpp-tests/Classes/BugsTest/Bug-1159.cpp diff --git a/tests/Classes/BugsTest/Bug-1159.h b/samples/cpp-tests/Classes/BugsTest/Bug-1159.h similarity index 100% rename from tests/Classes/BugsTest/Bug-1159.h rename to samples/cpp-tests/Classes/BugsTest/Bug-1159.h diff --git a/tests/Classes/BugsTest/Bug-1174.cpp b/samples/cpp-tests/Classes/BugsTest/Bug-1174.cpp similarity index 100% rename from tests/Classes/BugsTest/Bug-1174.cpp rename to samples/cpp-tests/Classes/BugsTest/Bug-1174.cpp diff --git a/tests/Classes/BugsTest/Bug-1174.h b/samples/cpp-tests/Classes/BugsTest/Bug-1174.h similarity index 100% rename from tests/Classes/BugsTest/Bug-1174.h rename to samples/cpp-tests/Classes/BugsTest/Bug-1174.h diff --git a/tests/Classes/BugsTest/Bug-350.cpp b/samples/cpp-tests/Classes/BugsTest/Bug-350.cpp similarity index 100% rename from tests/Classes/BugsTest/Bug-350.cpp rename to samples/cpp-tests/Classes/BugsTest/Bug-350.cpp diff --git a/tests/Classes/BugsTest/Bug-350.h b/samples/cpp-tests/Classes/BugsTest/Bug-350.h similarity index 100% rename from tests/Classes/BugsTest/Bug-350.h rename to samples/cpp-tests/Classes/BugsTest/Bug-350.h diff --git a/tests/Classes/BugsTest/Bug-422.cpp b/samples/cpp-tests/Classes/BugsTest/Bug-422.cpp similarity index 100% rename from tests/Classes/BugsTest/Bug-422.cpp rename to samples/cpp-tests/Classes/BugsTest/Bug-422.cpp diff --git a/tests/Classes/BugsTest/Bug-422.h b/samples/cpp-tests/Classes/BugsTest/Bug-422.h similarity index 100% rename from tests/Classes/BugsTest/Bug-422.h rename to samples/cpp-tests/Classes/BugsTest/Bug-422.h diff --git a/tests/Classes/BugsTest/Bug-458/Bug-458.cpp b/samples/cpp-tests/Classes/BugsTest/Bug-458/Bug-458.cpp similarity index 100% rename from tests/Classes/BugsTest/Bug-458/Bug-458.cpp rename to samples/cpp-tests/Classes/BugsTest/Bug-458/Bug-458.cpp diff --git a/tests/Classes/BugsTest/Bug-458/Bug-458.h b/samples/cpp-tests/Classes/BugsTest/Bug-458/Bug-458.h similarity index 100% rename from tests/Classes/BugsTest/Bug-458/Bug-458.h rename to samples/cpp-tests/Classes/BugsTest/Bug-458/Bug-458.h diff --git a/tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp b/samples/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp similarity index 100% rename from tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp rename to samples/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp diff --git a/tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.h b/samples/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.h similarity index 100% rename from tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.h rename to samples/cpp-tests/Classes/BugsTest/Bug-458/QuestionContainerSprite.h diff --git a/tests/Classes/BugsTest/Bug-624.cpp b/samples/cpp-tests/Classes/BugsTest/Bug-624.cpp similarity index 100% rename from tests/Classes/BugsTest/Bug-624.cpp rename to samples/cpp-tests/Classes/BugsTest/Bug-624.cpp diff --git a/tests/Classes/BugsTest/Bug-624.h b/samples/cpp-tests/Classes/BugsTest/Bug-624.h similarity index 100% rename from tests/Classes/BugsTest/Bug-624.h rename to samples/cpp-tests/Classes/BugsTest/Bug-624.h diff --git a/tests/Classes/BugsTest/Bug-886.cpp b/samples/cpp-tests/Classes/BugsTest/Bug-886.cpp similarity index 100% rename from tests/Classes/BugsTest/Bug-886.cpp rename to samples/cpp-tests/Classes/BugsTest/Bug-886.cpp diff --git a/tests/Classes/BugsTest/Bug-886.h b/samples/cpp-tests/Classes/BugsTest/Bug-886.h similarity index 100% rename from tests/Classes/BugsTest/Bug-886.h rename to samples/cpp-tests/Classes/BugsTest/Bug-886.h diff --git a/tests/Classes/BugsTest/Bug-899.cpp b/samples/cpp-tests/Classes/BugsTest/Bug-899.cpp similarity index 100% rename from tests/Classes/BugsTest/Bug-899.cpp rename to samples/cpp-tests/Classes/BugsTest/Bug-899.cpp diff --git a/tests/Classes/BugsTest/Bug-899.h b/samples/cpp-tests/Classes/BugsTest/Bug-899.h similarity index 100% rename from tests/Classes/BugsTest/Bug-899.h rename to samples/cpp-tests/Classes/BugsTest/Bug-899.h diff --git a/tests/Classes/BugsTest/Bug-914.cpp b/samples/cpp-tests/Classes/BugsTest/Bug-914.cpp similarity index 100% rename from tests/Classes/BugsTest/Bug-914.cpp rename to samples/cpp-tests/Classes/BugsTest/Bug-914.cpp diff --git a/tests/Classes/BugsTest/Bug-914.h b/samples/cpp-tests/Classes/BugsTest/Bug-914.h similarity index 100% rename from tests/Classes/BugsTest/Bug-914.h rename to samples/cpp-tests/Classes/BugsTest/Bug-914.h diff --git a/tests/Classes/BugsTest/BugsTest.cpp b/samples/cpp-tests/Classes/BugsTest/BugsTest.cpp similarity index 100% rename from tests/Classes/BugsTest/BugsTest.cpp rename to samples/cpp-tests/Classes/BugsTest/BugsTest.cpp diff --git a/tests/Classes/BugsTest/BugsTest.h b/samples/cpp-tests/Classes/BugsTest/BugsTest.h similarity index 100% rename from tests/Classes/BugsTest/BugsTest.h rename to samples/cpp-tests/Classes/BugsTest/BugsTest.h diff --git a/tests/Classes/ChipmunkTest/ChipmunkTest.cpp b/samples/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.cpp similarity index 100% rename from tests/Classes/ChipmunkTest/ChipmunkTest.cpp rename to samples/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.cpp diff --git a/tests/Classes/ChipmunkTest/ChipmunkTest.h b/samples/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.h similarity index 100% rename from tests/Classes/ChipmunkTest/ChipmunkTest.h rename to samples/cpp-tests/Classes/ChipmunkTest/ChipmunkTest.h diff --git a/tests/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp b/samples/cpp-tests/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp similarity index 100% rename from tests/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp rename to samples/cpp-tests/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp diff --git a/tests/Classes/ClickAndMoveTest/ClickAndMoveTest.h b/samples/cpp-tests/Classes/ClickAndMoveTest/ClickAndMoveTest.h similarity index 100% rename from tests/Classes/ClickAndMoveTest/ClickAndMoveTest.h rename to samples/cpp-tests/Classes/ClickAndMoveTest/ClickAndMoveTest.h diff --git a/tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp b/samples/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp similarity index 100% rename from tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp rename to samples/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp diff --git a/tests/Classes/ClippingNodeTest/ClippingNodeTest.h b/samples/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.h similarity index 100% rename from tests/Classes/ClippingNodeTest/ClippingNodeTest.h rename to samples/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.h diff --git a/tests/Classes/CocosDenshionTest/CocosDenshionTest.cpp b/samples/cpp-tests/Classes/CocosDenshionTest/CocosDenshionTest.cpp similarity index 100% rename from tests/Classes/CocosDenshionTest/CocosDenshionTest.cpp rename to samples/cpp-tests/Classes/CocosDenshionTest/CocosDenshionTest.cpp diff --git a/tests/Classes/CocosDenshionTest/CocosDenshionTest.h b/samples/cpp-tests/Classes/CocosDenshionTest/CocosDenshionTest.h similarity index 100% rename from tests/Classes/CocosDenshionTest/CocosDenshionTest.h rename to samples/cpp-tests/Classes/CocosDenshionTest/CocosDenshionTest.h diff --git a/tests/Classes/ConfigurationTest/ConfigurationTest.cpp b/samples/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.cpp similarity index 100% rename from tests/Classes/ConfigurationTest/ConfigurationTest.cpp rename to samples/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.cpp diff --git a/tests/Classes/ConfigurationTest/ConfigurationTest.h b/samples/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.h similarity index 100% rename from tests/Classes/ConfigurationTest/ConfigurationTest.h rename to samples/cpp-tests/Classes/ConfigurationTest/ConfigurationTest.h diff --git a/tests/Classes/ConsoleTest/ConsoleTest.cpp b/samples/cpp-tests/Classes/ConsoleTest/ConsoleTest.cpp similarity index 100% rename from tests/Classes/ConsoleTest/ConsoleTest.cpp rename to samples/cpp-tests/Classes/ConsoleTest/ConsoleTest.cpp diff --git a/tests/Classes/ConsoleTest/ConsoleTest.h b/samples/cpp-tests/Classes/ConsoleTest/ConsoleTest.h similarity index 100% rename from tests/Classes/ConsoleTest/ConsoleTest.h rename to samples/cpp-tests/Classes/ConsoleTest/ConsoleTest.h diff --git a/tests/Classes/CurlTest/CurlTest.cpp b/samples/cpp-tests/Classes/CurlTest/CurlTest.cpp similarity index 100% rename from tests/Classes/CurlTest/CurlTest.cpp rename to samples/cpp-tests/Classes/CurlTest/CurlTest.cpp diff --git a/tests/Classes/CurlTest/CurlTest.h b/samples/cpp-tests/Classes/CurlTest/CurlTest.h similarity index 100% rename from tests/Classes/CurlTest/CurlTest.h rename to samples/cpp-tests/Classes/CurlTest/CurlTest.h diff --git a/tests/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp b/samples/cpp-tests/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp similarity index 100% rename from tests/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp rename to samples/cpp-tests/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp diff --git a/tests/Classes/CurrentLanguageTest/CurrentLanguageTest.h b/samples/cpp-tests/Classes/CurrentLanguageTest/CurrentLanguageTest.h similarity index 100% rename from tests/Classes/CurrentLanguageTest/CurrentLanguageTest.h rename to samples/cpp-tests/Classes/CurrentLanguageTest/CurrentLanguageTest.h diff --git a/tests/Classes/DataVisitorTest/DataVisitorTest.cpp b/samples/cpp-tests/Classes/DataVisitorTest/DataVisitorTest.cpp similarity index 100% rename from tests/Classes/DataVisitorTest/DataVisitorTest.cpp rename to samples/cpp-tests/Classes/DataVisitorTest/DataVisitorTest.cpp diff --git a/tests/Classes/DataVisitorTest/DataVisitorTest.h b/samples/cpp-tests/Classes/DataVisitorTest/DataVisitorTest.h similarity index 100% rename from tests/Classes/DataVisitorTest/DataVisitorTest.h rename to samples/cpp-tests/Classes/DataVisitorTest/DataVisitorTest.h diff --git a/tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp b/samples/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp similarity index 100% rename from tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp rename to samples/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp diff --git a/tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h b/samples/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h similarity index 100% rename from tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h rename to samples/cpp-tests/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h diff --git a/tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp b/samples/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp similarity index 100% rename from tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp rename to samples/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp diff --git a/tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h b/samples/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h similarity index 100% rename from tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h rename to samples/cpp-tests/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h diff --git a/tests/Classes/EffectsTest/EffectsTest.cpp b/samples/cpp-tests/Classes/EffectsTest/EffectsTest.cpp similarity index 100% rename from tests/Classes/EffectsTest/EffectsTest.cpp rename to samples/cpp-tests/Classes/EffectsTest/EffectsTest.cpp diff --git a/tests/Classes/EffectsTest/EffectsTest.h b/samples/cpp-tests/Classes/EffectsTest/EffectsTest.h similarity index 100% rename from tests/Classes/EffectsTest/EffectsTest.h rename to samples/cpp-tests/Classes/EffectsTest/EffectsTest.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/CocoStudioGUITest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CocoStudioGUITest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/CocoStudioGUITest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CocoStudioGUITest.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/CocoStudioGUITest.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CocoStudioGUITest.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/CocoStudioGUITest.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CocoStudioGUITest.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomGUIScene.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomGUIScene.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomGUIScene.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomGUIScene.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomGUIScene.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomGUIScene.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomGUIScene.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomGUIScene.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomImageTest/CustomImageTest.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageView.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageView.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageView.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageView.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageView.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageView.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageView.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageView.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomImageViewReader.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomParticleWidgetReader.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomReader.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomReader.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomReader.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomReader.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomReader.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomReader.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomReader.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/CustomWidget/CustomReader.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/GUIEditorTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/GUIEditorTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/GUIEditorTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/GUIEditorTest.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/GUIEditorTest.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/GUIEditorTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/GUIEditorTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/GUIEditorTest.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest_Editor.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest_Editor.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest_Editor.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest_Editor.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager_Editor.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager_Editor.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager_Editor.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager_Editor.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager_Editor.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager_Editor.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager_Editor.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager_Editor.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScene_Editor.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest_Editor.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextAtlasTest/UITextAtlasTest_Editor.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextBMFontTest/UITextBMFontTest_Editor.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest_Editor.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest_Editor.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest_Editor.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest_Editor.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest_Editor.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest_Editor.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest_Editor.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UITextTest/UITextTest_Editor.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest_Editor.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/EventDef.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/EventDef.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/EventDef.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/EventDef.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h diff --git a/tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp diff --git a/tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h b/samples/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h diff --git a/tests/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsLayerLoader.h b/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsLayerLoader.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsLayerLoader.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsLayerLoader.h diff --git a/tests/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp diff --git a/tests/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h b/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h diff --git a/tests/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp diff --git a/tests/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h b/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h diff --git a/tests/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayerLoader.h b/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayerLoader.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayerLoader.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayerLoader.h diff --git a/tests/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp diff --git a/tests/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.h b/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.h diff --git a/tests/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp diff --git a/tests/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h b/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h diff --git a/tests/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayerLoader.h b/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayerLoader.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayerLoader.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayerLoader.h diff --git a/tests/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayer.h b/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayer.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayer.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayer.h diff --git a/tests/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayerLoader.h b/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayerLoader.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayerLoader.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayerLoader.h diff --git a/tests/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp diff --git a/tests/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h b/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h diff --git a/tests/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayerLoader.h b/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayerLoader.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayerLoader.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayerLoader.h diff --git a/tests/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayer.h b/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayer.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayer.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayer.h diff --git a/tests/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayerLoader.h b/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayerLoader.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayerLoader.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayerLoader.h diff --git a/tests/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayer.h b/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayer.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayer.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayer.h diff --git a/tests/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayerLoader.h b/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayerLoader.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayerLoader.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayerLoader.h diff --git a/tests/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayer.h b/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayer.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayer.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayer.h diff --git a/tests/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayerLoader.h b/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayerLoader.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayerLoader.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayerLoader.h diff --git a/tests/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp diff --git a/tests/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h b/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h diff --git a/tests/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayerLoader.h b/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayerLoader.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayerLoader.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayerLoader.h diff --git a/tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackLayerLoader.h b/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackLayerLoader.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackLayerLoader.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackLayerLoader.h diff --git a/tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp b/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp diff --git a/tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h b/samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h similarity index 100% rename from tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h rename to samples/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h diff --git a/tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp diff --git a/tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.h b/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.h diff --git a/tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp diff --git a/tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.h b/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.h diff --git a/tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp diff --git a/tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.h b/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.h diff --git a/tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp b/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp diff --git a/tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.h b/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.h similarity index 100% rename from tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.h rename to samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.h diff --git a/tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp b/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp diff --git a/tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.h b/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.h similarity index 100% rename from tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.h rename to samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.h diff --git a/tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp diff --git a/tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.h b/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.h diff --git a/tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp diff --git a/tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.h b/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.h diff --git a/tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp diff --git a/tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.h b/samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.h diff --git a/tests/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp diff --git a/tests/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.h b/samples/cpp-tests/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.h diff --git a/tests/Classes/ExtensionsTest/ExtensionsTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/ExtensionsTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/ExtensionsTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/ExtensionsTest.cpp diff --git a/tests/Classes/ExtensionsTest/ExtensionsTest.h b/samples/cpp-tests/Classes/ExtensionsTest/ExtensionsTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/ExtensionsTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/ExtensionsTest.h diff --git a/tests/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp diff --git a/tests/Classes/ExtensionsTest/NetworkTest/HttpClientTest.h b/samples/cpp-tests/Classes/ExtensionsTest/NetworkTest/HttpClientTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/NetworkTest/HttpClientTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/NetworkTest/HttpClientTest.h diff --git a/tests/Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp diff --git a/tests/Classes/ExtensionsTest/NetworkTest/SocketIOTest.h b/samples/cpp-tests/Classes/ExtensionsTest/NetworkTest/SocketIOTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/NetworkTest/SocketIOTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/NetworkTest/SocketIOTest.h diff --git a/tests/Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp diff --git a/tests/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h b/samples/cpp-tests/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h diff --git a/tests/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp diff --git a/tests/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.h b/samples/cpp-tests/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.h diff --git a/tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp b/samples/cpp-tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp diff --git a/tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h b/samples/cpp-tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h similarity index 100% rename from tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h rename to samples/cpp-tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h diff --git a/tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp b/samples/cpp-tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp diff --git a/tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h b/samples/cpp-tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h similarity index 100% rename from tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h rename to samples/cpp-tests/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h diff --git a/tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp b/samples/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp similarity index 100% rename from tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp rename to samples/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp diff --git a/tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h b/samples/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h similarity index 100% rename from tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h rename to samples/cpp-tests/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h diff --git a/tests/Classes/FileUtilsTest/FileUtilsTest.cpp b/samples/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp similarity index 100% rename from tests/Classes/FileUtilsTest/FileUtilsTest.cpp rename to samples/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp diff --git a/tests/Classes/FileUtilsTest/FileUtilsTest.h b/samples/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.h similarity index 100% rename from tests/Classes/FileUtilsTest/FileUtilsTest.h rename to samples/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.h diff --git a/tests/Classes/FontTest/FontTest.cpp b/samples/cpp-tests/Classes/FontTest/FontTest.cpp similarity index 100% rename from tests/Classes/FontTest/FontTest.cpp rename to samples/cpp-tests/Classes/FontTest/FontTest.cpp diff --git a/tests/Classes/FontTest/FontTest.h b/samples/cpp-tests/Classes/FontTest/FontTest.h similarity index 100% rename from tests/Classes/FontTest/FontTest.h rename to samples/cpp-tests/Classes/FontTest/FontTest.h diff --git a/tests/Classes/InputTest/MouseTest.cpp b/samples/cpp-tests/Classes/InputTest/MouseTest.cpp similarity index 100% rename from tests/Classes/InputTest/MouseTest.cpp rename to samples/cpp-tests/Classes/InputTest/MouseTest.cpp diff --git a/tests/Classes/InputTest/MouseTest.h b/samples/cpp-tests/Classes/InputTest/MouseTest.h similarity index 100% rename from tests/Classes/InputTest/MouseTest.h rename to samples/cpp-tests/Classes/InputTest/MouseTest.h diff --git a/tests/Classes/IntervalTest/IntervalTest.cpp b/samples/cpp-tests/Classes/IntervalTest/IntervalTest.cpp similarity index 100% rename from tests/Classes/IntervalTest/IntervalTest.cpp rename to samples/cpp-tests/Classes/IntervalTest/IntervalTest.cpp diff --git a/tests/Classes/IntervalTest/IntervalTest.h b/samples/cpp-tests/Classes/IntervalTest/IntervalTest.h similarity index 100% rename from tests/Classes/IntervalTest/IntervalTest.h rename to samples/cpp-tests/Classes/IntervalTest/IntervalTest.h diff --git a/tests/Classes/KeyboardTest/KeyboardTest.cpp b/samples/cpp-tests/Classes/KeyboardTest/KeyboardTest.cpp similarity index 100% rename from tests/Classes/KeyboardTest/KeyboardTest.cpp rename to samples/cpp-tests/Classes/KeyboardTest/KeyboardTest.cpp diff --git a/tests/Classes/KeyboardTest/KeyboardTest.h b/samples/cpp-tests/Classes/KeyboardTest/KeyboardTest.h similarity index 100% rename from tests/Classes/KeyboardTest/KeyboardTest.h rename to samples/cpp-tests/Classes/KeyboardTest/KeyboardTest.h diff --git a/tests/Classes/KeypadTest/KeypadTest.cpp b/samples/cpp-tests/Classes/KeypadTest/KeypadTest.cpp similarity index 100% rename from tests/Classes/KeypadTest/KeypadTest.cpp rename to samples/cpp-tests/Classes/KeypadTest/KeypadTest.cpp diff --git a/tests/Classes/KeypadTest/KeypadTest.h b/samples/cpp-tests/Classes/KeypadTest/KeypadTest.h similarity index 100% rename from tests/Classes/KeypadTest/KeypadTest.h rename to samples/cpp-tests/Classes/KeypadTest/KeypadTest.h diff --git a/tests/Classes/LabelTest/LabelTest.cpp b/samples/cpp-tests/Classes/LabelTest/LabelTest.cpp similarity index 100% rename from tests/Classes/LabelTest/LabelTest.cpp rename to samples/cpp-tests/Classes/LabelTest/LabelTest.cpp diff --git a/tests/Classes/LabelTest/LabelTest.h b/samples/cpp-tests/Classes/LabelTest/LabelTest.h similarity index 100% rename from tests/Classes/LabelTest/LabelTest.h rename to samples/cpp-tests/Classes/LabelTest/LabelTest.h diff --git a/tests/Classes/LabelTest/LabelTestNew.cpp b/samples/cpp-tests/Classes/LabelTest/LabelTestNew.cpp similarity index 100% rename from tests/Classes/LabelTest/LabelTestNew.cpp rename to samples/cpp-tests/Classes/LabelTest/LabelTestNew.cpp diff --git a/tests/Classes/LabelTest/LabelTestNew.h b/samples/cpp-tests/Classes/LabelTest/LabelTestNew.h similarity index 100% rename from tests/Classes/LabelTest/LabelTestNew.h rename to samples/cpp-tests/Classes/LabelTest/LabelTestNew.h diff --git a/tests/Classes/LayerTest/LayerTest.cpp b/samples/cpp-tests/Classes/LayerTest/LayerTest.cpp similarity index 100% rename from tests/Classes/LayerTest/LayerTest.cpp rename to samples/cpp-tests/Classes/LayerTest/LayerTest.cpp diff --git a/tests/Classes/LayerTest/LayerTest.h b/samples/cpp-tests/Classes/LayerTest/LayerTest.h similarity index 100% rename from tests/Classes/LayerTest/LayerTest.h rename to samples/cpp-tests/Classes/LayerTest/LayerTest.h diff --git a/tests/Classes/MenuTest/MenuTest.cpp b/samples/cpp-tests/Classes/MenuTest/MenuTest.cpp similarity index 100% rename from tests/Classes/MenuTest/MenuTest.cpp rename to samples/cpp-tests/Classes/MenuTest/MenuTest.cpp diff --git a/tests/Classes/MenuTest/MenuTest.h b/samples/cpp-tests/Classes/MenuTest/MenuTest.h similarity index 100% rename from tests/Classes/MenuTest/MenuTest.h rename to samples/cpp-tests/Classes/MenuTest/MenuTest.h diff --git a/tests/Classes/MotionStreakTest/MotionStreakTest.cpp b/samples/cpp-tests/Classes/MotionStreakTest/MotionStreakTest.cpp similarity index 100% rename from tests/Classes/MotionStreakTest/MotionStreakTest.cpp rename to samples/cpp-tests/Classes/MotionStreakTest/MotionStreakTest.cpp diff --git a/tests/Classes/MotionStreakTest/MotionStreakTest.h b/samples/cpp-tests/Classes/MotionStreakTest/MotionStreakTest.h similarity index 100% rename from tests/Classes/MotionStreakTest/MotionStreakTest.h rename to samples/cpp-tests/Classes/MotionStreakTest/MotionStreakTest.h diff --git a/tests/Classes/MutiTouchTest/MutiTouchTest.cpp b/samples/cpp-tests/Classes/MutiTouchTest/MutiTouchTest.cpp similarity index 100% rename from tests/Classes/MutiTouchTest/MutiTouchTest.cpp rename to samples/cpp-tests/Classes/MutiTouchTest/MutiTouchTest.cpp diff --git a/tests/Classes/MutiTouchTest/MutiTouchTest.h b/samples/cpp-tests/Classes/MutiTouchTest/MutiTouchTest.h similarity index 100% rename from tests/Classes/MutiTouchTest/MutiTouchTest.h rename to samples/cpp-tests/Classes/MutiTouchTest/MutiTouchTest.h diff --git a/tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp b/samples/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp similarity index 100% rename from tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp rename to samples/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp diff --git a/tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h b/samples/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h similarity index 100% rename from tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h rename to samples/cpp-tests/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h diff --git a/tests/Classes/NewRendererTest/NewRendererTest.cpp b/samples/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp similarity index 100% rename from tests/Classes/NewRendererTest/NewRendererTest.cpp rename to samples/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp diff --git a/tests/Classes/NewRendererTest/NewRendererTest.h b/samples/cpp-tests/Classes/NewRendererTest/NewRendererTest.h similarity index 100% rename from tests/Classes/NewRendererTest/NewRendererTest.h rename to samples/cpp-tests/Classes/NewRendererTest/NewRendererTest.h diff --git a/tests/Classes/NodeTest/NodeTest.cpp b/samples/cpp-tests/Classes/NodeTest/NodeTest.cpp similarity index 100% rename from tests/Classes/NodeTest/NodeTest.cpp rename to samples/cpp-tests/Classes/NodeTest/NodeTest.cpp diff --git a/tests/Classes/NodeTest/NodeTest.h b/samples/cpp-tests/Classes/NodeTest/NodeTest.h similarity index 100% rename from tests/Classes/NodeTest/NodeTest.h rename to samples/cpp-tests/Classes/NodeTest/NodeTest.h diff --git a/tests/Classes/ParallaxTest/ParallaxTest.cpp b/samples/cpp-tests/Classes/ParallaxTest/ParallaxTest.cpp similarity index 100% rename from tests/Classes/ParallaxTest/ParallaxTest.cpp rename to samples/cpp-tests/Classes/ParallaxTest/ParallaxTest.cpp diff --git a/tests/Classes/ParallaxTest/ParallaxTest.h b/samples/cpp-tests/Classes/ParallaxTest/ParallaxTest.h similarity index 100% rename from tests/Classes/ParallaxTest/ParallaxTest.h rename to samples/cpp-tests/Classes/ParallaxTest/ParallaxTest.h diff --git a/tests/Classes/ParticleTest/ParticleTest.cpp b/samples/cpp-tests/Classes/ParticleTest/ParticleTest.cpp similarity index 100% rename from tests/Classes/ParticleTest/ParticleTest.cpp rename to samples/cpp-tests/Classes/ParticleTest/ParticleTest.cpp diff --git a/tests/Classes/ParticleTest/ParticleTest.h b/samples/cpp-tests/Classes/ParticleTest/ParticleTest.h similarity index 100% rename from tests/Classes/ParticleTest/ParticleTest.h rename to samples/cpp-tests/Classes/ParticleTest/ParticleTest.h diff --git a/tests/Classes/PerformanceTest/PerformanceAllocTest.cpp b/samples/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.cpp similarity index 100% rename from tests/Classes/PerformanceTest/PerformanceAllocTest.cpp rename to samples/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.cpp diff --git a/tests/Classes/PerformanceTest/PerformanceAllocTest.h b/samples/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.h similarity index 100% rename from tests/Classes/PerformanceTest/PerformanceAllocTest.h rename to samples/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.h diff --git a/tests/Classes/PerformanceTest/PerformanceContainerTest.cpp b/samples/cpp-tests/Classes/PerformanceTest/PerformanceContainerTest.cpp similarity index 100% rename from tests/Classes/PerformanceTest/PerformanceContainerTest.cpp rename to samples/cpp-tests/Classes/PerformanceTest/PerformanceContainerTest.cpp diff --git a/tests/Classes/PerformanceTest/PerformanceContainerTest.h b/samples/cpp-tests/Classes/PerformanceTest/PerformanceContainerTest.h similarity index 100% rename from tests/Classes/PerformanceTest/PerformanceContainerTest.h rename to samples/cpp-tests/Classes/PerformanceTest/PerformanceContainerTest.h diff --git a/tests/Classes/PerformanceTest/PerformanceEventDispatcherTest.cpp b/samples/cpp-tests/Classes/PerformanceTest/PerformanceEventDispatcherTest.cpp similarity index 100% rename from tests/Classes/PerformanceTest/PerformanceEventDispatcherTest.cpp rename to samples/cpp-tests/Classes/PerformanceTest/PerformanceEventDispatcherTest.cpp diff --git a/tests/Classes/PerformanceTest/PerformanceEventDispatcherTest.h b/samples/cpp-tests/Classes/PerformanceTest/PerformanceEventDispatcherTest.h similarity index 100% rename from tests/Classes/PerformanceTest/PerformanceEventDispatcherTest.h rename to samples/cpp-tests/Classes/PerformanceTest/PerformanceEventDispatcherTest.h diff --git a/tests/Classes/PerformanceTest/PerformanceLabelTest.cpp b/samples/cpp-tests/Classes/PerformanceTest/PerformanceLabelTest.cpp similarity index 100% rename from tests/Classes/PerformanceTest/PerformanceLabelTest.cpp rename to samples/cpp-tests/Classes/PerformanceTest/PerformanceLabelTest.cpp diff --git a/tests/Classes/PerformanceTest/PerformanceLabelTest.h b/samples/cpp-tests/Classes/PerformanceTest/PerformanceLabelTest.h similarity index 100% rename from tests/Classes/PerformanceTest/PerformanceLabelTest.h rename to samples/cpp-tests/Classes/PerformanceTest/PerformanceLabelTest.h diff --git a/tests/Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp b/samples/cpp-tests/Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp similarity index 100% rename from tests/Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp rename to samples/cpp-tests/Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp diff --git a/tests/Classes/PerformanceTest/PerformanceNodeChildrenTest.h b/samples/cpp-tests/Classes/PerformanceTest/PerformanceNodeChildrenTest.h similarity index 100% rename from tests/Classes/PerformanceTest/PerformanceNodeChildrenTest.h rename to samples/cpp-tests/Classes/PerformanceTest/PerformanceNodeChildrenTest.h diff --git a/tests/Classes/PerformanceTest/PerformanceParticleTest.cpp b/samples/cpp-tests/Classes/PerformanceTest/PerformanceParticleTest.cpp similarity index 100% rename from tests/Classes/PerformanceTest/PerformanceParticleTest.cpp rename to samples/cpp-tests/Classes/PerformanceTest/PerformanceParticleTest.cpp diff --git a/tests/Classes/PerformanceTest/PerformanceParticleTest.h b/samples/cpp-tests/Classes/PerformanceTest/PerformanceParticleTest.h similarity index 100% rename from tests/Classes/PerformanceTest/PerformanceParticleTest.h rename to samples/cpp-tests/Classes/PerformanceTest/PerformanceParticleTest.h diff --git a/tests/Classes/PerformanceTest/PerformanceRendererTest.cpp b/samples/cpp-tests/Classes/PerformanceTest/PerformanceRendererTest.cpp similarity index 100% rename from tests/Classes/PerformanceTest/PerformanceRendererTest.cpp rename to samples/cpp-tests/Classes/PerformanceTest/PerformanceRendererTest.cpp diff --git a/tests/Classes/PerformanceTest/PerformanceRendererTest.h b/samples/cpp-tests/Classes/PerformanceTest/PerformanceRendererTest.h similarity index 100% rename from tests/Classes/PerformanceTest/PerformanceRendererTest.h rename to samples/cpp-tests/Classes/PerformanceTest/PerformanceRendererTest.h diff --git a/tests/Classes/PerformanceTest/PerformanceScenarioTest.cpp b/samples/cpp-tests/Classes/PerformanceTest/PerformanceScenarioTest.cpp similarity index 100% rename from tests/Classes/PerformanceTest/PerformanceScenarioTest.cpp rename to samples/cpp-tests/Classes/PerformanceTest/PerformanceScenarioTest.cpp diff --git a/tests/Classes/PerformanceTest/PerformanceScenarioTest.h b/samples/cpp-tests/Classes/PerformanceTest/PerformanceScenarioTest.h similarity index 100% rename from tests/Classes/PerformanceTest/PerformanceScenarioTest.h rename to samples/cpp-tests/Classes/PerformanceTest/PerformanceScenarioTest.h diff --git a/tests/Classes/PerformanceTest/PerformanceSpriteTest.cpp b/samples/cpp-tests/Classes/PerformanceTest/PerformanceSpriteTest.cpp similarity index 100% rename from tests/Classes/PerformanceTest/PerformanceSpriteTest.cpp rename to samples/cpp-tests/Classes/PerformanceTest/PerformanceSpriteTest.cpp diff --git a/tests/Classes/PerformanceTest/PerformanceSpriteTest.h b/samples/cpp-tests/Classes/PerformanceTest/PerformanceSpriteTest.h similarity index 100% rename from tests/Classes/PerformanceTest/PerformanceSpriteTest.h rename to samples/cpp-tests/Classes/PerformanceTest/PerformanceSpriteTest.h diff --git a/tests/Classes/PerformanceTest/PerformanceTest.cpp b/samples/cpp-tests/Classes/PerformanceTest/PerformanceTest.cpp similarity index 100% rename from tests/Classes/PerformanceTest/PerformanceTest.cpp rename to samples/cpp-tests/Classes/PerformanceTest/PerformanceTest.cpp diff --git a/tests/Classes/PerformanceTest/PerformanceTest.h b/samples/cpp-tests/Classes/PerformanceTest/PerformanceTest.h similarity index 100% rename from tests/Classes/PerformanceTest/PerformanceTest.h rename to samples/cpp-tests/Classes/PerformanceTest/PerformanceTest.h diff --git a/tests/Classes/PerformanceTest/PerformanceTextureTest.cpp b/samples/cpp-tests/Classes/PerformanceTest/PerformanceTextureTest.cpp similarity index 100% rename from tests/Classes/PerformanceTest/PerformanceTextureTest.cpp rename to samples/cpp-tests/Classes/PerformanceTest/PerformanceTextureTest.cpp diff --git a/tests/Classes/PerformanceTest/PerformanceTextureTest.h b/samples/cpp-tests/Classes/PerformanceTest/PerformanceTextureTest.h similarity index 100% rename from tests/Classes/PerformanceTest/PerformanceTextureTest.h rename to samples/cpp-tests/Classes/PerformanceTest/PerformanceTextureTest.h diff --git a/tests/Classes/PerformanceTest/PerformanceTouchesTest.cpp b/samples/cpp-tests/Classes/PerformanceTest/PerformanceTouchesTest.cpp similarity index 100% rename from tests/Classes/PerformanceTest/PerformanceTouchesTest.cpp rename to samples/cpp-tests/Classes/PerformanceTest/PerformanceTouchesTest.cpp diff --git a/tests/Classes/PerformanceTest/PerformanceTouchesTest.h b/samples/cpp-tests/Classes/PerformanceTest/PerformanceTouchesTest.h similarity index 100% rename from tests/Classes/PerformanceTest/PerformanceTouchesTest.h rename to samples/cpp-tests/Classes/PerformanceTest/PerformanceTouchesTest.h diff --git a/tests/Classes/PhysicsTest/PhysicsTest.cpp b/samples/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp similarity index 100% rename from tests/Classes/PhysicsTest/PhysicsTest.cpp rename to samples/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp diff --git a/tests/Classes/PhysicsTest/PhysicsTest.h b/samples/cpp-tests/Classes/PhysicsTest/PhysicsTest.h similarity index 100% rename from tests/Classes/PhysicsTest/PhysicsTest.h rename to samples/cpp-tests/Classes/PhysicsTest/PhysicsTest.h diff --git a/tests/Classes/ReleasePoolTest/ReleasePoolTest.cpp b/samples/cpp-tests/Classes/ReleasePoolTest/ReleasePoolTest.cpp similarity index 100% rename from tests/Classes/ReleasePoolTest/ReleasePoolTest.cpp rename to samples/cpp-tests/Classes/ReleasePoolTest/ReleasePoolTest.cpp diff --git a/tests/Classes/ReleasePoolTest/ReleasePoolTest.h b/samples/cpp-tests/Classes/ReleasePoolTest/ReleasePoolTest.h similarity index 100% rename from tests/Classes/ReleasePoolTest/ReleasePoolTest.h rename to samples/cpp-tests/Classes/ReleasePoolTest/ReleasePoolTest.h diff --git a/tests/Classes/RenderTextureTest/RenderTextureTest.cpp b/samples/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.cpp similarity index 100% rename from tests/Classes/RenderTextureTest/RenderTextureTest.cpp rename to samples/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.cpp diff --git a/tests/Classes/RenderTextureTest/RenderTextureTest.h b/samples/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h similarity index 100% rename from tests/Classes/RenderTextureTest/RenderTextureTest.h rename to samples/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h diff --git a/tests/Classes/RotateWorldTest/RotateWorldTest.cpp b/samples/cpp-tests/Classes/RotateWorldTest/RotateWorldTest.cpp similarity index 100% rename from tests/Classes/RotateWorldTest/RotateWorldTest.cpp rename to samples/cpp-tests/Classes/RotateWorldTest/RotateWorldTest.cpp diff --git a/tests/Classes/RotateWorldTest/RotateWorldTest.h b/samples/cpp-tests/Classes/RotateWorldTest/RotateWorldTest.h similarity index 100% rename from tests/Classes/RotateWorldTest/RotateWorldTest.h rename to samples/cpp-tests/Classes/RotateWorldTest/RotateWorldTest.h diff --git a/tests/Classes/SceneTest/SceneTest.cpp b/samples/cpp-tests/Classes/SceneTest/SceneTest.cpp similarity index 100% rename from tests/Classes/SceneTest/SceneTest.cpp rename to samples/cpp-tests/Classes/SceneTest/SceneTest.cpp diff --git a/tests/Classes/SceneTest/SceneTest.h b/samples/cpp-tests/Classes/SceneTest/SceneTest.h similarity index 100% rename from tests/Classes/SceneTest/SceneTest.h rename to samples/cpp-tests/Classes/SceneTest/SceneTest.h diff --git a/tests/Classes/SchedulerTest/SchedulerTest.cpp b/samples/cpp-tests/Classes/SchedulerTest/SchedulerTest.cpp similarity index 100% rename from tests/Classes/SchedulerTest/SchedulerTest.cpp rename to samples/cpp-tests/Classes/SchedulerTest/SchedulerTest.cpp diff --git a/tests/Classes/SchedulerTest/SchedulerTest.h b/samples/cpp-tests/Classes/SchedulerTest/SchedulerTest.h similarity index 100% rename from tests/Classes/SchedulerTest/SchedulerTest.h rename to samples/cpp-tests/Classes/SchedulerTest/SchedulerTest.h diff --git a/tests/Classes/ShaderTest/ShaderTest.cpp b/samples/cpp-tests/Classes/ShaderTest/ShaderTest.cpp similarity index 100% rename from tests/Classes/ShaderTest/ShaderTest.cpp rename to samples/cpp-tests/Classes/ShaderTest/ShaderTest.cpp diff --git a/tests/Classes/ShaderTest/ShaderTest.h b/samples/cpp-tests/Classes/ShaderTest/ShaderTest.h similarity index 100% rename from tests/Classes/ShaderTest/ShaderTest.h rename to samples/cpp-tests/Classes/ShaderTest/ShaderTest.h diff --git a/tests/Classes/ShaderTest/ShaderTest2.cpp b/samples/cpp-tests/Classes/ShaderTest/ShaderTest2.cpp similarity index 100% rename from tests/Classes/ShaderTest/ShaderTest2.cpp rename to samples/cpp-tests/Classes/ShaderTest/ShaderTest2.cpp diff --git a/tests/Classes/ShaderTest/ShaderTest2.h b/samples/cpp-tests/Classes/ShaderTest/ShaderTest2.h similarity index 100% rename from tests/Classes/ShaderTest/ShaderTest2.h rename to samples/cpp-tests/Classes/ShaderTest/ShaderTest2.h diff --git a/tests/Classes/SpineTest/SpineTest.cpp b/samples/cpp-tests/Classes/SpineTest/SpineTest.cpp similarity index 100% rename from tests/Classes/SpineTest/SpineTest.cpp rename to samples/cpp-tests/Classes/SpineTest/SpineTest.cpp diff --git a/tests/Classes/SpineTest/SpineTest.h b/samples/cpp-tests/Classes/SpineTest/SpineTest.h similarity index 100% rename from tests/Classes/SpineTest/SpineTest.h rename to samples/cpp-tests/Classes/SpineTest/SpineTest.h diff --git a/tests/Classes/SpriteTest/SpriteTest.cpp.REMOVED.git-id b/samples/cpp-tests/Classes/SpriteTest/SpriteTest.cpp.REMOVED.git-id similarity index 100% rename from tests/Classes/SpriteTest/SpriteTest.cpp.REMOVED.git-id rename to samples/cpp-tests/Classes/SpriteTest/SpriteTest.cpp.REMOVED.git-id diff --git a/tests/Classes/SpriteTest/SpriteTest.h b/samples/cpp-tests/Classes/SpriteTest/SpriteTest.h similarity index 100% rename from tests/Classes/SpriteTest/SpriteTest.h rename to samples/cpp-tests/Classes/SpriteTest/SpriteTest.h diff --git a/tests/Classes/TextInputTest/TextInputTest.cpp b/samples/cpp-tests/Classes/TextInputTest/TextInputTest.cpp similarity index 100% rename from tests/Classes/TextInputTest/TextInputTest.cpp rename to samples/cpp-tests/Classes/TextInputTest/TextInputTest.cpp diff --git a/tests/Classes/TextInputTest/TextInputTest.h b/samples/cpp-tests/Classes/TextInputTest/TextInputTest.h similarity index 100% rename from tests/Classes/TextInputTest/TextInputTest.h rename to samples/cpp-tests/Classes/TextInputTest/TextInputTest.h diff --git a/tests/Classes/Texture2dTest/Texture2dTest.cpp b/samples/cpp-tests/Classes/Texture2dTest/Texture2dTest.cpp similarity index 100% rename from tests/Classes/Texture2dTest/Texture2dTest.cpp rename to samples/cpp-tests/Classes/Texture2dTest/Texture2dTest.cpp diff --git a/tests/Classes/Texture2dTest/Texture2dTest.h b/samples/cpp-tests/Classes/Texture2dTest/Texture2dTest.h similarity index 100% rename from tests/Classes/Texture2dTest/Texture2dTest.h rename to samples/cpp-tests/Classes/Texture2dTest/Texture2dTest.h diff --git a/tests/Classes/TextureCacheTest/TextureCacheTest.cpp b/samples/cpp-tests/Classes/TextureCacheTest/TextureCacheTest.cpp similarity index 100% rename from tests/Classes/TextureCacheTest/TextureCacheTest.cpp rename to samples/cpp-tests/Classes/TextureCacheTest/TextureCacheTest.cpp diff --git a/tests/Classes/TextureCacheTest/TextureCacheTest.h b/samples/cpp-tests/Classes/TextureCacheTest/TextureCacheTest.h similarity index 100% rename from tests/Classes/TextureCacheTest/TextureCacheTest.h rename to samples/cpp-tests/Classes/TextureCacheTest/TextureCacheTest.h diff --git a/tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp b/samples/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp similarity index 100% rename from tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp rename to samples/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp diff --git a/tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h b/samples/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h similarity index 100% rename from tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h rename to samples/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h diff --git a/tests/Classes/TileMapTest/TileMapTest.cpp b/samples/cpp-tests/Classes/TileMapTest/TileMapTest.cpp similarity index 100% rename from tests/Classes/TileMapTest/TileMapTest.cpp rename to samples/cpp-tests/Classes/TileMapTest/TileMapTest.cpp diff --git a/tests/Classes/TileMapTest/TileMapTest.h b/samples/cpp-tests/Classes/TileMapTest/TileMapTest.h similarity index 100% rename from tests/Classes/TileMapTest/TileMapTest.h rename to samples/cpp-tests/Classes/TileMapTest/TileMapTest.h diff --git a/tests/Classes/TouchesTest/Ball.cpp b/samples/cpp-tests/Classes/TouchesTest/Ball.cpp similarity index 100% rename from tests/Classes/TouchesTest/Ball.cpp rename to samples/cpp-tests/Classes/TouchesTest/Ball.cpp diff --git a/tests/Classes/TouchesTest/Ball.h b/samples/cpp-tests/Classes/TouchesTest/Ball.h similarity index 100% rename from tests/Classes/TouchesTest/Ball.h rename to samples/cpp-tests/Classes/TouchesTest/Ball.h diff --git a/tests/Classes/TouchesTest/Paddle.cpp b/samples/cpp-tests/Classes/TouchesTest/Paddle.cpp similarity index 100% rename from tests/Classes/TouchesTest/Paddle.cpp rename to samples/cpp-tests/Classes/TouchesTest/Paddle.cpp diff --git a/tests/Classes/TouchesTest/Paddle.h b/samples/cpp-tests/Classes/TouchesTest/Paddle.h similarity index 100% rename from tests/Classes/TouchesTest/Paddle.h rename to samples/cpp-tests/Classes/TouchesTest/Paddle.h diff --git a/tests/Classes/TouchesTest/TouchesTest.cpp b/samples/cpp-tests/Classes/TouchesTest/TouchesTest.cpp similarity index 100% rename from tests/Classes/TouchesTest/TouchesTest.cpp rename to samples/cpp-tests/Classes/TouchesTest/TouchesTest.cpp diff --git a/tests/Classes/TouchesTest/TouchesTest.h b/samples/cpp-tests/Classes/TouchesTest/TouchesTest.h similarity index 100% rename from tests/Classes/TouchesTest/TouchesTest.h rename to samples/cpp-tests/Classes/TouchesTest/TouchesTest.h diff --git a/tests/Classes/TransitionsTest/TransitionsTest.cpp b/samples/cpp-tests/Classes/TransitionsTest/TransitionsTest.cpp similarity index 100% rename from tests/Classes/TransitionsTest/TransitionsTest.cpp rename to samples/cpp-tests/Classes/TransitionsTest/TransitionsTest.cpp diff --git a/tests/Classes/TransitionsTest/TransitionsTest.h b/samples/cpp-tests/Classes/TransitionsTest/TransitionsTest.h similarity index 100% rename from tests/Classes/TransitionsTest/TransitionsTest.h rename to samples/cpp-tests/Classes/TransitionsTest/TransitionsTest.h diff --git a/tests/Classes/UnitTest/UnitTest.cpp b/samples/cpp-tests/Classes/UnitTest/UnitTest.cpp similarity index 100% rename from tests/Classes/UnitTest/UnitTest.cpp rename to samples/cpp-tests/Classes/UnitTest/UnitTest.cpp diff --git a/tests/Classes/UnitTest/UnitTest.h b/samples/cpp-tests/Classes/UnitTest/UnitTest.h similarity index 100% rename from tests/Classes/UnitTest/UnitTest.h rename to samples/cpp-tests/Classes/UnitTest/UnitTest.h diff --git a/tests/Classes/UserDefaultTest/UserDefaultTest.cpp b/samples/cpp-tests/Classes/UserDefaultTest/UserDefaultTest.cpp similarity index 100% rename from tests/Classes/UserDefaultTest/UserDefaultTest.cpp rename to samples/cpp-tests/Classes/UserDefaultTest/UserDefaultTest.cpp diff --git a/tests/Classes/UserDefaultTest/UserDefaultTest.h b/samples/cpp-tests/Classes/UserDefaultTest/UserDefaultTest.h similarity index 100% rename from tests/Classes/UserDefaultTest/UserDefaultTest.h rename to samples/cpp-tests/Classes/UserDefaultTest/UserDefaultTest.h diff --git a/tests/Classes/VisibleRect.cpp b/samples/cpp-tests/Classes/VisibleRect.cpp similarity index 100% rename from tests/Classes/VisibleRect.cpp rename to samples/cpp-tests/Classes/VisibleRect.cpp diff --git a/tests/Classes/VisibleRect.h b/samples/cpp-tests/Classes/VisibleRect.h similarity index 100% rename from tests/Classes/VisibleRect.h rename to samples/cpp-tests/Classes/VisibleRect.h diff --git a/tests/Classes/ZwoptexTest/ZwoptexTest.cpp b/samples/cpp-tests/Classes/ZwoptexTest/ZwoptexTest.cpp similarity index 100% rename from tests/Classes/ZwoptexTest/ZwoptexTest.cpp rename to samples/cpp-tests/Classes/ZwoptexTest/ZwoptexTest.cpp diff --git a/tests/Classes/ZwoptexTest/ZwoptexTest.h b/samples/cpp-tests/Classes/ZwoptexTest/ZwoptexTest.h similarity index 100% rename from tests/Classes/ZwoptexTest/ZwoptexTest.h rename to samples/cpp-tests/Classes/ZwoptexTest/ZwoptexTest.h diff --git a/tests/Classes/controller.cpp b/samples/cpp-tests/Classes/controller.cpp similarity index 100% rename from tests/Classes/controller.cpp rename to samples/cpp-tests/Classes/controller.cpp diff --git a/tests/Classes/controller.h b/samples/cpp-tests/Classes/controller.h similarity index 100% rename from tests/Classes/controller.h rename to samples/cpp-tests/Classes/controller.h diff --git a/tests/Classes/testBasic.cpp b/samples/cpp-tests/Classes/testBasic.cpp similarity index 100% rename from tests/Classes/testBasic.cpp rename to samples/cpp-tests/Classes/testBasic.cpp diff --git a/tests/Classes/testBasic.h b/samples/cpp-tests/Classes/testBasic.h similarity index 100% rename from tests/Classes/testBasic.h rename to samples/cpp-tests/Classes/testBasic.h diff --git a/tests/Classes/testResource.h b/samples/cpp-tests/Classes/testResource.h similarity index 100% rename from tests/Classes/testResource.h rename to samples/cpp-tests/Classes/testResource.h diff --git a/tests/Classes/tests.h b/samples/cpp-tests/Classes/tests.h similarity index 100% rename from tests/Classes/tests.h rename to samples/cpp-tests/Classes/tests.h diff --git a/tests/Resources/.gitignore b/samples/cpp-tests/Resources/.gitignore similarity index 100% rename from tests/Resources/.gitignore rename to samples/cpp-tests/Resources/.gitignore diff --git a/tests/Resources/Hello.png.REMOVED.git-id b/samples/cpp-tests/Resources/Hello.png.REMOVED.git-id similarity index 100% rename from tests/Resources/Hello.png.REMOVED.git-id rename to samples/cpp-tests/Resources/Hello.png.REMOVED.git-id diff --git a/tests/Resources/Images/HelloWorld.png.REMOVED.git-id b/samples/cpp-tests/Resources/Images/HelloWorld.png.REMOVED.git-id similarity index 100% rename from tests/Resources/Images/HelloWorld.png.REMOVED.git-id rename to samples/cpp-tests/Resources/Images/HelloWorld.png.REMOVED.git-id diff --git a/tests/Resources/Images/PlanetCute-1024x1024.png.REMOVED.git-id b/samples/cpp-tests/Resources/Images/PlanetCute-1024x1024.png.REMOVED.git-id similarity index 100% rename from tests/Resources/Images/PlanetCute-1024x1024.png.REMOVED.git-id rename to samples/cpp-tests/Resources/Images/PlanetCute-1024x1024.png.REMOVED.git-id diff --git a/tests/Resources/Images/atlastest.png.REMOVED.git-id b/samples/cpp-tests/Resources/Images/atlastest.png.REMOVED.git-id similarity index 100% rename from tests/Resources/Images/atlastest.png.REMOVED.git-id rename to samples/cpp-tests/Resources/Images/atlastest.png.REMOVED.git-id diff --git a/tests/Resources/Images/background1.png.REMOVED.git-id b/samples/cpp-tests/Resources/Images/background1.png.REMOVED.git-id similarity index 100% rename from tests/Resources/Images/background1.png.REMOVED.git-id rename to samples/cpp-tests/Resources/Images/background1.png.REMOVED.git-id diff --git a/tests/Resources/Images/background2.jpg.REMOVED.git-id b/samples/cpp-tests/Resources/Images/background2.jpg.REMOVED.git-id similarity index 100% rename from tests/Resources/Images/background2.jpg.REMOVED.git-id rename to samples/cpp-tests/Resources/Images/background2.jpg.REMOVED.git-id diff --git a/tests/Resources/Images/background2.png.REMOVED.git-id b/samples/cpp-tests/Resources/Images/background2.png.REMOVED.git-id similarity index 100% rename from tests/Resources/Images/background2.png.REMOVED.git-id rename to samples/cpp-tests/Resources/Images/background2.png.REMOVED.git-id diff --git a/tests/Resources/Images/bugs/bug886.png.REMOVED.git-id b/samples/cpp-tests/Resources/Images/bugs/bug886.png.REMOVED.git-id similarity index 100% rename from tests/Resources/Images/bugs/bug886.png.REMOVED.git-id rename to samples/cpp-tests/Resources/Images/bugs/bug886.png.REMOVED.git-id diff --git a/tests/Resources/Images/grossini_dance_atlas-mono.png.REMOVED.git-id b/samples/cpp-tests/Resources/Images/grossini_dance_atlas-mono.png.REMOVED.git-id similarity index 100% rename from tests/Resources/Images/grossini_dance_atlas-mono.png.REMOVED.git-id rename to samples/cpp-tests/Resources/Images/grossini_dance_atlas-mono.png.REMOVED.git-id diff --git a/tests/Resources/Images/landscape-1024x1024.png.REMOVED.git-id b/samples/cpp-tests/Resources/Images/landscape-1024x1024.png.REMOVED.git-id similarity index 100% rename from tests/Resources/Images/landscape-1024x1024.png.REMOVED.git-id rename to samples/cpp-tests/Resources/Images/landscape-1024x1024.png.REMOVED.git-id diff --git a/tests/Resources/Images/noise.png.REMOVED.git-id b/samples/cpp-tests/Resources/Images/noise.png.REMOVED.git-id similarity index 100% rename from tests/Resources/Images/noise.png.REMOVED.git-id rename to samples/cpp-tests/Resources/Images/noise.png.REMOVED.git-id diff --git a/tests/Resources/Images/spritesheet1.png.REMOVED.git-id b/samples/cpp-tests/Resources/Images/spritesheet1.png.REMOVED.git-id similarity index 100% rename from tests/Resources/Images/spritesheet1.png.REMOVED.git-id rename to samples/cpp-tests/Resources/Images/spritesheet1.png.REMOVED.git-id diff --git a/tests/Resources/Images/stone.png.REMOVED.git-id b/samples/cpp-tests/Resources/Images/stone.png.REMOVED.git-id similarity index 100% rename from tests/Resources/Images/stone.png.REMOVED.git-id rename to samples/cpp-tests/Resources/Images/stone.png.REMOVED.git-id diff --git a/tests/Resources/Images/test_1021x1024.png.REMOVED.git-id b/samples/cpp-tests/Resources/Images/test_1021x1024.png.REMOVED.git-id similarity index 100% rename from tests/Resources/Images/test_1021x1024.png.REMOVED.git-id rename to samples/cpp-tests/Resources/Images/test_1021x1024.png.REMOVED.git-id diff --git a/tests/Resources/Images/test_1021x1024_a8.pvr.REMOVED.git-id b/samples/cpp-tests/Resources/Images/test_1021x1024_a8.pvr.REMOVED.git-id similarity index 100% rename from tests/Resources/Images/test_1021x1024_a8.pvr.REMOVED.git-id rename to samples/cpp-tests/Resources/Images/test_1021x1024_a8.pvr.REMOVED.git-id diff --git a/tests/Resources/Images/test_1021x1024_rgb888.pvr.REMOVED.git-id b/samples/cpp-tests/Resources/Images/test_1021x1024_rgb888.pvr.REMOVED.git-id similarity index 100% rename from tests/Resources/Images/test_1021x1024_rgb888.pvr.REMOVED.git-id rename to samples/cpp-tests/Resources/Images/test_1021x1024_rgb888.pvr.REMOVED.git-id diff --git a/tests/Resources/Images/test_1021x1024_rgb888.pvr.gz.REMOVED.git-id b/samples/cpp-tests/Resources/Images/test_1021x1024_rgb888.pvr.gz.REMOVED.git-id similarity index 100% rename from tests/Resources/Images/test_1021x1024_rgb888.pvr.gz.REMOVED.git-id rename to samples/cpp-tests/Resources/Images/test_1021x1024_rgb888.pvr.gz.REMOVED.git-id diff --git a/tests/Resources/Images/test_1021x1024_rgba4444.pvr.REMOVED.git-id b/samples/cpp-tests/Resources/Images/test_1021x1024_rgba4444.pvr.REMOVED.git-id similarity index 100% rename from tests/Resources/Images/test_1021x1024_rgba4444.pvr.REMOVED.git-id rename to samples/cpp-tests/Resources/Images/test_1021x1024_rgba4444.pvr.REMOVED.git-id diff --git a/tests/Resources/Images/test_1021x1024_rgba4444.pvr.gz.REMOVED.git-id b/samples/cpp-tests/Resources/Images/test_1021x1024_rgba4444.pvr.gz.REMOVED.git-id similarity index 100% rename from tests/Resources/Images/test_1021x1024_rgba4444.pvr.gz.REMOVED.git-id rename to samples/cpp-tests/Resources/Images/test_1021x1024_rgba4444.pvr.gz.REMOVED.git-id diff --git a/tests/Resources/Images/test_1021x1024_rgba8888.pvr.REMOVED.git-id b/samples/cpp-tests/Resources/Images/test_1021x1024_rgba8888.pvr.REMOVED.git-id similarity index 100% rename from tests/Resources/Images/test_1021x1024_rgba8888.pvr.REMOVED.git-id rename to samples/cpp-tests/Resources/Images/test_1021x1024_rgba8888.pvr.REMOVED.git-id diff --git a/tests/Resources/Images/test_1021x1024_rgba8888.pvr.gz.REMOVED.git-id b/samples/cpp-tests/Resources/Images/test_1021x1024_rgba8888.pvr.gz.REMOVED.git-id similarity index 100% rename from tests/Resources/Images/test_1021x1024_rgba8888.pvr.gz.REMOVED.git-id rename to samples/cpp-tests/Resources/Images/test_1021x1024_rgba8888.pvr.gz.REMOVED.git-id diff --git a/tests/Resources/Images/test_512x512_s3tc_dxt5_with_no_mipmaps.dds.REMOVED.git-id b/samples/cpp-tests/Resources/Images/test_512x512_s3tc_dxt5_with_no_mipmaps.dds.REMOVED.git-id similarity index 100% rename from tests/Resources/Images/test_512x512_s3tc_dxt5_with_no_mipmaps.dds.REMOVED.git-id rename to samples/cpp-tests/Resources/Images/test_512x512_s3tc_dxt5_with_no_mipmaps.dds.REMOVED.git-id diff --git a/tests/Resources/Misc/resources-hd/test4.txt b/samples/cpp-tests/Resources/Misc/resources-hd/test4.txt similarity index 100% rename from tests/Resources/Misc/resources-hd/test4.txt rename to samples/cpp-tests/Resources/Misc/resources-hd/test4.txt diff --git a/tests/Resources/Misc/resources-ipad/test2.txt b/samples/cpp-tests/Resources/Misc/resources-ipad/test2.txt similarity index 100% rename from tests/Resources/Misc/resources-ipad/test2.txt rename to samples/cpp-tests/Resources/Misc/resources-ipad/test2.txt diff --git a/tests/Resources/Misc/resources-ipadhd/test1.txt b/samples/cpp-tests/Resources/Misc/resources-ipadhd/test1.txt similarity index 100% rename from tests/Resources/Misc/resources-ipadhd/test1.txt rename to samples/cpp-tests/Resources/Misc/resources-ipadhd/test1.txt diff --git a/tests/Resources/Misc/resources-iphone/test6.txt b/samples/cpp-tests/Resources/Misc/resources-iphone/test6.txt similarity index 100% rename from tests/Resources/Misc/resources-iphone/test6.txt rename to samples/cpp-tests/Resources/Misc/resources-iphone/test6.txt diff --git a/tests/Resources/Misc/resources-mac/test2.txt b/samples/cpp-tests/Resources/Misc/resources-mac/test2.txt similarity index 100% rename from tests/Resources/Misc/resources-mac/test2.txt rename to samples/cpp-tests/Resources/Misc/resources-mac/test2.txt diff --git a/tests/Resources/Misc/resources-machd/test1.txt b/samples/cpp-tests/Resources/Misc/resources-machd/test1.txt similarity index 100% rename from tests/Resources/Misc/resources-machd/test1.txt rename to samples/cpp-tests/Resources/Misc/resources-machd/test1.txt diff --git a/tests/Resources/Misc/resources-wide/test5.txt b/samples/cpp-tests/Resources/Misc/resources-wide/test5.txt similarity index 100% rename from tests/Resources/Misc/resources-wide/test5.txt rename to samples/cpp-tests/Resources/Misc/resources-wide/test5.txt diff --git a/tests/Resources/Misc/resources-widehd/test3.txt b/samples/cpp-tests/Resources/Misc/resources-widehd/test3.txt similarity index 100% rename from tests/Resources/Misc/resources-widehd/test3.txt rename to samples/cpp-tests/Resources/Misc/resources-widehd/test3.txt diff --git a/tests/Resources/Misc/searchpath1/file1.txt b/samples/cpp-tests/Resources/Misc/searchpath1/file1.txt similarity index 100% rename from tests/Resources/Misc/searchpath1/file1.txt rename to samples/cpp-tests/Resources/Misc/searchpath1/file1.txt diff --git a/tests/Resources/Misc/searchpath2/resources-ipad/file2.txt b/samples/cpp-tests/Resources/Misc/searchpath2/resources-ipad/file2.txt similarity index 100% rename from tests/Resources/Misc/searchpath2/resources-ipad/file2.txt rename to samples/cpp-tests/Resources/Misc/searchpath2/resources-ipad/file2.txt diff --git a/tests/Resources/Shaders/example_ColorBars.vsh b/samples/cpp-tests/Resources/Shaders/example_ColorBars.vsh similarity index 100% rename from tests/Resources/Shaders/example_ColorBars.vsh rename to samples/cpp-tests/Resources/Shaders/example_ColorBars.vsh diff --git a/tests/Resources/Shaders/example_Flower.vsh b/samples/cpp-tests/Resources/Shaders/example_Flower.vsh similarity index 100% rename from tests/Resources/Shaders/example_Flower.vsh rename to samples/cpp-tests/Resources/Shaders/example_Flower.vsh diff --git a/tests/Resources/Shaders/example_Heart.vsh b/samples/cpp-tests/Resources/Shaders/example_Heart.vsh similarity index 100% rename from tests/Resources/Shaders/example_Heart.vsh rename to samples/cpp-tests/Resources/Shaders/example_Heart.vsh diff --git a/tests/Resources/Shaders/example_Julia.vsh b/samples/cpp-tests/Resources/Shaders/example_Julia.vsh similarity index 100% rename from tests/Resources/Shaders/example_Julia.vsh rename to samples/cpp-tests/Resources/Shaders/example_Julia.vsh diff --git a/tests/Resources/Shaders/example_Mandelbrot.vsh b/samples/cpp-tests/Resources/Shaders/example_Mandelbrot.vsh similarity index 100% rename from tests/Resources/Shaders/example_Mandelbrot.vsh rename to samples/cpp-tests/Resources/Shaders/example_Mandelbrot.vsh diff --git a/tests/Resources/Shaders/example_Monjori.vsh b/samples/cpp-tests/Resources/Shaders/example_Monjori.vsh similarity index 100% rename from tests/Resources/Shaders/example_Monjori.vsh rename to samples/cpp-tests/Resources/Shaders/example_Monjori.vsh diff --git a/tests/Resources/Shaders/example_Plasma.vsh b/samples/cpp-tests/Resources/Shaders/example_Plasma.vsh similarity index 100% rename from tests/Resources/Shaders/example_Plasma.vsh rename to samples/cpp-tests/Resources/Shaders/example_Plasma.vsh diff --git a/tests/Resources/Shaders/example_Twist.vsh b/samples/cpp-tests/Resources/Shaders/example_Twist.vsh similarity index 100% rename from tests/Resources/Shaders/example_Twist.vsh rename to samples/cpp-tests/Resources/Shaders/example_Twist.vsh diff --git a/tests/Resources/TileMaps/hexa-tiles.png.REMOVED.git-id b/samples/cpp-tests/Resources/TileMaps/hexa-tiles.png.REMOVED.git-id similarity index 100% rename from tests/Resources/TileMaps/hexa-tiles.png.REMOVED.git-id rename to samples/cpp-tests/Resources/TileMaps/hexa-tiles.png.REMOVED.git-id diff --git a/tests/Resources/TileMaps/map/slcj.png.REMOVED.git-id b/samples/cpp-tests/Resources/TileMaps/map/slcj.png.REMOVED.git-id similarity index 100% rename from tests/Resources/TileMaps/map/slcj.png.REMOVED.git-id rename to samples/cpp-tests/Resources/TileMaps/map/slcj.png.REMOVED.git-id diff --git a/tests/Resources/TileMaps/ortho-test1.png.REMOVED.git-id b/samples/cpp-tests/Resources/TileMaps/ortho-test1.png.REMOVED.git-id similarity index 100% rename from tests/Resources/TileMaps/ortho-test1.png.REMOVED.git-id rename to samples/cpp-tests/Resources/TileMaps/ortho-test1.png.REMOVED.git-id diff --git a/tests/Resources/TileMaps/ortho-test1_bw.png.REMOVED.git-id b/samples/cpp-tests/Resources/TileMaps/ortho-test1_bw.png.REMOVED.git-id similarity index 100% rename from tests/Resources/TileMaps/ortho-test1_bw.png.REMOVED.git-id rename to samples/cpp-tests/Resources/TileMaps/ortho-test1_bw.png.REMOVED.git-id diff --git a/tests/Resources/animations/grossini.plist.xml b/samples/cpp-tests/Resources/animations/grossini.plist.xml similarity index 100% rename from tests/Resources/animations/grossini.plist.xml rename to samples/cpp-tests/Resources/animations/grossini.plist.xml diff --git a/tests/Resources/armature/Cowboy.ExportJson.REMOVED.git-id b/samples/cpp-tests/Resources/armature/Cowboy.ExportJson.REMOVED.git-id similarity index 100% rename from tests/Resources/armature/Cowboy.ExportJson.REMOVED.git-id rename to samples/cpp-tests/Resources/armature/Cowboy.ExportJson.REMOVED.git-id diff --git a/tests/Resources/armature/Cowboy0.png.REMOVED.git-id b/samples/cpp-tests/Resources/armature/Cowboy0.png.REMOVED.git-id similarity index 100% rename from tests/Resources/armature/Cowboy0.png.REMOVED.git-id rename to samples/cpp-tests/Resources/armature/Cowboy0.png.REMOVED.git-id diff --git a/tests/Resources/armature/Dragon.xml b/samples/cpp-tests/Resources/armature/Dragon.xml similarity index 100% rename from tests/Resources/armature/Dragon.xml rename to samples/cpp-tests/Resources/armature/Dragon.xml diff --git a/tests/Resources/armature/HeroAnimation.ExportJson.REMOVED.git-id b/samples/cpp-tests/Resources/armature/HeroAnimation.ExportJson.REMOVED.git-id similarity index 100% rename from tests/Resources/armature/HeroAnimation.ExportJson.REMOVED.git-id rename to samples/cpp-tests/Resources/armature/HeroAnimation.ExportJson.REMOVED.git-id diff --git a/tests/Resources/armature/cyborg.xml b/samples/cpp-tests/Resources/armature/cyborg.xml similarity index 100% rename from tests/Resources/armature/cyborg.xml rename to samples/cpp-tests/Resources/armature/cyborg.xml diff --git a/tests/Resources/armature/knight.xml b/samples/cpp-tests/Resources/armature/knight.xml similarity index 100% rename from tests/Resources/armature/knight.xml rename to samples/cpp-tests/Resources/armature/knight.xml diff --git a/tests/Resources/armature/robot.xml b/samples/cpp-tests/Resources/armature/robot.xml similarity index 100% rename from tests/Resources/armature/robot.xml rename to samples/cpp-tests/Resources/armature/robot.xml diff --git a/tests/Resources/armature/weapon.xml b/samples/cpp-tests/Resources/armature/weapon.xml similarity index 100% rename from tests/Resources/armature/weapon.xml rename to samples/cpp-tests/Resources/armature/weapon.xml diff --git a/tests/Resources/background-music-aac.wav.REMOVED.git-id b/samples/cpp-tests/Resources/background-music-aac.wav.REMOVED.git-id similarity index 100% rename from tests/Resources/background-music-aac.wav.REMOVED.git-id rename to samples/cpp-tests/Resources/background-music-aac.wav.REMOVED.git-id diff --git a/tests/Resources/background.mp3.REMOVED.git-id b/samples/cpp-tests/Resources/background.mp3.REMOVED.git-id similarity index 100% rename from tests/Resources/background.mp3.REMOVED.git-id rename to samples/cpp-tests/Resources/background.mp3.REMOVED.git-id diff --git a/tests/Resources/ccb/flower.jpg.REMOVED.git-id b/samples/cpp-tests/Resources/ccb/flower.jpg.REMOVED.git-id similarity index 100% rename from tests/Resources/ccb/flower.jpg.REMOVED.git-id rename to samples/cpp-tests/Resources/ccb/flower.jpg.REMOVED.git-id diff --git a/tests/Resources/ccb/gem-0.wav.REMOVED.git-id b/samples/cpp-tests/Resources/ccb/gem-0.wav.REMOVED.git-id similarity index 100% rename from tests/Resources/ccb/gem-0.wav.REMOVED.git-id rename to samples/cpp-tests/Resources/ccb/gem-0.wav.REMOVED.git-id diff --git a/tests/Resources/ccb/gem-1.wav.REMOVED.git-id b/samples/cpp-tests/Resources/ccb/gem-1.wav.REMOVED.git-id similarity index 100% rename from tests/Resources/ccb/gem-1.wav.REMOVED.git-id rename to samples/cpp-tests/Resources/ccb/gem-1.wav.REMOVED.git-id diff --git a/tests/Resources/ccb/markerfelt24shadow.fnt.REMOVED.git-id b/samples/cpp-tests/Resources/ccb/markerfelt24shadow.fnt.REMOVED.git-id similarity index 100% rename from tests/Resources/ccb/markerfelt24shadow.fnt.REMOVED.git-id rename to samples/cpp-tests/Resources/ccb/markerfelt24shadow.fnt.REMOVED.git-id diff --git a/tests/Resources/cocosgui/Hello.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/Hello.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/Hello.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/Hello.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIButton_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/UIEditorTest/UICheckBox_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIImageView_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelAtlas_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabelBMFont_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILabel_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/UIEditorTest/UILoadingBar_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIPageView_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/UIEditorTest/UISlider_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/UIEditorTest/UITextField_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/UITest/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/UITest/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/UITest/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/UITest/background.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/b11.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/b11.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/b11.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/b11.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/bitmapFontTest2.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/bitmapFontTest2.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/bitmapFontTest2.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/bitmapFontTest2.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/examples/examples.json.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/examples/examples.json.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/examples/examples.json.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/examples/examples.json.REMOVED.git-id diff --git a/tests/Resources/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id diff --git a/tests/Resources/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id diff --git a/tests/Resources/commonly_used_words.txt b/samples/cpp-tests/Resources/commonly_used_words.txt similarity index 100% rename from tests/Resources/commonly_used_words.txt rename to samples/cpp-tests/Resources/commonly_used_words.txt diff --git a/tests/Resources/extensions/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/extensions/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/extensions/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/extensions/background.png.REMOVED.git-id diff --git a/tests/Resources/fonts/Courier New.ttf.REMOVED.git-id b/samples/cpp-tests/Resources/fonts/Courier New.ttf.REMOVED.git-id similarity index 100% rename from tests/Resources/fonts/Courier New.ttf.REMOVED.git-id rename to samples/cpp-tests/Resources/fonts/Courier New.ttf.REMOVED.git-id diff --git a/tests/Resources/fonts/Thonburi.ttf.REMOVED.git-id b/samples/cpp-tests/Resources/fonts/Thonburi.ttf.REMOVED.git-id similarity index 100% rename from tests/Resources/fonts/Thonburi.ttf.REMOVED.git-id rename to samples/cpp-tests/Resources/fonts/Thonburi.ttf.REMOVED.git-id diff --git a/tests/Resources/fonts/ThonburiBold.ttf.REMOVED.git-id b/samples/cpp-tests/Resources/fonts/ThonburiBold.ttf.REMOVED.git-id similarity index 100% rename from tests/Resources/fonts/ThonburiBold.ttf.REMOVED.git-id rename to samples/cpp-tests/Resources/fonts/ThonburiBold.ttf.REMOVED.git-id diff --git a/tests/Resources/fonts/arial-26-en-ru_0.png.REMOVED.git-id b/samples/cpp-tests/Resources/fonts/arial-26-en-ru_0.png.REMOVED.git-id similarity index 100% rename from tests/Resources/fonts/arial-26-en-ru_0.png.REMOVED.git-id rename to samples/cpp-tests/Resources/fonts/arial-26-en-ru_0.png.REMOVED.git-id diff --git a/tests/Resources/fonts/arial-unicode-26.GlyphProject b/samples/cpp-tests/Resources/fonts/arial-unicode-26.GlyphProject similarity index 100% rename from tests/Resources/fonts/arial-unicode-26.GlyphProject rename to samples/cpp-tests/Resources/fonts/arial-unicode-26.GlyphProject diff --git a/tests/Resources/fonts/arial-unicode-26.png.REMOVED.git-id b/samples/cpp-tests/Resources/fonts/arial-unicode-26.png.REMOVED.git-id similarity index 100% rename from tests/Resources/fonts/arial-unicode-26.png.REMOVED.git-id rename to samples/cpp-tests/Resources/fonts/arial-unicode-26.png.REMOVED.git-id diff --git a/tests/Resources/fonts/arial.ttf.REMOVED.git-id b/samples/cpp-tests/Resources/fonts/arial.ttf.REMOVED.git-id similarity index 100% rename from tests/Resources/fonts/arial.ttf.REMOVED.git-id rename to samples/cpp-tests/Resources/fonts/arial.ttf.REMOVED.git-id diff --git a/tests/Resources/fonts/bitmapFontChinese.png.REMOVED.git-id b/samples/cpp-tests/Resources/fonts/bitmapFontChinese.png.REMOVED.git-id similarity index 100% rename from tests/Resources/fonts/bitmapFontChinese.png.REMOVED.git-id rename to samples/cpp-tests/Resources/fonts/bitmapFontChinese.png.REMOVED.git-id diff --git a/tests/Resources/fonts/bitmapFontTest.png.REMOVED.git-id b/samples/cpp-tests/Resources/fonts/bitmapFontTest.png.REMOVED.git-id similarity index 100% rename from tests/Resources/fonts/bitmapFontTest.png.REMOVED.git-id rename to samples/cpp-tests/Resources/fonts/bitmapFontTest.png.REMOVED.git-id diff --git a/tests/Resources/fonts/bitmapFontTest2.bmp.REMOVED.git-id b/samples/cpp-tests/Resources/fonts/bitmapFontTest2.bmp.REMOVED.git-id similarity index 100% rename from tests/Resources/fonts/bitmapFontTest2.bmp.REMOVED.git-id rename to samples/cpp-tests/Resources/fonts/bitmapFontTest2.bmp.REMOVED.git-id diff --git a/tests/Resources/fonts/bitmapFontTest2.png.REMOVED.git-id b/samples/cpp-tests/Resources/fonts/bitmapFontTest2.png.REMOVED.git-id similarity index 100% rename from tests/Resources/fonts/bitmapFontTest2.png.REMOVED.git-id rename to samples/cpp-tests/Resources/fonts/bitmapFontTest2.png.REMOVED.git-id diff --git a/tests/Resources/fonts/boundsTestFont.png.REMOVED.git-id b/samples/cpp-tests/Resources/fonts/boundsTestFont.png.REMOVED.git-id similarity index 100% rename from tests/Resources/fonts/boundsTestFont.png.REMOVED.git-id rename to samples/cpp-tests/Resources/fonts/boundsTestFont.png.REMOVED.git-id diff --git a/tests/Resources/fonts/font-issue1343-hd.png.REMOVED.git-id b/samples/cpp-tests/Resources/fonts/font-issue1343-hd.png.REMOVED.git-id similarity index 100% rename from tests/Resources/fonts/font-issue1343-hd.png.REMOVED.git-id rename to samples/cpp-tests/Resources/fonts/font-issue1343-hd.png.REMOVED.git-id diff --git a/tests/Resources/fonts/futura-48.png.REMOVED.git-id b/samples/cpp-tests/Resources/fonts/futura-48.png.REMOVED.git-id similarity index 100% rename from tests/Resources/fonts/futura-48.png.REMOVED.git-id rename to samples/cpp-tests/Resources/fonts/futura-48.png.REMOVED.git-id diff --git a/tests/Resources/fonts/helvetica-geneva-32.png.REMOVED.git-id b/samples/cpp-tests/Resources/fonts/helvetica-geneva-32.png.REMOVED.git-id similarity index 100% rename from tests/Resources/fonts/helvetica-geneva-32.png.REMOVED.git-id rename to samples/cpp-tests/Resources/fonts/helvetica-geneva-32.png.REMOVED.git-id diff --git a/tests/Resources/fonts/markerFelt.fnt.REMOVED.git-id b/samples/cpp-tests/Resources/fonts/markerFelt.fnt.REMOVED.git-id similarity index 100% rename from tests/Resources/fonts/markerFelt.fnt.REMOVED.git-id rename to samples/cpp-tests/Resources/fonts/markerFelt.fnt.REMOVED.git-id diff --git a/tests/Resources/fonts/strings.xml b/samples/cpp-tests/Resources/fonts/strings.xml similarity index 100% rename from tests/Resources/fonts/strings.xml rename to samples/cpp-tests/Resources/fonts/strings.xml diff --git a/tests/Resources/fonts/tahoma.ttf.REMOVED.git-id b/samples/cpp-tests/Resources/fonts/tahoma.ttf.REMOVED.git-id similarity index 100% rename from tests/Resources/fonts/tahoma.ttf.REMOVED.git-id rename to samples/cpp-tests/Resources/fonts/tahoma.ttf.REMOVED.git-id diff --git a/tests/Resources/fonts/wt021.ttf.REMOVED.git-id b/samples/cpp-tests/Resources/fonts/wt021.ttf.REMOVED.git-id similarity index 100% rename from tests/Resources/fonts/wt021.ttf.REMOVED.git-id rename to samples/cpp-tests/Resources/fonts/wt021.ttf.REMOVED.git-id diff --git a/tests/Resources/hd/Images/background1.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/Images/background1.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/Images/background1.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/Images/background1.png.REMOVED.git-id diff --git a/tests/Resources/hd/Images/background2.jpg.REMOVED.git-id b/samples/cpp-tests/Resources/hd/Images/background2.jpg.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/Images/background2.jpg.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/Images/background2.jpg.REMOVED.git-id diff --git a/tests/Resources/hd/Images/background2.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/Images/background2.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/Images/background2.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/Images/background2.png.REMOVED.git-id diff --git a/tests/Resources/hd/armature/Cowboy0.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/armature/Cowboy0.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/armature/Cowboy0.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/armature/Cowboy0.png.REMOVED.git-id diff --git a/tests/Resources/hd/armature/Dragon.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/armature/Dragon.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/armature/Dragon.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/armature/Dragon.png.REMOVED.git-id diff --git a/tests/Resources/hd/armature/HeroAnimation0.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/armature/HeroAnimation0.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/armature/HeroAnimation0.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/armature/HeroAnimation0.png.REMOVED.git-id diff --git a/tests/Resources/hd/armature/weapon.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/armature/weapon.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/armature/weapon.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/armature/weapon.png.REMOVED.git-id diff --git a/tests/Resources/hd/ccb/burst.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/ccb/burst.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/ccb/burst.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/ccb/burst.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/Hello.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/Hello.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/Hello.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/Hello.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/UIEditorTest/UIButton_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIButton_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/UIEditorTest/UIButton_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIButton_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/UIEditorTest/UICheckBox_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UICheckBox_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/UIEditorTest/UICheckBox_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UICheckBox_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/UIEditorTest/UIImageView_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIImageView_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/UIEditorTest/UIImageView_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIImageView_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/UIEditorTest/UILabelAtlas_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILabelAtlas_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/UIEditorTest/UILabelAtlas_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILabelAtlas_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/UIEditorTest/UILabelBMFont_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILabelBMFont_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/UIEditorTest/UILabelBMFont_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILabelBMFont_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/UIEditorTest/UILabel_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILabel_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/UIEditorTest/UILabel_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILabel_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/Hello.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_BackgroundImage_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Color_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Gradient_Color_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Horizontal_Layout_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Linear_Vertical_Layout_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Location_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Relative_Align_Parent_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILayout_Editor/UILayout_Scale9_BackgroundImage_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Horizontal_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIListView_Editor/UIListView_Vertical_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/UIEditorTest/UILoadingBar_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILoadingBar_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/UIEditorTest/UILoadingBar_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UILoadingBar_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/UIEditorTest/UIPageView_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIPageView_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/UIEditorTest/UIPageView_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIPageView_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Both_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Horizontal_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIScrollView_Editor/UIScrollView_Vertical_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/UIEditorTest/UISlider_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UISlider_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/UIEditorTest/UISlider_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UISlider_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/UIEditorTest/UITextField_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UITextField_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/UIEditorTest/UITextField_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UITextField_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/UIEditorTest/UIWidgetAddNode_Editor/background.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/UITest/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/UITest/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/UITest/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/UITest/background.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/b11.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/b11.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/b11.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/b11.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/bitmapFontTest2.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/bitmapFontTest2.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/bitmapFontTest2.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/bitmapFontTest2.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/examples/examples.json.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/examples/examples.json.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/examples/examples.json.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/examples/examples.json.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id diff --git a/tests/Resources/hd/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id diff --git a/tests/Resources/hd/extensions/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/extensions/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/extensions/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/extensions/background.png.REMOVED.git-id diff --git a/tests/Resources/hd/fonts/font-issue1343.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/fonts/font-issue1343.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/fonts/font-issue1343.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/fonts/font-issue1343.png.REMOVED.git-id diff --git a/tests/Resources/hd/fonts/markerFelt.fnt.REMOVED.git-id b/samples/cpp-tests/Resources/hd/fonts/markerFelt.fnt.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/fonts/markerFelt.fnt.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/fonts/markerFelt.fnt.REMOVED.git-id diff --git a/tests/Resources/hd/fonts/markerFelt.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/fonts/markerFelt.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/fonts/markerFelt.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/fonts/markerFelt.png.REMOVED.git-id diff --git a/tests/Resources/hd/fonts/tuffy_bold_italic-charmap.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/fonts/tuffy_bold_italic-charmap.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/fonts/tuffy_bold_italic-charmap.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/fonts/tuffy_bold_italic-charmap.png.REMOVED.git-id diff --git a/tests/Resources/hd/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/tests/Resources/hd/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/tests/Resources/hd/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/tests/Resources/hd/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/tests/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id b/samples/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id diff --git a/tests/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id b/samples/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id diff --git a/tests/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id diff --git a/tests/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id diff --git a/tests/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id diff --git a/tests/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id b/samples/cpp-tests/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id diff --git a/tests/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id diff --git a/tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id b/samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id diff --git a/tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id b/samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id diff --git a/tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id diff --git a/tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id diff --git a/tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id diff --git a/tests/Resources/hd/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/tests/Resources/hd/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/tests/Resources/hd/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/tests/Resources/hd/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/tests/Resources/hd/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/tests/Resources/hd/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/tests/Resources/hd/spine/goblins.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/spine/goblins.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/spine/goblins.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/spine/goblins.png.REMOVED.git-id diff --git a/tests/Resources/hd/spine/spineboy.png.REMOVED.git-id b/samples/cpp-tests/Resources/hd/spine/spineboy.png.REMOVED.git-id similarity index 100% rename from tests/Resources/hd/spine/spineboy.png.REMOVED.git-id rename to samples/cpp-tests/Resources/hd/spine/spineboy.png.REMOVED.git-id diff --git a/tests/Resources/ipad/ccb/burst.png.REMOVED.git-id b/samples/cpp-tests/Resources/ipad/ccb/burst.png.REMOVED.git-id similarity index 100% rename from tests/Resources/ipad/ccb/burst.png.REMOVED.git-id rename to samples/cpp-tests/Resources/ipad/ccb/burst.png.REMOVED.git-id diff --git a/tests/Resources/ipad/extensions/background.png.REMOVED.git-id b/samples/cpp-tests/Resources/ipad/extensions/background.png.REMOVED.git-id similarity index 100% rename from tests/Resources/ipad/extensions/background.png.REMOVED.git-id rename to samples/cpp-tests/Resources/ipad/extensions/background.png.REMOVED.git-id diff --git a/tests/Resources/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id b/samples/cpp-tests/Resources/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from tests/Resources/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/cpp-tests/Resources/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/tests/Resources/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/cpp-tests/Resources/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from tests/Resources/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to samples/cpp-tests/Resources/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/tests/Resources/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/cpp-tests/Resources/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from tests/Resources/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to samples/cpp-tests/Resources/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/tests/Resources/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id b/samples/cpp-tests/Resources/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from tests/Resources/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/cpp-tests/Resources/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/tests/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id b/samples/cpp-tests/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id similarity index 100% rename from tests/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id rename to samples/cpp-tests/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id diff --git a/tests/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id b/samples/cpp-tests/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id similarity index 100% rename from tests/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id rename to samples/cpp-tests/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id diff --git a/tests/Resources/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id b/samples/cpp-tests/Resources/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id similarity index 100% rename from tests/Resources/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id rename to samples/cpp-tests/Resources/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id diff --git a/tests/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id b/samples/cpp-tests/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id similarity index 100% rename from tests/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id rename to samples/cpp-tests/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id diff --git a/tests/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id b/samples/cpp-tests/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id similarity index 100% rename from tests/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id rename to samples/cpp-tests/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id diff --git a/tests/Resources/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id b/samples/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from tests/Resources/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/tests/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id b/samples/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id similarity index 100% rename from tests/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id rename to samples/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id diff --git a/tests/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id b/samples/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id similarity index 100% rename from tests/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id rename to samples/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id diff --git a/tests/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from tests/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to samples/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/tests/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from tests/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to samples/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/tests/Resources/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id b/samples/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id similarity index 100% rename from tests/Resources/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id rename to samples/cpp-tests/Resources/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id diff --git a/tests/Resources/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id b/samples/cpp-tests/Resources/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from tests/Resources/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/cpp-tests/Resources/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/tests/Resources/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/cpp-tests/Resources/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from tests/Resources/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to samples/cpp-tests/Resources/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/tests/Resources/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/cpp-tests/Resources/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from tests/Resources/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to samples/cpp-tests/Resources/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/tests/Resources/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id b/samples/cpp-tests/Resources/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id similarity index 100% rename from tests/Resources/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id rename to samples/cpp-tests/Resources/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id diff --git a/tests/Resources/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/cpp-tests/Resources/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id similarity index 100% rename from tests/Resources/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id rename to samples/cpp-tests/Resources/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id diff --git a/tests/Resources/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/cpp-tests/Resources/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id similarity index 100% rename from tests/Resources/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id rename to samples/cpp-tests/Resources/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id diff --git a/tests/Resources/spine/goblins.png.REMOVED.git-id b/samples/cpp-tests/Resources/spine/goblins.png.REMOVED.git-id similarity index 100% rename from tests/Resources/spine/goblins.png.REMOVED.git-id rename to samples/cpp-tests/Resources/spine/goblins.png.REMOVED.git-id diff --git a/tests/proj.android/.classpath b/samples/cpp-tests/proj.android/.classpath similarity index 100% rename from tests/proj.android/.classpath rename to samples/cpp-tests/proj.android/.classpath diff --git a/tests/proj.android/.project b/samples/cpp-tests/proj.android/.project similarity index 100% rename from tests/proj.android/.project rename to samples/cpp-tests/proj.android/.project diff --git a/tests/proj.android/AndroidManifest.xml b/samples/cpp-tests/proj.android/AndroidManifest.xml similarity index 100% rename from tests/proj.android/AndroidManifest.xml rename to samples/cpp-tests/proj.android/AndroidManifest.xml diff --git a/tests/proj.android/README.md b/samples/cpp-tests/proj.android/README.md similarity index 100% rename from tests/proj.android/README.md rename to samples/cpp-tests/proj.android/README.md diff --git a/tests/proj.android/ant.properties b/samples/cpp-tests/proj.android/ant.properties similarity index 100% rename from tests/proj.android/ant.properties rename to samples/cpp-tests/proj.android/ant.properties diff --git a/tests/proj.android/build.xml b/samples/cpp-tests/proj.android/build.xml similarity index 100% rename from tests/proj.android/build.xml rename to samples/cpp-tests/proj.android/build.xml diff --git a/tests/proj.android/jni/Android.mk b/samples/cpp-tests/proj.android/jni/Android.mk similarity index 100% rename from tests/proj.android/jni/Android.mk rename to samples/cpp-tests/proj.android/jni/Android.mk diff --git a/tests/proj.android/jni/Application.mk b/samples/cpp-tests/proj.android/jni/Application.mk similarity index 100% rename from tests/proj.android/jni/Application.mk rename to samples/cpp-tests/proj.android/jni/Application.mk diff --git a/tests/proj.android/jni/testcpp/main.cpp b/samples/cpp-tests/proj.android/jni/testcpp/main.cpp similarity index 100% rename from tests/proj.android/jni/testcpp/main.cpp rename to samples/cpp-tests/proj.android/jni/testcpp/main.cpp diff --git a/tests/proj.android/ndkgdb.sh b/samples/cpp-tests/proj.android/ndkgdb.sh similarity index 100% rename from tests/proj.android/ndkgdb.sh rename to samples/cpp-tests/proj.android/ndkgdb.sh diff --git a/tests/proj.android/proguard-project.txt b/samples/cpp-tests/proj.android/proguard-project.txt similarity index 100% rename from tests/proj.android/proguard-project.txt rename to samples/cpp-tests/proj.android/proguard-project.txt diff --git a/tests/proj.android/project.properties b/samples/cpp-tests/proj.android/project.properties similarity index 100% rename from tests/proj.android/project.properties rename to samples/cpp-tests/proj.android/project.properties diff --git a/tests/proj.android/res/values/strings.xml b/samples/cpp-tests/proj.android/res/values/strings.xml similarity index 100% rename from tests/proj.android/res/values/strings.xml rename to samples/cpp-tests/proj.android/res/values/strings.xml diff --git a/tests/proj.android/src/nojava.txt b/samples/cpp-tests/proj.android/src/nojava.txt similarity index 100% rename from tests/proj.android/src/nojava.txt rename to samples/cpp-tests/proj.android/src/nojava.txt diff --git a/tests/proj.android/src/org/cocos2dx/testcpp/Cocos2dxActivity.java b/samples/cpp-tests/proj.android/src/org/cocos2dx/testcpp/Cocos2dxActivity.java similarity index 100% rename from tests/proj.android/src/org/cocos2dx/testcpp/Cocos2dxActivity.java rename to samples/cpp-tests/proj.android/src/org/cocos2dx/testcpp/Cocos2dxActivity.java diff --git a/tests/proj.ios/Classes/RootViewController.h b/samples/cpp-tests/proj.ios/Classes/RootViewController.h similarity index 100% rename from tests/proj.ios/Classes/RootViewController.h rename to samples/cpp-tests/proj.ios/Classes/RootViewController.h diff --git a/tests/proj.ios/Classes/RootViewController.mm b/samples/cpp-tests/proj.ios/Classes/RootViewController.mm similarity index 100% rename from tests/proj.ios/Classes/RootViewController.mm rename to samples/cpp-tests/proj.ios/Classes/RootViewController.mm diff --git a/tests/proj.ios/Classes/testsAppDelegate.h b/samples/cpp-tests/proj.ios/Classes/testsAppDelegate.h similarity index 100% rename from tests/proj.ios/Classes/testsAppDelegate.h rename to samples/cpp-tests/proj.ios/Classes/testsAppDelegate.h diff --git a/tests/proj.ios/Classes/testsAppDelegate.mm b/samples/cpp-tests/proj.ios/Classes/testsAppDelegate.mm similarity index 100% rename from tests/proj.ios/Classes/testsAppDelegate.mm rename to samples/cpp-tests/proj.ios/Classes/testsAppDelegate.mm diff --git a/tests/proj.ios/Default-568h@2x.png.REMOVED.git-id b/samples/cpp-tests/proj.ios/Default-568h@2x.png.REMOVED.git-id similarity index 100% rename from tests/proj.ios/Default-568h@2x.png.REMOVED.git-id rename to samples/cpp-tests/proj.ios/Default-568h@2x.png.REMOVED.git-id diff --git a/tests/proj.ios/Default@2x.png.REMOVED.git-id b/samples/cpp-tests/proj.ios/Default@2x.png.REMOVED.git-id similarity index 100% rename from tests/proj.ios/Default@2x.png.REMOVED.git-id rename to samples/cpp-tests/proj.ios/Default@2x.png.REMOVED.git-id diff --git a/tests/proj.ios/iphone_Prefix.pch b/samples/cpp-tests/proj.ios/iphone_Prefix.pch similarity index 100% rename from tests/proj.ios/iphone_Prefix.pch rename to samples/cpp-tests/proj.ios/iphone_Prefix.pch diff --git a/tests/proj.ios/main.m b/samples/cpp-tests/proj.ios/main.m similarity index 100% rename from tests/proj.ios/main.m rename to samples/cpp-tests/proj.ios/main.m diff --git a/tests/proj.linux/main.cpp b/samples/cpp-tests/proj.linux/main.cpp similarity index 100% rename from tests/proj.linux/main.cpp rename to samples/cpp-tests/proj.linux/main.cpp diff --git a/tests/proj.mac/Icon.icns.REMOVED.git-id b/samples/cpp-tests/proj.mac/Icon.icns.REMOVED.git-id similarity index 100% rename from tests/proj.mac/Icon.icns.REMOVED.git-id rename to samples/cpp-tests/proj.mac/Icon.icns.REMOVED.git-id diff --git a/tests/proj.mac/Test_Prefix.pch b/samples/cpp-tests/proj.mac/Test_Prefix.pch similarity index 100% rename from tests/proj.mac/Test_Prefix.pch rename to samples/cpp-tests/proj.mac/Test_Prefix.pch diff --git a/tests/proj.mac/en.lproj/InfoPlist.strings b/samples/cpp-tests/proj.mac/en.lproj/InfoPlist.strings similarity index 100% rename from tests/proj.mac/en.lproj/InfoPlist.strings rename to samples/cpp-tests/proj.mac/en.lproj/InfoPlist.strings diff --git a/tests/proj.mac/en.lproj/MainMenu.xib b/samples/cpp-tests/proj.mac/en.lproj/MainMenu.xib similarity index 100% rename from tests/proj.mac/en.lproj/MainMenu.xib rename to samples/cpp-tests/proj.mac/en.lproj/MainMenu.xib diff --git a/tests/proj.mac/main.cpp b/samples/cpp-tests/proj.mac/main.cpp similarity index 100% rename from tests/proj.mac/main.cpp rename to samples/cpp-tests/proj.mac/main.cpp diff --git a/tests/proj.win32/TestCpp.vcxproj b/samples/cpp-tests/proj.win32/TestCpp.vcxproj similarity index 100% rename from tests/proj.win32/TestCpp.vcxproj rename to samples/cpp-tests/proj.win32/TestCpp.vcxproj diff --git a/tests/proj.win32/TestCpp.vcxproj.filters b/samples/cpp-tests/proj.win32/TestCpp.vcxproj.filters similarity index 100% rename from tests/proj.win32/TestCpp.vcxproj.filters rename to samples/cpp-tests/proj.win32/TestCpp.vcxproj.filters diff --git a/tests/proj.win32/TestCpp.vcxproj.user b/samples/cpp-tests/proj.win32/TestCpp.vcxproj.user similarity index 100% rename from tests/proj.win32/TestCpp.vcxproj.user rename to samples/cpp-tests/proj.win32/TestCpp.vcxproj.user diff --git a/tests/proj.win32/main.cpp b/samples/cpp-tests/proj.win32/main.cpp similarity index 100% rename from tests/proj.win32/main.cpp rename to samples/cpp-tests/proj.win32/main.cpp diff --git a/tests/proj.win32/main.h b/samples/cpp-tests/proj.win32/main.h similarity index 100% rename from tests/proj.win32/main.h rename to samples/cpp-tests/proj.win32/main.h