diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index 32eee9b6c9c6cd5197c49a0eb1ad50a9f5cc265e..e96269d1148dc706c7e1dd8c31f52f1b073cbb83 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -26,15 +26,13 @@
  *
  */
 
-namespace OCA\Files_Sharing\Appinfo;
-
 $l = \OC::$server->getL10N('files_sharing');
 
 \OC::$CLASSPATH['OC_Share_Backend_File'] = 'files_sharing/lib/share/file.php';
 \OC::$CLASSPATH['OC_Share_Backend_Folder'] = 'files_sharing/lib/share/folder.php';
 \OC::$CLASSPATH['OC\Files\Storage\Shared'] = 'files_sharing/lib/sharedstorage.php';
 
-$application = new Application();
+$application = new \OCA\Files_Sharing\AppInfo\Application();
 $application->registerMountProviders();
 
 \OCA\Files_Sharing\Helper::registerHooks();
diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml
index 7e49e267275a170b992b5a356b8b3da3bd407a86..f6e3053961fc1411e1bbedd31576cad367151e67 100644
--- a/apps/files_sharing/appinfo/info.xml
+++ b/apps/files_sharing/appinfo/info.xml
@@ -21,6 +21,8 @@ Turning the feature off removes shared files and folders on the server for all s
 		<files>public.php</files>
 	</public>
 
+	<namespace>Files_Sharing</namespace>
+
 	<background-jobs>
 		<job>OCA\Files_sharing\Lib\DeleteOrphanedSharesJob</job>
 		<job>OCA\Files_sharing\ExpireSharesJob</job>
diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php
index 80632f0fedf24b701ca04f6a073c0e4921feec4b..2e11e0e62bc7d7126aa6d8bbe10634c864a09361 100644
--- a/apps/files_sharing/appinfo/routes.php
+++ b/apps/files_sharing/appinfo/routes.php
@@ -24,11 +24,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-namespace OCA\Files_Sharing\AppInfo;
 
 use OCP\API;
 
-$application = new Application();
+$application = new \OCA\Files_Sharing\AppInfo\Application();
 $application->registerRoutes($this, [
 	'resources' => [
 		'ExternalShares' => ['url' => '/api/externalShares'],
diff --git a/apps/files_sharing/api/ocssharewrapper.php b/apps/files_sharing/lib/API/OCSShareWrapper.php
similarity index 100%
rename from apps/files_sharing/api/ocssharewrapper.php
rename to apps/files_sharing/lib/API/OCSShareWrapper.php
diff --git a/apps/files_sharing/api/remote.php b/apps/files_sharing/lib/API/Remote.php
similarity index 100%
rename from apps/files_sharing/api/remote.php
rename to apps/files_sharing/lib/API/Remote.php
diff --git a/apps/files_sharing/api/share20ocs.php b/apps/files_sharing/lib/API/Share20OCS.php
similarity index 100%
rename from apps/files_sharing/api/share20ocs.php
rename to apps/files_sharing/lib/API/Share20OCS.php
diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/lib/API/Sharees.php
similarity index 100%
rename from apps/files_sharing/api/sharees.php
rename to apps/files_sharing/lib/API/Sharees.php
diff --git a/apps/files_sharing/appinfo/application.php b/apps/files_sharing/lib/AppInfo/Application.php
similarity index 100%
rename from apps/files_sharing/appinfo/application.php
rename to apps/files_sharing/lib/AppInfo/Application.php
diff --git a/apps/files_sharing/tests/testcase.php b/apps/files_sharing/tests/testcase.php
index b1d6facafd64b7ba9e2d7be0f77551089ff72f34..9078a3d4578fffc92f11e1b37d467bd411065b80 100644
--- a/apps/files_sharing/tests/testcase.php
+++ b/apps/files_sharing/tests/testcase.php
@@ -32,7 +32,7 @@ namespace OCA\Files_Sharing\Tests;
 
 use OC\Files\Filesystem;
 use OCA\Files\Share;
-use OCA\Files_Sharing\Appinfo\Application;
+use OCA\Files_Sharing\AppInfo\Application;
 
 /**
  * Class Test_Files_Sharing_Base