diff --git a/Makefile.dryice.js b/Makefile.dryice.js
index 39f2ce97..f828a449 100755
--- a/Makefile.dryice.js
+++ b/Makefile.dryice.js
@@ -79,7 +79,6 @@ var aceHome = __dirname;
 console.log('# ace ---------');
 
 var aceProject = [
-    aceHome + '/lib',
     aceHome
 ];
 
@@ -126,10 +125,7 @@ copy({
     source: [
         copy.source.commonjs({
             project: project,
-            require: [
-                "ace/lib/fixoldbrowsers",
-                "ace/ace"
-            ]
+            require: ["ace/ace"]
         })
     ],
     filter: [ copy.filter.moduleDefines ],
@@ -229,7 +225,7 @@ console.log('# ace themes ---------');
 ].forEach(function(theme) {
     copy({
         source: [{
-            root: aceHome + '/lib',
+            root: aceHome,
             include: "ace/theme/" + theme + ".js"
         }],
         filter: modeThemeFilters,
@@ -263,7 +259,7 @@ console.log('# ace worker ---------');
     console.log("worker for " + mode + " mode");
     var worker = copy.createDataObject();
     var workerProject = copy.createCommonJsProject([
-        aceHome + '/lib'
+        aceHome
     ]);
     copy({
         source: [
@@ -282,7 +278,7 @@ console.log('# ace worker ---------');
     });
     copy({
         source: [
-            aceHome + "/lib/ace/worker/worker.js",
+            aceHome + "/ace/worker/worker.js",
             worker
         ],
         filter: [ copy.filter.uglifyjs, filterTextPlugin ],
diff --git a/lib/ace/ace.js b/ace/ace.js
similarity index 100%
rename from lib/ace/ace.js
rename to ace/ace.js
diff --git a/lib/ace/anchor.js b/ace/anchor.js
similarity index 100%
rename from lib/ace/anchor.js
rename to ace/anchor.js
diff --git a/lib/ace/anchor_test.js b/ace/anchor_test.js
similarity index 100%
rename from lib/ace/anchor_test.js
rename to ace/anchor_test.js
diff --git a/lib/ace/background_tokenizer.js b/ace/background_tokenizer.js
similarity index 100%
rename from lib/ace/background_tokenizer.js
rename to ace/background_tokenizer.js
diff --git a/lib/ace/commands/command_manager.js b/ace/commands/command_manager.js
similarity index 100%
rename from lib/ace/commands/command_manager.js
rename to ace/commands/command_manager.js
diff --git a/lib/ace/commands/default_commands.js b/ace/commands/default_commands.js
similarity index 100%
rename from lib/ace/commands/default_commands.js
rename to ace/commands/default_commands.js
diff --git a/lib/ace/document.js b/ace/document.js
similarity index 100%
rename from lib/ace/document.js
rename to ace/document.js
diff --git a/lib/ace/document_test.js b/ace/document_test.js
similarity index 100%
rename from lib/ace/document_test.js
rename to ace/document_test.js
diff --git a/lib/ace/edit_session/fold.js b/ace/edit_session/fold.js
similarity index 100%
rename from lib/ace/edit_session/fold.js
rename to ace/edit_session/fold.js
diff --git a/lib/ace/edit_session/fold_line.js b/ace/edit_session/fold_line.js
similarity index 100%
rename from lib/ace/edit_session/fold_line.js
rename to ace/edit_session/fold_line.js
diff --git a/lib/ace/edit_session/folding.js b/ace/edit_session/folding.js
similarity index 100%
rename from lib/ace/edit_session/folding.js
rename to ace/edit_session/folding.js
diff --git a/lib/ace/editor.js b/ace/editor.js
similarity index 100%
rename from lib/ace/editor.js
rename to ace/editor.js
diff --git a/lib/ace/editor_change_document_test.js b/ace/editor_change_document_test.js
similarity index 100%
rename from lib/ace/editor_change_document_test.js
rename to ace/editor_change_document_test.js
diff --git a/lib/ace/editor_highlight_selected_word_test.js b/ace/editor_highlight_selected_word_test.js
similarity index 100%
rename from lib/ace/editor_highlight_selected_word_test.js
rename to ace/editor_highlight_selected_word_test.js
diff --git a/lib/ace/editor_navigation_test.js b/ace/editor_navigation_test.js
similarity index 100%
rename from lib/ace/editor_navigation_test.js
rename to ace/editor_navigation_test.js
diff --git a/lib/ace/editor_text_edit_test.js b/ace/editor_text_edit_test.js
similarity index 100%
rename from lib/ace/editor_text_edit_test.js
rename to ace/editor_text_edit_test.js
diff --git a/lib/ace/keyboard/hash_handler.js b/ace/keyboard/hash_handler.js
similarity index 100%
rename from lib/ace/keyboard/hash_handler.js
rename to ace/keyboard/hash_handler.js
diff --git a/lib/ace/keyboard/keybinding.js b/ace/keyboard/keybinding.js
similarity index 100%
rename from lib/ace/keyboard/keybinding.js
rename to ace/keyboard/keybinding.js
diff --git a/lib/ace/keyboard/keybinding/emacs.js b/ace/keyboard/keybinding/emacs.js
similarity index 100%
rename from lib/ace/keyboard/keybinding/emacs.js
rename to ace/keyboard/keybinding/emacs.js
diff --git a/lib/ace/keyboard/keybinding/vim.js b/ace/keyboard/keybinding/vim.js
similarity index 100%
rename from lib/ace/keyboard/keybinding/vim.js
rename to ace/keyboard/keybinding/vim.js
diff --git a/lib/ace/keyboard/state_handler.js b/ace/keyboard/state_handler.js
similarity index 100%
rename from lib/ace/keyboard/state_handler.js
rename to ace/keyboard/state_handler.js
diff --git a/lib/ace/keyboard/textinput.js b/ace/keyboard/textinput.js
similarity index 100%
rename from lib/ace/keyboard/textinput.js
rename to ace/keyboard/textinput.js
diff --git a/lib/ace/lib/browser_focus.js b/ace/lib/browser_focus.js
similarity index 100%
rename from lib/ace/lib/browser_focus.js
rename to ace/lib/browser_focus.js
diff --git a/lib/ace/lib/dom.js b/ace/lib/dom.js
similarity index 100%
rename from lib/ace/lib/dom.js
rename to ace/lib/dom.js
diff --git a/lib/ace/lib/event.js b/ace/lib/event.js
similarity index 100%
rename from lib/ace/lib/event.js
rename to ace/lib/event.js
diff --git a/lib/ace/lib/event_emitter.js b/ace/lib/event_emitter.js
similarity index 100%
rename from lib/ace/lib/event_emitter.js
rename to ace/lib/event_emitter.js
diff --git a/lib/ace/lib/fixoldbrowsers.js b/ace/lib/fixoldbrowsers.js
similarity index 100%
rename from lib/ace/lib/fixoldbrowsers.js
rename to ace/lib/fixoldbrowsers.js
diff --git a/lib/ace/lib/keys.js b/ace/lib/keys.js
similarity index 100%
rename from lib/ace/lib/keys.js
rename to ace/lib/keys.js
diff --git a/lib/ace/lib/lang.js b/ace/lib/lang.js
similarity index 100%
rename from lib/ace/lib/lang.js
rename to ace/lib/lang.js
diff --git a/lib/ace/lib/oop.js b/ace/lib/oop.js
similarity index 100%
rename from lib/ace/lib/oop.js
rename to ace/lib/oop.js
diff --git a/lib/ace/lib/useragent.js b/ace/lib/useragent.js
similarity index 100%
rename from lib/ace/lib/useragent.js
rename to ace/lib/useragent.js
diff --git a/lib/ace/mode/behaviour.js b/ace/mode/behaviour.js
similarity index 100%
rename from lib/ace/mode/behaviour.js
rename to ace/mode/behaviour.js
diff --git a/lib/ace/mode/behaviour/cstyle.js b/ace/mode/behaviour/cstyle.js
similarity index 100%
rename from lib/ace/mode/behaviour/cstyle.js
rename to ace/mode/behaviour/cstyle.js
diff --git a/lib/ace/mode/behaviour/xml.js b/ace/mode/behaviour/xml.js
similarity index 100%
rename from lib/ace/mode/behaviour/xml.js
rename to ace/mode/behaviour/xml.js
diff --git a/lib/ace/mode/c_cpp.js b/ace/mode/c_cpp.js
similarity index 100%
rename from lib/ace/mode/c_cpp.js
rename to ace/mode/c_cpp.js
diff --git a/lib/ace/mode/c_cpp_highlight_rules.js b/ace/mode/c_cpp_highlight_rules.js
similarity index 100%
rename from lib/ace/mode/c_cpp_highlight_rules.js
rename to ace/mode/c_cpp_highlight_rules.js
diff --git a/lib/ace/mode/clojure.js b/ace/mode/clojure.js
similarity index 100%
rename from lib/ace/mode/clojure.js
rename to ace/mode/clojure.js
diff --git a/lib/ace/mode/clojure_highlight_rules.js b/ace/mode/clojure_highlight_rules.js
similarity index 100%
rename from lib/ace/mode/clojure_highlight_rules.js
rename to ace/mode/clojure_highlight_rules.js
diff --git a/lib/ace/mode/coffee.js b/ace/mode/coffee.js
similarity index 100%
rename from lib/ace/mode/coffee.js
rename to ace/mode/coffee.js
diff --git a/lib/ace/mode/coffee/coffee-script.js b/ace/mode/coffee/coffee-script.js
similarity index 100%
rename from lib/ace/mode/coffee/coffee-script.js
rename to ace/mode/coffee/coffee-script.js
diff --git a/lib/ace/mode/coffee/helpers.js b/ace/mode/coffee/helpers.js
similarity index 100%
rename from lib/ace/mode/coffee/helpers.js
rename to ace/mode/coffee/helpers.js
diff --git a/lib/ace/mode/coffee/lexer.js b/ace/mode/coffee/lexer.js
similarity index 100%
rename from lib/ace/mode/coffee/lexer.js
rename to ace/mode/coffee/lexer.js
diff --git a/lib/ace/mode/coffee/nodes.js b/ace/mode/coffee/nodes.js
similarity index 100%
rename from lib/ace/mode/coffee/nodes.js
rename to ace/mode/coffee/nodes.js
diff --git a/lib/ace/mode/coffee/parser.js b/ace/mode/coffee/parser.js
similarity index 100%
rename from lib/ace/mode/coffee/parser.js
rename to ace/mode/coffee/parser.js
diff --git a/lib/ace/mode/coffee/parser_test.js b/ace/mode/coffee/parser_test.js
similarity index 100%
rename from lib/ace/mode/coffee/parser_test.js
rename to ace/mode/coffee/parser_test.js
diff --git a/lib/ace/mode/coffee/rewriter.js b/ace/mode/coffee/rewriter.js
similarity index 100%
rename from lib/ace/mode/coffee/rewriter.js
rename to ace/mode/coffee/rewriter.js
diff --git a/lib/ace/mode/coffee/scope.js b/ace/mode/coffee/scope.js
similarity index 100%
rename from lib/ace/mode/coffee/scope.js
rename to ace/mode/coffee/scope.js
diff --git a/lib/ace/mode/coffee_highlight_rules.js b/ace/mode/coffee_highlight_rules.js
similarity index 100%
rename from lib/ace/mode/coffee_highlight_rules.js
rename to ace/mode/coffee_highlight_rules.js
diff --git a/lib/ace/mode/coffee_worker.js b/ace/mode/coffee_worker.js
similarity index 100%
rename from lib/ace/mode/coffee_worker.js
rename to ace/mode/coffee_worker.js
diff --git a/lib/ace/mode/csharp.js b/ace/mode/csharp.js
similarity index 100%
rename from lib/ace/mode/csharp.js
rename to ace/mode/csharp.js
diff --git a/lib/ace/mode/csharp_highlight_rules.js b/ace/mode/csharp_highlight_rules.js
similarity index 100%
rename from lib/ace/mode/csharp_highlight_rules.js
rename to ace/mode/csharp_highlight_rules.js
diff --git a/lib/ace/mode/css.js b/ace/mode/css.js
similarity index 100%
rename from lib/ace/mode/css.js
rename to ace/mode/css.js
diff --git a/lib/ace/mode/css/csslint.js b/ace/mode/css/csslint.js
similarity index 100%
rename from lib/ace/mode/css/csslint.js
rename to ace/mode/css/csslint.js
diff --git a/lib/ace/mode/css_highlight_rules.js b/ace/mode/css_highlight_rules.js
similarity index 100%
rename from lib/ace/mode/css_highlight_rules.js
rename to ace/mode/css_highlight_rules.js
diff --git a/lib/ace/mode/css_test.js b/ace/mode/css_test.js
similarity index 100%
rename from lib/ace/mode/css_test.js
rename to ace/mode/css_test.js
diff --git a/lib/ace/mode/css_tokenizer_test.js b/ace/mode/css_tokenizer_test.js
similarity index 100%
rename from lib/ace/mode/css_tokenizer_test.js
rename to ace/mode/css_tokenizer_test.js
diff --git a/lib/ace/mode/css_worker.js b/ace/mode/css_worker.js
similarity index 100%
rename from lib/ace/mode/css_worker.js
rename to ace/mode/css_worker.js
diff --git a/lib/ace/mode/css_worker_test.js b/ace/mode/css_worker_test.js
similarity index 100%
rename from lib/ace/mode/css_worker_test.js
rename to ace/mode/css_worker_test.js
diff --git a/lib/ace/mode/doc_comment_highlight_rules.js b/ace/mode/doc_comment_highlight_rules.js
similarity index 100%
rename from lib/ace/mode/doc_comment_highlight_rules.js
rename to ace/mode/doc_comment_highlight_rules.js
diff --git a/lib/ace/mode/groovy.js b/ace/mode/groovy.js
similarity index 100%
rename from lib/ace/mode/groovy.js
rename to ace/mode/groovy.js
diff --git a/lib/ace/mode/groovy_highlight_rules.js b/ace/mode/groovy_highlight_rules.js
similarity index 100%
rename from lib/ace/mode/groovy_highlight_rules.js
rename to ace/mode/groovy_highlight_rules.js
diff --git a/lib/ace/mode/html.js b/ace/mode/html.js
similarity index 100%
rename from lib/ace/mode/html.js
rename to ace/mode/html.js
diff --git a/lib/ace/mode/html_highlight_rules.js b/ace/mode/html_highlight_rules.js
similarity index 100%
rename from lib/ace/mode/html_highlight_rules.js
rename to ace/mode/html_highlight_rules.js
diff --git a/lib/ace/mode/html_test.js b/ace/mode/html_test.js
similarity index 100%
rename from lib/ace/mode/html_test.js
rename to ace/mode/html_test.js
diff --git a/lib/ace/mode/html_tokenizer_test.js b/ace/mode/html_tokenizer_test.js
similarity index 100%
rename from lib/ace/mode/html_tokenizer_test.js
rename to ace/mode/html_tokenizer_test.js
diff --git a/lib/ace/mode/java.js b/ace/mode/java.js
similarity index 100%
rename from lib/ace/mode/java.js
rename to ace/mode/java.js
diff --git a/lib/ace/mode/java_highlight_rules.js b/ace/mode/java_highlight_rules.js
similarity index 100%
rename from lib/ace/mode/java_highlight_rules.js
rename to ace/mode/java_highlight_rules.js
diff --git a/lib/ace/mode/javascript.js b/ace/mode/javascript.js
similarity index 100%
rename from lib/ace/mode/javascript.js
rename to ace/mode/javascript.js
diff --git a/lib/ace/mode/javascript/jsdefs.js b/ace/mode/javascript/jsdefs.js
similarity index 100%
rename from lib/ace/mode/javascript/jsdefs.js
rename to ace/mode/javascript/jsdefs.js
diff --git a/lib/ace/mode/javascript/jshint.js b/ace/mode/javascript/jshint.js
similarity index 100%
rename from lib/ace/mode/javascript/jshint.js
rename to ace/mode/javascript/jshint.js
diff --git a/lib/ace/mode/javascript/jslex.js b/ace/mode/javascript/jslex.js
similarity index 100%
rename from lib/ace/mode/javascript/jslex.js
rename to ace/mode/javascript/jslex.js
diff --git a/lib/ace/mode/javascript/jsparse.js b/ace/mode/javascript/jsparse.js
similarity index 100%
rename from lib/ace/mode/javascript/jsparse.js
rename to ace/mode/javascript/jsparse.js
diff --git a/lib/ace/mode/javascript_highlight_rules.js b/ace/mode/javascript_highlight_rules.js
similarity index 100%
rename from lib/ace/mode/javascript_highlight_rules.js
rename to ace/mode/javascript_highlight_rules.js
diff --git a/lib/ace/mode/javascript_test.js b/ace/mode/javascript_test.js
similarity index 100%
rename from lib/ace/mode/javascript_test.js
rename to ace/mode/javascript_test.js
diff --git a/lib/ace/mode/javascript_tokenizer_test.js b/ace/mode/javascript_tokenizer_test.js
similarity index 100%
rename from lib/ace/mode/javascript_tokenizer_test.js
rename to ace/mode/javascript_tokenizer_test.js
diff --git a/lib/ace/mode/javascript_worker.js b/ace/mode/javascript_worker.js
similarity index 100%
rename from lib/ace/mode/javascript_worker.js
rename to ace/mode/javascript_worker.js
diff --git a/lib/ace/mode/javascript_worker_test.js b/ace/mode/javascript_worker_test.js
similarity index 100%
rename from lib/ace/mode/javascript_worker_test.js
rename to ace/mode/javascript_worker_test.js
diff --git a/lib/ace/mode/json.js b/ace/mode/json.js
similarity index 100%
rename from lib/ace/mode/json.js
rename to ace/mode/json.js
diff --git a/lib/ace/mode/json_highlight_rules.js b/ace/mode/json_highlight_rules.js
similarity index 100%
rename from lib/ace/mode/json_highlight_rules.js
rename to ace/mode/json_highlight_rules.js
diff --git a/lib/ace/mode/matching_brace_outdent.js b/ace/mode/matching_brace_outdent.js
similarity index 100%
rename from lib/ace/mode/matching_brace_outdent.js
rename to ace/mode/matching_brace_outdent.js
diff --git a/lib/ace/mode/matching_parens_outdent.js b/ace/mode/matching_parens_outdent.js
similarity index 100%
rename from lib/ace/mode/matching_parens_outdent.js
rename to ace/mode/matching_parens_outdent.js
diff --git a/lib/ace/mode/ocaml.js b/ace/mode/ocaml.js
similarity index 100%
rename from lib/ace/mode/ocaml.js
rename to ace/mode/ocaml.js
diff --git a/lib/ace/mode/ocaml_highlight_rules.js b/ace/mode/ocaml_highlight_rules.js
similarity index 100%
rename from lib/ace/mode/ocaml_highlight_rules.js
rename to ace/mode/ocaml_highlight_rules.js
diff --git a/lib/ace/mode/perl.js b/ace/mode/perl.js
similarity index 100%
rename from lib/ace/mode/perl.js
rename to ace/mode/perl.js
diff --git a/lib/ace/mode/perl_highlight_rules.js b/ace/mode/perl_highlight_rules.js
similarity index 100%
rename from lib/ace/mode/perl_highlight_rules.js
rename to ace/mode/perl_highlight_rules.js
diff --git a/lib/ace/mode/php.js b/ace/mode/php.js
similarity index 100%
rename from lib/ace/mode/php.js
rename to ace/mode/php.js
diff --git a/lib/ace/mode/php_highlight_rules.js b/ace/mode/php_highlight_rules.js
similarity index 100%
rename from lib/ace/mode/php_highlight_rules.js
rename to ace/mode/php_highlight_rules.js
diff --git a/lib/ace/mode/python.js b/ace/mode/python.js
similarity index 100%
rename from lib/ace/mode/python.js
rename to ace/mode/python.js
diff --git a/lib/ace/mode/python_highlight_rules.js b/ace/mode/python_highlight_rules.js
similarity index 100%
rename from lib/ace/mode/python_highlight_rules.js
rename to ace/mode/python_highlight_rules.js
diff --git a/lib/ace/mode/ruby.js b/ace/mode/ruby.js
similarity index 100%
rename from lib/ace/mode/ruby.js
rename to ace/mode/ruby.js
diff --git a/lib/ace/mode/ruby_highlight_rules.js b/ace/mode/ruby_highlight_rules.js
similarity index 100%
rename from lib/ace/mode/ruby_highlight_rules.js
rename to ace/mode/ruby_highlight_rules.js
diff --git a/lib/ace/mode/ruby_tokenizer_test.js b/ace/mode/ruby_tokenizer_test.js
similarity index 100%
rename from lib/ace/mode/ruby_tokenizer_test.js
rename to ace/mode/ruby_tokenizer_test.js
diff --git a/lib/ace/mode/scad.js b/ace/mode/scad.js
similarity index 100%
rename from lib/ace/mode/scad.js
rename to ace/mode/scad.js
diff --git a/lib/ace/mode/scad_highlight_rules.js b/ace/mode/scad_highlight_rules.js
similarity index 100%
rename from lib/ace/mode/scad_highlight_rules.js
rename to ace/mode/scad_highlight_rules.js
diff --git a/lib/ace/mode/scala.js b/ace/mode/scala.js
similarity index 100%
rename from lib/ace/mode/scala.js
rename to ace/mode/scala.js
diff --git a/lib/ace/mode/scala_highlight_rules.js b/ace/mode/scala_highlight_rules.js
similarity index 100%
rename from lib/ace/mode/scala_highlight_rules.js
rename to ace/mode/scala_highlight_rules.js
diff --git a/lib/ace/mode/scss.js b/ace/mode/scss.js
similarity index 100%
rename from lib/ace/mode/scss.js
rename to ace/mode/scss.js
diff --git a/lib/ace/mode/scss_highlight_rules.js b/ace/mode/scss_highlight_rules.js
similarity index 100%
rename from lib/ace/mode/scss_highlight_rules.js
rename to ace/mode/scss_highlight_rules.js
diff --git a/lib/ace/mode/svg.js b/ace/mode/svg.js
similarity index 100%
rename from lib/ace/mode/svg.js
rename to ace/mode/svg.js
diff --git a/lib/ace/mode/svg_highlight_rules.js b/ace/mode/svg_highlight_rules.js
similarity index 100%
rename from lib/ace/mode/svg_highlight_rules.js
rename to ace/mode/svg_highlight_rules.js
diff --git a/lib/ace/mode/text.js b/ace/mode/text.js
similarity index 100%
rename from lib/ace/mode/text.js
rename to ace/mode/text.js
diff --git a/lib/ace/mode/text_highlight_rules.js b/ace/mode/text_highlight_rules.js
similarity index 100%
rename from lib/ace/mode/text_highlight_rules.js
rename to ace/mode/text_highlight_rules.js
diff --git a/lib/ace/mode/text_test.js b/ace/mode/text_test.js
similarity index 100%
rename from lib/ace/mode/text_test.js
rename to ace/mode/text_test.js
diff --git a/lib/ace/mode/textile.js b/ace/mode/textile.js
similarity index 100%
rename from lib/ace/mode/textile.js
rename to ace/mode/textile.js
diff --git a/lib/ace/mode/textile_highlight_rules.js b/ace/mode/textile_highlight_rules.js
similarity index 100%
rename from lib/ace/mode/textile_highlight_rules.js
rename to ace/mode/textile_highlight_rules.js
diff --git a/lib/ace/mode/xml.js b/ace/mode/xml.js
similarity index 100%
rename from lib/ace/mode/xml.js
rename to ace/mode/xml.js
diff --git a/lib/ace/mode/xml_highlight_rules.js b/ace/mode/xml_highlight_rules.js
similarity index 100%
rename from lib/ace/mode/xml_highlight_rules.js
rename to ace/mode/xml_highlight_rules.js
diff --git a/lib/ace/mode/xml_test.js b/ace/mode/xml_test.js
similarity index 100%
rename from lib/ace/mode/xml_test.js
rename to ace/mode/xml_test.js
diff --git a/lib/ace/mode/xml_tokenizer_test.js b/ace/mode/xml_tokenizer_test.js
similarity index 100%
rename from lib/ace/mode/xml_tokenizer_test.js
rename to ace/mode/xml_tokenizer_test.js
diff --git a/lib/ace/model/buffer.js b/ace/model/buffer.js
similarity index 100%
rename from lib/ace/model/buffer.js
rename to ace/model/buffer.js
diff --git a/lib/ace/model/buffer_test.js b/ace/model/buffer_test.js
similarity index 100%
rename from lib/ace/model/buffer_test.js
rename to ace/model/buffer_test.js
diff --git a/lib/ace/model/editor.js b/ace/model/editor.js
similarity index 100%
rename from lib/ace/model/editor.js
rename to ace/model/editor.js
diff --git a/ace/model/editor_test.js b/ace/model/editor_test.js
new file mode 100644
index 00000000..fbeb1b77
--- /dev/null
+++ b/ace/model/editor_test.js
@@ -0,0 +1,72 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Fabian Jakobs <fabian AT ajax DOT org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+if (typeof process !== "undefined") {
+    require("../../../support/paths");
+    require("ace/test/mockdom");
+}
+
+define(function(require, exports, module) {
+return;
+var EditorModel = require("ace/model/editor").Editor;
+var Window = require("ace/model/window").Window;
+var Buffer = require("ace/model/buffer").Buffer;
+
+module.exports = {
+
+    setUp: function() {
+        this.editor = new EditorModel();
+    },
+    
+    "test add buffer": function() {
+        this.editor.addBuffer(new Buffer(""));
+    },
+    
+    "test open buffer in window": function() {
+        var win = this.editor.addWindow(new Window());
+        var buffer = this.editor.addBuffer(new Buffer("juhu"));
+        this.editor.openInWindow(buffer, win);
+        //assert
+    }
+
+};
+
+});
+
+if (typeof module !== "undefined" && module === require.main) {
+    require("asyncjs").test.testcase(module.exports).exec()
+}
\ No newline at end of file
diff --git a/lib/ace/model/window.js b/ace/model/window.js
similarity index 100%
rename from lib/ace/model/window.js
rename to ace/model/window.js
diff --git a/lib/ace/model/window_test.js b/ace/model/window_test.js
similarity index 100%
rename from lib/ace/model/window_test.js
rename to ace/model/window_test.js
diff --git a/lib/ace/mouse_handler.js b/ace/mouse_handler.js
similarity index 100%
rename from lib/ace/mouse_handler.js
rename to ace/mouse_handler.js
diff --git a/lib/ace/range.js b/ace/range.js
similarity index 100%
rename from lib/ace/range.js
rename to ace/range.js
diff --git a/lib/ace/range_test.js b/ace/range_test.js
similarity index 100%
rename from lib/ace/range_test.js
rename to ace/range_test.js
diff --git a/lib/ace/renderloop.js b/ace/renderloop.js
similarity index 100%
rename from lib/ace/renderloop.js
rename to ace/renderloop.js
diff --git a/lib/ace/scrollbar.js b/ace/scrollbar.js
similarity index 100%
rename from lib/ace/scrollbar.js
rename to ace/scrollbar.js
diff --git a/lib/ace/search.js b/ace/search.js
similarity index 100%
rename from lib/ace/search.js
rename to ace/search.js
diff --git a/lib/ace/search_test.js b/ace/search_test.js
similarity index 100%
rename from lib/ace/search_test.js
rename to ace/search_test.js
diff --git a/lib/ace/selection.js b/ace/selection.js
similarity index 100%
rename from lib/ace/selection.js
rename to ace/selection.js
diff --git a/lib/ace/selection_test.js b/ace/selection_test.js
similarity index 100%
rename from lib/ace/selection_test.js
rename to ace/selection_test.js
diff --git a/lib/ace/split.js b/ace/split.js
similarity index 100%
rename from lib/ace/split.js
rename to ace/split.js
diff --git a/lib/ace/test/all.js b/ace/test/all.js
similarity index 100%
rename from lib/ace/test/all.js
rename to ace/test/all.js
diff --git a/lib/ace/test/all_browser.js b/ace/test/all_browser.js
similarity index 100%
rename from lib/ace/test/all_browser.js
rename to ace/test/all_browser.js
diff --git a/lib/ace/test/assertions.js b/ace/test/assertions.js
similarity index 100%
rename from lib/ace/test/assertions.js
rename to ace/test/assertions.js
diff --git a/lib/ace/test/asyncjs/assert.js b/ace/test/asyncjs/assert.js
similarity index 100%
rename from lib/ace/test/asyncjs/assert.js
rename to ace/test/asyncjs/assert.js
diff --git a/lib/ace/test/asyncjs/async.js b/ace/test/asyncjs/async.js
similarity index 100%
rename from lib/ace/test/asyncjs/async.js
rename to ace/test/asyncjs/async.js
diff --git a/lib/ace/test/asyncjs/index.js b/ace/test/asyncjs/index.js
similarity index 100%
rename from lib/ace/test/asyncjs/index.js
rename to ace/test/asyncjs/index.js
diff --git a/lib/ace/test/asyncjs/test.js b/ace/test/asyncjs/test.js
similarity index 100%
rename from lib/ace/test/asyncjs/test.js
rename to ace/test/asyncjs/test.js
diff --git a/lib/ace/test/asyncjs/utils.js b/ace/test/asyncjs/utils.js
similarity index 100%
rename from lib/ace/test/asyncjs/utils.js
rename to ace/test/asyncjs/utils.js
diff --git a/lib/ace/test/benchmark.js b/ace/test/benchmark.js
similarity index 100%
rename from lib/ace/test/benchmark.js
rename to ace/test/benchmark.js
diff --git a/lib/ace/test/event_emitter_test.js b/ace/test/event_emitter_test.js
similarity index 100%
rename from lib/ace/test/event_emitter_test.js
rename to ace/test/event_emitter_test.js
diff --git a/experiments/capture.html b/ace/test/experiments/capture.html
similarity index 100%
rename from experiments/capture.html
rename to ace/test/experiments/capture.html
diff --git a/experiments/cut_copy.html b/ace/test/experiments/cut_copy.html
similarity index 100%
rename from experiments/cut_copy.html
rename to ace/test/experiments/cut_copy.html
diff --git a/experiments/triple_click.html b/ace/test/experiments/triple_click.html
similarity index 100%
rename from experiments/triple_click.html
rename to ace/test/experiments/triple_click.html
diff --git a/experiments/worker.html b/ace/test/experiments/worker.html
similarity index 100%
rename from experiments/worker.html
rename to ace/test/experiments/worker.html
diff --git a/experiments/worker.js b/ace/test/experiments/worker.js
similarity index 100%
rename from experiments/worker.js
rename to ace/test/experiments/worker.js
diff --git a/lib/ace/test/mockdom.js b/ace/test/mockdom.js
similarity index 100%
rename from lib/ace/test/mockdom.js
rename to ace/test/mockdom.js
diff --git a/lib/ace/test/tests.html b/ace/test/tests.html
similarity index 100%
rename from lib/ace/test/tests.html
rename to ace/test/tests.html
diff --git a/lib/ace/theme/clouds.js b/ace/theme/clouds.js
similarity index 100%
rename from lib/ace/theme/clouds.js
rename to ace/theme/clouds.js
diff --git a/lib/ace/theme/clouds_midnight.js b/ace/theme/clouds_midnight.js
similarity index 100%
rename from lib/ace/theme/clouds_midnight.js
rename to ace/theme/clouds_midnight.js
diff --git a/lib/ace/theme/cobalt.js b/ace/theme/cobalt.js
similarity index 100%
rename from lib/ace/theme/cobalt.js
rename to ace/theme/cobalt.js
diff --git a/lib/ace/theme/crimson_editor.js b/ace/theme/crimson_editor.js
similarity index 100%
rename from lib/ace/theme/crimson_editor.js
rename to ace/theme/crimson_editor.js
diff --git a/lib/ace/theme/dawn.js b/ace/theme/dawn.js
similarity index 100%
rename from lib/ace/theme/dawn.js
rename to ace/theme/dawn.js
diff --git a/lib/ace/theme/eclipse.js b/ace/theme/eclipse.js
similarity index 100%
rename from lib/ace/theme/eclipse.js
rename to ace/theme/eclipse.js
diff --git a/lib/ace/theme/idle_fingers.js b/ace/theme/idle_fingers.js
similarity index 100%
rename from lib/ace/theme/idle_fingers.js
rename to ace/theme/idle_fingers.js
diff --git a/lib/ace/theme/kr_theme.js b/ace/theme/kr_theme.js
similarity index 100%
rename from lib/ace/theme/kr_theme.js
rename to ace/theme/kr_theme.js
diff --git a/lib/ace/theme/merbivore.js b/ace/theme/merbivore.js
similarity index 100%
rename from lib/ace/theme/merbivore.js
rename to ace/theme/merbivore.js
diff --git a/lib/ace/theme/merbivore_soft.js b/ace/theme/merbivore_soft.js
similarity index 100%
rename from lib/ace/theme/merbivore_soft.js
rename to ace/theme/merbivore_soft.js
diff --git a/lib/ace/theme/mono_industrial.js b/ace/theme/mono_industrial.js
similarity index 100%
rename from lib/ace/theme/mono_industrial.js
rename to ace/theme/mono_industrial.js
diff --git a/lib/ace/theme/monokai.js b/ace/theme/monokai.js
similarity index 100%
rename from lib/ace/theme/monokai.js
rename to ace/theme/monokai.js
diff --git a/lib/ace/theme/pastel_on_dark.js b/ace/theme/pastel_on_dark.js
similarity index 100%
rename from lib/ace/theme/pastel_on_dark.js
rename to ace/theme/pastel_on_dark.js
diff --git a/lib/ace/theme/solarized_dark.js b/ace/theme/solarized_dark.js
similarity index 100%
rename from lib/ace/theme/solarized_dark.js
rename to ace/theme/solarized_dark.js
diff --git a/lib/ace/theme/solarized_light.js b/ace/theme/solarized_light.js
similarity index 100%
rename from lib/ace/theme/solarized_light.js
rename to ace/theme/solarized_light.js
diff --git a/lib/ace/theme/textmate.js b/ace/theme/textmate.js
similarity index 100%
rename from lib/ace/theme/textmate.js
rename to ace/theme/textmate.js
diff --git a/lib/ace/theme/twilight.js b/ace/theme/twilight.js
similarity index 100%
rename from lib/ace/theme/twilight.js
rename to ace/theme/twilight.js
diff --git a/lib/ace/theme/vibrant_ink.js b/ace/theme/vibrant_ink.js
similarity index 100%
rename from lib/ace/theme/vibrant_ink.js
rename to ace/theme/vibrant_ink.js
diff --git a/lib/ace/tokenizer.js b/ace/tokenizer.js
similarity index 100%
rename from lib/ace/tokenizer.js
rename to ace/tokenizer.js
diff --git a/lib/ace/undomanager.js b/ace/undomanager.js
similarity index 100%
rename from lib/ace/undomanager.js
rename to ace/undomanager.js
diff --git a/lib/ace/unicode.js b/ace/unicode.js
similarity index 100%
rename from lib/ace/unicode.js
rename to ace/unicode.js
diff --git a/lib/ace/view/css/editor.css b/ace/view/css/editor.css
similarity index 100%
rename from lib/ace/view/css/editor.css
rename to ace/view/css/editor.css
diff --git a/lib/ace/view/layer/cursor.js b/ace/view/layer/cursor.js
similarity index 100%
rename from lib/ace/view/layer/cursor.js
rename to ace/view/layer/cursor.js
diff --git a/lib/ace/view/layer/gutter.js b/ace/view/layer/gutter.js
similarity index 100%
rename from lib/ace/view/layer/gutter.js
rename to ace/view/layer/gutter.js
diff --git a/lib/ace/view/layer/marker.js b/ace/view/layer/marker.js
similarity index 100%
rename from lib/ace/view/layer/marker.js
rename to ace/view/layer/marker.js
diff --git a/lib/ace/view/layer/text.js b/ace/view/layer/text.js
similarity index 100%
rename from lib/ace/view/layer/text.js
rename to ace/view/layer/text.js
diff --git a/lib/ace/view/layer/text_text.js b/ace/view/layer/text_text.js
similarity index 100%
rename from lib/ace/view/layer/text_text.js
rename to ace/view/layer/text_text.js
diff --git a/lib/ace/view/measure_text.js b/ace/view/measure_text.js
similarity index 100%
rename from lib/ace/view/measure_text.js
rename to ace/view/measure_text.js
diff --git a/lib/ace/view/window_view.js b/ace/view/window_view.js
similarity index 100%
rename from lib/ace/view/window_view.js
rename to ace/view/window_view.js
diff --git a/lib/ace/view/window_view_mock.js b/ace/view/window_view_mock.js
similarity index 100%
rename from lib/ace/view/window_view_mock.js
rename to ace/view/window_view_mock.js
diff --git a/lib/ace/view/window_view_test.js b/ace/view/window_view_test.js
similarity index 100%
rename from lib/ace/view/window_view_test.js
rename to ace/view/window_view_test.js
diff --git a/lib/ace/window_controller.js b/ace/window_controller.js
similarity index 100%
rename from lib/ace/window_controller.js
rename to ace/window_controller.js
diff --git a/lib/ace/worker/mirror.js b/ace/worker/mirror.js
similarity index 100%
rename from lib/ace/worker/mirror.js
rename to ace/worker/mirror.js
diff --git a/lib/ace/worker/worker.js b/ace/worker/worker.js
similarity index 100%
rename from lib/ace/worker/worker.js
rename to ace/worker/worker.js
diff --git a/lib/ace/worker/worker_client.js b/ace/worker/worker_client.js
similarity index 100%
rename from lib/ace/worker/worker_client.js
rename to ace/worker/worker_client.js
diff --git a/demo/demo.js b/demo/demo.js
index 40629764..f349b2e9 100644
--- a/demo/demo.js
+++ b/demo/demo.js
@@ -40,6 +40,27 @@
 
 define(function(require, exports, module) {
 
+    var themes = {};
+    function loadTheme(name, callback) {
+        if (themes[name])
+            return;
+
+        themes[name] = 1;
+        var base = name.split("/").pop();
+        var fileName = "src/theme-" + base + ".js";
+        loadScriptFile(fileName, callback)
+    }
+
+    function loadScriptFile(path, callback) {
+        var head = document.getElementsByTagName('head')[0];
+        var s = document.createElement('script');
+
+        s.src = path;
+        head.appendChild(s);
+
+        s.onload = callback;
+    }
+
     require("ace/lib/fixoldbrowsers");
 
     var env = {};
@@ -677,26 +698,5 @@ define(function(require, exports, module) {
             session.addFold(placeHolder, range);
         }
     }
-    
-    var themes = {};
-    function loadTheme(name, callback) {
-        if (themes[name])
-            return;
-
-        themes[name] = 1;
-        var base = name.split("/").pop();
-        var fileName = "src/theme-" + base + ".js";
-        loadScriptFile(fileName, callback)
-    }
-
-    function loadScriptFile(path, callback) {
-        var head = document.getElementsByTagName('head')[0];
-        var s = document.createElement('script');
-
-        s.src = path;
-        head.appendChild(s);
-
-        s.onload = callback;
-    }
 
 });
diff --git a/kitchen-sink.html b/kitchen-sink.html
index 0c4e0aec..aeac5662 100644
--- a/kitchen-sink.html
+++ b/kitchen-sink.html
@@ -218,7 +218,7 @@
   <script type="text/javascript">
       var require = {
           paths: {
-              ace: "../lib/ace"
+              ace: "../ace"
           }
       };
   </script>