diff --git a/public/app/features/datasources/all.js b/public/app/features/datasources/all.js
new file mode 100644
index 00000000000..b181fd475c2
--- /dev/null
+++ b/public/app/features/datasources/all.js
@@ -0,0 +1,4 @@
+define([
+  './list_ctrl',
+  './edit_ctrl',
+], function () {});
diff --git a/public/app/features/org/datasourceEditCtrl.js b/public/app/features/datasources/edit_ctrl.js
similarity index 95%
rename from public/app/features/org/datasourceEditCtrl.js
rename to public/app/features/datasources/edit_ctrl.js
index 5eadd9a07b1..468be95e24b 100644
--- a/public/app/features/org/datasourceEditCtrl.js
+++ b/public/app/features/datasources/edit_ctrl.js
@@ -9,9 +9,11 @@ function (angular, _, config) {
   var module = angular.module('grafana.controllers');
   var datasourceTypes = [];
 
-  module.controller('DataSourceEditCtrl', function($scope, $q, backendSrv, $routeParams, $location, datasourceSrv) {
+  module.directive('datasourceHttpSettings', function() {
+    return {templateUrl: 'app/features/datasources/partials/http_settings.html'};
+  });
 
-    $scope.httpConfigPartialSrc = 'app/features/org/partials/datasourceHttpConfig.html';
+  module.controller('DataSourceEditCtrl', function($scope, $q, backendSrv, $routeParams, $location, datasourceSrv) {
 
     var defaults = {name: '', type: 'graphite', url: '', access: 'proxy', jsonData: {}};
 
@@ -114,6 +116,5 @@ function (angular, _, config) {
     };
 
     $scope.init();
-
   });
 });
diff --git a/public/app/features/org/datasourcesCtrl.js b/public/app/features/datasources/list_ctrl.js
similarity index 100%
rename from public/app/features/org/datasourcesCtrl.js
rename to public/app/features/datasources/list_ctrl.js
diff --git a/public/app/features/org/partials/datasourceEdit.html b/public/app/features/datasources/partials/edit.html
similarity index 100%
rename from public/app/features/org/partials/datasourceEdit.html
rename to public/app/features/datasources/partials/edit.html
diff --git a/public/app/features/org/partials/datasourceHttpConfig.html b/public/app/features/datasources/partials/http_settings.html
similarity index 99%
rename from public/app/features/org/partials/datasourceHttpConfig.html
rename to public/app/features/datasources/partials/http_settings.html
index 4b5a72dbf11..bd70e419326 100644
--- a/public/app/features/org/partials/datasourceHttpConfig.html
+++ b/public/app/features/datasources/partials/http_settings.html
@@ -53,3 +53,5 @@
 		<div class="clearfix"></div>
 	</div>
 </div>
+
+<br>
diff --git a/public/app/features/org/partials/datasources.html b/public/app/features/datasources/partials/list.html
similarity index 100%
rename from public/app/features/org/partials/datasources.html
rename to public/app/features/datasources/partials/list.html
diff --git a/public/app/features/org/all.js b/public/app/features/org/all.js
index d03d270709d..d232b3bcd0a 100644
--- a/public/app/features/org/all.js
+++ b/public/app/features/org/all.js
@@ -1,9 +1,8 @@
 define([
-  './datasourcesCtrl',
-  './datasourceEditCtrl',
   './orgUsersCtrl',
   './newOrgCtrl',
   './userInviteCtrl',
   './orgApiKeysCtrl',
   './orgDetailsCtrl',
+  '../datasources/all',
 ], function () {});
diff --git a/public/app/plugins/datasource/elasticsearch/partials/edit_view.html b/public/app/plugins/datasource/elasticsearch/partials/edit_view.html
index 2f5b011d8cc..63a70ab8912 100644
--- a/public/app/plugins/datasource/elasticsearch/partials/edit_view.html
+++ b/public/app/plugins/datasource/elasticsearch/partials/edit_view.html
@@ -1,5 +1,4 @@
-<div ng-include="httpConfigPartialSrc"></div>
-<br>
+<datasource-http-settings></datasource-http-settings>
 
 <h5>Elasticsearch details</h5>
 
diff --git a/public/app/plugins/datasource/graphite/datasource.d.ts b/public/app/plugins/datasource/graphite/datasource.d.ts
index 4de8bcda15d..a50d7ca49cc 100644
--- a/public/app/plugins/datasource/graphite/datasource.d.ts
+++ b/public/app/plugins/datasource/graphite/datasource.d.ts
@@ -1,3 +1,3 @@
 declare var Datasource: any;
-export {Datasource};
+export default Datasource;
 
diff --git a/public/app/plugins/datasource/graphite/datasource.js b/public/app/plugins/datasource/graphite/datasource.js
index 1baac516790..3a169eaae4e 100644
--- a/public/app/plugins/datasource/graphite/datasource.js
+++ b/public/app/plugins/datasource/graphite/datasource.js
@@ -4,7 +4,6 @@ define([
   'jquery',
   'app/core/config',
   'app/core/utils/datemath',
-  './directives',
   './query_ctrl',
   './func_editor',
   './add_graphite_func',
@@ -293,7 +292,5 @@ function (angular, _, $, config, dateMath) {
     };
   }
 
-  return {
-    Datasource: GraphiteDatasource
-  };
+  return GraphiteDatasource;
 });
