From d83e24572aca9afb01eb9fb0a6aa01509012fd1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Sat, 9 Jan 2016 23:52:13 +0100
Subject: [PATCH] feat(plugins): more refactoring

---
 public/app/features/dashboard/dashboardCtrl.js            | 8 --------
 public/app/plugins/{panels => panel}/dashlist/editor.html | 0
 public/app/plugins/{panels => panel}/dashlist/module.html | 0
 public/app/plugins/{panels => panel}/dashlist/module.js   | 4 ++--
 public/app/plugins/panel/dashlist/plugin.json             | 5 +++++
 .../app/plugins/{panels => panel}/graph/axisEditor.html   | 0
 public/app/plugins/{panels => panel}/graph/graph.js       | 0
 .../app/plugins/{panels => panel}/graph/graph.tooltip.js  | 0
 public/app/plugins/{panels => panel}/graph/legend.js      | 0
 .../plugins/{panels => panel}/graph/legend.popover.html   | 0
 public/app/plugins/{panels => panel}/graph/module.html    | 0
 public/app/plugins/{panels => panel}/graph/module.js      | 6 +++---
 public/app/plugins/panel/graph/plugin.json                | 5 +++++
 .../{panels => panel}/graph/seriesOverridesCtrl.js        | 0
 .../app/plugins/{panels => panel}/graph/styleEditor.html  | 0
 .../app/plugins/{panels => panel}/singlestat/editor.html  | 0
 .../app/plugins/{panels => panel}/singlestat/module.html  | 0
 public/app/plugins/{panels => panel}/singlestat/module.js | 4 ++--
 public/app/plugins/panel/singlestat/plugin.json           | 5 +++++
 .../{panels => panel}/singlestat/singleStatPanel.js       | 0
 public/app/plugins/{panels => panel}/table/controller.ts  | 0
 public/app/plugins/{panels => panel}/table/editor.html    | 0
 public/app/plugins/{panels => panel}/table/editor.ts      | 0
 public/app/plugins/{panels => panel}/table/module.html    | 0
 public/app/plugins/{panels => panel}/table/module.ts      | 2 +-
 public/app/plugins/{panels => panel}/table/options.html   | 0
 public/app/plugins/panel/table/plugin.json                | 5 +++++
 public/app/plugins/{panels => panel}/table/renderer.ts    | 0
 .../{panels => panel}/table/specs/renderer_specs.ts       | 0
 .../{panels => panel}/table/specs/transformers_specs.ts   | 0
 .../app/plugins/{panels => panel}/table/transformers.ts   | 0
 public/app/plugins/{panels => panel}/text/editor.html     | 0
 public/app/plugins/{panels => panel}/text/module.html     | 0
 public/app/plugins/{panels => panel}/text/module.js       | 4 ++--
 public/app/plugins/panel/text/plugin.json                 | 5 +++++
 public/app/plugins/panels/dashlist/plugin.json            | 7 -------
 public/app/plugins/panels/graph/plugin.json               | 7 -------
 public/app/plugins/panels/singlestat/plugin.json          | 7 -------
 public/app/plugins/panels/table/plugin.json               | 7 -------
 public/app/plugins/panels/text/plugin.json                | 7 -------
 public/test/specs/graph-ctrl-specs.js                     | 2 +-
 public/test/specs/graph-specs.js                          | 2 +-
 public/test/specs/graph-tooltip-specs.js                  | 2 +-
 public/test/specs/seriesOverridesCtrl-specs.js            | 2 +-
 public/test/specs/singlestat-specs.js                     | 2 +-
 tasks/options/jscs.js                                     | 2 +-
 tasks/options/requirejs.js                                | 6 +++---
 tasks/systemjs_task.js                                    | 2 +-
 48 files changed, 45 insertions(+), 63 deletions(-)
 rename public/app/plugins/{panels => panel}/dashlist/editor.html (100%)
 rename public/app/plugins/{panels => panel}/dashlist/module.html (100%)
 rename public/app/plugins/{panels => panel}/dashlist/module.js (91%)
 create mode 100644 public/app/plugins/panel/dashlist/plugin.json
 rename public/app/plugins/{panels => panel}/graph/axisEditor.html (100%)
 rename public/app/plugins/{panels => panel}/graph/graph.js (100%)
 rename public/app/plugins/{panels => panel}/graph/graph.tooltip.js (100%)
 rename public/app/plugins/{panels => panel}/graph/legend.js (100%)
 rename public/app/plugins/{panels => panel}/graph/legend.popover.html (100%)
 rename public/app/plugins/{panels => panel}/graph/module.html (100%)
 rename public/app/plugins/{panels => panel}/graph/module.js (98%)
 create mode 100644 public/app/plugins/panel/graph/plugin.json
 rename public/app/plugins/{panels => panel}/graph/seriesOverridesCtrl.js (100%)
 rename public/app/plugins/{panels => panel}/graph/styleEditor.html (100%)
 rename public/app/plugins/{panels => panel}/singlestat/editor.html (100%)
 rename public/app/plugins/{panels => panel}/singlestat/module.html (100%)
 rename public/app/plugins/{panels => panel}/singlestat/module.js (97%)
 create mode 100644 public/app/plugins/panel/singlestat/plugin.json
 rename public/app/plugins/{panels => panel}/singlestat/singleStatPanel.js (100%)
 rename public/app/plugins/{panels => panel}/table/controller.ts (100%)
 rename public/app/plugins/{panels => panel}/table/editor.html (100%)
 rename public/app/plugins/{panels => panel}/table/editor.ts (100%)
 rename public/app/plugins/{panels => panel}/table/module.html (100%)
 rename public/app/plugins/{panels => panel}/table/module.ts (98%)
 rename public/app/plugins/{panels => panel}/table/options.html (100%)
 create mode 100644 public/app/plugins/panel/table/plugin.json
 rename public/app/plugins/{panels => panel}/table/renderer.ts (100%)
 rename public/app/plugins/{panels => panel}/table/specs/renderer_specs.ts (100%)
 rename public/app/plugins/{panels => panel}/table/specs/transformers_specs.ts (100%)
 rename public/app/plugins/{panels => panel}/table/transformers.ts (100%)
 rename public/app/plugins/{panels => panel}/text/editor.html (100%)
 rename public/app/plugins/{panels => panel}/text/module.html (100%)
 rename public/app/plugins/{panels => panel}/text/module.js (97%)
 create mode 100644 public/app/plugins/panel/text/plugin.json
 delete mode 100644 public/app/plugins/panels/dashlist/plugin.json
 delete mode 100644 public/app/plugins/panels/graph/plugin.json
 delete mode 100644 public/app/plugins/panels/singlestat/plugin.json
 delete mode 100644 public/app/plugins/panels/table/plugin.json
 delete mode 100644 public/app/plugins/panels/text/plugin.json

