diff --git a/dev/initdata/generate-commande.php b/dev/initdata/generate-commande.php
index 3a59e261b83..a03fc5c0795 100644
--- a/dev/initdata/generate-commande.php
+++ b/dev/initdata/generate-commande.php
@@ -38,7 +38,7 @@ require ($path."../htdocs/master.inc.php");
 include_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
 include_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 include_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
-include_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+include_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 include_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
 include_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
 
diff --git a/dev/initdata/generate-produit.php b/dev/initdata/generate-produit.php
index 79014cdd424..60cb7c44491 100644
--- a/dev/initdata/generate-produit.php
+++ b/dev/initdata/generate-produit.php
@@ -38,7 +38,7 @@ require ($path."../htdocs/master.inc.php");
 include_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
 include_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 include_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
-include_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+include_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 include_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
 include_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
 
diff --git a/dev/initdata/generate-societe.php b/dev/initdata/generate-societe.php
index 605c364ff1a..de6d74ccad4 100644
--- a/dev/initdata/generate-societe.php
+++ b/dev/initdata/generate-societe.php
@@ -38,7 +38,7 @@ require ($path."../htdocs/master.inc.php");
 include_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
 include_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 include_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
-include_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+include_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 include_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
 include_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
 
diff --git a/dev/samples/create_product.php b/dev/samples/create_product.php
index ff3815b8ab6..055d28aa4cd 100644
--- a/dev/samples/create_product.php
+++ b/dev/samples/create_product.php
@@ -67,7 +67,7 @@ print 'Argument 2='.$argv[2]."\n";
 // Start of transaction
 $db->begin();
 
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 // Create instance of object
 $myproduct=new Product($db);
diff --git a/dev/skeletons/skeleton_class.class.php b/dev/skeletons/skeleton_class.class.php
index efdc164246a..c6875ca5ca0 100644
--- a/dev/skeletons/skeleton_class.class.php
+++ b/dev/skeletons/skeleton_class.class.php
@@ -29,7 +29,7 @@
 // Put here all includes required by your class file
 //require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
 //require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
-//require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+//require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 
 /**
diff --git a/htdocs/admin/cashdesk.php b/htdocs/admin/cashdesk.php
index d435d92fe0f..2f102a3b2b8 100644
--- a/htdocs/admin/cashdesk.php
+++ b/htdocs/admin/cashdesk.php
@@ -25,7 +25,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/product/html.formproduct.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php");
 
 // If socid provided by ajax company selector
 if (! empty($_REQUEST['CASHDESK_ID_THIRDPARTY_id']))
diff --git a/htdocs/admin/produit.php b/htdocs/admin/produit.php
index bb93c75c73e..d656ba42144 100644
--- a/htdocs/admin/produit.php
+++ b/htdocs/admin/produit.php
@@ -287,7 +287,7 @@ if ($conf->global->PRODUCT_CANVAS_ABILITY)
 	
 	if (is_dir($dir))
 	{
-		require_once(DOL_DOCUMENT_ROOT . "/product/product.class.php");
+		require_once(DOL_DOCUMENT_ROOT . "/product/class/product.class.php");
 		
 		$handle=opendir($dir);
 		
diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php
index 5f349721a28..39ff722e51f 100644
--- a/htdocs/categories/categorie.php
+++ b/htdocs/categories/categorie.php
@@ -89,7 +89,7 @@ if ($_REQUEST["removecat"])
 {
 	if ($_REQUEST["type"]==0 && ($user->rights->produit->creer || $user->rights->service->creer))
 	{
-		require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+		require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 		$object = new Product($db);
 		if ($_REQUEST["ref"]) $result = $object->fetch('',$_REQUEST["ref"]);
 		if ($_REQUEST["id"])  $result = $object->fetch($_REQUEST["id"]);
@@ -125,7 +125,7 @@ if (isset($_REQUEST["catMere"]) && $_REQUEST["catMere"]>=0)
 
 	if ($_REQUEST["type"]==0 && ($user->rights->produit->creer || $user->rights->service->creer))
 	{
-		require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+		require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 		$object = new Product($db);
 		if ($_REQUEST["ref"]) $result = $object->fetch('',$_REQUEST["ref"]);
 		if ($_REQUEST["id"])  $result = $object->fetch($_REQUEST["id"]);
@@ -279,7 +279,7 @@ else if ($_GET["id"] || $_GET["ref"])
 		 * Fiche categorie de produit
 		 */
 		require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
