--- a/.eslintignore
+++ b/.eslintignore
@@ -122,20 +122,20 @@ devtools/client/shared/webgl-utils.js
 devtools/client/shared/widgets/*.jsm
 devtools/client/storage/test/*.html
 !devtools/client/storage/test/storage-cookies.html
 !devtools/client/storage/test/storage-overflow.html
 !devtools/client/storage/test/storage-search.html
 !devtools/client/storage/test/storage-unsecured-iframe.html
 !devtools/client/storage/test/storage-unsecured-iframe-usercontextid.html
 devtools/client/webaudioeditor/**
-devtools/client/webconsole/net/**
+devtools/client/webconsole/old/net/**
 !devtools/client/webconsole/new-console-output/test/mochitest/**
-devtools/client/webconsole/test/**
-devtools/client/webconsole/webconsole.js
+devtools/client/webconsole/old/test/**
+devtools/client/webconsole/old/webconsole.js
 devtools/client/webide/**
 !devtools/client/webide/components/webideCli.js
 devtools/server/tests/browser/storage-*.html
 !devtools/server/tests/browser/storage-unsecured-iframe.html
 devtools/server/tests/browser/stylesheets-nested-iframes.html
 devtools/server/tests/unit/xpcshell_debugging_script.js
 devtools/client/shared/webpack/shims/test/test_clipboard.html
 devtools/shared/qrcode/tests/mochitest/test_decode.html

--- a/devtools/.eslintrc.js
+++ b/devtools/.eslintrc.js
@@ -369,17 +369,17 @@ module.exports = {
     // Require spaces before/after unary operators (words on by default,
     // nonwords off by default).
     "space-unary-ops": ["error", { "words": true, "nonwords": false }],
     // Require "use strict" to be defined globally in the script.
     "strict": ["error", "global"],
     // Warn about invalid JSDoc comments.
     // Disabled for now because of https://github.com/eslint/eslint/issues/2270
     // The rule fails on some jsdoc comments like in:
-    // devtools/client/webconsole/console-output.js
+    // devtools/client/webconsole/old/console-output.js
     "valid-jsdoc": "off",
     // Allow vars to be declared anywhere in the scope.
     "vars-on-top": "off",
     // Don't require immediate function invocation to be wrapped in parentheses.
     "wrap-iife": "off",
     // Don't require regex literals to be wrapped in parentheses (which
     // supposedly prevent them from being mistaken for division operators).
     "wrap-regex": "off",

--- a/devtools/client/definitions.js
+++ b/devtools/client/definitions.js
@@ -94,17 +94,17 @@ Tools.inspector = {
   build: function(iframeWindow, toolbox) {
     return new InspectorPanel(iframeWindow, toolbox);
   }
 };
 Tools.webConsole = {
   id: "webconsole",
   accesskey: l10n("webConsoleCmd.accesskey"),
   ordinal: 2,
-  oldWebConsoleURL: "chrome://devtools/content/webconsole/webconsole.xul",
+  oldWebConsoleURL: "chrome://devtools/content/webconsole/old/webconsole.xul",
   newWebConsoleURL: "chrome://devtools/content/webconsole/webconsole.html",
   get browserConsoleURL() {
     if (Services.prefs.getBoolPref("devtools.browserconsole.new-frontend-enabled")) {
       return "chrome://devtools/content/webconsole/browserconsole.xul";
     }
     return Tools.webConsole.oldWebConsoleURL;
   },
   icon: "chrome://devtools/skin/images/tool-webconsole.svg",

--- a/devtools/client/jar.mn
+++ b/devtools/client/jar.mn
@@ -5,17 +5,17 @@
 devtools.jar:
 %   content devtools %content/
     content/shared/vendor/d3.js (shared/vendor/d3.js)
     content/shared/vendor/dagre-d3.js (shared/vendor/dagre-d3.js)
     content/shared/widgets/widgets.css (shared/widgets/widgets.css)
     content/shared/widgets/VariablesView.xul (shared/widgets/VariablesView.xul)
     content/webconsole/webconsole.html (webconsole/webconsole.html)
     content/webconsole/browserconsole.xul (webconsole/browserconsole.xul)
-*   content/webconsole/webconsole.xul (webconsole/webconsole.xul)
+*   content/webconsole/old/webconsole.xul (webconsole/old/webconsole.xul)
 *   content/scratchpad/scratchpad.xul (scratchpad/scratchpad.xul)
     content/scratchpad/scratchpad.js (scratchpad/scratchpad.js)
     content/shared/splitview.css (shared/splitview.css)
     content/shared/theme-switching.js (shared/theme-switching.js)
 *   content/styleeditor/styleeditor.xul (styleeditor/styleeditor.xul)
 *   content/storage/storage.xul (storage/storage.xul)
     content/inspector/inspector.js (inspector/inspector.js)
     content/inspector/markup/markup.xhtml (inspector/markup/markup.xhtml)

--- a/devtools/client/webconsole/hudservice.js
+++ b/devtools/client/webconsole/hudservice.js
@@ -6,17 +6,17 @@
 
 var Services = require("Services");
 loader.lazyRequireGetter(this, "Utils", "devtools/client/webconsole/utils", true);
 loader.lazyRequireGetter(this, "extend", "devtools/shared/extend", true);
 loader.lazyRequireGetter(this, "TargetFactory", "devtools/client/framework/target", true);
 loader.lazyRequireGetter(this, "gDevToolsBrowser", "devtools/client/framework/devtools-browser", true);
 loader.lazyRequireGetter(this, "Tools", "devtools/client/definitions", true);
 loader.lazyRequireGetter(this, "Telemetry", "devtools/client/shared/telemetry");
-loader.lazyRequireGetter(this, "WebConsoleFrame", "devtools/client/webconsole/webconsole", true);
+loader.lazyRequireGetter(this, "WebConsoleFrame", "devtools/client/webconsole/old/webconsole", true);
 loader.lazyRequireGetter(this, "NewWebConsoleFrame", "devtools/client/webconsole/new-webconsole", true);
 loader.lazyRequireGetter(this, "gDevTools", "devtools/client/framework/devtools", true);
 loader.lazyRequireGetter(this, "DebuggerServer", "devtools/server/main", true);
 loader.lazyRequireGetter(this, "DebuggerClient", "devtools/shared/client/debugger-client", true);
 loader.lazyRequireGetter(this, "showDoorhanger", "devtools/client/shared/doorhanger", true);
 loader.lazyRequireGetter(this, "viewSource", "devtools/client/shared/view-source");
 loader.lazyRequireGetter(this, "l10n", "devtools/client/webconsole/webconsole-l10n");
 const BC_WINDOW_FEATURES = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no";

--- a/devtools/client/webconsole/jsterm.js
+++ b/devtools/client/webconsole/jsterm.js
@@ -14,17 +14,17 @@ const Services = require("Services");
 const {KeyCodes} = require("devtools/client/shared/keycodes");
 
 loader.lazyServiceGetter(this, "clipboardHelper",
                          "@mozilla.org/widget/clipboardhelper;1",
                          "nsIClipboardHelper");
 loader.lazyRequireGetter(this, "EventEmitter", "devtools/shared/event-emitter");
 loader.lazyRequireGetter(this, "AutocompletePopup", "devtools/client/shared/autocomplete-popup");
 loader.lazyRequireGetter(this, "ToolSidebar", "devtools/client/framework/sidebar", true);
-loader.lazyRequireGetter(this, "Messages", "devtools/client/webconsole/console-output", true);
+loader.lazyRequireGetter(this, "Messages", "devtools/client/webconsole/old/console-output", true);
 loader.lazyRequireGetter(this, "asyncStorage", "devtools/shared/async-storage");
 loader.lazyRequireGetter(this, "EnvironmentClient", "devtools/shared/client/environment-client");
 loader.lazyRequireGetter(this, "ObjectClient", "devtools/shared/client/object-client");
 loader.lazyImporter(this, "VariablesView", "resource://devtools/client/shared/widgets/VariablesView.jsm");
 loader.lazyImporter(this, "VariablesViewController", "resource://devtools/client/shared/widgets/VariablesViewController.jsm");
 loader.lazyRequireGetter(this, "gDevTools", "devtools/client/framework/devtools", true);
 loader.lazyRequireGetter(this, "NotificationBox", "devtools/client/shared/components/NotificationBox", true);
 loader.lazyRequireGetter(this, "PriorityLevels", "devtools/client/shared/components/NotificationBox", true);

--- a/devtools/client/webconsole/moz.build
+++ b/devtools/client/webconsole/moz.build
@@ -1,26 +1,22 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
-
 DIRS += [
-    'net',
     'new-console-output',
+    'old',
 ]
 DevToolsModules(
     'console-commands.js',
-    'console-output.js',
     'hudservice.js',
     'jsterm.js',
     'new-webconsole.js',
     'panel.js',
     'utils.js',
     'webconsole-connection-proxy.js',
     'webconsole-l10n.js',
-    'webconsole.js',
 )
 with Files('**'):
     BUG_COMPONENT = ('Firefox', 'Developer Tools: Console')

rename from devtools/client/webconsole/console-output.js
rename to devtools/client/webconsole/old/console-output.js

new file mode 100644
--- /dev/null
+++ b/devtools/client/webconsole/old/moz.build
@@ -0,0 +1,17 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
+
+DIRS += [
+    'net',
+]
+DevToolsModules(
+    'console-output.js',
+    'webconsole.js',
+)
+with Files('**'):
+    BUG_COMPONENT = ('Firefox', 'Developer Tools: Console')

rename from devtools/client/webconsole/net/.eslintrc.js
rename to devtools/client/webconsole/old/net/.eslintrc.js

rename from devtools/client/webconsole/net/components/cookies-tab.js
rename to devtools/client/webconsole/old/net/components/cookies-tab.js

rename from devtools/client/webconsole/net/components/headers-tab.js
rename to devtools/client/webconsole/old/net/components/headers-tab.js

rename from devtools/client/webconsole/net/components/moz.build
rename to devtools/client/webconsole/old/net/components/moz.build

rename from devtools/client/webconsole/net/components/net-info-body.css
rename to devtools/client/webconsole/old/net/components/net-info-body.css

rename from devtools/client/webconsole/net/components/net-info-body.js
rename to devtools/client/webconsole/old/net/components/net-info-body.js

rename from devtools/client/webconsole/net/components/net-info-group-list.js
rename to devtools/client/webconsole/old/net/components/net-info-group-list.js

rename from devtools/client/webconsole/net/components/net-info-group.css
rename to devtools/client/webconsole/old/net/components/net-info-group.css

rename from devtools/client/webconsole/net/components/net-info-group.js
rename to devtools/client/webconsole/old/net/components/net-info-group.js

rename from devtools/client/webconsole/net/components/net-info-params.css
rename to devtools/client/webconsole/old/net/components/net-info-params.css

rename from devtools/client/webconsole/net/components/net-info-params.js
rename to devtools/client/webconsole/old/net/components/net-info-params.js

rename from devtools/client/webconsole/net/components/params-tab.js
rename to devtools/client/webconsole/old/net/components/params-tab.js

rename from devtools/client/webconsole/net/components/post-tab.js
rename to devtools/client/webconsole/old/net/components/post-tab.js

rename from devtools/client/webconsole/net/components/response-tab.css
rename to devtools/client/webconsole/old/net/components/response-tab.css

rename from devtools/client/webconsole/net/components/response-tab.js
rename to devtools/client/webconsole/old/net/components/response-tab.js

rename from devtools/client/webconsole/net/components/size-limit.css
rename to devtools/client/webconsole/old/net/components/size-limit.css

rename from devtools/client/webconsole/net/components/size-limit.js
rename to devtools/client/webconsole/old/net/components/size-limit.js

rename from devtools/client/webconsole/net/components/spinner.js
rename to devtools/client/webconsole/old/net/components/spinner.js

rename from devtools/client/webconsole/net/components/stacktrace-tab.js
rename to devtools/client/webconsole/old/net/components/stacktrace-tab.js

rename from devtools/client/webconsole/net/data-provider.js
rename to devtools/client/webconsole/old/net/data-provider.js

rename from devtools/client/webconsole/net/main.js
rename to devtools/client/webconsole/old/net/main.js
--- a/devtools/client/webconsole/net/main.js
+++ b/devtools/client/webconsole/old/net/main.js
@@ -3,39 +3,39 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
 /* global BrowserLoader */
 
 // Initialize module loader and load all modules of the new inline
 // preview feature. The entire code-base doesn't need any extra
 // privileges and runs entirely in content scope.
