diff --git a/lib/base.php b/lib/base.php
index 8ea164a500..87e69842cb 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -488,6 +488,9 @@ class OC {
 
 		self::$CLI = (php_sapi_name() == 'cli');
 
+		// Add default composer PSR-4 autoloader
+		require_once OC::$SERVERROOT . '/lib/composer/autoload.php';
+
 		try {
 			self::initPaths();
 			// setup 3rdparty autoloader
@@ -507,9 +510,6 @@ class OC {
 			exit();
 		}
 
-		// Add default composer PSR-4 autoloader
-		require_once OC::$SERVERROOT . '/lib/composer/autoload.php';
-
 		// setup the basic server
 		self::$server = new \OC\Server(\OC::$WEBROOT, self::$config);
 		\OC::$server->getEventLogger()->log('autoloader', 'Autoloader', $loaderStart, $loaderEnd);
diff --git a/lib/private/appframework/app.php b/lib/private/AppFramework/App.php
similarity index 100%
rename from lib/private/appframework/app.php
rename to lib/private/AppFramework/App.php
diff --git a/lib/private/appframework/core/api.php b/lib/private/AppFramework/Core/API.php
similarity index 100%
rename from lib/private/appframework/core/api.php
rename to lib/private/AppFramework/Core/API.php
diff --git a/lib/private/appframework/db/db.php b/lib/private/AppFramework/Db/Db.php
similarity index 100%
rename from lib/private/appframework/db/db.php
rename to lib/private/AppFramework/Db/Db.php
diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php
similarity index 100%
rename from lib/private/appframework/dependencyinjection/dicontainer.php
rename to lib/private/AppFramework/DependencyInjection/DIContainer.php
diff --git a/lib/private/appframework/http.php b/lib/private/AppFramework/Http.php
similarity index 100%
rename from lib/private/appframework/http.php
rename to lib/private/AppFramework/Http.php
diff --git a/lib/private/appframework/http/dispatcher.php b/lib/private/AppFramework/Http/Dispatcher.php
similarity index 100%
rename from lib/private/appframework/http/dispatcher.php
rename to lib/private/AppFramework/Http/Dispatcher.php
diff --git a/lib/private/appframework/http/output.php b/lib/private/AppFramework/Http/Output.php
similarity index 100%
rename from lib/private/appframework/http/output.php
rename to lib/private/AppFramework/Http/Output.php
diff --git a/lib/private/appframework/http/request.php b/lib/private/AppFramework/Http/Request.php
similarity index 100%
rename from lib/private/appframework/http/request.php
rename to lib/private/AppFramework/Http/Request.php
diff --git a/lib/private/appframework/middleware/middlewaredispatcher.php b/lib/private/AppFramework/Middleware/MiddlewareDispatcher.php
similarity index 100%
rename from lib/private/appframework/middleware/middlewaredispatcher.php
rename to lib/private/AppFramework/Middleware/MiddlewareDispatcher.php
diff --git a/lib/private/appframework/middleware/security/corsmiddleware.php b/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php
similarity index 100%
rename from lib/private/appframework/middleware/security/corsmiddleware.php
rename to lib/private/AppFramework/Middleware/Security/CORSMiddleware.php
diff --git a/lib/private/appframework/middleware/security/exceptions/appnotenabledexception.php b/lib/private/AppFramework/Middleware/Security/Exceptions/AppNotEnabledException.php
similarity index 100%
rename from lib/private/appframework/middleware/security/exceptions/appnotenabledexception.php
rename to lib/private/AppFramework/Middleware/Security/Exceptions/AppNotEnabledException.php
diff --git a/lib/private/appframework/middleware/security/exceptions/crosssiterequestforgeryexception.php b/lib/private/AppFramework/Middleware/Security/Exceptions/CrossSiteRequestForgeryException.php
similarity index 100%
rename from lib/private/appframework/middleware/security/exceptions/crosssiterequestforgeryexception.php
rename to lib/private/AppFramework/Middleware/Security/Exceptions/CrossSiteRequestForgeryException.php
diff --git a/lib/private/appframework/middleware/security/exceptions/notadminexception.php b/lib/private/AppFramework/Middleware/Security/Exceptions/NotAdminException.php
similarity index 100%
rename from lib/private/appframework/middleware/security/exceptions/notadminexception.php
rename to lib/private/AppFramework/Middleware/Security/Exceptions/NotAdminException.php
diff --git a/lib/private/appframework/middleware/security/exceptions/notloggedinexception.php b/lib/private/AppFramework/Middleware/Security/Exceptions/NotLoggedInException.php
similarity index 100%
rename from lib/private/appframework/middleware/security/exceptions/notloggedinexception.php
rename to lib/private/AppFramework/Middleware/Security/Exceptions/NotLoggedInException.php
diff --git a/lib/private/appframework/middleware/security/exceptions/securityexception.php b/lib/private/AppFramework/Middleware/Security/Exceptions/SecurityException.php
similarity index 100%
rename from lib/private/appframework/middleware/security/exceptions/securityexception.php
rename to lib/private/AppFramework/Middleware/Security/Exceptions/SecurityException.php
diff --git a/lib/private/appframework/middleware/security/securitymiddleware.php b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php
similarity index 100%
rename from lib/private/appframework/middleware/security/securitymiddleware.php
rename to lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php
diff --git a/lib/private/appframework/middleware/sessionmiddleware.php b/lib/private/AppFramework/Middleware/SessionMiddleware.php
similarity index 100%
rename from lib/private/appframework/middleware/sessionmiddleware.php
rename to lib/private/AppFramework/Middleware/SessionMiddleware.php
diff --git a/lib/private/appframework/routing/routeactionhandler.php b/lib/private/AppFramework/Routing/RouteActionHandler.php
similarity index 97%
rename from lib/private/appframework/routing/routeactionhandler.php
rename to lib/private/AppFramework/Routing/RouteActionHandler.php
index b282fc1b45..e8a7b8a1c6 100644
--- a/lib/private/appframework/routing/routeactionhandler.php
+++ b/lib/private/AppFramework/Routing/RouteActionHandler.php
@@ -21,7 +21,7 @@
  *
  */
 
-namespace OC\AppFramework\routing;
+namespace OC\AppFramework\Routing;
 
 use \OC\AppFramework\App;
 use \OC\AppFramework\DependencyInjection\DIContainer;
diff --git a/lib/private/appframework/routing/routeconfig.php b/lib/private/AppFramework/Routing/RouteConfig.php
similarity index 99%
rename from lib/private/appframework/routing/routeconfig.php
rename to lib/private/AppFramework/Routing/RouteConfig.php
index dd029ba9a0..f2ec5c0c88 100644
--- a/lib/private/appframework/routing/routeconfig.php
+++ b/lib/private/AppFramework/Routing/RouteConfig.php
@@ -24,7 +24,7 @@
  *
  */
 
-namespace OC\AppFramework\routing;
+namespace OC\AppFramework\Routing;
 
 use OC\AppFramework\DependencyInjection\DIContainer;
 use OCP\Route\IRouter;
diff --git a/lib/private/appframework/utility/controllermethodreflector.php b/lib/private/AppFramework/Utility/ControllerMethodReflector.php
similarity index 100%
rename from lib/private/appframework/utility/controllermethodreflector.php
rename to lib/private/AppFramework/Utility/ControllerMethodReflector.php
diff --git a/lib/private/appframework/utility/simplecontainer.php b/lib/private/AppFramework/Utility/SimpleContainer.php
similarity index 100%
rename from lib/private/appframework/utility/simplecontainer.php
rename to lib/private/AppFramework/Utility/SimpleContainer.php
diff --git a/lib/private/appframework/utility/timefactory.php b/lib/private/AppFramework/Utility/TimeFactory.php
similarity index 100%
rename from lib/private/appframework/utility/timefactory.php
rename to lib/private/AppFramework/Utility/TimeFactory.php