diff --git a/src/app/controllers/all.js b/src/app/controllers/all.js
index c7836b8d744..04e3fd36da9 100644
--- a/src/app/controllers/all.js
+++ b/src/app/controllers/all.js
@@ -10,7 +10,6 @@ define([
   './graphiteImport',
   './playlistCtrl',
   './inspectCtrl',
-  './annotationsEditorCtrl',
   './templateEditorCtrl',
   './sharePanelCtrl',
   './jsonEditorCtrl',
diff --git a/src/app/features/all.js b/src/app/features/all.js
index e2868f92b30..37e738b4bb1 100644
--- a/src/app/features/all.js
+++ b/src/app/features/all.js
@@ -1,5 +1,6 @@
 define([
   './panellinkeditor/module',
+  './annotations/annotationsSrv',
   './graphite/datasource',
   './influxdb/datasource',
   './opentsdb/datasource',
diff --git a/src/app/services/annotationsSrv.js b/src/app/features/annotations/annotationsSrv.js
similarity index 98%
rename from src/app/services/annotationsSrv.js
rename to src/app/features/annotations/annotationsSrv.js
index 68b5c85b5dd..2dd6da740e2 100644
--- a/src/app/services/annotationsSrv.js
+++ b/src/app/features/annotations/annotationsSrv.js
@@ -1,7 +1,8 @@
 define([
   'angular',
   'lodash',
-  'moment'
+  'moment',
+  './editorCtrl'
 ], function (angular, _, moment) {
   'use strict';
 
diff --git a/src/app/controllers/annotationsEditorCtrl.js b/src/app/features/annotations/editorCtrl.js
similarity index 100%
rename from src/app/controllers/annotationsEditorCtrl.js
rename to src/app/features/annotations/editorCtrl.js
diff --git a/src/app/partials/annotations_editor.html b/src/app/features/annotations/partials/editor.html
similarity index 100%
rename from src/app/partials/annotations_editor.html
rename to src/app/features/annotations/partials/editor.html
diff --git a/src/app/panels/graph/module.js b/src/app/panels/graph/module.js
index 335fd4e52a3..2f82dafcd3d 100644
--- a/src/app/panels/graph/module.js
+++ b/src/app/panels/graph/module.js
@@ -8,8 +8,6 @@ define([
   'components/timeSeries',
   'components/panelmeta',
   'services/panelSrv',
-  'services/annotationsSrv',
-  'services/datasourceSrv',
   './seriesOverridesCtrl',
   './graph',
   './legend',
diff --git a/src/app/partials/submenu.html b/src/app/partials/submenu.html
index e82e2505afb..19a56e57a63 100644
--- a/src/app/partials/submenu.html
+++ b/src/app/partials/submenu.html
@@ -10,7 +10,7 @@
 							</a>
 							<ul class="dropdown-menu">
 								<li><a class="pointer" dash-editor-link="app/partials/templating_editor.html">Templating</a></li>
-								<li><a class="pointer" dash-editor-link="app/partials/annotations_editor.html">Annotations</a></li>
+								<li><a class="pointer" dash-editor-link="app/features/annotations/partials/editor.html">Annotations</a></li>
 							</ul>
 						</div>
 					</li>
diff --git a/src/app/services/all.js b/src/app/services/all.js
index efb8c79fb15..fcc76edf482 100644
--- a/src/app/services/all.js
+++ b/src/app/services/all.js
@@ -8,7 +8,6 @@ define([
   './panelSrv',
   './timer',
   './keyboardManager',
-  './annotationsSrv',
   './popoverSrv',
   './playlistSrv',
   './unsavedChangesSrv',