diff --git a/.eslintignore b/.eslintignore
index 2a4ddeb509d1..74aea2254817 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -128,7 +128,7 @@ devtools/client/storage/test/*.html
 !devtools/client/storage/test/storage-unsecured-iframe-usercontextid.html
 devtools/client/webaudioeditor/**
 devtools/client/webconsole/old/net/**
-!devtools/client/webconsole/new-console-output/test/mochitest/**
+!devtools/client/webconsole/test/mochitest/**
 devtools/client/webconsole/old/test/**
 devtools/client/webconsole/old/webconsole.js
 devtools/client/webide/**
@@ -182,8 +182,8 @@ devtools/client/debugger/test/mochitest/code_*.js
 devtools/client/framework/test/code_*
 devtools/client/inspector/markup/test/events_bundle.js
 devtools/client/netmonitor/test/xhr_bundle.js
-devtools/client/webconsole/new-console-output/test/mochitest/code_bundle_nosource.js
-devtools/client/webconsole/new-console-output/test/mochitest/code_bundle_invalidmap.js
+devtools/client/webconsole/test/mochitest/code_bundle_nosource.js
+devtools/client/webconsole/test/mochitest/code_bundle_invalidmap.js
 devtools/server/tests/unit/babel_and_browserify_script_with_source_map.js
 devtools/server/tests/unit/setBreakpoint*
 devtools/server/tests/unit/sourcemapped.js
diff --git a/devtools/client/.eslintrc.js b/devtools/client/.eslintrc.js
index 626a25e0c407..53a082324de8 100644
--- a/devtools/client/.eslintrc.js
+++ b/devtools/client/.eslintrc.js
@@ -1,6 +1,7 @@
 "use strict";
 
 module.exports = {
+  "env": { "browser": true },
   "globals": {
     "define": true,
   },
diff --git a/devtools/client/shared/webpack/shims/jsterm-stub.js b/devtools/client/shared/webpack/shims/jsterm-stub.js
index 422f090a9bf3..f5ca9b504e9c 100644
--- a/devtools/client/shared/webpack/shims/jsterm-stub.js
+++ b/devtools/client/shared/webpack/shims/jsterm-stub.js
@@ -4,7 +4,7 @@
 
 "use strict";
 
-const { ConsoleCommand } = require("devtools/client/webconsole/new-console-output/types");
+const { ConsoleCommand } = require("devtools/client/webconsole/types");
 
 function JSTerm(webConsoleFrame) {
   this.hud = webConsoleFrame;
diff --git a/devtools/client/webconsole/README.md b/devtools/client/webconsole/README.md
index 7c99fdb9dfdf..cd9e80411500 100644
--- a/devtools/client/webconsole/README.md
+++ b/devtools/client/webconsole/README.md
@@ -8,8 +8,9 @@ to learn all the features and how to use the tool.
 
 ## Old / New frontend
 
-The current console used in the toolbox is called the new frontend, and the code lives in
-the `new-console-output/` folder. The old console code is mainly located in `webconsole.js`.
+The current console used in the toolbox is called the new frontend, and the code lives at
+the root of the `devtools/client/webconsole/` folder.
+The old console code is located in the `devtools/client/webconsole/old` folder.
 Both frontends use the same code for the console input, also called JsTerm (see `jsterm.js`).
 The old frontend is still used for the Browser Console, but is planned to be removed in the
 near future (see Bug 1381834).
@@ -83,14 +84,13 @@ unsure about the release process.
 ## Code Structure
 
 Top level files are used to launch the WebConsole inside of the DevTools toolbox or run in
-the browser tab (experimental). The WebConsole source is mainly located in the
-`new-console-output/` folder, the same code base is used to run in both environments.
+the browser tab (experimental). The same code base is used to run in both environments.
 
 ### Run inside of the DevTools toolbox
 
 Files used to run the WebConsole inside of the DevTools toolbox.
 
-* `new-console-output/main.js` called by devtools toolbox to launch the WebConsole panel.
+* `main.js` called by devtools toolbox to launch the WebConsole panel.
 * `webconsole.html` panel UI and launch scripts.
 
 ### Run in the browser tab (experimental)
@@ -111,9 +111,9 @@ into actual modules used by the WebConsole and other Devtools.
 ### UI
 
 The WebConsole UI is built using [React](http://docs.firefox-dev.tools/frontend/react.html)
-components (in `new-console-output/components/`).
+components (in `components/`).
 
-The React application is rendered from `new-console-output/new-console-output-wrapper.js`.
+The React application is rendered from `new-console-output-wrapper.js`.
 It contains 3 top components:
 * **ConsoleOutput** (in `ConsoleOutput.js`) is the component where messages are rendered.
 * **FilterBar** (in `FilterBar.js`) is the component for the filter bars (filter input and toggle buttons).
@@ -148,4 +148,4 @@ The redux state is a plain javascript object with the following properties:
 
 ### Tests
 
-[See new-console-output/test/README.md](new-console-output/test/README.md)
\ No newline at end of file
+[See test/README.md](test/README.md)
\ No newline at end of file
diff --git a/devtools/client/webconsole/new-console-output/actions/filters.js b/devtools/client/webconsole/actions/filters.js
similarity index 91%
rename from devtools/client/webconsole/new-console-output/actions/filters.js
rename to devtools/client/webconsole/actions/filters.js
index cd0e3adbdee5..d8e480224990 100644
--- a/devtools/client/webconsole/new-console-output/actions/filters.js
+++ b/devtools/client/webconsole/actions/filters.js
@@ -6,7 +6,7 @@
 
 "use strict";
 
-const { getAllFilters } = require("devtools/client/webconsole/new-console-output/selectors/filters");
+const { getAllFilters } = require("devtools/client/webconsole/selectors/filters");
 
 const {
   FILTER_TEXT_SET,
@@ -16,7 +16,7 @@ const {
   PREFS,
   FILTERS,
   DEFAULT_FILTERS,
-} = require("devtools/client/webconsole/new-console-output/constants");
+} = require("devtools/client/webconsole/constants");
 
 function filterTextSet(text) {
   return {
diff --git a/devtools/client/webconsole/new-console-output/actions/index.js b/devtools/client/webconsole/actions/index.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/actions/index.js
rename to devtools/client/webconsole/actions/index.js
diff --git a/devtools/client/webconsole/new-console-output/actions/messages.js b/devtools/client/webconsole/actions/messages.js
similarity index 94%
rename from devtools/client/webconsole/new-console-output/actions/messages.js
rename to devtools/client/webconsole/actions/messages.js
index a4b0c0d6242b..0bc782d41c02 100644
--- a/devtools/client/webconsole/new-console-output/actions/messages.js
+++ b/devtools/client/webconsole/actions/messages.js
@@ -8,8 +8,8 @@
 
 const {
   prepareMessage
-} = require("devtools/client/webconsole/new-console-output/utils/messages");
-const { IdGenerator } = require("devtools/client/webconsole/new-console-output/utils/id-generator");
+} = require("devtools/client/webconsole/utils/messages");
+const { IdGenerator } = require("devtools/client/webconsole/utils/id-generator");
 const { batchActions } = require("devtools/client/shared/redux/middleware/debounce");
 
 const {
diff --git a/devtools/client/webconsole/new-console-output/actions/moz.build b/devtools/client/webconsole/actions/moz.build
similarity index 100%
rename from devtools/client/webconsole/new-console-output/actions/moz.build
rename to devtools/client/webconsole/actions/moz.build
diff --git a/devtools/client/webconsole/new-console-output/actions/ui.js b/devtools/client/webconsole/actions/ui.js
similarity index 87%
rename from devtools/client/webconsole/new-console-output/actions/ui.js
rename to devtools/client/webconsole/actions/ui.js
index 1ecba81fb9b0..e04a09f9739f 100644
--- a/devtools/client/webconsole/new-console-output/actions/ui.js
+++ b/devtools/client/webconsole/actions/ui.js
@@ -6,8 +6,8 @@
 
 "use strict";
 
-const { getAllUi } = require("devtools/client/webconsole/new-console-output/selectors/ui");
-const { getMessage } = require("devtools/client/webconsole/new-console-output/selectors/messages");
+const { getAllUi } = require("devtools/client/webconsole/selectors/ui");
+const { getMessage } = require("devtools/client/webconsole/selectors/messages");
 
 const {
   FILTER_BAR_TOGGLE,
@@ -18,7 +18,7 @@ const {
   SIDEBAR_CLOSE,
   SHOW_OBJECT_IN_SIDEBAR,
   TIMESTAMPS_TOGGLE,
-} = require("devtools/client/webconsole/new-console-output/constants");
+} = require("devtools/client/webconsole/constants");
 
 function filterBarToggle(show) {
   return (dispatch, getState, {prefsService}) => {
diff --git a/devtools/client/webconsole/new-console-output/components/CollapseButton.js b/devtools/client/webconsole/components/CollapseButton.js
similarity index 89%
rename from devtools/client/webconsole/new-console-output/components/CollapseButton.js
rename to devtools/client/webconsole/components/CollapseButton.js
index 7e451a654943..2e96134b7269 100644
--- a/devtools/client/webconsole/new-console-output/components/CollapseButton.js
+++ b/devtools/client/webconsole/components/CollapseButton.js
@@ -8,7 +8,7 @@
 
 const dom = require("devtools/client/shared/vendor/react-dom-factories");
 
-const { l10n } = require("devtools/client/webconsole/new-console-output/utils/messages");
+const { l10n } = require("devtools/client/webconsole/utils/messages");
 const messageToggleDetails = l10n.getStr("messageToggleDetails");
 
 function CollapseButton(props) {
diff --git a/devtools/client/webconsole/new-console-output/components/ConsoleOutput.js b/devtools/client/webconsole/components/ConsoleOutput.js
similarity index 93%
rename from devtools/client/webconsole/new-console-output/components/ConsoleOutput.js
rename to devtools/client/webconsole/components/ConsoleOutput.js
index fc36881d6e6e..2a92cec3c315 100644
--- a/devtools/client/webconsole/new-console-output/components/ConsoleOutput.js
+++ b/devtools/client/webconsole/components/ConsoleOutput.js
@@ -7,7 +7,7 @@ const { Component, createFactory } = require("devtools/client/shared/vendor/reac
 const dom = require("devtools/client/shared/vendor/react-dom-factories");
 const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
 const { connect } = require("devtools/client/shared/redux/visibility-handler-connect");
-const {initialize} = require("devtools/client/webconsole/new-console-output/actions/ui");
+const {initialize} = require("devtools/client/webconsole/actions/ui");
 
 const {
   getAllMessagesById,
@@ -16,14 +16,14 @@ const {
   getAllNetworkMessagesUpdateById,
   getVisibleMessages,
   getAllRepeatById,
-} = require("devtools/client/webconsole/new-console-output/selectors/messages");
-const MessageContainer = createFactory(require("devtools/client/webconsole/new-console-output/components/MessageContainer").MessageContainer);
+} = require("devtools/client/webconsole/selectors/messages");
+const MessageContainer = createFactory(require("devtools/client/webconsole/components/MessageContainer").MessageContainer);
 const {
   MESSAGE_TYPE,
-} = require("devtools/client/webconsole/new-console-output/constants");
+} = require("devtools/client/webconsole/constants");
 const {
   getInitialMessageCountForViewport
-} = require("devtools/client/webconsole/new-console-output/utils/messages.js");
+} = require("devtools/client/webconsole/utils/messages.js");
 
 class ConsoleOutput extends Component {
   static get propTypes() {
diff --git a/devtools/client/webconsole/new-console-output/components/ConsoleTable.js b/devtools/client/webconsole/components/ConsoleTable.js
similarity index 96%
rename from devtools/client/webconsole/new-console-output/components/ConsoleTable.js
rename to devtools/client/webconsole/components/ConsoleTable.js
index bf4f64f1ec79..d85f4d51b543 100644
--- a/devtools/client/webconsole/new-console-output/components/ConsoleTable.js
+++ b/devtools/client/webconsole/components/ConsoleTable.js
@@ -7,10 +7,10 @@ const { Component, createFactory } = require("devtools/client/shared/vendor/reac
 const dom = require("devtools/client/shared/vendor/react-dom-factories");
 const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
 const ObjectClient = require("devtools/shared/client/object-client");
-const actions = require("devtools/client/webconsole/new-console-output/actions/messages");
-const { l10n } = require("devtools/client/webconsole/new-console-output/utils/messages");
+const actions = require("devtools/client/webconsole/actions/messages");
+const { l10n } = require("devtools/client/webconsole/utils/messages");
 const { MODE } = require("devtools/client/shared/components/reps/reps");
-const GripMessageBody = createFactory(require("devtools/client/webconsole/new-console-output/components/GripMessageBody"));
+const GripMessageBody = createFactory(require("devtools/client/webconsole/components/GripMessageBody"));
 
 const TABLE_ROW_MAX_ITEMS = 1000;
 const TABLE_COLUMN_MAX_ITEMS = 10;
diff --git a/devtools/client/webconsole/new-console-output/components/FilterBar.js b/devtools/client/webconsole/components/FilterBar.js
similarity index 93%
rename from devtools/client/webconsole/new-console-output/components/FilterBar.js
rename to devtools/client/webconsole/components/FilterBar.js
index 927aee877aa0..578db8a4369d 100644
--- a/devtools/client/webconsole/new-console-output/components/FilterBar.js
+++ b/devtools/client/webconsole/components/FilterBar.js
@@ -7,19 +7,19 @@ const { Component } = require("devtools/client/shared/vendor/react");
 const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
 const dom = require("devtools/client/shared/vendor/react-dom-factories");
 const { connect } = require("devtools/client/shared/vendor/react-redux");
-const { getAllFilters } = require("devtools/client/webconsole/new-console-output/selectors/filters");
-const { getFilteredMessagesCount } = require("devtools/client/webconsole/new-console-output/selectors/messages");
-const { getAllUi } = require("devtools/client/webconsole/new-console-output/selectors/ui");
-const actions = require("devtools/client/webconsole/new-console-output/actions/index");
-const { l10n } = require("devtools/client/webconsole/new-console-output/utils/messages");
+const { getAllFilters } = require("devtools/client/webconsole/selectors/filters");
+const { getFilteredMessagesCount } = require("devtools/client/webconsole/selectors/messages");
+const { getAllUi } = require("devtools/client/webconsole/selectors/ui");
+const actions = require("devtools/client/webconsole/actions/index");
+const { l10n } = require("devtools/client/webconsole/utils/messages");
 const { PluralForm } = require("devtools/shared/plural-form");
 const {
   DEFAULT_FILTERS,
   FILTERS,
 } = require("../constants");
 
-const FilterButton = require("devtools/client/webconsole/new-console-output/components/FilterButton");
-const FilterCheckbox = require("devtools/client/webconsole/new-console-output/components/FilterCheckbox");
+const FilterButton = require("devtools/client/webconsole/components/FilterButton");
+const FilterCheckbox = require("devtools/client/webconsole/components/FilterCheckbox");
 
 class FilterBar extends Component {
   static get propTypes() {
diff --git a/devtools/client/webconsole/new-console-output/components/FilterButton.js b/devtools/client/webconsole/components/FilterButton.js
similarity index 92%
rename from devtools/client/webconsole/new-console-output/components/FilterButton.js
rename to devtools/client/webconsole/components/FilterButton.js
index 60d9cc982be6..bf430ada3d3d 100644
--- a/devtools/client/webconsole/new-console-output/components/FilterButton.js
+++ b/devtools/client/webconsole/components/FilterButton.js
@@ -5,7 +5,7 @@
 
 const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
 const dom = require("devtools/client/shared/vendor/react-dom-factories");
-const actions = require("devtools/client/webconsole/new-console-output/actions/index");
+const actions = require("devtools/client/webconsole/actions/index");
 
 FilterButton.displayName = "FilterButton";
 
diff --git a/devtools/client/webconsole/new-console-output/components/FilterCheckbox.js b/devtools/client/webconsole/components/FilterCheckbox.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/components/FilterCheckbox.js
rename to devtools/client/webconsole/components/FilterCheckbox.js
diff --git a/devtools/client/webconsole/new-console-output/components/GripMessageBody.js b/devtools/client/webconsole/components/GripMessageBody.js
similarity index 98%
rename from devtools/client/webconsole/new-console-output/components/GripMessageBody.js
rename to devtools/client/webconsole/components/GripMessageBody.js
index ed5b242d0a74..fc2eb7919d86 100644
--- a/devtools/client/webconsole/new-console-output/components/GripMessageBody.js
+++ b/devtools/client/webconsole/components/GripMessageBody.js
@@ -12,7 +12,7 @@ const {
   MESSAGE_TYPE,
   JSTERM_COMMANDS,
 } = require("../constants");
-const { getObjectInspector } = require("devtools/client/webconsole/new-console-output/utils/object-inspector");
+const { getObjectInspector } = require("devtools/client/webconsole/utils/object-inspector");
 
 const reps = require("devtools/client/shared/components/reps/reps");
 const { MODE } = reps;
diff --git a/devtools/client/webconsole/new-console-output/components/Message.js b/devtools/client/webconsole/components/Message.js
similarity index 93%
rename from devtools/client/webconsole/new-console-output/components/Message.js
rename to devtools/client/webconsole/components/Message.js
index 44735b2073d9..e0bd78336fcc 100644
--- a/devtools/client/webconsole/new-console-output/components/Message.js
+++ b/devtools/client/webconsole/components/Message.js
@@ -11,19 +11,19 @@ const { Component, createFactory } = require("devtools/client/shared/vendor/reac
 const dom = require("devtools/client/shared/vendor/react-dom-factories");
 const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
 const { l10n } =
-  require("devtools/client/webconsole/new-console-output/utils/messages");
+  require("devtools/client/webconsole/utils/messages");
 const actions =
-  require("devtools/client/webconsole/new-console-output/actions/index");
+  require("devtools/client/webconsole/actions/index");
 const { MESSAGE_SOURCE, MESSAGE_TYPE } =
-  require("devtools/client/webconsole/new-console-output/constants");
+  require("devtools/client/webconsole/constants");
 const CollapseButton =
-  require("devtools/client/webconsole/new-console-output/components/CollapseButton");
+  require("devtools/client/webconsole/components/CollapseButton");
 const { MessageIndent } =
-  require("devtools/client/webconsole/new-console-output/components/MessageIndent");
+  require("devtools/client/webconsole/components/MessageIndent");
 const MessageIcon =
-  require("devtools/client/webconsole/new-console-output/components/MessageIcon");
+  require("devtools/client/webconsole/components/MessageIcon");
 const MessageRepeat =
-  require("devtools/client/webconsole/new-console-output/components/MessageRepeat");
+  require("devtools/client/webconsole/components/MessageRepeat");
 const FrameView = createFactory(require("devtools/client/shared/components/Frame"));
 const StackTrace = createFactory(require("devtools/client/shared/components/StackTrace"));
 
diff --git a/devtools/client/webconsole/new-console-output/components/MessageContainer.js b/devtools/client/webconsole/components/MessageContainer.js
similarity index 97%
rename from devtools/client/webconsole/new-console-output/components/MessageContainer.js
rename to devtools/client/webconsole/components/MessageContainer.js
index 36cd34196840..46822679292d 100644
--- a/devtools/client/webconsole/new-console-output/components/MessageContainer.js
+++ b/devtools/client/webconsole/components/MessageContainer.js
@@ -13,7 +13,7 @@ const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
 const {
   MESSAGE_SOURCE,
   MESSAGE_TYPE
-} = require("devtools/client/webconsole/new-console-output/constants");
+} = require("devtools/client/webconsole/constants");
 
 const componentMap = new Map([
   ["ConsoleApiCall", require("./message-types/ConsoleApiCall")],
diff --git a/devtools/client/webconsole/new-console-output/components/MessageIcon.js b/devtools/client/webconsole/components/MessageIcon.js
similarity index 93%
rename from devtools/client/webconsole/new-console-output/components/MessageIcon.js
rename to devtools/client/webconsole/components/MessageIcon.js
index ed850001d97a..80977cc8de8a 100644
--- a/devtools/client/webconsole/new-console-output/components/MessageIcon.js
+++ b/devtools/client/webconsole/components/MessageIcon.js
@@ -8,7 +8,7 @@
 
 const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
 const dom = require("devtools/client/shared/vendor/react-dom-factories");
-const {l10n} = require("devtools/client/webconsole/new-console-output/utils/messages");
+const {l10n} = require("devtools/client/webconsole/utils/messages");
 
 // Store common icons so they can be used without recreating the element
 // during render.
diff --git a/devtools/client/webconsole/new-console-output/components/MessageIndent.js b/devtools/client/webconsole/components/MessageIndent.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/components/MessageIndent.js
rename to devtools/client/webconsole/components/MessageIndent.js
diff --git a/devtools/client/webconsole/new-console-output/components/MessageRepeat.js b/devtools/client/webconsole/components/MessageRepeat.js
similarity index 91%
rename from devtools/client/webconsole/new-console-output/components/MessageRepeat.js
rename to devtools/client/webconsole/components/MessageRepeat.js
index 9fb941546997..ce2763c94b95 100644
--- a/devtools/client/webconsole/new-console-output/components/MessageRepeat.js
+++ b/devtools/client/webconsole/components/MessageRepeat.js
@@ -10,7 +10,7 @@
 const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
 const dom = require("devtools/client/shared/vendor/react-dom-factories");
 const { PluralForm } = require("devtools/shared/plural-form");
-const { l10n } = require("devtools/client/webconsole/new-console-output/utils/messages");
+const { l10n } = require("devtools/client/webconsole/utils/messages");
 const messageRepeatsTooltip = l10n.getStr("messageRepeats.tooltip2");
 
 MessageRepeat.displayName = "MessageRepeat";
diff --git a/devtools/client/webconsole/new-console-output/components/SideBar.js b/devtools/client/webconsole/components/SideBar.js
similarity index 94%
rename from devtools/client/webconsole/new-console-output/components/SideBar.js
rename to devtools/client/webconsole/components/SideBar.js
index ba27824583c6..857b7a2dfeaa 100644
--- a/devtools/client/webconsole/new-console-output/components/SideBar.js
+++ b/devtools/client/webconsole/components/SideBar.js
@@ -7,8 +7,8 @@ const { Component, createFactory } = require("devtools/client/shared/vendor/reac
 const dom = require("devtools/client/shared/vendor/react-dom-factories");
 const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
 const { connect } = require("devtools/client/shared/vendor/react-redux");
-const { getObjectInspector } = require("devtools/client/webconsole/new-console-output/utils/object-inspector");
-const actions = require("devtools/client/webconsole/new-console-output/actions/index");
+const { getObjectInspector } = require("devtools/client/webconsole/utils/object-inspector");
+const actions = require("devtools/client/webconsole/actions/index");
 const SplitBox = createFactory(require("devtools/client/shared/components/splitter/SplitBox"));
 
 const reps = require("devtools/client/shared/components/reps/reps");
diff --git a/devtools/client/webconsole/new-console-output/components/message-types/ConsoleApiCall.js b/devtools/client/webconsole/components/message-types/ConsoleApiCall.js
similarity index 94%
rename from devtools/client/webconsole/new-console-output/components/message-types/ConsoleApiCall.js
rename to devtools/client/webconsole/components/message-types/ConsoleApiCall.js
index 0ae3cb1f21e5..ac13ebaeb0a0 100644
--- a/devtools/client/webconsole/new-console-output/components/message-types/ConsoleApiCall.js
+++ b/devtools/client/webconsole/components/message-types/ConsoleApiCall.js
@@ -10,11 +10,11 @@
 const { createFactory } = require("devtools/client/shared/vendor/react");
 const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
 const dom = require("devtools/client/shared/vendor/react-dom-factories");
-const GripMessageBody = require("devtools/client/webconsole/new-console-output/components/GripMessageBody");
-const ConsoleTable = createFactory(require("devtools/client/webconsole/new-console-output/components/ConsoleTable"));
-const {isGroupType, l10n} = require("devtools/client/webconsole/new-console-output/utils/messages");
+const GripMessageBody = require("devtools/client/webconsole/components/GripMessageBody");
+const ConsoleTable = createFactory(require("devtools/client/webconsole/components/ConsoleTable"));
+const {isGroupType, l10n} = require("devtools/client/webconsole/utils/messages");
 
-const Message = createFactory(require("devtools/client/webconsole/new-console-output/components/Message"));
+const Message = createFactory(require("devtools/client/webconsole/components/Message"));
 
 ConsoleApiCall.displayName = "ConsoleApiCall";
 
diff --git a/devtools/client/webconsole/new-console-output/components/message-types/ConsoleCommand.js b/devtools/client/webconsole/components/message-types/ConsoleCommand.js
similarity index 96%
rename from devtools/client/webconsole/new-console-output/components/message-types/ConsoleCommand.js
rename to devtools/client/webconsole/components/message-types/ConsoleCommand.js
index d7bb0283b5da..92a436124ab9 100644
--- a/devtools/client/webconsole/new-console-output/components/message-types/ConsoleCommand.js
+++ b/devtools/client/webconsole/components/message-types/ConsoleCommand.js
@@ -9,7 +9,7 @@
 // React & Redux
 const { createFactory } = require("devtools/client/shared/vendor/react");
 const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
-const Message = createFactory(require("devtools/client/webconsole/new-console-output/components/Message"));
+const Message = createFactory(require("devtools/client/webconsole/components/Message"));
 
 ConsoleCommand.displayName = "ConsoleCommand";
 
diff --git a/devtools/client/webconsole/new-console-output/components/message-types/DefaultRenderer.js b/devtools/client/webconsole/components/message-types/DefaultRenderer.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/components/message-types/DefaultRenderer.js
rename to devtools/client/webconsole/components/message-types/DefaultRenderer.js
diff --git a/devtools/client/webconsole/new-console-output/components/message-types/EvaluationResult.js b/devtools/client/webconsole/components/message-types/EvaluationResult.js
similarity index 93%
rename from devtools/client/webconsole/new-console-output/components/message-types/EvaluationResult.js
rename to devtools/client/webconsole/components/message-types/EvaluationResult.js
index e7a74a01c365..d4837af963cb 100644
--- a/devtools/client/webconsole/new-console-output/components/message-types/EvaluationResult.js
+++ b/devtools/client/webconsole/components/message-types/EvaluationResult.js
@@ -9,8 +9,8 @@
 // React & Redux
 const { createFactory } = require("devtools/client/shared/vendor/react");
 const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
-const Message = createFactory(require("devtools/client/webconsole/new-console-output/components/Message"));
-const GripMessageBody = require("devtools/client/webconsole/new-console-output/components/GripMessageBody");
+const Message = createFactory(require("devtools/client/webconsole/components/Message"));
+const GripMessageBody = require("devtools/client/webconsole/components/GripMessageBody");
 
 EvaluationResult.displayName = "EvaluationResult";
 
diff --git a/devtools/client/webconsole/new-console-output/components/message-types/NetworkEventMessage.js b/devtools/client/webconsole/components/message-types/NetworkEventMessage.js
similarity index 95%
rename from devtools/client/webconsole/new-console-output/components/message-types/NetworkEventMessage.js
rename to devtools/client/webconsole/components/message-types/NetworkEventMessage.js
index ad5443e7b5fe..8c87878eed63 100644
--- a/devtools/client/webconsole/new-console-output/components/message-types/NetworkEventMessage.js
+++ b/devtools/client/webconsole/components/message-types/NetworkEventMessage.js
@@ -10,9 +10,9 @@
 const { createFactory } = require("devtools/client/shared/vendor/react");
 const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
 const dom = require("devtools/client/shared/vendor/react-dom-factories");
-const Message = createFactory(require("devtools/client/webconsole/new-console-output/components/Message"));
-const actions = require("devtools/client/webconsole/new-console-output/actions/index");
-const { l10n } = require("devtools/client/webconsole/new-console-output/utils/messages");
+const Message = createFactory(require("devtools/client/webconsole/components/Message"));
+const actions = require("devtools/client/webconsole/actions/index");
+const { l10n } = require("devtools/client/webconsole/utils/messages");
 const TabboxPanel = createFactory(require("devtools/client/netmonitor/src/components/TabboxPanel"));
 const { getHTTPStatusCodeURL } = require("devtools/client/netmonitor/src/utils/mdn-utils");
 const LEARN_MORE = l10n.getStr("webConsoleMoreInfoLabel");
diff --git a/devtools/client/webconsole/new-console-output/components/message-types/PageError.js b/devtools/client/webconsole/components/message-types/PageError.js
similarity index 97%
rename from devtools/client/webconsole/new-console-output/components/message-types/PageError.js
rename to devtools/client/webconsole/components/message-types/PageError.js
index 03512100775f..c8921a7d2ba4 100644
--- a/devtools/client/webconsole/new-console-output/components/message-types/PageError.js
+++ b/devtools/client/webconsole/components/message-types/PageError.js
@@ -9,7 +9,7 @@
 // React & Redux
 const { createFactory } = require("devtools/client/shared/vendor/react");
 const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
-const Message = createFactory(require("devtools/client/webconsole/new-console-output/components/Message"));
+const Message = createFactory(require("devtools/client/webconsole/components/Message"));
 
 PageError.displayName = "PageError";
 
diff --git a/devtools/client/webconsole/new-console-output/components/message-types/moz.build b/devtools/client/webconsole/components/message-types/moz.build
similarity index 100%
rename from devtools/client/webconsole/new-console-output/components/message-types/moz.build
rename to devtools/client/webconsole/components/message-types/moz.build
diff --git a/devtools/client/webconsole/new-console-output/components/moz.build b/devtools/client/webconsole/components/moz.build
similarity index 100%
rename from devtools/client/webconsole/new-console-output/components/moz.build
rename to devtools/client/webconsole/components/moz.build
diff --git a/devtools/client/webconsole/new-console-output/constants.js b/devtools/client/webconsole/constants.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/constants.js
rename to devtools/client/webconsole/constants.js
diff --git a/devtools/client/webconsole/jsterm.js b/devtools/client/webconsole/jsterm.js
index 1b3f0ca1ed9c..a773d9466adc 100644
--- a/devtools/client/webconsole/jsterm.js
+++ b/devtools/client/webconsole/jsterm.js
@@ -480,7 +480,7 @@ JSTerm.prototype = {
     }
 
     if (this.hud.NEW_CONSOLE_OUTPUT_ENABLED) {
-      const { ConsoleCommand } = require("devtools/client/webconsole/new-console-output/types");
+      const { ConsoleCommand } = require("devtools/client/webconsole/types");
       let message = new ConsoleCommand({
         messageText: executeString,
       });
diff --git a/devtools/client/webconsole/local-dev/index.js b/devtools/client/webconsole/local-dev/index.js
index d3c40c08c6b3..88b898a60926 100644
--- a/devtools/client/webconsole/local-dev/index.js
+++ b/devtools/client/webconsole/local-dev/index.js
@@ -40,7 +40,7 @@ pref("devtools.webconsole.timestampMessages", false);
 pref("devtools.webconsole.autoMultiline", true);
 pref("devtools.webconsole.sidebarToggle", true);
 
-const NewConsoleOutputWrapper = require("../new-console-output/new-console-output-wrapper");
+const NewConsoleOutputWrapper = require("../new-console-output-wrapper");
 const NewWebConsoleFrame = require("../new-webconsole").NewWebConsoleFrame;
 
 // Copied from netmonitor/index.js:
diff --git a/devtools/client/webconsole/new-console-output/main.js b/devtools/client/webconsole/main.js
similarity index 91%
rename from devtools/client/webconsole/new-console-output/main.js
rename to devtools/client/webconsole/main.js
index 65dfcdaa15b3..2cd9141d0cfb 100644
--- a/devtools/client/webconsole/new-console-output/main.js
+++ b/devtools/client/webconsole/main.js
@@ -13,7 +13,7 @@ this.NewConsoleOutput = function(parentNode, jsterm, toolbox, owner, serviceCont
   // preview feature. The entire code-base doesn't need any extra
   // privileges and runs entirely in content scope.
   let NewConsoleOutputWrapper = BrowserLoader({
-    baseURI: "resource://devtools/client/webconsole/new-console-output/",
+    baseURI: "resource://devtools/client/webconsole/",
     window
   }).require("./new-console-output-wrapper");
 
diff --git a/devtools/client/webconsole/moz.build b/devtools/client/webconsole/moz.build
index db434a03a4da..08d674545bb6 100644
--- a/devtools/client/webconsole/moz.build
+++ b/devtools/client/webconsole/moz.build
@@ -5,15 +5,25 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += [
-    'new-console-output',
+    'actions',
+    'components',
     'old',
+    'reducers',
+    'selectors',
+    'test',
+    'utils',
 ]
 DevToolsModules(
     'console-commands.js',
+    'constants.js',
     'hudservice.js',
     'jsterm.js',
+    'main.js',
+    'new-console-output-wrapper.js',
     'new-webconsole.js',
     'panel.js',
+    'store.js',
+    'types.js',
     'utils.js',
     'webconsole-connection-proxy.js',
     'webconsole-l10n.js',
diff --git a/devtools/client/webconsole/new-console-output/new-console-output-wrapper.js b/devtools/client/webconsole/new-console-output-wrapper.js
similarity index 96%
rename from devtools/client/webconsole/new-console-output/new-console-output-wrapper.js
rename to devtools/client/webconsole/new-console-output-wrapper.js
index be37dfc9492e..1622e2e340d9 100644
--- a/devtools/client/webconsole/new-console-output/new-console-output-wrapper.js
+++ b/devtools/client/webconsole/new-console-output-wrapper.js
@@ -8,16 +8,16 @@ const dom = require("devtools/client/shared/vendor/react-dom-factories");
 const ReactDOM = require("devtools/client/shared/vendor/react-dom");
 const { Provider } = require("devtools/client/shared/vendor/react-redux");
 
-const actions = require("devtools/client/webconsole/new-console-output/actions/index");
-const { createContextMenu } = require("devtools/client/webconsole/new-console-output/utils/context-menu");
-const { configureStore } = require("devtools/client/webconsole/new-console-output/store");
-const { isPacketPrivate } = require("devtools/client/webconsole/new-console-output/utils/messages");
-const { getAllMessagesById, getMessage } = require("devtools/client/webconsole/new-console-output/selectors/messages");
+const actions = require("devtools/client/webconsole/actions/index");
+const { createContextMenu } = require("devtools/client/webconsole/utils/context-menu");
+const { configureStore } = require("devtools/client/webconsole/store");
+const { isPacketPrivate } = require("devtools/client/webconsole/utils/messages");
+const { getAllMessagesById, getMessage } = require("devtools/client/webconsole/selectors/messages");
 
 const EventEmitter = require("devtools/shared/event-emitter");
-const ConsoleOutput = createFactory(require("devtools/client/webconsole/new-console-output/components/ConsoleOutput"));
-const FilterBar = createFactory(require("devtools/client/webconsole/new-console-output/components/FilterBar"));
-const SideBar = createFactory(require("devtools/client/webconsole/new-console-output/components/SideBar"));
+const ConsoleOutput = createFactory(require("devtools/client/webconsole/components/ConsoleOutput"));
+const FilterBar = createFactory(require("devtools/client/webconsole/components/FilterBar"));
+const SideBar = createFactory(require("devtools/client/webconsole/components/SideBar"));
 
 let store = null;
 
diff --git a/devtools/client/webconsole/new-console-output/.eslintrc.js b/devtools/client/webconsole/new-console-output/.eslintrc.js
deleted file mode 100644
index 9b5bf41191f8..000000000000
--- a/devtools/client/webconsole/new-console-output/.eslintrc.js
+++ /dev/null
@@ -1,5 +0,0 @@
-"use strict";
-
-module.exports = {
-  "env": { "browser": true }
-};
diff --git a/devtools/client/webconsole/new-console-output/moz.build b/devtools/client/webconsole/new-console-output/moz.build
deleted file mode 100644
index 7d0905aaa4f9..000000000000
--- a/devtools/client/webconsole/new-console-output/moz.build
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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/.
-
-DIRS += [
-    'actions',
-    'components',
-    'reducers',
-    'selectors',
-    'test',
-    'utils',
-]
-
-DevToolsModules(
-    'constants.js',
-    'main.js',
-    'new-console-output-wrapper.js',
-    'store.js',
-    'types.js',
-)
diff --git a/devtools/client/webconsole/new-webconsole.js b/devtools/client/webconsole/new-webconsole.js
index 6cc7aef45d2d..dcf1aeb089be 100644
--- a/devtools/client/webconsole/new-webconsole.js
+++ b/devtools/client/webconsole/new-webconsole.js
@@ -15,7 +15,7 @@ const { gDevTools } = require("devtools/client/framework/devtools");
 const { JSTerm } = require("devtools/client/webconsole/jsterm");
 const { WebConsoleConnectionProxy } = require("devtools/client/webconsole/webconsole-connection-proxy");
 const KeyShortcuts = require("devtools/client/shared/key-shortcuts");
-const { l10n } = require("devtools/client/webconsole/new-console-output/utils/messages");
+const { l10n } = require("devtools/client/webconsole/utils/messages");
 
 loader.lazyRequireGetter(this, "AppConstants", "resource://gre/modules/AppConstants.jsm", true);
 
diff --git a/devtools/client/webconsole/old/webconsole.xul b/devtools/client/webconsole/old/webconsole.xul
index 4cfa152f7214..9c57ba642c54 100644
--- a/devtools/client/webconsole/old/webconsole.xul
+++ b/devtools/client/webconsole/old/webconsole.xul
@@ -26,7 +26,7 @@
   <script type="application/javascript"
           src="chrome://devtools/content/shared/theme-switching.js"/>
   <script type="application/javascript"
-          src="resource://devtools/client/webconsole/new-console-output/main.js"/>
+          src="resource://devtools/client/webconsole/main.js"/>
   <script type="text/javascript" src="chrome://global/content/globalOverlay.js"/>
   <script type="text/javascript" src="resource://devtools/client/webconsole/old/net/main.js"/>
   <script type="text/javascript"><![CDATA[
diff --git a/devtools/client/webconsole/new-console-output/reducers/filters.js b/devtools/client/webconsole/reducers/filters.js
similarity index 93%
rename from devtools/client/webconsole/new-console-output/reducers/filters.js
rename to devtools/client/webconsole/reducers/filters.js
index be1ce9312712..5735f3a35f2c 100644
--- a/devtools/client/webconsole/new-console-output/reducers/filters.js
+++ b/devtools/client/webconsole/reducers/filters.js
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const constants = require("devtools/client/webconsole/new-console-output/constants");
+const constants = require("devtools/client/webconsole/constants");
 
 const FilterState = (overrides) => Object.freeze(
   cloneState(constants.DEFAULT_FILTERS_VALUES, overrides)
diff --git a/devtools/client/webconsole/new-console-output/reducers/index.js b/devtools/client/webconsole/reducers/index.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/reducers/index.js
rename to devtools/client/webconsole/reducers/index.js
diff --git a/devtools/client/webconsole/new-console-output/reducers/messages.js b/devtools/client/webconsole/reducers/messages.js
similarity index 99%
rename from devtools/client/webconsole/new-console-output/reducers/messages.js
rename to devtools/client/webconsole/reducers/messages.js
index 00b703dafb94..8dead06cc861 100644
--- a/devtools/client/webconsole/new-console-output/reducers/messages.js
+++ b/devtools/client/webconsole/reducers/messages.js
@@ -8,9 +8,9 @@
 const {
   isGroupType,
   l10n,
-} = require("devtools/client/webconsole/new-console-output/utils/messages");
+} = require("devtools/client/webconsole/utils/messages");
 
-const constants = require("devtools/client/webconsole/new-console-output/constants");
+const constants = require("devtools/client/webconsole/constants");
 const {
   DEFAULT_FILTERS,
   FILTERS,
diff --git a/devtools/client/webconsole/new-console-output/reducers/moz.build b/devtools/client/webconsole/reducers/moz.build
similarity index 100%
rename from devtools/client/webconsole/new-console-output/reducers/moz.build
rename to devtools/client/webconsole/reducers/moz.build
diff --git a/devtools/client/webconsole/new-console-output/reducers/prefs.js b/devtools/client/webconsole/reducers/prefs.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/reducers/prefs.js
rename to devtools/client/webconsole/reducers/prefs.js
diff --git a/devtools/client/webconsole/new-console-output/reducers/ui.js b/devtools/client/webconsole/reducers/ui.js
similarity index 96%
rename from devtools/client/webconsole/new-console-output/reducers/ui.js
rename to devtools/client/webconsole/reducers/ui.js
index fe7b2b05ca29..24bc7f5ad03a 100644
--- a/devtools/client/webconsole/new-console-output/reducers/ui.js
+++ b/devtools/client/webconsole/reducers/ui.js
@@ -14,7 +14,7 @@ const {
   SHOW_OBJECT_IN_SIDEBAR,
   TIMESTAMPS_TOGGLE,
   MESSAGES_CLEAR,
-} = require("devtools/client/webconsole/new-console-output/constants");
+} = require("devtools/client/webconsole/constants");
 
 const {
   PANELS,
diff --git a/devtools/client/webconsole/new-console-output/selectors/filters.js b/devtools/client/webconsole/selectors/filters.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/selectors/filters.js
rename to devtools/client/webconsole/selectors/filters.js
diff --git a/devtools/client/webconsole/new-console-output/selectors/messages.js b/devtools/client/webconsole/selectors/messages.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/selectors/messages.js
rename to devtools/client/webconsole/selectors/messages.js
diff --git a/devtools/client/webconsole/new-console-output/selectors/moz.build b/devtools/client/webconsole/selectors/moz.build
similarity index 100%
rename from devtools/client/webconsole/new-console-output/selectors/moz.build
rename to devtools/client/webconsole/selectors/moz.build
diff --git a/devtools/client/webconsole/new-console-output/selectors/prefs.js b/devtools/client/webconsole/selectors/prefs.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/selectors/prefs.js
rename to devtools/client/webconsole/selectors/prefs.js
diff --git a/devtools/client/webconsole/new-console-output/selectors/ui.js b/devtools/client/webconsole/selectors/ui.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/selectors/ui.js
rename to devtools/client/webconsole/selectors/ui.js
diff --git a/devtools/client/webconsole/new-console-output/store.js b/devtools/client/webconsole/store.js
similarity index 92%
rename from devtools/client/webconsole/new-console-output/store.js
rename to devtools/client/webconsole/store.js
index a7f5a969a633..69c25e9e6867 100644
--- a/devtools/client/webconsole/new-console-output/store.js
+++ b/devtools/client/webconsole/store.js
@@ -3,9 +3,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const {FilterState} = require("devtools/client/webconsole/new-console-output/reducers/filters");
-const {PrefState} = require("devtools/client/webconsole/new-console-output/reducers/prefs");
-const {UiState} = require("devtools/client/webconsole/new-console-output/reducers/ui");
+const {FilterState} = require("devtools/client/webconsole/reducers/filters");
+const {PrefState} = require("devtools/client/webconsole/reducers/prefs");
+const {UiState} = require("devtools/client/webconsole/reducers/ui");
 const {
   applyMiddleware,
   compose,
@@ -22,17 +22,17 @@ const {
   REMOVED_ACTORS_CLEAR,
   NETWORK_MESSAGE_UPDATE,
   PREFS,
-} = require("devtools/client/webconsole/new-console-output/constants");
+} = require("devtools/client/webconsole/constants");
 const { reducers } = require("./reducers/index");
 const {
   getMessage,
   getAllMessagesUiById,
-} = require("devtools/client/webconsole/new-console-output/selectors/messages");
+} = require("devtools/client/webconsole/selectors/messages");
 const DataProvider = require("devtools/client/netmonitor/src/connector/firefox-data-provider");
 const {
   getAllNetworkMessagesUpdateById,
-} = require("devtools/client/webconsole/new-console-output/selectors/messages");
-const {getPrefsService} = require("devtools/client/webconsole/new-console-output/utils/prefs");
+} = require("devtools/client/webconsole/selectors/messages");
+const {getPrefsService} = require("devtools/client/webconsole/utils/prefs");
 
 /**
  * Create and configure store for the Console panel. This is the place
diff --git a/devtools/client/webconsole/new-console-output/test/.eslintrc.mocha.js b/devtools/client/webconsole/test/.eslintrc.mocha.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/.eslintrc.mocha.js
rename to devtools/client/webconsole/test/.eslintrc.mocha.js
diff --git a/devtools/client/webconsole/new-console-output/test/README.md b/devtools/client/webconsole/test/README.md
similarity index 72%
rename from devtools/client/webconsole/new-console-output/test/README.md
rename to devtools/client/webconsole/test/README.md
index ea038aa2bdd6..e4778e654bd9 100644
--- a/devtools/client/webconsole/new-console-output/test/README.md
+++ b/devtools/client/webconsole/test/README.md
@@ -3,10 +3,10 @@ The console panel uses currently two different frameworks for tests:
 
 * Mochitest - [Mochitest](https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Mochitest) is an automated testing framework built on top of the MochiKit JavaScript libraries. It's just one of the automated regression testing frameworks used by Mozilla.
 
-Mochitests are located in `devtools/client/webconsole/new-console-output/test/mochitest/` and can be run with the following command:
+Mochitests are located in `devtools/client/webconsole/test/mochitest/` and can be run with the following command:
 
 ```sh
-./mach test devtools/client/webconsole/new-console-output/test/mochitest/
+./mach test devtools/client/webconsole/test/mochitest/
 ```
 
 These tests can be run on CI when pushing to TRY. Not all tests are enabled at the moment since they were copied over from the old frontend (See Bug 1400847).
@@ -14,16 +14,16 @@ These tests can be run on CI when pushing to TRY. Not all tests are enabled at t
 * Mocha + Enzyme - [mocha](https://mochajs.org/) Mocha is JavaScript test framework running on Node.js
 [Enzyme](http://airbnb.io/enzyme/) is a JavaScript Testing utility for React that makes it easier to assert, manipulate, and traverse your React Components' output.
 
-These tests are located in `new-console-output/test/components/` and `new-console-output/test/store/`, and can be run with the following command:
+These tests are located in `test/components/` and `test/store/`, and can be run with the following command:
 
 ```sh
-devtools/client/webconsole/new-console-output/test/ && npm install && npm test
+devtools/client/webconsole/test/ && npm install && npm test
 ```
 
 or using yarn with
 
 ```sh
-devtools/client/webconsole/new-console-output/test/ && yarn && yarn test
+devtools/client/webconsole/test/ && yarn && yarn test
 ```
 
 **⚠️️️️️️️️️️ These tests are not ran on CI at the moment. You need to run them manually when working on the console. (See Bug 1312823)**
@@ -47,9 +47,9 @@ See how to generate stubs for Console API calls.
 `\test\fixtures\stub-generators\browser_webconsole_check_stubs_console_api.js`
 
 Run the generator using `mach` command.
-`./mach test devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_check_stubs_console_api.js --headless`
+`./mach test devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_console_api.js --headless`
 
-This will override `new-console-output/test/fixtures/stubs/consoleApi.js`.
+This will override `test/fixtures/stubs/consoleApi.js`.
 
 ## Append new CSS Messages stubs
 See how to generate stubs for CSS messages.
@@ -57,7 +57,7 @@ See how to generate stubs for CSS messages.
 * Append new entry into `cssMessage` map into `stub-snippets.js`
 * Generate stubs with: `browser_webconsole_check_stubs_css_message.js`
 
-This will override `new-console-output/test/fixtures/stubs/cssMessage.js`.
+This will override `test/fixtures/stubs/cssMessage.js`.
 
 ## Append new Evaluation Result stubs
 See how to generate stubs for evaluation results.
@@ -65,7 +65,7 @@ See how to generate stubs for evaluation results.
 * Append new entry into `evaluationResultCommands` map into `stub-snippets.js`
 * Generate stubs with: `browser_webconsole_check_stubs_evaluation_result.js`
 
-This will override `new-console-output/test/fixtures/stubs/evaluationResult.js`.
+This will override `test/fixtures/stubs/evaluationResult.js`.
 
 ## Append new Network Events stubs
 See how to generate stubs for network events
@@ -73,7 +73,7 @@ See how to generate stubs for network events
 * Append new entry into `networkEvent` map into `stub-snippets.js`
 * Generate stubs with: `browser_webconsole_update_stubs_network_event.js`
 
-This will override `new-console-output/test/fixtures/stubs/networkEvent.js`.
+This will override `test/fixtures/stubs/networkEvent.js`.
 
 ## Append new Page Error stubs
 See how to generate stubs for page errors.
@@ -81,4 +81,4 @@ See how to generate stubs for page errors.
 * Append new entry into `pageError` array into `stub-snippets.js`
 * Generate stubs with: `browser_webconsole_update_stubs_page_error.js`
 
-This will override `new-console-output/test/fixtures/stubs/pageError.js`.
+This will override `test/fixtures/stubs/pageError.js`.
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/.eslintrc.js b/devtools/client/webconsole/test/chrome/.eslintrc.js
similarity index 66%
rename from devtools/client/webconsole/new-console-output/test/mochitest/.eslintrc.js
rename to devtools/client/webconsole/test/chrome/.eslintrc.js
index 677cbb4243df..698ae9181a0a 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/.eslintrc.js
+++ b/devtools/client/webconsole/test/chrome/.eslintrc.js
@@ -2,5 +2,5 @@
 
 module.exports = {
   // Extend from the shared list of defined globals for mochitests.
-  "extends": "../../../../../.eslintrc.mochitests.js"
+  "extends": "../../../../.eslintrc.mochitests.js"
 };
diff --git a/devtools/client/webconsole/new-console-output/test/chrome/chrome.ini b/devtools/client/webconsole/test/chrome/chrome.ini
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/chrome/chrome.ini
rename to devtools/client/webconsole/test/chrome/chrome.ini
diff --git a/devtools/client/webconsole/new-console-output/test/chrome/head.js b/devtools/client/webconsole/test/chrome/head.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/chrome/head.js
rename to devtools/client/webconsole/test/chrome/head.js
diff --git a/devtools/client/webconsole/new-console-output/test/chrome/test_render_perf.html b/devtools/client/webconsole/test/chrome/test_render_perf.html
similarity index 97%
rename from devtools/client/webconsole/new-console-output/test/chrome/test_render_perf.html
rename to devtools/client/webconsole/test/chrome/test_render_perf.html
index 0ed0ac4a53a9..68866fc9e6b6 100644
--- a/devtools/client/webconsole/new-console-output/test/chrome/test_render_perf.html
+++ b/devtools/client/webconsole/test/chrome/test_render_perf.html
@@ -25,9 +25,9 @@ ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
 const Services = browserRequire("Services");
 Services.prefs.setIntPref("devtools.hud.loglimit", NUM_MESSAGES);
 const NewConsoleOutputWrapper = browserRequire(
-  "devtools/client/webconsole/new-console-output/new-console-output-wrapper");
+  "devtools/client/webconsole/new-console-output-wrapper");
 const actions =
-  browserRequire("devtools/client/webconsole/new-console-output/actions/index");
+  browserRequire("devtools/client/webconsole/actions/index");
 const EventEmitter = browserRequire("devtools/shared/event-emitter");
 const testPackets = Array.from({length: NUM_MESSAGES}).map((el, id) => ({
   "from": "server1.conn4.child1/consoleActor2",
diff --git a/devtools/client/webconsole/new-console-output/test/components/.eslintrc.js b/devtools/client/webconsole/test/components/.eslintrc.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/components/.eslintrc.js
rename to devtools/client/webconsole/test/components/.eslintrc.js
diff --git a/devtools/client/webconsole/new-console-output/test/components/console-api-call.log-messages.test.js b/devtools/client/webconsole/test/components/console-api-call.log-messages.test.js
similarity index 85%
rename from devtools/client/webconsole/new-console-output/test/components/console-api-call.log-messages.test.js
rename to devtools/client/webconsole/test/components/console-api-call.log-messages.test.js
index 91d2273379f7..b4898c256638 100644
--- a/devtools/client/webconsole/new-console-output/test/components/console-api-call.log-messages.test.js
+++ b/devtools/client/webconsole/test/components/console-api-call.log-messages.test.js
@@ -10,10 +10,10 @@ const { render } = require("enzyme");
 const { createFactory } = require("devtools/client/shared/vendor/react");
 
 // Components under test.
-const ConsoleApiCall = createFactory(require("devtools/client/webconsole/new-console-output/components/message-types/ConsoleApiCall"));
+const ConsoleApiCall = createFactory(require("devtools/client/webconsole/components/message-types/ConsoleApiCall"));
 
-const { prepareMessage } = require("devtools/client/webconsole/new-console-output/utils/messages");
-const serviceContainer = require("devtools/client/webconsole/new-console-output/test/fixtures/serviceContainer");
+const { prepareMessage } = require("devtools/client/webconsole/utils/messages");
+const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer");
 
 describe("ConsoleAPICall component:", () => {
   describe("Services.console.logStringMessage", () => {
diff --git a/devtools/client/webconsole/new-console-output/test/components/console-api-call.test.js b/devtools/client/webconsole/test/components/console-api-call.test.js
similarity index 95%
rename from devtools/client/webconsole/new-console-output/test/components/console-api-call.test.js
rename to devtools/client/webconsole/test/components/console-api-call.test.js
index 51898105e860..42201abc91a8 100644
--- a/devtools/client/webconsole/new-console-output/test/components/console-api-call.test.js
+++ b/devtools/client/webconsole/test/components/console-api-call.test.js
@@ -10,20 +10,20 @@ const sinon = require("sinon");
 // React
 const { createFactory } = require("devtools/client/shared/vendor/react");
 const Provider = createFactory(require("react-redux").Provider);
-const { setupStore } = require("devtools/client/webconsole/new-console-output/test/helpers");
+const { setupStore } = require("devtools/client/webconsole/test/helpers");
 
 // Components under test.
-const ConsoleApiCall = createFactory(require("devtools/client/webconsole/new-console-output/components/message-types/ConsoleApiCall"));
+const ConsoleApiCall = createFactory(require("devtools/client/webconsole/components/message-types/ConsoleApiCall"));
 const {
   MESSAGE_OPEN,
   MESSAGE_CLOSE,
-} = require("devtools/client/webconsole/new-console-output/constants");
-const { INDENT_WIDTH } = require("devtools/client/webconsole/new-console-output/components/MessageIndent");
-const {prepareMessage} = require("devtools/client/webconsole/new-console-output/utils/messages");
+} = require("devtools/client/webconsole/constants");
+const { INDENT_WIDTH } = require("devtools/client/webconsole/components/MessageIndent");
+const {prepareMessage} = require("devtools/client/webconsole/utils/messages");
 
 // Test fakes.
-const { stubPreparedMessages } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
-const serviceContainer = require("devtools/client/webconsole/new-console-output/test/fixtures/serviceContainer");
+const { stubPreparedMessages } = require("devtools/client/webconsole/test/fixtures/stubs/index");
+const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer");
 
 describe("ConsoleAPICall component:", () => {
   describe("console.log", () => {
@@ -260,7 +260,7 @@ describe("ConsoleAPICall component:", () => {
       const message = stubPreparedMessages.get("console.trace()");
       const wrapper = render(ConsoleApiCall({ message, serviceContainer, open: true }));
       const filepath = "http://example.com/browser/devtools/client/webconsole/" +
-                       "new-console-output/test/fixtures/stub-generators/" +
+                       "test/fixtures/stub-generators/" +
                        "test-console-api.html";
 
       expect(wrapper.find(".message-body").text()).toBe("console.trace()");
@@ -462,7 +462,7 @@ describe("ConsoleAPICall component:", () => {
       const wrapper = render(ConsoleApiCall({ message, serviceContainer }));
 
       expect(wrapper.find(".message-body").text())
-        .toBe("Window http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html");
+        .toBe("Window http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html");
     });
   });
 
diff --git a/devtools/client/webconsole/new-console-output/test/components/console-output.test.js b/devtools/client/webconsole/test/components/console-output.test.js
similarity index 75%
rename from devtools/client/webconsole/new-console-output/test/components/console-output.test.js
rename to devtools/client/webconsole/test/components/console-output.test.js
index b5374e0ebd67..7e0ded838587 100644
--- a/devtools/client/webconsole/new-console-output/test/components/console-output.test.js
+++ b/devtools/client/webconsole/test/components/console-output.test.js
@@ -9,13 +9,13 @@ const {
 const expect = require("expect");
 const { render } = require("enzyme");
 
-const ConsoleOutput = createFactory(require("devtools/client/webconsole/new-console-output/components/ConsoleOutput"));
-const serviceContainer = require("devtools/client/webconsole/new-console-output/test/fixtures/serviceContainer");
-const { setupStore } = require("devtools/client/webconsole/new-console-output/test/helpers");
-const {initialize} = require("devtools/client/webconsole/new-console-output/actions/ui");
+const ConsoleOutput = createFactory(require("devtools/client/webconsole/components/ConsoleOutput"));
+const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer");
+const { setupStore } = require("devtools/client/webconsole/test/helpers");
+const {initialize} = require("devtools/client/webconsole/actions/ui");
 const {
   getInitialMessageCountForViewport
-} = require("devtools/client/webconsole/new-console-output/utils/messages.js");
+} = require("devtools/client/webconsole/utils/messages.js");
 
 const MESSAGES_NUMBER = 100;
 function getDefaultProps(initialized) {
diff --git a/devtools/client/webconsole/new-console-output/test/components/evaluation-result.test.js b/devtools/client/webconsole/test/components/evaluation-result.test.js
similarity index 92%
rename from devtools/client/webconsole/new-console-output/test/components/evaluation-result.test.js
rename to devtools/client/webconsole/test/components/evaluation-result.test.js
index 60c4e6a1d990..f99b5213904e 100644
--- a/devtools/client/webconsole/new-console-output/test/components/evaluation-result.test.js
+++ b/devtools/client/webconsole/test/components/evaluation-result.test.js
@@ -10,15 +10,15 @@ const sinon = require("sinon");
 // React
 const { createFactory } = require("devtools/client/shared/vendor/react");
 const Provider = createFactory(require("react-redux").Provider);
-const { setupStore } = require("devtools/client/webconsole/new-console-output/test/helpers");
+const { setupStore } = require("devtools/client/webconsole/test/helpers");
 
 // Components under test.
-const EvaluationResult = createFactory(require("devtools/client/webconsole/new-console-output/components/message-types/EvaluationResult"));
-const { INDENT_WIDTH } = require("devtools/client/webconsole/new-console-output/components/MessageIndent");
+const EvaluationResult = createFactory(require("devtools/client/webconsole/components/message-types/EvaluationResult"));
+const { INDENT_WIDTH } = require("devtools/client/webconsole/components/MessageIndent");
 
 // Test fakes.
-const { stubPreparedMessages } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
-const serviceContainer = require("devtools/client/webconsole/new-console-output/test/fixtures/serviceContainer");
+const { stubPreparedMessages } = require("devtools/client/webconsole/test/fixtures/stubs/index");
+const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer");
 
 describe("EvaluationResult component:", () => {
   it("renders a grip result", () => {
diff --git a/devtools/client/webconsole/new-console-output/test/components/filter-bar.test.js b/devtools/client/webconsole/test/components/filter-bar.test.js
similarity index 94%
rename from devtools/client/webconsole/new-console-output/test/components/filter-bar.test.js
rename to devtools/client/webconsole/test/components/filter-bar.test.js
index a54170101ddd..335f17690843 100644
--- a/devtools/client/webconsole/new-console-output/test/components/filter-bar.test.js
+++ b/devtools/client/webconsole/test/components/filter-bar.test.js
@@ -10,19 +10,19 @@ const { createFactory } = require("devtools/client/shared/vendor/react");
 const dom = require("devtools/client/shared/vendor/react-dom-factories");
 const Provider = createFactory(require("react-redux").Provider);
 
-const actions = require("devtools/client/webconsole/new-console-output/actions/index");
-const FilterButton = require("devtools/client/webconsole/new-console-output/components/FilterButton");
-const FilterBar = createFactory(require("devtools/client/webconsole/new-console-output/components/FilterBar"));
-const { getAllUi } = require("devtools/client/webconsole/new-console-output/selectors/ui");
-const { getAllFilters } = require("devtools/client/webconsole/new-console-output/selectors/filters");
+const actions = require("devtools/client/webconsole/actions/index");
+const FilterButton = require("devtools/client/webconsole/components/FilterButton");
+const FilterBar = createFactory(require("devtools/client/webconsole/components/FilterBar"));
+const { getAllUi } = require("devtools/client/webconsole/selectors/ui");
+const { getAllFilters } = require("devtools/client/webconsole/selectors/filters");
 const {
   MESSAGES_CLEAR,
   FILTERS,
   PREFS,
-} = require("devtools/client/webconsole/new-console-output/constants");
+} = require("devtools/client/webconsole/constants");
 
-const { setupStore, prefsService, clearPrefs } = require("devtools/client/webconsole/new-console-output/test/helpers");
-const serviceContainer = require("devtools/client/webconsole/new-console-output/test/fixtures/serviceContainer");
+const { setupStore, prefsService, clearPrefs } = require("devtools/client/webconsole/test/helpers");
+const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer");
 
 describe("FilterBar component:", () => {
   afterEach(() => {
diff --git a/devtools/client/webconsole/new-console-output/test/components/filter-button.test.js b/devtools/client/webconsole/test/components/filter-button.test.js
similarity index 89%
rename from devtools/client/webconsole/new-console-output/test/components/filter-button.test.js
rename to devtools/client/webconsole/test/components/filter-button.test.js
index 81f394e67020..aae1d5b29a40 100644
--- a/devtools/client/webconsole/new-console-output/test/components/filter-button.test.js
+++ b/devtools/client/webconsole/test/components/filter-button.test.js
@@ -7,8 +7,8 @@ const { render } = require("enzyme");
 
 const { createFactory } = require("devtools/client/shared/vendor/react");
 
-const FilterButton = createFactory(require("devtools/client/webconsole/new-console-output/components/FilterButton"));
-const { MESSAGE_LEVEL } = require("devtools/client/webconsole/new-console-output/constants");
+const FilterButton = createFactory(require("devtools/client/webconsole/components/FilterButton"));
+const { MESSAGE_LEVEL } = require("devtools/client/webconsole/constants");
 
 describe("FilterButton component:", () => {
   const props = {
diff --git a/devtools/client/webconsole/new-console-output/test/components/filter-checkbox.test.js b/devtools/client/webconsole/test/components/filter-checkbox.test.js
similarity index 95%
rename from devtools/client/webconsole/new-console-output/test/components/filter-checkbox.test.js
rename to devtools/client/webconsole/test/components/filter-checkbox.test.js
index 24d2188550a2..cb63027658cc 100644
--- a/devtools/client/webconsole/new-console-output/test/components/filter-checkbox.test.js
+++ b/devtools/client/webconsole/test/components/filter-checkbox.test.js
@@ -7,7 +7,7 @@ const { render } = require("enzyme");
 
 const { createFactory } = require("devtools/client/shared/vendor/react");
 
-const FilterCheckbox = createFactory(require("devtools/client/webconsole/new-console-output/components/FilterCheckbox"));
+const FilterCheckbox = createFactory(require("devtools/client/webconsole/components/FilterCheckbox"));
 
 describe("FilterCheckbox component:", () => {
   const props = {
diff --git a/devtools/client/webconsole/new-console-output/test/components/message-container.test.js b/devtools/client/webconsole/test/components/message-container.test.js
similarity index 73%
rename from devtools/client/webconsole/new-console-output/test/components/message-container.test.js
rename to devtools/client/webconsole/test/components/message-container.test.js
index 29ae471b4164..395b5d1aba87 100644
--- a/devtools/client/webconsole/new-console-output/test/components/message-container.test.js
+++ b/devtools/client/webconsole/test/components/message-container.test.js
@@ -8,15 +8,15 @@ const { render } = require("enzyme");
 const { createFactory } = require("devtools/client/shared/vendor/react");
 
 // Components under test.
-let { MessageContainer, getMessageComponent } = require("devtools/client/webconsole/new-console-output/components/MessageContainer");
+let { MessageContainer, getMessageComponent } = require("devtools/client/webconsole/components/MessageContainer");
 MessageContainer = createFactory(MessageContainer);
-const ConsoleApiCall = require("devtools/client/webconsole/new-console-output/components/message-types/ConsoleApiCall");
-const EvaluationResult = require("devtools/client/webconsole/new-console-output/components/message-types/EvaluationResult");
-const PageError = require("devtools/client/webconsole/new-console-output/components/message-types/PageError");
+const ConsoleApiCall = require("devtools/client/webconsole/components/message-types/ConsoleApiCall");
+const EvaluationResult = require("devtools/client/webconsole/components/message-types/EvaluationResult");
+const PageError = require("devtools/client/webconsole/components/message-types/PageError");
 
 // Test fakes.
-const { stubPreparedMessages } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
-const serviceContainer = require("devtools/client/webconsole/new-console-output/test/fixtures/serviceContainer");
+const { stubPreparedMessages } = require("devtools/client/webconsole/test/fixtures/stubs/index");
+const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer");
 
 describe("MessageContainer component:", () => {
   it("pipes data to children as expected", () => {
diff --git a/devtools/client/webconsole/new-console-output/test/components/message-icon.test.js b/devtools/client/webconsole/test/components/message-icon.test.js
similarity index 84%
rename from devtools/client/webconsole/new-console-output/test/components/message-icon.test.js
rename to devtools/client/webconsole/test/components/message-icon.test.js
index a70829e79ce2..1788db1b8a5e 100644
--- a/devtools/client/webconsole/new-console-output/test/components/message-icon.test.js
+++ b/devtools/client/webconsole/test/components/message-icon.test.js
@@ -4,12 +4,12 @@
 
 const {
   MESSAGE_LEVEL,
-} = require("devtools/client/webconsole/new-console-output/constants");
+} = require("devtools/client/webconsole/constants");
 
 const expect = require("expect");
 const { render } = require("enzyme");
 const { createFactory } = require("devtools/client/shared/vendor/react");
-const MessageIcon = createFactory(require("devtools/client/webconsole/new-console-output/components/MessageIcon"));
+const MessageIcon = createFactory(require("devtools/client/webconsole/components/MessageIcon"));
 
 describe("MessageIcon component:", () => {
   it("renders icon based on level", () => {
diff --git a/devtools/client/webconsole/new-console-output/test/components/message-location.test.js b/devtools/client/webconsole/test/components/message-location.test.js
similarity index 87%
rename from devtools/client/webconsole/new-console-output/test/components/message-location.test.js
rename to devtools/client/webconsole/test/components/message-location.test.js
index 5ee418d79935..e0c7a4b561c1 100644
--- a/devtools/client/webconsole/new-console-output/test/components/message-location.test.js
+++ b/devtools/client/webconsole/test/components/message-location.test.js
@@ -7,13 +7,13 @@ const expect = require("expect");
 const { mount } = require("enzyme");
 const sinon = require("sinon");
 const { createFactory } = require("devtools/client/shared/vendor/react");
-const serviceContainer = require("devtools/client/webconsole/new-console-output/test/fixtures/serviceContainer");
+const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer");
 
-let { MessageContainer } = require("devtools/client/webconsole/new-console-output/components/MessageContainer");
+let { MessageContainer } = require("devtools/client/webconsole/components/MessageContainer");
 MessageContainer = createFactory(MessageContainer);
 
 // Test fakes.
-const { stubPreparedMessages } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
+const { stubPreparedMessages } = require("devtools/client/webconsole/test/fixtures/stubs/index");
 
 describe("Message - location element", () => {
   it("Calls onViewSourceInDebugger when clicked", () => {
diff --git a/devtools/client/webconsole/new-console-output/test/components/message-repeat.test.js b/devtools/client/webconsole/test/components/message-repeat.test.js
similarity index 91%
rename from devtools/client/webconsole/new-console-output/test/components/message-repeat.test.js
rename to devtools/client/webconsole/test/components/message-repeat.test.js
index 0e9c413ea62e..65633a71897c 100644
--- a/devtools/client/webconsole/new-console-output/test/components/message-repeat.test.js
+++ b/devtools/client/webconsole/test/components/message-repeat.test.js
@@ -5,7 +5,7 @@
 const expect = require("expect");
 const { render } = require("enzyme");
 const { createFactory } = require("devtools/client/shared/vendor/react");
-const MessageRepeat = createFactory(require("devtools/client/webconsole/new-console-output/components/MessageRepeat"));
+const MessageRepeat = createFactory(require("devtools/client/webconsole/components/MessageRepeat"));
 
 describe("MessageRepeat component:", () => {
   it("renders repeated value correctly", () => {
diff --git a/devtools/client/webconsole/new-console-output/test/components/message-types-aria.test.js b/devtools/client/webconsole/test/components/message-types-aria.test.js
similarity index 76%
rename from devtools/client/webconsole/new-console-output/test/components/message-types-aria.test.js
rename to devtools/client/webconsole/test/components/message-types-aria.test.js
index f9d8e5f6a305..a204da8ee207 100644
--- a/devtools/client/webconsole/new-console-output/test/components/message-types-aria.test.js
+++ b/devtools/client/webconsole/test/components/message-types-aria.test.js
@@ -8,15 +8,15 @@ const { render } = require("enzyme");
 const { createFactory } = require("devtools/client/shared/vendor/react");
 
 // Components under test.
-const ConsoleApiCall = createFactory(require("devtools/client/webconsole/new-console-output/components/message-types/ConsoleApiCall"));
-const ConsoleCmd = createFactory(require("devtools/client/webconsole/new-console-output/components/message-types/ConsoleCommand"));
-const EvaluationResult = createFactory(require("devtools/client/webconsole/new-console-output/components/message-types/EvaluationResult"));
+const ConsoleApiCall = createFactory(require("devtools/client/webconsole/components/message-types/ConsoleApiCall"));
+const ConsoleCmd = createFactory(require("devtools/client/webconsole/components/message-types/ConsoleCommand"));
+const EvaluationResult = createFactory(require("devtools/client/webconsole/components/message-types/EvaluationResult"));
 
-const { ConsoleCommand } = require("devtools/client/webconsole/new-console-output/types");
+const { ConsoleCommand } = require("devtools/client/webconsole/types");
 
 // Test fakes.
-const { stubPreparedMessages } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
-const serviceContainer = require("devtools/client/webconsole/new-console-output/test/fixtures/serviceContainer");
+const { stubPreparedMessages } = require("devtools/client/webconsole/test/fixtures/stubs/index");
+const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer");
 
 describe("message types component ARIA:", () => {
   describe("ConsoleAPICall", () => {
diff --git a/devtools/client/webconsole/new-console-output/test/components/network-event-message.test.js b/devtools/client/webconsole/test/components/network-event-message.test.js
similarity index 91%
rename from devtools/client/webconsole/new-console-output/test/components/network-event-message.test.js
rename to devtools/client/webconsole/test/components/network-event-message.test.js
index 49fe4cf66b1a..8843d0054f42 100644
--- a/devtools/client/webconsole/new-console-output/test/components/network-event-message.test.js
+++ b/devtools/client/webconsole/test/components/network-event-message.test.js
@@ -10,14 +10,14 @@ const { render } = require("enzyme");
 const { createFactory } = require("devtools/client/shared/vendor/react");
 
 // Components under test.
-const NetworkEventMessage = createFactory(require("devtools/client/webconsole/new-console-output/components/message-types/NetworkEventMessage"));
-const { INDENT_WIDTH } = require("devtools/client/webconsole/new-console-output/components/MessageIndent");
+const NetworkEventMessage = createFactory(require("devtools/client/webconsole/components/message-types/NetworkEventMessage"));
+const { INDENT_WIDTH } = require("devtools/client/webconsole/components/MessageIndent");
 
 // Test fakes.
-const { stubPreparedMessages } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
-const serviceContainer = require("devtools/client/webconsole/new-console-output/test/fixtures/serviceContainer");
+const { stubPreparedMessages } = require("devtools/client/webconsole/test/fixtures/stubs/index");
+const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer");
 
-const EXPECTED_URL = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html";
+const EXPECTED_URL = "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html";
 const EXPECTED_STATUS = /\[HTTP\/\d\.\d \d+ [A-Za-z ]+ \d+ms\]/;
 
 describe("NetworkEventMessage component:", () => {
diff --git a/devtools/client/webconsole/new-console-output/test/components/new-console-output-wrapper.test.js b/devtools/client/webconsole/test/components/new-console-output-wrapper.test.js
similarity index 92%
rename from devtools/client/webconsole/new-console-output/test/components/new-console-output-wrapper.test.js
rename to devtools/client/webconsole/test/components/new-console-output-wrapper.test.js
index 706152256139..38da7d1ab076 100644
--- a/devtools/client/webconsole/new-console-output/test/components/new-console-output-wrapper.test.js
+++ b/devtools/client/webconsole/test/components/new-console-output-wrapper.test.js
@@ -7,18 +7,18 @@
 // Test utils.
 const expect = require("expect");
 const { stubPackets } =
-  require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
+  require("devtools/client/webconsole/test/fixtures/stubs/index");
 const {
   getFirstMessage,
   getLastMessage,
   getMessageAt,
   getPrivatePacket,
-} = require("devtools/client/webconsole/new-console-output/test/helpers");
+} = require("devtools/client/webconsole/test/helpers");
 
 const NewConsoleOutputWrapper =
-  require("devtools/client/webconsole/new-console-output/new-console-output-wrapper");
+  require("devtools/client/webconsole/new-console-output-wrapper");
 const { messagesAdd } =
-  require("devtools/client/webconsole/new-console-output/actions/messages");
+  require("devtools/client/webconsole/actions/messages");
 
 function getNewConsoleOutputWrapper() {
   const jsterm = {
diff --git a/devtools/client/webconsole/new-console-output/test/components/page-error.test.js b/devtools/client/webconsole/test/components/page-error.test.js
similarity index 94%
rename from devtools/client/webconsole/new-console-output/test/components/page-error.test.js
rename to devtools/client/webconsole/test/components/page-error.test.js
index 79a66266136f..a46f3f0582a8 100644
--- a/devtools/client/webconsole/new-console-output/test/components/page-error.test.js
+++ b/devtools/client/webconsole/test/components/page-error.test.js
@@ -10,19 +10,19 @@ const sinon = require("sinon");
 // React
 const { createFactory } = require("devtools/client/shared/vendor/react");
 const Provider = createFactory(require("react-redux").Provider);
-const { setupStore } = require("devtools/client/webconsole/new-console-output/test/helpers");
+const { setupStore } = require("devtools/client/webconsole/test/helpers");
 
 // Components under test.
-const PageError = require("devtools/client/webconsole/new-console-output/components/message-types/PageError");
+const PageError = require("devtools/client/webconsole/components/message-types/PageError");
 const {
   MESSAGE_OPEN,
   MESSAGE_CLOSE,
-} = require("devtools/client/webconsole/new-console-output/constants");
-const { INDENT_WIDTH } = require("devtools/client/webconsole/new-console-output/components/MessageIndent");
+} = require("devtools/client/webconsole/constants");
+const { INDENT_WIDTH } = require("devtools/client/webconsole/components/MessageIndent");
 
 // Test fakes.
-const { stubPreparedMessages } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
-const serviceContainer = require("devtools/client/webconsole/new-console-output/test/fixtures/serviceContainer");
+const { stubPreparedMessages } = require("devtools/client/webconsole/test/fixtures/stubs/index");
+const serviceContainer = require("devtools/client/webconsole/test/fixtures/serviceContainer");
 
 describe("PageError component:", () => {
   it("renders", () => {
diff --git a/devtools/client/webconsole/new-console-output/test/chrome/.eslintrc.js b/devtools/client/webconsole/test/fixtures/.eslintrc.js
similarity index 66%
rename from devtools/client/webconsole/new-console-output/test/chrome/.eslintrc.js
rename to devtools/client/webconsole/test/fixtures/.eslintrc.js
index 677cbb4243df..698ae9181a0a 100644
--- a/devtools/client/webconsole/new-console-output/test/chrome/.eslintrc.js
+++ b/devtools/client/webconsole/test/fixtures/.eslintrc.js
@@ -2,5 +2,5 @@
 
 module.exports = {
   // Extend from the shared list of defined globals for mochitests.
-  "extends": "../../../../../.eslintrc.mochitests.js"
+  "extends": "../../../../.eslintrc.mochitests.js"
 };
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/DebuggerClient.js b/devtools/client/webconsole/test/fixtures/DebuggerClient.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/fixtures/DebuggerClient.js
rename to devtools/client/webconsole/test/fixtures/DebuggerClient.js
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/L10n.js b/devtools/client/webconsole/test/fixtures/L10n.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/fixtures/L10n.js
rename to devtools/client/webconsole/test/fixtures/L10n.js
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/LocalizationHelper.js b/devtools/client/webconsole/test/fixtures/LocalizationHelper.js
similarity index 61%
rename from devtools/client/webconsole/new-console-output/test/fixtures/LocalizationHelper.js
rename to devtools/client/webconsole/test/fixtures/LocalizationHelper.js
index 8e6e9428c67a..917feb22ffa3 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/LocalizationHelper.js
+++ b/devtools/client/webconsole/test/fixtures/LocalizationHelper.js
@@ -3,7 +3,7 @@
 
 "use strict";
 
-const LocalizationHelper = require("devtools/client/webconsole/new-console-output/test/fixtures/L10n");
+const LocalizationHelper = require("devtools/client/webconsole/test/fixtures/L10n");
 
 module.exports = {
   LocalizationHelper
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/PluralForm.js b/devtools/client/webconsole/test/fixtures/PluralForm.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/fixtures/PluralForm.js
rename to devtools/client/webconsole/test/fixtures/PluralForm.js
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/WebConsoleUtils.js b/devtools/client/webconsole/test/fixtures/WebConsoleUtils.js
similarity index 72%
rename from devtools/client/webconsole/new-console-output/test/fixtures/WebConsoleUtils.js
rename to devtools/client/webconsole/test/fixtures/WebConsoleUtils.js
index c391caa7fb21..723dd7c6aba6 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/WebConsoleUtils.js
+++ b/devtools/client/webconsole/test/fixtures/WebConsoleUtils.js
@@ -3,7 +3,7 @@
 
 "use strict";
 
-const L10n = require("devtools/client/webconsole/new-console-output/test/fixtures/L10n");
+const L10n = require("devtools/client/webconsole/test/fixtures/L10n");
 
 const Utils = {
   L10n,
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/moz.build b/devtools/client/webconsole/test/fixtures/moz.build
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/fixtures/moz.build
rename to devtools/client/webconsole/test/fixtures/moz.build
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/serviceContainer.js b/devtools/client/webconsole/test/fixtures/serviceContainer.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/fixtures/serviceContainer.js
rename to devtools/client/webconsole/test/fixtures/serviceContainer.js
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser.ini b/devtools/client/webconsole/test/fixtures/stub-generators/browser.ini
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser.ini
rename to devtools/client/webconsole/test/fixtures/stub-generators/browser.ini
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_check_stubs_console_api.js b/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_console_api.js
similarity index 90%
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_check_stubs_console_api.js
rename to devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_console_api.js
index f99f921ccd17..657a46b9b2c5 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_check_stubs_console_api.js
+++ b/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_console_api.js
@@ -15,7 +15,7 @@ add_task(async function() {
 
   if (generatedStubs != repoStubFileContent) {
     ok(false, "The consoleApi stubs file needs to be updated by running " +
-      "`mach test devtools/client/webconsole/new-console-output/test/fixtures/" +
+      "`mach test devtools/client/webconsole/test/fixtures/" +
       "stub-generators/browser_webconsole_update_stubs_console_api.js`");
   } else {
     ok(true, "The consoleApi stubs file is up to date");
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_check_stubs_css_message.js b/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_css_message.js
similarity index 90%
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_check_stubs_css_message.js
rename to devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_css_message.js
index e6c886888638..bbdcb6fe8d77 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_check_stubs_css_message.js
+++ b/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_css_message.js
@@ -15,7 +15,7 @@ add_task(async function() {
 
   if (generatedStubs != repoStubFileContent) {
     ok(false, "The cssMessage stubs file needs to be updated by running " +
-      "`mach test devtools/client/webconsole/new-console-output/test/fixtures/" +
+      "`mach test devtools/client/webconsole/test/fixtures/" +
       "stub-generators/browser_webconsole_update_stubs_css_message.js`");
   } else {
     ok(true, "The cssMessage stubs file is up to date");
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_check_stubs_evaluation_result.js b/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_evaluation_result.js
similarity index 91%
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_check_stubs_evaluation_result.js
rename to devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_evaluation_result.js
index f35882b386c8..47d38016959d 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_check_stubs_evaluation_result.js
+++ b/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_evaluation_result.js
@@ -15,7 +15,7 @@ add_task(async function() {
 
   if (generatedStubs != repoStubFileContent) {
     ok(false, "The evaluationResult stubs file needs to be updated by running " +
-      "`mach test devtools/client/webconsole/new-console-output/test/fixtures/" +
+      "`mach test devtools/client/webconsole/test/fixtures/" +
       "stub-generators/browser_webconsole_update_stubs_evaluation_result.js`");
   } else {
     ok(true, "The evaluationResult stubs file is up to date");
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_check_stubs_network_event.js b/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_network_event.js
similarity index 91%
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_check_stubs_network_event.js
rename to devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_network_event.js
index f4e3aa711101..9e21dc166f5c 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_check_stubs_network_event.js
+++ b/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_network_event.js
@@ -16,7 +16,7 @@ add_task(async function() {
   is(generatedStubs, repoStubFileContent, "Generated stub has the expected content");
   if (generatedStubs != repoStubFileContent) {
     ok(false, "The networkEvent stubs file needs to be updated by running " +
-      "`mach test devtools/client/webconsole/new-console-output/test/fixtures/" +
+      "`mach test devtools/client/webconsole/test/fixtures/" +
       "stub-generators/browser_webconsole_update_stubs_network_event.js`");
   } else {
     ok(true, "The networkEvent stubs file is up to date");
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_check_stubs_page_error.js b/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_page_error.js
similarity index 90%
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_check_stubs_page_error.js
rename to devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_page_error.js
index 3d8d17b9dd3b..01c32ca0f291 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_check_stubs_page_error.js
+++ b/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_check_stubs_page_error.js
@@ -15,7 +15,7 @@ add_task(async function() {
 
   if (generatedStubs != repoStubFileContent) {
     ok(false, "The pageError stubs file needs to be updated by running " +
-      "`mach test devtools/client/webconsole/new-console-output/test/fixtures/" +
+      "`mach test devtools/client/webconsole/test/fixtures/" +
       "stub-generators/browser_webconsole_update_stubs_page_error.js`");
   } else {
     ok(true, "The pageError stubs file is up to date");
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_console_api.js b/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_console_api.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_console_api.js
rename to devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_console_api.js
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_css_message.js b/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_css_message.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_css_message.js
rename to devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_css_message.js
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_evaluation_result.js b/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_evaluation_result.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_evaluation_result.js
rename to devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_evaluation_result.js
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_network_event.js b/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_network_event.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_network_event.js
rename to devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_network_event.js
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_page_error.js b/devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_page_error.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_update_stubs_page_error.js
rename to devtools/client/webconsole/test/fixtures/stub-generators/browser_webconsole_update_stubs_page_error.js
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/head.js b/devtools/client/webconsole/test/fixtures/stub-generators/head.js
similarity index 94%
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/head.js
rename to devtools/client/webconsole/test/fixtures/stub-generators/head.js
index 32a6d5dcbed8..9e04bd4253be 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/head.js
+++ b/devtools/client/webconsole/test/fixtures/stub-generators/head.js
@@ -2,7 +2,7 @@
 /* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
-/* import-globals-from ../../../../../shared/test/shared-head.js */
+/* import-globals-from ../../../../shared/test/shared-head.js */
 /* exported generateConsoleApiStubs, generateCssMessageStubs,
             generateEvaluationResultStubs, generateNetworkEventStubs,
             generatePageErrorStubs, BASE_PATH */
