diff --git a/public/app/features/all.ts b/public/app/features/all.ts
index 0285e9c352a..2d1e6d2cf9f 100644
--- a/public/app/features/all.ts
+++ b/public/app/features/all.ts
@@ -1,5 +1,3 @@
-import './panellinks/module';
-import './dashlinks/module';
import './annotations/all';
import './templating/all';
import './plugins/all';
diff --git a/public/app/features/dashboard/all.ts b/public/app/features/dashboard/all.ts
index a8f491f3ddd..794d4f18041 100644
--- a/public/app/features/dashboard/all.ts
+++ b/public/app/features/dashboard/all.ts
@@ -27,6 +27,8 @@ import './dashgrid/RowOptions';
import './folder_picker/folder_picker';
import './move_to_folder_modal/move_to_folder';
import './settings/settings';
+import './panellinks/module';
+import './dashlinks/module';
import coreModule from 'app/core/core_module';
import { DashboardListCtrl } from './dashboard_list_ctrl';
diff --git a/public/app/features/dashlinks/editor.html b/public/app/features/dashboard/dashlinks/editor.html
similarity index 100%
rename from public/app/features/dashlinks/editor.html
rename to public/app/features/dashboard/dashlinks/editor.html
diff --git a/public/app/features/dashlinks/editor.ts b/public/app/features/dashboard/dashlinks/editor.ts
similarity index 95%
rename from public/app/features/dashlinks/editor.ts
rename to public/app/features/dashboard/dashlinks/editor.ts
index a4ba9ea209a..482052469db 100644
--- a/public/app/features/dashlinks/editor.ts
+++ b/public/app/features/dashboard/dashlinks/editor.ts
@@ -66,7 +66,7 @@ function dashLinksEditor() {
return {
restrict: 'E',
controller: DashLinkEditorCtrl,
- templateUrl: 'public/app/features/dashlinks/editor.html',
+ templateUrl: 'public/app/features/dashboard/dashlinks/editor.html',
bindToController: true,
controllerAs: 'ctrl',
scope: {
diff --git a/public/app/features/dashlinks/module.ts b/public/app/features/dashboard/dashlinks/module.ts
similarity index 100%
rename from public/app/features/dashlinks/module.ts
rename to public/app/features/dashboard/dashlinks/module.ts
diff --git a/public/app/features/panellinks/link_srv.ts b/public/app/features/dashboard/panellinks/link_srv.ts
similarity index 100%
rename from public/app/features/panellinks/link_srv.ts
rename to public/app/features/dashboard/panellinks/link_srv.ts
diff --git a/public/app/features/panellinks/module.html b/public/app/features/dashboard/panellinks/module.html
similarity index 100%
rename from public/app/features/panellinks/module.html
rename to public/app/features/dashboard/panellinks/module.html
diff --git a/public/app/features/panellinks/module.ts b/public/app/features/dashboard/panellinks/module.ts
similarity index 95%
rename from public/app/features/panellinks/module.ts
rename to public/app/features/dashboard/panellinks/module.ts
index a5605c1d641..c10e4ab224e 100644
--- a/public/app/features/panellinks/module.ts
+++ b/public/app/features/dashboard/panellinks/module.ts
@@ -9,7 +9,7 @@ function panelLinksEditor() {
},
restrict: 'E',
controller: 'PanelLinksEditorCtrl',
- templateUrl: 'public/app/features/panellinks/module.html',
+ templateUrl: 'public/app/features/dashboard/panellinks/module.html',
link: () => {},
};
}
diff --git a/public/app/features/panellinks/specs/link_srv.test.ts b/public/app/features/dashboard/panellinks/specs/link_srv.test.ts
similarity index 100%
rename from public/app/features/panellinks/specs/link_srv.test.ts
rename to public/app/features/dashboard/panellinks/specs/link_srv.test.ts
diff --git a/public/app/features/dashboard/specs/share_modal_ctrl.test.ts b/public/app/features/dashboard/specs/share_modal_ctrl.test.ts
index 8a8d94fdddb..70d301ed5ff 100644
--- a/public/app/features/dashboard/specs/share_modal_ctrl.test.ts
+++ b/public/app/features/dashboard/specs/share_modal_ctrl.test.ts
@@ -1,7 +1,7 @@
import '../shareModalCtrl';
import { ShareModalCtrl } from '../shareModalCtrl';
import config from 'app/core/config';
-import { LinkSrv } from 'app/features/panellinks/link_srv';
+import { LinkSrv } from 'app/features/dashboard/panellinks/link_srv';
describe('ShareModalCtrl', () => {
const ctx = {
diff --git a/public/views/index.template.html b/public/views/index.template.html
index 0a6af599280..ad55f810d0e 100644
--- a/public/views/index.template.html
+++ b/public/views/index.template.html
@@ -236,26 +236,28 @@
// insert it at the end of the head in a legacy-friendly manner
document.head.insertBefore(myCSS, document.head.childNodes[document.head.childNodes.length - 1].nextSibling);
- [[if .GoogleTagManagerId]]
-
-
-
-
-
+
+ [[if .GoogleTagManagerId]]
+
+
+
+
+
[[end]]