-		require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+		require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 		// Produit
 		$product = new Product($db);
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 9a5267f79bc..19a3f4c0e65 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -28,7 +28,7 @@
  *	\version	$Id$
  */
 
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php");
 
 
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 5470c75a41c..5416e735421 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -33,7 +33,7 @@
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
-require_once(DOL_DOCUMENT_ROOT ."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT ."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT ."/contact/class/contact.class.php");
 
 
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 7a89ecff5f9..98cf7489c7a 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -28,7 +28,7 @@
  */
 
 require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 
 /**
diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php
index 635049278c9..82cdf5b5a23 100644
--- a/htdocs/compta/bank/class/bankcateg.class.php
+++ b/htdocs/compta/bank/class/bankcateg.class.php
@@ -29,7 +29,7 @@
 // Put here all includes required by your class file
 //require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
 //require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
-//require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+//require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 
 /**
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index b5e32963a8b..954167eae85 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -27,7 +27,7 @@
  */
 
 require_once(DOL_DOCUMENT_ROOT."/core/class/notify.class.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
 
 
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 03361860b3c..60acbe4206e 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -32,7 +32,7 @@
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
-require_once(DOL_DOCUMENT_ROOT ."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT ."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT ."/societe/client.class.php");
 
 
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 138f77d5798..7e8f5be4a72 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -28,7 +28,7 @@
 require("../../main.inc.php");
 require_once("./class/facture-rec.class.php");
 require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 
 // Security check
diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
index 6097046abc5..69309091142 100644
--- a/htdocs/compta/tva/quadri_detail.php
+++ b/htdocs/compta/tva/quadri_detail.php
@@ -33,7 +33,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/tax.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/tva/class/tva.class.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
 require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php");
 require_once(DOL_DOCUMENT_ROOT."/fourn/facture/paiementfourn.class.php");
diff --git a/htdocs/compta/ventilation/lignes.php b/htdocs/compta/ventilation/lignes.php
index 8c53aae8f82..6ef4fd246cd 100644
--- a/htdocs/compta/ventilation/lignes.php
+++ b/htdocs/compta/ventilation/lignes.php
@@ -28,7 +28,7 @@
 
 require('../../main.inc.php');
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 $langs->load("bills");
 $langs->load("compta");
diff --git a/htdocs/compta/ventilation/liste.php b/htdocs/compta/ventilation/liste.php
index a4a8c68a0fa..65dd91bea56 100644
--- a/htdocs/compta/ventilation/liste.php
+++ b/htdocs/compta/ventilation/liste.php
@@ -30,7 +30,7 @@
 
 require('../../main.inc.php');
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 $langs->load("compta");
 $langs->load("bills");
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 5a19e9e96db..dd8f8b4e435 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -29,7 +29,7 @@
  */
 
 require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/price.lib.php");
 
 
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index 506d026d562..352dd8b2abd 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -27,7 +27,7 @@
 
 require ("../main.inc.php");
 require_once (DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
-require_once (DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once (DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once (DOL_DOCUMENT_ROOT."/societe/societe.class.php");
 
 $langs->load("products");
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index 438b42d8e43..359c101853c 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -29,7 +29,7 @@
 // Put here all includes required by your class file
 //require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
 //require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
-//require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+//require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 
 /**
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index 38647492aee..2a2d42d4ec5 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -20,7 +20,7 @@
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 $langs->load("products");
 
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index 6e308dd01f9..c5386ec2691 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -31,10 +31,10 @@ require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php");
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
-require_once(DOL_DOCUMENT_ROOT."/product/html.formproduct.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/sendings.lib.php");
-if ($conf->produit->enabled || $conf->service->enabled)  require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+if ($conf->produit->enabled || $conf->service->enabled)  require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 if ($conf->propal->enabled)   require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
 if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
 if ($conf->stock->enabled)    require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php");
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index de51282d940..f196bb4460d 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -31,7 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/sendings.lib.php");
-if ($conf->produit->enabled || $conf->service->enabled)  require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+if ($conf->produit->enabled || $conf->service->enabled)  require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 if ($conf->projet->enabled)   require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php");
 if ($conf->propal->enabled)   require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
 if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
index 2c96f9a7871..908bf93a699 100644
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -143,7 +143,7 @@ class Fournisseur extends Societe
 	function ProductCommande($user, $fk_product)
 	{
 		include_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.commande.class.php");
-		include_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+		include_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 		$commf = new CommandeFournisseur($this->db);
 
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index c44586b095c..ca3ffa33375 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -27,7 +27,7 @@
  *	\version    $Id$
  */
 
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
 
 
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 76f9111bec7..a1f61ec452b 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -25,7 +25,7 @@
  * 	\version    $Id$
  */
 
-require_once DOL_DOCUMENT_ROOT."/product/product.class.php";
+require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
 require_once DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php";
 
 
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index 08ecca192a2..f6a94bc9866 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php');
 require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php');
 require_once(DOL_DOCUMENT_ROOT.'/fourn/facture/paiementfourn.class.php');
 require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php');
-require_once(DOL_DOCUMENT_ROOT.'/product/product.class.php');
+require_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php');
 if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/project.class.php');
 
 // If socid provided by ajax company selector
diff --git a/htdocs/fourn/product/categorie.php b/htdocs/fourn/product/categorie.php
index cb7905fe806..0bc20a79acc 100644
--- a/htdocs/fourn/product/categorie.php
+++ b/htdocs/fourn/product/categorie.php
@@ -26,7 +26,7 @@
  */
 
 require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 $langs->load("categories");
 
diff --git a/htdocs/fourn/product/liste.php b/htdocs/fourn/product/liste.php
index cc3c55f8d4f..e400601b1a0 100644
--- a/htdocs/fourn/product/liste.php
+++ b/htdocs/fourn/product/liste.php
@@ -26,7 +26,7 @@
 */
 
 require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
 
 $langs->load("products");
diff --git a/htdocs/fourn/product/photos.php b/htdocs/fourn/product/photos.php
index 17b367fc4e4..7a275d69a4c 100644
--- a/htdocs/fourn/product/photos.php
+++ b/htdocs/fourn/product/photos.php
@@ -25,7 +25,7 @@
  */
 
 require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 
 if (!$user->rights->produit->lire && !$user->rights->service->lire) accessforbidden();
diff --git a/htdocs/includes/boxes/box_produits.php b/htdocs/includes/boxes/box_produits.php
index 59c56073734..1df6150f8f2 100644
--- a/htdocs/includes/boxes/box_produits.php
+++ b/htdocs/includes/boxes/box_produits.php
@@ -26,7 +26,7 @@
  */
 
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
-include_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+include_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 
 class box_produits extends ModeleBoxes {
@@ -64,7 +64,7 @@ class box_produits extends ModeleBoxes {
 
 		$this->max=$max;
 
-		include_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+		include_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 		$productstatic=new Product($db);
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastProducts",$max));
diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php
index 3a18f369ca9..016cc1b4f44 100644
--- a/htdocs/includes/modules/commande/pdf_einstein.modules.php
+++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php
@@ -28,7 +28,7 @@
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 
diff --git a/htdocs/includes/modules/facture/modules_facture.php b/htdocs/includes/modules/facture/modules_facture.php
index 7344b276525..c9f900ade1d 100644
--- a/htdocs/includes/modules/facture/modules_facture.php
+++ b/htdocs/includes/modules/facture/modules_facture.php
@@ -30,7 +30,7 @@
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
 require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php');
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php");   // Requis car utilise dans les classes qui heritent
 
 
diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php
index c68c4ebc35b..ecb851d00d6 100644
--- a/htdocs/includes/modules/facture/pdf_crabe.modules.php
+++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php
@@ -28,7 +28,7 @@
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 
diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php
index 198660e7fb5..ad692301b43 100644
--- a/htdocs/includes/modules/facture/pdf_oursin.modules.php
+++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php
@@ -28,7 +28,7 @@
  * 		\version    $Id$
  */
 
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
 
diff --git a/htdocs/includes/modules/member/cards/modules_cards.php b/htdocs/includes/modules/member/cards/modules_cards.php
index 7bd4526603b..3b16b8bca07 100644
--- a/htdocs/includes/modules/member/cards/modules_cards.php
+++ b/htdocs/includes/modules/member/cards/modules_cards.php
@@ -30,7 +30,7 @@
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
 require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php');
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 
 /**
diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
index 8d9acfd65bc..7d35af0988d 100644
--- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
@@ -27,7 +27,7 @@
  *	\version    $Id$
  */
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 
diff --git a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
index d60eed1e00f..c807ac02cd0 100644
--- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -28,7 +28,7 @@
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/supplier_order/modules_commandefournisseur.php");
 require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
 
 
diff --git a/htdocs/index.php b/htdocs/index.php
index fe7b7aa0e3c..221c0a11f44 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -130,7 +130,7 @@ if ($user->societe_id == 0)
 	DOL_DOCUMENT_ROOT."/comm/prospect/prospect.class.php",
 	DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php",
 	DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php",
-	DOL_DOCUMENT_ROOT."/product/product.class.php",
+	DOL_DOCUMENT_ROOT."/product/class/product.class.php",
 	DOL_DOCUMENT_ROOT."/product/service.class.php",
 	DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php",
 	DOL_DOCUMENT_ROOT."/commande/class/commande.class.php",
diff --git a/htdocs/lib/sendings.lib.php b/htdocs/lib/sendings.lib.php
index 4093b58ff90..ad32801b82e 100644
--- a/htdocs/lib/sendings.lib.php
+++ b/htdocs/lib/sendings.lib.php
@@ -22,7 +22,7 @@
  *	\brief      Library for expedition module
  *	\version    $Id$
  */
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 
 function shipping_prepare_head($object)
diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php
index 6db263ecf0c..ec2e008ada0 100644
--- a/htdocs/livraison/fiche.php
+++ b/htdocs/livraison/fiche.php
@@ -32,7 +32,7 @@ require_once(DOL_DOCUMENT_ROOT."/livraison/class/livraison.class.php");
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/livraison/modules_livraison.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/sendings.lib.php");
-if ($conf->produit->enabled || $conf->service->enabled) require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+if ($conf->produit->enabled || $conf->service->enabled) require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 if ($conf->expedition_bon->enabled) require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php");
 if ($conf->stock->enabled) require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php");
 
diff --git a/htdocs/product/barcode.php b/htdocs/product/barcode.php
index e26972c77a2..70514dfbada 100644
--- a/htdocs/product/barcode.php
+++ b/htdocs/product/barcode.php
@@ -27,7 +27,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/includes/barcode/html.formbarcode.class.php");
 
 $langs->load("products");
diff --git a/htdocs/product/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
similarity index 100%
rename from htdocs/product/html.formproduct.class.php
rename to htdocs/product/class/html.formproduct.class.php
diff --git a/htdocs/product/product.class.php b/htdocs/product/class/product.class.php
similarity index 100%
rename from htdocs/product/product.class.php
rename to htdocs/product/class/product.class.php
diff --git a/htdocs/product/composition/fiche.php b/htdocs/product/composition/fiche.php
index af4b3e14a8b..2def135a32b 100644
--- a/htdocs/product/composition/fiche.php
+++ b/htdocs/product/composition/fiche.php
@@ -30,7 +30,7 @@
 require("../../main.inc.php");
 
 require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php");
 
 $langs->load("bills");
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 567c5b6d456..cbdaa4ba083 100755
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -29,7 +29,7 @@
 
 require('../main.inc.php');
 require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index 0f430e61fa7..6ac7eea3e56 100644
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@@ -30,11 +30,11 @@
  */
 
 require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/product/html.formproduct.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
 
 $langs->load("bills");
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index cced9e8f845..673bece47b6 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -26,7 +26,7 @@
  */
 
 require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT.'/product/product.class.php');
+require_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php');
 
 $type=isset($_GET["type"])?$_GET["type"]:(isset($_POST["type"])?$_POST["type"]:'');
 if ($type =='' && !$user->rights->produit->lire) $type='1';	// Force global page on service page only
diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php
index 09d8d85c651..8635a9f4c23 100644
--- a/htdocs/product/liste.php
+++ b/htdocs/product/liste.php
@@ -26,7 +26,7 @@
  */
 
 require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT.'/product/product.class.php');
+require_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php');
 require_once(DOL_DOCUMENT_ROOT."/html.formother.class.php");
 if ($conf->categorie->enabled) require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php");
 
diff --git a/htdocs/product/photos.php b/htdocs/product/photos.php
index 75bb43c46c4..46fab2e7a86 100644
--- a/htdocs/product/photos.php
+++ b/htdocs/product/photos.php
@@ -28,7 +28,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 
 $langs->load("products");
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 89f05ef07d7..5e026b0066c 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -26,7 +26,7 @@
  */
 
 require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT.'/product/product.class.php');
+require_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php');
 
 // Security check
 if ($user->societe_id) $socid=$user->societe_id;
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 797dcc7fa7b..eac073d9280 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -29,7 +29,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 $langs->load("products");
 $langs->load("bills");
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index f6fd576cbbb..b31586cee20 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -26,7 +26,7 @@
  */
 
 require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT.'/product/product.class.php');
+require_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php');
 require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php");
 
 $langs->load("products");
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 8bbf4fcdbfe..594f178941b 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -28,7 +28,7 @@
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 $langs->load("orders");
 $langs->load("products");
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index 34aea3c9d6a..f7a539778a1 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -28,7 +28,7 @@
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 $langs->load("orders");
 $langs->load("products");
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index e810948af62..d4701c0b155 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -28,7 +28,7 @@
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 $langs->load("contracts");
 $langs->load("products");
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 51184023f47..f69ba4e4df8 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -28,7 +28,7 @@
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 $langs->load("companies");
 $langs->load("bills");
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 6f80920632b..41b2bd5c56c 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -28,7 +28,7 @@
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 $langs->load("companies");
 $langs->load("bills");
diff --git a/htdocs/product/stats/fiche.php b/htdocs/product/stats/fiche.php
index c74c5fc1a72..72fc6a7f314 100644
--- a/htdocs/product/stats/fiche.php
+++ b/htdocs/product/stats/fiche.php
@@ -28,7 +28,7 @@
 
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php");
 
 $langs->load("companies");
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index ea6417c0681..03fee24bbfe 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -29,7 +29,7 @@
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 $langs->load("products");
 $langs->load("companies");
diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php
index 43de207dd9d..9ec6dac6a63 100644
--- a/htdocs/product/stock/fiche.php
+++ b/htdocs/product/stock/fiche.php
@@ -28,7 +28,7 @@
 
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/stock.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
 
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index 81ef45b715b..08b827039f4 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -27,7 +27,7 @@
 
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/stock.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php");
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index c67d36a9f00..b7cc8ebdbd0 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -29,9 +29,9 @@
 
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/product/html.formproduct.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php");
 
 $langs->load("products");
 $langs->load("orders");
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index 1855853f24f..330922ec1b2 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -29,7 +29,7 @@
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formadmin.class.php");
 
 $langs->load("products");
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index 0f1c4ef1129..71e6358b699 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -33,7 +33,7 @@ require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/paybox/paybox.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 // Security check
 if (empty($conf->paybox->enabled)) accessforbidden('',1,1,1);
diff --git a/scripts/books/droits-editeurs.php b/scripts/books/droits-editeurs.php
index 0d6c5e2dffb..a96b049a99e 100644
--- a/scripts/books/droits-editeurs.php
+++ b/scripts/books/droits-editeurs.php
@@ -27,7 +27,7 @@
 
 require_once("../../htdocs/master.inc.php");
 require_once(FPDF_PATH.'fpdf.php');
-require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/product/canvas/livre/product.livre.class.php");
 
 $error = 0;