From 27f66a6df93fec6ff96e445111d5aaaf2f7a6c7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Tue, 9 Nov 2021 08:37:16 +0100
Subject: [PATCH] Angular: Move coreModule to app/angular and isolate angular
 usage more  (#41433)

* moving coreModule to app/angular and isolating it more

* fixed ts issue
---
 public/app/angular/AngularApp.ts                     |  4 +++-
 public/app/angular/angular_wrappers.ts               |  2 +-
 public/app/angular/array_join.ts                     |  2 +-
 public/app/angular/autofill_event_fix.ts             |  2 +-
 public/app/angular/bridgeReactAngularRouting.ts      |  2 +-
 .../angular/components/code_editor/code_editor.ts    |  2 +-
 .../components/form_dropdown/form_dropdown.ts        |  4 ++--
 public/app/angular/components/info_popover.ts        |  2 +-
 public/app/angular/components/jsontree.ts            |  2 +-
 public/app/angular/components/query_part_editor.ts   |  4 ++--
 public/app/angular/components/scroll.ts              |  2 +-
 public/app/angular/components/spectrum_picker.ts     |  2 +-
 .../angular/components/sql_part/sql_part_editor.ts   |  2 +-
 public/app/angular/components/switch.ts              |  2 +-
 public/app/{core => angular}/core_module.ts          |  0
 public/app/angular/diff-view.ts                      |  2 +-
 public/app/angular/dropdown_typeahead.ts             |  2 +-
 public/app/angular/filters/filters.ts                |  2 +-
 public/app/angular/give_focus.ts                     |  2 +-
 public/app/angular/index.ts                          |  2 ++
 public/app/angular/metric_segment.ts                 |  2 +-
 public/app/angular/misc.ts                           |  2 +-
 public/app/angular/ng_model_on_blur.ts               |  2 +-
 public/app/angular/panel/panel_directive.ts          |  2 +-
 public/app/angular/panel/panellinks/link_srv.ts      |  2 +-
 public/app/angular/panel/query_editor_row.ts         |  2 +-
 .../{core/utils => angular}/promiseToDigest.test.ts  |  0
 .../app/{core/utils => angular}/promiseToDigest.ts   |  0
 public/app/{core/utils => angular}/react2angular.ts  |  2 +-
 public/app/angular/rebuild_on_change.ts              |  2 +-
 public/app/angular/registerComponents.ts             |  8 ++++++++
 .../app/{core => angular}/services/AngularLoader.ts  | 12 ++----------
 public/app/angular/services/alert_srv.ts             |  2 +-
 public/app/angular/services/dynamic_directive_srv.ts |  2 +-
 public/app/angular/services/nav_model_srv.ts         |  2 +-
 public/app/angular/services/popover_srv.ts           |  2 +-
 public/app/angular/services/segment_srv.ts           |  2 +-
 public/app/angular/services/timer.ts                 |  2 +-
 public/app/angular/tags.ts                           |  2 +-
 public/app/app.ts                                    | 10 +++++++++-
 public/app/core/core.ts                              |  2 --
 public/app/core/services/backend_srv.ts              |  2 --
 public/app/core/services/context_srv.ts              |  5 -----
 public/app/core/services/util_srv.ts                 |  2 +-
 public/app/features/alerting/AlertTabCtrl.ts         |  4 ++--
 .../app/features/annotations/annotation_tooltip.ts   |  2 +-
 public/app/features/annotations/annotations_srv.ts   | 10 +---------
 .../components/StandardAnnotationQueryEditor.tsx     |  9 ---------
 public/app/features/annotations/event_editor.ts      |  2 +-
 .../DashboardSettings/AnnotationsSettings.test.tsx   |  4 +---
 .../components/FolderPicker/FolderPickerCtrl.ts      |  4 ++--
 .../components/VersionHistory/HistorySrv.ts          |  2 +-
 .../app/features/dashboard/services/DashboardSrv.ts  |  2 +-
 .../datasources/settings/HttpSettingsCtrl.ts         |  2 +-
 .../datasources/settings/TlsAuthSettingsCtrl.ts      |  2 +-
 .../UploadDashboard/uploadDashboardDirective.ts      |  2 +-
 .../manage-dashboards/services/ValidationSrv.ts      |  2 +-
 public/app/features/plugins/datasource_srv.ts        |  2 +-
 public/app/features/plugins/plugin_component.ts      |  2 +-
 public/app/features/plugins/plugin_loader.ts         |  6 ++++--
 public/app/features/plugins/plugin_page_ctrl.ts      |  2 +-
 .../features/plugins/variableQueryEditorLoader.tsx   |  2 +-
 .../plugins/datasource/graphite/specs/store.test.ts  |  2 +-
 public/app/plugins/panel/graph/graph.ts              |  3 ++-
 .../app/plugins/panel/graph/series_overrides_ctrl.ts |  2 +-
 public/app/plugins/panel/graph/thresholds_form.ts    |  2 +-
 public/app/plugins/panel/graph/time_regions_form.ts  |  2 +-
 public/app/plugins/panel/heatmap/color_legend.ts     |  2 +-
 public/app/routes/GrafanaCtrl.ts                     |  8 +++-----
 69 files changed, 91 insertions(+), 106 deletions(-)
 rename public/app/{core => angular}/core_module.ts (100%)
 rename public/app/{core/utils => angular}/promiseToDigest.test.ts (100%)
 rename public/app/{core/utils => angular}/promiseToDigest.ts (100%)
 rename public/app/{core/utils => angular}/react2angular.ts (85%)
 create mode 100644 public/app/angular/registerComponents.ts
 rename public/app/{core => angular}/services/AngularLoader.ts (75%)

diff --git a/public/app/angular/AngularApp.ts b/public/app/angular/AngularApp.ts
index 7fab2829548..c17f7ac6e0e 100644
--- a/public/app/angular/AngularApp.ts
+++ b/public/app/angular/AngularApp.ts
@@ -5,7 +5,7 @@ import 'angular-bindonce';
 import 'vendor/bootstrap/bootstrap';
 import 'vendor/angular-other/angular-strap';
 import { config } from 'app/core/config';
-import coreModule, { angularModules } from 'app/core/core_module';
+import coreModule, { angularModules } from 'app/angular/core_module';
 import { DashboardLoaderSrv } from 'app/features/dashboard/services/DashboardLoaderSrv';
 import { registerAngularDirectives } from './angular_wrappers';
 import { initAngularRoutingBridge } from './bridgeReactAngularRouting';
@@ -13,6 +13,7 @@ import { monkeyPatchInjectorWithPreAssignedBindings } from './injectorMonkeyPatc
 import { extend } from 'lodash';
 import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { getTemplateSrv } from '@grafana/runtime';
+import { registerComponents } from './registerComponents';
 
 export class AngularApp {
   ngModuleDependencies: any[];
@@ -89,6 +90,7 @@ export class AngularApp {
     coreModule.factory('templateSrv', () => getTemplateSrv());
 
     registerAngularDirectives();
+    registerComponents();
     initAngularRoutingBridge();
   }
 
diff --git a/public/app/angular/angular_wrappers.ts b/public/app/angular/angular_wrappers.ts
index c678704635e..2ce3911600a 100644
--- a/public/app/angular/angular_wrappers.ts
+++ b/public/app/angular/angular_wrappers.ts
@@ -1,4 +1,4 @@
-import { react2AngularDirective } from 'app/core/utils/react2angular';
+import { react2AngularDirective } from 'app/angular/react2angular';
 import { QueryEditor as CloudMonitoringQueryEditor } from 'app/plugins/datasource/cloud-monitoring/components/QueryEditor';
 import { AnnotationQueryEditor as CloudMonitoringAnnotationQueryEditor } from 'app/plugins/datasource/cloud-monitoring/components/AnnotationQueryEditor';
 import { AnnotationQueryEditor as CloudWatchAnnotationQueryEditor } from 'app/plugins/datasource/cloudwatch/components/AnnotationQueryEditor';
diff --git a/public/app/angular/array_join.ts b/public/app/angular/array_join.ts
index 5bf12b795b7..b81d3596760 100644
--- a/public/app/angular/array_join.ts
+++ b/public/app/angular/array_join.ts
@@ -1,5 +1,5 @@
 import { isArray } from 'lodash';
-import coreModule from '../core/core_module';
+import coreModule from './core_module';
 
 export function arrayJoin() {
   'use strict';
diff --git a/public/app/angular/autofill_event_fix.ts b/public/app/angular/autofill_event_fix.ts
index 922b0c2b497..d885a5c59e6 100644
--- a/public/app/angular/autofill_event_fix.ts
+++ b/public/app/angular/autofill_event_fix.ts
@@ -1,4 +1,4 @@
-import coreModule from '../core/core_module';
+import coreModule from './core_module';
 
 /** @ngInject */
 export function autofillEventFix($compile: any) {
diff --git a/public/app/angular/bridgeReactAngularRouting.ts b/public/app/angular/bridgeReactAngularRouting.ts
index d25aa7e92d7..d3afb95e212 100644
--- a/public/app/angular/bridgeReactAngularRouting.ts
+++ b/public/app/angular/bridgeReactAngularRouting.ts
@@ -1,4 +1,4 @@
-import { coreModule } from '../core/core_module';
+import { coreModule } from './core_module';
 import { RouteProvider } from '../core/navigation/patch/RouteProvider';
 import { RouteParamsProvider } from '../core/navigation/patch/RouteParamsProvider';
 import { ILocationService } from 'angular';
diff --git a/public/app/angular/components/code_editor/code_editor.ts b/public/app/angular/components/code_editor/code_editor.ts
index bd109ed7891..c6e144249d6 100644
--- a/public/app/angular/components/code_editor/code_editor.ts
+++ b/public/app/angular/components/code_editor/code_editor.ts
@@ -28,7 +28,7 @@
  * Ctrl-Enter (Command-Enter): run onChange() function
  */
 
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 import config from 'app/core/config';
 
 const DEFAULT_THEME_DARK = 'ace/theme/grafana-dark';
diff --git a/public/app/angular/components/form_dropdown/form_dropdown.ts b/public/app/angular/components/form_dropdown/form_dropdown.ts
index fbe0107a7b0..3fbec41def6 100644
--- a/public/app/angular/components/form_dropdown/form_dropdown.ts
+++ b/public/app/angular/components/form_dropdown/form_dropdown.ts
@@ -1,7 +1,7 @@
 import { debounce, find, indexOf, map, isObject, escape, unescape } from 'lodash';
-import coreModule from '../../../core/core_module';
+import coreModule from '../../core_module';
 import { ISCEService } from 'angular';
-import { promiseToDigest } from 'app/core/utils/promiseToDigest';
+import { promiseToDigest } from '../../promiseToDigest';
 
 function typeaheadMatcher(this: any, item: string) {
   let str = this.query;
diff --git a/public/app/angular/components/info_popover.ts b/public/app/angular/components/info_popover.ts
index 7e4d0e0524f..37fe61de5ba 100644
--- a/public/app/angular/components/info_popover.ts
+++ b/public/app/angular/components/info_popover.ts
@@ -1,5 +1,5 @@
 import { each } from 'lodash';
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 // @ts-ignore
 import Drop from 'tether-drop';
 
diff --git a/public/app/angular/components/jsontree.ts b/public/app/angular/components/jsontree.ts
index f88e317d07c..1628de803f0 100644
--- a/public/app/angular/components/jsontree.ts
+++ b/public/app/angular/components/jsontree.ts
@@ -1,4 +1,4 @@
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 import { JsonExplorer } from '@grafana/ui';
 
 coreModule.directive('jsonTree', [
diff --git a/public/app/angular/components/query_part_editor.ts b/public/app/angular/components/query_part_editor.ts
index 9f0c350e287..3f85e55498b 100644
--- a/public/app/angular/components/query_part_editor.ts
+++ b/public/app/angular/components/query_part_editor.ts
@@ -1,7 +1,7 @@
 import { debounce, each, map, partial, escape, unescape } from 'lodash';
 import $ from 'jquery';
-import coreModule from 'app/core/core_module';
-import { promiseToDigest } from '../../core/utils/promiseToDigest';
+import coreModule from 'app/angular/core_module';
+import { promiseToDigest } from '../promiseToDigest';
 
 const template = `
 <div class="dropdown cascade-open">
diff --git a/public/app/angular/components/scroll.ts b/public/app/angular/components/scroll.ts
index 40f0dd0641b..961241a1068 100644
--- a/public/app/angular/components/scroll.ts
+++ b/public/app/angular/components/scroll.ts
@@ -1,7 +1,7 @@
 import $ from 'jquery';
 // @ts-ignore
 import baron from 'baron';
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 
 const scrollBarHTML = `
 <div class="baron__track">
diff --git a/public/app/angular/components/spectrum_picker.ts b/public/app/angular/components/spectrum_picker.ts
index 560d50f15da..9cb84bcd9d9 100644
--- a/public/app/angular/components/spectrum_picker.ts
+++ b/public/app/angular/components/spectrum_picker.ts
@@ -3,7 +3,7 @@
  * Allows remaining <spectrum-picker> untouched in outdated plugins.
  * Technically, it's just a wrapper for react component with two-way data binding support.
  */
-import coreModule from '../../core/core_module';
+import coreModule from '../core_module';
 
 /** @ngInject */
 export function spectrumPicker() {
diff --git a/public/app/angular/components/sql_part/sql_part_editor.ts b/public/app/angular/components/sql_part/sql_part_editor.ts
index f944b2d48f1..29bf91e9ca5 100644
--- a/public/app/angular/components/sql_part/sql_part_editor.ts
+++ b/public/app/angular/components/sql_part/sql_part_editor.ts
@@ -1,6 +1,6 @@
 import { debounce, each, indexOf, map, partial, escape, unescape } from 'lodash';
 import $ from 'jquery';
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 
 const template = `
 <div class="dropdown cascade-open">
diff --git a/public/app/angular/components/switch.ts b/public/app/angular/components/switch.ts
index 3d213f6a6de..5e8f89e7188 100644
--- a/public/app/angular/components/switch.ts
+++ b/public/app/angular/components/switch.ts
@@ -1,4 +1,4 @@
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 
 const template = `
 <label for="check-{{ctrl.id}}" class="gf-form-switch-container">
diff --git a/public/app/core/core_module.ts b/public/app/angular/core_module.ts
similarity index 100%
rename from public/app/core/core_module.ts
rename to public/app/angular/core_module.ts
diff --git a/public/app/angular/diff-view.ts b/public/app/angular/diff-view.ts
index f364c2d9491..72ebed93fe6 100644
--- a/public/app/angular/diff-view.ts
+++ b/public/app/angular/diff-view.ts
@@ -1,5 +1,5 @@
 import angular from 'angular';
-import coreModule from '../core/core_module';
+import coreModule from './core_module';
 import { GrafanaRootScope } from 'app/routes/GrafanaCtrl';
 
 export class DeltaCtrl {
diff --git a/public/app/angular/dropdown_typeahead.ts b/public/app/angular/dropdown_typeahead.ts
index 87e3a67bea2..c824c1a4bf8 100644
--- a/public/app/angular/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/core_module';
+import coreModule from './core_module';
 
 /** @ngInject */
 export function dropdownTypeahead($compile: any) {
diff --git a/public/app/angular/filters/filters.ts b/public/app/angular/filters/filters.ts
index 64e467dbf99..c06d15547f2 100644
--- a/public/app/angular/filters/filters.ts
+++ b/public/app/angular/filters/filters.ts
@@ -1,6 +1,6 @@
 import { isArray, isNull, isObject, isUndefined } from 'lodash';
 import angular from 'angular';
-import coreModule from '../../core/core_module';
+import coreModule from '../core_module';
 import { getTemplateSrv, TemplateSrv } from 'app/features/templating/template_srv';
 import { dateTime } from '@grafana/data';
 
diff --git a/public/app/angular/give_focus.ts b/public/app/angular/give_focus.ts
index 63bcbbc79c8..9f9ca3d0c48 100644
--- a/public/app/angular/give_focus.ts
+++ b/public/app/angular/give_focus.ts
@@ -1,4 +1,4 @@
-import coreModule from '../core/core_module';
+import coreModule from './core_module';
 
 coreModule.directive('giveFocus', () => {
   return (scope: any, element: any, attrs: any) => {
diff --git a/public/app/angular/index.ts b/public/app/angular/index.ts
index 0ef85ca80a8..f8ea94d9b7d 100644
--- a/public/app/angular/index.ts
+++ b/public/app/angular/index.ts
@@ -7,6 +7,8 @@ import './services/ng_react';
 import './services/segment_srv';
 import './services/popover_srv';
 import './services/timer';
+import './services/AngularLoader';
+
 import './dropdown_typeahead';
 import './autofill_event_fix';
 import './metric_segment';
diff --git a/public/app/angular/metric_segment.ts b/public/app/angular/metric_segment.ts
index 075a4d25a6f..d9a31182e55 100644
--- a/public/app/angular/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/core_module';
+import coreModule from './core_module';
 import { TemplateSrv } from 'app/features/templating/template_srv';
 
 /** @ngInject */
diff --git a/public/app/angular/misc.ts b/public/app/angular/misc.ts
index 202f69a60df..dec5cd26ff0 100644
--- a/public/app/angular/misc.ts
+++ b/public/app/angular/misc.ts
@@ -1,6 +1,6 @@
 import angular from 'angular';
 import Clipboard from 'clipboard';
-import coreModule from '../core/core_module';
+import coreModule from './core_module';
 import { appEvents } from 'app/core/core';
 import { AppEvents } from '@grafana/data';
 
diff --git a/public/app/angular/ng_model_on_blur.ts b/public/app/angular/ng_model_on_blur.ts
index f1fec919341..d79c60a9f3a 100644
--- a/public/app/angular/ng_model_on_blur.ts
+++ b/public/app/angular/ng_model_on_blur.ts
@@ -1,4 +1,4 @@
-import coreModule from '../core/core_module';
+import coreModule from './core_module';
 import { rangeUtil } from '@grafana/data';
 
 function ngModelOnBlur() {
diff --git a/public/app/angular/panel/panel_directive.ts b/public/app/angular/panel/panel_directive.ts
index 90142b54c0e..81e18557961 100644
--- a/public/app/angular/panel/panel_directive.ts
+++ b/public/app/angular/panel/panel_directive.ts
@@ -5,7 +5,7 @@ import { PanelModel } from '../../features/dashboard/state';
 import { PanelCtrl } from './panel_ctrl';
 import { Subscription } from 'rxjs';
 import { PanelDirectiveReadyEvent, RenderEvent } from 'app/types/events';
-import { coreModule } from 'app/core/core_module';
+import { coreModule } from 'app/angular/core_module';
 import { RefreshEvent } from '@grafana/runtime';
 
 const panelTemplate = `
diff --git a/public/app/angular/panel/panellinks/link_srv.ts b/public/app/angular/panel/panellinks/link_srv.ts
index 81b83a48bf6..f353497e066 100644
--- a/public/app/angular/panel/panellinks/link_srv.ts
+++ b/public/app/angular/panel/panellinks/link_srv.ts
@@ -1,7 +1,7 @@
 import { chain } from 'lodash';
 import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { getTemplateSrv } from '@grafana/runtime';
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 import { getConfig } from 'app/core/config';
 import {
   DataFrame,
diff --git a/public/app/angular/panel/query_editor_row.ts b/public/app/angular/panel/query_editor_row.ts
index f7f0849da6d..7b226ac2163 100644
--- a/public/app/angular/panel/query_editor_row.ts
+++ b/public/app/angular/panel/query_editor_row.ts
@@ -1,4 +1,4 @@
-import { coreModule } from 'app/core/core_module';
+import { coreModule } from 'app/angular/core_module';
 
 export class QueryRowCtrl {
   target: any;
diff --git a/public/app/core/utils/promiseToDigest.test.ts b/public/app/angular/promiseToDigest.test.ts
similarity index 100%
rename from public/app/core/utils/promiseToDigest.test.ts
rename to public/app/angular/promiseToDigest.test.ts
diff --git a/public/app/core/utils/promiseToDigest.ts b/public/app/angular/promiseToDigest.ts
similarity index 100%
rename from public/app/core/utils/promiseToDigest.ts
rename to public/app/angular/promiseToDigest.ts
diff --git a/public/app/core/utils/react2angular.ts b/public/app/angular/react2angular.ts
similarity index 85%
rename from public/app/core/utils/react2angular.ts
rename to public/app/angular/react2angular.ts
index db0c2cb3f74..db10ac0bad4 100644
--- a/public/app/core/utils/react2angular.ts
+++ b/public/app/angular/react2angular.ts
@@ -1,4 +1,4 @@
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 import { provideTheme } from 'app/core/utils/ConfigProvider';
 
 export function react2AngularDirective(name: string, component: any, options: any) {
diff --git a/public/app/angular/rebuild_on_change.ts b/public/app/angular/rebuild_on_change.ts
index 91cb45d9c4e..243aacfe0b6 100644
--- a/public/app/angular/rebuild_on_change.ts
+++ b/public/app/angular/rebuild_on_change.ts
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import coreModule from '../core/core_module';
+import coreModule from './core_module';
 
 function getBlockNodes(nodes: any[]) {
   let node = nodes[0];
diff --git a/public/app/angular/registerComponents.ts b/public/app/angular/registerComponents.ts
new file mode 100644
index 00000000000..c9b73f28af2
--- /dev/null
+++ b/public/app/angular/registerComponents.ts
@@ -0,0 +1,8 @@
+import { getBackendSrv } from '@grafana/runtime';
+import { contextSrv } from 'app/core/core';
+import coreModule from './core_module';
+
+export function registerComponents() {
+  coreModule.factory('backendSrv', () => getBackendSrv());
+  coreModule.factory('contextSrv', () => contextSrv);
+}
diff --git a/public/app/core/services/AngularLoader.ts b/public/app/angular/services/AngularLoader.ts
similarity index 75%
rename from public/app/core/services/AngularLoader.ts
rename to public/app/angular/services/AngularLoader.ts
index e7f18addf93..eb2cec7a9f3 100644
--- a/public/app/core/services/AngularLoader.ts
+++ b/public/app/angular/services/AngularLoader.ts
@@ -1,12 +1,8 @@
 import angular from 'angular';
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 import { assign } from 'lodash';
 
-import {
-  AngularComponent,
-  AngularLoader as AngularLoaderInterface,
-  setAngularLoader as setAngularLoaderInterface,
-} from '@grafana/runtime';
+import { AngularComponent, AngularLoader as AngularLoaderInterface } from '@grafana/runtime';
 import { GrafanaRootScope } from 'app/routes/GrafanaCtrl';
 
 export class AngularLoader implements AngularLoaderInterface {
@@ -39,8 +35,4 @@ export class AngularLoader implements AngularLoaderInterface {
   }
 }
 
-export function setAngularLoader(v: AngularLoader) {
-  setAngularLoaderInterface(v);
-}
-
 coreModule.service('angularLoader', AngularLoader);
diff --git a/public/app/angular/services/alert_srv.ts b/public/app/angular/services/alert_srv.ts
index ce91fc45150..ce4d22254c4 100644
--- a/public/app/angular/services/alert_srv.ts
+++ b/public/app/angular/services/alert_srv.ts
@@ -1,4 +1,4 @@
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 
 export class AlertSrv {
   constructor() {}
diff --git a/public/app/angular/services/dynamic_directive_srv.ts b/public/app/angular/services/dynamic_directive_srv.ts
index 8a63bafbac9..30c4c860240 100644
--- a/public/app/angular/services/dynamic_directive_srv.ts
+++ b/public/app/angular/services/dynamic_directive_srv.ts
@@ -1,5 +1,5 @@
 import angular from 'angular';
-import coreModule from '../../core/core_module';
+import coreModule from '../core_module';
 
 class DynamicDirectiveSrv {
   /** @ngInject */
diff --git a/public/app/angular/services/nav_model_srv.ts b/public/app/angular/services/nav_model_srv.ts
index 6947b4d7ab0..57341325e5d 100644
--- a/public/app/angular/services/nav_model_srv.ts
+++ b/public/app/angular/services/nav_model_srv.ts
@@ -1,4 +1,4 @@
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 import config from 'app/core/config';
 import { find, isNumber } from 'lodash';
 import { NavModel } from '@grafana/data';
diff --git a/public/app/angular/services/popover_srv.ts b/public/app/angular/services/popover_srv.ts
index 14e17b04a65..57c70a1afe8 100644
--- a/public/app/angular/services/popover_srv.ts
+++ b/public/app/angular/services/popover_srv.ts
@@ -1,5 +1,5 @@
 import { extend } from 'lodash';
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 // @ts-ignore
 import Drop from 'tether-drop';
 import { GrafanaRootScope } from 'app/routes/GrafanaCtrl';
diff --git a/public/app/angular/services/segment_srv.ts b/public/app/angular/services/segment_srv.ts
index 2b0fbdaea70..b0c37eee45c 100644
--- a/public/app/angular/services/segment_srv.ts
+++ b/public/app/angular/services/segment_srv.ts
@@ -1,5 +1,5 @@
 import { each, isString, map } from 'lodash';
-import coreModule from '../../core/core_module';
+import coreModule from '../core_module';
 
 /** @ngInject */
 export function uiSegmentSrv(this: any, $sce: any, templateSrv: any) {
diff --git a/public/app/angular/services/timer.ts b/public/app/angular/services/timer.ts
index 1e82927282f..177b3fc156c 100644
--- a/public/app/angular/services/timer.ts
+++ b/public/app/angular/services/timer.ts
@@ -1,5 +1,5 @@
 import { without, each } from 'lodash';
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 import { ITimeoutService } from 'angular';
 
 // This service really just tracks a list of $timeout promises to give us a
diff --git a/public/app/angular/tags.ts b/public/app/angular/tags.ts
index a2959af8798..aad0db6e6e2 100644
--- a/public/app/angular/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/core_module';
+import coreModule from './core_module';
 import 'vendor/tagsinput/bootstrap-tagsinput.js';
 
 function setColor(name: string, element: JQuery) {
diff --git a/public/app/app.ts b/public/app/app.ts
index 98be6741bd4..e4967cc84d9 100644
--- a/public/app/app.ts
+++ b/public/app/app.ts
@@ -26,7 +26,13 @@ import {
 } from '@grafana/data';
 import { arrayMove } from 'app/core/utils/arrayMove';
 import { importPluginModule } from 'app/features/plugins/plugin_loader';
-import { registerEchoBackend, setEchoSrv, setPanelRenderer, setQueryRunnerFactory } from '@grafana/runtime';
+import {
+  registerEchoBackend,
+  setBackendSrv,
+  setEchoSrv,
+  setPanelRenderer,
+  setQueryRunnerFactory,
+} from '@grafana/runtime';
 import { Echo } from './core/services/echo/Echo';
 import { reportPerformance } from './core/services/echo/EchoSrv';
 import { PerformanceBackend } from './core/services/echo/backends/PerformanceBackend';
@@ -52,6 +58,7 @@ import { GAEchoBackend } from './core/services/echo/backends/analytics/GABackend
 import { ApplicationInsightsBackend } from './core/services/echo/backends/analytics/ApplicationInsightsBackend';
 import { RudderstackBackend } from './core/services/echo/backends/analytics/RudderstackBackend';
 import { getAllOptionEditors } from './core/components/editors/registry';
+import { backendSrv } from './core/services/backend_srv';
 
 // add move to lodash for backward compatabilty with plugins
 // @ts-ignore
@@ -76,6 +83,7 @@ export class GrafanaApp {
 
   async init() {
     try {
+      setBackendSrv(backendSrv);
       initEchoSrv();
       addClassIfNoOverlayScrollbar();
       setLocale(config.bootData.user.locale);
diff --git a/public/app/core/core.ts b/public/app/core/core.ts
index 7e2327e315f..911578774e3 100644
--- a/public/app/core/core.ts
+++ b/public/app/core/core.ts
@@ -2,7 +2,6 @@ import './jquery_extended';
 import './services/search_srv';
 import { colors, JsonExplorer } from '@grafana/ui/';
 import 'app/core/services/all';
-import coreModule from './core_module';
 import appEvents from './app_events';
 import { assignModelProperties } from './utils/model_utils';
 import { contextSrv } from './services/context_srv';
@@ -12,7 +11,6 @@ import TimeSeries, { updateLegendValues } from './time_series2';
 
 export {
   profiler,
-  coreModule,
   appEvents,
   colors,
   assignModelProperties,
diff --git a/public/app/core/services/backend_srv.ts b/public/app/core/services/backend_srv.ts
index 260020ff640..f523fb19314 100644
--- a/public/app/core/services/backend_srv.ts
+++ b/public/app/core/services/backend_srv.ts
@@ -19,7 +19,6 @@ import appEvents from 'app/core/app_events';
 import { getConfig } from 'app/core/config';
 import { DashboardSearchHit } from 'app/features/search/types';
 import { FolderDTO } from 'app/types';
-import { coreModule } from 'app/core/core_module';
 import { ContextSrv, contextSrv } from './context_srv';
 import { parseInitFromOptions, parseResponseBody, parseUrlFromOptions } from '../utils/fetch';
 import { isDataQuery, isLocalUrl } from '../utils/query';
@@ -425,7 +424,6 @@ export class BackendSrv implements BackendService {
   }
 }
 
-coreModule.factory('backendSrv', () => backendSrv);
 // Used for testing and things that really need BackendSrv
 export const backendSrv = new BackendSrv();
 export const getBackendSrv = (): BackendSrv => backendSrv;
diff --git a/public/app/core/services/context_srv.ts b/public/app/core/services/context_srv.ts
index 90a8e811f18..bdc9d10f6df 100644
--- a/public/app/core/services/context_srv.ts
+++ b/public/app/core/services/context_srv.ts
@@ -1,6 +1,5 @@
 import config from '../../core/config';
 import { extend } from 'lodash';
-import coreModule from 'app/core/core_module';
 import { rangeUtil } from '@grafana/data';
 import { AccessControlAction, UserPermission } from 'app/types';
 
@@ -143,7 +142,3 @@ export const setContextSrv = (override: ContextSrv) => {
   }
   contextSrv = override;
 };
-
-coreModule.factory('contextSrv', () => {
-  return contextSrv;
-});
diff --git a/public/app/core/services/util_srv.ts b/public/app/core/services/util_srv.ts
index 4ad5e32ca82..74b3676b642 100644
--- a/public/app/core/services/util_srv.ts
+++ b/public/app/core/services/util_srv.ts
@@ -1,7 +1,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 import appEvents from 'app/core/app_events';
 
 import { GrafanaRootScope } from 'app/routes/GrafanaCtrl';
diff --git a/public/app/features/alerting/AlertTabCtrl.ts b/public/app/features/alerting/AlertTabCtrl.ts
index 8b291447664..e883925b740 100644
--- a/public/app/features/alerting/AlertTabCtrl.ts
+++ b/public/app/features/alerting/AlertTabCtrl.ts
@@ -1,5 +1,5 @@
 import { find, map, reduce, remove } from 'lodash';
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 import { ThresholdMapper } from './state/ThresholdMapper';
 import { QueryPart } from 'app/angular/components/query_part';
 import alertDef from './state/alertDef';
@@ -12,7 +12,7 @@ import { DataQuery, DataSourceApi, rangeUtil } from '@grafana/data';
 import { PanelModel } from 'app/features/dashboard/state';
 import { getDefaultCondition } from './getAlertingValidationMessage';
 import { CoreEvents } from 'app/types';
-import { promiseToDigest } from 'app/core/utils/promiseToDigest';
+import { promiseToDigest } from 'app/angular/promiseToDigest';
 import { ShowConfirmModalEvent } from '../../types/events';
 
 export class AlertTabCtrl {
diff --git a/public/app/features/annotations/annotation_tooltip.ts b/public/app/features/annotations/annotation_tooltip.ts
index 0d734a34a40..cef5ff43aa6 100644
--- a/public/app/features/annotations/annotation_tooltip.ts
+++ b/public/app/features/annotations/annotation_tooltip.ts
@@ -1,6 +1,6 @@
 import { isString, escape } from 'lodash';
 import $ from 'jquery';
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 import alertDef from '../alerting/state/alertDef';
 import { DashboardSrv } from '../dashboard/services/DashboardSrv';
 import { ContextSrv } from 'app/core/services/context_srv';
diff --git a/public/app/features/annotations/annotations_srv.ts b/public/app/features/annotations/annotations_srv.ts
index ef98fc3620c..dc4f2dd40b8 100644
--- a/public/app/features/annotations/annotations_srv.ts
+++ b/public/app/features/annotations/annotations_srv.ts
@@ -11,8 +11,7 @@ import {
   ScopedVars,
 } from '@grafana/data';
 
-import coreModule from 'app/core/core_module';
-import { DashboardModel } from '../dashboard/state';
+import coreModule from 'app/angular/core_module';
 import { AnnotationQueryOptions, AnnotationQueryResponse } from './types';
 import { standardAnnotationSupport } from './standardAnnotationSupport';
 import { runRequest } from '../query/state/runRequest';
@@ -26,13 +25,6 @@ function getNextRequestId() {
  * @deprecated AnnotationsSrv is deprecated in favor of DashboardQueryRunner
  */
 export class AnnotationsSrv {
-  /**
-   * @deprecated init is deprecated in favor of DashboardQueryRunner.run
-   */
-  init(dashboard: DashboardModel) {
-    deprecationWarning('annotations_srv.ts', 'init', 'DashboardQueryRunner.run');
-  }
-
   /**
    * @deprecated clearPromiseCaches is deprecated
    */
diff --git a/public/app/features/annotations/components/StandardAnnotationQueryEditor.tsx b/public/app/features/annotations/components/StandardAnnotationQueryEditor.tsx
index d69d3ba056f..9b85dd779a6 100644
--- a/public/app/features/annotations/components/StandardAnnotationQueryEditor.tsx
+++ b/public/app/features/annotations/components/StandardAnnotationQueryEditor.tsx
@@ -11,7 +11,6 @@ import { executeAnnotationQuery } from '../annotations_srv';
 import { PanelModel } from 'app/features/dashboard/state';
 import { AnnotationQueryResponse } from '../types';
 import { AnnotationFieldMapper } from './AnnotationResultMapper';
-import coreModule from 'app/core/core_module';
 
 interface Props {
   datasource: DataSourceApi;
@@ -187,11 +186,3 @@ export default class StandardAnnotationQueryEditor extends PureComponent<Props,
     );
   }
 }
-
-// Careful to use a unique directive name!  many plugins already use "annotationEditor" and have conflicts
-coreModule.directive('standardAnnotationEditor', [
-  'reactDirective',
-  (reactDirective: any) => {
-    return reactDirective(StandardAnnotationQueryEditor, ['annotation', 'datasource', 'change']);
-  },
-]);
diff --git a/public/app/features/annotations/event_editor.ts b/public/app/features/annotations/event_editor.ts
index 1839c01a6a2..580b48488cf 100644
--- a/public/app/features/annotations/event_editor.ts
+++ b/public/app/features/annotations/event_editor.ts
@@ -1,5 +1,5 @@
 import { cloneDeep, isNumber } from 'lodash';
-import { coreModule } from 'app/core/core';
+import { coreModule } from 'app/angular/core_module';
 import { AnnotationEvent, dateTime } from '@grafana/data';
 import { MetricsPanelCtrl } from 'app/angular/panel/metrics_panel_ctrl';
 import { deleteAnnotation, saveAnnotation, updateAnnotation } from './api';
diff --git a/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.test.tsx b/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.test.tsx
index f81055f8189..ee33e4cad33 100644
--- a/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.test.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/AnnotationsSettings.test.tsx
@@ -4,8 +4,7 @@ import { render, screen } from '@testing-library/react';
 import { within } from '@testing-library/dom';
 import userEvent from '@testing-library/user-event';
 import { selectors } from '@grafana/e2e-selectors';
-import { setDataSourceSrv } from '@grafana/runtime';
-import { setAngularLoader } from 'app/core/services/AngularLoader';
+import { setAngularLoader, setDataSourceSrv } from '@grafana/runtime';
 import { AnnotationsSettings } from './AnnotationsSettings';
 
 describe('AnnotationsSettings', () => {
@@ -80,7 +79,6 @@ describe('AnnotationsSettings', () => {
       },
     } as any);
 
-    // @ts-ignore
     setAngularLoader({
       load: () => ({
         destroy: jest.fn(),
diff --git a/public/app/features/dashboard/components/FolderPicker/FolderPickerCtrl.ts b/public/app/features/dashboard/components/FolderPicker/FolderPickerCtrl.ts
index 7ebf8343383..2604b54f4ec 100644
--- a/public/app/features/dashboard/components/FolderPicker/FolderPickerCtrl.ts
+++ b/public/app/features/dashboard/components/FolderPicker/FolderPickerCtrl.ts
@@ -2,12 +2,12 @@ import { map, find } from 'lodash';
 import { IScope } from 'angular';
 import { AppEvents } from '@grafana/data';
 
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 import appEvents from 'app/core/app_events';
 import { backendSrv } from 'app/core/services/backend_srv';
 import { ValidationSrv } from 'app/features/manage-dashboards';
 import { ContextSrv } from 'app/core/services/context_srv';
-import { promiseToDigest } from '../../../../core/utils/promiseToDigest';
+import { promiseToDigest } from '../../../../angular/promiseToDigest';
 import { createFolder } from 'app/features/manage-dashboards/state/actions';
 
 export class FolderPickerCtrl {
diff --git a/public/app/features/dashboard/components/VersionHistory/HistorySrv.ts b/public/app/features/dashboard/components/VersionHistory/HistorySrv.ts
index 1982f07fb49..041df2fb9f2 100644
--- a/public/app/features/dashboard/components/VersionHistory/HistorySrv.ts
+++ b/public/app/features/dashboard/components/VersionHistory/HistorySrv.ts
@@ -1,5 +1,5 @@
 import { isNumber } from 'lodash';
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 import { DashboardModel } from '../../state/DashboardModel';
 import { getBackendSrv } from '@grafana/runtime';
 
diff --git a/public/app/features/dashboard/services/DashboardSrv.ts b/public/app/features/dashboard/services/DashboardSrv.ts
index 3bc1b41b462..7d07ce0d9ea 100644
--- a/public/app/features/dashboard/services/DashboardSrv.ts
+++ b/public/app/features/dashboard/services/DashboardSrv.ts
@@ -1,4 +1,4 @@
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 import { appEvents } from 'app/core/app_events';
 import { DashboardModel } from '../state/DashboardModel';
 import { removePanel } from '../utils/panel';
diff --git a/public/app/features/datasources/settings/HttpSettingsCtrl.ts b/public/app/features/datasources/settings/HttpSettingsCtrl.ts
index 4b01d2b3b36..190fe246f62 100644
--- a/public/app/features/datasources/settings/HttpSettingsCtrl.ts
+++ b/public/app/features/datasources/settings/HttpSettingsCtrl.ts
@@ -1,4 +1,4 @@
-import { coreModule } from 'app/core/core';
+import { coreModule } from 'app/angular/core_module';
 
 coreModule.directive('datasourceHttpSettings', () => {
   return {
diff --git a/public/app/features/datasources/settings/TlsAuthSettingsCtrl.ts b/public/app/features/datasources/settings/TlsAuthSettingsCtrl.ts
index 7c21fab404c..3cf49145496 100644
--- a/public/app/features/datasources/settings/TlsAuthSettingsCtrl.ts
+++ b/public/app/features/datasources/settings/TlsAuthSettingsCtrl.ts
@@ -1,4 +1,4 @@
-import { coreModule } from 'app/core/core';
+import { coreModule } from 'app/angular/core_module';
 
 coreModule.directive('datasourceTlsAuthSettings', () => {
   return {
diff --git a/public/app/features/manage-dashboards/components/UploadDashboard/uploadDashboardDirective.ts b/public/app/features/manage-dashboards/components/UploadDashboard/uploadDashboardDirective.ts
index 5f2a226bf27..5cf013fb472 100644
--- a/public/app/features/manage-dashboards/components/UploadDashboard/uploadDashboardDirective.ts
+++ b/public/app/features/manage-dashboards/components/UploadDashboard/uploadDashboardDirective.ts
@@ -1,4 +1,4 @@
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 import appEvents from 'app/core/app_events';
 import angular from 'angular';
 import { AppEvents } from '@grafana/data';
diff --git a/public/app/features/manage-dashboards/services/ValidationSrv.ts b/public/app/features/manage-dashboards/services/ValidationSrv.ts
index ea0c572f0a6..f0d4cbb50f1 100644
--- a/public/app/features/manage-dashboards/services/ValidationSrv.ts
+++ b/public/app/features/manage-dashboards/services/ValidationSrv.ts
@@ -1,4 +1,4 @@
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 import { backendSrv } from 'app/core/services/backend_srv';
 
 const hitTypes = {
diff --git a/public/app/features/plugins/datasource_srv.ts b/public/app/features/plugins/datasource_srv.ts
index daa6d897447..d027a554558 100644
--- a/public/app/features/plugins/datasource_srv.ts
+++ b/public/app/features/plugins/datasource_srv.ts
@@ -1,5 +1,5 @@
 // Libraries
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 // Services & Utils
 import { importDataSourcePlugin } from './plugin_loader';
 import {
diff --git a/public/app/features/plugins/plugin_component.ts b/public/app/features/plugins/plugin_component.ts
index dcbb39d7967..b66ec7c1c4a 100644
--- a/public/app/features/plugins/plugin_component.ts
+++ b/public/app/features/plugins/plugin_component.ts
@@ -2,7 +2,7 @@ import angular, { ILocationService } from 'angular';
 import { each } from 'lodash';
 
 import config from 'app/core/config';
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 
 import { DataSourceApi, PanelEvents } from '@grafana/data';
 import { importDataSourcePlugin, importAppPlugin } from './plugin_loader';
diff --git a/public/app/features/plugins/plugin_loader.ts b/public/app/features/plugins/plugin_loader.ts
index 5130dd61cee..be0dea0d95e 100644
--- a/public/app/features/plugins/plugin_loader.ts
+++ b/public/app/features/plugins/plugin_loader.ts
@@ -22,11 +22,12 @@ import * as redux from 'redux';
 import config from 'app/core/config';
 import TimeSeries from 'app/core/time_series2';
 import TableModel from 'app/core/table_model';
-import { coreModule, appEvents, contextSrv } from 'app/core/core';
+import { coreModule } from 'app/angular/core_module';
+import { appEvents, contextSrv } from 'app/core/core';
 import * as flatten from 'app/core/utils/flatten';
 import * as ticks from 'app/core/utils/ticks';
 import { BackendSrv, getBackendSrv } from 'app/core/services/backend_srv';
-import { promiseToDigest } from 'app/core/utils/promiseToDigest';
+import { promiseToDigest } from 'app/angular/promiseToDigest';
 import impressionSrv from 'app/core/services/impression_srv';
 import builtInPlugins from './built_in_plugins';
 import * as d3 from 'd3';
@@ -82,6 +83,7 @@ grafanaRuntime.SystemJS.config({
 
 function exposeToPlugin(name: string, component: any) {
   grafanaRuntime.SystemJS.registerDynamic(name, [], true, (require: any, exports: any, module: { exports: any }) => {
+    console.log('registerDynamic callback', name);
     module.exports = component;
   });
 }
diff --git a/public/app/features/plugins/plugin_page_ctrl.ts b/public/app/features/plugins/plugin_page_ctrl.ts
index 1ed7a9cceec..2d68f3b4d9e 100644
--- a/public/app/features/plugins/plugin_page_ctrl.ts
+++ b/public/app/features/plugins/plugin_page_ctrl.ts
@@ -4,7 +4,7 @@ import { find } from 'lodash';
 import { getPluginSettings } from './PluginSettingsCache';
 import { PluginMeta, AppEvents } from '@grafana/data';
 import { GrafanaRootScope } from 'app/routes/GrafanaCtrl';
-import { promiseToDigest } from '../../core/utils/promiseToDigest';
+import { promiseToDigest } from '../../angular/promiseToDigest';
 import { NavModelSrv } from 'app/angular/services/nav_model_srv';
 
 export class AppPageCtrl {
diff --git a/public/app/features/plugins/variableQueryEditorLoader.tsx b/public/app/features/plugins/variableQueryEditorLoader.tsx
index 2c2b6e14790..98e187281d1 100644
--- a/public/app/features/plugins/variableQueryEditorLoader.tsx
+++ b/public/app/features/plugins/variableQueryEditorLoader.tsx
@@ -1,4 +1,4 @@
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 import { importDataSourcePlugin } from './plugin_loader';
 import React from 'react';
 import ReactDOM from 'react-dom';
diff --git a/public/app/plugins/datasource/graphite/specs/store.test.ts b/public/app/plugins/datasource/graphite/specs/store.test.ts
index 059a83956ef..c073a439f12 100644
--- a/public/app/plugins/datasource/graphite/specs/store.test.ts
+++ b/public/app/plugins/datasource/graphite/specs/store.test.ts
@@ -7,7 +7,7 @@ import { getAltSegmentsSelectables, getTagsSelectables, getTagsAsSegmentsSelecta
 import { GraphiteSegment } from '../types';
 import { createStore } from '../state/store';
 
-jest.mock('app/core/utils/promiseToDigest', () => ({
+jest.mock('app/angular/promiseToDigest', () => ({
   promiseToDigest: (scope: any) => {
     return (p: Promise<any>) => p;
   },
diff --git a/public/app/plugins/panel/graph/graph.ts b/public/app/plugins/panel/graph/graph.ts
index 7c6cd2e76d0..2f445549f39 100644
--- a/public/app/plugins/panel/graph/graph.ts
+++ b/public/app/plugins/panel/graph/graph.ts
@@ -11,7 +11,8 @@ import './jquery.flot.events';
 import $ from 'jquery';
 import { clone, find, flatten, isUndefined, map, max as _max, min as _min, sortBy as _sortBy, toNumber } from 'lodash';
 import { tickStep } from 'app/core/utils/ticks';
-import { coreModule, updateLegendValues } from 'app/core/core';
+import { updateLegendValues } from 'app/core/core';
+import { coreModule } from 'app/angular/core_module';
 import GraphTooltip from './graph_tooltip';
 import { ThresholdManager } from './threshold_manager';
 import { TimeRegionManager } from './time_region_manager';
diff --git a/public/app/plugins/panel/graph/series_overrides_ctrl.ts b/public/app/plugins/panel/graph/series_overrides_ctrl.ts
index ab8313e9724..21f9e4cde90 100644
--- a/public/app/plugins/panel/graph/series_overrides_ctrl.ts
+++ b/public/app/plugins/panel/graph/series_overrides_ctrl.ts
@@ -1,5 +1,5 @@
 import { map, each, isUndefined } from 'lodash';
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 import { textUtil } from '@grafana/data';
 
 /** @ngInject */
diff --git a/public/app/plugins/panel/graph/thresholds_form.ts b/public/app/plugins/panel/graph/thresholds_form.ts
index 7afb615eb17..5609a66b54a 100644
--- a/public/app/plugins/panel/graph/thresholds_form.ts
+++ b/public/app/plugins/panel/graph/thresholds_form.ts
@@ -1,4 +1,4 @@
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 import config from 'app/core/config';
 import tinycolor from 'tinycolor2';
 export class ThresholdFormCtrl {
diff --git a/public/app/plugins/panel/graph/time_regions_form.ts b/public/app/plugins/panel/graph/time_regions_form.ts
index d0fb9111a92..3c911c59a8e 100644
--- a/public/app/plugins/panel/graph/time_regions_form.ts
+++ b/public/app/plugins/panel/graph/time_regions_form.ts
@@ -1,4 +1,4 @@
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 import { getColorModes } from './time_region_manager';
 
 export class TimeRegionFormCtrl {
diff --git a/public/app/plugins/panel/heatmap/color_legend.ts b/public/app/plugins/panel/heatmap/color_legend.ts
index 4378710809a..e331a742a0f 100644
--- a/public/app/plugins/panel/heatmap/color_legend.ts
+++ b/public/app/plugins/panel/heatmap/color_legend.ts
@@ -4,7 +4,7 @@ import * as d3 from 'd3';
 import { contextSrv } from 'app/core/core';
 import { tickStep } from 'app/core/utils/ticks';
 import { getColorScale, getOpacityScale } from './color_scale';
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 import { PanelEvents, getColorForTheme } from '@grafana/data';
 import { config } from 'app/core/config';
 
diff --git a/public/app/routes/GrafanaCtrl.ts b/public/app/routes/GrafanaCtrl.ts
index 88b52b8e5b0..1d8effddf7c 100644
--- a/public/app/routes/GrafanaCtrl.ts
+++ b/public/app/routes/GrafanaCtrl.ts
@@ -6,19 +6,19 @@ import $ from 'jquery';
 // Utils and servies
 import { colors } from '@grafana/ui';
 import {
-  setBackendSrv,
   setDataSourceSrv,
   setLegacyAngularInjector,
   setLocationSrv,
   locationService,
   setAppEvents,
+  setAngularLoader,
 } from '@grafana/runtime';
 import config from 'app/core/config';
-import coreModule from 'app/core/core_module';
+import coreModule from 'app/angular/core_module';
 import { profiler } from 'app/core/profiler';
 import appEvents from 'app/core/app_events';
 import { DatasourceSrv } from 'app/features/plugins/datasource_srv';
-import { AngularLoader, setAngularLoader } from 'app/core/services/AngularLoader';
+import { AngularLoader } from 'app/angular/services/AngularLoader';
 
 // Types
 import { CoreEvents, AppEventEmitter, AppEventConsumer } from 'app/types';
@@ -28,7 +28,6 @@ import { ContextSrv } from 'app/core/services/context_srv';
 import { DashboardSrv, setDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
 import { IRootScopeService, IAngularEvent, auto } from 'angular';
 import { AppEvent } from '@grafana/data';
-import { backendSrv } from 'app/core/services/backend_srv';
 import { initGrafanaLive } from 'app/features/live';
 
 export type GrafanaRootScope = IRootScopeService & AppEventEmitter & AppEventConsumer & { colors: string[] };
@@ -48,7 +47,6 @@ export class GrafanaCtrl {
   ) {
     // make angular loader service available to react components
     setAngularLoader(angularLoader);
-    setBackendSrv(backendSrv);
     setDataSourceSrv(datasourceSrv);
     setLinkSrv(linkSrv);
     setDashboardSrv(dashboardSrv);