diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index 18f8b2551fa..26358886c0b 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 2b192c94aa4..25df58c6368 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 927ce9869f9..65ac2286fa0 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 e2f55e652a8..703b2cd265f 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 8cc2422c7ff..62dfbadc936 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 5d490c6091f..d7c650526b3 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 94%
rename from apps/files_external/command/applicable.php
rename to apps/files_external/lib/Command/Applicable.php
index 7e6c99d2915..4e178edbbae 100644
--- a/apps/files_external/command/applicable.php
+++ b/apps/files_external/lib/Command/Applicable.php
@@ -22,14 +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\Lib\StorageConfig;
+use OCA\Files_External\NotFoundException;
+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 96%
rename from apps/files_external/command/config.php
rename to apps/files_external/lib/Command/Config.php
index 1403c24b345..909b130f17b 100644
--- a/apps/files_external/command/config.php
+++ b/apps/files_external/lib/Command/Config.php
@@ -22,9 +22,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\Lib\StorageConfig;
+use OCA\Files_External\NotFoundException;
+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 94%
rename from apps/files_external/command/create.php
rename to apps/files_external/lib/Command/Create.php
index 315b23f9d3c..e5fd095d6f2 100644
--- a/apps/files_external/command/create.php
+++ b/apps/files_external/lib/Command/Create.php
@@ -27,21 +27,16 @@ use OC\User\NoUserException;
 use OCA\Files_External\Lib\Auth\AuthMechanism;
 use OCA\Files_External\Lib\Backend\Backend;
 use OCA\Files_External\Lib\DefinitionParameter;
-use OCA\Files_external\Lib\StorageConfig;
+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 90%
rename from apps/files_external/command/delete.php
rename to apps/files_external/lib/Command/Delete.php
index bdbfcf8bb55..64228b2033b 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\NotFoundException;
+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 94%
rename from apps/files_external/command/import.php
rename to apps/files_external/lib/Command/Import.php
index 97bb9a937f0..4f881acb500 100644
--- a/apps/files_external/command/import.php
+++ b/apps/files_external/lib/Command/Import.php
@@ -23,21 +23,17 @@ namespace OCA\Files_External\Command;
 
 use OC\Core\Command\Base;
 use OC\User\NoUserException;
-use OCA\Files_external\Lib\StorageConfig;
+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 5a0794be4c5..c1fb18b3bc2 100644
--- a/apps/files_external/command/listcommand.php
+++ b/apps/files_external/lib/Command/ListCommand.php
@@ -23,12 +23,11 @@ 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\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\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 82%
rename from apps/files_external/command/option.php
rename to apps/files_external/lib/Command/Option.php
index 292005134cb..4f7733b25d8 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 OCA\Files_External\Lib\StorageConfig;
 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 94%
rename from apps/files_external/command/verify.php
rename to apps/files_external/lib/Command/Verify.php
index f985cb401af..dfc536530bb 100644
--- a/apps/files_external/command/verify.php
+++ b/apps/files_external/lib/Command/Verify.php
@@ -25,13 +25,10 @@ use OC\Core\Command\Base;
 use OCA\Files_External\Lib\Auth\AuthMechanism;
 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\Lib\StorageConfig;
