diff --git a/composer.json b/composer.json
index d7fc7bbd9b..7746f46d45 100644
--- a/composer.json
+++ b/composer.json
@@ -45,21 +45,12 @@
     },
     "autoload": {
         "psr-4" : {
-            "Sabre\\DAV\\"     : "lib/DAV/",
-            "Sabre\\DAVACL\\"  : "lib/DAVACL/",
-            "Sabre\\CalDAV\\"  : "lib/CalDAV/",
-            "Sabre\\CardDAV\\" : "lib/CardDAV/"
+            "Sabre\\" : "lib/"
         }
     },
     "autoload-dev" : {
         "psr-4" : {
-            "Sabre\\" : "tests/Sabre/",
-            "Sabre\\CalDAV\\" : "tests/Sabre/CalDAV",
-            "Sabre\\CardDAV\\" : "tests/Sabre/CardDAV",
-            "Sabre\\DAV\\" : "tests/Sabre/DAV",
-            "Sabre\\DAV\\Property\\" : "tests/Sabre/DAV/Xml/Property",
-            "Sabre\\DAVACL\\" : "tests/Sabre/DAVACL",
-            "Sabre\\HTTP\\" : "tests/Sabre/HTTP"
+            "Sabre\\" : "tests/Sabre/"
         }
     },
     "support" : {
diff --git a/tests/Sabre/DAV/Xml/Property/SupportedReportSetTest.php b/tests/Sabre/DAV/Xml/Property/SupportedReportSetTest.php
index 18124f3c07..6fd03e95f6 100644
--- a/tests/Sabre/DAV/Xml/Property/SupportedReportSetTest.php
+++ b/tests/Sabre/DAV/Xml/Property/SupportedReportSetTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sabre\DAV\Property;
+namespace Sabre\DAV\Xml\Property;
 
 use Sabre\DAV;
 use Sabre\HTTP;