Reorganize file structure by language/platform

Moved all files that are specifically for the website into web (except for index.htm) Moved all files that are javascript (for node or web) into js Organized js folder to generally follow node structures This change also changes .npmignore to include unpackers in the package. First step on #224.
beautifier · Apr 4, 2013 · 9de057f · 9de057f
1 parent 1768f57
commit 9de057f
Show file tree

Hide file tree

Showing 204 changed files with 56 additions and 58 deletions.
diff --git a/.npmignore b/.npmignore
@@ -1,9 +1,5 @@
 Makefile
-attic/
-favicon.png
 index.html
-jquery/
 php/
 python/
-third-party/
-unpackers/
+web/
diff --git a/Makefile b/Makefile
@@ -34,15 +34,15 @@ testj:
 
 edit:
 	vim \
-		beautify.js python/jsbeautifier/__init__.py \
-		tests/beautify-tests.js python/jsbeautifier/tests/testjsbeautifier.py
+		js/lib/beautify.js python/jsbeautifier/__init__.py \
+		js/test/beautify-tests.js python/jsbeautifier/tests/testjsbeautifier.py
 
 gedit:
 	gvim \
-		beautify.js \
-		tests/beautify-tests.js \
-		python/jsbeautifier/__init__.py \
-		python/jsbeautifier/tests/testjsbeautifier.py &
+		js/lib/beautify.js \
+		js/test/beautify-tests.js \
+		js/python/jsbeautifier/__init__.py \
+		js/python/jsbeautifier/tests/testjsbeautifier.py &
 
 tests: testj testp
 

diff --git a/bin/css-beautify.js b/bin/css-beautify.js
diff --git a/bin/html-beautify.js b/bin/html-beautify.js
diff --git a/bin/js-beautify.js b/bin/js-beautify.js
diff --git a/index.html b/index.html
@@ -32,10 +32,10 @@
 <head>
     <meta charset="utf-8">
     <title>Online JavaScript beautifier</title>
-    <link rel="icon" href="favicon.png" type="image/png">
-    <script src="third-party/codemirror2/lib/codemirror.js"></script>
-    <script src="third-party/codemirror2/mode/javascript/javascript.js"></script>
-    <link rel="stylesheet" href="third-party/codemirror2/lib/codemirror.css">
+    <link rel="icon" href="web/favicon.png" type="image/png">
+    <script src="web/third-party/codemirror/lib/codemirror.js"></script>
+    <script src="web/third-party/codemirror/mode/javascript/javascript.js"></script>
+    <link rel="stylesheet" href="web/third-party/codemirror/lib/codemirror.css">
 
     <style>
 
@@ -137,19 +137,19 @@
 }
 
     </style>
-<script src="third-party/jquery/jquery.js"></script>
-<script src="third-party/jquery/jquery.cookie.js"></script>
-
-
-<script src="beautify.js"></script>
-<script src="beautify-css.js"></script>
-<script src="beautify-html.js"></script>
-<script src="tests/sanitytest.js"></script>
-<script src="tests/beautify-tests.js"></script>
-<script src="unpackers/javascriptobfuscator_unpacker.js"></script>
-<script src="unpackers/urlencode_unpacker.js"></script>
-<script src="unpackers/p_a_c_k_e_r_unpacker.js"></script>
-<script src="unpackers/myobfuscate_unpacker.js"></script>
+<script src="web/third-party/jquery/jquery.js"></script>
+<script src="web/third-party/jquery/jquery.cookie.js"></script>
+
+
+<script src="js/lib/beautify.js"></script>
+<script src="js/lib/beautify-css.js"></script>
+<script src="js/lib/beautify-html.js"></script>
+<script src="js/test/sanitytest.js"></script>
+<script src="js/test/beautify-tests.js"></script>
+<script src="js/lib/unpackers/javascriptobfuscator_unpacker.js"></script>
+<script src="js/lib/unpackers/urlencode_unpacker.js"></script>
+<script src="js/lib/unpackers/p_a_c_k_e_r_unpacker.js"></script>
+<script src="js/lib/unpackers/myobfuscate_unpacker.js"></script>
 
 <script>
 

diff --git a/js/bin/css-beautify.js b/js/bin/css-beautify.js
@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+var cli = require('../lib/cli'); cli.interpret();
+
+
diff --git a/js/bin/html-beautify.js b/js/bin/html-beautify.js
@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+var cli = require('../lib/cli'); cli.interpret();
+
+
diff --git a/js/bin/js-beautify.js b/js/bin/js-beautify.js
@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+var cli = require('../lib/cli'); cli.interpret();
+
+
diff --git a/config/defaults.json → js/config/defaults.json b/config/defaults.json → js/config/defaults.json
diff --git a/index.js → js/index.js b/index.js → js/index.js
diff --git a/beautify-css.js → js/lib/beautify-css.js b/beautify-css.js → js/lib/beautify-css.js
diff --git a/beautify-html.js → js/lib/beautify-html.js b/beautify-html.js → js/lib/beautify-html.js
diff --git a/beautify.js → js/lib/beautify.js b/beautify.js → js/lib/beautify.js
diff --git a/cli.js → js/lib/cli.js b/cli.js → js/lib/cli.js
@@ -38,7 +38,7 @@ var debug = process.env.DEBUG_JSBEAUTIFY || process.env.JSBEAUTIFY_DEBUG
 
 var fs = require('fs'),
     cc = require('config-chain'),
