diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index 7a85e46413f501af192afee4ab78422995937d11..7539fea7c434f3cb776fb7c37adc895b6e9b9094 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -30,7 +30,7 @@
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.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."/user/class/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 975d447b3ef6ec253fd1502de019aca750aff6bb..21e18592773cfbe83a45b0f3112789c562f13521 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -30,7 +30,7 @@
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.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."/user/class/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/user/group/usergroup.class.php b/htdocs/user/class/usergroup.class.php
similarity index 100%
rename from htdocs/user/group/usergroup.class.php
rename to htdocs/user/class/usergroup.class.php
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index c99c4d93fedbadb7ff9850508027b8ba26dbe81d..81839fc75d143a27cc084392316cc975db285aa2 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -29,7 +29,7 @@
 
 require("../main.inc.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."/user/class/usergroup.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");
diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php
index 77e7ea7af5a9127081ca4d738d3d41e71bcf872a..c13c465ef1b94a4dee04af1a4b39687a9e5c2a5d 100644
--- a/htdocs/user/group/fiche.php
+++ b/htdocs/user/group/fiche.php
@@ -25,7 +25,7 @@
  */
 
 require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/user/group/usergroup.class.php");
+require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
 
 // Defini si peux lire/modifier utilisateurs et permisssions
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index bace973610dded4b31b60a92d8dd54c526d498fd..ef68d55cb4b0d59e3c6166a4253aafd56eb17cdd 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -25,7 +25,7 @@
  */
 
 require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT.'/user/group/usergroup.class.php');
+require_once(DOL_DOCUMENT_ROOT.'/user/class/usergroup.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");
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index f8457deec82d2a9d496aad255aae0258b3aa3391..e2cb60264514ffb96c5b383de7a30fa1b6c8f1f5 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -27,7 +27,7 @@
  */
 
 require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT.'/user/group/usergroup.class.php');
+require_once(DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php');
 require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
 
 $langs->load("users");
diff --git a/scripts/user/sync_groups_dolibarr2ldap.php b/scripts/user/sync_groups_dolibarr2ldap.php
index 52453c0114e2097d00fd12fb45a39fb9529e66b8..752dd24c9bbef64e226cfd82bcd5b37f629240a9 100644
--- a/scripts/user/sync_groups_dolibarr2ldap.php
+++ b/scripts/user/sync_groups_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/group/usergroup.class.php");
+require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php");
 
 $error=0;
 
diff --git a/test/UserGroupTest.php b/test/UserGroupTest.php
index 2f2adc4b74e87740ca4a1b62417d868055aa3da7..5ee3a241fd5d287ade3b778dac8c4de7129d7907 100644
--- a/test/UserGroupTest.php
+++ b/test/UserGroupTest.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/group/usergroup.class.php';
+require_once dirname(__FILE__).'/../htdocs/user/class/usergroup.class.php';
 
 if (empty($user->id))
 {