diff --git a/Makefile b/Makefile
index 2ed302db..922c2d92 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 build:
-	mkdir -p build/theme
+	mkdir -p build/src
 	./Makefile.dryice.js
 
 clean:
@@ -7,8 +7,7 @@ clean:
 	rm -rf ace
 
 ace.tgz: build
-	mkdir ace
-	cp -r build ace/src
+	mv build ace-`./version.js`
 	cp Readme.md ace
 	cp LICENSE ace
 	tar cvfz ace-`./version.js`.tgz ace
diff --git a/Makefile.dryice.js b/Makefile.dryice.js
index 58ba1884..8ee05293 100755
--- a/Makefile.dryice.js
+++ b/Makefile.dryice.js
@@ -106,12 +106,12 @@ copy({
 // Create the compressed and uncompressed output files
 copy({
     source: ace,
-//    filter: copy.filter.uglifyjs,
-    dest: 'build/ace.js'
+    filter: copy.filter.uglifyjs,
+    dest: 'build/src/ace.js'
 });
 copy({
     source: ace,
-    dest: 'build/ace-uncompressed.js'
+    dest: 'build/src/ace-uncompressed.js'
 });
 
 console.log('# cockpit ---------');
@@ -153,11 +153,11 @@ copy({
 copy({
     source: cockpit,
     filter: copy.filter.uglifyjs,
-    dest: 'build/cockpit.js'
+    dest: 'build/src/cockpit.js'
 });
 copy({
     source: cockpit,
-    dest: 'build/cockpit-uncompressed.js'
+    dest: 'build/src/cockpit-uncompressed.js'
 });
 
 
@@ -173,7 +173,7 @@ project.assmeAllFilesLoaded();
             }),
         ],
         filter: [ copy.filter.moduleDefines, copy.filter.uglifyjs ],
-        dest: "build/mode/" + mode + ".js"
+        dest: "build/src/mode-" + mode + ".js"
     });
 });
 
@@ -197,7 +197,7 @@ copy({
             ]
         }),
     ],
-    filter: [ copy.filter.moduleDefines, /*copy.filter.uglifyjs*/ ],
+    filter: [ copy.filter.moduleDefines, copy.filter.uglifyjs ],
     dest: jsWorker
 });
 copy({
@@ -205,7 +205,7 @@ copy({
         aceHome + "/lib/ace/worker/worker.js",
         jsWorker
     ],
-    dest: "build/worker/javascript.js"
+    dest: "build/src/worker-javascript.js"
 });
 
 // create themes
@@ -228,7 +228,7 @@ copy({
 });
 copy({
     source: eclipseTheme,
-    dest: 'build/theme/eclipse.js'
+    dest: 'build/src/theme-eclipse.js'
 });
 
 [
@@ -241,6 +241,15 @@ copy({
             include: "ace/theme/" + theme + ".js"
         }],
         filter: [ copy.filter.moduleDefines, copy.filter.uglifyjs ],
-        dest: "build/theme/" + theme + ".js"
+        dest: "build/src/theme-" + theme + ".js"
     });
+});
+
+copy({
+    source: "LICENSE",
+    dest: 'build/LICENSE'
+});
+copy({
+    source: "Readme.md",
+    dest: 'build/Readme.md'
 });
\ No newline at end of file
diff --git a/build_support/editor.html b/build_support/editor.html
index ac69db86..cbd4bc55 100644
--- a/build_support/editor.html
+++ b/build_support/editor.html
@@ -17,9 +17,9 @@
     }
 }</div>
     
-<script src="ace.js" type="text/javascript" charset="utf-8"></script>
-<script src="theme/twilight.js" type="text/javascript" charset="utf-8"></script>
-<script src="mode/javascript.js" type="text/javascript" charset="utf-8"></script>
+<script src="src/ace.js" type="text/javascript" charset="utf-8"></script>
+<script src="src/theme-twilight.js" type="text/javascript" charset="utf-8"></script>
+<script src="src/mode-javascript.js" type="text/javascript" charset="utf-8"></script>
 <script>
 document.addEventListener("DOMContentLoaded", function() {
     var editor = ace.edit("editor");
diff --git a/build_support/mini_require.js b/build_support/mini_require.js
index 2cd6805a..460a0866 100644
--- a/build_support/mini_require.js
+++ b/build_support/mini_require.js
@@ -60,7 +60,7 @@ function require(module, callback) {
     if (Object.prototype.toString.call(module) === "[object Array]") {
         var params = [];
         for (var i = 0, l = module.length; i < l; ++i) {
-            params.push(require._lookup(module[i]));
+            params.push(define.lookup(module[i]));
         };
         if (callback) {
             callback.apply(null, params);
diff --git a/lib/ace/mode/javascript.js b/lib/ace/mode/javascript.js
index 0cea87d2..79c7e28e 100644
--- a/lib/ace/mode/javascript.js
+++ b/lib/ace/mode/javascript.js
@@ -124,7 +124,7 @@ oop.inherits(Mode, TextMode);
     
     this.createWorker = function(session) {
         var doc = session.getDocument();
-        var worker = new WorkerClient("../..", ["ace", "pilot"], "worker/javascript.js", "ace/mode/javascript_worker", "JavaScriptWorker");
+        var worker = new WorkerClient("../..", ["ace", "pilot"], "worker-javascript.js", "ace/mode/javascript_worker", "JavaScriptWorker");
         worker.call("setValue", [doc.getValue()]);
         
         doc.on("change", function(e) {