diff --git a/composer.json b/composer.json
index 21575b5fa60cc5a667e0e2eecd2534ff852dd394..0f0d0bd31046fe53ecbc7a61220cc332eecf8309 100644
--- a/composer.json
+++ b/composer.json
@@ -5,6 +5,8 @@
     "autoload" : {
         "psr-4": {
             "OC\\": "lib/private",
+            "OC\\Core\\": "core/",
+            "OC\\Settings\\": "settings/",
             "OCP\\": "lib/public"
         }
     },
diff --git a/core/application.php b/core/Application.php
similarity index 100%
rename from core/application.php
rename to core/Application.php
diff --git a/lib/composer/composer/LICENSE b/lib/composer/composer/LICENSE
index c8d57af8b2788b6908cbfabc50c35970f40d7cc6..1a28124886db89f1ca3e4fa674cb69a9a17585b3 100644
--- a/lib/composer/composer/LICENSE
+++ b/lib/composer/composer/LICENSE
@@ -1,5 +1,5 @@
 
-Copyright (c) 2015 Nils Adermann, Jordi Boggiano
+Copyright (c) 2016 Nils Adermann, Jordi Boggiano
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/composer/composer/autoload_psr4.php b/lib/composer/composer/autoload_psr4.php
index 4610a912c6d64f0498e41131b9dea59b6410fb11..2561f0048c5021ef06cf96456fd99cda175e05b4 100644
--- a/lib/composer/composer/autoload_psr4.php
+++ b/lib/composer/composer/autoload_psr4.php
@@ -6,6 +6,8 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname(dirname($vendorDir));
 
 return array(
+    'OC\\Settings\\' => array($baseDir . '/settings'),
+    'OC\\Core\\' => array($baseDir . '/core'),
     'OC\\' => array($baseDir . '/lib/private'),
     'OCP\\' => array($baseDir . '/lib/public'),
 );
diff --git a/settings/application.php b/settings/Application.php
similarity index 100%
rename from settings/application.php
rename to settings/Application.php