diff --git a/src/dev/cli_workers/binder.ts b/src/cli/cluster/binder.ts
similarity index 100%
rename from src/dev/cli_workers/binder.ts
rename to src/cli/cluster/binder.ts
diff --git a/src/dev/cli_workers/binder_for.ts b/src/cli/cluster/binder_for.ts
similarity index 100%
rename from src/dev/cli_workers/binder_for.ts
rename to src/cli/cluster/binder_for.ts
diff --git a/src/dev/cli_workers/cluster.mock.ts b/src/cli/cluster/cluster.mock.ts
similarity index 100%
rename from src/dev/cli_workers/cluster.mock.ts
rename to src/cli/cluster/cluster.mock.ts
diff --git a/src/dev/cli_workers/cluster_manager.test.mocks.ts b/src/cli/cluster/cluster_manager.test.mocks.ts
similarity index 100%
rename from src/dev/cli_workers/cluster_manager.test.mocks.ts
rename to src/cli/cluster/cluster_manager.test.mocks.ts
diff --git a/src/dev/cli_workers/cluster_manager.test.ts b/src/cli/cluster/cluster_manager.test.ts
similarity index 100%
rename from src/dev/cli_workers/cluster_manager.test.ts
rename to src/cli/cluster/cluster_manager.test.ts
diff --git a/src/dev/cli_workers/cluster_manager.ts b/src/cli/cluster/cluster_manager.ts
similarity index 100%
rename from src/dev/cli_workers/cluster_manager.ts
rename to src/cli/cluster/cluster_manager.ts
diff --git a/src/dev/cli_workers/log.ts b/src/cli/cluster/log.ts
similarity index 100%
rename from src/dev/cli_workers/log.ts
rename to src/cli/cluster/log.ts
diff --git a/src/dev/cli_workers/run_kbn_optimizer.ts b/src/cli/cluster/run_kbn_optimizer.ts
similarity index 100%
rename from src/dev/cli_workers/run_kbn_optimizer.ts
rename to src/cli/cluster/run_kbn_optimizer.ts
diff --git a/src/dev/cli_workers/worker.test.ts b/src/cli/cluster/worker.test.ts
similarity index 100%
rename from src/dev/cli_workers/worker.test.ts
rename to src/cli/cluster/worker.test.ts
diff --git a/src/dev/cli_workers/worker.ts b/src/cli/cluster/worker.ts
similarity index 100%
rename from src/dev/cli_workers/worker.ts
rename to src/cli/cluster/worker.ts
diff --git a/src/cli/serve/serve.js b/src/cli/serve/serve.js
index e36570b96fa098c..61f880d80633da4 100644
--- a/src/cli/serve/serve.js
+++ b/src/cli/serve/serve.js
@@ -42,7 +42,7 @@ function canRequire(path) {
   }
 }
 
-const CLUSTER_MANAGER_PATH = resolve(__dirname, '../../dev/cli_workers/cluster_manager');
+const CLUSTER_MANAGER_PATH = resolve(__dirname, '../cluster/cluster_manager');
 const DEV_MODE_SUPPORTED = canRequire(CLUSTER_MANAGER_PATH);
 
 const REPL_PATH = resolve(__dirname, '../repl');
diff --git a/src/core/server/legacy/cluster_manager.js b/src/core/server/legacy/cluster_manager.js
index ea61cc01a995606..3c51fd6869a0933 100644
--- a/src/core/server/legacy/cluster_manager.js
+++ b/src/core/server/legacy/cluster_manager.js
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-export { ClusterManager } from '../../../dev/cli_workers/cluster_manager';
+export { ClusterManager } from '../../../cli/cluster/cluster_manager';
diff --git a/src/dev/build/tasks/copy_source_task.ts b/src/dev/build/tasks/copy_source_task.ts
index 710e504e5886856..b0ace3c63d82ed6 100644
--- a/src/dev/build/tasks/copy_source_task.ts
+++ b/src/dev/build/tasks/copy_source_task.ts
@@ -33,6 +33,7 @@ export const CopySource: Task = {
         '!src/**/{target,__tests__,__snapshots__,__mocks__}/**',
         '!src/test_utils/**',
         '!src/fixtures/**',
+        '!src/cli/cluster/**',
         '!src/cli/repl/**',
         '!src/cli/dev.js',
         '!src/functional_test_runner/**',