diff --git a/htdocs/includes/flot/.cvsignore b/htdocs/includes/jquery/plugins/flot/.cvsignore
similarity index 100%
rename from htdocs/includes/flot/.cvsignore
rename to htdocs/includes/jquery/plugins/flot/.cvsignore
diff --git a/htdocs/includes/flot/API.txt b/htdocs/includes/jquery/plugins/flot/API.txt
similarity index 100%
rename from htdocs/includes/flot/API.txt
rename to htdocs/includes/jquery/plugins/flot/API.txt
diff --git a/htdocs/includes/flot/FAQ.txt b/htdocs/includes/jquery/plugins/flot/FAQ.txt
similarity index 100%
rename from htdocs/includes/flot/FAQ.txt
rename to htdocs/includes/jquery/plugins/flot/FAQ.txt
diff --git a/htdocs/includes/flot/LICENSE.txt b/htdocs/includes/jquery/plugins/flot/LICENSE.txt
similarity index 100%
rename from htdocs/includes/flot/LICENSE.txt
rename to htdocs/includes/jquery/plugins/flot/LICENSE.txt
diff --git a/htdocs/includes/flot/Makefile b/htdocs/includes/jquery/plugins/flot/Makefile
similarity index 100%
rename from htdocs/includes/flot/Makefile
rename to htdocs/includes/jquery/plugins/flot/Makefile
diff --git a/htdocs/includes/flot/NEWS.txt b/htdocs/includes/jquery/plugins/flot/NEWS.txt
similarity index 100%
rename from htdocs/includes/flot/NEWS.txt
rename to htdocs/includes/jquery/plugins/flot/NEWS.txt
diff --git a/htdocs/includes/flot/PLUGINS.txt b/htdocs/includes/jquery/plugins/flot/PLUGINS.txt
similarity index 100%
rename from htdocs/includes/flot/PLUGINS.txt
rename to htdocs/includes/jquery/plugins/flot/PLUGINS.txt
diff --git a/htdocs/includes/flot/README.txt b/htdocs/includes/jquery/plugins/flot/README.txt
similarity index 100%
rename from htdocs/includes/flot/README.txt
rename to htdocs/includes/jquery/plugins/flot/README.txt
diff --git a/htdocs/includes/flot/excanvas.js b/htdocs/includes/jquery/plugins/flot/excanvas.js
similarity index 100%
rename from htdocs/includes/flot/excanvas.js
rename to htdocs/includes/jquery/plugins/flot/excanvas.js
diff --git a/htdocs/includes/flot/excanvas.min.js b/htdocs/includes/jquery/plugins/flot/excanvas.min.js
similarity index 100%
rename from htdocs/includes/flot/excanvas.min.js
rename to htdocs/includes/jquery/plugins/flot/excanvas.min.js
diff --git a/htdocs/includes/flot/jquery.colorhelpers.js b/htdocs/includes/jquery/plugins/flot/jquery.colorhelpers.js
similarity index 100%
rename from htdocs/includes/flot/jquery.colorhelpers.js
rename to htdocs/includes/jquery/plugins/flot/jquery.colorhelpers.js
diff --git a/htdocs/includes/flot/jquery.colorhelpers.min.js b/htdocs/includes/jquery/plugins/flot/jquery.colorhelpers.min.js
similarity index 100%
rename from htdocs/includes/flot/jquery.colorhelpers.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.colorhelpers.min.js
diff --git a/htdocs/includes/flot/jquery.flot.crosshair.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.crosshair.js
similarity index 100%
rename from htdocs/includes/flot/jquery.flot.crosshair.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.crosshair.js
diff --git a/htdocs/includes/flot/jquery.flot.crosshair.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.crosshair.min.js
similarity index 100%
rename from htdocs/includes/flot/jquery.flot.crosshair.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.crosshair.min.js
diff --git a/htdocs/includes/flot/jquery.flot.fillbetween.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.fillbetween.js
similarity index 100%
rename from htdocs/includes/flot/jquery.flot.fillbetween.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.fillbetween.js
diff --git a/htdocs/includes/flot/jquery.flot.fillbetween.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.fillbetween.min.js
similarity index 100%
rename from htdocs/includes/flot/jquery.flot.fillbetween.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.fillbetween.min.js
diff --git a/htdocs/includes/flot/jquery.flot.image.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.image.js
similarity index 100%
rename from htdocs/includes/flot/jquery.flot.image.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.image.js
diff --git a/htdocs/includes/flot/jquery.flot.image.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.image.min.js
similarity index 100%
rename from htdocs/includes/flot/jquery.flot.image.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.image.min.js
diff --git a/htdocs/includes/flot/jquery.flot.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.js
similarity index 100%
rename from htdocs/includes/flot/jquery.flot.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.js
diff --git a/htdocs/includes/flot/jquery.flot.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.min.js
similarity index 100%
rename from htdocs/includes/flot/jquery.flot.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.min.js
diff --git a/htdocs/includes/flot/jquery.flot.navigate.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.navigate.js
similarity index 100%
rename from htdocs/includes/flot/jquery.flot.navigate.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.navigate.js
diff --git a/htdocs/includes/flot/jquery.flot.navigate.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.navigate.min.js
similarity index 100%
rename from htdocs/includes/flot/jquery.flot.navigate.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.navigate.min.js
diff --git a/htdocs/includes/flot/jquery.flot.pie.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.pie.js
similarity index 100%
rename from htdocs/includes/flot/jquery.flot.pie.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.pie.js
diff --git a/htdocs/includes/flot/jquery.flot.pie.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.pie.min.js
similarity index 100%
rename from htdocs/includes/flot/jquery.flot.pie.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.pie.min.js
diff --git a/htdocs/includes/flot/jquery.flot.resize.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.resize.js
similarity index 100%
rename from htdocs/includes/flot/jquery.flot.resize.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.resize.js
diff --git a/htdocs/includes/flot/jquery.flot.resize.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.resize.min.js
similarity index 100%
rename from htdocs/includes/flot/jquery.flot.resize.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.resize.min.js
diff --git a/htdocs/includes/flot/jquery.flot.selection.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.selection.js
similarity index 100%
rename from htdocs/includes/flot/jquery.flot.selection.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.selection.js
diff --git a/htdocs/includes/flot/jquery.flot.selection.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.selection.min.js
similarity index 100%
rename from htdocs/includes/flot/jquery.flot.selection.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.selection.min.js
diff --git a/htdocs/includes/flot/jquery.flot.stack.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.stack.js
similarity index 100%
rename from htdocs/includes/flot/jquery.flot.stack.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.stack.js
diff --git a/htdocs/includes/flot/jquery.flot.stack.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.stack.min.js
similarity index 100%
rename from htdocs/includes/flot/jquery.flot.stack.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.stack.min.js
diff --git a/htdocs/includes/flot/jquery.flot.symbol.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.symbol.js
similarity index 100%
rename from htdocs/includes/flot/jquery.flot.symbol.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.symbol.js
diff --git a/htdocs/includes/flot/jquery.flot.symbol.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.symbol.min.js
similarity index 100%
rename from htdocs/includes/flot/jquery.flot.symbol.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.symbol.min.js
diff --git a/htdocs/includes/flot/jquery.flot.threshold.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.threshold.js
similarity index 100%
rename from htdocs/includes/flot/jquery.flot.threshold.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.threshold.js
diff --git a/htdocs/includes/flot/jquery.flot.threshold.min.js b/htdocs/includes/jquery/plugins/flot/jquery.flot.threshold.min.js
similarity index 100%
rename from htdocs/includes/flot/jquery.flot.threshold.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.flot.threshold.min.js
diff --git a/htdocs/includes/flot/jquery.js b/htdocs/includes/jquery/plugins/flot/jquery.js
similarity index 100%
rename from htdocs/includes/flot/jquery.js
rename to htdocs/includes/jquery/plugins/flot/jquery.js
diff --git a/htdocs/includes/flot/jquery.min.js b/htdocs/includes/jquery/plugins/flot/jquery.min.js
similarity index 100%
rename from htdocs/includes/flot/jquery.min.js
rename to htdocs/includes/jquery/plugins/flot/jquery.min.js
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 4538d76f74e..0b67548495c 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -26,7 +26,7 @@
  *	\file       htdocs/main.inc.php
  *	\ingroup	core
  *	\brief      File that defines environment for Dolibarr pages only (variables not required by scripts)
- *	\version    $Id: main.inc.php,v 1.752 2011/07/06 12:58:34 eldy Exp $
+ *	\version    $Id: main.inc.php,v 1.753 2011/07/08 11:26:40 eldy Exp $
  */
 
 @ini_set('memory_limit', '64M');	// This may be useless if memory is hard limited by your PHP
@@ -970,10 +970,10 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
 			// jQuery jnotify
 			if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY))	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js"></script>'."\n";
             // Flot
-            print '<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/flot/excanvas.min.js"></script><![endif]-->'."\n";
-			print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/flot/jquery.flot.min.js"></script>'."\n";
-            print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/flot/jquery.flot.pie.min.js"></script>'."\n";
-            print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/flot/jquery.flot.stack.min.js"></script>'."\n";
+            print '<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/excanvas.min.js"></script><![endif]-->'."\n";
+			print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.min.js"></script>'."\n";
+            print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.pie.min.js"></script>'."\n";
+            print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.stack.min.js"></script>'."\n";
             // CKEditor
             if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_EDITORNAME) && $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor')
             {