diff --git a/apps/files_sharing/lib/AppInfo/Application.php b/apps/files_sharing/lib/AppInfo/Application.php
index 29cdf702a5..922db7dac7 100644
--- a/apps/files_sharing/lib/AppInfo/Application.php
+++ b/apps/files_sharing/lib/AppInfo/Application.php
@@ -32,8 +32,8 @@ use OCA\Files_Sharing\Middleware\OCSShareAPIMiddleware;
 use OCA\Files_Sharing\MountProvider;
 use OCP\AppFramework\App;
 use OC\AppFramework\Utility\SimpleContainer;
-use OCA\Files_Sharing\Controllers\ExternalSharesController;
-use OCA\Files_Sharing\Controllers\ShareController;
+use OCA\Files_Sharing\Controller\ExternalSharesController;
+use OCA\Files_Sharing\Controller\ShareController;
 use OCA\Files_Sharing\Middleware\SharingCheckMiddleware;
 use \OCP\IContainer;
 use OCP\IServerContainer;
diff --git a/apps/files_sharing/lib/Controllers/ExternalSharesController.php b/apps/files_sharing/lib/Controller/ExternalSharesController.php
similarity index 97%
rename from apps/files_sharing/lib/Controllers/ExternalSharesController.php
rename to apps/files_sharing/lib/Controller/ExternalSharesController.php
index 24b3211e00..fe4c09dd19 100644
--- a/apps/files_sharing/lib/Controllers/ExternalSharesController.php
+++ b/apps/files_sharing/lib/Controller/ExternalSharesController.php
@@ -24,7 +24,7 @@
  *
  */
 
-namespace OCA\Files_Sharing\Controllers;
+namespace OCA\Files_Sharing\Controller;
 
 use OCP\AppFramework\Controller;
 use OCP\IRequest;
@@ -35,7 +35,7 @@ use OCP\AppFramework\Http\DataResponse;
 /**
  * Class ExternalSharesController
  *
- * @package OCA\Files_Sharing\Controllers
+ * @package OCA\Files_Sharing\Controller
  */
 class ExternalSharesController extends Controller {
 
diff --git a/apps/files_sharing/lib/Controllers/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php
similarity index 99%
rename from apps/files_sharing/lib/Controllers/ShareController.php
rename to apps/files_sharing/lib/Controller/ShareController.php
index 8e3405311e..62725115dd 100644
--- a/apps/files_sharing/lib/Controllers/ShareController.php
+++ b/apps/files_sharing/lib/Controller/ShareController.php
@@ -30,7 +30,7 @@
  *
  */
 
-namespace OCA\Files_Sharing\Controllers;
+namespace OCA\Files_Sharing\Controller;
 
 use OC_Files;
 use OC_Util;
diff --git a/apps/files_sharing/lib/Middleware/SharingCheckMiddleware.php b/apps/files_sharing/lib/Middleware/SharingCheckMiddleware.php
index 7c5eb5afbd..7e9109bf2d 100644
--- a/apps/files_sharing/lib/Middleware/SharingCheckMiddleware.php
+++ b/apps/files_sharing/lib/Middleware/SharingCheckMiddleware.php
@@ -78,10 +78,10 @@ class SharingCheckMiddleware extends Middleware {
 			throw new NotFoundException('Sharing is disabled.');
 		}
 
-		if ($controller instanceof \OCA\Files_Sharing\Controllers\ExternalSharesController &&
+		if ($controller instanceof \OCA\Files_Sharing\Controller\ExternalSharesController &&
 			!$this->externalSharesChecks()) {
 			throw new S2SException('Federated sharing not allowed');
-		} else if ($controller instanceof \OCA\Files_Sharing\Controllers\ShareController &&
+		} else if ($controller instanceof \OCA\Files_Sharing\Controller\ShareController &&
 			!$this->isLinkSharingEnabled()) {
 			throw new NotFoundException('Link sharing is disabled');
 		}
diff --git a/apps/files_sharing/tests/Controllers/ExternalShareControllerTest.php b/apps/files_sharing/tests/Controller/ExternalShareControllerTest.php
similarity index 98%
rename from apps/files_sharing/tests/Controllers/ExternalShareControllerTest.php
rename to apps/files_sharing/tests/Controller/ExternalShareControllerTest.php
index e5fd739c4f..71a4f4adeb 100644
--- a/apps/files_sharing/tests/Controllers/ExternalShareControllerTest.php
+++ b/apps/files_sharing/tests/Controller/ExternalShareControllerTest.php
@@ -24,7 +24,7 @@
 
 namespace OCA\Files_Sharing\Tests\Controllers;
 
-use OCA\Files_Sharing\Controllers\ExternalSharesController;
+use OCA\Files_Sharing\Controller\ExternalSharesController;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\Http\Client\IClientService;
diff --git a/apps/files_sharing/tests/Controllers/ShareControllerTest.php b/apps/files_sharing/tests/Controller/ShareControllerTest.php
similarity index 99%
rename from apps/files_sharing/tests/Controllers/ShareControllerTest.php
rename to apps/files_sharing/tests/Controller/ShareControllerTest.php
index 94891d868c..dae7740b3a 100644
--- a/apps/files_sharing/tests/Controllers/ShareControllerTest.php
+++ b/apps/files_sharing/tests/Controller/ShareControllerTest.php
@@ -33,7 +33,7 @@ namespace OCA\Files_Sharing\Tests\Controllers;
 
 use OC\Files\Filesystem;
 use OCA\FederatedFileSharing\FederatedShareProvider;
-use OCA\Files_Sharing\Controllers\ShareController;
+use OCA\Files_Sharing\Controller\ShareController;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\Share\Exceptions\ShareNotFound;
 use OCP\AppFramework\Http\NotFoundResponse;
@@ -96,7 +96,7 @@ class ShareControllerTest extends \Test\TestCase {
 			->method('isIncomingServer2serverShareEnabled')->willReturn(true);
 		$this->eventDispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
 
-		$this->shareController = new \OCA\Files_Sharing\Controllers\ShareController(
+		$this->shareController = new \OCA\Files_Sharing\Controller\ShareController(
 			$this->appName,
 			$this->getMockBuilder('\OCP\IRequest')->getMock(),
 			$this->config,