diff --git a/build.js b/build.js
index 522bd244..0f2eef83 100644
--- a/build.js
+++ b/build.js
@@ -39,7 +39,7 @@
         {
             name: "ace/theme/eclipse",
             exclude: [
-                "ace/lib/lang",
+                "pilot/lang",
                 "pilot/dom",
                 "ace/lib/oop"
             ]
@@ -56,7 +56,7 @@
             name: "ace/mode/css",
             exclude: [
                 "ace/lib/oop",
-                "ace/lib/lang",
+                "pilot/lang",
                 "ace/tokenizer",
                 "ace/range",
                 "ace/mode/text"
@@ -66,7 +66,7 @@
             name: "ace/mode/html",
             exclude: [
                 "ace/lib/oop",
-                "ace/lib/lang",
+                "pilot/lang",
                 "ace/tokenizer",
                 "ace/range",
                 "ace/mode/text",
diff --git a/lib/ace/document.js b/lib/ace/document.js
index 903b8e51..40c67ab1 100644
--- a/lib/ace/document.js
+++ b/lib/ace/document.js
@@ -38,7 +38,7 @@
 define(function(require, exports, module) {
 
 var oop = require("ace/lib/oop").oop;
-var lang = require("ace/lib/lang").lang;
+var lang = require("pilot/lang").lang;
 var MEventEmitter = require("ace/event_emitter").MEventEmitter;
 var Selection = require("ace/selection").Selection;
 var TextMode = require("ace/mode/text").Text;
diff --git a/lib/ace/editor.js b/lib/ace/editor.js
index 01faa5c0..7fc87d25 100644
--- a/lib/ace/editor.js
+++ b/lib/ace/editor.js
@@ -39,7 +39,7 @@ define(function(require, exports, module) {
 
 var oop = require("ace/lib/oop").oop;
 var event = require("pilot/event").event;
-var lang = require("ace/lib/lang").lang;
+var lang = require("pilot/lang").lang;
 var TextInput = require("ace/textinput").TextInput;
 var KeyBinding = require("ace/keybinding").KeyBinding;
 var Document = require("ace/document").Document;
diff --git a/lib/ace/event_emitter.js b/lib/ace/event_emitter.js
index 3bfb8277..d7b1a14c 100644
--- a/lib/ace/event_emitter.js
+++ b/lib/ace/event_emitter.js
@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-    var lang = require("ace/lib/lang").lang;
+    var lang = require("pilot/lang").lang;
 
     var MEventEmitter = {}
 
diff --git a/lib/ace/mode/css_highlight_rules.js b/lib/ace/mode/css_highlight_rules.js
index b06199ff..e5f79e8e 100644
--- a/lib/ace/mode/css_highlight_rules.js
+++ b/lib/ace/mode/css_highlight_rules.js
@@ -38,7 +38,7 @@
 define(function(require, exports, module) {
 
 var oop = require("ace/lib/oop").oop;
-var lang = require("ace/lib/lang").lang;
+var lang = require("pilot/lang").lang;
 var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules;
 
 var CssHighlightRules = function() {
diff --git a/lib/ace/mode/javascript_highlight_rules.js b/lib/ace/mode/javascript_highlight_rules.js
index 0a054e5f..a7a6ad0d 100644
--- a/lib/ace/mode/javascript_highlight_rules.js
+++ b/lib/ace/mode/javascript_highlight_rules.js
@@ -38,7 +38,7 @@
 define(function(require, exports, module) {
 
 var oop = require("ace/lib/oop").oop;
-var lang = require("ace/lib/lang").lang;
+var lang = require("pilot/lang").lang;
 var DocCommentHighlightRules = require("ace/mode/doc_comment_highlight_rules").DocCommentHighlightRules;
 var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules;
 
diff --git a/lib/ace/scrollbar.js b/lib/ace/scrollbar.js
index 7bc741e8..da10d301 100644
--- a/lib/ace/scrollbar.js
+++ b/lib/ace/scrollbar.js
@@ -38,7 +38,7 @@
 define(function(require, exports, module) {
 
 var oop = require("ace/lib/oop").oop;
-var lang = require("ace/lib/lang").lang;
+var lang = require("pilot/lang").lang;
 var dom = require("pilot/dom").dom;
 var event = require("pilot/event").event;
 var MEventEmitter = require("ace/event_emitter").MEventEmitter;
diff --git a/lib/ace/search.js b/lib/ace/search.js
index 1f700e9a..815c5cd4 100644
--- a/lib/ace/search.js
+++ b/lib/ace/search.js
@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-var lang = require("ace/lib/lang").lang;
+var lang = require("pilot/lang").lang;
 var oop = require("ace/lib/oop").oop;
 var Range = require("ace/range").Range;
 
diff --git a/lib/ace/selection.js b/lib/ace/selection.js
index 51c0a9b4..82d1af65 100644
--- a/lib/ace/selection.js
+++ b/lib/ace/selection.js
@@ -38,7 +38,7 @@
 define(function(require, exports, module) {
 
 var oop = require("ace/lib/oop").oop;
-var lang = require("ace/lib/lang").lang;
+var lang = require("pilot/lang").lang;
 var MEventEmitter = require("ace/event_emitter").MEventEmitter;
 var Range = require("ace/range").Range;
 
diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js
index 46b45caa..6cbdd48e 100644
--- a/lib/ace/virtual_renderer.js
+++ b/lib/ace/virtual_renderer.js
@@ -38,7 +38,7 @@
 define(function(require, exports, module) {
 
 var oop = require("ace/lib/oop").oop;
-var lang = require("ace/lib/lang").lang;
+var lang = require("pilot/lang").lang;
 var dom = require("pilot/dom").dom;
 var event = require("pilot/event").event;
 var GutterLayer = require("ace/layer/gutter").Gutter;
diff --git a/plugins/pilot/lib/dom.js b/plugins/pilot/lib/dom.js
index 4dac3cb1..f1021241 100644
--- a/plugins/pilot/lib/dom.js
+++ b/plugins/pilot/lib/dom.js
@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-    var lang = require("ace/lib/lang").lang;
+    var lang = require("pilot/lang").lang;
 
     var dom = {};
 
diff --git a/lib/ace/lib/lang.js b/plugins/pilot/lib/lang.js
similarity index 100%
rename from lib/ace/lib/lang.js
rename to plugins/pilot/lib/lang.js