diff --git a/demo/boot.js b/demo/boot.js
index 36bcb00f..6a039428 100644
--- a/demo/boot.js
+++ b/demo/boot.js
@@ -36,12 +36,14 @@
  * ***** END LICENSE BLOCK ***** */
 
 var config = {
-    paths: { 
-        demo: "../demo",
-        ace: "../lib/ace",
-        cockpit: "../support/cockpit/lib/cockpit",
-        pilot: "../support/cockpit/support/pilot/lib/pilot"
-    }
+    baseUrl: "../../packages/",
+    packages: [
+        { name: "ace", lib: "lib/ace" },
+        { name: "cockpit", lib: "lib/cockpit" },
+        { name: "pilot", lib: "lib/pilot" },
+        { name: "demo", location: "ace/demo", lib: "." },
+        { name: "require", location: "requirejs/require", lib: "." }
+    ]
 };
 
 require(config, ["pilot/fixoldbrowsers", "pilot/plugin_manager", "pilot/settings",
diff --git a/editor.html b/editor.html
index f1b20bf5..86acbb57 100644
--- a/editor.html
+++ b/editor.html
@@ -196,9 +196,7 @@ echo $output;
 ?></script>
 
   <input id="cockpitInput" type="text"/>
-
-  <script src="demo/require.js" type="text/javascript" charset="utf-8"></script>
-  <script src="demo/boot.js" type="text/javascript"></script>
-
+  <script type="text/javascript" src="packages/requirejs/require.js"></script>
+  <script type="text/javascript" src="demo/boot.js"></script>
 </body>
 </html>
diff --git a/package.json b/package.json
index f27b9a63..af3e3c79 100644
--- a/package.json
+++ b/package.json
@@ -1,17 +1,29 @@
 {
     "name": "ace",
     "description": "Ajax.org Code Editor is a full featured source code highlighting editor that powers the Cloud9 IDE",
-    "version": "0.1",
+    "version": "0.1.0",
     "homepage" : "http://github.com/ajaxorg/ace",
     "engines": {"node": ">= 0.1.102"},
     "author": "Fabian Jakobs <fabian@ajax.org>",
-    "main": "src/ace/ace",
     "repository" : {
         "type" : "git",
          "url" : "http://github.com/ajaxorg/ace.git"
     },
+    "overlay": {
+        "teleport": {
+            "directories": {
+                "lib": "lib/ace"
+            }
+        }
+    },
+    "dependencies": {
+        "pilot": ">=0.1.0",
+        "cockpit": ">=0.1.0",
+        "teleport": ">=0.2.4",
+        "requirejs": ">=0.22.0"
+    },
     "licenses": [{
         "type": "LGPLv3",
         "url": "http://www.gnu.org/licenses/lgpl-3.0.txt"}
     ]
-}
\ No newline at end of file
+}