diff --git a/build/demo/boot-build.js b/build/demo/boot-build.js
deleted file mode 100644
index 8ae2b0f8..00000000
--- a/build/demo/boot-build.js
+++ /dev/null
@@ -1,11 +0,0 @@
-define(function(a) {
-  a("pilot/fixoldbrowsers");
-  var b = a("pilot/plugin_manager").catalog, d = a("pilot/plugin_manager").REASONS.APP_STARTUP;
-  a("pilot/settings");
-  b.registerPlugins(["pilot/index", "cockpit/index"]).then(function() {
-    var c = a("pilot/environment").create();
-    b.startupPlugins({env:c}, d).then(function() {
-      a("demo/startup").launch(c)
-    })
-  })
-});
\ No newline at end of file
diff --git a/demo/boot.js b/demo/boot.js
index d6533cd7..c8de55ae 100644
--- a/demo/boot.js
+++ b/demo/boot.js
@@ -37,9 +37,6 @@
 
 var config = {
     packagePaths: {
-        "../lib": [
-            { name:"ace", lib: "." }
-        ],
         "../support/cockpit/lib": [
             { name: "cockpit", main: "index", lib: "." }
         ],
@@ -47,18 +44,21 @@ var config = {
             { name: "pilot", main: "index", lib: "." }
         ]
     },
-    paths: { demo_startup: "../demo/demo_startup" }
+    paths: { 
+        demo: "../demo",
+        ace: "../lib/ace"
+    }
 };
 
 var deps = [ "pilot/fixoldbrowsers", "pilot/plugin_manager", "pilot/settings",
-             "pilot/environment", "demo_startup" ];
+             "pilot/environment", "demo/startup" ];
 
 require(config, deps, function() {
     var catalog = require("pilot/plugin_manager").catalog;
     catalog.registerPlugins([ "pilot/index", "cockpit/index" ]).then(function() {
         var env = require("pilot/environment").create();
         catalog.startupPlugins({ env: env }).then(function() {
-            require("demo_startup").launch(env);
+            require("demo/startup").launch(env);
         });
     });
 });
diff --git a/demo/demo_startup.js b/demo/startup.js
similarity index 99%
rename from demo/demo_startup.js
rename to demo/startup.js
index e113265b..f8932281 100644
--- a/demo/demo_startup.js
+++ b/demo/startup.js
@@ -235,4 +235,4 @@ exports.launch = function(env) {
     });
 };
 
-});
+});
\ No newline at end of file