diff --git a/Gruntfile.js b/Gruntfile.js
index 9a0a046..6f8e8c7 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -16,7 +16,7 @@ module.exports = function(grunt) {
             dist: {
                 expand: true,
                 flatten: true,
-                src: ["jquery.*.js", "!jquery.js"],
+                src: ["src/**/*.js"],
                 dest: "dist/",
                 rename: function(base, path) {
                     return base + path.replace(/\.js/, ".min.js");
@@ -29,7 +29,7 @@ module.exports = function(grunt) {
                 src: "Gruntfile.js"
             },
             flot: {
-                src: ["jquery.flot*.js"]
+                src: ["src/**/*.js"]
             }
         },
         watch: {
diff --git a/examples/ajax/index.html b/examples/ajax/index.html
index be0ff74..ea100a4 100644
--- a/examples/ajax/index.html
+++ b/examples/ajax/index.html
@@ -7,7 +7,7 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
 	<script type="text/javascript">
 
 	$(function() {
diff --git a/examples/annotating/index.html b/examples/annotating/index.html
index c88d017..853b3bd 100644
--- a/examples/annotating/index.html
+++ b/examples/annotating/index.html
@@ -7,7 +7,7 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
 	<script type="text/javascript">
 
 	$(function() {
diff --git a/examples/axes-interacting/index.html b/examples/axes-interacting/index.html
index eb2f20e..cffe0c0 100644
--- a/examples/axes-interacting/index.html
+++ b/examples/axes-interacting/index.html
@@ -7,7 +7,7 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
 	<script type="text/javascript">
 
 	$(function() {
diff --git a/examples/axes-multiple/index.html b/examples/axes-multiple/index.html
index 839b5ab..79403fd 100644
--- a/examples/axes-multiple/index.html
+++ b/examples/axes-multiple/index.html
@@ -7,8 +7,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.time.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.time.js"></script>
 	<script type="text/javascript">
 
 	$(function() {
diff --git a/examples/axes-time-zones/index.html b/examples/axes-time-zones/index.html
index 9142be5..de29844 100644
--- a/examples/axes-time-zones/index.html
+++ b/examples/axes-time-zones/index.html
@@ -7,8 +7,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.time.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.time.js"></script>
 	<script language="javascript" type="text/javascript" src="date.js"></script>
 	<script type="text/javascript">
 
diff --git a/examples/axes-time/index.html b/examples/axes-time/index.html
index 999b7d1..1588364 100644
--- a/examples/axes-time/index.html
+++ b/examples/axes-time/index.html
@@ -7,8 +7,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.time.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.time.js"></script>
 	<script type="text/javascript">
 
 	$(function() {
diff --git a/examples/basic-options/index.html b/examples/basic-options/index.html
index e4b2c7f..35d25e0 100644
--- a/examples/basic-options/index.html
+++ b/examples/basic-options/index.html
@@ -7,7 +7,7 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
 	<script type="text/javascript">
 
 	$(function () {
diff --git a/examples/basic-usage/index.html b/examples/basic-usage/index.html
index aed1355..c587cca 100644
--- a/examples/basic-usage/index.html
+++ b/examples/basic-usage/index.html
@@ -7,7 +7,7 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
 	<script type="text/javascript">
 
 	$(function() {
diff --git a/examples/canvas/index.html b/examples/canvas/index.html
index 5f72e18..eaf3754 100644
--- a/examples/canvas/index.html
+++ b/examples/canvas/index.html
@@ -7,9 +7,9 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.time.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.canvas.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.time.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.canvas.js"></script>
 	<script type="text/javascript">
 
 	$(function() {
diff --git a/examples/categories/index.html b/examples/categories/index.html
index 35b4c38..ca7f633 100644
--- a/examples/categories/index.html
+++ b/examples/categories/index.html
@@ -7,8 +7,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.categories.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.categories.js"></script>
 	<script type="text/javascript">
 
 	$(function() {
diff --git a/examples/image/index.html b/examples/image/index.html
index 7f66292..e1b4010 100644
--- a/examples/image/index.html
+++ b/examples/image/index.html
@@ -7,8 +7,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.image.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.image.js"></script>
 	<script type="text/javascript">
 
 	$(function() {
diff --git a/examples/index.html b/examples/index.html
index baf636e..8c5edf1 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -13,7 +13,7 @@
 
 	</style>
 	<script language="javascript" type="text/javascript" src="../lib/jquery.js"></script>
-	<script language="javascript" type="text/javascript" src="../jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../src/jquery.flot.js"></script>
 	<script type="text/javascript">
 
 	$(function() {
diff --git a/examples/interacting/index.html b/examples/interacting/index.html
index ca70f36..e695902 100644
--- a/examples/interacting/index.html
+++ b/examples/interacting/index.html
@@ -7,7 +7,7 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
 	<script type="text/javascript">
 
 	$(function() {
diff --git a/examples/markings/index.html b/examples/markings/index.html
index 8ce5a50..93d59b3 100644
--- a/examples/markings/index.html
+++ b/examples/markings/index.html
@@ -7,8 +7,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
     <script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
     <script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-    <script language="javascript" type="text/javascript" src="../../jquery.flot.image.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+    <script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.image.js"></script>
 	<script type="text/javascript">
 
 	    $(function () {
diff --git a/examples/navigate/index.html b/examples/navigate/index.html
index 33237f3..8074bc2 100644
--- a/examples/navigate/index.html
+++ b/examples/navigate/index.html
@@ -26,8 +26,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.navigate.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.navigate.js"></script>
 	<script type="text/javascript">
 
 	$(function() {
diff --git a/examples/percentiles/index.html b/examples/percentiles/index.html
index bb2c162..fe0de0d 100644
--- a/examples/percentiles/index.html
+++ b/examples/percentiles/index.html
@@ -7,8 +7,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>	
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.fillbetween.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.fillbetween.js"></script>
 	<script type="text/javascript">
 
 	$(function() {
diff --git a/examples/realtime/index.html b/examples/realtime/index.html
index c905252..8595c20 100644
--- a/examples/realtime/index.html
+++ b/examples/realtime/index.html
@@ -7,7 +7,7 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>	
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
 	<script type="text/javascript">
 
 	$(function() {
diff --git a/examples/resize/index.html b/examples/resize/index.html
index 344977f..d0a20ba 100644
--- a/examples/resize/index.html
+++ b/examples/resize/index.html
@@ -9,8 +9,8 @@
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
 	<script language="javascript" type="text/javascript" src="../shared/jquery-ui/jquery-ui.min.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.resize.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.resize.js"></script>
 	<script type="text/javascript">
 
 	$(function() {
diff --git a/examples/selection/index.html b/examples/selection/index.html
index 9ce6e40..f58cae8 100644
--- a/examples/selection/index.html
+++ b/examples/selection/index.html
@@ -7,8 +7,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.selection.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.selection.js"></script>
 	<script type="text/javascript">
 
 	$(function() {
diff --git a/examples/series-errorbars/index.html b/examples/series-errorbars/index.html
index ce25194..6042d78 100644
--- a/examples/series-errorbars/index.html
+++ b/examples/series-errorbars/index.html
@@ -7,9 +7,9 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.errorbars.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.navigate.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.errorbars.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.navigate.js"></script>
 	<script type="text/javascript">
 
 	$(function() {
diff --git a/examples/series-pie/index.html b/examples/series-pie/index.html
index b679b01..78094b0 100644
--- a/examples/series-pie/index.html
+++ b/examples/series-pie/index.html
@@ -78,8 +78,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.pie.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.pie.js"></script>
 	<script type="text/javascript">
 
 	$(function() {
diff --git a/examples/series-toggle/index.html b/examples/series-toggle/index.html
index 55cfe32..4a68295 100644
--- a/examples/series-toggle/index.html
+++ b/examples/series-toggle/index.html
@@ -7,7 +7,7 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
 	<script type="text/javascript">
 
 	$(function() {
diff --git a/examples/series-types/index.html b/examples/series-types/index.html
index 4d53929..634eecb 100644
--- a/examples/series-types/index.html
+++ b/examples/series-types/index.html
@@ -7,7 +7,7 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
 	<script type="text/javascript">
 
 	$(function() {
diff --git a/examples/stacking/index.html b/examples/stacking/index.html
index 233fed7..3d5c828 100644
--- a/examples/stacking/index.html
+++ b/examples/stacking/index.html
@@ -7,8 +7,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.stack.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.stack.js"></script>
 	<script type="text/javascript">
 
 	$(function() {
diff --git a/examples/symbols/index.html b/examples/symbols/index.html
index 76c945d..26149f5 100644
--- a/examples/symbols/index.html
+++ b/examples/symbols/index.html
@@ -7,8 +7,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.symbol.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.symbol.js"></script>
 	<script type="text/javascript">
 
 	$(function() {
diff --git a/examples/threshold/index.html b/examples/threshold/index.html
index 02bf106..a8232ff 100644
--- a/examples/threshold/index.html
+++ b/examples/threshold/index.html
@@ -7,8 +7,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.threshold.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.threshold.js"></script>
 	<script type="text/javascript">
 
 	$(function() {
diff --git a/examples/tracking/index.html b/examples/tracking/index.html
index f17f4e4..a6eef69 100644
--- a/examples/tracking/index.html
+++ b/examples/tracking/index.html
@@ -7,8 +7,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.crosshair.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.crosshair.js"></script>
 	<script type="text/javascript">
 
 	$(function() {
diff --git a/examples/visitors/index.html b/examples/visitors/index.html
index 76bb1f4..fa668fc 100644
--- a/examples/visitors/index.html
+++ b/examples/visitors/index.html
@@ -7,9 +7,9 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.time.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.selection.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.time.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.selection.js"></script>
 	<script type="text/javascript">
 
 	$(function() {
diff --git a/examples/zooming/index.html b/examples/zooming/index.html
index 5689af4..ade769c 100644
--- a/examples/zooming/index.html
+++ b/examples/zooming/index.html
@@ -7,8 +7,8 @@
 	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../lib/excanvas.min.js"></script><![endif]-->
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="../../lib/jquery.colorhelpers.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.selection.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/jquery.flot.js"></script>
+	<script language="javascript" type="text/javascript" src="../../src/plugins/jquery.flot.selection.js"></script>
 	<script type="text/javascript">
 
 	$(function() {
diff --git a/jquery.flot.js b/src/jquery.flot.js
similarity index 100%
rename from jquery.flot.js
rename to src/jquery.flot.js
diff --git a/jquery.flot.canvas.js b/src/plugins/jquery.flot.canvas.js
similarity index 100%
rename from jquery.flot.canvas.js
rename to src/plugins/jquery.flot.canvas.js
diff --git a/jquery.flot.categories.js b/src/plugins/jquery.flot.categories.js
similarity index 100%
rename from jquery.flot.categories.js
rename to src/plugins/jquery.flot.categories.js
diff --git a/jquery.flot.crosshair.js b/src/plugins/jquery.flot.crosshair.js
similarity index 100%
rename from jquery.flot.crosshair.js
rename to src/plugins/jquery.flot.crosshair.js
diff --git a/jquery.flot.errorbars.js b/src/plugins/jquery.flot.errorbars.js
similarity index 100%
rename from jquery.flot.errorbars.js
rename to src/plugins/jquery.flot.errorbars.js
diff --git a/jquery.flot.fillbetween.js b/src/plugins/jquery.flot.fillbetween.js
similarity index 100%
rename from jquery.flot.fillbetween.js
rename to src/plugins/jquery.flot.fillbetween.js
diff --git a/jquery.flot.image.js b/src/plugins/jquery.flot.image.js
similarity index 100%
rename from jquery.flot.image.js
rename to src/plugins/jquery.flot.image.js
diff --git a/jquery.flot.navigate.js b/src/plugins/jquery.flot.navigate.js
similarity index 100%
rename from jquery.flot.navigate.js
rename to src/plugins/jquery.flot.navigate.js
diff --git a/jquery.flot.pie.js b/src/plugins/jquery.flot.pie.js
similarity index 100%
rename from jquery.flot.pie.js
rename to src/plugins/jquery.flot.pie.js
diff --git a/jquery.flot.resize.js b/src/plugins/jquery.flot.resize.js
similarity index 100%
rename from jquery.flot.resize.js
rename to src/plugins/jquery.flot.resize.js
diff --git a/jquery.flot.selection.js b/src/plugins/jquery.flot.selection.js
similarity index 100%
rename from jquery.flot.selection.js
rename to src/plugins/jquery.flot.selection.js
diff --git a/jquery.flot.stack.js b/src/plugins/jquery.flot.stack.js
similarity index 100%
rename from jquery.flot.stack.js
rename to src/plugins/jquery.flot.stack.js
diff --git a/jquery.flot.symbol.js b/src/plugins/jquery.flot.symbol.js
similarity index 100%
rename from jquery.flot.symbol.js
rename to src/plugins/jquery.flot.symbol.js
diff --git a/jquery.flot.threshold.js b/src/plugins/jquery.flot.threshold.js
similarity index 100%
rename from jquery.flot.threshold.js
rename to src/plugins/jquery.flot.threshold.js
diff --git a/jquery.flot.time.js b/src/plugins/jquery.flot.time.js
similarity index 100%
rename from jquery.flot.time.js
rename to src/plugins/jquery.flot.time.js