+use OCA\Files_External\NotFoundException;
+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/lib/config/configadapter.php b/apps/files_external/lib/Config/ConfigAdapter.php
similarity index 98%
rename from apps/files_external/lib/config/configadapter.php
rename to apps/files_external/lib/Config/ConfigAdapter.php
index a19a111d3d9..a05ff555f72 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/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 94%
rename from apps/files_external/controller/globalstoragescontroller.php
rename to apps/files_external/lib/Controller/GlobalStoragesController.php
index b443cf4ea8f..0ae9e1fd5e0 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\NotFoundException;
-use \OCA\Files_external\Lib\StorageConfig;
-use \OCA\Files_External\Service\BackendService;
+use OCA\Files_External\Service\GlobalStoragesService;
+use OCA\Files_External\NotFoundException;
 
 /**
  * Global storages controller
diff --git a/apps/files_external/controller/storagescontroller.php b/apps/files_external/lib/Controller/StoragesController.php
similarity index 97%
rename from apps/files_external/controller/storagescontroller.php
rename to apps/files_external/lib/Controller/StoragesController.php
index 09b83104700..a368169944e 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\NotFoundException;
-use \OCA\Files_external\Lib\StorageConfig;
+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 97%
rename from apps/files_external/controller/userglobalstoragescontroller.php
rename to apps/files_external/lib/Controller/UserGlobalStoragesController.php
index 36c3740eed3..ee4cd640018 100644
--- a/apps/files_external/controller/userglobalstoragescontroller.php
+++ b/apps/files_external/lib/Controller/UserGlobalStoragesController.php
@@ -30,9 +30,9 @@ 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\NotFoundException;
-use \OCA\Files_external\Lib\StorageConfig;
+use OCA\Files_External\Service\UserGlobalStoragesService;
+use OCA\Files_External\NotFoundException;
+use OCA\Files_External\Lib\StorageConfig;
 use \OCA\Files_External\Lib\Backend\Backend;
 use OCP\IUserSession;
 
diff --git a/apps/files_external/controller/userstoragescontroller.php b/apps/files_external/lib/Controller/UserStoragesController.php
similarity index 95%
rename from apps/files_external/controller/userstoragescontroller.php
rename to apps/files_external/lib/Controller/UserStoragesController.php
index e53ea21f005..1850d0087b3 100644
--- a/apps/files_external/controller/userstoragescontroller.php
+++ b/apps/files_external/lib/Controller/UserStoragesController.php
@@ -25,19 +25,15 @@ 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\NotFoundException;
-use \OCA\Files_external\Lib\StorageConfig;
+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/lib/api.php b/apps/files_external/lib/Lib/Api.php
similarity index 100%
rename from apps/files_external/lib/api.php
rename to apps/files_external/lib/Lib/Api.php
diff --git a/apps/files_external/lib/auth/amazons3/accesskey.php b/apps/files_external/lib/Lib/Auth/AmazonS3/AccessKey.php
similarity index 100%
rename from apps/files_external/lib/auth/amazons3/accesskey.php
rename to apps/files_external/lib/Lib/Auth/AmazonS3/AccessKey.php
diff --git a/apps/files_external/lib/auth/authmechanism.php b/apps/files_external/lib/Lib/Auth/AuthMechanism.php
similarity index 100%
rename from apps/files_external/lib/auth/authmechanism.php
rename to apps/files_external/lib/Lib/Auth/AuthMechanism.php
diff --git a/apps/files_external/lib/auth/builtin.php b/apps/files_external/lib/Lib/Auth/Builtin.php
similarity index 92%
rename from apps/files_external/lib/auth/builtin.php
rename to apps/files_external/lib/Lib/Auth/Builtin.php
index 8b43cb459cc..c5c3a19e54f 100644
--- a/apps/files_external/lib/auth/builtin.php
+++ b/apps/files_external/lib/Lib/Auth/Builtin.php
@@ -22,8 +22,6 @@
 namespace OCA\Files_External\Lib\Auth;
 
 use \OCP\IL10N;
-use \OCA\Files_External\Lib\Auth\AuthMechanism;
-use \OCA\Files_external\Lib\StorageConfig;
 
 /**
  * Builtin authentication mechanism, for legacy backends
diff --git a/apps/files_external/lib/auth/iuserprovided.php b/apps/files_external/lib/Lib/Auth/IUserProvided.php
similarity index 100%
rename from apps/files_external/lib/auth/iuserprovided.php
rename to apps/files_external/lib/Lib/Auth/IUserProvided.php
diff --git a/apps/files_external/lib/auth/nullmechanism.php b/apps/files_external/lib/Lib/Auth/NullMechanism.php
similarity index 92%
rename from apps/files_external/lib/auth/nullmechanism.php
rename to apps/files_external/lib/Lib/Auth/NullMechanism.php
index 06083729e59..671a5ff66c5 100644
--- a/apps/files_external/lib/auth/nullmechanism.php
+++ b/apps/files_external/lib/Lib/Auth/NullMechanism.php
@@ -22,8 +22,6 @@
 namespace OCA\Files_External\Lib\Auth;
 
 use \OCP\IL10N;
-use \OCA\Files_External\Lib\Auth\AuthMechanism;
-use \OCA\Files_external\Lib\StorageConfig;
 
 /**
  * Null authentication mechanism
diff --git a/apps/files_external/lib/auth/oauth1/oauth1.php b/apps/files_external/lib/Lib/Auth/OAuth1/OAuth1.php
similarity index 100%
rename from apps/files_external/lib/auth/oauth1/oauth1.php
rename to apps/files_external/lib/Lib/Auth/OAuth1/OAuth1.php
diff --git a/apps/files_external/lib/auth/oauth2/oauth2.php b/apps/files_external/lib/Lib/Auth/OAuth2/OAuth2.php
similarity index 100%
rename from apps/files_external/lib/auth/oauth2/oauth2.php
rename to apps/files_external/lib/Lib/Auth/OAuth2/OAuth2.php
diff --git a/apps/files_external/lib/auth/openstack/openstack.php b/apps/files_external/lib/Lib/Auth/OpenStack/OpenStack.php
similarity index 100%
rename from apps/files_external/lib/auth/openstack/openstack.php
rename to apps/files_external/lib/Lib/Auth/OpenStack/OpenStack.php
diff --git a/apps/files_external/lib/auth/openstack/rackspace.php b/apps/files_external/lib/Lib/Auth/OpenStack/Rackspace.php
similarity index 100%
rename from apps/files_external/lib/auth/openstack/rackspace.php
rename to apps/files_external/lib/Lib/Auth/OpenStack/Rackspace.php
diff --git a/apps/files_external/lib/auth/password/password.php b/apps/files_external/lib/Lib/Auth/Password/Password.php
similarity index 100%
rename from apps/files_external/lib/auth/password/password.php
rename to apps/files_external/lib/Lib/Auth/Password/Password.php
diff --git a/apps/files_external/lib/auth/password/sessioncredentials.php b/apps/files_external/lib/Lib/Auth/Password/SessionCredentials.php
similarity index 100%
rename from apps/files_external/lib/auth/password/sessioncredentials.php
rename to apps/files_external/lib/Lib/Auth/Password/SessionCredentials.php
diff --git a/apps/files_external/lib/auth/publickey/rsa.php b/apps/files_external/lib/Lib/Auth/PublicKey/RSA.php
similarity index 100%
rename from apps/files_external/lib/auth/publickey/rsa.php
rename to apps/files_external/lib/Lib/Auth/PublicKey/RSA.php
diff --git a/apps/files_external/lib/backend/amazons3.php b/apps/files_external/lib/Lib/Backend/AmazonS3.php
similarity index 100%
rename from apps/files_external/lib/backend/amazons3.php
rename to apps/files_external/lib/Lib/Backend/AmazonS3.php
diff --git a/apps/files_external/lib/backend/backend.php b/apps/files_external/lib/Lib/Backend/Backend.php
similarity index 100%
rename from apps/files_external/lib/backend/backend.php
rename to apps/files_external/lib/Lib/Backend/Backend.php
diff --git a/apps/files_external/lib/backend/dav.php b/apps/files_external/lib/Lib/Backend/DAV.php
similarity index 100%
rename from apps/files_external/lib/backend/dav.php
rename to apps/files_external/lib/Lib/Backend/DAV.php
diff --git a/apps/files_external/lib/backend/dropbox.php b/apps/files_external/lib/Lib/Backend/Dropbox.php
similarity index 100%
rename from apps/files_external/lib/backend/dropbox.php
rename to apps/files_external/lib/Lib/Backend/Dropbox.php
diff --git a/apps/files_external/lib/backend/ftp.php b/apps/files_external/lib/Lib/Backend/FTP.php
similarity index 100%
rename from apps/files_external/lib/backend/ftp.php
rename to apps/files_external/lib/Lib/Backend/FTP.php
diff --git a/apps/files_external/lib/backend/google.php b/apps/files_external/lib/Lib/Backend/Google.php
similarity index 100%
rename from apps/files_external/lib/backend/google.php
rename to apps/files_external/lib/Lib/Backend/Google.php
diff --git a/apps/files_external/lib/backend/legacybackend.php b/apps/files_external/lib/Lib/Backend/LegacyBackend.php
similarity index 100%
rename from apps/files_external/lib/backend/legacybackend.php
rename to apps/files_external/lib/Lib/Backend/LegacyBackend.php
diff --git a/apps/files_external/lib/backend/local.php b/apps/files_external/lib/Lib/Backend/Local.php
similarity index 100%
rename from apps/files_external/lib/backend/local.php
rename to apps/files_external/lib/Lib/Backend/Local.php
diff --git a/apps/files_external/lib/backend/owncloud.php b/apps/files_external/lib/Lib/Backend/OwnCloud.php
similarity index 100%
rename from apps/files_external/lib/backend/owncloud.php
rename to apps/files_external/lib/Lib/Backend/OwnCloud.php
diff --git a/apps/files_external/lib/backend/sftp.php b/apps/files_external/lib/Lib/Backend/SFTP.php
similarity index 100%
rename from apps/files_external/lib/backend/sftp.php
rename to apps/files_external/lib/Lib/Backend/SFTP.php
diff --git a/apps/files_external/lib/backend/sftp_key.php b/apps/files_external/lib/Lib/Backend/SFTP_Key.php
similarity index 100%
rename from apps/files_external/lib/backend/sftp_key.php
rename to apps/files_external/lib/Lib/Backend/SFTP_Key.php
diff --git a/apps/files_external/lib/backend/smb.php b/apps/files_external/lib/Lib/Backend/SMB.php
similarity index 100%
rename from apps/files_external/lib/backend/smb.php
rename to apps/files_external/lib/Lib/Backend/SMB.php
diff --git a/apps/files_external/lib/backend/smb_oc.php b/apps/files_external/lib/Lib/Backend/SMB_OC.php
similarity index 100%
rename from apps/files_external/lib/backend/smb_oc.php
rename to apps/files_external/lib/Lib/Backend/SMB_OC.php
diff --git a/apps/files_external/lib/backend/swift.php b/apps/files_external/lib/Lib/Backend/Swift.php
similarity index 100%
rename from apps/files_external/lib/backend/swift.php
rename to apps/files_external/lib/Lib/Backend/Swift.php
diff --git a/apps/files_external/lib/definitionparameter.php b/apps/files_external/lib/Lib/DefinitionParameter.php
similarity index 100%
rename from apps/files_external/lib/definitionparameter.php
rename to apps/files_external/lib/Lib/DefinitionParameter.php
diff --git a/apps/files_external/lib/dependencytrait.php b/apps/files_external/lib/Lib/DependencyTrait.php
similarity index 100%
rename from apps/files_external/lib/dependencytrait.php
rename to apps/files_external/lib/Lib/DependencyTrait.php
diff --git a/apps/files_external/lib/frontenddefinitiontrait.php b/apps/files_external/lib/Lib/FrontendDefinitionTrait.php
similarity index 100%
rename from apps/files_external/lib/frontenddefinitiontrait.php
rename to apps/files_external/lib/Lib/FrontendDefinitionTrait.php
diff --git a/apps/files_external/lib/identifiertrait.php b/apps/files_external/lib/Lib/IdentifierTrait.php
similarity index 100%
rename from apps/files_external/lib/identifiertrait.php
rename to apps/files_external/lib/Lib/IdentifierTrait.php
diff --git a/apps/files_external/lib/insufficientdataformeaningfulanswerexception.php b/apps/files_external/lib/Lib/InsufficientDataForMeaningfulAnswerException.php
similarity index 100%
rename from apps/files_external/lib/insufficientdataformeaningfulanswerexception.php
rename to apps/files_external/lib/Lib/InsufficientDataForMeaningfulAnswerException.php
diff --git a/apps/files_external/lib/legacydependencycheckpolyfill.php b/apps/files_external/lib/Lib/LegacyDependencyCheckPolyfill.php
similarity index 100%
rename from apps/files_external/lib/legacydependencycheckpolyfill.php
rename to apps/files_external/lib/Lib/LegacyDependencyCheckPolyfill.php
diff --git a/apps/files_external/lib/missingdependency.php b/apps/files_external/lib/Lib/MissingDependency.php
similarity index 100%
rename from apps/files_external/lib/missingdependency.php
rename to apps/files_external/lib/Lib/MissingDependency.php
diff --git a/apps/files_external/lib/personalmount.php b/apps/files_external/lib/Lib/PersonalMount.php
similarity index 100%
rename from apps/files_external/lib/personalmount.php
rename to apps/files_external/lib/Lib/PersonalMount.php
diff --git a/apps/files_external/lib/prioritytrait.php b/apps/files_external/lib/Lib/PriorityTrait.php
similarity index 100%
rename from apps/files_external/lib/prioritytrait.php
rename to apps/files_external/lib/Lib/PriorityTrait.php
diff --git a/apps/files_external/lib/sessionstoragewrapper.php b/apps/files_external/lib/Lib/SessionStorageWrapper.php
similarity index 100%
rename from apps/files_external/lib/sessionstoragewrapper.php
rename to apps/files_external/lib/Lib/SessionStorageWrapper.php
diff --git a/apps/files_external/lib/storage/amazons3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php
similarity index 100%
rename from apps/files_external/lib/storage/amazons3.php
rename to apps/files_external/lib/Lib/Storage/AmazonS3.php
diff --git a/apps/files_external/lib/storage/dropbox.php b/apps/files_external/lib/Lib/Storage/Dropbox.php
similarity index 100%
rename from apps/files_external/lib/storage/dropbox.php
rename to apps/files_external/lib/Lib/Storage/Dropbox.php
diff --git a/apps/files_external/lib/storage/ftp.php b/apps/files_external/lib/Lib/Storage/FTP.php
similarity index 100%
rename from apps/files_external/lib/storage/ftp.php
rename to apps/files_external/lib/Lib/Storage/FTP.php
diff --git a/apps/files_external/lib/storage/google.php b/apps/files_external/lib/Lib/Storage/Google.php
similarity index 100%
rename from apps/files_external/lib/storage/google.php
rename to apps/files_external/lib/Lib/Storage/Google.php
diff --git a/apps/files_external/lib/storage/owncloud.php b/apps/files_external/lib/Lib/Storage/OwnCloud.php
similarity index 100%
rename from apps/files_external/lib/storage/owncloud.php
rename to apps/files_external/lib/Lib/Storage/OwnCloud.php
diff --git a/apps/files_external/lib/storage/sftp.php b/apps/files_external/lib/Lib/Storage/SFTP.php
similarity index 100%
rename from apps/files_external/lib/storage/sftp.php
rename to apps/files_external/lib/Lib/Storage/SFTP.php
diff --git a/apps/files_external/lib/storage/smb.php b/apps/files_external/lib/Lib/Storage/SMB.php
similarity index 100%
rename from apps/files_external/lib/storage/smb.php
rename to apps/files_external/lib/Lib/Storage/SMB.php
diff --git a/apps/files_external/lib/storage/streamwrapper.php b/apps/files_external/lib/Lib/Storage/StreamWrapper.php
similarity index 100%
rename from apps/files_external/lib/storage/streamwrapper.php
rename to apps/files_external/lib/Lib/Storage/StreamWrapper.php
diff --git a/apps/files_external/lib/storage/swift.php b/apps/files_external/lib/Lib/Storage/Swift.php
similarity index 100%
rename from apps/files_external/lib/storage/swift.php
rename to apps/files_external/lib/Lib/Storage/Swift.php
diff --git a/apps/files_external/lib/storageconfig.php b/apps/files_external/lib/Lib/StorageConfig.php
similarity index 99%
rename from apps/files_external/lib/storageconfig.php
rename to apps/files_external/lib/Lib/StorageConfig.php
index 590a5f53249..2a22b324ead 100644
--- a/apps/files_external/lib/storageconfig.php
+++ b/apps/files_external/lib/Lib/StorageConfig.php
@@ -23,7 +23,7 @@
  *
  */
 
