diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index a4c8d1ca9d1..4d34edfdf2f 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -30,7 +30,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
-require_once(DOL_DOCUMENT_ROOT.'/expedition/expedition.class.php');
+require_once(DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php');
 
 $langs->load("admin");
 $langs->load("bills");
diff --git a/htdocs/expedition/expedition.class.php b/htdocs/expedition/class/expedition.class.php
similarity index 100%
rename from htdocs/expedition/expedition.class.php
rename to htdocs/expedition/class/expedition.class.php
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index a7a28cfaa38..aadf705c288 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -28,7 +28,7 @@
  */
 
 require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/expedition/expedition.class.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");
diff --git a/htdocs/expedition/liste.php b/htdocs/expedition/liste.php
index 9ba1290359b..c6deb3d41df 100644
--- a/htdocs/expedition/liste.php
+++ b/htdocs/expedition/liste.php
@@ -26,7 +26,7 @@
  */
 
 require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/expedition/expedition.class.php");
+require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php");
 
 $langs->load("sendings");
 $langs->load('companies');
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index a8c40010559..71343095b29 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -27,7 +27,7 @@
  */
 
 require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/expedition/expedition.class.php");
+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");
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index 7f3624258d3..165971b168f 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -26,7 +26,7 @@
  */
 
 require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/expedition/expedition.class.php");
+require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php");
 
 $langs->load("sendings");
 
diff --git a/htdocs/expedition/stats/month.php b/htdocs/expedition/stats/month.php
index 6360b59b8f8..a65fcb28873 100644
--- a/htdocs/expedition/stats/month.php
+++ b/htdocs/expedition/stats/month.php
@@ -25,7 +25,7 @@
  */
 
 require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/expedition/expedition.class.php");
+require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php");
 require_once(DOL_DOCUMENT_ROOT."/expedition/stats/expeditionstats.class.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php");
 
diff --git a/htdocs/exports/export.class.php b/htdocs/exports/class/export.class.php
similarity index 100%
rename from htdocs/exports/export.class.php
rename to htdocs/exports/class/export.class.php
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index d3aaa80bc8c..06b42044e66 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -27,7 +27,7 @@
 require_once("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formother.class.php");
-require_once(DOL_DOCUMENT_ROOT."/exports/export.class.php");
+require_once(DOL_DOCUMENT_ROOT."/exports/class/export.class.php");
 require_once(DOL_DOCUMENT_ROOT.'/includes/modules/export/modules_export.php');
 
 $langs->load("exports");
diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php
index 2ba8a714047..31bea86cd07 100644
--- a/htdocs/exports/index.php
+++ b/htdocs/exports/index.php
@@ -24,7 +24,7 @@
  */
 
 require_once("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/exports/export.class.php");
+require_once(DOL_DOCUMENT_ROOT."/exports/class/export.class.php");
 
 $langs->load("exports");
 
diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php
index 0004b81d803..46a11af8335 100644
--- a/htdocs/livraison/fiche.php
+++ b/htdocs/livraison/fiche.php
@@ -33,7 +33,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/livraison/modules_livraison.ph
 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->expedition_bon->enabled) require_once(DOL_DOCUMENT_ROOT."/expedition/expedition.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");
 
 if (!$user->rights->expedition->livraison->lire) accessforbidden();
diff --git a/htdocs/livraison/livraison.class.php b/htdocs/livraison/livraison.class.php
index 71de192312e..674ca0bdaf8 100644
--- a/htdocs/livraison/livraison.class.php
+++ b/htdocs/livraison/livraison.class.php
@@ -27,7 +27,7 @@
  */
 
 require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
-require_once(DOL_DOCUMENT_ROOT."/expedition/expedition.class.php");
+require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php");
 require_once(DOL_DOCUMENT_ROOT."/product/stock/mouvementstock.class.php");
 if ($conf->propal->enabled)   require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");