-const rootUrl = "resource://devtools/client/webconsole/net/";
+const rootUrl = "resource://devtools/client/webconsole/old/net/";
 const require = BrowserLoader({
   baseURI: rootUrl,
   window}).require;
 
 const NetRequest = require("./net-request");
 const { loadSheet } = require("devtools/shared/layout/utils");
 
 // Localization
 const {LocalizationHelper} = require("devtools/shared/l10n");
 const L10N = new LocalizationHelper("devtools/client/locales/netmonitor.properties");
 
 // Stylesheets
 var styleSheets = [
   "resource://devtools/client/jsonview/css/toolbar.css",
   "resource://devtools/client/shared/components/tree/TreeView.css",
   "resource://devtools/client/shared/components/reps.css",
-  "resource://devtools/client/webconsole/net/net-request.css",
-  "resource://devtools/client/webconsole/net/components/size-limit.css",
-  "resource://devtools/client/webconsole/net/components/net-info-body.css",
-  "resource://devtools/client/webconsole/net/components/net-info-group.css",
-  "resource://devtools/client/webconsole/net/components/net-info-params.css",
-  "resource://devtools/client/webconsole/net/components/response-tab.css"
+  "resource://devtools/client/webconsole/old/net/net-request.css",
+  "resource://devtools/client/webconsole/old/net/components/size-limit.css",
+  "resource://devtools/client/webconsole/old/net/components/net-info-body.css",
+  "resource://devtools/client/webconsole/old/net/components/net-info-group.css",
+  "resource://devtools/client/webconsole/old/net/components/net-info-params.css",
+  "resource://devtools/client/webconsole/old/net/components/response-tab.css"
 ];
 
 // Load theme stylesheets into the Console frame. This should be
 // done automatically by UI Components as soon as we have consensus
 // on the right CSS strategy FIXME.
 // It would also be nice to include them using @import.
 styleSheets.forEach(url => {
   loadSheet(window, url, "author");