diff --git a/src/app/controllers/all.js b/src/app/controllers/all.js
index 26876fe9f0c..60e3fe7b150 100644
--- a/src/app/controllers/all.js
+++ b/src/app/controllers/all.js
@@ -7,4 +7,5 @@ define([
   './inspectCtrl',
   './jsonEditorCtrl',
   './loginCtrl',
+  './registerCtrl',
 ], function () {});
diff --git a/src/app/routes/backend/login.js b/src/app/controllers/registerCtrl.js
similarity index 68%
rename from src/app/routes/backend/login.js
rename to src/app/controllers/registerCtrl.js
index b7f45a7bddd..5395826c1a3 100644
--- a/src/app/routes/backend/login.js
+++ b/src/app/controllers/registerCtrl.js
@@ -6,18 +6,6 @@ function (angular) {
 
   var module = angular.module('grafana.routes');
 
-  module.config(function($routeProvider) {
-    $routeProvider
-      .when('/login', {
-        templateUrl: 'app/partials/login.html',
-        controller : 'LoginCtrl',
-      })
-      .when('/register', {
-        templateUrl: 'app/partials/register.html',
-        controller : 'RegisterCtrl',
-      });
-  });
-
   module.controller('RegisterCtrl', function($scope, backendSrv, $location) {
     $scope.loginModel = {};
     $scope.grafana.sidemenu = false;
diff --git a/src/app/features/dashboard/all.js b/src/app/features/dashboard/all.js
index 74c2fa0bb80..c2984dd923b 100644
--- a/src/app/features/dashboard/all.js
+++ b/src/app/features/dashboard/all.js
@@ -10,5 +10,6 @@ define([
   './viewStateSrv',
   './playlistSrv',
   './panelSrv',
+  './soloPanelCtrl',
   './timeSrv',
 ], function () {});
diff --git a/src/app/routes/backend/solo-panel.js b/src/app/features/dashboard/soloPanelCtrl.js
similarity index 89%
rename from src/app/routes/backend/solo-panel.js
rename to src/app/features/dashboard/soloPanelCtrl.js
index bd0fb010b51..3e7efa5e28c 100644
--- a/src/app/routes/backend/solo-panel.js
+++ b/src/app/features/dashboard/soloPanelCtrl.js
@@ -7,14 +7,6 @@ function (angular, $) {
 
   var module = angular.module('grafana.routes');
 
-  module.config(function($routeProvider) {
-    $routeProvider
-      .when('/dashboard/solo/:id/', {
-        templateUrl: 'app/partials/solo-panel.html',
-        controller : 'SoloPanelCtrl',
-      });
-  });
-
   module.controller('SoloPanelCtrl', function($scope, $rootScope, datasourceSrv, $routeParams, dashboardSrv, timeSrv, $location) {
     var panelId;
 
diff --git a/src/app/features/grafanaDatasource/datasource.js b/src/app/features/grafanaDatasource/datasource.js
index c96199ce168..96566c91829 100644
--- a/src/app/features/grafanaDatasource/datasource.js
+++ b/src/app/features/grafanaDatasource/datasource.js
@@ -63,7 +63,7 @@ function (angular, _, kbn) {
     };
 
     GrafanaDatasource.prototype.searchDashboards = function(query) {
-      return backendSrv.get('/api/search/', { q: query } )
+      return backendSrv.get('/api/search/', {q: query})
         .then(function(data) {
           _.each(data.dashboards, function(item) {
             item.id = item.slug;
diff --git a/src/app/routes/backend/admin.js b/src/app/routes/backend/admin.js
deleted file mode 100644
index 722e4ca1e07..00000000000
--- a/src/app/routes/backend/admin.js
+++ /dev/null
@@ -1,21 +0,0 @@
-define([
-  'angular',
-],
-function (angular) {
-  "use strict";
-
-  var module = angular.module('grafana.routes');
-
-  module.config(function($routeProvider) {
-    $routeProvider
-      .when('/admin/datasources', {
-        templateUrl: 'app/features/admin/partials/datasources.html',
-        controller : 'DataSourcesCtrl',
-      })
-      .when('/account', {
-        templateUrl: 'app/features/admin/partials/account.html',
-        controller : 'AccountCtrl',
-      });
-  });
-
-});
diff --git a/src/app/routes/backend/all.js b/src/app/routes/backend/all.js
index 41cf25aec49..01e9a23651b 100644
--- a/src/app/routes/backend/all.js
+++ b/src/app/routes/backend/all.js
@@ -1,6 +1,55 @@
 define([
+  'angular',
   './dashboard',
-  './admin',
-  './login',
-  './solo-panel',
-], function() {});
+], function(angular) {
+  "use strict";
+
+  var module = angular.module('grafana.routes');
+
+  module.config(function($routeProvider, $locationProvider) {
+    $locationProvider.html5Mode(true);
+
+    $routeProvider
+      .when('/', {
+        templateUrl: 'app/partials/dashboard.html',
+        controller : 'DashFromDBProvider',
+        reloadOnSearch: false,
+      })
+      .when('/dashboard/db/:id', {
+        templateUrl: 'app/partials/dashboard.html',
+        controller : 'DashFromDBProvider',
+        reloadOnSearch: false,
+      })
+      .when('/dashboard/temp/:id', {
+        templateUrl: 'app/partials/dashboard.html',
+        controller : 'DashFromDBProvider',
+        reloadOnSearch: false,
+      })
+      .when('/dashboard/import/:id', {
+        templateUrl: 'app/partials/dashboard.html',
+        controller : 'DashFromImportCtrl',
+        reloadOnSearch: false,
+      })
+      .when('/admin/datasources', {
+        templateUrl: 'app/features/admin/partials/datasources.html',
+        controller : 'DataSourcesCtrl',
+      })
+      .when('/account', {
+        templateUrl: 'app/features/admin/partials/account.html',
+        controller : 'AccountCtrl',
+      })
+      .when('/login', {
+        templateUrl: 'app/partials/login.html',
+        controller : 'LoginCtrl',
+      })
+      .when('/register', {
+        templateUrl: 'app/partials/register.html',
+        controller : 'RegisterCtrl',
+      })
+      .when('/dashboard/solo/:id/', {
+        templateUrl: 'app/partials/solo-panel.html',
+        controller : 'SoloPanelCtrl',
+      });
+  });
+
+});
diff --git a/src/app/routes/backend/dashboard.js b/src/app/routes/backend/dashboard.js
index 4aa6c4642cd..1ea3e8792cd 100644
--- a/src/app/routes/backend/dashboard.js
+++ b/src/app/routes/backend/dashboard.js
@@ -7,32 +7,6 @@ function (angular, store) {
 
   var module = angular.module('grafana.routes');
 
-  module.config(function($routeProvider, $locationProvider) {
-    $locationProvider.html5Mode(true);
-
-    $routeProvider
-      .when('/', {
-        templateUrl: 'app/partials/dashboard.html',
-        controller : 'DashFromDBProvider',
-        reloadOnSearch: false,
-      })
-      .when('/dashboard/db/:id', {
-        templateUrl: 'app/partials/dashboard.html',
-        controller : 'DashFromDBProvider',
-        reloadOnSearch: false,
-      })
-      .when('/dashboard/temp/:id', {
-        templateUrl: 'app/partials/dashboard.html',
-        controller : 'DashFromDBProvider',
-        reloadOnSearch: false,
-      })
-      .when('/dashboard/import/:id', {
-        templateUrl: 'app/partials/dashboard.html',
-        controller : 'DashFromImportCtrl',
-        reloadOnSearch: false,
-      });
-  });
-
   // remember previous dashboard
   var prevDashPath = null;
 
diff --git a/src/test/specs/SoloPanelCtrl-specs.js b/src/test/specs/SoloPanelCtrl-specs.js
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/test/specs/pro/soloPanelCtrl-specs.js b/src/test/specs/soloPanelCtrl-specs.js
similarity index 97%
rename from src/test/specs/pro/soloPanelCtrl-specs.js
rename to src/test/specs/soloPanelCtrl-specs.js
index f3460bbba30..db5dc0af979 100644
--- a/src/test/specs/pro/soloPanelCtrl-specs.js
+++ b/src/test/specs/soloPanelCtrl-specs.js
@@ -1,6 +1,6 @@
 define([
   'helpers',
-  'routes/backend/solo-panel',
+  'controllers/soloPanelCtrl',
   'features/dashboard/dashboardSrv',
 ], function(helpers) {
   'use strict';