diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index 18f8b2551f..26358886c0 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -31,7 +31,7 @@ OC::$CLASSPATH['OC_Mount_Config'] = 'files_external/lib/config.php';
 require_once __DIR__ . '/../3rdparty/autoload.php';
 
 // register Application object singleton
-\OC_Mount_Config::$app = new \OCA\Files_external\Appinfo\Application();
+\OC_Mount_Config::$app = new \OCA\Files_External\AppInfo\Application();
 $appContainer = \OC_Mount_Config::$app->getContainer();
 
 \OC_Mount_Config::$app->registerSettings();
diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml
index 2b192c94aa..25df58c636 100644
--- a/apps/files_external/appinfo/info.xml
+++ b/apps/files_external/appinfo/info.xml
@@ -19,6 +19,8 @@
 	</types>
 	<ocsid>166048</ocsid>
 
+	<namespace>Files_External</namespace>
+
 	<dependencies>
 		<owncloud min-version="9.1" max-version="9.1" />
 	</dependencies>
diff --git a/apps/files_external/appinfo/register_command.php b/apps/files_external/appinfo/register_command.php
index 927ce9869f..65ac2286fa 100644
--- a/apps/files_external/appinfo/register_command.php
+++ b/apps/files_external/appinfo/register_command.php
@@ -37,9 +37,9 @@ $groupManager = OC::$server->getGroupManager();
 
 $app = \OC_Mount_Config::$app;
 
-$globalStorageService = $app->getContainer()->query('\OCA\Files_external\Service\GlobalStoragesService');
-$userStorageService = $app->getContainer()->query('\OCA\Files_external\Service\UserStoragesService');
-$importLegacyStorageService = $app->getContainer()->query('\OCA\Files_external\Service\ImportLegacyStoragesService');
+$globalStorageService = $app->getContainer()->query('\OCA\Files_External\Service\GlobalStoragesService');
+$userStorageService = $app->getContainer()->query('\OCA\Files_External\Service\UserStoragesService');
+$importLegacyStorageService = $app->getContainer()->query('\OCA\Files_External\Service\ImportLegacyStoragesService');
 $backendService = $app->getContainer()->query('OCA\Files_External\Service\BackendService');
 
 /** @var Symfony\Component\Console\Application $application */
diff --git a/apps/files_external/appinfo/routes.php b/apps/files_external/appinfo/routes.php
index e2f55e652a..703b2cd265 100644
--- a/apps/files_external/appinfo/routes.php
+++ b/apps/files_external/appinfo/routes.php
@@ -26,8 +26,6 @@
  *
  */
 
-namespace OCA\Files_External\AppInfo;
-
 /**
  * @var $this \OCP\Route\IRouter
  **/
diff --git a/apps/files_external/appinfo/update.php b/apps/files_external/appinfo/update.php
index 8cc2422c7f..62dfbadc93 100644
--- a/apps/files_external/appinfo/update.php
+++ b/apps/files_external/appinfo/update.php
@@ -21,10 +21,10 @@
 
 $installedVersion = \OC::$server->getConfig()->getAppValue('files_external', 'installed_version');
 
-$app = new \OCA\Files_external\Appinfo\Application();
+$app = new \OCA\Files_External\AppInfo\Application();
 
 // Migration to db config
 if (version_compare($installedVersion, '0.5.0', '<')) {
-	$migrator = $app->getContainer()->query('OCA\Files_external\Migration\StorageMigrator');
+	$migrator = $app->getContainer()->query('OCA\Files_External\Migration\StorageMigrator');
 	$migrator->migrateGlobal();
 }
