diff --git a/res/app/components/stf/screen/index.js b/res/app/components/stf/screen/index.js
index f5ee036d..3139367b 100644
--- a/res/app/components/stf/screen/index.js
+++ b/res/app/components/stf/screen/index.js
@@ -1,4 +1,5 @@
 module.exports = angular.module('stf/screen', [
   require('stf/screen/scaling').name
 ])
-  .directive('deviceScreen', require('./screen-directive'))
\ No newline at end of file
+  .directive('deviceScreen', require('./screen-directive'))
+  .controller('DeviceScreenCtrl', require('./screen-controller'))
\ No newline at end of file
diff --git a/res/app/device-control/device-screen/device-screen-controller.js b/res/app/components/stf/screen/screen-controller.js
similarity index 100%
rename from res/app/device-control/device-screen/device-screen-controller.js
rename to res/app/components/stf/screen/screen-controller.js
diff --git a/res/app/device-control/device-screen/index.js b/res/app/device-control/device-screen/index.js
deleted file mode 100644
index 3deb5002..00000000
--- a/res/app/device-control/device-screen/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-module.exports = angular.module('device-screen-controller', [
-  require('stf/screen/scaling').name
-])
-  .controller('DeviceScreenCtrl', require('./device-screen-controller'))
diff --git a/res/app/device-control/index.js b/res/app/device-control/index.js
index d4dee331..4be2f3e3 100644
--- a/res/app/device-control/index.js
+++ b/res/app/device-control/index.js
@@ -4,7 +4,6 @@ module.exports = angular.module('device-control', [
   require('stf/device').name,
   require('stf/control').name,
   require('stf/screen').name,
-  require('./device-screen').name
 ])
   .config(['$routeProvider', function ($routeProvider) {
     $routeProvider.when('/devices/:serial', {