diff --git a/dev/initdata/generate-commande.php b/dev/initdata/generate-commande.php
index dc10b88a751..831eb88deda 100644
--- a/dev/initdata/generate-commande.php
+++ b/dev/initdata/generate-commande.php
@@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 $path=preg_replace('/generate-commande.php/i','',$_SERVER["PHP_SELF"]);
 require ($path."../htdocs/master.inc.php");
 include_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
-include_once(DOL_DOCUMENT_ROOT."/contact/contact.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."/compta/paiement/class/paiement.class.php");
diff --git a/dev/initdata/generate-produit.php b/dev/initdata/generate-produit.php
index af816e69f2f..25a31f24eed 100644
--- a/dev/initdata/generate-produit.php
+++ b/dev/initdata/generate-produit.php
@@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 $path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]);
 require ($path."../htdocs/master.inc.php");
 include_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
-include_once(DOL_DOCUMENT_ROOT."/contact/contact.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."/compta/paiement/class/paiement.class.php");
diff --git a/dev/initdata/generate-societe.php b/dev/initdata/generate-societe.php
index 779ff73b236..0ed09b0e60e 100644
--- a/dev/initdata/generate-societe.php
+++ b/dev/initdata/generate-societe.php
@@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 $path=preg_replace('/generate-societe.php/i','',$_SERVER["PHP_SELF"]);
 require ($path."../htdocs/master.inc.php");
 include_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
-include_once(DOL_DOCUMENT_ROOT."/contact/contact.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."/compta/paiement/class/paiement.class.php");
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index 52b409efc1b..676ad32ae2b 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -31,7 +31,7 @@ require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 
 $langs->load("admin");
 $langs->load("errors");
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 86d3de2e687..d4b6d5533e6 100755
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -29,7 +29,7 @@
 
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/action/cactioncomm.class.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index 93cbef993b2..8b9f8c9f0d4 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -28,7 +28,7 @@
 
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/user/user.class.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/action/cactioncomm.class.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index d28fd510d3d..d30eccac1e5 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -27,7 +27,7 @@
  */
 
 require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php");
diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php
index cbee5422a83..a8b069799a3 100644
--- a/htdocs/comm/action/info.php
+++ b/htdocs/comm/action/info.php
@@ -27,7 +27,7 @@
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/action/cactioncomm.class.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
 
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index f7380ddf4b2..274279d6d8f 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -27,7 +27,7 @@
  */
 
 require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php");
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index c4b8c283655..68d48dd9208 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -28,7 +28,7 @@
 
 require("../../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/action/rapport.pdf.php");
 
diff --git a/htdocs/comm/adresse_livraison.php b/htdocs/comm/adresse_livraison.php
index fa5a7ae67e3..7fb12dd75af 100644
--- a/htdocs/comm/adresse_livraison.php
+++ b/htdocs/comm/adresse_livraison.php
@@ -27,7 +27,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/comm/adresse_livraison.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/class/adresse_livraison.class.php");
 
 $langs->load("companies");
 $langs->load("commercial");
diff --git a/htdocs/comm/adresse_livraison.class.php b/htdocs/comm/class/adresse_livraison.class.php
similarity index 100%
rename from htdocs/comm/adresse_livraison.class.php
rename to htdocs/comm/class/adresse_livraison.class.php
diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index c743daf0f30..19ca46de70f 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -31,7 +31,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.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");
diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php
index f0c8ac77cf3..1d7722cb9c5 100644
--- a/htdocs/comm/multiprix.php
+++ b/htdocs/comm/multiprix.php
@@ -27,7 +27,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 
 $langs->load("orders");
 $langs->load("companies");
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index 168ce350f90..c20ae57f730 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -26,7 +26,7 @@
 
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php');
 
diff --git a/htdocs/comm/propal/propal.class.php b/htdocs/comm/propal/propal.class.php
index c0b37407be5..4c47bc69d9e 100644
--- a/htdocs/comm/propal/propal.class.php
+++ b/htdocs/comm/propal/propal.class.php
@@ -34,7 +34,7 @@
 
 require_once(DOL_DOCUMENT_ROOT ."/core/commonobject.class.php");
 require_once(DOL_DOCUMENT_ROOT ."/product/product.class.php");
-require_once(DOL_DOCUMENT_ROOT ."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT ."/contact/class/contact.class.php");
 
 
 /**
diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php
index 8c3667b59c7..c17c43969d8 100644
--- a/htdocs/comm/prospect/fiche.php
+++ b/htdocs/comm/prospect/fiche.php
@@ -29,7 +29,7 @@ require_once("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/prospect/prospect.class.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formcompany.class.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
 if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 
diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index 1beab3676fe..fe9fe14d534 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -26,7 +26,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 
 $langs->load("companies");
 $langs->load("orders");
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index 46fe1e5852d..61430c031da 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -27,7 +27,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php');
 
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index e41f589a52f..26a0c71f250 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -26,7 +26,7 @@
  */
 
 require('../main.inc.php');
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
 
 // Secrutiy check
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index 14302f1f692..fc6f5b408e3 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -26,7 +26,7 @@
 
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT.'/core/discount.class.php');
 require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php');
 require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php');
diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php
index 03facd7834c..a074a145020 100644
--- a/htdocs/compta/fiche.php
+++ b/htdocs/compta/fiche.php
@@ -28,7 +28,7 @@
 
 require('../main.inc.php');
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
 
 $langs->load("companies");
diff --git a/htdocs/contact/contact.class.php b/htdocs/contact/class/contact.class.php
similarity index 100%
rename from htdocs/contact/contact.class.php
rename to htdocs/contact/class/contact.class.php
diff --git a/htdocs/contact/exportimport.php b/htdocs/contact/exportimport.php
index cdcfc53b990..f0230922617 100644
--- a/htdocs/contact/exportimport.php
+++ b/htdocs/contact/exportimport.php
@@ -25,7 +25,7 @@
  */
 
 require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php");
 
 $langs->load("companies");
diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index da6ecd1220d..6f1fa70a64f 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -29,7 +29,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formcompany.class.php");
diff --git a/htdocs/contact/index.php b/htdocs/contact/index.php
index d101a22d20d..13a086a1ed4 100644
--- a/htdocs/contact/index.php
+++ b/htdocs/contact/index.php
@@ -27,7 +27,7 @@
  */
 
 require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 
 $langs->load("companies");
 $langs->load("suppliers");
diff --git a/htdocs/contact/info.php b/htdocs/contact/info.php
index 2e027136cec..123f73b32b5 100644
--- a/htdocs/contact/info.php
+++ b/htdocs/contact/info.php
@@ -26,7 +26,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php");
 
 $langs->load("companies");
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index d95f228753d..7ea4b4c6555 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -25,7 +25,7 @@
  */
 
 require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index 39925e32b54..658615a4131 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -25,7 +25,7 @@
  */
 
 require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php");
 
 $langs->load("companies");
diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php
index fd3154a2e25..d3b3711598e 100644
--- a/htdocs/contact/vcard.php
+++ b/htdocs/contact/vcard.php
@@ -25,7 +25,7 @@
  */
 
 require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
 require_once(DOL_DOCUMENT_ROOT."/includes/vcard/vcard.class.php");
 
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index ae5042c83f0..a472a7e2b10 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -27,7 +27,7 @@
 require ("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php');
 require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php');
 
 
diff --git a/htdocs/core/commonobject.class.php b/htdocs/core/commonobject.class.php
index ec25373e7c0..2d28c217dcb 100644
--- a/htdocs/core/commonobject.class.php
+++ b/htdocs/core/commonobject.class.php
@@ -342,7 +342,7 @@ class CommonObject
 	 */
 	function fetch_contact($contactid)
 	{
-		require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+		require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 		$contact = new Contact($this->db);
 		$result=$contact->fetch($contactid);
 		$this->contact = $contact;
diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php
index e9ebb7812c3..3bd4df4e73e 100644
--- a/htdocs/fichinter/contact.php
+++ b/htdocs/fichinter/contact.php
@@ -26,7 +26,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/fichinter/fichinter.class.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php');
 
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index 7fdd27a692d..52bd4194be2 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -26,7 +26,7 @@
  */
 
 require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/fichinter/fichinter.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php");
 
diff --git a/htdocs/fichinter/rapport.php b/htdocs/fichinter/rapport.php
index 8418be4b25b..34d5ba7cd82 100644
--- a/htdocs/fichinter/rapport.php
+++ b/htdocs/fichinter/rapport.php
@@ -21,7 +21,7 @@
  */
 
 require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 
 // Security check
 if ($user->societe_id) $socid=$user->societe_id;
diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index 9a8c15a1818..1b493d8c7ea 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -27,7 +27,7 @@
 
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.commande.class.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once DOL_DOCUMENT_ROOT."/lib/fourn.lib.php";
 require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php');
 
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index 59208eb2b07..545bbe0bd5a 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -27,7 +27,7 @@
 
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.commande.class.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 
 // Security check
 $orderid = isset($_GET["orderid"])?$_GET["orderid"]:'';
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index a767809acf1..bb4a4457b7a 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -28,7 +28,7 @@
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT.'/fourn/fournisseur.class.php');
 require_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.facture.class.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php');
 require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php');
 
diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php
index e47ad5106a3..f09659d1236 100644
--- a/htdocs/fourn/fiche.php
+++ b/htdocs/fourn/fiche.php
@@ -30,7 +30,7 @@
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.class.php");
 require_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.facture.class.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
 
 $langs->load('suppliers');
diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index 70348e62dcd..c11f4dbe1a5 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -2083,7 +2083,7 @@ class Form
 		{
 			if ($selected)
 			{
-				require_once(DOL_DOCUMENT_ROOT ."/contact/contact.class.php");
+				require_once(DOL_DOCUMENT_ROOT ."/contact/class/contact.class.php");
 				//$this->load_cache_contacts();
 				//print $this->cache_contacts[$selected];
 				$contact=new Contact($this->db);
@@ -2124,7 +2124,7 @@ class Form
 		{
 			if ($selected)
 			{
-				require_once(DOL_DOCUMENT_ROOT ."/comm/adresse_livraison.class.php");
+				require_once(DOL_DOCUMENT_ROOT ."/comm/class/adresse_livraison.class.php");
 				$livraison=new AdresseLivraison($this->db);
 				$result=$livraison->fetch_adresse($selected);
 				print '<a href='.DOL_URL_ROOT.'/comm/adresse_livraison.php?socid='.$livraison->socid.'&id='.$livraison->id.'&action=edit&origin='.$origin.'&originid='.$originid.'>'.$livraison->label.'</a>';
diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
index 4865f45a4b3..9f545f2fed9 100644
--- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
+++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
@@ -27,7 +27,7 @@
  */
 
 require_once DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php";
-require_once DOL_DOCUMENT_ROOT."/contact/contact.class.php";
+require_once DOL_DOCUMENT_ROOT."/contact/class/contact.class.php";
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
 
 
diff --git a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php b/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
index 93397d41c36..ed52327869e 100644
--- a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
+++ b/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
@@ -472,7 +472,7 @@ class InterfaceActionsAuto
 			$now=dol_now('tzserver');
 
 			// Insertion action
-			require_once(DOL_DOCUMENT_ROOT.'/contact/contact.class.php');
+			require_once(DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php');
 			require_once(DOL_DOCUMENT_ROOT.'/comm/action/actioncomm.class.php');
 			$actioncomm = new ActionComm($this->db);
 			$actioncomm->type_code   = $object->actiontypecode;
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index 3b928f380a3..c74f357b4eb 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -25,7 +25,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php');
 
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 9f57d881e3b..ba50e3d6d60 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -28,7 +28,7 @@
 require ("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php");
 require_once(DOL_DOCUMENT_ROOT."/projet/tasks/task.class.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php');
 
diff --git a/htdocs/soc.php b/htdocs/soc.php
index 76d2dc26b26..75c65037e8a 100644
--- a/htdocs/soc.php
+++ b/htdocs/soc.php
@@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formadmin.class.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formcompany.class.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 if ($conf->adherent->enabled) require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
 
 $langs->load("companies");
diff --git a/htdocs/societe.php b/htdocs/societe.php
index 2f08327c0c0..42a33a0e673 100644
--- a/htdocs/societe.php
+++ b/htdocs/societe.php
@@ -26,7 +26,7 @@
  */
 
 require_once("./main.inc.php");
-include_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+include_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 
 $langs->load("companies");
 $langs->load("customers");
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index 7aee16c484c..15714246bc4 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -28,7 +28,7 @@
  */
 
 require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
 
 $langs->load("companies");
diff --git a/htdocs/societe/notify/fiche.php b/htdocs/societe/notify/fiche.php
index cf4195356fa..c47435499e4 100644
--- a/htdocs/societe/notify/fiche.php
+++ b/htdocs/societe/notify/fiche.php
@@ -26,7 +26,7 @@
 
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 
 $langs->load("companies");
 $langs->load("mails");
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index b918189bd6a..24156df5fd7 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -30,7 +30,7 @@
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/user/user.class.php");
 require_once(DOL_DOCUMENT_ROOT."/user/group/usergroup.class.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
 if ($conf->ldap->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index c57de82185b..bace973610d 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -26,7 +26,7 @@
 
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT.'/user/group/usergroup.class.php');
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 515973eaa1e..185e70037c8 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -25,7 +25,7 @@
 define("NOLOGIN",1);	// This means this output page does not require to be logged.
 
 require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
 
diff --git a/scripts/company/sync_contacts_dolibarr2ldap.php b/scripts/company/sync_contacts_dolibarr2ldap.php
index 8099146162e..a992feb65fa 100644
--- a/scripts/company/sync_contacts_dolibarr2ldap.php
+++ b/scripts/company/sync_contacts_dolibarr2ldap.php
@@ -44,7 +44,7 @@ $now=$argv[1];
 $version='$Revision$';
 
 require_once($path."../../htdocs/master.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/contact/contact.class.php");
+require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/user/user.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");