diff --git a/public/app/features/dashboard/dashboardCtrl.js b/public/app/features/dashboard/dashboardCtrl.js
index eb2aa3bad89..20b3122230c 100644
--- a/public/app/features/dashboard/dashboardCtrl.js
+++ b/public/app/features/dashboard/dashboardCtrl.js
@@ -106,14 +106,6 @@ function (angular, $, config, moment) {
       };
     };
 
-    $scope.panelEditorPath = function(type) {
-      return 'app/' + config.panels[type].path + '/editor.html';
-    };
-
-    $scope.pulldownEditorPath = function(type) {
-      return 'app/panels/'+type+'/editor.html';
-    };
-
     $scope.showJsonEditor = function(evt, options) {
       var editScope = $rootScope.$new();
       editScope.object = options.object;
diff --git a/public/app/plugins/panels/dashlist/editor.html b/public/app/plugins/panel/dashlist/editor.html
similarity index 100%
rename from public/app/plugins/panels/dashlist/editor.html
rename to public/app/plugins/panel/dashlist/editor.html
diff --git a/public/app/plugins/panels/dashlist/module.html b/public/app/plugins/panel/dashlist/module.html
similarity index 100%
rename from public/app/plugins/panels/dashlist/module.html
rename to public/app/plugins/panel/dashlist/module.html
diff --git a/public/app/plugins/panels/dashlist/module.js b/public/app/plugins/panel/dashlist/module.js
similarity index 91%
rename from public/app/plugins/panels/dashlist/module.js
rename to public/app/plugins/panel/dashlist/module.js
index fddc762ffe2..d9152566975 100644
--- a/public/app/plugins/panels/dashlist/module.js
+++ b/public/app/plugins/panel/dashlist/module.js
@@ -14,7 +14,7 @@ function (angular, app, _, config, PanelMeta) {
   module.directive('grafanaPanelDashlist', function() {
     return {
       controller: 'DashListPanelCtrl',
-      templateUrl: 'app/plugins/panels/dashlist/module.html',
+      templateUrl: 'app/plugins/panel/dashlist/module.html',
     };
   });
 
@@ -26,7 +26,7 @@ function (angular, app, _, config, PanelMeta) {
       fullscreen: true,
     });
 
-    $scope.panelMeta.addEditorTab('Options', 'app/plugins/panels/dashlist/editor.html');
+    $scope.panelMeta.addEditorTab('Options', 'app/plugins/panel/dashlist/editor.html');
 
     var defaults = {
       mode: 'starred',
diff --git a/public/app/plugins/panel/dashlist/plugin.json b/public/app/plugins/panel/dashlist/plugin.json
new file mode 100644
index 00000000000..1f1266d8444
--- /dev/null
+++ b/public/app/plugins/panel/dashlist/plugin.json
@@ -0,0 +1,5 @@
+{
+  "type": "panel",
+  "name": "Dashboard list",
+  "id": "dashlist"
+}
diff --git a/public/app/plugins/panels/graph/axisEditor.html b/public/app/plugins/panel/graph/axisEditor.html
similarity index 100%
rename from public/app/plugins/panels/graph/axisEditor.html
rename to public/app/plugins/panel/graph/axisEditor.html
diff --git a/public/app/plugins/panels/graph/graph.js b/public/app/plugins/panel/graph/graph.js
similarity index 100%
rename from public/app/plugins/panels/graph/graph.js
rename to public/app/plugins/panel/graph/graph.js
diff --git a/public/app/plugins/panels/graph/graph.tooltip.js b/public/app/plugins/panel/graph/graph.tooltip.js
similarity index 100%
rename from public/app/plugins/panels/graph/graph.tooltip.js
rename to public/app/plugins/panel/graph/graph.tooltip.js
diff --git a/public/app/plugins/panels/graph/legend.js b/public/app/plugins/panel/graph/legend.js
similarity index 100%
rename from public/app/plugins/panels/graph/legend.js
rename to public/app/plugins/panel/graph/legend.js
diff --git a/public/app/plugins/panels/graph/legend.popover.html b/public/app/plugins/panel/graph/legend.popover.html
similarity index 100%
rename from public/app/plugins/panels/graph/legend.popover.html
rename to public/app/plugins/panel/graph/legend.popover.html
diff --git a/public/app/plugins/panels/graph/module.html b/public/app/plugins/panel/graph/module.html
similarity index 100%
rename from public/app/plugins/panels/graph/module.html
rename to public/app/plugins/panel/graph/module.html
diff --git a/public/app/plugins/panels/graph/module.js b/public/app/plugins/panel/graph/module.js
similarity index 98%
rename from public/app/plugins/panels/graph/module.js
rename to public/app/plugins/panel/graph/module.js
index 731fb47ae6d..5936275d797 100644
--- a/public/app/plugins/panels/graph/module.js
+++ b/public/app/plugins/panel/graph/module.js
@@ -17,7 +17,7 @@ function (angular, _, moment, kbn, TimeSeries, PanelMeta) {
   module.directive('grafanaPanelGraph', function() {
     return {
       controller: 'GraphCtrl',
-      templateUrl: 'app/plugins/panels/graph/module.html',
+      templateUrl: 'app/plugins/panel/graph/module.html',
     };
   });
 
@@ -30,8 +30,8 @@ function (angular, _, moment, kbn, TimeSeries, PanelMeta) {
       metricsEditor: true,
     });
 
-    $scope.panelMeta.addEditorTab('Axes & Grid', 'app/plugins/panels/graph/axisEditor.html');
-    $scope.panelMeta.addEditorTab('Display Styles', 'app/plugins/panels/graph/styleEditor.html');
+    $scope.panelMeta.addEditorTab('Axes & Grid', 'app/plugins/panel/graph/axisEditor.html');
+    $scope.panelMeta.addEditorTab('Display Styles', 'app/plugins/panel/graph/styleEditor.html');
     $scope.panelMeta.addEditorTab('Time range', 'app/features/panel/partials/panelTime.html');
 
     $scope.panelMeta.addExtendedMenuItem('Export CSV', '', 'exportCsv()');
diff --git a/public/app/plugins/panel/graph/plugin.json b/public/app/plugins/panel/graph/plugin.json
new file mode 100644
index 00000000000..f603e5e4b06
--- /dev/null
+++ b/public/app/plugins/panel/graph/plugin.json
@@ -0,0 +1,5 @@
+{
+  "type": "panel",
+  "name": "Graph",
+  "id": "graph"
+}
diff --git a/public/app/plugins/panels/graph/seriesOverridesCtrl.js b/public/app/plugins/panel/graph/seriesOverridesCtrl.js
similarity index 100%
rename from public/app/plugins/panels/graph/seriesOverridesCtrl.js
rename to public/app/plugins/panel/graph/seriesOverridesCtrl.js
diff --git a/public/app/plugins/panels/graph/styleEditor.html b/public/app/plugins/panel/graph/styleEditor.html
similarity index 100%
rename from public/app/plugins/panels/graph/styleEditor.html
rename to public/app/plugins/panel/graph/styleEditor.html
diff --git a/public/app/plugins/panels/singlestat/editor.html b/public/app/plugins/panel/singlestat/editor.html
similarity index 100%
rename from public/app/plugins/panels/singlestat/editor.html
rename to public/app/plugins/panel/singlestat/editor.html
diff --git a/public/app/plugins/panels/singlestat/module.html b/public/app/plugins/panel/singlestat/module.html
similarity index 100%
rename from public/app/plugins/panels/singlestat/module.html
rename to public/app/plugins/panel/singlestat/module.html
diff --git a/public/app/plugins/panels/singlestat/module.js b/public/app/plugins/panel/singlestat/module.js
similarity index 97%
rename from public/app/plugins/panels/singlestat/module.js
rename to public/app/plugins/panel/singlestat/module.js
index 47b18ba526f..5c99cf7d3b1 100644
--- a/public/app/plugins/panels/singlestat/module.js
+++ b/public/app/plugins/panel/singlestat/module.js
@@ -16,7 +16,7 @@ function (angular, app, _, kbn, TimeSeries, PanelMeta) {
   module.directive('grafanaPanelSinglestat', function() {
     return {
       controller: 'SingleStatCtrl',
-      templateUrl: 'app/plugins/panels/singlestat/module.html',
+      templateUrl: 'app/plugins/panel/singlestat/module.html',
     };
   });
 
@@ -31,7 +31,7 @@ function (angular, app, _, kbn, TimeSeries, PanelMeta) {
 
     $scope.fontSizes = ['20%', '30%','50%','70%','80%','100%', '110%', '120%', '150%', '170%', '200%'];
 
-    $scope.panelMeta.addEditorTab('Options', 'app/plugins/panels/singlestat/editor.html');
+    $scope.panelMeta.addEditorTab('Options', 'app/plugins/panel/singlestat/editor.html');
     $scope.panelMeta.addEditorTab('Time range', 'app/features/panel/partials/panelTime.html');
 
     // Set and populate defaults
diff --git a/public/app/plugins/panel/singlestat/plugin.json b/public/app/plugins/panel/singlestat/plugin.json
new file mode 100644
index 00000000000..8372e4b2c2d
--- /dev/null
+++ b/public/app/plugins/panel/singlestat/plugin.json
@@ -0,0 +1,5 @@
+{
+  "type": "panel",
+  "name": "Singlestat",
+  "id": "singlestat"
+}
diff --git a/public/app/plugins/panels/singlestat/singleStatPanel.js b/public/app/plugins/panel/singlestat/singleStatPanel.js
similarity index 100%
rename from public/app/plugins/panels/singlestat/singleStatPanel.js
rename to public/app/plugins/panel/singlestat/singleStatPanel.js
diff --git a/public/app/plugins/panels/table/controller.ts b/public/app/plugins/panel/table/controller.ts
similarity index 100%
rename from public/app/plugins/panels/table/controller.ts
rename to public/app/plugins/panel/table/controller.ts
diff --git a/public/app/plugins/panels/table/editor.html b/public/app/plugins/panel/table/editor.html
similarity index 100%
rename from public/app/plugins/panels/table/editor.html
rename to public/app/plugins/panel/table/editor.html
diff --git a/public/app/plugins/panels/table/editor.ts b/public/app/plugins/panel/table/editor.ts
similarity index 100%
rename from public/app/plugins/panels/table/editor.ts
rename to public/app/plugins/panel/table/editor.ts
diff --git a/public/app/plugins/panels/table/module.html b/public/app/plugins/panel/table/module.html
similarity index 100%
rename from public/app/plugins/panels/table/module.html
rename to public/app/plugins/panel/table/module.html
diff --git a/public/app/plugins/panels/table/module.ts b/public/app/plugins/panel/table/module.ts
similarity index 98%
rename from public/app/plugins/panels/table/module.ts
rename to public/app/plugins/panel/table/module.ts
index 72122ecbd97..4344eb41229 100644
--- a/public/app/plugins/panels/table/module.ts
+++ b/public/app/plugins/panel/table/module.ts
@@ -14,7 +14,7 @@ export function tablePanel() {
   'use strict';
   return {
     restrict: 'E',
-    templateUrl: 'app/plugins/panels/table/module.html',
+    templateUrl: 'app/plugins/panel/table/module.html',
     controller: TablePanelCtrl,
     link: function(scope, elem) {
       var data;
diff --git a/public/app/plugins/panels/table/options.html b/public/app/plugins/panel/table/options.html
similarity index 100%
rename from public/app/plugins/panels/table/options.html
rename to public/app/plugins/panel/table/options.html
diff --git a/public/app/plugins/panel/table/plugin.json b/public/app/plugins/panel/table/plugin.json
new file mode 100644
index 00000000000..7f8c0bb23cf
--- /dev/null
+++ b/public/app/plugins/panel/table/plugin.json
@@ -0,0 +1,5 @@
+{
+  "type": "panel",
+  "name": "Table",
+  "id": "table"
+}
diff --git a/public/app/plugins/panels/table/renderer.ts b/public/app/plugins/panel/table/renderer.ts
similarity index 100%
rename from public/app/plugins/panels/table/renderer.ts
rename to public/app/plugins/panel/table/renderer.ts
diff --git a/public/app/plugins/panels/table/specs/renderer_specs.ts b/public/app/plugins/panel/table/specs/renderer_specs.ts
similarity index 100%
rename from public/app/plugins/panels/table/specs/renderer_specs.ts
rename to public/app/plugins/panel/table/specs/renderer_specs.ts
diff --git a/public/app/plugins/panels/table/specs/transformers_specs.ts b/public/app/plugins/panel/table/specs/transformers_specs.ts
similarity index 100%
rename from public/app/plugins/panels/table/specs/transformers_specs.ts
rename to public/app/plugins/panel/table/specs/transformers_specs.ts
diff --git a/public/app/plugins/panels/table/transformers.ts b/public/app/plugins/panel/table/transformers.ts
similarity index 100%
rename from public/app/plugins/panels/table/transformers.ts
rename to public/app/plugins/panel/table/transformers.ts
diff --git a/public/app/plugins/panels/text/editor.html b/public/app/plugins/panel/text/editor.html
similarity index 100%
rename from public/app/plugins/panels/text/editor.html
rename to public/app/plugins/panel/text/editor.html
diff --git a/public/app/plugins/panels/text/module.html b/public/app/plugins/panel/text/module.html
similarity index 100%
rename from public/app/plugins/panels/text/module.html
rename to public/app/plugins/panel/text/module.html
diff --git a/public/app/plugins/panels/text/module.js b/public/app/plugins/panel/text/module.js
similarity index 97%
rename from public/app/plugins/panels/text/module.js
rename to public/app/plugins/panel/text/module.js
index bb3c5faae03..d3add3a15b8 100644
--- a/public/app/plugins/panels/text/module.js
+++ b/public/app/plugins/panel/text/module.js
@@ -16,7 +16,7 @@ function (angular, app, _, require, PanelMeta) {
   module.directive('grafanaPanelText', function() {
     return {
       controller: 'TextPanelCtrl',
-      templateUrl: 'app/plugins/panels/text/module.html',
+      templateUrl: 'app/plugins/panel/text/module.html',
     };
   });
 
@@ -28,7 +28,7 @@ function (angular, app, _, require, PanelMeta) {
       fullscreen: true,
     });
 
-    $scope.panelMeta.addEditorTab('Edit text', 'app/plugins/panels/text/editor.html');
+    $scope.panelMeta.addEditorTab('Edit text', 'app/plugins/panel/text/editor.html');
 
     // Set and populate defaults
     var _d = {
diff --git a/public/app/plugins/panel/text/plugin.json b/public/app/plugins/panel/text/plugin.json
new file mode 100644
index 00000000000..4cf046cec36
--- /dev/null
+++ b/public/app/plugins/panel/text/plugin.json
@@ -0,0 +1,5 @@
+{
+  "type": "panel",
+  "name": "Text",
+  "id": "text"
+}
diff --git a/public/app/plugins/panels/dashlist/plugin.json b/public/app/plugins/panels/dashlist/plugin.json
deleted file mode 100644
index e1fcb2f9221..00000000000
--- a/public/app/plugins/panels/dashlist/plugin.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "type": "panel",
-  "name": "Dashboard list",
-  "id": "dashlist",
-
-  "module": "app/plugins/panels/dashlist/module"
-}
diff --git a/public/app/plugins/panels/graph/plugin.json b/public/app/plugins/panels/graph/plugin.json
deleted file mode 100644
index 7e4dc3093bb..00000000000
--- a/public/app/plugins/panels/graph/plugin.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "type": "panel",
-  "name": "Graph",
-  "id": "graph",
-
-  "module": "app/plugins/panels/graph/module"
-}
diff --git a/public/app/plugins/panels/singlestat/plugin.json b/public/app/plugins/panels/singlestat/plugin.json
deleted file mode 100644
index 5bc8e536510..00000000000
--- a/public/app/plugins/panels/singlestat/plugin.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "type": "panel",
-  "name": "Singlestat",
-  "id": "singlestat",
-
-  "module": "app/plugins/panels/singlestat/module"
-}
diff --git a/public/app/plugins/panels/table/plugin.json b/public/app/plugins/panels/table/plugin.json
deleted file mode 100644
index 4fdb393b3db..00000000000
--- a/public/app/plugins/panels/table/plugin.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "type": "panel",
-  "name": "Table",
-  "id": "table",
-
-  "module": "app/plugins/panels/table/module"
-}
diff --git a/public/app/plugins/panels/text/plugin.json b/public/app/plugins/panels/text/plugin.json
deleted file mode 100644
index 33c49b2f8a4..00000000000
--- a/public/app/plugins/panels/text/plugin.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "type": "panel",
-  "name": "Text",
-  "id": "text",
-
-  "module": "app/plugins/panels/text/module"
-}
diff --git a/public/test/specs/graph-ctrl-specs.js b/public/test/specs/graph-ctrl-specs.js
index 81be9a40b46..607c13cf528 100644
--- a/public/test/specs/graph-ctrl-specs.js
+++ b/public/test/specs/graph-ctrl-specs.js
@@ -2,7 +2,7 @@ define([
   './helpers',
   'app/features/panel/panel_srv',
   'app/features/panel/panel_helper',
-  'app/plugins/panels/graph/module'
+  'app/plugins/panel/graph/module'
 ], function(helpers) {
   'use strict';
 
diff --git a/public/test/specs/graph-specs.js b/public/test/specs/graph-specs.js
index 29fdeeb825e..db3a4acf61f 100644
--- a/public/test/specs/graph-specs.js
+++ b/public/test/specs/graph-specs.js
@@ -3,7 +3,7 @@ define([
   'angular',
   'jquery',
   'app/core/time_series',
-  'app/plugins/panels/graph/graph'
+  'app/plugins/panel/graph/graph'
 ], function(helpers, angular, $, TimeSeries) {
   'use strict';
 
diff --git a/public/test/specs/graph-tooltip-specs.js b/public/test/specs/graph-tooltip-specs.js
index 9dc84daefa3..de39d855a70 100644
--- a/public/test/specs/graph-tooltip-specs.js
+++ b/public/test/specs/graph-tooltip-specs.js
@@ -1,6 +1,6 @@
 define([
   'jquery',
-  'app/plugins/panels/graph/graph.tooltip'
+  'app/plugins/panel/graph/graph.tooltip'
 ], function($, GraphTooltip) {
   'use strict';
 
diff --git a/public/test/specs/seriesOverridesCtrl-specs.js b/public/test/specs/seriesOverridesCtrl-specs.js
index 1290e5f0987..ba820f065ab 100644
--- a/public/test/specs/seriesOverridesCtrl-specs.js
+++ b/public/test/specs/seriesOverridesCtrl-specs.js
@@ -1,6 +1,6 @@
 define([
   './helpers',
-  'app/plugins/panels/graph/seriesOverridesCtrl'
+  'app/plugins/panel/graph/seriesOverridesCtrl'
 ], function(helpers) {
   'use strict';
 
diff --git a/public/test/specs/singlestat-specs.js b/public/test/specs/singlestat-specs.js
index 14e1ca63cca..733f7f37e98 100644
--- a/public/test/specs/singlestat-specs.js
+++ b/public/test/specs/singlestat-specs.js
@@ -2,7 +2,7 @@ define([
   './helpers',
   'app/features/panel/panel_srv',
   'app/features/panel/panel_helper',
-  'app/plugins/panels/singlestat/module'
+  'app/plugins/panel/singlestat/module'
 ], function(helpers) {
   'use strict';
 
diff --git a/tasks/options/jscs.js b/tasks/options/jscs.js
index c27c1aff09d..8296e59a506 100644
--- a/tasks/options/jscs.js
+++ b/tasks/options/jscs.js
@@ -3,7 +3,7 @@ module.exports = function(config) {
     src: [
       'Gruntfile.js',
       '<%= srcDir %>/app/**/*.js',
-      '<%= srcDir %>/plugins/**/*.js',
+      '<%= srcDir %>/plugin/**/*.js',
       '!<%= srcDir %>/app/dashboards/*'
     ],
     options: {
diff --git a/tasks/options/requirejs.js b/tasks/options/requirejs.js
index fd6603e16f4..ecd28d8c914 100644
--- a/tasks/options/requirejs.js
+++ b/tasks/options/requirejs.js
@@ -62,11 +62,11 @@ module.exports = function(config,grunt) {
     ];
 
     var fs = require('fs');
-    var panelPath = config.srcDir + '/app/plugins/panels';
+    var panelPath = config.srcDir + '/app/plugins/panel';
 
-    // create a module for each directory in public/app/panels/
+    // create a module for each directory in public/app/panel/
     fs.readdirSync(panelPath).forEach(function (panelName) {
-      requireModules[0].include.push('app/plugins/panels/'+panelName+'/module');
+      requireModules[0].include.push('app/plugins/panel/'+panelName+'/module');
     });
 
     return { options: options };
diff --git a/tasks/systemjs_task.js b/tasks/systemjs_task.js
index 6340ce532b8..0f1a63883e0 100644
--- a/tasks/systemjs_task.js
+++ b/tasks/systemjs_task.js
@@ -13,7 +13,7 @@ module.exports = function(grunt) {
     var modules = [
       'app/app',
       'app/features/all',
-      'app/plugins/panels/**/module',
+      'app/plugins/panel/**/module',
       'app/plugins/datasource/graphite/datasource',
       'app/plugins/datasource/influxdb/datasource',
       'app/plugins/datasource/elasticsearch/datasource',