diff --git a/demo/editor.html b/demo/editor.html
index 092815a6..b00d6679 100644
--- a/demo/editor.html
+++ b/demo/editor.html
@@ -134,7 +134,7 @@
 <script type="text/javascript" charset="utf-8">
 
 require(
-    {baseUrl: "../src"},
+    {baseUrl: "../lib"},
     [
         "ace/lib/event",
         "ace/Editor",
diff --git a/src/ace/BackgroundTokenizer.js b/lib/ace/BackgroundTokenizer.js
similarity index 100%
rename from src/ace/BackgroundTokenizer.js
rename to lib/ace/BackgroundTokenizer.js
diff --git a/src/ace/Document.js b/lib/ace/Document.js
similarity index 100%
rename from src/ace/Document.js
rename to lib/ace/Document.js
diff --git a/src/ace/Editor.js b/lib/ace/Editor.js
similarity index 100%
rename from src/ace/Editor.js
rename to lib/ace/Editor.js
diff --git a/src/ace/KeyBinding.js b/lib/ace/KeyBinding.js
similarity index 100%
rename from src/ace/KeyBinding.js
rename to lib/ace/KeyBinding.js
diff --git a/src/ace/MEventEmitter.js b/lib/ace/MEventEmitter.js
similarity index 100%
rename from src/ace/MEventEmitter.js
rename to lib/ace/MEventEmitter.js
diff --git a/src/ace/PluginManager.js b/lib/ace/PluginManager.js
similarity index 100%
rename from src/ace/PluginManager.js
rename to lib/ace/PluginManager.js
diff --git a/src/ace/Range.js b/lib/ace/Range.js
similarity index 100%
rename from src/ace/Range.js
rename to lib/ace/Range.js
diff --git a/src/ace/RenderLoop.js b/lib/ace/RenderLoop.js
similarity index 100%
rename from src/ace/RenderLoop.js
rename to lib/ace/RenderLoop.js
diff --git a/src/ace/ScrollBar.js b/lib/ace/ScrollBar.js
similarity index 100%
rename from src/ace/ScrollBar.js
rename to lib/ace/ScrollBar.js
diff --git a/src/ace/Search.js b/lib/ace/Search.js
similarity index 100%
rename from src/ace/Search.js
rename to lib/ace/Search.js
diff --git a/src/ace/Selection.js b/lib/ace/Selection.js
similarity index 100%
rename from src/ace/Selection.js
rename to lib/ace/Selection.js
diff --git a/src/ace/TextInput.js b/lib/ace/TextInput.js
similarity index 100%
rename from src/ace/TextInput.js
rename to lib/ace/TextInput.js
diff --git a/src/ace/Tokenizer.js b/lib/ace/Tokenizer.js
similarity index 100%
rename from src/ace/Tokenizer.js
rename to lib/ace/Tokenizer.js
diff --git a/src/ace/UndoManager.js b/lib/ace/UndoManager.js
similarity index 100%
rename from src/ace/UndoManager.js
rename to lib/ace/UndoManager.js
diff --git a/src/ace/VirtualRenderer.js b/lib/ace/VirtualRenderer.js
similarity index 100%
rename from src/ace/VirtualRenderer.js
rename to lib/ace/VirtualRenderer.js
diff --git a/src/ace/commands/DefaultCommands.js b/lib/ace/commands/DefaultCommands.js
similarity index 100%
rename from src/ace/commands/DefaultCommands.js
rename to lib/ace/commands/DefaultCommands.js
diff --git a/src/ace/conf/keybindings/default_mac.js b/lib/ace/conf/keybindings/default_mac.js
similarity index 100%
rename from src/ace/conf/keybindings/default_mac.js
rename to lib/ace/conf/keybindings/default_mac.js
diff --git a/src/ace/conf/keybindings/default_win.js b/lib/ace/conf/keybindings/default_win.js
similarity index 100%
rename from src/ace/conf/keybindings/default_win.js
rename to lib/ace/conf/keybindings/default_win.js
diff --git a/src/ace/css/editor.css b/lib/ace/css/editor.css
similarity index 100%
rename from src/ace/css/editor.css
rename to lib/ace/css/editor.css
diff --git a/src/ace/layer/Cursor.js b/lib/ace/layer/Cursor.js
similarity index 100%
rename from src/ace/layer/Cursor.js
rename to lib/ace/layer/Cursor.js
diff --git a/src/ace/layer/Gutter.js b/lib/ace/layer/Gutter.js
similarity index 100%
rename from src/ace/layer/Gutter.js
rename to lib/ace/layer/Gutter.js
diff --git a/src/ace/layer/Marker.js b/lib/ace/layer/Marker.js
similarity index 100%
rename from src/ace/layer/Marker.js
rename to lib/ace/layer/Marker.js
diff --git a/src/ace/layer/Text.js b/lib/ace/layer/Text.js
similarity index 100%
rename from src/ace/layer/Text.js
rename to lib/ace/layer/Text.js
diff --git a/src/ace/lib/core.js b/lib/ace/lib/core.js
similarity index 100%
rename from src/ace/lib/core.js
rename to lib/ace/lib/core.js
diff --git a/src/ace/lib/dom.js b/lib/ace/lib/dom.js
similarity index 100%
rename from src/ace/lib/dom.js
rename to lib/ace/lib/dom.js
diff --git a/src/ace/lib/event.js b/lib/ace/lib/event.js
similarity index 100%
rename from src/ace/lib/event.js
rename to lib/ace/lib/event.js
diff --git a/src/ace/lib/lang.js b/lib/ace/lib/lang.js
similarity index 100%
rename from src/ace/lib/lang.js
rename to lib/ace/lib/lang.js
diff --git a/src/ace/lib/oop.js b/lib/ace/lib/oop.js
similarity index 100%
rename from src/ace/lib/oop.js
rename to lib/ace/lib/oop.js
diff --git a/src/ace/mode/Css.js b/lib/ace/mode/Css.js
similarity index 100%
rename from src/ace/mode/Css.js
rename to lib/ace/mode/Css.js
diff --git a/src/ace/mode/CssHighlightRules.js b/lib/ace/mode/CssHighlightRules.js
similarity index 100%
rename from src/ace/mode/CssHighlightRules.js
rename to lib/ace/mode/CssHighlightRules.js
diff --git a/src/ace/mode/DocCommentHighlightRules.js b/lib/ace/mode/DocCommentHighlightRules.js
similarity index 100%
rename from src/ace/mode/DocCommentHighlightRules.js
rename to lib/ace/mode/DocCommentHighlightRules.js
diff --git a/src/ace/mode/Html.js b/lib/ace/mode/Html.js
similarity index 100%
rename from src/ace/mode/Html.js
rename to lib/ace/mode/Html.js
diff --git a/src/ace/mode/HtmlHighlightRules.js b/lib/ace/mode/HtmlHighlightRules.js
similarity index 100%
rename from src/ace/mode/HtmlHighlightRules.js
rename to lib/ace/mode/HtmlHighlightRules.js
diff --git a/src/ace/mode/JavaScript.js b/lib/ace/mode/JavaScript.js
similarity index 100%
rename from src/ace/mode/JavaScript.js
rename to lib/ace/mode/JavaScript.js
diff --git a/src/ace/mode/JavaScriptHighlightRules.js b/lib/ace/mode/JavaScriptHighlightRules.js
similarity index 100%
rename from src/ace/mode/JavaScriptHighlightRules.js
rename to lib/ace/mode/JavaScriptHighlightRules.js
diff --git a/src/ace/mode/MatchingBraceOutdent.js b/lib/ace/mode/MatchingBraceOutdent.js
similarity index 100%
rename from src/ace/mode/MatchingBraceOutdent.js
rename to lib/ace/mode/MatchingBraceOutdent.js
diff --git a/src/ace/mode/Text.js b/lib/ace/mode/Text.js
similarity index 100%
rename from src/ace/mode/Text.js
rename to lib/ace/mode/Text.js
diff --git a/src/ace/mode/TextHighlightRules.js b/lib/ace/mode/TextHighlightRules.js
similarity index 100%
rename from src/ace/mode/TextHighlightRules.js
rename to lib/ace/mode/TextHighlightRules.js
diff --git a/src/ace/mode/Xml.js b/lib/ace/mode/Xml.js
similarity index 100%
rename from src/ace/mode/Xml.js
rename to lib/ace/mode/Xml.js
diff --git a/src/ace/mode/XmlHighlightRules.js b/lib/ace/mode/XmlHighlightRules.js
similarity index 100%
rename from src/ace/mode/XmlHighlightRules.js
rename to lib/ace/mode/XmlHighlightRules.js
diff --git a/src/ace/test/ChangeDocumentTest.js b/lib/ace/test/ChangeDocumentTest.js
similarity index 100%
rename from src/ace/test/ChangeDocumentTest.js
rename to lib/ace/test/ChangeDocumentTest.js
diff --git a/src/ace/test/DocumentTest.js b/lib/ace/test/DocumentTest.js
similarity index 100%
rename from src/ace/test/DocumentTest.js
rename to lib/ace/test/DocumentTest.js
diff --git a/src/ace/test/EventEmitterTest.js b/lib/ace/test/EventEmitterTest.js
similarity index 100%
rename from src/ace/test/EventEmitterTest.js
rename to lib/ace/test/EventEmitterTest.js
diff --git a/src/ace/test/MockRenderer.js b/lib/ace/test/MockRenderer.js
similarity index 100%
rename from src/ace/test/MockRenderer.js
rename to lib/ace/test/MockRenderer.js
diff --git a/src/ace/test/NavigationTest.js b/lib/ace/test/NavigationTest.js
similarity index 100%
rename from src/ace/test/NavigationTest.js
rename to lib/ace/test/NavigationTest.js
diff --git a/src/ace/test/RangeTest.js b/lib/ace/test/RangeTest.js
similarity index 100%
rename from src/ace/test/RangeTest.js
rename to lib/ace/test/RangeTest.js
diff --git a/src/ace/test/SearchTest.js b/lib/ace/test/SearchTest.js
similarity index 100%
rename from src/ace/test/SearchTest.js
rename to lib/ace/test/SearchTest.js
diff --git a/src/ace/test/SelectionTest.js b/lib/ace/test/SelectionTest.js
similarity index 100%
rename from src/ace/test/SelectionTest.js
rename to lib/ace/test/SelectionTest.js
diff --git a/src/ace/test/TextEditTest.js b/lib/ace/test/TextEditTest.js
similarity index 100%
rename from src/ace/test/TextEditTest.js
rename to lib/ace/test/TextEditTest.js
diff --git a/src/ace/test/VirtualRendererTest.js b/lib/ace/test/VirtualRendererTest.js
similarity index 100%
rename from src/ace/test/VirtualRendererTest.js
rename to lib/ace/test/VirtualRendererTest.js
diff --git a/src/ace/test/all.js b/lib/ace/test/all.js
similarity index 100%
rename from src/ace/test/all.js
rename to lib/ace/test/all.js
diff --git a/src/ace/test/assertions.js b/lib/ace/test/assertions.js
similarity index 100%
rename from src/ace/test/assertions.js
rename to lib/ace/test/assertions.js
diff --git a/src/ace/test/mode/CssTest.js b/lib/ace/test/mode/CssTest.js
similarity index 100%
rename from src/ace/test/mode/CssTest.js
rename to lib/ace/test/mode/CssTest.js
diff --git a/src/ace/test/mode/CssTokenizerTest.js b/lib/ace/test/mode/CssTokenizerTest.js
similarity index 100%
rename from src/ace/test/mode/CssTokenizerTest.js
rename to lib/ace/test/mode/CssTokenizerTest.js
diff --git a/src/ace/test/mode/HtmlTest.js b/lib/ace/test/mode/HtmlTest.js
similarity index 100%
rename from src/ace/test/mode/HtmlTest.js
rename to lib/ace/test/mode/HtmlTest.js
diff --git a/src/ace/test/mode/HtmlTokenizerTest.js b/lib/ace/test/mode/HtmlTokenizerTest.js
similarity index 100%
rename from src/ace/test/mode/HtmlTokenizerTest.js
rename to lib/ace/test/mode/HtmlTokenizerTest.js
diff --git a/src/ace/test/mode/JavaScriptTest.js b/lib/ace/test/mode/JavaScriptTest.js
similarity index 100%
rename from src/ace/test/mode/JavaScriptTest.js
rename to lib/ace/test/mode/JavaScriptTest.js
diff --git a/src/ace/test/mode/JavaScriptTokenizerTest.js b/lib/ace/test/mode/JavaScriptTokenizerTest.js
similarity index 100%
rename from src/ace/test/mode/JavaScriptTokenizerTest.js
rename to lib/ace/test/mode/JavaScriptTokenizerTest.js
diff --git a/src/ace/test/mode/TextTest.js b/lib/ace/test/mode/TextTest.js
similarity index 100%
rename from src/ace/test/mode/TextTest.js
rename to lib/ace/test/mode/TextTest.js
diff --git a/src/ace/test/mode/XmlTest.js b/lib/ace/test/mode/XmlTest.js
similarity index 100%
rename from src/ace/test/mode/XmlTest.js
rename to lib/ace/test/mode/XmlTest.js
diff --git a/src/ace/test/mode/XmlTokenizerTest.js b/lib/ace/test/mode/XmlTokenizerTest.js
similarity index 100%
rename from src/ace/test/mode/XmlTokenizerTest.js
rename to lib/ace/test/mode/XmlTokenizerTest.js
diff --git a/src/ace/theme/Clouds.js b/lib/ace/theme/Clouds.js
similarity index 100%
rename from src/ace/theme/Clouds.js
rename to lib/ace/theme/Clouds.js
diff --git a/src/ace/theme/CloudsMidnight.js b/lib/ace/theme/CloudsMidnight.js
similarity index 100%
rename from src/ace/theme/CloudsMidnight.js
rename to lib/ace/theme/CloudsMidnight.js
diff --git a/src/ace/theme/Cobalt.js b/lib/ace/theme/Cobalt.js
similarity index 100%
rename from src/ace/theme/Cobalt.js
rename to lib/ace/theme/Cobalt.js
diff --git a/src/ace/theme/Dawn.js b/lib/ace/theme/Dawn.js
similarity index 100%
rename from src/ace/theme/Dawn.js
rename to lib/ace/theme/Dawn.js
diff --git a/src/ace/theme/Eclipse.js b/lib/ace/theme/Eclipse.js
similarity index 100%
rename from src/ace/theme/Eclipse.js
rename to lib/ace/theme/Eclipse.js
diff --git a/src/ace/theme/IdleFingers.js b/lib/ace/theme/IdleFingers.js
similarity index 100%
rename from src/ace/theme/IdleFingers.js
rename to lib/ace/theme/IdleFingers.js
diff --git a/src/ace/theme/KrTheme.js b/lib/ace/theme/KrTheme.js
similarity index 100%
rename from src/ace/theme/KrTheme.js
rename to lib/ace/theme/KrTheme.js
diff --git a/src/ace/theme/MonoIndustrial.js b/lib/ace/theme/MonoIndustrial.js
similarity index 100%
rename from src/ace/theme/MonoIndustrial.js
rename to lib/ace/theme/MonoIndustrial.js
diff --git a/src/ace/theme/Monokai.js b/lib/ace/theme/Monokai.js
similarity index 100%
rename from src/ace/theme/Monokai.js
rename to lib/ace/theme/Monokai.js
diff --git a/src/ace/theme/TextMate.js b/lib/ace/theme/TextMate.js
similarity index 100%
rename from src/ace/theme/TextMate.js
rename to lib/ace/theme/TextMate.js
diff --git a/src/ace/theme/Twilight.js b/lib/ace/theme/Twilight.js
similarity index 100%
rename from src/ace/theme/Twilight.js
rename to lib/ace/theme/Twilight.js
diff --git a/src/ace/theme/eclipse.css b/lib/ace/theme/eclipse.css
similarity index 100%
rename from src/ace/theme/eclipse.css
rename to lib/ace/theme/eclipse.css
diff --git a/src/ace/theme/tm.css b/lib/ace/theme/tm.css
similarity index 100%
rename from src/ace/theme/tm.css
rename to lib/ace/theme/tm.css
diff --git a/package.json b/package.json
index bfd67f0d..f27b9a63 100644
--- a/package.json
+++ b/package.json
@@ -2,13 +2,13 @@
     "name": "ace",
     "description": "Ajax.org Code Editor is a full featured source code highlighting editor that powers the Cloud9 IDE",
     "version": "0.1",
-    "homepage" : "http://github.com/ajaxorg/editor",
+    "homepage" : "http://github.com/ajaxorg/ace",
     "engines": {"node": ">= 0.1.102"},
     "author": "Fabian Jakobs <fabian@ajax.org>",
     "main": "src/ace/ace",
     "repository" : {
         "type" : "git",
-         "url" : "http://github.com/ajaxorg/editor.git"
+         "url" : "http://github.com/ajaxorg/ace.git"
     },
     "licenses": [{
         "type": "LGPLv3",