diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/.gitattributes b/IPython/frontend/html/notebook/static/components/codemirror/.gitattributes
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/.gitattributes
rename to IPython/frontend/html/notebook/static/components/codemirror/.gitattributes
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/.gitignore b/IPython/frontend/html/notebook/static/components/codemirror/.gitignore
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/.gitignore
rename to IPython/frontend/html/notebook/static/components/codemirror/.gitignore
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/.travis.yml b/IPython/frontend/html/notebook/static/components/codemirror/.travis.yml
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/.travis.yml
rename to IPython/frontend/html/notebook/static/components/codemirror/.travis.yml
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/CONTRIBUTING.md b/IPython/frontend/html/notebook/static/components/codemirror/CONTRIBUTING.md
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/CONTRIBUTING.md
rename to IPython/frontend/html/notebook/static/components/codemirror/CONTRIBUTING.md
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/LICENSE b/IPython/frontend/html/notebook/static/components/codemirror/LICENSE
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/LICENSE
rename to IPython/frontend/html/notebook/static/components/codemirror/LICENSE
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/README.md b/IPython/frontend/html/notebook/static/components/codemirror/README.md
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/README.md
rename to IPython/frontend/html/notebook/static/components/codemirror/README.md
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/dialog/dialog.css b/IPython/frontend/html/notebook/static/components/codemirror/addon/dialog/dialog.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/dialog/dialog.css
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/dialog/dialog.css
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/dialog/dialog.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/dialog/dialog.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/dialog/dialog.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/dialog/dialog.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/display/placeholder.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/display/placeholder.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/display/placeholder.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/display/placeholder.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/edit/closebrackets.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/edit/closebrackets.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/edit/closebrackets.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/edit/closebrackets.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/edit/closetag.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/edit/closetag.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/edit/closetag.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/edit/closetag.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/edit/continuecomment.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/edit/continuecomment.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/edit/continuecomment.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/edit/continuecomment.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/edit/continuelist.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/edit/continuelist.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/edit/continuelist.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/edit/continuelist.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/edit/matchbrackets.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/edit/matchbrackets.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/edit/matchbrackets.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/edit/matchbrackets.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/fold/brace-fold.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/fold/brace-fold.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/fold/brace-fold.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/fold/brace-fold.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/fold/foldcode.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/fold/foldcode.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/fold/foldcode.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/fold/foldcode.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/fold/indent-fold.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/fold/indent-fold.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/fold/indent-fold.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/fold/indent-fold.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/fold/xml-fold.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/fold/xml-fold.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/fold/xml-fold.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/fold/xml-fold.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/hint/html-hint.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/hint/html-hint.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/hint/html-hint.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/hint/html-hint.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/hint/javascript-hint.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/hint/javascript-hint.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/hint/javascript-hint.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/hint/javascript-hint.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/hint/pig-hint.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/hint/pig-hint.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/hint/pig-hint.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/hint/pig-hint.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/hint/python-hint.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/hint/python-hint.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/hint/python-hint.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/hint/python-hint.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/hint/show-hint.css b/IPython/frontend/html/notebook/static/components/codemirror/addon/hint/show-hint.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/hint/show-hint.css
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/hint/show-hint.css
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/hint/show-hint.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/hint/show-hint.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/hint/show-hint.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/hint/show-hint.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/hint/xml-hint.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/hint/xml-hint.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/hint/xml-hint.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/hint/xml-hint.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/lint/javascript-lint.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/lint/javascript-lint.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/lint/javascript-lint.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/lint/javascript-lint.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/lint/json-lint.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/lint/json-lint.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/lint/json-lint.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/lint/json-lint.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/lint/lint.css b/IPython/frontend/html/notebook/static/components/codemirror/addon/lint/lint.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/lint/lint.css
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/lint/lint.css
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/lint/lint.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/lint/lint.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/lint/lint.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/lint/lint.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/mode/loadmode.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/mode/loadmode.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/mode/loadmode.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/mode/loadmode.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/mode/multiplex.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/mode/multiplex.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/mode/multiplex.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/mode/multiplex.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/mode/overlay.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/mode/overlay.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/mode/overlay.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/mode/overlay.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/runmode/colorize.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/runmode/colorize.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/runmode/colorize.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/runmode/colorize.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/runmode/runmode-standalone.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/runmode/runmode-standalone.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/runmode/runmode-standalone.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/runmode/runmode-standalone.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/runmode/runmode.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/runmode/runmode.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/runmode/runmode.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/runmode/runmode.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/runmode/runmode.node.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/runmode/runmode.node.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/runmode/runmode.node.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/runmode/runmode.node.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/search/match-highlighter.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/search/match-highlighter.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/search/match-highlighter.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/search/match-highlighter.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/search/search.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/search/search.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/search/search.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/search/search.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/search/searchcursor.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/search/searchcursor.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/search/searchcursor.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/search/searchcursor.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/selection/active-line.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/selection/active-line.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/selection/active-line.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/selection/active-line.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/addon/selection/mark-selection.js b/IPython/frontend/html/notebook/static/components/codemirror/addon/selection/mark-selection.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/addon/selection/mark-selection.js
rename to IPython/frontend/html/notebook/static/components/codemirror/addon/selection/mark-selection.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/bin/compress b/IPython/frontend/html/notebook/static/components/codemirror/bin/compress
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/bin/compress
rename to IPython/frontend/html/notebook/static/components/codemirror/bin/compress
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/bin/lint b/IPython/frontend/html/notebook/static/components/codemirror/bin/lint
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/bin/lint
rename to IPython/frontend/html/notebook/static/components/codemirror/bin/lint
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/bower.json b/IPython/frontend/html/notebook/static/components/codemirror/bower.json
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/bower.json
rename to IPython/frontend/html/notebook/static/components/codemirror/bower.json
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/activeline.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/activeline.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/activeline.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/activeline.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/bidi.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/bidi.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/bidi.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/bidi.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/btree.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/btree.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/btree.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/btree.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/buffers.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/buffers.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/buffers.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/buffers.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/changemode.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/changemode.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/changemode.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/changemode.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/closebrackets.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/closebrackets.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/closebrackets.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/closebrackets.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/closetag.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/closetag.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/closetag.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/closetag.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/complete.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/complete.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/complete.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/complete.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/emacs.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/emacs.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/emacs.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/emacs.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/folding.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/folding.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/folding.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/folding.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/fullscreen.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/fullscreen.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/fullscreen.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/fullscreen.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/html5complete.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/html5complete.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/html5complete.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/html5complete.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/indentwrap.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/indentwrap.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/indentwrap.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/indentwrap.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/lint.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/lint.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/lint.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/lint.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/loadmode.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/loadmode.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/loadmode.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/loadmode.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/marker.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/marker.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/marker.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/marker.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/markselection.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/markselection.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/markselection.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/markselection.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/matchhighlighter.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/matchhighlighter.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/matchhighlighter.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/matchhighlighter.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/multiplex.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/multiplex.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/multiplex.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/multiplex.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/mustache.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/mustache.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/mustache.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/mustache.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/placeholder.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/placeholder.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/placeholder.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/placeholder.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/preview.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/preview.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/preview.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/preview.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/resize.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/resize.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/resize.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/resize.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/runmode.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/runmode.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/runmode.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/runmode.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/search.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/search.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/search.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/search.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/spanaffectswrapping_shim.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/spanaffectswrapping_shim.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/spanaffectswrapping_shim.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/spanaffectswrapping_shim.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/theme.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/theme.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/theme.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/theme.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/variableheight.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/variableheight.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/variableheight.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/variableheight.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/vim.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/vim.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/vim.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/vim.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/visibletabs.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/visibletabs.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/visibletabs.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/visibletabs.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/widget.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/widget.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/widget.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/widget.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/demo/xmlcomplete.html b/IPython/frontend/html/notebook/static/components/codemirror/demo/xmlcomplete.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/demo/xmlcomplete.html
rename to IPython/frontend/html/notebook/static/components/codemirror/demo/xmlcomplete.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/doc/baboon.png b/IPython/frontend/html/notebook/static/components/codemirror/doc/baboon.png
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/doc/baboon.png
rename to IPython/frontend/html/notebook/static/components/codemirror/doc/baboon.png
Binary files a/IPython/frontend/html/notebook/static/components/cmtemp/doc/baboon.png and b/IPython/frontend/html/notebook/static/components/codemirror/doc/baboon.png differ
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/doc/baboon_vector.svg b/IPython/frontend/html/notebook/static/components/codemirror/doc/baboon_vector.svg
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/doc/baboon_vector.svg
rename to IPython/frontend/html/notebook/static/components/codemirror/doc/baboon_vector.svg
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/doc/compress.html b/IPython/frontend/html/notebook/static/components/codemirror/doc/compress.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/doc/compress.html
rename to IPython/frontend/html/notebook/static/components/codemirror/doc/compress.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/doc/docs.css b/IPython/frontend/html/notebook/static/components/codemirror/doc/docs.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/doc/docs.css
rename to IPython/frontend/html/notebook/static/components/codemirror/doc/docs.css
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/doc/internals.html b/IPython/frontend/html/notebook/static/components/codemirror/doc/internals.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/doc/internals.html
rename to IPython/frontend/html/notebook/static/components/codemirror/doc/internals.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/doc/manual.html b/IPython/frontend/html/notebook/static/components/codemirror/doc/manual.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/doc/manual.html
rename to IPython/frontend/html/notebook/static/components/codemirror/doc/manual.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/doc/modes.html b/IPython/frontend/html/notebook/static/components/codemirror/doc/modes.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/doc/modes.html
rename to IPython/frontend/html/notebook/static/components/codemirror/doc/modes.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/doc/oldrelease.html b/IPython/frontend/html/notebook/static/components/codemirror/doc/oldrelease.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/doc/oldrelease.html
rename to IPython/frontend/html/notebook/static/components/codemirror/doc/oldrelease.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/doc/realworld.html b/IPython/frontend/html/notebook/static/components/codemirror/doc/realworld.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/doc/realworld.html
rename to IPython/frontend/html/notebook/static/components/codemirror/doc/realworld.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/doc/reporting.html b/IPython/frontend/html/notebook/static/components/codemirror/doc/reporting.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/doc/reporting.html
rename to IPython/frontend/html/notebook/static/components/codemirror/doc/reporting.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/doc/upgrade_v2.2.html b/IPython/frontend/html/notebook/static/components/codemirror/doc/upgrade_v2.2.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/doc/upgrade_v2.2.html
rename to IPython/frontend/html/notebook/static/components/codemirror/doc/upgrade_v2.2.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/doc/upgrade_v3.html b/IPython/frontend/html/notebook/static/components/codemirror/doc/upgrade_v3.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/doc/upgrade_v3.html
rename to IPython/frontend/html/notebook/static/components/codemirror/doc/upgrade_v3.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/index.html b/IPython/frontend/html/notebook/static/components/codemirror/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/keymap/emacs.js b/IPython/frontend/html/notebook/static/components/codemirror/keymap/emacs.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/keymap/emacs.js
rename to IPython/frontend/html/notebook/static/components/codemirror/keymap/emacs.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/keymap/vim.js b/IPython/frontend/html/notebook/static/components/codemirror/keymap/vim.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/keymap/vim.js
rename to IPython/frontend/html/notebook/static/components/codemirror/keymap/vim.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/lib/codemirror.css b/IPython/frontend/html/notebook/static/components/codemirror/lib/codemirror.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/lib/codemirror.css
rename to IPython/frontend/html/notebook/static/components/codemirror/lib/codemirror.css
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/lib/codemirror.js b/IPython/frontend/html/notebook/static/components/codemirror/lib/codemirror.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/lib/codemirror.js
rename to IPython/frontend/html/notebook/static/components/codemirror/lib/codemirror.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/apl/apl.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/apl/apl.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/apl/apl.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/apl/apl.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/apl/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/apl/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/apl/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/apl/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/asterisk/asterisk.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/asterisk/asterisk.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/asterisk/asterisk.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/asterisk/asterisk.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/asterisk/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/asterisk/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/asterisk/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/asterisk/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/clike/clike.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/clike/clike.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/clike/clike.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/clike/clike.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/clike/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/clike/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/clike/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/clike/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/clike/scala.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/clike/scala.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/clike/scala.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/clike/scala.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/clojure/clojure.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/clojure/clojure.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/clojure/clojure.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/clojure/clojure.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/clojure/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/clojure/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/clojure/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/clojure/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/coffeescript/LICENSE b/IPython/frontend/html/notebook/static/components/codemirror/mode/coffeescript/LICENSE
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/coffeescript/LICENSE
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/coffeescript/LICENSE
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/coffeescript/coffeescript.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/coffeescript/coffeescript.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/coffeescript/coffeescript.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/coffeescript/coffeescript.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/coffeescript/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/coffeescript/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/coffeescript/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/coffeescript/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/commonlisp/commonlisp.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/commonlisp/commonlisp.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/commonlisp/commonlisp.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/commonlisp/commonlisp.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/commonlisp/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/commonlisp/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/commonlisp/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/commonlisp/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/css/css.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/css/css.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/css/css.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/css/css.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/css/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/css/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/css/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/css/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/css/scss.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/css/scss.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/css/scss.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/css/scss.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/css/scss_test.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/css/scss_test.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/css/scss_test.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/css/scss_test.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/css/test.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/css/test.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/css/test.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/css/test.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/d/d.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/d/d.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/d/d.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/d/d.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/d/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/d/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/d/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/d/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/diff/diff.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/diff/diff.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/diff/diff.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/diff/diff.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/diff/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/diff/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/diff/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/diff/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/ecl/ecl.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/ecl/ecl.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/ecl/ecl.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/ecl/ecl.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/ecl/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/ecl/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/ecl/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/ecl/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/erlang/erlang.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/erlang/erlang.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/erlang/erlang.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/erlang/erlang.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/erlang/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/erlang/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/erlang/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/erlang/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/gas/gas.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/gas/gas.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/gas/gas.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/gas/gas.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/gas/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/gas/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/gas/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/gas/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/gfm/gfm.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/gfm/gfm.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/gfm/gfm.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/gfm/gfm.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/gfm/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/gfm/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/gfm/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/gfm/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/gfm/test.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/gfm/test.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/gfm/test.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/gfm/test.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/go/go.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/go/go.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/go/go.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/go/go.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/go/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/go/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/go/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/go/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/groovy/groovy.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/groovy/groovy.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/groovy/groovy.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/groovy/groovy.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/groovy/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/groovy/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/groovy/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/groovy/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/haskell/haskell.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/haskell/haskell.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/haskell/haskell.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/haskell/haskell.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/haskell/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/haskell/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/haskell/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/haskell/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/haxe/haxe.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/haxe/haxe.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/haxe/haxe.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/haxe/haxe.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/haxe/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/haxe/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/haxe/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/haxe/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/htmlembedded/htmlembedded.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/htmlembedded/htmlembedded.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/htmlembedded/htmlembedded.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/htmlembedded/htmlembedded.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/htmlembedded/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/htmlembedded/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/htmlembedded/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/htmlembedded/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/htmlmixed/htmlmixed.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/htmlmixed/htmlmixed.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/htmlmixed/htmlmixed.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/htmlmixed/htmlmixed.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/htmlmixed/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/htmlmixed/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/htmlmixed/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/htmlmixed/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/http/http.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/http/http.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/http/http.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/http/http.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/http/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/http/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/http/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/http/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/javascript/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/javascript/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/javascript/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/javascript/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/javascript/javascript.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/javascript/javascript.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/javascript/javascript.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/javascript/javascript.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/javascript/typescript.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/javascript/typescript.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/javascript/typescript.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/javascript/typescript.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/jinja2/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/jinja2/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/jinja2/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/jinja2/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/jinja2/jinja2.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/jinja2/jinja2.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/jinja2/jinja2.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/jinja2/jinja2.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/less/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/less/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/less/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/less/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/less/less.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/less/less.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/less/less.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/less/less.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/livescript/LICENSE b/IPython/frontend/html/notebook/static/components/codemirror/mode/livescript/LICENSE
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/livescript/LICENSE
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/livescript/LICENSE
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/livescript/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/livescript/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/livescript/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/livescript/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/livescript/livescript.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/livescript/livescript.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/livescript/livescript.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/livescript/livescript.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/livescript/livescript.ls b/IPython/frontend/html/notebook/static/components/codemirror/mode/livescript/livescript.ls
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/livescript/livescript.ls
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/livescript/livescript.ls
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/lua/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/lua/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/lua/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/lua/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/lua/lua.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/lua/lua.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/lua/lua.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/lua/lua.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/markdown/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/markdown/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/markdown/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/markdown/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/markdown/markdown.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/markdown/markdown.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/markdown/markdown.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/markdown/markdown.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/markdown/test.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/markdown/test.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/markdown/test.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/markdown/test.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/meta.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/meta.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/meta.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/meta.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/mirc/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/mirc/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/mirc/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/mirc/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/mirc/mirc.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/mirc/mirc.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/mirc/mirc.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/mirc/mirc.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/ntriples/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/ntriples/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/ntriples/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/ntriples/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/ntriples/ntriples.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/ntriples/ntriples.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/ntriples/ntriples.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/ntriples/ntriples.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/ocaml/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/ocaml/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/ocaml/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/ocaml/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/ocaml/ocaml.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/ocaml/ocaml.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/ocaml/ocaml.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/ocaml/ocaml.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/pascal/LICENSE b/IPython/frontend/html/notebook/static/components/codemirror/mode/pascal/LICENSE
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/pascal/LICENSE
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/pascal/LICENSE
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/pascal/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/pascal/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/pascal/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/pascal/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/pascal/pascal.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/pascal/pascal.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/pascal/pascal.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/pascal/pascal.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/perl/LICENSE b/IPython/frontend/html/notebook/static/components/codemirror/mode/perl/LICENSE
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/perl/LICENSE
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/perl/LICENSE
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/perl/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/perl/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/perl/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/perl/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/perl/perl.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/perl/perl.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/perl/perl.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/perl/perl.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/php/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/php/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/php/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/php/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/php/php.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/php/php.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/php/php.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/php/php.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/pig/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/pig/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/pig/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/pig/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/pig/pig.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/pig/pig.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/pig/pig.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/pig/pig.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/properties/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/properties/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/properties/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/properties/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/properties/properties.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/properties/properties.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/properties/properties.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/properties/properties.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/python/LICENSE.txt b/IPython/frontend/html/notebook/static/components/codemirror/mode/python/LICENSE.txt
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/python/LICENSE.txt
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/python/LICENSE.txt
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/python/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/python/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/python/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/python/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/python/python.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/python/python.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/python/python.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/python/python.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/q/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/q/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/q/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/q/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/q/q.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/q/q.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/q/q.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/q/q.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/r/LICENSE b/IPython/frontend/html/notebook/static/components/codemirror/mode/r/LICENSE
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/r/LICENSE
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/r/LICENSE
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/r/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/r/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/r/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/r/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/r/r.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/r/r.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/r/r.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/r/r.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/rpm/changes/changes.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/rpm/changes/changes.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/rpm/changes/changes.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/rpm/changes/changes.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/rpm/changes/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/rpm/changes/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/rpm/changes/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/rpm/changes/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/rpm/spec/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/rpm/spec/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/rpm/spec/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/rpm/spec/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/rpm/spec/spec.css b/IPython/frontend/html/notebook/static/components/codemirror/mode/rpm/spec/spec.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/rpm/spec/spec.css
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/rpm/spec/spec.css
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/rpm/spec/spec.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/rpm/spec/spec.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/rpm/spec/spec.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/rpm/spec/spec.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/rst/LICENSE.txt b/IPython/frontend/html/notebook/static/components/codemirror/mode/rst/LICENSE.txt
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/rst/LICENSE.txt
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/rst/LICENSE.txt
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/rst/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/rst/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/rst/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/rst/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/rst/rst.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/rst/rst.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/rst/rst.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/rst/rst.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/ruby/LICENSE b/IPython/frontend/html/notebook/static/components/codemirror/mode/ruby/LICENSE
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/ruby/LICENSE
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/ruby/LICENSE
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/ruby/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/ruby/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/ruby/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/ruby/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/ruby/ruby.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/ruby/ruby.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/ruby/ruby.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/ruby/ruby.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/rust/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/rust/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/rust/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/rust/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/rust/rust.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/rust/rust.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/rust/rust.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/rust/rust.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/sass/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/sass/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/sass/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/sass/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/sass/sass.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/sass/sass.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/sass/sass.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/sass/sass.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/scheme/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/scheme/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/scheme/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/scheme/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/scheme/scheme.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/scheme/scheme.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/scheme/scheme.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/scheme/scheme.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/shell/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/shell/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/shell/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/shell/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/shell/shell.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/shell/shell.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/shell/shell.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/shell/shell.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/sieve/LICENSE b/IPython/frontend/html/notebook/static/components/codemirror/mode/sieve/LICENSE
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/sieve/LICENSE
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/sieve/LICENSE
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/sieve/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/sieve/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/sieve/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/sieve/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/sieve/sieve.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/sieve/sieve.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/sieve/sieve.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/sieve/sieve.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/smalltalk/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/smalltalk/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/smalltalk/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/smalltalk/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/smalltalk/smalltalk.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/smalltalk/smalltalk.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/smalltalk/smalltalk.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/smalltalk/smalltalk.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/smarty/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/smarty/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/smarty/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/smarty/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/smarty/smarty.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/smarty/smarty.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/smarty/smarty.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/smarty/smarty.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/sparql/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/sparql/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/sparql/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/sparql/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/sparql/sparql.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/sparql/sparql.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/sparql/sparql.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/sparql/sparql.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/sql/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/sql/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/sql/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/sql/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/sql/sql.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/sql/sql.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/sql/sql.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/sql/sql.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/stex/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/stex/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/stex/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/stex/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/stex/stex.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/stex/stex.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/stex/stex.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/stex/stex.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/stex/test.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/stex/test.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/stex/test.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/stex/test.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/tcl/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/tcl/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/tcl/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/tcl/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/tcl/tcl.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/tcl/tcl.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/tcl/tcl.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/tcl/tcl.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/tiddlywiki/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/tiddlywiki/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/tiddlywiki/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/tiddlywiki/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/tiddlywiki/tiddlywiki.css b/IPython/frontend/html/notebook/static/components/codemirror/mode/tiddlywiki/tiddlywiki.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/tiddlywiki/tiddlywiki.css
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/tiddlywiki/tiddlywiki.css
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/tiddlywiki/tiddlywiki.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/tiddlywiki/tiddlywiki.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/tiddlywiki/tiddlywiki.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/tiddlywiki/tiddlywiki.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/tiki/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/tiki/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/tiki/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/tiki/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/tiki/tiki.css b/IPython/frontend/html/notebook/static/components/codemirror/mode/tiki/tiki.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/tiki/tiki.css
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/tiki/tiki.css
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/tiki/tiki.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/tiki/tiki.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/tiki/tiki.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/tiki/tiki.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/turtle/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/turtle/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/turtle/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/turtle/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/turtle/turtle.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/turtle/turtle.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/turtle/turtle.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/turtle/turtle.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/vb/LICENSE.txt b/IPython/frontend/html/notebook/static/components/codemirror/mode/vb/LICENSE.txt
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/vb/LICENSE.txt
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/vb/LICENSE.txt
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/vb/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/vb/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/vb/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/vb/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/vb/vb.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/vb/vb.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/vb/vb.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/vb/vb.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/vbscript/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/vbscript/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/vbscript/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/vbscript/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/vbscript/vbscript.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/vbscript/vbscript.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/vbscript/vbscript.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/vbscript/vbscript.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/velocity/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/velocity/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/velocity/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/velocity/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/velocity/velocity.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/velocity/velocity.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/velocity/velocity.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/velocity/velocity.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/verilog/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/verilog/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/verilog/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/verilog/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/verilog/verilog.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/verilog/verilog.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/verilog/verilog.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/verilog/verilog.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/xml/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/xml/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/xml/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/xml/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/xml/xml.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/xml/xml.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/xml/xml.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/xml/xml.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/xquery/LICENSE b/IPython/frontend/html/notebook/static/components/codemirror/mode/xquery/LICENSE
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/xquery/LICENSE
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/xquery/LICENSE
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/xquery/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/xquery/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/xquery/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/xquery/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/xquery/test.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/xquery/test.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/xquery/test.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/xquery/test.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/xquery/xquery.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/xquery/xquery.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/xquery/xquery.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/xquery/xquery.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/yaml/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/yaml/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/yaml/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/yaml/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/yaml/yaml.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/yaml/yaml.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/yaml/yaml.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/yaml/yaml.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/z80/index.html b/IPython/frontend/html/notebook/static/components/codemirror/mode/z80/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/z80/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/z80/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/mode/z80/z80.js b/IPython/frontend/html/notebook/static/components/codemirror/mode/z80/z80.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/mode/z80/z80.js
rename to IPython/frontend/html/notebook/static/components/codemirror/mode/z80/z80.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/package.json b/IPython/frontend/html/notebook/static/components/codemirror/package.json
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/package.json
rename to IPython/frontend/html/notebook/static/components/codemirror/package.json
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/test/doc_test.js b/IPython/frontend/html/notebook/static/components/codemirror/test/doc_test.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/test/doc_test.js
rename to IPython/frontend/html/notebook/static/components/codemirror/test/doc_test.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/test/driver.js b/IPython/frontend/html/notebook/static/components/codemirror/test/driver.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/test/driver.js
rename to IPython/frontend/html/notebook/static/components/codemirror/test/driver.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/test/index.html b/IPython/frontend/html/notebook/static/components/codemirror/test/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/test/index.html
rename to IPython/frontend/html/notebook/static/components/codemirror/test/index.html
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/test/lint/acorn.js b/IPython/frontend/html/notebook/static/components/codemirror/test/lint/acorn.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/test/lint/acorn.js
rename to IPython/frontend/html/notebook/static/components/codemirror/test/lint/acorn.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/test/lint/lint.js b/IPython/frontend/html/notebook/static/components/codemirror/test/lint/lint.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/test/lint/lint.js
rename to IPython/frontend/html/notebook/static/components/codemirror/test/lint/lint.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/test/lint/parse-js.js b/IPython/frontend/html/notebook/static/components/codemirror/test/lint/parse-js.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/test/lint/parse-js.js
rename to IPython/frontend/html/notebook/static/components/codemirror/test/lint/parse-js.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/test/lint/walk.js b/IPython/frontend/html/notebook/static/components/codemirror/test/lint/walk.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/test/lint/walk.js
rename to IPython/frontend/html/notebook/static/components/codemirror/test/lint/walk.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/test/mode_test.css b/IPython/frontend/html/notebook/static/components/codemirror/test/mode_test.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/test/mode_test.css
rename to IPython/frontend/html/notebook/static/components/codemirror/test/mode_test.css
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/test/mode_test.js b/IPython/frontend/html/notebook/static/components/codemirror/test/mode_test.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/test/mode_test.js
rename to IPython/frontend/html/notebook/static/components/codemirror/test/mode_test.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/test/phantom_driver.js b/IPython/frontend/html/notebook/static/components/codemirror/test/phantom_driver.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/test/phantom_driver.js
rename to IPython/frontend/html/notebook/static/components/codemirror/test/phantom_driver.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/test/run.js b/IPython/frontend/html/notebook/static/components/codemirror/test/run.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/test/run.js
rename to IPython/frontend/html/notebook/static/components/codemirror/test/run.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/test/test.js b/IPython/frontend/html/notebook/static/components/codemirror/test/test.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/test/test.js
rename to IPython/frontend/html/notebook/static/components/codemirror/test/test.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/test/vim_test.js b/IPython/frontend/html/notebook/static/components/codemirror/test/vim_test.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/test/vim_test.js
rename to IPython/frontend/html/notebook/static/components/codemirror/test/vim_test.js
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/theme/ambiance-mobile.css b/IPython/frontend/html/notebook/static/components/codemirror/theme/ambiance-mobile.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/theme/ambiance-mobile.css
rename to IPython/frontend/html/notebook/static/components/codemirror/theme/ambiance-mobile.css
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/theme/ambiance.css b/IPython/frontend/html/notebook/static/components/codemirror/theme/ambiance.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/theme/ambiance.css
rename to IPython/frontend/html/notebook/static/components/codemirror/theme/ambiance.css
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/theme/blackboard.css b/IPython/frontend/html/notebook/static/components/codemirror/theme/blackboard.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/theme/blackboard.css
rename to IPython/frontend/html/notebook/static/components/codemirror/theme/blackboard.css
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/theme/cobalt.css b/IPython/frontend/html/notebook/static/components/codemirror/theme/cobalt.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/theme/cobalt.css
rename to IPython/frontend/html/notebook/static/components/codemirror/theme/cobalt.css
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/theme/eclipse.css b/IPython/frontend/html/notebook/static/components/codemirror/theme/eclipse.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/theme/eclipse.css
rename to IPython/frontend/html/notebook/static/components/codemirror/theme/eclipse.css
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/theme/elegant.css b/IPython/frontend/html/notebook/static/components/codemirror/theme/elegant.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/theme/elegant.css
rename to IPython/frontend/html/notebook/static/components/codemirror/theme/elegant.css
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/theme/erlang-dark.css b/IPython/frontend/html/notebook/static/components/codemirror/theme/erlang-dark.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/theme/erlang-dark.css
rename to IPython/frontend/html/notebook/static/components/codemirror/theme/erlang-dark.css
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/theme/lesser-dark.css b/IPython/frontend/html/notebook/static/components/codemirror/theme/lesser-dark.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/theme/lesser-dark.css
rename to IPython/frontend/html/notebook/static/components/codemirror/theme/lesser-dark.css
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/theme/midnight.css b/IPython/frontend/html/notebook/static/components/codemirror/theme/midnight.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/theme/midnight.css
rename to IPython/frontend/html/notebook/static/components/codemirror/theme/midnight.css
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/theme/monokai.css b/IPython/frontend/html/notebook/static/components/codemirror/theme/monokai.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/theme/monokai.css
rename to IPython/frontend/html/notebook/static/components/codemirror/theme/monokai.css
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/theme/neat.css b/IPython/frontend/html/notebook/static/components/codemirror/theme/neat.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/theme/neat.css
rename to IPython/frontend/html/notebook/static/components/codemirror/theme/neat.css
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/theme/night.css b/IPython/frontend/html/notebook/static/components/codemirror/theme/night.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/theme/night.css
rename to IPython/frontend/html/notebook/static/components/codemirror/theme/night.css
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/theme/rubyblue.css b/IPython/frontend/html/notebook/static/components/codemirror/theme/rubyblue.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/theme/rubyblue.css
rename to IPython/frontend/html/notebook/static/components/codemirror/theme/rubyblue.css
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/theme/solarized.css b/IPython/frontend/html/notebook/static/components/codemirror/theme/solarized.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/theme/solarized.css
rename to IPython/frontend/html/notebook/static/components/codemirror/theme/solarized.css
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/theme/twilight.css b/IPython/frontend/html/notebook/static/components/codemirror/theme/twilight.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/theme/twilight.css
rename to IPython/frontend/html/notebook/static/components/codemirror/theme/twilight.css
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/theme/vibrant-ink.css b/IPython/frontend/html/notebook/static/components/codemirror/theme/vibrant-ink.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/theme/vibrant-ink.css
rename to IPython/frontend/html/notebook/static/components/codemirror/theme/vibrant-ink.css
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/theme/xq-dark.css b/IPython/frontend/html/notebook/static/components/codemirror/theme/xq-dark.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/theme/xq-dark.css
rename to IPython/frontend/html/notebook/static/components/codemirror/theme/xq-dark.css
diff --git a/IPython/frontend/html/notebook/static/components/cmtemp/theme/xq-light.css b/IPython/frontend/html/notebook/static/components/codemirror/theme/xq-light.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/components/cmtemp/theme/xq-light.css
rename to IPython/frontend/html/notebook/static/components/codemirror/theme/xq-light.css