diff --git a/apps/federatedfilesharing/appinfo/app.php b/apps/federatedfilesharing/appinfo/app.php
index 23af62037a..4666d343f7 100644
--- a/apps/federatedfilesharing/appinfo/app.php
+++ b/apps/federatedfilesharing/appinfo/app.php
@@ -19,7 +19,5 @@
  *
  */
 
-namespace OCA\FederatedFileSharing\AppInfo;
-
-$app = new Application('federatedfilesharing');
+$app = new \OCA\FederatedFileSharing\AppInfo\Application('federatedfilesharing');
 $app->registerSettings();
diff --git a/apps/federatedfilesharing/lib/addresshandler.php b/apps/federatedfilesharing/lib/AddressHandler.php
similarity index 100%
rename from apps/federatedfilesharing/lib/addresshandler.php
rename to apps/federatedfilesharing/lib/AddressHandler.php
diff --git a/apps/federatedfilesharing/appinfo/application.php b/apps/federatedfilesharing/lib/AppInfo/Application.php
similarity index 100%
rename from apps/federatedfilesharing/appinfo/application.php
rename to apps/federatedfilesharing/lib/AppInfo/Application.php
diff --git a/apps/federatedfilesharing/backgroundjob/unshare.php b/apps/federatedfilesharing/lib/BackgroundJob/UnShare.php
similarity index 100%
rename from apps/federatedfilesharing/backgroundjob/unshare.php
rename to apps/federatedfilesharing/lib/BackgroundJob/UnShare.php
diff --git a/apps/federatedfilesharing/lib/discoverymanager.php b/apps/federatedfilesharing/lib/DiscoveryManager.php
similarity index 100%
rename from apps/federatedfilesharing/lib/discoverymanager.php
rename to apps/federatedfilesharing/lib/DiscoveryManager.php
diff --git a/apps/federatedfilesharing/lib/federatedshareprovider.php b/apps/federatedfilesharing/lib/FederatedShareProvider.php
similarity index 100%
rename from apps/federatedfilesharing/lib/federatedshareprovider.php
rename to apps/federatedfilesharing/lib/FederatedShareProvider.php
diff --git a/apps/federatedfilesharing/lib/notifications.php b/apps/federatedfilesharing/lib/Notifications.php
similarity index 100%
rename from apps/federatedfilesharing/lib/notifications.php
rename to apps/federatedfilesharing/lib/Notifications.php
diff --git a/apps/federatedfilesharing/lib/tokenhandler.php b/apps/federatedfilesharing/lib/TokenHandler.php
similarity index 100%
rename from apps/federatedfilesharing/lib/tokenhandler.php
rename to apps/federatedfilesharing/lib/TokenHandler.php
diff --git a/apps/federatedfilesharing/tests/addresshandlertest.php b/apps/federatedfilesharing/tests/AddressHandlerTest.php
similarity index 100%
rename from apps/federatedfilesharing/tests/addresshandlertest.php
rename to apps/federatedfilesharing/tests/AddressHandlerTest.php
diff --git a/apps/federatedfilesharing/tests/federatedshareprovidertest.php b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php
similarity index 100%
rename from apps/federatedfilesharing/tests/federatedshareprovidertest.php
rename to apps/federatedfilesharing/tests/FederatedShareProviderTest.php
diff --git a/apps/federatedfilesharing/tests/notificationstest.php b/apps/federatedfilesharing/tests/NotificationsTest.php
similarity index 100%
rename from apps/federatedfilesharing/tests/notificationstest.php
rename to apps/federatedfilesharing/tests/NotificationsTest.php
diff --git a/apps/federatedfilesharing/tests/tokenhandlertest.php b/apps/federatedfilesharing/tests/TokenHandlerTest.php
similarity index 100%
rename from apps/federatedfilesharing/tests/tokenhandlertest.php
rename to apps/federatedfilesharing/tests/TokenHandlerTest.php