diff --git a/apps/user_ldap/ajax/wizard.php b/apps/user_ldap/ajax/wizard.php
index f3e5efffc24d4a0af03c0abd068d38e8fe9768fd..99e0c37d1cf83954a3e9817c1f1f21baf442137a 100644
--- a/apps/user_ldap/ajax/wizard.php
+++ b/apps/user_ldap/ajax/wizard.php
@@ -49,7 +49,7 @@ $con->setConfiguration($configuration->getConfiguration());
 $con->ldapConfigurationActive = true;
 $con->setIgnoreValidation(true);
 
-$userManager = new \OCA\user_ldap\lib\user\Manager(
+$userManager = new \OCA\User_LDAP\User\Manager(
 	\OC::$server->getConfig(),
 	new \OCA\user_ldap\lib\FilesystemHelper(),
 	new \OCA\user_ldap\lib\LogWrapper(),
diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index 5e716f1860ca8f3c24bf475a2049c3d2621ee40d..efc5e19e91d5be7582a28e186a47fdc6177cc920 100644
--- a/apps/user_ldap/appinfo/app.php
+++ b/apps/user_ldap/appinfo/app.php
@@ -33,7 +33,7 @@ $ldapWrapper = new OCA\user_ldap\lib\LDAP();
 $ocConfig = \OC::$server->getConfig();
 if(count($configPrefixes) === 1) {
 	$dbc = \OC::$server->getDatabaseConnection();
-	$userManager = new OCA\user_ldap\lib\user\Manager($ocConfig,
+	$userManager = new OCA\User_LDAP\User\Manager($ocConfig,
 		new OCA\user_ldap\lib\FilesystemHelper(),
 		new OCA\user_ldap\lib\LogWrapper(),
 		\OC::$server->getAvatarManager(),
diff --git a/apps/user_ldap/appinfo/register_command.php b/apps/user_ldap/appinfo/register_command.php
index a2dd3a381dadf4687595bc39330b64cab346a108..57e1f5e9af53adbbb62548c51dd3649e88dc66aa 100644
--- a/apps/user_ldap/appinfo/register_command.php
+++ b/apps/user_ldap/appinfo/register_command.php
@@ -25,7 +25,7 @@ use OCA\user_ldap\lib\Helper;
 use OCA\user_ldap\lib\LDAP;
 use OCA\User_LDAP\User_Proxy;
 use OCA\User_LDAP\Mapping\UserMapping;
-use OCA\User_LDAP\lib\User\DeletedUsersIndex;
+use OCA\User_LDAP\User\DeletedUsersIndex;
 
 $dbConnection = \OC::$server->getDatabaseConnection();
 $userMapping = new UserMapping($dbConnection);
diff --git a/apps/user_ldap/lib/Command/CheckUser.php b/apps/user_ldap/lib/Command/CheckUser.php
index c8c46bbdff2906b8594870c5d9db3931aad80483..f26b2f4546b6c9180069e2bf248e142da468df79 100644
--- a/apps/user_ldap/lib/Command/CheckUser.php
+++ b/apps/user_ldap/lib/Command/CheckUser.php
@@ -28,7 +28,7 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-use OCA\User_LDAP\lib\User\DeletedUsersIndex;
+use OCA\User_LDAP\User\DeletedUsersIndex;
 use OCA\User_LDAP\Mapping\UserMapping;
 use OCA\user_ldap\lib\Helper as LDAPHelper;
 use OCA\User_LDAP\User_Proxy;
@@ -40,7 +40,7 @@ class CheckUser extends Command {
 	/** @var \OCA\User_LDAP\lib\Helper */
 	protected $helper;
 
-	/** @var \OCA\User_LDAP\lib\User\DeletedUsersIndex */
+	/** @var \OCA\User_LDAP\User\DeletedUsersIndex */
 	protected $dui;
 
 	/** @var \OCA\User_LDAP\Mapping\UserMapping */
diff --git a/apps/user_ldap/lib/Command/ShowRemnants.php b/apps/user_ldap/lib/Command/ShowRemnants.php
index de435ec4327e2c1f297002e8379aa38a7c4e06ed..59da6e5522dd2aec158b68dbb95f9c105f322361 100644
--- a/apps/user_ldap/lib/Command/ShowRemnants.php
+++ b/apps/user_ldap/lib/Command/ShowRemnants.php
@@ -28,11 +28,11 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-use OCA\user_ldap\lib\user\DeletedUsersIndex;
+use OCA\User_LDAP\User\DeletedUsersIndex;
 use OCP\IDateTimeFormatter;
 
 class ShowRemnants extends Command {
-	/** @var \OCA\User_LDAP\lib\User\DeletedUsersIndex */
+	/** @var \OCA\User_LDAP\User\DeletedUsersIndex */
 	protected $dui;
 
 	/** @var \OCP\IDateTimeFormatter */
diff --git a/apps/user_ldap/lib/Jobs/CleanUp.php b/apps/user_ldap/lib/Jobs/CleanUp.php
index d3af1cf12fa7b6d03140e8d787bbaa30dbdc2ca3..fb4f37203c1c6799bb17c0c412cc4419d0badd88 100644
--- a/apps/user_ldap/lib/Jobs/CleanUp.php
+++ b/apps/user_ldap/lib/Jobs/CleanUp.php
@@ -27,7 +27,7 @@ use \OCA\user_ldap\User_LDAP;
 use \OCA\User_LDAP\User_Proxy;
 use \OCA\user_ldap\lib\Helper;
 use \OCA\user_ldap\lib\LDAP;
-use \OCA\user_ldap\lib\user\DeletedUsersIndex;
+use \OCA\User_LDAP\User\DeletedUsersIndex;
 use \OCA\User_LDAP\Mapping\UserMapping;
 
 /**
@@ -59,7 +59,7 @@ class CleanUp extends TimedJob {
 	/** @var \OCA\User_LDAP\Mapping\UserMapping */
 	protected $mapping;
 
-	/** @var \OCA\User_LDAP\lib\User\DeletedUsersIndex */
+	/** @var \OCA\User_LDAP\User\DeletedUsersIndex */
 	protected $dui;
 
 	public function __construct() {
diff --git a/apps/user_ldap/lib/user/deletedusersindex.php b/apps/user_ldap/lib/User/DeletedUsersIndex.php
similarity index 95%
rename from apps/user_ldap/lib/user/deletedusersindex.php
rename to apps/user_ldap/lib/User/DeletedUsersIndex.php
index 48daeb9b8bce567ac3e748add41b6055a1efee7e..7a9823786dd925139dffc1d6531a095a95061e1e 100644
--- a/apps/user_ldap/lib/user/deletedusersindex.php
+++ b/apps/user_ldap/lib/User/DeletedUsersIndex.php
@@ -21,7 +21,7 @@
  *
  */
 
-namespace OCA\user_ldap\lib\user;
+namespace OCA\User_LDAP\User;
 
 use OCA\User_LDAP\Mapping\UserMapping;
 
@@ -63,7 +63,7 @@ class DeletedUsersIndex {
 
 	/**
 	 * reads LDAP users marked as deleted from the database
-	 * @return \OCA\user_ldap\lib\user\OfflineUser[]
+	 * @return \OCA\User_LDAP\User\OfflineUser[]
 	 */
 	private function fetchDeletedUsers() {
 		$deletedUsers = $this->config->getUsersForUserValue(
@@ -80,7 +80,7 @@ class DeletedUsersIndex {
 
 	/**
 	 * returns all LDAP users that are marked as deleted
-	 * @return \OCA\user_ldap\lib\user\OfflineUser[]
+	 * @return \OCA\User_LDAP\User\OfflineUser[]
 	 */
 	public function getUsers() {
 		if(is_array($this->deletedUsers)) {
diff --git a/apps/user_ldap/lib/user/iusertools.php b/apps/user_ldap/lib/User/IUserTools.php
similarity index 97%
rename from apps/user_ldap/lib/user/iusertools.php
rename to apps/user_ldap/lib/User/IUserTools.php
index b0eb9e1ffb35defbabf188bf6818ef952722bc68..747b46ec68aa488e3bec747385b545b5eb148f26 100644
--- a/apps/user_ldap/lib/user/iusertools.php
+++ b/apps/user_ldap/lib/User/IUserTools.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace OCA\user_ldap\lib\user;
+namespace OCA\User_LDAP\User;
 
 /**
  * IUserTools
diff --git a/apps/user_ldap/lib/user/manager.php b/apps/user_ldap/lib/User/Manager.php
similarity index 92%
rename from apps/user_ldap/lib/user/manager.php
rename to apps/user_ldap/lib/User/Manager.php
index dc12ebd6e9d9b5c6c9dff32294b49b8da5936041..ca86970d47731b8f4b96f1688da5db059f909bb4 100644
--- a/apps/user_ldap/lib/user/manager.php
+++ b/apps/user_ldap/lib/User/Manager.php
@@ -23,13 +23,10 @@
  *
  */
 
-namespace OCA\user_ldap\lib\user;
+namespace OCA\User_LDAP\User;
 
-use OCA\user_ldap\lib\user\IUserTools;
-use OCA\user_ldap\lib\user\User;
 use OCA\user_ldap\lib\LogWrapper;
 use OCA\user_ldap\lib\FilesystemHelper;
-use OCA\user_ldap\lib\user\OfflineUser;
 use OCP\IAvatarManager;
 use OCP\IConfig;
 use OCP\IDBConnection;
@@ -65,8 +62,8 @@ class Manager {
 	protected $avatarManager;
 
 	/**
-	 * array['byDN']	\OCA\user_ldap\lib\User[]
-	 * 	['byUid']	\OCA\user_ldap\lib\User[]
+	 * array['byDN']	\OCA\User_LDAP\User\User[]
+	 * 	['byUid']	\OCA\User_LDAP\User\User[]
 	 * @var array $users
 	 */
 	protected $users = array(
@@ -112,7 +109,7 @@ class Manager {
 	 * property array
 	 * @param string $dn the DN of the user
 	 * @param string $uid the internal (owncloud) username
-	 * @return \OCA\user_ldap\lib\User\User
+	 * @return \OCA\User_LDAP\User\User
 	 */
 	private function createAndCache($dn, $uid) {
 		$this->checkAccess();
@@ -187,7 +184,7 @@ class Manager {
 	/**
 	 * creates and returns an instance of OfflineUser for the specified user
 	 * @param string $id
-	 * @return \OCA\user_ldap\lib\user\OfflineUser
+	 * @return \OCA\User_LDAP\User\OfflineUser
 	 */
 	public function getDeletedUser($id) {
 		return new OfflineUser(
@@ -200,7 +197,7 @@ class Manager {
 	/**
 	 * @brief returns a User object by it's ownCloud username
 	 * @param string $id the DN or username of the user
-	 * @return \OCA\user_ldap\lib\user\User|\OCA\user_ldap\lib\user\OfflineUser|null
+	 * @return \OCA\User_LDAP\User\User|\OCA\User_LDAP\User\OfflineUser|null
 	 */
 	protected function createInstancyByUserName($id) {
 		//most likely a uid. Check whether it is a deleted user
@@ -217,7 +214,7 @@ class Manager {
 	/**
 	 * @brief returns a User object by it's DN or ownCloud username
 	 * @param string $id the DN or username of the user
-	 * @return \OCA\user_ldap\lib\user\User|\OCA\user_ldap\lib\user\OfflineUser|null
+	 * @return \OCA\User_LDAP\User\User|\OCA\User_LDAP\User\OfflineUser|null
 	 * @throws \Exception when connection could not be established
 	 */
 	public function get($id) {
diff --git a/apps/user_ldap/lib/user/offlineuser.php b/apps/user_ldap/lib/User/OfflineUser.php
similarity index 99%
rename from apps/user_ldap/lib/user/offlineuser.php
rename to apps/user_ldap/lib/User/OfflineUser.php
index aee1a137a9654d1b2c27d94dbdd7ae044b2f37f5..a3a9995490db37abda6ba23c232068871a1a47d8 100644
--- a/apps/user_ldap/lib/user/offlineuser.php
+++ b/apps/user_ldap/lib/User/OfflineUser.php
@@ -21,7 +21,7 @@
  *
  */
 
-namespace OCA\user_ldap\lib\user;
+namespace OCA\User_LDAP\User;
 
 use OCA\User_LDAP\Mapping\UserMapping;
 
diff --git a/apps/user_ldap/lib/user/user.php b/apps/user_ldap/lib/User/User.php
similarity index 99%
rename from apps/user_ldap/lib/user/user.php
rename to apps/user_ldap/lib/User/User.php
index 4da8ae5f09831b40ad20eb0d0172f27214d2848e..4b9e3a3c9fca231f048f63f000fa0e350da2f723 100644
--- a/apps/user_ldap/lib/user/user.php
+++ b/apps/user_ldap/lib/User/User.php
@@ -22,7 +22,7 @@
  *
  */
 
-namespace OCA\user_ldap\lib\user;
+namespace OCA\User_LDAP\User;
 
 use OCA\user_ldap\lib\Connection;
 use OCA\user_ldap\lib\FilesystemHelper;
diff --git a/apps/user_ldap/lib/User_LDAP.php b/apps/user_ldap/lib/User_LDAP.php
index 29ea8496587db150b1b47b85aae2f85583742539..1098a30a50186dbff5b59dd813f94b7e0c0ff11d 100644
--- a/apps/user_ldap/lib/User_LDAP.php
+++ b/apps/user_ldap/lib/User_LDAP.php
@@ -34,8 +34,8 @@ namespace OCA\User_LDAP;
 use OC\User\NoUserException;
 use OCA\user_ldap\lib\BackendUtility;
 use OCA\user_ldap\lib\Access;
-use OCA\user_ldap\lib\user\OfflineUser;
-use OCA\User_LDAP\lib\User\User;
+use OCA\User_LDAP\User\OfflineUser;
+use OCA\User_LDAP\User\User;
 use OCP\IConfig;
 
 class User_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserInterface {
@@ -201,7 +201,7 @@ class User_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn
 	/**
 	 * checks whether a user is still available on LDAP
 	 *
-	 * @param string|\OCA\User_LDAP\lib\user\User $user either the ownCloud user
+	 * @param string|\OCA\User_LDAP\User\User $user either the ownCloud user
 	 * name or an instance of that user
 	 * @return bool
 	 * @throws \Exception
diff --git a/apps/user_ldap/lib/User_Proxy.php b/apps/user_ldap/lib/User_Proxy.php
index 73883a3d47ec768b569b454f413cd73bae3b4c5e..aba8398fa20c48d408c7b7e7f424e70f039e437e 100644
--- a/apps/user_ldap/lib/User_Proxy.php
+++ b/apps/user_ldap/lib/User_Proxy.php
@@ -27,7 +27,7 @@
 namespace OCA\User_LDAP;
 
 use OCA\user_ldap\lib\ILDAPWrapper;
-use OCA\User_LDAP\lib\User\User;
+use OCA\User_LDAP\User\User;
 use \OCA\user_ldap\User_LDAP;
 use OCP\IConfig;
 
@@ -162,7 +162,7 @@ class User_Proxy extends lib\Proxy implements \OCP\IUserBackend, \OCP\UserInterf
 
 	/**
 	 * check if a user exists on LDAP
-	 * @param string|\OCA\User_LDAP\lib\User\User $user either the ownCloud user
+	 * @param string|\OCA\User_LDAP\User\User $user either the ownCloud user
 	 * name or an instance of that user
 	 * @return boolean
 	 */
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index f92ded64797660073b5f4f6d1fd79eda012b39ad..814de3f409202ee43c38b8bf34af94b71e07ac86 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -37,14 +37,15 @@
 
 namespace OCA\user_ldap\lib;
 
-use OCA\user_ldap\lib\user\OfflineUser;
+use OCA\User_LDAP\User\IUserTools;
+use OCA\User_LDAP\User\OfflineUser;
 use OCA\User_LDAP\Mapping\AbstractMapping;
 
 /**
  * Class Access
  * @package OCA\user_ldap\lib
  */
-class Access extends LDAPUtility implements user\IUserTools {
+class Access extends LDAPUtility implements IUserTools {
 	/**
 	 * @var \OCA\user_ldap\lib\Connection
 	 */
diff --git a/apps/user_ldap/tests/GroupLDAPTest.php b/apps/user_ldap/tests/GroupLDAPTest.php
index 2075f42fa517c2da86187c398a1f5780168df31f..02392e6e610e69ceb12366e94d35f230bcde1cd2 100644
--- a/apps/user_ldap/tests/GroupLDAPTest.php
+++ b/apps/user_ldap/tests/GroupLDAPTest.php
@@ -51,7 +51,7 @@ class GroupLDAPTest extends \Test\TestCase {
 		$connector = $this->getMock('\OCA\user_ldap\lib\Connection',
 									$conMethods,
 									array($lw, null, null));
-		$um = $this->getMockBuilder('\OCA\user_ldap\lib\user\Manager')
+		$um = $this->getMockBuilder('\OCA\User_LDAP\User\Manager')
 			->disableOriginalConstructor()
 			->getMock();
 		$access = $this->getMock('\OCA\user_ldap\lib\Access',
diff --git a/apps/user_ldap/tests/user/manager.php b/apps/user_ldap/tests/User/ManagerTest.php
similarity index 94%
rename from apps/user_ldap/tests/user/manager.php
rename to apps/user_ldap/tests/User/ManagerTest.php
index c4af1009df8b25dd7f93a1d1839ad3143870a768..03a1dfbeb472b5edc7bd064ab18fe852ade26123 100644
--- a/apps/user_ldap/tests/user/manager.php
+++ b/apps/user_ldap/tests/User/ManagerTest.php
@@ -23,9 +23,9 @@
  *
  */
 
-namespace OCA\user_ldap\tests;
+namespace OCA\User_LDAP\Tests\User;
 
-use OCA\user_ldap\lib\user\Manager;
+use OCA\User_LDAP\User\Manager;
 
 /**
  * Class Test_User_Manager
@@ -34,10 +34,10 @@ use OCA\user_ldap\lib\user\Manager;
  *
  * @package OCA\user_ldap\tests
  */
-class Test_User_Manager extends \Test\TestCase {
+class ManagerTest extends \Test\TestCase {
 
 	private function getTestInstances() {
-		$access = $this->getMock('\OCA\user_ldap\lib\user\IUserTools');
+		$access = $this->getMock('\OCA\User_LDAP\User\IUserTools');
 		$config = $this->getMock('\OCP\IConfig');
 		$filesys = $this->getMock('\OCA\user_ldap\lib\FilesystemHelper');
 		$log = $this->getMock('\OCA\user_ldap\lib\LogWrapper');
@@ -87,7 +87,7 @@ class Test_User_Manager extends \Test\TestCase {
 		// runtime caching the manager is broken.
 		$user = $manager->get($inputDN);
 
-		$this->assertInstanceOf('\OCA\user_ldap\lib\user\User', $user);
+		$this->assertInstanceOf('\OCA\User_LDAP\User\User', $user);
 	}
 
 	public function testGetByEDirectoryDN() {
@@ -114,7 +114,7 @@ class Test_User_Manager extends \Test\TestCase {
 		$manager->setLdapAccess($access);
 		$user = $manager->get($inputDN);
 
-		$this->assertInstanceOf('\OCA\user_ldap\lib\user\User', $user);
+		$this->assertInstanceOf('\OCA\User_LDAP\User\User', $user);
 	}
 
 	public function testGetByExoticDN() {
@@ -141,7 +141,7 @@ class Test_User_Manager extends \Test\TestCase {
 		$manager->setLdapAccess($access);
 		$user = $manager->get($inputDN);
 
-		$this->assertInstanceOf('\OCA\user_ldap\lib\user\User', $user);
+		$this->assertInstanceOf('\OCA\User_LDAP\User\User', $user);
 	}
 
 	public function testGetByDNNotExisting() {
@@ -200,7 +200,7 @@ class Test_User_Manager extends \Test\TestCase {
 		// runtime caching the manager is broken.
 		$user = $manager->get($uid);
 
-		$this->assertInstanceOf('\OCA\user_ldap\lib\user\User', $user);
+		$this->assertInstanceOf('\OCA\User_LDAP\User\User', $user);
 	}
 
 	public function testGetByUidNotExisting() {
diff --git a/apps/user_ldap/tests/user/user.php b/apps/user_ldap/tests/User/UserTest.php
similarity index 98%
rename from apps/user_ldap/tests/user/user.php
rename to apps/user_ldap/tests/User/UserTest.php
index ed04520aa74df1aa50fb9d57283772876dc1bd99..81497b4bcb8c59dd81873fb8127777a2f950d2d0 100644
--- a/apps/user_ldap/tests/user/user.php
+++ b/apps/user_ldap/tests/User/UserTest.php
@@ -22,9 +22,9 @@
  *
  */
 
-namespace OCA\user_ldap\tests;
+namespace OCA\User_LDAP\Tests\User;
 
-use OCA\user_ldap\lib\user\User;
+use OCA\User_LDAP\User\User;
 use OCP\IUserManager;
 
 /**
@@ -34,10 +34,10 @@ use OCP\IUserManager;
  *
  * @package OCA\user_ldap\tests
  */
-class Test_User_User extends \Test\TestCase {
+class UserTest extends \Test\TestCase {
 
 	private function getTestInstances() {
-		$access  = $this->getMock('\OCA\user_ldap\lib\user\IUserTools');
+		$access  = $this->getMock('\OCA\User_LDAP\User\IUserTools');
 		$config  = $this->getMock('\OCP\IConfig');
 		$filesys = $this->getMock('\OCA\user_ldap\lib\FilesystemHelper');
 		$log     = $this->getMock('\OCA\user_ldap\lib\LogWrapper');
@@ -59,14 +59,14 @@ class Test_User_User extends \Test\TestCase {
 			$accMethods = get_class_methods('\OCA\user_ldap\lib\Access');
 			//getConnection shall not be replaced
 			unset($accMethods[array_search('getConnection', $accMethods)]);
-			$umMethods = get_class_methods('\OCA\user_ldap\lib\user\Manager');
+			$umMethods = get_class_methods('\OCA\User_LDAP\User\Manager');
 		}
 		$lw = $this->getMock('\OCA\user_ldap\lib\ILDAPWrapper');
 		$im = $this->getMock('\OCP\Image');
 		if (is_null($userMgr)) {
 			$userMgr = $this->getMock('\OCP\IUserManager');
 		}
-		$um = $this->getMock('\OCA\user_ldap\lib\user\Manager',
+		$um = $this->getMock('\OCA\User_LDAP\User\Manager',
 			$umMethods, array($cfMock, $fsMock, $logMock, $avaMgr, $im, $dbc, $userMgr));
 		$connector = $this->getMock('\OCA\user_ldap\lib\Connection',
 			$conMethods, array($lw, null, null));
@@ -763,7 +763,7 @@ class Test_User_User extends \Test\TestCase {
 			'updateAvatar'
 		);
 
-		$userMock = $this->getMockBuilder('OCA\user_ldap\lib\user\User')
+		$userMock = $this->getMockBuilder('OCA\User_LDAP\User\User')
 			->setConstructorArgs(array($uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr, $userMgr))
 			->setMethods($requiredMethods)
 			->getMock();
diff --git a/apps/user_ldap/tests/User_LDAPTest.php b/apps/user_ldap/tests/User_LDAPTest.php
index e9e277ee7375b761f987c7a5d563aa0d4e72ae31..fb36ee94e27ff264b70b3dbdf965f930dc7d9cdd 100644
--- a/apps/user_ldap/tests/User_LDAPTest.php
+++ b/apps/user_ldap/tests/User_LDAPTest.php
@@ -60,7 +60,7 @@ class User_LDAPTest extends \Test\TestCase {
 			$conMethods = get_class_methods('\OCA\user_ldap\lib\Connection');
 			$accMethods = get_class_methods('\OCA\user_ldap\lib\Access');
 			unset($accMethods[array_search('getConnection', $accMethods)]);
-			$uMethods   = get_class_methods('\OCA\user_ldap\lib\user\User');
+			$uMethods   = get_class_methods('\OCA\User_LDAP\User\User');
 			unset($uMethods[array_search('getUsername', $uMethods)]);
 			unset($uMethods[array_search('getDN', $uMethods)]);
 			unset($uMethods[array_search('__construct', $uMethods)]);
@@ -72,11 +72,11 @@ class User_LDAPTest extends \Test\TestCase {
 
 		$this->configMock = $this->getMock('\OCP\IConfig');
 
-		$offlineUser = $this->getMockBuilder('\OCA\user_ldap\lib\user\OfflineUser')
+		$offlineUser = $this->getMockBuilder('\OCA\User_LDAP\User\OfflineUser')
 			->disableOriginalConstructor()
 			->getMock();
 
-		$um = $this->getMockBuilder('\OCA\user_ldap\lib\user\Manager')
+		$um = $this->getMockBuilder('\OCA\User_LDAP\User\Manager')
 			->setMethods(['getDeletedUser'])
 			->setConstructorArgs([
 				$this->configMock,
diff --git a/apps/user_ldap/tests/access.php b/apps/user_ldap/tests/access.php
index 6d35adf16949d0e7565855c31b60425c9fd7b93d..e9789219177689e7ed080821ad253bdbb1c422e6 100644
--- a/apps/user_ldap/tests/access.php
+++ b/apps/user_ldap/tests/access.php
@@ -45,13 +45,13 @@ class Test_Access extends \Test\TestCase {
 		if(is_null($conMethods) || is_null($accMethods)) {
 			$conMethods = get_class_methods('\OCA\user_ldap\lib\Connection');
 			$accMethods = get_class_methods('\OCA\user_ldap\lib\Access');
-			$umMethods  = get_class_methods('\OCA\user_ldap\lib\user\Manager');
+			$umMethods  = get_class_methods('\OCA\User_LDAP\User\Manager');
 		}
 		$lw  = $this->getMock('\OCA\user_ldap\lib\ILDAPWrapper');
 		$connector = $this->getMock('\OCA\user_ldap\lib\Connection',
 									$conMethods,
 									array($lw, null, null));
-		$um = $this->getMock('\OCA\user_ldap\lib\user\Manager',
+		$um = $this->getMock('\OCA\User_LDAP\User\Manager',
 			$umMethods, array(
 				$this->getMock('\OCP\IConfig'),
 				$this->getMock('\OCA\user_ldap\lib\FilesystemHelper'),
@@ -244,7 +244,7 @@ class Test_Access extends \Test\TestCase {
 			->method('getNameByDN')
 			->will($this->returnValue('a_username'));
 
-		$userMock = $this->getMockBuilder('\OCA\user_ldap\lib\user\User')
+		$userMock = $this->getMockBuilder('\OCA\User_LDAP\User\User')
 			->disableOriginalConstructor()
 			->getMock();
 
diff --git a/apps/user_ldap/tests/integration/abstractintegrationtest.php b/apps/user_ldap/tests/integration/abstractintegrationtest.php
index 10ce7378830d17bd2ba5a2d135876eda28c9c319..ff9bc9b46e7b2a9d1d97a3e5d849fdd22fd9537f 100644
--- a/apps/user_ldap/tests/integration/abstractintegrationtest.php
+++ b/apps/user_ldap/tests/integration/abstractintegrationtest.php
@@ -24,7 +24,7 @@ namespace OCA\user_ldap\tests\integration;
 use OCA\user_ldap\lib\Access;
 use OCA\user_ldap\lib\Connection;
 use OCA\user_ldap\lib\LDAP;
-use OCA\user_ldap\lib\user\Manager;
+use OCA\User_LDAP\User\Manager;
 
 abstract class AbstractIntegrationTest {
 	/** @var  LDAP */
diff --git a/apps/user_ldap/tests/integration/fakemanager.php b/apps/user_ldap/tests/integration/fakemanager.php
index 7d6ea0f3c13b5e84bbfa874293f6d63d4a15ae54..6d67e98fb48d15c8202e6aa75471ce331a860b9e 100644
--- a/apps/user_ldap/tests/integration/fakemanager.php
+++ b/apps/user_ldap/tests/integration/fakemanager.php
@@ -24,11 +24,11 @@ namespace OCA\user_ldap\tests\integration;
 /**
  * Class FakeManager
  *
- * this is a mock of \OCA\user_ldap\lib\user\Manager which is a dependency of
+ * this is a mock of \OCA\User_LDAP\User\Manager which is a dependency of
  * Access, that pulls plenty more things in. Because it is not needed in the
  * scope of these tests, we replace it with a mock.
  */
-class FakeManager extends \OCA\user_ldap\lib\user\Manager {
+class FakeManager extends \OCA\User_LDAP\User\Manager {
 	public function __construct() {
 		$this->ocConfig = \OC::$server->getConfig();
 		$this->image = new \OCP\Image();
diff --git a/apps/user_ldap/tests/integration/lib/integrationtestbackupserver.php b/apps/user_ldap/tests/integration/lib/integrationtestbackupserver.php
index 9eabb5f2e7abf8e407b2363dc5145e47fd682bc4..450032de9a75200dc7cc8a228bbc9579b917ff31 100644
--- a/apps/user_ldap/tests/integration/lib/integrationtestbackupserver.php
+++ b/apps/user_ldap/tests/integration/lib/integrationtestbackupserver.php
@@ -21,7 +21,6 @@
 
 namespace OCA\user_ldap\tests\integration\lib;
 
-use OCA\user_ldap\lib\user\Manager as LDAPUserManager;
 use OCA\user_ldap\tests\integration\AbstractIntegrationTest;
 use OCA\User_LDAP\Mapping\UserMapping;
 use OCA\User_LDAP\User_LDAP;
diff --git a/apps/user_ldap/tests/integration/lib/integrationtestconnect.php b/apps/user_ldap/tests/integration/lib/integrationtestconnect.php
index b333552955ab978f0ce5bac77d36b918bb1ccb04..e453c52b2ca70c9e1fdef1424e2e024e76652786 100644
--- a/apps/user_ldap/tests/integration/lib/integrationtestconnect.php
+++ b/apps/user_ldap/tests/integration/lib/integrationtestconnect.php
@@ -21,7 +21,7 @@
 
 namespace OCA\user_ldap\tests\integration\lib;
 
-use OCA\user_ldap\lib\user\Manager as LDAPUserManager;
+use OCA\User_LDAP\User\Manager as LDAPUserManager;
 use OCA\user_ldap\tests\integration\AbstractIntegrationTest;
 use OCA\User_LDAP\Mapping\UserMapping;
 use OCA\User_LDAP\User_LDAP;
diff --git a/apps/user_ldap/tests/integration/lib/integrationtestcountusersbyloginname.php b/apps/user_ldap/tests/integration/lib/integrationtestcountusersbyloginname.php
index 83ed7e1b1769f1d5fda30c07820a1d6644d8a1b3..bf46cfeffa1857d152781dc88c9e52eea1639b2c 100644
--- a/apps/user_ldap/tests/integration/lib/integrationtestcountusersbyloginname.php
+++ b/apps/user_ldap/tests/integration/lib/integrationtestcountusersbyloginname.php
@@ -21,7 +21,7 @@
 
 namespace OCA\user_ldap\tests\integration\lib;
 
-use OCA\user_ldap\lib\user\Manager as LDAPUserManager;
+use OCA\User_LDAP\User\Manager as LDAPUserManager;
 use OCA\user_ldap\tests\integration\AbstractIntegrationTest;
 use OCA\User_LDAP\Mapping\UserMapping;
 use OCA\User_LDAP\User_LDAP;
diff --git a/apps/user_ldap/tests/integration/lib/integrationtestfetchusersbyloginname.php b/apps/user_ldap/tests/integration/lib/integrationtestfetchusersbyloginname.php
index d7b7363b8a1a6682797b2a699bdc3ec3596e2d03..9713f26ba726d6635899dbf83176f45124331c43 100644
--- a/apps/user_ldap/tests/integration/lib/integrationtestfetchusersbyloginname.php
+++ b/apps/user_ldap/tests/integration/lib/integrationtestfetchusersbyloginname.php
@@ -21,7 +21,7 @@
 
 namespace OCA\user_ldap\tests\integration\lib;
 
-use OCA\user_ldap\lib\user\Manager as LDAPUserManager;
+use OCA\User_LDAP\User\Manager as LDAPUserManager;
 use OCA\user_ldap\tests\integration\AbstractIntegrationTest;
 use OCA\User_LDAP\Mapping\UserMapping;
 use OCA\User_LDAP\User_LDAP;
diff --git a/apps/user_ldap/tests/integration/lib/integrationtestpaging.php b/apps/user_ldap/tests/integration/lib/integrationtestpaging.php
index 2f7cc6a55a84006eb83a3bd158fb183633fc95bc..1de0a4d059b3da43fba438e6ce475b582f7f6e4a 100644
--- a/apps/user_ldap/tests/integration/lib/integrationtestpaging.php
+++ b/apps/user_ldap/tests/integration/lib/integrationtestpaging.php
@@ -21,7 +21,7 @@
 
 namespace OCA\user_ldap\tests\integration\lib;
 
-use OCA\user_ldap\lib\user\Manager as LDAPUserManager;
+use OCA\User_LDAP\User\Manager as LDAPUserManager;
 use OCA\user_ldap\tests\integration\AbstractIntegrationTest;
 use OCA\User_LDAP\Mapping\UserMapping;
 use OCA\User_LDAP\User_LDAP;
diff --git a/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php b/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php
index 3d455608bf169204b11a55fe69bec4230c78acf2..95a3f850a637dfc5072237e972242f09697a77da 100644
--- a/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php
+++ b/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php
@@ -21,7 +21,7 @@
 
 namespace OCA\user_ldap\tests\integration\lib;
 
-use OCA\user_ldap\lib\user\Manager as LDAPUserManager;
+use OCA\User_LDAP\User\Manager as LDAPUserManager;
 use OCA\user_ldap\tests\integration\AbstractIntegrationTest;
 use OCA\User_LDAP\Mapping\UserMapping;
 use OCA\User_LDAP\User_LDAP;
diff --git a/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php b/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php
index 4b220ff036ec6bd0c45a976b219d7edbac72f944..65e026d6980d50e4da8086f4b5190fe1ba8b4982 100644
--- a/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php
+++ b/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php
@@ -20,7 +20,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-use OCA\user_ldap\lib\user\User;
+
+use OCA\User_LDAP\User\User;
 use OCA\User_LDAP\Mapping\UserMapping;
 use OCA\user_ldap\tests\integration\AbstractIntegrationTest;
 
@@ -118,7 +119,7 @@ class IntegrationTestUserAvatar extends AbstractIntegrationTest {
 	}
 
 	protected function initUserManager() {
-		$this->userManager = new \OCA\user_ldap\lib\user\Manager(
+		$this->userManager = new \OCA\User_LDAP\User\Manager(
 			\OC::$server->getConfig(),
 			new \OCA\user_ldap\lib\FilesystemHelper(),
 			new \OCA\user_ldap\lib\LogWrapper(),
diff --git a/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserDisplayName.php b/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserDisplayName.php
index 6f021e61f6e24db5dbe4c13cf0e32b91c0f4c635..d1c048b4d2540edbdbd9d21692c0de86a6803027 100644
--- a/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserDisplayName.php
+++ b/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserDisplayName.php
@@ -18,7 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-use OCA\user_ldap\lib\user\User;
+
+use OCA\User_LDAP\User\User;
 use OCA\User_LDAP\Mapping\UserMapping;
 use OCA\user_ldap\tests\integration\AbstractIntegrationTest;
 
diff --git a/apps/user_ldap/tests/jobs/cleanup.php b/apps/user_ldap/tests/jobs/cleanup.php
index 8a577f37233f3b970a5d4c5cabc00889d81659d9..f19c7cd885839f8616a8c1f0cc78bde5b09ba562 100644
--- a/apps/user_ldap/tests/jobs/cleanup.php
+++ b/apps/user_ldap/tests/jobs/cleanup.php
@@ -30,7 +30,7 @@ class Test_CleanUp extends \PHPUnit_Framework_TestCase {
 				->disableOriginalConstructor()
 				->getMock();
 		$mocks['deletedUsersIndex'] =
-			$this->getMockBuilder('\OCA\user_ldap\lib\user\deletedUsersIndex')
+			$this->getMockBuilder('\OCA\User_LDAP\User\DeletedUsersIndex')
 				->disableOriginalConstructor()
 				->getMock();
 		$mocks['ocConfig']    = $this->getMock('\OCP\IConfig');
diff --git a/apps/user_ldap/tests/wizard.php b/apps/user_ldap/tests/wizard.php
index c247718c2a344bceceab5a8e64cb9cff6e6e2f3d..a73292db354ecbba814acf3b57cc47ab8782e9f3 100644
--- a/apps/user_ldap/tests/wizard.php
+++ b/apps/user_ldap/tests/wizard.php
@@ -70,7 +70,7 @@ class Test_Wizard extends \Test\TestCase {
 
 		$connector = $this->getMock('\OCA\user_ldap\lib\Connection',
 			$connMethods, array($lw, null, null));
-		$um = $this->getMockBuilder('\OCA\user_ldap\lib\user\Manager')
+		$um = $this->getMockBuilder('\OCA\User_LDAP\User\Manager')
 					->disableOriginalConstructor()
 					->getMock();
 		$access = $this->getMock('\OCA\user_ldap\lib\Access',