diff --git a/public/app/features/panel/panel.ts b/public/app/features/panel/panel.ts
deleted file mode 100644
index c2415aaa1da..00000000000
--- a/public/app/features/panel/panel.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-///<reference path="../../headers/common.d.ts" />
-
-import config from 'app/core/config';
-
-import {PanelCtrl} from './panel_ctrl';
-import {MetricsPanelCtrl} from './metrics_panel_ctrl';
-import {QueryCtrl} from './query_ctrl';
-
-export {
-  PanelCtrl,
-  MetricsPanelCtrl,
-  QueryCtrl,
-}
diff --git a/public/app/plugins/datasource/cloudwatch/query_ctrl.ts b/public/app/plugins/datasource/cloudwatch/query_ctrl.ts
index daacd7fe198..ab0ac0bdcff 100644
--- a/public/app/plugins/datasource/cloudwatch/query_ctrl.ts
+++ b/public/app/plugins/datasource/cloudwatch/query_ctrl.ts
@@ -2,7 +2,7 @@
 
 import './query_parameter_ctrl';
 import _ from 'lodash';
-import {QueryCtrl} from 'app/features/panel/panel';
+import {QueryCtrl} from 'app/plugins/sdk';
 
 export class CloudWatchQueryCtrl extends QueryCtrl {
   static templateUrl = 'public/app/plugins/datasource/cloudwatch/partials/query.editor.html';
diff --git a/public/app/plugins/datasource/elasticsearch/query_ctrl.ts b/public/app/plugins/datasource/elasticsearch/query_ctrl.ts
index fb04f39b8ac..cab1fcf5676 100644
--- a/public/app/plugins/datasource/elasticsearch/query_ctrl.ts
+++ b/public/app/plugins/datasource/elasticsearch/query_ctrl.ts
@@ -5,7 +5,7 @@ import './metric_agg';
 
 import angular from 'angular';
 import _ from 'lodash';
-import {QueryCtrl} from 'app/features/panel/panel';
+import {QueryCtrl} from 'app/plugins/sdk';
 
 export class ElasticQueryCtrl extends QueryCtrl {
   static templateUrl = 'public/app/plugins/datasource/elasticsearch/partials/query.editor.html';
diff --git a/public/app/plugins/datasource/grafana/module.ts b/public/app/plugins/datasource/grafana/module.ts
index 19233c4f975..66d398273e0 100644
--- a/public/app/plugins/datasource/grafana/module.ts
+++ b/public/app/plugins/datasource/grafana/module.ts
@@ -2,7 +2,7 @@
 
 import angular from 'angular';
 import {GrafanaDatasource} from './datasource';
-import {QueryCtrl} from 'app/features/panel/panel';
+import {QueryCtrl} from 'app/plugins/sdk';
 
 class GrafanaQueryCtrl extends QueryCtrl {
   static templateUrl = 'public/app/plugins/datasource/grafana/partials/query.editor.html';
diff --git a/public/app/plugins/datasource/graphite/query_ctrl.ts b/public/app/plugins/datasource/graphite/query_ctrl.ts
index 23c6c2aa6d6..659253102c5 100644
--- a/public/app/plugins/datasource/graphite/query_ctrl.ts
+++ b/public/app/plugins/datasource/graphite/query_ctrl.ts
@@ -8,7 +8,7 @@ import _ from 'lodash';
 import moment from 'moment';
 import gfunc from './gfunc';
 import {Parser} from './parser';
-import {QueryCtrl} from 'app/features/panel/panel';
+import {QueryCtrl} from 'app/plugins/sdk';
 
 export class GraphiteQueryCtrl extends QueryCtrl {
   static templateUrl = 'public/app/plugins/datasource/graphite/partials/query.editor.html';
diff --git a/public/app/plugins/datasource/influxdb/query_ctrl.ts b/public/app/plugins/datasource/influxdb/query_ctrl.ts
index 0622fc17bd1..cecfac28ea8 100644
--- a/public/app/plugins/datasource/influxdb/query_ctrl.ts
+++ b/public/app/plugins/datasource/influxdb/query_ctrl.ts
@@ -8,7 +8,7 @@ import _ from 'lodash';
 import InfluxQueryBuilder from './query_builder';
 import InfluxQuery from './influx_query';
 import queryPart from './query_part';
-import {QueryCtrl} from 'app/features/panel/panel';
+import {QueryCtrl} from 'app/plugins/sdk';
 
 export class InfluxQueryCtrl extends QueryCtrl {
   static templateUrl = 'public/app/plugins/datasource/influxdb/partials/query.editor.html';
diff --git a/public/app/plugins/datasource/opentsdb/query_ctrl.ts b/public/app/plugins/datasource/opentsdb/query_ctrl.ts
index 69590b714ca..43086588679 100644
--- a/public/app/plugins/datasource/opentsdb/query_ctrl.ts
+++ b/public/app/plugins/datasource/opentsdb/query_ctrl.ts
@@ -2,7 +2,7 @@
 
 import _ from 'lodash';
 import kbn from 'app/core/utils/kbn';
-import {QueryCtrl} from 'app/features/panel/panel';
+import {QueryCtrl} from 'app/plugins/sdk';
 
 export class OpenTsQueryCtrl extends QueryCtrl {
   static templateUrl = 'public/app/plugins/datasource/opentsdb/partials/query.editor.html';
diff --git a/public/app/plugins/datasource/prometheus/query_ctrl.ts b/public/app/plugins/datasource/prometheus/query_ctrl.ts
index c215b184275..4ae380f1f65 100644
--- a/public/app/plugins/datasource/prometheus/query_ctrl.ts
+++ b/public/app/plugins/datasource/prometheus/query_ctrl.ts
@@ -5,7 +5,7 @@ import _ from 'lodash';
 import moment from 'moment';
 
 import * as dateMath from 'app/core/utils/datemath';
-import {QueryCtrl} from 'app/features/panel/panel';
+import {QueryCtrl} from 'app/plugins/sdk';
 
 class PrometheusQueryCtrl extends QueryCtrl {
   static templateUrl = 'public/app/plugins/datasource/prometheus/partials/query.editor.html';
diff --git a/public/app/plugins/panel/dashlist/module.ts b/public/app/plugins/panel/dashlist/module.ts
index 829c98f39f5..78f2c0e3f6a 100644
--- a/public/app/plugins/panel/dashlist/module.ts
+++ b/public/app/plugins/panel/dashlist/module.ts
@@ -2,7 +2,7 @@
 
 import _ from 'lodash';
 import config from 'app/core/config';
-import {PanelCtrl} from '../../../features/panel/panel';
+import {PanelCtrl} from 'app/plugins/sdk';
 
  // Set and populate defaults
 var panelDefaults = {
diff --git a/public/app/plugins/panel/graph/module.ts b/public/app/plugins/panel/graph/module.ts
index 7b7db37a0d5..1b1d9f567ca 100644
--- a/public/app/plugins/panel/graph/module.ts
+++ b/public/app/plugins/panel/graph/module.ts
@@ -7,9 +7,9 @@ import './seriesOverridesCtrl';
 import moment from 'moment';
 import kbn from 'app/core/utils/kbn';
 import _ from 'lodash';
-import TimeSeries from '../../../core/time_series2';
-import * as fileExport from '../../../core/utils/file_export';
-import {MetricsPanelCtrl} from '../../../features/panel/panel';
+import TimeSeries from 'app/core/time_series2';
+import * as fileExport from 'app/core/utils/file_export';
+import {MetricsPanelCtrl} from 'app/plugins/sdk';
 
 var panelDefaults = {
   // datasource name, null = default datasource
diff --git a/public/app/plugins/panel/singlestat/module.ts b/public/app/plugins/panel/singlestat/module.ts
index 5786c6be6d2..7eee8524d8c 100644
--- a/public/app/plugins/panel/singlestat/module.ts
+++ b/public/app/plugins/panel/singlestat/module.ts
@@ -6,8 +6,8 @@ import $ from 'jquery';
 import 'jquery.flot';
 
 import kbn from 'app/core/utils/kbn';
-import TimeSeries from '../../../core/time_series2';
-import {MetricsPanelCtrl} from '../../../features/panel/panel';
+import TimeSeries from 'app/core/time_series2';
+import {MetricsPanelCtrl} from 'app/plugins/sdk';
 
 // Set and populate defaults
 var panelDefaults = {
diff --git a/public/app/plugins/panel/table/module.ts b/public/app/plugins/panel/table/module.ts
index a84d2678295..43355d5966c 100644
--- a/public/app/plugins/panel/table/module.ts
+++ b/public/app/plugins/panel/table/module.ts
@@ -5,7 +5,7 @@ import _ from 'lodash';
 import $ from 'jquery';
 import moment from 'moment';
 import * as FileExport from 'app/core/utils/file_export';
-import {MetricsPanelCtrl} from '../../../features/panel/panel';
+import {MetricsPanelCtrl} from 'app/plugins/sdk';
 import {transformDataToTable} from './transformers';
 import {tablePanelEditor} from './editor';
 import {TableRenderer} from './renderer';
diff --git a/public/app/plugins/panel/text/module.ts b/public/app/plugins/panel/text/module.ts
index 5e781571eff..3509db12cfa 100644
--- a/public/app/plugins/panel/text/module.ts
+++ b/public/app/plugins/panel/text/module.ts
@@ -1,7 +1,7 @@
 ///<reference path="../../../headers/common.d.ts" />
 
 import _ from 'lodash';
-import {PanelCtrl} from 'app/features/panel/panel';
+import {PanelCtrl} from 'app/plugins/sdk';
 
  // Set and populate defaults
 var panelDefaults = {
diff --git a/public/app/plugins/panel/unknown/module.ts b/public/app/plugins/panel/unknown/module.ts
index d625485cb63..0a0871d6b69 100644
--- a/public/app/plugins/panel/unknown/module.ts
+++ b/public/app/plugins/panel/unknown/module.ts
@@ -1,6 +1,6 @@
 ///<reference path="../../../headers/common.d.ts" />
 
-import {PanelCtrl} from '../../../features/panel/panel';
+import {PanelCtrl} from 'app/plugins/sdk';
 
 export class UnknownPanelCtrl extends PanelCtrl {
   static templateUrl = 'public/app/plugins/panel/unknown/module.html';
diff --git a/public/app/plugins/sdk.ts b/public/app/plugins/sdk.ts
new file mode 100644
index 00000000000..a3616903908
--- /dev/null
+++ b/public/app/plugins/sdk.ts
@@ -0,0 +1,9 @@
+import {PanelCtrl} from 'app/features/panel/panel_ctrl';
+import {MetricsPanelCtrl} from 'app/features/panel/metrics_panel_ctrl';
+import {QueryCtrl} from 'app/features/panel/query_ctrl';
+
+export {
+  PanelCtrl,
+  MetricsPanelCtrl,
+  QueryCtrl,
+}