diff --git a/public/app/features/dashboard/share_snapshot_ctrl.ts b/public/app/features/dashboard/components/ShareModal/ShareSnapshotCtrl.ts
similarity index 100%
rename from public/app/features/dashboard/share_snapshot_ctrl.ts
rename to public/app/features/dashboard/components/ShareModal/ShareSnapshotCtrl.ts
diff --git a/public/app/features/dashboard/components/ShareModal/index.ts b/public/app/features/dashboard/components/ShareModal/index.ts
index 053f40c8278..3f27d5a1ba3 100644
--- a/public/app/features/dashboard/components/ShareModal/index.ts
+++ b/public/app/features/dashboard/components/ShareModal/index.ts
@@ -1 +1,2 @@
 export { ShareModalCtrl } from './ShareModalCtrl';
+export { ShareSnapshotCtrl } from './ShareSnapshotCtrl';
diff --git a/public/app/features/dashboard/index.ts b/public/app/features/dashboard/index.ts
index 3887e10629e..fab23d4641f 100644
--- a/public/app/features/dashboard/index.ts
+++ b/public/app/features/dashboard/index.ts
@@ -1,6 +1,4 @@
 import './dashboard_ctrl';
-import './share_snapshot_ctrl';
-import './dashboard_srv';
 import './validation_srv';
 import './time_srv';
 import './ad_hoc_filters';
@@ -14,6 +12,7 @@ import './panellinks/module';
 import './services/DashboardViewStateSrv';
 import './services/UnsavedChangesSrv';
 import './services/DashboardLoaderSrv';
+import './services/DashboardSrv';
 
 // Components
 import './components/DashLinks';
diff --git a/public/app/features/dashboard/dashboard_srv.ts b/public/app/features/dashboard/services/DashboardSrv.ts
similarity index 98%
rename from public/app/features/dashboard/dashboard_srv.ts
rename to public/app/features/dashboard/services/DashboardSrv.ts
index d5695a577c5..67a4938c6aa 100644
--- a/public/app/features/dashboard/dashboard_srv.ts
+++ b/public/app/features/dashboard/services/DashboardSrv.ts
@@ -1,5 +1,5 @@
 import coreModule from 'app/core/core_module';
-import { DashboardModel } from './dashboard_model';
+import { DashboardModel } from '../dashboard_model';
 import locationUtil from 'app/core/utils/location_util';
 
 export class DashboardSrv {