diff --git a/ace/LICENSE b/LICENSE
similarity index 100%
rename from ace/LICENSE
rename to LICENSE
diff --git a/ace/demo/editor.html b/demo/editor.html
similarity index 100%
rename from ace/demo/editor.html
rename to demo/editor.html
diff --git a/ace/demo/logo.png b/demo/logo.png
similarity index 100%
rename from ace/demo/logo.png
rename to demo/logo.png
diff --git a/ace/demo/require.js b/demo/require.js
similarity index 100%
rename from ace/demo/require.js
rename to demo/require.js
diff --git a/ace/doc/Editor.mm b/doc/Editor.mm
similarity index 100%
rename from ace/doc/Editor.mm
rename to doc/Editor.mm
diff --git a/ace/package.json b/package.json
similarity index 100%
rename from ace/package.json
rename to package.json
diff --git a/ace/src/ace/BackgroundTokenizer.js b/src/ace/BackgroundTokenizer.js
similarity index 100%
rename from ace/src/ace/BackgroundTokenizer.js
rename to src/ace/BackgroundTokenizer.js
diff --git a/ace/src/ace/Document.js b/src/ace/Document.js
similarity index 100%
rename from ace/src/ace/Document.js
rename to src/ace/Document.js
diff --git a/ace/src/ace/Editor.js b/src/ace/Editor.js
similarity index 100%
rename from ace/src/ace/Editor.js
rename to src/ace/Editor.js
diff --git a/ace/src/ace/KeyBinding.js b/src/ace/KeyBinding.js
similarity index 100%
rename from ace/src/ace/KeyBinding.js
rename to src/ace/KeyBinding.js
diff --git a/ace/src/ace/MEventEmitter.js b/src/ace/MEventEmitter.js
similarity index 100%
rename from ace/src/ace/MEventEmitter.js
rename to src/ace/MEventEmitter.js
diff --git a/ace/src/ace/PluginManager.js b/src/ace/PluginManager.js
similarity index 100%
rename from ace/src/ace/PluginManager.js
rename to src/ace/PluginManager.js
diff --git a/ace/src/ace/Range.js b/src/ace/Range.js
similarity index 100%
rename from ace/src/ace/Range.js
rename to src/ace/Range.js
diff --git a/ace/src/ace/RenderLoop.js b/src/ace/RenderLoop.js
similarity index 100%
rename from ace/src/ace/RenderLoop.js
rename to src/ace/RenderLoop.js
diff --git a/ace/src/ace/ScrollBar.js b/src/ace/ScrollBar.js
similarity index 100%
rename from ace/src/ace/ScrollBar.js
rename to src/ace/ScrollBar.js
diff --git a/ace/src/ace/Search.js b/src/ace/Search.js
similarity index 100%
rename from ace/src/ace/Search.js
rename to src/ace/Search.js
diff --git a/ace/src/ace/Selection.js b/src/ace/Selection.js
similarity index 100%
rename from ace/src/ace/Selection.js
rename to src/ace/Selection.js
diff --git a/ace/src/ace/TextInput.js b/src/ace/TextInput.js
similarity index 100%
rename from ace/src/ace/TextInput.js
rename to src/ace/TextInput.js
diff --git a/ace/src/ace/Tokenizer.js b/src/ace/Tokenizer.js
similarity index 100%
rename from ace/src/ace/Tokenizer.js
rename to src/ace/Tokenizer.js
diff --git a/ace/src/ace/UndoManager.js b/src/ace/UndoManager.js
similarity index 100%
rename from ace/src/ace/UndoManager.js
rename to src/ace/UndoManager.js
diff --git a/ace/src/ace/VirtualRenderer.js b/src/ace/VirtualRenderer.js
similarity index 100%
rename from ace/src/ace/VirtualRenderer.js
rename to src/ace/VirtualRenderer.js
diff --git a/ace/src/ace/commands/DefaultCommands.js b/src/ace/commands/DefaultCommands.js
similarity index 100%
rename from ace/src/ace/commands/DefaultCommands.js
rename to src/ace/commands/DefaultCommands.js
diff --git a/ace/src/ace/conf/keybindings/default_mac.js b/src/ace/conf/keybindings/default_mac.js
similarity index 100%
rename from ace/src/ace/conf/keybindings/default_mac.js
rename to src/ace/conf/keybindings/default_mac.js
diff --git a/ace/src/ace/conf/keybindings/default_win.js b/src/ace/conf/keybindings/default_win.js
similarity index 100%
rename from ace/src/ace/conf/keybindings/default_win.js
rename to src/ace/conf/keybindings/default_win.js
diff --git a/ace/src/ace/css/editor.css b/src/ace/css/editor.css
similarity index 100%
rename from ace/src/ace/css/editor.css
rename to src/ace/css/editor.css
diff --git a/ace/src/ace/layer/Cursor.js b/src/ace/layer/Cursor.js
similarity index 100%
rename from ace/src/ace/layer/Cursor.js
rename to src/ace/layer/Cursor.js
diff --git a/ace/src/ace/layer/Gutter.js b/src/ace/layer/Gutter.js
similarity index 100%
rename from ace/src/ace/layer/Gutter.js
rename to src/ace/layer/Gutter.js
diff --git a/ace/src/ace/layer/Marker.js b/src/ace/layer/Marker.js
similarity index 100%
rename from ace/src/ace/layer/Marker.js
rename to src/ace/layer/Marker.js
diff --git a/ace/src/ace/layer/Text.js b/src/ace/layer/Text.js
similarity index 100%
rename from ace/src/ace/layer/Text.js
rename to src/ace/layer/Text.js
diff --git a/ace/src/ace/lib/core.js b/src/ace/lib/core.js
similarity index 100%
rename from ace/src/ace/lib/core.js
rename to src/ace/lib/core.js
diff --git a/ace/src/ace/lib/dom.js b/src/ace/lib/dom.js
similarity index 100%
rename from ace/src/ace/lib/dom.js
rename to src/ace/lib/dom.js
diff --git a/ace/src/ace/lib/event.js b/src/ace/lib/event.js
similarity index 100%
rename from ace/src/ace/lib/event.js
rename to src/ace/lib/event.js
diff --git a/ace/src/ace/lib/lang.js b/src/ace/lib/lang.js
similarity index 100%
rename from ace/src/ace/lib/lang.js
rename to src/ace/lib/lang.js
diff --git a/ace/src/ace/lib/oop.js b/src/ace/lib/oop.js
similarity index 100%
rename from ace/src/ace/lib/oop.js
rename to src/ace/lib/oop.js
diff --git a/ace/src/ace/mode/Css.js b/src/ace/mode/Css.js
similarity index 100%
rename from ace/src/ace/mode/Css.js
rename to src/ace/mode/Css.js
diff --git a/ace/src/ace/mode/CssHighlightRules.js b/src/ace/mode/CssHighlightRules.js
similarity index 100%
rename from ace/src/ace/mode/CssHighlightRules.js
rename to src/ace/mode/CssHighlightRules.js
diff --git a/ace/src/ace/mode/DocCommentHighlightRules.js b/src/ace/mode/DocCommentHighlightRules.js
similarity index 100%
rename from ace/src/ace/mode/DocCommentHighlightRules.js
rename to src/ace/mode/DocCommentHighlightRules.js
diff --git a/ace/src/ace/mode/Html.js b/src/ace/mode/Html.js
similarity index 100%
rename from ace/src/ace/mode/Html.js
rename to src/ace/mode/Html.js
diff --git a/ace/src/ace/mode/HtmlHighlightRules.js b/src/ace/mode/HtmlHighlightRules.js
similarity index 100%
rename from ace/src/ace/mode/HtmlHighlightRules.js
rename to src/ace/mode/HtmlHighlightRules.js
diff --git a/ace/src/ace/mode/JavaScript.js b/src/ace/mode/JavaScript.js
similarity index 100%
rename from ace/src/ace/mode/JavaScript.js
rename to src/ace/mode/JavaScript.js
diff --git a/ace/src/ace/mode/JavaScriptHighlightRules.js b/src/ace/mode/JavaScriptHighlightRules.js
similarity index 100%
rename from ace/src/ace/mode/JavaScriptHighlightRules.js
rename to src/ace/mode/JavaScriptHighlightRules.js
diff --git a/ace/src/ace/mode/MatchingBraceOutdent.js b/src/ace/mode/MatchingBraceOutdent.js
similarity index 100%
rename from ace/src/ace/mode/MatchingBraceOutdent.js
rename to src/ace/mode/MatchingBraceOutdent.js
diff --git a/ace/src/ace/mode/Text.js b/src/ace/mode/Text.js
similarity index 100%
rename from ace/src/ace/mode/Text.js
rename to src/ace/mode/Text.js
diff --git a/ace/src/ace/mode/TextHighlightRules.js b/src/ace/mode/TextHighlightRules.js
similarity index 100%
rename from ace/src/ace/mode/TextHighlightRules.js
rename to src/ace/mode/TextHighlightRules.js
diff --git a/ace/src/ace/mode/Xml.js b/src/ace/mode/Xml.js
similarity index 100%
rename from ace/src/ace/mode/Xml.js
rename to src/ace/mode/Xml.js
diff --git a/ace/src/ace/mode/XmlHighlightRules.js b/src/ace/mode/XmlHighlightRules.js
similarity index 100%
rename from ace/src/ace/mode/XmlHighlightRules.js
rename to src/ace/mode/XmlHighlightRules.js
diff --git a/ace/src/ace/test/ChangeDocumentTest.js b/src/ace/test/ChangeDocumentTest.js
similarity index 100%
rename from ace/src/ace/test/ChangeDocumentTest.js
rename to src/ace/test/ChangeDocumentTest.js
diff --git a/ace/src/ace/test/DocumentTest.js b/src/ace/test/DocumentTest.js
similarity index 100%
rename from ace/src/ace/test/DocumentTest.js
rename to src/ace/test/DocumentTest.js
diff --git a/ace/src/ace/test/EventEmitterTest.js b/src/ace/test/EventEmitterTest.js
similarity index 100%
rename from ace/src/ace/test/EventEmitterTest.js
rename to src/ace/test/EventEmitterTest.js
diff --git a/ace/src/ace/test/MockRenderer.js b/src/ace/test/MockRenderer.js
similarity index 100%
rename from ace/src/ace/test/MockRenderer.js
rename to src/ace/test/MockRenderer.js
diff --git a/ace/src/ace/test/NavigationTest.js b/src/ace/test/NavigationTest.js
similarity index 100%
rename from ace/src/ace/test/NavigationTest.js
rename to src/ace/test/NavigationTest.js
diff --git a/ace/src/ace/test/RangeTest.js b/src/ace/test/RangeTest.js
similarity index 100%
rename from ace/src/ace/test/RangeTest.js
rename to src/ace/test/RangeTest.js
diff --git a/ace/src/ace/test/SearchTest.js b/src/ace/test/SearchTest.js
similarity index 100%
rename from ace/src/ace/test/SearchTest.js
rename to src/ace/test/SearchTest.js
diff --git a/ace/src/ace/test/SelectionTest.js b/src/ace/test/SelectionTest.js
similarity index 100%
rename from ace/src/ace/test/SelectionTest.js
rename to src/ace/test/SelectionTest.js
diff --git a/ace/src/ace/test/TextEditTest.js b/src/ace/test/TextEditTest.js
similarity index 100%
rename from ace/src/ace/test/TextEditTest.js
rename to src/ace/test/TextEditTest.js
diff --git a/ace/src/ace/test/VirtualRendererTest.js b/src/ace/test/VirtualRendererTest.js
similarity index 100%
rename from ace/src/ace/test/VirtualRendererTest.js
rename to src/ace/test/VirtualRendererTest.js
diff --git a/ace/src/ace/test/all.js b/src/ace/test/all.js
similarity index 100%
rename from ace/src/ace/test/all.js
rename to src/ace/test/all.js
diff --git a/ace/src/ace/test/assertions.js b/src/ace/test/assertions.js
similarity index 100%
rename from ace/src/ace/test/assertions.js
rename to src/ace/test/assertions.js
diff --git a/ace/src/ace/test/mode/CssTest.js b/src/ace/test/mode/CssTest.js
similarity index 100%
rename from ace/src/ace/test/mode/CssTest.js
rename to src/ace/test/mode/CssTest.js
diff --git a/ace/src/ace/test/mode/CssTokenizerTest.js b/src/ace/test/mode/CssTokenizerTest.js
similarity index 100%
rename from ace/src/ace/test/mode/CssTokenizerTest.js
rename to src/ace/test/mode/CssTokenizerTest.js
diff --git a/ace/src/ace/test/mode/HtmlTest.js b/src/ace/test/mode/HtmlTest.js
similarity index 100%
rename from ace/src/ace/test/mode/HtmlTest.js
rename to src/ace/test/mode/HtmlTest.js
diff --git a/ace/src/ace/test/mode/HtmlTokenizerTest.js b/src/ace/test/mode/HtmlTokenizerTest.js
similarity index 100%
rename from ace/src/ace/test/mode/HtmlTokenizerTest.js
rename to src/ace/test/mode/HtmlTokenizerTest.js
diff --git a/ace/src/ace/test/mode/JavaScriptTest.js b/src/ace/test/mode/JavaScriptTest.js
similarity index 100%
rename from ace/src/ace/test/mode/JavaScriptTest.js
rename to src/ace/test/mode/JavaScriptTest.js
diff --git a/ace/src/ace/test/mode/JavaScriptTokenizerTest.js b/src/ace/test/mode/JavaScriptTokenizerTest.js
similarity index 100%
rename from ace/src/ace/test/mode/JavaScriptTokenizerTest.js
rename to src/ace/test/mode/JavaScriptTokenizerTest.js
diff --git a/ace/src/ace/test/mode/TextTest.js b/src/ace/test/mode/TextTest.js
similarity index 100%
rename from ace/src/ace/test/mode/TextTest.js
rename to src/ace/test/mode/TextTest.js
diff --git a/ace/src/ace/test/mode/XmlTest.js b/src/ace/test/mode/XmlTest.js
similarity index 100%
rename from ace/src/ace/test/mode/XmlTest.js
rename to src/ace/test/mode/XmlTest.js
diff --git a/ace/src/ace/test/mode/XmlTokenizerTest.js b/src/ace/test/mode/XmlTokenizerTest.js
similarity index 100%
rename from ace/src/ace/test/mode/XmlTokenizerTest.js
rename to src/ace/test/mode/XmlTokenizerTest.js
diff --git a/ace/src/ace/theme/Clouds.js b/src/ace/theme/Clouds.js
similarity index 100%
rename from ace/src/ace/theme/Clouds.js
rename to src/ace/theme/Clouds.js
diff --git a/ace/src/ace/theme/CloudsMidnight.js b/src/ace/theme/CloudsMidnight.js
similarity index 100%
rename from ace/src/ace/theme/CloudsMidnight.js
rename to src/ace/theme/CloudsMidnight.js
diff --git a/ace/src/ace/theme/Cobalt.js b/src/ace/theme/Cobalt.js
similarity index 100%
rename from ace/src/ace/theme/Cobalt.js
rename to src/ace/theme/Cobalt.js
diff --git a/ace/src/ace/theme/Dawn.js b/src/ace/theme/Dawn.js
similarity index 100%
rename from ace/src/ace/theme/Dawn.js
rename to src/ace/theme/Dawn.js
diff --git a/ace/src/ace/theme/Eclipse.js b/src/ace/theme/Eclipse.js
similarity index 100%
rename from ace/src/ace/theme/Eclipse.js
rename to src/ace/theme/Eclipse.js
diff --git a/ace/src/ace/theme/IdleFingers.js b/src/ace/theme/IdleFingers.js
similarity index 100%
rename from ace/src/ace/theme/IdleFingers.js
rename to src/ace/theme/IdleFingers.js
diff --git a/ace/src/ace/theme/KrTheme.js b/src/ace/theme/KrTheme.js
similarity index 100%
rename from ace/src/ace/theme/KrTheme.js
rename to src/ace/theme/KrTheme.js
diff --git a/ace/src/ace/theme/MonoIndustrial.js b/src/ace/theme/MonoIndustrial.js
similarity index 100%
rename from ace/src/ace/theme/MonoIndustrial.js
rename to src/ace/theme/MonoIndustrial.js
diff --git a/ace/src/ace/theme/Monokai.js b/src/ace/theme/Monokai.js
similarity index 100%
rename from ace/src/ace/theme/Monokai.js
rename to src/ace/theme/Monokai.js
diff --git a/ace/src/ace/theme/TextMate.js b/src/ace/theme/TextMate.js
similarity index 100%
rename from ace/src/ace/theme/TextMate.js
rename to src/ace/theme/TextMate.js
diff --git a/ace/src/ace/theme/Twilight.js b/src/ace/theme/Twilight.js
similarity index 100%
rename from ace/src/ace/theme/Twilight.js
rename to src/ace/theme/Twilight.js
diff --git a/ace/src/ace/theme/eclipse.css b/src/ace/theme/eclipse.css
similarity index 100%
rename from ace/src/ace/theme/eclipse.css
rename to src/ace/theme/eclipse.css
diff --git a/ace/src/ace/theme/tm.css b/src/ace/theme/tm.css
similarity index 100%
rename from ace/src/ace/theme/tm.css
rename to src/ace/theme/tm.css
diff --git a/ace/tool/Theme.tmpl.css b/tool/Theme.tmpl.css
similarity index 100%
rename from ace/tool/Theme.tmpl.css
rename to tool/Theme.tmpl.css
diff --git a/ace/tool/theme.tmpl.js b/tool/theme.tmpl.js
similarity index 100%
rename from ace/tool/theme.tmpl.js
rename to tool/theme.tmpl.js
diff --git a/ace/tool/tmtheme.js b/tool/tmtheme.js
similarity index 100%
rename from ace/tool/tmtheme.js
rename to tool/tmtheme.js
diff --git a/ace/tool/tmthemes/Dawn.tmTheme b/tool/tmthemes/Dawn.tmTheme
similarity index 100%
rename from ace/tool/tmthemes/Dawn.tmTheme
rename to tool/tmthemes/Dawn.tmTheme
diff --git a/ace/tool/tmthemes/Twilight.tmTheme b/tool/tmthemes/Twilight.tmTheme
similarity index 100%
rename from ace/tool/tmthemes/Twilight.tmTheme
rename to tool/tmthemes/Twilight.tmTheme
diff --git a/ace/tool/tmthemes/idleFingers.tmTheme b/tool/tmthemes/idleFingers.tmTheme
similarity index 100%
rename from ace/tool/tmthemes/idleFingers.tmTheme
rename to tool/tmthemes/idleFingers.tmTheme