diff --git a/apps/user_ldap/ajax/wizard.php b/apps/user_ldap/ajax/wizard.php
index 55a681a007b76a812291e40239e310042eace443..fa42706fac9c27970ff8744d71df9f0ee202dd5d 100644
--- a/apps/user_ldap/ajax/wizard.php
+++ b/apps/user_ldap/ajax/wizard.php
@@ -51,7 +51,7 @@ $con->setIgnoreValidation(true);
 
 $userManager = new \OCA\User_LDAP\User\Manager(
 	\OC::$server->getConfig(),
-	new \OCA\user_ldap\lib\FilesystemHelper(),
+	new \OCA\User_LDAP\FilesystemHelper(),
 	new \OCA\User_LDAP\LogWrapper(),
 	\OC::$server->getAvatarManager(),
 	new \OCP\Image(),
diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index 28b385944943446dd5498239900ab0cfb146f098..e9777b0f985f6c1e3fb9333f6351ee97d4538f52 100644
--- a/apps/user_ldap/appinfo/app.php
+++ b/apps/user_ldap/appinfo/app.php
@@ -34,7 +34,7 @@ $ocConfig = \OC::$server->getConfig();
 if(count($configPrefixes) === 1) {
 	$dbc = \OC::$server->getDatabaseConnection();
 	$userManager = new OCA\User_LDAP\User\Manager($ocConfig,
-		new OCA\user_ldap\lib\FilesystemHelper(),
+		new OCA\User_LDAP\FilesystemHelper(),
 		new OCA\User_LDAP\LogWrapper(),
 		\OC::$server->getAvatarManager(),
 		new \OCP\Image(),
diff --git a/apps/user_ldap/lib/filesystemhelper.php b/apps/user_ldap/lib/FilesystemHelper.php
similarity index 97%
rename from apps/user_ldap/lib/filesystemhelper.php
rename to apps/user_ldap/lib/FilesystemHelper.php
index 03f4c4274f415b102edd66081b98f735772f77c4..439e7fb1d0b1a781675598843a76123a2875a570 100644
--- a/apps/user_ldap/lib/filesystemhelper.php
+++ b/apps/user_ldap/lib/FilesystemHelper.php
@@ -21,7 +21,7 @@
  *
  */
 
-namespace OCA\user_ldap\lib;
+namespace OCA\User_LDAP;
 
 /**
  * @brief wraps around static ownCloud core methods
diff --git a/apps/user_ldap/lib/Proxy.php b/apps/user_ldap/lib/Proxy.php
index bf4083fdb18eefd01a8670e4c506e3948fad8d10..c51d647348256e51aeb56090b02ce94f47181446 100644
--- a/apps/user_ldap/lib/Proxy.php
+++ b/apps/user_ldap/lib/Proxy.php
@@ -30,7 +30,6 @@ namespace OCA\User_LDAP;
 
 use OCA\user_ldap\lib\Access;
 use OCA\user_ldap\lib\Connection;
-use OCA\user_ldap\lib\FilesystemHelper;
 use OCA\User_LDAP\Mapping\UserMapping;
 use OCA\User_LDAP\Mapping\GroupMapping;
 
diff --git a/apps/user_ldap/lib/User/Manager.php b/apps/user_ldap/lib/User/Manager.php
index 211f5d519c361a99703ef90fb3023eb7e77dfc7f..d97112e43c7f59352285d407728276360bbe7e2f 100644
--- a/apps/user_ldap/lib/User/Manager.php
+++ b/apps/user_ldap/lib/User/Manager.php
@@ -26,7 +26,7 @@
 namespace OCA\User_LDAP\User;
 
 use OCA\User_LDAP\LogWrapper;
-use OCA\user_ldap\lib\FilesystemHelper;
+use OCA\User_LDAP\FilesystemHelper;
 use OCP\IAvatarManager;
 use OCP\IConfig;
 use OCP\IDBConnection;
@@ -73,7 +73,7 @@ class Manager {
 
 	/**
 	 * @param IConfig $ocConfig
-	 * @param \OCA\user_ldap\lib\FilesystemHelper $ocFilesystem object that
+	 * @param \OCA\User_LDAP\FilesystemHelper $ocFilesystem object that
 	 * gives access to necessary functions from the OC filesystem
 	 * @param  \OCA\User_LDAP\LogWrapper $ocLog
 	 * @param IAvatarManager $avatarManager
diff --git a/apps/user_ldap/lib/User/User.php b/apps/user_ldap/lib/User/User.php
index 53159d66f6780b5a146bf164cb8dabdca2df5bdc..aee644a2b6c3fa516f1d1978926bbdadee21e20c 100644
--- a/apps/user_ldap/lib/User/User.php
+++ b/apps/user_ldap/lib/User/User.php
@@ -25,7 +25,7 @@
 namespace OCA\User_LDAP\User;
 
 use OCA\user_ldap\lib\Connection;
-use OCA\user_ldap\lib\FilesystemHelper;
+use OCA\User_LDAP\FilesystemHelper;
 use OCA\User_LDAP\LogWrapper;
 use OCP\IAvatarManager;
 use OCP\IConfig;
diff --git a/apps/user_ldap/lib/jobs.php b/apps/user_ldap/lib/jobs.php
index b855b12fe91d432c45e35289a96e8538b945faca..9b0398c068d8cdf3e5d31b446055799cd819abbe 100644
--- a/apps/user_ldap/lib/jobs.php
+++ b/apps/user_ldap/lib/jobs.php
@@ -28,6 +28,10 @@
 
 namespace OCA\user_ldap\lib;
 
+use OCA\User_LDAP\FilesystemHelper;
+use OCA\User_LDAP\Helper;
+use OCA\User_LDAP\LDAP;
+use OCA\User_LDAP\LogWrapper;
 use OCA\User_LDAP\Mapping\GroupMapping;
 use OCA\User_LDAP\Mapping\UserMapping;
 use OCA\User_LDAP\User\Manager;
diff --git a/apps/user_ldap/tests/User/ManagerTest.php b/apps/user_ldap/tests/User/ManagerTest.php
index 633cd0c876a63df6db892267ee5e63728574a321..478cd2aca8c091d297eeba69f852c62151e0f164 100644
--- a/apps/user_ldap/tests/User/ManagerTest.php
+++ b/apps/user_ldap/tests/User/ManagerTest.php
@@ -39,7 +39,7 @@ class ManagerTest extends \Test\TestCase {
 	private function getTestInstances() {
 		$access = $this->getMock('\OCA\User_LDAP\User\IUserTools');
 		$config = $this->getMock('\OCP\IConfig');
-		$filesys = $this->getMock('\OCA\user_ldap\lib\FilesystemHelper');
+		$filesys = $this->getMock('\OCA\User_LDAP\FilesystemHelper');
 		$log = $this->getMock('\OCA\User_LDAP\LogWrapper');
 		$avaMgr = $this->getMock('\OCP\IAvatarManager');
 		$image = $this->getMock('\OCP\Image');
diff --git a/apps/user_ldap/tests/User/UserTest.php b/apps/user_ldap/tests/User/UserTest.php
index 9afdb7c864594133998a3b3a8295f2de5da2a9b6..638546850236d6d47a07eff320c8e3e395d6aef6 100644
--- a/apps/user_ldap/tests/User/UserTest.php
+++ b/apps/user_ldap/tests/User/UserTest.php
@@ -39,7 +39,7 @@ class UserTest extends \Test\TestCase {
 	private function getTestInstances() {
 		$access  = $this->getMock('\OCA\User_LDAP\User\IUserTools');
 		$config  = $this->getMock('\OCP\IConfig');
-		$filesys = $this->getMock('\OCA\user_ldap\lib\FilesystemHelper');
+		$filesys = $this->getMock('\OCA\User_LDAP\FilesystemHelper');
 		$log     = $this->getMock('\OCA\User_LDAP\LogWrapper');
 		$avaMgr  = $this->getMock('\OCP\IAvatarManager');
 		$image   = $this->getMock('\OCP\Image');
diff --git a/apps/user_ldap/tests/User_LDAPTest.php b/apps/user_ldap/tests/User_LDAPTest.php
index f13240aa2488392fc6a55de1c4fcce4d06fc744e..de634f2131553d2627660d283d2a32722b4ffcf7 100644
--- a/apps/user_ldap/tests/User_LDAPTest.php
+++ b/apps/user_ldap/tests/User_LDAPTest.php
@@ -79,7 +79,7 @@ class User_LDAPTest extends \Test\TestCase {
 			->setMethods(['getDeletedUser'])
 			->setConstructorArgs([
 				$this->configMock,
-				$this->getMock('\OCA\user_ldap\lib\FilesystemHelper'),
+				$this->getMock('\OCA\User_LDAP\FilesystemHelper'),
 				$this->getMock('\OCA\User_LDAP\LogWrapper'),
 				$this->getMock('\OCP\IAvatarManager'),
 				$this->getMock('\OCP\Image'),
diff --git a/apps/user_ldap/tests/access.php b/apps/user_ldap/tests/access.php
index 75bf4b7524da14df6cb4277c6e60508b92d3e17d..bf80ac6af91cf2b962d4014f215e3c805f5f8e21 100644
--- a/apps/user_ldap/tests/access.php
+++ b/apps/user_ldap/tests/access.php
@@ -53,7 +53,7 @@ class Test_Access extends \Test\TestCase {
 		$um = $this->getMock('\OCA\User_LDAP\User\Manager',
 			$umMethods, array(
 				$this->getMock('\OCP\IConfig'),
-				$this->getMock('\OCA\user_ldap\lib\FilesystemHelper'),
+				$this->getMock('\OCA\User_LDAP\FilesystemHelper'),
 				$this->getMock('\OCA\User_LDAP\LogWrapper'),
 				$this->getMock('\OCP\IAvatarManager'),
 				$this->getMock('\OCP\Image'),
diff --git a/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php b/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php
index 189fbf4154b9d34ce1e9b18f8b79d52e1d04f26f..751cb99600ce6650839837e1e7e240e14fadaaf6 100644
--- a/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php
+++ b/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php
@@ -66,7 +66,7 @@ class IntegrationTestUserHome extends AbstractIntegrationTest {
 	protected function initUserManager() {
 		$this->userManager = new LDAPUserManager(
 			\OC::$server->getConfig(),
-			new \OCA\user_ldap\lib\FilesystemHelper(),
+			new \OCA\User_LDAP\FilesystemHelper(),
 			new \OCA\User_LDAP\LogWrapper(),
 			\OC::$server->getAvatarManager(),
 			new \OCP\Image(),
diff --git a/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php b/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php
index 598d8720f569a07af41ccaa6b7ec7af8de3276f8..195862226b7e6ed02797dd75376b58ead1b93527 100644
--- a/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php
+++ b/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php
@@ -121,7 +121,7 @@ class IntegrationTestUserAvatar extends AbstractIntegrationTest {
 	protected function initUserManager() {
 		$this->userManager = new \OCA\User_LDAP\User\Manager(
 			\OC::$server->getConfig(),
-			new \OCA\user_ldap\lib\FilesystemHelper(),
+			new \OCA\User_LDAP\FilesystemHelper(),
 			new \OCA\User_LDAP\LogWrapper(),
 			\OC::$server->getAvatarManager(),
 			new \OCP\Image(),