-namespace OCA\Files_external\Lib;
+namespace OCA\Files_External\Lib;
 
 use OCA\Files_External\Lib\Auth\IUserProvided;
 use \OCA\Files_External\Lib\Backend\Backend;
diff --git a/apps/files_external/lib/storagemodifiertrait.php b/apps/files_external/lib/Lib/StorageModifierTrait.php
similarity index 100%
rename from apps/files_external/lib/storagemodifiertrait.php
rename to apps/files_external/lib/Lib/StorageModifierTrait.php
diff --git a/apps/files_external/lib/visibilitytrait.php b/apps/files_external/lib/Lib/VisibilityTrait.php
similarity index 100%
rename from apps/files_external/lib/visibilitytrait.php
rename to apps/files_external/lib/Lib/VisibilityTrait.php
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 bb4ef19dace..b2157aafebb 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 48ab52768e2..3cd7be3f953 100644
--- a/apps/files_external/migration/storagemigrator.php
+++ b/apps/files_external/lib/Migration/StorageMigrator.php
@@ -20,22 +20,21 @@
  *
  */
 
-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\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 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/lib/notfoundexception.php b/apps/files_external/lib/NotFoundException.php
similarity index 96%
rename from apps/files_external/lib/notfoundexception.php
rename to apps/files_external/lib/NotFoundException.php
index dd3dd1907a5..80333c103ca 100644
--- a/apps/files_external/lib/notfoundexception.php
+++ b/apps/files_external/lib/NotFoundException.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace OCA\Files_external;
+namespace OCA\Files_External;
 
 /**
  * Storage is not found
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 ed9b1bcf075..4c44881051a 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 97%
rename from apps/files_external/service/globalstoragesservice.php
rename to apps/files_external/lib/Service/GlobalStoragesService.php
index 62da314c5fa..592283444d1 100644
--- a/apps/files_external/service/globalstoragesservice.php
+++ b/apps/files_external/lib/Service/GlobalStoragesService.php
@@ -22,13 +22,11 @@
  *
  */
 
