diff --git a/src/Umbraco.Web.UI.Client/build/belle/views/common/application.controller.js b/src/Umbraco.Web.UI.Client/build/belle/views/common/application.controller.js
deleted file mode 100644
index 940ee42848..0000000000
--- a/src/Umbraco.Web.UI.Client/build/belle/views/common/application.controller.js
+++ /dev/null
@@ -1,72 +0,0 @@
-//Handles the section area of the app
-angular.module('umbraco').controller("NavigationController",
-    function ($scope, navigationService) {
-    
-    //load navigation service handlers
-    $scope.changeSection = navigationService.changeSection;    
-    $scope.showTree = navigationService.showTree;
-    $scope.hideTree = navigationService.hideTree;
-    $scope.hideMenu = navigationService.hideMenu;
-    $scope.showMenu = navigationService.showMenu;
-    $scope.hideDialog = navigationService.hideDialog;
-    $scope.hideNavigation = navigationService.hideNavigation;
-    $scope.ui = navigationService.ui;    
-
-    $scope.selectedId = navigationService.currentId;
-    $scope.sections = navigationService.sections();
-    
-    //events
-    $scope.$on("treeOptionsClick", function(ev, args){
-            $scope.currentNode = args.node;
-            args.scope = $scope;
-            navigationService.showMenu(ev, args);
-    });
-
-    $scope.openDialog = function(currentNode,action,currentSection){
-        navigationService.showDialog({
-                                        scope: $scope,
-                                        node: currentNode,
-                                        action: action,
-                                        section: currentSection});
-    };
-});
-
-
-angular.module('umbraco').controller("SearchController", function ($scope, searchService, $log, navigationService) {
-
-    var currentTerm = "";
-    $scope.deActivateSearch = function(){
-       currentTerm = ""; 
-    };
-
-    $scope.performSearch = function (term) {
-        if(term != undefined && term != currentTerm){
-            if(term.length > 3){
-                $scope.ui.selectedSearchResult = -1;
-                navigationService.showSearch();
-                currentTerm = term;
-                $scope.ui.searchResults = searchService.search(term, $scope.currentSection);
-            }else{
-                $scope.ui.searchResults = [];
-            }
-        }
-    };    
-
-    $scope.hideSearch = navigationService.hideSearch;
-
-    $scope.iterateResults = function (direction) {
-       if(direction == "up" && $scope.ui.selectedSearchResult < $scope.ui.searchResults.length) 
-            $scope.ui.selectedSearchResult++;
-        else if($scope.ui.selectedSearchResult > 0)
-            $scope.ui.selectedSearchResult--;
-    };
-
-    $scope.selectResult = function () {
-        navigationService.showMenu($scope.ui.searchResults[$scope.ui.selectedSearchResult], undefined);
-    };
-});
-
-
-angular.module('umbraco').controller("DashboardController", function ($scope, $routeParams) {
-    $scope.name = $routeParams.section;
-});
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/application.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/application.controller.js
deleted file mode 100644
index 940ee42848..0000000000
--- a/src/Umbraco.Web.UI.Client/src/views/common/application.controller.js
+++ /dev/null
@@ -1,72 +0,0 @@
-//Handles the section area of the app
-angular.module('umbraco').controller("NavigationController",
-    function ($scope, navigationService) {
-    
-    //load navigation service handlers
-    $scope.changeSection = navigationService.changeSection;    
-    $scope.showTree = navigationService.showTree;
-    $scope.hideTree = navigationService.hideTree;
-    $scope.hideMenu = navigationService.hideMenu;
-    $scope.showMenu = navigationService.showMenu;
-    $scope.hideDialog = navigationService.hideDialog;
-    $scope.hideNavigation = navigationService.hideNavigation;
-    $scope.ui = navigationService.ui;    
-
-    $scope.selectedId = navigationService.currentId;
-    $scope.sections = navigationService.sections();
-    
-    //events
-    $scope.$on("treeOptionsClick", function(ev, args){
-            $scope.currentNode = args.node;
-            args.scope = $scope;
-            navigationService.showMenu(ev, args);
-    });
-
-    $scope.openDialog = function(currentNode,action,currentSection){
-        navigationService.showDialog({
-                                        scope: $scope,
-                                        node: currentNode,
-                                        action: action,
-                                        section: currentSection});
-    };
-});
-
-
-angular.module('umbraco').controller("SearchController", function ($scope, searchService, $log, navigationService) {
-
-    var currentTerm = "";
-    $scope.deActivateSearch = function(){
-       currentTerm = ""; 
-    };
-
-    $scope.performSearch = function (term) {
-        if(term != undefined && term != currentTerm){
-            if(term.length > 3){
-                $scope.ui.selectedSearchResult = -1;
-                navigationService.showSearch();
-                currentTerm = term;
-                $scope.ui.searchResults = searchService.search(term, $scope.currentSection);
-            }else{
-                $scope.ui.searchResults = [];
-            }
-        }
-    };    
-
-    $scope.hideSearch = navigationService.hideSearch;
-
-    $scope.iterateResults = function (direction) {
-       if(direction == "up" && $scope.ui.selectedSearchResult < $scope.ui.searchResults.length) 
-            $scope.ui.selectedSearchResult++;
-        else if($scope.ui.selectedSearchResult > 0)
-            $scope.ui.selectedSearchResult--;
-    };
-
-    $scope.selectResult = function () {
-        navigationService.showMenu($scope.ui.searchResults[$scope.ui.selectedSearchResult], undefined);
-    };
-});
-
-
-angular.module('umbraco').controller("DashboardController", function ($scope, $routeParams) {
-    $scope.name = $routeParams.section;
-});
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dashboard.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dashboard.controller.js
new file mode 100644
index 0000000000..2a0b0cc3d0
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dashboard.controller.js
@@ -0,0 +1,14 @@
+/**
+ * @ngdoc controller
+ * @name DashboardController
+ * @function
+ * 
+ * @description
+ * Controls the dashboards of the application
+ * 
+ */
+function DashboardController($scope, $routeParams) {
+    $scope.name = $routeParams.section;
+}
+//register it
+angular.module('umbraco').controller("DashboardController", DashboardController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/navigation.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/navigation.controller.js
new file mode 100644
index 0000000000..a9ff4cbb72
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/navigation.controller.js
@@ -0,0 +1,44 @@
+
+/**
+ * @ngdoc controller
+ * @name NavigationController
+ * @function
+ * 
+ * @description
+ * Handles the section area of the app
+ * 
+ * @param navigationService {navigationService} A reference to the navigationService
+ */
+function NavigationController($scope, navigationService) {
+    //load navigation service handlers
+    $scope.changeSection = navigationService.changeSection;
+    $scope.showTree = navigationService.showTree;
+    $scope.hideTree = navigationService.hideTree;
+    $scope.hideMenu = navigationService.hideMenu;
+    $scope.showMenu = navigationService.showMenu;
+    $scope.hideDialog = navigationService.hideDialog;
+    $scope.hideNavigation = navigationService.hideNavigation;
+    $scope.ui = navigationService.ui;
+
+    $scope.selectedId = navigationService.currentId;
+    $scope.sections = navigationService.sections();
+
+    //events
+    $scope.$on("treeOptionsClick", function (ev, args) {
+        $scope.currentNode = args.node;
+        args.scope = $scope;
+        navigationService.showMenu(ev, args);
+    });
+
+    $scope.openDialog = function (currentNode, action, currentSection) {
+        navigationService.showDialog({
+            scope: $scope,
+            node: currentNode,
+            action: action,
+            section: currentSection
+        });
+    };
+}
+
+//register it
+angular.module('umbraco').controller("NavigationController", NavigationController);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/search.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/search.controller.js
new file mode 100644
index 0000000000..54ac10a1ae
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/search.controller.js
@@ -0,0 +1,43 @@
+/**
+ * @ngdoc controller
+ * @name SearchController
+ * @function
+ * 
+ * @description
+ * Controls the search functionality in the site
+ *  
+ */
+function SearchController($scope, searchService, $log, navigationService) {
+    var currentTerm = "";
+    $scope.deActivateSearch = function () {
+        currentTerm = "";
+    };
+
+    $scope.performSearch = function (term) {
+        if (term != undefined && term != currentTerm) {
+            if (term.length > 3) {
+                $scope.ui.selectedSearchResult = -1;
+                navigationService.showSearch();
+                currentTerm = term;
+                $scope.ui.searchResults = searchService.search(term, $scope.currentSection);
+            } else {
+                $scope.ui.searchResults = [];
+            }
+        }
+    };
+
+    $scope.hideSearch = navigationService.hideSearch;
+
+    $scope.iterateResults = function (direction) {
+        if (direction == "up" && $scope.ui.selectedSearchResult < $scope.ui.searchResults.length)
+            $scope.ui.selectedSearchResult++;
+        else if ($scope.ui.selectedSearchResult > 0)
+            $scope.ui.selectedSearchResult--;
+    };
+
+    $scope.selectResult = function () {
+        navigationService.showMenu($scope.ui.searchResults[$scope.ui.selectedSearchResult], undefined);
+    };
+}
+//register it
+angular.module('umbraco').controller("SearchController", SearchController);
\ No newline at end of file