diff --git a/apps/files_external/appinfo/application.php b/apps/files_external/lib/AppInfo/Application.php
similarity index 99%
rename from apps/files_external/appinfo/application.php
rename to apps/files_external/lib/AppInfo/Application.php
index 5d490c6091..d7c650526b 100644
--- a/apps/files_external/appinfo/application.php
+++ b/apps/files_external/lib/AppInfo/Application.php
@@ -34,7 +34,7 @@ use \OCA\Files_External\Lib\Config\IBackendProvider;
 use \OCA\Files_External\Lib\Config\IAuthMechanismProvider;
 
 /**
- * @package OCA\Files_External\Appinfo
+ * @package OCA\Files_External\AppInfo
  */
 class Application extends App implements IBackendProvider, IAuthMechanismProvider {
 
diff --git a/apps/files_external/command/applicable.php b/apps/files_external/lib/Command/Applicable.php
similarity index 96%
rename from apps/files_external/command/applicable.php
rename to apps/files_external/lib/Command/Applicable.php
index 7e6c99d291..902e76cb4c 100644
--- a/apps/files_external/command/applicable.php
+++ b/apps/files_external/lib/Command/Applicable.php
@@ -24,12 +24,9 @@ namespace OCA\Files_External\Command;
 use OC\Core\Command\Base;
 use OCA\Files_external\Lib\StorageConfig;
 use OCA\Files_external\NotFoundException;
-use OCA\Files_external\Service\GlobalStoragesService;
+use OCA\Files_External\Service\GlobalStoragesService;
 use OCP\IGroupManager;
 use OCP\IUserManager;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Helper\Table;
-use Symfony\Component\Console\Helper\TableHelper;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
diff --git a/apps/files_external/command/backends.php b/apps/files_external/lib/Command/Backends.php
similarity index 100%
rename from apps/files_external/command/backends.php
rename to apps/files_external/lib/Command/Backends.php
diff --git a/apps/files_external/command/config.php b/apps/files_external/lib/Command/Config.php
similarity index 98%
rename from apps/files_external/command/config.php
rename to apps/files_external/lib/Command/Config.php
index 1403c24b34..873fece86d 100644
--- a/apps/files_external/command/config.php
+++ b/apps/files_external/lib/Command/Config.php
@@ -24,7 +24,7 @@ namespace OCA\Files_External\Command;
 use OC\Core\Command\Base;
 use OCA\Files_external\Lib\StorageConfig;
 use OCA\Files_external\NotFoundException;
-use OCA\Files_external\Service\GlobalStoragesService;
+use OCA\Files_External\Service\GlobalStoragesService;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Helper\TableHelper;
diff --git a/apps/files_external/command/create.php b/apps/files_external/lib/Command/Create.php
similarity index 95%
rename from apps/files_external/command/create.php
rename to apps/files_external/lib/Command/Create.php
index 315b23f9d3..17ad7ef1a1 100644
--- a/apps/files_external/command/create.php
+++ b/apps/files_external/lib/Command/Create.php
@@ -29,19 +29,14 @@ use OCA\Files_External\Lib\Backend\Backend;
 use OCA\Files_External\Lib\DefinitionParameter;
 use OCA\Files_external\Lib\StorageConfig;
 use OCA\Files_External\Service\BackendService;
-use OCA\Files_external\Service\GlobalStoragesService;
-use OCA\Files_external\Service\ImportLegacyStoragesService;
-use OCA\Files_external\Service\UserStoragesService;
+use OCA\Files_External\Service\GlobalStoragesService;
+use OCA\Files_External\Service\UserStoragesService;
 use OCP\IUserManager;
 use OCP\IUserSession;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Helper\Table;
-use Symfony\Component\Console\Helper\TableHelper;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Input\Input;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Create extends Base {
diff --git a/apps/files_external/command/delete.php b/apps/files_external/lib/Command/Delete.php
similarity index 91%
rename from apps/files_external/command/delete.php
rename to apps/files_external/lib/Command/Delete.php
index bdbfcf8bb5..a3aef7f330 100644
--- a/apps/files_external/command/delete.php
+++ b/apps/files_external/lib/Command/Delete.php
@@ -22,15 +22,11 @@
 namespace OCA\Files_External\Command;
 
 use OC\Core\Command\Base;
-use OCA\Files_external\Lib\StorageConfig;
 use OCA\Files_external\NotFoundException;
-use OCA\Files_external\Service\GlobalStoragesService;
-use OCA\Files_external\Service\UserStoragesService;
+use OCA\Files_External\Service\GlobalStoragesService;
+use OCA\Files_External\Service\UserStoragesService;
 use OCP\IUserManager;
 use OCP\IUserSession;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Helper\Table;
-use Symfony\Component\Console\Helper\TableHelper;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/apps/files_external/command/export.php b/apps/files_external/lib/Command/Export.php
similarity index 100%
rename from apps/files_external/command/export.php
rename to apps/files_external/lib/Command/Export.php
diff --git a/apps/files_external/command/import.php b/apps/files_external/lib/Command/Import.php
similarity index 95%
rename from apps/files_external/command/import.php
rename to apps/files_external/lib/Command/Import.php
index 97bb9a937f..55528b6647 100644
--- a/apps/files_external/command/import.php
+++ b/apps/files_external/lib/Command/Import.php
@@ -25,19 +25,15 @@ use OC\Core\Command\Base;
 use OC\User\NoUserException;
 use OCA\Files_external\Lib\StorageConfig;
 use OCA\Files_External\Service\BackendService;
-use OCA\Files_external\Service\GlobalStoragesService;
-use OCA\Files_external\Service\ImportLegacyStoragesService;
-use OCA\Files_external\Service\UserStoragesService;
+use OCA\Files_External\Service\GlobalStoragesService;
+use OCA\Files_External\Service\ImportLegacyStoragesService;
+use OCA\Files_External\Service\UserStoragesService;
 use OCP\IUserManager;
 use OCP\IUserSession;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Helper\Table;
-use Symfony\Component\Console\Helper\TableHelper;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Input\Input;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Import extends Base {
diff --git a/apps/files_external/command/listcommand.php b/apps/files_external/lib/Command/ListCommand.php
similarity index 97%
rename from apps/files_external/command/listcommand.php
rename to apps/files_external/lib/Command/ListCommand.php
index 5a0794be4c..cbe1913ccf 100644
--- a/apps/files_external/command/listcommand.php
+++ b/apps/files_external/lib/Command/ListCommand.php
@@ -24,11 +24,10 @@ namespace OCA\Files_External\Command;
 use OC\Core\Command\Base;
 use OC\User\NoUserException;
 use OCA\Files_external\Lib\StorageConfig;
-use OCA\Files_external\Service\GlobalStoragesService;
-use OCA\Files_external\Service\UserStoragesService;
+use OCA\Files_External\Service\GlobalStoragesService;
+use OCA\Files_External\Service\UserStoragesService;
 use OCP\IUserManager;
 use OCP\IUserSession;
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/apps/files_external/command/option.php b/apps/files_external/lib/Command/Option.php
similarity index 84%
rename from apps/files_external/command/option.php
rename to apps/files_external/lib/Command/Option.php
index 292005134c..109ca26c31 100644
--- a/apps/files_external/command/option.php
+++ b/apps/files_external/lib/Command/Option.php
@@ -21,18 +21,8 @@
 
 namespace OCA\Files_External\Command;
 
-use OC\Core\Command\Base;
 use OCA\Files_external\Lib\StorageConfig;
-use OCA\Files_external\Service\GlobalStoragesService;
-use OCA\Files_external\Service\UserStoragesService;
-use OCP\IUserManager;
-use OCP\IUserSession;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Helper\Table;
-use Symfony\Component\Console\Helper\TableHelper;
 use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Option extends Config {
diff --git a/apps/files_external/command/verify.php b/apps/files_external/lib/Command/Verify.php
similarity index 95%
rename from apps/files_external/command/verify.php
rename to apps/files_external/lib/Command/Verify.php
index f985cb401a..6ff871a609 100644
--- a/apps/files_external/command/verify.php
+++ b/apps/files_external/lib/Command/Verify.php
@@ -27,11 +27,8 @@ use OCA\Files_External\Lib\Backend\Backend;
 use OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException;
 use OCA\Files_external\Lib\StorageConfig;
 use OCA\Files_external\NotFoundException;
-use OCA\Files_external\Service\GlobalStoragesService;
+use OCA\Files_External\Service\GlobalStoragesService;
 use OCP\Files\StorageNotAvailableException;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Helper\Table;
-use Symfony\Component\Console\Helper\TableHelper;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
diff --git a/apps/files_external/controller/ajaxcontroller.php b/apps/files_external/lib/Controller/AjaxController.php
similarity index 100%
rename from apps/files_external/controller/ajaxcontroller.php
rename to apps/files_external/lib/Controller/AjaxController.php
diff --git a/apps/files_external/controller/globalstoragescontroller.php b/apps/files_external/lib/Controller/GlobalStoragesController.php
similarity index 95%
rename from apps/files_external/controller/globalstoragescontroller.php
rename to apps/files_external/lib/Controller/GlobalStoragesController.php
index b443cf4ea8..2471ac861d 100644
--- a/apps/files_external/controller/globalstoragescontroller.php
+++ b/apps/files_external/lib/Controller/GlobalStoragesController.php
@@ -24,18 +24,13 @@
 namespace OCA\Files_External\Controller;
 
 
-use \OCP\IConfig;
 use OCP\ILogger;
-use \OCP\IUserSession;
 use \OCP\IRequest;
 use \OCP\IL10N;
 use \OCP\AppFramework\Http\DataResponse;
-use \OCP\AppFramework\Controller;
 use \OCP\AppFramework\Http;
-use \OCA\Files_external\Service\GlobalStoragesService;
+use OCA\Files_External\Service\GlobalStoragesService;
 use \OCA\Files_external\NotFoundException;
-use \OCA\Files_external\Lib\StorageConfig;
-use \OCA\Files_External\Service\BackendService;
 
 /**
  * Global storages controller
diff --git a/apps/files_external/controller/storagescontroller.php b/apps/files_external/lib/Controller/StoragesController.php
similarity index 98%
rename from apps/files_external/controller/storagescontroller.php
rename to apps/files_external/lib/Controller/StoragesController.php
index 09b8310470..da26f24b6b 100644
--- a/apps/files_external/controller/storagescontroller.php
+++ b/apps/files_external/lib/Controller/StoragesController.php
@@ -25,23 +25,19 @@
 namespace OCA\Files_External\Controller;
 
 
-use \OCP\IConfig;
 use OCP\ILogger;
-use OCP\IUser;
-use \OCP\IUserSession;
 use \OCP\IRequest;
 use \OCP\IL10N;
 use \OCP\AppFramework\Http\DataResponse;
 use \OCP\AppFramework\Controller;
 use \OCP\AppFramework\Http;
-use \OCA\Files_external\Service\StoragesService;
+use OCA\Files_External\Service\StoragesService;
 use \OCA\Files_external\NotFoundException;
 use \OCA\Files_external\Lib\StorageConfig;
 use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use \OCP\Files\StorageNotAvailableException;
 use \OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException;
-use \OCA\Files_External\Service\BackendService;
 
 /**
  * Base class for storages controllers
diff --git a/apps/files_external/controller/userglobalstoragescontroller.php b/apps/files_external/lib/Controller/UserGlobalStoragesController.php
similarity index 98%
rename from apps/files_external/controller/userglobalstoragescontroller.php
rename to apps/files_external/lib/Controller/UserGlobalStoragesController.php
index 36c3740eed..c420d9ad59 100644
--- a/apps/files_external/controller/userglobalstoragescontroller.php
+++ b/apps/files_external/lib/Controller/UserGlobalStoragesController.php
@@ -30,7 +30,7 @@ use \OCP\IRequest;
 use \OCP\IL10N;
 use \OCP\AppFramework\Http\DataResponse;
 use \OCP\AppFramework\Http;
-use \OCA\Files_external\Service\UserGlobalStoragesService;
+use OCA\Files_External\Service\UserGlobalStoragesService;
 use \OCA\Files_external\NotFoundException;
 use \OCA\Files_external\Lib\StorageConfig;
 use \OCA\Files_External\Lib\Backend\Backend;
diff --git a/apps/files_external/controller/userstoragescontroller.php b/apps/files_external/lib/Controller/UserStoragesController.php
similarity index 96%
rename from apps/files_external/controller/userstoragescontroller.php
rename to apps/files_external/lib/Controller/UserStoragesController.php
index e53ea21f00..e20a41e0cc 100644
--- a/apps/files_external/controller/userstoragescontroller.php
+++ b/apps/files_external/lib/Controller/UserStoragesController.php
@@ -25,17 +25,13 @@ namespace OCA\Files_External\Controller;
 
 
 use OCA\Files_External\Lib\Auth\AuthMechanism;
-use \OCP\IConfig;
 use OCP\ILogger;
-use OCP\IUser;
 use \OCP\IUserSession;
 use \OCP\IRequest;
 use \OCP\IL10N;
 use \OCP\AppFramework\Http\DataResponse;
-use \OCP\AppFramework\Controller;
 use \OCP\AppFramework\Http;
-use \OCA\Files_external\Service\UserStoragesService;
-use \OCA\Files_External\Service\BackendService;
+use OCA\Files_External\Service\UserStoragesService;
 use \OCA\Files_external\NotFoundException;
 use \OCA\Files_external\Lib\StorageConfig;
 use \OCA\Files_External\Lib\Backend\Backend;
diff --git a/apps/files_external/migration/dummyusersession.php b/apps/files_external/lib/Migration/DummyUserSession.php
similarity index 96%
rename from apps/files_external/migration/dummyusersession.php
rename to apps/files_external/lib/Migration/DummyUserSession.php
index bb4ef19dac..b2157aafeb 100644
--- a/apps/files_external/migration/dummyusersession.php
+++ b/apps/files_external/lib/Migration/DummyUserSession.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace OCA\Files_external\Migration;
+namespace OCA\Files_External\Migration;
 
 use OCP\IUser;
 use OCP\IUserSession;
diff --git a/apps/files_external/migration/storagemigrator.php b/apps/files_external/lib/Migration/StorageMigrator.php
similarity index 90%
rename from apps/files_external/migration/storagemigrator.php
rename to apps/files_external/lib/Migration/StorageMigrator.php
index 48ab52768e..a8b0461e7d 100644
--- a/apps/files_external/migration/storagemigrator.php
+++ b/apps/files_external/lib/Migration/StorageMigrator.php
@@ -20,22 +20,18 @@
  *
  */
 
-namespace OCA\Files_external\Migration;
+namespace OCA\Files_External\Migration;
 
 use OCA\Files_External\Service\BackendService;
 use OCA\Files_External\Service\DBConfigService;
-use OCA\Files_external\Service\GlobalLegacyStoragesService;
-use OCA\Files_external\Service\GlobalStoragesService;
-use OCA\Files_external\Service\LegacyStoragesService;
-use OCA\Files_external\Service\StoragesService;
-use OCA\Files_external\Service\UserLegacyStoragesService;
-use OCA\Files_external\Service\UserStoragesService;
+use OCA\Files_External\Service\GlobalStoragesService;
+use OCA\Files_External\Service\LegacyStoragesService;
+use OCA\Files_External\Service\StoragesService;
 use OCP\Files\Config\IUserMountCache;
 use OCP\IConfig;
 use OCP\IDBConnection;
 use OCP\ILogger;
 use OCP\IUser;
-use OCP\IUserSession;
 
 /**
  * Migrate mount config from mount.json to the database
diff --git a/apps/files_external/service/backendservice.php b/apps/files_external/lib/Service/BackendService.php
similarity index 100%
rename from apps/files_external/service/backendservice.php
rename to apps/files_external/lib/Service/BackendService.php
diff --git a/apps/files_external/service/dbconfigservice.php b/apps/files_external/lib/Service/DBConfigService.php
similarity index 100%
rename from apps/files_external/service/dbconfigservice.php
rename to apps/files_external/lib/Service/DBConfigService.php
diff --git a/apps/files_external/service/globallegacystoragesservice.php b/apps/files_external/lib/Service/GlobalLegacyStoragesService.php
similarity index 97%
rename from apps/files_external/service/globallegacystoragesservice.php
rename to apps/files_external/lib/Service/GlobalLegacyStoragesService.php
index ed9b1bcf07..4c44881051 100644
--- a/apps/files_external/service/globallegacystoragesservice.php
+++ b/apps/files_external/lib/Service/GlobalLegacyStoragesService.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace OCA\Files_external\Service;
+namespace OCA\Files_External\Service;
 
 /**
  * Read admin defined mounts from the legacy mount.json
diff --git a/apps/files_external/service/globalstoragesservice.php b/apps/files_external/lib/Service/GlobalStoragesService.php
similarity index 99%
rename from apps/files_external/service/globalstoragesservice.php
rename to apps/files_external/lib/Service/GlobalStoragesService.php
index 62da314c5f..6032a82773 100644
--- a/apps/files_external/service/globalstoragesservice.php
+++ b/apps/files_external/lib/Service/GlobalStoragesService.php
@@ -22,7 +22,7 @@
  *
  */
 
-namespace OCA\Files_external\Service;
+namespace OCA\Files_External\Service;
 
 use \OCP\IUserSession;
 use \OC\Files\Filesystem;
diff --git a/apps/files_external/service/importlegacystoragesservice.php b/apps/files_external/lib/Service/ImportLegacyStoragesService.php
similarity index 96%
rename from apps/files_external/service/importlegacystoragesservice.php
rename to apps/files_external/lib/Service/ImportLegacyStoragesService.php
index 8a790c5de9..cb020fb495 100644
--- a/apps/files_external/service/importlegacystoragesservice.php
+++ b/apps/files_external/lib/Service/ImportLegacyStoragesService.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace OCA\Files_external\Service;
+namespace OCA\Files_External\Service;
 
 class ImportLegacyStoragesService extends LegacyStoragesService {
 	private $data;
diff --git a/apps/files_external/service/legacystoragesservice.php b/apps/files_external/lib/Service/LegacyStoragesService.php
similarity index 99%
rename from apps/files_external/service/legacystoragesservice.php
rename to apps/files_external/lib/Service/LegacyStoragesService.php
index 158fc2b513..40f57e4550 100644
--- a/apps/files_external/service/legacystoragesservice.php
+++ b/apps/files_external/lib/Service/LegacyStoragesService.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace OCA\Files_external\Service;
+namespace OCA\Files_External\Service;
 
 use \OCA\Files_external\Lib\StorageConfig;
 
diff --git a/apps/files_external/service/storagesservice.php b/apps/files_external/lib/Service/StoragesService.php
similarity index 99%
rename from apps/files_external/service/storagesservice.php
rename to apps/files_external/lib/Service/StoragesService.php
index 6542be146d..0999c0a7ad 100644
--- a/apps/files_external/service/storagesservice.php
+++ b/apps/files_external/lib/Service/StoragesService.php
@@ -23,7 +23,7 @@
  *
  */
 
-namespace OCA\Files_external\Service;
+namespace OCA\Files_External\Service;
 
 use \OC\Files\Filesystem;
 use \OCA\Files_external\Lib\StorageConfig;
diff --git a/apps/files_external/service/userglobalstoragesservice.php b/apps/files_external/lib/Service/UserGlobalStoragesService.php
similarity index 97%
rename from apps/files_external/service/userglobalstoragesservice.php
rename to apps/files_external/lib/Service/UserGlobalStoragesService.php
index 111d458692..b5e2d13c71 100644
--- a/apps/files_external/service/userglobalstoragesservice.php
+++ b/apps/files_external/lib/Service/UserGlobalStoragesService.php
@@ -22,12 +22,9 @@
 
 namespace OCA\Files_External\Service;
 
-use \OCA\Files_external\Service\GlobalStoragesService;
-use \OCA\Files_External\Service\BackendService;
 use OCP\Files\Config\IUserMountCache;
 use \OCP\IUserSession;
 use \OCP\IGroupManager;
-use \OCA\Files_External\Service\UserTrait;
 use \OCA\Files_External\Lib\StorageConfig;
 
 /**
diff --git a/apps/files_external/service/userlegacystoragesservice.php b/apps/files_external/lib/Service/UserLegacyStoragesService.php
similarity index 97%
rename from apps/files_external/service/userlegacystoragesservice.php
rename to apps/files_external/lib/Service/UserLegacyStoragesService.php
index 2f14857c63..c64520c8b0 100644
--- a/apps/files_external/service/userlegacystoragesservice.php
+++ b/apps/files_external/lib/Service/UserLegacyStoragesService.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace OCA\Files_external\Service;
+namespace OCA\Files_External\Service;
 
 use OCP\IUserSession;
 
diff --git a/apps/files_external/service/userstoragesservice.php b/apps/files_external/lib/Service/UserStoragesService.php
similarity index 99%
rename from apps/files_external/service/userstoragesservice.php
rename to apps/files_external/lib/Service/UserStoragesService.php
index c46846e76d..b64f289b3e 100644
--- a/apps/files_external/service/userstoragesservice.php
+++ b/apps/files_external/lib/Service/UserStoragesService.php
@@ -21,7 +21,7 @@
  *
  */
 
-namespace OCA\Files_external\Service;
+namespace OCA\Files_External\Service;
 
 use OCP\Files\Config\IUserMountCache;
 use \OCP\IUserSession;
diff --git a/apps/files_external/service/usertrait.php b/apps/files_external/lib/Service/UserTrait.php
similarity index 100%
rename from apps/files_external/service/usertrait.php
rename to apps/files_external/lib/Service/UserTrait.php
diff --git a/apps/files_external/lib/config/configadapter.php b/apps/files_external/lib/config/configadapter.php
index a19a111d3d..a05ff555f7 100644
--- a/apps/files_external/lib/config/configadapter.php
+++ b/apps/files_external/lib/config/configadapter.php
@@ -24,14 +24,14 @@
 namespace OCA\Files_External\Config;
 
 use OC\Files\Storage\Wrapper\Availability;
-use OCA\Files_external\Migration\StorageMigrator;
+use OCA\Files_External\Migration\StorageMigrator;
 use OCP\Files\Storage;
 use OC\Files\Mount\MountPoint;
 use OCP\Files\Storage\IStorageFactory;
 use OCA\Files_External\Lib\PersonalMount;
 use OCP\Files\Config\IMountProvider;
 use OCP\IUser;
-use OCA\Files_external\Service\UserStoragesService;
+use OCA\Files_External\Service\UserStoragesService;
 use OCA\Files_External\Service\UserGlobalStoragesService;
 use OCA\Files_External\Lib\StorageConfig;
 use OC\Files\Storage\FailedStorage;
diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php
index 5c568f45b7..195b826a4c 100644
--- a/apps/files_external/personal.php
+++ b/apps/files_external/personal.php
@@ -29,7 +29,7 @@ use \OCA\Files_External\Service\BackendService;
 // we must use the same container
 $appContainer = \OC_Mount_Config::$app->getContainer();
 $backendService = $appContainer->query('OCA\Files_External\Service\BackendService');
-$userStoragesService = $appContainer->query('OCA\Files_external\Service\UserStoragesService');
+$userStoragesService = $appContainer->query('OCA\Files_External\Service\UserStoragesService');
 
 $tmpl = new OCP\Template('files_external', 'settings');
 $tmpl->assign('encryptionEnabled', \OC::$server->getEncryptionManager()->isEnabled());
diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php
index 0d83d26ff9..8f44c170ce 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -31,7 +31,7 @@ use \OCA\Files_External\Service\BackendService;
 // we must use the same container
 $appContainer = \OC_Mount_Config::$app->getContainer();
 $backendService = $appContainer->query('OCA\Files_External\Service\BackendService');
-$globalStoragesService = $appContainer->query('OCA\Files_external\Service\GlobalStoragesService');
+$globalStoragesService = $appContainer->query('OCA\Files_External\Service\GlobalStoragesService');
 
 \OC_Util::addVendorScript('select2/select2');
 \OC_Util::addVendorStyle('select2/select2');
diff --git a/apps/files_external/tests/command/applicabletest.php b/apps/files_external/tests/Command/ApplicableTest.php
similarity index 100%
rename from apps/files_external/tests/command/applicabletest.php
rename to apps/files_external/tests/Command/ApplicableTest.php
diff --git a/apps/files_external/tests/command/commandtest.php b/apps/files_external/tests/Command/CommandTest.php
similarity index 96%
rename from apps/files_external/tests/command/commandtest.php
rename to apps/files_external/tests/Command/CommandTest.php
index 9a0afbd368..73a1ea8315 100644
--- a/apps/files_external/tests/command/commandtest.php
+++ b/apps/files_external/tests/Command/CommandTest.php
@@ -32,10 +32,10 @@ use Test\TestCase;
 abstract class CommandTest extends TestCase {
 	/**
 	 * @param StorageConfig[] $mounts
-	 * @return \OCA\Files_external\Service\GlobalStoragesService|\PHPUnit_Framework_MockObject_MockObject
+	 * @return \OCA\Files_External\Service\GlobalStoragesService|\PHPUnit_Framework_MockObject_MockObject
 	 */
 	protected function getGlobalStorageService(array $mounts = []) {
-		$mock = $this->getMockBuilder('OCA\Files_external\Service\GlobalStoragesService')
+		$mock = $this->getMockBuilder('OCA\Files_External\Service\GlobalStoragesService')
 			->disableOriginalConstructor()
 			->getMock();
 
diff --git a/apps/files_external/tests/command/listcommandtest.php b/apps/files_external/tests/Command/ListCommandTest.php
similarity index 91%
rename from apps/files_external/tests/command/listcommandtest.php
rename to apps/files_external/tests/Command/ListCommandTest.php
index 3098906bcc..1475249ae4 100644
--- a/apps/files_external/tests/command/listcommandtest.php
+++ b/apps/files_external/tests/Command/ListCommandTest.php
@@ -34,10 +34,10 @@ class ListCommandTest extends CommandTest {
 	 * @return \OCA\Files_External\Command\ListCommand|\PHPUnit_Framework_MockObject_MockObject
 	 */
 	private function getInstance() {
-		/** @var \OCA\Files_external\Service\GlobalStoragesService|\PHPUnit_Framework_MockObject_MockObject $globalService */
-		$globalService = $this->getMock('\OCA\Files_external\Service\GlobalStoragesService', null, [], '', false);
-		/** @var \OCA\Files_external\Service\UserStoragesService|\PHPUnit_Framework_MockObject_MockObject $userService */
-		$userService = $this->getMock('\OCA\Files_external\Service\UserStoragesService', null, [], '', false);
+		/** @var \OCA\Files_External\Service\GlobalStoragesService|\PHPUnit_Framework_MockObject_MockObject $globalService */
+		$globalService = $this->getMock('\OCA\Files_External\Service\GlobalStoragesService', null, [], '', false);
+		/** @var \OCA\Files_External\Service\UserStoragesService|\PHPUnit_Framework_MockObject_MockObject $userService */
+		$userService = $this->getMock('\OCA\Files_External\Service\UserStoragesService', null, [], '', false);
 		/** @var \OCP\IUserManager|\PHPUnit_Framework_MockObject_MockObject $userManager */
 		$userManager = $this->getMock('\OCP\IUserManager');
 		/** @var \OCP\IUserSession|\PHPUnit_Framework_MockObject_MockObject $userSession */
diff --git a/apps/files_external/tests/controller/globalstoragescontrollertest.php b/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php
similarity index 84%
rename from apps/files_external/tests/controller/globalstoragescontrollertest.php
rename to apps/files_external/tests/Controller/GlobalStoragesControllerTest.php
index 1021300399..9761a4e23f 100644
--- a/apps/files_external/tests/controller/globalstoragescontrollertest.php
+++ b/apps/files_external/tests/Controller/GlobalStoragesControllerTest.php
@@ -20,18 +20,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-namespace OCA\Files_external\Tests\Controller;
+namespace OCA\Files_External\Tests\Controller;
 
-use \OCA\Files_external\Controller\GlobalStoragesController;
-use \OCA\Files_external\Service\GlobalStoragesService;
+use OCA\Files_External\Controller\GlobalStoragesController;
 use \OCP\AppFramework\Http;
-use \OCA\Files_external\NotFoundException;
 use \OCA\Files_External\Service\BackendService;
 
 class GlobalStoragesControllerTest extends StoragesControllerTest {
 	public function setUp() {
 		parent::setUp();
-		$this->service = $this->getMockBuilder('\OCA\Files_external\Service\GlobalStoragesService')
+		$this->service = $this->getMockBuilder('\OCA\Files_External\Service\GlobalStoragesService')
 			->disableOriginalConstructor()
 			->getMock();
 
diff --git a/apps/files_external/tests/controller/storagescontrollertest.php b/apps/files_external/tests/Controller/StoragesControllerTest.php
similarity index 98%
rename from apps/files_external/tests/controller/storagescontrollertest.php
rename to apps/files_external/tests/Controller/StoragesControllerTest.php
index 4c3c62d5d6..81625fbbcb 100644
--- a/apps/files_external/tests/controller/storagescontrollertest.php
+++ b/apps/files_external/tests/Controller/StoragesControllerTest.php
@@ -19,12 +19,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-namespace OCA\Files_external\Tests\Controller;
+namespace OCA\Files_External\Tests\Controller;
 
 use \OCP\AppFramework\Http;
 
-use \OCA\Files_external\Controller\GlobalStoragesController;
-use \OCA\Files_external\Service\GlobalStoragesService;
+use \OCA\Files_External\Controller\GlobalStoragesController;
+use \OCA\Files_External\Service\GlobalStoragesService;
 use \OCA\Files_external\Lib\StorageConfig;
 use \OCA\Files_external\NotFoundException;
 
diff --git a/apps/files_external/tests/controller/userstoragescontrollertest.php b/apps/files_external/tests/Controller/UserStoragesControllerTest.php
similarity index 89%
rename from apps/files_external/tests/controller/userstoragescontrollertest.php
rename to apps/files_external/tests/Controller/UserStoragesControllerTest.php
index 804b752b6a..ac8d466374 100644
--- a/apps/files_external/tests/controller/userstoragescontrollertest.php
+++ b/apps/files_external/tests/Controller/UserStoragesControllerTest.php
@@ -20,13 +20,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-namespace OCA\Files_external\Tests\Controller;
+namespace OCA\Files_External\Tests\Controller;
 
-use \OCA\Files_external\Controller\UserStoragesController;
-use \OCA\Files_external\Service\UserStoragesService;
+use \OCA\Files_External\Controller\UserStoragesController;
 use \OCP\AppFramework\Http;
-use \OCA\Files_external\NotFoundException;
-use \OCA\Files_External\Lib\StorageConfig;
 use \OCA\Files_External\Service\BackendService;
 
 class UserStoragesControllerTest extends StoragesControllerTest {
@@ -38,7 +35,7 @@ class UserStoragesControllerTest extends StoragesControllerTest {
 
 	public function setUp() {
 		parent::setUp();
-		$this->service = $this->getMockBuilder('\OCA\Files_external\Service\UserStoragesService')
+		$this->service = $this->getMockBuilder('\OCA\Files_External\Service\UserStoragesService')
 			->disableOriginalConstructor()
 			->getMock();
 
diff --git a/apps/files_external/tests/service/backendservicetest.php b/apps/files_external/tests/Service/BackendServiceTest.php
similarity index 100%
rename from apps/files_external/tests/service/backendservicetest.php
rename to apps/files_external/tests/Service/BackendServiceTest.php
diff --git a/apps/files_external/tests/service/dbconfigservicetest.php b/apps/files_external/tests/Service/DBConfigServiceTest.php
similarity index 100%
rename from apps/files_external/tests/service/dbconfigservicetest.php
rename to apps/files_external/tests/Service/DBConfigServiceTest.php
diff --git a/apps/files_external/tests/service/globalstoragesservicetest.php b/apps/files_external/tests/Service/GlobalStoragesServiceTest.php
similarity index 97%
rename from apps/files_external/tests/service/globalstoragesservicetest.php
rename to apps/files_external/tests/Service/GlobalStoragesServiceTest.php
index 6cdfbef82d..b2cc7f59ed 100644
--- a/apps/files_external/tests/service/globalstoragesservicetest.php
+++ b/apps/files_external/tests/Service/GlobalStoragesServiceTest.php
@@ -20,13 +20,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-namespace OCA\Files_external\Tests\Service;
+namespace OCA\Files_External\Tests\Service;
 
 use \OC\Files\Filesystem;
 
-use \OCA\Files_external\Service\GlobalStoragesService;
-use \OCA\Files_external\NotFoundException;
-use \OCA\Files_external\Lib\StorageConfig;
+use \OCA\Files_External\Service\GlobalStoragesService;
 
 /**
  * @group DB
@@ -449,8 +447,8 @@ class GlobalStoragesServiceTest extends StoragesServiceTest {
 		$storage->setApplicableGroups($sourceApplicableGroups);
 		$storage = $this->service->addStorage($storage);
 
-		$storage->setapplicableUsers($updatedApplicableUsers);
-		$storage->setapplicableGroups($updatedApplicableGroups);
+		$storage->setApplicableUsers($updatedApplicableUsers);
+		$storage->setApplicableGroups($updatedApplicableGroups);
 
 		// reset calls
 		self::$hookCalls = [];
diff --git a/apps/files_external/tests/service/storagesservicetest.php b/apps/files_external/tests/Service/StoragesServiceTest.php
similarity index 99%
rename from apps/files_external/tests/service/storagesservicetest.php
rename to apps/files_external/tests/Service/StoragesServiceTest.php
index f93c013481..7cc0d8fad9 100644
--- a/apps/files_external/tests/service/storagesservicetest.php
+++ b/apps/files_external/tests/Service/StoragesServiceTest.php
@@ -20,7 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-namespace OCA\Files_external\Tests\Service;
+namespace OCA\Files_External\Tests\Service;
 
 use \OC\Files\Filesystem;
 
@@ -28,7 +28,7 @@ use \OCA\Files_external\NotFoundException;
 use \OCA\Files_external\Lib\StorageConfig;
 use OCA\Files_External\Service\BackendService;
 use OCA\Files_External\Service\DBConfigService;
-use OCA\Files_external\Service\StoragesService;
+use OCA\Files_External\Service\StoragesService;
 
 class CleaningDBConfig extends DBConfigService {
 	private $mountIds = [];
diff --git a/apps/files_external/tests/service/userglobalstoragesservicetest.php b/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php
similarity index 98%
rename from apps/files_external/tests/service/userglobalstoragesservicetest.php
rename to apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php
index baecf143c6..812c12392f 100644
--- a/apps/files_external/tests/service/userglobalstoragesservicetest.php
+++ b/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php
@@ -23,11 +23,8 @@
 namespace OCA\Files_External\Tests\Service;
 
 use OCA\Files_external\NotFoundException;
-use OCA\Files_external\Service\StoragesService;
-use \OCA\Files_External\Service\UserGlobalStoragesService;
-use \OCP\IGroupManager;
-
-use \OCA\Files_External\Lib\StorageConfig;
+use OCA\Files_External\Service\StoragesService;
+use OCA\Files_External\Service\UserGlobalStoragesService;
 use OCP\IUser;
 use Test\Traits\UserTrait;
 
diff --git a/apps/files_external/tests/service/userstoragesservicetest.php b/apps/files_external/tests/Service/UserStoragesServiceTest.php
similarity index 96%
rename from apps/files_external/tests/service/userstoragesservicetest.php
rename to apps/files_external/tests/Service/UserStoragesServiceTest.php
index 37423cb8d7..21696878a0 100644
--- a/apps/files_external/tests/service/userstoragesservicetest.php
+++ b/apps/files_external/tests/Service/UserStoragesServiceTest.php
@@ -20,14 +20,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-namespace OCA\Files_external\Tests\Service;
+namespace OCA\Files_External\Tests\Service;
 
 use \OC\Files\Filesystem;
 
-use OCA\Files_external\Service\GlobalStoragesService;
-use OCA\Files_external\Service\StoragesService;
-use \OCA\Files_external\Service\UserStoragesService;
-use \OCA\Files_external\NotFoundException;
+use OCA\Files_External\Service\GlobalStoragesService;
+use OCA\Files_External\Service\StoragesService;
+use OCA\Files_External\Service\UserStoragesService;
 use \OCA\Files_external\Lib\StorageConfig;
 use Test\Traits\UserTrait;