diff --git a/devtools/client/shared/developer-toolbar.js b/devtools/client/shared/developer-toolbar.js
index 37e0b9d12bf4..833a7148d832 100644
--- a/devtools/client/shared/developer-toolbar.js
+++ b/devtools/client/shared/developer-toolbar.js
@@ -25,7 +25,7 @@ loader.lazyGetter(this, "prefBranch", function () {
 
 loader.lazyRequireGetter(this, "gcliInit", "devtools/shared/gcli/commands/index");
 loader.lazyRequireGetter(this, "util", "gcli/util/util");
-loader.lazyRequireGetter(this, "ConsoleServiceListener", "devtools/server/actors/utils/webconsole-listeners", true);
+loader.lazyRequireGetter(this, "ConsoleServiceListener", "devtools/server/actors/webconsole/listeners", true);
 loader.lazyRequireGetter(this, "gDevTools", "devtools/client/framework/devtools", true);
 loader.lazyRequireGetter(this, "gDevToolsBrowser", "devtools/client/framework/devtools-browser", true);
 loader.lazyRequireGetter(this, "nodeConstants", "devtools/shared/dom-node-constants");
diff --git a/devtools/server/actors/addon.js b/devtools/server/actors/addon.js
index 3520c06f1a2e..1b458d8b3b59 100644
--- a/devtools/server/actors/addon.js
+++ b/devtools/server/actors/addon.js
@@ -9,7 +9,7 @@ var Services = require("Services");
 var { ActorPool } = require("devtools/server/actors/common");
 var { TabSources } = require("./utils/TabSources");
 var makeDebugger = require("./utils/make-debugger");
-var { ConsoleAPIListener } = require("devtools/server/actors/utils/webconsole-listeners");
+var { ConsoleAPIListener } = require("devtools/server/actors/webconsole/listeners");
 var DevToolsUtils = require("devtools/shared/DevToolsUtils");
 var { assert, update } = DevToolsUtils;
 
diff --git a/devtools/server/actors/moz.build b/devtools/server/actors/moz.build
index 783720b7c913..5e0e704a9048 100644
--- a/devtools/server/actors/moz.build
+++ b/devtools/server/actors/moz.build
@@ -7,6 +7,7 @@
 DIRS += [
     'highlighters',
     'utils',
+    'webconsole',
 ]
 
 DevToolsModules(
diff --git a/devtools/server/actors/utils/moz.build b/devtools/server/actors/utils/moz.build
index 6bacf0ac6e0e..979a0324ea12 100644
--- a/devtools/server/actors/utils/moz.build
+++ b/devtools/server/actors/utils/moz.build
@@ -15,7 +15,4 @@ DevToolsModules(
     'stack.js',
     'TabSources.js',
     'walker-search.js',
-    'webconsole-listeners.js',
-    'webconsole-utils.js',
-    'webconsole-worker-listeners.js',
 )
diff --git a/devtools/server/actors/webconsole.js b/devtools/server/actors/webconsole.js
index 16d3697451fe..ec929e2555b4 100644
--- a/devtools/server/actors/webconsole.js
+++ b/devtools/server/actors/webconsole.js
@@ -25,20 +25,20 @@ loader.lazyRequireGetter(this, "ServerLoggingListener", "devtools/shared/webcons
 loader.lazyRequireGetter(this, "JSPropertyProvider", "devtools/shared/webconsole/js-property-provider", true);
 loader.lazyRequireGetter(this, "Parser", "resource://devtools/shared/Parser.jsm", true);
 loader.lazyRequireGetter(this, "NetUtil", "resource://gre/modules/NetUtil.jsm", true);
-loader.lazyRequireGetter(this, "addWebConsoleCommands", "devtools/server/actors/utils/webconsole-utils", true);
-loader.lazyRequireGetter(this, "CONSOLE_WORKER_IDS", "devtools/server/actors/utils/webconsole-utils", true);
-loader.lazyRequireGetter(this, "WebConsoleUtils", "devtools/server/actors/utils/webconsole-utils", true);
+loader.lazyRequireGetter(this, "addWebConsoleCommands", "devtools/server/actors/webconsole/utils", true);
+loader.lazyRequireGetter(this, "CONSOLE_WORKER_IDS", "devtools/server/actors/webconsole/utils", true);
+loader.lazyRequireGetter(this, "WebConsoleUtils", "devtools/server/actors/webconsole/utils", true);
 loader.lazyRequireGetter(this, "EnvironmentActor", "devtools/server/actors/environment", true);
 
 // Overwrite implemented listeners for workers so that we don't attempt
 // to load an unsupported module.
 if (isWorker) {
-  loader.lazyRequireGetter(this, "ConsoleAPIListener", "devtools/server/actors/utils/webconsole-worker-listeners", true);
-  loader.lazyRequireGetter(this, "ConsoleServiceListener", "devtools/server/actors/utils/webconsole-worker-listeners", true);
+  loader.lazyRequireGetter(this, "ConsoleAPIListener", "devtools/server/actors/webconsole/worker-listeners", true);
+  loader.lazyRequireGetter(this, "ConsoleServiceListener", "devtools/server/actors/webconsole/worker-listeners", true);
 } else {
-  loader.lazyRequireGetter(this, "ConsoleAPIListener", "devtools/server/actors/utils/webconsole-listeners", true);
-  loader.lazyRequireGetter(this, "ConsoleServiceListener", "devtools/server/actors/utils/webconsole-listeners", true);
-  loader.lazyRequireGetter(this, "ConsoleReflowListener", "devtools/server/actors/utils/webconsole-listeners", true);
+  loader.lazyRequireGetter(this, "ConsoleAPIListener", "devtools/server/actors/webconsole/listeners", true);
+  loader.lazyRequireGetter(this, "ConsoleServiceListener", "devtools/server/actors/webconsole/listeners", true);
+  loader.lazyRequireGetter(this, "ConsoleReflowListener", "devtools/server/actors/webconsole/listeners", true);
 }
 
 /**
diff --git a/devtools/server/actors/utils/webconsole-listeners.js b/devtools/server/actors/webconsole/listeners.js
similarity index 99%
rename from devtools/server/actors/utils/webconsole-listeners.js
rename to devtools/server/actors/webconsole/listeners.js
index bf9082937923..94d8d051b5c9 100644
--- a/devtools/server/actors/utils/webconsole-listeners.js
+++ b/devtools/server/actors/webconsole/listeners.js
@@ -8,7 +8,7 @@ const {Cc, Ci, components} = require("chrome");
 const {isWindowIncluded} = require("devtools/shared/layout/utils");
 const Services = require("Services");
 const {XPCOMUtils} = require("resource://gre/modules/XPCOMUtils.jsm");
-const {CONSOLE_WORKER_IDS, WebConsoleUtils} = require("devtools/server/actors/utils/webconsole-utils");
+const {CONSOLE_WORKER_IDS, WebConsoleUtils} = require("devtools/server/actors/webconsole/utils");
 
 XPCOMUtils.defineLazyServiceGetter(this,
                                    "swm",
diff --git a/devtools/server/actors/webconsole/moz.build b/devtools/server/actors/webconsole/moz.build
new file mode 100644
index 000000000000..d6e64676952c
--- /dev/null
+++ b/devtools/server/actors/webconsole/moz.build
@@ -0,0 +1,11 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DevToolsModules(
+    'listeners.js',
+    'utils.js',
+    'worker-listeners.js',
+)
diff --git a/devtools/server/actors/utils/webconsole-utils.js b/devtools/server/actors/webconsole/utils.js
similarity index 100%
rename from devtools/server/actors/utils/webconsole-utils.js
rename to devtools/server/actors/webconsole/utils.js
diff --git a/devtools/server/actors/utils/webconsole-worker-listeners.js b/devtools/server/actors/webconsole/worker-listeners.js
similarity index 100%
rename from devtools/server/actors/utils/webconsole-worker-listeners.js
rename to devtools/server/actors/webconsole/worker-listeners.js
diff --git a/devtools/shared/tests/unit/test_console_filtering.js b/devtools/shared/tests/unit/test_console_filtering.js
index 5c7b2dadff8e..d8cf8b262081 100644
--- a/devtools/shared/tests/unit/test_console_filtering.js
+++ b/devtools/shared/tests/unit/test_console_filtering.js
@@ -4,7 +4,7 @@
 "use strict";
 
 const { console, ConsoleAPI } = require("resource://gre/modules/Console.jsm");
-const { ConsoleAPIListener } = require("devtools/server/actors/utils/webconsole-listeners");
+const { ConsoleAPIListener } = require("devtools/server/actors/webconsole/listeners");
 const Services = require("Services");
 
 var seenMessages = 0;
diff --git a/devtools/shared/webconsole/test/test_cached_messages.html b/devtools/shared/webconsole/test/test_cached_messages.html
index c5121d2b7a75..e14348c7ecee 100644
--- a/devtools/shared/webconsole/test/test_cached_messages.html
+++ b/devtools/shared/webconsole/test/test_cached_messages.html
@@ -97,7 +97,7 @@ function doConsoleCalls() {
 <script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 var {ConsoleServiceListener, ConsoleAPIListener} =
-  require("devtools/server/actors/utils/webconsole-listeners");
+  require("devtools/server/actors/webconsole/listeners");
 
 let consoleAPIListener, consoleServiceListener;
 let consoleAPICalls = 0;
diff --git a/devtools/shared/webconsole/test/test_commands_registration.html b/devtools/shared/webconsole/test/test_commands_registration.html
index 0448edc106da..364de6c6fc04 100644
--- a/devtools/shared/webconsole/test/test_commands_registration.html
+++ b/devtools/shared/webconsole/test/test_commands_registration.html
@@ -18,7 +18,7 @@ SimpleTest.waitForExplicitFinish();
 let gState;
 let tests;
 
-let {WebConsoleCommands} = require("devtools/server/actors/utils/webconsole-utils");
+let {WebConsoleCommands} = require("devtools/server/actors/webconsole/utils");
 
 function evaluateJS(input) {
   return new Promise((resolve) => gState.client.evaluateJS(input, resolve));