diff --git a/lib/private/appframework/http/dispatcher.php b/lib/private/appframework/http/dispatcher.php
index 2a9ed12148..51283fd64e 100644
--- a/lib/private/appframework/http/dispatcher.php
+++ b/lib/private/appframework/http/dispatcher.php
@@ -25,7 +25,7 @@
 namespace OC\AppFramework\Http;
 
 use \OC\AppFramework\Middleware\MiddlewareDispatcher;
-use OCP\AppFramework\Controller\Controller;
+use OCP\AppFramework\Controller;
 
 
 /**
diff --git a/lib/private/appframework/middleware/middlewaredispatcher.php b/lib/private/appframework/middleware/middlewaredispatcher.php
index c46ddc7cb0..681140c224 100644
--- a/lib/private/appframework/middleware/middlewaredispatcher.php
+++ b/lib/private/appframework/middleware/middlewaredispatcher.php
@@ -24,7 +24,7 @@
 
 namespace OC\AppFramework\Middleware;
 
-use OCP\AppFramework\Controller\Controller;
+use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\MiddleWare;
 
diff --git a/lib/public/appframework/controller/controller.php b/lib/public/appframework/controller.php
similarity index 99%
rename from lib/public/appframework/controller/controller.php
rename to lib/public/appframework/controller.php
index b3de8c991a..1642b50857 100644
--- a/lib/public/appframework/controller/controller.php
+++ b/lib/public/appframework/controller.php
@@ -22,7 +22,7 @@
  */
 
 
-namespace OCP\AppFramework\Controller;
+namespace OCP\AppFramework;
 
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\IAppContainer;
diff --git a/lib/public/appframework/middleware.php b/lib/public/appframework/middleware.php
index 13b4b8cab9..94f71ea852 100644
--- a/lib/public/appframework/middleware.php
+++ b/lib/public/appframework/middleware.php
@@ -24,7 +24,7 @@
 
 namespace OCP\AppFramework;
 
-use OCP\AppFramework\Controller\Controller;
+use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\Response;
 
 
diff --git a/tests/lib/appframework/AppTest.php b/tests/lib/appframework/AppTest.php
index 8942e2f442..9bedcb446e 100644
--- a/tests/lib/appframework/AppTest.php
+++ b/tests/lib/appframework/AppTest.php
@@ -40,7 +40,7 @@ class AppTest extends \PHPUnit_Framework_TestCase {
 	protected function setUp() {
 		$this->container = new \OC\AppFramework\DependencyInjection\DIContainer('test');
 		$this->controller = $this->getMockBuilder(
-			'OCP\AppFramework\Controller\Controller')
+			'OCP\AppFramework\Controller')
 			->disableOriginalConstructor()
 			->getMock();
 		$this->dispatcher = $this->getMockBuilder(
diff --git a/tests/lib/appframework/controller/ControllerTest.php b/tests/lib/appframework/controller/ControllerTest.php
index 614744394e..f17d5f24aa 100644
--- a/tests/lib/appframework/controller/ControllerTest.php
+++ b/tests/lib/appframework/controller/ControllerTest.php
@@ -25,7 +25,7 @@
 namespace Test\AppFramework\Controller;
 
 use OC\AppFramework\Http\Request;
-use OCP\AppFramework\Controller\Controller;
+use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\TemplateResponse;
 
 
diff --git a/tests/lib/appframework/http/DispatcherTest.php b/tests/lib/appframework/http/DispatcherTest.php
index fb9fd0d582..9052fe0781 100644
--- a/tests/lib/appframework/http/DispatcherTest.php
+++ b/tests/lib/appframework/http/DispatcherTest.php
@@ -62,7 +62,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
 			->disableOriginalConstructor()
 			->getMock();
 		$this->controller = $this->getMock(
-			'\OCP\AppFramework\Controller\Controller',
+			'\OCP\AppFramework\Controller',
 			array($this->controllerMethod), array($app, $request));
 		
 		$this->dispatcher = new Dispatcher(
diff --git a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
index 5a43099ebb..95d42e4eb8 100644
--- a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
+++ b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
@@ -128,7 +128,7 @@ class MiddlewareDispatcherTest extends \PHPUnit_Framework_TestCase {
 
 
 	private function getControllerMock(){
-		return $this->getMock('OCP\AppFramework\Controller\Controller', array('method'),
+		return $this->getMock('OCP\AppFramework\Controller', array('method'),
 			array($this->getAPIMock(), new Request()));
 	}
 
diff --git a/tests/lib/appframework/middleware/MiddlewareTest.php b/tests/lib/appframework/middleware/MiddlewareTest.php
index fde67fbd39..7a93c0d4dd 100644
--- a/tests/lib/appframework/middleware/MiddlewareTest.php
+++ b/tests/lib/appframework/middleware/MiddlewareTest.php
@@ -47,7 +47,7 @@ class MiddlewareTest extends \PHPUnit_Framework_TestCase {
 		$this->api = $this->getMock('OC\AppFramework\DependencyInjection\DIContainer',
 					array(), array('test'));
 
-		$this->controller = $this->getMock('OCP\AppFramework\Controller\Controller',
+		$this->controller = $this->getMock('OCP\AppFramework\Controller',
 				array(), array($this->api, new Request()));
 		$this->exception = new \Exception();
 		$this->response = $this->getMock('OCP\AppFramework\Http\Response');
diff --git a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
index b647c01826..4bfd725ffd 100644
--- a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
+++ b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
@@ -40,7 +40,7 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 
 	public function setUp() {
 		$api = $this->getMock('OC\AppFramework\DependencyInjection\DIContainer', array(), array('test'));
-		$this->controller = $this->getMock('OCP\AppFramework\Controller\Controller',
+		$this->controller = $this->getMock('OCP\AppFramework\Controller',
 				array(), array($api, new Request()));
 
 		$this->request = new Request();
@@ -302,7 +302,7 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 		$api->expects($this->once())->method('getServer')
 			->will($this->returnValue($serverMock));
 
-		$this->controller = $this->getMock('OCP\AppFramework\Controller\Controller',
+		$this->controller = $this->getMock('OCP\AppFramework\Controller',
 			array(), array($api, new Request()));
 
 		$this->request = new Request(