-namespace OCA\Files_external\Service;
+namespace OCA\Files_External\Service;
+
 
-use \OCP\IUserSession;
 use \OC\Files\Filesystem;
-
-use \OCA\Files_external\Lib\StorageConfig;
-use \OCA\Files_external\NotFoundException;
+use OCA\Files_External\Lib\StorageConfig;
 
 /**
  * Service class to manage global external storages
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 8a790c5de9b..cb020fb495c 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 98%
rename from apps/files_external/service/legacystoragesservice.php
rename to apps/files_external/lib/Service/LegacyStoragesService.php
index 158fc2b5137..365181d746c 100644
--- a/apps/files_external/service/legacystoragesservice.php
+++ b/apps/files_external/lib/Service/LegacyStoragesService.php
@@ -19,9 +19,9 @@
  *
  */
 
-namespace OCA\Files_external\Service;
+namespace OCA\Files_External\Service;
 
-use \OCA\Files_external\Lib\StorageConfig;
+use OCA\Files_External\Lib\StorageConfig;
 
 /**
  * Read mount config from legacy mount.json
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 6542be146d6..4fb0f65e760 100644
--- a/apps/files_external/service/storagesservice.php
+++ b/apps/files_external/lib/Service/StoragesService.php
@@ -23,11 +23,11 @@
  *
  */
 
