diff --git a/public/app/core/directives/array_join.ts b/public/app/angular/array_join.ts
similarity index 93%
rename from public/app/core/directives/array_join.ts
rename to public/app/angular/array_join.ts
index b98105d39bd..5bf12b795b7 100644
--- a/public/app/core/directives/array_join.ts
+++ b/public/app/angular/array_join.ts
@@ -1,5 +1,5 @@
 import { isArray } from 'lodash';
-import coreModule from '../core_module';
+import coreModule from '../core/core_module';
 
 export function arrayJoin() {
   'use strict';
diff --git a/public/app/core/directives/autofill_event_fix.ts b/public/app/angular/autofill_event_fix.ts
similarity index 95%
rename from public/app/core/directives/autofill_event_fix.ts
rename to public/app/angular/autofill_event_fix.ts
index d6bd4af55fa..922b0c2b497 100644
--- a/public/app/core/directives/autofill_event_fix.ts
+++ b/public/app/angular/autofill_event_fix.ts
@@ -1,4 +1,4 @@
-import coreModule from '../core_module';
+import coreModule from '../core/core_module';
 
 /** @ngInject */
 export function autofillEventFix($compile: any) {
diff --git a/public/app/core/directives/diff-view.ts b/public/app/angular/diff-view.ts
similarity index 97%
rename from public/app/core/directives/diff-view.ts
rename to public/app/angular/diff-view.ts
index eb52e6cae8e..f364c2d9491 100644
--- a/public/app/core/directives/diff-view.ts
+++ b/public/app/angular/diff-view.ts
@@ -1,5 +1,5 @@
 import angular from 'angular';
-import coreModule from '../core_module';
+import coreModule from '../core/core_module';
 import { GrafanaRootScope } from 'app/routes/GrafanaCtrl';
 
 export class DeltaCtrl {
diff --git a/public/app/core/directives/dropdown_typeahead.ts b/public/app/angular/dropdown_typeahead.ts
similarity index 99%
rename from public/app/core/directives/dropdown_typeahead.ts
rename to public/app/angular/dropdown_typeahead.ts
index 144e6dcf2f6..87e3a67bea2 100644
--- a/public/app/core/directives/dropdown_typeahead.ts
+++ b/public/app/angular/dropdown_typeahead.ts
@@ -1,6 +1,6 @@
 import { each, reduce } from 'lodash';
 import $ from 'jquery';
-import coreModule from '../core_module';
+import coreModule from '../core/core_module';
 
 /** @ngInject */
 export function dropdownTypeahead($compile: any) {
diff --git a/public/app/core/directives/give_focus.ts b/public/app/angular/give_focus.ts
similarity index 92%
rename from public/app/core/directives/give_focus.ts
rename to public/app/angular/give_focus.ts
index c10dbb9f9ac..63bcbbc79c8 100644
--- a/public/app/core/directives/give_focus.ts
+++ b/public/app/angular/give_focus.ts
@@ -1,4 +1,4 @@
-import coreModule from '../core_module';
+import coreModule from '../core/core_module';
 
 coreModule.directive('giveFocus', () => {
   return (scope: any, element: any, attrs: any) => {
diff --git a/public/app/core/directives/metric_segment.ts b/public/app/angular/metric_segment.ts
similarity index 99%
rename from public/app/core/directives/metric_segment.ts
rename to public/app/angular/metric_segment.ts
index 0589a884f58..075a4d25a6f 100644
--- a/public/app/core/directives/metric_segment.ts
+++ b/public/app/angular/metric_segment.ts
@@ -1,6 +1,6 @@
 import { debounce, find, indexOf, map, escape, unescape } from 'lodash';
 import $ from 'jquery';
-import coreModule from '../core_module';
+import coreModule from '../core/core_module';
 import { TemplateSrv } from 'app/features/templating/template_srv';
 
 /** @ngInject */
diff --git a/public/app/core/directives/misc.ts b/public/app/angular/misc.ts
similarity index 99%
rename from public/app/core/directives/misc.ts
rename to public/app/angular/misc.ts
index b9e2f4b675c..feb04eddee0 100644
--- a/public/app/core/directives/misc.ts
+++ b/public/app/angular/misc.ts
@@ -1,6 +1,6 @@
 import angular from 'angular';
 import Clipboard from 'clipboard';
-import coreModule from '../core_module';
+import coreModule from '../core/core_module';
 import kbn from 'app/core/utils/kbn';
 import { appEvents } from 'app/core/core';
 import { AppEvents } from '@grafana/data';
diff --git a/public/app/core/directives/ng_model_on_blur.ts b/public/app/angular/ng_model_on_blur.ts
similarity index 96%
rename from public/app/core/directives/ng_model_on_blur.ts
rename to public/app/angular/ng_model_on_blur.ts
index a0f621332ef..f1fec919341 100644
--- a/public/app/core/directives/ng_model_on_blur.ts
+++ b/public/app/angular/ng_model_on_blur.ts
@@ -1,4 +1,4 @@
-import coreModule from '../core_module';
+import coreModule from '../core/core_module';
 import { rangeUtil } from '@grafana/data';
 
 function ngModelOnBlur() {
diff --git a/public/app/core/directives/rebuild_on_change.ts b/public/app/angular/rebuild_on_change.ts
similarity index 97%
rename from public/app/core/directives/rebuild_on_change.ts
rename to public/app/angular/rebuild_on_change.ts
index a8be3ca70df..91cb45d9c4e 100644
--- a/public/app/core/directives/rebuild_on_change.ts
+++ b/public/app/angular/rebuild_on_change.ts
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import coreModule from '../core_module';
+import coreModule from '../core/core_module';
 
 function getBlockNodes(nodes: any[]) {
   let node = nodes[0];
diff --git a/public/app/angular/services.ts b/public/app/angular/services.ts
new file mode 100644
index 00000000000..f43e8d6ee82
--- /dev/null
+++ b/public/app/angular/services.ts
@@ -0,0 +1,9 @@
+import './alert_srv';
+import './util_srv';
+import './context_srv';
+import './timer';
+import './analytics';
+import './popover_srv';
+import './segment_srv';
+import './backend_srv';
+import './dynamic_directive_srv';
diff --git a/public/app/core/directives/tags.ts b/public/app/angular/tags.ts
similarity index 98%
rename from public/app/core/directives/tags.ts
rename to public/app/angular/tags.ts
index 8cd81fb3ed6..a2959af8798 100644
--- a/public/app/core/directives/tags.ts
+++ b/public/app/angular/tags.ts
@@ -1,7 +1,7 @@
 import angular from 'angular';
 import { getTagColorsFromName } from '@grafana/ui';
 import $ from 'jquery';
-import coreModule from '../core_module';
+import coreModule from '../core/core_module';
 import 'vendor/tagsinput/bootstrap-tagsinput.js';
 
 function setColor(name: string, element: JQuery) {
diff --git a/public/app/core/controllers/all.ts b/public/app/core/controllers/all.ts
deleted file mode 100644
index ae905a7c598..00000000000
--- a/public/app/core/controllers/all.ts
+++ /dev/null
@@ -1 +0,0 @@
-import './json_editor_ctrl';
diff --git a/public/app/core/controllers/json_editor_ctrl.ts b/public/app/core/controllers/json_editor_ctrl.ts
deleted file mode 100644
index 0c33a0408e7..00000000000
--- a/public/app/core/controllers/json_editor_ctrl.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import angular from 'angular';
-import coreModule from '../core_module';
-
-export class JsonEditorCtrl {
-  /** @ngInject */
-  constructor($scope: any) {
-    $scope.json = angular.toJson($scope.model.object, true);
-    $scope.canUpdate = $scope.model.updateHandler !== void 0 && $scope.model.canUpdate;
-    $scope.canCopy = $scope.model.enableCopy;
-
-    $scope.update = () => {
-      const newObject = angular.fromJson($scope.json);
-      $scope.model.updateHandler(newObject, $scope.model.object);
-    };
-
-    $scope.getContentForClipboard = () => $scope.json;
-  }
-}
-
-coreModule.controller('JsonEditorCtrl', JsonEditorCtrl);
diff --git a/public/app/core/core.ts b/public/app/core/core.ts
index a8e8f226ee8..c90abd0781d 100644
--- a/public/app/core/core.ts
+++ b/public/app/core/core.ts
@@ -1,12 +1,12 @@
-import './directives/dropdown_typeahead';
-import './directives/autofill_event_fix';
-import './directives/metric_segment';
-import './directives/misc';
-import './directives/ng_model_on_blur';
-import './directives/tags';
-import './directives/rebuild_on_change';
-import './directives/give_focus';
-import './directives/diff-view';
+import '../angular/dropdown_typeahead';
+import '../angular/autofill_event_fix';
+import '../angular/metric_segment';
+import '../angular/misc';
+import '../angular/ng_model_on_blur';
+import '../angular/tags';
+import '../angular/rebuild_on_change';
+import '../angular/give_focus';
+import '../angular/diff-view';
 import './jquery_extended';
 import './partials';
 import './components/jsontree/jsontree';
@@ -17,13 +17,12 @@ import './services/ng_react';
 import { colors, JsonExplorer } from '@grafana/ui/';
 
 import { infoPopover } from './components/info_popover';
-import { arrayJoin } from './directives/array_join';
+import { arrayJoin } from '../angular/array_join';
 import { switchDirective } from './components/switch';
 import { dashboardSelector } from './components/dashboard_selector';
 import { queryPartEditorDirective } from './components/query_part/query_part_editor';
 import { sqlPartEditorDirective } from './components/sql_part/sql_part_editor';
 import { formDropdownDirective } from './components/form_dropdown/form_dropdown';
-import 'app/core/controllers/all';
 import 'app/core/services/all';
 import './filters/filters';
 import coreModule from './core_module';