diff --git a/res/app/app.js b/res/app/app.js
index e9acfef1..f941f3fa 100644
--- a/res/app/app.js
+++ b/res/app/app.js
@@ -6,8 +6,7 @@ require('./app-styles')
 angular.module('app', [
   'ngRoute',
   require('./device-list').name,
-  require('./device-control').name,
-  require('./device-screen').name
+  require('./device-control').name
 ])
   .config(['$routeProvider', '$locationProvider',
     function ($routeProvider, $locationProvider) {
diff --git a/res/app/components/stf/device/device-service.js b/res/app/components/stf/device/device-service.js
index 3f425c2c..15d98e1a 100644
--- a/res/app/components/stf/device/device-service.js
+++ b/res/app/components/stf/device/device-service.js
@@ -1,4 +1,5 @@
 var oboe = require('oboe')
+var _ = require('lodash')
 
 module.exports = function DeviceServiceFactory($rootScope, $http, socket) {
   var deviceService = {
diff --git a/res/app/device-screen/device-screen-controller.js b/res/app/device-control/device-screen/device-screen-controller.js
similarity index 100%
rename from res/app/device-screen/device-screen-controller.js
rename to res/app/device-control/device-screen/device-screen-controller.js
diff --git a/res/app/device-screen/index.js b/res/app/device-control/device-screen/index.js
similarity index 100%
rename from res/app/device-screen/index.js
rename to res/app/device-control/device-screen/index.js
diff --git a/res/app/device-control/index.js b/res/app/device-control/index.js
index a0aac57f..ff76aeb2 100644
--- a/res/app/device-control/index.js
+++ b/res/app/device-control/index.js
@@ -3,7 +3,7 @@ require('./device-control.css')
 module.exports = angular.module('device-control', [
   require('stf/device').name,
   require('stf/control').name,
-  require('../device-screen').name
+  require('./device-screen').name
 ])
   .config(['$routeProvider', function ($routeProvider) {
     $routeProvider.when('/devices/:serial', {