@@ -18,20 +18,19 @@ Services.prefs.setBoolPref("devtools.webconsole.new-frontend-enabled", true);
 registerCleanupFunction(() => {
   Services.prefs.clearUserPref("devtools.webconsole.new-frontend-enabled");
 });
-const { PREFS } = require("devtools/client/webconsole/new-console-output/constants");
+const { PREFS } = require("devtools/client/webconsole/constants");
 
-const { prepareMessage } = require("devtools/client/webconsole/new-console-output/utils/messages");
-const { stubPackets } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index.js");
+const { prepareMessage } = require("devtools/client/webconsole/utils/messages");
+const { stubPackets } = require("devtools/client/webconsole/test/fixtures/stubs/index.js");
 const {
   consoleApi,
   cssMessage,
   evaluationResult,
   networkEvent,
   pageError,
-} = require("devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/stub-snippets.js");
+} = require("devtools/client/webconsole/test/fixtures/stub-generators/stub-snippets.js");
 
-const BASE_PATH =
-  "../../../../devtools/client/webconsole/new-console-output/test/fixtures";
+const BASE_PATH = "../../../devtools/client/webconsole/test/fixtures";
 
 let cachedPackets = {};
 
@@ -278,7 +277,7 @@ function formatFile(stubs, type) {
  */
 
 const { ${type} } =
-  require("devtools/client/webconsole/new-console-output/types");
+  require("devtools/client/webconsole/types");
 
 let stubPreparedMessages = new Map();
 let stubPackets = new Map();
@@ -294,7 +293,7 @@ module.exports = {
 }
 
 async function generateConsoleApiStubs() {
-  const TEST_URI = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html";
+  const TEST_URI = "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html";
 
   // Hiding log messages so we don't get unwanted client/server communication.
   Services.prefs.setBoolPref(PREFS.FILTER.LOG, false);
@@ -348,7 +347,7 @@ async function generateConsoleApiStubs() {
 }
 
 async function generateCssMessageStubs() {
-  const TEST_URI = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-css-message.html";
+  const TEST_URI = "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-css-message.html";
 
   let stubs = {
     preparedMessages: [],
@@ -412,7 +411,7 @@ async function generateEvaluationResultStubs() {
 }
 
 async function generateNetworkEventStubs() {
-  const TEST_URI = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html";
+  const TEST_URI = "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-network-event.html";
 
   let stubs = {
     preparedMessages: [],
@@ -482,7 +481,7 @@ async function generateNetworkEventStubs() {
 }
 
 async function generatePageErrorStubs() {
-  const TEST_URI = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html";
+  const TEST_URI = "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html";
 
   let stubs = {
     preparedMessages: [],
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/moz.build b/devtools/client/webconsole/test/fixtures/stub-generators/moz.build
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/moz.build
rename to devtools/client/webconsole/test/fixtures/stub-generators/moz.build
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/stub-snippets.js b/devtools/client/webconsole/test/fixtures/stub-generators/stub-snippets.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/stub-snippets.js
rename to devtools/client/webconsole/test/fixtures/stub-generators/stub-snippets.js
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html b/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html
rename to devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-css-message.html b/devtools/client/webconsole/test/fixtures/stub-generators/test-css-message.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-css-message.html
rename to devtools/client/webconsole/test/fixtures/stub-generators/test-css-message.html
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html b/devtools/client/webconsole/test/fixtures/stub-generators/test-network-event.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html
rename to devtools/client/webconsole/test/fixtures/stub-generators/test-network-event.html
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/consoleApi.js b/devtools/client/webconsole/test/fixtures/stubs/consoleApi.js
similarity index 72%
rename from devtools/client/webconsole/new-console-output/test/fixtures/stubs/consoleApi.js
rename to devtools/client/webconsole/test/fixtures/stubs/consoleApi.js
index dde7f70d6aa3..b75a41a7d0bd 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/consoleApi.js
+++ b/devtools/client/webconsole/test/fixtures/stubs/consoleApi.js
@@ -9,7 +9,7 @@
  */
 
 const { ConsoleMessage } =
-  require("devtools/client/webconsole/new-console-output/types");
+  require("devtools/client/webconsole/types");
 
 let stubPreparedMessages = new Map();
 let stubPackets = new Map();
@@ -26,10 +26,10 @@ stubPreparedMessages.set(`console.log('foobar', 'test')`, new ConsoleMessage({
     "foobar",
     "test"
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"foobar\",\"test\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"foobar\",\"test\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 1,
     "column": 27
   },
@@ -56,10 +56,10 @@ stubPreparedMessages.set(`console.log(undefined)`, new ConsoleMessage({
       "type": "undefined"
     }
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"undefined\"}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"undefined\"}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 1,
     "column": 27
   },
@@ -84,10 +84,10 @@ stubPreparedMessages.set(`console.warn('danger, will robinson!')`, new ConsoleMe
   "parameters": [
     "danger, will robinson!"
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":null,\"parameters\":[\"danger, will robinson!\"],\"source\":\"console-api\",\"type\":\"warn\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":null,\"parameters\":[\"danger, will robinson!\"],\"source\":\"console-api\",\"type\":\"warn\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 1,
     "column": 27
   },
@@ -114,10 +114,10 @@ stubPreparedMessages.set(`console.log(NaN)`, new ConsoleMessage({
       "type": "NaN"
     }
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"NaN\"}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"NaN\"}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 1,
     "column": 27
   },
@@ -144,10 +144,10 @@ stubPreparedMessages.set(`console.log(null)`, new ConsoleMessage({
       "type": "null"
     }
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"null\"}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"null\"}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 1,
     "column": 27
   },
@@ -172,10 +172,10 @@ stubPreparedMessages.set(`console.log('鼬')`, new ConsoleMessage({
   "parameters": [
     "鼬"
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"鼬\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"鼬\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 1,
     "column": 27
   },
@@ -200,10 +200,10 @@ stubPreparedMessages.set(`console.clear()`, new ConsoleMessage({
   "parameters": [
     "Console was cleared."
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"Console was cleared.\"],\"source\":\"console-api\",\"type\":\"clear\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"Console was cleared.\"],\"source\":\"console-api\",\"type\":\"clear\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 1,
     "column": 27
   },
@@ -226,10 +226,10 @@ stubPreparedMessages.set(`console.count('bar')`, new ConsoleMessage({
   "level": "log",
   "messageText": "bar: 1",
   "parameters": null,
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"bar: 1\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"bar: 1\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 1,
     "column": 27
   },
@@ -277,17 +277,17 @@ stubPreparedMessages.set(`console.assert(false, {message: 'foobar'})`, new Conso
       }
     }
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":null,\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj30\",\"class\":\"Object\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":1,\"preview\":{\"kind\":\"Object\",\"ownProperties\":{\"message\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"foobar\"}},\"ownSymbols\":[],\"ownPropertiesLength\":1,\"ownSymbolsLength\":0,\"safeGetterValues\":{}}}],\"source\":\"console-api\",\"type\":\"assert\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":null,\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj30\",\"class\":\"Object\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":1,\"preview\":{\"kind\":\"Object\",\"ownProperties\":{\"message\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"foobar\"}},\"ownSymbols\":[],\"ownPropertiesLength\":1,\"ownSymbolsLength\":0,\"safeGetterValues\":{}}}],\"source\":\"console-api\",\"type\":\"assert\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": [
     {
       "columnNumber": 27,
-      "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+      "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
       "functionName": "triggerPacket",
       "lineNumber": 1
     }
   ],
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 1,
     "column": 27
   },
@@ -312,10 +312,10 @@ stubPreparedMessages.set(`console.log('hello \nfrom \rthe \"string world!')`, ne
   "parameters": [
     "hello \nfrom \rthe \"string world!"
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"hello \\nfrom \\rthe \\\"string world!\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"hello \\nfrom \\rthe \\\"string world!\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 1,
     "column": 27
   },
@@ -340,10 +340,10 @@ stubPreparedMessages.set(`console.log('úṇĩçödê țĕșť')`, new ConsoleMe
   "parameters": [
     "úṇĩçödê țĕșť"
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"úṇĩçödê țĕșť\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"úṇĩçödê țĕșť\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 1,
     "column": 27
   },
@@ -376,14 +376,14 @@ stubPreparedMessages.set(`console.dirxml(window)`, new ConsoleMessage({
       "ownPropertyLength": 830,
       "preview": {
         "kind": "ObjectWithURL",
-        "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html"
+        "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html"
       }
     }
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj31\",\"class\":\"Window\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":830,\"preview\":{\"kind\":\"ObjectWithURL\",\"url\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\"}}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj31\",\"class\":\"Window\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":830,\"preview\":{\"kind\":\"ObjectWithURL\",\"url\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\"}}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 1,
     "column": 27
   },
@@ -426,10 +426,10 @@ stubPreparedMessages.set(`console.log('myarray', ['red', 'green', 'blue'])`, new
       }
     }
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"myarray\",{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj32\",\"class\":\"Array\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":4,\"preview\":{\"kind\":\"ArrayLike\",\"length\":3,\"items\":[\"red\",\"green\",\"blue\"]}}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"myarray\",{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj32\",\"class\":\"Array\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":4,\"preview\":{\"kind\":\"ArrayLike\",\"length\":3,\"items\":[\"red\",\"green\",\"blue\"]}}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 1,
     "column": 27
   },
@@ -464,10 +464,10 @@ stubPreparedMessages.set(`console.log('myregex', /a.b.c/)`, new ConsoleMessage({
       "displayString": "/a.b.c/"
     }
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"myregex\",{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj33\",\"class\":\"RegExp\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":1,\"displayString\":\"/a.b.c/\"}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"myregex\",{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj33\",\"class\":\"RegExp\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":1,\"displayString\":\"/a.b.c/\"}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 1,
     "column": 27
   },
@@ -509,10 +509,10 @@ stubPreparedMessages.set(`console.table(['red', 'green', 'blue']);`, new Console
       }
     }
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj34\",\"class\":\"Array\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":4,\"preview\":{\"kind\":\"ArrayLike\",\"length\":3,\"items\":[\"red\",\"green\",\"blue\"]}}],\"source\":\"console-api\",\"type\":\"table\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj34\",\"class\":\"Array\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":4,\"preview\":{\"kind\":\"ArrayLike\",\"length\":3,\"items\":[\"red\",\"green\",\"blue\"]}}],\"source\":\"console-api\",\"type\":\"table\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 1,
     "column": 27
   },
@@ -573,10 +573,10 @@ stubPreparedMessages.set(`console.log('myobject', {red: 'redValue', green: 'gree
       }
     }
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"myobject\",{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj35\",\"class\":\"Object\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":3,\"preview\":{\"kind\":\"Object\",\"ownProperties\":{\"red\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"redValue\"},\"green\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"greenValue\"},\"blue\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"blueValue\"}},\"ownSymbols\":[],\"ownPropertiesLength\":3,\"ownSymbolsLength\":0,\"safeGetterValues\":{}}}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"myobject\",{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj35\",\"class\":\"Object\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":3,\"preview\":{\"kind\":\"Object\",\"ownProperties\":{\"red\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"redValue\"},\"green\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"greenValue\"},\"blue\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"blueValue\"}},\"ownSymbols\":[],\"ownPropertiesLength\":3,\"ownSymbolsLength\":0,\"safeGetterValues\":{}}}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 1,
     "column": 27
   },
@@ -601,10 +601,10 @@ stubPreparedMessages.set(`console.debug('debug message');`, new ConsoleMessage({
   "parameters": [
     "debug message"
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"debug\",\"messageText\":null,\"parameters\":[\"debug message\"],\"source\":\"console-api\",\"type\":\"debug\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"debug\",\"messageText\":null,\"parameters\":[\"debug message\"],\"source\":\"console-api\",\"type\":\"debug\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 1,
     "column": 27
   },
@@ -629,10 +629,10 @@ stubPreparedMessages.set(`console.info('info message');`, new ConsoleMessage({
   "parameters": [
     "info message"
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"info\",\"messageText\":null,\"parameters\":[\"info message\"],\"source\":\"console-api\",\"type\":\"info\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"info\",\"messageText\":null,\"parameters\":[\"info message\"],\"source\":\"console-api\",\"type\":\"info\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 1,
     "column": 27
   },
@@ -657,17 +657,17 @@ stubPreparedMessages.set(`console.error('error message');`, new ConsoleMessage({
   "parameters": [
     "error message"
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":null,\"parameters\":[\"error message\"],\"source\":\"console-api\",\"type\":\"error\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":null,\"parameters\":[\"error message\"],\"source\":\"console-api\",\"type\":\"error\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": [
     {
       "columnNumber": 27,
-      "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+      "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
       "functionName": "triggerPacket",
       "lineNumber": 1
     }
   ],
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 1,
     "column": 27
   },
@@ -715,10 +715,10 @@ stubPreparedMessages.set(`console.log('mymap')`, new ConsoleMessage({
       }
     }
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":5,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"mymap\",{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj36\",\"class\":\"Map\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":0,\"preview\":{\"kind\":\"MapLike\",\"size\":2,\"entries\":[[\"key1\",\"value1\"],[\"key2\",\"value2\"]]}}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":5,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"mymap\",{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj36\",\"class\":\"Map\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":0,\"preview\":{\"kind\":\"MapLike\",\"size\":2,\"entries\":[[\"key1\",\"value1\"],[\"key2\",\"value2\"]]}}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 5,
     "column": 1
   },
@@ -760,10 +760,10 @@ stubPreparedMessages.set(`console.log('myset')`, new ConsoleMessage({
       }
     }
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"myset\",{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj37\",\"class\":\"Set\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":0,\"preview\":{\"kind\":\"ArrayLike\",\"length\":2,\"items\":[\"a\",\"b\"]}}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"myset\",{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj37\",\"class\":\"Set\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":0,\"preview\":{\"kind\":\"ArrayLike\",\"length\":2,\"items\":[\"a\",\"b\"]}}],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 2,
     "column": 1
   },
@@ -786,29 +786,29 @@ stubPreparedMessages.set(`console.trace()`, new ConsoleMessage({
   "level": "log",
   "messageText": null,
   "parameters": [],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":3,\"column\":3},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[],\"source\":\"console-api\",\"type\":\"trace\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":3,\"column\":3},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[],\"source\":\"console-api\",\"type\":\"trace\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": [
     {
       "columnNumber": 3,
-      "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+      "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
       "functionName": "testStacktraceFiltering",
       "lineNumber": 3
     },
     {
       "columnNumber": 3,
-      "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+      "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
       "functionName": "foo",
       "lineNumber": 6
     },
     {
       "columnNumber": 1,
-      "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+      "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
       "functionName": "triggerPacket",
       "lineNumber": 9
     }
   ],
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 3,
     "column": 3
   },
@@ -831,10 +831,10 @@ stubPreparedMessages.set(`console.time('bar')`, new ConsoleMessage({
   "level": "log",
   "messageText": null,
   "parameters": null,
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"nullMessage\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"nullMessage\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 2,
     "column": 1
   },
@@ -857,10 +857,10 @@ stubPreparedMessages.set(`timerAlreadyExists`, new ConsoleMessage({
   "level": "warn",
   "messageText": "Timer “bar” already exists.",
   "parameters": null,
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":3,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":\"Timer “bar” already exists.\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"time\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":3,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":\"Timer “bar” already exists.\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"time\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 3,
     "column": 1
   },
@@ -883,10 +883,10 @@ stubPreparedMessages.set(`console.timeEnd('bar')`, new ConsoleMessage({
   "level": "log",
   "messageText": "bar: 1.21ms",
   "parameters": null,
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":4,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"bar: 1.21ms\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"timeEnd\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":4,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"bar: 1.21ms\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"timeEnd\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 4,
     "column": 1
   },
@@ -909,10 +909,10 @@ stubPreparedMessages.set(`timerDoesntExist`, new ConsoleMessage({
   "level": "warn",
   "messageText": "Timer “bar” doesn’t exist.",
   "parameters": null,
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":5,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":\"Timer “bar” doesn’t exist.\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"timeEnd\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":5,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":\"Timer “bar” doesn’t exist.\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"timeEnd\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 5,
     "column": 1
   },
@@ -937,10 +937,10 @@ stubPreparedMessages.set(`console.table('bar')`, new ConsoleMessage({
   "parameters": [
     "bar"
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"bar\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"bar\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 2,
     "column": 1
   },
@@ -982,10 +982,10 @@ stubPreparedMessages.set(`console.table(['a', 'b', 'c'])`, new ConsoleMessage({
       }
     }
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj39\",\"class\":\"Array\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":4,\"preview\":{\"kind\":\"ArrayLike\",\"length\":3,\"items\":[\"a\",\"b\",\"c\"]}}],\"source\":\"console-api\",\"type\":\"table\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj39\",\"class\":\"Array\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":4,\"preview\":{\"kind\":\"ArrayLike\",\"length\":3,\"items\":[\"a\",\"b\",\"c\"]}}],\"source\":\"console-api\",\"type\":\"table\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 2,
     "column": 1
   },
@@ -1010,10 +1010,10 @@ stubPreparedMessages.set(`console.group('bar')`, new ConsoleMessage({
   "parameters": [
     "bar"
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"bar\"],\"source\":\"console-api\",\"type\":\"startGroup\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"bar\"],\"source\":\"console-api\",\"type\":\"startGroup\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 2,
     "column": 1
   },
@@ -1036,10 +1036,10 @@ stubPreparedMessages.set(`console.groupEnd('bar')`, new ConsoleMessage({
   "level": "log",
   "messageText": null,
   "parameters": null,
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":3,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":3,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 3,
     "column": 1
   },
@@ -1064,10 +1064,10 @@ stubPreparedMessages.set(`console.groupCollapsed('foo')`, new ConsoleMessage({
   "parameters": [
     "foo"
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"foo\"],\"source\":\"console-api\",\"type\":\"startGroupCollapsed\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"foo\"],\"source\":\"console-api\",\"type\":\"startGroupCollapsed\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 2,
     "column": 1
   },
@@ -1090,10 +1090,10 @@ stubPreparedMessages.set(`console.groupEnd('foo')`, new ConsoleMessage({
   "level": "log",
   "messageText": null,
   "parameters": null,
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":3,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":3,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 3,
     "column": 1
   },
@@ -1118,10 +1118,10 @@ stubPreparedMessages.set(`console.group()`, new ConsoleMessage({
   "parameters": [
     "<no group label>"
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"<no group label>\"],\"source\":\"console-api\",\"type\":\"startGroup\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"<no group label>\"],\"source\":\"console-api\",\"type\":\"startGroup\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 2,
     "column": 1
   },
@@ -1144,10 +1144,10 @@ stubPreparedMessages.set(`console.groupEnd()`, new ConsoleMessage({
   "level": "log",
   "messageText": null,
   "parameters": null,
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":3,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":3,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 3,
     "column": 1
   },
@@ -1173,10 +1173,10 @@ stubPreparedMessages.set(`console.log(%cfoobar)`, new ConsoleMessage({
     "foo",
     "bar"
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"foo\",\"bar\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[\"color:blue; font-size:1.3em; background:url('http://example.com/test'); position:absolute; top:10px; \",\"color:red; line-height: 1.5; background:url('http://example.com/test')\"],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"foo\",\"bar\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[\"color:blue; font-size:1.3em; background:url('http://example.com/test'); position:absolute; top:10px; \",\"color:red; line-height: 1.5; background:url('http://example.com/test')\"],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 2,
     "column": 1
   },
@@ -1206,10 +1206,10 @@ stubPreparedMessages.set(`console.log("%cHello%c|%cWorld")`, new ConsoleMessage(
     "|",
     "World"
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":3},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"Hello\",\"|\",\"World\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[\"color:red\",\"\",\"color: blue\"],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":3},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"Hello\",\"|\",\"World\"],\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[\"color:red\",\"\",\"color: blue\"],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 2,
     "column": 3
   },
@@ -1239,10 +1239,10 @@ stubPreparedMessages.set(`console.group(%cfoo%cbar)`, new ConsoleMessage({
     "foo",
     "bar"
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"foo\",\"bar\"],\"source\":\"console-api\",\"type\":\"startGroup\",\"userProvidedStyles\":[\"color:blue;font-size:1.3em;background:url('http://example.com/test');position:absolute;top:10px\",\"color:red;background:url('http://example.com/test')\"],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"foo\",\"bar\"],\"source\":\"console-api\",\"type\":\"startGroup\",\"userProvidedStyles\":[\"color:blue;font-size:1.3em;background:url('http://example.com/test');position:absolute;top:10px\",\"color:red;background:url('http://example.com/test')\"],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 2,
     "column": 1
   },
@@ -1268,10 +1268,10 @@ stubPreparedMessages.set(`console.groupEnd(%cfoo%cbar)`, new ConsoleMessage({
   "level": "log",
   "messageText": null,
   "parameters": null,
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":6,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":6,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 6,
     "column": 1
   },
@@ -1297,10 +1297,10 @@ stubPreparedMessages.set(`console.groupCollapsed(%cfoo%cbaz)`, new ConsoleMessag
     "foo",
     "baz"
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"foo\",\"baz\"],\"source\":\"console-api\",\"type\":\"startGroupCollapsed\",\"userProvidedStyles\":[\"color:blue;font-size:1.3em;background:url('http://example.com/test');position:absolute;top:10px\",\"color:red;background:url('http://example.com/test')\"],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"foo\",\"baz\"],\"source\":\"console-api\",\"type\":\"startGroupCollapsed\",\"userProvidedStyles\":[\"color:blue;font-size:1.3em;background:url('http://example.com/test');position:absolute;top:10px\",\"color:red;background:url('http://example.com/test')\"],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 2,
     "column": 1
   },
@@ -1326,10 +1326,10 @@ stubPreparedMessages.set(`console.groupEnd(%cfoo%cbaz)`, new ConsoleMessage({
   "level": "log",
   "messageText": null,
   "parameters": null,
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":6,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":6,\"column\":1},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":null,\"source\":\"console-api\",\"type\":\"endGroup\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 6,
     "column": 1
   },
@@ -1395,10 +1395,10 @@ stubPreparedMessages.set(`console.dir({C, M, Y, K})`, new ConsoleMessage({
       }
     }
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj36\",\"class\":\"Object\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":4,\"preview\":{\"kind\":\"Object\",\"ownProperties\":{\"cyan\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"C\"},\"magenta\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"M\"},\"yellow\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"Y\"},\"black\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"K\"}},\"ownSymbols\":[],\"ownPropertiesLength\":4,\"ownSymbolsLength\":0,\"safeGetterValues\":{}}}],\"source\":\"console-api\",\"type\":\"dir\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":27},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[{\"type\":\"object\",\"actor\":\"server1.conn0.child1/obj36\",\"class\":\"Object\",\"extensible\":true,\"frozen\":false,\"sealed\":false,\"ownPropertyLength\":4,\"preview\":{\"kind\":\"Object\",\"ownProperties\":{\"cyan\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"C\"},\"magenta\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"M\"},\"yellow\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"Y\"},\"black\":{\"configurable\":true,\"enumerable\":true,\"writable\":true,\"value\":\"K\"}},\"ownSymbols\":[],\"ownPropertiesLength\":4,\"ownSymbolsLength\":0,\"safeGetterValues\":{}}}],\"source\":\"console-api\",\"type\":\"dir\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 1,
     "column": 27
   },
@@ -1421,10 +1421,10 @@ stubPreparedMessages.set(`console.count | default: 1`, new ConsoleMessage({
   "level": "log",
   "messageText": "default: 1",
   "parameters": null,
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"default: 1\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"default: 1\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 2,
     "column": 5
   },
@@ -1447,10 +1447,10 @@ stubPreparedMessages.set(`console.count | default: 2`, new ConsoleMessage({
   "level": "log",
   "messageText": "default: 2",
   "parameters": null,
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":3,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"default: 2\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":3,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"default: 2\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 3,
     "column": 5
   },
@@ -1473,10 +1473,10 @@ stubPreparedMessages.set(`console.count | test counter: 1`, new ConsoleMessage({
   "level": "log",
   "messageText": "test counter: 1",
   "parameters": null,
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":4,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"test counter: 1\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":4,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"test counter: 1\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 4,
     "column": 5
   },
@@ -1499,10 +1499,10 @@ stubPreparedMessages.set(`console.count | test counter: 2`, new ConsoleMessage({
   "level": "log",
   "messageText": "test counter: 2",
   "parameters": null,
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":5,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"test counter: 2\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":5,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"test counter: 2\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 5,
     "column": 5
   },
@@ -1525,10 +1525,10 @@ stubPreparedMessages.set(`console.count | default: 3`, new ConsoleMessage({
   "level": "log",
   "messageText": "default: 3",
   "parameters": null,
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":6,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"default: 3\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":6,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"default: 3\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 6,
     "column": 5
   },
@@ -1553,10 +1553,10 @@ stubPreparedMessages.set(`console.count | clear`, new ConsoleMessage({
   "parameters": [
     "Console was cleared."
   ],
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":7,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"Console was cleared.\"],\"source\":\"console-api\",\"type\":\"clear\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":7,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":null,\"parameters\":[\"Console was cleared.\"],\"source\":\"console-api\",\"type\":\"clear\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 7,
     "column": 5
   },
@@ -1579,10 +1579,10 @@ stubPreparedMessages.set(`console.count | default: 4`, new ConsoleMessage({
   "level": "log",
   "messageText": "default: 4",
   "parameters": null,
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":8,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"default: 4\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":8,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"default: 4\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 8,
     "column": 5
   },
@@ -1605,10 +1605,10 @@ stubPreparedMessages.set(`console.count | test counter: 3`, new ConsoleMessage({
   "level": "log",
   "messageText": "test counter: 3",
   "parameters": null,
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":9,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"test counter: 3\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":9,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"test counter: 3\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 9,
     "column": 5
   },
@@ -1632,7 +1632,7 @@ stubPackets.set(`console.log('foobar', 'test')`, {
     ],
     "columnNumber": 27,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "log",
@@ -1659,7 +1659,7 @@ stubPackets.set(`console.log(undefined)`, {
     ],
     "columnNumber": 27,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "log",
@@ -1684,7 +1684,7 @@ stubPackets.set(`console.warn('danger, will robinson!')`, {
     ],
     "columnNumber": 27,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "warn",
@@ -1711,7 +1711,7 @@ stubPackets.set(`console.log(NaN)`, {
     ],
     "columnNumber": 27,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "log",
@@ -1738,7 +1738,7 @@ stubPackets.set(`console.log(null)`, {
     ],
     "columnNumber": 27,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "log",
@@ -1763,7 +1763,7 @@ stubPackets.set(`console.log('鼬')`, {
     ],
     "columnNumber": 27,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "log",
@@ -1786,7 +1786,7 @@ stubPackets.set(`console.clear()`, {
     "arguments": [],
     "columnNumber": 27,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "clear",
@@ -1814,7 +1814,7 @@ stubPackets.set(`console.count('bar')`, {
       "count": 1,
       "label": "bar"
     },
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "count",
@@ -1862,7 +1862,7 @@ stubPackets.set(`console.assert(false, {message: 'foobar'})`, {
     ],
     "columnNumber": 27,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "assert",
@@ -1875,7 +1875,7 @@ stubPackets.set(`console.assert(false, {message: 'foobar'})`, {
     "stacktrace": [
       {
         "columnNumber": 27,
-        "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+        "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
         "functionName": "triggerPacket",
         "lineNumber": 1
       }
@@ -1895,7 +1895,7 @@ stubPackets.set(`console.log('hello \nfrom \rthe \"string world!')`, {
     ],
     "columnNumber": 27,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "log",
@@ -1920,7 +1920,7 @@ stubPackets.set(`console.log('úṇĩçödê țĕșť')`, {
     ],
     "columnNumber": 27,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "log",
@@ -1951,13 +1951,13 @@ stubPackets.set(`console.dirxml(window)`, {
         "ownPropertyLength": 830,
         "preview": {
           "kind": "ObjectWithURL",
-          "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html"
+          "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html"
         }
       }
     ],
     "columnNumber": 27,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "dirxml",
@@ -2000,7 +2000,7 @@ stubPackets.set(`console.log('myarray', ['red', 'green', 'blue'])`, {
     ],
     "columnNumber": 27,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "log",
@@ -2035,7 +2035,7 @@ stubPackets.set(`console.log('myregex', /a.b.c/)`, {
     ],
     "columnNumber": 27,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "log",
@@ -2077,7 +2077,7 @@ stubPackets.set(`console.table(['red', 'green', 'blue']);`, {
     ],
     "columnNumber": 27,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "table",
@@ -2138,7 +2138,7 @@ stubPackets.set(`console.log('myobject', {red: 'redValue', green: 'greenValue',
     ],
     "columnNumber": 27,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "log",
@@ -2163,7 +2163,7 @@ stubPackets.set(`console.debug('debug message');`, {
     ],
     "columnNumber": 27,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "debug",
@@ -2188,7 +2188,7 @@ stubPackets.set(`console.info('info message');`, {
     ],
     "columnNumber": 27,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "info",
@@ -2213,7 +2213,7 @@ stubPackets.set(`console.error('error message');`, {
     ],
     "columnNumber": 27,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "error",
@@ -2226,7 +2226,7 @@ stubPackets.set(`console.error('error message');`, {
     "stacktrace": [
       {
         "columnNumber": 27,
-        "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+        "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
         "functionName": "triggerPacket",
         "lineNumber": 1
       }
@@ -2269,7 +2269,7 @@ stubPackets.set(`console.log('mymap')`, {
     ],
     "columnNumber": 1,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "log",
@@ -2311,7 +2311,7 @@ stubPackets.set(`console.log('myset')`, {
     ],
     "columnNumber": 1,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "log",
@@ -2334,7 +2334,7 @@ stubPackets.set(`console.trace()`, {
     "arguments": [],
     "columnNumber": 3,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "testStacktraceFiltering",
     "groupName": "",
     "level": "trace",
@@ -2346,19 +2346,19 @@ stubPackets.set(`console.trace()`, {
     "stacktrace": [
       {
         "columnNumber": 3,
-        "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+        "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
         "functionName": "testStacktraceFiltering",
         "lineNumber": 3
       },
       {
         "columnNumber": 3,
-        "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+        "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
         "functionName": "foo",
         "lineNumber": 6
       },
       {
         "columnNumber": 1,
-        "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+        "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
         "functionName": "triggerPacket",
         "lineNumber": 9
       }
@@ -2379,7 +2379,7 @@ stubPackets.set(`console.time('bar')`, {
     ],
     "columnNumber": 1,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "time",
@@ -2406,7 +2406,7 @@ stubPackets.set(`timerAlreadyExists`, {
     ],
     "columnNumber": 1,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "time",
@@ -2434,7 +2434,7 @@ stubPackets.set(`console.timeEnd('bar')`, {
     ],
     "columnNumber": 1,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "timeEnd",
@@ -2462,7 +2462,7 @@ stubPackets.set(`timerDoesntExist`, {
     ],
     "columnNumber": 1,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "timeEnd",
@@ -2490,7 +2490,7 @@ stubPackets.set(`console.table('bar')`, {
     ],
     "columnNumber": 1,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "table",
@@ -2532,7 +2532,7 @@ stubPackets.set(`console.table(['a', 'b', 'c'])`, {
     ],
     "columnNumber": 1,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "table",
@@ -2557,7 +2557,7 @@ stubPackets.set(`console.group('bar')`, {
     ],
     "columnNumber": 1,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "bar",
     "level": "group",
@@ -2580,7 +2580,7 @@ stubPackets.set(`console.groupEnd('bar')`, {
     "arguments": [],
     "columnNumber": 1,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "bar",
     "level": "groupEnd",
@@ -2605,7 +2605,7 @@ stubPackets.set(`console.groupCollapsed('foo')`, {
     ],
     "columnNumber": 1,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "foo",
     "level": "groupCollapsed",
@@ -2628,7 +2628,7 @@ stubPackets.set(`console.groupEnd('foo')`, {
     "arguments": [],
     "columnNumber": 1,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "foo",
     "level": "groupEnd",
@@ -2651,7 +2651,7 @@ stubPackets.set(`console.group()`, {
     "arguments": [],
     "columnNumber": 1,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "group",
@@ -2674,7 +2674,7 @@ stubPackets.set(`console.groupEnd()`, {
     "arguments": [],
     "columnNumber": 1,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "groupEnd",
@@ -2700,7 +2700,7 @@ stubPackets.set(`console.log(%cfoobar)`, {
     ],
     "columnNumber": 1,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "log",
@@ -2730,7 +2730,7 @@ stubPackets.set(`console.log("%cHello%c|%cWorld")`, {
     ],
     "columnNumber": 3,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "log",
@@ -2760,7 +2760,7 @@ stubPackets.set(`console.group(%cfoo%cbar)`, {
     ],
     "columnNumber": 1,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "foo bar",
     "level": "group",
@@ -2786,7 +2786,7 @@ stubPackets.set(`console.groupEnd(%cfoo%cbar)`, {
     "arguments": [],
     "columnNumber": 1,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "foo bar",
     "level": "groupEnd",
@@ -2812,7 +2812,7 @@ stubPackets.set(`console.groupCollapsed(%cfoo%cbaz)`, {
     ],
     "columnNumber": 1,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "foo baz",
     "level": "groupCollapsed",
@@ -2838,7 +2838,7 @@ stubPackets.set(`console.groupEnd(%cfoo%cbaz)`, {
     "arguments": [],
     "columnNumber": 1,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "foo baz",
     "level": "groupEnd",
@@ -2904,7 +2904,7 @@ stubPackets.set(`console.dir({C, M, Y, K})`, {
     ],
     "columnNumber": 27,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "dir",
@@ -2932,7 +2932,7 @@ stubPackets.set(`console.count | default: 1`, {
       "count": 1,
       "label": "default"
     },
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "count",
@@ -2960,7 +2960,7 @@ stubPackets.set(`console.count | default: 2`, {
       "count": 2,
       "label": "default"
     },
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "count",
@@ -2988,7 +2988,7 @@ stubPackets.set(`console.count | test counter: 1`, {
       "count": 1,
       "label": "test counter"
     },
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "count",
@@ -3016,7 +3016,7 @@ stubPackets.set(`console.count | test counter: 2`, {
       "count": 2,
       "label": "test counter"
     },
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "count",
@@ -3044,7 +3044,7 @@ stubPackets.set(`console.count | default: 3`, {
       "count": 3,
       "label": "default"
     },
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "count",
@@ -3067,7 +3067,7 @@ stubPackets.set(`console.count | clear`, {
     "arguments": [],
     "columnNumber": 5,
     "counter": null,
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "clear",
@@ -3095,7 +3095,7 @@ stubPackets.set(`console.count | default: 4`, {
       "count": 4,
       "label": "default"
     },
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "count",
@@ -3123,7 +3123,7 @@ stubPackets.set(`console.count | test counter: 3`, {
       "count": 3,
       "label": "test counter"
     },
-    "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "functionName": "triggerPacket",
     "groupName": "",
     "level": "count",
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/cssMessage.js b/devtools/client/webconsole/test/fixtures/stubs/cssMessage.js
similarity index 73%
rename from devtools/client/webconsole/new-console-output/test/fixtures/stubs/cssMessage.js
rename to devtools/client/webconsole/test/fixtures/stubs/cssMessage.js
index 984a560dd6b5..a2489325dd41 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/cssMessage.js
+++ b/devtools/client/webconsole/test/fixtures/stubs/cssMessage.js
@@ -9,7 +9,7 @@
  */
 
 const { ConsoleMessage } =
-  require("devtools/client/webconsole/new-console-output/types");
+  require("devtools/client/webconsole/types");
 
 let stubPreparedMessages = new Map();
 let stubPackets = new Map();
@@ -23,10 +23,10 @@ stubPreparedMessages.set(`Unknown property ‘such-unknown-property’.  Declara
   "level": "warn",
   "messageText": "Unknown property ‘such-unknown-property’.  Declaration dropped.",
   "parameters": null,
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-css-message.html\",\"line\":3,\"column\":25},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":\"Unknown property ‘such-unknown-property’.  Declaration dropped.\",\"parameters\":null,\"source\":\"css\",\"type\":\"log\",\"userProvidedStyles\":null,\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-css-message.html\",\"line\":3,\"column\":25},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":\"Unknown property ‘such-unknown-property’.  Declaration dropped.\",\"parameters\":null,\"source\":\"css\",\"type\":\"log\",\"userProvidedStyles\":null,\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-css-message.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-css-message.html",
     "line": 3,
     "column": 25
   },
@@ -48,10 +48,10 @@ stubPreparedMessages.set(`Error in parsing value for ‘padding-top’.  Declara
   "level": "warn",
   "messageText": "Error in parsing value for ‘padding-top’.  Declaration dropped.",
   "parameters": null,
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-css-message.html\",\"line\":3,\"column\":16},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":\"Error in parsing value for ‘padding-top’.  Declaration dropped.\",\"parameters\":null,\"source\":\"css\",\"type\":\"log\",\"userProvidedStyles\":null,\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-css-message.html\",\"line\":3,\"column\":16},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":\"Error in parsing value for ‘padding-top’.  Declaration dropped.\",\"parameters\":null,\"source\":\"css\",\"type\":\"log\",\"userProvidedStyles\":null,\"private\":false}",
   "stacktrace": null,
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-css-message.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-css-message.html",
     "line": 3,
     "column": 16
   },
@@ -69,7 +69,7 @@ stubPackets.set(`Unknown property ‘such-unknown-property’.  Declaration drop
   "pageError": {
     "errorMessage": "Unknown property ‘such-unknown-property’.  Declaration dropped.",
     "errorMessageName": "",
-    "sourceName": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-css-message.html",
+    "sourceName": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-css-message.html",
     "lineText": "",
     "lineNumber": 3,
     "columnNumber": 25,
@@ -92,7 +92,7 @@ stubPackets.set(`Error in parsing value for ‘padding-top’.  Declaration drop
   "pageError": {
     "errorMessage": "Error in parsing value for ‘padding-top’.  Declaration dropped.",
     "errorMessageName": "",
-    "sourceName": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-css-message.html",
+    "sourceName": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-css-message.html",
     "lineText": "",
     "lineNumber": 3,
     "columnNumber": 16,
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/evaluationResult.js b/devtools/client/webconsole/test/fixtures/stubs/evaluationResult.js
similarity index 99%
rename from devtools/client/webconsole/new-console-output/test/fixtures/stubs/evaluationResult.js
rename to devtools/client/webconsole/test/fixtures/stubs/evaluationResult.js
index 8166581c0d76..50fd537c7024 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/evaluationResult.js
+++ b/devtools/client/webconsole/test/fixtures/stubs/evaluationResult.js
@@ -9,7 +9,7 @@
  */
 
 const { ConsoleMessage } =
-  require("devtools/client/webconsole/new-console-output/types");
+  require("devtools/client/webconsole/types");
 
 let stubPreparedMessages = new Map();
 let stubPackets = new Map();
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/index.js b/devtools/client/webconsole/test/fixtures/stubs/index.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/fixtures/stubs/index.js
rename to devtools/client/webconsole/test/fixtures/stubs/index.js
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/moz.build b/devtools/client/webconsole/test/fixtures/stubs/moz.build
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/fixtures/stubs/moz.build
rename to devtools/client/webconsole/test/fixtures/stubs/moz.build
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/networkEvent.js b/devtools/client/webconsole/test/fixtures/stubs/networkEvent.js
similarity index 81%
rename from devtools/client/webconsole/new-console-output/test/fixtures/stubs/networkEvent.js
rename to devtools/client/webconsole/test/fixtures/stubs/networkEvent.js
index 637710439bf2..808baf21ffb9 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/networkEvent.js
+++ b/devtools/client/webconsole/test/fixtures/stubs/networkEvent.js
@@ -9,7 +9,7 @@
  */
 
 const { NetworkEventMessage } =
-  require("devtools/client/webconsole/new-console-output/types");
+  require("devtools/client/webconsole/types");
 
 let stubPreparedMessages = new Map();
 let stubPackets = new Map();
@@ -19,7 +19,7 @@ stubPreparedMessages.set("GET request", new NetworkEventMessage({
   "level": "log",
   "isXHR": false,
   "request": {
-    "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+    "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
     "method": "GET"
   },
   "response": {},
@@ -34,18 +34,18 @@ stubPreparedMessages.set("GET request", new NetworkEventMessage({
   "securityInfo": null,
   "requestHeadersFromUploadStream": null,
   "private": false,
-  "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+  "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
   "urlDetails": {
     "baseNameWithQuery": "inexistent.html",
     "host": "example.com",
     "scheme": "http",
-    "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+    "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
     "isLocal": null
   },
   "method": "GET",
   "cause": {
     "type": "img",
-    "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html",
+    "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-network-event.html",
     "stacktraceAvailable": true
   }
 }));
@@ -55,7 +55,7 @@ stubPreparedMessages.set("GET request update", new NetworkEventMessage({
   "actor": "server1.conn0.child1/netEvent30",
   "level": "log",
   "request": {
-    "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+    "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
     "method": "GET",
     "headersSize": 489
   },
@@ -81,12 +81,12 @@ stubPreparedMessages.set("GET request update", new NetworkEventMessage({
   "securityState": null,
   "securityInfo": null,
   "requestHeadersFromUploadStream": null,
-  "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+  "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
   "urlDetails": {
     "baseNameWithQuery": "inexistent.html",
     "host": "example.com",
     "scheme": "http",
-    "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+    "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
     "isLocal": null
   },
   "method": "GET"
@@ -98,7 +98,7 @@ stubPreparedMessages.set("XHR GET request", new NetworkEventMessage({
   "level": "log",
   "isXHR": true,
   "request": {
-    "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+    "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
     "method": "GET"
   },
   "response": {},
@@ -113,18 +113,18 @@ stubPreparedMessages.set("XHR GET request", new NetworkEventMessage({
   "securityInfo": null,
   "requestHeadersFromUploadStream": null,
   "private": false,
-  "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+  "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
   "urlDetails": {
     "baseNameWithQuery": "inexistent.html",
     "host": "example.com",
     "scheme": "http",
-    "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+    "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
     "isLocal": null
   },
   "method": "GET",
   "cause": {
     "type": "xhr",
-    "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html",
+    "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-network-event.html",
     "stacktraceAvailable": true
   }
 }));
@@ -134,7 +134,7 @@ stubPreparedMessages.set("XHR GET request update", new NetworkEventMessage({
   "actor": "server1.conn0.child1/netEvent31",
   "level": "log",
   "request": {
-    "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+    "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
     "method": "GET",
     "headersSize": 489
   },
@@ -160,12 +160,12 @@ stubPreparedMessages.set("XHR GET request update", new NetworkEventMessage({
   "securityState": null,
   "securityInfo": null,
   "requestHeadersFromUploadStream": null,
-  "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+  "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
   "urlDetails": {
     "baseNameWithQuery": "inexistent.html",
     "host": "example.com",
     "scheme": "http",
-    "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+    "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
     "isLocal": null
   },
   "method": "GET"
@@ -177,7 +177,7 @@ stubPreparedMessages.set("XHR POST request", new NetworkEventMessage({
   "level": "log",
   "isXHR": true,
   "request": {
-    "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+    "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
     "method": "POST"
   },
   "response": {},
@@ -192,18 +192,18 @@ stubPreparedMessages.set("XHR POST request", new NetworkEventMessage({
   "securityInfo": null,
   "requestHeadersFromUploadStream": null,
   "private": false,
-  "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+  "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
   "urlDetails": {
     "baseNameWithQuery": "inexistent.html",
     "host": "example.com",
     "scheme": "http",
-    "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+    "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
     "isLocal": null
   },
   "method": "POST",
   "cause": {
     "type": "xhr",
-    "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html",
+    "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-network-event.html",
     "stacktraceAvailable": true
   }
 }));
@@ -213,7 +213,7 @@ stubPreparedMessages.set("XHR POST request update", new NetworkEventMessage({
   "actor": "server1.conn0.child1/netEvent32",
   "level": "log",
   "request": {
-    "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+    "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
     "method": "POST",
     "headersSize": 509
   },
@@ -239,12 +239,12 @@ stubPreparedMessages.set("XHR POST request update", new NetworkEventMessage({
   "securityState": null,
   "securityInfo": null,
   "requestHeadersFromUploadStream": null,
-  "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+  "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
   "urlDetails": {
     "baseNameWithQuery": "inexistent.html",
     "host": "example.com",
     "scheme": "http",
-    "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+    "unicodeUrl": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
     "isLocal": null
   },
   "method": "POST"
@@ -259,13 +259,13 @@ stubPackets.set(`GET request`, {
   "discardResponseBody": true,
   "startedDateTime": "2017-02-13T21:40:56.850Z",
   "request": {
-    "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+    "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
     "method": "GET"
   },
   "isXHR": false,
   "cause": {
     "type": "img",
-    "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html",
+    "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-network-event.html",
     "stacktraceAvailable": true
   },
   "response": {},
@@ -280,7 +280,7 @@ stubPackets.set(`GET request update`, {
     "_type": "NetworkEvent",
     "actor": "server1.conn0.child1/netEvent30",
     "request": {
-      "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+      "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
       "method": "GET",
       "headersSize": 489
     },
@@ -310,13 +310,13 @@ stubPackets.set(`XHR GET request`, {
   "discardResponseBody": true,
   "startedDateTime": "2017-02-13T21:40:57.746Z",
   "request": {
-    "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+    "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
     "method": "GET"
   },
   "isXHR": true,
   "cause": {
     "type": "xhr",
-    "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html",
+    "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-network-event.html",
     "stacktraceAvailable": true
   },
   "response": {},
@@ -331,7 +331,7 @@ stubPackets.set(`XHR GET request update`, {
     "_type": "NetworkEvent",
     "actor": "server1.conn0.child1/netEvent31",
     "request": {
-      "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+      "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
       "method": "GET",
       "headersSize": 489
     },
@@ -361,13 +361,13 @@ stubPackets.set(`XHR POST request`, {
   "discardResponseBody": true,
   "startedDateTime": "2017-02-13T21:40:58.414Z",
   "request": {
-    "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+    "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
     "method": "POST"
   },
   "isXHR": true,
   "cause": {
     "type": "xhr",
-    "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html",
+    "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-network-event.html",
     "stacktraceAvailable": true
   },
   "response": {},
@@ -382,7 +382,7 @@ stubPackets.set(`XHR POST request update`, {
     "_type": "NetworkEvent",
     "actor": "server1.conn0.child1/netEvent32",
     "request": {
-      "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
+      "url": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/inexistent.html",
       "method": "POST",
       "headersSize": 509
     },
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/pageError.js b/devtools/client/webconsole/test/fixtures/stubs/pageError.js
similarity index 83%
rename from devtools/client/webconsole/new-console-output/test/fixtures/stubs/pageError.js
rename to devtools/client/webconsole/test/fixtures/stubs/pageError.js
index 9fcd9eba8d14..e78b60e13784 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/pageError.js
+++ b/devtools/client/webconsole/test/fixtures/stubs/pageError.js
@@ -9,7 +9,7 @@
  */
 
 const { ConsoleMessage } =
-  require("devtools/client/webconsole/new-console-output/types");
+  require("devtools/client/webconsole/types");
 
 let stubPreparedMessages = new Map();
 let stubPackets = new Map();
@@ -23,22 +23,22 @@ stubPreparedMessages.set(`ReferenceError: asdf is not defined`, new ConsoleMessa
   "level": "error",
   "messageText": "ReferenceError: asdf is not defined",
   "parameters": null,
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":3,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"ReferenceError: asdf is not defined\",\"parameters\":null,\"source\":\"javascript\",\"type\":\"log\",\"userProvidedStyles\":null,\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":3,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"ReferenceError: asdf is not defined\",\"parameters\":null,\"source\":\"javascript\",\"type\":\"log\",\"userProvidedStyles\":null,\"private\":false}",
   "stacktrace": [
     {
-      "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+      "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
       "lineNumber": 3,
       "columnNumber": 5,
       "functionName": "bar"
     },
     {
-      "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+      "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
       "lineNumber": 6,
       "columnNumber": 5,
       "functionName": "foo"
     },
     {
-      "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+      "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
       "lineNumber": 9,
       "columnNumber": 3,
       "functionName": null
@@ -57,7 +57,7 @@ stubPreparedMessages.set(`ReferenceError: asdf is not defined`, new ConsoleMessa
     }
   ],
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 3,
     "column": 5
   },
@@ -80,7 +80,7 @@ stubPreparedMessages.set(`SyntaxError: redeclaration of let a`, new ConsoleMessa
   "level": "error",
   "messageText": "SyntaxError: redeclaration of let a",
   "parameters": null,
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"SyntaxError: redeclaration of let a\",\"parameters\":null,\"source\":\"javascript\",\"type\":\"log\",\"userProvidedStyles\":null,\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":2,\"column\":9},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"SyntaxError: redeclaration of let a\",\"parameters\":null,\"source\":\"javascript\",\"type\":\"log\",\"userProvidedStyles\":null,\"private\":false}",
   "stacktrace": [
     {
       "filename": "resource://testing-common/content-task.js line 50 > eval",
@@ -96,7 +96,7 @@ stubPreparedMessages.set(`SyntaxError: redeclaration of let a`, new ConsoleMessa
     }
   ],
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 2,
     "column": 9
   },
@@ -106,7 +106,7 @@ stubPreparedMessages.set(`SyntaxError: redeclaration of let a`, new ConsoleMessa
     {
       "messageBody": "Previously declared at line 2, column 6",
       "frame": {
-        "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+        "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
         "line": 2,
         "column": 6
       }
@@ -132,10 +132,10 @@ stubPreparedMessages.set(`TypeError longString message`, new ConsoleMessage({
     "actor": "server1.conn0.child1/longString30"
   },
   "parameters": null,
-  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":7},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":{\"type\":\"longString\",\"initial\":\"Error: Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Lon\",\"length\":110007,\"actor\":\"server1.conn0.child1/longString30\"},\"parameters\":null,\"source\":\"javascript\",\"type\":\"log\",\"userProvidedStyles\":null,\"private\":false}",
+  "repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":1,\"column\":7},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":{\"type\":\"longString\",\"initial\":\"Error: Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Long error Lon\",\"length\":110007,\"actor\":\"server1.conn0.child1/longString30\"},\"parameters\":null,\"source\":\"javascript\",\"type\":\"log\",\"userProvidedStyles\":null,\"private\":false}",
   "stacktrace": [
     {
-      "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+      "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
       "lineNumber": 1,
       "columnNumber": 7,
       "functionName": null
@@ -154,7 +154,7 @@ stubPreparedMessages.set(`TypeError longString message`, new ConsoleMessage({
     }
   ],
   "frame": {
-    "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "line": 1,
     "column": 7
   },
@@ -215,7 +215,7 @@ stubPackets.set(`ReferenceError: asdf is not defined`, {
     "errorMessage": "ReferenceError: asdf is not defined",
     "errorMessageName": "JSMSG_NOT_DEFINED",
     "exceptionDocURL": "https://developer.mozilla.org/docs/Web/JavaScript/Reference/Errors/Not_defined?utm_source=mozilla&utm_medium=firefox-console-errors&utm_campaign=default",
-    "sourceName": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "sourceName": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "lineText": "",
     "lineNumber": 3,
     "columnNumber": 5,
@@ -229,19 +229,19 @@ stubPackets.set(`ReferenceError: asdf is not defined`, {
     "private": false,
     "stacktrace": [
       {
-        "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+        "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
         "lineNumber": 3,
         "columnNumber": 5,
         "functionName": "bar"
       },
       {
-        "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+        "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
         "lineNumber": 6,
         "columnNumber": 5,
         "functionName": "foo"
       },
       {
-        "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+        "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
         "lineNumber": 9,
         "columnNumber": 3,
         "functionName": null
@@ -269,7 +269,7 @@ stubPackets.set(`SyntaxError: redeclaration of let a`, {
   "pageError": {
     "errorMessage": "SyntaxError: redeclaration of let a",
     "errorMessageName": "JSMSG_REDECLARED_VAR",
-    "sourceName": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "sourceName": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "lineText": "  let a, a;\n",
     "lineNumber": 2,
     "columnNumber": 9,
@@ -299,7 +299,7 @@ stubPackets.set(`SyntaxError: redeclaration of let a`, {
       {
         "messageBody": "Previously declared at line 2, column 6",
         "frame": {
-          "source": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+          "source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
           "line": 2,
           "column": 6
         }
@@ -319,7 +319,7 @@ stubPackets.set(`TypeError longString message`, {
       "actor": "server1.conn0.child1/longString30"
     },
     "errorMessageName": "",
-    "sourceName": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+    "sourceName": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
     "lineText": "",
     "lineNumber": 1,
     "columnNumber": 7,
@@ -333,7 +333,7 @@ stubPackets.set(`TypeError longString message`, {
     "private": false,
     "stacktrace": [
       {
-        "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-console-api.html",
+        "filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
         "lineNumber": 1,
         "columnNumber": 7,
         "functionName": null
diff --git a/devtools/client/webconsole/new-console-output/test/helpers.js b/devtools/client/webconsole/test/helpers.js
similarity index 85%
rename from devtools/client/webconsole/new-console-output/test/helpers.js
rename to devtools/client/webconsole/test/helpers.js
index 5bac20b587a6..9cf4388d1fae 100644
--- a/devtools/client/webconsole/new-console-output/test/helpers.js
+++ b/devtools/client/webconsole/test/helpers.js
@@ -3,14 +3,14 @@
 
 "use strict";
 
-const reduxActions = require("devtools/client/webconsole/new-console-output/actions/index");
-const { configureStore } = require("devtools/client/webconsole/new-console-output/store");
-const { IdGenerator } = require("devtools/client/webconsole/new-console-output/utils/id-generator");
-const { stubPackets } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
-const { getAllMessagesById } = require("devtools/client/webconsole/new-console-output/selectors/messages");
-const { getPrefsService } = require("devtools/client/webconsole/new-console-output/utils/prefs");
+const reduxActions = require("devtools/client/webconsole/actions/index");
+const { configureStore } = require("devtools/client/webconsole/store");
+const { IdGenerator } = require("devtools/client/webconsole/utils/id-generator");
+const { stubPackets } = require("devtools/client/webconsole/test/fixtures/stubs/index");
+const { getAllMessagesById } = require("devtools/client/webconsole/selectors/messages");
+const { getPrefsService } = require("devtools/client/webconsole/utils/prefs");
 const prefsService = getPrefsService({});
-const { PREFS } = require("devtools/client/webconsole/new-console-output/constants");
+const { PREFS } = require("devtools/client/webconsole/constants");
 
 /**
  * Prepare actions for use in testing.
diff --git a/devtools/client/webconsole/new-console-output/test/middleware/.eslintrc.js b/devtools/client/webconsole/test/middleware/.eslintrc.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/middleware/.eslintrc.js
rename to devtools/client/webconsole/test/middleware/.eslintrc.js
diff --git a/devtools/client/webconsole/new-console-output/test/middleware/debounce.test.js b/devtools/client/webconsole/test/middleware/debounce.test.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/middleware/debounce.test.js
rename to devtools/client/webconsole/test/middleware/debounce.test.js
diff --git a/devtools/client/webconsole/new-console-output/test/mocha-test-setup.js b/devtools/client/webconsole/test/mocha-test-setup.js
similarity index 91%
rename from devtools/client/webconsole/new-console-output/test/mocha-test-setup.js
rename to devtools/client/webconsole/test/mocha-test-setup.js
index d37f5f655b04..84b805cc2e59 100644
--- a/devtools/client/webconsole/new-console-output/test/mocha-test-setup.js
+++ b/devtools/client/webconsole/test/mocha-test-setup.js
@@ -5,7 +5,7 @@
 
 "use strict";
 
-const mcRoot = `${__dirname}/../../../../../`;
+const mcRoot = `${__dirname}/../../../../`;
 const getModule = mcPath => `module.exports = require("${mcRoot}${mcPath}");`;
 
 const { Services: { pref } } = require("devtools-modules");
@@ -50,10 +50,10 @@ requireHacker.global_hook("default", (path, module) => {
   switch (path) {
     case "devtools/shared/l10n":
       return getModule(
-        "devtools/client/webconsole/new-console-output/test/fixtures/LocalizationHelper");
+        "devtools/client/webconsole/test/fixtures/LocalizationHelper");
     case "devtools/shared/plural-form":
       return getModule(
-        "devtools/client/webconsole/new-console-output/test/fixtures/PluralForm");
+        "devtools/client/webconsole/test/fixtures/PluralForm");
     case "Services":
     case "Services.default":
       return `module.exports = require("devtools-modules/src/Services")`;
@@ -61,7 +61,7 @@ requireHacker.global_hook("default", (path, module) => {
       return `() => {}`;
     case "devtools/client/netmonitor/src/components/TabboxPanel":
       return "{}";
-    case "devtools/client/webconsole/new-console-output/utils/context-menu":
+    case "devtools/client/webconsole/utils/context-menu":
       return "{}";
     case "devtools/shared/event-emitter":
       return `module.exports = require("devtools-modules/src/utils/event-emitter")`;
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/.eslintrc.js b/devtools/client/webconsole/test/mochitest/.eslintrc.js
similarity index 66%
rename from devtools/client/webconsole/new-console-output/test/fixtures/.eslintrc.js
rename to devtools/client/webconsole/test/mochitest/.eslintrc.js
index 677cbb4243df..698ae9181a0a 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/.eslintrc.js
+++ b/devtools/client/webconsole/test/mochitest/.eslintrc.js
@@ -2,5 +2,5 @@
 
 module.exports = {
   // Extend from the shared list of defined globals for mochitests.
-  "extends": "../../../../../.eslintrc.mochitests.js"
+  "extends": "../../../../.eslintrc.mochitests.js"
 };
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser.ini b/devtools/client/webconsole/test/mochitest/browser.ini
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser.ini
rename to devtools/client/webconsole/test/mochitest/browser.ini
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console.js b/devtools/client/webconsole/test/mochitest/browser_console.js
similarity index 97%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console.js
rename to devtools/client/webconsole/test/mochitest/browser_console.js
index 0a7e2731be7a..95de53325496 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console.js
+++ b/devtools/client/webconsole/test/mochitest/browser_console.js
@@ -8,16 +8,16 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-console.html?" +
+                 "test/mochitest/test-console.html?" +
                  Date.now();
 const TEST_FILE = "chrome://mochitests/content/browser/devtools/client/" +
-                  "webconsole/new-console-output/test/mochitest/" +
+                  "webconsole/test/mochitest/" +
                   "test-cu-reporterror.js";
 
 const TEST_XHR_ERROR_URI = `http://example.com/404.html?${Date.now()}`;
 
 const TEST_IMAGE = "http://example.com/browser/devtools/client/webconsole/" +
-                   "new-console-output/test/test-image.png";
+                   "test/test-image.png";
 
 const ObjectClient = require("devtools/shared/client/object-client");
 
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_clear_method.js b/devtools/client/webconsole/test/mochitest/browser_console_clear_method.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console_clear_method.js
rename to devtools/client/webconsole/test/mochitest/browser_console_clear_method.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_consolejsm_output.js b/devtools/client/webconsole/test/mochitest/browser_console_consolejsm_output.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console_consolejsm_output.js
rename to devtools/client/webconsole/test/mochitest/browser_console_consolejsm_output.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_context_menu_entries.js b/devtools/client/webconsole/test/mochitest/browser_console_context_menu_entries.js
similarity index 97%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console_context_menu_entries.js
rename to devtools/client/webconsole/test/mochitest/browser_console_context_menu_entries.js
index ad0b2d1923ba..3672a29ab66f 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_context_menu_entries.js
+++ b/devtools/client/webconsole/test/mochitest/browser_console_context_menu_entries.js
@@ -6,7 +6,7 @@
 // Check that we display the expected context menu entries.
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-console.html";
+                 "test/mochitest/test-console.html";
 
 add_task(async function() {
   // Enable net messages in the console for this test.
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_dead_objects.js b/devtools/client/webconsole/test/mochitest/browser_console_dead_objects.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console_dead_objects.js
rename to devtools/client/webconsole/test/mochitest/browser_console_dead_objects.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_devtools_loader_exception.js b/devtools/client/webconsole/test/mochitest/browser_console_devtools_loader_exception.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console_devtools_loader_exception.js
rename to devtools/client/webconsole/test/mochitest/browser_console_devtools_loader_exception.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_error_source_click.js b/devtools/client/webconsole/test/mochitest/browser_console_error_source_click.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console_error_source_click.js
rename to devtools/client/webconsole/test/mochitest/browser_console_error_source_click.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_filters.js b/devtools/client/webconsole/test/mochitest/browser_console_filters.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console_filters.js
rename to devtools/client/webconsole/test/mochitest/browser_console_filters.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_nsiconsolemessage.js b/devtools/client/webconsole/test/mochitest/browser_console_nsiconsolemessage.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console_nsiconsolemessage.js
rename to devtools/client/webconsole/test/mochitest/browser_console_nsiconsolemessage.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_open_or_focus.js b/devtools/client/webconsole/test/mochitest/browser_console_open_or_focus.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console_open_or_focus.js
rename to devtools/client/webconsole/test/mochitest/browser_console_open_or_focus.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_restore.js b/devtools/client/webconsole/test/mochitest/browser_console_restore.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console_restore.js
rename to devtools/client/webconsole/test/mochitest/browser_console_restore.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_webconsole_console_api_calls.js b/devtools/client/webconsole/test/mochitest/browser_console_webconsole_console_api_calls.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console_webconsole_console_api_calls.js
rename to devtools/client/webconsole/test/mochitest/browser_console_webconsole_console_api_calls.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_webconsole_ctrlw_close_tab.js b/devtools/client/webconsole/test/mochitest/browser_console_webconsole_ctrlw_close_tab.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console_webconsole_ctrlw_close_tab.js
rename to devtools/client/webconsole/test/mochitest/browser_console_webconsole_ctrlw_close_tab.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_webconsole_iframe_messages.js b/devtools/client/webconsole/test/mochitest/browser_console_webconsole_iframe_messages.js
similarity index 95%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console_webconsole_iframe_messages.js
rename to devtools/client/webconsole/test/mochitest/browser_console_webconsole_iframe_messages.js
index 1026a8ecdee1..1f092361dce3 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_webconsole_iframe_messages.js
+++ b/devtools/client/webconsole/test/mochitest/browser_console_webconsole_iframe_messages.js
@@ -9,7 +9,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-console-iframes.html";
+                 "test/mochitest/test-console-iframes.html";
 
 const expectedMessages = [
   "main file",
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_console_webconsole_private_browsing.js b/devtools/client/webconsole/test/mochitest/browser_console_webconsole_private_browsing.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_console_webconsole_private_browsing.js
rename to devtools/client/webconsole/test/mochitest/browser_console_webconsole_private_browsing.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_accessibility.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_accessibility.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_accessibility.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_accessibility.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_add_edited_input_to_history.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_add_edited_input_to_history.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_add_edited_input_to_history.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_add_edited_input_to_history.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete-properties-with-non-alphanumeric-names.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_array_no_index.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_array_no_index.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_array_no_index.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_array_no_index.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_cached_results.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_cached_results.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_cached_results.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_cached_results.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js
similarity index 94%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js
index 49af7d741b49..cf5bf4f29157 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_crossdomain_iframe.js
@@ -7,7 +7,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-iframe-parent.html";
+                 "test/mochitest/test-iframe-parent.html";
 add_task(async function() {
   const hud = await openNewTabAndConsole(TEST_URI);
   const { jsterm } = hud;
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_escape_key.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_escape_key.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_escape_key.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_escape_key.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_extraneous_closing_brackets.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_extraneous_closing_brackets.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_extraneous_closing_brackets.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_extraneous_closing_brackets.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_helpers.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_helpers.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_helpers.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_helpers.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_in_chrome_tab.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_chrome_tab.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_in_chrome_tab.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_chrome_tab.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_in_debugger_stackframe.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_debugger_stackframe.js
similarity index 97%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_in_debugger_stackframe.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_debugger_stackframe.js
index b61ebad71e66..fab971cbdb78 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_in_debugger_stackframe.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_in_debugger_stackframe.js
@@ -9,7 +9,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-autocomplete-in-stackframe.html";
+                 "test/mochitest/test-autocomplete-in-stackframe.html";
 
 add_task(async function() {
   // Force the old debugger UI since it's directly used (see Bug 1301705)
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_inside_text.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_inside_text.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_inside_text.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_inside_text.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_native_getters.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_native_getters.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_native_getters.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_native_getters.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_nav_and_tab_key.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_nav_and_tab_key.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_nav_and_tab_key.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_nav_and_tab_key.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_return_key.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_return_key.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_return_key_no_selection.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key_no_selection.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_autocomplete_return_key_no_selection.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_autocomplete_return_key_no_selection.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_completion.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_completion.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_completion.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_completion.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_copy_command.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_copy_command.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_copy_command.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_copy_command.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_ctrl_a_select_all.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_a_select_all.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_ctrl_a_select_all.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_a_select_all.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_ctrl_key_nav.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_key_nav.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_ctrl_key_nav.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_ctrl_key_nav.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_document_no_xray.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_document_no_xray.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_document_no_xray.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_document_no_xray.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_dollar.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_dollar.js
similarity index 92%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_dollar.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_dollar.js
index a1931a8f3db6..aa58c4e80b95 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_dollar.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_dollar.js
@@ -9,7 +9,7 @@
 // if they are defined. See Bug 621644.
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-jsterm-dollar.html";
+                 "test/mochitest/test-jsterm-dollar.html";
 
 add_task(async function() {
   let hud = await openNewTabAndConsole(TEST_URI);
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_error_docs.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_error_docs.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_error_docs.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_error_docs.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_error_outside_valid_range.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_error_outside_valid_range.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_error_outside_valid_range.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_error_outside_valid_range.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_helper_clear.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_clear.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_helper_clear.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_helper_clear.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_helper_dollar.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_helper_dollar.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_helper_dollar_dollar.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_dollar.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_helper_dollar_dollar.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_dollar.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_helper_dollar_x.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_x.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_helper_dollar_x.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_helper_dollar_x.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_helper_help.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_help.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_helper_help.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_helper_help.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_helper_keys_values.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_keys_values.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_helper_keys_values.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_helper_keys_values.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_helper_pprint.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_helper_pprint.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_helper_pprint.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_helper_pprint.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_hide_when_devtools_chrome_enabled_false.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_hide_when_devtools_chrome_enabled_false.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_hide_when_devtools_chrome_enabled_false.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_hide_when_devtools_chrome_enabled_false.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_history.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_history.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_history.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_history.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_history_nav.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_history_nav.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_history_nav.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_history_nav.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_history_persist.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_history_persist.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_history_persist.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_history_persist.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_input_expansion.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_input_expansion.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_input_expansion.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_input_expansion.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_inspect.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_inspect.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_inspect.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_inspect.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_instance_of.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_instance_of.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_instance_of.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_instance_of.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_multiline.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_multiline.js
similarity index 97%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_multiline.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_multiline.js
index 4cea1bb41983..9328095abf0f 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_multiline.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_multiline.js
@@ -10,7 +10,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-console.html";
+                 "test/mochitest/test-console.html";
 
 let SHOULD_ENTER_MULTILINE = [
   {input: "function foo() {" },
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_no_autocompletion_on_defined_variables.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_no_autocompletion_on_defined_variables.js
similarity index 94%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_no_autocompletion_on_defined_variables.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_no_autocompletion_on_defined_variables.js
index 9ab3243d42a8..321d9fdffc8d 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_no_autocompletion_on_defined_variables.js
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_no_autocompletion_on_defined_variables.js
@@ -8,7 +8,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-console.html";
+                 "test/mochitest/test-console.html";
 
 add_task(async function() {
   let hud = await openNewTabAndConsole(TEST_URI);
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_no_input_and_tab_key_pressed.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_no_input_and_tab_key_pressed.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_no_input_and_tab_key_pressed.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_no_input_and_tab_key_pressed.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_no_input_change_and_tab_key_pressed.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_no_input_change_and_tab_key_pressed.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_no_input_change_and_tab_key_pressed.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_no_input_change_and_tab_key_pressed.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_null_undefined.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_null_undefined.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_null_undefined.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_null_undefined.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_popup.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_popup.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_popup.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_popup.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_popup_close_on_tab_switch.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_popup_close_on_tab_switch.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_popup_close_on_tab_switch.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_popup_close_on_tab_switch.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_selfxss.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_selfxss.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_jsterm_selfxss.js
rename to devtools/client/webconsole/test/mochitest/browser_jsterm_selfxss.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_allow_mixedcontent_securityerrors.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_allow_mixedcontent_securityerrors.js
similarity index 98%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_allow_mixedcontent_securityerrors.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_allow_mixedcontent_securityerrors.js
index 298c0fe11a16..c5329404e0d8 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_allow_mixedcontent_securityerrors.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_allow_mixedcontent_securityerrors.js
@@ -14,7 +14,7 @@
 "use strict";
 
 const TEST_URI = "https://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/" +
+                 "test/mochitest/" +
                  "test-mixedcontent-securityerrors.html";
 const LEARN_MORE_URI = "https://developer.mozilla.org/docs/Web/Security/" +
                        "Mixed_content" + DOCS_GA_PARAMS;
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_batching.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_batching.js
similarity index 91%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_batching.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_batching.js
index dd9bedaa4232..3a41fcebc12e 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_batching.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_batching.js
@@ -8,8 +8,8 @@
 // Check adding console calls as batch keep the order of the message.
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-batching.html";
-const { l10n } = require("devtools/client/webconsole/new-console-output/utils/messages");
+                 "test/mochitest/test-batching.html";
+const { l10n } = require("devtools/client/webconsole/utils/messages");
 
 add_task(async function() {
   let hud = await openNewTabAndConsole(TEST_URI);
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_block_mixedcontent_securityerrors.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_block_mixedcontent_securityerrors.js
similarity index 98%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_block_mixedcontent_securityerrors.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_block_mixedcontent_securityerrors.js
index 390d8b187fbe..9b2154fb66ba 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_block_mixedcontent_securityerrors.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_block_mixedcontent_securityerrors.js
@@ -17,7 +17,7 @@
 "use strict";
 
 const TEST_URI = "https://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/" +
+                 "test/mochitest/" +
                  "test-mixedcontent-securityerrors.html";
 const LEARN_MORE_URI = "https://developer.mozilla.org/docs/Web/Security/" +
                        "Mixed_content" + DOCS_GA_PARAMS;
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cached_messages.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_cached_messages.js
similarity index 96%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cached_messages.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_cached_messages.js
index 339cafb4265b..3c06c0497389 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cached_messages.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_cached_messages.js
@@ -9,7 +9,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/" +
+                 "test/mochitest/" +
                  "test-webconsole-error-observer.html";
 
 add_task(async function() {
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cd_iframe.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_cd_iframe.js
similarity index 96%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cd_iframe.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_cd_iframe.js
index 22c959514b92..cb59fb42cbab 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cd_iframe.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_cd_iframe.js
@@ -8,7 +8,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-cd-iframe-parent.html";
+                 "test/mochitest/test-cd-iframe-parent.html";
 
 add_task(async function() {
   const hud = await openNewTabAndConsole(TEST_URI);
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_certificate_messages.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_certificate_messages.js
similarity index 94%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_certificate_messages.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_certificate_messages.js
index 400a7e8a5481..eee18b0fa426 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_certificate_messages.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_certificate_messages.js
@@ -8,7 +8,7 @@
 "use strict";
 
 const TEST_URI = "data:text/html;charset=utf8,Web Console weak crypto warnings test";
-const TEST_URI_PATH = "/browser/devtools/client/webconsole/new-console-output/test/" +
+const TEST_URI_PATH = "/browser/devtools/client/webconsole/test/" +
                       "mochitest/test-certificate-messages.html";
 
 const SHA1_URL = "https://sha1ee.example.com" + TEST_URI_PATH;
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_click_function_to_source.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_click_function_to_source.js
similarity index 96%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_click_function_to_source.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_click_function_to_source.js
index 56cdbd2e1191..663db7f12619 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_click_function_to_source.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_click_function_to_source.js
@@ -8,7 +8,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/" +
+                 "test/mochitest/" +
                  "test-click-function-to-source.html";
 
 // Force the old debugger UI since it's directly used (see Bug 1301705)
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_clickable_urls.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_clickable_urls.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_clickable_urls.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_clickable_urls.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_close_sidebar.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_close_sidebar.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_close_sidebar.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_close_sidebar.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_close_unfocused_window.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_close_unfocused_window.js
similarity index 94%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_close_unfocused_window.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_close_unfocused_window.js
index 5d4530c0f3fb..4997e654daf3 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_close_unfocused_window.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_close_unfocused_window.js
@@ -9,7 +9,7 @@
 // any error.
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-console.html";
+                 "test/mochitest/test-console.html";
 
 add_task(async function() {
   let tab1 = await addTab(TEST_URI, {window});
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_closing_after_completion.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_closing_after_completion.js
similarity index 94%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_closing_after_completion.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_closing_after_completion.js
index 86ae889b9221..feb4bc4a2d3a 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_closing_after_completion.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_closing_after_completion.js
@@ -9,7 +9,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-console.html";
+                 "test/mochitest/test-console.html";
 
 add_task(async function() {
   let tab = await addTab(TEST_URI);
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_closure_inspection.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_closure_inspection.js
similarity index 97%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_closure_inspection.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_closure_inspection.js
index b961a41b558a..05eef7aa09f1 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_closure_inspection.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_closure_inspection.js
@@ -12,7 +12,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-closures.html";
+                 "test/mochitest/test-closures.html";
 
 var gWebConsole, gJSTerm, gVariablesView;
 
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_api_iframe.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_console_api_iframe.js
similarity index 91%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_api_iframe.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_console_api_iframe.js
index 75acd5ecccc6..f2255b2acea8 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_api_iframe.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_console_api_iframe.js
@@ -8,7 +8,7 @@
 // Check that Console API works with iframes. See Bug 613013.
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-console-api-iframe.html";
+                 "test/mochitest/test-console-api-iframe.html";
 
 add_task(async function() {
   const hud = await openNewTabAndConsole(TEST_URI);
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_dir.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_console_dir.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_dir.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_console_dir.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_dir_uninspectable.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_console_dir_uninspectable.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_dir_uninspectable.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_console_dir_uninspectable.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_group.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_console_group.js
similarity index 96%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_group.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_console_group.js
index 3546b24b38ac..f8b0c8a13e01 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_group.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_console_group.js
@@ -9,9 +9,9 @@
 // behave as expected.
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-console-group.html";
+                 "test/mochitest/test-console-group.html";
 const { INDENT_WIDTH } =
-  require("devtools/client/webconsole/new-console-output/components/MessageIndent");
+  require("devtools/client/webconsole/components/MessageIndent");
 
 add_task(async function() {
   const hud = await openNewTabAndConsole(TEST_URI);
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_logging_workers_api.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_console_logging_workers_api.js
similarity index 91%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_logging_workers_api.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_console_logging_workers_api.js
index 8410e62b3e1b..5e85f37bda11 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_logging_workers_api.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_console_logging_workers_api.js
@@ -9,7 +9,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-console-workers.html";
+                 "test/mochitest/test-console-workers.html";
 
 add_task(async function() {
   const hud = await openNewTabAndConsole(TEST_URI);
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_table.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_console_table.js
similarity index 98%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_table.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_console_table.js
index 51b2ae9ac43c..21436e0e8b2a 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_table.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_console_table.js
@@ -9,7 +9,7 @@
 // in the MDN doc (https://developer.mozilla.org/en-US/docs/Web/API/Console/table)
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-console-table.html";
+                 "test/mochitest/test-console-table.html";
 
 add_task(async function() {
   let toolbox = await openNewTabAndToolbox(TEST_URI, "webconsole");
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_trace_duplicates.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_console_trace_duplicates.js
similarity index 98%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_trace_duplicates.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_console_trace_duplicates.js
index 0c88e2ab4032..ceb01c84b29d 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_console_trace_duplicates.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_console_trace_duplicates.js
@@ -6,7 +6,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                  "new-console-output/test/mochitest/" +
+                  "test/mochitest/" +
                   "test-console-trace-duplicates.html";
 
 add_task(async function testTraceMessages() {
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_copy_entire_message.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_copy_entire_message.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_copy_entire_message.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_copy_entire_message.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_copy_link_location.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_copy_link_location.js
similarity index 96%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_copy_link_location.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_copy_link_location.js
index bd53ac507b38..51f8a34936b2 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_copy_link_location.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_copy_link_location.js
@@ -9,7 +9,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-console.html?_date=" +
+                 "test/mochitest/test-console.html?_date=" +
                  Date.now();
 const CONTEXT_MENU_ID = "#console-menu-copy-url";
 
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_copy_object.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_copy_object.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_copy_object.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_copy_object.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_object_in_sidebar.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_object_in_sidebar.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_object_in_sidebar.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_object_in_sidebar.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_open_url.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_open_url.js
similarity index 97%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_open_url.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_open_url.js
index 578c58378b45..3a1047d8b040 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_open_url.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_open_url.js
@@ -9,7 +9,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-console.html";
+                 "test/mochitest/test-console.html";
 
 add_task(async function() {
   // Enable net messages in the console for this test.
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_store_as_global.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_store_as_global.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_context_menu_store_as_global.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_context_menu_store_as_global.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_csp_ignore_reflected_xss_message.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_csp_ignore_reflected_xss_message.js
similarity index 94%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_csp_ignore_reflected_xss_message.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_csp_ignore_reflected_xss_message.js
index f9dae150bdca..d82a8844e64d 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_csp_ignore_reflected_xss_message.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_csp_ignore_reflected_xss_message.js
@@ -11,7 +11,7 @@
 const EXPECTED_RESULT = "Not supporting directive \u2018reflected-xss\u2019. " +
                         "Directive and values will be ignored.";
 const TEST_FILE = "http://example.com/browser/devtools/client/webconsole/" +
-                  "new-console-output/test/mochitest/" +
+                  "test/mochitest/" +
                   "test_console_csp_ignore_reflected_xss_message.html";
 
 const TEST_URI =
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_csp_violation.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_csp_violation.js
similarity index 92%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_csp_violation.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_csp_violation.js
index 095cde09364a..f430c72cebd1 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_csp_violation.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_csp_violation.js
@@ -10,7 +10,7 @@
 
 const TEST_URI = "data:text/html;charset=utf8,Web Console CSP violation test";
 const TEST_VIOLATION = "https://example.com/browser/devtools/client/webconsole/" +
-                       "new-console-output/test/mochitest/test-csp-violation.html";
+                       "test/mochitest/test-csp-violation.html";
 const CSP_VIOLATION_MSG = "Content Security Policy: The page\u2019s settings " +
                           "blocked the loading of a resource at " +
                           "http://some.example.com/test.png (\u201cimg-src\u201d).";
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cspro.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_cspro.js
similarity index 95%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cspro.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_cspro.js
index 22dacd06c88e..41fc790c0c8c 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_cspro.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_cspro.js
@@ -18,7 +18,7 @@ See Bug 1010953.
 
 const TEST_URI = "data:text/html;charset=utf8,Web Console CSP report only test";
 const TEST_VIOLATION = "http://example.com/browser/devtools/client/webconsole/" +
-                       "new-console-output/test/mochitest/test-cspro.html";
+                       "test/mochitest/test-cspro.html";
 const CSP_VIOLATION_MSG =
   "Content Security Policy: The page\u2019s settings blocked the loading of a resource " +
   "at http://some.example.com/cspro.png (\u201cimg-src\u201d).";
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_document_focus.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_document_focus.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_document_focus.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_document_focus.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_duplicate_errors.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_duplicate_errors.js
similarity index 92%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_duplicate_errors.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_duplicate_errors.js
index 32555860b115..212b95cfc66b 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_duplicate_errors.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_duplicate_errors.js
@@ -7,7 +7,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-duplicate-error.html";
+                 "test/mochitest/test-duplicate-error.html";
 
 add_task(async function() {
   // On e10s, the exception is triggered in child process
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_errors_after_page_reload.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_errors_after_page_reload.js
similarity index 94%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_errors_after_page_reload.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_errors_after_page_reload.js
index 05ed415a1278..ed60868371a7 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_errors_after_page_reload.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_errors_after_page_reload.js
@@ -10,7 +10,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-error.html";
+                 "test/mochitest/test-error.html";
 
 add_task(async function() {
   let hud = await openNewTabAndConsole(TEST_URI);
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_eval_in_debugger_stackframe.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_eval_in_debugger_stackframe.js
similarity index 97%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_eval_in_debugger_stackframe.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_eval_in_debugger_stackframe.js
index 55997bc9f049..52d17cf697aa 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_eval_in_debugger_stackframe.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_eval_in_debugger_stackframe.js
@@ -9,7 +9,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-eval-in-stackframe.html";
+                 "test/mochitest/test-eval-in-stackframe.html";
 
 add_task(async function() {
   // Force the old debugger UI since it's directly used (see Bug 1301705).
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_eval_in_debugger_stackframe2.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_eval_in_debugger_stackframe2.js
similarity index 96%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_eval_in_debugger_stackframe2.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_eval_in_debugger_stackframe2.js
index 57a4a71f1b67..ae554f957470 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_eval_in_debugger_stackframe2.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_eval_in_debugger_stackframe2.js
@@ -10,7 +10,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-eval-in-stackframe.html";
+                 "test/mochitest/test-eval-in-stackframe.html";
 
 add_task(async function() {
   // Force the old debugger UI since it's directly used (see Bug 1301705).
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_execution_scope.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_execution_scope.js
similarity index 93%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_execution_scope.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_execution_scope.js
index 692d105102ed..fb6ed1897f35 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_execution_scope.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_execution_scope.js
@@ -8,7 +8,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-console.html";
+                 "test/mochitest/test-console.html";
 
 add_task(async function() {
   const hud = await openNewTabAndConsole(TEST_URI);
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_external_script_errors.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_external_script_errors.js
similarity index 93%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_external_script_errors.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_external_script_errors.js
index 3713cb11e41f..137fdc01dfc4 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_external_script_errors.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_external_script_errors.js
@@ -8,7 +8,7 @@
 // See Bug 597136.
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/" +
+                 "test/mochitest/" +
                  "test-external-script-errors.html";
 
 add_task(async function() {
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_file_uri.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_file_uri.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_file_uri.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_file_uri.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filter_scroll.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_filter_scroll.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filter_scroll.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_filter_scroll.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filters.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_filters.js
similarity index 96%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filters.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_filters.js
index 869089c8ef5e..d6872c22c767 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filters.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_filters.js
@@ -8,7 +8,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-console-filters.html";
+                 "test/mochitest/test-console-filters.html";
 
 add_task(async function() {
   const hud = await openNewTabAndConsole(TEST_URI);
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filters_persist.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_filters_persist.js
similarity index 96%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filters_persist.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_filters_persist.js
index 7c9b819a3f1d..3e8c946ba954 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_filters_persist.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_filters_persist.js
@@ -8,7 +8,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-console-filters.html";
+                 "test/mochitest/test-console-filters.html";
 
 add_task(async function() {
   let hud = await openNewTabAndConsole(TEST_URI);
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_highlighter_console_helper.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_highlighter_console_helper.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_highlighter_console_helper.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_highlighter_console_helper.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_history_arrow_keys.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_history_arrow_keys.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_history_arrow_keys.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_history_arrow_keys.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_hpkp_invalid-headers.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_hpkp_invalid-headers.js
similarity index 98%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_hpkp_invalid-headers.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_hpkp_invalid-headers.js
index 41f861f619fc..3a4c5c9701a3 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_hpkp_invalid-headers.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_hpkp_invalid-headers.js
@@ -7,7 +7,7 @@
 
 const TEST_URI = "data:text/html;charset=utf-8,Web Console HPKP invalid header test";
 const SJS_URL = "https://example.com/browser/devtools/client/webconsole/" +
-                "new-console-output/test/mochitest/test_hpkp-invalid-headers.sjs";
+                "test/mochitest/test_hpkp-invalid-headers.sjs";
 const LEARN_MORE_URI = "https://developer.mozilla.org/docs/Web/HTTP/" +
                        "Public_Key_Pinning" + DOCS_GA_PARAMS;
 const NON_BUILTIN_ROOT_PREF =
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_hsts_invalid-headers.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_hsts_invalid-headers.js
similarity index 97%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_hsts_invalid-headers.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_hsts_invalid-headers.js
index b2e43f37cb6a..bcfa2305c1e2 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_hsts_invalid-headers.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_hsts_invalid-headers.js
@@ -7,7 +7,7 @@
 
 const TEST_URI = "data:text/html;charset=utf-8,Web Console HSTS invalid header test";
 const SJS_URL = "https://example.com/browser/devtools/client/webconsole/" +
-                "/new-console-output/test/mochitest/test_hsts-invalid-headers.sjs";
+                "/test/mochitest/test_hsts-invalid-headers.sjs";
 const LEARN_MORE_URI = "https://developer.mozilla.org/docs/Web/HTTP/Headers/" +
                        "Strict-Transport-Security" + DOCS_GA_PARAMS;
 
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_iframe_wrong_hud.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_iframe_wrong_hud.js
similarity index 86%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_iframe_wrong_hud.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_iframe_wrong_hud.js
index d4abb2575c36..1582b29039a2 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_iframe_wrong_hud.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_iframe_wrong_hud.js
@@ -8,13 +8,13 @@
 // Ensure that iframes are not associated with the wrong hud. See Bug 593003.
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-  "new-console-output/test/mochitest/test-iframe-wrong-hud.html";
+  "test/mochitest/test-iframe-wrong-hud.html";
 
 const TEST_IFRAME_URI = "http://example.com/browser/devtools/client/webconsole/" +
-  "new-console-output/test/mochitest/test-iframe-wrong-hud-iframe.html";
+  "test/mochitest/test-iframe-wrong-hud-iframe.html";
 
 const TEST_DUMMY_URI = "http://example.com/browser/devtools/client/webconsole/" +
-  "new-console-output/test/mochitest/test-console.html";
+  "test/mochitest/test-console.html";
 
 add_task(async function() {
   await pushPref("devtools.webconsole.filter.net", true);
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_ineffective_iframe_sandbox_warning.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_ineffective_iframe_sandbox_warning.js
similarity index 97%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_ineffective_iframe_sandbox_warning.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_ineffective_iframe_sandbox_warning.js
index be588c2df287..087076492e64 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_ineffective_iframe_sandbox_warning.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_ineffective_iframe_sandbox_warning.js
@@ -11,7 +11,7 @@
 requestLongerTimeout(2);
 
 const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/" +
-                  "new-console-output/test/mochitest/";
+                  "test/mochitest/";
 const TEST_URI_WARNING = `${TEST_PATH}test-ineffective-iframe-sandbox-warning0.html`;
 const TEST_URI_NOWARNING = [
   `${TEST_PATH}test-ineffective-iframe-sandbox-warning1.html`,
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_init.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_init.js
similarity index 93%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_init.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_init.js
index b4c881c960b4..5b527e8ef155 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_init.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_init.js
@@ -6,7 +6,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-console.html";
+                 "test/mochitest/test-console.html";
 
 add_task(async function() {
   let toolbox = await openNewTabAndToolbox(TEST_URI, "webconsole");
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_input_field_focus_on_panel_select.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_input_field_focus_on_panel_select.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_input_field_focus_on_panel_select.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_input_field_focus_on_panel_select.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_input_focus.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_input_focus.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_input_focus.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_input_focus.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_insecure_passwords_about_blank_web_console_warning.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_insecure_passwords_about_blank_web_console_warning.js
similarity index 94%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_insecure_passwords_about_blank_web_console_warning.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_insecure_passwords_about_blank_web_console_warning.js
index ab475001468b..b8bac020b58b 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_insecure_passwords_about_blank_web_console_warning.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_insecure_passwords_about_blank_web_console_warning.js
@@ -9,7 +9,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/" +
+                 "test/mochitest/" +
                  "test-insecure-passwords-about-blank-web-console-warning.html";
 const INSECURE_PASSWORD_MSG = "Password fields present on an insecure (http://) iframe." +
   " This is a security risk that allows user login credentials to be stolen.";
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_insecure_passwords_web_console_warning.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_insecure_passwords_web_console_warning.js
similarity index 88%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_insecure_passwords_web_console_warning.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_insecure_passwords_web_console_warning.js
index e3e54297c419..e257c51d65c6 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_insecure_passwords_web_console_warning.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_insecure_passwords_web_console_warning.js
@@ -9,11 +9,11 @@
 "use strict";
 
 const INSECURE_IFRAME_URI = "http://example.com/browser/devtools/client/webconsole/" +
-  "new-console-output/test/mochitest/test-insecure-passwords-web-console-warning.html";
+  "test/mochitest/test-insecure-passwords-web-console-warning.html";
 const INSECURE_PASSWORD_URI = "http://example.com/browser/devtools/client/webconsole/" +
-  "new-console-output/test/mochitest/test-iframe-insecure-form-action.html";
+  "test/mochitest/test-iframe-insecure-form-action.html";
 const INSECURE_FORM_ACTION_URI = "https://example.com/browser/devtools/client/" +
-  "webconsole/new-console-output/test/mochitest/test-iframe-insecure-form-action.html";
+  "webconsole/test/mochitest/test-iframe-insecure-form-action.html";
 
 const STOLEN = "This is a security risk that allows user login credentials to be stolen.";
 const INSECURE_PASSWORD_MSG =
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_inspect_cross_domain_object.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_inspect_cross_domain_object.js
similarity index 97%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_inspect_cross_domain_object.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_inspect_cross_domain_object.js
index db1c39822b05..f2147969e1e8 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_inspect_cross_domain_object.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_inspect_cross_domain_object.js
@@ -9,7 +9,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/" +
+                 "test/mochitest/" +
                  "test-inspect-cross-domain-objects-top.html";
 
 add_task(async function() {
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_js_input_expansion.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_js_input_expansion.js
similarity index 95%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_js_input_expansion.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_js_input_expansion.js
index 9fcacb72c9af..2360e8edd86a 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_js_input_expansion.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_js_input_expansion.js
@@ -8,7 +8,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-console.html";
+                 "test/mochitest/test-console.html";
 
 add_task(async function() {
   const { jsterm } = await openNewTabAndConsole(TEST_URI);
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_keyboard_accessibility.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_keyboard_accessibility.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_keyboard_accessibility.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_keyboard_accessibility.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_location_debugger_link.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_location_debugger_link.js
similarity index 95%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_location_debugger_link.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_location_debugger_link.js
index 9733d0884769..83f4c0c6fbb9 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_location_debugger_link.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_location_debugger_link.js
@@ -16,7 +16,7 @@ PromiseTestUtils.whitelistRejectionsGlobally(/this\.worker is null/);
 requestLongerTimeout(2);
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-location-debugger-link.html";
+                 "test/mochitest/test-location-debugger-link.html";
 
 add_task(async function() {
   // Force the new debugger UI, in case this gets uplifted with the old
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_location_scratchpad_link.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_location_scratchpad_link.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_location_scratchpad_link.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_location_scratchpad_link.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_location_styleeditor_link.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_location_styleeditor_link.js
similarity index 98%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_location_styleeditor_link.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_location_styleeditor_link.js
index 01713c61e6d4..227f78112d7d 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_location_styleeditor_link.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_location_styleeditor_link.js
@@ -6,7 +6,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/" +
+                 "test/mochitest/" +
                  "test-location-styleeditor-link.html";
 
 add_task(async function() {
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_logErrorInPage.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_logErrorInPage.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_logErrorInPage.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_logErrorInPage.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_logWarningInPage.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_logWarningInPage.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_logWarningInPage.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_logWarningInPage.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_loglimit.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_loglimit.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_loglimit.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_loglimit.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_longstring_expand.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_longstring_expand.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_longstring_expand.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_longstring_expand.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_longstring_hang.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_longstring_hang.js
similarity index 96%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_longstring_hang.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_longstring_hang.js
index 73fd30a14e82..43e64dd88fca 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_longstring_hang.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_longstring_hang.js
@@ -11,7 +11,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/" +
+                 "test/mochitest/" +
                  "test-bug-859170-longstring-hang.html";
 
 add_task(async function() {
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_message_categories.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_message_categories.js
similarity index 98%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_message_categories.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_message_categories.js
index f43009358d1e..0f63f24eb7c0 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_message_categories.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_message_categories.js
@@ -10,7 +10,7 @@
 const TEST_URI = "data:text/html;charset=utf-8,Web Console test for " +
                  "bug 595934 - message categories coverage.";
 const TESTS_PATH = "http://example.com/browser/devtools/client/webconsole/" +
-                   "new-console-output/test/mochitest/";
+                   "test/mochitest/";
 const TESTS = [
   {
     // #0
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_multiple_windows_and_tabs.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_multiple_windows_and_tabs.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_multiple_windows_and_tabs.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_multiple_windows_and_tabs.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_attach.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_network_attach.js
similarity index 97%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_attach.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_network_attach.js
index 77834286eae6..74095906230b 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_attach.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_network_attach.js
@@ -5,7 +5,7 @@
 
 const TEST_FILE = "test-network-request.html";
 const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/" +
-                  "new-console-output/test/mochitest/";
+                  "test/mochitest/";
 const TEST_URI = TEST_PATH + TEST_FILE;
 
 add_task(async function task() {
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_exceptions.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_network_exceptions.js
similarity index 92%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_exceptions.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_network_exceptions.js
index ba289fb153de..a749a22e0f15 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_exceptions.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_network_exceptions.js
@@ -10,7 +10,7 @@
 
 const TEST_URI = "data:text/html;charset=utf-8,Web Console test for bug 618078";
 const TEST_URI2 = "http://example.com/browser/devtools/client/webconsole/" +
-                  "new-console-output/test/mochitest/test-network-exceptions.html";
+                  "test/mochitest/test-network-exceptions.html";
 
 add_task(async function() {
   let hud = await openNewTabAndConsole(TEST_URI);
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_expand.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_expand.js
similarity index 99%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_expand.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_expand.js
index 3b17b52a8f70..be5caf293acf 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_expand.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_expand.js
@@ -5,7 +5,7 @@
 
 const TEST_FILE = "test-network-request.html";
 const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/" +
-                  "new-console-output/test/mochitest/";
+                  "test/mochitest/";
 const TEST_URI = TEST_PATH + TEST_FILE;
 
 const NET_PREF = "devtools.webconsole.filter.net";
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_openinnet.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_openinnet.js
similarity index 96%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_openinnet.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_openinnet.js
index 6fd739b8b9c8..1e3ad850bea4 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_openinnet.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_openinnet.js
@@ -9,7 +9,7 @@ const TEST_URI = "data:text/html;charset=utf8,Test that 'Open in Network Panel'
 const TEST_FILE = "test-network-request.html";
 const JSON_TEST_URL = "test-network-request.html";
 const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/" +
-                  "new-console-output/test/mochitest/";
+                  "test/mochitest/";
 
 const NET_PREF = "devtools.webconsole.filter.net";
 const XHR_PREF = "devtools.webconsole.filter.netxhr";
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_status_code.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_status_code.js
similarity index 95%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_status_code.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_status_code.js
index d3f643bff4ac..149f28f7bcda 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_messages_status_code.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_network_messages_status_code.js
@@ -5,12 +5,12 @@
 
 const TEST_FILE = "test-network-request.html";
 const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/" +
-                  "new-console-output/test/mochitest/";
+                  "test/mochitest/";
 const TEST_URI = TEST_PATH + TEST_FILE;
 
 const NET_PREF = "devtools.webconsole.filter.net";
 const XHR_PREF = "devtools.webconsole.filter.netxhr";
-let { l10n } = require("devtools/client/webconsole/new-console-output/utils/messages");
+let { l10n } = require("devtools/client/webconsole/utils/messages");
 const LEARN_MORE_URI = "https://developer.mozilla.org/docs/Web/HTTP/Status/200" + STATUS_CODES_GA_PARAMS;
 
 pushPref(NET_PREF, true);
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_requests_from_chrome.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_network_requests_from_chrome.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_requests_from_chrome.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_network_requests_from_chrome.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_reset_filter.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_network_reset_filter.js
similarity index 97%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_reset_filter.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_network_reset_filter.js
index b05b32770205..93c7c0c55402 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_network_reset_filter.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_network_reset_filter.js
@@ -9,7 +9,7 @@
 "use strict";
 
 const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/" +
-                  "new-console-output/test/mochitest/";
+                  "test/mochitest/";
 const TEST_URI = "data:text/html;charset=utf8,<p>test file URI";
 
 add_task(async function() {
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_nodes_highlight.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_nodes_highlight.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_nodes_highlight.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_nodes_highlight.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_nodes_select.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_nodes_select.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_nodes_select.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_nodes_select.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_object_in_sidebar.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_object_in_sidebar.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_object_in_sidebar.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_object_in_sidebar.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_object_inspector.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_object_inspector.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_object_inspector_entries.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_entries.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_object_inspector_entries.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_entries.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_object_inspector_key_sorting.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_key_sorting.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_object_inspector_key_sorting.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_key_sorting.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_object_inspector_while_debugging_and_inspecting.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_while_debugging_and_inspecting.js
similarity index 96%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_object_inspector_while_debugging_and_inspecting.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_while_debugging_and_inspecting.js
index 5fda45bfc60f..568e8d4add63 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_object_inspector_while_debugging_and_inspecting.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_object_inspector_while_debugging_and_inspecting.js
@@ -9,7 +9,7 @@
 "use strict";
 
 const TEST_URI = "https://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-eval-in-stackframe.html";
+                 "test/mochitest/test-eval-in-stackframe.html";
 
 add_task(async function() {
   // Force the old debugger UI since it's directly used (see Bug 1301705)
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_observer_notifications.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_observer_notifications.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_observer_notifications.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_observer_notifications.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_optimized_out_vars.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_optimized_out_vars.js
similarity index 97%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_optimized_out_vars.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_optimized_out_vars.js
index 52b1e36c1778..cc6f18d39dfd 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_optimized_out_vars.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_optimized_out_vars.js
@@ -9,7 +9,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/" +
+                 "test/mochitest/" +
                  "test-closure-optimized-out.html";
 
 add_task(async function() {
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_output_copy.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_output_copy.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_output_copy.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_output_copy.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_output_copy_newlines.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_output_copy_newlines.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_output_copy_newlines.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_output_copy_newlines.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_output_order.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_output_order.js
similarity index 93%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_output_order.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_output_order.js
index 846b1df861b9..f1384788beba 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_output_order.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_output_order.js
@@ -9,7 +9,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-console.html";
+                 "test/mochitest/test-console.html";
 
 add_task(async function() {
   let hud = await openNewTabAndConsole(TEST_URI);
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_persist.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_persist.js
similarity index 96%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_persist.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_persist.js
index 0d76f380500a..875bc26797b5 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_persist.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_persist.js
@@ -8,7 +8,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-console.html";
+                 "test/mochitest/test-console.html";
 
 registerCleanupFunction(() => {
   Services.prefs.clearUserPref("devtools.webconsole.persistlog");
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_reopen_closed_tab.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_reopen_closed_tab.js
similarity index 94%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_reopen_closed_tab.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_reopen_closed_tab.js
index 22b538f8c314..60c9481c9d6f 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_reopen_closed_tab.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_reopen_closed_tab.js
@@ -9,7 +9,7 @@
 // reloading a page.
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-reopen-closed-tab.html";
+                 "test/mochitest/test-reopen-closed-tab.html";
 
 add_task(async function() {
   // If we persist log, the test might be successful even if only the first
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_repeat_different_objects.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_repeat_different_objects.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_repeat_different_objects.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_repeat_different_objects.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sandbox_update_after_navigation.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_sandbox_update_after_navigation.js
similarity index 96%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sandbox_update_after_navigation.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_sandbox_update_after_navigation.js
index 546613761f29..7048194904d1 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sandbox_update_after_navigation.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_sandbox_update_after_navigation.js
@@ -10,7 +10,7 @@
 "use strict";
 
 const BASE_URI = "browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-console.html";
+                 "test/mochitest/test-console.html";
 const TEST_URI1 = "http://example.com/" + BASE_URI;
 const TEST_URI2 = "http://example.org/" + BASE_URI;
 
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_script_errordoc_urls.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_script_errordoc_urls.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_script_errordoc_urls.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_script_errordoc_urls.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_scroll.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_scroll.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_scroll.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_scroll.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_select_all.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_select_all.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_select_all.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_select_all.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_show_subresource_security_errors.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_show_subresource_security_errors.js
similarity index 90%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_show_subresource_security_errors.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_show_subresource_security_errors.js
index f07869773fe7..2bf8546232bc 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_show_subresource_security_errors.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_show_subresource_security_errors.js
@@ -10,7 +10,7 @@
 const TEST_URI = "data:text/html;charset=utf-8,Web Console subresource STS " +
                  "warning test";
 const TEST_DOC = "https://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-subresource-security-error.html";
+                 "test/mochitest/test-subresource-security-error.html";
 const SAMPLE_MSG = "specified a header that could not be parsed successfully.";
 
 add_task(async function() {
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_shows_reqs_from_netmonitor.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_shows_reqs_from_netmonitor.js
similarity index 96%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_shows_reqs_from_netmonitor.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_shows_reqs_from_netmonitor.js
index 089828e564e2..7e1cac8eda71 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_shows_reqs_from_netmonitor.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_shows_reqs_from_netmonitor.js
@@ -11,7 +11,7 @@ const TEST_URI = "data:text/html;charset=utf8,Test that the netmonitor " +
 
 const TEST_FILE = "test-network-request.html";
 const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/" +
-                  "new-console-output/test/mochitest/" + TEST_FILE;
+                  "test/mochitest/" + TEST_FILE;
 
 const NET_PREF = "devtools.webconsole.filter.net";
 Services.prefs.setBoolPref(NET_PREF, true);
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_shows_reqs_in_netmonitor.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_shows_reqs_in_netmonitor.js
similarity index 96%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_shows_reqs_in_netmonitor.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_shows_reqs_in_netmonitor.js
index 781f55c7cf2a..a8ba3101f32e 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_shows_reqs_in_netmonitor.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_shows_reqs_in_netmonitor.js
@@ -11,7 +11,7 @@ const TEST_URI = "data:text/html;charset=utf8,Test that the web console " +
 
 const TEST_FILE = "test-network-request.html";
 const TEST_PATH = "http://example.com/browser/devtools/client/webconsole/" +
-                  "new-console-output/test/mochitest/" + TEST_FILE;
+                  "test/mochitest/" + TEST_FILE;
 
 const NET_PREF = "devtools.webconsole.filter.net";
 Services.prefs.setBoolPref(NET_PREF, true);
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_css.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_sourcemap_css.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_css.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_sourcemap_css.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_error.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_sourcemap_error.js
similarity index 93%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_error.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_sourcemap_error.js
index 983ce0ca29d2..f015f94ab209 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_error.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_sourcemap_error.js
@@ -8,7 +8,7 @@
 // Test that a missing source map is reported.
 
 const BASE = "http://example.com/browser/devtools/client/webconsole/" +
-             "new-console-output/test/mochitest/";
+             "test/mochitest/";
 
 add_task(async function() {
   for (let test of ["test-sourcemap-error-01.html", "test-sourcemap-error-02.html"]) {
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_invalid.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_sourcemap_invalid.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_invalid.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_sourcemap_invalid.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_nosource.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_sourcemap_nosource.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_sourcemap_nosource.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_sourcemap_nosource.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_split.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_split.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_split.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_split.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_split_escape_key.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_split_escape_key.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_split_escape_key.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_split_escape_key.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_split_focus.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_split_focus.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_split_focus.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_split_focus.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_split_persist.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_split_persist.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_split_persist.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_split_persist.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_stacktrace_location_debugger_link.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_stacktrace_location_debugger_link.js
similarity index 97%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_stacktrace_location_debugger_link.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_stacktrace_location_debugger_link.js
index 2384fcc3b83a..6a4a6bc6f3fb 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_stacktrace_location_debugger_link.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_stacktrace_location_debugger_link.js
@@ -15,7 +15,7 @@ PromiseTestUtils.whitelistRejectionsGlobally(/Component not initialized/);
 PromiseTestUtils.whitelistRejectionsGlobally(/this\.worker is null/);
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/" +
+                 "test/mochitest/" +
                  "test-stacktrace-location-debugger-link.html";
 
 add_task(async function() {
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_stacktrace_location_scratchpad_link.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_stacktrace_location_scratchpad_link.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_stacktrace_location_scratchpad_link.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_stacktrace_location_scratchpad_link.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_strict_mode_errors.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_strict_mode_errors.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_strict_mode_errors.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_strict_mode_errors.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_string.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_string.js
similarity index 94%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_string.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_string.js
index 9066a11686fa..b9db22f658e9 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_string.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_string.js
@@ -6,7 +6,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-console.html";
+                 "test/mochitest/test-console.html";
 
 add_task(async function() {
   let hud = await openNewTabAndConsole(TEST_URI);
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_time_methods.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_time_methods.js
similarity index 97%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_time_methods.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_time_methods.js
index f667822309fb..7b39293cebc6 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_time_methods.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_time_methods.js
@@ -8,7 +8,7 @@
 "use strict";
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-time-methods.html";
+                 "test/mochitest/test-time-methods.html";
 
 const TEST_URI2 = "data:text/html;charset=utf-8,<script>" +
                   "console.timeEnd('bTimer');</script>";
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_timestamps.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_timestamps.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_timestamps.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_timestamps.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_trackingprotection_errors.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_trackingprotection_errors.js
similarity index 96%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_trackingprotection_errors.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_trackingprotection_errors.js
index 9c78f092f760..1e26f559bb4a 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_trackingprotection_errors.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_trackingprotection_errors.js
@@ -9,7 +9,7 @@
 "use strict";
 
 const TEST_URI = "http://tracking.example.org/browser/devtools/client/" +
-                 "webconsole/new-console-output/test/mochitest/" +
+                 "webconsole/test/mochitest/" +
                  "test-trackingprotection-securityerrors.html";
 const LEARN_MORE_URI = "https://developer.mozilla.org/Firefox/Privacy/" +
                        "Tracking_Protection" + DOCS_GA_PARAMS;
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_view_source.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_view_source.js
similarity index 95%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_view_source.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_view_source.js
index eece82b949e6..043d01e1a0f1 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_view_source.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_view_source.js
@@ -11,7 +11,7 @@
 "use strict";
 
 const TEST_URI = "https://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/" +
+                 "test/mochitest/" +
                  "test-mixedcontent-securityerrors.html";
 
 add_task(async function() {
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_visibility_messages.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_visibility_messages.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_visibility_messages.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_visibility_messages.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_warn_about_replaced_api.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_warn_about_replaced_api.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_warn_about_replaced_api.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_warn_about_replaced_api.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_websocket.js b/devtools/client/webconsole/test/mochitest/browser_webconsole_websocket.js
similarity index 92%
rename from devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_websocket.js
rename to devtools/client/webconsole/test/mochitest/browser_webconsole_websocket.js
index 9c510441fe05..f165c7e9725c 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/browser_webconsole_websocket.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_websocket.js
@@ -8,7 +8,7 @@
 // Check that WebSocket connection failure messages are displayed. See Bug 603750.
 
 const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
-                 "new-console-output/test/mochitest/test-websocket.html";
+                 "test/mochitest/test-websocket.html";
 const TEST_URI2 = "data:text/html;charset=utf-8,Web Console test for " +
                   "bug 603750: Web Socket errors";
 
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/code_bundle_invalidmap.js b/devtools/client/webconsole/test/mochitest/code_bundle_invalidmap.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/code_bundle_invalidmap.js
rename to devtools/client/webconsole/test/mochitest/code_bundle_invalidmap.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/code_bundle_invalidmap.js.map b/devtools/client/webconsole/test/mochitest/code_bundle_invalidmap.js.map
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/code_bundle_invalidmap.js.map
rename to devtools/client/webconsole/test/mochitest/code_bundle_invalidmap.js.map
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/code_bundle_nosource.js b/devtools/client/webconsole/test/mochitest/code_bundle_nosource.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/code_bundle_nosource.js
rename to devtools/client/webconsole/test/mochitest/code_bundle_nosource.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/code_bundle_nosource.js.map b/devtools/client/webconsole/test/mochitest/code_bundle_nosource.js.map
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/code_bundle_nosource.js.map
rename to devtools/client/webconsole/test/mochitest/code_bundle_nosource.js.map
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/code_nosource.js b/devtools/client/webconsole/test/mochitest/code_nosource.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/code_nosource.js
rename to devtools/client/webconsole/test/mochitest/code_nosource.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/head.js b/devtools/client/webconsole/test/mochitest/head.js
similarity index 99%
rename from devtools/client/webconsole/new-console-output/test/mochitest/head.js
rename to devtools/client/webconsole/test/mochitest/head.js
index 938e4aae2596..041c78130e6e 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/head.js
+++ b/devtools/client/webconsole/test/mochitest/head.js
@@ -14,7 +14,7 @@ Services.scriptloader.loadSubScript(
 
 // shared-head.js handles imports, constants, and utility functions
 // Load the shared-head file first.
-/* import-globals-from ../../../../shared/test/shared-head.js */
+/* import-globals-from ../../../shared/test/shared-head.js */
 Services.scriptloader.loadSubScript(
   "chrome://mochitests/content/browser/devtools/client/shared/test/shared-head.js",
   this);
@@ -32,7 +32,7 @@ const STATUS_CODES_GA_PARAMS = `?${new URLSearchParams({
   "utm_campaign": "default"
 })}`;
 
-const wcActions = require("devtools/client/webconsole/new-console-output/actions/index");
+const wcActions = require("devtools/client/webconsole/actions/index");
 
 Services.prefs.setBoolPref("devtools.browserconsole.new-frontend-enabled", true);
 registerCleanupFunction(async function() {
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/sjs_cors-test-server.sjs b/devtools/client/webconsole/test/mochitest/sjs_cors-test-server.sjs
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/sjs_cors-test-server.sjs
rename to devtools/client/webconsole/test/mochitest/sjs_cors-test-server.sjs
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/sjs_slow-response-test-server.sjs b/devtools/client/webconsole/test/mochitest/sjs_slow-response-test-server.sjs
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/sjs_slow-response-test-server.sjs
rename to devtools/client/webconsole/test/mochitest/sjs_slow-response-test-server.sjs
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/source-mapped.css b/devtools/client/webconsole/test/mochitest/source-mapped.css
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/source-mapped.css
rename to devtools/client/webconsole/test/mochitest/source-mapped.css
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/source-mapped.css.map b/devtools/client/webconsole/test/mochitest/source-mapped.css.map
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/source-mapped.css.map
rename to devtools/client/webconsole/test/mochitest/source-mapped.css.map
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/source-mapped.scss b/devtools/client/webconsole/test/mochitest/source-mapped.scss
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/source-mapped.scss
rename to devtools/client/webconsole/test/mochitest/source-mapped.scss
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-autocomplete-in-stackframe.html b/devtools/client/webconsole/test/mochitest/test-autocomplete-in-stackframe.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-autocomplete-in-stackframe.html
rename to devtools/client/webconsole/test/mochitest/test-autocomplete-in-stackframe.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-batching.html b/devtools/client/webconsole/test/mochitest/test-batching.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-batching.html
rename to devtools/client/webconsole/test/mochitest/test-batching.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-585956-console-trace.html b/devtools/client/webconsole/test/mochitest/test-bug-585956-console-trace.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-585956-console-trace.html
rename to devtools/client/webconsole/test/mochitest/test-bug-585956-console-trace.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-599725-response-headers.sjs b/devtools/client/webconsole/test/mochitest/test-bug-599725-response-headers.sjs
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-599725-response-headers.sjs
rename to devtools/client/webconsole/test/mochitest/test-bug-599725-response-headers.sjs
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-601177-log-levels.html b/devtools/client/webconsole/test/mochitest/test-bug-601177-log-levels.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-601177-log-levels.html
rename to devtools/client/webconsole/test/mochitest/test-bug-601177-log-levels.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-601177-log-levels.js b/devtools/client/webconsole/test/mochitest/test-bug-601177-log-levels.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-601177-log-levels.js
rename to devtools/client/webconsole/test/mochitest/test-bug-601177-log-levels.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-630733-response-redirect-headers.sjs b/devtools/client/webconsole/test/mochitest/test-bug-630733-response-redirect-headers.sjs
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-630733-response-redirect-headers.sjs
rename to devtools/client/webconsole/test/mochitest/test-bug-630733-response-redirect-headers.sjs
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-632275-getters.html b/devtools/client/webconsole/test/mochitest/test-bug-632275-getters.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-632275-getters.html
rename to devtools/client/webconsole/test/mochitest/test-bug-632275-getters.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-646025-console-file-location.html b/devtools/client/webconsole/test/mochitest/test-bug-646025-console-file-location.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-646025-console-file-location.html
rename to devtools/client/webconsole/test/mochitest/test-bug-646025-console-file-location.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-766001-console-log.js b/devtools/client/webconsole/test/mochitest/test-bug-766001-console-log.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-766001-console-log.js
rename to devtools/client/webconsole/test/mochitest/test-bug-766001-console-log.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-766001-js-console-links.html b/devtools/client/webconsole/test/mochitest/test-bug-766001-js-console-links.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-766001-js-console-links.html
rename to devtools/client/webconsole/test/mochitest/test-bug-766001-js-console-links.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-766001-js-errors.js b/devtools/client/webconsole/test/mochitest/test-bug-766001-js-errors.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-766001-js-errors.js
rename to devtools/client/webconsole/test/mochitest/test-bug-766001-js-errors.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-782653-css-errors-1.css b/devtools/client/webconsole/test/mochitest/test-bug-782653-css-errors-1.css
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-782653-css-errors-1.css
rename to devtools/client/webconsole/test/mochitest/test-bug-782653-css-errors-1.css
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-782653-css-errors-2.css b/devtools/client/webconsole/test/mochitest/test-bug-782653-css-errors-2.css
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-782653-css-errors-2.css
rename to devtools/client/webconsole/test/mochitest/test-bug-782653-css-errors-2.css
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-782653-css-errors.html b/devtools/client/webconsole/test/mochitest/test-bug-782653-css-errors.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-782653-css-errors.html
rename to devtools/client/webconsole/test/mochitest/test-bug-782653-css-errors.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-837351-security-errors.html b/devtools/client/webconsole/test/mochitest/test-bug-837351-security-errors.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-837351-security-errors.html
rename to devtools/client/webconsole/test/mochitest/test-bug-837351-security-errors.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-859170-longstring-hang.html b/devtools/client/webconsole/test/mochitest/test-bug-859170-longstring-hang.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-859170-longstring-hang.html
rename to devtools/client/webconsole/test/mochitest/test-bug-859170-longstring-hang.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug-952277-highlight-nodes-in-vview.html b/devtools/client/webconsole/test/mochitest/test-bug-952277-highlight-nodes-in-vview.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug-952277-highlight-nodes-in-vview.html
rename to devtools/client/webconsole/test/mochitest/test-bug-952277-highlight-nodes-in-vview.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug_923281_console_log_filter.html b/devtools/client/webconsole/test/mochitest/test-bug_923281_console_log_filter.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug_923281_console_log_filter.html
rename to devtools/client/webconsole/test/mochitest/test-bug_923281_console_log_filter.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug_923281_test1.js b/devtools/client/webconsole/test/mochitest/test-bug_923281_test1.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug_923281_test1.js
rename to devtools/client/webconsole/test/mochitest/test-bug_923281_test1.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-bug_923281_test2.js b/devtools/client/webconsole/test/mochitest/test-bug_923281_test2.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-bug_923281_test2.js
rename to devtools/client/webconsole/test/mochitest/test-bug_923281_test2.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-cd-iframe-child.html b/devtools/client/webconsole/test/mochitest/test-cd-iframe-child.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-cd-iframe-child.html
rename to devtools/client/webconsole/test/mochitest/test-cd-iframe-child.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-cd-iframe-parent.html b/devtools/client/webconsole/test/mochitest/test-cd-iframe-parent.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-cd-iframe-parent.html
rename to devtools/client/webconsole/test/mochitest/test-cd-iframe-parent.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-certificate-messages.html b/devtools/client/webconsole/test/mochitest/test-certificate-messages.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-certificate-messages.html
rename to devtools/client/webconsole/test/mochitest/test-certificate-messages.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-click-function-to-source.html b/devtools/client/webconsole/test/mochitest/test-click-function-to-source.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-click-function-to-source.html
rename to devtools/client/webconsole/test/mochitest/test-click-function-to-source.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-click-function-to-source.js b/devtools/client/webconsole/test/mochitest/test-click-function-to-source.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-click-function-to-source.js
rename to devtools/client/webconsole/test/mochitest/test-click-function-to-source.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-closure-optimized-out.html b/devtools/client/webconsole/test/mochitest/test-closure-optimized-out.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-closure-optimized-out.html
rename to devtools/client/webconsole/test/mochitest/test-closure-optimized-out.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-closures.html b/devtools/client/webconsole/test/mochitest/test-closures.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-closures.html
rename to devtools/client/webconsole/test/mochitest/test-closures.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-api-iframe.html b/devtools/client/webconsole/test/mochitest/test-console-api-iframe.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-api-iframe.html
rename to devtools/client/webconsole/test/mochitest/test-console-api-iframe.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-api-stackframe.html b/devtools/client/webconsole/test/mochitest/test-console-api-stackframe.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-api-stackframe.html
rename to devtools/client/webconsole/test/mochitest/test-console-api-stackframe.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-clear.html b/devtools/client/webconsole/test/mochitest/test-console-clear.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-clear.html
rename to devtools/client/webconsole/test/mochitest/test-console-clear.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-column.html b/devtools/client/webconsole/test/mochitest/test-console-column.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-column.html
rename to devtools/client/webconsole/test/mochitest/test-console-column.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-count-external-file.js b/devtools/client/webconsole/test/mochitest/test-console-count-external-file.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-count-external-file.js
rename to devtools/client/webconsole/test/mochitest/test-console-count-external-file.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-count.html b/devtools/client/webconsole/test/mochitest/test-console-count.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-count.html
rename to devtools/client/webconsole/test/mochitest/test-console-count.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-extras.html b/devtools/client/webconsole/test/mochitest/test-console-extras.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-extras.html
rename to devtools/client/webconsole/test/mochitest/test-console-extras.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-filters.html b/devtools/client/webconsole/test/mochitest/test-console-filters.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-filters.html
rename to devtools/client/webconsole/test/mochitest/test-console-filters.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-group.html b/devtools/client/webconsole/test/mochitest/test-console-group.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-group.html
rename to devtools/client/webconsole/test/mochitest/test-console-group.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-iframes.html b/devtools/client/webconsole/test/mochitest/test-console-iframes.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-iframes.html
rename to devtools/client/webconsole/test/mochitest/test-console-iframes.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-output-02.html b/devtools/client/webconsole/test/mochitest/test-console-output-02.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-output-02.html
rename to devtools/client/webconsole/test/mochitest/test-console-output-02.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-output-03.html b/devtools/client/webconsole/test/mochitest/test-console-output-03.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-output-03.html
rename to devtools/client/webconsole/test/mochitest/test-console-output-03.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-output-04.html b/devtools/client/webconsole/test/mochitest/test-console-output-04.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-output-04.html
rename to devtools/client/webconsole/test/mochitest/test-console-output-04.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-output-dom-elements.html b/devtools/client/webconsole/test/mochitest/test-console-output-dom-elements.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-output-dom-elements.html
rename to devtools/client/webconsole/test/mochitest/test-console-output-dom-elements.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-output-events.html b/devtools/client/webconsole/test/mochitest/test-console-output-events.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-output-events.html
rename to devtools/client/webconsole/test/mochitest/test-console-output-events.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-replaced-api.html b/devtools/client/webconsole/test/mochitest/test-console-replaced-api.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-replaced-api.html
rename to devtools/client/webconsole/test/mochitest/test-console-replaced-api.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-server-logging-array.sjs b/devtools/client/webconsole/test/mochitest/test-console-server-logging-array.sjs
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-server-logging-array.sjs
rename to devtools/client/webconsole/test/mochitest/test-console-server-logging-array.sjs
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-server-logging-backtrace.sjs b/devtools/client/webconsole/test/mochitest/test-console-server-logging-backtrace.sjs
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-server-logging-backtrace.sjs
rename to devtools/client/webconsole/test/mochitest/test-console-server-logging-backtrace.sjs
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-server-logging.sjs b/devtools/client/webconsole/test/mochitest/test-console-server-logging.sjs
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-server-logging.sjs
rename to devtools/client/webconsole/test/mochitest/test-console-server-logging.sjs
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-table.html b/devtools/client/webconsole/test/mochitest/test-console-table.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-table.html
rename to devtools/client/webconsole/test/mochitest/test-console-table.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-trace-async.html b/devtools/client/webconsole/test/mochitest/test-console-trace-async.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-trace-async.html
rename to devtools/client/webconsole/test/mochitest/test-console-trace-async.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-trace-duplicates.html b/devtools/client/webconsole/test/mochitest/test-console-trace-duplicates.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-trace-duplicates.html
rename to devtools/client/webconsole/test/mochitest/test-console-trace-duplicates.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console-workers.html b/devtools/client/webconsole/test/mochitest/test-console-workers.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console-workers.html
rename to devtools/client/webconsole/test/mochitest/test-console-workers.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-console.html b/devtools/client/webconsole/test/mochitest/test-console.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-console.html
rename to devtools/client/webconsole/test/mochitest/test-console.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-csp-violation.html b/devtools/client/webconsole/test/mochitest/test-csp-violation.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-csp-violation.html
rename to devtools/client/webconsole/test/mochitest/test-csp-violation.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-cspro.html b/devtools/client/webconsole/test/mochitest/test-cspro.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-cspro.html
rename to devtools/client/webconsole/test/mochitest/test-cspro.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-cspro.html^headers^ b/devtools/client/webconsole/test/mochitest/test-cspro.html^headers^
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-cspro.html^headers^
rename to devtools/client/webconsole/test/mochitest/test-cspro.html^headers^
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-cu-reporterror.js b/devtools/client/webconsole/test/mochitest/test-cu-reporterror.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-cu-reporterror.js
rename to devtools/client/webconsole/test/mochitest/test-cu-reporterror.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-data.json b/devtools/client/webconsole/test/mochitest/test-data.json
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-data.json
rename to devtools/client/webconsole/test/mochitest/test-data.json
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-data.json^headers^ b/devtools/client/webconsole/test/mochitest/test-data.json^headers^
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-data.json^headers^
rename to devtools/client/webconsole/test/mochitest/test-data.json^headers^
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-duplicate-error.html b/devtools/client/webconsole/test/mochitest/test-duplicate-error.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-duplicate-error.html
rename to devtools/client/webconsole/test/mochitest/test-duplicate-error.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-encoding-ISO-8859-1.html b/devtools/client/webconsole/test/mochitest/test-encoding-ISO-8859-1.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-encoding-ISO-8859-1.html
rename to devtools/client/webconsole/test/mochitest/test-encoding-ISO-8859-1.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-error.html b/devtools/client/webconsole/test/mochitest/test-error.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-error.html
rename to devtools/client/webconsole/test/mochitest/test-error.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-eval-in-stackframe.html b/devtools/client/webconsole/test/mochitest/test-eval-in-stackframe.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-eval-in-stackframe.html
rename to devtools/client/webconsole/test/mochitest/test-eval-in-stackframe.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-exception-stackframe.html b/devtools/client/webconsole/test/mochitest/test-exception-stackframe.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-exception-stackframe.html
rename to devtools/client/webconsole/test/mochitest/test-exception-stackframe.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-external-script-errors.html b/devtools/client/webconsole/test/mochitest/test-external-script-errors.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-external-script-errors.html
rename to devtools/client/webconsole/test/mochitest/test-external-script-errors.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-external-script-errors.js b/devtools/client/webconsole/test/mochitest/test-external-script-errors.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-external-script-errors.js
rename to devtools/client/webconsole/test/mochitest/test-external-script-errors.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-file-location.js b/devtools/client/webconsole/test/mochitest/test-file-location.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-file-location.js
rename to devtools/client/webconsole/test/mochitest/test-file-location.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-filter.html b/devtools/client/webconsole/test/mochitest/test-filter.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-filter.html
rename to devtools/client/webconsole/test/mochitest/test-filter.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-for-of.html b/devtools/client/webconsole/test/mochitest/test-for-of.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-for-of.html
rename to devtools/client/webconsole/test/mochitest/test-for-of.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-child.html b/devtools/client/webconsole/test/mochitest/test-iframe-child.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-child.html
rename to devtools/client/webconsole/test/mochitest/test-iframe-child.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-insecure-form-action.html b/devtools/client/webconsole/test/mochitest/test-iframe-insecure-form-action.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-insecure-form-action.html
rename to devtools/client/webconsole/test/mochitest/test-iframe-insecure-form-action.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-parent.html b/devtools/client/webconsole/test/mochitest/test-iframe-parent.html
similarity index 82%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-parent.html
rename to devtools/client/webconsole/test/mochitest/test-iframe-parent.html
index fffa6e021ae5..3238b4b28ad7 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-parent.html
+++ b/devtools/client/webconsole/test/mochitest/test-iframe-parent.html
@@ -8,6 +8,6 @@
   </head>
   <body>
     <p>test for bug 989025 - iframe parent</p>
-    <iframe src="http://mochi.test:8888/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-child.html"></iframe>
+    <iframe src="http://mochi.test:8888/browser/devtools/client/webconsole/test/mochitest/test-iframe-child.html"></iframe>
   </body>
 </html>
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-wrong-hud-iframe.html b/devtools/client/webconsole/test/mochitest/test-iframe-wrong-hud-iframe.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-wrong-hud-iframe.html
rename to devtools/client/webconsole/test/mochitest/test-iframe-wrong-hud-iframe.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-wrong-hud.html b/devtools/client/webconsole/test/mochitest/test-iframe-wrong-hud.html
similarity index 84%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-wrong-hud.html
rename to devtools/client/webconsole/test/mochitest/test-iframe-wrong-hud.html
index 336076269133..6a02ea351faa 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-wrong-hud.html
+++ b/devtools/client/webconsole/test/mochitest/test-iframe-wrong-hud.html
@@ -9,6 +9,6 @@
    <body>
      <p>WebConsole test: iframe associated to the wrong HUD.</p>
      <iframe
-       src="http://example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-wrong-hud-iframe.html"></iframe>
+       src="http://example.com/browser/devtools/client/webconsole/test/mochitest/test-iframe-wrong-hud-iframe.html"></iframe>
    </body>
  </html>
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe1.html b/devtools/client/webconsole/test/mochitest/test-iframe1.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-iframe1.html
rename to devtools/client/webconsole/test/mochitest/test-iframe1.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe2.html b/devtools/client/webconsole/test/mochitest/test-iframe2.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-iframe2.html
rename to devtools/client/webconsole/test/mochitest/test-iframe2.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe3.html b/devtools/client/webconsole/test/mochitest/test-iframe3.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-iframe3.html
rename to devtools/client/webconsole/test/mochitest/test-iframe3.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-image.png b/devtools/client/webconsole/test/mochitest/test-image.png
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-image.png
rename to devtools/client/webconsole/test/mochitest/test-image.png
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning-inner.html b/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-inner.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning-inner.html
rename to devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-inner.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning-nested1.html b/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-nested1.html
similarity index 68%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning-nested1.html
rename to devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-nested1.html
index dc4152ec9601..30f9140133a6 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning-nested1.html
+++ b/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-nested1.html
@@ -9,6 +9,6 @@
   </head>
   <body>
     <iframe
-src="http://www.example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning-inner.html"></iframe>
+src="http://www.example.com/browser/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-inner.html"></iframe>
   </body>
 </html>
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning-nested2.html b/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-nested2.html
similarity index 63%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning-nested2.html
rename to devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-nested2.html
index 02b0e2195900..b42548e57b83 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning-nested2.html
+++ b/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-nested2.html
@@ -9,6 +9,6 @@
   </head>
   <body>
     <iframe
-src="http://www.example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning-inner.html" sandbox="allow-scripts allow-same-origin"></iframe>
+src="http://www.example.com/browser/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-inner.html" sandbox="allow-scripts allow-same-origin"></iframe>
   </body>
 </html>
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning0.html b/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning0.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning0.html
rename to devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning0.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning1.html b/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning1.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning1.html
rename to devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning1.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning2.html b/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning2.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning2.html
rename to devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning2.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning3.html b/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning3.html
similarity index 65%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning3.html
rename to devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning3.html
index eb20467c12f9..193709d988de 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning3.html
+++ b/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning3.html
@@ -9,6 +9,6 @@
   </head>
   <body>
     <iframe
-src="http://www.example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning-inner.html" sandbox="allow-scripts allow-same-origin"></iframe>
+src="http://www.example.com/browser/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-inner.html" sandbox="allow-scripts allow-same-origin"></iframe>
   </body>
 </html>
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning4.html b/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning4.html
similarity index 65%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning4.html
rename to devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning4.html
index 8036c7d855ef..ec84184cb8a2 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning4.html
+++ b/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning4.html
@@ -9,6 +9,6 @@
   </head>
   <body>
     <iframe
-src="http://www.example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning-nested1.html" sandbox="allow-scripts allow-same-origin"></iframe>
+src="http://www.example.com/browser/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-nested1.html" sandbox="allow-scripts allow-same-origin"></iframe>
   </body>
 </html>
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning5.html b/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning5.html
similarity index 70%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning5.html
rename to devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning5.html
index fe4df1f1990b..a923a163e5f0 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning5.html
+++ b/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning5.html
@@ -9,6 +9,6 @@
   </head>
   <body>
     <iframe
-src="http://www.example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-ineffective-iframe-sandbox-warning-nested2.html"></iframe>
+src="http://www.example.com/browser/devtools/client/webconsole/test/mochitest/test-ineffective-iframe-sandbox-warning-nested2.html"></iframe>
   </body>
 </html>
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-insecure-frame.html b/devtools/client/webconsole/test/mochitest/test-insecure-frame.html
similarity index 73%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-insecure-frame.html
rename to devtools/client/webconsole/test/mochitest/test-insecure-frame.html
index 2a955c0d3c4f..23281caeb366 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/test-insecure-frame.html
+++ b/devtools/client/webconsole/test/mochitest/test-insecure-frame.html
@@ -9,7 +9,7 @@
     <h1>iframe 1</h1>
     <p>This frame is served with an insecure password field.</p>
     <iframe src=
-      "http://example.com/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-iframe-insecure-form-action.html">
+      "http://example.com/browser/devtools/client/webconsole/test/mochitest/test-iframe-insecure-form-action.html">
     </iframe>
   </body>
 </html>
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-insecure-passwords-about-blank-web-console-warning.html b/devtools/client/webconsole/test/mochitest/test-insecure-passwords-about-blank-web-console-warning.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-insecure-passwords-about-blank-web-console-warning.html
rename to devtools/client/webconsole/test/mochitest/test-insecure-passwords-about-blank-web-console-warning.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-insecure-passwords-web-console-warning.html b/devtools/client/webconsole/test/mochitest/test-insecure-passwords-web-console-warning.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-insecure-passwords-web-console-warning.html
rename to devtools/client/webconsole/test/mochitest/test-insecure-passwords-web-console-warning.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-inspect-cross-domain-objects-frame.html b/devtools/client/webconsole/test/mochitest/test-inspect-cross-domain-objects-frame.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-inspect-cross-domain-objects-frame.html
rename to devtools/client/webconsole/test/mochitest/test-inspect-cross-domain-objects-frame.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-inspect-cross-domain-objects-top.html b/devtools/client/webconsole/test/mochitest/test-inspect-cross-domain-objects-top.html
similarity index 81%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-inspect-cross-domain-objects-top.html
rename to devtools/client/webconsole/test/mochitest/test-inspect-cross-domain-objects-top.html
index 8fab7ab38e52..109d343de018 100644
--- a/devtools/client/webconsole/new-console-output/test/mochitest/test-inspect-cross-domain-objects-top.html
+++ b/devtools/client/webconsole/test/mochitest/test-inspect-cross-domain-objects-top.html
@@ -9,6 +9,6 @@
   <body>
     <p>Make sure users can inspect objects from cross-domain iframes.</p>
     <p>Top window.</p>
-    <iframe src="http://example.org/browser/devtools/client/webconsole/new-console-output/test/mochitest/test-inspect-cross-domain-objects-frame.html"></iframe>
+    <iframe src="http://example.org/browser/devtools/client/webconsole/test/mochitest/test-inspect-cross-domain-objects-frame.html"></iframe>
   </body>
 </html>
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-jsterm-dollar.html b/devtools/client/webconsole/test/mochitest/test-jsterm-dollar.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-jsterm-dollar.html
rename to devtools/client/webconsole/test/mochitest/test-jsterm-dollar.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-location-debugger-link-console-log.js b/devtools/client/webconsole/test/mochitest/test-location-debugger-link-console-log.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-location-debugger-link-console-log.js
rename to devtools/client/webconsole/test/mochitest/test-location-debugger-link-console-log.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-location-debugger-link-errors.js b/devtools/client/webconsole/test/mochitest/test-location-debugger-link-errors.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-location-debugger-link-errors.js
rename to devtools/client/webconsole/test/mochitest/test-location-debugger-link-errors.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-location-debugger-link.html b/devtools/client/webconsole/test/mochitest/test-location-debugger-link.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-location-debugger-link.html
rename to devtools/client/webconsole/test/mochitest/test-location-debugger-link.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-location-styleeditor-link-1.css b/devtools/client/webconsole/test/mochitest/test-location-styleeditor-link-1.css
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-location-styleeditor-link-1.css
rename to devtools/client/webconsole/test/mochitest/test-location-styleeditor-link-1.css
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-location-styleeditor-link-2.css b/devtools/client/webconsole/test/mochitest/test-location-styleeditor-link-2.css
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-location-styleeditor-link-2.css
rename to devtools/client/webconsole/test/mochitest/test-location-styleeditor-link-2.css
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-location-styleeditor-link.html b/devtools/client/webconsole/test/mochitest/test-location-styleeditor-link.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-location-styleeditor-link.html
rename to devtools/client/webconsole/test/mochitest/test-location-styleeditor-link.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-canvas-css.html b/devtools/client/webconsole/test/mochitest/test-message-categories-canvas-css.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-canvas-css.html
rename to devtools/client/webconsole/test/mochitest/test-message-categories-canvas-css.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-canvas-css.js b/devtools/client/webconsole/test/mochitest/test-message-categories-canvas-css.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-canvas-css.js
rename to devtools/client/webconsole/test/mochitest/test-message-categories-canvas-css.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-css-loader.css b/devtools/client/webconsole/test/mochitest/test-message-categories-css-loader.css
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-css-loader.css
rename to devtools/client/webconsole/test/mochitest/test-message-categories-css-loader.css
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-css-loader.css^headers^ b/devtools/client/webconsole/test/mochitest/test-message-categories-css-loader.css^headers^
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-css-loader.css^headers^
rename to devtools/client/webconsole/test/mochitest/test-message-categories-css-loader.css^headers^
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-css-loader.html b/devtools/client/webconsole/test/mochitest/test-message-categories-css-loader.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-css-loader.html
rename to devtools/client/webconsole/test/mochitest/test-message-categories-css-loader.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-css-parser.css b/devtools/client/webconsole/test/mochitest/test-message-categories-css-parser.css
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-css-parser.css
rename to devtools/client/webconsole/test/mochitest/test-message-categories-css-parser.css
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-css-parser.html b/devtools/client/webconsole/test/mochitest/test-message-categories-css-parser.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-css-parser.html
rename to devtools/client/webconsole/test/mochitest/test-message-categories-css-parser.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-empty-getelementbyid.html b/devtools/client/webconsole/test/mochitest/test-message-categories-empty-getelementbyid.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-empty-getelementbyid.html
rename to devtools/client/webconsole/test/mochitest/test-message-categories-empty-getelementbyid.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-empty-getelementbyid.js b/devtools/client/webconsole/test/mochitest/test-message-categories-empty-getelementbyid.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-empty-getelementbyid.js
rename to devtools/client/webconsole/test/mochitest/test-message-categories-empty-getelementbyid.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-html.html b/devtools/client/webconsole/test/mochitest/test-message-categories-html.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-html.html
rename to devtools/client/webconsole/test/mochitest/test-message-categories-html.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-image.html b/devtools/client/webconsole/test/mochitest/test-message-categories-image.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-image.html
rename to devtools/client/webconsole/test/mochitest/test-message-categories-image.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-image.jpg b/devtools/client/webconsole/test/mochitest/test-message-categories-image.jpg
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-image.jpg
rename to devtools/client/webconsole/test/mochitest/test-message-categories-image.jpg
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-imagemap.html b/devtools/client/webconsole/test/mochitest/test-message-categories-imagemap.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-imagemap.html
rename to devtools/client/webconsole/test/mochitest/test-message-categories-imagemap.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-malformedxml-external.html b/devtools/client/webconsole/test/mochitest/test-message-categories-malformedxml-external.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-malformedxml-external.html
rename to devtools/client/webconsole/test/mochitest/test-message-categories-malformedxml-external.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-malformedxml-external.xml b/devtools/client/webconsole/test/mochitest/test-message-categories-malformedxml-external.xml
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-malformedxml-external.xml
rename to devtools/client/webconsole/test/mochitest/test-message-categories-malformedxml-external.xml
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-malformedxml.xhtml b/devtools/client/webconsole/test/mochitest/test-message-categories-malformedxml.xhtml
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-malformedxml.xhtml
rename to devtools/client/webconsole/test/mochitest/test-message-categories-malformedxml.xhtml
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-svg.xhtml b/devtools/client/webconsole/test/mochitest/test-message-categories-svg.xhtml
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-svg.xhtml
rename to devtools/client/webconsole/test/mochitest/test-message-categories-svg.xhtml
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-workers.html b/devtools/client/webconsole/test/mochitest/test-message-categories-workers.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-workers.html
rename to devtools/client/webconsole/test/mochitest/test-message-categories-workers.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-workers.js b/devtools/client/webconsole/test/mochitest/test-message-categories-workers.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-message-categories-workers.js
rename to devtools/client/webconsole/test/mochitest/test-message-categories-workers.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-mixedcontent-securityerrors.html b/devtools/client/webconsole/test/mochitest/test-mixedcontent-securityerrors.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-mixedcontent-securityerrors.html
rename to devtools/client/webconsole/test/mochitest/test-mixedcontent-securityerrors.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-mutation.html b/devtools/client/webconsole/test/mochitest/test-mutation.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-mutation.html
rename to devtools/client/webconsole/test/mochitest/test-mutation.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-network-exceptions.html b/devtools/client/webconsole/test/mochitest/test-network-exceptions.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-network-exceptions.html
rename to devtools/client/webconsole/test/mochitest/test-network-exceptions.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-network-request.html b/devtools/client/webconsole/test/mochitest/test-network-request.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-network-request.html
rename to devtools/client/webconsole/test/mochitest/test-network-request.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-network.html b/devtools/client/webconsole/test/mochitest/test-network.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-network.html
rename to devtools/client/webconsole/test/mochitest/test-network.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-observe-http-ajax.html b/devtools/client/webconsole/test/mochitest/test-observe-http-ajax.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-observe-http-ajax.html
rename to devtools/client/webconsole/test/mochitest/test-observe-http-ajax.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-own-console.html b/devtools/client/webconsole/test/mochitest/test-own-console.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-own-console.html
rename to devtools/client/webconsole/test/mochitest/test-own-console.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-property-provider.html b/devtools/client/webconsole/test/mochitest/test-property-provider.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-property-provider.html
rename to devtools/client/webconsole/test/mochitest/test-property-provider.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-reopen-closed-tab.html b/devtools/client/webconsole/test/mochitest/test-reopen-closed-tab.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-reopen-closed-tab.html
rename to devtools/client/webconsole/test/mochitest/test-reopen-closed-tab.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-result-format-as-string.html b/devtools/client/webconsole/test/mochitest/test-result-format-as-string.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-result-format-as-string.html
rename to devtools/client/webconsole/test/mochitest/test-result-format-as-string.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-sourcemap-error-01.html b/devtools/client/webconsole/test/mochitest/test-sourcemap-error-01.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-sourcemap-error-01.html
rename to devtools/client/webconsole/test/mochitest/test-sourcemap-error-01.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-sourcemap-error-01.js b/devtools/client/webconsole/test/mochitest/test-sourcemap-error-01.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-sourcemap-error-01.js
rename to devtools/client/webconsole/test/mochitest/test-sourcemap-error-01.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-sourcemap-error-02.html b/devtools/client/webconsole/test/mochitest/test-sourcemap-error-02.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-sourcemap-error-02.html
rename to devtools/client/webconsole/test/mochitest/test-sourcemap-error-02.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-sourcemap-error-02.js b/devtools/client/webconsole/test/mochitest/test-sourcemap-error-02.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-sourcemap-error-02.js
rename to devtools/client/webconsole/test/mochitest/test-sourcemap-error-02.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-stacktrace-location-debugger-link.html b/devtools/client/webconsole/test/mochitest/test-stacktrace-location-debugger-link.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-stacktrace-location-debugger-link.html
rename to devtools/client/webconsole/test/mochitest/test-stacktrace-location-debugger-link.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-subresource-security-error.html b/devtools/client/webconsole/test/mochitest/test-subresource-security-error.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-subresource-security-error.html
rename to devtools/client/webconsole/test/mochitest/test-subresource-security-error.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-subresource-security-error.js b/devtools/client/webconsole/test/mochitest/test-subresource-security-error.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-subresource-security-error.js
rename to devtools/client/webconsole/test/mochitest/test-subresource-security-error.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-subresource-security-error.js^headers^ b/devtools/client/webconsole/test/mochitest/test-subresource-security-error.js^headers^
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-subresource-security-error.js^headers^
rename to devtools/client/webconsole/test/mochitest/test-subresource-security-error.js^headers^
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-time-methods.html b/devtools/client/webconsole/test/mochitest/test-time-methods.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-time-methods.html
rename to devtools/client/webconsole/test/mochitest/test-time-methods.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-trackingprotection-securityerrors.html b/devtools/client/webconsole/test/mochitest/test-trackingprotection-securityerrors.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-trackingprotection-securityerrors.html
rename to devtools/client/webconsole/test/mochitest/test-trackingprotection-securityerrors.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-webconsole-error-observer.html b/devtools/client/webconsole/test/mochitest/test-webconsole-error-observer.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-webconsole-error-observer.html
rename to devtools/client/webconsole/test/mochitest/test-webconsole-error-observer.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-websocket.html b/devtools/client/webconsole/test/mochitest/test-websocket.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-websocket.html
rename to devtools/client/webconsole/test/mochitest/test-websocket.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test-websocket.js b/devtools/client/webconsole/test/mochitest/test-websocket.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test-websocket.js
rename to devtools/client/webconsole/test/mochitest/test-websocket.js
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test_bug_770099_violation.html b/devtools/client/webconsole/test/mochitest/test_bug_770099_violation.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test_bug_770099_violation.html
rename to devtools/client/webconsole/test/mochitest/test_bug_770099_violation.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test_bug_770099_violation.html^headers^ b/devtools/client/webconsole/test/mochitest/test_bug_770099_violation.html^headers^
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test_bug_770099_violation.html^headers^
rename to devtools/client/webconsole/test/mochitest/test_bug_770099_violation.html^headers^
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test_console_csp_ignore_reflected_xss_message.html b/devtools/client/webconsole/test/mochitest/test_console_csp_ignore_reflected_xss_message.html
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test_console_csp_ignore_reflected_xss_message.html
rename to devtools/client/webconsole/test/mochitest/test_console_csp_ignore_reflected_xss_message.html
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test_console_csp_ignore_reflected_xss_message.html^headers^ b/devtools/client/webconsole/test/mochitest/test_console_csp_ignore_reflected_xss_message.html^headers^
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test_console_csp_ignore_reflected_xss_message.html^headers^
rename to devtools/client/webconsole/test/mochitest/test_console_csp_ignore_reflected_xss_message.html^headers^
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test_hpkp-invalid-headers.sjs b/devtools/client/webconsole/test/mochitest/test_hpkp-invalid-headers.sjs
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test_hpkp-invalid-headers.sjs
rename to devtools/client/webconsole/test/mochitest/test_hpkp-invalid-headers.sjs
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/test_hsts-invalid-headers.sjs b/devtools/client/webconsole/test/mochitest/test_hsts-invalid-headers.sjs
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/test_hsts-invalid-headers.sjs
rename to devtools/client/webconsole/test/mochitest/test_hsts-invalid-headers.sjs
diff --git a/devtools/client/webconsole/new-console-output/test/mochitest/testscript.js b/devtools/client/webconsole/test/mochitest/testscript.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/mochitest/testscript.js
rename to devtools/client/webconsole/test/mochitest/testscript.js
diff --git a/devtools/client/webconsole/new-console-output/test/moz.build b/devtools/client/webconsole/test/moz.build
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/moz.build
rename to devtools/client/webconsole/test/moz.build
diff --git a/devtools/client/webconsole/new-console-output/test/package.json b/devtools/client/webconsole/test/package.json
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/package.json
rename to devtools/client/webconsole/test/package.json
diff --git a/devtools/client/webconsole/new-console-output/test/store/.eslintrc.js b/devtools/client/webconsole/test/store/.eslintrc.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/store/.eslintrc.js
rename to devtools/client/webconsole/test/store/.eslintrc.js
diff --git a/devtools/client/webconsole/new-console-output/test/store/filters.test.js b/devtools/client/webconsole/test/store/filters.test.js
similarity index 94%
rename from devtools/client/webconsole/new-console-output/test/store/filters.test.js
rename to devtools/client/webconsole/test/store/filters.test.js
index e392721ad70f..9d159526afd7 100644
--- a/devtools/client/webconsole/new-console-output/test/store/filters.test.js
+++ b/devtools/client/webconsole/test/store/filters.test.js
@@ -5,15 +5,15 @@
 
 const expect = require("expect");
 
-const actions = require("devtools/client/webconsole/new-console-output/actions/index");
-const { messagesAdd } = require("devtools/client/webconsole/new-console-output/actions/index");
-const { ConsoleCommand } = require("devtools/client/webconsole/new-console-output/types");
-const { getVisibleMessages } = require("devtools/client/webconsole/new-console-output/selectors/messages");
-const { getAllFilters } = require("devtools/client/webconsole/new-console-output/selectors/filters");
-const { setupStore, getFiltersPrefs } = require("devtools/client/webconsole/new-console-output/test/helpers");
-const { FILTERS, PREFS } = require("devtools/client/webconsole/new-console-output/constants");
-const { stubPackets } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
-const { stubPreparedMessages } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
+const actions = require("devtools/client/webconsole/actions/index");
+const { messagesAdd } = require("devtools/client/webconsole/actions/index");
+const { ConsoleCommand } = require("devtools/client/webconsole/types");
+const { getVisibleMessages } = require("devtools/client/webconsole/selectors/messages");
+const { getAllFilters } = require("devtools/client/webconsole/selectors/filters");
+const { setupStore, getFiltersPrefs } = require("devtools/client/webconsole/test/helpers");
+const { FILTERS, PREFS } = require("devtools/client/webconsole/constants");
+const { stubPackets } = require("devtools/client/webconsole/test/fixtures/stubs/index");
+const { stubPreparedMessages } = require("devtools/client/webconsole/test/fixtures/stubs/index");
 
 describe("Filtering", () => {
   let store;
diff --git a/devtools/client/webconsole/new-console-output/test/store/hidden-messages.test.js b/devtools/client/webconsole/test/store/hidden-messages.test.js
similarity index 92%
rename from devtools/client/webconsole/new-console-output/test/store/hidden-messages.test.js
rename to devtools/client/webconsole/test/store/hidden-messages.test.js
index 75dc704915cb..dd78d86c7d61 100644
--- a/devtools/client/webconsole/new-console-output/test/store/hidden-messages.test.js
+++ b/devtools/client/webconsole/test/store/hidden-messages.test.js
@@ -5,11 +5,11 @@
 
 const expect = require("expect");
 
-const actions = require("devtools/client/webconsole/new-console-output/actions/index");
-const { getFilteredMessagesCount } = require("devtools/client/webconsole/new-console-output/selectors/messages");
-const { setupStore } = require("devtools/client/webconsole/new-console-output/test/helpers");
-const { FILTERS } = require("devtools/client/webconsole/new-console-output/constants");
-const { stubPackets } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
+const actions = require("devtools/client/webconsole/actions/index");
+const { getFilteredMessagesCount } = require("devtools/client/webconsole/selectors/messages");
+const { setupStore } = require("devtools/client/webconsole/test/helpers");
+const { FILTERS } = require("devtools/client/webconsole/constants");
+const { stubPackets } = require("devtools/client/webconsole/test/fixtures/stubs/index");
 
 describe("Filtering - Hidden messages", () => {
   let store;
diff --git a/devtools/client/webconsole/new-console-output/test/store/messages.test.js b/devtools/client/webconsole/test/store/messages.test.js
similarity index 99%
rename from devtools/client/webconsole/new-console-output/test/store/messages.test.js
rename to devtools/client/webconsole/test/store/messages.test.js
index d592a4d93c26..907a7241885d 100644
--- a/devtools/client/webconsole/new-console-output/test/store/messages.test.js
+++ b/devtools/client/webconsole/test/store/messages.test.js
@@ -11,7 +11,7 @@ const {
   getGroupsById,
   getAllMessagesById,
   getVisibleMessages,
-} = require("devtools/client/webconsole/new-console-output/selectors/messages");
+} = require("devtools/client/webconsole/selectors/messages");
 const {
   clonePacket,
   getFirstMessage,
@@ -19,11 +19,11 @@ const {
   getMessageAt,
   setupActions,
   setupStore,
-} = require("devtools/client/webconsole/new-console-output/test/helpers");
-const { stubPackets, stubPreparedMessages } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
+} = require("devtools/client/webconsole/test/helpers");
+const { stubPackets, stubPreparedMessages } = require("devtools/client/webconsole/test/fixtures/stubs/index");
 const {
   MESSAGE_TYPE,
-} = require("devtools/client/webconsole/new-console-output/constants");
+} = require("devtools/client/webconsole/constants");
 
 const expect = require("expect");
 
diff --git a/devtools/client/webconsole/new-console-output/test/store/network-messages.test.js b/devtools/client/webconsole/test/store/network-messages.test.js
similarity index 89%
rename from devtools/client/webconsole/new-console-output/test/store/network-messages.test.js
rename to devtools/client/webconsole/test/store/network-messages.test.js
index c98850edd5ad..03985d6ef869 100644
--- a/devtools/client/webconsole/new-console-output/test/store/network-messages.test.js
+++ b/devtools/client/webconsole/test/store/network-messages.test.js
@@ -4,13 +4,13 @@
 
 const {
   getAllNetworkMessagesUpdateById,
-} = require("devtools/client/webconsole/new-console-output/selectors/messages");
+} = require("devtools/client/webconsole/selectors/messages");
 const {
   setupActions,
   setupStore,
   clonePacket
-} = require("devtools/client/webconsole/new-console-output/test/helpers");
-const { stubPackets } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
+} = require("devtools/client/webconsole/test/helpers");
+const { stubPackets } = require("devtools/client/webconsole/test/fixtures/stubs/index");
 
 const expect = require("expect");
 
diff --git a/devtools/client/webconsole/new-console-output/test/store/private-messages.test.js b/devtools/client/webconsole/test/store/private-messages.test.js
similarity index 95%
rename from devtools/client/webconsole/new-console-output/test/store/private-messages.test.js
rename to devtools/client/webconsole/test/store/private-messages.test.js
index 6c4ab6210dbe..83b9446a4f3d 100644
--- a/devtools/client/webconsole/new-console-output/test/store/private-messages.test.js
+++ b/devtools/client/webconsole/test/store/private-messages.test.js
@@ -13,15 +13,15 @@ const {
   getGroupsById,
   getAllMessagesById,
   getVisibleMessages,
-} = require("devtools/client/webconsole/new-console-output/selectors/messages");
+} = require("devtools/client/webconsole/selectors/messages");
 const {
   getFirstMessage,
   getLastMessage,
   getPrivatePacket,
   setupActions,
   setupStore,
-} = require("devtools/client/webconsole/new-console-output/test/helpers");
-const { stubPackets } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
+} = require("devtools/client/webconsole/test/helpers");
+const { stubPackets } = require("devtools/client/webconsole/test/fixtures/stubs/index");
 
 const expect = require("expect");
 
diff --git a/devtools/client/webconsole/new-console-output/test/store/release-actors.test.js b/devtools/client/webconsole/test/store/release-actors.test.js
similarity index 96%
rename from devtools/client/webconsole/new-console-output/test/store/release-actors.test.js
rename to devtools/client/webconsole/test/store/release-actors.test.js
index 4d8c65aabf5a..820c24c7c0bd 100644
--- a/devtools/client/webconsole/new-console-output/test/store/release-actors.test.js
+++ b/devtools/client/webconsole/test/store/release-actors.test.js
@@ -7,9 +7,9 @@ const {
   getFirstMessage,
   setupActions,
   setupStore,
-} = require("devtools/client/webconsole/new-console-output/test/helpers");
+} = require("devtools/client/webconsole/test/helpers");
 
-const { stubPackets } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
+const { stubPackets } = require("devtools/client/webconsole/test/fixtures/stubs/index");
 const expect = require("expect");
 
 describe("Release actor enhancer:", () => {
diff --git a/devtools/client/webconsole/new-console-output/test/store/search.test.js b/devtools/client/webconsole/test/store/search.test.js
similarity index 92%
rename from devtools/client/webconsole/new-console-output/test/store/search.test.js
rename to devtools/client/webconsole/test/store/search.test.js
index 8aac196948fe..5692f8ec8a5a 100644
--- a/devtools/client/webconsole/new-console-output/test/store/search.test.js
+++ b/devtools/client/webconsole/test/store/search.test.js
@@ -5,9 +5,9 @@
 
 const expect = require("expect");
 
-const actions = require("devtools/client/webconsole/new-console-output/actions/index");
-const { getVisibleMessages } = require("devtools/client/webconsole/new-console-output/selectors/messages");
-const { setupStore } = require("devtools/client/webconsole/new-console-output/test/helpers");
+const actions = require("devtools/client/webconsole/actions/index");
+const { getVisibleMessages } = require("devtools/client/webconsole/selectors/messages");
+const { setupStore } = require("devtools/client/webconsole/test/helpers");
 
 describe("Searching in grips", () => {
   let store;
diff --git a/devtools/client/webconsole/new-console-output/test/store/ui.test.js b/devtools/client/webconsole/test/store/ui.test.js
similarity index 95%
rename from devtools/client/webconsole/new-console-output/test/store/ui.test.js
rename to devtools/client/webconsole/test/store/ui.test.js
index a4867ed71e1a..6b79377063c8 100644
--- a/devtools/client/webconsole/new-console-output/test/store/ui.test.js
+++ b/devtools/client/webconsole/test/store/ui.test.js
@@ -5,9 +5,9 @@
 
 const expect = require("expect");
 
-const actions = require("devtools/client/webconsole/new-console-output/actions/index");
-const { setupStore, getFirstMessage, getLastMessage } = require("devtools/client/webconsole/new-console-output/test/helpers");
-const { stubPackets, stubPreparedMessages } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
+const actions = require("devtools/client/webconsole/actions/index");
+const { setupStore, getFirstMessage, getLastMessage } = require("devtools/client/webconsole/test/helpers");
+const { stubPackets, stubPreparedMessages } = require("devtools/client/webconsole/test/fixtures/stubs/index");
 
 describe("Testing UI", () => {
   let store;
diff --git a/devtools/client/webconsole/new-console-output/test/unit/.eslintrc.js b/devtools/client/webconsole/test/unit/.eslintrc.js
similarity index 65%
rename from devtools/client/webconsole/new-console-output/test/unit/.eslintrc.js
rename to devtools/client/webconsole/test/unit/.eslintrc.js
index 54a9a6361b5c..59adf410a6ff 100644
--- a/devtools/client/webconsole/new-console-output/test/unit/.eslintrc.js
+++ b/devtools/client/webconsole/test/unit/.eslintrc.js
@@ -2,5 +2,5 @@
 
 module.exports = {
   // Extend from the common devtools xpcshell eslintrc config.
-  "extends": "../../../../../.eslintrc.xpcshell.js"
+  "extends": "../../../../.eslintrc.xpcshell.js"
 };
diff --git a/devtools/client/webconsole/new-console-output/test/unit/test_webconsole_l10n.js b/devtools/client/webconsole/test/unit/test_webconsole_l10n.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/unit/test_webconsole_l10n.js
rename to devtools/client/webconsole/test/unit/test_webconsole_l10n.js
diff --git a/devtools/client/webconsole/new-console-output/test/unit/xpcshell.ini b/devtools/client/webconsole/test/unit/xpcshell.ini
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/unit/xpcshell.ini
rename to devtools/client/webconsole/test/unit/xpcshell.ini
diff --git a/devtools/client/webconsole/new-console-output/test/utils/.eslintrc.js b/devtools/client/webconsole/test/utils/.eslintrc.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/test/utils/.eslintrc.js
rename to devtools/client/webconsole/test/utils/.eslintrc.js
diff --git a/devtools/client/webconsole/new-console-output/test/utils/getRepeatId.test.js b/devtools/client/webconsole/test/utils/getRepeatId.test.js
similarity index 92%
rename from devtools/client/webconsole/new-console-output/test/utils/getRepeatId.test.js
rename to devtools/client/webconsole/test/utils/getRepeatId.test.js
index 889f5194dbac..85b8f9b28811 100644
--- a/devtools/client/webconsole/new-console-output/test/utils/getRepeatId.test.js
+++ b/devtools/client/webconsole/test/utils/getRepeatId.test.js
@@ -2,8 +2,8 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 "use strict";
 
-const { getRepeatId } = require("devtools/client/webconsole/new-console-output/utils/messages");
-const { stubPreparedMessages } = require("devtools/client/webconsole/new-console-output/test/fixtures/stubs/index");
+const { getRepeatId } = require("devtools/client/webconsole/utils/messages");
+const { stubPreparedMessages } = require("devtools/client/webconsole/test/fixtures/stubs/index");
 
 const expect = require("expect");
 
diff --git a/devtools/client/webconsole/new-console-output/types.js b/devtools/client/webconsole/types.js
similarity index 95%
rename from devtools/client/webconsole/new-console-output/types.js
rename to devtools/client/webconsole/types.js
index 5663221d5ccb..6bfd39790ce3 100644
--- a/devtools/client/webconsole/new-console-output/types.js
+++ b/devtools/client/webconsole/types.js
@@ -9,7 +9,7 @@ const {
   MESSAGE_SOURCE,
   MESSAGE_TYPE,
   MESSAGE_LEVEL
-} = require("devtools/client/webconsole/new-console-output/constants");
+} = require("devtools/client/webconsole/constants");
 
 exports.ConsoleCommand = function(props) {
   return Object.assign({
diff --git a/devtools/client/webconsole/new-console-output/utils/context-menu.js b/devtools/client/webconsole/utils/context-menu.js
similarity index 97%
rename from devtools/client/webconsole/new-console-output/utils/context-menu.js
rename to devtools/client/webconsole/utils/context-menu.js
index cdf625925f93..1268f77d6e8c 100644
--- a/devtools/client/webconsole/new-console-output/utils/context-menu.js
+++ b/devtools/client/webconsole/utils/context-menu.js
@@ -12,10 +12,10 @@ const {gDevTools} = require("devtools/client/framework/devtools");
 const Menu = require("devtools/client/framework/menu");
 const MenuItem = require("devtools/client/framework/menu-item");
 
-const { MESSAGE_SOURCE } = require("devtools/client/webconsole/new-console-output/constants");
+const { MESSAGE_SOURCE } = require("devtools/client/webconsole/constants");
 
 const clipboardHelper = require("devtools/shared/platform/clipboard");
-const { l10n } = require("devtools/client/webconsole/new-console-output/utils/messages");
+const { l10n } = require("devtools/client/webconsole/utils/messages");
 
 /**
  * Create a Menu instance for the webconsole.
diff --git a/devtools/client/webconsole/new-console-output/utils/id-generator.js b/devtools/client/webconsole/utils/id-generator.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/utils/id-generator.js
rename to devtools/client/webconsole/utils/id-generator.js
diff --git a/devtools/client/webconsole/new-console-output/utils/messages.js b/devtools/client/webconsole/utils/messages.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/utils/messages.js
rename to devtools/client/webconsole/utils/messages.js
diff --git a/devtools/client/webconsole/new-console-output/utils/moz.build b/devtools/client/webconsole/utils/moz.build
similarity index 100%
rename from devtools/client/webconsole/new-console-output/utils/moz.build
rename to devtools/client/webconsole/utils/moz.build
diff --git a/devtools/client/webconsole/new-console-output/utils/object-inspector.js b/devtools/client/webconsole/utils/object-inspector.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/utils/object-inspector.js
rename to devtools/client/webconsole/utils/object-inspector.js
diff --git a/devtools/client/webconsole/new-console-output/utils/prefs.js b/devtools/client/webconsole/utils/prefs.js
similarity index 100%
rename from devtools/client/webconsole/new-console-output/utils/prefs.js
rename to devtools/client/webconsole/utils/prefs.js
diff --git a/devtools/client/webconsole/webconsole.html b/devtools/client/webconsole/webconsole.html
index 61662778ff31..b6e2d202e651 100644
--- a/devtools/client/webconsole/webconsole.html
+++ b/devtools/client/webconsole/webconsole.html
@@ -16,7 +16,7 @@
 
     <script src="chrome://devtools/content/shared/theme-switching.js"></script>
     <script type="application/javascript"
-            src="resource://devtools/client/webconsole/new-console-output/main.js"></script>
+            src="resource://devtools/client/webconsole/main.js"></script>
   </head>
   <body class="theme-sidebar" role="application">
     <div id="app-wrapper" class="theme-body">
diff --git a/devtools/client/webconsole/webpack.config.js b/devtools/client/webconsole/webpack.config.js
index c059e33086bc..9bfd74686f7a 100644
--- a/devtools/client/webconsole/webpack.config.js
+++ b/devtools/client/webconsole/webpack.config.js
@@ -78,7 +78,7 @@ webpackConfig.resolve = {
     "Services": "devtools-modules/src/Services",
 
     "devtools/client/webconsole/jsterm": path.join(__dirname, "../../client/shared/webpack/shims/jsterm-stub"),
-    "devtools/client/webconsole/utils": path.join(__dirname, "new-console-output/test/fixtures/WebConsoleUtils"),
+    "devtools/client/webconsole/utils": path.join(__dirname, "test/fixtures/WebConsoleUtils"),
 
     "devtools/client/shared/vendor/immutable": "immutable",
     "devtools/client/shared/vendor/react": "react",
@@ -98,7 +98,7 @@ webpackConfig.resolve = {
     "devtools/shared/fronts/timeline": path.join(__dirname, "../../client/shared/webpack/shims/fronts-timeline-shim"),
     "devtools/shared/old-event-emitter": "devtools-modules/src/utils/event-emitter",
     "devtools/shared/event-emitter": "devtools-modules/src/utils/event-emitter",
-    "devtools/shared/client/debugger-client": path.join(__dirname, "new-console-output/test/fixtures/DebuggerClient"),
+    "devtools/shared/client/debugger-client": path.join(__dirname, "test/fixtures/DebuggerClient"),
     "devtools/shared/platform/clipboard": path.join(__dirname, "../../client/shared/webpack/shims/platform-clipboard-stub"),
     "devtools/shared/platform/stack": path.join(__dirname, "../../client/shared/webpack/shims/platform-stack-stub"),