-    beautify = require('./index'),
+    beautify = require('../index'),
     nopt = require('nopt'),
     path = require('path'),
     knownOpts = {
@@ -113,7 +113,7 @@ var interpret = exports.interpret = function (argv, slice) {
     var parsed = nopt(knownOpts, shortHands, argv, slice);
 
     if (parsed.version) {
-        console.log(require('./package.json').version);
+        console.log(require(__dirname + '/../../package.json').version);
         process.exit(0);
     }
     else if (parsed.help) {
@@ -126,7 +126,7 @@ var interpret = exports.interpret = function (argv, slice) {
         cleanOptions(cc.env('jsbeautify_'), knownOpts),
         parsed.config,
         cc.find('.jsbeautifyrc'),
-        __dirname + '/config/defaults.json'
+        __dirname + '/../config/defaults.json'
     ).snapshot;
 
     try {

diff --git a/unpackers/javascriptobfuscator_unpacker.js → ...npackers/javascriptobfuscator_unpacker.js b/unpackers/javascriptobfuscator_unpacker.js → ...npackers/javascriptobfuscator_unpacker.js
diff --git a/unpackers/myobfuscate_unpacker.js → js/lib/unpackers/myobfuscate_unpacker.js b/unpackers/myobfuscate_unpacker.js → js/lib/unpackers/myobfuscate_unpacker.js
diff --git a/unpackers/p_a_c_k_e_r_unpacker.js → js/lib/unpackers/p_a_c_k_e_r_unpacker.js b/unpackers/p_a_c_k_e_r_unpacker.js → js/lib/unpackers/p_a_c_k_e_r_unpacker.js
diff --git a/unpackers/urlencode_unpacker.js → js/lib/unpackers/urlencode_unpacker.js b/unpackers/urlencode_unpacker.js → js/lib/unpackers/urlencode_unpacker.js
@@ -9,12 +9,12 @@
 // if (Urlencoded.detect(some_string)) {
 //     var unpacked = Urlencoded.unpack(some_string);
 // }
-// 
+//
 //
 
 var isNode = (typeof module !== 'undefined' && module.exports);
 if (isNode) {
-    var SanityTest = require(__dirname + '/../tests/sanitytest');
+    var SanityTest = require(__dirname + '/../../test/sanitytest');
 }
 
 var Urlencoded = {

diff --git a/tests/beautify-tests.js → js/test/beautify-tests.js b/tests/beautify-tests.js → js/test/beautify-tests.js
diff --git a/tests/node-beautify-tests.js → js/test/node-beautify-tests.js b/tests/node-beautify-tests.js → js/test/node-beautify-tests.js
@@ -2,8 +2,8 @@
 /*jshint node:true */
 
 var SanityTest = require('./sanitytest'),
-    Urlencoded = require('../unpackers/urlencode_unpacker'),
-    js_beautify = require('../beautify').js_beautify,
+    Urlencoded = require('../lib/unpackers/urlencode_unpacker'),
+    js_beautify = require('../lib/beautify').js_beautify,
     run_beautifier_tests = require('./beautify-tests').run_beautifier_tests;
 
 function node_beautifier_tests() {

diff --git a/tests/run-tests → js/test/run-tests b/tests/run-tests → js/test/run-tests
@@ -5,13 +5,13 @@
 // a little helper for testing from command line
 // just run it, it will output the test results
 
-load('beautify.js');
-load('tests/sanitytest.js')
-load('tests/beautify-tests.js')
-load('unpackers/urlencode_unpacker.js')
+load('js/lib/beautify.js');
+load('js/test/sanitytest.js')
+load('js/test/beautify-tests.js')
+load('js/lib/unpackers/urlencode_unpacker.js')
 
 print(run_beautifier_tests().results_raw())
 
 
 // for nodejs use this from the command line from the main directory:
-// node tests/beautify-tests.js
+// node test/beautify-tests.js
diff --git a/tests/sanitytest.js → js/test/sanitytest.js b/tests/sanitytest.js → js/test/sanitytest.js
diff --git a/package.json b/package.json
@@ -2,18 +2,20 @@
   "name": "js-beautify",
   "version": "1.2.0",
   "description": "jsbeautifier.org for node",
-  "main": "index.js",
+  "main": "js/index.js",
   "preferGlobal": true,
   "bin": {
-    "css-beautify": "./bin/css-beautify.js",
-    "html-beautify": "./bin/html-beautify.js",
-    "js-beautify": "./bin/js-beautify.js"
+    "css-beautify": "./js/bin/css-beautify.js",
+    "html-beautify": "./js/bin/html-beautify.js",
+    "js-beautify": "./js/bin/js-beautify.js"
   },
   "directories": {
-    "test": "tests"
+    "lib": "js/lib",
+    "test": "js/test"
+
   },
   "scripts": {
-    "test": "node ./tests/node-beautify-tests.js"
+    "test": "node ./js/test/node-beautify-tests.js"
   },
   "bugs": "https://github.com/einars/js-beautify/issues",
   "homepage": "http://jsbeautifier.org/",

diff --git a/favicon.png → web/favicon.png b/favicon.png → web/favicon.png
diff --git a/third-party/codemirror2/LICENSE → web/third-party/codemirror/LICENSE b/third-party/codemirror2/LICENSE → web/third-party/codemirror/LICENSE
diff --git a/third-party/codemirror2/README.md → web/third-party/codemirror/README.md b/third-party/codemirror2/README.md → web/third-party/codemirror/README.md
diff --git a/third-party/codemirror2/demo/activeline.html → ...ird-party/codemirror/demo/activeline.html b/third-party/codemirror2/demo/activeline.html → ...ird-party/codemirror/demo/activeline.html
diff --git a/third-party/codemirror2/demo/changemode.html → ...ird-party/codemirror/demo/changemode.html b/third-party/codemirror2/demo/changemode.html → ...ird-party/codemirror/demo/changemode.html
diff --git a/third-party/codemirror2/demo/closetag.html → ...third-party/codemirror/demo/closetag.html b/third-party/codemirror2/demo/closetag.html → ...third-party/codemirror/demo/closetag.html
diff --git a/third-party/codemirror2/demo/complete.html → ...third-party/codemirror/demo/complete.html b/third-party/codemirror2/demo/complete.html → ...third-party/codemirror/demo/complete.html
diff --git a/third-party/codemirror2/demo/emacs.html → web/third-party/codemirror/demo/emacs.html b/third-party/codemirror2/demo/emacs.html → web/third-party/codemirror/demo/emacs.html
diff --git a/third-party/codemirror2/demo/folding.html → web/third-party/codemirror/demo/folding.html b/third-party/codemirror2/demo/folding.html → web/third-party/codemirror/demo/folding.html
diff --git a/third-party/codemirror2/demo/formatting.html → ...ird-party/codemirror/demo/formatting.html b/third-party/codemirror2/demo/formatting.html → ...ird-party/codemirror/demo/formatting.html
diff --git a/third-party/codemirror2/demo/fullscreen.html → ...ird-party/codemirror/demo/fullscreen.html b/third-party/codemirror2/demo/fullscreen.html → ...ird-party/codemirror/demo/fullscreen.html
diff --git a/third-party/codemirror2/demo/loadmode.html → ...third-party/codemirror/demo/loadmode.html b/third-party/codemirror2/demo/loadmode.html → ...third-party/codemirror/demo/loadmode.html
diff --git a/third-party/codemirror2/demo/marker.html → web/third-party/codemirror/demo/marker.html b/third-party/codemirror2/demo/marker.html → web/third-party/codemirror/demo/marker.html
diff --git a/...ty/codemirror2/demo/matchhighlighter.html → ...rty/codemirror/demo/matchhighlighter.html b/...ty/codemirror2/demo/matchhighlighter.html → ...rty/codemirror/demo/matchhighlighter.html
diff --git a/third-party/codemirror2/demo/mustache.html → ...third-party/codemirror/demo/mustache.html b/third-party/codemirror2/demo/mustache.html → ...third-party/codemirror/demo/mustache.html
diff --git a/third-party/codemirror2/demo/preview.html → web/third-party/codemirror/demo/preview.html b/third-party/codemirror2/demo/preview.html → web/third-party/codemirror/demo/preview.html
diff --git a/third-party/codemirror2/demo/resize.html → web/third-party/codemirror/demo/resize.html b/third-party/codemirror2/demo/resize.html → web/third-party/codemirror/demo/resize.html
diff --git a/third-party/codemirror2/demo/runmode.html → web/third-party/codemirror/demo/runmode.html b/third-party/codemirror2/demo/runmode.html → web/third-party/codemirror/demo/runmode.html
diff --git a/third-party/codemirror2/demo/search.html → web/third-party/codemirror/demo/search.html b/third-party/codemirror2/demo/search.html → web/third-party/codemirror/demo/search.html
diff --git a/third-party/codemirror2/demo/theme.html → web/third-party/codemirror/demo/theme.html b/third-party/codemirror2/demo/theme.html → web/third-party/codemirror/demo/theme.html
diff --git a/third-party/codemirror2/demo/vim.html → web/third-party/codemirror/demo/vim.html b/third-party/codemirror2/demo/vim.html → web/third-party/codemirror/demo/vim.html
diff --git a/...d-party/codemirror2/demo/visibletabs.html → ...rd-party/codemirror/demo/visibletabs.html b/...d-party/codemirror2/demo/visibletabs.html → ...rd-party/codemirror/demo/visibletabs.html
diff --git a/third-party/codemirror2/doc/baboon.png → web/third-party/codemirror/doc/baboon.png b/third-party/codemirror2/doc/baboon.png → web/third-party/codemirror/doc/baboon.png
diff --git a/...d-party/codemirror2/doc/baboon_vector.svg → ...rd-party/codemirror/doc/baboon_vector.svg b/...d-party/codemirror2/doc/baboon_vector.svg → ...rd-party/codemirror/doc/baboon_vector.svg
diff --git a/third-party/codemirror2/doc/compress.html → web/third-party/codemirror/doc/compress.html b/third-party/codemirror2/doc/compress.html → web/third-party/codemirror/doc/compress.html
diff --git a/third-party/codemirror2/doc/docs.css → web/third-party/codemirror/doc/docs.css b/third-party/codemirror2/doc/docs.css → web/third-party/codemirror/doc/docs.css
diff --git a/third-party/codemirror2/doc/internals.html → ...third-party/codemirror/doc/internals.html b/third-party/codemirror2/doc/internals.html → ...third-party/codemirror/doc/internals.html
diff --git a/third-party/codemirror2/doc/manual.html → web/third-party/codemirror/doc/manual.html b/third-party/codemirror2/doc/manual.html → web/third-party/codemirror/doc/manual.html
diff --git a/third-party/codemirror2/doc/oldrelease.html → ...hird-party/codemirror/doc/oldrelease.html b/third-party/codemirror2/doc/oldrelease.html → ...hird-party/codemirror/doc/oldrelease.html
diff --git a/third-party/codemirror2/doc/reporting.html → ...third-party/codemirror/doc/reporting.html b/third-party/codemirror2/doc/reporting.html → ...third-party/codemirror/doc/reporting.html
diff --git a/...d-party/codemirror2/doc/upgrade_v2.2.html → ...rd-party/codemirror/doc/upgrade_v2.2.html b/...d-party/codemirror2/doc/upgrade_v2.2.html → ...rd-party/codemirror/doc/upgrade_v2.2.html
diff --git a/third-party/codemirror2/index.html → web/third-party/codemirror/index.html b/third-party/codemirror2/index.html → web/third-party/codemirror/index.html
diff --git a/third-party/codemirror2/keymap/emacs.js → web/third-party/codemirror/keymap/emacs.js b/third-party/codemirror2/keymap/emacs.js → web/third-party/codemirror/keymap/emacs.js
diff --git a/third-party/codemirror2/keymap/vim.js → web/third-party/codemirror/keymap/vim.js b/third-party/codemirror2/keymap/vim.js → web/third-party/codemirror/keymap/vim.js
diff --git a/third-party/codemirror2/lib/codemirror.css → ...third-party/codemirror/lib/codemirror.css b/third-party/codemirror2/lib/codemirror.css → ...third-party/codemirror/lib/codemirror.css
diff --git a/third-party/codemirror2/lib/codemirror.js → web/third-party/codemirror/lib/codemirror.js b/third-party/codemirror2/lib/codemirror.js → web/third-party/codemirror/lib/codemirror.js
diff --git a/third-party/codemirror2/lib/util/closetag.js → ...ird-party/codemirror/lib/util/closetag.js b/third-party/codemirror2/lib/util/closetag.js → ...ird-party/codemirror/lib/util/closetag.js
diff --git a/third-party/codemirror2/lib/util/dialog.css → ...hird-party/codemirror/lib/util/dialog.css b/third-party/codemirror2/lib/util/dialog.css → ...hird-party/codemirror/lib/util/dialog.css
diff --git a/third-party/codemirror2/lib/util/dialog.js → ...third-party/codemirror/lib/util/dialog.js b/third-party/codemirror2/lib/util/dialog.js → ...third-party/codemirror/lib/util/dialog.js
diff --git a/third-party/codemirror2/lib/util/foldcode.js → ...ird-party/codemirror/lib/util/foldcode.js b/third-party/codemirror2/lib/util/foldcode.js → ...ird-party/codemirror/lib/util/foldcode.js
diff --git a/...-party/codemirror2/lib/util/formatting.js → ...d-party/codemirror/lib/util/formatting.js b/...-party/codemirror2/lib/util/formatting.js → ...d-party/codemirror/lib/util/formatting.js
diff --git a/...y/codemirror2/lib/util/javascript-hint.js → ...ty/codemirror/lib/util/javascript-hint.js b/...y/codemirror2/lib/util/javascript-hint.js → ...ty/codemirror/lib/util/javascript-hint.js
diff --git a/third-party/codemirror2/lib/util/loadmode.js → ...ird-party/codemirror/lib/util/loadmode.js b/third-party/codemirror2/lib/util/loadmode.js → ...ird-party/codemirror/lib/util/loadmode.js
diff --git a/...codemirror2/lib/util/match-highlighter.js → .../codemirror/lib/util/match-highlighter.js b/...codemirror2/lib/util/match-highlighter.js → .../codemirror/lib/util/match-highlighter.js
diff --git a/third-party/codemirror2/lib/util/overlay.js → ...hird-party/codemirror/lib/util/overlay.js b/third-party/codemirror2/lib/util/overlay.js → ...hird-party/codemirror/lib/util/overlay.js
diff --git a/third-party/codemirror2/lib/util/runmode.js → ...hird-party/codemirror/lib/util/runmode.js b/third-party/codemirror2/lib/util/runmode.js → ...hird-party/codemirror/lib/util/runmode.js
diff --git a/third-party/codemirror2/lib/util/search.js → ...third-party/codemirror/lib/util/search.js b/third-party/codemirror2/lib/util/search.js → ...third-party/codemirror/lib/util/search.js
diff --git a/...arty/codemirror2/lib/util/searchcursor.js → ...party/codemirror/lib/util/searchcursor.js b/...arty/codemirror2/lib/util/searchcursor.js → ...party/codemirror/lib/util/searchcursor.js
diff --git a/...arty/codemirror2/lib/util/simple-hint.css → ...party/codemirror/lib/util/simple-hint.css b/...arty/codemirror2/lib/util/simple-hint.css → ...party/codemirror/lib/util/simple-hint.css
diff --git a/...party/codemirror2/lib/util/simple-hint.js → ...-party/codemirror/lib/util/simple-hint.js b/...party/codemirror2/lib/util/simple-hint.js → ...-party/codemirror/lib/util/simple-hint.js
diff --git a/third-party/codemirror2/mode/clike/clike.js → ...hird-party/codemirror/mode/clike/clike.js b/third-party/codemirror2/mode/clike/clike.js → ...hird-party/codemirror/mode/clike/clike.js
diff --git a/...d-party/codemirror2/mode/clike/index.html → ...rd-party/codemirror/mode/clike/index.html b/...d-party/codemirror2/mode/clike/index.html → ...rd-party/codemirror/mode/clike/index.html
diff --git a/...party/codemirror2/mode/clojure/clojure.js → ...-party/codemirror/mode/clojure/clojure.js b/...party/codemirror2/mode/clojure/clojure.js → ...-party/codemirror/mode/clojure/clojure.js
diff --git a/...party/codemirror2/mode/clojure/index.html → ...-party/codemirror/mode/clojure/index.html b/...party/codemirror2/mode/clojure/index.html → ...-party/codemirror/mode/clojure/index.html
diff --git a/...rty/codemirror2/mode/coffeescript/LICENSE → ...arty/codemirror/mode/coffeescript/LICENSE b/...rty/codemirror2/mode/coffeescript/LICENSE → ...arty/codemirror/mode/coffeescript/LICENSE
diff --git a/...mirror2/mode/coffeescript/coffeescript.js → ...emirror/mode/coffeescript/coffeescript.js b/...mirror2/mode/coffeescript/coffeescript.js → ...emirror/mode/coffeescript/coffeescript.js
diff --git a/.../codemirror2/mode/coffeescript/index.html → ...y/codemirror/mode/coffeescript/index.html b/.../codemirror2/mode/coffeescript/index.html → ...y/codemirror/mode/coffeescript/index.html
diff --git a/third-party/codemirror2/mode/css/css.js → web/third-party/codemirror/mode/css/css.js b/third-party/codemirror2/mode/css/css.js → web/third-party/codemirror/mode/css/css.js
diff --git a/third-party/codemirror2/mode/css/index.html → ...hird-party/codemirror/mode/css/index.html b/third-party/codemirror2/mode/css/index.html → ...hird-party/codemirror/mode/css/index.html
diff --git a/third-party/codemirror2/mode/diff/diff.js → web/third-party/codemirror/mode/diff/diff.js b/third-party/codemirror2/mode/diff/diff.js → web/third-party/codemirror/mode/diff/diff.js
diff --git a/third-party/codemirror2/mode/diff/index.html → ...ird-party/codemirror/mode/diff/index.html b/third-party/codemirror2/mode/diff/index.html → ...ird-party/codemirror/mode/diff/index.html
diff --git a/third-party/codemirror2/mode/ecl/ecl.js → web/third-party/codemirror/mode/ecl/ecl.js b/third-party/codemirror2/mode/ecl/ecl.js → web/third-party/codemirror/mode/ecl/ecl.js
diff --git a/third-party/codemirror2/mode/ecl/index.html → ...hird-party/codemirror/mode/ecl/index.html b/third-party/codemirror2/mode/ecl/index.html → ...hird-party/codemirror/mode/ecl/index.html
diff --git a/...d-party/codemirror2/mode/erlang/erlang.js → ...rd-party/codemirror/mode/erlang/erlang.js b/...d-party/codemirror2/mode/erlang/erlang.js → ...rd-party/codemirror/mode/erlang/erlang.js
diff --git a/...-party/codemirror2/mode/erlang/index.html → ...d-party/codemirror/mode/erlang/index.html b/...-party/codemirror2/mode/erlang/index.html → ...d-party/codemirror/mode/erlang/index.html
diff --git a/third-party/codemirror2/mode/gfm/gfm.js → web/third-party/codemirror/mode/gfm/gfm.js b/third-party/codemirror2/mode/gfm/gfm.js → web/third-party/codemirror/mode/gfm/gfm.js
diff --git a/third-party/codemirror2/mode/gfm/index.html → ...hird-party/codemirror/mode/gfm/index.html b/third-party/codemirror2/mode/gfm/index.html → ...hird-party/codemirror/mode/gfm/index.html
diff --git a/third-party/codemirror2/mode/go/go.js → web/third-party/codemirror/mode/go/go.js b/third-party/codemirror2/mode/go/go.js → web/third-party/codemirror/mode/go/go.js
diff --git a/third-party/codemirror2/mode/go/index.html → ...third-party/codemirror/mode/go/index.html b/third-party/codemirror2/mode/go/index.html → ...third-party/codemirror/mode/go/index.html
diff --git a/...d-party/codemirror2/mode/groovy/groovy.js → ...rd-party/codemirror/mode/groovy/groovy.js b/...d-party/codemirror2/mode/groovy/groovy.js → ...rd-party/codemirror/mode/groovy/groovy.js
diff --git a/...-party/codemirror2/mode/groovy/index.html → ...d-party/codemirror/mode/groovy/index.html b/...-party/codemirror2/mode/groovy/index.html → ...d-party/codemirror/mode/groovy/index.html
diff --git a/...party/codemirror2/mode/haskell/haskell.js → ...-party/codemirror/mode/haskell/haskell.js b/...party/codemirror2/mode/haskell/haskell.js → ...-party/codemirror/mode/haskell/haskell.js
diff --git a/...party/codemirror2/mode/haskell/index.html → ...-party/codemirror/mode/haskell/index.html b/...party/codemirror2/mode/haskell/index.html → ...-party/codemirror/mode/haskell/index.html
diff --git a/...mirror2/mode/htmlembedded/htmlembedded.js → ...emirror/mode/htmlembedded/htmlembedded.js b/...mirror2/mode/htmlembedded/htmlembedded.js → ...emirror/mode/htmlembedded/htmlembedded.js
diff --git a/.../codemirror2/mode/htmlembedded/index.html → ...y/codemirror/mode/htmlembedded/index.html b/.../codemirror2/mode/htmlembedded/index.html → ...y/codemirror/mode/htmlembedded/index.html
diff --git a/...y/codemirror2/mode/htmlmixed/htmlmixed.js → ...ty/codemirror/mode/htmlmixed/htmlmixed.js b/...y/codemirror2/mode/htmlmixed/htmlmixed.js → ...ty/codemirror/mode/htmlmixed/htmlmixed.js
diff --git a/...rty/codemirror2/mode/htmlmixed/index.html → ...arty/codemirror/mode/htmlmixed/index.html b/...rty/codemirror2/mode/htmlmixed/index.html → ...arty/codemirror/mode/htmlmixed/index.html
diff --git a/...ty/codemirror2/mode/javascript/index.html → ...rty/codemirror/mode/javascript/index.html b/...ty/codemirror2/mode/javascript/index.html → ...rty/codemirror/mode/javascript/index.html
diff --git a/...codemirror2/mode/javascript/javascript.js → .../codemirror/mode/javascript/javascript.js b/...codemirror2/mode/javascript/javascript.js → .../codemirror/mode/javascript/javascript.js
diff --git a/...-party/codemirror2/mode/jinja2/index.html → ...d-party/codemirror/mode/jinja2/index.html b/...-party/codemirror2/mode/jinja2/index.html → ...d-party/codemirror/mode/jinja2/index.html
diff --git a/...d-party/codemirror2/mode/jinja2/jinja2.js → ...rd-party/codemirror/mode/jinja2/jinja2.js b/...d-party/codemirror2/mode/jinja2/jinja2.js → ...rd-party/codemirror/mode/jinja2/jinja2.js
diff --git a/third-party/codemirror2/mode/less/index.html → ...ird-party/codemirror/mode/less/index.html b/third-party/codemirror2/mode/less/index.html → ...ird-party/codemirror/mode/less/index.html
diff --git a/third-party/codemirror2/mode/less/less.js → web/third-party/codemirror/mode/less/less.js b/third-party/codemirror2/mode/less/less.js → web/third-party/codemirror/mode/less/less.js
diff --git a/third-party/codemirror2/mode/lua/index.html → ...hird-party/codemirror/mode/lua/index.html b/third-party/codemirror2/mode/lua/index.html → ...hird-party/codemirror/mode/lua/index.html
diff --git a/third-party/codemirror2/mode/lua/lua.js → web/third-party/codemirror/mode/lua/lua.js b/third-party/codemirror2/mode/lua/lua.js → web/third-party/codemirror/mode/lua/lua.js
diff --git a/...arty/codemirror2/mode/markdown/index.html → ...party/codemirror/mode/markdown/index.html b/...arty/codemirror2/mode/markdown/index.html → ...party/codemirror/mode/markdown/index.html
diff --git a/...rty/codemirror2/mode/markdown/markdown.js → ...arty/codemirror/mode/markdown/markdown.js b/...rty/codemirror2/mode/markdown/markdown.js → ...arty/codemirror/mode/markdown/markdown.js
diff --git a/...d-party/codemirror2/mode/mysql/index.html → ...rd-party/codemirror/mode/mysql/index.html b/...d-party/codemirror2/mode/mysql/index.html → ...rd-party/codemirror/mode/mysql/index.html
diff --git a/third-party/codemirror2/mode/mysql/mysql.js → ...hird-party/codemirror/mode/mysql/mysql.js b/third-party/codemirror2/mode/mysql/mysql.js → ...hird-party/codemirror/mode/mysql/mysql.js
diff --git a/...arty/codemirror2/mode/ntriples/index.html → ...party/codemirror/mode/ntriples/index.html b/...arty/codemirror2/mode/ntriples/index.html → ...party/codemirror/mode/ntriples/index.html
diff --git a/...rty/codemirror2/mode/ntriples/ntriples.js → ...arty/codemirror/mode/ntriples/ntriples.js b/...rty/codemirror2/mode/ntriples/ntriples.js → ...arty/codemirror/mode/ntriples/ntriples.js
diff --git a/third-party/codemirror2/mode/pascal/LICENSE → ...hird-party/codemirror/mode/pascal/LICENSE b/third-party/codemirror2/mode/pascal/LICENSE → ...hird-party/codemirror/mode/pascal/LICENSE
diff --git a/...-party/codemirror2/mode/pascal/index.html → ...d-party/codemirror/mode/pascal/index.html b/...-party/codemirror2/mode/pascal/index.html → ...d-party/codemirror/mode/pascal/index.html
diff --git a/...d-party/codemirror2/mode/pascal/pascal.js → ...rd-party/codemirror/mode/pascal/pascal.js b/...d-party/codemirror2/mode/pascal/pascal.js → ...rd-party/codemirror/mode/pascal/pascal.js
diff --git a/third-party/codemirror2/mode/perl/LICENSE → web/third-party/codemirror/mode/perl/LICENSE b/third-party/codemirror2/mode/perl/LICENSE → web/third-party/codemirror/mode/perl/LICENSE
diff --git a/third-party/codemirror2/mode/perl/index.html → ...ird-party/codemirror/mode/perl/index.html b/third-party/codemirror2/mode/perl/index.html → ...ird-party/codemirror/mode/perl/index.html
diff --git a/third-party/codemirror2/mode/perl/perl.js → web/third-party/codemirror/mode/perl/perl.js b/third-party/codemirror2/mode/perl/perl.js → web/third-party/codemirror/mode/perl/perl.js
diff --git a/third-party/codemirror2/mode/php/index.html → ...hird-party/codemirror/mode/php/index.html b/third-party/codemirror2/mode/php/index.html → ...hird-party/codemirror/mode/php/index.html
diff --git a/third-party/codemirror2/mode/php/php.js → web/third-party/codemirror/mode/php/php.js b/third-party/codemirror2/mode/php/php.js → web/third-party/codemirror/mode/php/php.js
diff --git a/third-party/codemirror2/mode/pig/index.html → ...hird-party/codemirror/mode/pig/index.html b/third-party/codemirror2/mode/pig/index.html → ...hird-party/codemirror/mode/pig/index.html
diff --git a/third-party/codemirror2/mode/pig/pig.js → web/third-party/codemirror/mode/pig/pig.js b/third-party/codemirror2/mode/pig/pig.js → web/third-party/codemirror/mode/pig/pig.js
diff --git a/...d-party/codemirror2/mode/plsql/index.html → ...rd-party/codemirror/mode/plsql/index.html b/...d-party/codemirror2/mode/plsql/index.html → ...rd-party/codemirror/mode/plsql/index.html
diff --git a/third-party/codemirror2/mode/plsql/plsql.js → ...hird-party/codemirror/mode/plsql/plsql.js b/third-party/codemirror2/mode/plsql/plsql.js → ...hird-party/codemirror/mode/plsql/plsql.js
diff --git a/...ty/codemirror2/mode/properties/index.html → ...rty/codemirror/mode/properties/index.html b/...ty/codemirror2/mode/properties/index.html → ...rty/codemirror/mode/properties/index.html
diff --git a/...codemirror2/mode/properties/properties.js → .../codemirror/mode/properties/properties.js b/...codemirror2/mode/properties/properties.js → .../codemirror/mode/properties/properties.js
diff --git a/...party/codemirror2/mode/python/LICENSE.txt → ...-party/codemirror/mode/python/LICENSE.txt b/...party/codemirror2/mode/python/LICENSE.txt → ...-party/codemirror/mode/python/LICENSE.txt
diff --git a/...-party/codemirror2/mode/python/index.html → ...d-party/codemirror/mode/python/index.html b/...-party/codemirror2/mode/python/index.html → ...d-party/codemirror/mode/python/index.html
diff --git a/...d-party/codemirror2/mode/python/python.js → ...rd-party/codemirror/mode/python/python.js b/...d-party/codemirror2/mode/python/python.js → ...rd-party/codemirror/mode/python/python.js
diff --git a/third-party/codemirror2/mode/r/LICENSE → web/third-party/codemirror/mode/r/LICENSE b/third-party/codemirror2/mode/r/LICENSE → web/third-party/codemirror/mode/r/LICENSE
diff --git a/third-party/codemirror2/mode/r/index.html → web/third-party/codemirror/mode/r/index.html b/third-party/codemirror2/mode/r/index.html → web/third-party/codemirror/mode/r/index.html
diff --git a/third-party/codemirror2/mode/r/r.js → web/third-party/codemirror/mode/r/r.js b/third-party/codemirror2/mode/r/r.js → web/third-party/codemirror/mode/r/r.js
diff --git a/...y/codemirror2/mode/rpm/changes/changes.js → ...ty/codemirror/mode/rpm/changes/changes.js b/...y/codemirror2/mode/rpm/changes/changes.js → ...ty/codemirror/mode/rpm/changes/changes.js
diff --git a/...y/codemirror2/mode/rpm/changes/index.html → ...ty/codemirror/mode/rpm/changes/index.html b/...y/codemirror2/mode/rpm/changes/index.html → ...ty/codemirror/mode/rpm/changes/index.html
diff --git a/...arty/codemirror2/mode/rpm/spec/index.html → ...party/codemirror/mode/rpm/spec/index.html b/...arty/codemirror2/mode/rpm/spec/index.html → ...party/codemirror/mode/rpm/spec/index.html
diff --git a/...-party/codemirror2/mode/rpm/spec/spec.css → ...d-party/codemirror/mode/rpm/spec/spec.css b/...-party/codemirror2/mode/rpm/spec/spec.css → ...d-party/codemirror/mode/rpm/spec/spec.css
diff --git a/...d-party/codemirror2/mode/rpm/spec/spec.js → ...rd-party/codemirror/mode/rpm/spec/spec.js b/...d-party/codemirror2/mode/rpm/spec/spec.js → ...rd-party/codemirror/mode/rpm/spec/spec.js
diff --git a/third-party/codemirror2/mode/rst/index.html → ...hird-party/codemirror/mode/rst/index.html b/third-party/codemirror2/mode/rst/index.html → ...hird-party/codemirror/mode/rst/index.html
diff --git a/third-party/codemirror2/mode/rst/rst.js → web/third-party/codemirror/mode/rst/rst.js b/third-party/codemirror2/mode/rst/rst.js → web/third-party/codemirror/mode/rst/rst.js
diff --git a/third-party/codemirror2/mode/ruby/LICENSE → web/third-party/codemirror/mode/ruby/LICENSE b/third-party/codemirror2/mode/ruby/LICENSE → web/third-party/codemirror/mode/ruby/LICENSE
diff --git a/third-party/codemirror2/mode/ruby/index.html → ...ird-party/codemirror/mode/ruby/index.html b/third-party/codemirror2/mode/ruby/index.html → ...ird-party/codemirror/mode/ruby/index.html
diff --git a/third-party/codemirror2/mode/ruby/ruby.js → web/third-party/codemirror/mode/ruby/ruby.js b/third-party/codemirror2/mode/ruby/ruby.js → web/third-party/codemirror/mode/ruby/ruby.js
diff --git a/third-party/codemirror2/mode/rust/index.html → ...ird-party/codemirror/mode/rust/index.html b/third-party/codemirror2/mode/rust/index.html → ...ird-party/codemirror/mode/rust/index.html
diff --git a/third-party/codemirror2/mode/rust/rust.js → web/third-party/codemirror/mode/rust/rust.js b/third-party/codemirror2/mode/rust/rust.js → web/third-party/codemirror/mode/rust/rust.js
diff --git a/...-party/codemirror2/mode/scheme/index.html → ...d-party/codemirror/mode/scheme/index.html b/...-party/codemirror2/mode/scheme/index.html → ...d-party/codemirror/mode/scheme/index.html
diff --git a/...d-party/codemirror2/mode/scheme/scheme.js → ...rd-party/codemirror/mode/scheme/scheme.js b/...d-party/codemirror2/mode/scheme/scheme.js → ...rd-party/codemirror/mode/scheme/scheme.js
diff --git a/...d-party/codemirror2/mode/shell/index.html → ...rd-party/codemirror/mode/shell/index.html b/...d-party/codemirror2/mode/shell/index.html → ...rd-party/codemirror/mode/shell/index.html
diff --git a/third-party/codemirror2/mode/shell/shell.js → ...hird-party/codemirror/mode/shell/shell.js b/third-party/codemirror2/mode/shell/shell.js → ...hird-party/codemirror/mode/shell/shell.js
diff --git a/...rty/codemirror2/mode/smalltalk/index.html → ...arty/codemirror/mode/smalltalk/index.html b/...rty/codemirror2/mode/smalltalk/index.html → ...arty/codemirror/mode/smalltalk/index.html
diff --git a/...y/codemirror2/mode/smalltalk/smalltalk.js → ...ty/codemirror/mode/smalltalk/smalltalk.js b/...y/codemirror2/mode/smalltalk/smalltalk.js → ...ty/codemirror/mode/smalltalk/smalltalk.js
diff --git a/...-party/codemirror2/mode/smarty/index.html → ...d-party/codemirror/mode/smarty/index.html b/...-party/codemirror2/mode/smarty/index.html → ...d-party/codemirror/mode/smarty/index.html
diff --git a/...d-party/codemirror2/mode/smarty/smarty.js → ...rd-party/codemirror/mode/smarty/smarty.js b/...d-party/codemirror2/mode/smarty/smarty.js → ...rd-party/codemirror/mode/smarty/smarty.js
diff --git a/...-party/codemirror2/mode/sparql/index.html → ...d-party/codemirror/mode/sparql/index.html b/...-party/codemirror2/mode/sparql/index.html → ...d-party/codemirror/mode/sparql/index.html
diff --git a/...d-party/codemirror2/mode/sparql/sparql.js → ...rd-party/codemirror/mode/sparql/sparql.js b/...d-party/codemirror2/mode/sparql/sparql.js → ...rd-party/codemirror/mode/sparql/sparql.js
diff --git a/third-party/codemirror2/mode/stex/index.html → ...ird-party/codemirror/mode/stex/index.html b/third-party/codemirror2/mode/stex/index.html → ...ird-party/codemirror/mode/stex/index.html
diff --git a/third-party/codemirror2/mode/stex/stex.js → web/third-party/codemirror/mode/stex/stex.js b/third-party/codemirror2/mode/stex/stex.js → web/third-party/codemirror/mode/stex/stex.js
diff --git a/third-party/codemirror2/mode/stex/test.html → ...hird-party/codemirror/mode/stex/test.html b/third-party/codemirror2/mode/stex/test.html → ...hird-party/codemirror/mode/stex/test.html
diff --git a/...ty/codemirror2/mode/tiddlywiki/index.html → ...rty/codemirror/mode/tiddlywiki/index.html b/...ty/codemirror2/mode/tiddlywiki/index.html → ...rty/codemirror/mode/tiddlywiki/index.html
diff --git a/...odemirror2/mode/tiddlywiki/tiddlywiki.css → ...codemirror/mode/tiddlywiki/tiddlywiki.css b/...odemirror2/mode/tiddlywiki/tiddlywiki.css → ...codemirror/mode/tiddlywiki/tiddlywiki.css
diff --git a/...codemirror2/mode/tiddlywiki/tiddlywiki.js → .../codemirror/mode/tiddlywiki/tiddlywiki.js b/...codemirror2/mode/tiddlywiki/tiddlywiki.js → .../codemirror/mode/tiddlywiki/tiddlywiki.js
diff --git a/third-party/codemirror2/mode/tiki/index.html → ...ird-party/codemirror/mode/tiki/index.html b/third-party/codemirror2/mode/tiki/index.html → ...ird-party/codemirror/mode/tiki/index.html
diff --git a/third-party/codemirror2/mode/tiki/tiki.css → ...third-party/codemirror/mode/tiki/tiki.css b/third-party/codemirror2/mode/tiki/tiki.css → ...third-party/codemirror/mode/tiki/tiki.css
diff --git a/third-party/codemirror2/mode/tiki/tiki.js → web/third-party/codemirror/mode/tiki/tiki.js b/third-party/codemirror2/mode/tiki/tiki.js → web/third-party/codemirror/mode/tiki/tiki.js
diff --git a/...arty/codemirror2/mode/vbscript/index.html → ...party/codemirror/mode/vbscript/index.html b/...arty/codemirror2/mode/vbscript/index.html → ...party/codemirror/mode/vbscript/index.html
diff --git a/...rty/codemirror2/mode/vbscript/vbscript.js → ...arty/codemirror/mode/vbscript/vbscript.js b/...rty/codemirror2/mode/vbscript/vbscript.js → ...arty/codemirror/mode/vbscript/vbscript.js
diff --git a/...arty/codemirror2/mode/velocity/index.html → ...party/codemirror/mode/velocity/index.html b/...arty/codemirror2/mode/velocity/index.html → ...party/codemirror/mode/velocity/index.html
diff --git a/...rty/codemirror2/mode/velocity/velocity.js → ...arty/codemirror/mode/velocity/velocity.js b/...rty/codemirror2/mode/velocity/velocity.js → ...arty/codemirror/mode/velocity/velocity.js
diff --git a/...party/codemirror2/mode/verilog/index.html → ...-party/codemirror/mode/verilog/index.html b/...party/codemirror2/mode/verilog/index.html → ...-party/codemirror/mode/verilog/index.html
diff --git a/...party/codemirror2/mode/verilog/verilog.js → ...-party/codemirror/mode/verilog/verilog.js b/...party/codemirror2/mode/verilog/verilog.js → ...-party/codemirror/mode/verilog/verilog.js
diff --git a/third-party/codemirror2/mode/xml/index.html → ...hird-party/codemirror/mode/xml/index.html b/third-party/codemirror2/mode/xml/index.html → ...hird-party/codemirror/mode/xml/index.html
diff --git a/third-party/codemirror2/mode/xml/xml.js → web/third-party/codemirror/mode/xml/xml.js b/third-party/codemirror2/mode/xml/xml.js → web/third-party/codemirror/mode/xml/xml.js
diff --git a/third-party/codemirror2/mode/xquery/LICENSE → ...hird-party/codemirror/mode/xquery/LICENSE b/third-party/codemirror2/mode/xquery/LICENSE → ...hird-party/codemirror/mode/xquery/LICENSE
diff --git a/...-party/codemirror2/mode/xquery/index.html → ...d-party/codemirror/mode/xquery/index.html b/...-party/codemirror2/mode/xquery/index.html → ...d-party/codemirror/mode/xquery/index.html
diff --git a/...y/codemirror2/mode/xquery/test/index.html → ...ty/codemirror/mode/xquery/test/index.html b/...y/codemirror2/mode/xquery/test/index.html → ...ty/codemirror/mode/xquery/test/index.html
diff --git a/.../codemirror2/mode/xquery/test/testBase.js → ...y/codemirror/mode/xquery/test/testBase.js b/.../codemirror2/mode/xquery/test/testBase.js → ...y/codemirror/mode/xquery/test/testBase.js
diff --git a/...e/xquery/test/testEmptySequenceKeyword.js → ...e/xquery/test/testEmptySequenceKeyword.js b/...e/xquery/test/testEmptySequenceKeyword.js → ...e/xquery/test/testEmptySequenceKeyword.js
diff --git a/...mirror2/mode/xquery/test/testMultiAttr.js → ...emirror/mode/xquery/test/testMultiAttr.js b/...mirror2/mode/xquery/test/testMultiAttr.js → ...emirror/mode/xquery/test/testMultiAttr.js
diff --git a/...irror2/mode/xquery/test/testNamespaces.js → ...mirror/mode/xquery/test/testNamespaces.js b/...irror2/mode/xquery/test/testNamespaces.js → ...mirror/mode/xquery/test/testNamespaces.js
diff --git a/...xquery/test/testProcessingInstructions.js → ...xquery/test/testProcessingInstructions.js b/...xquery/test/testProcessingInstructions.js → ...xquery/test/testProcessingInstructions.js
diff --git a/...odemirror2/mode/xquery/test/testQuotes.js → ...codemirror/mode/xquery/test/testQuotes.js b/...odemirror2/mode/xquery/test/testQuotes.js → ...codemirror/mode/xquery/test/testQuotes.js
diff --git a/...d-party/codemirror2/mode/xquery/xquery.js → ...rd-party/codemirror/mode/xquery/xquery.js b/...d-party/codemirror2/mode/xquery/xquery.js → ...rd-party/codemirror/mode/xquery/xquery.js
diff --git a/third-party/codemirror2/mode/yaml/index.html → ...ird-party/codemirror/mode/yaml/index.html b/third-party/codemirror2/mode/yaml/index.html → ...ird-party/codemirror/mode/yaml/index.html
diff --git a/third-party/codemirror2/mode/yaml/yaml.js → web/third-party/codemirror/mode/yaml/yaml.js b/third-party/codemirror2/mode/yaml/yaml.js → web/third-party/codemirror/mode/yaml/yaml.js
diff --git a/third-party/codemirror2/test/index.html → web/third-party/codemirror/test/index.html b/third-party/codemirror2/test/index.html → web/third-party/codemirror/test/index.html
diff --git a/third-party/codemirror2/test/mode_test.css → ...third-party/codemirror/test/mode_test.css b/third-party/codemirror2/test/mode_test.css → ...third-party/codemirror/test/mode_test.css
diff --git a/third-party/codemirror2/test/mode_test.js → web/third-party/codemirror/test/mode_test.js b/third-party/codemirror2/test/mode_test.js → web/third-party/codemirror/test/mode_test.js
diff --git a/third-party/codemirror2/test/test.js → web/third-party/codemirror/test/test.js b/third-party/codemirror2/test/test.js → web/third-party/codemirror/test/test.js
diff --git a/third-party/codemirror2/theme/ambiance.css → ...third-party/codemirror/theme/ambiance.css b/third-party/codemirror2/theme/ambiance.css → ...third-party/codemirror/theme/ambiance.css
diff --git a/third-party/codemirror2/theme/blackboard.css → ...ird-party/codemirror/theme/blackboard.css b/third-party/codemirror2/theme/blackboard.css → ...ird-party/codemirror/theme/blackboard.css
diff --git a/third-party/codemirror2/theme/cobalt.css → web/third-party/codemirror/theme/cobalt.css b/third-party/codemirror2/theme/cobalt.css → web/third-party/codemirror/theme/cobalt.css
diff --git a/third-party/codemirror2/theme/eclipse.css → web/third-party/codemirror/theme/eclipse.css b/third-party/codemirror2/theme/eclipse.css → web/third-party/codemirror/theme/eclipse.css
diff --git a/third-party/codemirror2/theme/elegant.css → web/third-party/codemirror/theme/elegant.css b/third-party/codemirror2/theme/elegant.css → web/third-party/codemirror/theme/elegant.css
diff --git a/...d-party/codemirror2/theme/erlang-dark.css → ...rd-party/codemirror/theme/erlang-dark.css b/...d-party/codemirror2/theme/erlang-dark.css → ...rd-party/codemirror/theme/erlang-dark.css
diff --git a/...d-party/codemirror2/theme/lesser-dark.css → ...rd-party/codemirror/theme/lesser-dark.css b/...d-party/codemirror2/theme/lesser-dark.css → ...rd-party/codemirror/theme/lesser-dark.css
diff --git a/third-party/codemirror2/theme/monokai.css → web/third-party/codemirror/theme/monokai.css b/third-party/codemirror2/theme/monokai.css → web/third-party/codemirror/theme/monokai.css
diff --git a/third-party/codemirror2/theme/neat.css → web/third-party/codemirror/theme/neat.css b/third-party/codemirror2/theme/neat.css → web/third-party/codemirror/theme/neat.css
diff --git a/third-party/codemirror2/theme/night.css → web/third-party/codemirror/theme/night.css b/third-party/codemirror2/theme/night.css → web/third-party/codemirror/theme/night.css
diff --git a/third-party/codemirror2/theme/rubyblue.css → ...third-party/codemirror/theme/rubyblue.css b/third-party/codemirror2/theme/rubyblue.css → ...third-party/codemirror/theme/rubyblue.css
diff --git a/third-party/codemirror2/theme/xq-dark.css → web/third-party/codemirror/theme/xq-dark.css b/third-party/codemirror2/theme/xq-dark.css → web/third-party/codemirror/theme/xq-dark.css
diff --git a/third-party/jquery/jquery.cookie.js → web/third-party/jquery/jquery.cookie.js b/third-party/jquery/jquery.cookie.js → web/third-party/jquery/jquery.cookie.js
diff --git a/third-party/jquery/jquery.js → web/third-party/jquery/jquery.js b/third-party/jquery/jquery.js → web/third-party/jquery/jquery.js