diff --git a/src/app/controllers/all.js b/src/app/controllers/all.js
index 04e3fd36da9..6e052ee445e 100644
--- a/src/app/controllers/all.js
+++ b/src/app/controllers/all.js
@@ -10,7 +10,6 @@ define([
   './graphiteImport',
   './playlistCtrl',
   './inspectCtrl',
-  './templateEditorCtrl',
   './sharePanelCtrl',
   './jsonEditorCtrl',
 ], function () {});
diff --git a/src/app/features/all.js b/src/app/features/all.js
index 37e738b4bb1..6860e3de932 100644
--- a/src/app/features/all.js
+++ b/src/app/features/all.js
@@ -1,6 +1,7 @@
 define([
   './panellinkeditor/module',
   './annotations/annotationsSrv',
+  './templating/templateSrv',
   './graphite/datasource',
   './influxdb/datasource',
   './opentsdb/datasource',
diff --git a/src/app/controllers/templateEditorCtrl.js b/src/app/features/templating/editorCtrl.js
similarity index 100%
rename from src/app/controllers/templateEditorCtrl.js
rename to src/app/features/templating/editorCtrl.js
diff --git a/src/app/services/templateSrv.js b/src/app/features/templating/templateSrv.js
similarity index 98%
rename from src/app/services/templateSrv.js
rename to src/app/features/templating/templateSrv.js
index c201147becf..c44ff0a5669 100644
--- a/src/app/services/templateSrv.js
+++ b/src/app/features/templating/templateSrv.js
@@ -1,6 +1,8 @@
 define([
   'angular',
   'lodash',
+  './editorCtrl',
+  './templateValuesSrv',
 ],
 function (angular, _) {
   'use strict';
diff --git a/src/app/services/templateValuesSrv.js b/src/app/features/templating/templateValuesSrv.js
similarity index 100%
rename from src/app/services/templateValuesSrv.js
rename to src/app/features/templating/templateValuesSrv.js
diff --git a/src/app/services/all.js b/src/app/services/all.js
index fcc76edf482..daf889d1cd3 100644
--- a/src/app/services/all.js
+++ b/src/app/services/all.js
@@ -3,8 +3,6 @@ define([
   './utilSrv',
   './datasourceSrv',
   './timeSrv',
-  './templateSrv',
-  './templateValuesSrv',
   './panelSrv',
   './timer',
   './keyboardManager',
diff --git a/src/test/specs/templateSrv-specs.js b/src/test/specs/templateSrv-specs.js
index f740ef6d544..bb85b9a1c98 100644
--- a/src/test/specs/templateSrv-specs.js
+++ b/src/test/specs/templateSrv-specs.js
@@ -1,7 +1,7 @@
 define([
   'mocks/dashboard-mock',
   'lodash',
-  'services/templateSrv'
+  'features/templating/templateSrv'
 ], function(dashboardMock) {
   'use strict';
 
diff --git a/src/test/specs/templateValuesSrv-specs.js b/src/test/specs/templateValuesSrv-specs.js
index 8ca5e6a87ae..0fe00fd9e68 100644
--- a/src/test/specs/templateValuesSrv-specs.js
+++ b/src/test/specs/templateValuesSrv-specs.js
@@ -2,7 +2,7 @@ define([
   'mocks/dashboard-mock',
   'helpers',
   'moment',
-  'services/templateValuesSrv'
+  'features/templating/templateValuesSrv'
 ], function(dashboardMock, helpers, moment) {
   'use strict';