diff --git a/public/app/plugins/datasource/graphite/directives.js b/public/app/plugins/datasource/graphite/module.js
similarity index 84%
rename from public/app/plugins/datasource/graphite/directives.js
rename to public/app/plugins/datasource/graphite/module.js
index 91e52bb9546..b7910448304 100644
--- a/public/app/plugins/datasource/graphite/directives.js
+++ b/public/app/plugins/datasource/graphite/module.js
@@ -1,7 +1,8 @@
 define([
   'angular',
+  './datasource',
 ],
-function (angular) {
+function (angular, GraphiteDatasource) {
   'use strict';
 
   var module = angular.module('grafana.directives');
@@ -18,4 +19,7 @@ function (angular) {
     return {templateUrl: 'app/plugins/datasource/graphite/partials/annotations.editor.html'};
   });
 
+  return {
+    Datasource: GraphiteDatasource,
+  };
 });
diff --git a/public/app/plugins/datasource/graphite/partials/config.html b/public/app/plugins/datasource/graphite/partials/config.html
index 0b454f4dc74..9f5259cb2ea 100644
--- a/public/app/plugins/datasource/graphite/partials/config.html
+++ b/public/app/plugins/datasource/graphite/partials/config.html
@@ -1,3 +1,2 @@
-<div ng-include="httpConfigPartialSrc"></div>
-
+<datasource-http-settings></datasource-http-settings>
 
diff --git a/public/app/plugins/datasource/graphite/plugin.json b/public/app/plugins/datasource/graphite/plugin.json
index d6f5f8475a4..175ac5fa659 100644
--- a/public/app/plugins/datasource/graphite/plugin.json
+++ b/public/app/plugins/datasource/graphite/plugin.json
@@ -3,11 +3,7 @@
   "type": "datasource",
   "id": "graphite",
 
-  "module": "app/plugins/datasource/graphite/datasource",
-
-  "partials": {
-    "config": "app/plugins/datasource/graphite/partials/config.html"
-  },
+  "module": "app/plugins/datasource/graphite/module",
 
   "defaultMatchFormat": "glob",
   "metrics": true,
diff --git a/public/app/plugins/datasource/graphite/specs/datasource_specs.ts b/public/app/plugins/datasource/graphite/specs/datasource_specs.ts
index 439e865bd43..810e1be3516 100644
--- a/public/app/plugins/datasource/graphite/specs/datasource_specs.ts
+++ b/public/app/plugins/datasource/graphite/specs/datasource_specs.ts
@@ -1,7 +1,7 @@
 
 import {describe, beforeEach, it, sinon, expect, angularMocks} from 'test/lib/common';
 import helpers from 'test/specs/helpers';
-import {Datasource} from "../datasource";
+import Datasource from "../datasource";
 
 describe('graphiteDatasource', function() {
   var ctx = new helpers.ServiceTestContext();
diff --git a/public/app/plugins/datasource/influxdb/partials/config.html b/public/app/plugins/datasource/influxdb/partials/config.html
index 4d51a33e6b2..8a85ec2a16a 100644
--- a/public/app/plugins/datasource/influxdb/partials/config.html
+++ b/public/app/plugins/datasource/influxdb/partials/config.html
@@ -1,5 +1,4 @@
-<div ng-include="httpConfigPartialSrc"></div>
-<br>
+<datasource-http-settings></datasource-http-settings>
 
 <h5>InfluxDB Details</h5>
 
diff --git a/public/app/plugins/datasource/opentsdb/partials/config.html b/public/app/plugins/datasource/opentsdb/partials/config.html
index bb5bdda1e20..9f5259cb2ea 100644
--- a/public/app/plugins/datasource/opentsdb/partials/config.html
+++ b/public/app/plugins/datasource/opentsdb/partials/config.html
@@ -1,4 +1,2 @@
-<div ng-include="httpConfigPartialSrc"></div>
-
-<br>
+<datasource-http-settings></datasource-http-settings>
 
diff --git a/public/app/plugins/datasource/prometheus/partials/config.html b/public/app/plugins/datasource/prometheus/partials/config.html
index bb5bdda1e20..9f5259cb2ea 100644
--- a/public/app/plugins/datasource/prometheus/partials/config.html
+++ b/public/app/plugins/datasource/prometheus/partials/config.html
@@ -1,4 +1,2 @@
-<div ng-include="httpConfigPartialSrc"></div>
-
-<br>
+<datasource-http-settings></datasource-http-settings>
 
diff --git a/tasks/options/watch.js b/tasks/options/watch.js
index 2be128a3112..db250d56862 100644
--- a/tasks/options/watch.js
+++ b/tasks/options/watch.js
@@ -6,7 +6,7 @@ module.exports = function(config, grunt) {
 
     grunt.log.writeln('File Changed: ' + filepath);
 
-    if (/(\.html)$/.test(filepath)) {
+    if (/(\.html)|(\.json)$/.test(filepath)) {
       newPath = filepath.replace(/^public/, 'public_gen');
       grunt.log.writeln('Copying to ' + newPath);
       grunt.file.copy(filepath, newPath);