diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 88f6a3f6409e081390cb4084985601b0cbb321bb..61ce837d60c7102f4356129fb72a704907882c5b 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -497,7 +497,7 @@ class Adherent extends CommonObject
 			{
 				if ($this->user_id > 0 && ! $nosyncuser)
 				{
-					require_once(DOL_DOCUMENT_ROOT."/user/user.class.php");
+					require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
 
 					dol_syslog("Adherent::update update linked user");
 
@@ -766,7 +766,7 @@ class Adherent extends CommonObject
 
 				if ($this->user_id && ! $nosyncuser)
 				{
-					require_once(DOL_DOCUMENT_ROOT."/user/user.class.php");
+					require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
 
 					// This member is linked with a user, so we also update users informations
 					// if this is an update.
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index 7fb27f4044b073f9ab3b9e3f4973ae1439fda8c2..7a85e46413f501af192afee4ab78422995937d11 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -29,7 +29,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/user/user.class.php");
+require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
 require_once(DOL_DOCUMENT_ROOT."/user/group/usergroup.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index af733fb7c4560505ca3e0af5df4c95c685f0e5d6..975d447b3ef6ec253fd1502de019aca750aff6bb 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -29,7 +29,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/user/user.class.php");
+require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
 require_once(DOL_DOCUMENT_ROOT."/user/group/usergroup.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");
diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index b02be953e7c885f1842923f5a4f1a5baee8fd6a4..b014179318ed3ca7be89c95277dffe0d8c0d02f0 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -29,7 +29,7 @@
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.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."/user/class/user.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."/html.formactions.class.php");
diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index c11f4dbe1a5de83c124b91d8c965912b7a0cb05e..84d6d9ccab3747a55d6f8090d6237e9d18647a2f 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -1954,7 +1954,7 @@ class Form
 		{
 			if ($selected)
 			{
-				require_once(DOL_DOCUMENT_ROOT ."/user/user.class.php");
+				require_once(DOL_DOCUMENT_ROOT ."/user/class/user.class.php");
 				//$this->load_cache_contacts();
 				//print $this->cache_contacts[$selected];
 				$theuser=new User($this->db);
diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php
index 6cb62014f26bb7bd2645e3cc3f18d05243e8d09c..a5de69dc927d95d169f31465594abab8894ebeec 100644
--- a/htdocs/install/etape5.php
+++ b/htdocs/install/etape5.php
@@ -149,7 +149,7 @@ if ($_POST["action"] == "set" || preg_match('/upgrade/i',$_POST["action"]))
 			$conf->setValues($db);
 
 			// Create user
-			include_once(DOL_DOCUMENT_ROOT ."/user/user.class.php");
+			include_once(DOL_DOCUMENT_ROOT ."/user/class/user.class.php");
 
 			$createuser=new User($db);
 			$createuser->id=0;
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 928da094f6cfaeb893e7a78944eab62e82abba13..2c1de700d92f2434942bf0b38d7d74fc306a4e4d 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -216,7 +216,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('NOREQUIREUSER')) require_once(DOL_DOCUMENT_ROOT ."/user/class/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/class/societe.class.php");
 if (! defined('NOREQUIREDB'))   require_once(DOL_DOCUMENT_ROOT ."/lib/databases/".$conf->db->type.".lib.php");
diff --git a/htdocs/user/user.class.php b/htdocs/user/class/user.class.php
similarity index 100%
rename from htdocs/user/user.class.php
rename to htdocs/user/class/user.class.php
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 24156df5fd7cc2f949a553b397c05acf1349dc66..e73107821fd102b0b14c769d28cc6f526833d6f1 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -28,7 +28,7 @@
  */
 
 require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/user/user.class.php");
+require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
 require_once(DOL_DOCUMENT_ROOT."/user/group/usergroup.class.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php");
diff --git a/htdocs/user/info.php b/htdocs/user/info.php
index 0cb78224d79a2d5d70d6114365ac20b1a6f02774..6cbdc91f460e09de687059885d7661fba25450a8 100644
--- a/htdocs/user/info.php
+++ b/htdocs/user/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/usergroups.lib.php');
-require_once(DOL_DOCUMENT_ROOT."/user/user.class.php");
+require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
 
 $langs->load("users");
 
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index b9d939b954b43d811cc124a9672f26c4c169412c..7aef7a36eb24292ce425e52bb732bc9a179119af 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -26,7 +26,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/usergroups.lib.php');
-require_once(DOL_DOCUMENT_ROOT.'/user/user.class.php');
+require_once(DOL_DOCUMENT_ROOT.'/user/class/user.class.php');
 
 $action=isset($_GET["action"])?$_GET["action"]:(isset($_POST["action"])?$_POST["action"]:"");
 $id=isset($_GET["id"])?$_GET["id"]:(isset($_POST["id"])?$_POST["id"]:"");
diff --git a/scripts/company/sync_contacts_dolibarr2ldap.php b/scripts/company/sync_contacts_dolibarr2ldap.php
index a992feb65fa1e2a79c99c5a526f416962ba122fc..cd279ddbfa5d0242f3baf8b498e6b61c93194f4f 100644
--- a/scripts/company/sync_contacts_dolibarr2ldap.php
+++ b/scripts/company/sync_contacts_dolibarr2ldap.php
@@ -45,7 +45,7 @@ $version='$Revision$';
 
 require_once($path."../../htdocs/master.inc.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."/user/class/user.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
 
 $error=0;
diff --git a/scripts/user/sync_users_dolibarr2ldap.php b/scripts/user/sync_users_dolibarr2ldap.php
index 686beac8aaae073a5b567a9e695285638d7ffbd3..cb46df3d6f0cac84c5a896d47076e8cd47d5f2c3 100644
--- a/scripts/user/sync_users_dolibarr2ldap.php
+++ b/scripts/user/sync_users_dolibarr2ldap.php
@@ -45,7 +45,7 @@ $version='$Revision$';
 
 require_once($path."../../htdocs/master.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
-require_once(DOL_DOCUMENT_ROOT."/user/user.class.php");
+require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
 
 $error=0;
 
diff --git a/test/UserTest.php b/test/UserTest.php
index 1c21c94e8eece197e143c6a02c194a6975025d6d..5cb38c2b0a142e9823170c22cd25b98ab7836222 100644
--- a/test/UserTest.php
+++ b/test/UserTest.php
@@ -28,7 +28,7 @@ global $conf,$user,$langs,$db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 require_once 'PHPUnit/Framework.php';
 require_once dirname(__FILE__).'/../htdocs/master.inc.php';
-require_once dirname(__FILE__).'/../htdocs/user/user.class.php';
+require_once dirname(__FILE__).'/../htdocs/user/class/user.class.php';
 
 if (empty($user->id))
 {