diff --git a/demo/editor.html b/demo/editor.html
index 425aebd9..f8b2f1a1 100644
--- a/demo/editor.html
+++ b/demo/editor.html
@@ -40,30 +40,30 @@
 	<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.js" type="text/javascript" charset="utf-8"></script>
-	<script src="../src/mode/Text.js" type="text/javascript" charset="utf-8"></script>
-	<script src="../src/mode/JavaScript.js" type="text/javascript" charset="utf-8"></script>
-	<script src="../src/mode/JavaScriptHighlightRules.js" type="text/javascript" charset="utf-8"></script>
-	<script src="../src/mode/Html.js" type="text/javascript" charset="utf-8"></script>
-	<script src="../src/mode/HtmlHighlightRules.js" type="text/javascript" charset="utf-8"></script>
-	<script src="../src/mode/Css.js" type="text/javascript" charset="utf-8"></script>
-	<script src="../src/mode/CssHighlightRules.js" type="text/javascript" charset="utf-8"></script>
-	<script src="../src/mode/Xml.js" type="text/javascript" charset="utf-8"></script>
-	<script src="../src/mode/XmlHighlightRules.js" type="text/javascript" charset="utf-8"></script>
-	<script src="../src/MEventEmitter.js" type="text/javascript" charset="utf-8"></script>
-	<script src="../src/Selection.js" type="text/javascript" charset="utf-8"></script>
-	<script src="../src/Document.js" type="text/javascript" charset="utf-8"></script>
-	<script src="../src/Tokenizer.js" type="text/javascript" charset="utf-8"></script>
-	<script src="../src/BackgroundTokenizer.js" type="text/javascript" charset="utf-8"></script>
-	<script src="../src/layer/Cursor.js" type="text/javascript" charset="utf-8"></script>	
-	<script src="../src/layer/Gutter.js" type="text/javascript" charset="utf-8"></script>	
-	<script src="../src/layer/Text.js" type="text/javascript" charset="utf-8"></script>	
-	<script src="../src/layer/Marker.js" type="text/javascript" charset="utf-8"></script>	
-	<script src="../src/ScrollBar.js" type="text/javascript" charset="utf-8"></script>	
-	<script src="../src/TextInput.js" type="text/javascript" charset="utf-8"></script>
-	<script src="../src/KeyBinding.js" type="text/javascript" charset="utf-8"></script>	
-	<script src="../src/Editor.js" type="text/javascript" charset="utf-8"></script>	
-	<script src="../src/VirtualRenderer.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../src/ace/ace.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/JavaScript.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../src/ace/mode/JavaScriptHighlightRules.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../src/ace/mode/Html.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../src/ace/mode/HtmlHighlightRules.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../src/ace/mode/Css.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../src/ace/mode/CssHighlightRules.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../src/ace/mode/Xml.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../src/ace/mode/XmlHighlightRules.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../src/ace/MEventEmitter.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../src/ace/Selection.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../src/ace/Document.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../src/ace/Tokenizer.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../src/ace/BackgroundTokenizer.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../src/ace/layer/Cursor.js" type="text/javascript" charset="utf-8"></script>	
+	<script src="../src/ace/layer/Gutter.js" type="text/javascript" charset="utf-8"></script>	
+	<script src="../src/ace/layer/Text.js" type="text/javascript" charset="utf-8"></script>	
+	<script src="../src/ace/layer/Marker.js" type="text/javascript" charset="utf-8"></script>	
+	<script src="../src/ace/ScrollBar.js" type="text/javascript" charset="utf-8"></script>	
+	<script src="../src/ace/TextInput.js" type="text/javascript" charset="utf-8"></script>
+	<script src="../src/ace/KeyBinding.js" type="text/javascript" charset="utf-8"></script>	
+	<script src="../src/ace/Editor.js" type="text/javascript" charset="utf-8"></script>	
+	<script src="../src/ace/VirtualRenderer.js" type="text/javascript" charset="utf-8"></script>
 </head>
 <body>
     