-namespace OCA\Files_external\Service;
+namespace OCA\Files_External\Service;
 
 use \OC\Files\Filesystem;
-use \OCA\Files_external\Lib\StorageConfig;
-use \OCA\Files_external\NotFoundException;
+use OCA\Files_External\Lib\StorageConfig;
+use OCA\Files_External\NotFoundException;
 use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use OCP\Files\Config\IUserMountCache;
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 111d4586924..b5e2d13c712 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 2f14857c633..c64520c8b02 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 97%
rename from apps/files_external/service/userstoragesservice.php
rename to apps/files_external/lib/Service/UserStoragesService.php
index c46846e76d6..a527acbba3a 100644
--- a/apps/files_external/service/userstoragesservice.php
+++ b/apps/files_external/lib/Service/UserStoragesService.php
@@ -21,14 +21,14 @@
  *
  */
 
-namespace OCA\Files_external\Service;
+namespace OCA\Files_External\Service;
 
 use OCP\Files\Config\IUserMountCache;
 use \OCP\IUserSession;
 use \OC\Files\Filesystem;
 
-use \OCA\Files_external\Lib\StorageConfig;
-use \OCA\Files_external\NotFoundException;
+use OCA\Files_External\Lib\StorageConfig;
+use OCA\Files_External\NotFoundException;
 use \OCA\Files_External\Service\BackendService;
 use \OCA\Files_External\Service\UserTrait;
 
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.php b/apps/files_external/lib/config.php
index 70f8550f39b..d581deab190 100644
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -33,7 +33,7 @@
  */
 
 use phpseclib\Crypt\AES;
