10 files changed, 13 insertions, 16 deletions
diff --git a/apps/user_ldap/lib/Command/CheckUser.php b/apps/user_ldap/lib/Command/CheckUser.php
index f26b2f4546b..43de421de6a 100644
--- a/apps/user_ldap/lib/Command/CheckUser.php
+++ b/apps/user_ldap/lib/Command/CheckUser.php
@@ -30,14 +30,14 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 use OCA\User_LDAP\User\DeletedUsersIndex;
 use OCA\User_LDAP\Mapping\UserMapping;
-use OCA\user_ldap\lib\Helper as LDAPHelper;
+use OCA\User_LDAP\Helper as LDAPHelper;
 use OCA\User_LDAP\User_Proxy;
 
 class CheckUser extends Command {
 	/** @var \OCA\User_LDAP\User_Proxy */
 	protected $backend;
 
-	/** @var \OCA\User_LDAP\lib\Helper */
+	/** @var \OCA\User_LDAP\Helper */
 	protected $helper;
 
 	/** @var \OCA\User_LDAP\User\DeletedUsersIndex */
diff --git a/apps/user_ldap/lib/Command/CreateEmptyConfig.php b/apps/user_ldap/lib/Command/CreateEmptyConfig.php
index 9ce665e049c..779dbbc6fd5 100644
--- a/apps/user_ldap/lib/Command/CreateEmptyConfig.php
+++ b/apps/user_ldap/lib/Command/CreateEmptyConfig.php
@@ -26,11 +26,11 @@ namespace OCA\User_LDAP\Command;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use \OCA\user_ldap\lib\Helper;
+use \OCA\User_LDAP\Helper;
 use \OCA\user_ldap\lib\Configuration;
 
 class CreateEmptyConfig extends Command {
-	/** @var \OCA\User_LDAP\lib\Helper */
+	/** @var \OCA\User_LDAP\Helper */
 	protected $helper;
 
 	/**
diff --git a/apps/user_ldap/lib/Command/DeleteConfig.php b/apps/user_ldap/lib/Command/DeleteConfig.php
index 5a7986d1303..a56753daddc 100644
--- a/apps/user_ldap/lib/Command/DeleteConfig.php
+++ b/apps/user_ldap/lib/Command/DeleteConfig.php
@@ -27,10 +27,10 @@ use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use \OCA\user_ldap\lib\Helper;
+use \OCA\User_LDAP\Helper;
 
 class DeleteConfig extends Command {
-	/** @var \OCA\User_LDAP\lib\Helper */
+	/** @var \OCA\User_LDAP\Helper */
 	protected $helper;
 
 	/**
diff --git a/apps/user_ldap/lib/Command/Search.php b/apps/user_ldap/lib/Command/Search.php
index 77c0271a708..795530e2044 100644
--- a/apps/user_ldap/lib/Command/Search.php
+++ b/apps/user_ldap/lib/Command/Search.php
@@ -30,7 +30,7 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 use OCA\User_LDAP\User_Proxy;
 use OCA\User_LDAP\Group_Proxy;
-use OCA\user_ldap\lib\Helper;
+use OCA\User_LDAP\Helper;
 use OCA\User_LDAP\LDAP;
 use OCP\IConfig;
 
diff --git a/apps/user_ldap/lib/Command/SetConfig.php b/apps/user_ldap/lib/Command/SetConfig.php
index 7e2e2f19f66..d9308c0afd4 100644
--- a/apps/user_ldap/lib/Command/SetConfig.php
+++ b/apps/user_ldap/lib/Command/SetConfig.php
@@ -27,7 +27,7 @@ use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use \OCA\user_ldap\lib\Helper;
+use OCA\User_LDAP\Helper;
 use \OCA\user_ldap\lib\Configuration;
 
 class SetConfig extends Command {
diff --git a/apps/user_ldap/lib/Command/ShowConfig.php b/apps/user_ldap/lib/Command/ShowConfig.php
index ea0ad3fed05..91904ca8380 100644
--- a/apps/user_ldap/lib/Command/ShowConfig.php
+++ b/apps/user_ldap/lib/Command/ShowConfig.php
@@ -28,11 +28,11 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use \OCA\user_ldap\lib\Helper;
+use \OCA\User_LDAP\Helper;
 use \OCA\user_ldap\lib\Configuration;
 
 class ShowConfig extends Command {
-	/** @var \OCA\User_LDAP\lib\Helper */
+	/** @var \OCA\User_LDAP\Helper */
 	protected $helper;
 
 	/**
diff --git a/apps/user_ldap/lib/Command/TestConfig.php b/apps/user_ldap/lib/Command/TestConfig.php
index aa369f1a421..656752095cf 100644
--- a/apps/user_ldap/lib/Command/TestConfig.php
+++ b/apps/user_ldap/lib/Command/TestConfig.php
@@ -27,7 +27,7 @@ use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use \OCA\user_ldap\lib\Helper;
+use \OCA\User_LDAP\Helper;
 use \OCA\user_ldap\lib\Connection;
 
 class TestConfig extends Command {
diff --git a/apps/user_ldap/lib/helper.php b/apps/user_ldap/lib/Helper.php
index c0900f54a62..aa6d6aa1bce 100644
--- a/apps/user_ldap/lib/helper.php
+++ b/apps/user_ldap/lib/Helper.php
@@ -25,9 +25,7 @@
  *
  */
 
-namespace OCA\user_ldap\lib;
-
-use OCA\User_LDAP\User_Proxy;
+namespace OCA\User_LDAP;
 
 class Helper {
 
diff --git a/apps/user_ldap/lib/Jobs/CleanUp.php b/apps/user_ldap/lib/Jobs/CleanUp.php
index 3bbf897ea19..45669a278ba 100644
--- a/apps/user_ldap/lib/Jobs/CleanUp.php
+++ b/apps/user_ldap/lib/Jobs/CleanUp.php
@@ -25,7 +25,7 @@ namespace OCA\User_LDAP\Jobs;
 use \OC\BackgroundJob\TimedJob;
 use \OCA\user_ldap\User_LDAP;
 use \OCA\User_LDAP\User_Proxy;
-use \OCA\user_ldap\lib\Helper;
+use \OCA\User_LDAP\Helper;
 use \OCA\User_LDAP\LDAP;
 use \OCA\User_LDAP\User\DeletedUsersIndex;
 use \OCA\User_LDAP\Mapping\UserMapping;
diff --git a/apps/user_ldap/lib/Wizard.php b/apps/user_ldap/lib/Wizard.php
index a94d3174c4e..c565b5bdc43 100644
--- a/apps/user_ldap/lib/Wizard.php
+++ b/apps/user_ldap/lib/Wizard.php
@@ -34,7 +34,6 @@ namespace OCA\User_LDAP;
 use OC\ServerNotAvailableException;
 use OCA\user_ldap\lib\Access;
 use OCA\user_ldap\lib\Configuration;
-use OCA\user_ldap\lib\Helper;
 
 class Wizard extends LDAPUtility {
 	static protected $l;