diff --git a/cmd-ui/cmd_controller.js b/cmd-ui/cmd_controller.js
index 2defd4c3c..7dc8d628d 100644
--- a/cmd-ui/cmd_controller.js
+++ b/cmd-ui/cmd_controller.js
@@ -64,7 +64,7 @@ class EmbarkController {
   run(options) {
     let self = this;
     self.context = options.context || [constants.contexts.run, constants.contexts.build];
-    let Dashboard = require('../lib/dashboard/dashboard.js');
+    let Dashboard = require('./dashboard/dashboard.js');
 
     let webServerConfig = {
       enabled: options.runWebserver
diff --git a/lib/dashboard/command_history.js b/cmd-ui/dashboard/command_history.js
similarity index 100%
rename from lib/dashboard/command_history.js
rename to cmd-ui/dashboard/command_history.js
diff --git a/lib/dashboard/console.js b/cmd-ui/dashboard/console.js
similarity index 97%
rename from lib/dashboard/console.js
rename to cmd-ui/dashboard/console.js
index c77d2b2fa..805ef9657 100644
--- a/lib/dashboard/console.js
+++ b/cmd-ui/dashboard/console.js
@@ -1,4 +1,4 @@
-let utils = require('../utils/utils.js');
+let utils = require('../../lib/utils/utils.js');
 
 class Console {
   constructor(options) {
diff --git a/lib/dashboard/dashboard.js b/cmd-ui/dashboard/dashboard.js
similarity index 100%
rename from lib/dashboard/dashboard.js
rename to cmd-ui/dashboard/dashboard.js
diff --git a/lib/dashboard/monitor.js b/cmd-ui/dashboard/monitor.js
similarity index 100%
rename from lib/dashboard/monitor.js
rename to cmd-ui/dashboard/monitor.js
diff --git a/lib/dashboard/repl.js b/cmd-ui/dashboard/repl.js
similarity index 100%
rename from lib/dashboard/repl.js
rename to cmd-ui/dashboard/repl.js
diff --git a/test/console.js b/test/console.js
index 71b6998e5..841961378 100644
--- a/test/console.js
+++ b/test/console.js
@@ -1,5 +1,5 @@
 /*globals describe, it*/
-let Console = require('../lib/dashboard/console.js');
+let Console = require('../cmd-ui/dashboard/console.js');
 let Plugins = require('../lib/core/plugins.js');
 let assert = require('assert');
 let version = require('../package.json').version;