diff --git a/samples/AnimationCallbacks/progress-bar.html b/samples/animation/progress-bar.html
similarity index 95%
rename from samples/AnimationCallbacks/progress-bar.html
rename to samples/animation/progress-bar.html
index ddfc12e3c..b0c495a02 100644
--- a/samples/AnimationCallbacks/progress-bar.html
+++ b/samples/animation/progress-bar.html
@@ -3,7 +3,7 @@
 <head>
 	<title> Animation Callbacks </title>
     <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../utils.js"></script>
     <style>
     canvas {
         -moz-user-select: none;
@@ -23,13 +23,7 @@
     <button id="randomizeData">Randomize Data</button>
     <script>
         var MONTHS = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
-
-        var randomScalingFactor = function() {
-            return Math.round(Math.random() * 100);
-        };
-
         var progress = document.getElementById('animationProgress');
-
         var config = {
             type: 'line',
             data: {
diff --git a/samples/bar/bar-horizontal.html b/samples/bar/bar-horizontal.html
index 4759dd327..affcc3349 100644
--- a/samples/bar/bar-horizontal.html
+++ b/samples/bar/bar-horizontal.html
@@ -4,7 +4,7 @@
 <head>
     <title>Horizontal Bar Chart</title>
     <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../utils.js"></script>
     <style>
     canvas {
         -moz-user-select: none;
@@ -25,19 +25,7 @@
     <button id="removeData">Remove Data</button>
     <script>
         var MONTHS = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
-
-        var randomScalingFactor = function() {
-            return (Math.random() > 0.5 ? 1.0 : -1.0) * Math.round(Math.random() * 100);
-        };
-        var randomColorFactor = function() {
-            return Math.round(Math.random() * 255);
-        };
-        var randomColor = function() {
-            return 'rgba(' + randomColorFactor() + ',' + randomColorFactor() + ',' + randomColorFactor() + ',.7)';
-        };
-
         var color = Chart.helpers.color;
-
         var horizontalBarChartData = {
             labels: ["January", "February", "March", "April", "May", "June", "July"],
             datasets: [{
diff --git a/samples/bar/bar-multi-axis.html b/samples/bar/bar-multi-axis.html
index 2a6caa8a2..b35e89055 100644
--- a/samples/bar/bar-multi-axis.html
+++ b/samples/bar/bar-multi-axis.html
@@ -4,7 +4,7 @@
 <head>
     <title>Bar Chart Multi Axis</title>
     <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../utils.js"></script>
     <style>
     canvas {
         -moz-user-select: none;
@@ -20,10 +20,6 @@
     </div>
     <button id="randomizeData">Randomize Data</button>
     <script>
-    var randomScalingFactor = function() {
-        return (Math.random() > 0.5 ? 1.0 : -1.0) * Math.round(Math.random() * 100);
-    };
-
     var barChartData = {
         labels: ["January", "February", "March", "April", "May", "June", "July"],
         datasets: [{
diff --git a/samples/bar/bar-stacked.html b/samples/bar/bar-stacked.html
index 60bf26f54..f80b1b6ed 100644
--- a/samples/bar/bar-stacked.html
+++ b/samples/bar/bar-stacked.html
@@ -4,7 +4,7 @@
 <head>
     <title>Stacked Bar Chart</title>
     <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../utils.js"></script>
     <style>
     canvas {
         -moz-user-select: none;
@@ -20,10 +20,6 @@
     </div>
     <button id="randomizeData">Randomize Data</button>
     <script>
-        var randomScalingFactor = function() {
-            return (Math.random() > 0.5 ? 1.0 : -1.0) * Math.round(Math.random() * 100);
-        };
-
         var barChartData = {
             labels: ["January", "February", "March", "April", "May", "June", "July"],
             datasets: [{
diff --git a/samples/bar/bar.html b/samples/bar/bar.html
index d46502e67..d2fc4acac 100644
--- a/samples/bar/bar.html
+++ b/samples/bar/bar.html
@@ -4,7 +4,7 @@
 <head>
     <title>Bar Chart</title>
     <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../utils.js"></script>
     <style>
     canvas {
         -moz-user-select: none;
@@ -25,17 +25,6 @@
     <button id="removeData">Remove Data</button>
     <script>
         var MONTHS = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
-
-        var randomScalingFactor = function() {
-            return (Math.random() > 0.5 ? 1.0 : -1.0) * Math.round(Math.random() * 100);
-        };
-        var randomColorFactor = function() {
-            return Math.round(Math.random() * 255);
-        };
-        var randomColor = function() {
-            return 'rgba(' + randomColorFactor() + ',' + randomColorFactor() + ',' + randomColorFactor() + ',.7)';
-        };
-
         var color = Chart.helpers.color;
         var barChartData = {
             labels: ["January", "February", "March", "April", "May", "June", "July"],
diff --git a/samples/bubble.html b/samples/bubble.html
index bde0f70cf..d62d63759 100644
--- a/samples/bubble.html
+++ b/samples/bubble.html
@@ -4,7 +4,7 @@
 <head>
     <title>Bubble Chart</title>
     <script src="../dist/Chart.bundle.js"></script>
-    <script src="chartColors.js"></script>
+    <script src="utils.js"></script>
     <style type="text/css">
     canvas{
         -moz-user-select: none;
@@ -27,11 +27,6 @@
         var DEFAULT_DATASET_SIZE = 7;
 
         var addedCount = 0;
-
-        var randomScalingFactor = function() {
-            return (Math.random() > 0.5 ? 1.0 : -1.0) * Math.round(Math.random() * 100);
-        };
-
         var color = Chart.helpers.color;
         var bubbleChartData = {
             animation: {
diff --git a/samples/combo-bar-line.html b/samples/combo-bar-line.html
index db6c3aa07..c8b5a08f8 100644
--- a/samples/combo-bar-line.html
+++ b/samples/combo-bar-line.html
@@ -4,7 +4,7 @@
 <head>
     <title>Combo Bar-Line Chart</title>
     <script src="../dist/Chart.bundle.js"></script>
-    <script src="chartColors.js"></script>
+    <script src="utils.js"></script>
     <style>
     canvas {
         -moz-user-select: none;
@@ -20,10 +20,6 @@
     </div>
     <button id="randomizeData">Randomize Data</button>
     <script>
-        var randomScalingFactor = function() {
-            return (Math.random() > 0.5 ? 1.0 : -1.0) * Math.round(Math.random() * 100);
-        };
-
         var chartData = {
             labels: ["January", "February", "March", "April", "May", "June", "July"],
             datasets: [{
diff --git a/samples/data_labelling.html b/samples/data_labelling.html
index 849de80d3..939e517a9 100644
--- a/samples/data_labelling.html
+++ b/samples/data_labelling.html
@@ -5,7 +5,7 @@
 <head>
     <title>Labelling Data Points</title>
     <script src="../dist/Chart.bundle.js"></script>
-    <script src="chartColors.js"></script>
+    <script src="utils.js"></script>
     <style>
     canvas {
         -moz-user-select: none;
@@ -21,10 +21,6 @@
     </div>
     <button id="randomizeData">Randomize Data</button>
     <script>
-        var randomScalingFactor = function() {
-            return (Math.random() > 0.5 ? 1.0 : -1.0) * Math.round(Math.random() * 100);
-        };
-
         var color = Chart.helpers.color;
         var barChartData = {
             labels: ["January", "February", "March", "April", "May", "June", "July"],
diff --git a/samples/doughnut.html b/samples/doughnut.html
index e2fd662d8..51b98a82a 100644
--- a/samples/doughnut.html
+++ b/samples/doughnut.html
@@ -4,7 +4,7 @@
 <head>
     <title>Doughnut Chart</title>
     <script src="../dist/Chart.bundle.js"></script>
-    <script src="chartColors.js"></script>
+    <script src="utils.js"></script>
     <style>
     canvas {
         -moz-user-select: none;
diff --git a/samples/legend/pointstyle.html b/samples/legend/pointstyle.html
index e90b63def..727c7a6d8 100644
--- a/samples/legend/pointstyle.html
+++ b/samples/legend/pointstyle.html
@@ -4,7 +4,7 @@
 <head>
     <title>Legend Point Style</title>
     <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../utils.js"></script>
     <style>
         canvas {
             -moz-user-select: none;
@@ -35,10 +35,6 @@
         </div>
     </div>
     <script>
-        var randomScalingFactor = function() {
-            return Math.round(Math.random() * 100 * (Math.random() > 0.5 ? -1 : 1));
-        };
-
         var color = Chart.helpers.color;
         function createConfig(colorName) {
             return {
diff --git a/samples/legend/positions.html b/samples/legend/positions.html
index f1edd7c6f..97bc70fa0 100644
--- a/samples/legend/positions.html
+++ b/samples/legend/positions.html
@@ -4,7 +4,7 @@
 <head>
     <title>Legend Positions</title>
     <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../utils.js"></script>
     <style>
         canvas {
             -moz-user-select: none;
@@ -41,10 +41,6 @@
         </div>
     </div>
     <script>
-        var randomScalingFactor = function() {
-            return Math.round(Math.random() * 100 * (Math.random() > 0.5 ? -1 : 1));
-        };
-
         var color = Chart.helpers.color;
         function createConfig(legendPosition, colorName) {
             return {
diff --git a/samples/line/different-point-sizes.html b/samples/line/different-point-sizes.html
index 3137367f7..ed52cf0ae 100644
--- a/samples/line/different-point-sizes.html
+++ b/samples/line/different-point-sizes.html
@@ -4,7 +4,7 @@
 <head>
     <title>Different Point Sizes</title>
     <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../utils.js"></script>
     <style>
         canvas {
             -moz-user-select: none;
@@ -20,10 +20,6 @@
     </div>
     <script>
         var MONTHS = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
-        var randomScalingFactor = function() {
-            return Math.round(Math.random() * 100 * (Math.random() > 0.5 ? -1 : 1));
-        };
-
         var config = {
             type: 'line',
             data: {
diff --git a/samples/line/interpolation-modes.html b/samples/line/interpolation-modes.html
index 51469c933..ff75210a6 100644
--- a/samples/line/interpolation-modes.html
+++ b/samples/line/interpolation-modes.html
@@ -4,7 +4,7 @@
 <head>
     <title>Line Chart - Cubic interpolation mode</title>
     <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../utils.js"></script>
     <style>
     canvas{
         -moz-user-select: none;
diff --git a/samples/line/line-multi-axis.html b/samples/line/line-multi-axis.html
index f51e297dc..debdf369f 100644
--- a/samples/line/line-multi-axis.html
+++ b/samples/line/line-multi-axis.html
@@ -4,7 +4,7 @@
 <head>
     <title>Line Chart Multiple Axes</title>
     <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../utils.js"></script>
     <style>
     canvas {
         -moz-user-select: none;
@@ -20,10 +20,6 @@
     </div>
     <button id="randomizeData">Randomize Data</button>
     <script>
-    var randomScalingFactor = function() {
-        return Math.round(Math.random() * 100 * (Math.random() > 0.5 ? -1 : 1));
-    };
-
     var lineChartData = {
         labels: ["January", "February", "March", "April", "May", "June", "July"],
         datasets: [{
diff --git a/samples/line/line-skip-points.html b/samples/line/line-skip-points.html
index a40571d2c..bb8c8c4c8 100644
--- a/samples/line/line-skip-points.html
+++ b/samples/line/line-skip-points.html
@@ -4,7 +4,7 @@
 <head>
     <title>Line Chart</title>
     <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../utils.js"></script>
     <style>
     canvas {
         -moz-user-select: none;
@@ -19,10 +19,6 @@
         <canvas id="canvas"></canvas>
     </div>
     <script>
-        var randomScalingFactor = function() {
-            return Math.round(Math.random() * 100);
-        };
-
         var config = {
             type: 'line',
             data: {
diff --git a/samples/line/line-stacked-area.html b/samples/line/line-stacked-area.html
index a194bba3b..9621c14d5 100644
--- a/samples/line/line-stacked-area.html
+++ b/samples/line/line-stacked-area.html
@@ -4,7 +4,7 @@
 <head>
 	<title>Line Chart</title>
 	<script src="../../dist/Chart.bundle.js"></script>
-	<script src="../chartColors.js"></script>
+	<script src="../utils.js"></script>
 	<style>
 		canvas {
 				-moz-user-select: none;
@@ -27,11 +27,6 @@
 	<button id="removeData">Remove Data</button>
 	<script>
 		var MONTHS = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
-
-		var randomScalingFactor = function() {
-			return Math.round(Math.random() * 100 * (Math.random() > 0.5 ? -1 : 1));
-		};
-
 		var config = {
 			type: 'line',
 			data: {
diff --git a/samples/line/line-stepped.html b/samples/line/line-stepped.html
index 94cc61520..ff1bf2a6e 100644
--- a/samples/line/line-stepped.html
+++ b/samples/line/line-stepped.html
@@ -4,7 +4,7 @@
 <head>
     <title>Stepped Line Chart</title>
     <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../utils.js"></script>
     <style>
     canvas{
         -moz-user-select: none;
@@ -19,9 +19,6 @@
         <canvas id="canvas"></canvas>
     </div>
     <script>
-        var randomScalingFactor = function() {
-            return (Math.random() > 0.5 ? -1 : 1) * Math.round(Math.random() * 100);
-        };
         var config = {
             type: 'line',
             data: {
diff --git a/samples/line/line-styles.html b/samples/line/line-styles.html
index a2c06f935..0ac3aabdb 100644
--- a/samples/line/line-styles.html
+++ b/samples/line/line-styles.html
@@ -4,7 +4,7 @@
 <head>
     <title>Line Styles</title>
     <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../utils.js"></script>
     <style>
     canvas{
         -moz-user-select: none;
@@ -19,10 +19,6 @@
         <canvas id="canvas"></canvas>
     </div>
     <script>
-        var randomScalingFactor = function() {
-            return Math.round(Math.random() * 100);
-        };
-
         var config = {
             type: 'line',
             data: {
diff --git a/samples/line/line.html b/samples/line/line.html
index 980feb747..68ae7e5f6 100644
--- a/samples/line/line.html
+++ b/samples/line/line.html
@@ -4,7 +4,7 @@
 <head>
     <title>Line Chart</title>
     <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../utils.js"></script>
     <style>
     canvas{
         -moz-user-select: none;
@@ -27,11 +27,6 @@
     <button id="removeData">Remove Data</button>
     <script>
         var MONTHS = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
-        
-        var randomScalingFactor = function() {
-            return Math.round(Math.random() * 100);
-        };
-
         var config = {
             type: 'line',
             data: {
diff --git a/samples/line/point-styles.html b/samples/line/point-styles.html
index ff7586355..547b1ea0a 100644
--- a/samples/line/point-styles.html
+++ b/samples/line/point-styles.html
@@ -4,7 +4,7 @@
 <head>
     <title>Line Chart</title>
     <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../utils.js"></script>
     <style>
     canvas{
         -moz-user-select: none;
@@ -52,6 +52,9 @@
                         display:true,
                         text:'Point Style: ' + pointStyle
                     },
+                    legend: {
+                        display: false
+                    },
                     elements: {
                         point: {
                             pointStyle: pointStyle
diff --git a/samples/pie.html b/samples/pie.html
index 2b1578536..c299af961 100644
--- a/samples/pie.html
+++ b/samples/pie.html
@@ -4,7 +4,7 @@
 <head>
     <title>Pie Chart</title>
     <script src="../dist/Chart.bundle.js"></script>
-    <script src="chartColors.js"></script>
+    <script src="utils.js"></script>
 </head>
 
 <body>
diff --git a/samples/polar-area.html b/samples/polar-area.html
index 0b382c484..48fe984af 100644
--- a/samples/polar-area.html
+++ b/samples/polar-area.html
@@ -4,7 +4,7 @@
 <head>
     <title>Polar Area Chart</title>
     <script src="../dist/Chart.bundle.js"></script>
-    <script src="chartColors.js"></script>
+    <script src="utils.js"></script>
     <style>
     canvas {
         -moz-user-select: none;
diff --git a/samples/radar/radar-skip-points.html b/samples/radar/radar-skip-points.html
index 40ad4779e..ab29b3a0e 100644
--- a/samples/radar/radar-skip-points.html
+++ b/samples/radar/radar-skip-points.html
@@ -4,7 +4,7 @@
 <head>
     <title>Radar Chart</title>
     <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../utils.js"></script>
     <style>
     canvas {
         -moz-user-select: none;
diff --git a/samples/radar/radar.html b/samples/radar/radar.html
index 98bc7086d..507d5bb47 100644
--- a/samples/radar/radar.html
+++ b/samples/radar/radar.html
@@ -4,7 +4,7 @@
 <head>
     <title>Radar Chart</title>
     <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../utils.js"></script>
     <style>
     canvas {
         -moz-user-select: none;
diff --git a/samples/generalScales/display-settings.html b/samples/scales/display-settings.html
similarity index 98%
rename from samples/generalScales/display-settings.html
rename to samples/scales/display-settings.html
index 71f1c518c..0c2dc114e 100644
--- a/samples/generalScales/display-settings.html
+++ b/samples/scales/display-settings.html
@@ -4,7 +4,7 @@
 <head>
     <title>Suggested Min/Max Settings</title>
     <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../utils.js"></script>
     <style>
     canvas{
         -moz-user-select: none;
diff --git a/samples/generalScales/filtering-labels.html b/samples/scales/filtering-labels.html
similarity index 98%
rename from samples/generalScales/filtering-labels.html
rename to samples/scales/filtering-labels.html
index 21cb0cc89..4af89025e 100644
--- a/samples/generalScales/filtering-labels.html
+++ b/samples/scales/filtering-labels.html
@@ -4,7 +4,7 @@
 <head>
     <title>Chart with xAxis Filtering</title>
     <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../utils.js"></script>
     <style>
     canvas {
         -moz-user-select: none;
diff --git a/samples/generalScales/gridlines.html b/samples/scales/gridlines.html
similarity index 97%
rename from samples/generalScales/gridlines.html
rename to samples/scales/gridlines.html
index e133e4e8d..76bb1f007 100644
--- a/samples/generalScales/gridlines.html
+++ b/samples/scales/gridlines.html
@@ -4,7 +4,7 @@
 <head>
     <title>Suggested Min/Max Settings</title>
     <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../utils.js"></script>
     <style>
     canvas{
         -moz-user-select: none;
diff --git a/samples/generalScales/line-non-numeric-y.html b/samples/scales/line-non-numeric-y.html
similarity index 82%
rename from samples/generalScales/line-non-numeric-y.html
rename to samples/scales/line-non-numeric-y.html
index 3ec760e92..07e319b70 100644
--- a/samples/generalScales/line-non-numeric-y.html
+++ b/samples/scales/line-non-numeric-y.html
@@ -4,7 +4,7 @@
 <head>
     <title>Line Chart</title>
     <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../utils.js"></script>
     <style>
     canvas{
         -moz-user-select: none;
@@ -20,18 +20,6 @@
     </div>
     <script>
         var MONTHS = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
-        
-        var randomScalingFactor = function() {
-            return Math.round(Math.random() * 100);
-            //return 0;
-        };
-        var randomColorFactor = function() {
-            return Math.round(Math.random() * 255);
-        };
-        var randomColor = function(opacity) {
-            return 'rgba(' + randomColorFactor() + ',' + randomColorFactor() + ',' + randomColorFactor() + ',' + (opacity || '.3') + ')';
-        };
-
         var config = {
             type: 'line',
             data: {
diff --git a/samples/linearScale/min-max-settings.html b/samples/scales/linear/min-max-settings.html
similarity index 94%
rename from samples/linearScale/min-max-settings.html
rename to samples/scales/linear/min-max-settings.html
index 529eb481f..868bc7b1d 100644
--- a/samples/linearScale/min-max-settings.html
+++ b/samples/scales/linear/min-max-settings.html
@@ -3,8 +3,8 @@
 
 <head>
     <title>Min/Max Settings</title>
-    <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../../../dist/Chart.bundle.js"></script>
+    <script src="../../utils.js"></script>
     <style>
     canvas{
         -moz-user-select: none;
diff --git a/samples/linearScale/step-size.html b/samples/scales/linear/step-size.html
similarity index 97%
rename from samples/linearScale/step-size.html
rename to samples/scales/linear/step-size.html
index c65cc9ab4..d38f3e1f0 100644
--- a/samples/linearScale/step-size.html
+++ b/samples/scales/linear/step-size.html
@@ -3,8 +3,8 @@
 
 <head>
     <title>Line Chart</title>
-    <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../../../dist/Chart.bundle.js"></script>
+    <script src="../../utils.js"></script>
     <style>
     canvas{
         -moz-user-select: none;
diff --git a/samples/linearScale/suggested-min-max-settings.html b/samples/scales/linear/suggested-min-max-settings.html
similarity index 95%
rename from samples/linearScale/suggested-min-max-settings.html
rename to samples/scales/linear/suggested-min-max-settings.html
index 54396f92e..18059548a 100644
--- a/samples/linearScale/suggested-min-max-settings.html
+++ b/samples/scales/linear/suggested-min-max-settings.html
@@ -3,8 +3,8 @@
 
 <head>
     <title>Suggested Min/Max Settings</title>
-    <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../../../dist/Chart.bundle.js"></script>
+    <script src="../../utils.js"></script>
     <style>
     canvas{
         -moz-user-select: none;
diff --git a/samples/logarithmicScale/line-logarithmic.html b/samples/scales/logarithmic/line-logarithmic.html
similarity index 96%
rename from samples/logarithmicScale/line-logarithmic.html
rename to samples/scales/logarithmic/line-logarithmic.html
index fe3d5b110..2c961abd2 100644
--- a/samples/logarithmicScale/line-logarithmic.html
+++ b/samples/scales/logarithmic/line-logarithmic.html
@@ -3,8 +3,8 @@
 
 <head>
     <title>Logarithmic Line Chart</title>
-    <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../../../dist/Chart.bundle.js"></script>
+    <script src="../../utils.js"></script>
     <style>
     canvas {
         -moz-user-select: none;
diff --git a/samples/logarithmicScale/scatter-logX.html b/samples/scales/logarithmic/scatter-logX.html
similarity index 96%
rename from samples/logarithmicScale/scatter-logX.html
rename to samples/scales/logarithmic/scatter-logX.html
index 6864b4090..a4bd577c2 100644
--- a/samples/logarithmicScale/scatter-logX.html
+++ b/samples/scales/logarithmic/scatter-logX.html
@@ -3,8 +3,8 @@
 
 <head>
     <title>Scatter Chart</title>
-    <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../../../dist/Chart.bundle.js"></script>
+    <script src="../../utils.js"></script>
     <style>
     canvas {
         -moz-user-select: none;
diff --git a/samples/generalScales/multiline-labels.html b/samples/scales/multiline-labels.html
similarity index 98%
rename from samples/generalScales/multiline-labels.html
rename to samples/scales/multiline-labels.html
index 006c28ede..b7bb041e9 100644
--- a/samples/generalScales/multiline-labels.html
+++ b/samples/scales/multiline-labels.html
@@ -4,7 +4,7 @@
 <head>
     <title>Line Chart</title>
     <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../utils.js"></script>
     <style>
     canvas{
         -moz-user-select: none;
diff --git a/samples/timeScale/combo-time-scale.html b/samples/scales/time/combo-time-scale.html
similarity index 95%
rename from samples/timeScale/combo-time-scale.html
rename to samples/scales/time/combo-time-scale.html
index 23a5f777e..873e40d1a 100644
--- a/samples/timeScale/combo-time-scale.html
+++ b/samples/scales/time/combo-time-scale.html
@@ -4,8 +4,8 @@
 <head>
 	<title>Line Chart - Combo Time Scale</title>
 	<script src="http://cdnjs.cloudflare.com/ajax/libs/moment.js/2.13.0/moment.min.js"></script>
-	<script src="../../dist/Chart.js"></script>
-	<script src="../chartColors.js"></script>
+	<script src="../../../dist/Chart.js"></script>
+	<script src="../../utils.js"></script>
 	<style>
     canvas {
         -moz-user-select: none;
@@ -29,10 +29,6 @@
 	<script>
 		var timeFormat = 'MM/DD/YYYY HH:mm';
 
-		function randomScalingFactor() {
-			return Math.round(Math.random() * 100 * (Math.random() > 0.5 ? -1 : 1));
-		}
-
 		function newDateString(days) {
 			return moment().add(days, 'd').format(timeFormat);
 		}
diff --git a/samples/timeScale/line-time-point-data.html b/samples/scales/time/line-time-point-data.html
similarity index 94%
rename from samples/timeScale/line-time-point-data.html
rename to samples/scales/time/line-time-point-data.html
index 7d90c6b0b..d880515f5 100644
--- a/samples/timeScale/line-time-point-data.html
+++ b/samples/scales/time/line-time-point-data.html
@@ -4,8 +4,8 @@
 <head>
 	<title>Time Scale Point Data</title>
 	<script src="http://cdnjs.cloudflare.com/ajax/libs/moment.js/2.13.0/moment.min.js"></script>
-	<script src="../../dist/Chart.js"></script>
-	<script src="../chartColors.js"></script>
+	<script src="../../../dist/Chart.js"></script>
+	<script src="../../utils.js"></script>
 	<style>
     canvas {
         -moz-user-select: none;
@@ -25,10 +25,6 @@
 	<button id="addData">Add Data</button>
 	<button id="removeData">Remove Data</button>
 	<script>
-		function randomScalingFactor() {
-			return Math.round(Math.random() * 100 * (Math.random() > 0.5 ? -1 : 1));
-		}
-
 		function newDate(days) {
 			return moment().add(days, 'd').toDate();
 		}
diff --git a/samples/timeScale/line-time-scale.html b/samples/scales/time/line-time-scale.html
similarity index 96%
rename from samples/timeScale/line-time-scale.html
rename to samples/scales/time/line-time-scale.html
index e48d92c02..b1645e0dd 100644
--- a/samples/timeScale/line-time-scale.html
+++ b/samples/scales/time/line-time-scale.html
@@ -4,8 +4,8 @@
 <head>
 	<title>Line Chart</title>
 	<script src="http://cdnjs.cloudflare.com/ajax/libs/moment.js/2.13.0/moment.min.js"></script>
-	<script src="../../dist/Chart.js"></script>
-	<script src="../chartColors.js"></script>
+	<script src="../../../dist/Chart.js"></script>
+	<script src="../../utils.js"></script>
 	<style>
     canvas {
         -moz-user-select: none;
@@ -28,11 +28,7 @@
 	<button id="removeData">Remove Data</button>
 	<script>
 		var timeFormat = 'MM/DD/YYYY HH:mm';
-
-		function randomScalingFactor() {
-			return Math.round(Math.random() * 100 * (Math.random() > 0.5 ? -1 : 1));
-		}
-
+		
 		function newDate(days) {
 			return moment().add(days, 'd').toDate();
 		}
diff --git a/samples/scatter/scatter-multi-axis.html b/samples/scatter/scatter-multi-axis.html
index 96edac994..aedcd3daa 100644
--- a/samples/scatter/scatter-multi-axis.html
+++ b/samples/scatter/scatter-multi-axis.html
@@ -4,7 +4,7 @@
 <head>
 	<title>Scatter Chart Multi Axis</title>
 	<script src="../../dist/Chart.bundle.js"></script>
-	<script src="../chartColors.js"></script>
+	<script src="../utils.js"></script>
 	<style>
 	canvas {
 		-moz-user-select: none;
@@ -20,10 +20,6 @@
 	</div>
 	<button id="randomizeData">Randomize Data</button>
 	<script>
-	var randomScalingFactor = function() {
-		return (Math.random() > 0.5 ? 1.0 : -1.0) * Math.round(Math.random() * 100);
-	};
-
 	var color = Chart.helpers.color;
 	var scatterChartData = {
 		datasets: [{
diff --git a/samples/scatter/scatter.html b/samples/scatter/scatter.html
index c5de6bae0..b8ac32b8f 100644
--- a/samples/scatter/scatter.html
+++ b/samples/scatter/scatter.html
@@ -4,7 +4,7 @@
 <head>
     <title>Scatter Chart</title>
     <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../utils.js"></script>
     <style>
     canvas {
         -moz-user-select: none;
@@ -20,10 +20,6 @@
     </div>
     <button id="randomizeData">Randomize Data</button>
     <script>
-        var randomScalingFactor = function() {
-            return (Math.random() > 0.5 ? 1.0 : -1.0) * Math.round(Math.random() * 100);
-        };
-
         var color = Chart.helpers.color;
         var scatterChartData = {
             datasets: [{
diff --git a/samples/tooltips/dataPoints-customTooltips.html b/samples/tooltips/dataPoints-customTooltips.html
index 1ae7f90ab..b9e981675 100644
--- a/samples/tooltips/dataPoints-customTooltips.html
+++ b/samples/tooltips/dataPoints-customTooltips.html
@@ -4,7 +4,7 @@
 <head>
 	<title>Custom Tooltips using Data Points</title>
 	<script src="../../dist/Chart.bundle.js"></script>
-	<script src="../chartColors.js"></script>
+	<script src="../utils.js"></script>
 	<script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
 	<style>
 		canvas{
@@ -66,9 +66,6 @@
 				});
 			}
 		};
-		var randomScalingFactor = function() {
-			return Math.round(Math.random() * 100);
-		};
 		var color = Chart.helpers.color;
 		var lineChartData = {
 			labels: ["January", "February", "March", "April", "May", "June", "July"],
diff --git a/samples/tooltips/interaction-modes.html b/samples/tooltips/interaction-modes.html
index bf9bf971a..f3dec217f 100644
--- a/samples/tooltips/interaction-modes.html
+++ b/samples/tooltips/interaction-modes.html
@@ -4,7 +4,7 @@
 <head>
 	<title>Tooltip Interaction Modes</title>
 	<script src="../../dist/Chart.bundle.js"></script>
-	<script src="../chartColors.js"></script>
+	<script src="../utils.js"></script>
 	<style>
 	canvas {
 		-moz-user-select: none;
diff --git a/samples/tooltips/line-customTooltips.html b/samples/tooltips/line-customTooltips.html
index cc6e356b3..97f543b26 100644
--- a/samples/tooltips/line-customTooltips.html
+++ b/samples/tooltips/line-customTooltips.html
@@ -4,7 +4,7 @@
 <head>
 	<title>Line Chart with Custom Tooltips</title>
 	<script src="../../dist/Chart.bundle.js"></script>
-	<script src="../chartColors.js"></script>
+	<script src="../utils.js"></script>
 	<style>
 		canvas{
 			-moz-user-select: none;
@@ -106,10 +106,7 @@
 			tooltipEl.style.fontStyle = tooltip._fontStyle;
 			tooltipEl.style.padding = tooltip.yPadding + 'px ' + tooltip.xPadding + 'px';
 		};
-		
-		var randomScalingFactor = function() {
-			return Math.round(Math.random() * 100);
-		};
+
 		var lineChartData = {
 			labels: ["January", "February", "March", "April", "May", "June", "July"],
 			datasets: [{
diff --git a/samples/tooltips/pie-customTooltips.html b/samples/tooltips/pie-customTooltips.html
index abc047bfd..4eedd6a3a 100644
--- a/samples/tooltips/pie-customTooltips.html
+++ b/samples/tooltips/pie-customTooltips.html
@@ -4,7 +4,7 @@
 <head>
 		<title>Pie Chart with Custom Tooltips</title>
 		<script src="../../dist/Chart.bundle.js"></script>
-		<script src="../chartColors.js"></script>
+		<script src="../utils.js"></script>
 
 		<style>
 		#canvas-holder {
diff --git a/samples/tooltips/position-modes.html b/samples/tooltips/position-modes.html
index 596eb6dfe..03ad88214 100644
--- a/samples/tooltips/position-modes.html
+++ b/samples/tooltips/position-modes.html
@@ -4,7 +4,7 @@
 <head>
 	<title>Tooltip Interaction Modes</title>
 	<script src="../../dist/Chart.bundle.js"></script>
-	<script src="../chartColors.js"></script>
+	<script src="../utils.js"></script>
 	<style>
 	canvas {
 		-moz-user-select: none;
diff --git a/samples/tooltips/tooltip-callbacks.html b/samples/tooltips/tooltip-callbacks.html
index 397348b01..590edd1a2 100644
--- a/samples/tooltips/tooltip-callbacks.html
+++ b/samples/tooltips/tooltip-callbacks.html
@@ -4,7 +4,7 @@
 <head>
     <title>Tooltip Hooks</title>
     <script src="../../dist/Chart.bundle.js"></script>
-    <script src="../chartColors.js"></script>
+    <script src="../utils.js"></script>
     <style>
     canvas {
         -moz-user-select: none;
@@ -19,10 +19,6 @@
         <canvas id="canvas"></canvas>
     </div>
     <script>
-        var randomScalingFactor = function() {
-            return Math.round(Math.random() * 100 * (Math.random() > 0.5 ? -1 : 1));
-        };
-
         var config = {
             type: 'line',
             data: {
diff --git a/samples/chartColors.js b/samples/utils.js
similarity index 64%
rename from samples/chartColors.js
rename to samples/utils.js
index c63678fb5..34965ce66 100644
--- a/samples/chartColors.js
+++ b/samples/utils.js
@@ -6,4 +6,8 @@ window.chartColors = {
 	blue: 'rgb(54, 162, 235)',
 	purple: 'rgb(153, 102, 255)',
 	grey: 'rgb(231,233,237)'
+};
+
+window.randomScalingFactor = function() {
+	return (Math.random() > 0.5 ? 1.0 : -1.0) * Math.round(Math.random() * 100);
 }
\ No newline at end of file
