diff --git a/codemirror-2.36/.gitignore b/codemirror/.gitignore
similarity index 100%
rename from codemirror-2.36/.gitignore
rename to codemirror/.gitignore
diff --git a/codemirror-2.36/.travis.yml b/codemirror/.travis.yml
similarity index 100%
rename from codemirror-2.36/.travis.yml
rename to codemirror/.travis.yml
diff --git a/codemirror-2.36/LICENSE b/codemirror/LICENSE
similarity index 100%
rename from codemirror-2.36/LICENSE
rename to codemirror/LICENSE
diff --git a/codemirror-2.36/README.md b/codemirror/README.md
similarity index 100%
rename from codemirror-2.36/README.md
rename to codemirror/README.md
diff --git a/codemirror-2.36/bin/compress b/codemirror/bin/compress
similarity index 100%
rename from codemirror-2.36/bin/compress
rename to codemirror/bin/compress
diff --git a/codemirror-2.36/index.html b/codemirror/index.html
similarity index 100%
rename from codemirror-2.36/index.html
rename to codemirror/index.html
diff --git a/codemirror-2.36/keymap/emacs.js b/codemirror/keymap/emacs.js
similarity index 100%
rename from codemirror-2.36/keymap/emacs.js
rename to codemirror/keymap/emacs.js
diff --git a/codemirror-2.36/keymap/vim.js b/codemirror/keymap/vim.js
similarity index 100%
rename from codemirror-2.36/keymap/vim.js
rename to codemirror/keymap/vim.js
diff --git a/codemirror-2.36/lib/codemirror.css b/codemirror/lib/codemirror.css
similarity index 100%
rename from codemirror-2.36/lib/codemirror.css
rename to codemirror/lib/codemirror.css
diff --git a/codemirror-2.36/lib/codemirror.js b/codemirror/lib/codemirror.js
similarity index 100%
rename from codemirror-2.36/lib/codemirror.js
rename to codemirror/lib/codemirror.js
diff --git a/codemirror-2.36/lib/util/closetag.js b/codemirror/lib/util/closetag.js
similarity index 100%
rename from codemirror-2.36/lib/util/closetag.js
rename to codemirror/lib/util/closetag.js
diff --git a/codemirror-2.36/lib/util/continuecomment.js b/codemirror/lib/util/continuecomment.js
similarity index 100%
rename from codemirror-2.36/lib/util/continuecomment.js
rename to codemirror/lib/util/continuecomment.js
diff --git a/codemirror-2.36/lib/util/dialog.css b/codemirror/lib/util/dialog.css
similarity index 100%
rename from codemirror-2.36/lib/util/dialog.css
rename to codemirror/lib/util/dialog.css
diff --git a/codemirror-2.36/lib/util/dialog.js b/codemirror/lib/util/dialog.js
similarity index 100%
rename from codemirror-2.36/lib/util/dialog.js
rename to codemirror/lib/util/dialog.js
diff --git a/codemirror-2.36/lib/util/foldcode.js b/codemirror/lib/util/foldcode.js
similarity index 100%
rename from codemirror-2.36/lib/util/foldcode.js
rename to codemirror/lib/util/foldcode.js
diff --git a/codemirror-2.36/lib/util/formatting.js b/codemirror/lib/util/formatting.js
similarity index 100%
rename from codemirror-2.36/lib/util/formatting.js
rename to codemirror/lib/util/formatting.js
diff --git a/codemirror-2.36/lib/util/javascript-hint.js b/codemirror/lib/util/javascript-hint.js
similarity index 100%
rename from codemirror-2.36/lib/util/javascript-hint.js
rename to codemirror/lib/util/javascript-hint.js
diff --git a/codemirror-2.36/lib/util/loadmode.js b/codemirror/lib/util/loadmode.js
similarity index 100%
rename from codemirror-2.36/lib/util/loadmode.js
rename to codemirror/lib/util/loadmode.js
diff --git a/codemirror-2.36/lib/util/match-highlighter.js b/codemirror/lib/util/match-highlighter.js
similarity index 100%
rename from codemirror-2.36/lib/util/match-highlighter.js
rename to codemirror/lib/util/match-highlighter.js
diff --git a/codemirror-2.36/lib/util/multiplex.js b/codemirror/lib/util/multiplex.js
similarity index 100%
rename from codemirror-2.36/lib/util/multiplex.js
rename to codemirror/lib/util/multiplex.js
diff --git a/codemirror-2.36/lib/util/overlay.js b/codemirror/lib/util/overlay.js
similarity index 100%
rename from codemirror-2.36/lib/util/overlay.js
rename to codemirror/lib/util/overlay.js
diff --git a/codemirror-2.36/lib/util/pig-hint.js b/codemirror/lib/util/pig-hint.js
similarity index 100%
rename from codemirror-2.36/lib/util/pig-hint.js
rename to codemirror/lib/util/pig-hint.js
diff --git a/codemirror-2.36/lib/util/runmode-standalone.js b/codemirror/lib/util/runmode-standalone.js
similarity index 100%
rename from codemirror-2.36/lib/util/runmode-standalone.js
rename to codemirror/lib/util/runmode-standalone.js
diff --git a/codemirror-2.36/lib/util/runmode.js b/codemirror/lib/util/runmode.js
similarity index 100%
rename from codemirror-2.36/lib/util/runmode.js
rename to codemirror/lib/util/runmode.js
diff --git a/codemirror-2.36/lib/util/search.js b/codemirror/lib/util/search.js
similarity index 100%
rename from codemirror-2.36/lib/util/search.js
rename to codemirror/lib/util/search.js
diff --git a/codemirror-2.36/lib/util/searchcursor.js b/codemirror/lib/util/searchcursor.js
similarity index 100%
rename from codemirror-2.36/lib/util/searchcursor.js
rename to codemirror/lib/util/searchcursor.js
diff --git a/codemirror-2.36/lib/util/simple-hint.css b/codemirror/lib/util/simple-hint.css
similarity index 100%
rename from codemirror-2.36/lib/util/simple-hint.css
rename to codemirror/lib/util/simple-hint.css
diff --git a/codemirror-2.36/lib/util/simple-hint.js b/codemirror/lib/util/simple-hint.js
similarity index 100%
rename from codemirror-2.36/lib/util/simple-hint.js
rename to codemirror/lib/util/simple-hint.js
diff --git a/codemirror-2.36/lib/util/xml-hint.js b/codemirror/lib/util/xml-hint.js
similarity index 100%
rename from codemirror-2.36/lib/util/xml-hint.js
rename to codemirror/lib/util/xml-hint.js
diff --git a/codemirror-2.36/mode/css/css.js b/codemirror/mode/css/css.js
similarity index 100%
rename from codemirror-2.36/mode/css/css.js
rename to codemirror/mode/css/css.js
diff --git a/codemirror-2.36/mode/css/index.html b/codemirror/mode/css/index.html
similarity index 100%
rename from codemirror-2.36/mode/css/index.html
rename to codemirror/mode/css/index.html
diff --git a/codemirror-2.36/mode/css/test.js b/codemirror/mode/css/test.js
similarity index 100%
rename from codemirror-2.36/mode/css/test.js
rename to codemirror/mode/css/test.js
diff --git a/codemirror-2.36/package.json b/codemirror/package.json
similarity index 100%
rename from codemirror-2.36/package.json
rename to codemirror/package.json
diff --git a/codemirror-2.36/theme/ambiance-mobile.css b/codemirror/theme/ambiance-mobile.css
similarity index 100%
rename from codemirror-2.36/theme/ambiance-mobile.css
rename to codemirror/theme/ambiance-mobile.css
diff --git a/codemirror-2.36/theme/ambiance.css b/codemirror/theme/ambiance.css
similarity index 100%
rename from codemirror-2.36/theme/ambiance.css
rename to codemirror/theme/ambiance.css
diff --git a/codemirror-2.36/theme/blackboard.css b/codemirror/theme/blackboard.css
similarity index 100%
rename from codemirror-2.36/theme/blackboard.css
rename to codemirror/theme/blackboard.css
diff --git a/codemirror-2.36/theme/cobalt.css b/codemirror/theme/cobalt.css
similarity index 100%
rename from codemirror-2.36/theme/cobalt.css
rename to codemirror/theme/cobalt.css
diff --git a/codemirror-2.36/theme/eclipse.css b/codemirror/theme/eclipse.css
similarity index 100%
rename from codemirror-2.36/theme/eclipse.css
rename to codemirror/theme/eclipse.css
diff --git a/codemirror-2.36/theme/elegant.css b/codemirror/theme/elegant.css
similarity index 100%
rename from codemirror-2.36/theme/elegant.css
rename to codemirror/theme/elegant.css
diff --git a/codemirror-2.36/theme/erlang-dark.css b/codemirror/theme/erlang-dark.css
similarity index 100%
rename from codemirror-2.36/theme/erlang-dark.css
rename to codemirror/theme/erlang-dark.css
diff --git a/codemirror-2.36/theme/lesser-dark.css b/codemirror/theme/lesser-dark.css
similarity index 100%
rename from codemirror-2.36/theme/lesser-dark.css
rename to codemirror/theme/lesser-dark.css
diff --git a/codemirror-2.36/theme/monokai.css b/codemirror/theme/monokai.css
similarity index 100%
rename from codemirror-2.36/theme/monokai.css
rename to codemirror/theme/monokai.css
diff --git a/codemirror-2.36/theme/neat.css b/codemirror/theme/neat.css
similarity index 100%
rename from codemirror-2.36/theme/neat.css
rename to codemirror/theme/neat.css
diff --git a/codemirror-2.36/theme/night.css b/codemirror/theme/night.css
similarity index 100%
rename from codemirror-2.36/theme/night.css
rename to codemirror/theme/night.css
diff --git a/codemirror-2.36/theme/rubyblue.css b/codemirror/theme/rubyblue.css
similarity index 100%
rename from codemirror-2.36/theme/rubyblue.css
rename to codemirror/theme/rubyblue.css
diff --git a/codemirror-2.36/theme/twilight.css b/codemirror/theme/twilight.css
similarity index 100%
rename from codemirror-2.36/theme/twilight.css
rename to codemirror/theme/twilight.css
diff --git a/codemirror-2.36/theme/vibrant-ink.css b/codemirror/theme/vibrant-ink.css
similarity index 100%
rename from codemirror-2.36/theme/vibrant-ink.css
rename to codemirror/theme/vibrant-ink.css
diff --git a/codemirror-2.36/theme/xq-dark.css b/codemirror/theme/xq-dark.css
similarity index 100%
rename from codemirror-2.36/theme/xq-dark.css
rename to codemirror/theme/xq-dark.css
diff --git a/edit.html b/edit.html
index bb0dc2f9..19f602fb 100644
--- a/edit.html
+++ b/edit.html
@@ -1,8 +1,8 @@
 <html>
 	<head>
-    <script src="codemirror-2.36/lib/codemirror.js"></script>
-    <link rel="stylesheet" href="codemirror-2.36/lib/codemirror.css">
-    <script src="codemirror-2.36/mode/css/css.js"></script>
+    <script src="codemirror/lib/codemirror.js"></script>
+    <link rel="stylesheet" href="codemirror/lib/codemirror.css">
+    <script src="codemirror/mode/css/css.js"></script>
 		<style type="text/css">
 			body {
 				margin: 0px;