diff --git a/lib/ace/mode/folding/latex.js b/lib/ace/mode/folding/latex.js
index 71d9c36e..a8c9db74 100644
--- a/lib/ace/mode/folding/latex.js
+++ b/lib/ace/mode/folding/latex.js
@@ -34,7 +34,7 @@ define(function(require, exports, module) {
 var oop = require("../../lib/oop");
 var BaseFoldMode = require("./fold_mode").FoldMode;
 var Range = require("../../range").Range;
-var TokenIterator = require("ace/token_iterator").TokenIterator;
+var TokenIterator = require("../../token_iterator").TokenIterator;
 
 var FoldMode = exports.FoldMode = function() {};
 
diff --git a/lib/ace/mode/folding/lua.js b/lib/ace/mode/folding/lua.js
index 2aa7d562..a7d3205c 100644
--- a/lib/ace/mode/folding/lua.js
+++ b/lib/ace/mode/folding/lua.js
@@ -34,7 +34,7 @@ define(function(require, exports, module) {
 var oop = require("../../lib/oop");
 var BaseFoldMode = require("./fold_mode").FoldMode;
 var Range = require("../../range").Range;
-var TokenIterator = require("ace/token_iterator").TokenIterator;
+var TokenIterator = require("../../token_iterator").TokenIterator;
 
 
 var FoldMode = exports.FoldMode = function() {};
diff --git a/lib/ace/mode/r.js b/lib/ace/mode/r.js
index 11cfe79c..0c60c120 100644
--- a/lib/ace/mode/r.js
+++ b/lib/ace/mode/r.js
@@ -18,17 +18,14 @@
 define(function(require, exports, module) {
    "use strict";
 
-   var Editor = require("ace/editor").Editor;
-   var EditSession = require("ace/edit_session").EditSession;
-   var Range = require("ace/range").Range;
-   var oop = require("ace/lib/oop");
-   var TextMode = require("ace/mode/text").Mode;
-   var Tokenizer = require("ace/tokenizer").Tokenizer;
-   var TextHighlightRules = require("ace/mode/text_highlight_rules")
-         .TextHighlightRules;
+   var Range = require("../range").Range;
+   var oop = require("../lib/oop");
+   var TextMode = require("./text").Mode;
+   var Tokenizer = require("../tokenizer").Tokenizer;
+   var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
    var RHighlightRules = require("./r_highlight_rules").RHighlightRules;
-   var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent;
-   var unicode = require("ace/unicode");
+   var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+   var unicode = require("../unicode");
 
    var Mode = function()
    {
diff --git a/lib/ace/mode/r_highlight_rules.js b/lib/ace/mode/r_highlight_rules.js
index f59be4e9..106eeadf 100644
--- a/lib/ace/mode/r_highlight_rules.js
+++ b/lib/ace/mode/r_highlight_rules.js
@@ -18,10 +18,9 @@
 define(function(require, exports, module)
 {
 
-   var oop = require("ace/lib/oop");
-   var lang = require("ace/lib/lang");
-   var TextHighlightRules = require("ace/mode/text_highlight_rules")
-         .TextHighlightRules;
+   var oop = require("../lib/oop");
+   var lang = require("../lib/lang");
+   var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
    var TexHighlightRules = require("./tex_highlight_rules").TexHighlightRules;
 
    var RHighlightRules = function()
diff --git a/lib/ace/mode/rdoc.js b/lib/ace/mode/rdoc.js
index e095be08..1fb9e6e4 100644
--- a/lib/ace/mode/rdoc.js
+++ b/lib/ace/mode/rdoc.js
@@ -13,12 +13,12 @@
 define(function(require, exports, module) {
 "use strict";
 
-var oop = require("ace/lib/oop");
-var TextMode = require("ace/mode/text").Mode;
-var Tokenizer = require("ace/tokenizer").Tokenizer;
-var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules;
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
 var RDocHighlightRules = require("./rdoc_highlight_rules").RDocHighlightRules;
-var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 
 var Mode = function(suppressHighlighting) {
 	this.$tokenizer = new Tokenizer(new RDocHighlightRules().getRules());
diff --git a/lib/ace/mode/rdoc_highlight_rules.js b/lib/ace/mode/rdoc_highlight_rules.js
index c5bbe145..df511b4a 100644
--- a/lib/ace/mode/rdoc_highlight_rules.js
+++ b/lib/ace/mode/rdoc_highlight_rules.js
@@ -13,8 +13,8 @@
 define(function(require, exports, module) {
 "use strict";
 
-var oop = require("ace/lib/oop");
-var lang = require("ace/lib/lang");
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
 var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
 var LaTeXHighlightRules = require("./latex_highlight_rules");
 
diff --git a/lib/ace/mode/rhtml.js b/lib/ace/mode/rhtml.js
index c999cf22..c45f85ac 100644
--- a/lib/ace/mode/rhtml.js
+++ b/lib/ace/mode/rhtml.js
@@ -19,9 +19,9 @@
 define(function(require, exports, module) {
 "use strict";
 
-var oop = require("ace/lib/oop");
-var HtmlMode = require("ace/mode/html").Mode;
-var Tokenizer = require("ace/tokenizer").Tokenizer;
+var oop = require("../lib/oop");
+var HtmlMode = require("./html").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
 
 var RHtmlHighlightRules = require("./rhtml_highlight_rules").RHtmlHighlightRules;
 /* Make life easier, don't do these right now 
diff --git a/lib/ace/mode/rhtml_highlight_rules.js b/lib/ace/mode/rhtml_highlight_rules.js
index 08d8a720..20cd3bbc 100644
--- a/lib/ace/mode/rhtml_highlight_rules.js
+++ b/lib/ace/mode/rhtml_highlight_rules.js
@@ -18,7 +18,7 @@
 define(function(require, exports, module) {
 "use strict";
 
-var oop = require("ace/lib/oop");
+var oop = require("../lib/oop");
 var RHighlightRules = require("./r_highlight_rules").RHighlightRules;
 var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules;
 var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
diff --git a/lib/ace/mode/tex.js b/lib/ace/mode/tex.js
index 580f17e2..7d8f859d 100644
--- a/lib/ace/mode/tex.js
+++ b/lib/ace/mode/tex.js
@@ -18,9 +18,9 @@
 define(function(require, exports, module) {
 "use strict";
 
-var oop = require("ace/lib/oop");
-var TextMode = require("ace/mode/text").Mode;
-var Tokenizer = require("ace/tokenizer").Tokenizer;
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var Tokenizer = require("../tokenizer").Tokenizer;
 var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
 var TexHighlightRules = require("./tex_highlight_rules").TexHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
diff --git a/lib/ace/mode/tex_highlight_rules.js b/lib/ace/mode/tex_highlight_rules.js
index 6c5e34a9..c64d031f 100644
--- a/lib/ace/mode/tex_highlight_rules.js
+++ b/lib/ace/mode/tex_highlight_rules.js
@@ -18,8 +18,8 @@
 define(function(require, exports, module) {
 "use strict";
 
-var oop = require("ace/lib/oop");
-var lang = require("ace/lib/lang");
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
 var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
 
 var TexHighlightRules = function(textClass) {