diff --git a/tests/editor/img/sh.png b/editor/img/sh.png
similarity index 100%
rename from tests/editor/img/sh.png
rename to editor/img/sh.png
diff --git a/tests/editor/img/tile_shape_rotation_map.jpg b/editor/img/tile_shape_rotation_map.jpg
similarity index 100%
rename from tests/editor/img/tile_shape_rotation_map.jpg
rename to editor/img/tile_shape_rotation_map.jpg
diff --git a/tests/editor/img/tile_shape_rotation_map_view.jpg b/editor/img/tile_shape_rotation_map_view.jpg
similarity index 100%
rename from tests/editor/img/tile_shape_rotation_map_view.jpg
rename to editor/img/tile_shape_rotation_map_view.jpg
diff --git a/tests/editor/index.html b/editor/index.html
similarity index 100%
rename from tests/editor/index.html
rename to editor/index.html
diff --git a/tests/editor/script/Button.js b/editor/script/Button.js
similarity index 100%
rename from tests/editor/script/Button.js
rename to editor/script/Button.js
diff --git a/tests/editor/script/Debug.js b/editor/script/Debug.js
similarity index 100%
rename from tests/editor/script/Debug.js
rename to editor/script/Debug.js
diff --git a/tests/editor/script/Game.js b/editor/script/Game.js
similarity index 100%
rename from tests/editor/script/Game.js
rename to editor/script/Game.js
diff --git a/tests/editor/script/Start.js b/editor/script/Start.js
similarity index 100%
rename from tests/editor/script/Start.js
rename to editor/script/Start.js
diff --git a/tests/editor/script/Tile.js b/editor/script/Tile.js
similarity index 100%
rename from tests/editor/script/Tile.js
rename to editor/script/Tile.js
diff --git a/tests/editor/script/jquery.js b/editor/script/jquery.js
similarity index 100%
rename from tests/editor/script/jquery.js
rename to editor/script/jquery.js
diff --git a/tests/editor/script/jquery.mousewheel.js b/editor/script/jquery.mousewheel.js
similarity index 100%
rename from tests/editor/script/jquery.mousewheel.js
rename to editor/script/jquery.mousewheel.js
diff --git a/tests/editor/script/main.js b/editor/script/main.js
similarity index 100%
rename from tests/editor/script/main.js
rename to editor/script/main.js
diff --git a/tests/editor/style/style.css b/editor/style/style.css
similarity index 100%
rename from tests/editor/style/style.css
rename to editor/style/style.css
diff --git a/tests/game-draft/css/style.css b/game-draft/css/style.css
similarity index 100%
rename from tests/game-draft/css/style.css
rename to game-draft/css/style.css
diff --git a/tests/game-draft/index.html b/game-draft/index.html
similarity index 100%
rename from tests/game-draft/index.html
rename to game-draft/index.html
diff --git a/tests/game-draft/js/Box2d/Box2dWeb-2.1.a.3.js b/game-draft/js/Box2d/Box2dWeb-2.1.a.3.js
similarity index 100%
rename from tests/game-draft/js/Box2d/Box2dWeb-2.1.a.3.js
rename to game-draft/js/Box2d/Box2dWeb-2.1.a.3.js
diff --git a/tests/game-draft/js/Box2d/Box2dWeb-2.1.a.3.min.js b/game-draft/js/Box2d/Box2dWeb-2.1.a.3.min.js
similarity index 100%
rename from tests/game-draft/js/Box2d/Box2dWeb-2.1.a.3.min.js
rename to game-draft/js/Box2d/Box2dWeb-2.1.a.3.min.js
diff --git a/tests/game-draft/js/Chuck/Collision/Detector.js b/game-draft/js/Chuck/Collision/Detector.js
similarity index 100%
rename from tests/game-draft/js/Chuck/Collision/Detector.js
rename to game-draft/js/Chuck/Collision/Detector.js
diff --git a/tests/game-draft/js/Chuck/Config/Setup.js b/game-draft/js/Chuck/Config/Setup.js
similarity index 100%
rename from tests/game-draft/js/Chuck/Config/Setup.js
rename to game-draft/js/Chuck/Config/Setup.js
diff --git a/tests/game-draft/js/Chuck/Control/InputControlUnit.js b/game-draft/js/Chuck/Control/InputControlUnit.js
similarity index 100%
rename from tests/game-draft/js/Chuck/Control/InputControlUnit.js
rename to game-draft/js/Chuck/Control/InputControlUnit.js
diff --git a/tests/game-draft/js/Chuck/Control/Key.js b/game-draft/js/Chuck/Control/Key.js
similarity index 100%
rename from tests/game-draft/js/Chuck/Control/Key.js
rename to game-draft/js/Chuck/Control/Key.js
diff --git a/tests/game-draft/js/Chuck/Control/KeyboardInput.js b/game-draft/js/Chuck/Control/KeyboardInput.js
similarity index 100%
rename from tests/game-draft/js/Chuck/Control/KeyboardInput.js
rename to game-draft/js/Chuck/Control/KeyboardInput.js
diff --git a/tests/game-draft/js/Chuck/Loader/Level.js b/game-draft/js/Chuck/Loader/Level.js
similarity index 100%
rename from tests/game-draft/js/Chuck/Loader/Level.js
rename to game-draft/js/Chuck/Loader/Level.js
diff --git a/tests/game-draft/js/Chuck/Main.js b/game-draft/js/Chuck/Main.js
similarity index 100%
rename from tests/game-draft/js/Chuck/Main.js
rename to game-draft/js/Chuck/Main.js
diff --git a/tests/game-draft/js/Chuck/Physics/Doll.js b/game-draft/js/Chuck/Physics/Doll.js
similarity index 100%
rename from tests/game-draft/js/Chuck/Physics/Doll.js
rename to game-draft/js/Chuck/Physics/Doll.js
diff --git a/tests/game-draft/js/Chuck/Physics/Engine.js b/game-draft/js/Chuck/Physics/Engine.js
similarity index 100%
rename from tests/game-draft/js/Chuck/Physics/Engine.js
rename to game-draft/js/Chuck/Physics/Engine.js
diff --git a/tests/game-draft/js/Chuck/Player.js b/game-draft/js/Chuck/Player.js
similarity index 100%
rename from tests/game-draft/js/Chuck/Player.js
rename to game-draft/js/Chuck/Player.js
diff --git a/tests/game-draft/js/Chuck/Processor.js b/game-draft/js/Chuck/Processor.js
similarity index 100%
rename from tests/game-draft/js/Chuck/Processor.js
rename to game-draft/js/Chuck/Processor.js
diff --git a/tests/game-draft/js/Chuck/View.js b/game-draft/js/Chuck/View.js
similarity index 100%
rename from tests/game-draft/js/Chuck/View.js
rename to game-draft/js/Chuck/View.js
diff --git a/tests/game-draft/js/JQuery/jquery.1.7.2.min.js b/game-draft/js/JQuery/jquery.1.7.2.min.js
similarity index 100%
rename from tests/game-draft/js/JQuery/jquery.1.7.2.min.js
rename to game-draft/js/JQuery/jquery.1.7.2.min.js
diff --git a/tests/game-draft/xml/level.xml b/game-draft/xml/level.xml
similarity index 100%
rename from tests/game-draft/xml/level.xml
rename to game-draft/xml/level.xml
diff --git a/tests/three-test/img/green.png b/three-test/img/green.png
similarity index 100%
rename from tests/three-test/img/green.png
rename to three-test/img/green.png
diff --git a/tests/three-test/img/smile.png b/three-test/img/smile.png
similarity index 100%
rename from tests/three-test/img/smile.png
rename to three-test/img/smile.png
diff --git a/tests/three-test/three.html b/three-test/index.html
similarity index 92%
rename from tests/three-test/three.html
rename to three-test/index.html
index 78c1d87..6c000b3 100755
--- a/tests/three-test/three.html
+++ b/three-test/index.html
@@ -4,7 +4,7 @@
             html, body { margin: 0; padding: 0; }
             canvas { background: #333; }
         </style>
-        <script type="text/javascript" src="lib/Three/Three.min.js"></script>
+        <script type="text/javascript" src="js/Three/Three.min.js"></script>
         <script type="text/javascript" src="http://www.html5canvastutorials.com/libraries/Three.js"></script>
     </head>
     <body></body>
@@ -60,4 +60,4 @@
             animate();
         };
     </script>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/game-draft/js/Three/Three.min.js b/three-test/js/Three/Three.min.js
similarity index 100%
rename from tests/game-draft/js/Three/Three.min.js
rename to three-test/js/Three/Three.min.js
diff --git a/tests/game-draft/js/Three/ThreeDebug.js b/three-test/js/Three/ThreeDebug.js
similarity index 100%
rename from tests/game-draft/js/Three/ThreeDebug.js
rename to three-test/js/Three/ThreeDebug.js