diff --git a/IPython/frontend/html/notebook/static/codemirror-2.12/LICENSE b/IPython/frontend/html/notebook/static/codemirror/LICENSE
similarity index 100%
rename from IPython/frontend/html/notebook/static/codemirror-2.12/LICENSE
rename to IPython/frontend/html/notebook/static/codemirror/LICENSE
diff --git a/IPython/frontend/html/notebook/static/codemirror-2.12/README.md b/IPython/frontend/html/notebook/static/codemirror/README.md
similarity index 100%
rename from IPython/frontend/html/notebook/static/codemirror-2.12/README.md
rename to IPython/frontend/html/notebook/static/codemirror/README.md
diff --git a/IPython/frontend/html/notebook/static/codemirror/ipython-version-2.15 b/IPython/frontend/html/notebook/static/codemirror/ipython-version-2.15
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/IPython/frontend/html/notebook/static/codemirror/ipython-version-2.15
diff --git a/IPython/frontend/html/notebook/static/codemirror-2.12/lib/codemirror.css b/IPython/frontend/html/notebook/static/codemirror/lib/codemirror.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/codemirror-2.12/lib/codemirror.css
rename to IPython/frontend/html/notebook/static/codemirror/lib/codemirror.css
diff --git a/IPython/frontend/html/notebook/static/codemirror-2.12/lib/codemirror.js b/IPython/frontend/html/notebook/static/codemirror/lib/codemirror.js
similarity index 99%
rename from IPython/frontend/html/notebook/static/codemirror-2.12/lib/codemirror.js
rename to IPython/frontend/html/notebook/static/codemirror/lib/codemirror.js
index 5fda603..2e4531f 100644
--- a/IPython/frontend/html/notebook/static/codemirror-2.12/lib/codemirror.js
+++ b/IPython/frontend/html/notebook/static/codemirror/lib/codemirror.js
@@ -103,8 +103,8 @@ var CodeMirror = (function() {
     connect(scroller, "paste", function(){focusInput(); fastPoll();});
     connect(input, "paste", function(){fastPoll();});
     connect(input, "cut", function(){fastPoll();});
-    
-    // IE throws unspecified error in certain cases, when 
+
+    // IE throws unspecified error in certain cases, when
     // trying to access activeElement before onload
     var hasFocus; try { hasFocus = (targetDocument.activeElement == input); } catch(e) { }
     if (hasFocus) setTimeout(onFocus, 20);
@@ -248,7 +248,7 @@ var CodeMirror = (function() {
         }
 
       var start = posFromMouse(e);
-      
+
       switch (e_button(e)) {
       case 3:
         if (gecko && !mac) onContextMenu(e);
@@ -1255,7 +1255,7 @@ var CodeMirror = (function() {
         prepareInput();
         slowPoll();
       }
-      
+
       if (gecko) {
         e_stop(e);
         var mouseup = connect(window, "mouseup", function() {
diff --git a/IPython/frontend/html/notebook/static/codemirror-2.12/lib/overlay.js b/IPython/frontend/html/notebook/static/codemirror/lib/overlay.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/codemirror-2.12/lib/overlay.js
rename to IPython/frontend/html/notebook/static/codemirror/lib/overlay.js
index c4cdf9f..b2ae21f 100644
--- a/IPython/frontend/html/notebook/static/codemirror-2.12/lib/overlay.js
+++ b/IPython/frontend/html/notebook/static/codemirror/lib/overlay.js
@@ -42,7 +42,7 @@ CodeMirror.overlayParser = function(base, overlay, combine) {
       if (state.baseCur != null && combine) return state.baseCur + " " + state.overlayCur;
       else return state.overlayCur;
     },
-    
+
     indent: function(state, textAfter) {
       return base.indent(state.base, textAfter);
     },
diff --git a/IPython/frontend/html/notebook/static/codemirror-2.12/lib/runmode.js b/IPython/frontend/html/notebook/static/codemirror/lib/runmode.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/codemirror-2.12/lib/runmode.js
rename to IPython/frontend/html/notebook/static/codemirror/lib/runmode.js
diff --git a/IPython/frontend/html/notebook/static/codemirror-2.12/mode/css/css.js b/IPython/frontend/html/notebook/static/codemirror/mode/css/css.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/codemirror-2.12/mode/css/css.js
rename to IPython/frontend/html/notebook/static/codemirror/mode/css/css.js
diff --git a/IPython/frontend/html/notebook/static/codemirror-2.12/mode/css/index.html b/IPython/frontend/html/notebook/static/codemirror/mode/css/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/codemirror-2.12/mode/css/index.html
rename to IPython/frontend/html/notebook/static/codemirror/mode/css/index.html
diff --git a/IPython/frontend/html/notebook/static/codemirror-2.12/mode/htmlmixed/htmlmixed.js b/IPython/frontend/html/notebook/static/codemirror/mode/htmlmixed/htmlmixed.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/codemirror-2.12/mode/htmlmixed/htmlmixed.js
rename to IPython/frontend/html/notebook/static/codemirror/mode/htmlmixed/htmlmixed.js
diff --git a/IPython/frontend/html/notebook/static/codemirror-2.12/mode/htmlmixed/index.html b/IPython/frontend/html/notebook/static/codemirror/mode/htmlmixed/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/codemirror-2.12/mode/htmlmixed/index.html
rename to IPython/frontend/html/notebook/static/codemirror/mode/htmlmixed/index.html
diff --git a/IPython/frontend/html/notebook/static/codemirror-2.12/mode/javascript/index.html b/IPython/frontend/html/notebook/static/codemirror/mode/javascript/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/codemirror-2.12/mode/javascript/index.html
rename to IPython/frontend/html/notebook/static/codemirror/mode/javascript/index.html
diff --git a/IPython/frontend/html/notebook/static/codemirror-2.12/mode/javascript/javascript.js b/IPython/frontend/html/notebook/static/codemirror/mode/javascript/javascript.js
similarity index 99%
rename from IPython/frontend/html/notebook/static/codemirror-2.12/mode/javascript/javascript.js
rename to IPython/frontend/html/notebook/static/codemirror/mode/javascript/javascript.js
index d3f9289..4e0f7ff 100644
--- a/IPython/frontend/html/notebook/static/codemirror-2.12/mode/javascript/javascript.js
+++ b/IPython/frontend/html/notebook/static/codemirror/mode/javascript/javascript.js
@@ -52,7 +52,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     else if (ch == "0" && stream.eat(/x/i)) {
       stream.eatWhile(/[\da-f]/i);
       return ret("number", "number");
-    }      
+    }
     else if (/\d/.test(ch)) {
       stream.match(/^\d*(?:\.\d*)?(?:e[+\-]?\d+)?/);
       return ret("number", "number");
@@ -134,7 +134,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     // Communicate our context to the combinators.
     // (Less wasteful than consing up a hundred closures on every call.)
     cx.state = state; cx.stream = stream; cx.marked = null, cx.cc = cc;
-  
+
     if (!state.lexical.hasOwnProperty("align"))
       state.lexical.align = true;
 
diff --git a/IPython/frontend/html/notebook/static/codemirror-2.12/mode/markdown/index.html b/IPython/frontend/html/notebook/static/codemirror/mode/markdown/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/codemirror-2.12/mode/markdown/index.html
rename to IPython/frontend/html/notebook/static/codemirror/mode/markdown/index.html
diff --git a/IPython/frontend/html/notebook/static/codemirror-2.12/mode/markdown/markdown.css b/IPython/frontend/html/notebook/static/codemirror/mode/markdown/markdown.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/codemirror-2.12/mode/markdown/markdown.css
rename to IPython/frontend/html/notebook/static/codemirror/mode/markdown/markdown.css
diff --git a/IPython/frontend/html/notebook/static/codemirror-2.12/mode/markdown/markdown.js b/IPython/frontend/html/notebook/static/codemirror/mode/markdown/markdown.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/codemirror-2.12/mode/markdown/markdown.js
rename to IPython/frontend/html/notebook/static/codemirror/mode/markdown/markdown.js
diff --git a/IPython/frontend/html/notebook/static/codemirror-2.12/mode/python/LICENSE.txt b/IPython/frontend/html/notebook/static/codemirror/mode/python/LICENSE.txt
similarity index 100%
rename from IPython/frontend/html/notebook/static/codemirror-2.12/mode/python/LICENSE.txt
rename to IPython/frontend/html/notebook/static/codemirror/mode/python/LICENSE.txt
diff --git a/IPython/frontend/html/notebook/static/codemirror-2.12/mode/python/index.html b/IPython/frontend/html/notebook/static/codemirror/mode/python/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/codemirror-2.12/mode/python/index.html
rename to IPython/frontend/html/notebook/static/codemirror/mode/python/index.html
index 1c36643..88cd09a 100644
--- a/IPython/frontend/html/notebook/static/codemirror-2.12/mode/python/index.html
+++ b/IPython/frontend/html/notebook/static/codemirror/mode/python/index.html
@@ -11,7 +11,7 @@
   </head>
   <body>
     <h1>CodeMirror 2: Python mode</h1>
-    
+
     <div><textarea id="code" name="code">
 # Literals
 1234
diff --git a/IPython/frontend/html/notebook/static/codemirror-2.12/mode/python/python.js b/IPython/frontend/html/notebook/static/codemirror/mode/python/python.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/codemirror-2.12/mode/python/python.js
rename to IPython/frontend/html/notebook/static/codemirror/mode/python/python.js
index 4f60d9e..ca94e7a 100644
--- a/IPython/frontend/html/notebook/static/codemirror-2.12/mode/python/python.js
+++ b/IPython/frontend/html/notebook/static/codemirror/mode/python/python.js
@@ -1,10 +1,10 @@
 CodeMirror.defineMode("python", function(conf, parserConf) {
     var ERRORCLASS = 'error';
-    
+
     function wordRegexp(words) {
         return new RegExp("^((" + words.join(")|(") + "))\\b");
     }
-    
+
     var singleOperators = new RegExp("^[\\+\\-\\*/%&|\\^~<>!]");
     var singleDelimiters = new RegExp('^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]');
     var doubleOperators = new RegExp("^((==)|(!=)|(<=)|(>=)|(<>)|(<<)|(>>)|(//)|(\\*\\*))");
@@ -65,15 +65,15 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
         if (stream.eatSpace()) {
             return null;
         }
-        
+
         var ch = stream.peek();
-        
+
         // Handle Comments
         if (ch === '#') {
             stream.skipToEnd();
             return 'comment';
         }
-        
+
         // Handle Number Literals
         if (stream.match(/^[0-9\.]/, false)) {
             var floatLiteral = false;
@@ -109,13 +109,13 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
                 return 'number';
             }
         }
-        
+
         // Handle Strings
         if (stream.match(stringPrefixes)) {
             state.tokenize = tokenStringFactory(stream.current());
             return state.tokenize(stream, state);
         }
-        
+
         // Handle operators and Delimiters
         if (stream.match(tripleDelimiters) || stream.match(doubleDelimiters)) {
             return null;
@@ -128,31 +128,31 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
         if (stream.match(singleDelimiters)) {
             return null;
         }
-        
+
         if (stream.match(types)) {
             return 'builtin';
         }
-        
+
         if (stream.match(keywords)) {
             return 'keyword';
         }
-        
+
         if (stream.match(identifiers)) {
             return 'variable';
         }
-        
+
         // Handle non-detected items
         stream.next();
         return ERRORCLASS;
     }
-    
+
     function tokenStringFactory(delimiter) {
         while ('rub'.indexOf(delimiter.charAt(0).toLowerCase()) >= 0) {
             delimiter = delimiter.substr(1);
         }
         var singleline = delimiter.length == 1;
         var OUTCLASS = 'string';
-        
+
         return function tokenString(stream, state) {
             while (!stream.eol()) {
                 stream.eatWhile(/[^'"\\]/);
@@ -178,7 +178,7 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
             return OUTCLASS;
         };
     }
-    
+
     function indent(stream, state, type) {
         type = type || 'py';
         var indentUnit = 0;
@@ -197,7 +197,7 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
             type: type
         });
     }
-    
+
     function dedent(stream, state) {
         if (state.scopes.length == 1) return;
         if (state.scopes[0].type === 'py') {
@@ -237,7 +237,7 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
                 return ERRORCLASS;
             }
         }
-        
+
         // Handle decorators
         if (current === '@') {
             style = state.tokenize(stream, state);
@@ -250,7 +250,7 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
                 return ERRORCLASS;
             }
         }
-        
+
         // Handle scope changes.
         if (current === 'pass' || current === 'return') {
             state.dedent += 1;
@@ -278,7 +278,7 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
             if (state.scopes.length > 1) state.scopes.shift();
             state.dedent -= 1;
         }
-        
+
         return style;
     }
 
@@ -292,27 +292,27 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
               dedent: 0
           };
         },
-        
+
         token: function(stream, state) {
             var style = tokenLexer(stream, state);
-            
+
             state.lastToken = {style:style, content: stream.current()};
-            
+
             if (stream.eol() && stream.lambda) {
                 state.lambda = false;
             }
-            
+
             return style;
         },
-        
+
         indent: function(state, textAfter) {
             if (state.tokenize != tokenBase) {
                 return 0;
             }
-            
+
             return state.scopes[0].offset;
         }
-        
+
     };
     return external;
 });
diff --git a/IPython/frontend/html/notebook/static/codemirror-2.12/mode/rst/index.html b/IPython/frontend/html/notebook/static/codemirror/mode/rst/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/codemirror-2.12/mode/rst/index.html
rename to IPython/frontend/html/notebook/static/codemirror/mode/rst/index.html
index 0831dff..447c24f 100644
--- a/IPython/frontend/html/notebook/static/codemirror-2.12/mode/rst/index.html
+++ b/IPython/frontend/html/notebook/static/codemirror/mode/rst/index.html
@@ -523,4 +523,3 @@ There are some problems one commonly runs into while authoring reST documents:
     <p><strong>MIME types defined:</strong> <code>text/x-rst</code>.</p>
   </body>
 </html>
-
diff --git a/IPython/frontend/html/notebook/static/codemirror-2.12/mode/rst/rst.css b/IPython/frontend/html/notebook/static/codemirror/mode/rst/rst.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/codemirror-2.12/mode/rst/rst.css
rename to IPython/frontend/html/notebook/static/codemirror/mode/rst/rst.css
diff --git a/IPython/frontend/html/notebook/static/codemirror-2.12/mode/rst/rst.js b/IPython/frontend/html/notebook/static/codemirror/mode/rst/rst.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/codemirror-2.12/mode/rst/rst.js
rename to IPython/frontend/html/notebook/static/codemirror/mode/rst/rst.js
diff --git a/IPython/frontend/html/notebook/static/codemirror-2.12/mode/xml/index.html b/IPython/frontend/html/notebook/static/codemirror/mode/xml/index.html
similarity index 100%
rename from IPython/frontend/html/notebook/static/codemirror-2.12/mode/xml/index.html
rename to IPython/frontend/html/notebook/static/codemirror/mode/xml/index.html
diff --git a/IPython/frontend/html/notebook/static/codemirror-2.12/mode/xml/xml.js b/IPython/frontend/html/notebook/static/codemirror/mode/xml/xml.js
similarity index 100%
rename from IPython/frontend/html/notebook/static/codemirror-2.12/mode/xml/xml.js
rename to IPython/frontend/html/notebook/static/codemirror/mode/xml/xml.js
diff --git a/IPython/frontend/html/notebook/static/codemirror-2.12/theme/default.css b/IPython/frontend/html/notebook/static/codemirror/theme/default.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/codemirror-2.12/theme/default.css
rename to IPython/frontend/html/notebook/static/codemirror/theme/default.css
diff --git a/IPython/frontend/html/notebook/static/codemirror-2.12/theme/elegant.css b/IPython/frontend/html/notebook/static/codemirror/theme/elegant.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/codemirror-2.12/theme/elegant.css
rename to IPython/frontend/html/notebook/static/codemirror/theme/elegant.css
diff --git a/IPython/frontend/html/notebook/static/codemirror-2.12/theme/ipython.css b/IPython/frontend/html/notebook/static/codemirror/theme/ipython.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/codemirror-2.12/theme/ipython.css
rename to IPython/frontend/html/notebook/static/codemirror/theme/ipython.css
index ced6133..16ef8ad 100644
--- a/IPython/frontend/html/notebook/static/codemirror-2.12/theme/ipython.css
+++ b/IPython/frontend/html/notebook/static/codemirror/theme/ipython.css
@@ -38,4 +38,3 @@
 /*span.py-bytes {color: #BA2121;}*/
 /*span.py-raw {color: #BA2121;}*/
 /*span.py-unicode {color: #BA2121;}*/
-
diff --git a/IPython/frontend/html/notebook/static/codemirror-2.12/theme/neat.css b/IPython/frontend/html/notebook/static/codemirror/theme/neat.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/codemirror-2.12/theme/neat.css
rename to IPython/frontend/html/notebook/static/codemirror/theme/neat.css
diff --git a/IPython/frontend/html/notebook/static/codemirror-2.12/theme/night.css b/IPython/frontend/html/notebook/static/codemirror/theme/night.css
similarity index 100%
rename from IPython/frontend/html/notebook/static/codemirror-2.12/theme/night.css
rename to IPython/frontend/html/notebook/static/codemirror/theme/night.css