diff --git a/src/BackgroundTokenizer.js b/src/ace/BackgroundTokenizer.js
similarity index 100%
rename from src/BackgroundTokenizer.js
rename to src/ace/BackgroundTokenizer.js
diff --git a/src/Document.js b/src/ace/Document.js
similarity index 100%
rename from src/Document.js
rename to src/ace/Document.js
diff --git a/src/Editor.js b/src/ace/Editor.js
similarity index 100%
rename from src/Editor.js
rename to src/ace/Editor.js
diff --git a/src/KeyBinding.js b/src/ace/KeyBinding.js
similarity index 100%
rename from src/KeyBinding.js
rename to src/ace/KeyBinding.js
diff --git a/src/MEventEmitter.js b/src/ace/MEventEmitter.js
similarity index 100%
rename from src/MEventEmitter.js
rename to src/ace/MEventEmitter.js
diff --git a/src/ScrollBar.js b/src/ace/ScrollBar.js
similarity index 100%
rename from src/ScrollBar.js
rename to src/ace/ScrollBar.js
diff --git a/src/Selection.js b/src/ace/Selection.js
similarity index 100%
rename from src/Selection.js
rename to src/ace/Selection.js
diff --git a/src/TextInput.js b/src/ace/TextInput.js
similarity index 100%
rename from src/TextInput.js
rename to src/ace/TextInput.js
diff --git a/src/Tokenizer.js b/src/ace/Tokenizer.js
similarity index 100%
rename from src/Tokenizer.js
rename to src/ace/Tokenizer.js
diff --git a/src/VirtualRenderer.js b/src/ace/VirtualRenderer.js
similarity index 100%
rename from src/VirtualRenderer.js
rename to src/ace/VirtualRenderer.js
diff --git a/src/ace.js b/src/ace/ace.js
similarity index 100%
rename from src/ace.js
rename to src/ace/ace.js
diff --git a/src/layer/Cursor.js b/src/ace/layer/Cursor.js
similarity index 100%
rename from src/layer/Cursor.js
rename to src/ace/layer/Cursor.js
diff --git a/src/layer/Gutter.js b/src/ace/layer/Gutter.js
similarity index 100%
rename from src/layer/Gutter.js
rename to src/ace/layer/Gutter.js
diff --git a/src/layer/Marker.js b/src/ace/layer/Marker.js
similarity index 100%
rename from src/layer/Marker.js
rename to src/ace/layer/Marker.js
diff --git a/src/layer/Text.js b/src/ace/layer/Text.js
similarity index 100%
rename from src/layer/Text.js
rename to src/ace/layer/Text.js
diff --git a/src/mode/Css.js b/src/ace/mode/Css.js
similarity index 100%
rename from src/mode/Css.js
rename to src/ace/mode/Css.js
diff --git a/src/mode/CssHighlightRules.js b/src/ace/mode/CssHighlightRules.js
similarity index 100%
rename from src/mode/CssHighlightRules.js
rename to src/ace/mode/CssHighlightRules.js
diff --git a/src/mode/Html.js b/src/ace/mode/Html.js
similarity index 100%
rename from src/mode/Html.js
rename to src/ace/mode/Html.js
diff --git a/src/mode/HtmlHighlightRules.js b/src/ace/mode/HtmlHighlightRules.js
similarity index 100%
rename from src/mode/HtmlHighlightRules.js
rename to src/ace/mode/HtmlHighlightRules.js
diff --git a/src/mode/JavaScript.js b/src/ace/mode/JavaScript.js
similarity index 100%
rename from src/mode/JavaScript.js
rename to src/ace/mode/JavaScript.js
diff --git a/src/mode/JavaScriptHighlightRules.js b/src/ace/mode/JavaScriptHighlightRules.js
similarity index 100%
rename from src/mode/JavaScriptHighlightRules.js
rename to src/ace/mode/JavaScriptHighlightRules.js
diff --git a/src/mode/Text.js b/src/ace/mode/Text.js
similarity index 100%
rename from src/mode/Text.js
rename to src/ace/mode/Text.js
diff --git a/src/mode/Xml.js b/src/ace/mode/Xml.js
similarity index 100%
rename from src/mode/Xml.js
rename to src/ace/mode/Xml.js
diff --git a/src/mode/XmlHighlightRules.js b/src/ace/mode/XmlHighlightRules.js
similarity index 100%
rename from src/mode/XmlHighlightRules.js
rename to src/ace/mode/XmlHighlightRules.js