diff --git a/public/app/core/selectors/navModel.ts b/public/app/core/selectors/navModel.ts
index a7e1c3330bd..8b3a3edd84e 100644
--- a/public/app/core/selectors/navModel.ts
+++ b/public/app/core/selectors/navModel.ts
@@ -1,7 +1,7 @@
 import { NavModel, NavModelItem, NavIndex } from 'app/types';
 
 function getNotFoundModel(): NavModel {
-  var node: NavModelItem = {
+  const node: NavModelItem = {
     id: 'not-found',
     text: 'Page not found',
     icon: 'fa fa-fw fa-warning',
diff --git a/public/app/features/admin/admin_edit_org_ctrl.ts b/public/app/features/admin/AdminEditOrgCtrl.ts
similarity index 88%
rename from public/app/features/admin/admin_edit_org_ctrl.ts
rename to public/app/features/admin/AdminEditOrgCtrl.ts
index ec3f8548023..3117c5f0f9b 100644
--- a/public/app/features/admin/admin_edit_org_ctrl.ts
+++ b/public/app/features/admin/AdminEditOrgCtrl.ts
@@ -1,6 +1,5 @@
-import angular from 'angular';
 
-export class AdminEditOrgCtrl {
+export default class AdminEditOrgCtrl {
   /** @ngInject */
   constructor($scope, $routeParams, backendSrv, $location, navModelSrv) {
     $scope.init = () => {
@@ -48,4 +47,3 @@ export class AdminEditOrgCtrl {
   }
 }
 
-angular.module('grafana.controllers').controller('AdminEditOrgCtrl', AdminEditOrgCtrl);
diff --git a/public/app/features/admin/admin_edit_user_ctrl.ts b/public/app/features/admin/AdminEditUserCtrl.ts
similarity index 95%
rename from public/app/features/admin/admin_edit_user_ctrl.ts
rename to public/app/features/admin/AdminEditUserCtrl.ts
index c34ccdc1cad..bf72c1746aa 100644
--- a/public/app/features/admin/admin_edit_user_ctrl.ts
+++ b/public/app/features/admin/AdminEditUserCtrl.ts
@@ -1,7 +1,6 @@
-import angular from 'angular';
 import _ from 'lodash';
 
-export class AdminEditUserCtrl {
+export default class AdminEditUserCtrl {
   /** @ngInject */
   constructor($scope, $routeParams, backendSrv, $location, navModelSrv) {
     $scope.user = {};
@@ -117,5 +116,3 @@ export class AdminEditUserCtrl {
     $scope.init();
   }
 }
-
-angular.module('grafana.controllers').controller('AdminEditUserCtrl', AdminEditUserCtrl);
diff --git a/public/app/features/admin/admin_list_orgs_ctrl.ts b/public/app/features/admin/AdminListOrgsCtrl.ts
similarity index 84%
rename from public/app/features/admin/admin_list_orgs_ctrl.ts
rename to public/app/features/admin/AdminListOrgsCtrl.ts
index 0513752aa3e..9190f7f494e 100644
--- a/public/app/features/admin/admin_list_orgs_ctrl.ts
+++ b/public/app/features/admin/AdminListOrgsCtrl.ts
@@ -1,6 +1,5 @@
-import angular from 'angular';
 
-export class AdminListOrgsCtrl {
+export default class AdminListOrgsCtrl {
   /** @ngInject */
   constructor($scope, backendSrv, navModelSrv) {
     $scope.init = () => {
@@ -33,4 +32,3 @@ export class AdminListOrgsCtrl {
   }
 }
 
-angular.module('grafana.controllers').controller('AdminListOrgsCtrl', AdminListOrgsCtrl);
diff --git a/public/app/features/admin/admin_list_users_ctrl.ts b/public/app/features/admin/AdminListUsersCtrl.ts
similarity index 100%
rename from public/app/features/admin/admin_list_users_ctrl.ts
rename to public/app/features/admin/AdminListUsersCtrl.ts
diff --git a/public/app/features/admin/containers/ServerStats.test.tsx b/public/app/features/admin/ServerStats.test.tsx
similarity index 89%
rename from public/app/features/admin/containers/ServerStats.test.tsx
rename to public/app/features/admin/ServerStats.test.tsx
index e12dfc3bed4..cbcc580f612 100644
--- a/public/app/features/admin/containers/ServerStats.test.tsx
+++ b/public/app/features/admin/ServerStats.test.tsx
@@ -2,14 +2,14 @@ import React from 'react';
 import renderer from 'react-test-renderer';
 import { ServerStats } from './ServerStats';
 import { createNavModel } from 'test/mocks/common';
-import { ServerStat } from '../apis';
+import { ServerStat } from './state/apis';
 
 describe('ServerStats', () => {
   it('Should render table with stats', done => {
     const navModel = createNavModel('Admin', 'stats');
     const stats: ServerStat[] = [{ name: 'Total dashboards', value: 10 }, { name: 'Total Users', value: 1 }];
 
-    let getServerStats = () => {
+    const getServerStats = () => {
       return Promise.resolve(stats);
     };
 
diff --git a/public/app/features/admin/containers/ServerStats.tsx b/public/app/features/admin/ServerStats.tsx
similarity index 96%
rename from public/app/features/admin/containers/ServerStats.tsx
rename to public/app/features/admin/ServerStats.tsx
index 97419ec9301..40be87ed4d3 100644
--- a/public/app/features/admin/containers/ServerStats.tsx
+++ b/public/app/features/admin/ServerStats.tsx
@@ -3,7 +3,7 @@ import { hot } from 'react-hot-loader';
 import { connect } from 'react-redux';
 import { NavModel, StoreState } from 'app/types';
 import { getNavModel } from 'app/core/selectors/navModel';
-import { getServerStats, ServerStat } from '../apis';
+import { getServerStats, ServerStat } from './state/apis';
 import PageHeader from 'app/core/components/PageHeader/PageHeader';
 
 interface Props {
diff --git a/public/app/features/admin/containers/__snapshots__/ServerStats.test.tsx.snap b/public/app/features/admin/__snapshots__/ServerStats.test.tsx.snap
similarity index 100%
rename from public/app/features/admin/containers/__snapshots__/ServerStats.test.tsx.snap
rename to public/app/features/admin/__snapshots__/ServerStats.test.tsx.snap
diff --git a/public/app/features/admin/admin.ts b/public/app/features/admin/index.ts
similarity index 57%
rename from public/app/features/admin/admin.ts
rename to public/app/features/admin/index.ts
index 00e98821779..7fc14791ea7 100644
--- a/public/app/features/admin/admin.ts
+++ b/public/app/features/admin/index.ts
@@ -1,7 +1,7 @@
-import AdminListUsersCtrl from './admin_list_users_ctrl';
-import './admin_list_orgs_ctrl';
-import './admin_edit_org_ctrl';
-import './admin_edit_user_ctrl';
+import AdminListUsersCtrl from './AdminListUsersCtrl';
+import AdminEditUserCtrl from './AdminEditUserCtrl';
+import AdminListOrgsCtrl from './AdminListOrgsCtrl';
+import AdminEditOrgCtrl from './AdminEditOrgCtrl';
 
 import coreModule from 'app/core/core_module';
 
@@ -27,21 +27,11 @@ class AdminHomeCtrl {
   }
 }
 
-export class AdminStatsCtrl {
-  stats: any;
-  navModel: any;
+coreModule.controller('AdminListUsersCtrl', AdminListUsersCtrl);
+coreModule.controller('AdminEditUserCtrl', AdminEditUserCtrl);
 
-  /** @ngInject */
-  constructor(backendSrv: any, navModelSrv) {
-    this.navModel = navModelSrv.getNav('cfg', 'admin', 'server-stats', 1);
-
-    backendSrv.get('/api/admin/stats').then(stats => {
-      this.stats = stats;
-    });
-  }
-}
+coreModule.controller('AdminListOrgsCtrl', AdminListOrgsCtrl);
+coreModule.controller('AdminEditOrgCtrl', AdminEditOrgCtrl);
 
 coreModule.controller('AdminSettingsCtrl', AdminSettingsCtrl);
 coreModule.controller('AdminHomeCtrl', AdminHomeCtrl);
-coreModule.controller('AdminStatsCtrl', AdminStatsCtrl);
-coreModule.controller('AdminListUsersCtrl', AdminListUsersCtrl);
diff --git a/public/app/features/admin/apis/index.ts b/public/app/features/admin/state/apis.ts
similarity index 100%
rename from public/app/features/admin/apis/index.ts
rename to public/app/features/admin/state/apis.ts
diff --git a/public/app/features/all.ts b/public/app/features/all.ts
index 065f399cae3..0285e9c352a 100644
--- a/public/app/features/all.ts
+++ b/public/app/features/all.ts
@@ -8,7 +8,7 @@ import './playlist/all';
 import './snapshot/all';
 import './panel/all';
 import './org/all';
-import './admin/admin';
+import './admin';
 import './alerting/NotificationsEditCtrl';
 import './alerting/NotificationsListCtrl';
 import './styleguide/styleguide';
diff --git a/public/app/routes/routes.ts b/public/app/routes/routes.ts
index 86afe685887..0fd76a8c8eb 100644
--- a/public/app/routes/routes.ts
+++ b/public/app/routes/routes.ts
@@ -1,7 +1,7 @@
 import './dashboard_loaders';
 import './ReactContainer';
 
-import ServerStats from 'app/features/admin/containers/ServerStats';
+import ServerStats from 'app/features/admin/ServerStats';
 import AlertRuleList from 'app/features/alerting/AlertRuleList';
 import FolderSettings from 'app/containers/ManageDashboards/FolderSettings';
 import FolderPermissions from 'app/containers/ManageDashboards/FolderPermissions';
diff --git a/public/test/jest-setup.ts b/public/test/jest-setup.ts
index f97e4ec4b91..9079754dc28 100644
--- a/public/test/jest-setup.ts
+++ b/public/test/jest-setup.ts
@@ -21,19 +21,19 @@ configure({ adapter: new Adapter() });
 const global = window as any;
 global.$ = global.jQuery = $;
 
-const localStorageMock = (function() {
-  var store = {};
+const localStorageMock = (() => {
+  let store = {};
   return {
-    getItem: function(key) {
+    getItem: key => {
       return store[key];
     },
-    setItem: function(key, value) {
+    setItem: (key, value) => {
       store[key] = value.toString();
     },
-    clear: function() {
+    clear: () => {
       store = {};
     },
-    removeItem: function(key) {
+    removeItem: key => {
       delete store[key];
     },
   };
diff --git a/public/test/mocks/common.ts b/public/test/mocks/common.ts
index 1c7bdb4f1e2..385f72621a9 100644
--- a/public/test/mocks/common.ts
+++ b/public/test/mocks/common.ts
@@ -31,7 +31,7 @@ export function createNavModel(title: string, ...tabs: string[]): NavModel {
     breadcrumbs: [],
   };
 
-  for (let tab of tabs) {
+  for (const tab of tabs) {
     node.children.push({
       id: tab,
       icon: 'icon',