diff --git a/plugins/cockpit/lib/ui/cliView.css b/plugins/cockpit/ui/cliView.css
similarity index 100%
rename from plugins/cockpit/lib/ui/cliView.css
rename to plugins/cockpit/ui/cliView.css
diff --git a/plugins/cockpit/lib/ui/cliView.js b/plugins/cockpit/ui/cliView.js
similarity index 99%
rename from plugins/cockpit/lib/ui/cliView.js
rename to plugins/cockpit/ui/cliView.js
index 5a9c1a3b..ee12e65f 100644
--- a/plugins/cockpit/lib/ui/cliView.js
+++ b/plugins/cockpit/ui/cliView.js
@@ -39,7 +39,7 @@ define(function(require, exports, module) {
 
 
 var editorCss = require("text!cockpit/ui/cliView.css");
-var dom = require("pilot/dom").dom;
+var dom = require("pilot/dom");
 dom.importCssString(editorCss);
 
 var canon = require("pilot/canon");
@@ -61,7 +61,7 @@ var NO_HINT = new Hint(Status.VALID, '', 0, 0);
  * 2. Attach a set of events so the command line works
  */
 exports.startup = function(data, reason) {
-    var cli = new CliRequisition();
+    var cli = new CliRequisition(data.env);
     var cliView = new CliView(cli, data.env);
 };
 
diff --git a/plugins/cockpit/lib/ui/images/closer.png b/plugins/cockpit/ui/images/closer.png
similarity index 100%
rename from plugins/cockpit/lib/ui/images/closer.png
rename to plugins/cockpit/ui/images/closer.png
diff --git a/plugins/cockpit/lib/ui/images/dot_clear.gif b/plugins/cockpit/ui/images/dot_clear.gif
similarity index 100%
rename from plugins/cockpit/lib/ui/images/dot_clear.gif
rename to plugins/cockpit/ui/images/dot_clear.gif
diff --git a/plugins/cockpit/lib/ui/images/minus.png b/plugins/cockpit/ui/images/minus.png
similarity index 100%
rename from plugins/cockpit/lib/ui/images/minus.png
rename to plugins/cockpit/ui/images/minus.png
diff --git a/plugins/cockpit/lib/ui/images/pinaction.png b/plugins/cockpit/ui/images/pinaction.png
similarity index 100%
rename from plugins/cockpit/lib/ui/images/pinaction.png
rename to plugins/cockpit/ui/images/pinaction.png
diff --git a/plugins/cockpit/lib/ui/images/pinin.png b/plugins/cockpit/ui/images/pinin.png
similarity index 100%
rename from plugins/cockpit/lib/ui/images/pinin.png
rename to plugins/cockpit/ui/images/pinin.png
diff --git a/plugins/cockpit/lib/ui/images/pinout.png b/plugins/cockpit/ui/images/pinout.png
similarity index 100%
rename from plugins/cockpit/lib/ui/images/pinout.png
rename to plugins/cockpit/ui/images/pinout.png
diff --git a/plugins/cockpit/lib/ui/images/pins.png b/plugins/cockpit/ui/images/pins.png
similarity index 100%
rename from plugins/cockpit/lib/ui/images/pins.png
rename to plugins/cockpit/ui/images/pins.png
diff --git a/plugins/cockpit/lib/ui/images/plus.png b/plugins/cockpit/ui/images/plus.png
similarity index 100%
rename from plugins/cockpit/lib/ui/images/plus.png
rename to plugins/cockpit/ui/images/plus.png
diff --git a/plugins/cockpit/lib/ui/images/throbber.gif b/plugins/cockpit/ui/images/throbber.gif
similarity index 100%
rename from plugins/cockpit/lib/ui/images/throbber.gif
rename to plugins/cockpit/ui/images/throbber.gif
diff --git a/plugins/cockpit/lib/ui/requestView.css b/plugins/cockpit/ui/requestView.css
similarity index 100%
rename from plugins/cockpit/lib/ui/requestView.css
rename to plugins/cockpit/ui/requestView.css
diff --git a/plugins/cockpit/lib/ui/requestView.html b/plugins/cockpit/ui/requestView.html
similarity index 100%
rename from plugins/cockpit/lib/ui/requestView.html
rename to plugins/cockpit/ui/requestView.html
diff --git a/plugins/cockpit/lib/ui/requestView.js b/plugins/cockpit/ui/requestView.js
similarity index 99%
rename from plugins/cockpit/lib/ui/requestView.js
rename to plugins/cockpit/ui/requestView.js
index 1a3f8292..24458a46 100644
--- a/plugins/cockpit/lib/ui/requestView.js
+++ b/plugins/cockpit/ui/requestView.js
@@ -41,7 +41,7 @@ define(function(require, exports, module) {
 var util = require('pilot/util');
 
 var requestViewCss = require("text!cockpit/ui/requestView.css");
-var dom = require("pilot/dom").dom;
+var dom = require("pilot/dom");
 dom.importCssString(requestViewCss);
 
 var requestViewHtml = require("text!cockpit/ui/requestView.html");
diff --git a/plugins/cockpit/lib/ui/settings.js b/plugins/cockpit/ui/settings.js
similarity index 100%
rename from plugins/cockpit/lib/ui/settings.js
rename to plugins/cockpit/ui/settings.js
diff --git a/plugins/pilot/lib/commands/basic.js b/plugins/pilot/commands/basic.js
similarity index 100%
rename from plugins/pilot/lib/commands/basic.js
rename to plugins/pilot/commands/basic.js
diff --git a/plugins/pilot/lib/commands/history.js b/plugins/pilot/commands/history.js
similarity index 100%
rename from plugins/pilot/lib/commands/history.js
rename to plugins/pilot/commands/history.js
diff --git a/plugins/pilot/lib/domtemplate.js b/plugins/pilot/domtemplate.js
similarity index 100%
rename from plugins/pilot/lib/domtemplate.js
rename to plugins/pilot/domtemplate.js