diff --git a/apps/federation/api/ocsauthapi.php b/apps/federation/lib/API/OCSAuthAPI.php
similarity index 100%
rename from apps/federation/api/ocsauthapi.php
rename to apps/federation/lib/API/OCSAuthAPI.php
diff --git a/apps/federation/appinfo/application.php b/apps/federation/lib/AppInfo/Application.php
similarity index 100%
rename from apps/federation/appinfo/application.php
rename to apps/federation/lib/AppInfo/Application.php
diff --git a/apps/federation/backgroundjob/getsharedsecret.php b/apps/federation/lib/BackgroundJob/GetSharedSecret.php
similarity index 100%
rename from apps/federation/backgroundjob/getsharedsecret.php
rename to apps/federation/lib/BackgroundJob/GetSharedSecret.php
diff --git a/apps/federation/backgroundjob/requestsharedsecret.php b/apps/federation/lib/BackgroundJob/RequestSharedSecret.php
similarity index 100%
rename from apps/federation/backgroundjob/requestsharedsecret.php
rename to apps/federation/lib/BackgroundJob/RequestSharedSecret.php
diff --git a/apps/federation/command/syncfederationaddressbooks.php b/apps/federation/lib/Command/SyncFederationAddressBooks.php
similarity index 100%
rename from apps/federation/command/syncfederationaddressbooks.php
rename to apps/federation/lib/Command/SyncFederationAddressBooks.php
diff --git a/apps/federation/controller/settingscontroller.php b/apps/federation/lib/Controller/SettingsController.php
similarity index 100%
rename from apps/federation/controller/settingscontroller.php
rename to apps/federation/lib/Controller/SettingsController.php
diff --git a/apps/federation/dav/fedauth.php b/apps/federation/lib/DAV/FedAuth.php
similarity index 100%
rename from apps/federation/dav/fedauth.php
rename to apps/federation/lib/DAV/FedAuth.php
diff --git a/apps/federation/lib/dbhandler.php b/apps/federation/lib/DbHandler.php
similarity index 100%
rename from apps/federation/lib/dbhandler.php
rename to apps/federation/lib/DbHandler.php
diff --git a/apps/federation/lib/hooks.php b/apps/federation/lib/Hooks.php
similarity index 100%
rename from apps/federation/lib/hooks.php
rename to apps/federation/lib/Hooks.php
diff --git a/apps/federation/middleware/addservermiddleware.php b/apps/federation/lib/Middleware/AddServerMiddleware.php
similarity index 98%
rename from apps/federation/middleware/addservermiddleware.php
rename to apps/federation/lib/Middleware/AddServerMiddleware.php
index 1578125134..4b752f51ee 100644
--- a/apps/federation/middleware/addservermiddleware.php
+++ b/apps/federation/lib/Middleware/AddServerMiddleware.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace OCA\Federation\Middleware ;
+namespace OCA\Federation\Middleware;
 
 use OC\HintException;
 use OCP\AppFramework\Http;
diff --git a/apps/federation/lib/syncfederationaddressbooks.php b/apps/federation/lib/SyncFederationAddressBooks.php
similarity index 100%
rename from apps/federation/lib/syncfederationaddressbooks.php
rename to apps/federation/lib/SyncFederationAddressBooks.php
diff --git a/apps/federation/lib/syncjob.php b/apps/federation/lib/SyncJob.php
similarity index 100%
rename from apps/federation/lib/syncjob.php
rename to apps/federation/lib/SyncJob.php
diff --git a/apps/federation/lib/trustedservers.php b/apps/federation/lib/TrustedServers.php
similarity index 100%
rename from apps/federation/lib/trustedservers.php
rename to apps/federation/lib/TrustedServers.php