diff --git a/core/composer.json b/core/composer.json
index a6d52d1082..4132f717d2 100644
--- a/core/composer.json
+++ b/core/composer.json
@@ -192,7 +192,6 @@
     "autoload": {
         "psr-4": {
             "Drupal\\Core\\": "lib/Drupal/Core",
-            "Drupal\\Component\\": "lib/Drupal/Component",
             "Drupal\\Driver\\": "../drivers/lib/Drupal/Driver"
         },
         "classmap": [
diff --git a/core/lib/Drupal/Component/Annotation/composer.json b/core/lib/Drupal/Component/Annotation/composer.json
index 51e7d25b00..1995f5742b 100644
--- a/core/lib/Drupal/Component/Annotation/composer.json
+++ b/core/lib/Drupal/Component/Annotation/composer.json
@@ -14,7 +14,7 @@
   },
   "autoload": {
     "psr-4": {
-      "Drupal\\Component\\Annotation\\": ""
+      "Drupal\\Component\\Annotation\\": "/src"
     }
   }
 }
diff --git a/core/lib/Drupal/Component/Annotation/nbproject/private/phpcsmd.xml b/core/lib/Drupal/Component/Annotation/nbproject/private/phpcsmd.xml
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/core/lib/Drupal/Component/Annotation/AnnotationBase.php b/core/lib/Drupal/Component/Annotation/src/AnnotationBase.php
similarity index 100%
rename from core/lib/Drupal/Component/Annotation/AnnotationBase.php
rename to core/lib/Drupal/Component/Annotation/src/AnnotationBase.php
diff --git a/core/lib/Drupal/Component/Annotation/AnnotationInterface.php b/core/lib/Drupal/Component/Annotation/src/AnnotationInterface.php
similarity index 100%
rename from core/lib/Drupal/Component/Annotation/AnnotationInterface.php
rename to core/lib/Drupal/Component/Annotation/src/AnnotationInterface.php
diff --git a/core/lib/Drupal/Component/Annotation/Plugin.php b/core/lib/Drupal/Component/Annotation/src/Plugin.php
similarity index 100%
rename from core/lib/Drupal/Component/Annotation/Plugin.php
rename to core/lib/Drupal/Component/Annotation/src/Plugin.php
diff --git a/core/lib/Drupal/Component/Annotation/Plugin/Discovery/AnnotatedClassDiscovery.php b/core/lib/Drupal/Component/Annotation/src/Plugin/Discovery/AnnotatedClassDiscovery.php
similarity index 100%
rename from core/lib/Drupal/Component/Annotation/Plugin/Discovery/AnnotatedClassDiscovery.php
rename to core/lib/Drupal/Component/Annotation/src/Plugin/Discovery/AnnotatedClassDiscovery.php
diff --git a/core/lib/Drupal/Component/Annotation/Plugin/Discovery/AnnotationBridgeDecorator.php b/core/lib/Drupal/Component/Annotation/src/Plugin/Discovery/AnnotationBridgeDecorator.php
similarity index 100%
rename from core/lib/Drupal/Component/Annotation/Plugin/Discovery/AnnotationBridgeDecorator.php
rename to core/lib/Drupal/Component/Annotation/src/Plugin/Discovery/AnnotationBridgeDecorator.php
diff --git a/core/lib/Drupal/Component/Annotation/PluginID.php b/core/lib/Drupal/Component/Annotation/src/PluginID.php
similarity index 100%
rename from core/lib/Drupal/Component/Annotation/PluginID.php
rename to core/lib/Drupal/Component/Annotation/src/PluginID.php
diff --git a/core/lib/Drupal/Component/Annotation/Reflection/MockFileFinder.php b/core/lib/Drupal/Component/Annotation/src/Reflection/MockFileFinder.php
similarity index 100%
rename from core/lib/Drupal/Component/Annotation/Reflection/MockFileFinder.php
rename to core/lib/Drupal/Component/Annotation/src/Reflection/MockFileFinder.php