diff --git a/core/lib/Drupal/Component/Plugin/Discovery/AnnotatedClassDiscovery.php b/core/lib/Drupal/Component/Annotation/Plugin/Discovery/AnnotatedClassDiscovery.php
similarity index 95%
rename from core/lib/Drupal/Component/Plugin/Discovery/AnnotatedClassDiscovery.php
rename to core/lib/Drupal/Component/Annotation/Plugin/Discovery/AnnotatedClassDiscovery.php
index 13f853d..04b8215 100644
--- a/core/lib/Drupal/Component/Plugin/Discovery/AnnotatedClassDiscovery.php
+++ b/core/lib/Drupal/Component/Annotation/Plugin/Discovery/AnnotatedClassDiscovery.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Contains Drupal\Component\Plugin\Discovery\AnnotatedClassDiscovery.
+ * Contains Drupal\Component\Annotation\Plugin\Discovery\AnnotatedClassDiscovery.
  */
 
-namespace Drupal\Component\Plugin\Discovery;
+namespace Drupal\Component\Annotation\Plugin\Discovery;
 
 use DirectoryIterator;
 use Drupal\Component\Plugin\Discovery\DiscoveryInterface;
-use Drupal\Component\Reflection\MockFileFinder;
+use Drupal\Component\Annotation\Reflection\MockFileFinder;
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Annotations\AnnotationRegistry;
 use Doctrine\Common\Reflection\StaticReflectionParser;
diff --git a/core/lib/Drupal/Component/Reflection/MockFileFinder.php b/core/lib/Drupal/Component/Annotation/Reflection/MockFileFinder.php
similarity index 89%
rename from core/lib/Drupal/Component/Reflection/MockFileFinder.php
rename to core/lib/Drupal/Component/Annotation/Reflection/MockFileFinder.php
index 34c6949..920db94 100644
--- a/core/lib/Drupal/Component/Reflection/MockFileFinder.php
+++ b/core/lib/Drupal/Component/Annotation/Reflection/MockFileFinder.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\Component\Reflection\MockFileFinder.
+ * Contains Drupal\Component\Annotation\Reflection\MockFileFinder.
  */
 
-namespace Drupal\Component\Reflection;
+namespace Drupal\Component\Annotation\Reflection;
 
 use Doctrine\Common\Reflection\ClassFinderInterface;
 
diff --git a/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php b/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php
index 63c87ab..538b511 100644
--- a/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php
+++ b/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Plugin\Discovery\AnnotatedClassDiscovery.
+ * Contains Drupal\Core\Plugin\Discovery\AnnotatedClassDiscovery.
  */
 
 namespace Drupal\Core\Plugin\Discovery;
 
-use Drupal\Component\Plugin\Discovery\AnnotatedClassDiscovery as ComponentAnnotatedClassDiscovery;
+use Drupal\Component\Annotation\Plugin\Discovery\AnnotatedClassDiscovery as ComponentAnnotatedClassDiscovery;
 
 /**
  * Defines a discovery mechanism to find annotated plugins in PSR-0 namespaces.