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 100%
rename from apps/files_external/lib/auth/builtin.php
rename to apps/files_external/lib/Lib/Auth/Builtin.php
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 95%
rename from apps/files_external/lib/auth/nullmechanism.php
rename to apps/files_external/lib/Lib/Auth/NullMechanism.php
index 06083729e5..c0a8f4f119 100644
--- a/apps/files_external/lib/auth/nullmechanism.php
+++ b/apps/files_external/lib/Lib/Auth/NullMechanism.php
@@ -22,7 +22,6 @@
 namespace OCA\Files_External\Lib\Auth;
 
 use \OCP\IL10N;
-use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use \OCA\Files_external\Lib\StorageConfig;
 
 /**
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/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