diff --git a/platform/features/plot/src/PlotController.js b/platform/features/plot/src/PlotController.js
index 215b723946..c18f60b4a1 100644
--- a/platform/features/plot/src/PlotController.js
+++ b/platform/features/plot/src/PlotController.js
@@ -5,15 +5,23 @@
  */
 define(
     [
-        "./PlotPreparer",
-        "./PlotPalette",
-        "./PlotPanZoomStack",
-        "./PlotPosition",
-        "./PlotTickGenerator",
-        "./PlotFormatter",
-        "./PlotAxis"
+        "./elements/PlotPreparer",
+        "./elements/PlotPalette",
+        "./elements/PlotPanZoomStack",
+        "./elements/PlotPosition",
+        "./elements/PlotTickGenerator",
+        "./elements/PlotFormatter",
+        "./elements/PlotAxis"
     ],
-    function (PlotPreparer, PlotPalette, PlotPanZoomStack, PlotPosition, PlotTickGenerator, PlotFormatter, PlotAxis) {
+    function (
+        PlotPreparer,
+        PlotPalette,
+        PlotPanZoomStack,
+        PlotPosition,
+        PlotTickGenerator,
+        PlotFormatter,
+        PlotAxis
+    ) {
         "use strict";
 
         var AXIS_DEFAULTS = [
diff --git a/platform/features/plot/src/PlotAxis.js b/platform/features/plot/src/elements/PlotAxis.js
similarity index 100%
rename from platform/features/plot/src/PlotAxis.js
rename to platform/features/plot/src/elements/PlotAxis.js
diff --git a/platform/features/plot/src/PlotFormatter.js b/platform/features/plot/src/elements/PlotFormatter.js
similarity index 94%
rename from platform/features/plot/src/PlotFormatter.js
rename to platform/features/plot/src/elements/PlotFormatter.js
index c1bfed34bb..49af46698d 100644
--- a/platform/features/plot/src/PlotFormatter.js
+++ b/platform/features/plot/src/elements/PlotFormatter.js
@@ -1,7 +1,7 @@
 /*global define,moment*/
 
 define(
-    ["../lib/moment.min"],
+    ["../../lib/moment.min"],
     function () {
         "use strict";
 
diff --git a/platform/features/plot/src/PlotPalette.js b/platform/features/plot/src/elements/PlotPalette.js
similarity index 100%
rename from platform/features/plot/src/PlotPalette.js
rename to platform/features/plot/src/elements/PlotPalette.js
diff --git a/platform/features/plot/src/PlotPanZoomStack.js b/platform/features/plot/src/elements/PlotPanZoomStack.js
similarity index 100%
rename from platform/features/plot/src/PlotPanZoomStack.js
rename to platform/features/plot/src/elements/PlotPanZoomStack.js
diff --git a/platform/features/plot/src/PlotPosition.js b/platform/features/plot/src/elements/PlotPosition.js
similarity index 100%
rename from platform/features/plot/src/PlotPosition.js
rename to platform/features/plot/src/elements/PlotPosition.js
diff --git a/platform/features/plot/src/PlotPreparer.js b/platform/features/plot/src/elements/PlotPreparer.js
similarity index 100%
rename from platform/features/plot/src/PlotPreparer.js
rename to platform/features/plot/src/elements/PlotPreparer.js
diff --git a/platform/features/plot/src/PlotTickGenerator.js b/platform/features/plot/src/elements/PlotTickGenerator.js
similarity index 100%
rename from platform/features/plot/src/PlotTickGenerator.js
rename to platform/features/plot/src/elements/PlotTickGenerator.js