diff --git a/dev/initdata/generate-commande.php b/dev/initdata/generate-commande.php
index a03fc5c0795..372c634e93c 100644
--- a/dev/initdata/generate-commande.php
+++ b/dev/initdata/generate-commande.php
@@ -35,7 +35,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 // Recupere root dolibarr
 $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."/societe/class/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/class/product.class.php");
diff --git a/dev/initdata/generate-facture.php b/dev/initdata/generate-facture.php
index 56c1e4a0e3f..9a506914df1 100644
--- a/dev/initdata/generate-facture.php
+++ b/dev/initdata/generate-facture.php
@@ -35,7 +35,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 $path=preg_replace('/generate-facture.php/i','',$_SERVER["PHP_SELF"]);
 require ($path."../htdocs/master.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
-require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
+require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 
 
 /*
diff --git a/dev/initdata/generate-produit.php b/dev/initdata/generate-produit.php
index 60cb7c44491..954b39d9965 100644
--- a/dev/initdata/generate-produit.php
+++ b/dev/initdata/generate-produit.php
@@ -35,7 +35,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 // Recupere root dolibarr
 $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."/societe/class/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/class/product.class.php");
diff --git a/dev/initdata/generate-propale.php b/dev/initdata/generate-propale.php
index 8488703af20..ebf6cbc06a5 100644
--- a/dev/initdata/generate-propale.php
+++ b/dev/initdata/generate-propale.php
@@ -38,7 +38,7 @@ require ($path."../htdocs/master.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
 require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
-require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
+require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 
 /*
  * Parameters
diff --git a/dev/initdata/generate-societe.php b/dev/initdata/generate-societe.php
index de6d74ccad4..881b59190ad 100644
--- a/dev/initdata/generate-societe.php
+++ b/dev/initdata/generate-societe.php
@@ -35,7 +35,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 // Recupere root dolibarr
 $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."/societe/class/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/class/product.class.php");
diff --git a/dev/skeletons/skeleton_class.class.php b/dev/skeletons/skeleton_class.class.php
index c6875ca5ca0..bafb7dff900 100644
--- a/dev/skeletons/skeleton_class.class.php
+++ b/dev/skeletons/skeleton_class.class.php
@@ -28,7 +28,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."/societe/class/societe.class.php");
 //require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 
diff --git a/htdocs/bookmarks/liste.php b/htdocs/bookmarks/liste.php
index 3cc156a4227..0f01af57523 100644
--- a/htdocs/bookmarks/liste.php
+++ b/htdocs/bookmarks/liste.php
@@ -126,7 +126,7 @@ if ($resql)
             if (! $obj->title)
             {
                 // For compatibility with old Dolibarr bookmarks
-                require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
+                require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
                 $societe=new Societe($db);
                 $societe->fetch($obj->rowid);
                 $obj->title=$societe->nom;
diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php
index 17609772a96..be39055c7a3 100644
--- a/htdocs/cashdesk/tpl/menu.tpl.php
+++ b/htdocs/cashdesk/tpl/menu.tpl.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-include_once(DOL_DOCUMENT_ROOT.'/societe/societe.class.php');
+include_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php');
 include_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php');
 include_once(DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php');
 
diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php
index 39ff722e51f..c8dc8e14306 100644
--- a/htdocs/categories/categorie.php
+++ b/htdocs/categories/categorie.php
@@ -179,7 +179,7 @@ $html = new Form($db);
 if ($_GET["socid"])
 {
 	require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
-	require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
+	require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 
 	$langs->load("companies");
 
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 73fbb28f7f9..4c9931ecd43 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -27,7 +27,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
-require_once(DOL_DOCUMENT_ROOT."/societe/client.class.php");
+require_once(DOL_DOCUMENT_ROOT."/societe/class/client.class.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/action/actioncomm.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php");
 if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 5416e735421..7493b96b43a 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -733,7 +733,7 @@ class Propal extends CommonObject
 		$object->id=0;
 		$object->statut=0;
 
-		require_once(DOL_DOCUMENT_ROOT ."/societe/societe.class.php");
+		require_once(DOL_DOCUMENT_ROOT ."/societe/class/societe.class.php");
 		$objsoc=new Societe($this->db);
 		$objsoc->fetch($object->socid);
 
diff --git a/htdocs/comm/prospect/prospect.class.php b/htdocs/comm/prospect/prospect.class.php
index 234b52d28bf..3e1dfb41c5b 100644
--- a/htdocs/comm/prospect/prospect.class.php
+++ b/htdocs/comm/prospect/prospect.class.php
@@ -25,7 +25,7 @@
  *		\version    $Id$
 */
 
-include_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
+include_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 
 
 /**
diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index 9fab72b2b51..febbc2fa460 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -29,7 +29,7 @@
 
 require("./pre.inc.php");	// We use pre.inc.php to have a dynamic menu
 require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
+require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php
index 82cdf5b5a23..717d3ee55df 100644
--- a/htdocs/compta/bank/class/bankcateg.class.php
+++ b/htdocs/compta/bank/class/bankcateg.class.php
@@ -28,7 +28,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."/societe/class/societe.class.php");
 //require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 
diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php
index 6b14f5248d2..2062a7dde66 100644
--- a/htdocs/compta/bank/rappro.php
+++ b/htdocs/compta/bank/rappro.php
@@ -26,7 +26,7 @@
 
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
+require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/sociales/class/chargesociales.class.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php
index a73665d0a48..5d46b566f4a 100644
--- a/htdocs/compta/bank/search.php
+++ b/htdocs/compta/bank/search.php
@@ -27,7 +27,7 @@
 
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
+require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/bankcateg.class.php");
 
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index e6f1961ae72..f0c761126ae 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -27,7 +27,7 @@
 
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
+require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php');
 require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php');
 require_once(DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php');
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 6c898ac020b..d2659a8f937 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -33,7 +33,7 @@
 
 require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
 require_once(DOL_DOCUMENT_ROOT ."/product/class/product.class.php");
-require_once(DOL_DOCUMENT_ROOT ."/societe/client.class.php");
+require_once(DOL_DOCUMENT_ROOT ."/societe/class/client.class.php");
 
 
 /**
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index aa0cd9aa033..1dcfb43c156 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -466,7 +466,7 @@ if ($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire)
 // Last customers
 if ($conf->societe->enabled && $user->rights->societe->lire)
 {
-	include_once(DOL_DOCUMENT_ROOT.'/societe/client.class.php');
+	include_once(DOL_DOCUMENT_ROOT.'/societe/class/client.class.php');
 
 	$langs->load("boxes");
 
diff --git a/htdocs/compta/prelevement/class/bon-prelevement.class.php b/htdocs/compta/prelevement/class/bon-prelevement.class.php
index c064b92ddf6..2107c02c40c 100644
--- a/htdocs/compta/prelevement/class/bon-prelevement.class.php
+++ b/htdocs/compta/prelevement/class/bon-prelevement.class.php
@@ -26,7 +26,7 @@
 
 require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
-require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
+require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 
 
 /**
@@ -683,7 +683,7 @@ class BonPrelevement extends CommonObject
 
         require_once (DOL_DOCUMENT_ROOT."/compta/prelevement/bon-prelevement.class.php");
         require_once (DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
-        require_once (DOL_DOCUMENT_ROOT."/societe/societe.class.php");
+        require_once (DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
         require_once (DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
 
         $error = 0;
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 93883ba1f00..51d66e68fd1 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -26,7 +26,7 @@
 require('../../main.inc.php');
 require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
-require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
+require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 
 $langs->load("widthdrawals");
 $langs->load("companies");
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 967fc3cde8c..cf83955dba6 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -27,7 +27,7 @@
 require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT."/includes/modules/modPrelevement.class.php";
 require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php";
-require_once DOL_DOCUMENT_ROOT."/societe/societe.class.php";
+require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
 
 $langs->load("widthdrawals");
 $langs->load("companies");
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 749fa53bad2..93c59b70949 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -27,7 +27,7 @@
 require('../../main.inc.php');
 require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
-require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
+require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 
 $langs->load("withdrawals");
 
diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php
index d3b3711598e..80abb4f9520 100644
--- a/htdocs/contact/vcard.php
+++ b/htdocs/contact/vcard.php
@@ -26,7 +26,7 @@
 
 require("../main.inc.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."/societe/class/societe.class.php");
 require_once(DOL_DOCUMENT_ROOT."/includes/vcard/vcard.class.php");
 
 
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index 352dd8b2abd..64c17ba4891 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -28,7 +28,7 @@
 require ("../main.inc.php");
 require_once (DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
 require_once (DOL_DOCUMENT_ROOT."/product/class/product.class.php");
-require_once (DOL_DOCUMENT_ROOT."/societe/societe.class.php");
+require_once (DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 
 $langs->load("products");
 $langs->load("companies");
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index 359c101853c..6aacf9256b3 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -28,7 +28,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."/societe/class/societe.class.php");
 //require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 
diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
index 908bf93a699..48cafd745e5 100644
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -25,7 +25,7 @@
  *	\version    $Id$
  */
 
-require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
+require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php");
 require_once(DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.product.class.php");
 
diff --git a/htdocs/fourn/product/liste.php b/htdocs/fourn/product/liste.php
index e400601b1a0..a31344eb8c0 100644
--- a/htdocs/fourn/product/liste.php
+++ b/htdocs/fourn/product/liste.php
@@ -27,7 +27,7 @@
 
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
-require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
+require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 
 $langs->load("products");
 $langs->load("suppliers");
diff --git a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php
index 59c79cccae3..0897fc3f13a 100644
--- a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php
@@ -26,7 +26,7 @@
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php");
-require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
+require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
 
diff --git a/htdocs/index.php b/htdocs/index.php
index 2a6ceff1d29..7df11e683de 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -126,7 +126,7 @@ if ($user->societe_id == 0)
 	! empty($conf->telephonie->enabled) && $user->rights->telephonie->lire,
 	! empty($conf->societe->enabled) && $user->rights->contrat->activer);
 	// Class file containing the method load_state_board for each line
-	$includes=array(DOL_DOCUMENT_ROOT."/societe/client.class.php",
+	$includes=array(DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
 	DOL_DOCUMENT_ROOT."/comm/prospect/prospect.class.php",
 	DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php",
 	DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php",
diff --git a/htdocs/lib/agenda.lib.php b/htdocs/lib/agenda.lib.php
index e936a14f9bb..0d64880b3b0 100644
--- a/htdocs/lib/agenda.lib.php
+++ b/htdocs/lib/agenda.lib.php
@@ -125,7 +125,7 @@ function show_array_actions_to_do($max=5)
 	global $langs, $conf, $user, $db, $bc, $socid;
 
 	include_once(DOL_DOCUMENT_ROOT.'/comm/action/actioncomm.class.php');
-	include_once(DOL_DOCUMENT_ROOT.'/societe/client.class.php');
+	include_once(DOL_DOCUMENT_ROOT.'/societe/class/client.class.php');
 
 	$sql = "SELECT a.id, a.label, ".$db->pdate("a.datep")." as dp, a.fk_user_author, a.percent,";
 	$sql.= " c.code, c.libelle,";
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 6ac1b82841a..928da094f6c 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -218,7 +218,7 @@ if (isset($_SERVER["HTTP_USER_AGENT"]))
 // Chargement des includes principaux de librairies communes
 if (! defined('NOREQUIREUSER')) require_once(DOL_DOCUMENT_ROOT ."/user/user.class.php");		// Need 500ko memory
 if (! defined('NOREQUIRETRAN')) require_once(DOL_DOCUMENT_ROOT ."/core/class/translate.class.php");
-if (! defined('NOREQUIRESOC'))  require_once(DOL_DOCUMENT_ROOT ."/societe/societe.class.php");
+if (! defined('NOREQUIRESOC'))  require_once(DOL_DOCUMENT_ROOT ."/societe/class/societe.class.php");
 if (! defined('NOREQUIREDB'))   require_once(DOL_DOCUMENT_ROOT ."/lib/databases/".$conf->db->type.".lib.php");
 
 /*
@@ -334,7 +334,7 @@ if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
  */
 if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC'))
 {
-	require_once(DOL_DOCUMENT_ROOT ."/societe/societe.class.php");
+	require_once(DOL_DOCUMENT_ROOT ."/societe/class/societe.class.php");
 	$mysoc=new Societe($db);
 
 	$mysoc->id=0;
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index 15714246bc4..6b6fe2e3031 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -63,7 +63,7 @@ $html = new Form($db);
 if ($_GET["socid"])
 {
 	require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
-	require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
+	require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 
 	$langs->load("companies");
 
diff --git a/htdocs/societe/client.class.php b/htdocs/societe/class/client.class.php
similarity index 98%
rename from htdocs/societe/client.class.php
rename to htdocs/societe/class/client.class.php
index e163b09f868..0c4f87291fd 100644
--- a/htdocs/societe/client.class.php
+++ b/htdocs/societe/class/client.class.php
@@ -23,7 +23,7 @@
  *		\brief      File for class of customers
  *		\version    $Id$
  */
-include_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
+include_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 
 
 /**
diff --git a/htdocs/societe/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
similarity index 100%
rename from htdocs/societe/companybankaccount.class.php
rename to htdocs/societe/class/companybankaccount.class.php
diff --git a/htdocs/societe/societe.class.php b/htdocs/societe/class/societe.class.php
similarity index 99%
rename from htdocs/societe/societe.class.php
rename to htdocs/societe/class/societe.class.php
index 721772052fe..31f2d0ee56e 100644
--- a/htdocs/societe/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1482,7 +1482,7 @@ class Societe extends CommonObject
 	{
 		global $langs;
 
-		require_once DOL_DOCUMENT_ROOT . "/societe/companybankaccount.class.php";
+		require_once DOL_DOCUMENT_ROOT . "/societe/class/companybankaccount.class.php";
 
 		$bac = new CompanyBankAccount($this->db);
 		$bac->socid = $this->id;
@@ -1505,7 +1505,7 @@ class Societe extends CommonObject
 	 */
 	function load_ban()
 	{
-		require_once DOL_DOCUMENT_ROOT . "/societe/companybankaccount.class.php";
+		require_once DOL_DOCUMENT_ROOT . "/societe/class/companybankaccount.class.php";
 
 		$bac = new CompanyBankAccount($this->db, $this->id);
 		$bac->fetch($this->id);
diff --git a/htdocs/societe/info.php b/htdocs/societe/info.php
index a66a247c9d3..baecbbc0f2a 100644
--- a/htdocs/societe/info.php
+++ b/htdocs/societe/info.php
@@ -26,7 +26,7 @@
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
+require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 
 $langs->load("companies");
 $langs->load("other");
diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index a8fd92d95d5..cca175f6ab5 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -29,7 +29,7 @@
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php");
-require_once DOL_DOCUMENT_ROOT."/societe/companybankaccount.class.php";
+require_once DOL_DOCUMENT_ROOT."/societe/class/companybankaccount.class.php";
 
 $langs->load("companies");
 $langs->load("banks");
diff --git a/scripts/withdrawals/prelevement-verif.php b/scripts/withdrawals/prelevement-verif.php
index 48294007584..f6e2fc86fa7 100644
--- a/scripts/withdrawals/prelevement-verif.php
+++ b/scripts/withdrawals/prelevement-verif.php
@@ -39,7 +39,7 @@ $version='$Revision$';
 
 require_once($path."../../htdocs/master.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
-require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
+require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 
 $error = 0;
 
diff --git a/scripts/withdrawals/prelevement.php b/scripts/withdrawals/prelevement.php
index 300abe6c025..ee5cc81b943 100644
--- a/scripts/withdrawals/prelevement.php
+++ b/scripts/withdrawals/prelevement.php
@@ -40,7 +40,7 @@ $version='$Revision$';
 require_once($path."../../htdocs/master.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
-require_once(DOL_DOCUMENT_ROOT."/societe/societe.class.php");
+require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
 
 $error = 0;