diff --git a/demo/editor.html b/demo/editor.html
index f0d054af..821536af 100644
--- a/demo/editor.html
+++ b/demo/editor.html
@@ -40,7 +40,11 @@
 	<link rel="stylesheet" href="../css/editor.css" type="text/css" charset="utf-8">
 	<link rel="stylesheet" href="../css/tm.css" type="text/css" charset="utf-8">
 	
-	<script src="../src/ace/ace.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../src/ace/lib/core.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../src/ace/lib/oop.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../src/ace/lib/lang.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../src/ace/lib/event.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../src/ace/lib/dom.js" type="text/javascript" charset="utf-8"></script>
 	<script src="../src/ace/mode/Text.js" type="text/javascript" charset="utf-8"></script>
 	<script src="../src/ace/mode/TextHighlightRules.js" type="text/javascript" charset="utf-8"></script>
 	<script src="../src/ace/mode/JavaScript.js" type="text/javascript" charset="utf-8"></script>
diff --git a/src/ace/ace.js b/src/ace/ace.js
deleted file mode 100644
index c6b14ca0..00000000
--- a/src/ace/ace.js
+++ /dev/null
@@ -1,307 +0,0 @@
-if (!window.ace)
-    ace = {};
-
-ace.provide = function(namespace) {
-    var parts = namespace.split(".");
-    var obj = window;
-    for (var i=0; i<parts.length; i++) {
-        var part = parts[i];
-        if (!obj[part]) {
-            obj[part] = {};
-        }
-        obj = obj[part];
-    }
-};
-
-ace.inherits = function(ctor, superCtor) {
-    var tempCtor = function() {};
-    tempCtor.prototype = superCtor.prototype;
-    ctor.super_ = superCtor.prototype;
-    ctor.prototype = new tempCtor();
-    ctor.prototype.constructor = ctor;
-};
-
-ace.mixin = function(obj, mixin) {
-    for (var key in mixin) {
-        obj[key] = mixin[key];
-    }
-};
-
-ace.implement = function(proto, mixin) {
-    mixin.call(proto);
-};
-
-ace.addListener = function(elem, type, callback) {
-    if (elem.addEventListener) {
-        return elem.addEventListener(type, callback, false);
-    }
-    if (elem.attachEvent) {
-        var wrapper = function() {
-            callback(window.event);
-        };
-        callback.$$wrapper = wrapper;
-        elem.attachEvent("on" + type, wrapper);
-    }
-};
-
-ace.removeListener = function(elem, type, callback) {
-    if (elem.removeEventListener) {
-        return elem.removeEventListener(type, callback, false);
-    }
-    if (elem.detachEvent) {
-        elem.detachEvent("on" + type, callback.$$wrapper || callback);
-    }
-};
-
-ace.setText = function(elem, text) {
-    if (elem.innerText !== undefined) {
-        elem.innerText = text;
-    }
-    if (elem.textContent !== undefined) {
-        elem.textContent = text;
-    }
-};
-
-ace.stopEvent = function(e) {
-    ace.stopPropagation(e);
-    ace.preventDefault(e);
-    return false;
-};
-
-ace.stopPropagation = function(e) {
-    if (e.stopPropagation)
-        e.stopPropagation();
-    else
-        e.cancelBubble = true;
-};
-
-ace.preventDefault = function(e) {
-    if (e.preventDefault)
-        e.preventDefault();
-    else
-        e.returnValue = false;
-};
-
-
-ace.hasCssClass = function(el, name) {
-    var classes = el.className.split(/\s+/g);
-    return ace.arrayIndexOf(classes, name) !== -1;
-};
-
-
-ace.addCssClass = function(el, name) {
-    if (!ace.hasCssClass(el, name)) {
-        el.className += " " + name;
-    }
-};
-
-ace.removeCssClass = function(el, name) {
-    var classes = el.className.split(/\s+/g);
-    while (true) {
-        var index = ace.arrayIndexOf(classes, name);
-        if (index == -1) {
-            break;
-        }
-        classes.splice(index, 1);
-    }
-    el.className = classes.join(" ");
-};
-
-ace.getInnerWidth = function(element) {
-    return (parseInt(ace.computedStyle(element, "paddingLeft"))
-            + parseInt(ace.computedStyle(element, "paddingRight")) + element.clientWidth);
-};
-
-ace.getInnerHeight = function(element) {
-    return (parseInt(ace.computedStyle(element, "paddingTop"))
-            + parseInt(ace.computedStyle(element, "paddingBottom")) + element.clientHeight);
-};
-
-ace.computedStyle = function(element, style) {
-    if (window.getComputedStyle) {
-        return (window.getComputedStyle(element, null))[style];
-    }
-    else {
-        return element.currentStyle[style];
-    }
-};
-
-ace.scrollbarWidth = function() {
-
-    var inner = document.createElement('p');
-    inner.style.width = "100%";
-    inner.style.height = "200px";
-
-    var outer = document.createElement("div");
-    var style = outer.style;
-
-    style.position = "absolute";
-    style.left = "-10000px";
-    style.overflow = "hidden";
-    style.width = "200px";
-    style.height = "150px";
-
-    outer.appendChild(inner);
-    document.body.appendChild(outer);
-    var noScrollbar = inner.offsetWidth;
-
-    style.overflow = "scroll";
-    var withScrollbar = inner.offsetWidth;
-
-    if (noScrollbar == withScrollbar) {
-        withScrollbar = outer.clientWidth;
-    }
-
-    document.body.removeChild(outer);
-
-    return noScrollbar-withScrollbar;
-};
-
-ace.stringReverse = function(string) {
-    return string.split("").reverse().join("");
-};
-
-if (Array.prototype.indexOf) {
-    ace.arrayIndexOf = function(array, searchElement) {
-        return array.indexOf(searchElement);
-    };
-}
-else {
-    ace.arrayIndexOf = function(array, searchElement) {
-        for (var i=0; i<array.length; i++) {
-            if (array[i] == searchElement) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-
-ace.isArray = function(value) {
-    return Object.prototype.toString.call(value) == "[object Array]";
-};
-
-ace.escapeRegExp = function(str) {
-    return str.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1');
-};
-
-ace.bind = function(fcn, context) {
-    return function() {
-        return fcn.apply(context, arguments);
-    };
-};
-
-ace.getDocumentX = function(event) {
-    if (event.clientX) {
-        var scrollLeft = document.documentElement.scrollLeft || document.body.scrollLeft;
-        return event.clientX + scrollLeft;
-    } else {
-        return event.pageX;
-    }
-};
-
-ace.getDocumentY = function(event) {
-    if (event.clientY) {
-        var scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
-        return event.clientY + scrollTop;
-    } else {
-        return event.pageX;
-    }
-};
-
-if (document.documentElement.setCapture) {
-    ace.capture = function(el, eventHandler, releaseCaptureHandler) {
-        function onMouseMove(e) {
-            eventHandler(e);
-            return ace.stopPropagation(e);
-        }
-
-        function onReleaseCapture(e) {
-            eventHandler && eventHandler(e);
-            releaseCaptureHandler && releaseCaptureHandler();
-
-            ace.removeListener(el, "mousemove", eventHandler);
-            ace.removeListener(el, "mouseup", onReleaseCapture);
-            ace.removeListener(el, "losecapture", onReleaseCapture);
-
-            el.releaseCapture();
-        }
-
-        ace.addListener(el, "mousemove", eventHandler);
-        ace.addListener(el, "mouseup", onReleaseCapture);
-        ace.addListener(el, "losecapture", onReleaseCapture);
-        el.setCapture();
-    };
-}
-else {
-    ace.capture = function(el, eventHandler, releaseCaptureHandler) {
-        function onMouseMove(e) {
-            eventHandler(e);
-            e.stopPropagation();
-        }
-
-        function onMouseUp(e) {
-            eventHandler && eventHandler(e);
-            releaseCaptureHandler && releaseCaptureHandler();
-
-            document.removeEventListener("mousemove", onMouseMove, true);
-            document.removeEventListener("mouseup", onMouseUp, true);
-
-            e.stopPropagation();
-        }
-
-        document.addEventListener("mousemove", onMouseMove, true);
-        document.addEventListener("mouseup", onMouseUp, true);
-    };
-}
-
-ace.addMouseWheelListener = function(el, callback) {
-    var listener = function(e) {
-        e.wheel = (e.wheelDelta) ? e.wheelDelta / 120
-                : -(e.detail || 0) / 3;
-        callback(e);
-    };
-    ace.addListener(el, "DOMMouseScroll", listener);
-    ace.addListener(el, "mousewheel", listener);
-};
-
-ace.autoremoveListener = function(el, type, callback, timeout) {
-    var listener = function(e) {
-        clearTimeout(timeoutId);
-        remove();
-        callback(e);
-    };
-
-    var remove = function() {
-        ace.removeListener(el, type, listener);
-    };
-
-    ace.addListener(el, type, listener);
-    var timeoutId = setTimeout(remove, timeout);
-};
-
-ace.addTripleClickListener = function(el, callback) {
-    ace.addListener(el, "mousedown", function() {
-        ace.autoremoveListener(el, "mousedown", function() {
-            ace.autoremoveListener(el, "mousedown", callback, 300);
-        }, 300);
-    });
-};
-
-ace.addKeyListener = function(el, callback) {
-  var lastDown = null;
-
-  ace.addListener(el, "keydown", function(e) {
-      lastDown = e.keyIdentifier || e.keyCode;
-      return callback(e);
-  });
-
-  ace.addListener(el, "keypress", function(e) {
-      var keyId = e.keyIdentifier || e.keyCode;
-      if (lastDown !== keyId) {
-          return callback(e);
-      } else {
-          lastDown = null;
-      }
-  });
-};
\ No newline at end of file
diff --git a/src/ace/lib/core.js b/src/ace/lib/core.js
new file mode 100644
index 00000000..92436573
--- /dev/null
+++ b/src/ace/lib/core.js
@@ -0,0 +1,18 @@
+if (!window.ace)
+    ace = {};
+
+(function() {
+
+    this.provide = function(namespace) {
+        var parts = namespace.split(".");
+        var obj = window;
+        for (var i=0; i<parts.length; i++) {
+            var part = parts[i];
+            if (!obj[part]) {
+                obj[part] = {};
+            }
+            obj = obj[part];
+        }
+    };
+
+}).call(ace);
\ No newline at end of file
diff --git a/src/ace/lib/dom.js b/src/ace/lib/dom.js
new file mode 100644
index 00000000..d42b4fb3
--- /dev/null
+++ b/src/ace/lib/dom.js
@@ -0,0 +1,88 @@
+(function() {
+
+    var self = this;
+
+    this.setText = function(elem, text) {
+        if (elem.innerText !== undefined) {
+            elem.innerText = text;
+        }
+        if (elem.textContent !== undefined) {
+            elem.textContent = text;
+        }
+    };
+
+    this.hasCssClass = function(el, name) {
+        var classes = el.className.split(/\s+/g);
+        return ace.arrayIndexOf(classes, name) !== -1;
+    };
+
+
+    this.addCssClass = function(el, name) {
+        if (!this.hasCssClass(el, name)) {
+            el.className += " " + name;
+        }
+    };
+
+    this.removeCssClass = function(el, name) {
+        var classes = el.className.split(/\s+/g);
+        while (true) {
+            var index = ace.arrayIndexOf(classes, name);
+            if (index == -1) {
+                break;
+            }
+            classes.splice(index, 1);
+        }
+        el.className = classes.join(" ");
+    };
+
+    this.getInnerWidth = function(element) {
+        return (parseInt(self.computedStyle(element, "paddingLeft"))
+                + parseInt(self.computedStyle(element, "paddingRight")) + element.clientWidth);
+    };
+
+    this.getInnerHeight = function(element) {
+        return (parseInt(this.computedStyle(element, "paddingTop"))
+                + parseInt(this.computedStyle(element, "paddingBottom")) + element.clientHeight);
+    };
+
+    this.computedStyle = function(element, style) {
+        if (window.getComputedStyle) {
+            return (window.getComputedStyle(element, null))[style];
+        }
+        else {
+            return element.currentStyle[style];
+        }
+    };
+
+    this.scrollbarWidth = function() {
+
+        var inner = document.createElement('p');
+        inner.style.width = "100%";
+        inner.style.height = "200px";
+
+        var outer = document.createElement("div");
+        var style = outer.style;
+
+        style.position = "absolute";
+        style.left = "-10000px";
+        style.overflow = "hidden";
+        style.width = "200px";
+        style.height = "150px";
+
+        outer.appendChild(inner);
+        document.body.appendChild(outer);
+        var noScrollbar = inner.offsetWidth;
+
+        style.overflow = "scroll";
+        var withScrollbar = inner.offsetWidth;
+
+        if (noScrollbar == withScrollbar) {
+            withScrollbar = outer.clientWidth;
+        }
+
+        document.body.removeChild(outer);
+
+        return noScrollbar-withScrollbar;
+    };
+
+}).call(ace);
\ No newline at end of file
diff --git a/src/ace/lib/event.js b/src/ace/lib/event.js
new file mode 100644
index 00000000..4fe4ad14
--- /dev/null
+++ b/src/ace/lib/event.js
@@ -0,0 +1,161 @@
+(function() {
+
+    var self = this;
+
+    this.addListener = function(elem, type, callback) {
+        if (elem.addEventListener) {
+            return elem.addEventListener(type, callback, false);
+        }
+        if (elem.attachEvent) {
+            var wrapper = function() {
+                callback(window.event);
+            };
+            callback.$$wrapper = wrapper;
+            elem.attachEvent("on" + type, wrapper);
+        }
+    };
+
+    this.removeListener = function(elem, type, callback) {
+        if (elem.removeEventListener) {
+            return elem.removeEventListener(type, callback, false);
+        }
+        if (elem.detachEvent) {
+            elem.detachEvent("on" + type, callback.$$wrapper || callback);
+        }
+    };
+
+    this.stopEvent = function(e) {
+        self.stopPropagation(e);
+        self.preventDefault(e);
+        return false;
+    };
+
+    this.stopPropagation = function(e) {
+        if (e.stopPropagation)
+            e.stopPropagation();
+        else
+            e.cancelBubble = true;
+    };
+
+    this.preventDefault = function(e) {
+        if (e.preventDefault)
+            e.preventDefault();
+        else
+            e.returnValue = false;
+    };
+
+    this.getDocumentX = function(event) {
+        if (event.clientX) {
+            var scrollLeft = document.documentElement.scrollLeft || document.body.scrollLeft;
+            return event.clientX + scrollLeft;
+        } else {
+            return event.pageX;
+        }
+    };
+
+    this.getDocumentY = function(event) {
+        if (event.clientY) {
+            var scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
+            return event.clientY + scrollTop;
+        } else {
+            return event.pageX;
+        }
+    };
+
+    if (document.documentElement.setCapture) {
+        this.capture = function(el, eventHandler, releaseCaptureHandler) {
+            function onMouseMove(e) {
+                eventHandler(e);
+                return self.stopPropagation(e);
+            }
+
+            function onReleaseCapture(e) {
+                eventHandler && eventHandler(e);
+                releaseCaptureHandler && releaseCaptureHandler();
+
+                self.removeListener(el, "mousemove", eventHandler);
+                self.removeListener(el, "mouseup", onReleaseCapture);
+                self.removeListener(el, "losecapture", onReleaseCapture);
+
+                el.releaseCapture();
+            }
+
+            self.addListener(el, "mousemove", eventHandler);
+            self.addListener(el, "mouseup", onReleaseCapture);
+            self.addListener(el, "losecapture", onReleaseCapture);
+            el.setCapture();
+        };
+    }
+    else {
+        this.capture = function(el, eventHandler, releaseCaptureHandler) {
+            function onMouseMove(e) {
+                eventHandler(e);
+                e.stopPropagation();
+            }
+
+            function onMouseUp(e) {
+                eventHandler && eventHandler(e);
+                releaseCaptureHandler && releaseCaptureHandler();
+
+                document.removeEventListener("mousemove", onMouseMove, true);
+                document.removeEventListener("mouseup", onMouseUp, true);
+
+                e.stopPropagation();
+            }
+
+            document.addEventListener("mousemove", onMouseMove, true);
+            document.addEventListener("mouseup", onMouseUp, true);
+        };
+    }
+
+    this.addMouseWheelListener = function(el, callback) {
+        var listener = function(e) {
+            e.wheel = (e.wheelDelta) ? e.wheelDelta / 120
+                    : -(e.detail || 0) / 3;
+            callback(e);
+        };
+        self.addListener(el, "DOMMouseScroll", listener);
+        self.addListener(el, "mousewheel", listener);
+    };
+
+    this.autoremoveListener = function(el, type, callback, timeout) {
+        var listener = function(e) {
+            clearTimeout(timeoutId);
+            remove();
+            callback(e);
+        };
+
+        var remove = function() {
+            self.removeListener(el, type, listener);
+        };
+
+        self.addListener(el, type, listener);
+        var timeoutId = setTimeout(remove, timeout);
+    };
+
+    this.addTripleClickListener = function(el, callback) {
+        self.addListener(el, "mousedown", function() {
+            self.autoremoveListener(el, "mousedown", function() {
+                self.autoremoveListener(el, "mousedown", callback, 300);
+            }, 300);
+        });
+    };
+
+    this.addKeyListener = function(el, callback) {
+      var lastDown = null;
+
+      self.addListener(el, "keydown", function(e) {
+          lastDown = e.keyIdentifier || e.keyCode;
+          return callback(e);
+      });
+
+      self.addListener(el, "keypress", function(e) {
+          var keyId = e.keyIdentifier || e.keyCode;
+          if (lastDown !== keyId) {
+              return callback(e);
+          } else {
+              lastDown = null;
+          }
+      });
+    };
+}).call(ace);
\ No newline at end of file
diff --git a/src/ace/lib/lang.js b/src/ace/lib/lang.js
new file mode 100644
index 00000000..40be4580
--- /dev/null
+++ b/src/ace/lib/lang.js
@@ -0,0 +1,67 @@
+(function() {
+
+    this.stringReverse = function(string) {
+        return string.split("").reverse().join("");
+    };
+
+    if (Array.prototype.indexOf) {
+        this.arrayIndexOf = function(array, searchElement) {
+            return array.indexOf(searchElement);
+        };
+    }
+    else {
+        this.arrayIndexOf = function(array, searchElement) {
+            for (var i=0; i<array.length; i++) {
+                if (array[i] == searchElement) {
+                    return i;
+                }
+            }
+            return -1;
+        };
+    }
+
+    this.isArray = function(value) {
+        return Object.prototype.toString.call(value) == "[object Array]";
+    };
+
+    this.copyObject = function(obj) {
+        var copy = {};
+        for (var key in obj) {
+            copy[key] = obj[key];
+        }
+        return copy;
+    };
+
+    this.escapeRegExp = function(str) {
+        return str.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1');
+    };
+
+    this.bind = function(fcn, context) {
+        return function() {
+            return fcn.apply(context, arguments);
+        };
+    };
+
+    this.deferredCall = function(fcn) {
+
+        var timer = null;
+        var callback = function() {
+            timer = null;
+            fcn();
+        };
+
+        return {
+          schedule: function() {
+            if (!timer) {
+                timer = setTimeout(callback, 0);
+            }
+          },
+
+          cancel: function() {
+              clearTimeout(timer);
+              timer = null;
+          }
+      };
+    };
+
+}).call(ace);
\ No newline at end of file
diff --git a/src/ace/lib/oop.js b/src/ace/lib/oop.js
new file mode 100644
index 00000000..57764f3a
--- /dev/null
+++ b/src/ace/lib/oop.js
@@ -0,0 +1,21 @@
+(function() {
+
+    this.inherits = function(ctor, superCtor) {
+        var tempCtor = function() {};
+        tempCtor.prototype = superCtor.prototype;
+        ctor.super_ = superCtor.prototype;
+        ctor.prototype = new tempCtor();
+        ctor.prototype.constructor = ctor;
+    };
+
+    this.mixin = function(obj, mixin) {
+        for (var key in mixin) {
+            obj[key] = mixin[key];
+        }
+    };
+
+    this.implement = function(proto, mixin) {
+        mixin.call(proto);
+    };
+
+}).call(ace);
\ No newline at end of file