-use \OCA\Files_External\Appinfo\Application;
+use \OCA\Files_External\AppInfo\Application;
 use \OCA\Files_External\Lib\Backend\LegacyBackend;
 use \OCA\Files_External\Lib\StorageConfig;
 use \OCA\Files_External\Lib\Backend\Backend;
@@ -91,7 +91,7 @@ class OC_Mount_Config {
 		$userStoragesService->setUser($user);
 
 		foreach ($userGlobalStoragesService->getStorages() as $storage) {
-			/** @var \OCA\Files_external\Lib\StorageConfig $storage */
+			/** @var \OCA\Files_External\Lib\StorageConfig $storage */
 			$mountPoint = '/'.$uid.'/files'.$storage->getMountPoint();
 			$mountEntry = self::prepareMountPointEntry($storage, false);
 			foreach ($mountEntry['options'] as &$option) {
diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php
index 5c568f45b7d..195b826a4c2 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 0d83d26ff97..8f44c170ce6 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/amazons3migration.php b/apps/files_external/tests/AmazonS3MigrationTest.php
similarity index 98%
rename from apps/files_external/tests/amazons3migration.php
rename to apps/files_external/tests/AmazonS3MigrationTest.php
index 614d6ca33df..132d907ab14 100644
--- a/apps/files_external/tests/amazons3migration.php
+++ b/apps/files_external/tests/AmazonS3MigrationTest.php
@@ -35,7 +35,7 @@ use OCA\Files_External\Lib\Storage\AmazonS3;
  *
  * @package OCA\Files_External\Tests
  */
-class AmazonS3Migration extends \Test\TestCase {
+class AmazonS3MigrationTest extends \Test\TestCase {
 
 	/**
 	 * @var \OC\Files\Storage\Storage instance
diff --git a/apps/files_external/tests/auth/authmechanismtest.php b/apps/files_external/tests/Auth/AuthMechanismTest.php
similarity index 100%
rename from apps/files_external/tests/auth/authmechanismtest.php
rename to apps/files_external/tests/Auth/AuthMechanismTest.php
diff --git a/apps/files_external/tests/backend/backendtest.php b/apps/files_external/tests/Backend/BackendTest.php
similarity index 100%
rename from apps/files_external/tests/backend/backendtest.php
rename to apps/files_external/tests/Backend/BackendTest.php
diff --git a/apps/files_external/tests/backend/legacybackendtest.php b/apps/files_external/tests/Backend/LegacyBackendTest.php
similarity index 100%
rename from apps/files_external/tests/backend/legacybackendtest.php
rename to apps/files_external/tests/Backend/LegacyBackendTest.php
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 93%
rename from apps/files_external/tests/command/commandtest.php
rename to apps/files_external/tests/Command/CommandTest.php
index 9a0afbd3681..2283cf97ace 100644
--- a/apps/files_external/tests/command/commandtest.php
+++ b/apps/files_external/tests/Command/CommandTest.php
@@ -21,8 +21,8 @@
 
 namespace OCA\Files_External\Tests\Command;
 
-use OCA\Files_external\Lib\StorageConfig;
-use OCA\Files_external\NotFoundException;
+use OCA\Files_External\Lib\StorageConfig;
+use OCA\Files_External\NotFoundException;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\Input;
@@ -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 90%
rename from apps/files_external/tests/command/listcommandtest.php
rename to apps/files_external/tests/Command/ListCommandTest.php
index 3098906bcc6..fee53c9f143 100644
--- a/apps/files_external/tests/command/listcommandtest.php
+++ b/apps/files_external/tests/Command/ListCommandTest.php
@@ -26,7 +26,7 @@ use OCA\Files_External\Lib\Auth\NullMechanism;
 use OCA\Files_External\Lib\Auth\Password\Password;
 use OCA\Files_External\Lib\Auth\Password\SessionCredentials;
 use OCA\Files_External\Lib\Backend\Local;
-use OCA\Files_external\Lib\StorageConfig;
+use OCA\Files_External\Lib\StorageConfig;
 use Symfony\Component\Console\Output\BufferedOutput;
 
 class ListCommandTest extends CommandTest {
@@ -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 1021300399a..9761a4e23f9 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 97%
rename from apps/files_external/tests/controller/storagescontrollertest.php
rename to apps/files_external/tests/Controller/StoragesControllerTest.php
index 4c3c62d5d6f..4c3bd73fe4b 100644
--- a/apps/files_external/tests/controller/storagescontrollertest.php
+++ b/apps/files_external/tests/Controller/StoragesControllerTest.php
@@ -19,14 +19,14 @@
  * 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\Lib\StorageConfig;
-use \OCA\Files_external\NotFoundException;
+use \OCA\Files_External\Controller\GlobalStoragesController;
+use \OCA\Files_External\Service\GlobalStoragesService;
+use OCA\Files_External\Lib\StorageConfig;
+use OCA\Files_External\NotFoundException;
 
 abstract class StoragesControllerTest extends \Test\TestCase {
 
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 804b752b6af..ac8d4663740 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/definitionparameterttest.php b/apps/files_external/tests/DefinitionParameterTest.php
similarity index 100%
rename from apps/files_external/tests/definitionparameterttest.php
rename to apps/files_external/tests/DefinitionParameterTest.php
diff --git a/apps/files_external/tests/frontenddefinitiontraittest.php b/apps/files_external/tests/FrontendDefinitionTraitTest.php
similarity index 100%
rename from apps/files_external/tests/frontenddefinitiontraittest.php
rename to apps/files_external/tests/FrontendDefinitionTraitTest.php
diff --git a/apps/files_external/tests/legacydependencycheckpolyfilltest.php b/apps/files_external/tests/LegacyDependencyCheckPolyfillTest.php
similarity index 100%
rename from apps/files_external/tests/legacydependencycheckpolyfilltest.php
rename to apps/files_external/tests/LegacyDependencyCheckPolyfillTest.php
diff --git a/apps/files_external/tests/owncloudfunctions.php b/apps/files_external/tests/OwnCloudFunctionsTest.php
similarity index 98%
rename from apps/files_external/tests/owncloudfunctions.php
rename to apps/files_external/tests/OwnCloudFunctionsTest.php
index 25aaa90d178..41ae0421ebf 100644
--- a/apps/files_external/tests/owncloudfunctions.php
+++ b/apps/files_external/tests/OwnCloudFunctionsTest.php
@@ -32,7 +32,7 @@ namespace OCA\Files_External\Tests;
  *
  * @package OCA\Files_External\Tests
  */
-class OwnCloudFunctions extends \Test\TestCase {
+class OwnCloudFunctionsTest extends \Test\TestCase {
 
 	function configUrlProvider() {
 		return array(
diff --git a/apps/files_external/tests/personalmounttest.php b/apps/files_external/tests/PersonalMountTest.php
similarity index 97%
rename from apps/files_external/tests/personalmounttest.php
rename to apps/files_external/tests/PersonalMountTest.php
index d82773ad749..8e8a299714f 100644
--- a/apps/files_external/tests/personalmounttest.php
+++ b/apps/files_external/tests/PersonalMountTest.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace OCA\Files_external\Tests;
+namespace OCA\Files_External\Tests;
 
 use OC\Files\Mount\Manager;
 use OCA\Files_External\Lib\PersonalMount;
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 6cdfbef82d4..b2cc7f59ed4 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 98%
rename from apps/files_external/tests/service/storagesservicetest.php
rename to apps/files_external/tests/Service/StoragesServiceTest.php
index f93c0134814..5d1094271e5 100644
--- a/apps/files_external/tests/service/storagesservicetest.php
+++ b/apps/files_external/tests/Service/StoragesServiceTest.php
@@ -20,15 +20,15 @@
  * 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\NotFoundException;
-use \OCA\Files_external\Lib\StorageConfig;
+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 = [];
@@ -241,7 +241,7 @@ abstract class StoragesServiceTest extends \Test\TestCase {
 
 
 	/**
-	 * @expectedException \OCA\Files_external\NotFoundException
+	 * @expectedException \OCA\Files_External\NotFoundException
 	 */
 	public function testNonExistingStorage() {
 		$backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB');
@@ -324,7 +324,7 @@ abstract class StoragesServiceTest extends \Test\TestCase {
 	}
 
 	/**
-	 * @expectedException \OCA\Files_external\NotFoundException
+	 * @expectedException \OCA\Files_External\NotFoundException
 	 */
 	public function testDeleteUnexistingStorage() {
 		$this->service->removeStorage(255);
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 baecf143c66..4a03b6194e9 100644
--- a/apps/files_external/tests/service/userglobalstoragesservicetest.php
+++ b/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php
@@ -22,12 +22,9 @@
  */
 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\NotFoundException;
+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 93%
rename from apps/files_external/tests/service/userstoragesservicetest.php
rename to apps/files_external/tests/Service/UserStoragesServiceTest.php
index 37423cb8d74..6ae888d8274 100644
--- a/apps/files_external/tests/service/userstoragesservicetest.php
+++ b/apps/files_external/tests/Service/UserStoragesServiceTest.php
@@ -20,15 +20,14 @@
  * 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\Lib\StorageConfig;
+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;
 
 /**
@@ -186,7 +185,7 @@ class UserStoragesServiceTest extends StoragesServiceTest {
 	}
 
 	/**
-	 * @expectedException \OCA\Files_external\NotFoundException
+	 * @expectedException \OCA\Files_External\NotFoundException
 	 */
 	public function testGetAdminStorage() {
 		$backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB');
@@ -201,7 +200,7 @@ class UserStoragesServiceTest extends StoragesServiceTest {
 
 		$newStorage = $this->globalStoragesService->addStorage($storage);
 
-		$this->assertInstanceOf('\OCA\Files_external\Lib\StorageConfig', $this->globalStoragesService->getStorage($newStorage->getId()));
+		$this->assertInstanceOf('\OCA\Files_External\Lib\StorageConfig', $this->globalStoragesService->getStorage($newStorage->getId()));
 
 		$this->service->getStorage($newStorage->getId());
 	}
diff --git a/apps/files_external/tests/storage/amazons3test.php b/apps/files_external/tests/Storage/AmazonS3Test.php
similarity index 100%
rename from apps/files_external/tests/storage/amazons3test.php
rename to apps/files_external/tests/Storage/AmazonS3Test.php
diff --git a/apps/files_external/tests/storage/dropboxtest.php b/apps/files_external/tests/Storage/DropboxTest.php
similarity index 100%
rename from apps/files_external/tests/storage/dropboxtest.php
rename to apps/files_external/tests/Storage/DropboxTest.php
diff --git a/apps/files_external/tests/storage/ftptest.php b/apps/files_external/tests/Storage/FTPTest.php
similarity index 100%
rename from apps/files_external/tests/storage/ftptest.php
rename to apps/files_external/tests/Storage/FTPTest.php
diff --git a/apps/files_external/tests/storage/googletest.php b/apps/files_external/tests/Storage/GoogleTest.php
similarity index 100%
rename from apps/files_external/tests/storage/googletest.php
rename to apps/files_external/tests/Storage/GoogleTest.php
diff --git a/apps/files_external/tests/storage/owncloudtest.php b/apps/files_external/tests/Storage/OwnCloudTest.php
similarity index 100%
rename from apps/files_external/tests/storage/owncloudtest.php
rename to apps/files_external/tests/Storage/OwnCloudTest.php
diff --git a/apps/files_external/tests/storage/sftptest.php b/apps/files_external/tests/Storage/SFTPTest.php
similarity index 100%
rename from apps/files_external/tests/storage/sftptest.php
rename to apps/files_external/tests/Storage/SFTPTest.php
diff --git a/apps/files_external/tests/storage/sftp_keytest.php b/apps/files_external/tests/Storage/SFTP_KeyTest.php
similarity index 100%
rename from apps/files_external/tests/storage/sftp_keytest.php
rename to apps/files_external/tests/Storage/SFTP_KeyTest.php
diff --git a/apps/files_external/tests/storage/smbtest.php b/apps/files_external/tests/Storage/SMBTest.php
similarity index 100%
rename from apps/files_external/tests/storage/smbtest.php
rename to apps/files_external/tests/Storage/SMBTest.php
diff --git a/apps/files_external/tests/storage/swifttest.php b/apps/files_external/tests/Storage/SwiftTest.php
similarity index 100%
rename from apps/files_external/tests/storage/swifttest.php
rename to apps/files_external/tests/Storage/SwiftTest.php
diff --git a/apps/files_external/tests/storage/webdavtest.php b/apps/files_external/tests/Storage/WebDAVTest.php
similarity index 100%
rename from apps/files_external/tests/storage/webdavtest.php
rename to apps/files_external/tests/Storage/WebDAVTest.php
diff --git a/apps/files_external/tests/storageconfigtest.php b/apps/files_external/tests/StorageConfigTest.php
similarity index 97%
rename from apps/files_external/tests/storageconfigtest.php
rename to apps/files_external/tests/StorageConfigTest.php
index 278c86d2cbe..a46ab14d84b 100644
--- a/apps/files_external/tests/storageconfigtest.php
+++ b/apps/files_external/tests/StorageConfigTest.php
@@ -21,9 +21,9 @@
  *
  */
 
-namespace OCA\Files_external\Tests;
+namespace OCA\Files_External\Tests;
 
-use \OCA\Files_external\Lib\StorageConfig;
+use OCA\Files_External\Lib\StorageConfig;
 
 class StorageConfigTest extends \Test\TestCase {