diff --git a/app/index.js b/app/index.js
index 7154c0b..1dd622d 100644
--- a/app/index.js
+++ b/app/index.js
@@ -61,6 +61,7 @@
 import power_operations_controller from './server-control/controllers/power-operations-controller.js';
 import remote_console_controller from './server-control/controllers/remote-console-controller.js';
 import remote_console_window_controller from './server-control/controllers/remote-console-window-controller.js';
+import unit_id_controller from './server-control/controllers/unit-id-controller.js';
 
 import server_health_index from './server-health/index.js';
 import diagnostics_controller from './server-health/controllers/diagnostics-controller.js';
@@ -70,7 +71,6 @@
 import power_consumption_controller from './server-health/controllers/power-consumption-controller.js';
 import sensors_controller from './server-health/controllers/sensors-controller.js';
 import sensors_overview_controller from './server-health/controllers/sensors-overview-controller.js';
-import unit_id_controller from './server-health/controllers/unit-id-controller.js';
 
 import configuration_index from './configuration/index.js';
 import date_time_controller from './configuration/controllers/date-time-controller.js';
diff --git a/app/server-health/controllers/unit-id-controller.html b/app/server-control/controllers/unit-id-controller.html
similarity index 100%
rename from app/server-health/controllers/unit-id-controller.html
rename to app/server-control/controllers/unit-id-controller.html
diff --git a/app/server-health/controllers/unit-id-controller.js b/app/server-control/controllers/unit-id-controller.js
similarity index 91%
rename from app/server-health/controllers/unit-id-controller.js
rename to app/server-control/controllers/unit-id-controller.js
index 7af4ca1..3648acd 100644
--- a/app/server-health/controllers/unit-id-controller.js
+++ b/app/server-control/controllers/unit-id-controller.js
@@ -1,7 +1,7 @@
 /**
  * Controller for unit Id
  *
- * @module app/serverHealth
+ * @module app/serverControl
  * @exports unitIdController
  * @name unitIdController
  */
@@ -9,7 +9,7 @@
 window.angular && (function(angular) {
   'use strict';
 
-  angular.module('app.serverHealth').controller('unitIdController', [
+  angular.module('app.serverControl').controller('unitIdController', [
     '$scope', '$window', 'APIUtils', 'dataService',
     function($scope, $window, APIUtils, dataService) {
       $scope.dataService = dataService;
diff --git a/app/server-control/index.js b/app/server-control/index.js
index 0b0fa93..f9aaba9 100644
--- a/app/server-control/index.js
+++ b/app/server-control/index.js
@@ -21,8 +21,7 @@
                 authenticated: true
               })
               .when('/server-control/server-led', {
-                'template': require(
-                    '../server-health/controllers/unit-id-controller.html'),
+                'template': require('./controllers/unit-id-controller.html'),
                 'controller': 'unitIdController',
                 authenticated: true
               })
diff --git a/app/server-control/styles/index.scss b/app/server-control/styles/index.scss
index dfb6b6e..d469ecf 100644
--- a/app/server-control/styles/index.scss
+++ b/app/server-control/styles/index.scss
@@ -1,3 +1,4 @@
 @import "./bmc-reboot.scss";
 @import "./power-operations.scss";
-@import "./remote-console.scss";
\ No newline at end of file
+@import "./remote-console.scss";
+@import "./unit-id.scss";
diff --git a/app/server-health/styles/unit-id.scss b/app/server-control/styles/unit-id.scss
similarity index 100%
rename from app/server-health/styles/unit-id.scss
rename to app/server-control/styles/unit-id.scss
diff --git a/app/server-health/styles/index.scss b/app/server-health/styles/index.scss
index 8df3468..842fad2 100644
--- a/app/server-health/styles/index.scss
+++ b/app/server-health/styles/index.scss
@@ -1,6 +1,5 @@
 @import "./inventory.scss";
 @import "./log.scss";
 @import "./sensors.scss";
-@import "./unit-id.scss";
 @import "./power-consumption.scss";
-@import "./diagnostics.scss";
\ No newline at end of file
+@import "./diagnostics.scss";