diff --git a/bin/embark b/bin/embark
index 303b96b42..a824c98ba 100755
--- a/bin/embark
+++ b/bin/embark
@@ -9,6 +9,6 @@ try {
   }
 }
 
-var Cmd = require('../cmd-ui/cmd');
+var Cmd = require('../cmd/cmd');
 var cli = new Cmd();
 cli.process(process.argv);
diff --git a/cmd-ui/cmd.js b/cmd/cmd.js
similarity index 100%
rename from cmd-ui/cmd.js
rename to cmd/cmd.js
diff --git a/cmd-ui/cmd_controller.js b/cmd/cmd_controller.js
similarity index 100%
rename from cmd-ui/cmd_controller.js
rename to cmd/cmd_controller.js
diff --git a/cmd-ui/dashboard/command_history.js b/cmd/dashboard/command_history.js
similarity index 100%
rename from cmd-ui/dashboard/command_history.js
rename to cmd/dashboard/command_history.js
diff --git a/cmd-ui/dashboard/console.js b/cmd/dashboard/console.js
similarity index 100%
rename from cmd-ui/dashboard/console.js
rename to cmd/dashboard/console.js
diff --git a/cmd-ui/dashboard/dashboard.js b/cmd/dashboard/dashboard.js
similarity index 100%
rename from cmd-ui/dashboard/dashboard.js
rename to cmd/dashboard/dashboard.js
diff --git a/cmd-ui/dashboard/monitor.js b/cmd/dashboard/monitor.js
similarity index 100%
rename from cmd-ui/dashboard/monitor.js
rename to cmd/dashboard/monitor.js
diff --git a/cmd-ui/dashboard/repl.js b/cmd/dashboard/repl.js
similarity index 100%
rename from cmd-ui/dashboard/repl.js
rename to cmd/dashboard/repl.js
diff --git a/test/cmd.js b/test/cmd.js
index 1b0e193e9..767c82b7c 100644
--- a/test/cmd.js
+++ b/test/cmd.js
@@ -1,5 +1,5 @@
 let Embark = require('../lib/index');
-let Cmd = require('../cmd-ui/cmd');
+let Cmd = require('../cmd/cmd');
 
 // Function to send a line to stdin
 function sendLine(line) {
diff --git a/test/console.js b/test/console.js
index 841961378..eca2814e1 100644
--- a/test/console.js
+++ b/test/console.js
@@ -1,5 +1,5 @@
 /*globals describe, it*/
-let Console = require('../cmd-ui/dashboard/console.js');
+let Console = require('../cmd/dashboard/console.js');
 let Plugins = require('../lib/core/plugins.js');
 let assert = require('assert');
 let version = require('../package.json').version;