diff --git a/core/authorize.php b/core/authorize.php
index 8a76fe4..3507f7f 100644
--- a/core/authorize.php
+++ b/core/authorize.php
@@ -23,7 +23,7 @@
 // Change the directory to the Drupal root.
 chdir('..');
 
-require_once __DIR__ . '/vendor/autoload.php';
+require_once __DIR__ . '/autoload.php';
 
 /**
  * Global flag to identify update.php and authorize.php runs.
diff --git a/core/autoload.php b/core/autoload.php
new file mode 100644
index 0000000..79b7fd3
--- /dev/null
+++ b/core/autoload.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @file
+ * Drupal-specific autoload.php to be used instead of the one generated by
+ * Composer.
+ * Having a Drupal-specific autoload.php makes it easier to use a ClassLoader
+ * implementation different from the one provided by Composer.
+ */
+
+use Drupal\Core\Autoload\DrupalAutoloaderInit;
+
+require_once __DIR__ . '/lib/Drupal/Core/Autoload/DrupalAutoloaderInit.php';
+
+return DrupalAutoloaderInit::getLoader();
diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index e8350cf..5728a3c 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -2719,7 +2719,7 @@ function arg($index = NULL, $path = NULL) {
  *   loader class when calling drupal_classloader() from settings.php. It is
  *   ignored otherwise.
  *
- * @return \Composer\Autoload\ClassLoader
+ * @return \Drupal\Core\Autoload\ClassLoader
  *   A ClassLoader class instance (or extension thereof).
  */
 function drupal_classloader($class_loader = NULL) {
@@ -2731,7 +2731,7 @@ function drupal_classloader($class_loader = NULL) {
   if (!isset($loader)) {
 
     // Retrieve the Composer ClassLoader for loading classes.
-    $loader = include __DIR__ . '/../vendor/autoload.php';
+    $loader = include __DIR__ . '/../autoload.php';
 
     // Register the class loader.
     // When configured to use APC, the ApcClassLoader is registered instead.
@@ -2761,7 +2761,10 @@ function drupal_classloader($class_loader = NULL) {
  */
 function drupal_classloader_register($name, $path) {
   $loader = drupal_classloader();
-  $loader->add('Drupal\\' . $name, DRUPAL_ROOT . '/' . $path . '/lib');
+  $loader->addPsr4('Drupal\\' . $name . '\\', array(
+    DRUPAL_ROOT . '/' . $path . '/lib/Drupal/' . $name,
+    DRUPAL_ROOT . '/' . $path . '/lib',
+  ));
 }
 
 /**
diff --git a/core/install.php b/core/install.php
index 7152fd8..e2900a2 100644
--- a/core/install.php
+++ b/core/install.php
@@ -8,7 +8,7 @@
 // Change the directory to the Drupal root.
 chdir('..');
 
-require_once __DIR__ . '/vendor/autoload.php';
+require_once __DIR__ . '/autoload.php';
 
 /**
  * Global flag to indicate the site is in installation mode.
diff --git a/core/lib/Drupal/Component/Plugin/Discovery/AnnotatedClassDiscovery.php b/core/lib/Drupal/Component/Plugin/Discovery/AnnotatedClassDiscovery.php
index 6110bd1..5264f5e 100644
--- a/core/lib/Drupal/Component/Plugin/Discovery/AnnotatedClassDiscovery.php
+++ b/core/lib/Drupal/Component/Plugin/Discovery/AnnotatedClassDiscovery.php
@@ -52,7 +52,7 @@ function __construct($plugin_namespaces = array(), $plugin_definition_annotation
   }
 
   /**
-   * Implements Drupal\Component\Plugin\Discovery\DiscoveryInterface::getDefinition().
+   * {@inheritdoc}
    */
   public function getDefinition($plugin_id) {
     $plugins = $this->getDefinitions();
@@ -60,7 +60,7 @@ public function getDefinition($plugin_id) {
   }
 
   /**
-   * Implements Drupal\Component\Plugin\Discovery\DiscoveryInterface::getDefinitions().
+   * {@inheritdoc}
    */
   public function getDefinitions() {
     $definitions = array();
@@ -77,7 +77,6 @@ public function getDefinitions() {
     // Search for classes within all PSR-0 namespace locations.
     foreach ($this->getPluginNamespaces() as $namespace => $dirs) {
       foreach ($dirs as $dir) {
-        $dir .= DIRECTORY_SEPARATOR . str_replace('\\', DIRECTORY_SEPARATOR, $namespace);
         if (file_exists($dir)) {
           foreach (new DirectoryIterator($dir) as $fileinfo) {
             // @todo Once core requires 5.3.6, use $fileinfo->getExtension().
diff --git a/core/lib/Drupal/Core/Autoload/ClassLoader.php b/core/lib/Drupal/Core/Autoload/ClassLoader.php
new file mode 100644
index 0000000..ef78b58
--- /dev/null
+++ b/core/lib/Drupal/Core/Autoload/ClassLoader.php
@@ -0,0 +1,377 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\Core\Autoload\ClassLoader.
+ */
+
+namespace Drupal\Core\Autoload;
+
+/**
+ * ClassLoader implements a PSR-0 class loader
+ *
+ * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
+ *
+ *     $loader = new \Composer\Autoload\ClassLoader();
+ *
+ *     // register classes with namespaces
+ *     $loader->add('Symfony\Component', __DIR__.'/component');
+ *     $loader->add('Symfony',           __DIR__.'/framework');
+ *
+ *     // activate the autoloader
+ *     $loader->register();
+ *
+ *     // to enable searching the include path (eg. for PEAR packages)
+ *     $loader->setUseIncludePath(true);
+ *
+ * In this example, if you try to use a class in the Symfony\Component
+ * namespace or one of its children (Symfony\Component\Console for instance),
+ * the autoloader will first look for the class under the component/
+ * directory, and it will then fallback to the framework/ directory if not
+ * found before giving up.
+ *
+ * This class is loosely based on the Symfony UniversalClassLoader.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ */
+class ClassLoader {
+
+  // PSR-4
+  private $prefixLengthsPsr4 = array();
+  private $prefixDirsPsr4 = array();
+  private $fallbackDirsPsr4 = array();
+
+  // PSR-0
+  private $prefixesPsr0 = array();
+  private $fallbackDirsPsr0 = array();
+
+  private $useIncludePath = false;
+  private $classMap = array();
+
+  const PREDICTOR_INDEX = 9;
+
+  public function getPrefixes() {
+    return call_user_func_array('array_merge', $this->prefixesPsr0);
+  }
+
+  public function getPrefixesPsr4() {
+    return $this->prefixDirsPsr4;
+  }
+
+  public function getFallbackDirs() {
+    return $this->fallbackDirsPsr0;
+  }
+
+  public function getFallbackDirsPsr4() {
+    return $this->fallbackDirsPsr4;
+  }
+
+  public function getClassMap() {
+    return $this->classMap;
+  }
+
+  /**
+   * @param array $classMap Class to filename map
+   */
+  public function addClassMap(array $classMap) {
+    if ($this->classMap) {
+      $this->classMap = array_merge($this->classMap, $classMap);
+    }
+    else {
+      $this->classMap = $classMap;
+    }
+  }
+
+  /**
+   * Registers a set of PSR-0 directories for a given prefix, either
+   * appending or prepending to the ones previously set for this prefix.
+   *
+   * @param string       $prefix  The prefix
+   * @param array|string $paths   The PSR-0 root directories
+   * @param bool         $prepend Whether to prepend the directories
+   */
+  public function add($prefix, $paths, $prepend = false) {
+    if (!$prefix) {
+      if ($prepend) {
+        $this->fallbackDirsPsr0 = array_merge(
+          (array) $paths,
+          $this->fallbackDirsPsr0
+        );
+      }
+      else {
+        $this->fallbackDirsPsr0 = array_merge(
+          $this->fallbackDirsPsr0,
+          (array) $paths
+        );
+      }
+
+      return;
+    }
+
+    $first = $prefix[0];
+    if (!isset($this->prefixesPsr0[$first][$prefix])) {
+      $this->prefixesPsr0[$first][$prefix] = (array) $paths;
+
+      return;
+    }
+    if ($prepend) {
+      $this->prefixesPsr0[$first][$prefix] = array_merge(
+        (array) $paths,
+        $this->prefixesPsr0[$first][$prefix]
+      );
+    }
+    else {
+      $this->prefixesPsr0[$first][$prefix] = array_merge(
+        $this->prefixesPsr0[$first][$prefix],
+        (array) $paths
+      );
+    }
+  }
+
+  /**
+   * Registers a set of PSR-4 directories for a given namespace, either
+   * appending or prepending to the ones previously set for this namespace.
+   *
+   * @param string $prefix  The prefix/namespace, with trailing '\\'
+   * @param array|string $paths   The PSR-0 base directories
+   * @param bool $prepend Whether to prepend the directories
+   * @throws \Exception
+   */
+  public function addPsr4($prefix, $paths, $prepend = false) {
+    if (!$prefix) {
+      // Register directories for the root namespace.
+      if ($prepend) {
+        $this->fallbackDirsPsr4 = array_merge(
+          (array) $paths,
+          $this->fallbackDirsPsr4
+        );
+      }
+      else {
+        $this->fallbackDirsPsr4 = array_merge(
+          $this->fallbackDirsPsr4,
+          (array) $paths
+        );
+      }
+    }
+    elseif (!isset($this->prefixDirsPsr4[$prefix])) {
+      // Register directories for a new namespace.
+      $length = strlen($prefix);
+      if ('\\' !== $prefix[$length - 1]) {
+        throw new \Exception("A non-empty PSR-4 prefix must end with a namespace separator.");
+      }
+      if ($length > self::PREDICTOR_INDEX) {
+        $predictor = $prefix[0] . $prefix[self::PREDICTOR_INDEX];
+        $this->prefixLengthsPsr4[$predictor][$prefix] = $length;
+      }
+      else {
+        $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+      }
+      $this->prefixDirsPsr4[$prefix] = (array) $paths;
+    }
+    elseif ($prepend) {
+      // Prepend directories for an already registered namespace.
+      $this->prefixDirsPsr4[$prefix] = array_merge(
+        (array) $paths,
+        $this->prefixDirsPsr4[$prefix]
+      );
+    }
+    else {
+      // Append directories for an already registered namespace.
+      $this->prefixDirsPsr4[$prefix] = array_merge(
+        $this->prefixDirsPsr4[$prefix],
+        (array) $paths
+      );
+    }
+  }
+
+  /**
+   * Registers a set of PSR-0 directories for a given prefix,
+   * replacing any others previously set for this prefix.
+   *
+   * @param string       $prefix The prefix
+   * @param array|string $paths  The PSR-0 base directories
+   */
+  public function set($prefix, $paths) {
+    if (!$prefix) {
+      $this->fallbackDirsPsr0 = (array) $paths;
+    }
+    else {
+      $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
+    }
+  }
+
+  /**
+   * Registers a set of PSR-4 directories for a given namespace,
+   * replacing any others previously set for this namespace.
+   *
+   * @param string $prefix  The prefix/namespace, with trailing '\\'
+   * @param array|string $paths   The PSR-4 base directories
+   * @throws \Exception
+   */
+  public function setPsr4($prefix, $paths) {
+    if (!$prefix) {
+      $this->fallbackDirsPsr4 = (array) $paths;
+    }
+    else {
+      $length = strlen($prefix);
+      if ('\\' !== $prefix[$length - 1]) {
+        throw new \Exception("A non-empty PSR-4 prefix must end with a namespace separator.");
+      }
+      if ($length > self::PREDICTOR_INDEX) {
+        $predictor = $prefix[0] . $prefix[self::PREDICTOR_INDEX];
+        $this->prefixLengthsPsr4[$predictor][$prefix] = $length;
+      }
+      else {
+        $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+      }
+      $this->prefixDirsPsr4[$prefix] = (array) $paths;
+    }
+  }
+
+  /**
+   * Turns on searching the include path for class files.
+   *
+   * @param bool $useIncludePath
+   */
+  public function setUseIncludePath($useIncludePath) {
+    $this->useIncludePath = $useIncludePath;
+  }
+
+  /**
+   * Can be used to check if the autoloader uses the include path to check
+   * for classes.
+   *
+   * @return bool
+   */
+  public function getUseIncludePath() {
+    return $this->useIncludePath;
+  }
+
+  /**
+   * Registers this instance as an autoloader.
+   *
+   * @param bool $prepend Whether to prepend the autoloader or not
+   */
+  public function register($prepend = false) {
+    spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+  }
+
+  /**
+   * Unregisters this instance as an autoloader.
+   */
+  public function unregister() {
+    spl_autoload_unregister(array($this, 'loadClass'));
+  }
+
+  /**
+   * Loads the given class or interface.
+   *
+   * @param  string    $class The name of the class
+   * @return bool|null True if loaded, null otherwise
+   */
+  public function loadClass($class) {
+    if ($file = $this->findFile($class)) {
+      include $file;
+
+      return true;
+    }
+  }
+
+  /**
+   * Finds the path to the file where the class is defined.
+   *
+   * @param string $class The name of the class
+   *
+   * @return string|false The path if found, false otherwise
+   */
+  public function findFile($class) {
+    // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
+    if ('\\' == $class[0]) {
+      $class = substr($class, 1);
+    }
+
+    // class map lookup
+    if (isset($this->classMap[$class])) {
+      return $this->classMap[$class];
+    }
+
+    // PSR-4 lookup
+    $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . '.php';
+
+    $first = $class[0];
+    if (isset($class[self::PREDICTOR_INDEX])) {
+      $predictor = $first . $class[self::PREDICTOR_INDEX];
+      if (isset($this->prefixLengthsPsr4[$predictor])) {
+        foreach ($this->prefixLengthsPsr4[$predictor] as $prefix => $length) {
+          if (0 === strpos($class, $prefix)) {
+            foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
+              if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+                return $file;
+              }
+            }
+          }
+        }
+      }
+    }
+
+    if (isset($this->prefixLengthsPsr4[$first])) {
+      foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
+        if (0 === strpos($class, $prefix)) {
+          foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+              return $file;
+            }
+          }
+        }
+      }
+    }
+
+    // PSR-4 fallback dirs
+    foreach ($this->fallbackDirsPsr4 as $dir) {
+      if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+        return $file;
+      }
+    }
+
+    // PSR-0 lookup
+    if (false !== $pos = strrpos($class, '\\')) {
+      // namespaced class name
+      $logicalPathPsr0
+        = substr($logicalPathPsr4, 0, $pos + 1)
+        . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR)
+      ;
+    }
+    else {
+      // PEAR-like class name
+      $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . '.php';
+    }
+
+    if (isset($this->prefixesPsr0[$first])) {
+      foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
+        if (0 === strpos($class, $prefix)) {
+          foreach ($dirs as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+              return $file;
+            }
+          }
+        }
+      }
+    }
+
+    // PSR-0 fallback dirs
+    foreach ($this->fallbackDirsPsr0 as $dir) {
+      if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+        return $file;
+      }
+    }
+
+    // PSR-0 include paths.
+    if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
+      return $file;
+    }
+
+    // Remember that this class does not exist.
+    return $this->classMap[$class] = false;
+  }
+}
diff --git a/core/lib/Drupal/Core/Autoload/DrupalAutoloaderInit.php b/core/lib/Drupal/Core/Autoload/DrupalAutoloaderInit.php
new file mode 100644
index 0000000..87f6478
--- /dev/null
+++ b/core/lib/Drupal/Core/Autoload/DrupalAutoloaderInit.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\Core\Autoload\DrupalAutoloaderInit.
+ */
+
+namespace Drupal\Core\Autoload;
+
+class DrupalAutoloaderInit
+{
+  private static $loader;
+
+  public static function loadClassLoader($class) {
+    if ('Drupal\Core\Autoload\ClassLoader' === $class) {
+      require __DIR__ . '/ClassLoader.php';
+    }
+  }
+
+  public static function getLoader() {
+    if (null !== self::$loader) {
+      return self::$loader;
+    }
+
+    spl_autoload_register(array('Drupal\Core\Autoload\DrupalAutoloaderInit', 'loadClassLoader'), true, true);
+    self::$loader = $loader = new ClassLoader();
+    spl_autoload_unregister(array('Drupal\Core\Autoload\DrupalAutoloaderInit', 'loadClassLoader'));
+
+    $coreDir = dirname(dirname(dirname(dirname(__DIR__))));
+    $vendorDir = $coreDir . '/vendor';
+    $composerDir = $vendorDir . '/composer';
+    $baseDir = dirname($coreDir);
+
+    $includePaths = require $composerDir . '/include_paths.php';
+    array_push($includePaths, get_include_path());
+    set_include_path(join(PATH_SEPARATOR, $includePaths));
+
+    $map = require $composerDir . '/autoload_namespaces.php';
+    // Register core namespaces as PSR-4 instead of PSR-0,
+    // to let the autoloader handle them with priority.
+    // @todo Do this via composer.json, once Composer supports PSR-4.
+    unset($map['Drupal\Core']);
+    unset($map['Drupal\Component']);
+    unset($map['Drupal\Driver']);
+    $loader->setPsr4('Drupal\Core\\', $baseDir . '/core/lib/Drupal/Core');
+    $loader->setPsr4('Drupal\Component\\', $baseDir . '/core/lib/Drupal/Component');
+    $loader->setPsr4('Drupal\Driver\\', $baseDir . '/core/lib/Drupal/Driver');
+    foreach ($map as $namespace => $path) {
+      $loader->set($namespace, $path);
+    }
+
+    $classMap = require $composerDir . '/autoload_classmap.php';
+    if ($classMap) {
+      $loader->addClassMap($classMap);
+    }
+
+    $loader->register(true);
+
+    // @todo This can be updated once Composer provides a autoload_files.php.
+    require $vendorDir . '/kriswallsmith/assetic/src/functions.php';
+    require $baseDir . '/core/lib/Drupal.php';
+
+    return $loader;
+  }
+}
diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
index 1bf9c05..23ea4db 100644
--- a/core/lib/Drupal/Core/DrupalKernel.php
+++ b/core/lib/Drupal/Core/DrupalKernel.php
@@ -19,7 +19,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\TerminableInterface;
-use Composer\Autoload\ClassLoader;
+use Drupal\Core\Autoload\ClassLoader;
 
 /**
  * The DrupalKernel class is the core of Drupal itself.
@@ -97,7 +97,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
   /**
    * The classloader object.
    *
-   * @var \Composer\Autoload\ClassLoader
+   * @var \Drupal\Core\Autoload\ClassLoader
    */
   protected $classLoader;
 
@@ -150,7 +150,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
    *   String indicating the environment, e.g. 'prod' or 'dev'. Used by
    *   Symfony\Component\HttpKernel\Kernel::__construct(). Drupal does not use
    *   this value currently. Pass 'prod'.
-   * @param \Composer\Autoload\ClassLoader $class_loader
+   * @param \Drupal\Core\Autoload\ClassLoader $class_loader
    *   (optional) The classloader is only used if $storage is not given or
    *   the load from storage fails and a container rebuild is required. In
    *   this case, the loaded modules will be registered with this loader in
@@ -218,7 +218,7 @@ public function discoverServiceProviders() {
       $this->moduleList = isset($module_list['enabled']) ? $module_list['enabled'] : array();
     }
     $module_filenames = $this->getModuleFileNames();
-    $this->registerNamespaces($this->getModuleNamespaces($module_filenames));
+    $this->registerNamespacesPsr4($this->getModuleNamespacesPsr4($module_filenames));
 
     // Load each module's serviceProvider class.
     foreach ($this->moduleList as $module => $weight) {
@@ -402,8 +402,8 @@ protected function initializeContainer() {
       // All namespaces must be registered before we attempt to use any service
       // from the container.
       $container_modules = $this->container->getParameter('container.modules');
-      $namespaces_before = $this->classLoader->getPrefixes();
-      $this->registerNamespaces($this->getModuleNamespaces($container_modules));
+      $namespaces_before = $this->classLoader->getPrefixesPsr4();
+      $this->registerNamespacesPsr4($this->getModuleNamespacesPsr4($container_modules));
 
       // If 'container.modules' is wrong, the container must be rebuilt.
       if (!isset($this->moduleList)) {
@@ -416,9 +416,9 @@ protected function initializeContainer() {
         // registerNamespaces() performs a merge rather than replace, so to
         // effectively remove erroneous registrations, we must replace them with
         // empty arrays.
-        $namespaces_after = $this->classLoader->getPrefixes();
+        $namespaces_after = $this->classLoader->getPrefixesPsr4();
         $namespaces_before += array_fill_keys(array_diff(array_keys($namespaces_after), array_keys($namespaces_before)), array());
-        $this->registerNamespaces($namespaces_before);
+        $this->registerNamespacesPsr4($namespaces_before);
       }
     }
 
@@ -492,14 +492,15 @@ protected function buildContainer() {
     $container->setParameter('container.modules', $this->getModuleFileNames());
 
     // Get a list of namespaces and put it onto the container.
-    $namespaces = $this->getModuleNamespaces($this->getModuleFileNames());
+    $namespaces = $this->getModuleNamespacesPsr4($this->getModuleFileNames());
     // Add all components in \Drupal\Core and \Drupal\Component that have a
     // Plugin directory.
     foreach (array('Core', 'Component') as $parent_directory) {
       $path = DRUPAL_ROOT . '/core/lib/Drupal/' . $parent_directory;
+      $parent_namespace = 'Drupal\\' . $parent_directory;
       foreach (new \DirectoryIterator($path) as $component) {
         if (!$component->isDot() && is_dir($component->getPathname() . '/Plugin')) {
-          $namespaces['Drupal\\' . $parent_directory  .'\\' . $component->getFilename()] = DRUPAL_ROOT . '/core/lib';
+          $namespaces[$parent_namespace . '\\' . $component->getFilename()] = $path . '/' . $component->getFilename();
         }
       }
     }
@@ -632,7 +633,28 @@ protected function getModuleFileNames() {
   }
 
   /**
-   * Gets the namespaces of each enabled module.
+   * Gets the namespaces of each enabled module,
+   * each with their PSR-4 directories.
+   *
+   * @param array $moduleFileNames
+   * @return array
+   */
+  protected function getModuleNamespacesPsr4($moduleFileNames) {
+    $namespaces = array();
+    foreach ($moduleFileNames as $module => $filename) {
+      // @todo Remove lib/Drupal/$module, once the switch to PSR-4 is complete.
+      $namespaces["Drupal\\$module"][] = DRUPAL_ROOT . '/' . dirname($filename) . '/lib/Drupal/' . $module;
+      $namespaces["Drupal\\$module"][] = DRUPAL_ROOT . '/' . dirname($filename) . '/lib';
+    }
+    return $namespaces;
+  }
+
+  /**
+   * Gets the namespaces of each enabled module,
+   * each with its PSR-0 directory.
+   *
+   * @param array $moduleFileNames
+   * @return array
    */
   protected function getModuleNamespaces($moduleFileNames) {
     $namespaces = array();
@@ -643,7 +665,20 @@ protected function getModuleNamespaces($moduleFileNames) {
   }
 
   /**
-   * Registers a list of namespaces.
+   * Registers a list of namespaces with PSR-4 directories.
+   *
+   * @param array $namespaces
+   */
+  protected function registerNamespacesPsr4(array $namespaces = array()) {
+    foreach ($namespaces as $prefix => $paths) {
+      $this->classLoader->addPsr4($prefix . '\\', $paths);
+    }
+  }
+
+  /**
+   * Registers a list of namespaces with PSR-0 directories.
+   *
+   * @param array $namespaces
    */
   protected function registerNamespaces(array $namespaces = array()) {
     foreach ($namespaces as $prefix => $path) {
diff --git a/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php b/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php
index e033caf..ae208af 100644
--- a/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php
+++ b/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php
@@ -15,17 +15,23 @@
 class AnnotatedClassDiscovery extends ComponentAnnotatedClassDiscovery {
 
   /**
-   * The subdirectory within a namespace to look for plugins.
+   * A suffix to append to each PSR-4 directory associated with a base
+   * namespace, to form the directories where plugins are found.
    *
-   * If the plugins are in the top level of the namespace and not within a
-   * subdirectory, set this to an empty string.
+   * @var string
+   */
+  protected $directorySuffix = '';
+
+  /**
+   * A suffix to append to each base namespace, to obtain the namespaces where
+   * plugins are found.
    *
    * @var string
    */
-  protected $subdir = '';
+  protected $namespaceSuffix = '';
 
   /**
-   * An object containing the namespaces to look for plugin implementations.
+   * A list of base namespaces with their PSR-4 directories.
    *
    * @var \Traversable
    */
@@ -47,7 +53,11 @@ class AnnotatedClassDiscovery extends ComponentAnnotatedClassDiscovery {
    */
   function __construct($subdir, \Traversable $root_namespaces, $plugin_definition_annotation_name = 'Drupal\Component\Annotation\Plugin') {
     if ($subdir) {
-      $this->subdir = str_replace('/', '\\', $subdir);
+      if ('/' !== $subdir[0]) {
+        $subdir = '/' . $subdir;
+      }
+      $this->directorySuffix = $subdir;
+      $this->namespaceSuffix = str_replace('/', '\\', $subdir);
     }
     $this->rootNamespacesIterator = $root_namespaces;
     $plugin_namespaces = array();
@@ -92,11 +102,18 @@ protected function getProviderFromNamespace($namespace) {
    */
   protected function getPluginNamespaces() {
     $plugin_namespaces = array();
-    foreach ($this->rootNamespacesIterator as $namespace => $dir) {
-      if ($this->subdir) {
-        $namespace .= "\\{$this->subdir}";
+    if ($this->namespaceSuffix) {
+      foreach ($this->rootNamespacesIterator as $namespace => $dirs) {
+        $namespace .= $this->namespaceSuffix;
+        foreach ((array) $dirs as $dir) {
+          $plugin_namespaces[$namespace][] = $dir . $this->directorySuffix;
+        }
+      }
+    }
+    else {
+      foreach ($this->rootNamespacesIterator as $namespace => $dirs) {
+        $plugin_namespaces[$namespace] = (array) $dirs;
       }
-      $plugin_namespaces[$namespace] = array($dir);
     }
 
     return $plugin_namespaces;
diff --git a/core/modules/action/lib/Drupal/action/ActionAccessController.php b/core/modules/action/lib/ActionAccessController.php
similarity index 100%
rename from core/modules/action/lib/Drupal/action/ActionAccessController.php
rename to core/modules/action/lib/ActionAccessController.php
diff --git a/core/modules/action/lib/Drupal/action/ActionAddFormController.php b/core/modules/action/lib/ActionAddFormController.php
similarity index 100%
rename from core/modules/action/lib/Drupal/action/ActionAddFormController.php
rename to core/modules/action/lib/ActionAddFormController.php
diff --git a/core/modules/action/lib/Drupal/action/ActionEditFormController.php b/core/modules/action/lib/ActionEditFormController.php
similarity index 100%
rename from core/modules/action/lib/Drupal/action/ActionEditFormController.php
rename to core/modules/action/lib/ActionEditFormController.php
diff --git a/core/modules/action/lib/Drupal/action/ActionFormControllerBase.php b/core/modules/action/lib/ActionFormControllerBase.php
similarity index 100%
rename from core/modules/action/lib/Drupal/action/ActionFormControllerBase.php
rename to core/modules/action/lib/ActionFormControllerBase.php
diff --git a/core/modules/action/lib/Drupal/action/ActionListController.php b/core/modules/action/lib/ActionListController.php
similarity index 100%
rename from core/modules/action/lib/Drupal/action/ActionListController.php
rename to core/modules/action/lib/ActionListController.php
diff --git a/core/modules/action/lib/Drupal/action/Form/ActionAdminManageForm.php b/core/modules/action/lib/Form/ActionAdminManageForm.php
similarity index 100%
rename from core/modules/action/lib/Drupal/action/Form/ActionAdminManageForm.php
rename to core/modules/action/lib/Form/ActionAdminManageForm.php
diff --git a/core/modules/action/lib/Drupal/action/Form/ActionDeleteForm.php b/core/modules/action/lib/Form/ActionDeleteForm.php
similarity index 100%
rename from core/modules/action/lib/Drupal/action/Form/ActionDeleteForm.php
rename to core/modules/action/lib/Form/ActionDeleteForm.php
diff --git a/core/modules/action/lib/Drupal/action/Plugin/Action/EmailAction.php b/core/modules/action/lib/Plugin/Action/EmailAction.php
similarity index 100%
rename from core/modules/action/lib/Drupal/action/Plugin/Action/EmailAction.php
rename to core/modules/action/lib/Plugin/Action/EmailAction.php
diff --git a/core/modules/action/lib/Drupal/action/Plugin/Action/GotoAction.php b/core/modules/action/lib/Plugin/Action/GotoAction.php
similarity index 100%
rename from core/modules/action/lib/Drupal/action/Plugin/Action/GotoAction.php
rename to core/modules/action/lib/Plugin/Action/GotoAction.php
diff --git a/core/modules/action/lib/Drupal/action/Plugin/Action/MessageAction.php b/core/modules/action/lib/Plugin/Action/MessageAction.php
similarity index 100%
rename from core/modules/action/lib/Drupal/action/Plugin/Action/MessageAction.php
rename to core/modules/action/lib/Plugin/Action/MessageAction.php
diff --git a/core/modules/action/lib/Drupal/action/Tests/ActionUninstallTest.php b/core/modules/action/lib/Tests/ActionUninstallTest.php
similarity index 100%
rename from core/modules/action/lib/Drupal/action/Tests/ActionUninstallTest.php
rename to core/modules/action/lib/Tests/ActionUninstallTest.php
diff --git a/core/modules/action/lib/Drupal/action/Tests/BulkFormTest.php b/core/modules/action/lib/Tests/BulkFormTest.php
similarity index 100%
rename from core/modules/action/lib/Drupal/action/Tests/BulkFormTest.php
rename to core/modules/action/lib/Tests/BulkFormTest.php
diff --git a/core/modules/action/lib/Drupal/action/Tests/ConfigurationTest.php b/core/modules/action/lib/Tests/ConfigurationTest.php
similarity index 100%
rename from core/modules/action/lib/Drupal/action/Tests/ConfigurationTest.php
rename to core/modules/action/lib/Tests/ConfigurationTest.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Access/CategoriesAccessCheck.php b/core/modules/aggregator/lib/Access/CategoriesAccessCheck.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Access/CategoriesAccessCheck.php
rename to core/modules/aggregator/lib/Access/CategoriesAccessCheck.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Annotation/AggregatorFetcher.php b/core/modules/aggregator/lib/Annotation/AggregatorFetcher.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Annotation/AggregatorFetcher.php
rename to core/modules/aggregator/lib/Annotation/AggregatorFetcher.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Annotation/AggregatorParser.php b/core/modules/aggregator/lib/Annotation/AggregatorParser.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Annotation/AggregatorParser.php
rename to core/modules/aggregator/lib/Annotation/AggregatorParser.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Annotation/AggregatorProcessor.php b/core/modules/aggregator/lib/Annotation/AggregatorProcessor.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Annotation/AggregatorProcessor.php
rename to core/modules/aggregator/lib/Annotation/AggregatorProcessor.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/CategoryStorageController.php b/core/modules/aggregator/lib/CategoryStorageController.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/CategoryStorageController.php
rename to core/modules/aggregator/lib/CategoryStorageController.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/CategoryStorageControllerInterface.php b/core/modules/aggregator/lib/CategoryStorageControllerInterface.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/CategoryStorageControllerInterface.php
rename to core/modules/aggregator/lib/CategoryStorageControllerInterface.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php b/core/modules/aggregator/lib/Controller/AggregatorController.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php
rename to core/modules/aggregator/lib/Controller/AggregatorController.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Entity/Feed.php b/core/modules/aggregator/lib/Entity/Feed.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Entity/Feed.php
rename to core/modules/aggregator/lib/Entity/Feed.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Entity/Item.php b/core/modules/aggregator/lib/Entity/Item.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Entity/Item.php
rename to core/modules/aggregator/lib/Entity/Item.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/FeedFormController.php b/core/modules/aggregator/lib/FeedFormController.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/FeedFormController.php
rename to core/modules/aggregator/lib/FeedFormController.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/FeedInterface.php b/core/modules/aggregator/lib/FeedInterface.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/FeedInterface.php
rename to core/modules/aggregator/lib/FeedInterface.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/FeedRenderController.php b/core/modules/aggregator/lib/FeedRenderController.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/FeedRenderController.php
rename to core/modules/aggregator/lib/FeedRenderController.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/FeedStorageController.php b/core/modules/aggregator/lib/FeedStorageController.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/FeedStorageController.php
rename to core/modules/aggregator/lib/FeedStorageController.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/FeedStorageControllerInterface.php b/core/modules/aggregator/lib/FeedStorageControllerInterface.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/FeedStorageControllerInterface.php
rename to core/modules/aggregator/lib/FeedStorageControllerInterface.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/AggregatorCategorizeFormBase.php b/core/modules/aggregator/lib/Form/AggregatorCategorizeFormBase.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Form/AggregatorCategorizeFormBase.php
rename to core/modules/aggregator/lib/Form/AggregatorCategorizeFormBase.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/CategorizeCategoryForm.php b/core/modules/aggregator/lib/Form/CategorizeCategoryForm.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Form/CategorizeCategoryForm.php
rename to core/modules/aggregator/lib/Form/CategorizeCategoryForm.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/CategorizeFeedForm.php b/core/modules/aggregator/lib/Form/CategorizeFeedForm.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Form/CategorizeFeedForm.php
rename to core/modules/aggregator/lib/Form/CategorizeFeedForm.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/CategoryAdminForm.php b/core/modules/aggregator/lib/Form/CategoryAdminForm.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Form/CategoryAdminForm.php
rename to core/modules/aggregator/lib/Form/CategoryAdminForm.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/CategoryDeleteForm.php b/core/modules/aggregator/lib/Form/CategoryDeleteForm.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Form/CategoryDeleteForm.php
rename to core/modules/aggregator/lib/Form/CategoryDeleteForm.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/FeedDeleteForm.php b/core/modules/aggregator/lib/Form/FeedDeleteForm.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Form/FeedDeleteForm.php
rename to core/modules/aggregator/lib/Form/FeedDeleteForm.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/FeedItemsRemoveForm.php b/core/modules/aggregator/lib/Form/FeedItemsRemoveForm.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Form/FeedItemsRemoveForm.php
rename to core/modules/aggregator/lib/Form/FeedItemsRemoveForm.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/OpmlFeedAdd.php b/core/modules/aggregator/lib/Form/OpmlFeedAdd.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Form/OpmlFeedAdd.php
rename to core/modules/aggregator/lib/Form/OpmlFeedAdd.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Form/SettingsForm.php b/core/modules/aggregator/lib/Form/SettingsForm.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Form/SettingsForm.php
rename to core/modules/aggregator/lib/Form/SettingsForm.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/ItemInterface.php b/core/modules/aggregator/lib/ItemInterface.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/ItemInterface.php
rename to core/modules/aggregator/lib/ItemInterface.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/ItemRenderController.php b/core/modules/aggregator/lib/ItemRenderController.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/ItemRenderController.php
rename to core/modules/aggregator/lib/ItemRenderController.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/ItemStorageController.php b/core/modules/aggregator/lib/ItemStorageController.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/ItemStorageController.php
rename to core/modules/aggregator/lib/ItemStorageController.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/ItemStorageControllerInterface.php b/core/modules/aggregator/lib/ItemStorageControllerInterface.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/ItemStorageControllerInterface.php
rename to core/modules/aggregator/lib/ItemStorageControllerInterface.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/AggregatorPluginManager.php b/core/modules/aggregator/lib/Plugin/AggregatorPluginManager.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/AggregatorPluginManager.php
rename to core/modules/aggregator/lib/Plugin/AggregatorPluginManager.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/AggregatorPluginSettingsBase.php b/core/modules/aggregator/lib/Plugin/AggregatorPluginSettingsBase.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/AggregatorPluginSettingsBase.php
rename to core/modules/aggregator/lib/Plugin/AggregatorPluginSettingsBase.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorCategoryBlock.php b/core/modules/aggregator/lib/Plugin/Block/AggregatorCategoryBlock.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorCategoryBlock.php
rename to core/modules/aggregator/lib/Plugin/Block/AggregatorCategoryBlock.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php b/core/modules/aggregator/lib/Plugin/Block/AggregatorFeedBlock.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php
rename to core/modules/aggregator/lib/Plugin/Block/AggregatorFeedBlock.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Derivative/AggregatorCategoryBlock.php b/core/modules/aggregator/lib/Plugin/Derivative/AggregatorCategoryBlock.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/Derivative/AggregatorCategoryBlock.php
rename to core/modules/aggregator/lib/Plugin/Derivative/AggregatorCategoryBlock.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Derivative/AggregatorFeedBlock.php b/core/modules/aggregator/lib/Plugin/Derivative/AggregatorFeedBlock.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/Derivative/AggregatorFeedBlock.php
rename to core/modules/aggregator/lib/Plugin/Derivative/AggregatorFeedBlock.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/FetcherInterface.php b/core/modules/aggregator/lib/Plugin/FetcherInterface.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/FetcherInterface.php
rename to core/modules/aggregator/lib/Plugin/FetcherInterface.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/ParserInterface.php b/core/modules/aggregator/lib/Plugin/ParserInterface.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/ParserInterface.php
rename to core/modules/aggregator/lib/Plugin/ParserInterface.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/ProcessorInterface.php b/core/modules/aggregator/lib/Plugin/ProcessorInterface.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/ProcessorInterface.php
rename to core/modules/aggregator/lib/Plugin/ProcessorInterface.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php b/core/modules/aggregator/lib/Plugin/aggregator/fetcher/DefaultFetcher.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php
rename to core/modules/aggregator/lib/Plugin/aggregator/fetcher/DefaultFetcher.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/parser/DefaultParser.php b/core/modules/aggregator/lib/Plugin/aggregator/parser/DefaultParser.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/parser/DefaultParser.php
rename to core/modules/aggregator/lib/Plugin/aggregator/parser/DefaultParser.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/processor/DefaultProcessor.php b/core/modules/aggregator/lib/Plugin/aggregator/processor/DefaultProcessor.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/processor/DefaultProcessor.php
rename to core/modules/aggregator/lib/Plugin/aggregator/processor/DefaultProcessor.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/CategoryCid.php b/core/modules/aggregator/lib/Plugin/views/argument/CategoryCid.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/CategoryCid.php
rename to core/modules/aggregator/lib/Plugin/views/argument/CategoryCid.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Fid.php b/core/modules/aggregator/lib/Plugin/views/argument/Fid.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Fid.php
rename to core/modules/aggregator/lib/Plugin/views/argument/Fid.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Iid.php b/core/modules/aggregator/lib/Plugin/views/argument/Iid.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Iid.php
rename to core/modules/aggregator/lib/Plugin/views/argument/Iid.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/Category.php b/core/modules/aggregator/lib/Plugin/views/field/Category.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/Category.php
rename to core/modules/aggregator/lib/Plugin/views/field/Category.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/TitleLink.php b/core/modules/aggregator/lib/Plugin/views/field/TitleLink.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/TitleLink.php
rename to core/modules/aggregator/lib/Plugin/views/field/TitleLink.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/Xss.php b/core/modules/aggregator/lib/Plugin/views/field/Xss.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/Xss.php
rename to core/modules/aggregator/lib/Plugin/views/field/Xss.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/filter/CategoryCid.php b/core/modules/aggregator/lib/Plugin/views/filter/CategoryCid.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/filter/CategoryCid.php
rename to core/modules/aggregator/lib/Plugin/views/filter/CategoryCid.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/row/Rss.php b/core/modules/aggregator/lib/Plugin/views/row/Rss.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/row/Rss.php
rename to core/modules/aggregator/lib/Plugin/views/row/Rss.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AddFeedTest.php b/core/modules/aggregator/lib/Tests/AddFeedTest.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/AddFeedTest.php
rename to core/modules/aggregator/lib/Tests/AddFeedTest.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorConfigurationTest.php b/core/modules/aggregator/lib/Tests/AggregatorConfigurationTest.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorConfigurationTest.php
rename to core/modules/aggregator/lib/Tests/AggregatorConfigurationTest.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorCronTest.php b/core/modules/aggregator/lib/Tests/AggregatorCronTest.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorCronTest.php
rename to core/modules/aggregator/lib/Tests/AggregatorCronTest.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorRenderingTest.php b/core/modules/aggregator/lib/Tests/AggregatorRenderingTest.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorRenderingTest.php
rename to core/modules/aggregator/lib/Tests/AggregatorRenderingTest.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php b/core/modules/aggregator/lib/Tests/AggregatorTestBase.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php
rename to core/modules/aggregator/lib/Tests/AggregatorTestBase.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/CategorizeFeedItemTest.php b/core/modules/aggregator/lib/Tests/CategorizeFeedItemTest.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/CategorizeFeedItemTest.php
rename to core/modules/aggregator/lib/Tests/CategorizeFeedItemTest.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/CategorizeFeedTest.php b/core/modules/aggregator/lib/Tests/CategorizeFeedTest.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/CategorizeFeedTest.php
rename to core/modules/aggregator/lib/Tests/CategorizeFeedTest.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/FeedFetcherPluginTest.php b/core/modules/aggregator/lib/Tests/FeedFetcherPluginTest.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/FeedFetcherPluginTest.php
rename to core/modules/aggregator/lib/Tests/FeedFetcherPluginTest.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/FeedLanguageTest.php b/core/modules/aggregator/lib/Tests/FeedLanguageTest.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/FeedLanguageTest.php
rename to core/modules/aggregator/lib/Tests/FeedLanguageTest.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/FeedParserTest.php b/core/modules/aggregator/lib/Tests/FeedParserTest.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/FeedParserTest.php
rename to core/modules/aggregator/lib/Tests/FeedParserTest.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/FeedProcessorPluginTest.php b/core/modules/aggregator/lib/Tests/FeedProcessorPluginTest.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/FeedProcessorPluginTest.php
rename to core/modules/aggregator/lib/Tests/FeedProcessorPluginTest.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/ImportOpmlTest.php b/core/modules/aggregator/lib/Tests/ImportOpmlTest.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/ImportOpmlTest.php
rename to core/modules/aggregator/lib/Tests/ImportOpmlTest.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/RemoveFeedItemTest.php b/core/modules/aggregator/lib/Tests/RemoveFeedItemTest.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/RemoveFeedItemTest.php
rename to core/modules/aggregator/lib/Tests/RemoveFeedItemTest.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/RemoveFeedTest.php b/core/modules/aggregator/lib/Tests/RemoveFeedTest.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/RemoveFeedTest.php
rename to core/modules/aggregator/lib/Tests/RemoveFeedTest.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/UpdateFeedItemTest.php b/core/modules/aggregator/lib/Tests/UpdateFeedItemTest.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/UpdateFeedItemTest.php
rename to core/modules/aggregator/lib/Tests/UpdateFeedItemTest.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/UpdateFeedTest.php b/core/modules/aggregator/lib/Tests/UpdateFeedTest.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/UpdateFeedTest.php
rename to core/modules/aggregator/lib/Tests/UpdateFeedTest.php
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/Views/IntegrationTest.php b/core/modules/aggregator/lib/Tests/Views/IntegrationTest.php
similarity index 100%
rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/Views/IntegrationTest.php
rename to core/modules/aggregator/lib/Tests/Views/IntegrationTest.php
diff --git a/core/modules/aggregator/tests/Drupal/aggregator/Tests/Plugin/AggregatorPluginSettingsBaseTest.php b/core/modules/aggregator/tests/lib/Plugin/AggregatorPluginSettingsBaseTest.php
similarity index 100%
rename from core/modules/aggregator/tests/Drupal/aggregator/Tests/Plugin/AggregatorPluginSettingsBaseTest.php
rename to core/modules/aggregator/tests/lib/Plugin/AggregatorPluginSettingsBaseTest.php
diff --git a/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/fetcher/TestFetcher.php b/core/modules/aggregator/tests/modules/aggregator_test/lib/Plugin/aggregator/fetcher/TestFetcher.php
similarity index 100%
rename from core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/fetcher/TestFetcher.php
rename to core/modules/aggregator/tests/modules/aggregator_test/lib/Plugin/aggregator/fetcher/TestFetcher.php
diff --git a/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/parser/TestParser.php b/core/modules/aggregator/tests/modules/aggregator_test/lib/Plugin/aggregator/parser/TestParser.php
similarity index 100%
rename from core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/parser/TestParser.php
rename to core/modules/aggregator/tests/modules/aggregator_test/lib/Plugin/aggregator/parser/TestParser.php
diff --git a/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/processor/TestProcessor.php b/core/modules/aggregator/tests/modules/aggregator_test/lib/Plugin/aggregator/processor/TestProcessor.php
similarity index 100%
rename from core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/processor/TestProcessor.php
rename to core/modules/aggregator/tests/modules/aggregator_test/lib/Plugin/aggregator/processor/TestProcessor.php
diff --git a/core/modules/ban/lib/Drupal/ban/BanIpManager.php b/core/modules/ban/lib/BanIpManager.php
similarity index 100%
rename from core/modules/ban/lib/Drupal/ban/BanIpManager.php
rename to core/modules/ban/lib/BanIpManager.php
diff --git a/core/modules/ban/lib/Drupal/ban/EventSubscriber/BanSubscriber.php b/core/modules/ban/lib/EventSubscriber/BanSubscriber.php
similarity index 100%
rename from core/modules/ban/lib/Drupal/ban/EventSubscriber/BanSubscriber.php
rename to core/modules/ban/lib/EventSubscriber/BanSubscriber.php
diff --git a/core/modules/ban/lib/Drupal/ban/Form/BanAdmin.php b/core/modules/ban/lib/Form/BanAdmin.php
similarity index 100%
rename from core/modules/ban/lib/Drupal/ban/Form/BanAdmin.php
rename to core/modules/ban/lib/Form/BanAdmin.php
diff --git a/core/modules/ban/lib/Drupal/ban/Form/BanDelete.php b/core/modules/ban/lib/Form/BanDelete.php
similarity index 100%
rename from core/modules/ban/lib/Drupal/ban/Form/BanDelete.php
rename to core/modules/ban/lib/Form/BanDelete.php
diff --git a/core/modules/ban/lib/Drupal/ban/Tests/IpAddressBlockingTest.php b/core/modules/ban/lib/Tests/IpAddressBlockingTest.php
similarity index 100%
rename from core/modules/ban/lib/Drupal/ban/Tests/IpAddressBlockingTest.php
rename to core/modules/ban/lib/Tests/IpAddressBlockingTest.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Controller/CustomBlockController.php b/core/modules/block/custom_block/lib/Controller/CustomBlockController.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/Controller/CustomBlockController.php
rename to core/modules/block/custom_block/lib/Controller/CustomBlockController.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockAccessController.php b/core/modules/block/custom_block/lib/CustomBlockAccessController.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockAccessController.php
rename to core/modules/block/custom_block/lib/CustomBlockAccessController.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockFormController.php b/core/modules/block/custom_block/lib/CustomBlockFormController.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockFormController.php
rename to core/modules/block/custom_block/lib/CustomBlockFormController.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockInterface.php b/core/modules/block/custom_block/lib/CustomBlockInterface.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockInterface.php
rename to core/modules/block/custom_block/lib/CustomBlockInterface.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockListController.php b/core/modules/block/custom_block/lib/CustomBlockListController.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockListController.php
rename to core/modules/block/custom_block/lib/CustomBlockListController.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockRenderController.php b/core/modules/block/custom_block/lib/CustomBlockRenderController.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockRenderController.php
rename to core/modules/block/custom_block/lib/CustomBlockRenderController.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockStorageController.php b/core/modules/block/custom_block/lib/CustomBlockStorageController.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockStorageController.php
rename to core/modules/block/custom_block/lib/CustomBlockStorageController.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTranslationController.php b/core/modules/block/custom_block/lib/CustomBlockTranslationController.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTranslationController.php
rename to core/modules/block/custom_block/lib/CustomBlockTranslationController.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeAccessController.php b/core/modules/block/custom_block/lib/CustomBlockTypeAccessController.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeAccessController.php
rename to core/modules/block/custom_block/lib/CustomBlockTypeAccessController.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeFormController.php b/core/modules/block/custom_block/lib/CustomBlockTypeFormController.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeFormController.php
rename to core/modules/block/custom_block/lib/CustomBlockTypeFormController.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeInterface.php b/core/modules/block/custom_block/lib/CustomBlockTypeInterface.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeInterface.php
rename to core/modules/block/custom_block/lib/CustomBlockTypeInterface.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeListController.php b/core/modules/block/custom_block/lib/CustomBlockTypeListController.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeListController.php
rename to core/modules/block/custom_block/lib/CustomBlockTypeListController.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlock.php b/core/modules/block/custom_block/lib/Entity/CustomBlock.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlock.php
rename to core/modules/block/custom_block/lib/Entity/CustomBlock.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlockType.php b/core/modules/block/custom_block/lib/Entity/CustomBlockType.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlockType.php
rename to core/modules/block/custom_block/lib/Entity/CustomBlockType.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockDeleteForm.php b/core/modules/block/custom_block/lib/Form/CustomBlockDeleteForm.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockDeleteForm.php
rename to core/modules/block/custom_block/lib/Form/CustomBlockDeleteForm.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockTypeDeleteForm.php b/core/modules/block/custom_block/lib/Form/CustomBlockTypeDeleteForm.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/Form/CustomBlockTypeDeleteForm.php
rename to core/modules/block/custom_block/lib/Form/CustomBlockTypeDeleteForm.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Block/CustomBlockBlock.php b/core/modules/block/custom_block/lib/Plugin/Block/CustomBlockBlock.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Block/CustomBlockBlock.php
rename to core/modules/block/custom_block/lib/Plugin/Block/CustomBlockBlock.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Derivative/CustomBlock.php b/core/modules/block/custom_block/lib/Plugin/Derivative/CustomBlock.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Derivative/CustomBlock.php
rename to core/modules/block/custom_block/lib/Plugin/Derivative/CustomBlock.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockBuildContentTest.php b/core/modules/block/custom_block/lib/Tests/CustomBlockBuildContentTest.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockBuildContentTest.php
rename to core/modules/block/custom_block/lib/Tests/CustomBlockBuildContentTest.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockCreationTest.php b/core/modules/block/custom_block/lib/Tests/CustomBlockCreationTest.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockCreationTest.php
rename to core/modules/block/custom_block/lib/Tests/CustomBlockCreationTest.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockFieldTest.php b/core/modules/block/custom_block/lib/Tests/CustomBlockFieldTest.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockFieldTest.php
rename to core/modules/block/custom_block/lib/Tests/CustomBlockFieldTest.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockListTest.php b/core/modules/block/custom_block/lib/Tests/CustomBlockListTest.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockListTest.php
rename to core/modules/block/custom_block/lib/Tests/CustomBlockListTest.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockLoadHooksTest.php b/core/modules/block/custom_block/lib/Tests/CustomBlockLoadHooksTest.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockLoadHooksTest.php
rename to core/modules/block/custom_block/lib/Tests/CustomBlockLoadHooksTest.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockPageViewTest.php b/core/modules/block/custom_block/lib/Tests/CustomBlockPageViewTest.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockPageViewTest.php
rename to core/modules/block/custom_block/lib/Tests/CustomBlockPageViewTest.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockRevisionsTest.php b/core/modules/block/custom_block/lib/Tests/CustomBlockRevisionsTest.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockRevisionsTest.php
rename to core/modules/block/custom_block/lib/Tests/CustomBlockRevisionsTest.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockSaveTest.php b/core/modules/block/custom_block/lib/Tests/CustomBlockSaveTest.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockSaveTest.php
rename to core/modules/block/custom_block/lib/Tests/CustomBlockSaveTest.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTestBase.php b/core/modules/block/custom_block/lib/Tests/CustomBlockTestBase.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTestBase.php
rename to core/modules/block/custom_block/lib/Tests/CustomBlockTestBase.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTranslationUITest.php b/core/modules/block/custom_block/lib/Tests/CustomBlockTranslationUITest.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTranslationUITest.php
rename to core/modules/block/custom_block/lib/Tests/CustomBlockTranslationUITest.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTypeTest.php b/core/modules/block/custom_block/lib/Tests/CustomBlockTypeTest.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockTypeTest.php
rename to core/modules/block/custom_block/lib/Tests/CustomBlockTypeTest.php
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/PageEditTest.php b/core/modules/block/custom_block/lib/Tests/PageEditTest.php
similarity index 100%
rename from core/modules/block/custom_block/lib/Drupal/custom_block/Tests/PageEditTest.php
rename to core/modules/block/custom_block/lib/Tests/PageEditTest.php
diff --git a/core/modules/block/lib/Drupal/block/Access/BlockThemeAccessCheck.php b/core/modules/block/lib/Access/BlockThemeAccessCheck.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Access/BlockThemeAccessCheck.php
rename to core/modules/block/lib/Access/BlockThemeAccessCheck.php
diff --git a/core/modules/block/lib/Drupal/block/Annotation/Block.php b/core/modules/block/lib/Annotation/Block.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Annotation/Block.php
rename to core/modules/block/lib/Annotation/Block.php
diff --git a/core/modules/block/lib/Drupal/block/BlockAccessController.php b/core/modules/block/lib/BlockAccessController.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/BlockAccessController.php
rename to core/modules/block/lib/BlockAccessController.php
diff --git a/core/modules/block/lib/Drupal/block/BlockBase.php b/core/modules/block/lib/BlockBase.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/BlockBase.php
rename to core/modules/block/lib/BlockBase.php
diff --git a/core/modules/block/lib/Drupal/block/BlockFormController.php b/core/modules/block/lib/BlockFormController.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/BlockFormController.php
rename to core/modules/block/lib/BlockFormController.php
diff --git a/core/modules/block/lib/Drupal/block/BlockInterface.php b/core/modules/block/lib/BlockInterface.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/BlockInterface.php
rename to core/modules/block/lib/BlockInterface.php
diff --git a/core/modules/block/lib/Drupal/block/BlockListController.php b/core/modules/block/lib/BlockListController.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/BlockListController.php
rename to core/modules/block/lib/BlockListController.php
diff --git a/core/modules/block/lib/Drupal/block/BlockPluginBag.php b/core/modules/block/lib/BlockPluginBag.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/BlockPluginBag.php
rename to core/modules/block/lib/BlockPluginBag.php
diff --git a/core/modules/block/lib/Drupal/block/BlockPluginInterface.php b/core/modules/block/lib/BlockPluginInterface.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/BlockPluginInterface.php
rename to core/modules/block/lib/BlockPluginInterface.php
diff --git a/core/modules/block/lib/Drupal/block/BlockRenderController.php b/core/modules/block/lib/BlockRenderController.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/BlockRenderController.php
rename to core/modules/block/lib/BlockRenderController.php
diff --git a/core/modules/block/lib/Drupal/block/BlockStorageController.php b/core/modules/block/lib/BlockStorageController.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/BlockStorageController.php
rename to core/modules/block/lib/BlockStorageController.php
diff --git a/core/modules/block/lib/Drupal/block/Controller/BlockAddController.php b/core/modules/block/lib/Controller/BlockAddController.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Controller/BlockAddController.php
rename to core/modules/block/lib/Controller/BlockAddController.php
diff --git a/core/modules/block/lib/Drupal/block/Controller/BlockListController.php b/core/modules/block/lib/Controller/BlockListController.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Controller/BlockListController.php
rename to core/modules/block/lib/Controller/BlockListController.php
diff --git a/core/modules/block/lib/Drupal/block/Controller/CategoryAutocompleteController.php b/core/modules/block/lib/Controller/CategoryAutocompleteController.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Controller/CategoryAutocompleteController.php
rename to core/modules/block/lib/Controller/CategoryAutocompleteController.php
diff --git a/core/modules/block/lib/Drupal/block/Entity/Block.php b/core/modules/block/lib/Entity/Block.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Entity/Block.php
rename to core/modules/block/lib/Entity/Block.php
diff --git a/core/modules/block/lib/Drupal/block/Form/BlockDeleteForm.php b/core/modules/block/lib/Form/BlockDeleteForm.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Form/BlockDeleteForm.php
rename to core/modules/block/lib/Form/BlockDeleteForm.php
diff --git a/core/modules/block/lib/Drupal/block/Plugin/Type/BlockManager.php b/core/modules/block/lib/Plugin/Type/BlockManager.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Plugin/Type/BlockManager.php
rename to core/modules/block/lib/Plugin/Type/BlockManager.php
diff --git a/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php b/core/modules/block/lib/Plugin/views/display/Block.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php
rename to core/modules/block/lib/Plugin/views/display/Block.php
diff --git a/core/modules/block/lib/Drupal/block/Routing/RouteSubscriber.php b/core/modules/block/lib/Routing/RouteSubscriber.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Routing/RouteSubscriber.php
rename to core/modules/block/lib/Routing/RouteSubscriber.php
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockAdminThemeTest.php b/core/modules/block/lib/Tests/BlockAdminThemeTest.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Tests/BlockAdminThemeTest.php
rename to core/modules/block/lib/Tests/BlockAdminThemeTest.php
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockCacheTest.php b/core/modules/block/lib/Tests/BlockCacheTest.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Tests/BlockCacheTest.php
rename to core/modules/block/lib/Tests/BlockCacheTest.php
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockHiddenRegionTest.php b/core/modules/block/lib/Tests/BlockHiddenRegionTest.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Tests/BlockHiddenRegionTest.php
rename to core/modules/block/lib/Tests/BlockHiddenRegionTest.php
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockHookOperationTest.php b/core/modules/block/lib/Tests/BlockHookOperationTest.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Tests/BlockHookOperationTest.php
rename to core/modules/block/lib/Tests/BlockHookOperationTest.php
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockHtmlIdTest.php b/core/modules/block/lib/Tests/BlockHtmlIdTest.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Tests/BlockHtmlIdTest.php
rename to core/modules/block/lib/Tests/BlockHtmlIdTest.php
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockInterfaceTest.php b/core/modules/block/lib/Tests/BlockInterfaceTest.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Tests/BlockInterfaceTest.php
rename to core/modules/block/lib/Tests/BlockInterfaceTest.php
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockInvalidRegionTest.php b/core/modules/block/lib/Tests/BlockInvalidRegionTest.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Tests/BlockInvalidRegionTest.php
rename to core/modules/block/lib/Tests/BlockInvalidRegionTest.php
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockLanguageCacheTest.php b/core/modules/block/lib/Tests/BlockLanguageCacheTest.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Tests/BlockLanguageCacheTest.php
rename to core/modules/block/lib/Tests/BlockLanguageCacheTest.php
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockLanguageTest.php b/core/modules/block/lib/Tests/BlockLanguageTest.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Tests/BlockLanguageTest.php
rename to core/modules/block/lib/Tests/BlockLanguageTest.php
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockRenderOrderTest.php b/core/modules/block/lib/Tests/BlockRenderOrderTest.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Tests/BlockRenderOrderTest.php
rename to core/modules/block/lib/Tests/BlockRenderOrderTest.php
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php b/core/modules/block/lib/Tests/BlockStorageUnitTest.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php
rename to core/modules/block/lib/Tests/BlockStorageUnitTest.php
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockTemplateSuggestionsUnitTest.php b/core/modules/block/lib/Tests/BlockTemplateSuggestionsUnitTest.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Tests/BlockTemplateSuggestionsUnitTest.php
rename to core/modules/block/lib/Tests/BlockTemplateSuggestionsUnitTest.php
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockTest.php b/core/modules/block/lib/Tests/BlockTest.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Tests/BlockTest.php
rename to core/modules/block/lib/Tests/BlockTest.php
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockTestBase.php b/core/modules/block/lib/Tests/BlockTestBase.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Tests/BlockTestBase.php
rename to core/modules/block/lib/Tests/BlockTestBase.php
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockTitleXSSTest.php b/core/modules/block/lib/Tests/BlockTitleXSSTest.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Tests/BlockTitleXSSTest.php
rename to core/modules/block/lib/Tests/BlockTitleXSSTest.php
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockUiTest.php b/core/modules/block/lib/Tests/BlockUiTest.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Tests/BlockUiTest.php
rename to core/modules/block/lib/Tests/BlockUiTest.php
diff --git a/core/modules/block/lib/Drupal/block/Tests/NewDefaultThemeBlocksTest.php b/core/modules/block/lib/Tests/NewDefaultThemeBlocksTest.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Tests/NewDefaultThemeBlocksTest.php
rename to core/modules/block/lib/Tests/NewDefaultThemeBlocksTest.php
diff --git a/core/modules/block/lib/Drupal/block/Tests/NonDefaultBlockAdminTest.php b/core/modules/block/lib/Tests/NonDefaultBlockAdminTest.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Tests/NonDefaultBlockAdminTest.php
rename to core/modules/block/lib/Tests/NonDefaultBlockAdminTest.php
diff --git a/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php b/core/modules/block/lib/Tests/Views/DisplayBlockTest.php
similarity index 100%
rename from core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php
rename to core/modules/block/lib/Tests/Views/DisplayBlockTest.php
diff --git a/core/modules/block/tests/lib/Drupal/block/Tests/BlockBaseTest.php b/core/modules/block/tests/lib/BlockBaseTest.php
similarity index 100%
rename from core/modules/block/tests/lib/Drupal/block/Tests/BlockBaseTest.php
rename to core/modules/block/tests/lib/BlockBaseTest.php
diff --git a/core/modules/block/tests/lib/Drupal/block/Tests/BlockFormControllerTest.php b/core/modules/block/tests/lib/BlockFormControllerTest.php
similarity index 100%
rename from core/modules/block/tests/lib/Drupal/block/Tests/BlockFormControllerTest.php
rename to core/modules/block/tests/lib/BlockFormControllerTest.php
diff --git a/core/modules/block/tests/Drupal/block/Tests/CategoryAutocompleteTest.php b/core/modules/block/tests/lib/CategoryAutocompleteTest.php
similarity index 100%
rename from core/modules/block/tests/Drupal/block/Tests/CategoryAutocompleteTest.php
rename to core/modules/block/tests/lib/CategoryAutocompleteTest.php
diff --git a/core/modules/block/tests/lib/Drupal/block/Tests/Plugin/views/display/BlockTest.php b/core/modules/block/tests/lib/Plugin/views/display/BlockTest.php
similarity index 100%
rename from core/modules/block/tests/lib/Drupal/block/Tests/Plugin/views/display/BlockTest.php
rename to core/modules/block/tests/lib/Plugin/views/display/BlockTest.php
diff --git a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestBlockInstantiation.php b/core/modules/block/tests/modules/block_test/lib/Plugin/Block/TestBlockInstantiation.php
similarity index 100%
rename from core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestBlockInstantiation.php
rename to core/modules/block/tests/modules/block_test/lib/Plugin/Block/TestBlockInstantiation.php
diff --git a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestCacheBlock.php b/core/modules/block/tests/modules/block_test/lib/Plugin/Block/TestCacheBlock.php
similarity index 100%
rename from core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestCacheBlock.php
rename to core/modules/block/tests/modules/block_test/lib/Plugin/Block/TestCacheBlock.php
diff --git a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestHtmlIdBlock.php b/core/modules/block/tests/modules/block_test/lib/Plugin/Block/TestHtmlIdBlock.php
similarity index 100%
rename from core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestHtmlIdBlock.php
rename to core/modules/block/tests/modules/block_test/lib/Plugin/Block/TestHtmlIdBlock.php
diff --git a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestXSSTitleBlock.php b/core/modules/block/tests/modules/block_test/lib/Plugin/Block/TestXSSTitleBlock.php
similarity index 100%
rename from core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestXSSTitleBlock.php
rename to core/modules/block/tests/modules/block_test/lib/Plugin/Block/TestXSSTitleBlock.php
diff --git a/core/modules/book/lib/Drupal/book/BookExport.php b/core/modules/book/lib/BookExport.php
similarity index 100%
rename from core/modules/book/lib/Drupal/book/BookExport.php
rename to core/modules/book/lib/BookExport.php
diff --git a/core/modules/book/lib/Drupal/book/BookManager.php b/core/modules/book/lib/BookManager.php
similarity index 100%
rename from core/modules/book/lib/Drupal/book/BookManager.php
rename to core/modules/book/lib/BookManager.php
diff --git a/core/modules/book/lib/Drupal/book/Controller/BookController.php b/core/modules/book/lib/Controller/BookController.php
similarity index 100%
rename from core/modules/book/lib/Drupal/book/Controller/BookController.php
rename to core/modules/book/lib/Controller/BookController.php
diff --git a/core/modules/book/lib/Drupal/book/Form/BookSettingsForm.php b/core/modules/book/lib/Form/BookSettingsForm.php
similarity index 100%
rename from core/modules/book/lib/Drupal/book/Form/BookSettingsForm.php
rename to core/modules/book/lib/Form/BookSettingsForm.php
diff --git a/core/modules/book/lib/Drupal/book/Plugin/Block/BookNavigationBlock.php b/core/modules/book/lib/Plugin/Block/BookNavigationBlock.php
similarity index 100%
rename from core/modules/book/lib/Drupal/book/Plugin/Block/BookNavigationBlock.php
rename to core/modules/book/lib/Plugin/Block/BookNavigationBlock.php
diff --git a/core/modules/book/lib/Drupal/book/Tests/BookTest.php b/core/modules/book/lib/Tests/BookTest.php
similarity index 100%
rename from core/modules/book/lib/Drupal/book/Tests/BookTest.php
rename to core/modules/book/lib/Tests/BookTest.php
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointGroupInterface.php b/core/modules/breakpoint/lib/BreakpointGroupInterface.php
similarity index 100%
rename from core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointGroupInterface.php
rename to core/modules/breakpoint/lib/BreakpointGroupInterface.php
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointInterface.php b/core/modules/breakpoint/lib/BreakpointInterface.php
similarity index 100%
rename from core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointInterface.php
rename to core/modules/breakpoint/lib/BreakpointInterface.php
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/Breakpoint.php b/core/modules/breakpoint/lib/Entity/Breakpoint.php
similarity index 100%
rename from core/modules/breakpoint/lib/Drupal/breakpoint/Entity/Breakpoint.php
rename to core/modules/breakpoint/lib/Entity/Breakpoint.php
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/BreakpointGroup.php b/core/modules/breakpoint/lib/Entity/BreakpointGroup.php
similarity index 100%
rename from core/modules/breakpoint/lib/Drupal/breakpoint/Entity/BreakpointGroup.php
rename to core/modules/breakpoint/lib/Entity/BreakpointGroup.php
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/InvalidBreakpointException.php b/core/modules/breakpoint/lib/InvalidBreakpointException.php
similarity index 100%
rename from core/modules/breakpoint/lib/Drupal/breakpoint/InvalidBreakpointException.php
rename to core/modules/breakpoint/lib/InvalidBreakpointException.php
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/InvalidBreakpointMediaQueryException.php b/core/modules/breakpoint/lib/InvalidBreakpointMediaQueryException.php
similarity index 100%
rename from core/modules/breakpoint/lib/Drupal/breakpoint/InvalidBreakpointMediaQueryException.php
rename to core/modules/breakpoint/lib/InvalidBreakpointMediaQueryException.php
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/InvalidBreakpointNameException.php b/core/modules/breakpoint/lib/InvalidBreakpointNameException.php
similarity index 100%
rename from core/modules/breakpoint/lib/Drupal/breakpoint/InvalidBreakpointNameException.php
rename to core/modules/breakpoint/lib/InvalidBreakpointNameException.php
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/InvalidBreakpointSourceException.php b/core/modules/breakpoint/lib/InvalidBreakpointSourceException.php
similarity index 100%
rename from core/modules/breakpoint/lib/Drupal/breakpoint/InvalidBreakpointSourceException.php
rename to core/modules/breakpoint/lib/InvalidBreakpointSourceException.php
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/InvalidBreakpointSourceTypeException.php b/core/modules/breakpoint/lib/InvalidBreakpointSourceTypeException.php
similarity index 100%
rename from core/modules/breakpoint/lib/Drupal/breakpoint/InvalidBreakpointSourceTypeException.php
rename to core/modules/breakpoint/lib/InvalidBreakpointSourceTypeException.php
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointAPITest.php b/core/modules/breakpoint/lib/Tests/BreakpointAPITest.php
similarity index 100%
rename from core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointAPITest.php
rename to core/modules/breakpoint/lib/Tests/BreakpointAPITest.php
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointCRUDTest.php b/core/modules/breakpoint/lib/Tests/BreakpointCRUDTest.php
similarity index 100%
rename from core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointCRUDTest.php
rename to core/modules/breakpoint/lib/Tests/BreakpointCRUDTest.php
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupAPITest.php b/core/modules/breakpoint/lib/Tests/BreakpointGroupAPITest.php
similarity index 100%
rename from core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupAPITest.php
rename to core/modules/breakpoint/lib/Tests/BreakpointGroupAPITest.php
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupCRUDTest.php b/core/modules/breakpoint/lib/Tests/BreakpointGroupCRUDTest.php
similarity index 100%
rename from core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupCRUDTest.php
rename to core/modules/breakpoint/lib/Tests/BreakpointGroupCRUDTest.php
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupTestBase.php b/core/modules/breakpoint/lib/Tests/BreakpointGroupTestBase.php
similarity index 100%
rename from core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupTestBase.php
rename to core/modules/breakpoint/lib/Tests/BreakpointGroupTestBase.php
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointTestBase.php b/core/modules/breakpoint/lib/Tests/BreakpointTestBase.php
similarity index 100%
rename from core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointTestBase.php
rename to core/modules/breakpoint/lib/Tests/BreakpointTestBase.php
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointThemeTest.php b/core/modules/breakpoint/lib/Tests/BreakpointThemeTest.php
similarity index 100%
rename from core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointThemeTest.php
rename to core/modules/breakpoint/lib/Tests/BreakpointThemeTest.php
diff --git a/core/modules/breakpoint/tests/Drupal/breakpoint/Tests/BreakpointMediaQueryTest.php b/core/modules/breakpoint/tests/lib/BreakpointMediaQueryTest.php
similarity index 100%
rename from core/modules/breakpoint/tests/Drupal/breakpoint/Tests/BreakpointMediaQueryTest.php
rename to core/modules/breakpoint/tests/lib/BreakpointMediaQueryTest.php
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Annotation/CKEditorPlugin.php b/core/modules/ckeditor/lib/Annotation/CKEditorPlugin.php
similarity index 100%
rename from core/modules/ckeditor/lib/Drupal/ckeditor/Annotation/CKEditorPlugin.php
rename to core/modules/ckeditor/lib/Annotation/CKEditorPlugin.php
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginBase.php b/core/modules/ckeditor/lib/CKEditorPluginBase.php
similarity index 100%
rename from core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginBase.php
rename to core/modules/ckeditor/lib/CKEditorPluginBase.php
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginButtonsInterface.php b/core/modules/ckeditor/lib/CKEditorPluginButtonsInterface.php
similarity index 100%
rename from core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginButtonsInterface.php
rename to core/modules/ckeditor/lib/CKEditorPluginButtonsInterface.php
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginConfigurableInterface.php b/core/modules/ckeditor/lib/CKEditorPluginConfigurableInterface.php
similarity index 100%
rename from core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginConfigurableInterface.php
rename to core/modules/ckeditor/lib/CKEditorPluginConfigurableInterface.php
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginContextualInterface.php b/core/modules/ckeditor/lib/CKEditorPluginContextualInterface.php
similarity index 100%
rename from core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginContextualInterface.php
rename to core/modules/ckeditor/lib/CKEditorPluginContextualInterface.php
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginInterface.php b/core/modules/ckeditor/lib/CKEditorPluginInterface.php
similarity index 100%
rename from core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginInterface.php
rename to core/modules/ckeditor/lib/CKEditorPluginInterface.php
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginManager.php b/core/modules/ckeditor/lib/CKEditorPluginManager.php
similarity index 100%
rename from core/modules/ckeditor/lib/Drupal/ckeditor/CKEditorPluginManager.php
rename to core/modules/ckeditor/lib/CKEditorPluginManager.php
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalImage.php b/core/modules/ckeditor/lib/Plugin/CKEditorPlugin/DrupalImage.php
similarity index 100%
rename from core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalImage.php
rename to core/modules/ckeditor/lib/Plugin/CKEditorPlugin/DrupalImage.php
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalImageCaption.php b/core/modules/ckeditor/lib/Plugin/CKEditorPlugin/DrupalImageCaption.php
similarity index 100%
rename from core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalImageCaption.php
rename to core/modules/ckeditor/lib/Plugin/CKEditorPlugin/DrupalImageCaption.php
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalLink.php b/core/modules/ckeditor/lib/Plugin/CKEditorPlugin/DrupalLink.php
similarity index 100%
rename from core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalLink.php
rename to core/modules/ckeditor/lib/Plugin/CKEditorPlugin/DrupalLink.php
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/Internal.php b/core/modules/ckeditor/lib/Plugin/CKEditorPlugin/Internal.php
similarity index 100%
rename from core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/Internal.php
rename to core/modules/ckeditor/lib/Plugin/CKEditorPlugin/Internal.php
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/StylesCombo.php b/core/modules/ckeditor/lib/Plugin/CKEditorPlugin/StylesCombo.php
similarity index 100%
rename from core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/StylesCombo.php
rename to core/modules/ckeditor/lib/Plugin/CKEditorPlugin/StylesCombo.php
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php b/core/modules/ckeditor/lib/Plugin/Editor/CKEditor.php
similarity index 100%
rename from core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
rename to core/modules/ckeditor/lib/Plugin/Editor/CKEditor.php
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorAdminTest.php b/core/modules/ckeditor/lib/Tests/CKEditorAdminTest.php
similarity index 100%
rename from core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorAdminTest.php
rename to core/modules/ckeditor/lib/Tests/CKEditorAdminTest.php
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorLoadingTest.php b/core/modules/ckeditor/lib/Tests/CKEditorLoadingTest.php
similarity index 100%
rename from core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorLoadingTest.php
rename to core/modules/ckeditor/lib/Tests/CKEditorLoadingTest.php
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorPluginManagerTest.php b/core/modules/ckeditor/lib/Tests/CKEditorPluginManagerTest.php
similarity index 100%
rename from core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorPluginManagerTest.php
rename to core/modules/ckeditor/lib/Tests/CKEditorPluginManagerTest.php
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorTest.php b/core/modules/ckeditor/lib/Tests/CKEditorTest.php
similarity index 100%
rename from core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorTest.php
rename to core/modules/ckeditor/lib/Tests/CKEditorTest.php
diff --git a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/Llama.php b/core/modules/ckeditor/tests/modules/lib/Plugin/CKEditorPlugin/Llama.php
similarity index 100%
rename from core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/Llama.php
rename to core/modules/ckeditor/tests/modules/lib/Plugin/CKEditorPlugin/Llama.php
diff --git a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaButton.php b/core/modules/ckeditor/tests/modules/lib/Plugin/CKEditorPlugin/LlamaButton.php
similarity index 100%
rename from core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaButton.php
rename to core/modules/ckeditor/tests/modules/lib/Plugin/CKEditorPlugin/LlamaButton.php
diff --git a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextual.php b/core/modules/ckeditor/tests/modules/lib/Plugin/CKEditorPlugin/LlamaContextual.php
similarity index 100%
rename from core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextual.php
rename to core/modules/ckeditor/tests/modules/lib/Plugin/CKEditorPlugin/LlamaContextual.php
diff --git a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextualAndButton.php b/core/modules/ckeditor/tests/modules/lib/Plugin/CKEditorPlugin/LlamaContextualAndButton.php
similarity index 100%
rename from core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextualAndButton.php
rename to core/modules/ckeditor/tests/modules/lib/Plugin/CKEditorPlugin/LlamaContextualAndButton.php
diff --git a/core/modules/color/lib/Drupal/color/Tests/ColorTest.php b/core/modules/color/lib/Tests/ColorTest.php
similarity index 100%
rename from core/modules/color/lib/Drupal/color/Tests/ColorTest.php
rename to core/modules/color/lib/Tests/ColorTest.php
diff --git a/core/modules/comment/comment.install b/core/modules/comment/comment.install
index 04e1291..0ff09b1 100644
--- a/core/modules/comment/comment.install
+++ b/core/modules/comment/comment.install
@@ -13,7 +13,11 @@ function comment_uninstall() {
   variable_del('comment_block_count');
   $node_types = array_keys(node_type_get_types());
   Drupal::entityManager()->addNamespaces(new ArrayIterator(array(
-    'Drupal\comment' => DRUPAL_ROOT . '/core/modules/comment/lib',
+    'Drupal\comment' => array(
+      DRUPAL_ROOT . '/core/modules/comment/lib/Drupal/comment',
+      DRUPAL_ROOT . '/core/modules/comment/lib',
+      DRUPAL_ROOT . '/core/modules/comment/src',
+    ),
   )));
   drupal_classloader_register('comment', 'core/modules/comment');
   foreach ($node_types as $node_type) {
diff --git a/core/modules/comment/lib/Drupal/comment/CommentAccessController.php b/core/modules/comment/lib/CommentAccessController.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/CommentAccessController.php
rename to core/modules/comment/lib/CommentAccessController.php
diff --git a/core/modules/comment/lib/Drupal/comment/CommentBreadcrumbBuilder.php b/core/modules/comment/lib/CommentBreadcrumbBuilder.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/CommentBreadcrumbBuilder.php
rename to core/modules/comment/lib/CommentBreadcrumbBuilder.php
diff --git a/core/modules/comment/lib/Drupal/comment/CommentFormController.php b/core/modules/comment/lib/CommentFormController.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/CommentFormController.php
rename to core/modules/comment/lib/CommentFormController.php
diff --git a/core/modules/comment/lib/Drupal/comment/CommentInterface.php b/core/modules/comment/lib/CommentInterface.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/CommentInterface.php
rename to core/modules/comment/lib/CommentInterface.php
diff --git a/core/modules/comment/lib/Drupal/comment/CommentRenderController.php b/core/modules/comment/lib/CommentRenderController.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/CommentRenderController.php
rename to core/modules/comment/lib/CommentRenderController.php
diff --git a/core/modules/comment/lib/Drupal/comment/CommentStorageController.php b/core/modules/comment/lib/CommentStorageController.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/CommentStorageController.php
rename to core/modules/comment/lib/CommentStorageController.php
diff --git a/core/modules/comment/lib/Drupal/comment/CommentStorageControllerInterface.php b/core/modules/comment/lib/CommentStorageControllerInterface.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/CommentStorageControllerInterface.php
rename to core/modules/comment/lib/CommentStorageControllerInterface.php
diff --git a/core/modules/comment/lib/Drupal/comment/CommentTranslationController.php b/core/modules/comment/lib/CommentTranslationController.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/CommentTranslationController.php
rename to core/modules/comment/lib/CommentTranslationController.php
diff --git a/core/modules/comment/lib/Drupal/comment/Controller/CommentController.php b/core/modules/comment/lib/Controller/CommentController.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Controller/CommentController.php
rename to core/modules/comment/lib/Controller/CommentController.php
diff --git a/core/modules/comment/lib/Drupal/comment/Entity/Comment.php b/core/modules/comment/lib/Entity/Comment.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Entity/Comment.php
rename to core/modules/comment/lib/Entity/Comment.php
diff --git a/core/modules/comment/lib/Drupal/comment/Form/ConfirmDeleteMultiple.php b/core/modules/comment/lib/Form/ConfirmDeleteMultiple.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Form/ConfirmDeleteMultiple.php
rename to core/modules/comment/lib/Form/ConfirmDeleteMultiple.php
diff --git a/core/modules/comment/lib/Drupal/comment/Form/DeleteForm.php b/core/modules/comment/lib/Form/DeleteForm.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Form/DeleteForm.php
rename to core/modules/comment/lib/Form/DeleteForm.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Action/PublishComment.php b/core/modules/comment/lib/Plugin/Action/PublishComment.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/Action/PublishComment.php
rename to core/modules/comment/lib/Plugin/Action/PublishComment.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Action/SaveComment.php b/core/modules/comment/lib/Plugin/Action/SaveComment.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/Action/SaveComment.php
rename to core/modules/comment/lib/Plugin/Action/SaveComment.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Action/UnpublishByKeywordComment.php b/core/modules/comment/lib/Plugin/Action/UnpublishByKeywordComment.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/Action/UnpublishByKeywordComment.php
rename to core/modules/comment/lib/Plugin/Action/UnpublishByKeywordComment.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Action/UnpublishComment.php b/core/modules/comment/lib/Plugin/Action/UnpublishComment.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/Action/UnpublishComment.php
rename to core/modules/comment/lib/Plugin/Action/UnpublishComment.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Block/RecentCommentsBlock.php b/core/modules/comment/lib/Plugin/Block/RecentCommentsBlock.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/Block/RecentCommentsBlock.php
rename to core/modules/comment/lib/Plugin/Block/RecentCommentsBlock.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/entity_reference/selection/CommentSelection.php b/core/modules/comment/lib/Plugin/entity_reference/selection/CommentSelection.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/entity_reference/selection/CommentSelection.php
rename to core/modules/comment/lib/Plugin/entity_reference/selection/CommentSelection.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php b/core/modules/comment/lib/Plugin/views/argument/UserUid.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php
rename to core/modules/comment/lib/Plugin/views/argument/UserUid.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Comment.php b/core/modules/comment/lib/Plugin/views/field/Comment.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/views/field/Comment.php
rename to core/modules/comment/lib/Plugin/views/field/Comment.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Depth.php b/core/modules/comment/lib/Plugin/views/field/Depth.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/views/field/Depth.php
rename to core/modules/comment/lib/Plugin/views/field/Depth.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php b/core/modules/comment/lib/Plugin/views/field/LastTimestamp.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php
rename to core/modules/comment/lib/Plugin/views/field/LastTimestamp.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Link.php b/core/modules/comment/lib/Plugin/views/field/Link.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/views/field/Link.php
rename to core/modules/comment/lib/Plugin/views/field/Link.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkApprove.php b/core/modules/comment/lib/Plugin/views/field/LinkApprove.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkApprove.php
rename to core/modules/comment/lib/Plugin/views/field/LinkApprove.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkDelete.php b/core/modules/comment/lib/Plugin/views/field/LinkDelete.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkDelete.php
rename to core/modules/comment/lib/Plugin/views/field/LinkDelete.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkEdit.php b/core/modules/comment/lib/Plugin/views/field/LinkEdit.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkEdit.php
rename to core/modules/comment/lib/Plugin/views/field/LinkEdit.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkReply.php b/core/modules/comment/lib/Plugin/views/field/LinkReply.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkReply.php
rename to core/modules/comment/lib/Plugin/views/field/LinkReply.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php b/core/modules/comment/lib/Plugin/views/field/NcsLastCommentName.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php
rename to core/modules/comment/lib/Plugin/views/field/NcsLastCommentName.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastUpdated.php b/core/modules/comment/lib/Plugin/views/field/NcsLastUpdated.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastUpdated.php
rename to core/modules/comment/lib/Plugin/views/field/NcsLastUpdated.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeComment.php b/core/modules/comment/lib/Plugin/views/field/NodeComment.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeComment.php
rename to core/modules/comment/lib/Plugin/views/field/NodeComment.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeLink.php b/core/modules/comment/lib/Plugin/views/field/NodeLink.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeLink.php
rename to core/modules/comment/lib/Plugin/views/field/NodeLink.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php b/core/modules/comment/lib/Plugin/views/field/NodeNewComments.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php
rename to core/modules/comment/lib/Plugin/views/field/NodeNewComments.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Username.php b/core/modules/comment/lib/Plugin/views/field/Username.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/views/field/Username.php
rename to core/modules/comment/lib/Plugin/views/field/Username.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NcsLastUpdated.php b/core/modules/comment/lib/Plugin/views/filter/NcsLastUpdated.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NcsLastUpdated.php
rename to core/modules/comment/lib/Plugin/views/filter/NcsLastUpdated.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NodeComment.php b/core/modules/comment/lib/Plugin/views/filter/NodeComment.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NodeComment.php
rename to core/modules/comment/lib/Plugin/views/filter/NodeComment.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/UserUid.php b/core/modules/comment/lib/Plugin/views/filter/UserUid.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/views/filter/UserUid.php
rename to core/modules/comment/lib/Plugin/views/filter/UserUid.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/row/CommentRow.php b/core/modules/comment/lib/Plugin/views/row/CommentRow.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/views/row/CommentRow.php
rename to core/modules/comment/lib/Plugin/views/row/CommentRow.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/row/Rss.php b/core/modules/comment/lib/Plugin/views/row/Rss.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/views/row/Rss.php
rename to core/modules/comment/lib/Plugin/views/row/Rss.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastCommentName.php b/core/modules/comment/lib/Plugin/views/sort/NcsLastCommentName.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastCommentName.php
rename to core/modules/comment/lib/Plugin/views/sort/NcsLastCommentName.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastUpdated.php b/core/modules/comment/lib/Plugin/views/sort/NcsLastUpdated.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastUpdated.php
rename to core/modules/comment/lib/Plugin/views/sort/NcsLastUpdated.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/Thread.php b/core/modules/comment/lib/Plugin/views/sort/Thread.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/views/sort/Thread.php
rename to core/modules/comment/lib/Plugin/views/sort/Thread.php
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/wizard/Comment.php b/core/modules/comment/lib/Plugin/views/wizard/Comment.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Plugin/views/wizard/Comment.php
rename to core/modules/comment/lib/Plugin/views/wizard/Comment.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentActionsTest.php b/core/modules/comment/lib/Tests/CommentActionsTest.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/CommentActionsTest.php
rename to core/modules/comment/lib/Tests/CommentActionsTest.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentAnonymousTest.php b/core/modules/comment/lib/Tests/CommentAnonymousTest.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/CommentAnonymousTest.php
rename to core/modules/comment/lib/Tests/CommentAnonymousTest.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentApprovalTest.php b/core/modules/comment/lib/Tests/CommentApprovalTest.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/CommentApprovalTest.php
rename to core/modules/comment/lib/Tests/CommentApprovalTest.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentBlockTest.php b/core/modules/comment/lib/Tests/CommentBlockTest.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/CommentBlockTest.php
rename to core/modules/comment/lib/Tests/CommentBlockTest.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentCSSTest.php b/core/modules/comment/lib/Tests/CommentCSSTest.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/CommentCSSTest.php
rename to core/modules/comment/lib/Tests/CommentCSSTest.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentContentRebuildTest.php b/core/modules/comment/lib/Tests/CommentContentRebuildTest.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/CommentContentRebuildTest.php
rename to core/modules/comment/lib/Tests/CommentContentRebuildTest.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentFieldsTest.php b/core/modules/comment/lib/Tests/CommentFieldsTest.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/CommentFieldsTest.php
rename to core/modules/comment/lib/Tests/CommentFieldsTest.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentInterfaceTest.php b/core/modules/comment/lib/Tests/CommentInterfaceTest.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/CommentInterfaceTest.php
rename to core/modules/comment/lib/Tests/CommentInterfaceTest.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentLanguageTest.php b/core/modules/comment/lib/Tests/CommentLanguageTest.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/CommentLanguageTest.php
rename to core/modules/comment/lib/Tests/CommentLanguageTest.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentLinksTest.php b/core/modules/comment/lib/Tests/CommentLinksTest.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/CommentLinksTest.php
rename to core/modules/comment/lib/Tests/CommentLinksTest.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentNewIndicatorTest.php b/core/modules/comment/lib/Tests/CommentNewIndicatorTest.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/CommentNewIndicatorTest.php
rename to core/modules/comment/lib/Tests/CommentNewIndicatorTest.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentNodeAccessTest.php b/core/modules/comment/lib/Tests/CommentNodeAccessTest.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/CommentNodeAccessTest.php
rename to core/modules/comment/lib/Tests/CommentNodeAccessTest.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentNodeChangesTest.php b/core/modules/comment/lib/Tests/CommentNodeChangesTest.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/CommentNodeChangesTest.php
rename to core/modules/comment/lib/Tests/CommentNodeChangesTest.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentPagerTest.php b/core/modules/comment/lib/Tests/CommentPagerTest.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/CommentPagerTest.php
rename to core/modules/comment/lib/Tests/CommentPagerTest.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentPreviewTest.php b/core/modules/comment/lib/Tests/CommentPreviewTest.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/CommentPreviewTest.php
rename to core/modules/comment/lib/Tests/CommentPreviewTest.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentRssTest.php b/core/modules/comment/lib/Tests/CommentRssTest.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/CommentRssTest.php
rename to core/modules/comment/lib/Tests/CommentRssTest.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentStatisticsTest.php b/core/modules/comment/lib/Tests/CommentStatisticsTest.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/CommentStatisticsTest.php
rename to core/modules/comment/lib/Tests/CommentStatisticsTest.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php b/core/modules/comment/lib/Tests/CommentTestBase.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php
rename to core/modules/comment/lib/Tests/CommentTestBase.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentThreadingTest.php b/core/modules/comment/lib/Tests/CommentThreadingTest.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/CommentThreadingTest.php
rename to core/modules/comment/lib/Tests/CommentThreadingTest.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentTokenReplaceTest.php b/core/modules/comment/lib/Tests/CommentTokenReplaceTest.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/CommentTokenReplaceTest.php
rename to core/modules/comment/lib/Tests/CommentTokenReplaceTest.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentTranslationUITest.php b/core/modules/comment/lib/Tests/CommentTranslationUITest.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/CommentTranslationUITest.php
rename to core/modules/comment/lib/Tests/CommentTranslationUITest.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentUninstallTest.php b/core/modules/comment/lib/Tests/CommentUninstallTest.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/CommentUninstallTest.php
rename to core/modules/comment/lib/Tests/CommentUninstallTest.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/Views/ArgumentUserUIDTest.php b/core/modules/comment/lib/Tests/Views/ArgumentUserUIDTest.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/Views/ArgumentUserUIDTest.php
rename to core/modules/comment/lib/Tests/Views/ArgumentUserUIDTest.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/Views/CommentRowTest.php b/core/modules/comment/lib/Tests/Views/CommentRowTest.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/Views/CommentRowTest.php
rename to core/modules/comment/lib/Tests/Views/CommentRowTest.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/Views/CommentTestBase.php b/core/modules/comment/lib/Tests/Views/CommentTestBase.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/Views/CommentTestBase.php
rename to core/modules/comment/lib/Tests/Views/CommentTestBase.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/Views/DefaultViewRecentComments.php b/core/modules/comment/lib/Tests/Views/DefaultViewRecentComments.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/Views/DefaultViewRecentComments.php
rename to core/modules/comment/lib/Tests/Views/DefaultViewRecentComments.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/Views/FilterUserUIDTest.php b/core/modules/comment/lib/Tests/Views/FilterUserUIDTest.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/Views/FilterUserUIDTest.php
rename to core/modules/comment/lib/Tests/Views/FilterUserUIDTest.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/Views/RowRssTest.php b/core/modules/comment/lib/Tests/Views/RowRssTest.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/Views/RowRssTest.php
rename to core/modules/comment/lib/Tests/Views/RowRssTest.php
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/Views/WizardTest.php b/core/modules/comment/lib/Tests/Views/WizardTest.php
similarity index 100%
rename from core/modules/comment/lib/Drupal/comment/Tests/Views/WizardTest.php
rename to core/modules/comment/lib/Tests/Views/WizardTest.php
diff --git a/core/modules/config/lib/Drupal/config/Controller/ConfigController.php b/core/modules/config/lib/Controller/ConfigController.php
similarity index 100%
rename from core/modules/config/lib/Drupal/config/Controller/ConfigController.php
rename to core/modules/config/lib/Controller/ConfigController.php
diff --git a/core/modules/config/lib/Drupal/config/Form/ConfigExportForm.php b/core/modules/config/lib/Form/ConfigExportForm.php
similarity index 100%
rename from core/modules/config/lib/Drupal/config/Form/ConfigExportForm.php
rename to core/modules/config/lib/Form/ConfigExportForm.php
diff --git a/core/modules/config/lib/Drupal/config/Form/ConfigImportForm.php b/core/modules/config/lib/Form/ConfigImportForm.php
similarity index 100%
rename from core/modules/config/lib/Drupal/config/Form/ConfigImportForm.php
rename to core/modules/config/lib/Form/ConfigImportForm.php
diff --git a/core/modules/config/lib/Drupal/config/Form/ConfigSync.php b/core/modules/config/lib/Form/ConfigSync.php
similarity index 100%
rename from core/modules/config/lib/Drupal/config/Form/ConfigSync.php
rename to core/modules/config/lib/Form/ConfigSync.php
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigCRUDTest.php b/core/modules/config/lib/Tests/ConfigCRUDTest.php
similarity index 100%
rename from core/modules/config/lib/Drupal/config/Tests/ConfigCRUDTest.php
rename to core/modules/config/lib/Tests/ConfigCRUDTest.php
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigDiffTest.php b/core/modules/config/lib/Tests/ConfigDiffTest.php
similarity index 100%
rename from core/modules/config/lib/Drupal/config/Tests/ConfigDiffTest.php
rename to core/modules/config/lib/Tests/ConfigDiffTest.php
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityListTest.php b/core/modules/config/lib/Tests/ConfigEntityListTest.php
similarity index 100%
rename from core/modules/config/lib/Drupal/config/Tests/ConfigEntityListTest.php
rename to core/modules/config/lib/Tests/ConfigEntityListTest.php
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityStatusTest.php b/core/modules/config/lib/Tests/ConfigEntityStatusTest.php
similarity index 100%
rename from core/modules/config/lib/Drupal/config/Tests/ConfigEntityStatusTest.php
rename to core/modules/config/lib/Tests/ConfigEntityStatusTest.php
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityStatusUITest.php b/core/modules/config/lib/Tests/ConfigEntityStatusUITest.php
similarity index 100%
rename from core/modules/config/lib/Drupal/config/Tests/ConfigEntityStatusUITest.php
rename to core/modules/config/lib/Tests/ConfigEntityStatusUITest.php
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityStorageControllerTest.php b/core/modules/config/lib/Tests/ConfigEntityStorageControllerTest.php
similarity index 100%
rename from core/modules/config/lib/Drupal/config/Tests/ConfigEntityStorageControllerTest.php
rename to core/modules/config/lib/Tests/ConfigEntityStorageControllerTest.php
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityTest.php b/core/modules/config/lib/Tests/ConfigEntityTest.php
similarity index 100%
rename from core/modules/config/lib/Drupal/config/Tests/ConfigEntityTest.php
rename to core/modules/config/lib/Tests/ConfigEntityTest.php
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityUnitTest.php b/core/modules/config/lib/Tests/ConfigEntityUnitTest.php
similarity index 100%
rename from core/modules/config/lib/Drupal/config/Tests/ConfigEntityUnitTest.php
rename to core/modules/config/lib/Tests/ConfigEntityUnitTest.php
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigExportUITest.php b/core/modules/config/lib/Tests/ConfigExportUITest.php
similarity index 100%
rename from core/modules/config/lib/Drupal/config/Tests/ConfigExportUITest.php
rename to core/modules/config/lib/Tests/ConfigExportUITest.php
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigFileContentTest.php b/core/modules/config/lib/Tests/ConfigFileContentTest.php
similarity index 100%
rename from core/modules/config/lib/Drupal/config/Tests/ConfigFileContentTest.php
rename to core/modules/config/lib/Tests/ConfigFileContentTest.php
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigImportUITest.php b/core/modules/config/lib/Tests/ConfigImportUITest.php
similarity index 100%
rename from core/modules/config/lib/Drupal/config/Tests/ConfigImportUITest.php
rename to core/modules/config/lib/Tests/ConfigImportUITest.php
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigImportUploadTest.php b/core/modules/config/lib/Tests/ConfigImportUploadTest.php
similarity index 100%
rename from core/modules/config/lib/Drupal/config/Tests/ConfigImportUploadTest.php
rename to core/modules/config/lib/Tests/ConfigImportUploadTest.php
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigImporterTest.php b/core/modules/config/lib/Tests/ConfigImporterTest.php
similarity index 100%
rename from core/modules/config/lib/Drupal/config/Tests/ConfigImporterTest.php
rename to core/modules/config/lib/Tests/ConfigImporterTest.php
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigInstallTest.php b/core/modules/config/lib/Tests/ConfigInstallTest.php
similarity index 100%
rename from core/modules/config/lib/Drupal/config/Tests/ConfigInstallTest.php
rename to core/modules/config/lib/Tests/ConfigInstallTest.php
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigInstallWebTest.php b/core/modules/config/lib/Tests/ConfigInstallWebTest.php
similarity index 100%
rename from core/modules/config/lib/Drupal/config/Tests/ConfigInstallWebTest.php
rename to core/modules/config/lib/Tests/ConfigInstallWebTest.php
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigLocaleOverride.php b/core/modules/config/lib/Tests/ConfigLocaleOverride.php
similarity index 100%
rename from core/modules/config/lib/Drupal/config/Tests/ConfigLocaleOverride.php
rename to core/modules/config/lib/Tests/ConfigLocaleOverride.php
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigLocaleOverrideWebTest.php b/core/modules/config/lib/Tests/ConfigLocaleOverrideWebTest.php
similarity index 100%
rename from core/modules/config/lib/Drupal/config/Tests/ConfigLocaleOverrideWebTest.php
rename to core/modules/config/lib/Tests/ConfigLocaleOverrideWebTest.php
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigOverrideTest.php b/core/modules/config/lib/Tests/ConfigOverrideTest.php
similarity index 100%
rename from core/modules/config/lib/Drupal/config/Tests/ConfigOverrideTest.php
rename to core/modules/config/lib/Tests/ConfigOverrideTest.php
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigSchemaTest.php b/core/modules/config/lib/Tests/ConfigSchemaTest.php
similarity index 100%
rename from core/modules/config/lib/Drupal/config/Tests/ConfigSchemaTest.php
rename to core/modules/config/lib/Tests/ConfigSchemaTest.php
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigSnapshotTest.php b/core/modules/config/lib/Tests/ConfigSnapshotTest.php
similarity index 100%
rename from core/modules/config/lib/Drupal/config/Tests/ConfigSnapshotTest.php
rename to core/modules/config/lib/Tests/ConfigSnapshotTest.php
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigUpgradeTest.php b/core/modules/config/lib/Tests/ConfigUpgradeTest.php
similarity index 100%
rename from core/modules/config/lib/Drupal/config/Tests/ConfigUpgradeTest.php
rename to core/modules/config/lib/Tests/ConfigUpgradeTest.php
diff --git a/core/modules/config/lib/Drupal/config/Tests/Storage/ConfigStorageTestBase.php b/core/modules/config/lib/Tests/Storage/ConfigStorageTestBase.php
similarity index 100%
rename from core/modules/config/lib/Drupal/config/Tests/Storage/ConfigStorageTestBase.php
rename to core/modules/config/lib/Tests/Storage/ConfigStorageTestBase.php
diff --git a/core/modules/config/lib/Drupal/config/Tests/Storage/DatabaseStorageTest.php b/core/modules/config/lib/Tests/Storage/DatabaseStorageTest.php
similarity index 100%
rename from core/modules/config/lib/Drupal/config/Tests/Storage/DatabaseStorageTest.php
rename to core/modules/config/lib/Tests/Storage/DatabaseStorageTest.php
diff --git a/core/modules/config/lib/Drupal/config/Tests/Storage/FileStorageTest.php b/core/modules/config/lib/Tests/Storage/FileStorageTest.php
similarity index 100%
rename from core/modules/config/lib/Drupal/config/Tests/Storage/FileStorageTest.php
rename to core/modules/config/lib/Tests/Storage/FileStorageTest.php
diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestAccessController.php b/core/modules/config/tests/config_test/lib/ConfigTestAccessController.php
similarity index 100%
rename from core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestAccessController.php
rename to core/modules/config/tests/config_test/lib/ConfigTestAccessController.php
diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestController.php b/core/modules/config/tests/config_test/lib/ConfigTestController.php
similarity index 100%
rename from core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestController.php
rename to core/modules/config/tests/config_test/lib/ConfigTestController.php
diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestFormController.php b/core/modules/config/tests/config_test/lib/ConfigTestFormController.php
similarity index 100%
rename from core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestFormController.php
rename to core/modules/config/tests/config_test/lib/ConfigTestFormController.php
diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestInterface.php b/core/modules/config/tests/config_test/lib/ConfigTestInterface.php
similarity index 100%
rename from core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestInterface.php
rename to core/modules/config/tests/config_test/lib/ConfigTestInterface.php
diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestListController.php b/core/modules/config/tests/config_test/lib/ConfigTestListController.php
similarity index 100%
rename from core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestListController.php
rename to core/modules/config/tests/config_test/lib/ConfigTestListController.php
diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestStorageController.php b/core/modules/config/tests/config_test/lib/ConfigTestStorageController.php
similarity index 100%
rename from core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestStorageController.php
rename to core/modules/config/tests/config_test/lib/ConfigTestStorageController.php
diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigQueryTest.php b/core/modules/config/tests/config_test/lib/Entity/ConfigQueryTest.php
similarity index 100%
rename from core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigQueryTest.php
rename to core/modules/config/tests/config_test/lib/Entity/ConfigQueryTest.php
diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigTest.php b/core/modules/config/tests/config_test/lib/Entity/ConfigTest.php
similarity index 100%
rename from core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigTest.php
rename to core/modules/config/tests/config_test/lib/Entity/ConfigTest.php
diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/Form/ConfigTestDeleteForm.php b/core/modules/config/tests/config_test/lib/Form/ConfigTestDeleteForm.php
similarity index 100%
rename from core/modules/config/tests/config_test/lib/Drupal/config_test/Form/ConfigTestDeleteForm.php
rename to core/modules/config/tests/config_test/lib/Form/ConfigTestDeleteForm.php
diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Menu/LocalAction/AddConfigTestEntityLocalAction.php b/core/modules/config/tests/config_test/lib/Plugin/Menu/LocalAction/AddConfigTestEntityLocalAction.php
similarity index 100%
rename from core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Menu/LocalAction/AddConfigTestEntityLocalAction.php
rename to core/modules/config/tests/config_test/lib/Plugin/Menu/LocalAction/AddConfigTestEntityLocalAction.php
diff --git a/core/modules/contact/lib/Drupal/contact/CategoryAccessController.php b/core/modules/contact/lib/CategoryAccessController.php
similarity index 100%
rename from core/modules/contact/lib/Drupal/contact/CategoryAccessController.php
rename to core/modules/contact/lib/CategoryAccessController.php
diff --git a/core/modules/contact/lib/Drupal/contact/CategoryFormController.php b/core/modules/contact/lib/CategoryFormController.php
similarity index 100%
rename from core/modules/contact/lib/Drupal/contact/CategoryFormController.php
rename to core/modules/contact/lib/CategoryFormController.php
diff --git a/core/modules/contact/lib/Drupal/contact/CategoryInterface.php b/core/modules/contact/lib/CategoryInterface.php
similarity index 100%
rename from core/modules/contact/lib/Drupal/contact/CategoryInterface.php
rename to core/modules/contact/lib/CategoryInterface.php
diff --git a/core/modules/contact/lib/Drupal/contact/CategoryListController.php b/core/modules/contact/lib/CategoryListController.php
similarity index 100%
rename from core/modules/contact/lib/Drupal/contact/CategoryListController.php
rename to core/modules/contact/lib/CategoryListController.php
diff --git a/core/modules/contact/lib/Drupal/contact/CategoryStorageController.php b/core/modules/contact/lib/CategoryStorageController.php
similarity index 100%
rename from core/modules/contact/lib/Drupal/contact/CategoryStorageController.php
rename to core/modules/contact/lib/CategoryStorageController.php
diff --git a/core/modules/contact/lib/Drupal/contact/Entity/Category.php b/core/modules/contact/lib/Entity/Category.php
similarity index 100%
rename from core/modules/contact/lib/Drupal/contact/Entity/Category.php
rename to core/modules/contact/lib/Entity/Category.php
diff --git a/core/modules/contact/lib/Drupal/contact/Entity/Message.php b/core/modules/contact/lib/Entity/Message.php
similarity index 100%
rename from core/modules/contact/lib/Drupal/contact/Entity/Message.php
rename to core/modules/contact/lib/Entity/Message.php
diff --git a/core/modules/contact/lib/Drupal/contact/Form/CategoryDeleteForm.php b/core/modules/contact/lib/Form/CategoryDeleteForm.php
similarity index 100%
rename from core/modules/contact/lib/Drupal/contact/Form/CategoryDeleteForm.php
rename to core/modules/contact/lib/Form/CategoryDeleteForm.php
diff --git a/core/modules/contact/lib/Drupal/contact/MessageFormController.php b/core/modules/contact/lib/MessageFormController.php
similarity index 100%
rename from core/modules/contact/lib/Drupal/contact/MessageFormController.php
rename to core/modules/contact/lib/MessageFormController.php
diff --git a/core/modules/contact/lib/Drupal/contact/MessageInterface.php b/core/modules/contact/lib/MessageInterface.php
similarity index 100%
rename from core/modules/contact/lib/Drupal/contact/MessageInterface.php
rename to core/modules/contact/lib/MessageInterface.php
diff --git a/core/modules/contact/lib/Drupal/contact/MessageRenderController.php b/core/modules/contact/lib/MessageRenderController.php
similarity index 100%
rename from core/modules/contact/lib/Drupal/contact/MessageRenderController.php
rename to core/modules/contact/lib/MessageRenderController.php
diff --git a/core/modules/contact/lib/Drupal/contact/Plugin/views/field/ContactLink.php b/core/modules/contact/lib/Plugin/views/field/ContactLink.php
similarity index 100%
rename from core/modules/contact/lib/Drupal/contact/Plugin/views/field/ContactLink.php
rename to core/modules/contact/lib/Plugin/views/field/ContactLink.php
diff --git a/core/modules/contact/lib/Drupal/contact/Tests/ContactAuthenticatedUserTest.php b/core/modules/contact/lib/Tests/ContactAuthenticatedUserTest.php
similarity index 100%
rename from core/modules/contact/lib/Drupal/contact/Tests/ContactAuthenticatedUserTest.php
rename to core/modules/contact/lib/Tests/ContactAuthenticatedUserTest.php
diff --git a/core/modules/contact/lib/Drupal/contact/Tests/ContactPersonalTest.php b/core/modules/contact/lib/Tests/ContactPersonalTest.php
similarity index 100%
rename from core/modules/contact/lib/Drupal/contact/Tests/ContactPersonalTest.php
rename to core/modules/contact/lib/Tests/ContactPersonalTest.php
diff --git a/core/modules/contact/lib/Drupal/contact/Tests/ContactSitewideTest.php b/core/modules/contact/lib/Tests/ContactSitewideTest.php
similarity index 100%
rename from core/modules/contact/lib/Drupal/contact/Tests/ContactSitewideTest.php
rename to core/modules/contact/lib/Tests/ContactSitewideTest.php
diff --git a/core/modules/contact/lib/Drupal/contact/Tests/ContactUpgradePathTest.php b/core/modules/contact/lib/Tests/ContactUpgradePathTest.php
similarity index 100%
rename from core/modules/contact/lib/Drupal/contact/Tests/ContactUpgradePathTest.php
rename to core/modules/contact/lib/Tests/ContactUpgradePathTest.php
diff --git a/core/modules/contact/lib/Drupal/contact/Tests/MessageEntityTest.php b/core/modules/contact/lib/Tests/MessageEntityTest.php
similarity index 100%
rename from core/modules/contact/lib/Drupal/contact/Tests/MessageEntityTest.php
rename to core/modules/contact/lib/Tests/MessageEntityTest.php
diff --git a/core/modules/contact/lib/Drupal/contact/Tests/Views/ContactFieldsTest.php b/core/modules/contact/lib/Tests/Views/ContactFieldsTest.php
similarity index 100%
rename from core/modules/contact/lib/Drupal/contact/Tests/Views/ContactFieldsTest.php
rename to core/modules/contact/lib/Tests/Views/ContactFieldsTest.php
diff --git a/core/modules/contact/lib/Drupal/contact/Tests/Views/ContactLinkTest.php b/core/modules/contact/lib/Tests/Views/ContactLinkTest.php
similarity index 100%
rename from core/modules/contact/lib/Drupal/contact/Tests/Views/ContactLinkTest.php
rename to core/modules/contact/lib/Tests/Views/ContactLinkTest.php
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php b/core/modules/content_translation/lib/ContentTranslationController.php
similarity index 100%
rename from core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php
rename to core/modules/content_translation/lib/ContentTranslationController.php
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationControllerInterface.php b/core/modules/content_translation/lib/ContentTranslationControllerInterface.php
similarity index 100%
rename from core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationControllerInterface.php
rename to core/modules/content_translation/lib/ContentTranslationControllerInterface.php
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationControllerNG.php b/core/modules/content_translation/lib/ContentTranslationControllerNG.php
similarity index 100%
rename from core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationControllerNG.php
rename to core/modules/content_translation/lib/ContentTranslationControllerNG.php
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/FieldTranslationSynchronizer.php b/core/modules/content_translation/lib/FieldTranslationSynchronizer.php
similarity index 100%
rename from core/modules/content_translation/lib/Drupal/content_translation/FieldTranslationSynchronizer.php
rename to core/modules/content_translation/lib/FieldTranslationSynchronizer.php
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/FieldTranslationSynchronizerInterface.php b/core/modules/content_translation/lib/FieldTranslationSynchronizerInterface.php
similarity index 100%
rename from core/modules/content_translation/lib/Drupal/content_translation/FieldTranslationSynchronizerInterface.php
rename to core/modules/content_translation/lib/FieldTranslationSynchronizerInterface.php
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Form/TranslatableForm.php b/core/modules/content_translation/lib/Form/TranslatableForm.php
similarity index 100%
rename from core/modules/content_translation/lib/Drupal/content_translation/Form/TranslatableForm.php
rename to core/modules/content_translation/lib/Form/TranslatableForm.php
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Plugin/views/field/TranslationLink.php b/core/modules/content_translation/lib/Plugin/views/field/TranslationLink.php
similarity index 100%
rename from core/modules/content_translation/lib/Drupal/content_translation/Plugin/views/field/TranslationLink.php
rename to core/modules/content_translation/lib/Plugin/views/field/TranslationLink.php
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ConfigTestTranslationUITest.php b/core/modules/content_translation/lib/Tests/ConfigTestTranslationUITest.php
similarity index 100%
rename from core/modules/content_translation/lib/Drupal/content_translation/Tests/ConfigTestTranslationUITest.php
rename to core/modules/content_translation/lib/Tests/ConfigTestTranslationUITest.php
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTestTranslationUITest.php b/core/modules/content_translation/lib/Tests/ContentTestTranslationUITest.php
similarity index 100%
rename from core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTestTranslationUITest.php
rename to core/modules/content_translation/lib/Tests/ContentTestTranslationUITest.php
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSettingsTest.php b/core/modules/content_translation/lib/Tests/ContentTranslationSettingsTest.php
similarity index 100%
rename from core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSettingsTest.php
rename to core/modules/content_translation/lib/Tests/ContentTranslationSettingsTest.php
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSyncImageTest.php b/core/modules/content_translation/lib/Tests/ContentTranslationSyncImageTest.php
similarity index 100%
rename from core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSyncImageTest.php
rename to core/modules/content_translation/lib/Tests/ContentTranslationSyncImageTest.php
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSyncUnitTest.php b/core/modules/content_translation/lib/Tests/ContentTranslationSyncUnitTest.php
similarity index 100%
rename from core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSyncUnitTest.php
rename to core/modules/content_translation/lib/Tests/ContentTranslationSyncUnitTest.php
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationTestBase.php b/core/modules/content_translation/lib/Tests/ContentTranslationTestBase.php
similarity index 100%
rename from core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationTestBase.php
rename to core/modules/content_translation/lib/Tests/ContentTranslationTestBase.php
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationUITest.php b/core/modules/content_translation/lib/Tests/ContentTranslationUITest.php
similarity index 100%
rename from core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationUITest.php
rename to core/modules/content_translation/lib/Tests/ContentTranslationUITest.php
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationWorkflowsTest.php b/core/modules/content_translation/lib/Tests/ContentTranslationWorkflowsTest.php
similarity index 100%
rename from core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationWorkflowsTest.php
rename to core/modules/content_translation/lib/Tests/ContentTranslationWorkflowsTest.php
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/Views/ContentTranslationViewsUITest.php b/core/modules/content_translation/lib/Tests/Views/ContentTranslationViewsUITest.php
similarity index 100%
rename from core/modules/content_translation/lib/Drupal/content_translation/Tests/Views/ContentTranslationViewsUITest.php
rename to core/modules/content_translation/lib/Tests/Views/ContentTranslationViewsUITest.php
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/Views/TranslationLinkTest.php b/core/modules/content_translation/lib/Tests/Views/TranslationLinkTest.php
similarity index 100%
rename from core/modules/content_translation/lib/Drupal/content_translation/Tests/Views/TranslationLinkTest.php
rename to core/modules/content_translation/lib/Tests/Views/TranslationLinkTest.php
diff --git a/core/modules/contextual/lib/Drupal/contextual/ContextualController.php b/core/modules/contextual/lib/ContextualController.php
similarity index 100%
rename from core/modules/contextual/lib/Drupal/contextual/ContextualController.php
rename to core/modules/contextual/lib/ContextualController.php
diff --git a/core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php b/core/modules/contextual/lib/Plugin/views/field/ContextualLinks.php
similarity index 100%
rename from core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php
rename to core/modules/contextual/lib/Plugin/views/field/ContextualLinks.php
diff --git a/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualDynamicContextTest.php b/core/modules/contextual/lib/Tests/ContextualDynamicContextTest.php
similarity index 100%
rename from core/modules/contextual/lib/Drupal/contextual/Tests/ContextualDynamicContextTest.php
rename to core/modules/contextual/lib/Tests/ContextualDynamicContextTest.php
diff --git a/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualUnitTest.php b/core/modules/contextual/lib/Tests/ContextualUnitTest.php
similarity index 100%
rename from core/modules/contextual/lib/Drupal/contextual/Tests/ContextualUnitTest.php
rename to core/modules/contextual/lib/Tests/ContextualUnitTest.php
diff --git a/core/modules/datetime/lib/Drupal/datetime/DateHelper.php b/core/modules/datetime/lib/DateHelper.php
similarity index 100%
rename from core/modules/datetime/lib/Drupal/datetime/DateHelper.php
rename to core/modules/datetime/lib/DateHelper.php
diff --git a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/field_type/DateTimeItem.php b/core/modules/datetime/lib/Plugin/field/field_type/DateTimeItem.php
similarity index 100%
rename from core/modules/datetime/lib/Drupal/datetime/Plugin/field/field_type/DateTimeItem.php
rename to core/modules/datetime/lib/Plugin/field/field_type/DateTimeItem.php
diff --git a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimeDefaultFormatter.php b/core/modules/datetime/lib/Plugin/field/formatter/DatetimeDefaultFormatter.php
similarity index 100%
rename from core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimeDefaultFormatter.php
rename to core/modules/datetime/lib/Plugin/field/formatter/DatetimeDefaultFormatter.php
diff --git a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimePlainFormatter.php b/core/modules/datetime/lib/Plugin/field/formatter/DatetimePlainFormatter.php
similarity index 100%
rename from core/modules/datetime/lib/Drupal/datetime/Plugin/field/formatter/DatetimePlainFormatter.php
rename to core/modules/datetime/lib/Plugin/field/formatter/DatetimePlainFormatter.php
diff --git a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDatelistWidget.php b/core/modules/datetime/lib/Plugin/field/widget/DatetimeDatelistWidget.php
similarity index 100%
rename from core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDatelistWidget.php
rename to core/modules/datetime/lib/Plugin/field/widget/DatetimeDatelistWidget.php
diff --git a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDefaultWidget.php b/core/modules/datetime/lib/Plugin/field/widget/DatetimeDefaultWidget.php
similarity index 100%
rename from core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDefaultWidget.php
rename to core/modules/datetime/lib/Plugin/field/widget/DatetimeDefaultWidget.php
diff --git a/core/modules/datetime/lib/Drupal/datetime/Tests/DateTimeItemTest.php b/core/modules/datetime/lib/Tests/DateTimeItemTest.php
similarity index 100%
rename from core/modules/datetime/lib/Drupal/datetime/Tests/DateTimeItemTest.php
rename to core/modules/datetime/lib/Tests/DateTimeItemTest.php
diff --git a/core/modules/datetime/lib/Drupal/datetime/Tests/DatetimeFieldTest.php b/core/modules/datetime/lib/Tests/DatetimeFieldTest.php
similarity index 100%
rename from core/modules/datetime/lib/Drupal/datetime/Tests/DatetimeFieldTest.php
rename to core/modules/datetime/lib/Tests/DatetimeFieldTest.php
diff --git a/core/modules/dblog/lib/Drupal/dblog/Controller/DbLogController.php b/core/modules/dblog/lib/Controller/DbLogController.php
similarity index 100%
rename from core/modules/dblog/lib/Drupal/dblog/Controller/DbLogController.php
rename to core/modules/dblog/lib/Controller/DbLogController.php
diff --git a/core/modules/dblog/lib/Drupal/dblog/Plugin/views/field/DblogMessage.php b/core/modules/dblog/lib/Plugin/views/field/DblogMessage.php
similarity index 100%
rename from core/modules/dblog/lib/Drupal/dblog/Plugin/views/field/DblogMessage.php
rename to core/modules/dblog/lib/Plugin/views/field/DblogMessage.php
diff --git a/core/modules/dblog/lib/Drupal/dblog/Plugin/views/field/DblogOperations.php b/core/modules/dblog/lib/Plugin/views/field/DblogOperations.php
similarity index 100%
rename from core/modules/dblog/lib/Drupal/dblog/Plugin/views/field/DblogOperations.php
rename to core/modules/dblog/lib/Plugin/views/field/DblogOperations.php
diff --git a/core/modules/dblog/lib/Drupal/dblog/Plugin/views/wizard/Watchdog.php b/core/modules/dblog/lib/Plugin/views/wizard/Watchdog.php
similarity index 100%
rename from core/modules/dblog/lib/Drupal/dblog/Plugin/views/wizard/Watchdog.php
rename to core/modules/dblog/lib/Plugin/views/wizard/Watchdog.php
diff --git a/core/modules/dblog/lib/Drupal/dblog/Tests/DbLogTest.php b/core/modules/dblog/lib/Tests/DbLogTest.php
similarity index 100%
rename from core/modules/dblog/lib/Drupal/dblog/Tests/DbLogTest.php
rename to core/modules/dblog/lib/Tests/DbLogTest.php
diff --git a/core/modules/dblog/lib/Drupal/dblog/Tests/Views/ViewsIntegrationTest.php b/core/modules/dblog/lib/Tests/Views/ViewsIntegrationTest.php
similarity index 100%
rename from core/modules/dblog/lib/Drupal/dblog/Tests/Views/ViewsIntegrationTest.php
rename to core/modules/dblog/lib/Tests/Views/ViewsIntegrationTest.php
diff --git a/core/modules/edit/lib/Drupal/edit/Access/EditEntityAccessCheck.php b/core/modules/edit/lib/Access/EditEntityAccessCheck.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Access/EditEntityAccessCheck.php
rename to core/modules/edit/lib/Access/EditEntityAccessCheck.php
diff --git a/core/modules/edit/lib/Drupal/edit/Access/EditEntityFieldAccessCheck.php b/core/modules/edit/lib/Access/EditEntityFieldAccessCheck.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Access/EditEntityFieldAccessCheck.php
rename to core/modules/edit/lib/Access/EditEntityFieldAccessCheck.php
diff --git a/core/modules/edit/lib/Drupal/edit/Access/EditEntityFieldAccessCheckInterface.php b/core/modules/edit/lib/Access/EditEntityFieldAccessCheckInterface.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Access/EditEntityFieldAccessCheckInterface.php
rename to core/modules/edit/lib/Access/EditEntityFieldAccessCheckInterface.php
diff --git a/core/modules/edit/lib/Drupal/edit/Ajax/BaseCommand.php b/core/modules/edit/lib/Ajax/BaseCommand.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Ajax/BaseCommand.php
rename to core/modules/edit/lib/Ajax/BaseCommand.php
diff --git a/core/modules/edit/lib/Drupal/edit/Ajax/EntitySavedCommand.php b/core/modules/edit/lib/Ajax/EntitySavedCommand.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Ajax/EntitySavedCommand.php
rename to core/modules/edit/lib/Ajax/EntitySavedCommand.php
diff --git a/core/modules/edit/lib/Drupal/edit/Ajax/FieldFormCommand.php b/core/modules/edit/lib/Ajax/FieldFormCommand.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Ajax/FieldFormCommand.php
rename to core/modules/edit/lib/Ajax/FieldFormCommand.php
diff --git a/core/modules/edit/lib/Drupal/edit/Ajax/FieldFormSavedCommand.php b/core/modules/edit/lib/Ajax/FieldFormSavedCommand.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Ajax/FieldFormSavedCommand.php
rename to core/modules/edit/lib/Ajax/FieldFormSavedCommand.php
diff --git a/core/modules/edit/lib/Drupal/edit/Ajax/FieldFormValidationErrorsCommand.php b/core/modules/edit/lib/Ajax/FieldFormValidationErrorsCommand.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Ajax/FieldFormValidationErrorsCommand.php
rename to core/modules/edit/lib/Ajax/FieldFormValidationErrorsCommand.php
diff --git a/core/modules/edit/lib/Drupal/edit/Annotation/InPlaceEditor.php b/core/modules/edit/lib/Annotation/InPlaceEditor.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Annotation/InPlaceEditor.php
rename to core/modules/edit/lib/Annotation/InPlaceEditor.php
diff --git a/core/modules/edit/lib/Drupal/edit/EditController.php b/core/modules/edit/lib/EditController.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/EditController.php
rename to core/modules/edit/lib/EditController.php
diff --git a/core/modules/edit/lib/Drupal/edit/EditPluginInterface.php b/core/modules/edit/lib/EditPluginInterface.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/EditPluginInterface.php
rename to core/modules/edit/lib/EditPluginInterface.php
diff --git a/core/modules/edit/lib/Drupal/edit/EditorBase.php b/core/modules/edit/lib/EditorBase.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/EditorBase.php
rename to core/modules/edit/lib/EditorBase.php
diff --git a/core/modules/edit/lib/Drupal/edit/EditorSelector.php b/core/modules/edit/lib/EditorSelector.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/EditorSelector.php
rename to core/modules/edit/lib/EditorSelector.php
diff --git a/core/modules/edit/lib/Drupal/edit/EditorSelectorInterface.php b/core/modules/edit/lib/EditorSelectorInterface.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/EditorSelectorInterface.php
rename to core/modules/edit/lib/EditorSelectorInterface.php
diff --git a/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php b/core/modules/edit/lib/Form/EditFieldForm.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php
rename to core/modules/edit/lib/Form/EditFieldForm.php
diff --git a/core/modules/edit/lib/Drupal/edit/MetadataGenerator.php b/core/modules/edit/lib/MetadataGenerator.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/MetadataGenerator.php
rename to core/modules/edit/lib/MetadataGenerator.php
diff --git a/core/modules/edit/lib/Drupal/edit/MetadataGeneratorInterface.php b/core/modules/edit/lib/MetadataGeneratorInterface.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/MetadataGeneratorInterface.php
rename to core/modules/edit/lib/MetadataGeneratorInterface.php
diff --git a/core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditor/DirectEditor.php b/core/modules/edit/lib/Plugin/InPlaceEditor/DirectEditor.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditor/DirectEditor.php
rename to core/modules/edit/lib/Plugin/InPlaceEditor/DirectEditor.php
diff --git a/core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditor/FormEditor.php b/core/modules/edit/lib/Plugin/InPlaceEditor/FormEditor.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditor/FormEditor.php
rename to core/modules/edit/lib/Plugin/InPlaceEditor/FormEditor.php
diff --git a/core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditorManager.php b/core/modules/edit/lib/Plugin/InPlaceEditorManager.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditorManager.php
rename to core/modules/edit/lib/Plugin/InPlaceEditorManager.php
diff --git a/core/modules/edit/lib/Drupal/edit/Tests/EditLoadingTest.php b/core/modules/edit/lib/Tests/EditLoadingTest.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Tests/EditLoadingTest.php
rename to core/modules/edit/lib/Tests/EditLoadingTest.php
diff --git a/core/modules/edit/lib/Drupal/edit/Tests/EditTestBase.php b/core/modules/edit/lib/Tests/EditTestBase.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Tests/EditTestBase.php
rename to core/modules/edit/lib/Tests/EditTestBase.php
diff --git a/core/modules/edit/lib/Drupal/edit/Tests/EditorSelectionTest.php b/core/modules/edit/lib/Tests/EditorSelectionTest.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Tests/EditorSelectionTest.php
rename to core/modules/edit/lib/Tests/EditorSelectionTest.php
diff --git a/core/modules/edit/lib/Drupal/edit/Tests/MetadataGeneratorTest.php b/core/modules/edit/lib/Tests/MetadataGeneratorTest.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Tests/MetadataGeneratorTest.php
rename to core/modules/edit/lib/Tests/MetadataGeneratorTest.php
diff --git a/core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityAccessCheckTest.php b/core/modules/edit/lib/Tests/edit/Access/EditEntityAccessCheckTest.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityAccessCheckTest.php
rename to core/modules/edit/lib/Tests/edit/Access/EditEntityAccessCheckTest.php
diff --git a/core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityFieldAccessCheckTest.php b/core/modules/edit/lib/Tests/edit/Access/EditEntityFieldAccessCheckTest.php
similarity index 100%
rename from core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityFieldAccessCheckTest.php
rename to core/modules/edit/lib/Tests/edit/Access/EditEntityFieldAccessCheckTest.php
diff --git a/core/modules/edit/tests/modules/lib/Drupal/edit_test/MockEditEntityFieldAccessCheck.php b/core/modules/edit/tests/modules/lib/MockEditEntityFieldAccessCheck.php
similarity index 100%
rename from core/modules/edit/tests/modules/lib/Drupal/edit_test/MockEditEntityFieldAccessCheck.php
rename to core/modules/edit/tests/modules/lib/MockEditEntityFieldAccessCheck.php
diff --git a/core/modules/edit/tests/modules/lib/Drupal/edit_test/Plugin/InPlaceEditor/WysiwygEditor.php b/core/modules/edit/tests/modules/lib/Plugin/InPlaceEditor/WysiwygEditor.php
similarity index 100%
rename from core/modules/edit/tests/modules/lib/Drupal/edit_test/Plugin/InPlaceEditor/WysiwygEditor.php
rename to core/modules/edit/tests/modules/lib/Plugin/InPlaceEditor/WysiwygEditor.php
diff --git a/core/modules/editor/lib/Drupal/editor/Ajax/EditorDialogSave.php b/core/modules/editor/lib/Ajax/EditorDialogSave.php
similarity index 100%
rename from core/modules/editor/lib/Drupal/editor/Ajax/EditorDialogSave.php
rename to core/modules/editor/lib/Ajax/EditorDialogSave.php
diff --git a/core/modules/editor/lib/Drupal/editor/Ajax/GetUntransformedTextCommand.php b/core/modules/editor/lib/Ajax/GetUntransformedTextCommand.php
similarity index 100%
rename from core/modules/editor/lib/Drupal/editor/Ajax/GetUntransformedTextCommand.php
rename to core/modules/editor/lib/Ajax/GetUntransformedTextCommand.php
diff --git a/core/modules/editor/lib/Drupal/editor/Annotation/Editor.php b/core/modules/editor/lib/Annotation/Editor.php
similarity index 100%
rename from core/modules/editor/lib/Drupal/editor/Annotation/Editor.php
rename to core/modules/editor/lib/Annotation/Editor.php
diff --git a/core/modules/editor/lib/Drupal/editor/EditorController.php b/core/modules/editor/lib/EditorController.php
similarity index 100%
rename from core/modules/editor/lib/Drupal/editor/EditorController.php
rename to core/modules/editor/lib/EditorController.php
diff --git a/core/modules/editor/lib/Drupal/editor/EditorInterface.php b/core/modules/editor/lib/EditorInterface.php
similarity index 100%
rename from core/modules/editor/lib/Drupal/editor/EditorInterface.php
rename to core/modules/editor/lib/EditorInterface.php
diff --git a/core/modules/editor/lib/Drupal/editor/Entity/Editor.php b/core/modules/editor/lib/Entity/Editor.php
similarity index 100%
rename from core/modules/editor/lib/Drupal/editor/Entity/Editor.php
rename to core/modules/editor/lib/Entity/Editor.php
diff --git a/core/modules/editor/lib/Drupal/editor/Form/EditorImageDialog.php b/core/modules/editor/lib/Form/EditorImageDialog.php
similarity index 100%
rename from core/modules/editor/lib/Drupal/editor/Form/EditorImageDialog.php
rename to core/modules/editor/lib/Form/EditorImageDialog.php
diff --git a/core/modules/editor/lib/Drupal/editor/Form/EditorLinkDialog.php b/core/modules/editor/lib/Form/EditorLinkDialog.php
similarity index 100%
rename from core/modules/editor/lib/Drupal/editor/Form/EditorLinkDialog.php
rename to core/modules/editor/lib/Form/EditorLinkDialog.php
diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/EditorBase.php b/core/modules/editor/lib/Plugin/EditorBase.php
similarity index 100%
rename from core/modules/editor/lib/Drupal/editor/Plugin/EditorBase.php
rename to core/modules/editor/lib/Plugin/EditorBase.php
diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/EditorManager.php b/core/modules/editor/lib/Plugin/EditorManager.php
similarity index 100%
rename from core/modules/editor/lib/Drupal/editor/Plugin/EditorManager.php
rename to core/modules/editor/lib/Plugin/EditorManager.php
diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/EditorPluginInterface.php b/core/modules/editor/lib/Plugin/EditorPluginInterface.php
similarity index 100%
rename from core/modules/editor/lib/Drupal/editor/Plugin/EditorPluginInterface.php
rename to core/modules/editor/lib/Plugin/EditorPluginInterface.php
diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php b/core/modules/editor/lib/Plugin/InPlaceEditor/Editor.php
similarity index 100%
rename from core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php
rename to core/modules/editor/lib/Plugin/InPlaceEditor/Editor.php
diff --git a/core/modules/editor/lib/Drupal/editor/Tests/EditIntegrationLoadingTest.php b/core/modules/editor/lib/Tests/EditIntegrationLoadingTest.php
similarity index 100%
rename from core/modules/editor/lib/Drupal/editor/Tests/EditIntegrationLoadingTest.php
rename to core/modules/editor/lib/Tests/EditIntegrationLoadingTest.php
diff --git a/core/modules/editor/lib/Drupal/editor/Tests/EditIntegrationTest.php b/core/modules/editor/lib/Tests/EditIntegrationTest.php
similarity index 100%
rename from core/modules/editor/lib/Drupal/editor/Tests/EditIntegrationTest.php
rename to core/modules/editor/lib/Tests/EditIntegrationTest.php
diff --git a/core/modules/editor/lib/Drupal/editor/Tests/EditorAdminTest.php b/core/modules/editor/lib/Tests/EditorAdminTest.php
similarity index 100%
rename from core/modules/editor/lib/Drupal/editor/Tests/EditorAdminTest.php
rename to core/modules/editor/lib/Tests/EditorAdminTest.php
diff --git a/core/modules/editor/lib/Drupal/editor/Tests/EditorFileUsageTest.php b/core/modules/editor/lib/Tests/EditorFileUsageTest.php
similarity index 100%
rename from core/modules/editor/lib/Drupal/editor/Tests/EditorFileUsageTest.php
rename to core/modules/editor/lib/Tests/EditorFileUsageTest.php
diff --git a/core/modules/editor/lib/Drupal/editor/Tests/EditorLoadingTest.php b/core/modules/editor/lib/Tests/EditorLoadingTest.php
similarity index 100%
rename from core/modules/editor/lib/Drupal/editor/Tests/EditorLoadingTest.php
rename to core/modules/editor/lib/Tests/EditorLoadingTest.php
diff --git a/core/modules/editor/lib/Drupal/editor/Tests/EditorManagerTest.php b/core/modules/editor/lib/Tests/EditorManagerTest.php
similarity index 100%
rename from core/modules/editor/lib/Drupal/editor/Tests/EditorManagerTest.php
rename to core/modules/editor/lib/Tests/EditorManagerTest.php
diff --git a/core/modules/editor/tests/modules/lib/Drupal/editor_test/Plugin/Editor/UnicornEditor.php b/core/modules/editor/tests/modules/lib/Plugin/Editor/UnicornEditor.php
similarity index 100%
rename from core/modules/editor/tests/modules/lib/Drupal/editor_test/Plugin/Editor/UnicornEditor.php
rename to core/modules/editor/tests/modules/lib/Plugin/Editor/UnicornEditor.php
diff --git a/core/modules/email/lib/Drupal/email/Plugin/field/field_type/ConfigurableEmailItem.php b/core/modules/email/lib/Plugin/field/field_type/ConfigurableEmailItem.php
similarity index 100%
rename from core/modules/email/lib/Drupal/email/Plugin/field/field_type/ConfigurableEmailItem.php
rename to core/modules/email/lib/Plugin/field/field_type/ConfigurableEmailItem.php
diff --git a/core/modules/email/lib/Drupal/email/Plugin/field/formatter/MailToFormatter.php b/core/modules/email/lib/Plugin/field/formatter/MailToFormatter.php
similarity index 100%
rename from core/modules/email/lib/Drupal/email/Plugin/field/formatter/MailToFormatter.php
rename to core/modules/email/lib/Plugin/field/formatter/MailToFormatter.php
diff --git a/core/modules/email/lib/Drupal/email/Plugin/field/widget/EmailDefaultWidget.php b/core/modules/email/lib/Plugin/field/widget/EmailDefaultWidget.php
similarity index 100%
rename from core/modules/email/lib/Drupal/email/Plugin/field/widget/EmailDefaultWidget.php
rename to core/modules/email/lib/Plugin/field/widget/EmailDefaultWidget.php
diff --git a/core/modules/email/lib/Drupal/email/Tests/EmailFieldTest.php b/core/modules/email/lib/Tests/EmailFieldTest.php
similarity index 100%
rename from core/modules/email/lib/Drupal/email/Tests/EmailFieldTest.php
rename to core/modules/email/lib/Tests/EmailFieldTest.php
diff --git a/core/modules/email/lib/Drupal/email/Tests/EmailItemTest.php b/core/modules/email/lib/Tests/EmailItemTest.php
similarity index 100%
rename from core/modules/email/lib/Drupal/email/Tests/EmailItemTest.php
rename to core/modules/email/lib/Tests/EmailItemTest.php
diff --git a/core/modules/entity/lib/Drupal/entity/Controller/EntityDisplayModeController.php b/core/modules/entity/lib/Controller/EntityDisplayModeController.php
similarity index 100%
rename from core/modules/entity/lib/Drupal/entity/Controller/EntityDisplayModeController.php
rename to core/modules/entity/lib/Controller/EntityDisplayModeController.php
diff --git a/core/modules/entity/lib/Drupal/entity/Entity/EntityDisplay.php b/core/modules/entity/lib/Entity/EntityDisplay.php
similarity index 100%
rename from core/modules/entity/lib/Drupal/entity/Entity/EntityDisplay.php
rename to core/modules/entity/lib/Entity/EntityDisplay.php
diff --git a/core/modules/entity/lib/Drupal/entity/Entity/EntityFormDisplay.php b/core/modules/entity/lib/Entity/EntityFormDisplay.php
similarity index 100%
rename from core/modules/entity/lib/Drupal/entity/Entity/EntityFormDisplay.php
rename to core/modules/entity/lib/Entity/EntityFormDisplay.php
diff --git a/core/modules/entity/lib/Drupal/entity/Entity/EntityFormMode.php b/core/modules/entity/lib/Entity/EntityFormMode.php
similarity index 100%
rename from core/modules/entity/lib/Drupal/entity/Entity/EntityFormMode.php
rename to core/modules/entity/lib/Entity/EntityFormMode.php
diff --git a/core/modules/entity/lib/Drupal/entity/Entity/EntityViewMode.php b/core/modules/entity/lib/Entity/EntityViewMode.php
similarity index 100%
rename from core/modules/entity/lib/Drupal/entity/Entity/EntityViewMode.php
rename to core/modules/entity/lib/Entity/EntityViewMode.php
diff --git a/core/modules/entity/lib/Drupal/entity/EntityDisplayBase.php b/core/modules/entity/lib/EntityDisplayBase.php
similarity index 100%
rename from core/modules/entity/lib/Drupal/entity/EntityDisplayBase.php
rename to core/modules/entity/lib/EntityDisplayBase.php
diff --git a/core/modules/entity/lib/Drupal/entity/EntityDisplayBaseInterface.php b/core/modules/entity/lib/EntityDisplayBaseInterface.php
similarity index 100%
rename from core/modules/entity/lib/Drupal/entity/EntityDisplayBaseInterface.php
rename to core/modules/entity/lib/EntityDisplayBaseInterface.php
diff --git a/core/modules/entity/lib/Drupal/entity/EntityDisplayInterface.php b/core/modules/entity/lib/EntityDisplayInterface.php
similarity index 100%
rename from core/modules/entity/lib/Drupal/entity/EntityDisplayInterface.php
rename to core/modules/entity/lib/EntityDisplayInterface.php
diff --git a/core/modules/entity/lib/Drupal/entity/EntityDisplayModeAccessController.php b/core/modules/entity/lib/EntityDisplayModeAccessController.php
similarity index 100%
rename from core/modules/entity/lib/Drupal/entity/EntityDisplayModeAccessController.php
rename to core/modules/entity/lib/EntityDisplayModeAccessController.php
diff --git a/core/modules/entity/lib/Drupal/entity/EntityDisplayModeBase.php b/core/modules/entity/lib/EntityDisplayModeBase.php
similarity index 100%
rename from core/modules/entity/lib/Drupal/entity/EntityDisplayModeBase.php
rename to core/modules/entity/lib/EntityDisplayModeBase.php
diff --git a/core/modules/entity/lib/Drupal/entity/EntityDisplayModeInterface.php b/core/modules/entity/lib/EntityDisplayModeInterface.php
similarity index 100%
rename from core/modules/entity/lib/Drupal/entity/EntityDisplayModeInterface.php
rename to core/modules/entity/lib/EntityDisplayModeInterface.php
diff --git a/core/modules/entity/lib/Drupal/entity/EntityDisplayModeListController.php b/core/modules/entity/lib/EntityDisplayModeListController.php
similarity index 100%
rename from core/modules/entity/lib/Drupal/entity/EntityDisplayModeListController.php
rename to core/modules/entity/lib/EntityDisplayModeListController.php
diff --git a/core/modules/entity/lib/Drupal/entity/EntityDisplayModeStorageController.php b/core/modules/entity/lib/EntityDisplayModeStorageController.php
similarity index 100%
rename from core/modules/entity/lib/Drupal/entity/EntityDisplayModeStorageController.php
rename to core/modules/entity/lib/EntityDisplayModeStorageController.php
diff --git a/core/modules/entity/lib/Drupal/entity/EntityFormDisplayInterface.php b/core/modules/entity/lib/EntityFormDisplayInterface.php
similarity index 100%
rename from core/modules/entity/lib/Drupal/entity/EntityFormDisplayInterface.php
rename to core/modules/entity/lib/EntityFormDisplayInterface.php
diff --git a/core/modules/entity/lib/Drupal/entity/EntityFormModeInterface.php b/core/modules/entity/lib/EntityFormModeInterface.php
similarity index 100%
rename from core/modules/entity/lib/Drupal/entity/EntityFormModeInterface.php
rename to core/modules/entity/lib/EntityFormModeInterface.php
diff --git a/core/modules/entity/lib/Drupal/entity/EntityFormModeListController.php b/core/modules/entity/lib/EntityFormModeListController.php
similarity index 100%
rename from core/modules/entity/lib/Drupal/entity/EntityFormModeListController.php
rename to core/modules/entity/lib/EntityFormModeListController.php
diff --git a/core/modules/entity/lib/Drupal/entity/EntityViewModeInterface.php b/core/modules/entity/lib/EntityViewModeInterface.php
similarity index 100%
rename from core/modules/entity/lib/Drupal/entity/EntityViewModeInterface.php
rename to core/modules/entity/lib/EntityViewModeInterface.php
diff --git a/core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeAddForm.php b/core/modules/entity/lib/Form/EntityDisplayModeAddForm.php
similarity index 100%
rename from core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeAddForm.php
rename to core/modules/entity/lib/Form/EntityDisplayModeAddForm.php
diff --git a/core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeDeleteForm.php b/core/modules/entity/lib/Form/EntityDisplayModeDeleteForm.php
similarity index 100%
rename from core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeDeleteForm.php
rename to core/modules/entity/lib/Form/EntityDisplayModeDeleteForm.php
diff --git a/core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeEditForm.php b/core/modules/entity/lib/Form/EntityDisplayModeEditForm.php
similarity index 100%
rename from core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeEditForm.php
rename to core/modules/entity/lib/Form/EntityDisplayModeEditForm.php
diff --git a/core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeFormBase.php b/core/modules/entity/lib/Form/EntityDisplayModeFormBase.php
similarity index 100%
rename from core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeFormBase.php
rename to core/modules/entity/lib/Form/EntityDisplayModeFormBase.php
diff --git a/core/modules/entity/lib/Drupal/entity/Form/EntityFormModeAddForm.php b/core/modules/entity/lib/Form/EntityFormModeAddForm.php
similarity index 100%
rename from core/modules/entity/lib/Drupal/entity/Form/EntityFormModeAddForm.php
rename to core/modules/entity/lib/Form/EntityFormModeAddForm.php
diff --git a/core/modules/entity/lib/Drupal/entity/Tests/EntityDisplayModeTest.php b/core/modules/entity/lib/Tests/EntityDisplayModeTest.php
similarity index 100%
rename from core/modules/entity/lib/Drupal/entity/Tests/EntityDisplayModeTest.php
rename to core/modules/entity/lib/Tests/EntityDisplayModeTest.php
diff --git a/core/modules/entity/lib/Drupal/entity/Tests/EntityDisplayTest.php b/core/modules/entity/lib/Tests/EntityDisplayTest.php
similarity index 100%
rename from core/modules/entity/lib/Drupal/entity/Tests/EntityDisplayTest.php
rename to core/modules/entity/lib/Tests/EntityDisplayTest.php
diff --git a/core/modules/entity/lib/Drupal/entity/Tests/EntityFormDisplayTest.php b/core/modules/entity/lib/Tests/EntityFormDisplayTest.php
similarity index 100%
rename from core/modules/entity/lib/Drupal/entity/Tests/EntityFormDisplayTest.php
rename to core/modules/entity/lib/Tests/EntityFormDisplayTest.php
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Annotation/EntityReferenceSelection.php b/core/modules/entity_reference/lib/Annotation/EntityReferenceSelection.php
similarity index 100%
rename from core/modules/entity_reference/lib/Drupal/entity_reference/Annotation/EntityReferenceSelection.php
rename to core/modules/entity_reference/lib/Annotation/EntityReferenceSelection.php
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/EntityReferenceAutocomplete.php b/core/modules/entity_reference/lib/EntityReferenceAutocomplete.php
similarity index 100%
rename from core/modules/entity_reference/lib/Drupal/entity_reference/EntityReferenceAutocomplete.php
rename to core/modules/entity_reference/lib/EntityReferenceAutocomplete.php
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/EntityReferenceController.php b/core/modules/entity_reference/lib/EntityReferenceController.php
similarity index 100%
rename from core/modules/entity_reference/lib/Drupal/entity_reference/EntityReferenceController.php
rename to core/modules/entity_reference/lib/EntityReferenceController.php
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Derivative/SelectionBase.php b/core/modules/entity_reference/lib/Plugin/Derivative/SelectionBase.php
similarity index 100%
rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Derivative/SelectionBase.php
rename to core/modules/entity_reference/lib/Plugin/Derivative/SelectionBase.php
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Type/Selection/SelectionBroken.php b/core/modules/entity_reference/lib/Plugin/Type/Selection/SelectionBroken.php
similarity index 100%
rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Type/Selection/SelectionBroken.php
rename to core/modules/entity_reference/lib/Plugin/Type/Selection/SelectionBroken.php
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Type/Selection/SelectionInterface.php b/core/modules/entity_reference/lib/Plugin/Type/Selection/SelectionInterface.php
similarity index 100%
rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Type/Selection/SelectionInterface.php
rename to core/modules/entity_reference/lib/Plugin/Type/Selection/SelectionInterface.php
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Type/SelectionPluginManager.php b/core/modules/entity_reference/lib/Plugin/Type/SelectionPluginManager.php
similarity index 100%
rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Type/SelectionPluginManager.php
rename to core/modules/entity_reference/lib/Plugin/Type/SelectionPluginManager.php
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/entity_reference/selection/SelectionBase.php b/core/modules/entity_reference/lib/Plugin/entity_reference/selection/SelectionBase.php
similarity index 100%
rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/entity_reference/selection/SelectionBase.php
rename to core/modules/entity_reference/lib/Plugin/entity_reference/selection/SelectionBase.php
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/field_type/ConfigurableEntityReferenceItem.php b/core/modules/entity_reference/lib/Plugin/field/field_type/ConfigurableEntityReferenceItem.php
similarity index 100%
rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/field_type/ConfigurableEntityReferenceItem.php
rename to core/modules/entity_reference/lib/Plugin/field/field_type/ConfigurableEntityReferenceItem.php
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceEntityFormatter.php b/core/modules/entity_reference/lib/Plugin/field/formatter/EntityReferenceEntityFormatter.php
similarity index 100%
rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceEntityFormatter.php
rename to core/modules/entity_reference/lib/Plugin/field/formatter/EntityReferenceEntityFormatter.php
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceFormatterBase.php b/core/modules/entity_reference/lib/Plugin/field/formatter/EntityReferenceFormatterBase.php
similarity index 100%
rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceFormatterBase.php
rename to core/modules/entity_reference/lib/Plugin/field/formatter/EntityReferenceFormatterBase.php
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceIdFormatter.php b/core/modules/entity_reference/lib/Plugin/field/formatter/EntityReferenceIdFormatter.php
similarity index 100%
rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceIdFormatter.php
rename to core/modules/entity_reference/lib/Plugin/field/formatter/EntityReferenceIdFormatter.php
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceLabelFormatter.php b/core/modules/entity_reference/lib/Plugin/field/formatter/EntityReferenceLabelFormatter.php
similarity index 100%
rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceLabelFormatter.php
rename to core/modules/entity_reference/lib/Plugin/field/formatter/EntityReferenceLabelFormatter.php
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/widget/AutocompleteTagsWidget.php b/core/modules/entity_reference/lib/Plugin/field/widget/AutocompleteTagsWidget.php
similarity index 100%
rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/widget/AutocompleteTagsWidget.php
rename to core/modules/entity_reference/lib/Plugin/field/widget/AutocompleteTagsWidget.php
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/widget/AutocompleteWidget.php b/core/modules/entity_reference/lib/Plugin/field/widget/AutocompleteWidget.php
similarity index 100%
rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/widget/AutocompleteWidget.php
rename to core/modules/entity_reference/lib/Plugin/field/widget/AutocompleteWidget.php
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/widget/AutocompleteWidgetBase.php b/core/modules/entity_reference/lib/Plugin/field/widget/AutocompleteWidgetBase.php
similarity index 100%
rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/widget/AutocompleteWidgetBase.php
rename to core/modules/entity_reference/lib/Plugin/field/widget/AutocompleteWidgetBase.php
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/display/EntityReference.php b/core/modules/entity_reference/lib/Plugin/views/display/EntityReference.php
similarity index 100%
rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/display/EntityReference.php
rename to core/modules/entity_reference/lib/Plugin/views/display/EntityReference.php
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/row/EntityReference.php b/core/modules/entity_reference/lib/Plugin/views/row/EntityReference.php
similarity index 100%
rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/row/EntityReference.php
rename to core/modules/entity_reference/lib/Plugin/views/row/EntityReference.php
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/style/EntityReference.php b/core/modules/entity_reference/lib/Plugin/views/style/EntityReference.php
similarity index 100%
rename from core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/style/EntityReference.php
rename to core/modules/entity_reference/lib/Plugin/views/style/EntityReference.php
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/RecursiveRenderingException.php b/core/modules/entity_reference/lib/RecursiveRenderingException.php
similarity index 100%
rename from core/modules/entity_reference/lib/Drupal/entity_reference/RecursiveRenderingException.php
rename to core/modules/entity_reference/lib/RecursiveRenderingException.php
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAdminTest.php b/core/modules/entity_reference/lib/Tests/EntityReferenceAdminTest.php
similarity index 100%
rename from core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAdminTest.php
rename to core/modules/entity_reference/lib/Tests/EntityReferenceAdminTest.php
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAutoCreateTest.php b/core/modules/entity_reference/lib/Tests/EntityReferenceAutoCreateTest.php
similarity index 100%
rename from core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAutoCreateTest.php
rename to core/modules/entity_reference/lib/Tests/EntityReferenceAutoCreateTest.php
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAutocompleteTest.php b/core/modules/entity_reference/lib/Tests/EntityReferenceAutocompleteTest.php
similarity index 100%
rename from core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAutocompleteTest.php
rename to core/modules/entity_reference/lib/Tests/EntityReferenceAutocompleteTest.php
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceFieldTest.php b/core/modules/entity_reference/lib/Tests/EntityReferenceFieldTest.php
similarity index 100%
rename from core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceFieldTest.php
rename to core/modules/entity_reference/lib/Tests/EntityReferenceFieldTest.php
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceItemTest.php b/core/modules/entity_reference/lib/Tests/EntityReferenceItemTest.php
similarity index 100%
rename from core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceItemTest.php
rename to core/modules/entity_reference/lib/Tests/EntityReferenceItemTest.php
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionAccessTest.php b/core/modules/entity_reference/lib/Tests/EntityReferenceSelectionAccessTest.php
similarity index 100%
rename from core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionAccessTest.php
rename to core/modules/entity_reference/lib/Tests/EntityReferenceSelectionAccessTest.php
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionSortTest.php b/core/modules/entity_reference/lib/Tests/EntityReferenceSelectionSortTest.php
similarity index 100%
rename from core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionSortTest.php
rename to core/modules/entity_reference/lib/Tests/EntityReferenceSelectionSortTest.php
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/Views/SelectionTest.php b/core/modules/entity_reference/lib/Tests/Views/SelectionTest.php
similarity index 100%
rename from core/modules/entity_reference/lib/Drupal/entity_reference/Tests/Views/SelectionTest.php
rename to core/modules/entity_reference/lib/Tests/Views/SelectionTest.php
diff --git a/core/modules/field/lib/Drupal/field/Annotation/FieldFormatter.php b/core/modules/field/lib/Annotation/FieldFormatter.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Annotation/FieldFormatter.php
rename to core/modules/field/lib/Annotation/FieldFormatter.php
diff --git a/core/modules/field/lib/Drupal/field/Annotation/FieldWidget.php b/core/modules/field/lib/Annotation/FieldWidget.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Annotation/FieldWidget.php
rename to core/modules/field/lib/Annotation/FieldWidget.php
diff --git a/core/modules/field/lib/Drupal/field/Entity/Field.php b/core/modules/field/lib/Entity/Field.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Entity/Field.php
rename to core/modules/field/lib/Entity/Field.php
diff --git a/core/modules/field/lib/Drupal/field/Entity/FieldInstance.php b/core/modules/field/lib/Entity/FieldInstance.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Entity/FieldInstance.php
rename to core/modules/field/lib/Entity/FieldInstance.php
diff --git a/core/modules/field/lib/Drupal/field/Field.php b/core/modules/field/lib/Field.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Field.php
rename to core/modules/field/lib/Field.php
diff --git a/core/modules/field/lib/Drupal/field/FieldException.php b/core/modules/field/lib/FieldException.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/FieldException.php
rename to core/modules/field/lib/FieldException.php
diff --git a/core/modules/field/lib/Drupal/field/FieldInfo.php b/core/modules/field/lib/FieldInfo.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/FieldInfo.php
rename to core/modules/field/lib/FieldInfo.php
diff --git a/core/modules/field/lib/Drupal/field/FieldInstanceInterface.php b/core/modules/field/lib/FieldInstanceInterface.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/FieldInstanceInterface.php
rename to core/modules/field/lib/FieldInstanceInterface.php
diff --git a/core/modules/field/lib/Drupal/field/FieldInstanceStorageController.php b/core/modules/field/lib/FieldInstanceStorageController.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/FieldInstanceStorageController.php
rename to core/modules/field/lib/FieldInstanceStorageController.php
diff --git a/core/modules/field/lib/Drupal/field/FieldInterface.php b/core/modules/field/lib/FieldInterface.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/FieldInterface.php
rename to core/modules/field/lib/FieldInterface.php
diff --git a/core/modules/field/lib/Drupal/field/FieldStorageController.php b/core/modules/field/lib/FieldStorageController.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/FieldStorageController.php
rename to core/modules/field/lib/FieldStorageController.php
diff --git a/core/modules/field/lib/Drupal/field/FieldUpdateForbiddenException.php b/core/modules/field/lib/FieldUpdateForbiddenException.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/FieldUpdateForbiddenException.php
rename to core/modules/field/lib/FieldUpdateForbiddenException.php
diff --git a/core/modules/field/lib/Drupal/field/Plugin/PluginSettingsBase.php b/core/modules/field/lib/Plugin/PluginSettingsBase.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Plugin/PluginSettingsBase.php
rename to core/modules/field/lib/Plugin/PluginSettingsBase.php
diff --git a/core/modules/field/lib/Drupal/field/Plugin/PluginSettingsInterface.php b/core/modules/field/lib/Plugin/PluginSettingsInterface.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Plugin/PluginSettingsInterface.php
rename to core/modules/field/lib/Plugin/PluginSettingsInterface.php
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigEntityReferenceItemBase.php b/core/modules/field/lib/Plugin/Type/FieldType/ConfigEntityReferenceItemBase.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigEntityReferenceItemBase.php
rename to core/modules/field/lib/Plugin/Type/FieldType/ConfigEntityReferenceItemBase.php
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigField.php b/core/modules/field/lib/Plugin/Type/FieldType/ConfigField.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigField.php
rename to core/modules/field/lib/Plugin/Type/FieldType/ConfigField.php
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigFieldInterface.php b/core/modules/field/lib/Plugin/Type/FieldType/ConfigFieldInterface.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigFieldInterface.php
rename to core/modules/field/lib/Plugin/Type/FieldType/ConfigFieldInterface.php
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigFieldItemBase.php b/core/modules/field/lib/Plugin/Type/FieldType/ConfigFieldItemBase.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigFieldItemBase.php
rename to core/modules/field/lib/Plugin/Type/FieldType/ConfigFieldItemBase.php
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigFieldItemInterface.php b/core/modules/field/lib/Plugin/Type/FieldType/ConfigFieldItemInterface.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/ConfigFieldItemInterface.php
rename to core/modules/field/lib/Plugin/Type/FieldType/ConfigFieldItemInterface.php
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/LegacyFieldTypeDiscoveryDecorator.php b/core/modules/field/lib/Plugin/Type/FieldType/LegacyFieldTypeDiscoveryDecorator.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Plugin/Type/FieldType/LegacyFieldTypeDiscoveryDecorator.php
rename to core/modules/field/lib/Plugin/Type/FieldType/LegacyFieldTypeDiscoveryDecorator.php
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/Formatter/FormatterBase.php b/core/modules/field/lib/Plugin/Type/Formatter/FormatterBase.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Plugin/Type/Formatter/FormatterBase.php
rename to core/modules/field/lib/Plugin/Type/Formatter/FormatterBase.php
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/Formatter/FormatterInterface.php b/core/modules/field/lib/Plugin/Type/Formatter/FormatterInterface.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Plugin/Type/Formatter/FormatterInterface.php
rename to core/modules/field/lib/Plugin/Type/Formatter/FormatterInterface.php
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/Formatter/FormatterPluginManager.php b/core/modules/field/lib/Plugin/Type/Formatter/FormatterPluginManager.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Plugin/Type/Formatter/FormatterPluginManager.php
rename to core/modules/field/lib/Plugin/Type/Formatter/FormatterPluginManager.php
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetBase.php b/core/modules/field/lib/Plugin/Type/Widget/WidgetBase.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetBase.php
rename to core/modules/field/lib/Plugin/Type/Widget/WidgetBase.php
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetBaseInterface.php b/core/modules/field/lib/Plugin/Type/Widget/WidgetBaseInterface.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetBaseInterface.php
rename to core/modules/field/lib/Plugin/Type/Widget/WidgetBaseInterface.php
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetFactory.php b/core/modules/field/lib/Plugin/Type/Widget/WidgetFactory.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetFactory.php
rename to core/modules/field/lib/Plugin/Type/Widget/WidgetFactory.php
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetInterface.php b/core/modules/field/lib/Plugin/Type/Widget/WidgetInterface.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetInterface.php
rename to core/modules/field/lib/Plugin/Type/Widget/WidgetInterface.php
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetPluginManager.php b/core/modules/field/lib/Plugin/Type/Widget/WidgetPluginManager.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetPluginManager.php
rename to core/modules/field/lib/Plugin/Type/Widget/WidgetPluginManager.php
diff --git a/core/modules/field/lib/Drupal/field/Plugin/field/field_type/LegacyConfigField.php b/core/modules/field/lib/Plugin/field/field_type/LegacyConfigField.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Plugin/field/field_type/LegacyConfigField.php
rename to core/modules/field/lib/Plugin/field/field_type/LegacyConfigField.php
diff --git a/core/modules/field/lib/Drupal/field/Plugin/field/field_type/LegacyConfigFieldItem.php b/core/modules/field/lib/Plugin/field/field_type/LegacyConfigFieldItem.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Plugin/field/field_type/LegacyConfigFieldItem.php
rename to core/modules/field/lib/Plugin/field/field_type/LegacyConfigFieldItem.php
diff --git a/core/modules/field/lib/Drupal/field/Plugin/field/widget/HiddenWidget.php b/core/modules/field/lib/Plugin/field/widget/HiddenWidget.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Plugin/field/widget/HiddenWidget.php
rename to core/modules/field/lib/Plugin/field/widget/HiddenWidget.php
diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/argument/FieldList.php b/core/modules/field/lib/Plugin/views/argument/FieldList.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Plugin/views/argument/FieldList.php
rename to core/modules/field/lib/Plugin/views/argument/FieldList.php
diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/argument/ListString.php b/core/modules/field/lib/Plugin/views/argument/ListString.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Plugin/views/argument/ListString.php
rename to core/modules/field/lib/Plugin/views/argument/ListString.php
diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php b/core/modules/field/lib/Plugin/views/field/Field.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php
rename to core/modules/field/lib/Plugin/views/field/Field.php
diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/filter/FieldList.php b/core/modules/field/lib/Plugin/views/filter/FieldList.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Plugin/views/filter/FieldList.php
rename to core/modules/field/lib/Plugin/views/filter/FieldList.php
diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/relationship/EntityReverse.php b/core/modules/field/lib/Plugin/views/relationship/EntityReverse.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Plugin/views/relationship/EntityReverse.php
rename to core/modules/field/lib/Plugin/views/relationship/EntityReverse.php
diff --git a/core/modules/field/lib/Drupal/field/Tests/ActiveTest.php b/core/modules/field/lib/Tests/ActiveTest.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Tests/ActiveTest.php
rename to core/modules/field/lib/Tests/ActiveTest.php
diff --git a/core/modules/field/lib/Drupal/field/Tests/BulkDeleteTest.php b/core/modules/field/lib/Tests/BulkDeleteTest.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Tests/BulkDeleteTest.php
rename to core/modules/field/lib/Tests/BulkDeleteTest.php
diff --git a/core/modules/field/lib/Drupal/field/Tests/CrudTest.php b/core/modules/field/lib/Tests/CrudTest.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Tests/CrudTest.php
rename to core/modules/field/lib/Tests/CrudTest.php
diff --git a/core/modules/field/lib/Drupal/field/Tests/DisplayApiTest.php b/core/modules/field/lib/Tests/DisplayApiTest.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Tests/DisplayApiTest.php
rename to core/modules/field/lib/Tests/DisplayApiTest.php
diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldAccessTest.php b/core/modules/field/lib/Tests/FieldAccessTest.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Tests/FieldAccessTest.php
rename to core/modules/field/lib/Tests/FieldAccessTest.php
diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldAttachOtherTest.php b/core/modules/field/lib/Tests/FieldAttachOtherTest.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Tests/FieldAttachOtherTest.php
rename to core/modules/field/lib/Tests/FieldAttachOtherTest.php
diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldAttachStorageTest.php b/core/modules/field/lib/Tests/FieldAttachStorageTest.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Tests/FieldAttachStorageTest.php
rename to core/modules/field/lib/Tests/FieldAttachStorageTest.php
diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldImportChangeTest.php b/core/modules/field/lib/Tests/FieldImportChangeTest.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Tests/FieldImportChangeTest.php
rename to core/modules/field/lib/Tests/FieldImportChangeTest.php
diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldImportCreateTest.php b/core/modules/field/lib/Tests/FieldImportCreateTest.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Tests/FieldImportCreateTest.php
rename to core/modules/field/lib/Tests/FieldImportCreateTest.php
diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldImportDeleteTest.php b/core/modules/field/lib/Tests/FieldImportDeleteTest.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Tests/FieldImportDeleteTest.php
rename to core/modules/field/lib/Tests/FieldImportDeleteTest.php
diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldInfoTest.php b/core/modules/field/lib/Tests/FieldInfoTest.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Tests/FieldInfoTest.php
rename to core/modules/field/lib/Tests/FieldInfoTest.php
diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldInstanceCrudTest.php b/core/modules/field/lib/Tests/FieldInstanceCrudTest.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Tests/FieldInstanceCrudTest.php
rename to core/modules/field/lib/Tests/FieldInstanceCrudTest.php
diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldTestBase.php b/core/modules/field/lib/Tests/FieldTestBase.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Tests/FieldTestBase.php
rename to core/modules/field/lib/Tests/FieldTestBase.php
diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldUnitTestBase.php b/core/modules/field/lib/Tests/FieldUnitTestBase.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Tests/FieldUnitTestBase.php
rename to core/modules/field/lib/Tests/FieldUnitTestBase.php
diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldValidationTest.php b/core/modules/field/lib/Tests/FieldValidationTest.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Tests/FieldValidationTest.php
rename to core/modules/field/lib/Tests/FieldValidationTest.php
diff --git a/core/modules/field/lib/Drupal/field/Tests/FormTest.php b/core/modules/field/lib/Tests/FormTest.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Tests/FormTest.php
rename to core/modules/field/lib/Tests/FormTest.php
diff --git a/core/modules/field/lib/Drupal/field/Tests/NestedFormTest.php b/core/modules/field/lib/Tests/NestedFormTest.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Tests/NestedFormTest.php
rename to core/modules/field/lib/Tests/NestedFormTest.php
diff --git a/core/modules/field/lib/Drupal/field/Tests/ShapeItemTest.php b/core/modules/field/lib/Tests/ShapeItemTest.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Tests/ShapeItemTest.php
rename to core/modules/field/lib/Tests/ShapeItemTest.php
diff --git a/core/modules/field/lib/Drupal/field/Tests/TestItemTest.php b/core/modules/field/lib/Tests/TestItemTest.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Tests/TestItemTest.php
rename to core/modules/field/lib/Tests/TestItemTest.php
diff --git a/core/modules/field/lib/Drupal/field/Tests/TranslationTest.php b/core/modules/field/lib/Tests/TranslationTest.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Tests/TranslationTest.php
rename to core/modules/field/lib/Tests/TranslationTest.php
diff --git a/core/modules/field/lib/Drupal/field/Tests/TranslationWebTest.php b/core/modules/field/lib/Tests/TranslationWebTest.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Tests/TranslationWebTest.php
rename to core/modules/field/lib/Tests/TranslationWebTest.php
diff --git a/core/modules/field/lib/Drupal/field/Tests/Views/ApiDataTest.php b/core/modules/field/lib/Tests/Views/ApiDataTest.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Tests/Views/ApiDataTest.php
rename to core/modules/field/lib/Tests/Views/ApiDataTest.php
diff --git a/core/modules/field/lib/Drupal/field/Tests/Views/FieldTestBase.php b/core/modules/field/lib/Tests/Views/FieldTestBase.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Tests/Views/FieldTestBase.php
rename to core/modules/field/lib/Tests/Views/FieldTestBase.php
diff --git a/core/modules/field/lib/Drupal/field/Tests/Views/FieldUITest.php b/core/modules/field/lib/Tests/Views/FieldUITest.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Tests/Views/FieldUITest.php
rename to core/modules/field/lib/Tests/Views/FieldUITest.php
diff --git a/core/modules/field/lib/Drupal/field/Tests/Views/HandlerFieldFieldTest.php b/core/modules/field/lib/Tests/Views/HandlerFieldFieldTest.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Tests/Views/HandlerFieldFieldTest.php
rename to core/modules/field/lib/Tests/Views/HandlerFieldFieldTest.php
diff --git a/core/modules/field/lib/Drupal/field/Tests/reEnableModuleFieldTest.php b/core/modules/field/lib/Tests/reEnableModuleFieldTest.php
similarity index 100%
rename from core/modules/field/lib/Drupal/field/Tests/reEnableModuleFieldTest.php
rename to core/modules/field/lib/Tests/reEnableModuleFieldTest.php
diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldDefaultFormatter.php b/core/modules/field/tests/modules/field_test/lib/Plugin/field/formatter/TestFieldDefaultFormatter.php
similarity index 100%
rename from core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldDefaultFormatter.php
rename to core/modules/field/tests/modules/field_test/lib/Plugin/field/formatter/TestFieldDefaultFormatter.php
diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldEmptyFormatter.php b/core/modules/field/tests/modules/field_test/lib/Plugin/field/formatter/TestFieldEmptyFormatter.php
similarity index 100%
rename from core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldEmptyFormatter.php
rename to core/modules/field/tests/modules/field_test/lib/Plugin/field/formatter/TestFieldEmptyFormatter.php
diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldMultipleFormatter.php b/core/modules/field/tests/modules/field_test/lib/Plugin/field/formatter/TestFieldMultipleFormatter.php
similarity index 100%
rename from core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldMultipleFormatter.php
rename to core/modules/field/tests/modules/field_test/lib/Plugin/field/formatter/TestFieldMultipleFormatter.php
diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldPrepareViewFormatter.php b/core/modules/field/tests/modules/field_test/lib/Plugin/field/formatter/TestFieldPrepareViewFormatter.php
similarity index 100%
rename from core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/formatter/TestFieldPrepareViewFormatter.php
rename to core/modules/field/tests/modules/field_test/lib/Plugin/field/formatter/TestFieldPrepareViewFormatter.php
diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/widget/TestFieldWidget.php b/core/modules/field/tests/modules/field_test/lib/Plugin/field/widget/TestFieldWidget.php
similarity index 100%
rename from core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/widget/TestFieldWidget.php
rename to core/modules/field/tests/modules/field_test/lib/Plugin/field/widget/TestFieldWidget.php
diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/widget/TestFieldWidgetMultiple.php b/core/modules/field/tests/modules/field_test/lib/Plugin/field/widget/TestFieldWidgetMultiple.php
similarity index 100%
rename from core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/field/widget/TestFieldWidgetMultiple.php
rename to core/modules/field/tests/modules/field_test/lib/Plugin/field/widget/TestFieldWidgetMultiple.php
diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Type/HiddenTestItem.php b/core/modules/field/tests/modules/field_test/lib/Type/HiddenTestItem.php
similarity index 100%
rename from core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Type/HiddenTestItem.php
rename to core/modules/field/tests/modules/field_test/lib/Type/HiddenTestItem.php
diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Type/ShapeItem.php b/core/modules/field/tests/modules/field_test/lib/Type/ShapeItem.php
similarity index 100%
rename from core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Type/ShapeItem.php
rename to core/modules/field/tests/modules/field_test/lib/Type/ShapeItem.php
diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Type/TestItem.php b/core/modules/field/tests/modules/field_test/lib/Type/TestItem.php
similarity index 100%
rename from core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Type/TestItem.php
rename to core/modules/field/tests/modules/field_test/lib/Type/TestItem.php
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Access/FormModeAccessCheck.php b/core/modules/field_ui/lib/Access/FormModeAccessCheck.php
similarity index 100%
rename from core/modules/field_ui/lib/Drupal/field_ui/Access/FormModeAccessCheck.php
rename to core/modules/field_ui/lib/Access/FormModeAccessCheck.php
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Access/ViewModeAccessCheck.php b/core/modules/field_ui/lib/Access/ViewModeAccessCheck.php
similarity index 100%
rename from core/modules/field_ui/lib/Drupal/field_ui/Access/ViewModeAccessCheck.php
rename to core/modules/field_ui/lib/Access/ViewModeAccessCheck.php
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php b/core/modules/field_ui/lib/DisplayOverview.php
similarity index 100%
rename from core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php
rename to core/modules/field_ui/lib/DisplayOverview.php
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverviewBase.php b/core/modules/field_ui/lib/DisplayOverviewBase.php
similarity index 100%
rename from core/modules/field_ui/lib/Drupal/field_ui/DisplayOverviewBase.php
rename to core/modules/field_ui/lib/DisplayOverviewBase.php
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/FieldListController.php b/core/modules/field_ui/lib/FieldListController.php
similarity index 100%
rename from core/modules/field_ui/lib/Drupal/field_ui/FieldListController.php
rename to core/modules/field_ui/lib/FieldListController.php
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php b/core/modules/field_ui/lib/FieldOverview.php
similarity index 100%
rename from core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php
rename to core/modules/field_ui/lib/FieldOverview.php
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/FieldUI.php b/core/modules/field_ui/lib/FieldUI.php
similarity index 100%
rename from core/modules/field_ui/lib/Drupal/field_ui/FieldUI.php
rename to core/modules/field_ui/lib/FieldUI.php
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldDeleteForm.php b/core/modules/field_ui/lib/Form/FieldDeleteForm.php
similarity index 100%
rename from core/modules/field_ui/lib/Drupal/field_ui/Form/FieldDeleteForm.php
rename to core/modules/field_ui/lib/Form/FieldDeleteForm.php
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php b/core/modules/field_ui/lib/Form/FieldEditForm.php
similarity index 100%
rename from core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php
rename to core/modules/field_ui/lib/Form/FieldEditForm.php
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php b/core/modules/field_ui/lib/Form/FieldInstanceEditForm.php
similarity index 100%
rename from core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php
rename to core/modules/field_ui/lib/Form/FieldInstanceEditForm.php
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php b/core/modules/field_ui/lib/FormDisplayOverview.php
similarity index 100%
rename from core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php
rename to core/modules/field_ui/lib/FormDisplayOverview.php
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/OverviewBase.php b/core/modules/field_ui/lib/OverviewBase.php
similarity index 100%
rename from core/modules/field_ui/lib/Drupal/field_ui/OverviewBase.php
rename to core/modules/field_ui/lib/OverviewBase.php
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Routing/RouteSubscriber.php b/core/modules/field_ui/lib/Routing/RouteSubscriber.php
similarity index 100%
rename from core/modules/field_ui/lib/Drupal/field_ui/Routing/RouteSubscriber.php
rename to core/modules/field_ui/lib/Routing/RouteSubscriber.php
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUIRouteTest.php b/core/modules/field_ui/lib/Tests/FieldUIRouteTest.php
similarity index 100%
rename from core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUIRouteTest.php
rename to core/modules/field_ui/lib/Tests/FieldUIRouteTest.php
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUiTestBase.php b/core/modules/field_ui/lib/Tests/FieldUiTestBase.php
similarity index 100%
rename from core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUiTestBase.php
rename to core/modules/field_ui/lib/Tests/FieldUiTestBase.php
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php b/core/modules/field_ui/lib/Tests/ManageDisplayTest.php
similarity index 100%
rename from core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php
rename to core/modules/field_ui/lib/Tests/ManageDisplayTest.php
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php b/core/modules/field_ui/lib/Tests/ManageFieldsTest.php
similarity index 100%
rename from core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php
rename to core/modules/field_ui/lib/Tests/ManageFieldsTest.php
diff --git a/core/modules/field_ui/tests/modules/field_ui_test/lib/Drupal/field_ui_test/Entity/FieldUITestNoBundle.php b/core/modules/field_ui/tests/modules/field_ui_test/lib/Entity/FieldUITestNoBundle.php
similarity index 100%
rename from core/modules/field_ui/tests/modules/field_ui_test/lib/Drupal/field_ui_test/Entity/FieldUITestNoBundle.php
rename to core/modules/field_ui/tests/modules/field_ui_test/lib/Entity/FieldUITestNoBundle.php
diff --git a/core/modules/file/lib/Drupal/file/Controller/FileWidgetAjaxController.php b/core/modules/file/lib/Controller/FileWidgetAjaxController.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Controller/FileWidgetAjaxController.php
rename to core/modules/file/lib/Controller/FileWidgetAjaxController.php
diff --git a/core/modules/file/lib/Drupal/file/Entity/File.php b/core/modules/file/lib/Entity/File.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Entity/File.php
rename to core/modules/file/lib/Entity/File.php
diff --git a/core/modules/file/lib/Drupal/file/FileInterface.php b/core/modules/file/lib/FileInterface.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/FileInterface.php
rename to core/modules/file/lib/FileInterface.php
diff --git a/core/modules/file/lib/Drupal/file/FileStorageController.php b/core/modules/file/lib/FileStorageController.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/FileStorageController.php
rename to core/modules/file/lib/FileStorageController.php
diff --git a/core/modules/file/lib/Drupal/file/FileStorageControllerInterface.php b/core/modules/file/lib/FileStorageControllerInterface.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/FileStorageControllerInterface.php
rename to core/modules/file/lib/FileStorageControllerInterface.php
diff --git a/core/modules/file/lib/Drupal/file/FileUsage/DatabaseFileUsageBackend.php b/core/modules/file/lib/FileUsage/DatabaseFileUsageBackend.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/FileUsage/DatabaseFileUsageBackend.php
rename to core/modules/file/lib/FileUsage/DatabaseFileUsageBackend.php
diff --git a/core/modules/file/lib/Drupal/file/FileUsage/FileUsageBase.php b/core/modules/file/lib/FileUsage/FileUsageBase.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/FileUsage/FileUsageBase.php
rename to core/modules/file/lib/FileUsage/FileUsageBase.php
diff --git a/core/modules/file/lib/Drupal/file/FileUsage/FileUsageInterface.php b/core/modules/file/lib/FileUsage/FileUsageInterface.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/FileUsage/FileUsageInterface.php
rename to core/modules/file/lib/FileUsage/FileUsageInterface.php
diff --git a/core/modules/file/lib/Drupal/file/Plugin/entity_reference/selection/FileSelection.php b/core/modules/file/lib/Plugin/entity_reference/selection/FileSelection.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Plugin/entity_reference/selection/FileSelection.php
rename to core/modules/file/lib/Plugin/entity_reference/selection/FileSelection.php
diff --git a/core/modules/file/lib/Drupal/file/Plugin/field/field_type/FileField.php b/core/modules/file/lib/Plugin/field/field_type/FileField.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Plugin/field/field_type/FileField.php
rename to core/modules/file/lib/Plugin/field/field_type/FileField.php
diff --git a/core/modules/file/lib/Drupal/file/Plugin/field/field_type/FileItem.php b/core/modules/file/lib/Plugin/field/field_type/FileItem.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Plugin/field/field_type/FileItem.php
rename to core/modules/file/lib/Plugin/field/field_type/FileItem.php
diff --git a/core/modules/file/lib/Drupal/file/Plugin/field/formatter/FileFormatterBase.php b/core/modules/file/lib/Plugin/field/formatter/FileFormatterBase.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Plugin/field/formatter/FileFormatterBase.php
rename to core/modules/file/lib/Plugin/field/formatter/FileFormatterBase.php
diff --git a/core/modules/file/lib/Drupal/file/Plugin/field/formatter/GenericFileFormatter.php b/core/modules/file/lib/Plugin/field/formatter/GenericFileFormatter.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Plugin/field/formatter/GenericFileFormatter.php
rename to core/modules/file/lib/Plugin/field/formatter/GenericFileFormatter.php
diff --git a/core/modules/file/lib/Drupal/file/Plugin/field/formatter/RSSEnclosureFormatter.php b/core/modules/file/lib/Plugin/field/formatter/RSSEnclosureFormatter.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Plugin/field/formatter/RSSEnclosureFormatter.php
rename to core/modules/file/lib/Plugin/field/formatter/RSSEnclosureFormatter.php
diff --git a/core/modules/file/lib/Drupal/file/Plugin/field/formatter/TableFormatter.php b/core/modules/file/lib/Plugin/field/formatter/TableFormatter.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Plugin/field/formatter/TableFormatter.php
rename to core/modules/file/lib/Plugin/field/formatter/TableFormatter.php
diff --git a/core/modules/file/lib/Drupal/file/Plugin/field/formatter/UrlPlainFormatter.php b/core/modules/file/lib/Plugin/field/formatter/UrlPlainFormatter.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Plugin/field/formatter/UrlPlainFormatter.php
rename to core/modules/file/lib/Plugin/field/formatter/UrlPlainFormatter.php
diff --git a/core/modules/file/lib/Drupal/file/Plugin/field/widget/FileWidget.php b/core/modules/file/lib/Plugin/field/widget/FileWidget.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Plugin/field/widget/FileWidget.php
rename to core/modules/file/lib/Plugin/field/widget/FileWidget.php
diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/argument/Fid.php b/core/modules/file/lib/Plugin/views/argument/Fid.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Plugin/views/argument/Fid.php
rename to core/modules/file/lib/Plugin/views/argument/Fid.php
diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/Extension.php b/core/modules/file/lib/Plugin/views/field/Extension.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Plugin/views/field/Extension.php
rename to core/modules/file/lib/Plugin/views/field/Extension.php
diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/File.php b/core/modules/file/lib/Plugin/views/field/File.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Plugin/views/field/File.php
rename to core/modules/file/lib/Plugin/views/field/File.php
diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/FileMime.php b/core/modules/file/lib/Plugin/views/field/FileMime.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Plugin/views/field/FileMime.php
rename to core/modules/file/lib/Plugin/views/field/FileMime.php
diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/Status.php b/core/modules/file/lib/Plugin/views/field/Status.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Plugin/views/field/Status.php
rename to core/modules/file/lib/Plugin/views/field/Status.php
diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/Uri.php b/core/modules/file/lib/Plugin/views/field/Uri.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Plugin/views/field/Uri.php
rename to core/modules/file/lib/Plugin/views/field/Uri.php
diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/filter/Status.php b/core/modules/file/lib/Plugin/views/filter/Status.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Plugin/views/filter/Status.php
rename to core/modules/file/lib/Plugin/views/filter/Status.php
diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/wizard/File.php b/core/modules/file/lib/Plugin/views/wizard/File.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Plugin/views/wizard/File.php
rename to core/modules/file/lib/Plugin/views/wizard/File.php
diff --git a/core/modules/file/lib/Drupal/file/Tests/CopyTest.php b/core/modules/file/lib/Tests/CopyTest.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Tests/CopyTest.php
rename to core/modules/file/lib/Tests/CopyTest.php
diff --git a/core/modules/file/lib/Drupal/file/Tests/DeleteTest.php b/core/modules/file/lib/Tests/DeleteTest.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Tests/DeleteTest.php
rename to core/modules/file/lib/Tests/DeleteTest.php
diff --git a/core/modules/file/lib/Drupal/file/Tests/DownloadTest.php b/core/modules/file/lib/Tests/DownloadTest.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Tests/DownloadTest.php
rename to core/modules/file/lib/Tests/DownloadTest.php
diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldDisplayTest.php b/core/modules/file/lib/Tests/FileFieldDisplayTest.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Tests/FileFieldDisplayTest.php
rename to core/modules/file/lib/Tests/FileFieldDisplayTest.php
diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldPathTest.php b/core/modules/file/lib/Tests/FileFieldPathTest.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Tests/FileFieldPathTest.php
rename to core/modules/file/lib/Tests/FileFieldPathTest.php
diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldRSSContentTest.php b/core/modules/file/lib/Tests/FileFieldRSSContentTest.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Tests/FileFieldRSSContentTest.php
rename to core/modules/file/lib/Tests/FileFieldRSSContentTest.php
diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldRevisionTest.php b/core/modules/file/lib/Tests/FileFieldRevisionTest.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Tests/FileFieldRevisionTest.php
rename to core/modules/file/lib/Tests/FileFieldRevisionTest.php
diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldTestBase.php b/core/modules/file/lib/Tests/FileFieldTestBase.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Tests/FileFieldTestBase.php
rename to core/modules/file/lib/Tests/FileFieldTestBase.php
diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldValidateTest.php b/core/modules/file/lib/Tests/FileFieldValidateTest.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Tests/FileFieldValidateTest.php
rename to core/modules/file/lib/Tests/FileFieldValidateTest.php
diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldWidgetTest.php b/core/modules/file/lib/Tests/FileFieldWidgetTest.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Tests/FileFieldWidgetTest.php
rename to core/modules/file/lib/Tests/FileFieldWidgetTest.php
diff --git a/core/modules/file/lib/Drupal/file/Tests/FileItemTest.php b/core/modules/file/lib/Tests/FileItemTest.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Tests/FileItemTest.php
rename to core/modules/file/lib/Tests/FileItemTest.php
diff --git a/core/modules/file/lib/Drupal/file/Tests/FileListingTest.php b/core/modules/file/lib/Tests/FileListingTest.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Tests/FileListingTest.php
rename to core/modules/file/lib/Tests/FileListingTest.php
diff --git a/core/modules/file/lib/Drupal/file/Tests/FileManagedFileElementTest.php b/core/modules/file/lib/Tests/FileManagedFileElementTest.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Tests/FileManagedFileElementTest.php
rename to core/modules/file/lib/Tests/FileManagedFileElementTest.php
diff --git a/core/modules/file/lib/Drupal/file/Tests/FileManagedTestBase.php b/core/modules/file/lib/Tests/FileManagedTestBase.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Tests/FileManagedTestBase.php
rename to core/modules/file/lib/Tests/FileManagedTestBase.php
diff --git a/core/modules/file/lib/Drupal/file/Tests/FilePrivateTest.php b/core/modules/file/lib/Tests/FilePrivateTest.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Tests/FilePrivateTest.php
rename to core/modules/file/lib/Tests/FilePrivateTest.php
diff --git a/core/modules/file/lib/Drupal/file/Tests/FileTokenReplaceTest.php b/core/modules/file/lib/Tests/FileTokenReplaceTest.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Tests/FileTokenReplaceTest.php
rename to core/modules/file/lib/Tests/FileTokenReplaceTest.php
diff --git a/core/modules/file/lib/Drupal/file/Tests/LoadTest.php b/core/modules/file/lib/Tests/LoadTest.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Tests/LoadTest.php
rename to core/modules/file/lib/Tests/LoadTest.php
diff --git a/core/modules/file/lib/Drupal/file/Tests/MoveTest.php b/core/modules/file/lib/Tests/MoveTest.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Tests/MoveTest.php
rename to core/modules/file/lib/Tests/MoveTest.php
diff --git a/core/modules/file/lib/Drupal/file/Tests/RemoteFileSaveUploadTest.php b/core/modules/file/lib/Tests/RemoteFileSaveUploadTest.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Tests/RemoteFileSaveUploadTest.php
rename to core/modules/file/lib/Tests/RemoteFileSaveUploadTest.php
diff --git a/core/modules/file/lib/Drupal/file/Tests/SaveDataTest.php b/core/modules/file/lib/Tests/SaveDataTest.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Tests/SaveDataTest.php
rename to core/modules/file/lib/Tests/SaveDataTest.php
diff --git a/core/modules/file/lib/Drupal/file/Tests/SaveTest.php b/core/modules/file/lib/Tests/SaveTest.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Tests/SaveTest.php
rename to core/modules/file/lib/Tests/SaveTest.php
diff --git a/core/modules/file/lib/Drupal/file/Tests/SaveUploadTest.php b/core/modules/file/lib/Tests/SaveUploadTest.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Tests/SaveUploadTest.php
rename to core/modules/file/lib/Tests/SaveUploadTest.php
diff --git a/core/modules/file/lib/Drupal/file/Tests/SpaceUsedTest.php b/core/modules/file/lib/Tests/SpaceUsedTest.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Tests/SpaceUsedTest.php
rename to core/modules/file/lib/Tests/SpaceUsedTest.php
diff --git a/core/modules/file/lib/Drupal/file/Tests/UsageTest.php b/core/modules/file/lib/Tests/UsageTest.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Tests/UsageTest.php
rename to core/modules/file/lib/Tests/UsageTest.php
diff --git a/core/modules/file/lib/Drupal/file/Tests/ValidateTest.php b/core/modules/file/lib/Tests/ValidateTest.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Tests/ValidateTest.php
rename to core/modules/file/lib/Tests/ValidateTest.php
diff --git a/core/modules/file/lib/Drupal/file/Tests/ValidatorTest.php b/core/modules/file/lib/Tests/ValidatorTest.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Tests/ValidatorTest.php
rename to core/modules/file/lib/Tests/ValidatorTest.php
diff --git a/core/modules/file/lib/Drupal/file/Tests/Views/ExtensionViewsFieldTest.php b/core/modules/file/lib/Tests/Views/ExtensionViewsFieldTest.php
similarity index 100%
rename from core/modules/file/lib/Drupal/file/Tests/Views/ExtensionViewsFieldTest.php
rename to core/modules/file/lib/Tests/Views/ExtensionViewsFieldTest.php
diff --git a/core/modules/file/tests/file_test/lib/Drupal/file_test/DummyReadOnlyStreamWrapper.php b/core/modules/file/tests/file_test/lib/DummyReadOnlyStreamWrapper.php
similarity index 100%
rename from core/modules/file/tests/file_test/lib/Drupal/file_test/DummyReadOnlyStreamWrapper.php
rename to core/modules/file/tests/file_test/lib/DummyReadOnlyStreamWrapper.php
diff --git a/core/modules/file/tests/file_test/lib/Drupal/file_test/DummyRemoteStreamWrapper.php b/core/modules/file/tests/file_test/lib/DummyRemoteStreamWrapper.php
similarity index 100%
rename from core/modules/file/tests/file_test/lib/Drupal/file_test/DummyRemoteStreamWrapper.php
rename to core/modules/file/tests/file_test/lib/DummyRemoteStreamWrapper.php
diff --git a/core/modules/file/tests/file_test/lib/Drupal/file_test/DummyStreamWrapper.php b/core/modules/file/tests/file_test/lib/DummyStreamWrapper.php
similarity index 100%
rename from core/modules/file/tests/file_test/lib/Drupal/file_test/DummyStreamWrapper.php
rename to core/modules/file/tests/file_test/lib/DummyStreamWrapper.php
diff --git a/core/modules/file/tests/file_test/lib/Drupal/file_test/Form/FileTestForm.php b/core/modules/file/tests/file_test/lib/Form/FileTestForm.php
similarity index 100%
rename from core/modules/file/tests/file_test/lib/Drupal/file_test/Form/FileTestForm.php
rename to core/modules/file/tests/file_test/lib/Form/FileTestForm.php
diff --git a/core/modules/filter/lib/Drupal/filter/Access/FormatDisableCheck.php b/core/modules/filter/lib/Access/FormatDisableCheck.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Access/FormatDisableCheck.php
rename to core/modules/filter/lib/Access/FormatDisableCheck.php
diff --git a/core/modules/filter/lib/Drupal/filter/Annotation/Filter.php b/core/modules/filter/lib/Annotation/Filter.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Annotation/Filter.php
rename to core/modules/filter/lib/Annotation/Filter.php
diff --git a/core/modules/filter/lib/Drupal/filter/Controller/FilterController.php b/core/modules/filter/lib/Controller/FilterController.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Controller/FilterController.php
rename to core/modules/filter/lib/Controller/FilterController.php
diff --git a/core/modules/filter/lib/Drupal/filter/Entity/FilterFormat.php b/core/modules/filter/lib/Entity/FilterFormat.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Entity/FilterFormat.php
rename to core/modules/filter/lib/Entity/FilterFormat.php
diff --git a/core/modules/filter/lib/Drupal/filter/FilterBag.php b/core/modules/filter/lib/FilterBag.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/FilterBag.php
rename to core/modules/filter/lib/FilterBag.php
diff --git a/core/modules/filter/lib/Drupal/filter/FilterFormatAccessController.php b/core/modules/filter/lib/FilterFormatAccessController.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/FilterFormatAccessController.php
rename to core/modules/filter/lib/FilterFormatAccessController.php
diff --git a/core/modules/filter/lib/Drupal/filter/FilterFormatAddFormController.php b/core/modules/filter/lib/FilterFormatAddFormController.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/FilterFormatAddFormController.php
rename to core/modules/filter/lib/FilterFormatAddFormController.php
diff --git a/core/modules/filter/lib/Drupal/filter/FilterFormatEditFormController.php b/core/modules/filter/lib/FilterFormatEditFormController.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/FilterFormatEditFormController.php
rename to core/modules/filter/lib/FilterFormatEditFormController.php
diff --git a/core/modules/filter/lib/Drupal/filter/FilterFormatFormControllerBase.php b/core/modules/filter/lib/FilterFormatFormControllerBase.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/FilterFormatFormControllerBase.php
rename to core/modules/filter/lib/FilterFormatFormControllerBase.php
diff --git a/core/modules/filter/lib/Drupal/filter/FilterFormatInterface.php b/core/modules/filter/lib/FilterFormatInterface.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/FilterFormatInterface.php
rename to core/modules/filter/lib/FilterFormatInterface.php
diff --git a/core/modules/filter/lib/Drupal/filter/FilterFormatListController.php b/core/modules/filter/lib/FilterFormatListController.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/FilterFormatListController.php
rename to core/modules/filter/lib/FilterFormatListController.php
diff --git a/core/modules/filter/lib/Drupal/filter/FilterPluginManager.php b/core/modules/filter/lib/FilterPluginManager.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/FilterPluginManager.php
rename to core/modules/filter/lib/FilterPluginManager.php
diff --git a/core/modules/filter/lib/Drupal/filter/Form/FilterDisableForm.php b/core/modules/filter/lib/Form/FilterDisableForm.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Form/FilterDisableForm.php
rename to core/modules/filter/lib/Form/FilterDisableForm.php
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/DataType/FilterFormat.php b/core/modules/filter/lib/Plugin/DataType/FilterFormat.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Plugin/DataType/FilterFormat.php
rename to core/modules/filter/lib/Plugin/DataType/FilterFormat.php
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterAutoP.php b/core/modules/filter/lib/Plugin/Filter/FilterAutoP.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterAutoP.php
rename to core/modules/filter/lib/Plugin/Filter/FilterAutoP.php
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterCaption.php b/core/modules/filter/lib/Plugin/Filter/FilterCaption.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterCaption.php
rename to core/modules/filter/lib/Plugin/Filter/FilterCaption.php
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtml.php b/core/modules/filter/lib/Plugin/Filter/FilterHtml.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtml.php
rename to core/modules/filter/lib/Plugin/Filter/FilterHtml.php
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlCorrector.php b/core/modules/filter/lib/Plugin/Filter/FilterHtmlCorrector.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlCorrector.php
rename to core/modules/filter/lib/Plugin/Filter/FilterHtmlCorrector.php
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlEscape.php b/core/modules/filter/lib/Plugin/Filter/FilterHtmlEscape.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlEscape.php
rename to core/modules/filter/lib/Plugin/Filter/FilterHtmlEscape.php
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlImageSecure.php b/core/modules/filter/lib/Plugin/Filter/FilterHtmlImageSecure.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlImageSecure.php
rename to core/modules/filter/lib/Plugin/Filter/FilterHtmlImageSecure.php
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterNull.php b/core/modules/filter/lib/Plugin/Filter/FilterNull.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterNull.php
rename to core/modules/filter/lib/Plugin/Filter/FilterNull.php
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterUrl.php b/core/modules/filter/lib/Plugin/Filter/FilterUrl.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterUrl.php
rename to core/modules/filter/lib/Plugin/Filter/FilterUrl.php
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/FilterBase.php b/core/modules/filter/lib/Plugin/FilterBase.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Plugin/FilterBase.php
rename to core/modules/filter/lib/Plugin/FilterBase.php
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/FilterInterface.php b/core/modules/filter/lib/Plugin/FilterInterface.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Plugin/FilterInterface.php
rename to core/modules/filter/lib/Plugin/FilterInterface.php
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Menu/LocalAction/AddFilterFormatLocalAction.php b/core/modules/filter/lib/Plugin/Menu/LocalAction/AddFilterFormatLocalAction.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Plugin/Menu/LocalAction/AddFilterFormatLocalAction.php
rename to core/modules/filter/lib/Plugin/Menu/LocalAction/AddFilterFormatLocalAction.php
diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterAPITest.php b/core/modules/filter/lib/Tests/FilterAPITest.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Tests/FilterAPITest.php
rename to core/modules/filter/lib/Tests/FilterAPITest.php
diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterAdminTest.php b/core/modules/filter/lib/Tests/FilterAdminTest.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Tests/FilterAdminTest.php
rename to core/modules/filter/lib/Tests/FilterAdminTest.php
diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterCrudTest.php b/core/modules/filter/lib/Tests/FilterCrudTest.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Tests/FilterCrudTest.php
rename to core/modules/filter/lib/Tests/FilterCrudTest.php
diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterDefaultConfigTest.php b/core/modules/filter/lib/Tests/FilterDefaultConfigTest.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Tests/FilterDefaultConfigTest.php
rename to core/modules/filter/lib/Tests/FilterDefaultConfigTest.php
diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterDefaultFormatTest.php b/core/modules/filter/lib/Tests/FilterDefaultFormatTest.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Tests/FilterDefaultFormatTest.php
rename to core/modules/filter/lib/Tests/FilterDefaultFormatTest.php
diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterFormatAccessTest.php b/core/modules/filter/lib/Tests/FilterFormatAccessTest.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Tests/FilterFormatAccessTest.php
rename to core/modules/filter/lib/Tests/FilterFormatAccessTest.php
diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterHooksTest.php b/core/modules/filter/lib/Tests/FilterHooksTest.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Tests/FilterHooksTest.php
rename to core/modules/filter/lib/Tests/FilterHooksTest.php
diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterHtmlImageSecureTest.php b/core/modules/filter/lib/Tests/FilterHtmlImageSecureTest.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Tests/FilterHtmlImageSecureTest.php
rename to core/modules/filter/lib/Tests/FilterHtmlImageSecureTest.php
diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterNoFormatTest.php b/core/modules/filter/lib/Tests/FilterNoFormatTest.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Tests/FilterNoFormatTest.php
rename to core/modules/filter/lib/Tests/FilterNoFormatTest.php
diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterSecurityTest.php b/core/modules/filter/lib/Tests/FilterSecurityTest.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Tests/FilterSecurityTest.php
rename to core/modules/filter/lib/Tests/FilterSecurityTest.php
diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterSettingsTest.php b/core/modules/filter/lib/Tests/FilterSettingsTest.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Tests/FilterSettingsTest.php
rename to core/modules/filter/lib/Tests/FilterSettingsTest.php
diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterUnitTest.php b/core/modules/filter/lib/Tests/FilterUnitTest.php
similarity index 100%
rename from core/modules/filter/lib/Drupal/filter/Tests/FilterUnitTest.php
rename to core/modules/filter/lib/Tests/FilterUnitTest.php
diff --git a/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestReplace.php b/core/modules/filter/tests/filter_test/lib/Plugin/Filter/FilterTestReplace.php
similarity index 100%
rename from core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestReplace.php
rename to core/modules/filter/tests/filter_test/lib/Plugin/Filter/FilterTestReplace.php
diff --git a/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestRestrictTagsAndAttributes.php b/core/modules/filter/tests/filter_test/lib/Plugin/Filter/FilterTestRestrictTagsAndAttributes.php
similarity index 100%
rename from core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestRestrictTagsAndAttributes.php
rename to core/modules/filter/tests/filter_test/lib/Plugin/Filter/FilterTestRestrictTagsAndAttributes.php
diff --git a/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestUncacheable.php b/core/modules/filter/tests/filter_test/lib/Plugin/Filter/FilterTestUncacheable.php
similarity index 100%
rename from core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestUncacheable.php
rename to core/modules/filter/tests/filter_test/lib/Plugin/Filter/FilterTestUncacheable.php
diff --git a/core/modules/forum/lib/Drupal/forum/Controller/ForumController.php b/core/modules/forum/lib/Controller/ForumController.php
similarity index 100%
rename from core/modules/forum/lib/Drupal/forum/Controller/ForumController.php
rename to core/modules/forum/lib/Controller/ForumController.php
diff --git a/core/modules/forum/lib/Drupal/forum/Form/ContainerFormController.php b/core/modules/forum/lib/Form/ContainerFormController.php
similarity index 100%
rename from core/modules/forum/lib/Drupal/forum/Form/ContainerFormController.php
rename to core/modules/forum/lib/Form/ContainerFormController.php
diff --git a/core/modules/forum/lib/Drupal/forum/Form/DeleteForm.php b/core/modules/forum/lib/Form/DeleteForm.php
similarity index 100%
rename from core/modules/forum/lib/Drupal/forum/Form/DeleteForm.php
rename to core/modules/forum/lib/Form/DeleteForm.php
diff --git a/core/modules/forum/lib/Drupal/forum/Form/ForumFormController.php b/core/modules/forum/lib/Form/ForumFormController.php
similarity index 100%
rename from core/modules/forum/lib/Drupal/forum/Form/ForumFormController.php
rename to core/modules/forum/lib/Form/ForumFormController.php
diff --git a/core/modules/forum/lib/Drupal/forum/ForumBreadcrumbBuilder.php b/core/modules/forum/lib/ForumBreadcrumbBuilder.php
similarity index 100%
rename from core/modules/forum/lib/Drupal/forum/ForumBreadcrumbBuilder.php
rename to core/modules/forum/lib/ForumBreadcrumbBuilder.php
diff --git a/core/modules/forum/lib/Drupal/forum/ForumManager.php b/core/modules/forum/lib/ForumManager.php
similarity index 100%
rename from core/modules/forum/lib/Drupal/forum/ForumManager.php
rename to core/modules/forum/lib/ForumManager.php
diff --git a/core/modules/forum/lib/Drupal/forum/ForumManagerInterface.php b/core/modules/forum/lib/ForumManagerInterface.php
similarity index 100%
rename from core/modules/forum/lib/Drupal/forum/ForumManagerInterface.php
rename to core/modules/forum/lib/ForumManagerInterface.php
diff --git a/core/modules/forum/lib/Drupal/forum/ForumSettingsForm.php b/core/modules/forum/lib/ForumSettingsForm.php
similarity index 100%
rename from core/modules/forum/lib/Drupal/forum/ForumSettingsForm.php
rename to core/modules/forum/lib/ForumSettingsForm.php
diff --git a/core/modules/forum/lib/Drupal/forum/Plugin/Block/ActiveTopicsBlock.php b/core/modules/forum/lib/Plugin/Block/ActiveTopicsBlock.php
similarity index 100%
rename from core/modules/forum/lib/Drupal/forum/Plugin/Block/ActiveTopicsBlock.php
rename to core/modules/forum/lib/Plugin/Block/ActiveTopicsBlock.php
diff --git a/core/modules/forum/lib/Drupal/forum/Plugin/Block/ForumBlockBase.php b/core/modules/forum/lib/Plugin/Block/ForumBlockBase.php
similarity index 100%
rename from core/modules/forum/lib/Drupal/forum/Plugin/Block/ForumBlockBase.php
rename to core/modules/forum/lib/Plugin/Block/ForumBlockBase.php
diff --git a/core/modules/forum/lib/Drupal/forum/Plugin/Block/NewTopicsBlock.php b/core/modules/forum/lib/Plugin/Block/NewTopicsBlock.php
similarity index 100%
rename from core/modules/forum/lib/Drupal/forum/Plugin/Block/NewTopicsBlock.php
rename to core/modules/forum/lib/Plugin/Block/NewTopicsBlock.php
diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumBlockTest.php b/core/modules/forum/lib/Tests/ForumBlockTest.php
similarity index 100%
rename from core/modules/forum/lib/Drupal/forum/Tests/ForumBlockTest.php
rename to core/modules/forum/lib/Tests/ForumBlockTest.php
diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumIndexTest.php b/core/modules/forum/lib/Tests/ForumIndexTest.php
similarity index 100%
rename from core/modules/forum/lib/Drupal/forum/Tests/ForumIndexTest.php
rename to core/modules/forum/lib/Tests/ForumIndexTest.php
diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumNodeAccessTest.php b/core/modules/forum/lib/Tests/ForumNodeAccessTest.php
similarity index 100%
rename from core/modules/forum/lib/Drupal/forum/Tests/ForumNodeAccessTest.php
rename to core/modules/forum/lib/Tests/ForumNodeAccessTest.php
diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php b/core/modules/forum/lib/Tests/ForumTest.php
similarity index 100%
rename from core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php
rename to core/modules/forum/lib/Tests/ForumTest.php
diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumUninstallTest.php b/core/modules/forum/lib/Tests/ForumUninstallTest.php
similarity index 100%
rename from core/modules/forum/lib/Drupal/forum/Tests/ForumUninstallTest.php
rename to core/modules/forum/lib/Tests/ForumUninstallTest.php
diff --git a/core/modules/forum/lib/Drupal/forum/Tests/Views/ForumIntegrationTest.php b/core/modules/forum/lib/Tests/Views/ForumIntegrationTest.php
similarity index 100%
rename from core/modules/forum/lib/Drupal/forum/Tests/Views/ForumIntegrationTest.php
rename to core/modules/forum/lib/Tests/Views/ForumIntegrationTest.php
diff --git a/core/modules/forum/tests/Drupal/forum/Tests/ForumManagerTest.php b/core/modules/forum/tests/lib/ForumManagerTest.php
similarity index 100%
rename from core/modules/forum/tests/Drupal/forum/Tests/ForumManagerTest.php
rename to core/modules/forum/tests/lib/ForumManagerTest.php
diff --git a/core/modules/hal/lib/Drupal/hal/Encoder/JsonEncoder.php b/core/modules/hal/lib/Encoder/JsonEncoder.php
similarity index 100%
rename from core/modules/hal/lib/Drupal/hal/Encoder/JsonEncoder.php
rename to core/modules/hal/lib/Encoder/JsonEncoder.php
diff --git a/core/modules/hal/lib/Drupal/hal/HalSubscriber.php b/core/modules/hal/lib/HalSubscriber.php
similarity index 100%
rename from core/modules/hal/lib/Drupal/hal/HalSubscriber.php
rename to core/modules/hal/lib/HalSubscriber.php
diff --git a/core/modules/hal/lib/Drupal/hal/Normalizer/EntityNormalizer.php b/core/modules/hal/lib/Normalizer/EntityNormalizer.php
similarity index 100%
rename from core/modules/hal/lib/Drupal/hal/Normalizer/EntityNormalizer.php
rename to core/modules/hal/lib/Normalizer/EntityNormalizer.php
diff --git a/core/modules/hal/lib/Drupal/hal/Normalizer/EntityReferenceItemNormalizer.php b/core/modules/hal/lib/Normalizer/EntityReferenceItemNormalizer.php
similarity index 100%
rename from core/modules/hal/lib/Drupal/hal/Normalizer/EntityReferenceItemNormalizer.php
rename to core/modules/hal/lib/Normalizer/EntityReferenceItemNormalizer.php
diff --git a/core/modules/hal/lib/Drupal/hal/Normalizer/FieldItemNormalizer.php b/core/modules/hal/lib/Normalizer/FieldItemNormalizer.php
similarity index 100%
rename from core/modules/hal/lib/Drupal/hal/Normalizer/FieldItemNormalizer.php
rename to core/modules/hal/lib/Normalizer/FieldItemNormalizer.php
diff --git a/core/modules/hal/lib/Drupal/hal/Normalizer/FieldNormalizer.php b/core/modules/hal/lib/Normalizer/FieldNormalizer.php
similarity index 100%
rename from core/modules/hal/lib/Drupal/hal/Normalizer/FieldNormalizer.php
rename to core/modules/hal/lib/Normalizer/FieldNormalizer.php
diff --git a/core/modules/hal/lib/Drupal/hal/Normalizer/NormalizerBase.php b/core/modules/hal/lib/Normalizer/NormalizerBase.php
similarity index 100%
rename from core/modules/hal/lib/Drupal/hal/Normalizer/NormalizerBase.php
rename to core/modules/hal/lib/Normalizer/NormalizerBase.php
diff --git a/core/modules/hal/lib/Drupal/hal/Tests/DenormalizeTest.php b/core/modules/hal/lib/Tests/DenormalizeTest.php
similarity index 100%
rename from core/modules/hal/lib/Drupal/hal/Tests/DenormalizeTest.php
rename to core/modules/hal/lib/Tests/DenormalizeTest.php
diff --git a/core/modules/hal/lib/Drupal/hal/Tests/NormalizeTest.php b/core/modules/hal/lib/Tests/NormalizeTest.php
similarity index 100%
rename from core/modules/hal/lib/Drupal/hal/Tests/NormalizeTest.php
rename to core/modules/hal/lib/Tests/NormalizeTest.php
diff --git a/core/modules/hal/lib/Drupal/hal/Tests/NormalizerTestBase.php b/core/modules/hal/lib/Tests/NormalizerTestBase.php
similarity index 100%
rename from core/modules/hal/lib/Drupal/hal/Tests/NormalizerTestBase.php
rename to core/modules/hal/lib/Tests/NormalizerTestBase.php
diff --git a/core/modules/help/lib/Drupal/help/Controller/HelpController.php b/core/modules/help/lib/Controller/HelpController.php
similarity index 100%
rename from core/modules/help/lib/Drupal/help/Controller/HelpController.php
rename to core/modules/help/lib/Controller/HelpController.php
diff --git a/core/modules/help/lib/Drupal/help/Tests/HelpTest.php b/core/modules/help/lib/Tests/HelpTest.php
similarity index 100%
rename from core/modules/help/lib/Drupal/help/Tests/HelpTest.php
rename to core/modules/help/lib/Tests/HelpTest.php
diff --git a/core/modules/help/lib/Drupal/help/Tests/NoHelpTest.php b/core/modules/help/lib/Tests/NoHelpTest.php
similarity index 100%
rename from core/modules/help/lib/Drupal/help/Tests/NoHelpTest.php
rename to core/modules/help/lib/Tests/NoHelpTest.php
diff --git a/core/modules/history/lib/Drupal/history/Controller/HistoryController.php b/core/modules/history/lib/Controller/HistoryController.php
similarity index 100%
rename from core/modules/history/lib/Drupal/history/Controller/HistoryController.php
rename to core/modules/history/lib/Controller/HistoryController.php
diff --git a/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php b/core/modules/history/lib/Plugin/views/field/HistoryUserTimestamp.php
similarity index 100%
rename from core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php
rename to core/modules/history/lib/Plugin/views/field/HistoryUserTimestamp.php
diff --git a/core/modules/history/lib/Drupal/history/Plugin/views/filter/HistoryUserTimestamp.php b/core/modules/history/lib/Plugin/views/filter/HistoryUserTimestamp.php
similarity index 100%
rename from core/modules/history/lib/Drupal/history/Plugin/views/filter/HistoryUserTimestamp.php
rename to core/modules/history/lib/Plugin/views/filter/HistoryUserTimestamp.php
diff --git a/core/modules/history/lib/Drupal/history/Tests/HistoryTest.php b/core/modules/history/lib/Tests/HistoryTest.php
similarity index 100%
rename from core/modules/history/lib/Drupal/history/Tests/HistoryTest.php
rename to core/modules/history/lib/Tests/HistoryTest.php
diff --git a/core/modules/history/lib/Drupal/history/Tests/Views/HistoryTimestampTest.php b/core/modules/history/lib/Tests/Views/HistoryTimestampTest.php
similarity index 100%
rename from core/modules/history/lib/Drupal/history/Tests/Views/HistoryTimestampTest.php
rename to core/modules/history/lib/Tests/Views/HistoryTimestampTest.php
diff --git a/core/modules/image/lib/Drupal/image/Annotation/ImageEffect.php b/core/modules/image/lib/Annotation/ImageEffect.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Annotation/ImageEffect.php
rename to core/modules/image/lib/Annotation/ImageEffect.php
diff --git a/core/modules/image/lib/Drupal/image/ConfigurableImageEffectInterface.php b/core/modules/image/lib/ConfigurableImageEffectInterface.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/ConfigurableImageEffectInterface.php
rename to core/modules/image/lib/ConfigurableImageEffectInterface.php
diff --git a/core/modules/image/lib/Drupal/image/Controller/ImageStyleDownloadController.php b/core/modules/image/lib/Controller/ImageStyleDownloadController.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Controller/ImageStyleDownloadController.php
rename to core/modules/image/lib/Controller/ImageStyleDownloadController.php
diff --git a/core/modules/image/lib/Drupal/image/Entity/ImageStyle.php b/core/modules/image/lib/Entity/ImageStyle.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Entity/ImageStyle.php
rename to core/modules/image/lib/Entity/ImageStyle.php
diff --git a/core/modules/image/lib/Drupal/image/EventSubscriber/RouteSubscriber.php b/core/modules/image/lib/EventSubscriber/RouteSubscriber.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/EventSubscriber/RouteSubscriber.php
rename to core/modules/image/lib/EventSubscriber/RouteSubscriber.php
diff --git a/core/modules/image/lib/Drupal/image/Form/ImageEffectAddForm.php b/core/modules/image/lib/Form/ImageEffectAddForm.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Form/ImageEffectAddForm.php
rename to core/modules/image/lib/Form/ImageEffectAddForm.php
diff --git a/core/modules/image/lib/Drupal/image/Form/ImageEffectDeleteForm.php b/core/modules/image/lib/Form/ImageEffectDeleteForm.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Form/ImageEffectDeleteForm.php
rename to core/modules/image/lib/Form/ImageEffectDeleteForm.php
diff --git a/core/modules/image/lib/Drupal/image/Form/ImageEffectEditForm.php b/core/modules/image/lib/Form/ImageEffectEditForm.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Form/ImageEffectEditForm.php
rename to core/modules/image/lib/Form/ImageEffectEditForm.php
diff --git a/core/modules/image/lib/Drupal/image/Form/ImageEffectFormBase.php b/core/modules/image/lib/Form/ImageEffectFormBase.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Form/ImageEffectFormBase.php
rename to core/modules/image/lib/Form/ImageEffectFormBase.php
diff --git a/core/modules/image/lib/Drupal/image/Form/ImageStyleAddForm.php b/core/modules/image/lib/Form/ImageStyleAddForm.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Form/ImageStyleAddForm.php
rename to core/modules/image/lib/Form/ImageStyleAddForm.php
diff --git a/core/modules/image/lib/Drupal/image/Form/ImageStyleDeleteForm.php b/core/modules/image/lib/Form/ImageStyleDeleteForm.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Form/ImageStyleDeleteForm.php
rename to core/modules/image/lib/Form/ImageStyleDeleteForm.php
diff --git a/core/modules/image/lib/Drupal/image/Form/ImageStyleEditForm.php b/core/modules/image/lib/Form/ImageStyleEditForm.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Form/ImageStyleEditForm.php
rename to core/modules/image/lib/Form/ImageStyleEditForm.php
diff --git a/core/modules/image/lib/Drupal/image/Form/ImageStyleFormBase.php b/core/modules/image/lib/Form/ImageStyleFormBase.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Form/ImageStyleFormBase.php
rename to core/modules/image/lib/Form/ImageStyleFormBase.php
diff --git a/core/modules/image/lib/Drupal/image/ImageEffectBag.php b/core/modules/image/lib/ImageEffectBag.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/ImageEffectBag.php
rename to core/modules/image/lib/ImageEffectBag.php
diff --git a/core/modules/image/lib/Drupal/image/ImageEffectBase.php b/core/modules/image/lib/ImageEffectBase.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/ImageEffectBase.php
rename to core/modules/image/lib/ImageEffectBase.php
diff --git a/core/modules/image/lib/Drupal/image/ImageEffectInterface.php b/core/modules/image/lib/ImageEffectInterface.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/ImageEffectInterface.php
rename to core/modules/image/lib/ImageEffectInterface.php
diff --git a/core/modules/image/lib/Drupal/image/ImageEffectManager.php b/core/modules/image/lib/ImageEffectManager.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/ImageEffectManager.php
rename to core/modules/image/lib/ImageEffectManager.php
diff --git a/core/modules/image/lib/Drupal/image/ImageStyleAccessController.php b/core/modules/image/lib/ImageStyleAccessController.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/ImageStyleAccessController.php
rename to core/modules/image/lib/ImageStyleAccessController.php
diff --git a/core/modules/image/lib/Drupal/image/ImageStyleInterface.php b/core/modules/image/lib/ImageStyleInterface.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/ImageStyleInterface.php
rename to core/modules/image/lib/ImageStyleInterface.php
diff --git a/core/modules/image/lib/Drupal/image/ImageStyleListController.php b/core/modules/image/lib/ImageStyleListController.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/ImageStyleListController.php
rename to core/modules/image/lib/ImageStyleListController.php
diff --git a/core/modules/image/lib/Drupal/image/PathProcessor/PathProcessorImageStyles.php b/core/modules/image/lib/PathProcessor/PathProcessorImageStyles.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/PathProcessor/PathProcessorImageStyles.php
rename to core/modules/image/lib/PathProcessor/PathProcessorImageStyles.php
diff --git a/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/CropImageEffect.php b/core/modules/image/lib/Plugin/ImageEffect/CropImageEffect.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Plugin/ImageEffect/CropImageEffect.php
rename to core/modules/image/lib/Plugin/ImageEffect/CropImageEffect.php
diff --git a/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/DesaturateImageEffect.php b/core/modules/image/lib/Plugin/ImageEffect/DesaturateImageEffect.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Plugin/ImageEffect/DesaturateImageEffect.php
rename to core/modules/image/lib/Plugin/ImageEffect/DesaturateImageEffect.php
diff --git a/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/ResizeImageEffect.php b/core/modules/image/lib/Plugin/ImageEffect/ResizeImageEffect.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Plugin/ImageEffect/ResizeImageEffect.php
rename to core/modules/image/lib/Plugin/ImageEffect/ResizeImageEffect.php
diff --git a/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/RotateImageEffect.php b/core/modules/image/lib/Plugin/ImageEffect/RotateImageEffect.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Plugin/ImageEffect/RotateImageEffect.php
rename to core/modules/image/lib/Plugin/ImageEffect/RotateImageEffect.php
diff --git a/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/ScaleAndCropImageEffect.php b/core/modules/image/lib/Plugin/ImageEffect/ScaleAndCropImageEffect.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Plugin/ImageEffect/ScaleAndCropImageEffect.php
rename to core/modules/image/lib/Plugin/ImageEffect/ScaleAndCropImageEffect.php
diff --git a/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/ScaleImageEffect.php b/core/modules/image/lib/Plugin/ImageEffect/ScaleImageEffect.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Plugin/ImageEffect/ScaleImageEffect.php
rename to core/modules/image/lib/Plugin/ImageEffect/ScaleImageEffect.php
diff --git a/core/modules/image/lib/Drupal/image/Plugin/Menu/LocalAction/ImageStyleAddLocalAction.php b/core/modules/image/lib/Plugin/Menu/LocalAction/ImageStyleAddLocalAction.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Plugin/Menu/LocalAction/ImageStyleAddLocalAction.php
rename to core/modules/image/lib/Plugin/Menu/LocalAction/ImageStyleAddLocalAction.php
diff --git a/core/modules/image/lib/Drupal/image/Plugin/field/field_type/ImageItem.php b/core/modules/image/lib/Plugin/field/field_type/ImageItem.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Plugin/field/field_type/ImageItem.php
rename to core/modules/image/lib/Plugin/field/field_type/ImageItem.php
diff --git a/core/modules/image/lib/Drupal/image/Plugin/field/formatter/ImageFormatter.php b/core/modules/image/lib/Plugin/field/formatter/ImageFormatter.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Plugin/field/formatter/ImageFormatter.php
rename to core/modules/image/lib/Plugin/field/formatter/ImageFormatter.php
diff --git a/core/modules/image/lib/Drupal/image/Plugin/field/formatter/ImageFormatterBase.php b/core/modules/image/lib/Plugin/field/formatter/ImageFormatterBase.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Plugin/field/formatter/ImageFormatterBase.php
rename to core/modules/image/lib/Plugin/field/formatter/ImageFormatterBase.php
diff --git a/core/modules/image/lib/Drupal/image/Plugin/field/widget/ImageWidget.php b/core/modules/image/lib/Plugin/field/widget/ImageWidget.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Plugin/field/widget/ImageWidget.php
rename to core/modules/image/lib/Plugin/field/widget/ImageWidget.php
diff --git a/core/modules/image/lib/Drupal/image/Tests/FileMoveTest.php b/core/modules/image/lib/Tests/FileMoveTest.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Tests/FileMoveTest.php
rename to core/modules/image/lib/Tests/FileMoveTest.php
diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageAdminStylesTest.php b/core/modules/image/lib/Tests/ImageAdminStylesTest.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Tests/ImageAdminStylesTest.php
rename to core/modules/image/lib/Tests/ImageAdminStylesTest.php
diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageDimensionsTest.php b/core/modules/image/lib/Tests/ImageDimensionsTest.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Tests/ImageDimensionsTest.php
rename to core/modules/image/lib/Tests/ImageDimensionsTest.php
diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageEffectsTest.php b/core/modules/image/lib/Tests/ImageEffectsTest.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Tests/ImageEffectsTest.php
rename to core/modules/image/lib/Tests/ImageEffectsTest.php
diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php b/core/modules/image/lib/Tests/ImageFieldDefaultImagesTest.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php
rename to core/modules/image/lib/Tests/ImageFieldDefaultImagesTest.php
diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDisplayTest.php b/core/modules/image/lib/Tests/ImageFieldDisplayTest.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Tests/ImageFieldDisplayTest.php
rename to core/modules/image/lib/Tests/ImageFieldDisplayTest.php
diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageFieldTestBase.php b/core/modules/image/lib/Tests/ImageFieldTestBase.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Tests/ImageFieldTestBase.php
rename to core/modules/image/lib/Tests/ImageFieldTestBase.php
diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageFieldValidateTest.php b/core/modules/image/lib/Tests/ImageFieldValidateTest.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Tests/ImageFieldValidateTest.php
rename to core/modules/image/lib/Tests/ImageFieldValidateTest.php
diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageItemTest.php b/core/modules/image/lib/Tests/ImageItemTest.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Tests/ImageItemTest.php
rename to core/modules/image/lib/Tests/ImageItemTest.php
diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageStyleFlushTest.php b/core/modules/image/lib/Tests/ImageStyleFlushTest.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Tests/ImageStyleFlushTest.php
rename to core/modules/image/lib/Tests/ImageStyleFlushTest.php
diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageStylesPathAndUrlTest.php b/core/modules/image/lib/Tests/ImageStylesPathAndUrlTest.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Tests/ImageStylesPathAndUrlTest.php
rename to core/modules/image/lib/Tests/ImageStylesPathAndUrlTest.php
diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageThemeFunctionTest.php b/core/modules/image/lib/Tests/ImageThemeFunctionTest.php
similarity index 100%
rename from core/modules/image/lib/Drupal/image/Tests/ImageThemeFunctionTest.php
rename to core/modules/image/lib/Tests/ImageThemeFunctionTest.php
diff --git a/core/modules/image/tests/modules/image_module_test/lib/Drupal/image_module_test/Plugin/ImageEffect/NullTestImageEffect.php b/core/modules/image/tests/modules/image_module_test/lib/Plugin/ImageEffect/NullTestImageEffect.php
similarity index 100%
rename from core/modules/image/tests/modules/image_module_test/lib/Drupal/image_module_test/Plugin/ImageEffect/NullTestImageEffect.php
rename to core/modules/image/tests/modules/image_module_test/lib/Plugin/ImageEffect/NullTestImageEffect.php
diff --git a/core/modules/language/lib/Drupal/language/Entity/Language.php b/core/modules/language/lib/Entity/Language.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Entity/Language.php
rename to core/modules/language/lib/Entity/Language.php
diff --git a/core/modules/language/lib/Drupal/language/Form/ContentLanguageSettingsForm.php b/core/modules/language/lib/Form/ContentLanguageSettingsForm.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Form/ContentLanguageSettingsForm.php
rename to core/modules/language/lib/Form/ContentLanguageSettingsForm.php
diff --git a/core/modules/language/lib/Drupal/language/Form/LanguageDeleteForm.php b/core/modules/language/lib/Form/LanguageDeleteForm.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Form/LanguageDeleteForm.php
rename to core/modules/language/lib/Form/LanguageDeleteForm.php
diff --git a/core/modules/language/lib/Drupal/language/Form/NegotiationBrowserDeleteForm.php b/core/modules/language/lib/Form/NegotiationBrowserDeleteForm.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Form/NegotiationBrowserDeleteForm.php
rename to core/modules/language/lib/Form/NegotiationBrowserDeleteForm.php
diff --git a/core/modules/language/lib/Drupal/language/Form/NegotiationSelectedForm.php b/core/modules/language/lib/Form/NegotiationSelectedForm.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Form/NegotiationSelectedForm.php
rename to core/modules/language/lib/Form/NegotiationSelectedForm.php
diff --git a/core/modules/language/lib/Drupal/language/Form/NegotiationSessionForm.php b/core/modules/language/lib/Form/NegotiationSessionForm.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Form/NegotiationSessionForm.php
rename to core/modules/language/lib/Form/NegotiationSessionForm.php
diff --git a/core/modules/language/lib/Drupal/language/Form/NegotiationUrlForm.php b/core/modules/language/lib/Form/NegotiationUrlForm.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Form/NegotiationUrlForm.php
rename to core/modules/language/lib/Form/NegotiationUrlForm.php
diff --git a/core/modules/language/lib/Drupal/language/HttpKernel/PathProcessorLanguage.php b/core/modules/language/lib/HttpKernel/PathProcessorLanguage.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/HttpKernel/PathProcessorLanguage.php
rename to core/modules/language/lib/HttpKernel/PathProcessorLanguage.php
diff --git a/core/modules/language/lib/Drupal/language/LanguageAccessController.php b/core/modules/language/lib/LanguageAccessController.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/LanguageAccessController.php
rename to core/modules/language/lib/LanguageAccessController.php
diff --git a/core/modules/language/lib/Drupal/language/LanguageConfigContext.php b/core/modules/language/lib/LanguageConfigContext.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/LanguageConfigContext.php
rename to core/modules/language/lib/LanguageConfigContext.php
diff --git a/core/modules/language/lib/Drupal/language/LanguageInterface.php b/core/modules/language/lib/LanguageInterface.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/LanguageInterface.php
rename to core/modules/language/lib/LanguageInterface.php
diff --git a/core/modules/language/lib/Drupal/language/LanguageListController.php b/core/modules/language/lib/LanguageListController.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/LanguageListController.php
rename to core/modules/language/lib/LanguageListController.php
diff --git a/core/modules/language/lib/Drupal/language/Plugin/Block/LanguageBlock.php b/core/modules/language/lib/Plugin/Block/LanguageBlock.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Plugin/Block/LanguageBlock.php
rename to core/modules/language/lib/Plugin/Block/LanguageBlock.php
diff --git a/core/modules/language/lib/Drupal/language/Plugin/Condition/Language.php b/core/modules/language/lib/Plugin/Condition/Language.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Plugin/Condition/Language.php
rename to core/modules/language/lib/Plugin/Condition/Language.php
diff --git a/core/modules/language/lib/Drupal/language/Plugin/Derivative/LanguageBlock.php b/core/modules/language/lib/Plugin/Derivative/LanguageBlock.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Plugin/Derivative/LanguageBlock.php
rename to core/modules/language/lib/Plugin/Derivative/LanguageBlock.php
diff --git a/core/modules/language/lib/Drupal/language/Plugin/views/argument/LanguageArgument.php b/core/modules/language/lib/Plugin/views/argument/LanguageArgument.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Plugin/views/argument/LanguageArgument.php
rename to core/modules/language/lib/Plugin/views/argument/LanguageArgument.php
diff --git a/core/modules/language/lib/Drupal/language/Plugin/views/field/LanguageField.php b/core/modules/language/lib/Plugin/views/field/LanguageField.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Plugin/views/field/LanguageField.php
rename to core/modules/language/lib/Plugin/views/field/LanguageField.php
diff --git a/core/modules/language/lib/Drupal/language/Plugin/views/filter/LanguageFilter.php b/core/modules/language/lib/Plugin/views/filter/LanguageFilter.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Plugin/views/filter/LanguageFilter.php
rename to core/modules/language/lib/Plugin/views/filter/LanguageFilter.php
diff --git a/core/modules/language/lib/Drupal/language/Tests/Condition/LanguageConditionTest.php b/core/modules/language/lib/Tests/Condition/LanguageConditionTest.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Tests/Condition/LanguageConditionTest.php
rename to core/modules/language/lib/Tests/Condition/LanguageConditionTest.php
diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageBrowserDetectionUnitTest.php b/core/modules/language/lib/Tests/LanguageBrowserDetectionUnitTest.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Tests/LanguageBrowserDetectionUnitTest.php
rename to core/modules/language/lib/Tests/LanguageBrowserDetectionUnitTest.php
diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageConfigurationElementTest.php b/core/modules/language/lib/Tests/LanguageConfigurationElementTest.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Tests/LanguageConfigurationElementTest.php
rename to core/modules/language/lib/Tests/LanguageConfigurationElementTest.php
diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageConfigurationTest.php b/core/modules/language/lib/Tests/LanguageConfigurationTest.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Tests/LanguageConfigurationTest.php
rename to core/modules/language/lib/Tests/LanguageConfigurationTest.php
diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageCustomLanguageConfigurationTest.php b/core/modules/language/lib/Tests/LanguageCustomLanguageConfigurationTest.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Tests/LanguageCustomLanguageConfigurationTest.php
rename to core/modules/language/lib/Tests/LanguageCustomLanguageConfigurationTest.php
diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageDependencyInjectionTest.php b/core/modules/language/lib/Tests/LanguageDependencyInjectionTest.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Tests/LanguageDependencyInjectionTest.php
rename to core/modules/language/lib/Tests/LanguageDependencyInjectionTest.php
diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageListTest.php b/core/modules/language/lib/Tests/LanguageListTest.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Tests/LanguageListTest.php
rename to core/modules/language/lib/Tests/LanguageListTest.php
diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageNegotiationInfoTest.php b/core/modules/language/lib/Tests/LanguageNegotiationInfoTest.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Tests/LanguageNegotiationInfoTest.php
rename to core/modules/language/lib/Tests/LanguageNegotiationInfoTest.php
diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguagePathMonolingualTest.php b/core/modules/language/lib/Tests/LanguagePathMonolingualTest.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Tests/LanguagePathMonolingualTest.php
rename to core/modules/language/lib/Tests/LanguagePathMonolingualTest.php
diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageSwitchingTest.php b/core/modules/language/lib/Tests/LanguageSwitchingTest.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Tests/LanguageSwitchingTest.php
rename to core/modules/language/lib/Tests/LanguageSwitchingTest.php
diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageUILanguageNegotiationTest.php b/core/modules/language/lib/Tests/LanguageUILanguageNegotiationTest.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Tests/LanguageUILanguageNegotiationTest.php
rename to core/modules/language/lib/Tests/LanguageUILanguageNegotiationTest.php
diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageUrlRewritingTest.php b/core/modules/language/lib/Tests/LanguageUrlRewritingTest.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Tests/LanguageUrlRewritingTest.php
rename to core/modules/language/lib/Tests/LanguageUrlRewritingTest.php
diff --git a/core/modules/language/lib/Drupal/language/Tests/Views/ArgumentLanguageTest.php b/core/modules/language/lib/Tests/Views/ArgumentLanguageTest.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Tests/Views/ArgumentLanguageTest.php
rename to core/modules/language/lib/Tests/Views/ArgumentLanguageTest.php
diff --git a/core/modules/language/lib/Drupal/language/Tests/Views/FieldLanguageTest.php b/core/modules/language/lib/Tests/Views/FieldLanguageTest.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Tests/Views/FieldLanguageTest.php
rename to core/modules/language/lib/Tests/Views/FieldLanguageTest.php
diff --git a/core/modules/language/lib/Drupal/language/Tests/Views/FilterLanguageTest.php b/core/modules/language/lib/Tests/Views/FilterLanguageTest.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Tests/Views/FilterLanguageTest.php
rename to core/modules/language/lib/Tests/Views/FilterLanguageTest.php
diff --git a/core/modules/language/lib/Drupal/language/Tests/Views/LanguageTestBase.php b/core/modules/language/lib/Tests/Views/LanguageTestBase.php
similarity index 100%
rename from core/modules/language/lib/Drupal/language/Tests/Views/LanguageTestBase.php
rename to core/modules/language/lib/Tests/Views/LanguageTestBase.php
diff --git a/core/modules/language/tests/language_test/lib/Drupal/language_test/Controller/LanguageTestController.php b/core/modules/language/tests/language_test/lib/Controller/LanguageTestController.php
similarity index 100%
rename from core/modules/language/tests/language_test/lib/Drupal/language_test/Controller/LanguageTestController.php
rename to core/modules/language/tests/language_test/lib/Controller/LanguageTestController.php
diff --git a/core/modules/language/tests/language_test/lib/Drupal/language_test/LanguageTestManager.php b/core/modules/language/tests/language_test/lib/LanguageTestManager.php
similarity index 100%
rename from core/modules/language/tests/language_test/lib/Drupal/language_test/LanguageTestManager.php
rename to core/modules/language/tests/language_test/lib/LanguageTestManager.php
diff --git a/core/modules/language/tests/language_test/lib/Drupal/language_test/LanguageTestServiceProvider.php b/core/modules/language/tests/language_test/lib/LanguageTestServiceProvider.php
similarity index 100%
rename from core/modules/language/tests/language_test/lib/Drupal/language_test/LanguageTestServiceProvider.php
rename to core/modules/language/tests/language_test/lib/LanguageTestServiceProvider.php
diff --git a/core/modules/link/lib/Drupal/link/Plugin/field/field_type/LinkItem.php b/core/modules/link/lib/Plugin/field/field_type/LinkItem.php
similarity index 100%
rename from core/modules/link/lib/Drupal/link/Plugin/field/field_type/LinkItem.php
rename to core/modules/link/lib/Plugin/field/field_type/LinkItem.php
diff --git a/core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkFormatter.php b/core/modules/link/lib/Plugin/field/formatter/LinkFormatter.php
similarity index 100%
rename from core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkFormatter.php
rename to core/modules/link/lib/Plugin/field/formatter/LinkFormatter.php
diff --git a/core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkSeparateFormatter.php b/core/modules/link/lib/Plugin/field/formatter/LinkSeparateFormatter.php
similarity index 100%
rename from core/modules/link/lib/Drupal/link/Plugin/field/formatter/LinkSeparateFormatter.php
rename to core/modules/link/lib/Plugin/field/formatter/LinkSeparateFormatter.php
diff --git a/core/modules/link/lib/Drupal/link/Plugin/field/widget/LinkWidget.php b/core/modules/link/lib/Plugin/field/widget/LinkWidget.php
similarity index 100%
rename from core/modules/link/lib/Drupal/link/Plugin/field/widget/LinkWidget.php
rename to core/modules/link/lib/Plugin/field/widget/LinkWidget.php
diff --git a/core/modules/link/lib/Drupal/link/Tests/LinkFieldTest.php b/core/modules/link/lib/Tests/LinkFieldTest.php
similarity index 100%
rename from core/modules/link/lib/Drupal/link/Tests/LinkFieldTest.php
rename to core/modules/link/lib/Tests/LinkFieldTest.php
diff --git a/core/modules/link/lib/Drupal/link/Tests/LinkFieldUITest.php b/core/modules/link/lib/Tests/LinkFieldUITest.php
similarity index 100%
rename from core/modules/link/lib/Drupal/link/Tests/LinkFieldUITest.php
rename to core/modules/link/lib/Tests/LinkFieldUITest.php
diff --git a/core/modules/link/lib/Drupal/link/Tests/LinkItemTest.php b/core/modules/link/lib/Tests/LinkItemTest.php
similarity index 100%
rename from core/modules/link/lib/Drupal/link/Tests/LinkItemTest.php
rename to core/modules/link/lib/Tests/LinkItemTest.php
diff --git a/core/modules/locale/lib/Drupal/locale/Controller/LocaleController.php b/core/modules/locale/lib/Controller/LocaleController.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/Controller/LocaleController.php
rename to core/modules/locale/lib/Controller/LocaleController.php
diff --git a/core/modules/locale/lib/Drupal/locale/Form/LocaleSettingsForm.php b/core/modules/locale/lib/Form/LocaleSettingsForm.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/Form/LocaleSettingsForm.php
rename to core/modules/locale/lib/Form/LocaleSettingsForm.php
diff --git a/core/modules/locale/lib/Drupal/locale/Form/TranslateEditForm.php b/core/modules/locale/lib/Form/TranslateEditForm.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/Form/TranslateEditForm.php
rename to core/modules/locale/lib/Form/TranslateEditForm.php
diff --git a/core/modules/locale/lib/Drupal/locale/Form/TranslateFilterForm.php b/core/modules/locale/lib/Form/TranslateFilterForm.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/Form/TranslateFilterForm.php
rename to core/modules/locale/lib/Form/TranslateFilterForm.php
diff --git a/core/modules/locale/lib/Drupal/locale/Form/TranslateFormBase.php b/core/modules/locale/lib/Form/TranslateFormBase.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/Form/TranslateFormBase.php
rename to core/modules/locale/lib/Form/TranslateFormBase.php
diff --git a/core/modules/locale/lib/Drupal/locale/Gettext.php b/core/modules/locale/lib/Gettext.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/Gettext.php
rename to core/modules/locale/lib/Gettext.php
diff --git a/core/modules/locale/lib/Drupal/locale/Locale.php b/core/modules/locale/lib/Locale.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/Locale.php
rename to core/modules/locale/lib/Locale.php
diff --git a/core/modules/locale/lib/Drupal/locale/LocaleConfigManager.php b/core/modules/locale/lib/LocaleConfigManager.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/LocaleConfigManager.php
rename to core/modules/locale/lib/LocaleConfigManager.php
diff --git a/core/modules/locale/lib/Drupal/locale/LocaleConfigSubscriber.php b/core/modules/locale/lib/LocaleConfigSubscriber.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/LocaleConfigSubscriber.php
rename to core/modules/locale/lib/LocaleConfigSubscriber.php
diff --git a/core/modules/locale/lib/Drupal/locale/LocaleLookup.php b/core/modules/locale/lib/LocaleLookup.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/LocaleLookup.php
rename to core/modules/locale/lib/LocaleLookup.php
diff --git a/core/modules/locale/lib/Drupal/locale/LocaleTranslation.php b/core/modules/locale/lib/LocaleTranslation.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/LocaleTranslation.php
rename to core/modules/locale/lib/LocaleTranslation.php
diff --git a/core/modules/locale/lib/Drupal/locale/LocaleTypedConfig.php b/core/modules/locale/lib/LocaleTypedConfig.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/LocaleTypedConfig.php
rename to core/modules/locale/lib/LocaleTypedConfig.php
diff --git a/core/modules/locale/lib/Drupal/locale/PoDatabaseReader.php b/core/modules/locale/lib/PoDatabaseReader.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/PoDatabaseReader.php
rename to core/modules/locale/lib/PoDatabaseReader.php
diff --git a/core/modules/locale/lib/Drupal/locale/PoDatabaseWriter.php b/core/modules/locale/lib/PoDatabaseWriter.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/PoDatabaseWriter.php
rename to core/modules/locale/lib/PoDatabaseWriter.php
diff --git a/core/modules/locale/lib/Drupal/locale/SourceString.php b/core/modules/locale/lib/SourceString.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/SourceString.php
rename to core/modules/locale/lib/SourceString.php
diff --git a/core/modules/locale/lib/Drupal/locale/StringBase.php b/core/modules/locale/lib/StringBase.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/StringBase.php
rename to core/modules/locale/lib/StringBase.php
diff --git a/core/modules/locale/lib/Drupal/locale/StringDatabaseStorage.php b/core/modules/locale/lib/StringDatabaseStorage.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/StringDatabaseStorage.php
rename to core/modules/locale/lib/StringDatabaseStorage.php
diff --git a/core/modules/locale/lib/Drupal/locale/StringInterface.php b/core/modules/locale/lib/StringInterface.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/StringInterface.php
rename to core/modules/locale/lib/StringInterface.php
diff --git a/core/modules/locale/lib/Drupal/locale/StringStorageException.php b/core/modules/locale/lib/StringStorageException.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/StringStorageException.php
rename to core/modules/locale/lib/StringStorageException.php
diff --git a/core/modules/locale/lib/Drupal/locale/StringStorageInterface.php b/core/modules/locale/lib/StringStorageInterface.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/StringStorageInterface.php
rename to core/modules/locale/lib/StringStorageInterface.php
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleConfigTranslationTest.php b/core/modules/locale/lib/Tests/LocaleConfigTranslationTest.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleConfigTranslationTest.php
rename to core/modules/locale/lib/Tests/LocaleConfigTranslationTest.php
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleContentTest.php b/core/modules/locale/lib/Tests/LocaleContentTest.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleContentTest.php
rename to core/modules/locale/lib/Tests/LocaleContentTest.php
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleExportTest.php b/core/modules/locale/lib/Tests/LocaleExportTest.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleExportTest.php
rename to core/modules/locale/lib/Tests/LocaleExportTest.php
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleImportFunctionalTest.php b/core/modules/locale/lib/Tests/LocaleImportFunctionalTest.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleImportFunctionalTest.php
rename to core/modules/locale/lib/Tests/LocaleImportFunctionalTest.php
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleJavascriptTranslation.php b/core/modules/locale/lib/Tests/LocaleJavascriptTranslation.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleJavascriptTranslation.php
rename to core/modules/locale/lib/Tests/LocaleJavascriptTranslation.php
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleLibraryInfoAlterTest.php b/core/modules/locale/lib/Tests/LocaleLibraryInfoAlterTest.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleLibraryInfoAlterTest.php
rename to core/modules/locale/lib/Tests/LocaleLibraryInfoAlterTest.php
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocalePathTest.php b/core/modules/locale/lib/Tests/LocalePathTest.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/Tests/LocalePathTest.php
rename to core/modules/locale/lib/Tests/LocalePathTest.php
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocalePluralFormatTest.php b/core/modules/locale/lib/Tests/LocalePluralFormatTest.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/Tests/LocalePluralFormatTest.php
rename to core/modules/locale/lib/Tests/LocalePluralFormatTest.php
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleStringTest.php b/core/modules/locale/lib/Tests/LocaleStringTest.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleStringTest.php
rename to core/modules/locale/lib/Tests/LocaleStringTest.php
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleTranslationUiTest.php b/core/modules/locale/lib/Tests/LocaleTranslationUiTest.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleTranslationUiTest.php
rename to core/modules/locale/lib/Tests/LocaleTranslationUiTest.php
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleUninstallFrenchTest.php b/core/modules/locale/lib/Tests/LocaleUninstallFrenchTest.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleUninstallFrenchTest.php
rename to core/modules/locale/lib/Tests/LocaleUninstallFrenchTest.php
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleUninstallTest.php b/core/modules/locale/lib/Tests/LocaleUninstallTest.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleUninstallTest.php
rename to core/modules/locale/lib/Tests/LocaleUninstallTest.php
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateBase.php b/core/modules/locale/lib/Tests/LocaleUpdateBase.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateBase.php
rename to core/modules/locale/lib/Tests/LocaleUpdateBase.php
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateCronTest.php b/core/modules/locale/lib/Tests/LocaleUpdateCronTest.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateCronTest.php
rename to core/modules/locale/lib/Tests/LocaleUpdateCronTest.php
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateInterfaceTest.php b/core/modules/locale/lib/Tests/LocaleUpdateInterfaceTest.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateInterfaceTest.php
rename to core/modules/locale/lib/Tests/LocaleUpdateInterfaceTest.php
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateTest.php b/core/modules/locale/lib/Tests/LocaleUpdateTest.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/Tests/LocaleUpdateTest.php
rename to core/modules/locale/lib/Tests/LocaleUpdateTest.php
diff --git a/core/modules/locale/lib/Drupal/locale/TranslationString.php b/core/modules/locale/lib/TranslationString.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/TranslationString.php
rename to core/modules/locale/lib/TranslationString.php
diff --git a/core/modules/locale/lib/Drupal/locale/TranslationsStream.php b/core/modules/locale/lib/TranslationsStream.php
similarity index 100%
rename from core/modules/locale/lib/Drupal/locale/TranslationsStream.php
rename to core/modules/locale/lib/TranslationsStream.php
diff --git a/core/modules/locale/tests/Drupal/locale/Tests/LocaleTranslationTest.php b/core/modules/locale/tests/lib/LocaleTranslationTest.php
similarity index 100%
rename from core/modules/locale/tests/Drupal/locale/Tests/LocaleTranslationTest.php
rename to core/modules/locale/tests/lib/LocaleTranslationTest.php
diff --git a/core/modules/menu/lib/Drupal/menu/Controller/MenuController.php b/core/modules/menu/lib/Controller/MenuController.php
similarity index 100%
rename from core/modules/menu/lib/Drupal/menu/Controller/MenuController.php
rename to core/modules/menu/lib/Controller/MenuController.php
diff --git a/core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php b/core/modules/menu/lib/Form/MenuDeleteForm.php
similarity index 100%
rename from core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php
rename to core/modules/menu/lib/Form/MenuDeleteForm.php
diff --git a/core/modules/menu/lib/Drupal/menu/Form/MenuLinkDeleteForm.php b/core/modules/menu/lib/Form/MenuLinkDeleteForm.php
similarity index 100%
rename from core/modules/menu/lib/Drupal/menu/Form/MenuLinkDeleteForm.php
rename to core/modules/menu/lib/Form/MenuLinkDeleteForm.php
diff --git a/core/modules/menu/lib/Drupal/menu/Form/MenuLinkResetForm.php b/core/modules/menu/lib/Form/MenuLinkResetForm.php
similarity index 100%
rename from core/modules/menu/lib/Drupal/menu/Form/MenuLinkResetForm.php
rename to core/modules/menu/lib/Form/MenuLinkResetForm.php
diff --git a/core/modules/menu/lib/Drupal/menu/MenuFormController.php b/core/modules/menu/lib/MenuFormController.php
similarity index 100%
rename from core/modules/menu/lib/Drupal/menu/MenuFormController.php
rename to core/modules/menu/lib/MenuFormController.php
diff --git a/core/modules/menu/lib/Drupal/menu/MenuListController.php b/core/modules/menu/lib/MenuListController.php
similarity index 100%
rename from core/modules/menu/lib/Drupal/menu/MenuListController.php
rename to core/modules/menu/lib/MenuListController.php
diff --git a/core/modules/menu/lib/Drupal/menu/MenuSettingsForm.php b/core/modules/menu/lib/MenuSettingsForm.php
similarity index 100%
rename from core/modules/menu/lib/Drupal/menu/MenuSettingsForm.php
rename to core/modules/menu/lib/MenuSettingsForm.php
diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuLanguageTest.php b/core/modules/menu/lib/Tests/MenuLanguageTest.php
similarity index 100%
rename from core/modules/menu/lib/Drupal/menu/Tests/MenuLanguageTest.php
rename to core/modules/menu/lib/Tests/MenuLanguageTest.php
diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuNodeTest.php b/core/modules/menu/lib/Tests/MenuNodeTest.php
similarity index 100%
rename from core/modules/menu/lib/Drupal/menu/Tests/MenuNodeTest.php
rename to core/modules/menu/lib/Tests/MenuNodeTest.php
diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php b/core/modules/menu/lib/Tests/MenuTest.php
similarity index 100%
rename from core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
rename to core/modules/menu/lib/Tests/MenuTest.php
diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuUninstallTest.php b/core/modules/menu/lib/Tests/MenuUninstallTest.php
similarity index 100%
rename from core/modules/menu/lib/Drupal/menu/Tests/MenuUninstallTest.php
rename to core/modules/menu/lib/Tests/MenuUninstallTest.php
diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuWebTestBase.php b/core/modules/menu/lib/Tests/MenuWebTestBase.php
similarity index 100%
rename from core/modules/menu/lib/Drupal/menu/Tests/MenuWebTestBase.php
rename to core/modules/menu/lib/Tests/MenuWebTestBase.php
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php b/core/modules/menu_link/lib/Entity/MenuLink.php
similarity index 100%
rename from core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php
rename to core/modules/menu_link/lib/Entity/MenuLink.php
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkAccessController.php b/core/modules/menu_link/lib/MenuLinkAccessController.php
similarity index 100%
rename from core/modules/menu_link/lib/Drupal/menu_link/MenuLinkAccessController.php
rename to core/modules/menu_link/lib/MenuLinkAccessController.php
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkBreadcrumbBuilder.php b/core/modules/menu_link/lib/MenuLinkBreadcrumbBuilder.php
similarity index 100%
rename from core/modules/menu_link/lib/Drupal/menu_link/MenuLinkBreadcrumbBuilder.php
rename to core/modules/menu_link/lib/MenuLinkBreadcrumbBuilder.php
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php b/core/modules/menu_link/lib/MenuLinkFormController.php
similarity index 100%
rename from core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php
rename to core/modules/menu_link/lib/MenuLinkFormController.php
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkInterface.php b/core/modules/menu_link/lib/MenuLinkInterface.php
similarity index 100%
rename from core/modules/menu_link/lib/Drupal/menu_link/MenuLinkInterface.php
rename to core/modules/menu_link/lib/MenuLinkInterface.php
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php b/core/modules/menu_link/lib/MenuLinkStorageController.php
similarity index 100%
rename from core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php
rename to core/modules/menu_link/lib/MenuLinkStorageController.php
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageControllerInterface.php b/core/modules/menu_link/lib/MenuLinkStorageControllerInterface.php
similarity index 100%
rename from core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageControllerInterface.php
rename to core/modules/menu_link/lib/MenuLinkStorageControllerInterface.php
diff --git a/core/modules/menu_link/tests/Drupal/menu_link/Tests/Plugin/Core/Entity/MenuLinkTest.php b/core/modules/menu_link/tests/lib/Plugin/Core/Entity/MenuLinkTest.php
similarity index 100%
rename from core/modules/menu_link/tests/Drupal/menu_link/Tests/Plugin/Core/Entity/MenuLinkTest.php
rename to core/modules/menu_link/tests/lib/Plugin/Core/Entity/MenuLinkTest.php
diff --git a/core/modules/node/lib/Drupal/node/Access/NodeRevisionAccessCheck.php b/core/modules/node/lib/Access/NodeRevisionAccessCheck.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Access/NodeRevisionAccessCheck.php
rename to core/modules/node/lib/Access/NodeRevisionAccessCheck.php
diff --git a/core/modules/node/lib/Drupal/node/Entity/Node.php b/core/modules/node/lib/Entity/Node.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Entity/Node.php
rename to core/modules/node/lib/Entity/Node.php
diff --git a/core/modules/node/lib/Drupal/node/Entity/NodeType.php b/core/modules/node/lib/Entity/NodeType.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Entity/NodeType.php
rename to core/modules/node/lib/Entity/NodeType.php
diff --git a/core/modules/node/lib/Drupal/node/Form/DeleteMultiple.php b/core/modules/node/lib/Form/DeleteMultiple.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Form/DeleteMultiple.php
rename to core/modules/node/lib/Form/DeleteMultiple.php
diff --git a/core/modules/node/lib/Drupal/node/Form/NodeDeleteForm.php b/core/modules/node/lib/Form/NodeDeleteForm.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Form/NodeDeleteForm.php
rename to core/modules/node/lib/Form/NodeDeleteForm.php
diff --git a/core/modules/node/lib/Drupal/node/Form/NodeRevisionDeleteForm.php b/core/modules/node/lib/Form/NodeRevisionDeleteForm.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Form/NodeRevisionDeleteForm.php
rename to core/modules/node/lib/Form/NodeRevisionDeleteForm.php
diff --git a/core/modules/node/lib/Drupal/node/Form/NodeRevisionRevertForm.php b/core/modules/node/lib/Form/NodeRevisionRevertForm.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Form/NodeRevisionRevertForm.php
rename to core/modules/node/lib/Form/NodeRevisionRevertForm.php
diff --git a/core/modules/node/lib/Drupal/node/Form/NodeTypeDeleteConfirm.php b/core/modules/node/lib/Form/NodeTypeDeleteConfirm.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Form/NodeTypeDeleteConfirm.php
rename to core/modules/node/lib/Form/NodeTypeDeleteConfirm.php
diff --git a/core/modules/node/lib/Drupal/node/Form/RebuildPermissionsForm.php b/core/modules/node/lib/Form/RebuildPermissionsForm.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Form/RebuildPermissionsForm.php
rename to core/modules/node/lib/Form/RebuildPermissionsForm.php
diff --git a/core/modules/node/lib/Drupal/node/NodeAccessController.php b/core/modules/node/lib/NodeAccessController.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/NodeAccessController.php
rename to core/modules/node/lib/NodeAccessController.php
diff --git a/core/modules/node/lib/Drupal/node/NodeAccessControllerInterface.php b/core/modules/node/lib/NodeAccessControllerInterface.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/NodeAccessControllerInterface.php
rename to core/modules/node/lib/NodeAccessControllerInterface.php
diff --git a/core/modules/node/lib/Drupal/node/NodeFormController.php b/core/modules/node/lib/NodeFormController.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/NodeFormController.php
rename to core/modules/node/lib/NodeFormController.php
diff --git a/core/modules/node/lib/Drupal/node/NodeGrantDatabaseStorage.php b/core/modules/node/lib/NodeGrantDatabaseStorage.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/NodeGrantDatabaseStorage.php
rename to core/modules/node/lib/NodeGrantDatabaseStorage.php
diff --git a/core/modules/node/lib/Drupal/node/NodeGrantDatabaseStorageInterface.php b/core/modules/node/lib/NodeGrantDatabaseStorageInterface.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/NodeGrantDatabaseStorageInterface.php
rename to core/modules/node/lib/NodeGrantDatabaseStorageInterface.php
diff --git a/core/modules/node/lib/Drupal/node/NodeInterface.php b/core/modules/node/lib/NodeInterface.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/NodeInterface.php
rename to core/modules/node/lib/NodeInterface.php
diff --git a/core/modules/node/lib/Drupal/node/NodeRenderController.php b/core/modules/node/lib/NodeRenderController.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/NodeRenderController.php
rename to core/modules/node/lib/NodeRenderController.php
diff --git a/core/modules/node/lib/Drupal/node/NodeStorageController.php b/core/modules/node/lib/NodeStorageController.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/NodeStorageController.php
rename to core/modules/node/lib/NodeStorageController.php
diff --git a/core/modules/node/lib/Drupal/node/NodeTranslationController.php b/core/modules/node/lib/NodeTranslationController.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/NodeTranslationController.php
rename to core/modules/node/lib/NodeTranslationController.php
diff --git a/core/modules/node/lib/Drupal/node/NodeTypeAccessController.php b/core/modules/node/lib/NodeTypeAccessController.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/NodeTypeAccessController.php
rename to core/modules/node/lib/NodeTypeAccessController.php
diff --git a/core/modules/node/lib/Drupal/node/NodeTypeFormController.php b/core/modules/node/lib/NodeTypeFormController.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/NodeTypeFormController.php
rename to core/modules/node/lib/NodeTypeFormController.php
diff --git a/core/modules/node/lib/Drupal/node/NodeTypeInterface.php b/core/modules/node/lib/NodeTypeInterface.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/NodeTypeInterface.php
rename to core/modules/node/lib/NodeTypeInterface.php
diff --git a/core/modules/node/lib/Drupal/node/NodeTypeListController.php b/core/modules/node/lib/NodeTypeListController.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/NodeTypeListController.php
rename to core/modules/node/lib/NodeTypeListController.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/AssignOwnerNode.php b/core/modules/node/lib/Plugin/Action/AssignOwnerNode.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/Action/AssignOwnerNode.php
rename to core/modules/node/lib/Plugin/Action/AssignOwnerNode.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/DeleteNode.php b/core/modules/node/lib/Plugin/Action/DeleteNode.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/Action/DeleteNode.php
rename to core/modules/node/lib/Plugin/Action/DeleteNode.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/DemoteNode.php b/core/modules/node/lib/Plugin/Action/DemoteNode.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/Action/DemoteNode.php
rename to core/modules/node/lib/Plugin/Action/DemoteNode.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/PromoteNode.php b/core/modules/node/lib/Plugin/Action/PromoteNode.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/Action/PromoteNode.php
rename to core/modules/node/lib/Plugin/Action/PromoteNode.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/PublishNode.php b/core/modules/node/lib/Plugin/Action/PublishNode.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/Action/PublishNode.php
rename to core/modules/node/lib/Plugin/Action/PublishNode.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/SaveNode.php b/core/modules/node/lib/Plugin/Action/SaveNode.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/Action/SaveNode.php
rename to core/modules/node/lib/Plugin/Action/SaveNode.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/StickyNode.php b/core/modules/node/lib/Plugin/Action/StickyNode.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/Action/StickyNode.php
rename to core/modules/node/lib/Plugin/Action/StickyNode.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/UnpublishByKeywordNode.php b/core/modules/node/lib/Plugin/Action/UnpublishByKeywordNode.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/Action/UnpublishByKeywordNode.php
rename to core/modules/node/lib/Plugin/Action/UnpublishByKeywordNode.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/UnpublishNode.php b/core/modules/node/lib/Plugin/Action/UnpublishNode.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/Action/UnpublishNode.php
rename to core/modules/node/lib/Plugin/Action/UnpublishNode.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/UnstickyNode.php b/core/modules/node/lib/Plugin/Action/UnstickyNode.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/Action/UnstickyNode.php
rename to core/modules/node/lib/Plugin/Action/UnstickyNode.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Block/RecentContentBlock.php b/core/modules/node/lib/Plugin/Block/RecentContentBlock.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/Block/RecentContentBlock.php
rename to core/modules/node/lib/Plugin/Block/RecentContentBlock.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Block/SyndicateBlock.php b/core/modules/node/lib/Plugin/Block/SyndicateBlock.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/Block/SyndicateBlock.php
rename to core/modules/node/lib/Plugin/Block/SyndicateBlock.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Condition/NodeType.php b/core/modules/node/lib/Plugin/Condition/NodeType.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/Condition/NodeType.php
rename to core/modules/node/lib/Plugin/Condition/NodeType.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php b/core/modules/node/lib/Plugin/Search/NodeSearch.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php
rename to core/modules/node/lib/Plugin/Search/NodeSearch.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/entity_reference/selection/NodeSelection.php b/core/modules/node/lib/Plugin/entity_reference/selection/NodeSelection.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/entity_reference/selection/NodeSelection.php
rename to core/modules/node/lib/Plugin/entity_reference/selection/NodeSelection.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/area/ListingEmpty.php b/core/modules/node/lib/Plugin/views/area/ListingEmpty.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/views/area/ListingEmpty.php
rename to core/modules/node/lib/Plugin/views/area/ListingEmpty.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/Nid.php b/core/modules/node/lib/Plugin/views/argument/Nid.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/views/argument/Nid.php
rename to core/modules/node/lib/Plugin/views/argument/Nid.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/Type.php b/core/modules/node/lib/Plugin/views/argument/Type.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/views/argument/Type.php
rename to core/modules/node/lib/Plugin/views/argument/Type.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/UidRevision.php b/core/modules/node/lib/Plugin/views/argument/UidRevision.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/views/argument/UidRevision.php
rename to core/modules/node/lib/Plugin/views/argument/UidRevision.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/Vid.php b/core/modules/node/lib/Plugin/views/argument/Vid.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/views/argument/Vid.php
rename to core/modules/node/lib/Plugin/views/argument/Vid.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument_default/Node.php b/core/modules/node/lib/Plugin/views/argument_default/Node.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/views/argument_default/Node.php
rename to core/modules/node/lib/Plugin/views/argument_default/Node.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument_validator/Node.php b/core/modules/node/lib/Plugin/views/argument_validator/Node.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/views/argument_validator/Node.php
rename to core/modules/node/lib/Plugin/views/argument_validator/Node.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Language.php b/core/modules/node/lib/Plugin/views/field/Language.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/views/field/Language.php
rename to core/modules/node/lib/Plugin/views/field/Language.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Link.php b/core/modules/node/lib/Plugin/views/field/Link.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/views/field/Link.php
rename to core/modules/node/lib/Plugin/views/field/Link.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkDelete.php b/core/modules/node/lib/Plugin/views/field/LinkDelete.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/views/field/LinkDelete.php
rename to core/modules/node/lib/Plugin/views/field/LinkDelete.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkEdit.php b/core/modules/node/lib/Plugin/views/field/LinkEdit.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/views/field/LinkEdit.php
rename to core/modules/node/lib/Plugin/views/field/LinkEdit.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Node.php b/core/modules/node/lib/Plugin/views/field/Node.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/views/field/Node.php
rename to core/modules/node/lib/Plugin/views/field/Node.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/NodeBulkForm.php b/core/modules/node/lib/Plugin/views/field/NodeBulkForm.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/views/field/NodeBulkForm.php
rename to core/modules/node/lib/Plugin/views/field/NodeBulkForm.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Path.php b/core/modules/node/lib/Plugin/views/field/Path.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/views/field/Path.php
rename to core/modules/node/lib/Plugin/views/field/Path.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Revision.php b/core/modules/node/lib/Plugin/views/field/Revision.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/views/field/Revision.php
rename to core/modules/node/lib/Plugin/views/field/Revision.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php b/core/modules/node/lib/Plugin/views/field/RevisionLink.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php
rename to core/modules/node/lib/Plugin/views/field/RevisionLink.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkDelete.php b/core/modules/node/lib/Plugin/views/field/RevisionLinkDelete.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkDelete.php
rename to core/modules/node/lib/Plugin/views/field/RevisionLinkDelete.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkRevert.php b/core/modules/node/lib/Plugin/views/field/RevisionLinkRevert.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkRevert.php
rename to core/modules/node/lib/Plugin/views/field/RevisionLinkRevert.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Type.php b/core/modules/node/lib/Plugin/views/field/Type.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/views/field/Type.php
rename to core/modules/node/lib/Plugin/views/field/Type.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/filter/Access.php b/core/modules/node/lib/Plugin/views/filter/Access.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/views/filter/Access.php
rename to core/modules/node/lib/Plugin/views/filter/Access.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/filter/Status.php b/core/modules/node/lib/Plugin/views/filter/Status.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/views/filter/Status.php
rename to core/modules/node/lib/Plugin/views/filter/Status.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/filter/UidRevision.php b/core/modules/node/lib/Plugin/views/filter/UidRevision.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/views/filter/UidRevision.php
rename to core/modules/node/lib/Plugin/views/filter/UidRevision.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/row/NodeRow.php b/core/modules/node/lib/Plugin/views/row/NodeRow.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/views/row/NodeRow.php
rename to core/modules/node/lib/Plugin/views/row/NodeRow.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/row/Rss.php b/core/modules/node/lib/Plugin/views/row/Rss.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/views/row/Rss.php
rename to core/modules/node/lib/Plugin/views/row/Rss.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php b/core/modules/node/lib/Plugin/views/wizard/Node.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php
rename to core/modules/node/lib/Plugin/views/wizard/Node.php
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/wizard/NodeRevision.php b/core/modules/node/lib/Plugin/views/wizard/NodeRevision.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Plugin/views/wizard/NodeRevision.php
rename to core/modules/node/lib/Plugin/views/wizard/NodeRevision.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/Condition/NodeConditionTest.php b/core/modules/node/lib/Tests/Condition/NodeConditionTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/Condition/NodeConditionTest.php
rename to core/modules/node/lib/Tests/Condition/NodeConditionTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/Config/NodeImportChangeTest.php b/core/modules/node/lib/Tests/Config/NodeImportChangeTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/Config/NodeImportChangeTest.php
rename to core/modules/node/lib/Tests/Config/NodeImportChangeTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/Config/NodeImportCreateTest.php b/core/modules/node/lib/Tests/Config/NodeImportCreateTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/Config/NodeImportCreateTest.php
rename to core/modules/node/lib/Tests/Config/NodeImportCreateTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/MultiStepNodeFormBasicOptionsTest.php b/core/modules/node/lib/Tests/MultiStepNodeFormBasicOptionsTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/MultiStepNodeFormBasicOptionsTest.php
rename to core/modules/node/lib/Tests/MultiStepNodeFormBasicOptionsTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAccessBaseTableTest.php b/core/modules/node/lib/Tests/NodeAccessBaseTableTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeAccessBaseTableTest.php
rename to core/modules/node/lib/Tests/NodeAccessBaseTableTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAccessFieldTest.php b/core/modules/node/lib/Tests/NodeAccessFieldTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeAccessFieldTest.php
rename to core/modules/node/lib/Tests/NodeAccessFieldTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAccessLanguageAwareCombinationTest.php b/core/modules/node/lib/Tests/NodeAccessLanguageAwareCombinationTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeAccessLanguageAwareCombinationTest.php
rename to core/modules/node/lib/Tests/NodeAccessLanguageAwareCombinationTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAccessLanguageAwareTest.php b/core/modules/node/lib/Tests/NodeAccessLanguageAwareTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeAccessLanguageAwareTest.php
rename to core/modules/node/lib/Tests/NodeAccessLanguageAwareTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAccessLanguageTest.php b/core/modules/node/lib/Tests/NodeAccessLanguageTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeAccessLanguageTest.php
rename to core/modules/node/lib/Tests/NodeAccessLanguageTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAccessPagerTest.php b/core/modules/node/lib/Tests/NodeAccessPagerTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeAccessPagerTest.php
rename to core/modules/node/lib/Tests/NodeAccessPagerTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAccessRebuildTest.php b/core/modules/node/lib/Tests/NodeAccessRebuildTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeAccessRebuildTest.php
rename to core/modules/node/lib/Tests/NodeAccessRebuildTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAccessRecordsTest.php b/core/modules/node/lib/Tests/NodeAccessRecordsTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeAccessRecordsTest.php
rename to core/modules/node/lib/Tests/NodeAccessRecordsTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAccessTest.php b/core/modules/node/lib/Tests/NodeAccessTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeAccessTest.php
rename to core/modules/node/lib/Tests/NodeAccessTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAdminTest.php b/core/modules/node/lib/Tests/NodeAdminTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeAdminTest.php
rename to core/modules/node/lib/Tests/NodeAdminTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeBlockFunctionalTest.php b/core/modules/node/lib/Tests/NodeBlockFunctionalTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeBlockFunctionalTest.php
rename to core/modules/node/lib/Tests/NodeBlockFunctionalTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeBuildContentTest.php b/core/modules/node/lib/Tests/NodeBuildContentTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeBuildContentTest.php
rename to core/modules/node/lib/Tests/NodeBuildContentTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeCreationTest.php b/core/modules/node/lib/Tests/NodeCreationTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeCreationTest.php
rename to core/modules/node/lib/Tests/NodeCreationTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeEntityViewModeAlterTest.php b/core/modules/node/lib/Tests/NodeEntityViewModeAlterTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeEntityViewModeAlterTest.php
rename to core/modules/node/lib/Tests/NodeEntityViewModeAlterTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeFieldMultilingualTestCase.php b/core/modules/node/lib/Tests/NodeFieldMultilingualTestCase.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeFieldMultilingualTestCase.php
rename to core/modules/node/lib/Tests/NodeFieldMultilingualTestCase.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeFormButtonsTest.php b/core/modules/node/lib/Tests/NodeFormButtonsTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeFormButtonsTest.php
rename to core/modules/node/lib/Tests/NodeFormButtonsTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeLastChangedTest.php b/core/modules/node/lib/Tests/NodeLastChangedTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeLastChangedTest.php
rename to core/modules/node/lib/Tests/NodeLastChangedTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeLoadHooksTest.php b/core/modules/node/lib/Tests/NodeLoadHooksTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeLoadHooksTest.php
rename to core/modules/node/lib/Tests/NodeLoadHooksTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeLoadMultipleTest.php b/core/modules/node/lib/Tests/NodeLoadMultipleTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeLoadMultipleTest.php
rename to core/modules/node/lib/Tests/NodeLoadMultipleTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodePostSettingsTest.php b/core/modules/node/lib/Tests/NodePostSettingsTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodePostSettingsTest.php
rename to core/modules/node/lib/Tests/NodePostSettingsTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeQueryAlterTest.php b/core/modules/node/lib/Tests/NodeQueryAlterTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeQueryAlterTest.php
rename to core/modules/node/lib/Tests/NodeQueryAlterTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeRSSContentTest.php b/core/modules/node/lib/Tests/NodeRSSContentTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeRSSContentTest.php
rename to core/modules/node/lib/Tests/NodeRSSContentTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeRevisionPermissionsTest.php b/core/modules/node/lib/Tests/NodeRevisionPermissionsTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeRevisionPermissionsTest.php
rename to core/modules/node/lib/Tests/NodeRevisionPermissionsTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeRevisionsAllTestCase.php b/core/modules/node/lib/Tests/NodeRevisionsAllTestCase.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeRevisionsAllTestCase.php
rename to core/modules/node/lib/Tests/NodeRevisionsAllTestCase.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeRevisionsTest.php b/core/modules/node/lib/Tests/NodeRevisionsTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeRevisionsTest.php
rename to core/modules/node/lib/Tests/NodeRevisionsTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeSaveTest.php b/core/modules/node/lib/Tests/NodeSaveTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeSaveTest.php
rename to core/modules/node/lib/Tests/NodeSaveTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeSyndicateBlockTest.php b/core/modules/node/lib/Tests/NodeSyndicateBlockTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeSyndicateBlockTest.php
rename to core/modules/node/lib/Tests/NodeSyndicateBlockTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTestBase.php b/core/modules/node/lib/Tests/NodeTestBase.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeTestBase.php
rename to core/modules/node/lib/Tests/NodeTestBase.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTitleTest.php b/core/modules/node/lib/Tests/NodeTitleTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeTitleTest.php
rename to core/modules/node/lib/Tests/NodeTitleTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTitleXSSTest.php b/core/modules/node/lib/Tests/NodeTitleXSSTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeTitleXSSTest.php
rename to core/modules/node/lib/Tests/NodeTitleXSSTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTokenReplaceTest.php b/core/modules/node/lib/Tests/NodeTokenReplaceTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeTokenReplaceTest.php
rename to core/modules/node/lib/Tests/NodeTokenReplaceTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTranslationUITest.php b/core/modules/node/lib/Tests/NodeTranslationUITest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeTranslationUITest.php
rename to core/modules/node/lib/Tests/NodeTranslationUITest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTypeInitialLanguageTest.php b/core/modules/node/lib/Tests/NodeTypeInitialLanguageTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeTypeInitialLanguageTest.php
rename to core/modules/node/lib/Tests/NodeTypeInitialLanguageTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTypePersistenceTest.php b/core/modules/node/lib/Tests/NodeTypePersistenceTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeTypePersistenceTest.php
rename to core/modules/node/lib/Tests/NodeTypePersistenceTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTypeTest.php b/core/modules/node/lib/Tests/NodeTypeTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeTypeTest.php
rename to core/modules/node/lib/Tests/NodeTypeTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeValidationTest.php b/core/modules/node/lib/Tests/NodeValidationTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/NodeValidationTest.php
rename to core/modules/node/lib/Tests/NodeValidationTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/PageEditTest.php b/core/modules/node/lib/Tests/PageEditTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/PageEditTest.php
rename to core/modules/node/lib/Tests/PageEditTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/PagePreviewTest.php b/core/modules/node/lib/Tests/PagePreviewTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/PagePreviewTest.php
rename to core/modules/node/lib/Tests/PagePreviewTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/PageViewTest.php b/core/modules/node/lib/Tests/PageViewTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/PageViewTest.php
rename to core/modules/node/lib/Tests/PageViewTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/SummaryLengthTest.php b/core/modules/node/lib/Tests/SummaryLengthTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/SummaryLengthTest.php
rename to core/modules/node/lib/Tests/SummaryLengthTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/BulkFormTest.php b/core/modules/node/lib/Tests/Views/BulkFormTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/Views/BulkFormTest.php
rename to core/modules/node/lib/Tests/Views/BulkFormTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/FieldTypeTest.php b/core/modules/node/lib/Tests/Views/FieldTypeTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/Views/FieldTypeTest.php
rename to core/modules/node/lib/Tests/Views/FieldTypeTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/FilterUidRevisionTest.php b/core/modules/node/lib/Tests/Views/FilterUidRevisionTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/Views/FilterUidRevisionTest.php
rename to core/modules/node/lib/Tests/Views/FilterUidRevisionTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/FrontpageTest.php b/core/modules/node/lib/Tests/Views/FrontpageTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/Views/FrontpageTest.php
rename to core/modules/node/lib/Tests/Views/FrontpageTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/NodeContextualLinksTest.php b/core/modules/node/lib/Tests/Views/NodeContextualLinksTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/Views/NodeContextualLinksTest.php
rename to core/modules/node/lib/Tests/Views/NodeContextualLinksTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/NodeIntegrationTest.php b/core/modules/node/lib/Tests/Views/NodeIntegrationTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/Views/NodeIntegrationTest.php
rename to core/modules/node/lib/Tests/Views/NodeIntegrationTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/NodeTestBase.php b/core/modules/node/lib/Tests/Views/NodeTestBase.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/Views/NodeTestBase.php
rename to core/modules/node/lib/Tests/Views/NodeTestBase.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/RevisionRelationships.php b/core/modules/node/lib/Tests/Views/RevisionRelationships.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/Views/RevisionRelationships.php
rename to core/modules/node/lib/Tests/Views/RevisionRelationships.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/RowPluginTest.php b/core/modules/node/lib/Tests/Views/RowPluginTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/Views/RowPluginTest.php
rename to core/modules/node/lib/Tests/Views/RowPluginTest.php
diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/StatusExtraTest.php b/core/modules/node/lib/Tests/Views/StatusExtraTest.php
similarity index 100%
rename from core/modules/node/lib/Drupal/node/Tests/Views/StatusExtraTest.php
rename to core/modules/node/lib/Tests/Views/StatusExtraTest.php
diff --git a/core/modules/node/tests/Drupal/node/Tests/Plugin/views/field/NodeBulkFormTest.php b/core/modules/node/tests/lib/Plugin/views/field/NodeBulkFormTest.php
similarity index 100%
rename from core/modules/node/tests/Drupal/node/Tests/Plugin/views/field/NodeBulkFormTest.php
rename to core/modules/node/tests/lib/Plugin/views/field/NodeBulkFormTest.php
diff --git a/core/modules/node/tests/modules/node_test/lib/Drupal/node_test/NodeTest.php b/core/modules/node/tests/modules/node_test/lib/NodeTest.php
similarity index 100%
rename from core/modules/node/tests/modules/node_test/lib/Drupal/node_test/NodeTest.php
rename to core/modules/node/tests/modules/node_test/lib/NodeTest.php
diff --git a/core/modules/number/lib/Drupal/number/Plugin/field/field_type/DecimalItem.php b/core/modules/number/lib/Plugin/field/field_type/DecimalItem.php
similarity index 100%
rename from core/modules/number/lib/Drupal/number/Plugin/field/field_type/DecimalItem.php
rename to core/modules/number/lib/Plugin/field/field_type/DecimalItem.php
diff --git a/core/modules/number/lib/Drupal/number/Plugin/field/field_type/FloatItem.php b/core/modules/number/lib/Plugin/field/field_type/FloatItem.php
similarity index 100%
rename from core/modules/number/lib/Drupal/number/Plugin/field/field_type/FloatItem.php
rename to core/modules/number/lib/Plugin/field/field_type/FloatItem.php
diff --git a/core/modules/number/lib/Drupal/number/Plugin/field/field_type/IntegerItem.php b/core/modules/number/lib/Plugin/field/field_type/IntegerItem.php
similarity index 100%
rename from core/modules/number/lib/Drupal/number/Plugin/field/field_type/IntegerItem.php
rename to core/modules/number/lib/Plugin/field/field_type/IntegerItem.php
diff --git a/core/modules/number/lib/Drupal/number/Plugin/field/field_type/NumberItemBase.php b/core/modules/number/lib/Plugin/field/field_type/NumberItemBase.php
similarity index 100%
rename from core/modules/number/lib/Drupal/number/Plugin/field/field_type/NumberItemBase.php
rename to core/modules/number/lib/Plugin/field/field_type/NumberItemBase.php
diff --git a/core/modules/number/lib/Drupal/number/Plugin/field/formatter/DefaultNumberFormatter.php b/core/modules/number/lib/Plugin/field/formatter/DefaultNumberFormatter.php
similarity index 100%
rename from core/modules/number/lib/Drupal/number/Plugin/field/formatter/DefaultNumberFormatter.php
rename to core/modules/number/lib/Plugin/field/formatter/DefaultNumberFormatter.php
diff --git a/core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberDecimalFormatter.php b/core/modules/number/lib/Plugin/field/formatter/NumberDecimalFormatter.php
similarity index 100%
rename from core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberDecimalFormatter.php
rename to core/modules/number/lib/Plugin/field/formatter/NumberDecimalFormatter.php
diff --git a/core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberIntegerFormatter.php b/core/modules/number/lib/Plugin/field/formatter/NumberIntegerFormatter.php
similarity index 100%
rename from core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberIntegerFormatter.php
rename to core/modules/number/lib/Plugin/field/formatter/NumberIntegerFormatter.php
diff --git a/core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberUnformattedFormatter.php b/core/modules/number/lib/Plugin/field/formatter/NumberUnformattedFormatter.php
similarity index 100%
rename from core/modules/number/lib/Drupal/number/Plugin/field/formatter/NumberUnformattedFormatter.php
rename to core/modules/number/lib/Plugin/field/formatter/NumberUnformattedFormatter.php
diff --git a/core/modules/number/lib/Drupal/number/Plugin/field/widget/NumberWidget.php b/core/modules/number/lib/Plugin/field/widget/NumberWidget.php
similarity index 100%
rename from core/modules/number/lib/Drupal/number/Plugin/field/widget/NumberWidget.php
rename to core/modules/number/lib/Plugin/field/widget/NumberWidget.php
diff --git a/core/modules/number/lib/Drupal/number/Tests/NumberFieldTest.php b/core/modules/number/lib/Tests/NumberFieldTest.php
similarity index 100%
rename from core/modules/number/lib/Drupal/number/Tests/NumberFieldTest.php
rename to core/modules/number/lib/Tests/NumberFieldTest.php
diff --git a/core/modules/number/lib/Drupal/number/Tests/NumberItemTest.php b/core/modules/number/lib/Tests/NumberItemTest.php
similarity index 100%
rename from core/modules/number/lib/Drupal/number/Tests/NumberItemTest.php
rename to core/modules/number/lib/Tests/NumberItemTest.php
diff --git a/core/modules/options/lib/Drupal/options/Plugin/field/formatter/OptionsDefaultFormatter.php b/core/modules/options/lib/Plugin/field/formatter/OptionsDefaultFormatter.php
similarity index 100%
rename from core/modules/options/lib/Drupal/options/Plugin/field/formatter/OptionsDefaultFormatter.php
rename to core/modules/options/lib/Plugin/field/formatter/OptionsDefaultFormatter.php
diff --git a/core/modules/options/lib/Drupal/options/Plugin/field/formatter/OptionsKeyFormatter.php b/core/modules/options/lib/Plugin/field/formatter/OptionsKeyFormatter.php
similarity index 100%
rename from core/modules/options/lib/Drupal/options/Plugin/field/formatter/OptionsKeyFormatter.php
rename to core/modules/options/lib/Plugin/field/formatter/OptionsKeyFormatter.php
diff --git a/core/modules/options/lib/Drupal/options/Plugin/field/widget/ButtonsWidget.php b/core/modules/options/lib/Plugin/field/widget/ButtonsWidget.php
similarity index 100%
rename from core/modules/options/lib/Drupal/options/Plugin/field/widget/ButtonsWidget.php
rename to core/modules/options/lib/Plugin/field/widget/ButtonsWidget.php
diff --git a/core/modules/options/lib/Drupal/options/Plugin/field/widget/OnOffWidget.php b/core/modules/options/lib/Plugin/field/widget/OnOffWidget.php
similarity index 100%
rename from core/modules/options/lib/Drupal/options/Plugin/field/widget/OnOffWidget.php
rename to core/modules/options/lib/Plugin/field/widget/OnOffWidget.php
diff --git a/core/modules/options/lib/Drupal/options/Plugin/field/widget/OptionsWidgetBase.php b/core/modules/options/lib/Plugin/field/widget/OptionsWidgetBase.php
similarity index 100%
rename from core/modules/options/lib/Drupal/options/Plugin/field/widget/OptionsWidgetBase.php
rename to core/modules/options/lib/Plugin/field/widget/OptionsWidgetBase.php
diff --git a/core/modules/options/lib/Drupal/options/Plugin/field/widget/SelectWidget.php b/core/modules/options/lib/Plugin/field/widget/SelectWidget.php
similarity index 100%
rename from core/modules/options/lib/Drupal/options/Plugin/field/widget/SelectWidget.php
rename to core/modules/options/lib/Plugin/field/widget/SelectWidget.php
diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsDynamicValuesTest.php b/core/modules/options/lib/Tests/OptionsDynamicValuesTest.php
similarity index 100%
rename from core/modules/options/lib/Drupal/options/Tests/OptionsDynamicValuesTest.php
rename to core/modules/options/lib/Tests/OptionsDynamicValuesTest.php
diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsDynamicValuesValidationTest.php b/core/modules/options/lib/Tests/OptionsDynamicValuesValidationTest.php
similarity index 100%
rename from core/modules/options/lib/Drupal/options/Tests/OptionsDynamicValuesValidationTest.php
rename to core/modules/options/lib/Tests/OptionsDynamicValuesValidationTest.php
diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldTest.php b/core/modules/options/lib/Tests/OptionsFieldTest.php
similarity index 100%
rename from core/modules/options/lib/Drupal/options/Tests/OptionsFieldTest.php
rename to core/modules/options/lib/Tests/OptionsFieldTest.php
diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php b/core/modules/options/lib/Tests/OptionsFieldUITest.php
similarity index 100%
rename from core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php
rename to core/modules/options/lib/Tests/OptionsFieldUITest.php
diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUnitTestBase.php b/core/modules/options/lib/Tests/OptionsFieldUnitTestBase.php
similarity index 100%
rename from core/modules/options/lib/Drupal/options/Tests/OptionsFieldUnitTestBase.php
rename to core/modules/options/lib/Tests/OptionsFieldUnitTestBase.php
diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsFormattersTest.php b/core/modules/options/lib/Tests/OptionsFormattersTest.php
similarity index 100%
rename from core/modules/options/lib/Drupal/options/Tests/OptionsFormattersTest.php
rename to core/modules/options/lib/Tests/OptionsFormattersTest.php
diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsSelectDynamicValuesTest.php b/core/modules/options/lib/Tests/OptionsSelectDynamicValuesTest.php
similarity index 100%
rename from core/modules/options/lib/Drupal/options/Tests/OptionsSelectDynamicValuesTest.php
rename to core/modules/options/lib/Tests/OptionsSelectDynamicValuesTest.php
diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsWidgetsTest.php b/core/modules/options/lib/Tests/OptionsWidgetsTest.php
similarity index 100%
rename from core/modules/options/lib/Drupal/options/Tests/OptionsWidgetsTest.php
rename to core/modules/options/lib/Tests/OptionsWidgetsTest.php
diff --git a/core/modules/options/lib/Drupal/options/Type/ListBooleanItem.php b/core/modules/options/lib/Type/ListBooleanItem.php
similarity index 100%
rename from core/modules/options/lib/Drupal/options/Type/ListBooleanItem.php
rename to core/modules/options/lib/Type/ListBooleanItem.php
diff --git a/core/modules/options/lib/Drupal/options/Type/ListFloatItem.php b/core/modules/options/lib/Type/ListFloatItem.php
similarity index 100%
rename from core/modules/options/lib/Drupal/options/Type/ListFloatItem.php
rename to core/modules/options/lib/Type/ListFloatItem.php
diff --git a/core/modules/options/lib/Drupal/options/Type/ListIntegerItem.php b/core/modules/options/lib/Type/ListIntegerItem.php
similarity index 100%
rename from core/modules/options/lib/Drupal/options/Type/ListIntegerItem.php
rename to core/modules/options/lib/Type/ListIntegerItem.php
diff --git a/core/modules/options/lib/Drupal/options/Type/ListTextItem.php b/core/modules/options/lib/Type/ListTextItem.php
similarity index 100%
rename from core/modules/options/lib/Drupal/options/Type/ListTextItem.php
rename to core/modules/options/lib/Type/ListTextItem.php
diff --git a/core/modules/overlay/lib/Drupal/overlay/Access/DismissMessageAccessCheck.php b/core/modules/overlay/lib/Access/DismissMessageAccessCheck.php
similarity index 100%
rename from core/modules/overlay/lib/Drupal/overlay/Access/DismissMessageAccessCheck.php
rename to core/modules/overlay/lib/Access/DismissMessageAccessCheck.php
diff --git a/core/modules/overlay/lib/Drupal/overlay/Controller/OverlayController.php b/core/modules/overlay/lib/Controller/OverlayController.php
similarity index 100%
rename from core/modules/overlay/lib/Drupal/overlay/Controller/OverlayController.php
rename to core/modules/overlay/lib/Controller/OverlayController.php
diff --git a/core/modules/overlay/lib/Drupal/overlay/EventSubscriber/OverlaySubscriber.php b/core/modules/overlay/lib/EventSubscriber/OverlaySubscriber.php
similarity index 100%
rename from core/modules/overlay/lib/Drupal/overlay/EventSubscriber/OverlaySubscriber.php
rename to core/modules/overlay/lib/EventSubscriber/OverlaySubscriber.php
diff --git a/core/modules/overlay/lib/Drupal/overlay/Tests/OverlayCloseTest.php b/core/modules/overlay/lib/Tests/OverlayCloseTest.php
similarity index 100%
rename from core/modules/overlay/lib/Drupal/overlay/Tests/OverlayCloseTest.php
rename to core/modules/overlay/lib/Tests/OverlayCloseTest.php
diff --git a/core/modules/overlay/lib/Drupal/overlay/Tests/OverlayRenderTest.php b/core/modules/overlay/lib/Tests/OverlayRenderTest.php
similarity index 100%
rename from core/modules/overlay/lib/Drupal/overlay/Tests/OverlayRenderTest.php
rename to core/modules/overlay/lib/Tests/OverlayRenderTest.php
diff --git a/core/modules/overlay/lib/Drupal/overlay/Tests/OverlaySettingTest.php b/core/modules/overlay/lib/Tests/OverlaySettingTest.php
similarity index 100%
rename from core/modules/overlay/lib/Drupal/overlay/Tests/OverlaySettingTest.php
rename to core/modules/overlay/lib/Tests/OverlaySettingTest.php
diff --git a/core/modules/path/lib/Drupal/path/Form/DeleteForm.php b/core/modules/path/lib/Form/DeleteForm.php
similarity index 100%
rename from core/modules/path/lib/Drupal/path/Form/DeleteForm.php
rename to core/modules/path/lib/Form/DeleteForm.php
diff --git a/core/modules/path/lib/Drupal/path/Plugin/DataType/PathItem.php b/core/modules/path/lib/Plugin/DataType/PathItem.php
similarity index 100%
rename from core/modules/path/lib/Drupal/path/Plugin/DataType/PathItem.php
rename to core/modules/path/lib/Plugin/DataType/PathItem.php
diff --git a/core/modules/path/lib/Drupal/path/Tests/PathAliasTest.php b/core/modules/path/lib/Tests/PathAliasTest.php
similarity index 100%
rename from core/modules/path/lib/Drupal/path/Tests/PathAliasTest.php
rename to core/modules/path/lib/Tests/PathAliasTest.php
diff --git a/core/modules/path/lib/Drupal/path/Tests/PathLanguageTest.php b/core/modules/path/lib/Tests/PathLanguageTest.php
similarity index 100%
rename from core/modules/path/lib/Drupal/path/Tests/PathLanguageTest.php
rename to core/modules/path/lib/Tests/PathLanguageTest.php
diff --git a/core/modules/path/lib/Drupal/path/Tests/PathLanguageUiTest.php b/core/modules/path/lib/Tests/PathLanguageUiTest.php
similarity index 100%
rename from core/modules/path/lib/Drupal/path/Tests/PathLanguageUiTest.php
rename to core/modules/path/lib/Tests/PathLanguageUiTest.php
diff --git a/core/modules/path/lib/Drupal/path/Tests/PathTaxonomyTermTest.php b/core/modules/path/lib/Tests/PathTaxonomyTermTest.php
similarity index 100%
rename from core/modules/path/lib/Drupal/path/Tests/PathTaxonomyTermTest.php
rename to core/modules/path/lib/Tests/PathTaxonomyTermTest.php
diff --git a/core/modules/path/lib/Drupal/path/Tests/PathTestBase.php b/core/modules/path/lib/Tests/PathTestBase.php
similarity index 100%
rename from core/modules/path/lib/Drupal/path/Tests/PathTestBase.php
rename to core/modules/path/lib/Tests/PathTestBase.php
diff --git a/core/modules/php/lib/Drupal/php/Plugin/Condition/Php.php b/core/modules/php/lib/Plugin/Condition/Php.php
similarity index 100%
rename from core/modules/php/lib/Drupal/php/Plugin/Condition/Php.php
rename to core/modules/php/lib/Plugin/Condition/Php.php
diff --git a/core/modules/php/lib/Drupal/php/Plugin/Filter/Php.php b/core/modules/php/lib/Plugin/Filter/Php.php
similarity index 100%
rename from core/modules/php/lib/Drupal/php/Plugin/Filter/Php.php
rename to core/modules/php/lib/Plugin/Filter/Php.php
diff --git a/core/modules/php/lib/Drupal/php/Plugin/views/argument_default/Php.php b/core/modules/php/lib/Plugin/views/argument_default/Php.php
similarity index 100%
rename from core/modules/php/lib/Drupal/php/Plugin/views/argument_default/Php.php
rename to core/modules/php/lib/Plugin/views/argument_default/Php.php
diff --git a/core/modules/php/lib/Drupal/php/Plugin/views/argument_validator/Php.php b/core/modules/php/lib/Plugin/views/argument_validator/Php.php
similarity index 100%
rename from core/modules/php/lib/Drupal/php/Plugin/views/argument_validator/Php.php
rename to core/modules/php/lib/Plugin/views/argument_validator/Php.php
diff --git a/core/modules/php/lib/Drupal/php/Tests/Condition/PhpConditionTest.php b/core/modules/php/lib/Tests/Condition/PhpConditionTest.php
similarity index 100%
rename from core/modules/php/lib/Drupal/php/Tests/Condition/PhpConditionTest.php
rename to core/modules/php/lib/Tests/Condition/PhpConditionTest.php
diff --git a/core/modules/php/lib/Drupal/php/Tests/PhpAccessTest.php b/core/modules/php/lib/Tests/PhpAccessTest.php
similarity index 100%
rename from core/modules/php/lib/Drupal/php/Tests/PhpAccessTest.php
rename to core/modules/php/lib/Tests/PhpAccessTest.php
diff --git a/core/modules/php/lib/Drupal/php/Tests/PhpFilterTest.php b/core/modules/php/lib/Tests/PhpFilterTest.php
similarity index 100%
rename from core/modules/php/lib/Drupal/php/Tests/PhpFilterTest.php
rename to core/modules/php/lib/Tests/PhpFilterTest.php
diff --git a/core/modules/php/lib/Drupal/php/Tests/PhpTestBase.php b/core/modules/php/lib/Tests/PhpTestBase.php
similarity index 100%
rename from core/modules/php/lib/Drupal/php/Tests/PhpTestBase.php
rename to core/modules/php/lib/Tests/PhpTestBase.php
diff --git a/core/modules/php/lib/Drupal/php/Tests/Plugin/views/PhpArgumentValidatorTest.php b/core/modules/php/lib/Tests/Plugin/views/PhpArgumentValidatorTest.php
similarity index 100%
rename from core/modules/php/lib/Drupal/php/Tests/Plugin/views/PhpArgumentValidatorTest.php
rename to core/modules/php/lib/Tests/Plugin/views/PhpArgumentValidatorTest.php
diff --git a/core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php b/core/modules/picture/lib/Entity/PictureMapping.php
similarity index 100%
rename from core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php
rename to core/modules/picture/lib/Entity/PictureMapping.php
diff --git a/core/modules/picture/lib/Drupal/picture/Form/PictureMappingDeleteForm.php b/core/modules/picture/lib/Form/PictureMappingDeleteForm.php
similarity index 100%
rename from core/modules/picture/lib/Drupal/picture/Form/PictureMappingDeleteForm.php
rename to core/modules/picture/lib/Form/PictureMappingDeleteForm.php
diff --git a/core/modules/picture/lib/Drupal/picture/PictureMappingAccessController.php b/core/modules/picture/lib/PictureMappingAccessController.php
similarity index 100%
rename from core/modules/picture/lib/Drupal/picture/PictureMappingAccessController.php
rename to core/modules/picture/lib/PictureMappingAccessController.php
diff --git a/core/modules/picture/lib/Drupal/picture/PictureMappingFormController.php b/core/modules/picture/lib/PictureMappingFormController.php
similarity index 100%
rename from core/modules/picture/lib/Drupal/picture/PictureMappingFormController.php
rename to core/modules/picture/lib/PictureMappingFormController.php
diff --git a/core/modules/picture/lib/Drupal/picture/PictureMappingInterface.php b/core/modules/picture/lib/PictureMappingInterface.php
similarity index 100%
rename from core/modules/picture/lib/Drupal/picture/PictureMappingInterface.php
rename to core/modules/picture/lib/PictureMappingInterface.php
diff --git a/core/modules/picture/lib/Drupal/picture/PictureMappingListController.php b/core/modules/picture/lib/PictureMappingListController.php
similarity index 100%
rename from core/modules/picture/lib/Drupal/picture/PictureMappingListController.php
rename to core/modules/picture/lib/PictureMappingListController.php
diff --git a/core/modules/picture/lib/Drupal/picture/Plugin/field/formatter/PictureFormatter.php b/core/modules/picture/lib/Plugin/field/formatter/PictureFormatter.php
similarity index 100%
rename from core/modules/picture/lib/Drupal/picture/Plugin/field/formatter/PictureFormatter.php
rename to core/modules/picture/lib/Plugin/field/formatter/PictureFormatter.php
diff --git a/core/modules/picture/lib/Drupal/picture/Tests/PictureAdminUITest.php b/core/modules/picture/lib/Tests/PictureAdminUITest.php
similarity index 100%
rename from core/modules/picture/lib/Drupal/picture/Tests/PictureAdminUITest.php
rename to core/modules/picture/lib/Tests/PictureAdminUITest.php
diff --git a/core/modules/picture/lib/Drupal/picture/Tests/PictureFieldDisplayTest.php b/core/modules/picture/lib/Tests/PictureFieldDisplayTest.php
similarity index 100%
rename from core/modules/picture/lib/Drupal/picture/Tests/PictureFieldDisplayTest.php
rename to core/modules/picture/lib/Tests/PictureFieldDisplayTest.php
diff --git a/core/modules/rdf/lib/Drupal/rdf/CommonDataConverter.php b/core/modules/rdf/lib/CommonDataConverter.php
similarity index 100%
rename from core/modules/rdf/lib/Drupal/rdf/CommonDataConverter.php
rename to core/modules/rdf/lib/CommonDataConverter.php
diff --git a/core/modules/rdf/lib/Drupal/rdf/Entity/RdfMapping.php b/core/modules/rdf/lib/Entity/RdfMapping.php
similarity index 100%
rename from core/modules/rdf/lib/Drupal/rdf/Entity/RdfMapping.php
rename to core/modules/rdf/lib/Entity/RdfMapping.php
diff --git a/core/modules/rdf/lib/Drupal/rdf/RdfMappingInterface.php b/core/modules/rdf/lib/RdfMappingInterface.php
similarity index 100%
rename from core/modules/rdf/lib/Drupal/rdf/RdfMappingInterface.php
rename to core/modules/rdf/lib/RdfMappingInterface.php
diff --git a/core/modules/rdf/lib/Drupal/rdf/SchemaOrgDataConverter.php b/core/modules/rdf/lib/SchemaOrgDataConverter.php
similarity index 100%
rename from core/modules/rdf/lib/Drupal/rdf/SchemaOrgDataConverter.php
rename to core/modules/rdf/lib/SchemaOrgDataConverter.php
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php b/core/modules/rdf/lib/Tests/CommentAttributesTest.php
similarity index 100%
rename from core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php
rename to core/modules/rdf/lib/Tests/CommentAttributesTest.php
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/CrudTest.php b/core/modules/rdf/lib/Tests/CrudTest.php
similarity index 100%
rename from core/modules/rdf/lib/Drupal/rdf/Tests/CrudTest.php
rename to core/modules/rdf/lib/Tests/CrudTest.php
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/Field/FieldRdfaTestBase.php b/core/modules/rdf/lib/Tests/Field/FieldRdfaTestBase.php
similarity index 100%
rename from core/modules/rdf/lib/Drupal/rdf/Tests/Field/FieldRdfaTestBase.php
rename to core/modules/rdf/lib/Tests/Field/FieldRdfaTestBase.php
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/FileFieldAttributesTest.php b/core/modules/rdf/lib/Tests/FileFieldAttributesTest.php
similarity index 100%
rename from core/modules/rdf/lib/Drupal/rdf/Tests/FileFieldAttributesTest.php
rename to core/modules/rdf/lib/Tests/FileFieldAttributesTest.php
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/GetNamespacesTest.php b/core/modules/rdf/lib/Tests/GetNamespacesTest.php
similarity index 100%
rename from core/modules/rdf/lib/Drupal/rdf/Tests/GetNamespacesTest.php
rename to core/modules/rdf/lib/Tests/GetNamespacesTest.php
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/GetRdfNamespacesTest.php b/core/modules/rdf/lib/Tests/GetRdfNamespacesTest.php
similarity index 100%
rename from core/modules/rdf/lib/Drupal/rdf/Tests/GetRdfNamespacesTest.php
rename to core/modules/rdf/lib/Tests/GetRdfNamespacesTest.php
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/ImageFieldAttributesTest.php b/core/modules/rdf/lib/Tests/ImageFieldAttributesTest.php
similarity index 100%
rename from core/modules/rdf/lib/Drupal/rdf/Tests/ImageFieldAttributesTest.php
rename to core/modules/rdf/lib/Tests/ImageFieldAttributesTest.php
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/NodeAttributesTest.php b/core/modules/rdf/lib/Tests/NodeAttributesTest.php
similarity index 100%
rename from core/modules/rdf/lib/Drupal/rdf/Tests/NodeAttributesTest.php
rename to core/modules/rdf/lib/Tests/NodeAttributesTest.php
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/RdfMappingUpgradePathTest.php b/core/modules/rdf/lib/Tests/RdfMappingUpgradePathTest.php
similarity index 100%
rename from core/modules/rdf/lib/Drupal/rdf/Tests/RdfMappingUpgradePathTest.php
rename to core/modules/rdf/lib/Tests/RdfMappingUpgradePathTest.php
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/RdfaAttributesTest.php b/core/modules/rdf/lib/Tests/RdfaAttributesTest.php
similarity index 100%
rename from core/modules/rdf/lib/Drupal/rdf/Tests/RdfaAttributesTest.php
rename to core/modules/rdf/lib/Tests/RdfaAttributesTest.php
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/StandardProfileTest.php b/core/modules/rdf/lib/Tests/StandardProfileTest.php
similarity index 100%
rename from core/modules/rdf/lib/Drupal/rdf/Tests/StandardProfileTest.php
rename to core/modules/rdf/lib/Tests/StandardProfileTest.php
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/TaxonomyAttributesTest.php b/core/modules/rdf/lib/Tests/TaxonomyAttributesTest.php
similarity index 100%
rename from core/modules/rdf/lib/Drupal/rdf/Tests/TaxonomyAttributesTest.php
rename to core/modules/rdf/lib/Tests/TaxonomyAttributesTest.php
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/TaxonomyTermFieldAttributesTest.php b/core/modules/rdf/lib/Tests/TaxonomyTermFieldAttributesTest.php
similarity index 100%
rename from core/modules/rdf/lib/Drupal/rdf/Tests/TaxonomyTermFieldAttributesTest.php
rename to core/modules/rdf/lib/Tests/TaxonomyTermFieldAttributesTest.php
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/TrackerAttributesTest.php b/core/modules/rdf/lib/Tests/TrackerAttributesTest.php
similarity index 100%
rename from core/modules/rdf/lib/Drupal/rdf/Tests/TrackerAttributesTest.php
rename to core/modules/rdf/lib/Tests/TrackerAttributesTest.php
diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/UserAttributesTest.php b/core/modules/rdf/lib/Tests/UserAttributesTest.php
similarity index 100%
rename from core/modules/rdf/lib/Drupal/rdf/Tests/UserAttributesTest.php
rename to core/modules/rdf/lib/Tests/UserAttributesTest.php
diff --git a/core/modules/rest/lib/Drupal/rest/Access/CSRFAccessCheck.php b/core/modules/rest/lib/Access/CSRFAccessCheck.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/Access/CSRFAccessCheck.php
rename to core/modules/rest/lib/Access/CSRFAccessCheck.php
diff --git a/core/modules/rest/lib/Drupal/rest/EventSubscriber/RouteSubscriber.php b/core/modules/rest/lib/EventSubscriber/RouteSubscriber.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/EventSubscriber/RouteSubscriber.php
rename to core/modules/rest/lib/EventSubscriber/RouteSubscriber.php
diff --git a/core/modules/rest/lib/Drupal/rest/LinkManager/LinkManager.php b/core/modules/rest/lib/LinkManager/LinkManager.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/LinkManager/LinkManager.php
rename to core/modules/rest/lib/LinkManager/LinkManager.php
diff --git a/core/modules/rest/lib/Drupal/rest/LinkManager/LinkManagerInterface.php b/core/modules/rest/lib/LinkManager/LinkManagerInterface.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/LinkManager/LinkManagerInterface.php
rename to core/modules/rest/lib/LinkManager/LinkManagerInterface.php
diff --git a/core/modules/rest/lib/Drupal/rest/LinkManager/RelationLinkManager.php b/core/modules/rest/lib/LinkManager/RelationLinkManager.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/LinkManager/RelationLinkManager.php
rename to core/modules/rest/lib/LinkManager/RelationLinkManager.php
diff --git a/core/modules/rest/lib/Drupal/rest/LinkManager/RelationLinkManagerInterface.php b/core/modules/rest/lib/LinkManager/RelationLinkManagerInterface.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/LinkManager/RelationLinkManagerInterface.php
rename to core/modules/rest/lib/LinkManager/RelationLinkManagerInterface.php
diff --git a/core/modules/rest/lib/Drupal/rest/LinkManager/TypeLinkManager.php b/core/modules/rest/lib/LinkManager/TypeLinkManager.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/LinkManager/TypeLinkManager.php
rename to core/modules/rest/lib/LinkManager/TypeLinkManager.php
diff --git a/core/modules/rest/lib/Drupal/rest/LinkManager/TypeLinkManagerInterface.php b/core/modules/rest/lib/LinkManager/TypeLinkManagerInterface.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/LinkManager/TypeLinkManagerInterface.php
rename to core/modules/rest/lib/LinkManager/TypeLinkManagerInterface.php
diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/Derivative/EntityDerivative.php b/core/modules/rest/lib/Plugin/Derivative/EntityDerivative.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/Plugin/Derivative/EntityDerivative.php
rename to core/modules/rest/lib/Plugin/Derivative/EntityDerivative.php
diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/ResourceBase.php b/core/modules/rest/lib/Plugin/ResourceBase.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/Plugin/ResourceBase.php
rename to core/modules/rest/lib/Plugin/ResourceBase.php
diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/ResourceInterface.php b/core/modules/rest/lib/Plugin/ResourceInterface.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/Plugin/ResourceInterface.php
rename to core/modules/rest/lib/Plugin/ResourceInterface.php
diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/Type/ResourcePluginManager.php b/core/modules/rest/lib/Plugin/Type/ResourcePluginManager.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/Plugin/Type/ResourcePluginManager.php
rename to core/modules/rest/lib/Plugin/Type/ResourcePluginManager.php
diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/rest/resource/DBLogResource.php b/core/modules/rest/lib/Plugin/rest/resource/DBLogResource.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/Plugin/rest/resource/DBLogResource.php
rename to core/modules/rest/lib/Plugin/rest/resource/DBLogResource.php
diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/rest/resource/EntityResource.php b/core/modules/rest/lib/Plugin/rest/resource/EntityResource.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/Plugin/rest/resource/EntityResource.php
rename to core/modules/rest/lib/Plugin/rest/resource/EntityResource.php
diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/views/display/RestExport.php b/core/modules/rest/lib/Plugin/views/display/RestExport.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/Plugin/views/display/RestExport.php
rename to core/modules/rest/lib/Plugin/views/display/RestExport.php
diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/views/row/DataEntityRow.php b/core/modules/rest/lib/Plugin/views/row/DataEntityRow.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/Plugin/views/row/DataEntityRow.php
rename to core/modules/rest/lib/Plugin/views/row/DataEntityRow.php
diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/views/row/DataFieldRow.php b/core/modules/rest/lib/Plugin/views/row/DataFieldRow.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/Plugin/views/row/DataFieldRow.php
rename to core/modules/rest/lib/Plugin/views/row/DataFieldRow.php
diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/views/style/Serializer.php b/core/modules/rest/lib/Plugin/views/style/Serializer.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/Plugin/views/style/Serializer.php
rename to core/modules/rest/lib/Plugin/views/style/Serializer.php
diff --git a/core/modules/rest/lib/Drupal/rest/RequestHandler.php b/core/modules/rest/lib/RequestHandler.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/RequestHandler.php
rename to core/modules/rest/lib/RequestHandler.php
diff --git a/core/modules/rest/lib/Drupal/rest/ResourceResponse.php b/core/modules/rest/lib/ResourceResponse.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/ResourceResponse.php
rename to core/modules/rest/lib/ResourceResponse.php
diff --git a/core/modules/rest/lib/Drupal/rest/Tests/AuthTest.php b/core/modules/rest/lib/Tests/AuthTest.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/Tests/AuthTest.php
rename to core/modules/rest/lib/Tests/AuthTest.php
diff --git a/core/modules/rest/lib/Drupal/rest/Tests/CreateTest.php b/core/modules/rest/lib/Tests/CreateTest.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/Tests/CreateTest.php
rename to core/modules/rest/lib/Tests/CreateTest.php
diff --git a/core/modules/rest/lib/Drupal/rest/Tests/DBLogTest.php b/core/modules/rest/lib/Tests/DBLogTest.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/Tests/DBLogTest.php
rename to core/modules/rest/lib/Tests/DBLogTest.php
diff --git a/core/modules/rest/lib/Drupal/rest/Tests/DeleteTest.php b/core/modules/rest/lib/Tests/DeleteTest.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/Tests/DeleteTest.php
rename to core/modules/rest/lib/Tests/DeleteTest.php
diff --git a/core/modules/rest/lib/Drupal/rest/Tests/NodeTest.php b/core/modules/rest/lib/Tests/NodeTest.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/Tests/NodeTest.php
rename to core/modules/rest/lib/Tests/NodeTest.php
diff --git a/core/modules/rest/lib/Drupal/rest/Tests/RESTTestBase.php b/core/modules/rest/lib/Tests/RESTTestBase.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/Tests/RESTTestBase.php
rename to core/modules/rest/lib/Tests/RESTTestBase.php
diff --git a/core/modules/rest/lib/Drupal/rest/Tests/ReadTest.php b/core/modules/rest/lib/Tests/ReadTest.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/Tests/ReadTest.php
rename to core/modules/rest/lib/Tests/ReadTest.php
diff --git a/core/modules/rest/lib/Drupal/rest/Tests/UpdateTest.php b/core/modules/rest/lib/Tests/UpdateTest.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/Tests/UpdateTest.php
rename to core/modules/rest/lib/Tests/UpdateTest.php
diff --git a/core/modules/rest/lib/Drupal/rest/Tests/Views/StyleSerializerTest.php b/core/modules/rest/lib/Tests/Views/StyleSerializerTest.php
similarity index 100%
rename from core/modules/rest/lib/Drupal/rest/Tests/Views/StyleSerializerTest.php
rename to core/modules/rest/lib/Tests/Views/StyleSerializerTest.php
diff --git a/core/modules/rest/tests/Drupal/rest/Tests/CollectRoutesTest.php b/core/modules/rest/tests/lib/CollectRoutesTest.php
similarity index 100%
rename from core/modules/rest/tests/Drupal/rest/Tests/CollectRoutesTest.php
rename to core/modules/rest/tests/lib/CollectRoutesTest.php
diff --git a/core/modules/search/lib/Drupal/search/Annotation/SearchPlugin.php b/core/modules/search/lib/Annotation/SearchPlugin.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Annotation/SearchPlugin.php
rename to core/modules/search/lib/Annotation/SearchPlugin.php
diff --git a/core/modules/search/lib/Drupal/search/Form/ReindexConfirm.php b/core/modules/search/lib/Form/ReindexConfirm.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Form/ReindexConfirm.php
rename to core/modules/search/lib/Form/ReindexConfirm.php
diff --git a/core/modules/search/lib/Drupal/search/Form/SearchBlockForm.php b/core/modules/search/lib/Form/SearchBlockForm.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Form/SearchBlockForm.php
rename to core/modules/search/lib/Form/SearchBlockForm.php
diff --git a/core/modules/search/lib/Drupal/search/Form/SearchSettingsForm.php b/core/modules/search/lib/Form/SearchSettingsForm.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Form/SearchSettingsForm.php
rename to core/modules/search/lib/Form/SearchSettingsForm.php
diff --git a/core/modules/search/lib/Drupal/search/Plugin/Block/SearchBlock.php b/core/modules/search/lib/Plugin/Block/SearchBlock.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Plugin/Block/SearchBlock.php
rename to core/modules/search/lib/Plugin/Block/SearchBlock.php
diff --git a/core/modules/search/lib/Drupal/search/Plugin/SearchIndexingInterface.php b/core/modules/search/lib/Plugin/SearchIndexingInterface.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Plugin/SearchIndexingInterface.php
rename to core/modules/search/lib/Plugin/SearchIndexingInterface.php
diff --git a/core/modules/search/lib/Drupal/search/Plugin/SearchInterface.php b/core/modules/search/lib/Plugin/SearchInterface.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Plugin/SearchInterface.php
rename to core/modules/search/lib/Plugin/SearchInterface.php
diff --git a/core/modules/search/lib/Drupal/search/Plugin/SearchPluginBase.php b/core/modules/search/lib/Plugin/SearchPluginBase.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Plugin/SearchPluginBase.php
rename to core/modules/search/lib/Plugin/SearchPluginBase.php
diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php b/core/modules/search/lib/Plugin/views/argument/Search.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php
rename to core/modules/search/lib/Plugin/views/argument/Search.php
diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/field/Score.php b/core/modules/search/lib/Plugin/views/field/Score.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Plugin/views/field/Score.php
rename to core/modules/search/lib/Plugin/views/field/Score.php
diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php b/core/modules/search/lib/Plugin/views/filter/Search.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php
rename to core/modules/search/lib/Plugin/views/filter/Search.php
diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/row/SearchRow.php b/core/modules/search/lib/Plugin/views/row/SearchRow.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Plugin/views/row/SearchRow.php
rename to core/modules/search/lib/Plugin/views/row/SearchRow.php
diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/sort/Score.php b/core/modules/search/lib/Plugin/views/sort/Score.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Plugin/views/sort/Score.php
rename to core/modules/search/lib/Plugin/views/sort/Score.php
diff --git a/core/modules/search/lib/Drupal/search/SearchPluginManager.php b/core/modules/search/lib/SearchPluginManager.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/SearchPluginManager.php
rename to core/modules/search/lib/SearchPluginManager.php
diff --git a/core/modules/search/lib/Drupal/search/SearchQuery.php b/core/modules/search/lib/SearchQuery.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/SearchQuery.php
rename to core/modules/search/lib/SearchQuery.php
diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchAdvancedSearchFormTest.php b/core/modules/search/lib/Tests/SearchAdvancedSearchFormTest.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Tests/SearchAdvancedSearchFormTest.php
rename to core/modules/search/lib/Tests/SearchAdvancedSearchFormTest.php
diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchBlockTest.php b/core/modules/search/lib/Tests/SearchBlockTest.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Tests/SearchBlockTest.php
rename to core/modules/search/lib/Tests/SearchBlockTest.php
diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchCommentCountToggleTest.php b/core/modules/search/lib/Tests/SearchCommentCountToggleTest.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Tests/SearchCommentCountToggleTest.php
rename to core/modules/search/lib/Tests/SearchCommentCountToggleTest.php
diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchCommentTest.php b/core/modules/search/lib/Tests/SearchCommentTest.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Tests/SearchCommentTest.php
rename to core/modules/search/lib/Tests/SearchCommentTest.php
diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchConfigSettingsFormTest.php b/core/modules/search/lib/Tests/SearchConfigSettingsFormTest.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Tests/SearchConfigSettingsFormTest.php
rename to core/modules/search/lib/Tests/SearchConfigSettingsFormTest.php
diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchEmbedFormTest.php b/core/modules/search/lib/Tests/SearchEmbedFormTest.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Tests/SearchEmbedFormTest.php
rename to core/modules/search/lib/Tests/SearchEmbedFormTest.php
diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchExactTest.php b/core/modules/search/lib/Tests/SearchExactTest.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Tests/SearchExactTest.php
rename to core/modules/search/lib/Tests/SearchExactTest.php
diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchExcerptTest.php b/core/modules/search/lib/Tests/SearchExcerptTest.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Tests/SearchExcerptTest.php
rename to core/modules/search/lib/Tests/SearchExcerptTest.php
diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchKeywordsConditionsTest.php b/core/modules/search/lib/Tests/SearchKeywordsConditionsTest.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Tests/SearchKeywordsConditionsTest.php
rename to core/modules/search/lib/Tests/SearchKeywordsConditionsTest.php
diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchLanguageTest.php b/core/modules/search/lib/Tests/SearchLanguageTest.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Tests/SearchLanguageTest.php
rename to core/modules/search/lib/Tests/SearchLanguageTest.php
diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchMatchTest.php b/core/modules/search/lib/Tests/SearchMatchTest.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Tests/SearchMatchTest.php
rename to core/modules/search/lib/Tests/SearchMatchTest.php
diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchMultilingualEntityTest.php b/core/modules/search/lib/Tests/SearchMultilingualEntityTest.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Tests/SearchMultilingualEntityTest.php
rename to core/modules/search/lib/Tests/SearchMultilingualEntityTest.php
diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchNodeAccessTest.php b/core/modules/search/lib/Tests/SearchNodeAccessTest.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Tests/SearchNodeAccessTest.php
rename to core/modules/search/lib/Tests/SearchNodeAccessTest.php
diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchNumberMatchingTest.php b/core/modules/search/lib/Tests/SearchNumberMatchingTest.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Tests/SearchNumberMatchingTest.php
rename to core/modules/search/lib/Tests/SearchNumberMatchingTest.php
diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchNumbersTest.php b/core/modules/search/lib/Tests/SearchNumbersTest.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Tests/SearchNumbersTest.php
rename to core/modules/search/lib/Tests/SearchNumbersTest.php
diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchPageOverrideTest.php b/core/modules/search/lib/Tests/SearchPageOverrideTest.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Tests/SearchPageOverrideTest.php
rename to core/modules/search/lib/Tests/SearchPageOverrideTest.php
diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchPageTextTest.php b/core/modules/search/lib/Tests/SearchPageTextTest.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Tests/SearchPageTextTest.php
rename to core/modules/search/lib/Tests/SearchPageTextTest.php
diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchPreprocessLangcodeTest.php b/core/modules/search/lib/Tests/SearchPreprocessLangcodeTest.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Tests/SearchPreprocessLangcodeTest.php
rename to core/modules/search/lib/Tests/SearchPreprocessLangcodeTest.php
diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchRankingTest.php b/core/modules/search/lib/Tests/SearchRankingTest.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Tests/SearchRankingTest.php
rename to core/modules/search/lib/Tests/SearchRankingTest.php
diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchSimplifyTest.php b/core/modules/search/lib/Tests/SearchSimplifyTest.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Tests/SearchSimplifyTest.php
rename to core/modules/search/lib/Tests/SearchSimplifyTest.php
diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchTestBase.php b/core/modules/search/lib/Tests/SearchTestBase.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Tests/SearchTestBase.php
rename to core/modules/search/lib/Tests/SearchTestBase.php
diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchTokenizerTest.php b/core/modules/search/lib/Tests/SearchTokenizerTest.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Tests/SearchTokenizerTest.php
rename to core/modules/search/lib/Tests/SearchTokenizerTest.php
diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchUpgradePathTest.php b/core/modules/search/lib/Tests/SearchUpgradePathTest.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/Tests/SearchUpgradePathTest.php
rename to core/modules/search/lib/Tests/SearchUpgradePathTest.php
diff --git a/core/modules/search/lib/Drupal/search/ViewsSearchQuery.php b/core/modules/search/lib/ViewsSearchQuery.php
similarity index 100%
rename from core/modules/search/lib/Drupal/search/ViewsSearchQuery.php
rename to core/modules/search/lib/ViewsSearchQuery.php
diff --git a/core/modules/search/tests/modules/search_extra_type/lib/Drupal/search_extra_type/Plugin/Search/SearchExtraTypeSearch.php b/core/modules/search/tests/modules/search_extra_type/lib/Plugin/Search/SearchExtraTypeSearch.php
similarity index 100%
rename from core/modules/search/tests/modules/search_extra_type/lib/Drupal/search_extra_type/Plugin/Search/SearchExtraTypeSearch.php
rename to core/modules/search/tests/modules/search_extra_type/lib/Plugin/Search/SearchExtraTypeSearch.php
diff --git a/core/modules/serialization/lib/Drupal/serialization/Encoder/JsonEncoder.php b/core/modules/serialization/lib/Encoder/JsonEncoder.php
similarity index 100%
rename from core/modules/serialization/lib/Drupal/serialization/Encoder/JsonEncoder.php
rename to core/modules/serialization/lib/Encoder/JsonEncoder.php
diff --git a/core/modules/serialization/lib/Drupal/serialization/Encoder/XmlEncoder.php b/core/modules/serialization/lib/Encoder/XmlEncoder.php
similarity index 100%
rename from core/modules/serialization/lib/Drupal/serialization/Encoder/XmlEncoder.php
rename to core/modules/serialization/lib/Encoder/XmlEncoder.php
diff --git a/core/modules/serialization/lib/Drupal/serialization/EntityResolver/ChainEntityResolver.php b/core/modules/serialization/lib/EntityResolver/ChainEntityResolver.php
similarity index 100%
rename from core/modules/serialization/lib/Drupal/serialization/EntityResolver/ChainEntityResolver.php
rename to core/modules/serialization/lib/EntityResolver/ChainEntityResolver.php
diff --git a/core/modules/serialization/lib/Drupal/serialization/EntityResolver/EntityResolverInterface.php b/core/modules/serialization/lib/EntityResolver/EntityResolverInterface.php
similarity index 100%
rename from core/modules/serialization/lib/Drupal/serialization/EntityResolver/EntityResolverInterface.php
rename to core/modules/serialization/lib/EntityResolver/EntityResolverInterface.php
diff --git a/core/modules/serialization/lib/Drupal/serialization/EntityResolver/UuidReferenceInterface.php b/core/modules/serialization/lib/EntityResolver/UuidReferenceInterface.php
similarity index 100%
rename from core/modules/serialization/lib/Drupal/serialization/EntityResolver/UuidReferenceInterface.php
rename to core/modules/serialization/lib/EntityResolver/UuidReferenceInterface.php
diff --git a/core/modules/serialization/lib/Drupal/serialization/EntityResolver/UuidResolver.php b/core/modules/serialization/lib/EntityResolver/UuidResolver.php
similarity index 100%
rename from core/modules/serialization/lib/Drupal/serialization/EntityResolver/UuidResolver.php
rename to core/modules/serialization/lib/EntityResolver/UuidResolver.php
diff --git a/core/modules/serialization/lib/Drupal/serialization/Normalizer/ComplexDataNormalizer.php b/core/modules/serialization/lib/Normalizer/ComplexDataNormalizer.php
similarity index 100%
rename from core/modules/serialization/lib/Drupal/serialization/Normalizer/ComplexDataNormalizer.php
rename to core/modules/serialization/lib/Normalizer/ComplexDataNormalizer.php
diff --git a/core/modules/serialization/lib/Drupal/serialization/Normalizer/ListNormalizer.php b/core/modules/serialization/lib/Normalizer/ListNormalizer.php
similarity index 100%
rename from core/modules/serialization/lib/Drupal/serialization/Normalizer/ListNormalizer.php
rename to core/modules/serialization/lib/Normalizer/ListNormalizer.php
diff --git a/core/modules/serialization/lib/Drupal/serialization/Normalizer/NormalizerBase.php b/core/modules/serialization/lib/Normalizer/NormalizerBase.php
similarity index 100%
rename from core/modules/serialization/lib/Drupal/serialization/Normalizer/NormalizerBase.php
rename to core/modules/serialization/lib/Normalizer/NormalizerBase.php
diff --git a/core/modules/serialization/lib/Drupal/serialization/Normalizer/TypedDataNormalizer.php b/core/modules/serialization/lib/Normalizer/TypedDataNormalizer.php
similarity index 100%
rename from core/modules/serialization/lib/Drupal/serialization/Normalizer/TypedDataNormalizer.php
rename to core/modules/serialization/lib/Normalizer/TypedDataNormalizer.php
diff --git a/core/modules/serialization/lib/Drupal/serialization/RegisterEntityResolversCompilerPass.php b/core/modules/serialization/lib/RegisterEntityResolversCompilerPass.php
similarity index 100%
rename from core/modules/serialization/lib/Drupal/serialization/RegisterEntityResolversCompilerPass.php
rename to core/modules/serialization/lib/RegisterEntityResolversCompilerPass.php
diff --git a/core/modules/serialization/lib/Drupal/serialization/RegisterSerializationClassesCompilerPass.php b/core/modules/serialization/lib/RegisterSerializationClassesCompilerPass.php
similarity index 100%
rename from core/modules/serialization/lib/Drupal/serialization/RegisterSerializationClassesCompilerPass.php
rename to core/modules/serialization/lib/RegisterSerializationClassesCompilerPass.php
diff --git a/core/modules/serialization/lib/Drupal/serialization/SerializationServiceProvider.php b/core/modules/serialization/lib/SerializationServiceProvider.php
similarity index 100%
rename from core/modules/serialization/lib/Drupal/serialization/SerializationServiceProvider.php
rename to core/modules/serialization/lib/SerializationServiceProvider.php
diff --git a/core/modules/serialization/lib/Drupal/serialization/Tests/EntityResolverTest.php b/core/modules/serialization/lib/Tests/EntityResolverTest.php
similarity index 100%
rename from core/modules/serialization/lib/Drupal/serialization/Tests/EntityResolverTest.php
rename to core/modules/serialization/lib/Tests/EntityResolverTest.php
diff --git a/core/modules/serialization/lib/Drupal/serialization/Tests/EntitySerializationTest.php b/core/modules/serialization/lib/Tests/EntitySerializationTest.php
similarity index 100%
rename from core/modules/serialization/lib/Drupal/serialization/Tests/EntitySerializationTest.php
rename to core/modules/serialization/lib/Tests/EntitySerializationTest.php
diff --git a/core/modules/serialization/lib/Drupal/serialization/Tests/NormalizerTestBase.php b/core/modules/serialization/lib/Tests/NormalizerTestBase.php
similarity index 100%
rename from core/modules/serialization/lib/Drupal/serialization/Tests/NormalizerTestBase.php
rename to core/modules/serialization/lib/Tests/NormalizerTestBase.php
diff --git a/core/modules/serialization/lib/Drupal/serialization/Tests/SerializationTest.php b/core/modules/serialization/lib/Tests/SerializationTest.php
similarity index 100%
rename from core/modules/serialization/lib/Drupal/serialization/Tests/SerializationTest.php
rename to core/modules/serialization/lib/Tests/SerializationTest.php
diff --git a/core/modules/serialization/tests/serialization_test/lib/Drupal/serialization_test/SerializationTestEncoder.php b/core/modules/serialization/tests/serialization_test/lib/SerializationTestEncoder.php
similarity index 100%
rename from core/modules/serialization/tests/serialization_test/lib/Drupal/serialization_test/SerializationTestEncoder.php
rename to core/modules/serialization/tests/serialization_test/lib/SerializationTestEncoder.php
diff --git a/core/modules/serialization/tests/serialization_test/lib/Drupal/serialization_test/SerializationTestNormalizer.php b/core/modules/serialization/tests/serialization_test/lib/SerializationTestNormalizer.php
similarity index 100%
rename from core/modules/serialization/tests/serialization_test/lib/Drupal/serialization_test/SerializationTestNormalizer.php
rename to core/modules/serialization/tests/serialization_test/lib/SerializationTestNormalizer.php
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Access/LinkDeleteAccessCheck.php b/core/modules/shortcut/lib/Access/LinkDeleteAccessCheck.php
similarity index 100%
rename from core/modules/shortcut/lib/Drupal/shortcut/Access/LinkDeleteAccessCheck.php
rename to core/modules/shortcut/lib/Access/LinkDeleteAccessCheck.php
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Controller/ShortcutSetController.php b/core/modules/shortcut/lib/Controller/ShortcutSetController.php
similarity index 100%
rename from core/modules/shortcut/lib/Drupal/shortcut/Controller/ShortcutSetController.php
rename to core/modules/shortcut/lib/Controller/ShortcutSetController.php
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Entity/ShortcutSet.php b/core/modules/shortcut/lib/Entity/ShortcutSet.php
similarity index 100%
rename from core/modules/shortcut/lib/Drupal/shortcut/Entity/ShortcutSet.php
rename to core/modules/shortcut/lib/Entity/ShortcutSet.php
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Form/LinkDelete.php b/core/modules/shortcut/lib/Form/LinkDelete.php
similarity index 100%
rename from core/modules/shortcut/lib/Drupal/shortcut/Form/LinkDelete.php
rename to core/modules/shortcut/lib/Form/LinkDelete.php
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Form/SetCustomize.php b/core/modules/shortcut/lib/Form/SetCustomize.php
similarity index 100%
rename from core/modules/shortcut/lib/Drupal/shortcut/Form/SetCustomize.php
rename to core/modules/shortcut/lib/Form/SetCustomize.php
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Form/ShortcutSetDeleteForm.php b/core/modules/shortcut/lib/Form/ShortcutSetDeleteForm.php
similarity index 100%
rename from core/modules/shortcut/lib/Drupal/shortcut/Form/ShortcutSetDeleteForm.php
rename to core/modules/shortcut/lib/Form/ShortcutSetDeleteForm.php
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Plugin/Block/ShortcutsBlock.php b/core/modules/shortcut/lib/Plugin/Block/ShortcutsBlock.php
similarity index 100%
rename from core/modules/shortcut/lib/Drupal/shortcut/Plugin/Block/ShortcutsBlock.php
rename to core/modules/shortcut/lib/Plugin/Block/ShortcutsBlock.php
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Plugin/Menu/LocalAction/AddShortcutSetLocalAction.php b/core/modules/shortcut/lib/Plugin/Menu/LocalAction/AddShortcutSetLocalAction.php
similarity index 100%
rename from core/modules/shortcut/lib/Drupal/shortcut/Plugin/Menu/LocalAction/AddShortcutSetLocalAction.php
rename to core/modules/shortcut/lib/Plugin/Menu/LocalAction/AddShortcutSetLocalAction.php
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetAccessController.php b/core/modules/shortcut/lib/ShortcutSetAccessController.php
similarity index 100%
rename from core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetAccessController.php
rename to core/modules/shortcut/lib/ShortcutSetAccessController.php
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetFormController.php b/core/modules/shortcut/lib/ShortcutSetFormController.php
similarity index 100%
rename from core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetFormController.php
rename to core/modules/shortcut/lib/ShortcutSetFormController.php
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetInterface.php b/core/modules/shortcut/lib/ShortcutSetInterface.php
similarity index 100%
rename from core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetInterface.php
rename to core/modules/shortcut/lib/ShortcutSetInterface.php
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetListController.php b/core/modules/shortcut/lib/ShortcutSetListController.php
similarity index 100%
rename from core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetListController.php
rename to core/modules/shortcut/lib/ShortcutSetListController.php
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetStorageController.php b/core/modules/shortcut/lib/ShortcutSetStorageController.php
similarity index 100%
rename from core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetStorageController.php
rename to core/modules/shortcut/lib/ShortcutSetStorageController.php
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetStorageControllerInterface.php b/core/modules/shortcut/lib/ShortcutSetStorageControllerInterface.php
similarity index 100%
rename from core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetStorageControllerInterface.php
rename to core/modules/shortcut/lib/ShortcutSetStorageControllerInterface.php
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutLinksTest.php b/core/modules/shortcut/lib/Tests/ShortcutLinksTest.php
similarity index 100%
rename from core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutLinksTest.php
rename to core/modules/shortcut/lib/Tests/ShortcutLinksTest.php
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutSetsTest.php b/core/modules/shortcut/lib/Tests/ShortcutSetsTest.php
similarity index 100%
rename from core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutSetsTest.php
rename to core/modules/shortcut/lib/Tests/ShortcutSetsTest.php
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutTestBase.php b/core/modules/shortcut/lib/Tests/ShortcutTestBase.php
similarity index 100%
rename from core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutTestBase.php
rename to core/modules/shortcut/lib/Tests/ShortcutTestBase.php
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php b/core/modules/simpletest/lib/DrupalUnitTestBase.php
similarity index 100%
rename from core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php
rename to core/modules/simpletest/lib/DrupalUnitTestBase.php
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestResultsForm.php b/core/modules/simpletest/lib/Form/SimpletestResultsForm.php
similarity index 100%
rename from core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestResultsForm.php
rename to core/modules/simpletest/lib/Form/SimpletestResultsForm.php
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestSettingsForm.php b/core/modules/simpletest/lib/Form/SimpletestSettingsForm.php
similarity index 100%
rename from core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestSettingsForm.php
rename to core/modules/simpletest/lib/Form/SimpletestSettingsForm.php
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestTestForm.php b/core/modules/simpletest/lib/Form/SimpletestTestForm.php
similarity index 100%
rename from core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestTestForm.php
rename to core/modules/simpletest/lib/Form/SimpletestTestForm.php
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php b/core/modules/simpletest/lib/TestBase.php
similarity index 100%
rename from core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
rename to core/modules/simpletest/lib/TestBase.php
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/TestServiceProvider.php b/core/modules/simpletest/lib/TestServiceProvider.php
similarity index 100%
rename from core/modules/simpletest/lib/Drupal/simpletest/TestServiceProvider.php
rename to core/modules/simpletest/lib/TestServiceProvider.php
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Tests/BrokenSetUpTest.php b/core/modules/simpletest/lib/Tests/BrokenSetUpTest.php
similarity index 100%
rename from core/modules/simpletest/lib/Drupal/simpletest/Tests/BrokenSetUpTest.php
rename to core/modules/simpletest/lib/Tests/BrokenSetUpTest.php
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Tests/BrowserTest.php b/core/modules/simpletest/lib/Tests/BrowserTest.php
similarity index 100%
rename from core/modules/simpletest/lib/Drupal/simpletest/Tests/BrowserTest.php
rename to core/modules/simpletest/lib/Tests/BrowserTest.php
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Tests/DrupalUnitTestBaseTest.php b/core/modules/simpletest/lib/Tests/DrupalUnitTestBaseTest.php
similarity index 100%
rename from core/modules/simpletest/lib/Drupal/simpletest/Tests/DrupalUnitTestBaseTest.php
rename to core/modules/simpletest/lib/Tests/DrupalUnitTestBaseTest.php
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Tests/FolderTest.php b/core/modules/simpletest/lib/Tests/FolderTest.php
similarity index 100%
rename from core/modules/simpletest/lib/Drupal/simpletest/Tests/FolderTest.php
rename to core/modules/simpletest/lib/Tests/FolderTest.php
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Tests/InstallationProfileModuleTestsTest.php b/core/modules/simpletest/lib/Tests/InstallationProfileModuleTestsTest.php
similarity index 100%
rename from core/modules/simpletest/lib/Drupal/simpletest/Tests/InstallationProfileModuleTestsTest.php
rename to core/modules/simpletest/lib/Tests/InstallationProfileModuleTestsTest.php
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Tests/MailCaptureTest.php b/core/modules/simpletest/lib/Tests/MailCaptureTest.php
similarity index 100%
rename from core/modules/simpletest/lib/Drupal/simpletest/Tests/MailCaptureTest.php
rename to core/modules/simpletest/lib/Tests/MailCaptureTest.php
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Tests/MissingCheckedRequirementsTest.php b/core/modules/simpletest/lib/Tests/MissingCheckedRequirementsTest.php
similarity index 100%
rename from core/modules/simpletest/lib/Drupal/simpletest/Tests/MissingCheckedRequirementsTest.php
rename to core/modules/simpletest/lib/Tests/MissingCheckedRequirementsTest.php
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Tests/MissingDependentModuleUnitTest.php b/core/modules/simpletest/lib/Tests/MissingDependentModuleUnitTest.php
similarity index 100%
rename from core/modules/simpletest/lib/Drupal/simpletest/Tests/MissingDependentModuleUnitTest.php
rename to core/modules/simpletest/lib/Tests/MissingDependentModuleUnitTest.php
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Tests/OtherInstallationProfileModuleTestsTest.php b/core/modules/simpletest/lib/Tests/OtherInstallationProfileModuleTestsTest.php
similarity index 100%
rename from core/modules/simpletest/lib/Drupal/simpletest/Tests/OtherInstallationProfileModuleTestsTest.php
rename to core/modules/simpletest/lib/Tests/OtherInstallationProfileModuleTestsTest.php
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Tests/SimpleTestTest.php b/core/modules/simpletest/lib/Tests/SimpleTestTest.php
similarity index 100%
rename from core/modules/simpletest/lib/Drupal/simpletest/Tests/SimpleTestTest.php
rename to core/modules/simpletest/lib/Tests/SimpleTestTest.php
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Tests/UserHelpersTest.php b/core/modules/simpletest/lib/Tests/UserHelpersTest.php
similarity index 100%
rename from core/modules/simpletest/lib/Drupal/simpletest/Tests/UserHelpersTest.php
rename to core/modules/simpletest/lib/Tests/UserHelpersTest.php
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/UnitTestBase.php b/core/modules/simpletest/lib/UnitTestBase.php
similarity index 100%
rename from core/modules/simpletest/lib/Drupal/simpletest/UnitTestBase.php
rename to core/modules/simpletest/lib/UnitTestBase.php
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/lib/WebTestBase.php
similarity index 100%
rename from core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
rename to core/modules/simpletest/lib/WebTestBase.php
diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module
index 8d441f4..b98d528 100644
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -454,21 +454,28 @@ function simpletest_test_get_all() {
       $all_data = $module_data + system_rebuild_theme_data();
       $all_data += drupal_system_listing('/\.profile$/', 'profiles', 'name');
       foreach ($all_data as $name => $data) {
-        // Build directory in which the test files would reside.
-        $tests_dir = DRUPAL_ROOT . '/' . dirname($data->uri) . '/lib/Drupal/' . $name . '/Tests';
+        $extension_dir = DRUPAL_ROOT . '/' . dirname($data->uri);
+
+        // Build directories in which the test files would reside.
+        $tests_dirs = array(
+          $extension_dir . '/lib/Drupal/' . $name . '/Tests',
+          $extension_dir . '/lib/Tests',
+          $extension_dir . '/tests/Drupal/' . $name . '/Tests',
+          $extension_dir . '/tests/lib',
+        );
+
+        $namespace = 'Drupal\\' . $name . '\Tests\\';
+
         // Scan it for test files if it exists.
-        if (is_dir($tests_dir)) {
-          $files = file_scan_directory($tests_dir, '/.*\.php/');
-          if (!empty($files)) {
-            $basedir = DRUPAL_ROOT . '/' . dirname($data->uri) . '/lib/';
-            foreach ($files as $file) {
-              // Convert the file name into the namespaced class name.
-              $replacements = array(
-                '/' => '\\',
-                $basedir => '',
-                '.php' => '',
-              );
-              $classes[] = strtr($file->uri, $replacements);
+        foreach ($tests_dirs as $tests_dir) {
+          if (is_dir($tests_dir)) {
+            $files = file_scan_directory($tests_dir, '/.*\.php/');
+            if (!empty($files)) {
+              $strlen = strlen($tests_dir) + 1;
+              // Convert the file names into the namespaced class names.
+              foreach ($files as $file) {
+                $classes[] = $namespace . str_replace('/', '\\', substr($file->uri, $strlen, -4));
+              }
             }
           }
         }
@@ -526,8 +533,14 @@ function simpletest_classloader_register() {
   foreach ($types as $type => $info) {
     $matches = drupal_system_listing('/^' . DRUPAL_PHP_FUNCTION_PATTERN . '\.' . $info['extension'] . '$/', $info['dir']);
     foreach ($matches as $name => $file) {
+      // @todo Register PSR-4 namespace directories, once our classloader supports it.
+      // See https://drupal.org/node/2058867
       drupal_classloader_register($name, dirname($file->uri));
-      $classloader->add('Drupal\\' . $name . '\\Tests', DRUPAL_ROOT . '/' . dirname($file->uri) . '/tests');
+      $extension_dir = dirname($file->uri);
+      $classloader->addPsr4('Drupal\\' . $name . '\\Tests\\', array(
+        $extension_dir . '/tests/Drupal/' . $name . '/Tests',
+        $extension_dir . '/tests/lib',
+      ));
       // While being there, prime drupal_get_filename().
       drupal_get_filename($type, $name, $file->uri);
     }
diff --git a/core/modules/simpletest/tests/Drupal/simpletest/Tests/PhpUnitAutoloaderTest.php b/core/modules/simpletest/tests/lib/PhpUnitAutoloaderTest.php
similarity index 100%
rename from core/modules/simpletest/tests/Drupal/simpletest/Tests/PhpUnitAutoloaderTest.php
rename to core/modules/simpletest/tests/lib/PhpUnitAutoloaderTest.php
diff --git a/core/modules/simpletest/tests/Drupal/simpletest/Tests/PhpUnitErrorTest.php b/core/modules/simpletest/tests/lib/PhpUnitErrorTest.php
similarity index 100%
rename from core/modules/simpletest/tests/Drupal/simpletest/Tests/PhpUnitErrorTest.php
rename to core/modules/simpletest/tests/lib/PhpUnitErrorTest.php
diff --git a/core/modules/simpletest/tests/Drupal/simpletest/Tests/TestBaseTest.php b/core/modules/simpletest/tests/lib/TestBaseTest.php
similarity index 100%
rename from core/modules/simpletest/tests/Drupal/simpletest/Tests/TestBaseTest.php
rename to core/modules/simpletest/tests/lib/TestBaseTest.php
diff --git a/core/modules/simpletest/tests/Drupal/simpletest/Tests/phpunit_error.xml b/core/modules/simpletest/tests/lib/phpunit_error.xml
similarity index 100%
rename from core/modules/simpletest/tests/Drupal/simpletest/Tests/phpunit_error.xml
rename to core/modules/simpletest/tests/lib/phpunit_error.xml
diff --git a/core/modules/statistics/lib/Drupal/statistics/Plugin/Block/StatisticsPopularBlock.php b/core/modules/statistics/lib/Plugin/Block/StatisticsPopularBlock.php
similarity index 100%
rename from core/modules/statistics/lib/Drupal/statistics/Plugin/Block/StatisticsPopularBlock.php
rename to core/modules/statistics/lib/Plugin/Block/StatisticsPopularBlock.php
diff --git a/core/modules/statistics/lib/Drupal/statistics/StatisticsSettingsForm.php b/core/modules/statistics/lib/StatisticsSettingsForm.php
similarity index 100%
rename from core/modules/statistics/lib/Drupal/statistics/StatisticsSettingsForm.php
rename to core/modules/statistics/lib/StatisticsSettingsForm.php
diff --git a/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsAdminTest.php b/core/modules/statistics/lib/Tests/StatisticsAdminTest.php
similarity index 100%
rename from core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsAdminTest.php
rename to core/modules/statistics/lib/Tests/StatisticsAdminTest.php
diff --git a/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsLoggingTest.php b/core/modules/statistics/lib/Tests/StatisticsLoggingTest.php
similarity index 100%
rename from core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsLoggingTest.php
rename to core/modules/statistics/lib/Tests/StatisticsLoggingTest.php
diff --git a/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsReportsTest.php b/core/modules/statistics/lib/Tests/StatisticsReportsTest.php
similarity index 100%
rename from core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsReportsTest.php
rename to core/modules/statistics/lib/Tests/StatisticsReportsTest.php
diff --git a/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsTestBase.php b/core/modules/statistics/lib/Tests/StatisticsTestBase.php
similarity index 100%
rename from core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsTestBase.php
rename to core/modules/statistics/lib/Tests/StatisticsTestBase.php
diff --git a/core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsTokenReplaceTest.php b/core/modules/statistics/lib/Tests/StatisticsTokenReplaceTest.php
similarity index 100%
rename from core/modules/statistics/lib/Drupal/statistics/Tests/StatisticsTokenReplaceTest.php
rename to core/modules/statistics/lib/Tests/StatisticsTokenReplaceTest.php
diff --git a/core/modules/statistics/lib/Drupal/statistics/Tests/Views/IntegrationTest.php b/core/modules/statistics/lib/Tests/Views/IntegrationTest.php
similarity index 100%
rename from core/modules/statistics/lib/Drupal/statistics/Tests/Views/IntegrationTest.php
rename to core/modules/statistics/lib/Tests/Views/IntegrationTest.php
diff --git a/core/modules/statistics/statistics.php b/core/modules/statistics/statistics.php
index ed132e8..22acde2 100644
--- a/core/modules/statistics/statistics.php
+++ b/core/modules/statistics/statistics.php
@@ -9,7 +9,7 @@
 chdir('../../..');
 
 // Load the Drupal bootstrap.
-require_once dirname(dirname(__DIR__)) . '/vendor/autoload.php';
+require_once dirname(dirname(__DIR__)) . '/autoload.php';
 require_once dirname(dirname(__DIR__)) . '/includes/bootstrap.inc';
 drupal_bootstrap(DRUPAL_BOOTSTRAP_VARIABLES);
 
diff --git a/core/modules/syslog/lib/Drupal/syslog/Tests/SyslogTest.php b/core/modules/syslog/lib/Tests/SyslogTest.php
similarity index 100%
rename from core/modules/syslog/lib/Drupal/syslog/Tests/SyslogTest.php
rename to core/modules/syslog/lib/Tests/SyslogTest.php
diff --git a/core/modules/system/lib/Drupal/system/Access/CronAccessCheck.php b/core/modules/system/lib/Access/CronAccessCheck.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Access/CronAccessCheck.php
rename to core/modules/system/lib/Access/CronAccessCheck.php
diff --git a/core/modules/system/lib/Drupal/system/ActionConfigEntityInterface.php b/core/modules/system/lib/ActionConfigEntityInterface.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/ActionConfigEntityInterface.php
rename to core/modules/system/lib/ActionConfigEntityInterface.php
diff --git a/core/modules/system/lib/Drupal/system/Annotation/ImageToolkit.php b/core/modules/system/lib/Annotation/ImageToolkit.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Annotation/ImageToolkit.php
rename to core/modules/system/lib/Annotation/ImageToolkit.php
diff --git a/core/modules/system/lib/Drupal/system/Controller/AdminController.php b/core/modules/system/lib/Controller/AdminController.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Controller/AdminController.php
rename to core/modules/system/lib/Controller/AdminController.php
diff --git a/core/modules/system/lib/Drupal/system/Controller/DateFormatLanguageController.php b/core/modules/system/lib/Controller/DateFormatLanguageController.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Controller/DateFormatLanguageController.php
rename to core/modules/system/lib/Controller/DateFormatLanguageController.php
diff --git a/core/modules/system/lib/Drupal/system/Controller/FormAjaxController.php b/core/modules/system/lib/Controller/FormAjaxController.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Controller/FormAjaxController.php
rename to core/modules/system/lib/Controller/FormAjaxController.php
diff --git a/core/modules/system/lib/Drupal/system/Controller/SystemController.php b/core/modules/system/lib/Controller/SystemController.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Controller/SystemController.php
rename to core/modules/system/lib/Controller/SystemController.php
diff --git a/core/modules/system/lib/Drupal/system/Controller/SystemInfoController.php b/core/modules/system/lib/Controller/SystemInfoController.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Controller/SystemInfoController.php
rename to core/modules/system/lib/Controller/SystemInfoController.php
diff --git a/core/modules/system/lib/Drupal/system/Controller/ThemeController.php b/core/modules/system/lib/Controller/ThemeController.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Controller/ThemeController.php
rename to core/modules/system/lib/Controller/ThemeController.php
diff --git a/core/modules/system/lib/Drupal/system/Controller/TimezoneController.php b/core/modules/system/lib/Controller/TimezoneController.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Controller/TimezoneController.php
rename to core/modules/system/lib/Controller/TimezoneController.php
diff --git a/core/modules/system/lib/Drupal/system/CronController.php b/core/modules/system/lib/CronController.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/CronController.php
rename to core/modules/system/lib/CronController.php
diff --git a/core/modules/system/lib/Drupal/system/DateFormatAccessController.php b/core/modules/system/lib/DateFormatAccessController.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/DateFormatAccessController.php
rename to core/modules/system/lib/DateFormatAccessController.php
diff --git a/core/modules/system/lib/Drupal/system/DateFormatInterface.php b/core/modules/system/lib/DateFormatInterface.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/DateFormatInterface.php
rename to core/modules/system/lib/DateFormatInterface.php
diff --git a/core/modules/system/lib/Drupal/system/DateFormatListController.php b/core/modules/system/lib/DateFormatListController.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/DateFormatListController.php
rename to core/modules/system/lib/DateFormatListController.php
diff --git a/core/modules/system/lib/Drupal/system/Entity/Action.php b/core/modules/system/lib/Entity/Action.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Entity/Action.php
rename to core/modules/system/lib/Entity/Action.php
diff --git a/core/modules/system/lib/Drupal/system/Entity/DateFormat.php b/core/modules/system/lib/Entity/DateFormat.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Entity/DateFormat.php
rename to core/modules/system/lib/Entity/DateFormat.php
diff --git a/core/modules/system/lib/Drupal/system/Entity/Menu.php b/core/modules/system/lib/Entity/Menu.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Entity/Menu.php
rename to core/modules/system/lib/Entity/Menu.php
diff --git a/core/modules/system/lib/Drupal/system/FileDownloadController.php b/core/modules/system/lib/FileDownloadController.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/FileDownloadController.php
rename to core/modules/system/lib/FileDownloadController.php
diff --git a/core/modules/system/lib/Drupal/system/Form/CronForm.php b/core/modules/system/lib/Form/CronForm.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Form/CronForm.php
rename to core/modules/system/lib/Form/CronForm.php
diff --git a/core/modules/system/lib/Drupal/system/Form/DateFormatAddForm.php b/core/modules/system/lib/Form/DateFormatAddForm.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Form/DateFormatAddForm.php
rename to core/modules/system/lib/Form/DateFormatAddForm.php
diff --git a/core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php b/core/modules/system/lib/Form/DateFormatDeleteForm.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Form/DateFormatDeleteForm.php
rename to core/modules/system/lib/Form/DateFormatDeleteForm.php
diff --git a/core/modules/system/lib/Drupal/system/Form/DateFormatEditForm.php b/core/modules/system/lib/Form/DateFormatEditForm.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Form/DateFormatEditForm.php
rename to core/modules/system/lib/Form/DateFormatEditForm.php
diff --git a/core/modules/system/lib/Drupal/system/Form/DateFormatFormBase.php b/core/modules/system/lib/Form/DateFormatFormBase.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Form/DateFormatFormBase.php
rename to core/modules/system/lib/Form/DateFormatFormBase.php
diff --git a/core/modules/system/lib/Drupal/system/Form/DateFormatLocalizeResetForm.php b/core/modules/system/lib/Form/DateFormatLocalizeResetForm.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Form/DateFormatLocalizeResetForm.php
rename to core/modules/system/lib/Form/DateFormatLocalizeResetForm.php
diff --git a/core/modules/system/lib/Drupal/system/Form/FileSystemForm.php b/core/modules/system/lib/Form/FileSystemForm.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Form/FileSystemForm.php
rename to core/modules/system/lib/Form/FileSystemForm.php
diff --git a/core/modules/system/lib/Drupal/system/Form/ImageToolkitForm.php b/core/modules/system/lib/Form/ImageToolkitForm.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Form/ImageToolkitForm.php
rename to core/modules/system/lib/Form/ImageToolkitForm.php
diff --git a/core/modules/system/lib/Drupal/system/Form/LoggingForm.php b/core/modules/system/lib/Form/LoggingForm.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Form/LoggingForm.php
rename to core/modules/system/lib/Form/LoggingForm.php
diff --git a/core/modules/system/lib/Drupal/system/Form/ModulesListConfirmForm.php b/core/modules/system/lib/Form/ModulesListConfirmForm.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Form/ModulesListConfirmForm.php
rename to core/modules/system/lib/Form/ModulesListConfirmForm.php
diff --git a/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php b/core/modules/system/lib/Form/ModulesListForm.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Form/ModulesListForm.php
rename to core/modules/system/lib/Form/ModulesListForm.php
diff --git a/core/modules/system/lib/Drupal/system/Form/ModulesUninstallConfirmForm.php b/core/modules/system/lib/Form/ModulesUninstallConfirmForm.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Form/ModulesUninstallConfirmForm.php
rename to core/modules/system/lib/Form/ModulesUninstallConfirmForm.php
diff --git a/core/modules/system/lib/Drupal/system/Form/ModulesUninstallForm.php b/core/modules/system/lib/Form/ModulesUninstallForm.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Form/ModulesUninstallForm.php
rename to core/modules/system/lib/Form/ModulesUninstallForm.php
diff --git a/core/modules/system/lib/Drupal/system/Form/PerformanceForm.php b/core/modules/system/lib/Form/PerformanceForm.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Form/PerformanceForm.php
rename to core/modules/system/lib/Form/PerformanceForm.php
diff --git a/core/modules/system/lib/Drupal/system/Form/RegionalForm.php b/core/modules/system/lib/Form/RegionalForm.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Form/RegionalForm.php
rename to core/modules/system/lib/Form/RegionalForm.php
diff --git a/core/modules/system/lib/Drupal/system/Form/RssFeedsForm.php b/core/modules/system/lib/Form/RssFeedsForm.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Form/RssFeedsForm.php
rename to core/modules/system/lib/Form/RssFeedsForm.php
diff --git a/core/modules/system/lib/Drupal/system/Form/SiteInformationForm.php b/core/modules/system/lib/Form/SiteInformationForm.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Form/SiteInformationForm.php
rename to core/modules/system/lib/Form/SiteInformationForm.php
diff --git a/core/modules/system/lib/Drupal/system/Form/SiteMaintenanceModeForm.php b/core/modules/system/lib/Form/SiteMaintenanceModeForm.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Form/SiteMaintenanceModeForm.php
rename to core/modules/system/lib/Form/SiteMaintenanceModeForm.php
diff --git a/core/modules/system/lib/Drupal/system/Form/ThemeSettingsForm.php b/core/modules/system/lib/Form/ThemeSettingsForm.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Form/ThemeSettingsForm.php
rename to core/modules/system/lib/Form/ThemeSettingsForm.php
diff --git a/core/modules/system/lib/Drupal/system/LegacyBreadcrumbBuilder.php b/core/modules/system/lib/LegacyBreadcrumbBuilder.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/LegacyBreadcrumbBuilder.php
rename to core/modules/system/lib/LegacyBreadcrumbBuilder.php
diff --git a/core/modules/system/lib/Drupal/system/MachineNameController.php b/core/modules/system/lib/MachineNameController.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/MachineNameController.php
rename to core/modules/system/lib/MachineNameController.php
diff --git a/core/modules/system/lib/Drupal/system/MenuAccessController.php b/core/modules/system/lib/MenuAccessController.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/MenuAccessController.php
rename to core/modules/system/lib/MenuAccessController.php
diff --git a/core/modules/system/lib/Drupal/system/MenuInterface.php b/core/modules/system/lib/MenuInterface.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/MenuInterface.php
rename to core/modules/system/lib/MenuInterface.php
diff --git a/core/modules/system/lib/Drupal/system/PathProcessor/PathProcessorFiles.php b/core/modules/system/lib/PathProcessor/PathProcessorFiles.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/PathProcessor/PathProcessorFiles.php
rename to core/modules/system/lib/PathProcessor/PathProcessorFiles.php
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Archiver/Tar.php b/core/modules/system/lib/Plugin/Archiver/Tar.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Plugin/Archiver/Tar.php
rename to core/modules/system/lib/Plugin/Archiver/Tar.php
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Archiver/Zip.php b/core/modules/system/lib/Plugin/Archiver/Zip.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Plugin/Archiver/Zip.php
rename to core/modules/system/lib/Plugin/Archiver/Zip.php
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemBreadcrumbBlock.php b/core/modules/system/lib/Plugin/Block/SystemBreadcrumbBlock.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Plugin/Block/SystemBreadcrumbBlock.php
rename to core/modules/system/lib/Plugin/Block/SystemBreadcrumbBlock.php
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemHelpBlock.php b/core/modules/system/lib/Plugin/Block/SystemHelpBlock.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Plugin/Block/SystemHelpBlock.php
rename to core/modules/system/lib/Plugin/Block/SystemHelpBlock.php
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMainBlock.php b/core/modules/system/lib/Plugin/Block/SystemMainBlock.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Plugin/Block/SystemMainBlock.php
rename to core/modules/system/lib/Plugin/Block/SystemMainBlock.php
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMenuBlock.php b/core/modules/system/lib/Plugin/Block/SystemMenuBlock.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Plugin/Block/SystemMenuBlock.php
rename to core/modules/system/lib/Plugin/Block/SystemMenuBlock.php
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemPoweredByBlock.php b/core/modules/system/lib/Plugin/Block/SystemPoweredByBlock.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Plugin/Block/SystemPoweredByBlock.php
rename to core/modules/system/lib/Plugin/Block/SystemPoweredByBlock.php
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Derivative/SystemMenuBlock.php b/core/modules/system/lib/Plugin/Derivative/SystemMenuBlock.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Plugin/Derivative/SystemMenuBlock.php
rename to core/modules/system/lib/Plugin/Derivative/SystemMenuBlock.php
diff --git a/core/modules/system/lib/Drupal/system/Plugin/ImageToolkit/GDToolkit.php b/core/modules/system/lib/Plugin/ImageToolkit/GDToolkit.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Plugin/ImageToolkit/GDToolkit.php
rename to core/modules/system/lib/Plugin/ImageToolkit/GDToolkit.php
diff --git a/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitInterface.php b/core/modules/system/lib/Plugin/ImageToolkitInterface.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Plugin/ImageToolkitInterface.php
rename to core/modules/system/lib/Plugin/ImageToolkitInterface.php
diff --git a/core/modules/system/lib/Drupal/system/Plugin/ImageToolkitManager.php b/core/modules/system/lib/Plugin/ImageToolkitManager.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Plugin/ImageToolkitManager.php
rename to core/modules/system/lib/Plugin/ImageToolkitManager.php
diff --git a/core/modules/system/lib/Drupal/system/Plugin/views/field/BulkFormBase.php b/core/modules/system/lib/Plugin/views/field/BulkFormBase.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Plugin/views/field/BulkFormBase.php
rename to core/modules/system/lib/Plugin/views/field/BulkFormBase.php
diff --git a/core/modules/system/lib/Drupal/system/Routing/RouteSubscriber.php b/core/modules/system/lib/Routing/RouteSubscriber.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Routing/RouteSubscriber.php
rename to core/modules/system/lib/Routing/RouteSubscriber.php
diff --git a/core/modules/system/lib/Drupal/system/SystemConfigFormBase.php b/core/modules/system/lib/SystemConfigFormBase.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/SystemConfigFormBase.php
rename to core/modules/system/lib/SystemConfigFormBase.php
diff --git a/core/modules/system/lib/Drupal/system/SystemConfigSubscriber.php b/core/modules/system/lib/SystemConfigSubscriber.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/SystemConfigSubscriber.php
rename to core/modules/system/lib/SystemConfigSubscriber.php
diff --git a/core/modules/system/lib/Drupal/system/SystemManager.php b/core/modules/system/lib/SystemManager.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/SystemManager.php
rename to core/modules/system/lib/SystemManager.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Action/ActionUnitTest.php b/core/modules/system/lib/Tests/Action/ActionUnitTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Action/ActionUnitTest.php
rename to core/modules/system/lib/Tests/Action/ActionUnitTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/AjaxCommandsUnitTest.php b/core/modules/system/lib/Tests/Ajax/AjaxCommandsUnitTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Ajax/AjaxCommandsUnitTest.php
rename to core/modules/system/lib/Tests/Ajax/AjaxCommandsUnitTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/AjaxTestBase.php b/core/modules/system/lib/Tests/Ajax/AjaxTestBase.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Ajax/AjaxTestBase.php
rename to core/modules/system/lib/Tests/Ajax/AjaxTestBase.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/CommandsTest.php b/core/modules/system/lib/Tests/Ajax/CommandsTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Ajax/CommandsTest.php
rename to core/modules/system/lib/Tests/Ajax/CommandsTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/DialogTest.php b/core/modules/system/lib/Tests/Ajax/DialogTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Ajax/DialogTest.php
rename to core/modules/system/lib/Tests/Ajax/DialogTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/ElementValidationTest.php b/core/modules/system/lib/Tests/Ajax/ElementValidationTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Ajax/ElementValidationTest.php
rename to core/modules/system/lib/Tests/Ajax/ElementValidationTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/FormValuesTest.php b/core/modules/system/lib/Tests/Ajax/FormValuesTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Ajax/FormValuesTest.php
rename to core/modules/system/lib/Tests/Ajax/FormValuesTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/FrameworkTest.php b/core/modules/system/lib/Tests/Ajax/FrameworkTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Ajax/FrameworkTest.php
rename to core/modules/system/lib/Tests/Ajax/FrameworkTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/MultiFormTest.php b/core/modules/system/lib/Tests/Ajax/MultiFormTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Ajax/MultiFormTest.php
rename to core/modules/system/lib/Tests/Ajax/MultiFormTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Authentication/HttpBasicTest.php b/core/modules/system/lib/Tests/Authentication/HttpBasicTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Authentication/HttpBasicTest.php
rename to core/modules/system/lib/Tests/Authentication/HttpBasicTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Batch/PageTest.php b/core/modules/system/lib/Tests/Batch/PageTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Batch/PageTest.php
rename to core/modules/system/lib/Tests/Batch/PageTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Batch/ProcessingTest.php b/core/modules/system/lib/Tests/Batch/ProcessingTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Batch/ProcessingTest.php
rename to core/modules/system/lib/Tests/Batch/ProcessingTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/GetFilenameUnitTest.php b/core/modules/system/lib/Tests/Bootstrap/GetFilenameUnitTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Bootstrap/GetFilenameUnitTest.php
rename to core/modules/system/lib/Tests/Bootstrap/GetFilenameUnitTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/MiscUnitTest.php b/core/modules/system/lib/Tests/Bootstrap/MiscUnitTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Bootstrap/MiscUnitTest.php
rename to core/modules/system/lib/Tests/Bootstrap/MiscUnitTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/OverrideServerVariablesUnitTest.php b/core/modules/system/lib/Tests/Bootstrap/OverrideServerVariablesUnitTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Bootstrap/OverrideServerVariablesUnitTest.php
rename to core/modules/system/lib/Tests/Bootstrap/OverrideServerVariablesUnitTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/PageCacheTest.php b/core/modules/system/lib/Tests/Bootstrap/PageCacheTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Bootstrap/PageCacheTest.php
rename to core/modules/system/lib/Tests/Bootstrap/PageCacheTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/ResettableStaticUnitTest.php b/core/modules/system/lib/Tests/Bootstrap/ResettableStaticUnitTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Bootstrap/ResettableStaticUnitTest.php
rename to core/modules/system/lib/Tests/Bootstrap/ResettableStaticUnitTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/VariableTest.php b/core/modules/system/lib/Tests/Bootstrap/VariableTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Bootstrap/VariableTest.php
rename to core/modules/system/lib/Tests/Bootstrap/VariableTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Cache/BackendChainUnitTest.php b/core/modules/system/lib/Tests/Cache/BackendChainUnitTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Cache/BackendChainUnitTest.php
rename to core/modules/system/lib/Tests/Cache/BackendChainUnitTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Cache/CacheTestBase.php b/core/modules/system/lib/Tests/Cache/CacheTestBase.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Cache/CacheTestBase.php
rename to core/modules/system/lib/Tests/Cache/CacheTestBase.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Cache/ClearTest.php b/core/modules/system/lib/Tests/Cache/ClearTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Cache/ClearTest.php
rename to core/modules/system/lib/Tests/Cache/ClearTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Cache/DatabaseBackendUnitTest.php b/core/modules/system/lib/Tests/Cache/DatabaseBackendUnitTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Cache/DatabaseBackendUnitTest.php
rename to core/modules/system/lib/Tests/Cache/DatabaseBackendUnitTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Cache/GenericCacheBackendUnitTestBase.php b/core/modules/system/lib/Tests/Cache/GenericCacheBackendUnitTestBase.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Cache/GenericCacheBackendUnitTestBase.php
rename to core/modules/system/lib/Tests/Cache/GenericCacheBackendUnitTestBase.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Cache/MemoryBackendUnitTest.php b/core/modules/system/lib/Tests/Cache/MemoryBackendUnitTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Cache/MemoryBackendUnitTest.php
rename to core/modules/system/lib/Tests/Cache/MemoryBackendUnitTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/AddFeedTest.php b/core/modules/system/lib/Tests/Common/AddFeedTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Common/AddFeedTest.php
rename to core/modules/system/lib/Tests/Common/AddFeedTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/AlterTest.php b/core/modules/system/lib/Tests/Common/AlterTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Common/AlterTest.php
rename to core/modules/system/lib/Tests/Common/AlterTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/CascadingStylesheetsTest.php b/core/modules/system/lib/Tests/Common/CascadingStylesheetsTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Common/CascadingStylesheetsTest.php
rename to core/modules/system/lib/Tests/Common/CascadingStylesheetsTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php b/core/modules/system/lib/Tests/Common/FormatDateTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php
rename to core/modules/system/lib/Tests/Common/FormatDateTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/HtmlIdentifierUnitTest.php b/core/modules/system/lib/Tests/Common/HtmlIdentifierUnitTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Common/HtmlIdentifierUnitTest.php
rename to core/modules/system/lib/Tests/Common/HtmlIdentifierUnitTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php b/core/modules/system/lib/Tests/Common/JavaScriptTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php
rename to core/modules/system/lib/Tests/Common/JavaScriptTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/ParseInfoFileUnitTest.php b/core/modules/system/lib/Tests/Common/ParseInfoFileUnitTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Common/ParseInfoFileUnitTest.php
rename to core/modules/system/lib/Tests/Common/ParseInfoFileUnitTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/RegionContentTest.php b/core/modules/system/lib/Tests/Common/RegionContentTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Common/RegionContentTest.php
rename to core/modules/system/lib/Tests/Common/RegionContentTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/RenderElementTypesTest.php b/core/modules/system/lib/Tests/Common/RenderElementTypesTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Common/RenderElementTypesTest.php
rename to core/modules/system/lib/Tests/Common/RenderElementTypesTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/RenderTest.php b/core/modules/system/lib/Tests/Common/RenderTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Common/RenderTest.php
rename to core/modules/system/lib/Tests/Common/RenderTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/SimpleTestErrorCollectorTest.php b/core/modules/system/lib/Tests/Common/SimpleTestErrorCollectorTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Common/SimpleTestErrorCollectorTest.php
rename to core/modules/system/lib/Tests/Common/SimpleTestErrorCollectorTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/SizeUnitTest.php b/core/modules/system/lib/Tests/Common/SizeUnitTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Common/SizeUnitTest.php
rename to core/modules/system/lib/Tests/Common/SizeUnitTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/SystemListingTest.php b/core/modules/system/lib/Tests/Common/SystemListingTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Common/SystemListingTest.php
rename to core/modules/system/lib/Tests/Common/SystemListingTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/TableSortExtenderUnitTest.php b/core/modules/system/lib/Tests/Common/TableSortExtenderUnitTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Common/TableSortExtenderUnitTest.php
rename to core/modules/system/lib/Tests/Common/TableSortExtenderUnitTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/UrlTest.php b/core/modules/system/lib/Tests/Common/UrlTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Common/UrlTest.php
rename to core/modules/system/lib/Tests/Common/UrlTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/ValidNumberStepUnitTest.php b/core/modules/system/lib/Tests/Common/ValidNumberStepUnitTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Common/ValidNumberStepUnitTest.php
rename to core/modules/system/lib/Tests/Common/ValidNumberStepUnitTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/WriteRecordTest.php b/core/modules/system/lib/Tests/Common/WriteRecordTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Common/WriteRecordTest.php
rename to core/modules/system/lib/Tests/Common/WriteRecordTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/XssUnitTest.php b/core/modules/system/lib/Tests/Common/XssUnitTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Common/XssUnitTest.php
rename to core/modules/system/lib/Tests/Common/XssUnitTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Condition/ConditionFormTest.php b/core/modules/system/lib/Tests/Condition/ConditionFormTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Condition/ConditionFormTest.php
rename to core/modules/system/lib/Tests/Condition/ConditionFormTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/AlterTest.php b/core/modules/system/lib/Tests/Database/AlterTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/AlterTest.php
rename to core/modules/system/lib/Tests/Database/AlterTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/BasicSyntaxTest.php b/core/modules/system/lib/Tests/Database/BasicSyntaxTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/BasicSyntaxTest.php
rename to core/modules/system/lib/Tests/Database/BasicSyntaxTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/CaseSensitivityTest.php b/core/modules/system/lib/Tests/Database/CaseSensitivityTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/CaseSensitivityTest.php
rename to core/modules/system/lib/Tests/Database/CaseSensitivityTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/ConnectionTest.php b/core/modules/system/lib/Tests/Database/ConnectionTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/ConnectionTest.php
rename to core/modules/system/lib/Tests/Database/ConnectionTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/ConnectionUnitTest.php b/core/modules/system/lib/Tests/Database/ConnectionUnitTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/ConnectionUnitTest.php
rename to core/modules/system/lib/Tests/Database/ConnectionUnitTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/DatabaseExceptionWrapperTest.php b/core/modules/system/lib/Tests/Database/DatabaseExceptionWrapperTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/DatabaseExceptionWrapperTest.php
rename to core/modules/system/lib/Tests/Database/DatabaseExceptionWrapperTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/DatabaseTestBase.php b/core/modules/system/lib/Tests/Database/DatabaseTestBase.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/DatabaseTestBase.php
rename to core/modules/system/lib/Tests/Database/DatabaseTestBase.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/DatabaseWebTestBase.php b/core/modules/system/lib/Tests/Database/DatabaseWebTestBase.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/DatabaseWebTestBase.php
rename to core/modules/system/lib/Tests/Database/DatabaseWebTestBase.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/DeleteTruncateTest.php b/core/modules/system/lib/Tests/Database/DeleteTruncateTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/DeleteTruncateTest.php
rename to core/modules/system/lib/Tests/Database/DeleteTruncateTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/FakeRecord.php b/core/modules/system/lib/Tests/Database/FakeRecord.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/FakeRecord.php
rename to core/modules/system/lib/Tests/Database/FakeRecord.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/FetchTest.php b/core/modules/system/lib/Tests/Database/FetchTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/FetchTest.php
rename to core/modules/system/lib/Tests/Database/FetchTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/InsertDefaultsTest.php b/core/modules/system/lib/Tests/Database/InsertDefaultsTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/InsertDefaultsTest.php
rename to core/modules/system/lib/Tests/Database/InsertDefaultsTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/InsertLobTest.php b/core/modules/system/lib/Tests/Database/InsertLobTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/InsertLobTest.php
rename to core/modules/system/lib/Tests/Database/InsertLobTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/InsertTest.php b/core/modules/system/lib/Tests/Database/InsertTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/InsertTest.php
rename to core/modules/system/lib/Tests/Database/InsertTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/InvalidDataTest.php b/core/modules/system/lib/Tests/Database/InvalidDataTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/InvalidDataTest.php
rename to core/modules/system/lib/Tests/Database/InvalidDataTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/LoggingTest.php b/core/modules/system/lib/Tests/Database/LoggingTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/LoggingTest.php
rename to core/modules/system/lib/Tests/Database/LoggingTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/MergeTest.php b/core/modules/system/lib/Tests/Database/MergeTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/MergeTest.php
rename to core/modules/system/lib/Tests/Database/MergeTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/NextIdTest.php b/core/modules/system/lib/Tests/Database/NextIdTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/NextIdTest.php
rename to core/modules/system/lib/Tests/Database/NextIdTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/QueryTest.php b/core/modules/system/lib/Tests/Database/QueryTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/QueryTest.php
rename to core/modules/system/lib/Tests/Database/QueryTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/RangeQueryTest.php b/core/modules/system/lib/Tests/Database/RangeQueryTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/RangeQueryTest.php
rename to core/modules/system/lib/Tests/Database/RangeQueryTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/RegressionTest.php b/core/modules/system/lib/Tests/Database/RegressionTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/RegressionTest.php
rename to core/modules/system/lib/Tests/Database/RegressionTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SchemaTest.php b/core/modules/system/lib/Tests/Database/SchemaTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/SchemaTest.php
rename to core/modules/system/lib/Tests/Database/SchemaTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SelectCloneTest.php b/core/modules/system/lib/Tests/Database/SelectCloneTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/SelectCloneTest.php
rename to core/modules/system/lib/Tests/Database/SelectCloneTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SelectComplexTest.php b/core/modules/system/lib/Tests/Database/SelectComplexTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/SelectComplexTest.php
rename to core/modules/system/lib/Tests/Database/SelectComplexTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SelectOrderedTest.php b/core/modules/system/lib/Tests/Database/SelectOrderedTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/SelectOrderedTest.php
rename to core/modules/system/lib/Tests/Database/SelectOrderedTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SelectPagerDefaultTest.php b/core/modules/system/lib/Tests/Database/SelectPagerDefaultTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/SelectPagerDefaultTest.php
rename to core/modules/system/lib/Tests/Database/SelectPagerDefaultTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SelectSubqueryTest.php b/core/modules/system/lib/Tests/Database/SelectSubqueryTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/SelectSubqueryTest.php
rename to core/modules/system/lib/Tests/Database/SelectSubqueryTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SelectTableSortDefaultTest.php b/core/modules/system/lib/Tests/Database/SelectTableSortDefaultTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/SelectTableSortDefaultTest.php
rename to core/modules/system/lib/Tests/Database/SelectTableSortDefaultTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SelectTest.php b/core/modules/system/lib/Tests/Database/SelectTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/SelectTest.php
rename to core/modules/system/lib/Tests/Database/SelectTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SerializeQueryTest.php b/core/modules/system/lib/Tests/Database/SerializeQueryTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/SerializeQueryTest.php
rename to core/modules/system/lib/Tests/Database/SerializeQueryTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/TaggingTest.php b/core/modules/system/lib/Tests/Database/TaggingTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/TaggingTest.php
rename to core/modules/system/lib/Tests/Database/TaggingTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/TemporaryQueryTest.php b/core/modules/system/lib/Tests/Database/TemporaryQueryTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/TemporaryQueryTest.php
rename to core/modules/system/lib/Tests/Database/TemporaryQueryTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/TransactionTest.php b/core/modules/system/lib/Tests/Database/TransactionTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/TransactionTest.php
rename to core/modules/system/lib/Tests/Database/TransactionTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/UpdateComplexTest.php b/core/modules/system/lib/Tests/Database/UpdateComplexTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/UpdateComplexTest.php
rename to core/modules/system/lib/Tests/Database/UpdateComplexTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/UpdateLobTest.php b/core/modules/system/lib/Tests/Database/UpdateLobTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/UpdateLobTest.php
rename to core/modules/system/lib/Tests/Database/UpdateLobTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/UpdateTest.php b/core/modules/system/lib/Tests/Database/UpdateTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Database/UpdateTest.php
rename to core/modules/system/lib/Tests/Database/UpdateTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Datetime/DateTimePlusIntlTest.php b/core/modules/system/lib/Tests/Datetime/DateTimePlusIntlTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Datetime/DateTimePlusIntlTest.php
rename to core/modules/system/lib/Tests/Datetime/DateTimePlusIntlTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Datetime/DrupalDateTimeTest.php b/core/modules/system/lib/Tests/Datetime/DrupalDateTimeTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Datetime/DrupalDateTimeTest.php
rename to core/modules/system/lib/Tests/Datetime/DrupalDateTimeTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/DrupalKernel/ContentNegotiationTest.php b/core/modules/system/lib/Tests/DrupalKernel/ContentNegotiationTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/DrupalKernel/ContentNegotiationTest.php
rename to core/modules/system/lib/Tests/DrupalKernel/ContentNegotiationTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/DrupalKernel/DrupalKernelTest.php b/core/modules/system/lib/Tests/DrupalKernel/DrupalKernelTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/DrupalKernel/DrupalKernelTest.php
rename to core/modules/system/lib/Tests/DrupalKernel/DrupalKernelTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/DrupalKernel/ServiceDestructionTest.php b/core/modules/system/lib/Tests/DrupalKernel/ServiceDestructionTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/DrupalKernel/ServiceDestructionTest.php
rename to core/modules/system/lib/Tests/DrupalKernel/ServiceDestructionTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/ConfigEntityQueryTest.php b/core/modules/system/lib/Tests/Entity/ConfigEntityQueryTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Entity/ConfigEntityQueryTest.php
rename to core/modules/system/lib/Tests/Entity/ConfigEntityQueryTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityAccessTest.php b/core/modules/system/lib/Tests/Entity/EntityAccessTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityAccessTest.php
rename to core/modules/system/lib/Tests/Entity/EntityAccessTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityApiInfoTest.php b/core/modules/system/lib/Tests/Entity/EntityApiInfoTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityApiInfoTest.php
rename to core/modules/system/lib/Tests/Entity/EntityApiInfoTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityApiTest.php b/core/modules/system/lib/Tests/Entity/EntityApiTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityApiTest.php
rename to core/modules/system/lib/Tests/Entity/EntityApiTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityBCDecoratorTest.php b/core/modules/system/lib/Tests/Entity/EntityBCDecoratorTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityBCDecoratorTest.php
rename to core/modules/system/lib/Tests/Entity/EntityBCDecoratorTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityCrudHookTest.php b/core/modules/system/lib/Tests/Entity/EntityCrudHookTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityCrudHookTest.php
rename to core/modules/system/lib/Tests/Entity/EntityCrudHookTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldDefaultValueTest.php b/core/modules/system/lib/Tests/Entity/EntityFieldDefaultValueTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldDefaultValueTest.php
rename to core/modules/system/lib/Tests/Entity/EntityFieldDefaultValueTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldTest.php b/core/modules/system/lib/Tests/Entity/EntityFieldTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldTest.php
rename to core/modules/system/lib/Tests/Entity/EntityFieldTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFormTest.php b/core/modules/system/lib/Tests/Entity/EntityFormTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityFormTest.php
rename to core/modules/system/lib/Tests/Entity/EntityFormTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityLabelTest.php b/core/modules/system/lib/Tests/Entity/EntityLabelTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityLabelTest.php
rename to core/modules/system/lib/Tests/Entity/EntityLabelTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityManagerTest.php b/core/modules/system/lib/Tests/Entity/EntityManagerTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityManagerTest.php
rename to core/modules/system/lib/Tests/Entity/EntityManagerTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityOperationsTest.php b/core/modules/system/lib/Tests/Entity/EntityOperationsTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityOperationsTest.php
rename to core/modules/system/lib/Tests/Entity/EntityOperationsTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryAggregateTest.php b/core/modules/system/lib/Tests/Entity/EntityQueryAggregateTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryAggregateTest.php
rename to core/modules/system/lib/Tests/Entity/EntityQueryAggregateTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryRelationshipTest.php b/core/modules/system/lib/Tests/Entity/EntityQueryRelationshipTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryRelationshipTest.php
rename to core/modules/system/lib/Tests/Entity/EntityQueryRelationshipTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryTest.php b/core/modules/system/lib/Tests/Entity/EntityQueryTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryTest.php
rename to core/modules/system/lib/Tests/Entity/EntityQueryTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityRevisionsTest.php b/core/modules/system/lib/Tests/Entity/EntityRevisionsTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityRevisionsTest.php
rename to core/modules/system/lib/Tests/Entity/EntityRevisionsTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityTranslationFormTest.php b/core/modules/system/lib/Tests/Entity/EntityTranslationFormTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityTranslationFormTest.php
rename to core/modules/system/lib/Tests/Entity/EntityTranslationFormTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityTranslationTest.php b/core/modules/system/lib/Tests/Entity/EntityTranslationTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityTranslationTest.php
rename to core/modules/system/lib/Tests/Entity/EntityTranslationTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityUUIDTest.php b/core/modules/system/lib/Tests/Entity/EntityUUIDTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityUUIDTest.php
rename to core/modules/system/lib/Tests/Entity/EntityUUIDTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityUnitTestBase.php b/core/modules/system/lib/Tests/Entity/EntityUnitTestBase.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityUnitTestBase.php
rename to core/modules/system/lib/Tests/Entity/EntityUnitTestBase.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityUriTest.php b/core/modules/system/lib/Tests/Entity/EntityUriTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityUriTest.php
rename to core/modules/system/lib/Tests/Entity/EntityUriTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityValidationTest.php b/core/modules/system/lib/Tests/Entity/EntityValidationTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityValidationTest.php
rename to core/modules/system/lib/Tests/Entity/EntityValidationTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityViewControllerTest.php b/core/modules/system/lib/Tests/Entity/EntityViewControllerTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Entity/EntityViewControllerTest.php
rename to core/modules/system/lib/Tests/Entity/EntityViewControllerTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/FieldAccessTest.php b/core/modules/system/lib/Tests/Entity/FieldAccessTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Entity/FieldAccessTest.php
rename to core/modules/system/lib/Tests/Entity/FieldAccessTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/FieldSqlStorageTest.php b/core/modules/system/lib/Tests/Entity/FieldSqlStorageTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Entity/FieldSqlStorageTest.php
rename to core/modules/system/lib/Tests/Entity/FieldSqlStorageTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/ConfigTest.php b/core/modules/system/lib/Tests/File/ConfigTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/File/ConfigTest.php
rename to core/modules/system/lib/Tests/File/ConfigTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/DirectoryTest.php b/core/modules/system/lib/Tests/File/DirectoryTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/File/DirectoryTest.php
rename to core/modules/system/lib/Tests/File/DirectoryTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/FileTestBase.php b/core/modules/system/lib/Tests/File/FileTestBase.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/File/FileTestBase.php
rename to core/modules/system/lib/Tests/File/FileTestBase.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/MimeTypeTest.php b/core/modules/system/lib/Tests/File/MimeTypeTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/File/MimeTypeTest.php
rename to core/modules/system/lib/Tests/File/MimeTypeTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/NameMungingTest.php b/core/modules/system/lib/Tests/File/NameMungingTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/File/NameMungingTest.php
rename to core/modules/system/lib/Tests/File/NameMungingTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/ReadOnlyStreamWrapperTest.php b/core/modules/system/lib/Tests/File/ReadOnlyStreamWrapperTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/File/ReadOnlyStreamWrapperTest.php
rename to core/modules/system/lib/Tests/File/ReadOnlyStreamWrapperTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/RemoteFileDirectoryTest.php b/core/modules/system/lib/Tests/File/RemoteFileDirectoryTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/File/RemoteFileDirectoryTest.php
rename to core/modules/system/lib/Tests/File/RemoteFileDirectoryTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/RemoteFileScanDirectoryTest.php b/core/modules/system/lib/Tests/File/RemoteFileScanDirectoryTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/File/RemoteFileScanDirectoryTest.php
rename to core/modules/system/lib/Tests/File/RemoteFileScanDirectoryTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/RemoteFileUnmanagedCopyTest.php b/core/modules/system/lib/Tests/File/RemoteFileUnmanagedCopyTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/File/RemoteFileUnmanagedCopyTest.php
rename to core/modules/system/lib/Tests/File/RemoteFileUnmanagedCopyTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/RemoteFileUnmanagedDeleteRecursiveTest.php b/core/modules/system/lib/Tests/File/RemoteFileUnmanagedDeleteRecursiveTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/File/RemoteFileUnmanagedDeleteRecursiveTest.php
rename to core/modules/system/lib/Tests/File/RemoteFileUnmanagedDeleteRecursiveTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/RemoteFileUnmanagedDeleteTest.php b/core/modules/system/lib/Tests/File/RemoteFileUnmanagedDeleteTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/File/RemoteFileUnmanagedDeleteTest.php
rename to core/modules/system/lib/Tests/File/RemoteFileUnmanagedDeleteTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/RemoteFileUnmanagedMoveTest.php b/core/modules/system/lib/Tests/File/RemoteFileUnmanagedMoveTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/File/RemoteFileUnmanagedMoveTest.php
rename to core/modules/system/lib/Tests/File/RemoteFileUnmanagedMoveTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/RemoteFileUnmanagedSaveDataTest.php b/core/modules/system/lib/Tests/File/RemoteFileUnmanagedSaveDataTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/File/RemoteFileUnmanagedSaveDataTest.php
rename to core/modules/system/lib/Tests/File/RemoteFileUnmanagedSaveDataTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/ScanDirectoryTest.php b/core/modules/system/lib/Tests/File/ScanDirectoryTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/File/ScanDirectoryTest.php
rename to core/modules/system/lib/Tests/File/ScanDirectoryTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/StreamWrapperTest.php b/core/modules/system/lib/Tests/File/StreamWrapperTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/File/StreamWrapperTest.php
rename to core/modules/system/lib/Tests/File/StreamWrapperTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedCopyTest.php b/core/modules/system/lib/Tests/File/UnmanagedCopyTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/File/UnmanagedCopyTest.php
rename to core/modules/system/lib/Tests/File/UnmanagedCopyTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedDeleteRecursiveTest.php b/core/modules/system/lib/Tests/File/UnmanagedDeleteRecursiveTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/File/UnmanagedDeleteRecursiveTest.php
rename to core/modules/system/lib/Tests/File/UnmanagedDeleteRecursiveTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedDeleteTest.php b/core/modules/system/lib/Tests/File/UnmanagedDeleteTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/File/UnmanagedDeleteTest.php
rename to core/modules/system/lib/Tests/File/UnmanagedDeleteTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedMoveTest.php b/core/modules/system/lib/Tests/File/UnmanagedMoveTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/File/UnmanagedMoveTest.php
rename to core/modules/system/lib/Tests/File/UnmanagedMoveTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/UnmanagedSaveDataTest.php b/core/modules/system/lib/Tests/File/UnmanagedSaveDataTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/File/UnmanagedSaveDataTest.php
rename to core/modules/system/lib/Tests/File/UnmanagedSaveDataTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/File/UrlRewritingTest.php b/core/modules/system/lib/Tests/File/UrlRewritingTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/File/UrlRewritingTest.php
rename to core/modules/system/lib/Tests/File/UrlRewritingTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/FileTransfer/FileTransferTest.php b/core/modules/system/lib/Tests/FileTransfer/FileTransferTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/FileTransfer/FileTransferTest.php
rename to core/modules/system/lib/Tests/FileTransfer/FileTransferTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/FileTransfer/MockTestConnection.php b/core/modules/system/lib/Tests/FileTransfer/MockTestConnection.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/FileTransfer/MockTestConnection.php
rename to core/modules/system/lib/Tests/FileTransfer/MockTestConnection.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/FileTransfer/TestFileTransfer.php b/core/modules/system/lib/Tests/FileTransfer/TestFileTransfer.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/FileTransfer/TestFileTransfer.php
rename to core/modules/system/lib/Tests/FileTransfer/TestFileTransfer.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/AlterTest.php b/core/modules/system/lib/Tests/Form/AlterTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Form/AlterTest.php
rename to core/modules/system/lib/Tests/Form/AlterTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/ArbitraryRebuildTest.php b/core/modules/system/lib/Tests/Form/ArbitraryRebuildTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Form/ArbitraryRebuildTest.php
rename to core/modules/system/lib/Tests/Form/ArbitraryRebuildTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/CheckboxTest.php b/core/modules/system/lib/Tests/Form/CheckboxTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Form/CheckboxTest.php
rename to core/modules/system/lib/Tests/Form/CheckboxTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/ConfirmFormTest.php b/core/modules/system/lib/Tests/Form/ConfirmFormTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Form/ConfirmFormTest.php
rename to core/modules/system/lib/Tests/Form/ConfirmFormTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/ElementTest.php b/core/modules/system/lib/Tests/Form/ElementTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Form/ElementTest.php
rename to core/modules/system/lib/Tests/Form/ElementTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/ElementsLabelsTest.php b/core/modules/system/lib/Tests/Form/ElementsLabelsTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Form/ElementsLabelsTest.php
rename to core/modules/system/lib/Tests/Form/ElementsLabelsTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/ElementsTableSelectTest.php b/core/modules/system/lib/Tests/Form/ElementsTableSelectTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Form/ElementsTableSelectTest.php
rename to core/modules/system/lib/Tests/Form/ElementsTableSelectTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/ElementsVerticalTabsTest.php b/core/modules/system/lib/Tests/Form/ElementsVerticalTabsTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Form/ElementsVerticalTabsTest.php
rename to core/modules/system/lib/Tests/Form/ElementsVerticalTabsTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/EmailTest.php b/core/modules/system/lib/Tests/Form/EmailTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Form/EmailTest.php
rename to core/modules/system/lib/Tests/Form/EmailTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/FileInclusionTest.php b/core/modules/system/lib/Tests/Form/FileInclusionTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Form/FileInclusionTest.php
rename to core/modules/system/lib/Tests/Form/FileInclusionTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/FormCacheTest.php b/core/modules/system/lib/Tests/Form/FormCacheTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Form/FormCacheTest.php
rename to core/modules/system/lib/Tests/Form/FormCacheTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/FormObjectTest.php b/core/modules/system/lib/Tests/Form/FormObjectTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Form/FormObjectTest.php
rename to core/modules/system/lib/Tests/Form/FormObjectTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php b/core/modules/system/lib/Tests/Form/FormTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php
rename to core/modules/system/lib/Tests/Form/FormTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/HTMLIdTest.php b/core/modules/system/lib/Tests/Form/HTMLIdTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Form/HTMLIdTest.php
rename to core/modules/system/lib/Tests/Form/HTMLIdTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/LanguageSelectElementTest.php b/core/modules/system/lib/Tests/Form/LanguageSelectElementTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Form/LanguageSelectElementTest.php
rename to core/modules/system/lib/Tests/Form/LanguageSelectElementTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/ProgrammaticTest.php b/core/modules/system/lib/Tests/Form/ProgrammaticTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Form/ProgrammaticTest.php
rename to core/modules/system/lib/Tests/Form/ProgrammaticTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/RebuildTest.php b/core/modules/system/lib/Tests/Form/RebuildTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Form/RebuildTest.php
rename to core/modules/system/lib/Tests/Form/RebuildTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/RedirectTest.php b/core/modules/system/lib/Tests/Form/RedirectTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Form/RedirectTest.php
rename to core/modules/system/lib/Tests/Form/RedirectTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/StateValuesCleanAdvancedTest.php b/core/modules/system/lib/Tests/Form/StateValuesCleanAdvancedTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Form/StateValuesCleanAdvancedTest.php
rename to core/modules/system/lib/Tests/Form/StateValuesCleanAdvancedTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/StateValuesCleanTest.php b/core/modules/system/lib/Tests/Form/StateValuesCleanTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Form/StateValuesCleanTest.php
rename to core/modules/system/lib/Tests/Form/StateValuesCleanTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/StorageTest.php b/core/modules/system/lib/Tests/Form/StorageTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Form/StorageTest.php
rename to core/modules/system/lib/Tests/Form/StorageTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/SystemConfigFormTest.php b/core/modules/system/lib/Tests/Form/SystemConfigFormTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Form/SystemConfigFormTest.php
rename to core/modules/system/lib/Tests/Form/SystemConfigFormTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/TriggeringElementTest.php b/core/modules/system/lib/Tests/Form/TriggeringElementTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Form/TriggeringElementTest.php
rename to core/modules/system/lib/Tests/Form/TriggeringElementTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/UrlTest.php b/core/modules/system/lib/Tests/Form/UrlTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Form/UrlTest.php
rename to core/modules/system/lib/Tests/Form/UrlTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/ValidationTest.php b/core/modules/system/lib/Tests/Form/ValidationTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Form/ValidationTest.php
rename to core/modules/system/lib/Tests/Form/ValidationTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/WrapperTest.php b/core/modules/system/lib/Tests/Form/WrapperTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Form/WrapperTest.php
rename to core/modules/system/lib/Tests/Form/WrapperTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Image/ToolkitGdTest.php b/core/modules/system/lib/Tests/Image/ToolkitGdTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Image/ToolkitGdTest.php
rename to core/modules/system/lib/Tests/Image/ToolkitGdTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Image/ToolkitTest.php b/core/modules/system/lib/Tests/Image/ToolkitTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Image/ToolkitTest.php
rename to core/modules/system/lib/Tests/Image/ToolkitTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Image/ToolkitTestBase.php b/core/modules/system/lib/Tests/Image/ToolkitTestBase.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Image/ToolkitTestBase.php
rename to core/modules/system/lib/Tests/Image/ToolkitTestBase.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Installer/InstallerLanguageTest.php b/core/modules/system/lib/Tests/Installer/InstallerLanguageTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Installer/InstallerLanguageTest.php
rename to core/modules/system/lib/Tests/Installer/InstallerLanguageTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Installer/InstallerTranslationTest.php b/core/modules/system/lib/Tests/Installer/InstallerTranslationTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Installer/InstallerTranslationTest.php
rename to core/modules/system/lib/Tests/Installer/InstallerTranslationTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Installer/SiteNameTest.php b/core/modules/system/lib/Tests/Installer/SiteNameTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Installer/SiteNameTest.php
rename to core/modules/system/lib/Tests/Installer/SiteNameTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/InstallerTest.php b/core/modules/system/lib/Tests/InstallerTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/InstallerTest.php
rename to core/modules/system/lib/Tests/InstallerTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageExpirableTest.php b/core/modules/system/lib/Tests/KeyValueStore/DatabaseStorageExpirableTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageExpirableTest.php
rename to core/modules/system/lib/Tests/KeyValueStore/DatabaseStorageExpirableTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageTest.php b/core/modules/system/lib/Tests/KeyValueStore/DatabaseStorageTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/KeyValueStore/DatabaseStorageTest.php
rename to core/modules/system/lib/Tests/KeyValueStore/DatabaseStorageTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/GarbageCollectionTest.php b/core/modules/system/lib/Tests/KeyValueStore/GarbageCollectionTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/KeyValueStore/GarbageCollectionTest.php
rename to core/modules/system/lib/Tests/KeyValueStore/GarbageCollectionTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/MemoryStorageTest.php b/core/modules/system/lib/Tests/KeyValueStore/MemoryStorageTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/KeyValueStore/MemoryStorageTest.php
rename to core/modules/system/lib/Tests/KeyValueStore/MemoryStorageTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/KeyValueStore/StorageTestBase.php b/core/modules/system/lib/Tests/KeyValueStore/StorageTestBase.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/KeyValueStore/StorageTestBase.php
rename to core/modules/system/lib/Tests/KeyValueStore/StorageTestBase.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Lock/LockFunctionalTest.php b/core/modules/system/lib/Tests/Lock/LockFunctionalTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Lock/LockFunctionalTest.php
rename to core/modules/system/lib/Tests/Lock/LockFunctionalTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Lock/LockUnitTest.php b/core/modules/system/lib/Tests/Lock/LockUnitTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Lock/LockUnitTest.php
rename to core/modules/system/lib/Tests/Lock/LockUnitTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Mail/HtmlToTextTest.php b/core/modules/system/lib/Tests/Mail/HtmlToTextTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Mail/HtmlToTextTest.php
rename to core/modules/system/lib/Tests/Mail/HtmlToTextTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Mail/MailTest.php b/core/modules/system/lib/Tests/Mail/MailTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Mail/MailTest.php
rename to core/modules/system/lib/Tests/Mail/MailTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Mail/WrapMailUnitTest.php b/core/modules/system/lib/Tests/Mail/WrapMailUnitTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Mail/WrapMailUnitTest.php
rename to core/modules/system/lib/Tests/Mail/WrapMailUnitTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php b/core/modules/system/lib/Tests/Menu/BreadcrumbTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php
rename to core/modules/system/lib/Tests/Menu/BreadcrumbTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/LinksTest.php b/core/modules/system/lib/Tests/Menu/LinksTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Menu/LinksTest.php
rename to core/modules/system/lib/Tests/Menu/LinksTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/LocalActionTest.php b/core/modules/system/lib/Tests/Menu/LocalActionTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Menu/LocalActionTest.php
rename to core/modules/system/lib/Tests/Menu/LocalActionTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/LocalTasksTest.php b/core/modules/system/lib/Tests/Menu/LocalTasksTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Menu/LocalTasksTest.php
rename to core/modules/system/lib/Tests/Menu/LocalTasksTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/MenuRouterTest.php b/core/modules/system/lib/Tests/Menu/MenuRouterTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Menu/MenuRouterTest.php
rename to core/modules/system/lib/Tests/Menu/MenuRouterTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/MenuTestBase.php b/core/modules/system/lib/Tests/Menu/MenuTestBase.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Menu/MenuTestBase.php
rename to core/modules/system/lib/Tests/Menu/MenuTestBase.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/MenuTranslateTest.php b/core/modules/system/lib/Tests/Menu/MenuTranslateTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Menu/MenuTranslateTest.php
rename to core/modules/system/lib/Tests/Menu/MenuTranslateTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/RebuildTest.php b/core/modules/system/lib/Tests/Menu/RebuildTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Menu/RebuildTest.php
rename to core/modules/system/lib/Tests/Menu/RebuildTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/TrailTest.php b/core/modules/system/lib/Tests/Menu/TrailTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Menu/TrailTest.php
rename to core/modules/system/lib/Tests/Menu/TrailTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/TreeAccessTest.php b/core/modules/system/lib/Tests/Menu/TreeAccessTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Menu/TreeAccessTest.php
rename to core/modules/system/lib/Tests/Menu/TreeAccessTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/TreeDataUnitTest.php b/core/modules/system/lib/Tests/Menu/TreeDataUnitTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Menu/TreeDataUnitTest.php
rename to core/modules/system/lib/Tests/Menu/TreeDataUnitTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/TreeOutputTest.php b/core/modules/system/lib/Tests/Menu/TreeOutputTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Menu/TreeOutputTest.php
rename to core/modules/system/lib/Tests/Menu/TreeOutputTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/ClassLoaderTest.php b/core/modules/system/lib/Tests/Module/ClassLoaderTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Module/ClassLoaderTest.php
rename to core/modules/system/lib/Tests/Module/ClassLoaderTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/DependencyTest.php b/core/modules/system/lib/Tests/Module/DependencyTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Module/DependencyTest.php
rename to core/modules/system/lib/Tests/Module/DependencyTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/EnableDisableTest.php b/core/modules/system/lib/Tests/Module/EnableDisableTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Module/EnableDisableTest.php
rename to core/modules/system/lib/Tests/Module/EnableDisableTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/HookRequirementsTest.php b/core/modules/system/lib/Tests/Module/HookRequirementsTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Module/HookRequirementsTest.php
rename to core/modules/system/lib/Tests/Module/HookRequirementsTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/InstallTest.php b/core/modules/system/lib/Tests/Module/InstallTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Module/InstallTest.php
rename to core/modules/system/lib/Tests/Module/InstallTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleApiTest.php b/core/modules/system/lib/Tests/Module/ModuleApiTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Module/ModuleApiTest.php
rename to core/modules/system/lib/Tests/Module/ModuleApiTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleEnableTest.php b/core/modules/system/lib/Tests/Module/ModuleEnableTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Module/ModuleEnableTest.php
rename to core/modules/system/lib/Tests/Module/ModuleEnableTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php b/core/modules/system/lib/Tests/Module/ModuleTestBase.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php
rename to core/modules/system/lib/Tests/Module/ModuleTestBase.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/RequiredTest.php b/core/modules/system/lib/Tests/Module/RequiredTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Module/RequiredTest.php
rename to core/modules/system/lib/Tests/Module/RequiredTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/UninstallTest.php b/core/modules/system/lib/Tests/Module/UninstallTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Module/UninstallTest.php
rename to core/modules/system/lib/Tests/Module/UninstallTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/VersionTest.php b/core/modules/system/lib/Tests/Module/VersionTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Module/VersionTest.php
rename to core/modules/system/lib/Tests/Module/VersionTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Pager/PagerTest.php b/core/modules/system/lib/Tests/Pager/PagerTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Pager/PagerTest.php
rename to core/modules/system/lib/Tests/Pager/PagerTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/ParamConverter/UpcastingTest.php b/core/modules/system/lib/Tests/ParamConverter/UpcastingTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/ParamConverter/UpcastingTest.php
rename to core/modules/system/lib/Tests/ParamConverter/UpcastingTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Path/AliasTest.php b/core/modules/system/lib/Tests/Path/AliasTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Path/AliasTest.php
rename to core/modules/system/lib/Tests/Path/AliasTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Path/MatchPathTest.php b/core/modules/system/lib/Tests/Path/MatchPathTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Path/MatchPathTest.php
rename to core/modules/system/lib/Tests/Path/MatchPathTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Path/PathUnitTestBase.php b/core/modules/system/lib/Tests/Path/PathUnitTestBase.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Path/PathUnitTestBase.php
rename to core/modules/system/lib/Tests/Path/PathUnitTestBase.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Path/UrlAliasFixtures.php b/core/modules/system/lib/Tests/Path/UrlAliasFixtures.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Path/UrlAliasFixtures.php
rename to core/modules/system/lib/Tests/Path/UrlAliasFixtures.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Path/UrlAlterFunctionalTest.php b/core/modules/system/lib/Tests/Path/UrlAlterFunctionalTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Path/UrlAlterFunctionalTest.php
rename to core/modules/system/lib/Tests/Path/UrlAlterFunctionalTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/AlterDecoratorTest.php b/core/modules/system/lib/Tests/Plugin/AlterDecoratorTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Plugin/AlterDecoratorTest.php
rename to core/modules/system/lib/Tests/Plugin/AlterDecoratorTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/CacheDecoratorLanguageTest.php b/core/modules/system/lib/Tests/Plugin/CacheDecoratorLanguageTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Plugin/CacheDecoratorLanguageTest.php
rename to core/modules/system/lib/Tests/Plugin/CacheDecoratorLanguageTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/CacheDecoratorTest.php b/core/modules/system/lib/Tests/Plugin/CacheDecoratorTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Plugin/CacheDecoratorTest.php
rename to core/modules/system/lib/Tests/Plugin/CacheDecoratorTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/ContextPluginTest.php b/core/modules/system/lib/Tests/Plugin/ContextPluginTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Plugin/ContextPluginTest.php
rename to core/modules/system/lib/Tests/Plugin/ContextPluginTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/DerivativeTest.php b/core/modules/system/lib/Tests/Plugin/DerivativeTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Plugin/DerivativeTest.php
rename to core/modules/system/lib/Tests/Plugin/DerivativeTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/AnnotatedClassDiscoveryTest.php b/core/modules/system/lib/Tests/Plugin/Discovery/AnnotatedClassDiscoveryTest.php
similarity index 84%
rename from core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/AnnotatedClassDiscoveryTest.php
rename to core/modules/system/lib/Tests/Plugin/Discovery/AnnotatedClassDiscoveryTest.php
index d2fba9b..52bd303 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/AnnotatedClassDiscoveryTest.php
+++ b/core/modules/system/lib/Tests/Plugin/Discovery/AnnotatedClassDiscoveryTest.php
@@ -57,7 +57,13 @@ public function setUp() {
         'provider' => 'plugin_test',
       ),
     );
-    $namespaces = new \ArrayObject(array('Drupal\plugin_test' => DRUPAL_ROOT . '/core/modules/system/tests/modules/plugin_test/lib'));
+    $namespaces = new \ArrayObject(array(
+      'Drupal\plugin_test' => array(
+        // @todo Remove lib/Drupal/$module, once the switch to PSR-4 is complete.
+        DRUPAL_ROOT . '/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test',
+        DRUPAL_ROOT . '/core/modules/system/tests/modules/plugin_test/lib',
+      ),
+    ));
     $this->discovery = new AnnotatedClassDiscovery('Plugin/plugin_test/fruit', $namespaces);
     $this->emptyDiscovery = new AnnotatedClassDiscovery('Plugin/non_existing_module/non_existing_plugin_type', $namespaces);
   }
diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/CustomAnnotationClassDiscoveryTest.php b/core/modules/system/lib/Tests/Plugin/Discovery/CustomAnnotationClassDiscoveryTest.php
similarity index 81%
rename from core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/CustomAnnotationClassDiscoveryTest.php
rename to core/modules/system/lib/Tests/Plugin/Discovery/CustomAnnotationClassDiscoveryTest.php
index d61c013..17bbfa5 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/CustomAnnotationClassDiscoveryTest.php
+++ b/core/modules/system/lib/Tests/Plugin/Discovery/CustomAnnotationClassDiscoveryTest.php
@@ -41,7 +41,13 @@ protected function setUp() {
         'provider' => 'plugin_test',
       ),
     );
-    $root_namespaces = new \ArrayObject(array('Drupal\plugin_test' => DRUPAL_ROOT . '/core/modules/system/tests/modules/plugin_test/lib'));
+    $root_namespaces = new \ArrayObject(array(
+      'Drupal\plugin_test' => array(
+        // @todo Remove lib/Drupal/$module, once the switch to PSR-4 is complete.
+        DRUPAL_ROOT . '/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test',
+        DRUPAL_ROOT . '/core/modules/system/tests/modules/plugin_test/lib',
+      ),
+    ));
 
     $this->discovery = new AnnotatedClassDiscovery('Plugin/plugin_test/custom_annotation', $root_namespaces, 'Drupal\plugin_test\Plugin\Annotation\PluginExample');
     $this->emptyDiscovery = new AnnotatedClassDiscovery('Plugin/non_existing_module/non_existing_plugin_type', $root_namespaces, 'Drupal\plugin_test\Plugin\Annotation\PluginExample');
diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/CustomDirectoryAnnotatedClassDiscoveryTest.php b/core/modules/system/lib/Tests/Plugin/Discovery/CustomDirectoryAnnotatedClassDiscoveryTest.php
similarity index 80%
rename from core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/CustomDirectoryAnnotatedClassDiscoveryTest.php
rename to core/modules/system/lib/Tests/Plugin/Discovery/CustomDirectoryAnnotatedClassDiscoveryTest.php
index c005300..b817c68 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/CustomDirectoryAnnotatedClassDiscoveryTest.php
+++ b/core/modules/system/lib/Tests/Plugin/Discovery/CustomDirectoryAnnotatedClassDiscoveryTest.php
@@ -39,7 +39,13 @@ protected function setUp() {
         'provider' => 'plugin_test',
       ),
     );
-    $namespaces = new \ArrayObject(array('Drupal\plugin_test' => DRUPAL_ROOT . '/core/modules/system/tests/modules/plugin_test/lib'));
+    $namespaces = new \ArrayObject(array(
+      'Drupal\plugin_test' => array(
+        // @todo Remove lib/Drupal/$module, once the switch to PSR-4 is complete.
+        DRUPAL_ROOT . '/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test',
+        DRUPAL_ROOT . '/core/modules/system/tests/modules/plugin_test/lib',
+      ),
+    ));
     $this->discovery = new AnnotatedClassDiscovery('', $namespaces);
     $empty_namespaces = new \ArrayObject();
     $this->emptyDiscovery = new AnnotatedClassDiscovery('', $empty_namespaces);
diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/DiscoveryTestBase.php b/core/modules/system/lib/Tests/Plugin/Discovery/DiscoveryTestBase.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/DiscoveryTestBase.php
rename to core/modules/system/lib/Tests/Plugin/Discovery/DiscoveryTestBase.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/StaticDiscoveryTest.php b/core/modules/system/lib/Tests/Plugin/Discovery/StaticDiscoveryTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Plugin/Discovery/StaticDiscoveryTest.php
rename to core/modules/system/lib/Tests/Plugin/Discovery/StaticDiscoveryTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/FactoryTest.php b/core/modules/system/lib/Tests/Plugin/FactoryTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Plugin/FactoryTest.php
rename to core/modules/system/lib/Tests/Plugin/FactoryTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/InspectionTest.php b/core/modules/system/lib/Tests/Plugin/InspectionTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Plugin/InspectionTest.php
rename to core/modules/system/lib/Tests/Plugin/InspectionTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/PluginBagTest.php b/core/modules/system/lib/Tests/Plugin/PluginBagTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Plugin/PluginBagTest.php
rename to core/modules/system/lib/Tests/Plugin/PluginBagTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Plugin/PluginTestBase.php b/core/modules/system/lib/Tests/Plugin/PluginTestBase.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Plugin/PluginTestBase.php
rename to core/modules/system/lib/Tests/Plugin/PluginTestBase.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Queue/QueueTest.php b/core/modules/system/lib/Tests/Queue/QueueTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Queue/QueueTest.php
rename to core/modules/system/lib/Tests/Queue/QueueTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/ControllerResolverTest.php b/core/modules/system/lib/Tests/Routing/ControllerResolverTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Routing/ControllerResolverTest.php
rename to core/modules/system/lib/Tests/Routing/ControllerResolverTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/MatcherDumperTest.php b/core/modules/system/lib/Tests/Routing/MatcherDumperTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Routing/MatcherDumperTest.php
rename to core/modules/system/lib/Tests/Routing/MatcherDumperTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/MimeTypeMatcherTest.php b/core/modules/system/lib/Tests/Routing/MimeTypeMatcherTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Routing/MimeTypeMatcherTest.php
rename to core/modules/system/lib/Tests/Routing/MimeTypeMatcherTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/MockAliasManager.php b/core/modules/system/lib/Tests/Routing/MockAliasManager.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Routing/MockAliasManager.php
rename to core/modules/system/lib/Tests/Routing/MockAliasManager.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/MockController.php b/core/modules/system/lib/Tests/Routing/MockController.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Routing/MockController.php
rename to core/modules/system/lib/Tests/Routing/MockController.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/MockMatcher.php b/core/modules/system/lib/Tests/Routing/MockMatcher.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Routing/MockMatcher.php
rename to core/modules/system/lib/Tests/Routing/MockMatcher.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/MockRouteProvider.php b/core/modules/system/lib/Tests/Routing/MockRouteProvider.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Routing/MockRouteProvider.php
rename to core/modules/system/lib/Tests/Routing/MockRouteProvider.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/RouteProviderTest.php b/core/modules/system/lib/Tests/Routing/RouteProviderTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Routing/RouteProviderTest.php
rename to core/modules/system/lib/Tests/Routing/RouteProviderTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/RouterPermissionTest.php b/core/modules/system/lib/Tests/Routing/RouterPermissionTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Routing/RouterPermissionTest.php
rename to core/modules/system/lib/Tests/Routing/RouterPermissionTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/RouterTest.php b/core/modules/system/lib/Tests/Routing/RouterTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Routing/RouterTest.php
rename to core/modules/system/lib/Tests/Routing/RouterTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/RoutingFixtures.php b/core/modules/system/lib/Tests/Routing/RoutingFixtures.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Routing/RoutingFixtures.php
rename to core/modules/system/lib/Tests/Routing/RoutingFixtures.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/ServiceProvider/ServiceProviderTest.php b/core/modules/system/lib/Tests/ServiceProvider/ServiceProviderTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/ServiceProvider/ServiceProviderTest.php
rename to core/modules/system/lib/Tests/ServiceProvider/ServiceProviderTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Session/SessionHttpsTest.php b/core/modules/system/lib/Tests/Session/SessionHttpsTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Session/SessionHttpsTest.php
rename to core/modules/system/lib/Tests/Session/SessionHttpsTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Session/SessionTest.php b/core/modules/system/lib/Tests/Session/SessionTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Session/SessionTest.php
rename to core/modules/system/lib/Tests/Session/SessionTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/AccessDeniedTest.php b/core/modules/system/lib/Tests/System/AccessDeniedTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/System/AccessDeniedTest.php
rename to core/modules/system/lib/Tests/System/AccessDeniedTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/AdminMetaTagTest.php b/core/modules/system/lib/Tests/System/AdminMetaTagTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/System/AdminMetaTagTest.php
rename to core/modules/system/lib/Tests/System/AdminMetaTagTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/AdminTest.php b/core/modules/system/lib/Tests/System/AdminTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/System/AdminTest.php
rename to core/modules/system/lib/Tests/System/AdminTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/CronRunTest.php b/core/modules/system/lib/Tests/System/CronRunTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/System/CronRunTest.php
rename to core/modules/system/lib/Tests/System/CronRunTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/DateFormatsLanguageTest.php b/core/modules/system/lib/Tests/System/DateFormatsLanguageTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/System/DateFormatsLanguageTest.php
rename to core/modules/system/lib/Tests/System/DateFormatsLanguageTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/DateFormatsLockedTest.php b/core/modules/system/lib/Tests/System/DateFormatsLockedTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/System/DateFormatsLockedTest.php
rename to core/modules/system/lib/Tests/System/DateFormatsLockedTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php b/core/modules/system/lib/Tests/System/DateTimeTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php
rename to core/modules/system/lib/Tests/System/DateTimeTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/DefaultMobileMetaTagsTest.php b/core/modules/system/lib/Tests/System/DefaultMobileMetaTagsTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/System/DefaultMobileMetaTagsTest.php
rename to core/modules/system/lib/Tests/System/DefaultMobileMetaTagsTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/ErrorHandlerTest.php b/core/modules/system/lib/Tests/System/ErrorHandlerTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/System/ErrorHandlerTest.php
rename to core/modules/system/lib/Tests/System/ErrorHandlerTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/ExceptionControllerTest.php b/core/modules/system/lib/Tests/System/ExceptionControllerTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/System/ExceptionControllerTest.php
rename to core/modules/system/lib/Tests/System/ExceptionControllerTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/FloodTest.php b/core/modules/system/lib/Tests/System/FloodTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/System/FloodTest.php
rename to core/modules/system/lib/Tests/System/FloodTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/FrontPageTest.php b/core/modules/system/lib/Tests/System/FrontPageTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/System/FrontPageTest.php
rename to core/modules/system/lib/Tests/System/FrontPageTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/IgnoreSlaveSubscriberTest.php b/core/modules/system/lib/Tests/System/IgnoreSlaveSubscriberTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/System/IgnoreSlaveSubscriberTest.php
rename to core/modules/system/lib/Tests/System/IgnoreSlaveSubscriberTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/IndexPhpTest.php b/core/modules/system/lib/Tests/System/IndexPhpTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/System/IndexPhpTest.php
rename to core/modules/system/lib/Tests/System/IndexPhpTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/InfoAlterTest.php b/core/modules/system/lib/Tests/System/InfoAlterTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/System/InfoAlterTest.php
rename to core/modules/system/lib/Tests/System/InfoAlterTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/MainContentFallbackTest.php b/core/modules/system/lib/Tests/System/MainContentFallbackTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/System/MainContentFallbackTest.php
rename to core/modules/system/lib/Tests/System/MainContentFallbackTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/PageNotFoundTest.php b/core/modules/system/lib/Tests/System/PageNotFoundTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/System/PageNotFoundTest.php
rename to core/modules/system/lib/Tests/System/PageNotFoundTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/PageTitleTest.php b/core/modules/system/lib/Tests/System/PageTitleTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/System/PageTitleTest.php
rename to core/modules/system/lib/Tests/System/PageTitleTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/PasswordHashingTest.php b/core/modules/system/lib/Tests/System/PasswordHashingTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/System/PasswordHashingTest.php
rename to core/modules/system/lib/Tests/System/PasswordHashingTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/RetrieveFileTest.php b/core/modules/system/lib/Tests/System/RetrieveFileTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/System/RetrieveFileTest.php
rename to core/modules/system/lib/Tests/System/RetrieveFileTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/SettingsRewriteTest.php b/core/modules/system/lib/Tests/System/SettingsRewriteTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/System/SettingsRewriteTest.php
rename to core/modules/system/lib/Tests/System/SettingsRewriteTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/ShutdownFunctionsTest.php b/core/modules/system/lib/Tests/System/ShutdownFunctionsTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/System/ShutdownFunctionsTest.php
rename to core/modules/system/lib/Tests/System/ShutdownFunctionsTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/SiteMaintenanceTest.php b/core/modules/system/lib/Tests/System/SiteMaintenanceTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/System/SiteMaintenanceTest.php
rename to core/modules/system/lib/Tests/System/SiteMaintenanceTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/SystemAuthorizeTest.php b/core/modules/system/lib/Tests/System/SystemAuthorizeTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/System/SystemAuthorizeTest.php
rename to core/modules/system/lib/Tests/System/SystemAuthorizeTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/SystemConfigFormTestBase.php b/core/modules/system/lib/Tests/System/SystemConfigFormTestBase.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/System/SystemConfigFormTestBase.php
rename to core/modules/system/lib/Tests/System/SystemConfigFormTestBase.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/ThemeTest.php b/core/modules/system/lib/Tests/System/ThemeTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/System/ThemeTest.php
rename to core/modules/system/lib/Tests/System/ThemeTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/TokenReplaceTest.php b/core/modules/system/lib/Tests/System/TokenReplaceTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/System/TokenReplaceTest.php
rename to core/modules/system/lib/Tests/System/TokenReplaceTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/TokenScanTest.php b/core/modules/system/lib/Tests/System/TokenScanTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/System/TokenScanTest.php
rename to core/modules/system/lib/Tests/System/TokenScanTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/EntityFilteringThemeTest.php b/core/modules/system/lib/Tests/Theme/EntityFilteringThemeTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Theme/EntityFilteringThemeTest.php
rename to core/modules/system/lib/Tests/Theme/EntityFilteringThemeTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/FastTest.php b/core/modules/system/lib/Tests/Theme/FastTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Theme/FastTest.php
rename to core/modules/system/lib/Tests/Theme/FastTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/FunctionsTest.php b/core/modules/system/lib/Tests/Theme/FunctionsTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Theme/FunctionsTest.php
rename to core/modules/system/lib/Tests/Theme/FunctionsTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/HtmlTplPhpAttributesTest.php b/core/modules/system/lib/Tests/Theme/HtmlTplPhpAttributesTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Theme/HtmlTplPhpAttributesTest.php
rename to core/modules/system/lib/Tests/Theme/HtmlTplPhpAttributesTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/RegistryTest.php b/core/modules/system/lib/Tests/Theme/RegistryTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Theme/RegistryTest.php
rename to core/modules/system/lib/Tests/Theme/RegistryTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/TableTest.php b/core/modules/system/lib/Tests/Theme/TableTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Theme/TableTest.php
rename to core/modules/system/lib/Tests/Theme/TableTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeEarlyInitializationTest.php b/core/modules/system/lib/Tests/Theme/ThemeEarlyInitializationTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Theme/ThemeEarlyInitializationTest.php
rename to core/modules/system/lib/Tests/Theme/ThemeEarlyInitializationTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeInfoStylesTest.php b/core/modules/system/lib/Tests/Theme/ThemeInfoStylesTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Theme/ThemeInfoStylesTest.php
rename to core/modules/system/lib/Tests/Theme/ThemeInfoStylesTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTest.php b/core/modules/system/lib/Tests/Theme/ThemeTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTest.php
rename to core/modules/system/lib/Tests/Theme/ThemeTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTestPhpTemplate.php b/core/modules/system/lib/Tests/Theme/ThemeTestPhpTemplate.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTestPhpTemplate.php
rename to core/modules/system/lib/Tests/Theme/ThemeTestPhpTemplate.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTestTwig.php b/core/modules/system/lib/Tests/Theme/ThemeTestTwig.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTestTwig.php
rename to core/modules/system/lib/Tests/Theme/ThemeTestTwig.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/TwigDebugMarkupTest.php b/core/modules/system/lib/Tests/Theme/TwigDebugMarkupTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Theme/TwigDebugMarkupTest.php
rename to core/modules/system/lib/Tests/Theme/TwigDebugMarkupTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/TwigExtensionTest.php b/core/modules/system/lib/Tests/Theme/TwigExtensionTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Theme/TwigExtensionTest.php
rename to core/modules/system/lib/Tests/Theme/TwigExtensionTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/TwigReferenceObjectTest.php b/core/modules/system/lib/Tests/Theme/TwigReferenceObjectTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Theme/TwigReferenceObjectTest.php
rename to core/modules/system/lib/Tests/Theme/TwigReferenceObjectTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/TwigReferenceUnitTest.php b/core/modules/system/lib/Tests/Theme/TwigReferenceUnitTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Theme/TwigReferenceUnitTest.php
rename to core/modules/system/lib/Tests/Theme/TwigReferenceUnitTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/TwigSettingsTest.php b/core/modules/system/lib/Tests/Theme/TwigSettingsTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Theme/TwigSettingsTest.php
rename to core/modules/system/lib/Tests/Theme/TwigSettingsTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/TwigTransTest.php b/core/modules/system/lib/Tests/Theme/TwigTransTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Theme/TwigTransTest.php
rename to core/modules/system/lib/Tests/Theme/TwigTransTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Transliteration/TransliterationTest.php b/core/modules/system/lib/Tests/Transliteration/TransliterationTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Transliteration/TransliterationTest.php
rename to core/modules/system/lib/Tests/Transliteration/TransliterationTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/TypedData/TypedDataTest.php b/core/modules/system/lib/Tests/TypedData/TypedDataTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/TypedData/TypedDataTest.php
rename to core/modules/system/lib/Tests/TypedData/TypedDataTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Update/DependencyHookInvocationTest.php b/core/modules/system/lib/Tests/Update/DependencyHookInvocationTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Update/DependencyHookInvocationTest.php
rename to core/modules/system/lib/Tests/Update/DependencyHookInvocationTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Update/DependencyMissingTest.php b/core/modules/system/lib/Tests/Update/DependencyMissingTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Update/DependencyMissingTest.php
rename to core/modules/system/lib/Tests/Update/DependencyMissingTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Update/DependencyOrderingTest.php b/core/modules/system/lib/Tests/Update/DependencyOrderingTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Update/DependencyOrderingTest.php
rename to core/modules/system/lib/Tests/Update/DependencyOrderingTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Update/UpdateScriptTest.php b/core/modules/system/lib/Tests/Update/UpdateScriptTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Update/UpdateScriptTest.php
rename to core/modules/system/lib/Tests/Update/UpdateScriptTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/ActionUpgradePathTest.php b/core/modules/system/lib/Tests/Upgrade/ActionUpgradePathTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/ActionUpgradePathTest.php
rename to core/modules/system/lib/Tests/Upgrade/ActionUpgradePathTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/BareMinimalAnonymousUpgradePathTest.php b/core/modules/system/lib/Tests/Upgrade/BareMinimalAnonymousUpgradePathTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/BareMinimalAnonymousUpgradePathTest.php
rename to core/modules/system/lib/Tests/Upgrade/BareMinimalAnonymousUpgradePathTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/BareMinimalNoConfigUpgradePathTest.php b/core/modules/system/lib/Tests/Upgrade/BareMinimalNoConfigUpgradePathTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/BareMinimalNoConfigUpgradePathTest.php
rename to core/modules/system/lib/Tests/Upgrade/BareMinimalNoConfigUpgradePathTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/BareMinimalUpgradePathTest.php b/core/modules/system/lib/Tests/Upgrade/BareMinimalUpgradePathTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/BareMinimalUpgradePathTest.php
rename to core/modules/system/lib/Tests/Upgrade/BareMinimalUpgradePathTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/BareStandardUpgradePathTest.php b/core/modules/system/lib/Tests/Upgrade/BareStandardUpgradePathTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/BareStandardUpgradePathTest.php
rename to core/modules/system/lib/Tests/Upgrade/BareStandardUpgradePathTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/BlockUpgradePathTest.php b/core/modules/system/lib/Tests/Upgrade/BlockUpgradePathTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/BlockUpgradePathTest.php
rename to core/modules/system/lib/Tests/Upgrade/BlockUpgradePathTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/DateUpgradePathTest.php b/core/modules/system/lib/Tests/Upgrade/DateUpgradePathTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/DateUpgradePathTest.php
rename to core/modules/system/lib/Tests/Upgrade/DateUpgradePathTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/ExistingModuleNameLengthUpgradePathTest.php b/core/modules/system/lib/Tests/Upgrade/ExistingModuleNameLengthUpgradePathTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/ExistingModuleNameLengthUpgradePathTest.php
rename to core/modules/system/lib/Tests/Upgrade/ExistingModuleNameLengthUpgradePathTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUIUpgradePathTest.php b/core/modules/system/lib/Tests/Upgrade/FieldUIUpgradePathTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUIUpgradePathTest.php
rename to core/modules/system/lib/Tests/Upgrade/FieldUIUpgradePathTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUpgradePathTest.php b/core/modules/system/lib/Tests/Upgrade/FieldUpgradePathTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUpgradePathTest.php
rename to core/modules/system/lib/Tests/Upgrade/FieldUpgradePathTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/FilledMinimalUpgradePathTest.php b/core/modules/system/lib/Tests/Upgrade/FilledMinimalUpgradePathTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/FilledMinimalUpgradePathTest.php
rename to core/modules/system/lib/Tests/Upgrade/FilledMinimalUpgradePathTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/FilledStandardUpgradePathTest.php b/core/modules/system/lib/Tests/Upgrade/FilledStandardUpgradePathTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/FilledStandardUpgradePathTest.php
rename to core/modules/system/lib/Tests/Upgrade/FilledStandardUpgradePathTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/FilterFormatUpgradePathTest.php b/core/modules/system/lib/Tests/Upgrade/FilterFormatUpgradePathTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/FilterFormatUpgradePathTest.php
rename to core/modules/system/lib/Tests/Upgrade/FilterFormatUpgradePathTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/ForumUpgradePathTest.php b/core/modules/system/lib/Tests/Upgrade/ForumUpgradePathTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/ForumUpgradePathTest.php
rename to core/modules/system/lib/Tests/Upgrade/ForumUpgradePathTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/ImageUpgradePathTest.php b/core/modules/system/lib/Tests/Upgrade/ImageUpgradePathTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/ImageUpgradePathTest.php
rename to core/modules/system/lib/Tests/Upgrade/ImageUpgradePathTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/LanguageUpgradePathTest.php b/core/modules/system/lib/Tests/Upgrade/LanguageUpgradePathTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/LanguageUpgradePathTest.php
rename to core/modules/system/lib/Tests/Upgrade/LanguageUpgradePathTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/MailUpgradePathTest.php b/core/modules/system/lib/Tests/Upgrade/MailUpgradePathTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/MailUpgradePathTest.php
rename to core/modules/system/lib/Tests/Upgrade/MailUpgradePathTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/ModuleNameLengthUpgradePathTest.php b/core/modules/system/lib/Tests/Upgrade/ModuleNameLengthUpgradePathTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/ModuleNameLengthUpgradePathTest.php
rename to core/modules/system/lib/Tests/Upgrade/ModuleNameLengthUpgradePathTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/ModulesDisabledUpgradePathTest.php b/core/modules/system/lib/Tests/Upgrade/ModulesDisabledUpgradePathTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/ModulesDisabledUpgradePathTest.php
rename to core/modules/system/lib/Tests/Upgrade/ModulesDisabledUpgradePathTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/ShortcutUpgradePathTest.php b/core/modules/system/lib/Tests/Upgrade/ShortcutUpgradePathTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/ShortcutUpgradePathTest.php
rename to core/modules/system/lib/Tests/Upgrade/ShortcutUpgradePathTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/StateSystemUpgradePathTest.php b/core/modules/system/lib/Tests/Upgrade/StateSystemUpgradePathTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/StateSystemUpgradePathTest.php
rename to core/modules/system/lib/Tests/Upgrade/StateSystemUpgradePathTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/SystemUpgradePathTest.php b/core/modules/system/lib/Tests/Upgrade/SystemUpgradePathTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/SystemUpgradePathTest.php
rename to core/modules/system/lib/Tests/Upgrade/SystemUpgradePathTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php b/core/modules/system/lib/Tests/Upgrade/UpgradePathTestBase.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php
rename to core/modules/system/lib/Tests/Upgrade/UpgradePathTestBase.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UserPermissionUpgradePathTest.php b/core/modules/system/lib/Tests/Upgrade/UserPermissionUpgradePathTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/UserPermissionUpgradePathTest.php
rename to core/modules/system/lib/Tests/Upgrade/UserPermissionUpgradePathTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UserPictureUpgradePathTest.php b/core/modules/system/lib/Tests/Upgrade/UserPictureUpgradePathTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/UserPictureUpgradePathTest.php
rename to core/modules/system/lib/Tests/Upgrade/UserPictureUpgradePathTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UserRoleUpgradePathTest.php b/core/modules/system/lib/Tests/Upgrade/UserRoleUpgradePathTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/UserRoleUpgradePathTest.php
rename to core/modules/system/lib/Tests/Upgrade/UserRoleUpgradePathTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UuidUpgradePathTest.php b/core/modules/system/lib/Tests/Upgrade/UuidUpgradePathTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Upgrade/UuidUpgradePathTest.php
rename to core/modules/system/lib/Tests/Upgrade/UuidUpgradePathTest.php
diff --git a/core/modules/system/lib/Drupal/system/Tests/Uuid/UuidUnitTest.php b/core/modules/system/lib/Tests/Uuid/UuidUnitTest.php
similarity index 100%
rename from core/modules/system/lib/Drupal/system/Tests/Uuid/UuidUnitTest.php
rename to core/modules/system/lib/Tests/Uuid/UuidUnitTest.php
diff --git a/core/modules/system/tests/http.php b/core/modules/system/tests/http.php
index 662031f..10f4e20 100644
--- a/core/modules/system/tests/http.php
+++ b/core/modules/system/tests/http.php
@@ -18,6 +18,6 @@
 
 // Change current directory to the Drupal root.
 chdir('../../../..');
-require_once dirname(dirname(dirname(__DIR__))) . '/vendor/autoload.php';
+require_once dirname(dirname(dirname(__DIR__))) . '/autoload.php';
 require_once dirname(dirname(dirname(__DIR__))) . '/includes/bootstrap.inc';
 drupal_handle_request(TRUE);
diff --git a/core/modules/system/tests/https.php b/core/modules/system/tests/https.php
index 247e6e5..54c8afa 100644
--- a/core/modules/system/tests/https.php
+++ b/core/modules/system/tests/https.php
@@ -20,6 +20,6 @@
 
 // Change current directory to the Drupal root.
 chdir('../../../..');
-require_once dirname(dirname(dirname(__DIR__))) . '/vendor/autoload.php';
+require_once dirname(dirname(dirname(__DIR__))) . '/autoload.php';
 require_once dirname(dirname(dirname(__DIR__))) . '/includes/bootstrap.inc';
 drupal_handle_request(TRUE);
diff --git a/core/modules/system/tests/Drupal/system/Tests/Transliteration/MachineNameControllerTest.php b/core/modules/system/tests/lib/Transliteration/MachineNameControllerTest.php
similarity index 100%
rename from core/modules/system/tests/Drupal/system/Tests/Transliteration/MachineNameControllerTest.php
rename to core/modules/system/tests/lib/Transliteration/MachineNameControllerTest.php
diff --git a/core/modules/system/tests/modules/action_test/lib/Drupal/action_test/Plugin/Action/NoType.php b/core/modules/system/tests/modules/action_test/lib/Plugin/Action/NoType.php
similarity index 100%
rename from core/modules/system/tests/modules/action_test/lib/Drupal/action_test/Plugin/Action/NoType.php
rename to core/modules/system/tests/modules/action_test/lib/Plugin/Action/NoType.php
diff --git a/core/modules/system/tests/modules/action_test/lib/Drupal/action_test/Plugin/Action/SaveEntity.php b/core/modules/system/tests/modules/action_test/lib/Plugin/Action/SaveEntity.php
similarity index 100%
rename from core/modules/system/tests/modules/action_test/lib/Drupal/action_test/Plugin/Action/SaveEntity.php
rename to core/modules/system/tests/modules/action_test/lib/Plugin/Action/SaveEntity.php
diff --git a/core/modules/system/tests/modules/ajax_forms_test/lib/Drupal/ajax_forms_test/Callbacks.php b/core/modules/system/tests/modules/ajax_forms_test/lib/Callbacks.php
similarity index 100%
rename from core/modules/system/tests/modules/ajax_forms_test/lib/Drupal/ajax_forms_test/Callbacks.php
rename to core/modules/system/tests/modules/ajax_forms_test/lib/Callbacks.php
diff --git a/core/modules/system/tests/modules/ajax_test/lib/Drupal/ajax_test/AjaxTestController.php b/core/modules/system/tests/modules/ajax_test/lib/AjaxTestController.php
similarity index 100%
rename from core/modules/system/tests/modules/ajax_test/lib/Drupal/ajax_test/AjaxTestController.php
rename to core/modules/system/tests/modules/ajax_test/lib/AjaxTestController.php
diff --git a/core/modules/system/tests/modules/ajax_test/lib/Drupal/ajax_test/AjaxTestForm.php b/core/modules/system/tests/modules/ajax_test/lib/AjaxTestForm.php
similarity index 100%
rename from core/modules/system/tests/modules/ajax_test/lib/Drupal/ajax_test/AjaxTestForm.php
rename to core/modules/system/tests/modules/ajax_test/lib/AjaxTestForm.php
diff --git a/core/modules/system/tests/modules/common_test/lib/Drupal/common_test/Controller/CommonTestController.php b/core/modules/system/tests/modules/common_test/lib/Controller/CommonTestController.php
similarity index 100%
rename from core/modules/system/tests/modules/common_test/lib/Drupal/common_test/Controller/CommonTestController.php
rename to core/modules/system/tests/modules/common_test/lib/Controller/CommonTestController.php
diff --git a/core/modules/system/tests/modules/condition_test/lib/Drupal/condition_test/FormController.php b/core/modules/system/tests/modules/condition_test/lib/FormController.php
similarity index 100%
rename from core/modules/system/tests/modules/condition_test/lib/Drupal/condition_test/FormController.php
rename to core/modules/system/tests/modules/condition_test/lib/FormController.php
diff --git a/core/modules/system/tests/modules/design_test/lib/Drupal/design_test/Controller/DesignTestController.php b/core/modules/system/tests/modules/design_test/lib/Controller/DesignTestController.php
similarity index 100%
rename from core/modules/system/tests/modules/design_test/lib/Drupal/design_test/Controller/DesignTestController.php
rename to core/modules/system/tests/modules/design_test/lib/Controller/DesignTestController.php
diff --git a/core/modules/system/tests/modules/entity_cache_test_dependency/lib/Drupal/entity_cache_test_dependency/Entity/EntityCacheTest.php b/core/modules/system/tests/modules/entity_cache_test_dependency/lib/Entity/EntityCacheTest.php
similarity index 100%
rename from core/modules/system/tests/modules/entity_cache_test_dependency/lib/Drupal/entity_cache_test_dependency/Entity/EntityCacheTest.php
rename to core/modules/system/tests/modules/entity_cache_test_dependency/lib/Entity/EntityCacheTest.php
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTest.php b/core/modules/system/tests/modules/entity_test/lib/Entity/EntityTest.php
similarity index 100%
rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTest.php
rename to core/modules/system/tests/modules/entity_test/lib/Entity/EntityTest.php
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestCache.php b/core/modules/system/tests/modules/entity_test/lib/Entity/EntityTestCache.php
similarity index 100%
rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestCache.php
rename to core/modules/system/tests/modules/entity_test/lib/Entity/EntityTestCache.php
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestDefaultAccess.php b/core/modules/system/tests/modules/entity_test/lib/Entity/EntityTestDefaultAccess.php
similarity index 100%
rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestDefaultAccess.php
rename to core/modules/system/tests/modules/entity_test/lib/Entity/EntityTestDefaultAccess.php
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabel.php b/core/modules/system/tests/modules/entity_test/lib/Entity/EntityTestLabel.php
similarity index 100%
rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabel.php
rename to core/modules/system/tests/modules/entity_test/lib/Entity/EntityTestLabel.php
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabelCallback.php b/core/modules/system/tests/modules/entity_test/lib/Entity/EntityTestLabelCallback.php
similarity index 100%
rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabelCallback.php
rename to core/modules/system/tests/modules/entity_test/lib/Entity/EntityTestLabelCallback.php
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMul.php b/core/modules/system/tests/modules/entity_test/lib/Entity/EntityTestMul.php
similarity index 100%
rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMul.php
rename to core/modules/system/tests/modules/entity_test/lib/Entity/EntityTestMul.php
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMulRev.php b/core/modules/system/tests/modules/entity_test/lib/Entity/EntityTestMulRev.php
similarity index 100%
rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMulRev.php
rename to core/modules/system/tests/modules/entity_test/lib/Entity/EntityTestMulRev.php
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestNoLabel.php b/core/modules/system/tests/modules/entity_test/lib/Entity/EntityTestNoLabel.php
similarity index 100%
rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestNoLabel.php
rename to core/modules/system/tests/modules/entity_test/lib/Entity/EntityTestNoLabel.php
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRender.php b/core/modules/system/tests/modules/entity_test/lib/Entity/EntityTestRender.php
similarity index 100%
rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRender.php
rename to core/modules/system/tests/modules/entity_test/lib/Entity/EntityTestRender.php
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRev.php b/core/modules/system/tests/modules/entity_test/lib/Entity/EntityTestRev.php
similarity index 100%
rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRev.php
rename to core/modules/system/tests/modules/entity_test/lib/Entity/EntityTestRev.php
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestAccessController.php b/core/modules/system/tests/modules/entity_test/lib/EntityTestAccessController.php
similarity index 100%
rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestAccessController.php
rename to core/modules/system/tests/modules/entity_test/lib/EntityTestAccessController.php
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestFormController.php b/core/modules/system/tests/modules/entity_test/lib/EntityTestFormController.php
similarity index 100%
rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestFormController.php
rename to core/modules/system/tests/modules/entity_test/lib/EntityTestFormController.php
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestListController.php b/core/modules/system/tests/modules/entity_test/lib/EntityTestListController.php
similarity index 100%
rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestListController.php
rename to core/modules/system/tests/modules/entity_test/lib/EntityTestListController.php
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestRenderController.php b/core/modules/system/tests/modules/entity_test/lib/EntityTestRenderController.php
similarity index 100%
rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestRenderController.php
rename to core/modules/system/tests/modules/entity_test/lib/EntityTestRenderController.php
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestStorageController.php b/core/modules/system/tests/modules/entity_test/lib/EntityTestStorageController.php
similarity index 100%
rename from core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestStorageController.php
rename to core/modules/system/tests/modules/entity_test/lib/EntityTestStorageController.php
diff --git a/core/modules/system/tests/modules/error_test/lib/Drupal/error_test/Controller/ErrorTestController.php b/core/modules/system/tests/modules/error_test/lib/Controller/ErrorTestController.php
similarity index 100%
rename from core/modules/system/tests/modules/error_test/lib/Drupal/error_test/Controller/ErrorTestController.php
rename to core/modules/system/tests/modules/error_test/lib/Controller/ErrorTestController.php
diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/AutocompleteController.php b/core/modules/system/tests/modules/form_test/lib/AutocompleteController.php
similarity index 100%
rename from core/modules/system/tests/modules/form_test/lib/Drupal/form_test/AutocompleteController.php
rename to core/modules/system/tests/modules/form_test/lib/AutocompleteController.php
diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/Callbacks.php b/core/modules/system/tests/modules/form_test/lib/Callbacks.php
similarity index 100%
rename from core/modules/system/tests/modules/form_test/lib/Drupal/form_test/Callbacks.php
rename to core/modules/system/tests/modules/form_test/lib/Callbacks.php
diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/ConfirmFormArrayPathTestForm.php b/core/modules/system/tests/modules/form_test/lib/ConfirmFormArrayPathTestForm.php
similarity index 100%
rename from core/modules/system/tests/modules/form_test/lib/Drupal/form_test/ConfirmFormArrayPathTestForm.php
rename to core/modules/system/tests/modules/form_test/lib/ConfirmFormArrayPathTestForm.php
diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/ConfirmFormTestForm.php b/core/modules/system/tests/modules/form_test/lib/ConfirmFormTestForm.php
similarity index 100%
rename from core/modules/system/tests/modules/form_test/lib/Drupal/form_test/ConfirmFormTestForm.php
rename to core/modules/system/tests/modules/form_test/lib/ConfirmFormTestForm.php
diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/EventSubscriber/FormTestEventSubscriber.php b/core/modules/system/tests/modules/form_test/lib/EventSubscriber/FormTestEventSubscriber.php
similarity index 100%
rename from core/modules/system/tests/modules/form_test/lib/Drupal/form_test/EventSubscriber/FormTestEventSubscriber.php
rename to core/modules/system/tests/modules/form_test/lib/EventSubscriber/FormTestEventSubscriber.php
diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/FormTestArgumentsObject.php b/core/modules/system/tests/modules/form_test/lib/FormTestArgumentsObject.php
similarity index 100%
rename from core/modules/system/tests/modules/form_test/lib/Drupal/form_test/FormTestArgumentsObject.php
rename to core/modules/system/tests/modules/form_test/lib/FormTestArgumentsObject.php
diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/FormTestAutocompleteForm.php b/core/modules/system/tests/modules/form_test/lib/FormTestAutocompleteForm.php
similarity index 100%
rename from core/modules/system/tests/modules/form_test/lib/Drupal/form_test/FormTestAutocompleteForm.php
rename to core/modules/system/tests/modules/form_test/lib/FormTestAutocompleteForm.php
diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/FormTestControllerObject.php b/core/modules/system/tests/modules/form_test/lib/FormTestControllerObject.php
similarity index 100%
rename from core/modules/system/tests/modules/form_test/lib/Drupal/form_test/FormTestControllerObject.php
rename to core/modules/system/tests/modules/form_test/lib/FormTestControllerObject.php
diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/FormTestObject.php b/core/modules/system/tests/modules/form_test/lib/FormTestObject.php
similarity index 100%
rename from core/modules/system/tests/modules/form_test/lib/Drupal/form_test/FormTestObject.php
rename to core/modules/system/tests/modules/form_test/lib/FormTestObject.php
diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/FormTestServiceObject.php b/core/modules/system/tests/modules/form_test/lib/FormTestServiceObject.php
similarity index 100%
rename from core/modules/system/tests/modules/form_test/lib/Drupal/form_test/FormTestServiceObject.php
rename to core/modules/system/tests/modules/form_test/lib/FormTestServiceObject.php
diff --git a/core/modules/system/tests/modules/form_test/lib/Drupal/form_test/SystemConfigFormTestForm.php b/core/modules/system/tests/modules/form_test/lib/SystemConfigFormTestForm.php
similarity index 100%
rename from core/modules/system/tests/modules/form_test/lib/Drupal/form_test/SystemConfigFormTestForm.php
rename to core/modules/system/tests/modules/form_test/lib/SystemConfigFormTestForm.php
diff --git a/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkit/BrokenToolkit.php b/core/modules/system/tests/modules/image_test/lib/Plugin/ImageToolkit/BrokenToolkit.php
similarity index 100%
rename from core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkit/BrokenToolkit.php
rename to core/modules/system/tests/modules/image_test/lib/Plugin/ImageToolkit/BrokenToolkit.php
diff --git a/core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkit/TestToolkit.php b/core/modules/system/tests/modules/image_test/lib/Plugin/ImageToolkit/TestToolkit.php
similarity index 100%
rename from core/modules/system/tests/modules/image_test/lib/Drupal/image_test/Plugin/ImageToolkit/TestToolkit.php
rename to core/modules/system/tests/modules/image_test/lib/Plugin/ImageToolkit/TestToolkit.php
diff --git a/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/EventSubscriber/MaintenanceModeSubscriber.php b/core/modules/system/tests/modules/menu_test/lib/EventSubscriber/MaintenanceModeSubscriber.php
similarity index 100%
rename from core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/EventSubscriber/MaintenanceModeSubscriber.php
rename to core/modules/system/tests/modules/menu_test/lib/EventSubscriber/MaintenanceModeSubscriber.php
diff --git a/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Plugin/Menu/LocalAction/MenuTestLocalAction.php b/core/modules/system/tests/modules/menu_test/lib/Plugin/Menu/LocalAction/MenuTestLocalAction.php
similarity index 100%
rename from core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Plugin/Menu/LocalAction/MenuTestLocalAction.php
rename to core/modules/system/tests/modules/menu_test/lib/Plugin/Menu/LocalAction/MenuTestLocalAction.php
diff --git a/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Plugin/Menu/LocalTask/TestTasksSettingsSub1.php b/core/modules/system/tests/modules/menu_test/lib/Plugin/Menu/LocalTask/TestTasksSettingsSub1.php
similarity index 100%
rename from core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Plugin/Menu/LocalTask/TestTasksSettingsSub1.php
rename to core/modules/system/tests/modules/menu_test/lib/Plugin/Menu/LocalTask/TestTasksSettingsSub1.php
diff --git a/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/TestControllers.php b/core/modules/system/tests/modules/menu_test/lib/TestControllers.php
similarity index 100%
rename from core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/TestControllers.php
rename to core/modules/system/tests/modules/menu_test/lib/TestControllers.php
diff --git a/core/modules/system/tests/modules/paramconverter_test/lib/Drupal/paramconverter_test/TestControllers.php b/core/modules/system/tests/modules/paramconverter_test/lib/TestControllers.php
similarity index 100%
rename from core/modules/system/tests/modules/paramconverter_test/lib/Drupal/paramconverter_test/TestControllers.php
rename to core/modules/system/tests/modules/paramconverter_test/lib/TestControllers.php
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/CustomDirectoryExample1.php b/core/modules/system/tests/modules/plugin_test/lib/CustomDirectoryExample1.php
similarity index 100%
rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/CustomDirectoryExample1.php
rename to core/modules/system/tests/modules/plugin_test/lib/CustomDirectoryExample1.php
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/CustomDirectoryExample2.php b/core/modules/system/tests/modules/plugin_test/lib/CustomDirectoryExample2.php
similarity index 100%
rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/CustomDirectoryExample2.php
rename to core/modules/system/tests/modules/plugin_test/lib/CustomDirectoryExample2.php
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/AlterDecoratorTestPluginManager.php b/core/modules/system/tests/modules/plugin_test/lib/Plugin/AlterDecoratorTestPluginManager.php
similarity index 100%
rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/AlterDecoratorTestPluginManager.php
rename to core/modules/system/tests/modules/plugin_test/lib/Plugin/AlterDecoratorTestPluginManager.php
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/Annotation/PluginExample.php b/core/modules/system/tests/modules/plugin_test/lib/Plugin/Annotation/PluginExample.php
similarity index 100%
rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/Annotation/PluginExample.php
rename to core/modules/system/tests/modules/plugin_test/lib/Plugin/Annotation/PluginExample.php
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/CachedMockBlockManager.php b/core/modules/system/tests/modules/plugin_test/lib/Plugin/CachedMockBlockManager.php
similarity index 100%
rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/CachedMockBlockManager.php
rename to core/modules/system/tests/modules/plugin_test/lib/Plugin/CachedMockBlockManager.php
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/DefaultsTestPluginManager.php b/core/modules/system/tests/modules/plugin_test/lib/Plugin/DefaultsTestPluginManager.php
similarity index 100%
rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/DefaultsTestPluginManager.php
rename to core/modules/system/tests/modules/plugin_test/lib/Plugin/DefaultsTestPluginManager.php
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/MockBlockManager.php b/core/modules/system/tests/modules/plugin_test/lib/Plugin/MockBlockManager.php
similarity index 100%
rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/MockBlockManager.php
rename to core/modules/system/tests/modules/plugin_test/lib/Plugin/MockBlockManager.php
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/TestPluginBag.php b/core/modules/system/tests/modules/plugin_test/lib/Plugin/TestPluginBag.php
similarity index 100%
rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/TestPluginBag.php
rename to core/modules/system/tests/modules/plugin_test/lib/Plugin/TestPluginBag.php
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/TestPluginManager.php b/core/modules/system/tests/modules/plugin_test/lib/Plugin/TestPluginManager.php
similarity index 100%
rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/TestPluginManager.php
rename to core/modules/system/tests/modules/plugin_test/lib/Plugin/TestPluginManager.php
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/custom_annotation/Example1.php b/core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/custom_annotation/Example1.php
similarity index 100%
rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/custom_annotation/Example1.php
rename to core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/custom_annotation/Example1.php
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/custom_annotation/Example2.php b/core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/custom_annotation/Example2.php
similarity index 100%
rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/custom_annotation/Example2.php
rename to core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/custom_annotation/Example2.php
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Apple.php b/core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/fruit/Apple.php
similarity index 100%
rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Apple.php
rename to core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/fruit/Apple.php
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Banana.php b/core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/fruit/Banana.php
similarity index 100%
rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Banana.php
rename to core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/fruit/Banana.php
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Cherry.php b/core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/fruit/Cherry.php
similarity index 100%
rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Cherry.php
rename to core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/fruit/Cherry.php
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/NonAnnotatedClass.php b/core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/fruit/NonAnnotatedClass.php
similarity index 100%
rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/NonAnnotatedClass.php
rename to core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/fruit/NonAnnotatedClass.php
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Orange.php b/core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/fruit/Orange.php
similarity index 100%
rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Orange.php
rename to core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/fruit/Orange.php
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/README.txt b/core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/fruit/README.txt
similarity index 100%
rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/README.txt
rename to core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/fruit/README.txt
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockComplexContextBlock.php b/core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/mock_block/MockComplexContextBlock.php
similarity index 100%
rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockComplexContextBlock.php
rename to core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/mock_block/MockComplexContextBlock.php
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockLayoutBlock.php b/core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/mock_block/MockLayoutBlock.php
similarity index 100%
rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockLayoutBlock.php
rename to core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/mock_block/MockLayoutBlock.php
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockLayoutBlockDeriver.php b/core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/mock_block/MockLayoutBlockDeriver.php
similarity index 100%
rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockLayoutBlockDeriver.php
rename to core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/mock_block/MockLayoutBlockDeriver.php
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockMenuBlock.php b/core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/mock_block/MockMenuBlock.php
similarity index 100%
rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockMenuBlock.php
rename to core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/mock_block/MockMenuBlock.php
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockMenuBlockDeriver.php b/core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/mock_block/MockMenuBlockDeriver.php
similarity index 100%
rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockMenuBlockDeriver.php
rename to core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/mock_block/MockMenuBlockDeriver.php
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockTestBlock.php b/core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/mock_block/MockTestBlock.php
similarity index 100%
rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockTestBlock.php
rename to core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/mock_block/MockTestBlock.php
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockUserLoginBlock.php b/core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/mock_block/MockUserLoginBlock.php
similarity index 100%
rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockUserLoginBlock.php
rename to core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/mock_block/MockUserLoginBlock.php
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockUserNameBlock.php b/core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/mock_block/MockUserNameBlock.php
similarity index 100%
rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/MockUserNameBlock.php
rename to core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/mock_block/MockUserNameBlock.php
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/TypedDataStringBlock.php b/core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/mock_block/TypedDataStringBlock.php
similarity index 100%
rename from core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/mock_block/TypedDataStringBlock.php
rename to core/modules/system/tests/modules/plugin_test/lib/Plugin/plugin_test/mock_block/TypedDataStringBlock.php
diff --git a/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/Access/DefinedTestAccessCheck.php b/core/modules/system/tests/modules/router_test/lib/Access/DefinedTestAccessCheck.php
similarity index 100%
rename from core/modules/system/tests/modules/router_test/lib/Drupal/router_test/Access/DefinedTestAccessCheck.php
rename to core/modules/system/tests/modules/router_test/lib/Access/DefinedTestAccessCheck.php
diff --git a/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/Access/TestAccessCheck.php b/core/modules/system/tests/modules/router_test/lib/Access/TestAccessCheck.php
similarity index 100%
rename from core/modules/system/tests/modules/router_test/lib/Drupal/router_test/Access/TestAccessCheck.php
rename to core/modules/system/tests/modules/router_test/lib/Access/TestAccessCheck.php
diff --git a/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/RouteTestSubscriber.php b/core/modules/system/tests/modules/router_test/lib/RouteTestSubscriber.php
similarity index 100%
rename from core/modules/system/tests/modules/router_test/lib/Drupal/router_test/RouteTestSubscriber.php
rename to core/modules/system/tests/modules/router_test/lib/RouteTestSubscriber.php
diff --git a/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/RouterTestServiceProvider.php b/core/modules/system/tests/modules/router_test/lib/RouterTestServiceProvider.php
similarity index 100%
rename from core/modules/system/tests/modules/router_test/lib/Drupal/router_test/RouterTestServiceProvider.php
rename to core/modules/system/tests/modules/router_test/lib/RouterTestServiceProvider.php
diff --git a/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/TestContent.php b/core/modules/system/tests/modules/router_test/lib/TestContent.php
similarity index 100%
rename from core/modules/system/tests/modules/router_test/lib/Drupal/router_test/TestContent.php
rename to core/modules/system/tests/modules/router_test/lib/TestContent.php
diff --git a/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/TestControllers.php b/core/modules/system/tests/modules/router_test/lib/TestControllers.php
similarity index 100%
rename from core/modules/system/tests/modules/router_test/lib/Drupal/router_test/TestControllers.php
rename to core/modules/system/tests/modules/router_test/lib/TestControllers.php
diff --git a/core/modules/system/tests/modules/service_provider_test/lib/Drupal/service_provider_test/ServiceProviderTestServiceProvider.php b/core/modules/system/tests/modules/service_provider_test/lib/ServiceProviderTestServiceProvider.php
similarity index 100%
rename from core/modules/system/tests/modules/service_provider_test/lib/Drupal/service_provider_test/ServiceProviderTestServiceProvider.php
rename to core/modules/system/tests/modules/service_provider_test/lib/ServiceProviderTestServiceProvider.php
diff --git a/core/modules/system/tests/modules/service_provider_test/lib/Drupal/service_provider_test/TestClass.php b/core/modules/system/tests/modules/service_provider_test/lib/TestClass.php
similarity index 100%
rename from core/modules/system/tests/modules/service_provider_test/lib/Drupal/service_provider_test/TestClass.php
rename to core/modules/system/tests/modules/service_provider_test/lib/TestClass.php
diff --git a/core/modules/system/tests/modules/service_provider_test/lib/Drupal/service_provider_test/TestFileUsage.php b/core/modules/system/tests/modules/service_provider_test/lib/TestFileUsage.php
similarity index 100%
rename from core/modules/system/tests/modules/service_provider_test/lib/Drupal/service_provider_test/TestFileUsage.php
rename to core/modules/system/tests/modules/service_provider_test/lib/TestFileUsage.php
diff --git a/core/modules/system/tests/modules/session_test/lib/Drupal/session_test/EventSubscriber/SessionTestSubscriber.php b/core/modules/system/tests/modules/session_test/lib/EventSubscriber/SessionTestSubscriber.php
similarity index 100%
rename from core/modules/system/tests/modules/session_test/lib/Drupal/session_test/EventSubscriber/SessionTestSubscriber.php
rename to core/modules/system/tests/modules/session_test/lib/EventSubscriber/SessionTestSubscriber.php
diff --git a/core/modules/system/tests/modules/system_mail_failure_test/lib/Drupal/system_mail_failure_test/TestPhpMailFailure.php b/core/modules/system/tests/modules/system_mail_failure_test/lib/TestPhpMailFailure.php
similarity index 100%
rename from core/modules/system/tests/modules/system_mail_failure_test/lib/Drupal/system_mail_failure_test/TestPhpMailFailure.php
rename to core/modules/system/tests/modules/system_mail_failure_test/lib/TestPhpMailFailure.php
diff --git a/core/modules/system/tests/modules/system_test/lib/Drupal/system_test/Controller/PageCacheAcceptHeaderController.php b/core/modules/system/tests/modules/system_test/lib/Controller/PageCacheAcceptHeaderController.php
similarity index 100%
rename from core/modules/system/tests/modules/system_test/lib/Drupal/system_test/Controller/PageCacheAcceptHeaderController.php
rename to core/modules/system/tests/modules/system_test/lib/Controller/PageCacheAcceptHeaderController.php
diff --git a/core/modules/system/tests/modules/system_test/lib/Drupal/system_test/MockFileTransfer.php b/core/modules/system/tests/modules/system_test/lib/MockFileTransfer.php
similarity index 100%
rename from core/modules/system/tests/modules/system_test/lib/Drupal/system_test/MockFileTransfer.php
rename to core/modules/system/tests/modules/system_test/lib/MockFileTransfer.php
diff --git a/core/modules/system/tests/modules/test_page_test/lib/Drupal/test_page_test/Controller/Test.php b/core/modules/system/tests/modules/test_page_test/lib/Controller/Test.php
similarity index 100%
rename from core/modules/system/tests/modules/test_page_test/lib/Drupal/test_page_test/Controller/Test.php
rename to core/modules/system/tests/modules/test_page_test/lib/Controller/Test.php
diff --git a/core/modules/system/tests/modules/theme_test/lib/Drupal/theme_test/EventSubscriber/ThemeTestSubscriber.php b/core/modules/system/tests/modules/theme_test/lib/EventSubscriber/ThemeTestSubscriber.php
similarity index 100%
rename from core/modules/system/tests/modules/theme_test/lib/Drupal/theme_test/EventSubscriber/ThemeTestSubscriber.php
rename to core/modules/system/tests/modules/theme_test/lib/EventSubscriber/ThemeTestSubscriber.php
diff --git a/core/modules/system/tests/modules/theme_test/lib/Drupal/theme_test/ThemeTestController.php b/core/modules/system/tests/modules/theme_test/lib/ThemeTestController.php
similarity index 100%
rename from core/modules/system/tests/modules/theme_test/lib/Drupal/theme_test/ThemeTestController.php
rename to core/modules/system/tests/modules/theme_test/lib/ThemeTestController.php
diff --git a/core/modules/system/tests/modules/twig_extension_test/lib/Drupal/twig_extension_test/TwigExtension/TestExtension.php b/core/modules/system/tests/modules/twig_extension_test/lib/TwigExtension/TestExtension.php
similarity index 100%
rename from core/modules/system/tests/modules/twig_extension_test/lib/Drupal/twig_extension_test/TwigExtension/TestExtension.php
rename to core/modules/system/tests/modules/twig_extension_test/lib/TwigExtension/TestExtension.php
diff --git a/core/modules/system/tests/modules/twig_extension_test/lib/Drupal/twig_extension_test/TwigExtensionTestController.php b/core/modules/system/tests/modules/twig_extension_test/lib/TwigExtensionTestController.php
similarity index 100%
rename from core/modules/system/tests/modules/twig_extension_test/lib/Drupal/twig_extension_test/TwigExtensionTestController.php
rename to core/modules/system/tests/modules/twig_extension_test/lib/TwigExtensionTestController.php
diff --git a/core/modules/system/tests/modules/twig_theme_test/lib/Drupal/twig_theme_test/TwigThemeTestController.php b/core/modules/system/tests/modules/twig_theme_test/lib/TwigThemeTestController.php
similarity index 100%
rename from core/modules/system/tests/modules/twig_theme_test/lib/Drupal/twig_theme_test/TwigThemeTestController.php
rename to core/modules/system/tests/modules/twig_theme_test/lib/TwigThemeTestController.php
diff --git a/core/modules/system/tests/modules/url_alter_test/lib/Drupal/url_alter_test/Controller/URLAlterTestController.php b/core/modules/system/tests/modules/url_alter_test/lib/Controller/URLAlterTestController.php
similarity index 100%
rename from core/modules/system/tests/modules/url_alter_test/lib/Drupal/url_alter_test/Controller/URLAlterTestController.php
rename to core/modules/system/tests/modules/url_alter_test/lib/Controller/URLAlterTestController.php
diff --git a/core/modules/system/tests/modules/url_alter_test/lib/Drupal/url_alter_test/PathProcessor.php b/core/modules/system/tests/modules/url_alter_test/lib/PathProcessor.php
similarity index 100%
rename from core/modules/system/tests/modules/url_alter_test/lib/Drupal/url_alter_test/PathProcessor.php
rename to core/modules/system/tests/modules/url_alter_test/lib/PathProcessor.php
diff --git a/core/modules/system/tests/modules/url_alter_test/lib/Drupal/url_alter_test/PathProcessorTest.php b/core/modules/system/tests/modules/url_alter_test/lib/PathProcessorTest.php
similarity index 100%
rename from core/modules/system/tests/modules/url_alter_test/lib/Drupal/url_alter_test/PathProcessorTest.php
rename to core/modules/system/tests/modules/url_alter_test/lib/PathProcessorTest.php
diff --git a/core/modules/system/tests/themes/test_theme/lib/Drupal/test_theme/ThemeClass.php b/core/modules/system/tests/themes/test_theme/lib/ThemeClass.php
similarity index 100%
rename from core/modules/system/tests/themes/test_theme/lib/Drupal/test_theme/ThemeClass.php
rename to core/modules/system/tests/themes/test_theme/lib/ThemeClass.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Controller/TaxonomyController.php b/core/modules/taxonomy/lib/Controller/TaxonomyController.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Controller/TaxonomyController.php
rename to core/modules/taxonomy/lib/Controller/TaxonomyController.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Controller/TermAutocompleteController.php b/core/modules/taxonomy/lib/Controller/TermAutocompleteController.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Controller/TermAutocompleteController.php
rename to core/modules/taxonomy/lib/Controller/TermAutocompleteController.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php b/core/modules/taxonomy/lib/Entity/Term.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php
rename to core/modules/taxonomy/lib/Entity/Term.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php b/core/modules/taxonomy/lib/Entity/Vocabulary.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php
rename to core/modules/taxonomy/lib/Entity/Vocabulary.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php b/core/modules/taxonomy/lib/Form/OverviewTerms.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php
rename to core/modules/taxonomy/lib/Form/OverviewTerms.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/TermDeleteForm.php b/core/modules/taxonomy/lib/Form/TermDeleteForm.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Form/TermDeleteForm.php
rename to core/modules/taxonomy/lib/Form/TermDeleteForm.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/VocabularyDeleteForm.php b/core/modules/taxonomy/lib/Form/VocabularyDeleteForm.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Form/VocabularyDeleteForm.php
rename to core/modules/taxonomy/lib/Form/VocabularyDeleteForm.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/VocabularyResetForm.php b/core/modules/taxonomy/lib/Form/VocabularyResetForm.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Form/VocabularyResetForm.php
rename to core/modules/taxonomy/lib/Form/VocabularyResetForm.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/entity_reference/selection/TermSelection.php b/core/modules/taxonomy/lib/Plugin/entity_reference/selection/TermSelection.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/entity_reference/selection/TermSelection.php
rename to core/modules/taxonomy/lib/Plugin/entity_reference/selection/TermSelection.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/EntityReferenceTaxonomyTermRssFormatter.php b/core/modules/taxonomy/lib/Plugin/field/formatter/EntityReferenceTaxonomyTermRssFormatter.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/EntityReferenceTaxonomyTermRssFormatter.php
rename to core/modules/taxonomy/lib/Plugin/field/formatter/EntityReferenceTaxonomyTermRssFormatter.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/LinkFormatter.php b/core/modules/taxonomy/lib/Plugin/field/formatter/LinkFormatter.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/LinkFormatter.php
rename to core/modules/taxonomy/lib/Plugin/field/formatter/LinkFormatter.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/PlainFormatter.php b/core/modules/taxonomy/lib/Plugin/field/formatter/PlainFormatter.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/PlainFormatter.php
rename to core/modules/taxonomy/lib/Plugin/field/formatter/PlainFormatter.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/RSSCategoryFormatter.php b/core/modules/taxonomy/lib/Plugin/field/formatter/RSSCategoryFormatter.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/RSSCategoryFormatter.php
rename to core/modules/taxonomy/lib/Plugin/field/formatter/RSSCategoryFormatter.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/TaxonomyFormatterBase.php b/core/modules/taxonomy/lib/Plugin/field/formatter/TaxonomyFormatterBase.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/formatter/TaxonomyFormatterBase.php
rename to core/modules/taxonomy/lib/Plugin/field/formatter/TaxonomyFormatterBase.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/widget/TaxonomyAutocompleteWidget.php b/core/modules/taxonomy/lib/Plugin/field/widget/TaxonomyAutocompleteWidget.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/widget/TaxonomyAutocompleteWidget.php
rename to core/modules/taxonomy/lib/Plugin/field/widget/TaxonomyAutocompleteWidget.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTid.php b/core/modules/taxonomy/lib/Plugin/views/argument/IndexTid.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTid.php
rename to core/modules/taxonomy/lib/Plugin/views/argument/IndexTid.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepth.php b/core/modules/taxonomy/lib/Plugin/views/argument/IndexTidDepth.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepth.php
rename to core/modules/taxonomy/lib/Plugin/views/argument/IndexTidDepth.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php b/core/modules/taxonomy/lib/Plugin/views/argument/IndexTidDepthModifier.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php
rename to core/modules/taxonomy/lib/Plugin/views/argument/IndexTidDepthModifier.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/Taxonomy.php b/core/modules/taxonomy/lib/Plugin/views/argument/Taxonomy.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/Taxonomy.php
rename to core/modules/taxonomy/lib/Plugin/views/argument/Taxonomy.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyVid.php b/core/modules/taxonomy/lib/Plugin/views/argument/VocabularyVid.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyVid.php
rename to core/modules/taxonomy/lib/Plugin/views/argument/VocabularyVid.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_default/Tid.php b/core/modules/taxonomy/lib/Plugin/views/argument_default/Tid.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_default/Tid.php
rename to core/modules/taxonomy/lib/Plugin/views/argument_default/Tid.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_validator/Term.php b/core/modules/taxonomy/lib/Plugin/views/argument_validator/Term.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_validator/Term.php
rename to core/modules/taxonomy/lib/Plugin/views/argument_validator/Term.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Language.php b/core/modules/taxonomy/lib/Plugin/views/field/Language.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Language.php
rename to core/modules/taxonomy/lib/Plugin/views/field/Language.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/LinkEdit.php b/core/modules/taxonomy/lib/Plugin/views/field/LinkEdit.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/LinkEdit.php
rename to core/modules/taxonomy/lib/Plugin/views/field/LinkEdit.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php b/core/modules/taxonomy/lib/Plugin/views/field/Taxonomy.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php
rename to core/modules/taxonomy/lib/Plugin/views/field/Taxonomy.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php b/core/modules/taxonomy/lib/Plugin/views/field/TaxonomyIndexTid.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php
rename to core/modules/taxonomy/lib/Plugin/views/field/TaxonomyIndexTid.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php b/core/modules/taxonomy/lib/Plugin/views/filter/TaxonomyIndexTid.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php
rename to core/modules/taxonomy/lib/Plugin/views/filter/TaxonomyIndexTid.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php b/core/modules/taxonomy/lib/Plugin/views/filter/TaxonomyIndexTidDepth.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php
rename to core/modules/taxonomy/lib/Plugin/views/filter/TaxonomyIndexTidDepth.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/relationship/NodeTermData.php b/core/modules/taxonomy/lib/Plugin/views/relationship/NodeTermData.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/relationship/NodeTermData.php
rename to core/modules/taxonomy/lib/Plugin/views/relationship/NodeTermData.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/wizard/TaxonomyTerm.php b/core/modules/taxonomy/lib/Plugin/views/wizard/TaxonomyTerm.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/wizard/TaxonomyTerm.php
rename to core/modules/taxonomy/lib/Plugin/views/wizard/TaxonomyTerm.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/TermAccessController.php b/core/modules/taxonomy/lib/TermAccessController.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/TermAccessController.php
rename to core/modules/taxonomy/lib/TermAccessController.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php b/core/modules/taxonomy/lib/TermFormController.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php
rename to core/modules/taxonomy/lib/TermFormController.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/TermInterface.php b/core/modules/taxonomy/lib/TermInterface.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/TermInterface.php
rename to core/modules/taxonomy/lib/TermInterface.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/TermRenderController.php b/core/modules/taxonomy/lib/TermRenderController.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/TermRenderController.php
rename to core/modules/taxonomy/lib/TermRenderController.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/TermStorageController.php b/core/modules/taxonomy/lib/TermStorageController.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/TermStorageController.php
rename to core/modules/taxonomy/lib/TermStorageController.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/TermStorageControllerInterface.php b/core/modules/taxonomy/lib/TermStorageControllerInterface.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/TermStorageControllerInterface.php
rename to core/modules/taxonomy/lib/TermStorageControllerInterface.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/TermTranslationController.php b/core/modules/taxonomy/lib/TermTranslationController.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/TermTranslationController.php
rename to core/modules/taxonomy/lib/TermTranslationController.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/EfqTest.php b/core/modules/taxonomy/lib/Tests/EfqTest.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/EfqTest.php
rename to core/modules/taxonomy/lib/Tests/EfqTest.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/LegacyTest.php b/core/modules/taxonomy/lib/Tests/LegacyTest.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/LegacyTest.php
rename to core/modules/taxonomy/lib/Tests/LegacyTest.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/LoadMultipleTest.php b/core/modules/taxonomy/lib/Tests/LoadMultipleTest.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/LoadMultipleTest.php
rename to core/modules/taxonomy/lib/Tests/LoadMultipleTest.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/RssTest.php b/core/modules/taxonomy/lib/Tests/RssTest.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/RssTest.php
rename to core/modules/taxonomy/lib/Tests/RssTest.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TaxonomyTermIndentationTest.php b/core/modules/taxonomy/lib/Tests/TaxonomyTermIndentationTest.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TaxonomyTermIndentationTest.php
rename to core/modules/taxonomy/lib/Tests/TaxonomyTermIndentationTest.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TaxonomyTermReferenceItemTest.php b/core/modules/taxonomy/lib/Tests/TaxonomyTermReferenceItemTest.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TaxonomyTermReferenceItemTest.php
rename to core/modules/taxonomy/lib/Tests/TaxonomyTermReferenceItemTest.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TaxonomyTestBase.php b/core/modules/taxonomy/lib/Tests/TaxonomyTestBase.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TaxonomyTestBase.php
rename to core/modules/taxonomy/lib/Tests/TaxonomyTestBase.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermFieldMultipleVocabularyTest.php b/core/modules/taxonomy/lib/Tests/TermFieldMultipleVocabularyTest.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermFieldMultipleVocabularyTest.php
rename to core/modules/taxonomy/lib/Tests/TermFieldMultipleVocabularyTest.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermFieldTest.php b/core/modules/taxonomy/lib/Tests/TermFieldTest.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermFieldTest.php
rename to core/modules/taxonomy/lib/Tests/TermFieldTest.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermIndexTest.php b/core/modules/taxonomy/lib/Tests/TermIndexTest.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermIndexTest.php
rename to core/modules/taxonomy/lib/Tests/TermIndexTest.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermLanguageTest.php b/core/modules/taxonomy/lib/Tests/TermLanguageTest.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermLanguageTest.php
rename to core/modules/taxonomy/lib/Tests/TermLanguageTest.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTest.php b/core/modules/taxonomy/lib/Tests/TermTest.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTest.php
rename to core/modules/taxonomy/lib/Tests/TermTest.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTranslationUITest.php b/core/modules/taxonomy/lib/Tests/TermTranslationUITest.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTranslationUITest.php
rename to core/modules/taxonomy/lib/Tests/TermTranslationUITest.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermUnitTest.php b/core/modules/taxonomy/lib/Tests/TermUnitTest.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermUnitTest.php
rename to core/modules/taxonomy/lib/Tests/TermUnitTest.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/ThemeTest.php b/core/modules/taxonomy/lib/Tests/ThemeTest.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/ThemeTest.php
rename to core/modules/taxonomy/lib/Tests/ThemeTest.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TokenReplaceTest.php b/core/modules/taxonomy/lib/Tests/TokenReplaceTest.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TokenReplaceTest.php
rename to core/modules/taxonomy/lib/Tests/TokenReplaceTest.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipNodeTermDataTest.php b/core/modules/taxonomy/lib/Tests/Views/RelationshipNodeTermDataTest.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipNodeTermDataTest.php
rename to core/modules/taxonomy/lib/Tests/Views/RelationshipNodeTermDataTest.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipRepresentativeNode.php b/core/modules/taxonomy/lib/Tests/Views/RelationshipRepresentativeNode.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/RelationshipRepresentativeNode.php
rename to core/modules/taxonomy/lib/Tests/Views/RelationshipRepresentativeNode.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/TaxonomyIndexTidUiTest.php b/core/modules/taxonomy/lib/Tests/Views/TaxonomyIndexTidUiTest.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/TaxonomyIndexTidUiTest.php
rename to core/modules/taxonomy/lib/Tests/Views/TaxonomyIndexTidUiTest.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/TaxonomyTestBase.php b/core/modules/taxonomy/lib/Tests/Views/TaxonomyTestBase.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/TaxonomyTestBase.php
rename to core/modules/taxonomy/lib/Tests/Views/TaxonomyTestBase.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyLanguageTest.php b/core/modules/taxonomy/lib/Tests/VocabularyLanguageTest.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyLanguageTest.php
rename to core/modules/taxonomy/lib/Tests/VocabularyLanguageTest.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyPermissionsTest.php b/core/modules/taxonomy/lib/Tests/VocabularyPermissionsTest.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyPermissionsTest.php
rename to core/modules/taxonomy/lib/Tests/VocabularyPermissionsTest.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyTest.php b/core/modules/taxonomy/lib/Tests/VocabularyTest.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyTest.php
rename to core/modules/taxonomy/lib/Tests/VocabularyTest.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyUnitTest.php b/core/modules/taxonomy/lib/Tests/VocabularyUnitTest.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyUnitTest.php
rename to core/modules/taxonomy/lib/Tests/VocabularyUnitTest.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Type/TaxonomyTermReferenceItem.php b/core/modules/taxonomy/lib/Type/TaxonomyTermReferenceItem.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Type/TaxonomyTermReferenceItem.php
rename to core/modules/taxonomy/lib/Type/TaxonomyTermReferenceItem.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyAccessController.php b/core/modules/taxonomy/lib/VocabularyAccessController.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyAccessController.php
rename to core/modules/taxonomy/lib/VocabularyAccessController.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php b/core/modules/taxonomy/lib/VocabularyFormController.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php
rename to core/modules/taxonomy/lib/VocabularyFormController.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyInterface.php b/core/modules/taxonomy/lib/VocabularyInterface.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyInterface.php
rename to core/modules/taxonomy/lib/VocabularyInterface.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyListController.php b/core/modules/taxonomy/lib/VocabularyListController.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyListController.php
rename to core/modules/taxonomy/lib/VocabularyListController.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyStorageController.php b/core/modules/taxonomy/lib/VocabularyStorageController.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyStorageController.php
rename to core/modules/taxonomy/lib/VocabularyStorageController.php
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyStorageControllerInterface.php b/core/modules/taxonomy/lib/VocabularyStorageControllerInterface.php
similarity index 100%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyStorageControllerInterface.php
rename to core/modules/taxonomy/lib/VocabularyStorageControllerInterface.php
diff --git a/core/modules/taxonomy/taxonomy.install b/core/modules/taxonomy/taxonomy.install
index 7648ba0..a4494e2 100644
--- a/core/modules/taxonomy/taxonomy.install
+++ b/core/modules/taxonomy/taxonomy.install
@@ -14,7 +14,11 @@
  */
 function taxonomy_uninstall() {
   Drupal::entityManager()->addNamespaces(new ArrayIterator(array(
-    'Drupal\taxonomy' => DRUPAL_ROOT . '/core/modules/taxonomy/lib',
+    'Drupal\taxonomy' => array(
+      // @todo Remove lib/Drupal/$module, once the switch to PSR-4 is complete.
+      DRUPAL_ROOT . '/core/modules/taxonomy/lib/Drupal/taxonomy',
+      DRUPAL_ROOT . '/core/modules/taxonomy/lib',
+    ),
   )));
   drupal_classloader_register('taxonomy', 'core/modules/taxonomy');
   // Remove taxonomy_term bundles.
diff --git a/core/modules/telephone/lib/Drupal/telephone/Plugin/field/field_type/TelephoneItem.php b/core/modules/telephone/lib/Plugin/field/field_type/TelephoneItem.php
similarity index 100%
rename from core/modules/telephone/lib/Drupal/telephone/Plugin/field/field_type/TelephoneItem.php
rename to core/modules/telephone/lib/Plugin/field/field_type/TelephoneItem.php
diff --git a/core/modules/telephone/lib/Drupal/telephone/Plugin/field/formatter/TelephoneLinkFormatter.php b/core/modules/telephone/lib/Plugin/field/formatter/TelephoneLinkFormatter.php
similarity index 100%
rename from core/modules/telephone/lib/Drupal/telephone/Plugin/field/formatter/TelephoneLinkFormatter.php
rename to core/modules/telephone/lib/Plugin/field/formatter/TelephoneLinkFormatter.php
diff --git a/core/modules/telephone/lib/Drupal/telephone/Plugin/field/widget/TelephoneDefaultWidget.php b/core/modules/telephone/lib/Plugin/field/widget/TelephoneDefaultWidget.php
similarity index 100%
rename from core/modules/telephone/lib/Drupal/telephone/Plugin/field/widget/TelephoneDefaultWidget.php
rename to core/modules/telephone/lib/Plugin/field/widget/TelephoneDefaultWidget.php
diff --git a/core/modules/telephone/lib/Drupal/telephone/Tests/TelephoneFieldTest.php b/core/modules/telephone/lib/Tests/TelephoneFieldTest.php
similarity index 100%
rename from core/modules/telephone/lib/Drupal/telephone/Tests/TelephoneFieldTest.php
rename to core/modules/telephone/lib/Tests/TelephoneFieldTest.php
diff --git a/core/modules/telephone/lib/Drupal/telephone/Tests/TelephoneItemTest.php b/core/modules/telephone/lib/Tests/TelephoneItemTest.php
similarity index 100%
rename from core/modules/telephone/lib/Drupal/telephone/Tests/TelephoneItemTest.php
rename to core/modules/telephone/lib/Tests/TelephoneItemTest.php
diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextItem.php b/core/modules/text/lib/Plugin/field/field_type/TextItem.php
similarity index 100%
rename from core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextItem.php
rename to core/modules/text/lib/Plugin/field/field_type/TextItem.php
diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextItemBase.php b/core/modules/text/lib/Plugin/field/field_type/TextItemBase.php
similarity index 100%
rename from core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextItemBase.php
rename to core/modules/text/lib/Plugin/field/field_type/TextItemBase.php
diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextLongItem.php b/core/modules/text/lib/Plugin/field/field_type/TextLongItem.php
similarity index 100%
rename from core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextLongItem.php
rename to core/modules/text/lib/Plugin/field/field_type/TextLongItem.php
diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextWithSummaryItem.php b/core/modules/text/lib/Plugin/field/field_type/TextWithSummaryItem.php
similarity index 100%
rename from core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextWithSummaryItem.php
rename to core/modules/text/lib/Plugin/field/field_type/TextWithSummaryItem.php
diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextDefaultFormatter.php b/core/modules/text/lib/Plugin/field/formatter/TextDefaultFormatter.php
similarity index 100%
rename from core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextDefaultFormatter.php
rename to core/modules/text/lib/Plugin/field/formatter/TextDefaultFormatter.php
diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextPlainFormatter.php b/core/modules/text/lib/Plugin/field/formatter/TextPlainFormatter.php
similarity index 100%
rename from core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextPlainFormatter.php
rename to core/modules/text/lib/Plugin/field/formatter/TextPlainFormatter.php
diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextSummaryOrTrimmedFormatter.php b/core/modules/text/lib/Plugin/field/formatter/TextSummaryOrTrimmedFormatter.php
similarity index 100%
rename from core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextSummaryOrTrimmedFormatter.php
rename to core/modules/text/lib/Plugin/field/formatter/TextSummaryOrTrimmedFormatter.php
diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextTrimmedFormatter.php b/core/modules/text/lib/Plugin/field/formatter/TextTrimmedFormatter.php
similarity index 100%
rename from core/modules/text/lib/Drupal/text/Plugin/field/formatter/TextTrimmedFormatter.php
rename to core/modules/text/lib/Plugin/field/formatter/TextTrimmedFormatter.php
diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWidget.php b/core/modules/text/lib/Plugin/field/widget/TextareaWidget.php
similarity index 100%
rename from core/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWidget.php
rename to core/modules/text/lib/Plugin/field/widget/TextareaWidget.php
diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWithSummaryWidget.php b/core/modules/text/lib/Plugin/field/widget/TextareaWithSummaryWidget.php
similarity index 100%
rename from core/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWithSummaryWidget.php
rename to core/modules/text/lib/Plugin/field/widget/TextareaWithSummaryWidget.php
diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/widget/TextfieldWidget.php b/core/modules/text/lib/Plugin/field/widget/TextfieldWidget.php
similarity index 100%
rename from core/modules/text/lib/Drupal/text/Plugin/field/widget/TextfieldWidget.php
rename to core/modules/text/lib/Plugin/field/widget/TextfieldWidget.php
diff --git a/core/modules/text/lib/Drupal/text/Tests/Formatter/TextPlainUnitTest.php b/core/modules/text/lib/Tests/Formatter/TextPlainUnitTest.php
similarity index 100%
rename from core/modules/text/lib/Drupal/text/Tests/Formatter/TextPlainUnitTest.php
rename to core/modules/text/lib/Tests/Formatter/TextPlainUnitTest.php
diff --git a/core/modules/text/lib/Drupal/text/Tests/TextFieldTest.php b/core/modules/text/lib/Tests/TextFieldTest.php
similarity index 100%
rename from core/modules/text/lib/Drupal/text/Tests/TextFieldTest.php
rename to core/modules/text/lib/Tests/TextFieldTest.php
diff --git a/core/modules/text/lib/Drupal/text/Tests/TextSummaryTest.php b/core/modules/text/lib/Tests/TextSummaryTest.php
similarity index 100%
rename from core/modules/text/lib/Drupal/text/Tests/TextSummaryTest.php
rename to core/modules/text/lib/Tests/TextSummaryTest.php
diff --git a/core/modules/text/lib/Drupal/text/Tests/TextWithSummaryItemTest.php b/core/modules/text/lib/Tests/TextWithSummaryItemTest.php
similarity index 100%
rename from core/modules/text/lib/Drupal/text/Tests/TextWithSummaryItemTest.php
rename to core/modules/text/lib/Tests/TextWithSummaryItemTest.php
diff --git a/core/modules/text/lib/Drupal/text/TextProcessed.php b/core/modules/text/lib/TextProcessed.php
similarity index 100%
rename from core/modules/text/lib/Drupal/text/TextProcessed.php
rename to core/modules/text/lib/TextProcessed.php
diff --git a/core/modules/toolbar/lib/Drupal/toolbar/Access/SubtreeAccess.php b/core/modules/toolbar/lib/Access/SubtreeAccess.php
similarity index 100%
rename from core/modules/toolbar/lib/Drupal/toolbar/Access/SubtreeAccess.php
rename to core/modules/toolbar/lib/Access/SubtreeAccess.php
diff --git a/core/modules/toolbar/lib/Drupal/toolbar/Routing/ToolbarController.php b/core/modules/toolbar/lib/Routing/ToolbarController.php
similarity index 100%
rename from core/modules/toolbar/lib/Drupal/toolbar/Routing/ToolbarController.php
rename to core/modules/toolbar/lib/Routing/ToolbarController.php
diff --git a/core/modules/toolbar/lib/Drupal/toolbar/Tests/ToolbarHookToolbarTest.php b/core/modules/toolbar/lib/Tests/ToolbarHookToolbarTest.php
similarity index 100%
rename from core/modules/toolbar/lib/Drupal/toolbar/Tests/ToolbarHookToolbarTest.php
rename to core/modules/toolbar/lib/Tests/ToolbarHookToolbarTest.php
diff --git a/core/modules/toolbar/lib/Drupal/toolbar/Tests/ToolbarMenuTranslationTest.php b/core/modules/toolbar/lib/Tests/ToolbarMenuTranslationTest.php
similarity index 100%
rename from core/modules/toolbar/lib/Drupal/toolbar/Tests/ToolbarMenuTranslationTest.php
rename to core/modules/toolbar/lib/Tests/ToolbarMenuTranslationTest.php
diff --git a/core/modules/tour/lib/Drupal/tour/Annotation/Tip.php b/core/modules/tour/lib/Annotation/Tip.php
similarity index 100%
rename from core/modules/tour/lib/Drupal/tour/Annotation/Tip.php
rename to core/modules/tour/lib/Annotation/Tip.php
diff --git a/core/modules/tour/lib/Drupal/tour/Entity/Tour.php b/core/modules/tour/lib/Entity/Tour.php
similarity index 100%
rename from core/modules/tour/lib/Drupal/tour/Entity/Tour.php
rename to core/modules/tour/lib/Entity/Tour.php
diff --git a/core/modules/tour/lib/Drupal/tour/Plugin/tour/tip/TipPluginText.php b/core/modules/tour/lib/Plugin/tour/tip/TipPluginText.php
similarity index 100%
rename from core/modules/tour/lib/Drupal/tour/Plugin/tour/tip/TipPluginText.php
rename to core/modules/tour/lib/Plugin/tour/tip/TipPluginText.php
diff --git a/core/modules/tour/lib/Drupal/tour/Tests/TourPluginTest.php b/core/modules/tour/lib/Tests/TourPluginTest.php
similarity index 100%
rename from core/modules/tour/lib/Drupal/tour/Tests/TourPluginTest.php
rename to core/modules/tour/lib/Tests/TourPluginTest.php
diff --git a/core/modules/tour/lib/Drupal/tour/Tests/TourTest.php b/core/modules/tour/lib/Tests/TourTest.php
similarity index 100%
rename from core/modules/tour/lib/Drupal/tour/Tests/TourTest.php
rename to core/modules/tour/lib/Tests/TourTest.php
diff --git a/core/modules/tour/lib/Drupal/tour/Tests/TourTestBase.php b/core/modules/tour/lib/Tests/TourTestBase.php
similarity index 100%
rename from core/modules/tour/lib/Drupal/tour/Tests/TourTestBase.php
rename to core/modules/tour/lib/Tests/TourTestBase.php
diff --git a/core/modules/tour/lib/Drupal/tour/Tests/TourTestBasic.php b/core/modules/tour/lib/Tests/TourTestBasic.php
similarity index 100%
rename from core/modules/tour/lib/Drupal/tour/Tests/TourTestBasic.php
rename to core/modules/tour/lib/Tests/TourTestBasic.php
diff --git a/core/modules/tour/lib/Drupal/tour/TipPluginBase.php b/core/modules/tour/lib/TipPluginBase.php
similarity index 100%
rename from core/modules/tour/lib/Drupal/tour/TipPluginBase.php
rename to core/modules/tour/lib/TipPluginBase.php
diff --git a/core/modules/tour/lib/Drupal/tour/TipPluginInterface.php b/core/modules/tour/lib/TipPluginInterface.php
similarity index 100%
rename from core/modules/tour/lib/Drupal/tour/TipPluginInterface.php
rename to core/modules/tour/lib/TipPluginInterface.php
diff --git a/core/modules/tour/lib/Drupal/tour/TipPluginManager.php b/core/modules/tour/lib/TipPluginManager.php
similarity index 100%
rename from core/modules/tour/lib/Drupal/tour/TipPluginManager.php
rename to core/modules/tour/lib/TipPluginManager.php
diff --git a/core/modules/tour/lib/Drupal/tour/TipsBag.php b/core/modules/tour/lib/TipsBag.php
similarity index 100%
rename from core/modules/tour/lib/Drupal/tour/TipsBag.php
rename to core/modules/tour/lib/TipsBag.php
diff --git a/core/modules/tour/lib/Drupal/tour/TourInterface.php b/core/modules/tour/lib/TourInterface.php
similarity index 100%
rename from core/modules/tour/lib/Drupal/tour/TourInterface.php
rename to core/modules/tour/lib/TourInterface.php
diff --git a/core/modules/tour/lib/Drupal/tour/TourRenderController.php b/core/modules/tour/lib/TourRenderController.php
similarity index 100%
rename from core/modules/tour/lib/Drupal/tour/TourRenderController.php
rename to core/modules/tour/lib/TourRenderController.php
diff --git a/core/modules/tour/tests/tour_test/lib/Drupal/tour_test/Controller/TourTestController.php b/core/modules/tour/tests/tour_test/lib/Controller/TourTestController.php
similarity index 100%
rename from core/modules/tour/tests/tour_test/lib/Drupal/tour_test/Controller/TourTestController.php
rename to core/modules/tour/tests/tour_test/lib/Controller/TourTestController.php
diff --git a/core/modules/tour/tests/tour_test/lib/Drupal/tour_test/Plugin/tour/tip/TipPluginImage.php b/core/modules/tour/tests/tour_test/lib/Plugin/tour/tip/TipPluginImage.php
similarity index 100%
rename from core/modules/tour/tests/tour_test/lib/Drupal/tour_test/Plugin/tour/tip/TipPluginImage.php
rename to core/modules/tour/tests/tour_test/lib/Plugin/tour/tip/TipPluginImage.php
diff --git a/core/modules/tracker/lib/Drupal/tracker/Plugin/views/argument/UserUid.php b/core/modules/tracker/lib/Plugin/views/argument/UserUid.php
similarity index 100%
rename from core/modules/tracker/lib/Drupal/tracker/Plugin/views/argument/UserUid.php
rename to core/modules/tracker/lib/Plugin/views/argument/UserUid.php
diff --git a/core/modules/tracker/lib/Drupal/tracker/Plugin/views/filter/UserUid.php b/core/modules/tracker/lib/Plugin/views/filter/UserUid.php
similarity index 100%
rename from core/modules/tracker/lib/Drupal/tracker/Plugin/views/filter/UserUid.php
rename to core/modules/tracker/lib/Plugin/views/filter/UserUid.php
diff --git a/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerNodeAccessTest.php b/core/modules/tracker/lib/Tests/TrackerNodeAccessTest.php
similarity index 100%
rename from core/modules/tracker/lib/Drupal/tracker/Tests/TrackerNodeAccessTest.php
rename to core/modules/tracker/lib/Tests/TrackerNodeAccessTest.php
diff --git a/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerTest.php b/core/modules/tracker/lib/Tests/TrackerTest.php
similarity index 100%
rename from core/modules/tracker/lib/Drupal/tracker/Tests/TrackerTest.php
rename to core/modules/tracker/lib/Tests/TrackerTest.php
diff --git a/core/modules/tracker/lib/Drupal/tracker/Tests/Views/TrackerTestBase.php b/core/modules/tracker/lib/Tests/Views/TrackerTestBase.php
similarity index 100%
rename from core/modules/tracker/lib/Drupal/tracker/Tests/Views/TrackerTestBase.php
rename to core/modules/tracker/lib/Tests/Views/TrackerTestBase.php
diff --git a/core/modules/tracker/lib/Drupal/tracker/Tests/Views/TrackerUserUidTest.php b/core/modules/tracker/lib/Tests/Views/TrackerUserUidTest.php
similarity index 100%
rename from core/modules/tracker/lib/Drupal/tracker/Tests/Views/TrackerUserUidTest.php
rename to core/modules/tracker/lib/Tests/Views/TrackerUserUidTest.php
diff --git a/core/modules/translation/lib/Drupal/translation/Tests/TranslationTest.php b/core/modules/translation/lib/Tests/TranslationTest.php
similarity index 100%
rename from core/modules/translation/lib/Drupal/translation/Tests/TranslationTest.php
rename to core/modules/translation/lib/Tests/TranslationTest.php
diff --git a/core/modules/update/lib/Drupal/update/Controller/UpdateController.php b/core/modules/update/lib/Controller/UpdateController.php
similarity index 100%
rename from core/modules/update/lib/Drupal/update/Controller/UpdateController.php
rename to core/modules/update/lib/Controller/UpdateController.php
diff --git a/core/modules/update/lib/Drupal/update/Tests/UpdateContribTest.php b/core/modules/update/lib/Tests/UpdateContribTest.php
similarity index 100%
rename from core/modules/update/lib/Drupal/update/Tests/UpdateContribTest.php
rename to core/modules/update/lib/Tests/UpdateContribTest.php
diff --git a/core/modules/update/lib/Drupal/update/Tests/UpdateCoreTest.php b/core/modules/update/lib/Tests/UpdateCoreTest.php
similarity index 100%
rename from core/modules/update/lib/Drupal/update/Tests/UpdateCoreTest.php
rename to core/modules/update/lib/Tests/UpdateCoreTest.php
diff --git a/core/modules/update/lib/Drupal/update/Tests/UpdateCoreUnitTest.php b/core/modules/update/lib/Tests/UpdateCoreUnitTest.php
similarity index 100%
rename from core/modules/update/lib/Drupal/update/Tests/UpdateCoreUnitTest.php
rename to core/modules/update/lib/Tests/UpdateCoreUnitTest.php
diff --git a/core/modules/update/lib/Drupal/update/Tests/UpdateTestBase.php b/core/modules/update/lib/Tests/UpdateTestBase.php
similarity index 100%
rename from core/modules/update/lib/Drupal/update/Tests/UpdateTestBase.php
rename to core/modules/update/lib/Tests/UpdateTestBase.php
diff --git a/core/modules/update/lib/Drupal/update/Tests/UpdateUploadTest.php b/core/modules/update/lib/Tests/UpdateUploadTest.php
similarity index 100%
rename from core/modules/update/lib/Drupal/update/Tests/UpdateUploadTest.php
rename to core/modules/update/lib/Tests/UpdateUploadTest.php
diff --git a/core/modules/update/lib/Drupal/update/UpdateSettingsForm.php b/core/modules/update/lib/UpdateSettingsForm.php
similarity index 100%
rename from core/modules/update/lib/Drupal/update/UpdateSettingsForm.php
rename to core/modules/update/lib/UpdateSettingsForm.php
diff --git a/core/modules/update/tests/modules/update_test/lib/Drupal/update_test/Controller/UpdateTestController.php b/core/modules/update/tests/modules/update_test/lib/Controller/UpdateTestController.php
similarity index 100%
rename from core/modules/update/tests/modules/update_test/lib/Drupal/update_test/Controller/UpdateTestController.php
rename to core/modules/update/tests/modules/update_test/lib/Controller/UpdateTestController.php
diff --git a/core/modules/update/tests/modules/update_test/lib/Drupal/update_test/MockFileTransfer.php b/core/modules/update/tests/modules/update_test/lib/MockFileTransfer.php
similarity index 100%
rename from core/modules/update/tests/modules/update_test/lib/Drupal/update_test/MockFileTransfer.php
rename to core/modules/update/tests/modules/update_test/lib/MockFileTransfer.php
diff --git a/core/modules/user/lib/Drupal/user/Access/LoginStatusCheck.php b/core/modules/user/lib/Access/LoginStatusCheck.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Access/LoginStatusCheck.php
rename to core/modules/user/lib/Access/LoginStatusCheck.php
diff --git a/core/modules/user/lib/Drupal/user/Access/PermissionAccessCheck.php b/core/modules/user/lib/Access/PermissionAccessCheck.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Access/PermissionAccessCheck.php
rename to core/modules/user/lib/Access/PermissionAccessCheck.php
diff --git a/core/modules/user/lib/Drupal/user/Access/RegisterAccessCheck.php b/core/modules/user/lib/Access/RegisterAccessCheck.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Access/RegisterAccessCheck.php
rename to core/modules/user/lib/Access/RegisterAccessCheck.php
diff --git a/core/modules/user/lib/Drupal/user/Access/RoleAccessCheck.php b/core/modules/user/lib/Access/RoleAccessCheck.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Access/RoleAccessCheck.php
rename to core/modules/user/lib/Access/RoleAccessCheck.php
diff --git a/core/modules/user/lib/Drupal/user/AccountFormController.php b/core/modules/user/lib/AccountFormController.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/AccountFormController.php
rename to core/modules/user/lib/AccountFormController.php
diff --git a/core/modules/user/lib/Drupal/user/AccountSettingsForm.php b/core/modules/user/lib/AccountSettingsForm.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/AccountSettingsForm.php
rename to core/modules/user/lib/AccountSettingsForm.php
diff --git a/core/modules/user/lib/Drupal/user/Controller/UserAutocompleteController.php b/core/modules/user/lib/Controller/UserAutocompleteController.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Controller/UserAutocompleteController.php
rename to core/modules/user/lib/Controller/UserAutocompleteController.php
diff --git a/core/modules/user/lib/Drupal/user/Controller/UserController.php b/core/modules/user/lib/Controller/UserController.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Controller/UserController.php
rename to core/modules/user/lib/Controller/UserController.php
diff --git a/core/modules/user/lib/Drupal/user/Entity/Role.php b/core/modules/user/lib/Entity/Role.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Entity/Role.php
rename to core/modules/user/lib/Entity/Role.php
diff --git a/core/modules/user/lib/Drupal/user/Entity/User.php b/core/modules/user/lib/Entity/User.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Entity/User.php
rename to core/modules/user/lib/Entity/User.php
diff --git a/core/modules/user/lib/Drupal/user/EventSubscriber/MaintenanceModeSubscriber.php b/core/modules/user/lib/EventSubscriber/MaintenanceModeSubscriber.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/EventSubscriber/MaintenanceModeSubscriber.php
rename to core/modules/user/lib/EventSubscriber/MaintenanceModeSubscriber.php
diff --git a/core/modules/user/lib/Drupal/user/Form/UserLoginForm.php b/core/modules/user/lib/Form/UserLoginForm.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Form/UserLoginForm.php
rename to core/modules/user/lib/Form/UserLoginForm.php
diff --git a/core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php b/core/modules/user/lib/Form/UserPasswordForm.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php
rename to core/modules/user/lib/Form/UserPasswordForm.php
diff --git a/core/modules/user/lib/Drupal/user/Form/UserPermissionsForm.php b/core/modules/user/lib/Form/UserPermissionsForm.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Form/UserPermissionsForm.php
rename to core/modules/user/lib/Form/UserPermissionsForm.php
diff --git a/core/modules/user/lib/Drupal/user/Form/UserPermissionsRoleSpecificForm.php b/core/modules/user/lib/Form/UserPermissionsRoleSpecificForm.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Form/UserPermissionsRoleSpecificForm.php
rename to core/modules/user/lib/Form/UserPermissionsRoleSpecificForm.php
diff --git a/core/modules/user/lib/Drupal/user/Form/UserRoleDelete.php b/core/modules/user/lib/Form/UserRoleDelete.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Form/UserRoleDelete.php
rename to core/modules/user/lib/Form/UserRoleDelete.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Action/AddRoleUser.php b/core/modules/user/lib/Plugin/Action/AddRoleUser.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/Action/AddRoleUser.php
rename to core/modules/user/lib/Plugin/Action/AddRoleUser.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Action/BlockUser.php b/core/modules/user/lib/Plugin/Action/BlockUser.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/Action/BlockUser.php
rename to core/modules/user/lib/Plugin/Action/BlockUser.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Action/CancelUser.php b/core/modules/user/lib/Plugin/Action/CancelUser.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/Action/CancelUser.php
rename to core/modules/user/lib/Plugin/Action/CancelUser.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Action/ChangeUserRoleBase.php b/core/modules/user/lib/Plugin/Action/ChangeUserRoleBase.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/Action/ChangeUserRoleBase.php
rename to core/modules/user/lib/Plugin/Action/ChangeUserRoleBase.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Action/RemoveRoleUser.php b/core/modules/user/lib/Plugin/Action/RemoveRoleUser.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/Action/RemoveRoleUser.php
rename to core/modules/user/lib/Plugin/Action/RemoveRoleUser.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Action/UnblockUser.php b/core/modules/user/lib/Plugin/Action/UnblockUser.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/Action/UnblockUser.php
rename to core/modules/user/lib/Plugin/Action/UnblockUser.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php b/core/modules/user/lib/Plugin/Block/UserLoginBlock.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php
rename to core/modules/user/lib/Plugin/Block/UserLoginBlock.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Block/UserNewBlock.php b/core/modules/user/lib/Plugin/Block/UserNewBlock.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/Block/UserNewBlock.php
rename to core/modules/user/lib/Plugin/Block/UserNewBlock.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Block/UserOnlineBlock.php b/core/modules/user/lib/Plugin/Block/UserOnlineBlock.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/Block/UserOnlineBlock.php
rename to core/modules/user/lib/Plugin/Block/UserOnlineBlock.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Search/UserSearch.php b/core/modules/user/lib/Plugin/Search/UserSearch.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/Search/UserSearch.php
rename to core/modules/user/lib/Plugin/Search/UserSearch.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserMailUnique.php b/core/modules/user/lib/Plugin/Validation/Constraint/UserMailUnique.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserMailUnique.php
rename to core/modules/user/lib/Plugin/Validation/Constraint/UserMailUnique.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserNameConstraint.php b/core/modules/user/lib/Plugin/Validation/Constraint/UserNameConstraint.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserNameConstraint.php
rename to core/modules/user/lib/Plugin/Validation/Constraint/UserNameConstraint.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserNameConstraintValidator.php b/core/modules/user/lib/Plugin/Validation/Constraint/UserNameConstraintValidator.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserNameConstraintValidator.php
rename to core/modules/user/lib/Plugin/Validation/Constraint/UserNameConstraintValidator.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserNameUnique.php b/core/modules/user/lib/Plugin/Validation/Constraint/UserNameUnique.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserNameUnique.php
rename to core/modules/user/lib/Plugin/Validation/Constraint/UserNameUnique.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserUniqueValidator.php b/core/modules/user/lib/Plugin/Validation/Constraint/UserUniqueValidator.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserUniqueValidator.php
rename to core/modules/user/lib/Plugin/Validation/Constraint/UserUniqueValidator.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/entity_reference/selection/UserSelection.php b/core/modules/user/lib/Plugin/entity_reference/selection/UserSelection.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/entity_reference/selection/UserSelection.php
rename to core/modules/user/lib/Plugin/entity_reference/selection/UserSelection.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/access/Permission.php b/core/modules/user/lib/Plugin/views/access/Permission.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/views/access/Permission.php
rename to core/modules/user/lib/Plugin/views/access/Permission.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/access/Role.php b/core/modules/user/lib/Plugin/views/access/Role.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/views/access/Role.php
rename to core/modules/user/lib/Plugin/views/access/Role.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/argument/RolesRid.php b/core/modules/user/lib/Plugin/views/argument/RolesRid.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/views/argument/RolesRid.php
rename to core/modules/user/lib/Plugin/views/argument/RolesRid.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/argument/Uid.php b/core/modules/user/lib/Plugin/views/argument/Uid.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/views/argument/Uid.php
rename to core/modules/user/lib/Plugin/views/argument/Uid.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/argument_default/CurrentUser.php b/core/modules/user/lib/Plugin/views/argument_default/CurrentUser.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/views/argument_default/CurrentUser.php
rename to core/modules/user/lib/Plugin/views/argument_default/CurrentUser.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/argument_default/User.php b/core/modules/user/lib/Plugin/views/argument_default/User.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/views/argument_default/User.php
rename to core/modules/user/lib/Plugin/views/argument_default/User.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.php b/core/modules/user/lib/Plugin/views/argument_validator/User.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.php
rename to core/modules/user/lib/Plugin/views/argument_validator/User.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Language.php b/core/modules/user/lib/Plugin/views/field/Language.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/views/field/Language.php
rename to core/modules/user/lib/Plugin/views/field/Language.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Link.php b/core/modules/user/lib/Plugin/views/field/Link.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/views/field/Link.php
rename to core/modules/user/lib/Plugin/views/field/Link.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkCancel.php b/core/modules/user/lib/Plugin/views/field/LinkCancel.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/views/field/LinkCancel.php
rename to core/modules/user/lib/Plugin/views/field/LinkCancel.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkEdit.php b/core/modules/user/lib/Plugin/views/field/LinkEdit.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/views/field/LinkEdit.php
rename to core/modules/user/lib/Plugin/views/field/LinkEdit.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Mail.php b/core/modules/user/lib/Plugin/views/field/Mail.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/views/field/Mail.php
rename to core/modules/user/lib/Plugin/views/field/Mail.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php b/core/modules/user/lib/Plugin/views/field/Name.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php
rename to core/modules/user/lib/Plugin/views/field/Name.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php b/core/modules/user/lib/Plugin/views/field/Permissions.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php
rename to core/modules/user/lib/Plugin/views/field/Permissions.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php b/core/modules/user/lib/Plugin/views/field/Roles.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php
rename to core/modules/user/lib/Plugin/views/field/Roles.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/User.php b/core/modules/user/lib/Plugin/views/field/User.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/views/field/User.php
rename to core/modules/user/lib/Plugin/views/field/User.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/UserBulkForm.php b/core/modules/user/lib/Plugin/views/field/UserBulkForm.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/views/field/UserBulkForm.php
rename to core/modules/user/lib/Plugin/views/field/UserBulkForm.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/UserData.php b/core/modules/user/lib/Plugin/views/field/UserData.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/views/field/UserData.php
rename to core/modules/user/lib/Plugin/views/field/UserData.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Current.php b/core/modules/user/lib/Plugin/views/filter/Current.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/views/filter/Current.php
rename to core/modules/user/lib/Plugin/views/filter/Current.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php b/core/modules/user/lib/Plugin/views/filter/Name.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php
rename to core/modules/user/lib/Plugin/views/filter/Name.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Permissions.php b/core/modules/user/lib/Plugin/views/filter/Permissions.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/views/filter/Permissions.php
rename to core/modules/user/lib/Plugin/views/filter/Permissions.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Roles.php b/core/modules/user/lib/Plugin/views/filter/Roles.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/views/filter/Roles.php
rename to core/modules/user/lib/Plugin/views/filter/Roles.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/row/UserRow.php b/core/modules/user/lib/Plugin/views/row/UserRow.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/views/row/UserRow.php
rename to core/modules/user/lib/Plugin/views/row/UserRow.php
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/wizard/Users.php b/core/modules/user/lib/Plugin/views/wizard/Users.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Plugin/views/wizard/Users.php
rename to core/modules/user/lib/Plugin/views/wizard/Users.php
diff --git a/core/modules/user/lib/Drupal/user/ProfileFormController.php b/core/modules/user/lib/ProfileFormController.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/ProfileFormController.php
rename to core/modules/user/lib/ProfileFormController.php
diff --git a/core/modules/user/lib/Drupal/user/ProfileTranslationController.php b/core/modules/user/lib/ProfileTranslationController.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/ProfileTranslationController.php
rename to core/modules/user/lib/ProfileTranslationController.php
diff --git a/core/modules/user/lib/Drupal/user/RegisterFormController.php b/core/modules/user/lib/RegisterFormController.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/RegisterFormController.php
rename to core/modules/user/lib/RegisterFormController.php
diff --git a/core/modules/user/lib/Drupal/user/RoleAccessController.php b/core/modules/user/lib/RoleAccessController.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/RoleAccessController.php
rename to core/modules/user/lib/RoleAccessController.php
diff --git a/core/modules/user/lib/Drupal/user/RoleFormController.php b/core/modules/user/lib/RoleFormController.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/RoleFormController.php
rename to core/modules/user/lib/RoleFormController.php
diff --git a/core/modules/user/lib/Drupal/user/RoleInterface.php b/core/modules/user/lib/RoleInterface.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/RoleInterface.php
rename to core/modules/user/lib/RoleInterface.php
diff --git a/core/modules/user/lib/Drupal/user/RoleListController.php b/core/modules/user/lib/RoleListController.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/RoleListController.php
rename to core/modules/user/lib/RoleListController.php
diff --git a/core/modules/user/lib/Drupal/user/RoleStorageController.php b/core/modules/user/lib/RoleStorageController.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/RoleStorageController.php
rename to core/modules/user/lib/RoleStorageController.php
diff --git a/core/modules/user/lib/Drupal/user/RoleStorageControllerInterface.php b/core/modules/user/lib/RoleStorageControllerInterface.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/RoleStorageControllerInterface.php
rename to core/modules/user/lib/RoleStorageControllerInterface.php
diff --git a/core/modules/user/lib/Drupal/user/TempStore.php b/core/modules/user/lib/TempStore.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/TempStore.php
rename to core/modules/user/lib/TempStore.php
diff --git a/core/modules/user/lib/Drupal/user/TempStoreException.php b/core/modules/user/lib/TempStoreException.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/TempStoreException.php
rename to core/modules/user/lib/TempStoreException.php
diff --git a/core/modules/user/lib/Drupal/user/TempStoreFactory.php b/core/modules/user/lib/TempStoreFactory.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/TempStoreFactory.php
rename to core/modules/user/lib/TempStoreFactory.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/TempStoreDatabaseTest.php b/core/modules/user/lib/Tests/TempStoreDatabaseTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/TempStoreDatabaseTest.php
rename to core/modules/user/lib/Tests/TempStoreDatabaseTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php b/core/modules/user/lib/Tests/UserAccountLinksTests.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php
rename to core/modules/user/lib/Tests/UserAccountLinksTests.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserAdminListingTest.php b/core/modules/user/lib/Tests/UserAdminListingTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserAdminListingTest.php
rename to core/modules/user/lib/Tests/UserAdminListingTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserAdminSettingsFormTest.php b/core/modules/user/lib/Tests/UserAdminSettingsFormTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserAdminSettingsFormTest.php
rename to core/modules/user/lib/Tests/UserAdminSettingsFormTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserAdminTest.php b/core/modules/user/lib/Tests/UserAdminTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserAdminTest.php
rename to core/modules/user/lib/Tests/UserAdminTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserAutocompleteTest.php b/core/modules/user/lib/Tests/UserAutocompleteTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserAutocompleteTest.php
rename to core/modules/user/lib/Tests/UserAutocompleteTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserBlocksTests.php b/core/modules/user/lib/Tests/UserBlocksTests.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserBlocksTests.php
rename to core/modules/user/lib/Tests/UserBlocksTests.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php b/core/modules/user/lib/Tests/UserCancelTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php
rename to core/modules/user/lib/Tests/UserCancelTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserCreateFailMailTest.php b/core/modules/user/lib/Tests/UserCreateFailMailTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserCreateFailMailTest.php
rename to core/modules/user/lib/Tests/UserCreateFailMailTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserCreateTest.php b/core/modules/user/lib/Tests/UserCreateTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserCreateTest.php
rename to core/modules/user/lib/Tests/UserCreateTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserDeleteTest.php b/core/modules/user/lib/Tests/UserDeleteTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserDeleteTest.php
rename to core/modules/user/lib/Tests/UserDeleteTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserEditTest.php b/core/modules/user/lib/Tests/UserEditTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserEditTest.php
rename to core/modules/user/lib/Tests/UserEditTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserEditedOwnAccountTest.php b/core/modules/user/lib/Tests/UserEditedOwnAccountTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserEditedOwnAccountTest.php
rename to core/modules/user/lib/Tests/UserEditedOwnAccountTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserEntityCallbacksTest.php b/core/modules/user/lib/Tests/UserEntityCallbacksTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserEntityCallbacksTest.php
rename to core/modules/user/lib/Tests/UserEntityCallbacksTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserEntityTest.php b/core/modules/user/lib/Tests/UserEntityTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserEntityTest.php
rename to core/modules/user/lib/Tests/UserEntityTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserLanguageCreationTest.php b/core/modules/user/lib/Tests/UserLanguageCreationTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserLanguageCreationTest.php
rename to core/modules/user/lib/Tests/UserLanguageCreationTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserLanguageTest.php b/core/modules/user/lib/Tests/UserLanguageTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserLanguageTest.php
rename to core/modules/user/lib/Tests/UserLanguageTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserLoginTest.php b/core/modules/user/lib/Tests/UserLoginTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserLoginTest.php
rename to core/modules/user/lib/Tests/UserLoginTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserPasswordResetTest.php b/core/modules/user/lib/Tests/UserPasswordResetTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserPasswordResetTest.php
rename to core/modules/user/lib/Tests/UserPasswordResetTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserPermissionsTest.php b/core/modules/user/lib/Tests/UserPermissionsTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserPermissionsTest.php
rename to core/modules/user/lib/Tests/UserPermissionsTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserPictureTest.php b/core/modules/user/lib/Tests/UserPictureTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserPictureTest.php
rename to core/modules/user/lib/Tests/UserPictureTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserRegistrationTest.php b/core/modules/user/lib/Tests/UserRegistrationTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserRegistrationTest.php
rename to core/modules/user/lib/Tests/UserRegistrationTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserRoleAdminTest.php b/core/modules/user/lib/Tests/UserRoleAdminTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserRoleAdminTest.php
rename to core/modules/user/lib/Tests/UserRoleAdminTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserRolesAssignmentTest.php b/core/modules/user/lib/Tests/UserRolesAssignmentTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserRolesAssignmentTest.php
rename to core/modules/user/lib/Tests/UserRolesAssignmentTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserSaveTest.php b/core/modules/user/lib/Tests/UserSaveTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserSaveTest.php
rename to core/modules/user/lib/Tests/UserSaveTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserSearchTest.php b/core/modules/user/lib/Tests/UserSearchTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserSearchTest.php
rename to core/modules/user/lib/Tests/UserSearchTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserSignatureTest.php b/core/modules/user/lib/Tests/UserSignatureTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserSignatureTest.php
rename to core/modules/user/lib/Tests/UserSignatureTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserTimeZoneTest.php b/core/modules/user/lib/Tests/UserTimeZoneTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserTimeZoneTest.php
rename to core/modules/user/lib/Tests/UserTimeZoneTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserTokenReplaceTest.php b/core/modules/user/lib/Tests/UserTokenReplaceTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserTokenReplaceTest.php
rename to core/modules/user/lib/Tests/UserTokenReplaceTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserTranslationUITest.php b/core/modules/user/lib/Tests/UserTranslationUITest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserTranslationUITest.php
rename to core/modules/user/lib/Tests/UserTranslationUITest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserValidateCurrentPassCustomFormTest.php b/core/modules/user/lib/Tests/UserValidateCurrentPassCustomFormTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserValidateCurrentPassCustomFormTest.php
rename to core/modules/user/lib/Tests/UserValidateCurrentPassCustomFormTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserValidationTest.php b/core/modules/user/lib/Tests/UserValidationTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/UserValidationTest.php
rename to core/modules/user/lib/Tests/UserValidationTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/AccessPermissionTest.php b/core/modules/user/lib/Tests/Views/AccessPermissionTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/Views/AccessPermissionTest.php
rename to core/modules/user/lib/Tests/Views/AccessPermissionTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/AccessRoleTest.php b/core/modules/user/lib/Tests/Views/AccessRoleTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/Views/AccessRoleTest.php
rename to core/modules/user/lib/Tests/Views/AccessRoleTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/AccessTestBase.php b/core/modules/user/lib/Tests/Views/AccessTestBase.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/Views/AccessTestBase.php
rename to core/modules/user/lib/Tests/Views/AccessTestBase.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/ArgumentDefaultTest.php b/core/modules/user/lib/Tests/Views/ArgumentDefaultTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/Views/ArgumentDefaultTest.php
rename to core/modules/user/lib/Tests/Views/ArgumentDefaultTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/ArgumentValidateTest.php b/core/modules/user/lib/Tests/Views/ArgumentValidateTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/Views/ArgumentValidateTest.php
rename to core/modules/user/lib/Tests/Views/ArgumentValidateTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/BulkFormTest.php b/core/modules/user/lib/Tests/Views/BulkFormTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/Views/BulkFormTest.php
rename to core/modules/user/lib/Tests/Views/BulkFormTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerArgumentUserUidTest.php b/core/modules/user/lib/Tests/Views/HandlerArgumentUserUidTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/Views/HandlerArgumentUserUidTest.php
rename to core/modules/user/lib/Tests/Views/HandlerArgumentUserUidTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldPermissionTest.php b/core/modules/user/lib/Tests/Views/HandlerFieldPermissionTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldPermissionTest.php
rename to core/modules/user/lib/Tests/Views/HandlerFieldPermissionTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldRoleTest.php b/core/modules/user/lib/Tests/Views/HandlerFieldRoleTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldRoleTest.php
rename to core/modules/user/lib/Tests/Views/HandlerFieldRoleTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldUserNameTest.php b/core/modules/user/lib/Tests/Views/HandlerFieldUserNameTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldUserNameTest.php
rename to core/modules/user/lib/Tests/Views/HandlerFieldUserNameTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterPermissionTest.php b/core/modules/user/lib/Tests/Views/HandlerFilterPermissionTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterPermissionTest.php
rename to core/modules/user/lib/Tests/Views/HandlerFilterPermissionTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterUserNameTest.php b/core/modules/user/lib/Tests/Views/HandlerFilterUserNameTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/Views/HandlerFilterUserNameTest.php
rename to core/modules/user/lib/Tests/Views/HandlerFilterUserNameTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/RelationshipRepresentativeNode.php b/core/modules/user/lib/Tests/Views/RelationshipRepresentativeNode.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/Views/RelationshipRepresentativeNode.php
rename to core/modules/user/lib/Tests/Views/RelationshipRepresentativeNode.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/UserDataTest.php b/core/modules/user/lib/Tests/Views/UserDataTest.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/Views/UserDataTest.php
rename to core/modules/user/lib/Tests/Views/UserDataTest.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/UserTestBase.php b/core/modules/user/lib/Tests/Views/UserTestBase.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/Views/UserTestBase.php
rename to core/modules/user/lib/Tests/Views/UserTestBase.php
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/UserUnitTestBase.php b/core/modules/user/lib/Tests/Views/UserUnitTestBase.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/Tests/Views/UserUnitTestBase.php
rename to core/modules/user/lib/Tests/Views/UserUnitTestBase.php
diff --git a/core/modules/user/lib/Drupal/user/UserAccessController.php b/core/modules/user/lib/UserAccessController.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/UserAccessController.php
rename to core/modules/user/lib/UserAccessController.php
diff --git a/core/modules/user/lib/Drupal/user/UserAutocomplete.php b/core/modules/user/lib/UserAutocomplete.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/UserAutocomplete.php
rename to core/modules/user/lib/UserAutocomplete.php
diff --git a/core/modules/user/lib/Drupal/user/UserConfigContext.php b/core/modules/user/lib/UserConfigContext.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/UserConfigContext.php
rename to core/modules/user/lib/UserConfigContext.php
diff --git a/core/modules/user/lib/Drupal/user/UserData.php b/core/modules/user/lib/UserData.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/UserData.php
rename to core/modules/user/lib/UserData.php
diff --git a/core/modules/user/lib/Drupal/user/UserDataInterface.php b/core/modules/user/lib/UserDataInterface.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/UserDataInterface.php
rename to core/modules/user/lib/UserDataInterface.php
diff --git a/core/modules/user/lib/Drupal/user/UserInterface.php b/core/modules/user/lib/UserInterface.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/UserInterface.php
rename to core/modules/user/lib/UserInterface.php
diff --git a/core/modules/user/lib/Drupal/user/UserStorageController.php b/core/modules/user/lib/UserStorageController.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/UserStorageController.php
rename to core/modules/user/lib/UserStorageController.php
diff --git a/core/modules/user/lib/Drupal/user/UserStorageControllerInterface.php b/core/modules/user/lib/UserStorageControllerInterface.php
similarity index 100%
rename from core/modules/user/lib/Drupal/user/UserStorageControllerInterface.php
rename to core/modules/user/lib/UserStorageControllerInterface.php
diff --git a/core/modules/user/tests/Drupal/user/Tests/Plugin/Action/AddRoleUserTest.php b/core/modules/user/tests/lib/Plugin/Action/AddRoleUserTest.php
similarity index 100%
rename from core/modules/user/tests/Drupal/user/Tests/Plugin/Action/AddRoleUserTest.php
rename to core/modules/user/tests/lib/Plugin/Action/AddRoleUserTest.php
diff --git a/core/modules/user/tests/Drupal/user/Tests/Plugin/Action/RemoveRoleUserTest.php b/core/modules/user/tests/lib/Plugin/Action/RemoveRoleUserTest.php
similarity index 100%
rename from core/modules/user/tests/Drupal/user/Tests/Plugin/Action/RemoveRoleUserTest.php
rename to core/modules/user/tests/lib/Plugin/Action/RemoveRoleUserTest.php
diff --git a/core/modules/user/tests/Drupal/user/Tests/Plugin/Core/Entity/UserTest.php b/core/modules/user/tests/lib/Plugin/Core/Entity/UserTest.php
similarity index 100%
rename from core/modules/user/tests/Drupal/user/Tests/Plugin/Core/Entity/UserTest.php
rename to core/modules/user/tests/lib/Plugin/Core/Entity/UserTest.php
diff --git a/core/modules/user/tests/Drupal/user/Tests/Plugin/views/field/UserBulkFormTest.php b/core/modules/user/tests/lib/Plugin/views/field/UserBulkFormTest.php
similarity index 100%
rename from core/modules/user/tests/Drupal/user/Tests/Plugin/views/field/UserBulkFormTest.php
rename to core/modules/user/tests/lib/Plugin/views/field/UserBulkFormTest.php
diff --git a/core/modules/user/tests/Drupal/user/Tests/Views/Argument/RolesRidTest.php b/core/modules/user/tests/lib/Views/Argument/RolesRidTest.php
similarity index 100%
rename from core/modules/user/tests/Drupal/user/Tests/Views/Argument/RolesRidTest.php
rename to core/modules/user/tests/lib/Views/Argument/RolesRidTest.php
diff --git a/core/modules/user/tests/modules/user_form_test/lib/Drupal/user_form_test/Form/TestCurrentPassword.php b/core/modules/user/tests/modules/user_form_test/lib/Form/TestCurrentPassword.php
similarity index 100%
rename from core/modules/user/tests/modules/user_form_test/lib/Drupal/user_form_test/Form/TestCurrentPassword.php
rename to core/modules/user/tests/modules/user_form_test/lib/Form/TestCurrentPassword.php
diff --git a/core/modules/views/lib/Drupal/views/Ajax/DismissFormCommand.php b/core/modules/views/lib/Ajax/DismissFormCommand.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Ajax/DismissFormCommand.php
rename to core/modules/views/lib/Ajax/DismissFormCommand.php
diff --git a/core/modules/views/lib/Drupal/views/Ajax/HighlightCommand.php b/core/modules/views/lib/Ajax/HighlightCommand.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Ajax/HighlightCommand.php
rename to core/modules/views/lib/Ajax/HighlightCommand.php
diff --git a/core/modules/views/lib/Drupal/views/Ajax/ReplaceTitleCommand.php b/core/modules/views/lib/Ajax/ReplaceTitleCommand.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Ajax/ReplaceTitleCommand.php
rename to core/modules/views/lib/Ajax/ReplaceTitleCommand.php
diff --git a/core/modules/views/lib/Drupal/views/Ajax/ScrollTopCommand.php b/core/modules/views/lib/Ajax/ScrollTopCommand.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Ajax/ScrollTopCommand.php
rename to core/modules/views/lib/Ajax/ScrollTopCommand.php
diff --git a/core/modules/views/lib/Drupal/views/Ajax/SetFormCommand.php b/core/modules/views/lib/Ajax/SetFormCommand.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Ajax/SetFormCommand.php
rename to core/modules/views/lib/Ajax/SetFormCommand.php
diff --git a/core/modules/views/lib/Drupal/views/Ajax/ShowButtonsCommand.php b/core/modules/views/lib/Ajax/ShowButtonsCommand.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Ajax/ShowButtonsCommand.php
rename to core/modules/views/lib/Ajax/ShowButtonsCommand.php
diff --git a/core/modules/views/lib/Drupal/views/Ajax/TriggerPreviewCommand.php b/core/modules/views/lib/Ajax/TriggerPreviewCommand.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Ajax/TriggerPreviewCommand.php
rename to core/modules/views/lib/Ajax/TriggerPreviewCommand.php
diff --git a/core/modules/views/lib/Drupal/views/Ajax/ViewAjaxResponse.php b/core/modules/views/lib/Ajax/ViewAjaxResponse.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Ajax/ViewAjaxResponse.php
rename to core/modules/views/lib/Ajax/ViewAjaxResponse.php
diff --git a/core/modules/views/lib/Drupal/views/Analyzer.php b/core/modules/views/lib/Analyzer.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Analyzer.php
rename to core/modules/views/lib/Analyzer.php
diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsAccess.php b/core/modules/views/lib/Annotation/ViewsAccess.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Annotation/ViewsAccess.php
rename to core/modules/views/lib/Annotation/ViewsAccess.php
diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsArgumentDefault.php b/core/modules/views/lib/Annotation/ViewsArgumentDefault.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Annotation/ViewsArgumentDefault.php
rename to core/modules/views/lib/Annotation/ViewsArgumentDefault.php
diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsArgumentValidator.php b/core/modules/views/lib/Annotation/ViewsArgumentValidator.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Annotation/ViewsArgumentValidator.php
rename to core/modules/views/lib/Annotation/ViewsArgumentValidator.php
diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsCache.php b/core/modules/views/lib/Annotation/ViewsCache.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Annotation/ViewsCache.php
rename to core/modules/views/lib/Annotation/ViewsCache.php
diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsDisplay.php b/core/modules/views/lib/Annotation/ViewsDisplay.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Annotation/ViewsDisplay.php
rename to core/modules/views/lib/Annotation/ViewsDisplay.php
diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsDisplayExtender.php b/core/modules/views/lib/Annotation/ViewsDisplayExtender.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Annotation/ViewsDisplayExtender.php
rename to core/modules/views/lib/Annotation/ViewsDisplayExtender.php
diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsExposedForm.php b/core/modules/views/lib/Annotation/ViewsExposedForm.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Annotation/ViewsExposedForm.php
rename to core/modules/views/lib/Annotation/ViewsExposedForm.php
diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsPager.php b/core/modules/views/lib/Annotation/ViewsPager.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Annotation/ViewsPager.php
rename to core/modules/views/lib/Annotation/ViewsPager.php
diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsPluginAnnotationBase.php b/core/modules/views/lib/Annotation/ViewsPluginAnnotationBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Annotation/ViewsPluginAnnotationBase.php
rename to core/modules/views/lib/Annotation/ViewsPluginAnnotationBase.php
diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsQuery.php b/core/modules/views/lib/Annotation/ViewsQuery.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Annotation/ViewsQuery.php
rename to core/modules/views/lib/Annotation/ViewsQuery.php
diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsRow.php b/core/modules/views/lib/Annotation/ViewsRow.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Annotation/ViewsRow.php
rename to core/modules/views/lib/Annotation/ViewsRow.php
diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsStyle.php b/core/modules/views/lib/Annotation/ViewsStyle.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Annotation/ViewsStyle.php
rename to core/modules/views/lib/Annotation/ViewsStyle.php
diff --git a/core/modules/views/lib/Drupal/views/Annotation/ViewsWizard.php b/core/modules/views/lib/Annotation/ViewsWizard.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Annotation/ViewsWizard.php
rename to core/modules/views/lib/Annotation/ViewsWizard.php
diff --git a/core/modules/views/lib/Drupal/views/Controller/ViewAjaxController.php b/core/modules/views/lib/Controller/ViewAjaxController.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Controller/ViewAjaxController.php
rename to core/modules/views/lib/Controller/ViewAjaxController.php
diff --git a/core/modules/views/lib/Drupal/views/DisplayBag.php b/core/modules/views/lib/DisplayBag.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/DisplayBag.php
rename to core/modules/views/lib/DisplayBag.php
diff --git a/core/modules/views/lib/Drupal/views/Entity/View.php b/core/modules/views/lib/Entity/View.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Entity/View.php
rename to core/modules/views/lib/Entity/View.php
diff --git a/core/modules/views/lib/Drupal/views/EventSubscriber/RouteSubscriber.php b/core/modules/views/lib/EventSubscriber/RouteSubscriber.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/EventSubscriber/RouteSubscriber.php
rename to core/modules/views/lib/EventSubscriber/RouteSubscriber.php
diff --git a/core/modules/views/lib/Drupal/views/ManyToOneHelper.php b/core/modules/views/lib/ManyToOneHelper.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/ManyToOneHelper.php
rename to core/modules/views/lib/ManyToOneHelper.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php b/core/modules/views/lib/Plugin/Block/ViewsBlock.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php
rename to core/modules/views/lib/Plugin/Block/ViewsBlock.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlockBase.php b/core/modules/views/lib/Plugin/Block/ViewsBlockBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlockBase.php
rename to core/modules/views/lib/Plugin/Block/ViewsBlockBase.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsExposedFilterBlock.php b/core/modules/views/lib/Plugin/Block/ViewsExposedFilterBlock.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/Block/ViewsExposedFilterBlock.php
rename to core/modules/views/lib/Plugin/Block/ViewsExposedFilterBlock.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Derivative/DefaultWizardDeriver.php b/core/modules/views/lib/Plugin/Derivative/DefaultWizardDeriver.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/Derivative/DefaultWizardDeriver.php
rename to core/modules/views/lib/Plugin/Derivative/DefaultWizardDeriver.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsBlock.php b/core/modules/views/lib/Plugin/Derivative/ViewsBlock.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsBlock.php
rename to core/modules/views/lib/Plugin/Derivative/ViewsBlock.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsEntityRow.php b/core/modules/views/lib/Plugin/Derivative/ViewsEntityRow.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsEntityRow.php
rename to core/modules/views/lib/Plugin/Derivative/ViewsEntityRow.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsExposedFilterBlock.php b/core/modules/views/lib/Plugin/Derivative/ViewsExposedFilterBlock.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsExposedFilterBlock.php
rename to core/modules/views/lib/Plugin/Derivative/ViewsExposedFilterBlock.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Discovery/ViewsHandlerDiscovery.php b/core/modules/views/lib/Plugin/Discovery/ViewsHandlerDiscovery.php
similarity index 58%
rename from core/modules/views/lib/Drupal/views/Plugin/Discovery/ViewsHandlerDiscovery.php
rename to core/modules/views/lib/Plugin/Discovery/ViewsHandlerDiscovery.php
index a3a08c0..09f5255 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/Discovery/ViewsHandlerDiscovery.php
+++ b/core/modules/views/lib/Plugin/Discovery/ViewsHandlerDiscovery.php
@@ -22,13 +22,6 @@ class ViewsHandlerDiscovery extends AnnotatedClassDiscovery {
   protected $type;
 
   /**
-   * An object containing the namespaces to look for plugin implementations.
-   *
-   * @var \Traversable
-   */
-  protected $rootNamespacesIterator;
-
-  /**
    * Constructs a ViewsHandlerDiscovery object.
    *
    * @param string $type
@@ -39,15 +32,7 @@ class ViewsHandlerDiscovery extends AnnotatedClassDiscovery {
    */
   function __construct($type, \Traversable $root_namespaces) {
     $this->type = $type;
-    $this->rootNamespacesIterator = $root_namespaces;
-
-    $plugin_namespaces = array();
-    foreach ($root_namespaces as $namespace => $dir) {
-      $plugin_namespaces["$namespace\\Plugin\\views\\{$type}"] = array($dir);
-    }
-
-    $this->pluginNamespaces = $plugin_namespaces;
-    $this->pluginDefinitionAnnotationName = 'Drupal\Component\Annotation\PluginID';
+    parent::__construct("Plugin/views/$type", $root_namespaces, 'Drupal\Component\Annotation\PluginID');
   }
 
   /**
@@ -62,16 +47,4 @@ public function getDefinitions() {
     return $definitions;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  protected function getPluginNamespaces() {
-    $plugin_namespaces = array();
-    foreach ($this->rootNamespacesIterator as $namespace => $dir) {
-      $plugin_namespaces["$namespace\\Plugin\\views\\{$this->type}"] = array($dir);
-    }
-
-    return $plugin_namespaces;
-  }
-
 }
diff --git a/core/modules/views/lib/Drupal/views/Plugin/ViewsHandlerManager.php b/core/modules/views/lib/Plugin/ViewsHandlerManager.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/ViewsHandlerManager.php
rename to core/modules/views/lib/Plugin/ViewsHandlerManager.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/ViewsPluginManager.php b/core/modules/views/lib/Plugin/ViewsPluginManager.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/ViewsPluginManager.php
rename to core/modules/views/lib/Plugin/ViewsPluginManager.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/entity_reference/selection/ViewsSelection.php b/core/modules/views/lib/Plugin/entity_reference/selection/ViewsSelection.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/entity_reference/selection/ViewsSelection.php
rename to core/modules/views/lib/Plugin/entity_reference/selection/ViewsSelection.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php b/core/modules/views/lib/Plugin/views/HandlerBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php
rename to core/modules/views/lib/Plugin/views/HandlerBase.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/PluginBase.php b/core/modules/views/lib/Plugin/views/PluginBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/PluginBase.php
rename to core/modules/views/lib/Plugin/views/PluginBase.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/PluginInterface.php b/core/modules/views/lib/Plugin/views/PluginInterface.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/PluginInterface.php
rename to core/modules/views/lib/Plugin/views/PluginInterface.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/access/AccessPluginBase.php b/core/modules/views/lib/Plugin/views/access/AccessPluginBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/access/AccessPluginBase.php
rename to core/modules/views/lib/Plugin/views/access/AccessPluginBase.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/access/None.php b/core/modules/views/lib/Plugin/views/access/None.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/access/None.php
rename to core/modules/views/lib/Plugin/views/access/None.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/AreaPluginBase.php b/core/modules/views/lib/Plugin/views/area/AreaPluginBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/area/AreaPluginBase.php
rename to core/modules/views/lib/Plugin/views/area/AreaPluginBase.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/Broken.php b/core/modules/views/lib/Plugin/views/area/Broken.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/area/Broken.php
rename to core/modules/views/lib/Plugin/views/area/Broken.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/Entity.php b/core/modules/views/lib/Plugin/views/area/Entity.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/area/Entity.php
rename to core/modules/views/lib/Plugin/views/area/Entity.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/HTTPStatusCode.php b/core/modules/views/lib/Plugin/views/area/HTTPStatusCode.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/area/HTTPStatusCode.php
rename to core/modules/views/lib/Plugin/views/area/HTTPStatusCode.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/Result.php b/core/modules/views/lib/Plugin/views/area/Result.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/area/Result.php
rename to core/modules/views/lib/Plugin/views/area/Result.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/Text.php b/core/modules/views/lib/Plugin/views/area/Text.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/area/Text.php
rename to core/modules/views/lib/Plugin/views/area/Text.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/TextCustom.php b/core/modules/views/lib/Plugin/views/area/TextCustom.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/area/TextCustom.php
rename to core/modules/views/lib/Plugin/views/area/TextCustom.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/Title.php b/core/modules/views/lib/Plugin/views/area/Title.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/area/Title.php
rename to core/modules/views/lib/Plugin/views/area/Title.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/TokenizeAreaPluginBase.php b/core/modules/views/lib/Plugin/views/area/TokenizeAreaPluginBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/area/TokenizeAreaPluginBase.php
rename to core/modules/views/lib/Plugin/views/area/TokenizeAreaPluginBase.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/View.php b/core/modules/views/lib/Plugin/views/area/View.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/area/View.php
rename to core/modules/views/lib/Plugin/views/area/View.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php b/core/modules/views/lib/Plugin/views/argument/ArgumentPluginBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
rename to core/modules/views/lib/Plugin/views/argument/ArgumentPluginBase.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Broken.php b/core/modules/views/lib/Plugin/views/argument/Broken.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/Broken.php
rename to core/modules/views/lib/Plugin/views/argument/Broken.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Date.php b/core/modules/views/lib/Plugin/views/argument/Date.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/Date.php
rename to core/modules/views/lib/Plugin/views/argument/Date.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/DayDate.php b/core/modules/views/lib/Plugin/views/argument/DayDate.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/DayDate.php
rename to core/modules/views/lib/Plugin/views/argument/DayDate.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Formula.php b/core/modules/views/lib/Plugin/views/argument/Formula.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/Formula.php
rename to core/modules/views/lib/Plugin/views/argument/Formula.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/FullDate.php b/core/modules/views/lib/Plugin/views/argument/FullDate.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/FullDate.php
rename to core/modules/views/lib/Plugin/views/argument/FullDate.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/GroupByNumeric.php b/core/modules/views/lib/Plugin/views/argument/GroupByNumeric.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/GroupByNumeric.php
rename to core/modules/views/lib/Plugin/views/argument/GroupByNumeric.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ManyToOne.php b/core/modules/views/lib/Plugin/views/argument/ManyToOne.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/ManyToOne.php
rename to core/modules/views/lib/Plugin/views/argument/ManyToOne.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/MonthDate.php b/core/modules/views/lib/Plugin/views/argument/MonthDate.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/MonthDate.php
rename to core/modules/views/lib/Plugin/views/argument/MonthDate.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Null.php b/core/modules/views/lib/Plugin/views/argument/Null.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/Null.php
rename to core/modules/views/lib/Plugin/views/argument/Null.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Numeric.php b/core/modules/views/lib/Plugin/views/argument/Numeric.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/Numeric.php
rename to core/modules/views/lib/Plugin/views/argument/Numeric.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Standard.php b/core/modules/views/lib/Plugin/views/argument/Standard.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/Standard.php
rename to core/modules/views/lib/Plugin/views/argument/Standard.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/String.php b/core/modules/views/lib/Plugin/views/argument/String.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/String.php
rename to core/modules/views/lib/Plugin/views/argument/String.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/WeekDate.php b/core/modules/views/lib/Plugin/views/argument/WeekDate.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/WeekDate.php
rename to core/modules/views/lib/Plugin/views/argument/WeekDate.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/YearDate.php b/core/modules/views/lib/Plugin/views/argument/YearDate.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/YearDate.php
rename to core/modules/views/lib/Plugin/views/argument/YearDate.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/YearMonthDate.php b/core/modules/views/lib/Plugin/views/argument/YearMonthDate.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/argument/YearMonthDate.php
rename to core/modules/views/lib/Plugin/views/argument/YearMonthDate.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument_default/ArgumentDefaultPluginBase.php b/core/modules/views/lib/Plugin/views/argument_default/ArgumentDefaultPluginBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/argument_default/ArgumentDefaultPluginBase.php
rename to core/modules/views/lib/Plugin/views/argument_default/ArgumentDefaultPluginBase.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument_default/Fixed.php b/core/modules/views/lib/Plugin/views/argument_default/Fixed.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/argument_default/Fixed.php
rename to core/modules/views/lib/Plugin/views/argument_default/Fixed.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument_default/Raw.php b/core/modules/views/lib/Plugin/views/argument_default/Raw.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/argument_default/Raw.php
rename to core/modules/views/lib/Plugin/views/argument_default/Raw.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php b/core/modules/views/lib/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php
rename to core/modules/views/lib/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/None.php b/core/modules/views/lib/Plugin/views/argument_validator/None.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/None.php
rename to core/modules/views/lib/Plugin/views/argument_validator/None.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/Numeric.php b/core/modules/views/lib/Plugin/views/argument_validator/Numeric.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/Numeric.php
rename to core/modules/views/lib/Plugin/views/argument_validator/Numeric.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php b/core/modules/views/lib/Plugin/views/cache/CachePluginBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php
rename to core/modules/views/lib/Plugin/views/cache/CachePluginBase.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/cache/None.php b/core/modules/views/lib/Plugin/views/cache/None.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/cache/None.php
rename to core/modules/views/lib/Plugin/views/cache/None.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/cache/Time.php b/core/modules/views/lib/Plugin/views/cache/Time.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/cache/Time.php
rename to core/modules/views/lib/Plugin/views/cache/Time.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/Attachment.php b/core/modules/views/lib/Plugin/views/display/Attachment.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/display/Attachment.php
rename to core/modules/views/lib/Plugin/views/display/Attachment.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DefaultDisplay.php b/core/modules/views/lib/Plugin/views/display/DefaultDisplay.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/display/DefaultDisplay.php
rename to core/modules/views/lib/Plugin/views/display/DefaultDisplay.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/lib/Plugin/views/display/DisplayPluginBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
rename to core/modules/views/lib/Plugin/views/display/DisplayPluginBase.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayRouterInterface.php b/core/modules/views/lib/Plugin/views/display/DisplayRouterInterface.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayRouterInterface.php
rename to core/modules/views/lib/Plugin/views/display/DisplayRouterInterface.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/Embed.php b/core/modules/views/lib/Plugin/views/display/Embed.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/display/Embed.php
rename to core/modules/views/lib/Plugin/views/display/Embed.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/Feed.php b/core/modules/views/lib/Plugin/views/display/Feed.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/display/Feed.php
rename to core/modules/views/lib/Plugin/views/display/Feed.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/Page.php b/core/modules/views/lib/Plugin/views/display/Page.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/display/Page.php
rename to core/modules/views/lib/Plugin/views/display/Page.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php b/core/modules/views/lib/Plugin/views/display/PathPluginBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php
rename to core/modules/views/lib/Plugin/views/display/PathPluginBase.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display_extender/DefaultDisplayExtender.php b/core/modules/views/lib/Plugin/views/display_extender/DefaultDisplayExtender.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/display_extender/DefaultDisplayExtender.php
rename to core/modules/views/lib/Plugin/views/display_extender/DefaultDisplayExtender.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display_extender/DisplayExtenderPluginBase.php b/core/modules/views/lib/Plugin/views/display_extender/DisplayExtenderPluginBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/display_extender/DisplayExtenderPluginBase.php
rename to core/modules/views/lib/Plugin/views/display_extender/DisplayExtenderPluginBase.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/Basic.php b/core/modules/views/lib/Plugin/views/exposed_form/Basic.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/Basic.php
rename to core/modules/views/lib/Plugin/views/exposed_form/Basic.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php b/core/modules/views/lib/Plugin/views/exposed_form/ExposedFormPluginBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php
rename to core/modules/views/lib/Plugin/views/exposed_form/ExposedFormPluginBase.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php b/core/modules/views/lib/Plugin/views/exposed_form/InputRequired.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php
rename to core/modules/views/lib/Plugin/views/exposed_form/InputRequired.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/ActionBulkForm.php b/core/modules/views/lib/Plugin/views/field/ActionBulkForm.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/field/ActionBulkForm.php
rename to core/modules/views/lib/Plugin/views/field/ActionBulkForm.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Boolean.php b/core/modules/views/lib/Plugin/views/field/Boolean.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/field/Boolean.php
rename to core/modules/views/lib/Plugin/views/field/Boolean.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Broken.php b/core/modules/views/lib/Plugin/views/field/Broken.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/field/Broken.php
rename to core/modules/views/lib/Plugin/views/field/Broken.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Counter.php b/core/modules/views/lib/Plugin/views/field/Counter.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/field/Counter.php
rename to core/modules/views/lib/Plugin/views/field/Counter.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Custom.php b/core/modules/views/lib/Plugin/views/field/Custom.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/field/Custom.php
rename to core/modules/views/lib/Plugin/views/field/Custom.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Date.php b/core/modules/views/lib/Plugin/views/field/Date.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/field/Date.php
rename to core/modules/views/lib/Plugin/views/field/Date.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Dropbutton.php b/core/modules/views/lib/Plugin/views/field/Dropbutton.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/field/Dropbutton.php
rename to core/modules/views/lib/Plugin/views/field/Dropbutton.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/EntityLabel.php b/core/modules/views/lib/Plugin/views/field/EntityLabel.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/field/EntityLabel.php
rename to core/modules/views/lib/Plugin/views/field/EntityLabel.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php b/core/modules/views/lib/Plugin/views/field/FieldPluginBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
rename to core/modules/views/lib/Plugin/views/field/FieldPluginBase.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/FileSize.php b/core/modules/views/lib/Plugin/views/field/FileSize.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/field/FileSize.php
rename to core/modules/views/lib/Plugin/views/field/FileSize.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Links.php b/core/modules/views/lib/Plugin/views/field/Links.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/field/Links.php
rename to core/modules/views/lib/Plugin/views/field/Links.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/MachineName.php b/core/modules/views/lib/Plugin/views/field/MachineName.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/field/MachineName.php
rename to core/modules/views/lib/Plugin/views/field/MachineName.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Markup.php b/core/modules/views/lib/Plugin/views/field/Markup.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/field/Markup.php
rename to core/modules/views/lib/Plugin/views/field/Markup.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Numeric.php b/core/modules/views/lib/Plugin/views/field/Numeric.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/field/Numeric.php
rename to core/modules/views/lib/Plugin/views/field/Numeric.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/PrerenderList.php b/core/modules/views/lib/Plugin/views/field/PrerenderList.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/field/PrerenderList.php
rename to core/modules/views/lib/Plugin/views/field/PrerenderList.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Serialized.php b/core/modules/views/lib/Plugin/views/field/Serialized.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/field/Serialized.php
rename to core/modules/views/lib/Plugin/views/field/Serialized.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Standard.php b/core/modules/views/lib/Plugin/views/field/Standard.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/field/Standard.php
rename to core/modules/views/lib/Plugin/views/field/Standard.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/TimeInterval.php b/core/modules/views/lib/Plugin/views/field/TimeInterval.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/field/TimeInterval.php
rename to core/modules/views/lib/Plugin/views/field/TimeInterval.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Url.php b/core/modules/views/lib/Plugin/views/field/Url.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/field/Url.php
rename to core/modules/views/lib/Plugin/views/field/Url.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Xss.php b/core/modules/views/lib/Plugin/views/field/Xss.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/field/Xss.php
rename to core/modules/views/lib/Plugin/views/field/Xss.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php b/core/modules/views/lib/Plugin/views/filter/BooleanOperator.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php
rename to core/modules/views/lib/Plugin/views/filter/BooleanOperator.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperatorString.php b/core/modules/views/lib/Plugin/views/filter/BooleanOperatorString.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperatorString.php
rename to core/modules/views/lib/Plugin/views/filter/BooleanOperatorString.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Broken.php b/core/modules/views/lib/Plugin/views/filter/Broken.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/filter/Broken.php
rename to core/modules/views/lib/Plugin/views/filter/Broken.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Bundle.php b/core/modules/views/lib/Plugin/views/filter/Bundle.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/filter/Bundle.php
rename to core/modules/views/lib/Plugin/views/filter/Bundle.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Combine.php b/core/modules/views/lib/Plugin/views/filter/Combine.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/filter/Combine.php
rename to core/modules/views/lib/Plugin/views/filter/Combine.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Date.php b/core/modules/views/lib/Plugin/views/filter/Date.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/filter/Date.php
rename to core/modules/views/lib/Plugin/views/filter/Date.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Equality.php b/core/modules/views/lib/Plugin/views/filter/Equality.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/filter/Equality.php
rename to core/modules/views/lib/Plugin/views/filter/Equality.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php b/core/modules/views/lib/Plugin/views/filter/FilterPluginBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
rename to core/modules/views/lib/Plugin/views/filter/FilterPluginBase.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php b/core/modules/views/lib/Plugin/views/filter/GroupByNumeric.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php
rename to core/modules/views/lib/Plugin/views/filter/GroupByNumeric.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php b/core/modules/views/lib/Plugin/views/filter/InOperator.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php
rename to core/modules/views/lib/Plugin/views/filter/InOperator.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/ManyToOne.php b/core/modules/views/lib/Plugin/views/filter/ManyToOne.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/filter/ManyToOne.php
rename to core/modules/views/lib/Plugin/views/filter/ManyToOne.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Numeric.php b/core/modules/views/lib/Plugin/views/filter/Numeric.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/filter/Numeric.php
rename to core/modules/views/lib/Plugin/views/filter/Numeric.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Standard.php b/core/modules/views/lib/Plugin/views/filter/Standard.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/filter/Standard.php
rename to core/modules/views/lib/Plugin/views/filter/Standard.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/String.php b/core/modules/views/lib/Plugin/views/filter/String.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/filter/String.php
rename to core/modules/views/lib/Plugin/views/filter/String.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/join/JoinPluginBase.php b/core/modules/views/lib/Plugin/views/join/JoinPluginBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/join/JoinPluginBase.php
rename to core/modules/views/lib/Plugin/views/join/JoinPluginBase.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/join/Standard.php b/core/modules/views/lib/Plugin/views/join/Standard.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/join/Standard.php
rename to core/modules/views/lib/Plugin/views/join/Standard.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/join/Subquery.php b/core/modules/views/lib/Plugin/views/join/Subquery.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/join/Subquery.php
rename to core/modules/views/lib/Plugin/views/join/Subquery.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/Full.php b/core/modules/views/lib/Plugin/views/pager/Full.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/pager/Full.php
rename to core/modules/views/lib/Plugin/views/pager/Full.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/Mini.php b/core/modules/views/lib/Plugin/views/pager/Mini.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/pager/Mini.php
rename to core/modules/views/lib/Plugin/views/pager/Mini.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/None.php b/core/modules/views/lib/Plugin/views/pager/None.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/pager/None.php
rename to core/modules/views/lib/Plugin/views/pager/None.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php b/core/modules/views/lib/Plugin/views/pager/PagerPluginBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php
rename to core/modules/views/lib/Plugin/views/pager/PagerPluginBase.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/Some.php b/core/modules/views/lib/Plugin/views/pager/Some.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/pager/Some.php
rename to core/modules/views/lib/Plugin/views/pager/Some.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/SqlBase.php b/core/modules/views/lib/Plugin/views/pager/SqlBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/pager/SqlBase.php
rename to core/modules/views/lib/Plugin/views/pager/SqlBase.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/query/QueryInterface.php b/core/modules/views/lib/Plugin/views/query/QueryInterface.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/query/QueryInterface.php
rename to core/modules/views/lib/Plugin/views/query/QueryInterface.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/query/QueryPluginBase.php b/core/modules/views/lib/Plugin/views/query/QueryPluginBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/query/QueryPluginBase.php
rename to core/modules/views/lib/Plugin/views/query/QueryPluginBase.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php b/core/modules/views/lib/Plugin/views/query/Sql.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php
rename to core/modules/views/lib/Plugin/views/query/Sql.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/Broken.php b/core/modules/views/lib/Plugin/views/relationship/Broken.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/relationship/Broken.php
rename to core/modules/views/lib/Plugin/views/relationship/Broken.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php b/core/modules/views/lib/Plugin/views/relationship/GroupwiseMax.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php
rename to core/modules/views/lib/Plugin/views/relationship/GroupwiseMax.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/RelationshipPluginBase.php b/core/modules/views/lib/Plugin/views/relationship/RelationshipPluginBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/relationship/RelationshipPluginBase.php
rename to core/modules/views/lib/Plugin/views/relationship/RelationshipPluginBase.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/Standard.php b/core/modules/views/lib/Plugin/views/relationship/Standard.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/relationship/Standard.php
rename to core/modules/views/lib/Plugin/views/relationship/Standard.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/row/EntityRow.php b/core/modules/views/lib/Plugin/views/row/EntityRow.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/row/EntityRow.php
rename to core/modules/views/lib/Plugin/views/row/EntityRow.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/row/Fields.php b/core/modules/views/lib/Plugin/views/row/Fields.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/row/Fields.php
rename to core/modules/views/lib/Plugin/views/row/Fields.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/row/RowPluginBase.php b/core/modules/views/lib/Plugin/views/row/RowPluginBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/row/RowPluginBase.php
rename to core/modules/views/lib/Plugin/views/row/RowPluginBase.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/row/RssFields.php b/core/modules/views/lib/Plugin/views/row/RssFields.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/row/RssFields.php
rename to core/modules/views/lib/Plugin/views/row/RssFields.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Broken.php b/core/modules/views/lib/Plugin/views/sort/Broken.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/sort/Broken.php
rename to core/modules/views/lib/Plugin/views/sort/Broken.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Date.php b/core/modules/views/lib/Plugin/views/sort/Date.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/sort/Date.php
rename to core/modules/views/lib/Plugin/views/sort/Date.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/GroupByNumeric.php b/core/modules/views/lib/Plugin/views/sort/GroupByNumeric.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/sort/GroupByNumeric.php
rename to core/modules/views/lib/Plugin/views/sort/GroupByNumeric.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php b/core/modules/views/lib/Plugin/views/sort/MenuHierarchy.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php
rename to core/modules/views/lib/Plugin/views/sort/MenuHierarchy.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Random.php b/core/modules/views/lib/Plugin/views/sort/Random.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/sort/Random.php
rename to core/modules/views/lib/Plugin/views/sort/Random.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php b/core/modules/views/lib/Plugin/views/sort/SortPluginBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php
rename to core/modules/views/lib/Plugin/views/sort/SortPluginBase.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Standard.php b/core/modules/views/lib/Plugin/views/sort/Standard.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/sort/Standard.php
rename to core/modules/views/lib/Plugin/views/sort/Standard.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/DefaultStyle.php b/core/modules/views/lib/Plugin/views/style/DefaultStyle.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/style/DefaultStyle.php
rename to core/modules/views/lib/Plugin/views/style/DefaultStyle.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/DefaultSummary.php b/core/modules/views/lib/Plugin/views/style/DefaultSummary.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/style/DefaultSummary.php
rename to core/modules/views/lib/Plugin/views/style/DefaultSummary.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/Grid.php b/core/modules/views/lib/Plugin/views/style/Grid.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/style/Grid.php
rename to core/modules/views/lib/Plugin/views/style/Grid.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/HtmlList.php b/core/modules/views/lib/Plugin/views/style/HtmlList.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/style/HtmlList.php
rename to core/modules/views/lib/Plugin/views/style/HtmlList.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/Mapping.php b/core/modules/views/lib/Plugin/views/style/Mapping.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/style/Mapping.php
rename to core/modules/views/lib/Plugin/views/style/Mapping.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/Rss.php b/core/modules/views/lib/Plugin/views/style/Rss.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/style/Rss.php
rename to core/modules/views/lib/Plugin/views/style/Rss.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php b/core/modules/views/lib/Plugin/views/style/StylePluginBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php
rename to core/modules/views/lib/Plugin/views/style/StylePluginBase.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/Table.php b/core/modules/views/lib/Plugin/views/style/Table.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/style/Table.php
rename to core/modules/views/lib/Plugin/views/style/Table.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/UnformattedSummary.php b/core/modules/views/lib/Plugin/views/style/UnformattedSummary.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/style/UnformattedSummary.php
rename to core/modules/views/lib/Plugin/views/style/UnformattedSummary.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/wizard/Standard.php b/core/modules/views/lib/Plugin/views/wizard/Standard.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/wizard/Standard.php
rename to core/modules/views/lib/Plugin/views/wizard/Standard.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardException.php b/core/modules/views/lib/Plugin/views/wizard/WizardException.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardException.php
rename to core/modules/views/lib/Plugin/views/wizard/WizardException.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardInterface.php b/core/modules/views/lib/Plugin/views/wizard/WizardInterface.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardInterface.php
rename to core/modules/views/lib/Plugin/views/wizard/WizardInterface.php
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php b/core/modules/views/lib/Plugin/views/wizard/WizardPluginBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
rename to core/modules/views/lib/Plugin/views/wizard/WizardPluginBase.php
diff --git a/core/modules/views/lib/Drupal/views/ResultRow.php b/core/modules/views/lib/ResultRow.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/ResultRow.php
rename to core/modules/views/lib/ResultRow.php
diff --git a/core/modules/views/lib/Drupal/views/Routing/ViewPageController.php b/core/modules/views/lib/Routing/ViewPageController.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Routing/ViewPageController.php
rename to core/modules/views/lib/Routing/ViewPageController.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/BasicTest.php b/core/modules/views/lib/Tests/BasicTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/BasicTest.php
rename to core/modules/views/lib/Tests/BasicTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php b/core/modules/views/lib/Tests/DefaultViewsTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php
rename to core/modules/views/lib/Tests/DefaultViewsTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Entity/FieldEntityTest.php b/core/modules/views/lib/Tests/Entity/FieldEntityTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Entity/FieldEntityTest.php
rename to core/modules/views/lib/Tests/Entity/FieldEntityTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Entity/FilterEntityBundleTest.php b/core/modules/views/lib/Tests/Entity/FilterEntityBundleTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Entity/FilterEntityBundleTest.php
rename to core/modules/views/lib/Tests/Entity/FilterEntityBundleTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/GlossaryTest.php b/core/modules/views/lib/Tests/GlossaryTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/GlossaryTest.php
rename to core/modules/views/lib/Tests/GlossaryTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaEntityTest.php b/core/modules/views/lib/Tests/Handler/AreaEntityTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/AreaEntityTest.php
rename to core/modules/views/lib/Tests/Handler/AreaEntityTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaHTTPStatusCodeTest.php b/core/modules/views/lib/Tests/Handler/AreaHTTPStatusCodeTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/AreaHTTPStatusCodeTest.php
rename to core/modules/views/lib/Tests/Handler/AreaHTTPStatusCodeTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTest.php b/core/modules/views/lib/Tests/Handler/AreaTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/AreaTest.php
rename to core/modules/views/lib/Tests/Handler/AreaTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTextTest.php b/core/modules/views/lib/Tests/Handler/AreaTextTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/AreaTextTest.php
rename to core/modules/views/lib/Tests/Handler/AreaTextTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTitleTest.php b/core/modules/views/lib/Tests/Handler/AreaTitleTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/AreaTitleTest.php
rename to core/modules/views/lib/Tests/Handler/AreaTitleTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentDateTest.php b/core/modules/views/lib/Tests/Handler/ArgumentDateTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentDateTest.php
rename to core/modules/views/lib/Tests/Handler/ArgumentDateTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php b/core/modules/views/lib/Tests/Handler/ArgumentNullTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php
rename to core/modules/views/lib/Tests/Handler/ArgumentNullTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php b/core/modules/views/lib/Tests/Handler/ArgumentStringTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php
rename to core/modules/views/lib/Tests/Handler/ArgumentStringTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php b/core/modules/views/lib/Tests/Handler/FieldBooleanTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
rename to core/modules/views/lib/Tests/Handler/FieldBooleanTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldCounterTest.php b/core/modules/views/lib/Tests/Handler/FieldCounterTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/FieldCounterTest.php
rename to core/modules/views/lib/Tests/Handler/FieldCounterTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldCustomTest.php b/core/modules/views/lib/Tests/Handler/FieldCustomTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/FieldCustomTest.php
rename to core/modules/views/lib/Tests/Handler/FieldCustomTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldDateTest.php b/core/modules/views/lib/Tests/Handler/FieldDateTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/FieldDateTest.php
rename to core/modules/views/lib/Tests/Handler/FieldDateTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldDropButtonTest.php b/core/modules/views/lib/Tests/Handler/FieldDropButtonTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/FieldDropButtonTest.php
rename to core/modules/views/lib/Tests/Handler/FieldDropButtonTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php b/core/modules/views/lib/Tests/Handler/FieldFileSizeTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php
rename to core/modules/views/lib/Tests/Handler/FieldFileSizeTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUnitTest.php b/core/modules/views/lib/Tests/Handler/FieldUnitTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/FieldUnitTest.php
rename to core/modules/views/lib/Tests/Handler/FieldUnitTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUrlTest.php b/core/modules/views/lib/Tests/Handler/FieldUrlTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/FieldUrlTest.php
rename to core/modules/views/lib/Tests/Handler/FieldUrlTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldWebTest.php b/core/modules/views/lib/Tests/Handler/FieldWebTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/FieldWebTest.php
rename to core/modules/views/lib/Tests/Handler/FieldWebTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldXssTest.php b/core/modules/views/lib/Tests/Handler/FieldXssTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/FieldXssTest.php
rename to core/modules/views/lib/Tests/Handler/FieldXssTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterBooleanOperatorStringTest.php b/core/modules/views/lib/Tests/Handler/FilterBooleanOperatorStringTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/FilterBooleanOperatorStringTest.php
rename to core/modules/views/lib/Tests/Handler/FilterBooleanOperatorStringTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterBooleanOperatorTest.php b/core/modules/views/lib/Tests/Handler/FilterBooleanOperatorTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/FilterBooleanOperatorTest.php
rename to core/modules/views/lib/Tests/Handler/FilterBooleanOperatorTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterCombineTest.php b/core/modules/views/lib/Tests/Handler/FilterCombineTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/FilterCombineTest.php
rename to core/modules/views/lib/Tests/Handler/FilterCombineTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterDateTest.php b/core/modules/views/lib/Tests/Handler/FilterDateTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/FilterDateTest.php
rename to core/modules/views/lib/Tests/Handler/FilterDateTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php b/core/modules/views/lib/Tests/Handler/FilterEqualityTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php
rename to core/modules/views/lib/Tests/Handler/FilterEqualityTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php b/core/modules/views/lib/Tests/Handler/FilterInOperatorTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php
rename to core/modules/views/lib/Tests/Handler/FilterInOperatorTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterNumericTest.php b/core/modules/views/lib/Tests/Handler/FilterNumericTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/FilterNumericTest.php
rename to core/modules/views/lib/Tests/Handler/FilterNumericTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterStringTest.php b/core/modules/views/lib/Tests/Handler/FilterStringTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/FilterStringTest.php
rename to core/modules/views/lib/Tests/Handler/FilterStringTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAliasTest.php b/core/modules/views/lib/Tests/Handler/HandlerAliasTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAliasTest.php
rename to core/modules/views/lib/Tests/Handler/HandlerAliasTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAllTest.php b/core/modules/views/lib/Tests/Handler/HandlerAllTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAllTest.php
rename to core/modules/views/lib/Tests/Handler/HandlerAllTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerTest.php b/core/modules/views/lib/Tests/Handler/HandlerTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/HandlerTest.php
rename to core/modules/views/lib/Tests/Handler/HandlerTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerTestBase.php b/core/modules/views/lib/Tests/Handler/HandlerTestBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/HandlerTestBase.php
rename to core/modules/views/lib/Tests/Handler/HandlerTestBase.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/RelationshipTest.php b/core/modules/views/lib/Tests/Handler/RelationshipTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/RelationshipTest.php
rename to core/modules/views/lib/Tests/Handler/RelationshipTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/SortDateTest.php b/core/modules/views/lib/Tests/Handler/SortDateTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/SortDateTest.php
rename to core/modules/views/lib/Tests/Handler/SortDateTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/SortRandomTest.php b/core/modules/views/lib/Tests/Handler/SortRandomTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/SortRandomTest.php
rename to core/modules/views/lib/Tests/Handler/SortRandomTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/SortTest.php b/core/modules/views/lib/Tests/Handler/SortTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Handler/SortTest.php
rename to core/modules/views/lib/Tests/Handler/SortTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php b/core/modules/views/lib/Tests/ModuleTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/ModuleTest.php
rename to core/modules/views/lib/Tests/ModuleTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/AccessTest.php b/core/modules/views/lib/Tests/Plugin/AccessTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/AccessTest.php
rename to core/modules/views/lib/Tests/Plugin/AccessTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php b/core/modules/views/lib/Tests/Plugin/ArgumentDefaultTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php
rename to core/modules/views/lib/Tests/Plugin/ArgumentDefaultTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php b/core/modules/views/lib/Tests/Plugin/ArgumentValidatorTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php
rename to core/modules/views/lib/Tests/Plugin/ArgumentValidatorTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/CacheTest.php b/core/modules/views/lib/Tests/Plugin/CacheTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/CacheTest.php
rename to core/modules/views/lib/Tests/Plugin/CacheTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayAttachmentTest.php b/core/modules/views/lib/Tests/Plugin/DisplayAttachmentTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayAttachmentTest.php
rename to core/modules/views/lib/Tests/Plugin/DisplayAttachmentTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayExtenderTest.php b/core/modules/views/lib/Tests/Plugin/DisplayExtenderTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayExtenderTest.php
rename to core/modules/views/lib/Tests/Plugin/DisplayExtenderTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayFeedTest.php b/core/modules/views/lib/Tests/Plugin/DisplayFeedTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayFeedTest.php
rename to core/modules/views/lib/Tests/Plugin/DisplayFeedTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayPageTest.php b/core/modules/views/lib/Tests/Plugin/DisplayPageTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayPageTest.php
rename to core/modules/views/lib/Tests/Plugin/DisplayPageTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayPageWebTest.php b/core/modules/views/lib/Tests/Plugin/DisplayPageWebTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayPageWebTest.php
rename to core/modules/views/lib/Tests/Plugin/DisplayPageWebTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayTest.php b/core/modules/views/lib/Tests/Plugin/DisplayTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayTest.php
rename to core/modules/views/lib/Tests/Plugin/DisplayTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayUnitTest.php b/core/modules/views/lib/Tests/Plugin/DisplayUnitTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayUnitTest.php
rename to core/modules/views/lib/Tests/Plugin/DisplayUnitTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php b/core/modules/views/lib/Tests/Plugin/ExposedFormTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php
rename to core/modules/views/lib/Tests/Plugin/ExposedFormTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/FilterTest.php b/core/modules/views/lib/Tests/Plugin/FilterTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/FilterTest.php
rename to core/modules/views/lib/Tests/Plugin/FilterTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/JoinTest.php b/core/modules/views/lib/Tests/Plugin/JoinTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/JoinTest.php
rename to core/modules/views/lib/Tests/Plugin/JoinTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/MiniPagerTest.php b/core/modules/views/lib/Tests/Plugin/MiniPagerTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/MiniPagerTest.php
rename to core/modules/views/lib/Tests/Plugin/MiniPagerTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/PagerTest.php b/core/modules/views/lib/Tests/Plugin/PagerTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/PagerTest.php
rename to core/modules/views/lib/Tests/Plugin/PagerTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/PluginTestBase.php b/core/modules/views/lib/Tests/Plugin/PluginTestBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/PluginTestBase.php
rename to core/modules/views/lib/Tests/Plugin/PluginTestBase.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/PluginUnitTestBase.php b/core/modules/views/lib/Tests/Plugin/PluginUnitTestBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/PluginUnitTestBase.php
rename to core/modules/views/lib/Tests/Plugin/PluginUnitTestBase.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/QueryTest.php b/core/modules/views/lib/Tests/Plugin/QueryTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/QueryTest.php
rename to core/modules/views/lib/Tests/Plugin/QueryTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/RelationshipJoinTestBase.php b/core/modules/views/lib/Tests/Plugin/RelationshipJoinTestBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/RelationshipJoinTestBase.php
rename to core/modules/views/lib/Tests/Plugin/RelationshipJoinTestBase.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/RowEntityTest.php b/core/modules/views/lib/Tests/Plugin/RowEntityTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/RowEntityTest.php
rename to core/modules/views/lib/Tests/Plugin/RowEntityTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleGridTest.php b/core/modules/views/lib/Tests/Plugin/StyleGridTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/StyleGridTest.php
rename to core/modules/views/lib/Tests/Plugin/StyleGridTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleMappingTest.php b/core/modules/views/lib/Tests/Plugin/StyleMappingTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/StyleMappingTest.php
rename to core/modules/views/lib/Tests/Plugin/StyleMappingTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTableTest.php b/core/modules/views/lib/Tests/Plugin/StyleTableTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTableTest.php
rename to core/modules/views/lib/Tests/Plugin/StyleTableTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTableUnitTest.php b/core/modules/views/lib/Tests/Plugin/StyleTableUnitTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTableUnitTest.php
rename to core/modules/views/lib/Tests/Plugin/StyleTableUnitTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTest.php b/core/modules/views/lib/Tests/Plugin/StyleTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTest.php
rename to core/modules/views/lib/Tests/Plugin/StyleTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTestBase.php b/core/modules/views/lib/Tests/Plugin/StyleTestBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTestBase.php
rename to core/modules/views/lib/Tests/Plugin/StyleTestBase.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleUnformattedTest.php b/core/modules/views/lib/Tests/Plugin/StyleUnformattedTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/StyleUnformattedTest.php
rename to core/modules/views/lib/Tests/Plugin/StyleUnformattedTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/ViewsBlockTest.php b/core/modules/views/lib/Tests/Plugin/ViewsBlockTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Plugin/ViewsBlockTest.php
rename to core/modules/views/lib/Tests/Plugin/ViewsBlockTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/PluginInstanceTest.php b/core/modules/views/lib/Tests/PluginInstanceTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/PluginInstanceTest.php
rename to core/modules/views/lib/Tests/PluginInstanceTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/QueryGroupByTest.php b/core/modules/views/lib/Tests/QueryGroupByTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/QueryGroupByTest.php
rename to core/modules/views/lib/Tests/QueryGroupByTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/TestHelperPlugin.php b/core/modules/views/lib/Tests/TestHelperPlugin.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/TestHelperPlugin.php
rename to core/modules/views/lib/Tests/TestHelperPlugin.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/TokenReplaceTest.php b/core/modules/views/lib/Tests/TokenReplaceTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/TokenReplaceTest.php
rename to core/modules/views/lib/Tests/TokenReplaceTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewAjaxTest.php b/core/modules/views/lib/Tests/ViewAjaxTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/ViewAjaxTest.php
rename to core/modules/views/lib/Tests/ViewAjaxTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewElementTest.php b/core/modules/views/lib/Tests/ViewElementTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/ViewElementTest.php
rename to core/modules/views/lib/Tests/ViewElementTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php b/core/modules/views/lib/Tests/ViewExecutableTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php
rename to core/modules/views/lib/Tests/ViewExecutableTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewPageControllerTest.php b/core/modules/views/lib/Tests/ViewPageControllerTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/ViewPageControllerTest.php
rename to core/modules/views/lib/Tests/ViewPageControllerTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewRenderTest.php b/core/modules/views/lib/Tests/ViewRenderTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/ViewRenderTest.php
rename to core/modules/views/lib/Tests/ViewRenderTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php b/core/modules/views/lib/Tests/ViewStorageTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php
rename to core/modules/views/lib/Tests/ViewStorageTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php b/core/modules/views/lib/Tests/ViewTestBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php
rename to core/modules/views/lib/Tests/ViewTestBase.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewTestConfigInstaller.php b/core/modules/views/lib/Tests/ViewTestConfigInstaller.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/ViewTestConfigInstaller.php
rename to core/modules/views/lib/Tests/ViewTestConfigInstaller.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewTestData.php b/core/modules/views/lib/Tests/ViewTestData.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/ViewTestData.php
rename to core/modules/views/lib/Tests/ViewTestData.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewUnitTestBase.php b/core/modules/views/lib/Tests/ViewUnitTestBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/ViewUnitTestBase.php
rename to core/modules/views/lib/Tests/ViewUnitTestBase.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewsDataTest.php b/core/modules/views/lib/Tests/ViewsDataTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/ViewsDataTest.php
rename to core/modules/views/lib/Tests/ViewsDataTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewsHooksTest.php b/core/modules/views/lib/Tests/ViewsHooksTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/ViewsHooksTest.php
rename to core/modules/views/lib/Tests/ViewsHooksTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewsTaxonomyAutocompleteTest.php b/core/modules/views/lib/Tests/ViewsTaxonomyAutocompleteTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/ViewsTaxonomyAutocompleteTest.php
rename to core/modules/views/lib/Tests/ViewsTaxonomyAutocompleteTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewsTemplateTest.php b/core/modules/views/lib/Tests/ViewsTemplateTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/ViewsTemplateTest.php
rename to core/modules/views/lib/Tests/ViewsTemplateTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/BasicTest.php b/core/modules/views/lib/Tests/Wizard/BasicTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Wizard/BasicTest.php
rename to core/modules/views/lib/Tests/Wizard/BasicTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/ItemsPerPageTest.php b/core/modules/views/lib/Tests/Wizard/ItemsPerPageTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Wizard/ItemsPerPageTest.php
rename to core/modules/views/lib/Tests/Wizard/ItemsPerPageTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/MenuTest.php b/core/modules/views/lib/Tests/Wizard/MenuTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Wizard/MenuTest.php
rename to core/modules/views/lib/Tests/Wizard/MenuTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/SortingTest.php b/core/modules/views/lib/Tests/Wizard/SortingTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Wizard/SortingTest.php
rename to core/modules/views/lib/Tests/Wizard/SortingTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/TaggedWithTest.php b/core/modules/views/lib/Tests/Wizard/TaggedWithTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Wizard/TaggedWithTest.php
rename to core/modules/views/lib/Tests/Wizard/TaggedWithTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/WizardPluginBaseUnitTest.php b/core/modules/views/lib/Tests/Wizard/WizardPluginBaseUnitTest.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Wizard/WizardPluginBaseUnitTest.php
rename to core/modules/views/lib/Tests/Wizard/WizardPluginBaseUnitTest.php
diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/WizardTestBase.php b/core/modules/views/lib/Tests/Wizard/WizardTestBase.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Tests/Wizard/WizardTestBase.php
rename to core/modules/views/lib/Tests/Wizard/WizardTestBase.php
diff --git a/core/modules/views/lib/Drupal/views/ViewAccessController.php b/core/modules/views/lib/ViewAccessController.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/ViewAccessController.php
rename to core/modules/views/lib/ViewAccessController.php
diff --git a/core/modules/views/lib/Drupal/views/ViewExecutable.php b/core/modules/views/lib/ViewExecutable.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/ViewExecutable.php
rename to core/modules/views/lib/ViewExecutable.php
diff --git a/core/modules/views/lib/Drupal/views/ViewExecutableFactory.php b/core/modules/views/lib/ViewExecutableFactory.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/ViewExecutableFactory.php
rename to core/modules/views/lib/ViewExecutableFactory.php
diff --git a/core/modules/views/lib/Drupal/views/ViewStorageController.php b/core/modules/views/lib/ViewStorageController.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/ViewStorageController.php
rename to core/modules/views/lib/ViewStorageController.php
diff --git a/core/modules/views/lib/Drupal/views/ViewStorageInterface.php b/core/modules/views/lib/ViewStorageInterface.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/ViewStorageInterface.php
rename to core/modules/views/lib/ViewStorageInterface.php
diff --git a/core/modules/views/lib/Drupal/views/Views.php b/core/modules/views/lib/Views.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/Views.php
rename to core/modules/views/lib/Views.php
diff --git a/core/modules/views/lib/Drupal/views/ViewsAccessCheck.php b/core/modules/views/lib/ViewsAccessCheck.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/ViewsAccessCheck.php
rename to core/modules/views/lib/ViewsAccessCheck.php
diff --git a/core/modules/views/lib/Drupal/views/ViewsData.php b/core/modules/views/lib/ViewsData.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/ViewsData.php
rename to core/modules/views/lib/ViewsData.php
diff --git a/core/modules/views/lib/Drupal/views/ViewsDataHelper.php b/core/modules/views/lib/ViewsDataHelper.php
similarity index 100%
rename from core/modules/views/lib/Drupal/views/ViewsDataHelper.php
rename to core/modules/views/lib/ViewsDataHelper.php
diff --git a/core/modules/views/tests/Drupal/views/Tests/Controller/ViewAjaxControllerTest.php b/core/modules/views/tests/lib/Controller/ViewAjaxControllerTest.php
similarity index 100%
rename from core/modules/views/tests/Drupal/views/Tests/Controller/ViewAjaxControllerTest.php
rename to core/modules/views/tests/lib/Controller/ViewAjaxControllerTest.php
diff --git a/core/modules/views/tests/Drupal/views/Tests/Plugin/Block/ViewsBlockTest.php b/core/modules/views/tests/lib/Plugin/Block/ViewsBlockTest.php
similarity index 100%
rename from core/modules/views/tests/Drupal/views/Tests/Plugin/Block/ViewsBlockTest.php
rename to core/modules/views/tests/lib/Plugin/Block/ViewsBlockTest.php
diff --git a/core/modules/views/tests/Drupal/views/Tests/Plugin/argument_default/RawTest.php b/core/modules/views/tests/lib/Plugin/argument_default/RawTest.php
similarity index 100%
rename from core/modules/views/tests/Drupal/views/Tests/Plugin/argument_default/RawTest.php
rename to core/modules/views/tests/lib/Plugin/argument_default/RawTest.php
diff --git a/core/modules/views/tests/Drupal/views/Tests/Plugin/field/CounterTest.php b/core/modules/views/tests/lib/Plugin/field/CounterTest.php
similarity index 100%
rename from core/modules/views/tests/Drupal/views/Tests/Plugin/field/CounterTest.php
rename to core/modules/views/tests/lib/Plugin/field/CounterTest.php
diff --git a/core/modules/views/tests/Drupal/views/Tests/PluginBaseTest.php b/core/modules/views/tests/lib/PluginBaseTest.php
similarity index 100%
rename from core/modules/views/tests/Drupal/views/Tests/PluginBaseTest.php
rename to core/modules/views/tests/lib/PluginBaseTest.php
diff --git a/core/modules/views/tests/Drupal/views/Tests/PluginTypeListTest.php b/core/modules/views/tests/lib/PluginTypeListTest.php
similarity index 100%
rename from core/modules/views/tests/Drupal/views/Tests/PluginTypeListTest.php
rename to core/modules/views/tests/lib/PluginTypeListTest.php
diff --git a/core/modules/views/tests/Drupal/views/Tests/ViewExecutableUnitTest.php b/core/modules/views/tests/lib/ViewExecutableUnitTest.php
similarity index 100%
rename from core/modules/views/tests/Drupal/views/Tests/ViewExecutableUnitTest.php
rename to core/modules/views/tests/lib/ViewExecutableUnitTest.php
diff --git a/core/modules/views/tests/Drupal/views/Tests/ViewsDataHelperTest.php b/core/modules/views/tests/lib/ViewsDataHelperTest.php
similarity index 100%
rename from core/modules/views/tests/Drupal/views/Tests/ViewsDataHelperTest.php
rename to core/modules/views/tests/lib/ViewsDataHelperTest.php
diff --git a/core/modules/views/tests/Drupal/views/Tests/ViewsTest.php b/core/modules/views/tests/lib/ViewsTest.php
similarity index 100%
rename from core/modules/views/tests/Drupal/views/Tests/ViewsTest.php
rename to core/modules/views/tests/lib/ViewsTest.php
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Form/ViewsTestDataElementForm.php b/core/modules/views/tests/modules/views_test_data/lib/Form/ViewsTestDataElementForm.php
similarity index 100%
rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Form/ViewsTestDataElementForm.php
rename to core/modules/views/tests/modules/views_test_data/lib/Form/ViewsTestDataElementForm.php
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/StaticTest.php b/core/modules/views/tests/modules/views_test_data/lib/Plugin/views/access/StaticTest.php
similarity index 100%
rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/StaticTest.php
rename to core/modules/views/tests/modules/views_test_data/lib/Plugin/views/access/StaticTest.php
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/area/TestExample.php b/core/modules/views/tests/modules/views_test_data/lib/Plugin/views/area/TestExample.php
similarity index 100%
rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/area/TestExample.php
rename to core/modules/views/tests/modules/views_test_data/lib/Plugin/views/area/TestExample.php
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/argument_default/ArgumentDefaultTest.php b/core/modules/views/tests/modules/views_test_data/lib/Plugin/views/argument_default/ArgumentDefaultTest.php
similarity index 100%
rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/argument_default/ArgumentDefaultTest.php
rename to core/modules/views/tests/modules/views_test_data/lib/Plugin/views/argument_default/ArgumentDefaultTest.php
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayNoAreaTest.php b/core/modules/views/tests/modules/views_test_data/lib/Plugin/views/display/DisplayNoAreaTest.php
similarity index 100%
rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayNoAreaTest.php
rename to core/modules/views/tests/modules/views_test_data/lib/Plugin/views/display/DisplayNoAreaTest.php
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayTest.php b/core/modules/views/tests/modules/views_test_data/lib/Plugin/views/display/DisplayTest.php
similarity index 100%
rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayTest.php
rename to core/modules/views/tests/modules/views_test_data/lib/Plugin/views/display/DisplayTest.php
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest.php b/core/modules/views/tests/modules/views_test_data/lib/Plugin/views/display_extender/DisplayExtenderTest.php
similarity index 100%
rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest.php
rename to core/modules/views/tests/modules/views_test_data/lib/Plugin/views/display_extender/DisplayExtenderTest.php
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest2.php b/core/modules/views/tests/modules/views_test_data/lib/Plugin/views/display_extender/DisplayExtenderTest2.php
similarity index 100%
rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest2.php
rename to core/modules/views/tests/modules/views_test_data/lib/Plugin/views/display_extender/DisplayExtenderTest2.php
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/field/FieldTest.php b/core/modules/views/tests/modules/views_test_data/lib/Plugin/views/field/FieldTest.php
similarity index 100%
rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/field/FieldTest.php
rename to core/modules/views/tests/modules/views_test_data/lib/Plugin/views/field/FieldTest.php
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/filter/FilterTest.php b/core/modules/views/tests/modules/views_test_data/lib/Plugin/views/filter/FilterTest.php
similarity index 100%
rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/filter/FilterTest.php
rename to core/modules/views/tests/modules/views_test_data/lib/Plugin/views/filter/FilterTest.php
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/join/JoinTest.php b/core/modules/views/tests/modules/views_test_data/lib/Plugin/views/join/JoinTest.php
similarity index 100%
rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/join/JoinTest.php
rename to core/modules/views/tests/modules/views_test_data/lib/Plugin/views/join/JoinTest.php
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/query/QueryTest.php b/core/modules/views/tests/modules/views_test_data/lib/Plugin/views/query/QueryTest.php
similarity index 100%
rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/query/QueryTest.php
rename to core/modules/views/tests/modules/views_test_data/lib/Plugin/views/query/QueryTest.php
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/row/RowTest.php b/core/modules/views/tests/modules/views_test_data/lib/Plugin/views/row/RowTest.php
similarity index 100%
rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/row/RowTest.php
rename to core/modules/views/tests/modules/views_test_data/lib/Plugin/views/row/RowTest.php
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/MappingTest.php b/core/modules/views/tests/modules/views_test_data/lib/Plugin/views/style/MappingTest.php
similarity index 100%
rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/MappingTest.php
rename to core/modules/views/tests/modules/views_test_data/lib/Plugin/views/style/MappingTest.php
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/StyleTemplateTest.php b/core/modules/views/tests/modules/views_test_data/lib/Plugin/views/style/StyleTemplateTest.php
similarity index 100%
rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/StyleTemplateTest.php
rename to core/modules/views/tests/modules/views_test_data/lib/Plugin/views/style/StyleTemplateTest.php
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/StyleTest.php b/core/modules/views/tests/modules/views_test_data/lib/Plugin/views/style/StyleTest.php
similarity index 100%
rename from core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/StyleTest.php
rename to core/modules/views/tests/modules/views_test_data/lib/Plugin/views/style/StyleTest.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php b/core/modules/views_ui/lib/Controller/ViewsUIController.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php
rename to core/modules/views_ui/lib/Controller/ViewsUIController.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/AdvancedSettingsForm.php b/core/modules/views_ui/lib/Form/AdvancedSettingsForm.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Form/AdvancedSettingsForm.php
rename to core/modules/views_ui/lib/Form/AdvancedSettingsForm.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/AddItem.php b/core/modules/views_ui/lib/Form/Ajax/AddItem.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/AddItem.php
rename to core/modules/views_ui/lib/Form/Ajax/AddItem.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/Analyze.php b/core/modules/views_ui/lib/Form/Ajax/Analyze.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/Analyze.php
rename to core/modules/views_ui/lib/Form/Ajax/Analyze.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItem.php b/core/modules/views_ui/lib/Form/Ajax/ConfigItem.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItem.php
rename to core/modules/views_ui/lib/Form/Ajax/ConfigItem.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemExtra.php b/core/modules/views_ui/lib/Form/Ajax/ConfigItemExtra.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemExtra.php
rename to core/modules/views_ui/lib/Form/Ajax/ConfigItemExtra.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemGroup.php b/core/modules/views_ui/lib/Form/Ajax/ConfigItemGroup.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemGroup.php
rename to core/modules/views_ui/lib/Form/Ajax/ConfigItemGroup.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/Display.php b/core/modules/views_ui/lib/Form/Ajax/Display.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/Display.php
rename to core/modules/views_ui/lib/Form/Ajax/Display.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/EditDetails.php b/core/modules/views_ui/lib/Form/Ajax/EditDetails.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/EditDetails.php
rename to core/modules/views_ui/lib/Form/Ajax/EditDetails.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/Rearrange.php b/core/modules/views_ui/lib/Form/Ajax/Rearrange.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/Rearrange.php
rename to core/modules/views_ui/lib/Form/Ajax/Rearrange.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/RearrangeFilter.php b/core/modules/views_ui/lib/Form/Ajax/RearrangeFilter.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/RearrangeFilter.php
rename to core/modules/views_ui/lib/Form/Ajax/RearrangeFilter.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ReorderDisplays.php b/core/modules/views_ui/lib/Form/Ajax/ReorderDisplays.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ReorderDisplays.php
rename to core/modules/views_ui/lib/Form/Ajax/ReorderDisplays.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormBase.php b/core/modules/views_ui/lib/Form/Ajax/ViewsFormBase.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormBase.php
rename to core/modules/views_ui/lib/Form/Ajax/ViewsFormBase.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormInterface.php b/core/modules/views_ui/lib/Form/Ajax/ViewsFormInterface.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormInterface.php
rename to core/modules/views_ui/lib/Form/Ajax/ViewsFormInterface.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/BasicSettingsForm.php b/core/modules/views_ui/lib/Form/BasicSettingsForm.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Form/BasicSettingsForm.php
rename to core/modules/views_ui/lib/Form/BasicSettingsForm.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/BreakLockForm.php b/core/modules/views_ui/lib/Form/BreakLockForm.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Form/BreakLockForm.php
rename to core/modules/views_ui/lib/Form/BreakLockForm.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ParamConverter/ViewUIConverter.php b/core/modules/views_ui/lib/ParamConverter/ViewUIConverter.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/ParamConverter/ViewUIConverter.php
rename to core/modules/views_ui/lib/ParamConverter/ViewUIConverter.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/AnalyzeTest.php b/core/modules/views_ui/lib/Tests/AnalyzeTest.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/AnalyzeTest.php
rename to core/modules/views_ui/lib/Tests/AnalyzeTest.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/CachedDataUITest.php b/core/modules/views_ui/lib/Tests/CachedDataUITest.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/CachedDataUITest.php
rename to core/modules/views_ui/lib/Tests/CachedDataUITest.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/CustomBooleanTest.php b/core/modules/views_ui/lib/Tests/CustomBooleanTest.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/CustomBooleanTest.php
rename to core/modules/views_ui/lib/Tests/CustomBooleanTest.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DefaultViewsTest.php b/core/modules/views_ui/lib/Tests/DefaultViewsTest.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/DefaultViewsTest.php
rename to core/modules/views_ui/lib/Tests/DefaultViewsTest.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayAttachmentTest.php b/core/modules/views_ui/lib/Tests/DisplayAttachmentTest.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayAttachmentTest.php
rename to core/modules/views_ui/lib/Tests/DisplayAttachmentTest.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayExtenderUITest.php b/core/modules/views_ui/lib/Tests/DisplayExtenderUITest.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayExtenderUITest.php
rename to core/modules/views_ui/lib/Tests/DisplayExtenderUITest.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayPath.php b/core/modules/views_ui/lib/Tests/DisplayPath.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayPath.php
rename to core/modules/views_ui/lib/Tests/DisplayPath.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php b/core/modules/views_ui/lib/Tests/DisplayTest.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php
rename to core/modules/views_ui/lib/Tests/DisplayTest.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/ExposedFormUITest.php b/core/modules/views_ui/lib/Tests/ExposedFormUITest.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/ExposedFormUITest.php
rename to core/modules/views_ui/lib/Tests/ExposedFormUITest.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/FieldUITest.php b/core/modules/views_ui/lib/Tests/FieldUITest.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/FieldUITest.php
rename to core/modules/views_ui/lib/Tests/FieldUITest.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/FilterBooleanWebTest.php b/core/modules/views_ui/lib/Tests/FilterBooleanWebTest.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/FilterBooleanWebTest.php
rename to core/modules/views_ui/lib/Tests/FilterBooleanWebTest.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/GroupByTest.php b/core/modules/views_ui/lib/Tests/GroupByTest.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/GroupByTest.php
rename to core/modules/views_ui/lib/Tests/GroupByTest.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/HandlerTest.php b/core/modules/views_ui/lib/Tests/HandlerTest.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/HandlerTest.php
rename to core/modules/views_ui/lib/Tests/HandlerTest.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/OverrideDisplaysTest.php b/core/modules/views_ui/lib/Tests/OverrideDisplaysTest.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/OverrideDisplaysTest.php
rename to core/modules/views_ui/lib/Tests/OverrideDisplaysTest.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/PreviewTest.php b/core/modules/views_ui/lib/Tests/PreviewTest.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/PreviewTest.php
rename to core/modules/views_ui/lib/Tests/PreviewTest.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/QueryTest.php b/core/modules/views_ui/lib/Tests/QueryTest.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/QueryTest.php
rename to core/modules/views_ui/lib/Tests/QueryTest.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/RearrangeFieldsTest.php b/core/modules/views_ui/lib/Tests/RearrangeFieldsTest.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/RearrangeFieldsTest.php
rename to core/modules/views_ui/lib/Tests/RearrangeFieldsTest.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/RedirectTest.php b/core/modules/views_ui/lib/Tests/RedirectTest.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/RedirectTest.php
rename to core/modules/views_ui/lib/Tests/RedirectTest.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/RowUITest.php b/core/modules/views_ui/lib/Tests/RowUITest.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/RowUITest.php
rename to core/modules/views_ui/lib/Tests/RowUITest.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/SettingsTest.php b/core/modules/views_ui/lib/Tests/SettingsTest.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/SettingsTest.php
rename to core/modules/views_ui/lib/Tests/SettingsTest.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/StorageTest.php b/core/modules/views_ui/lib/Tests/StorageTest.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/StorageTest.php
rename to core/modules/views_ui/lib/Tests/StorageTest.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/StyleUITest.php b/core/modules/views_ui/lib/Tests/StyleUITest.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/StyleUITest.php
rename to core/modules/views_ui/lib/Tests/StyleUITest.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/TagTest.php b/core/modules/views_ui/lib/Tests/TagTest.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/TagTest.php
rename to core/modules/views_ui/lib/Tests/TagTest.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/UITestBase.php b/core/modules/views_ui/lib/Tests/UITestBase.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/UITestBase.php
rename to core/modules/views_ui/lib/Tests/UITestBase.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/ViewEditTest.php b/core/modules/views_ui/lib/Tests/ViewEditTest.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/ViewEditTest.php
rename to core/modules/views_ui/lib/Tests/ViewEditTest.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/ViewsUITourTest.php b/core/modules/views_ui/lib/Tests/ViewsUITourTest.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/Tests/ViewsUITourTest.php
rename to core/modules/views_ui/lib/Tests/ViewsUITourTest.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewAddFormController.php b/core/modules/views_ui/lib/ViewAddFormController.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/ViewAddFormController.php
rename to core/modules/views_ui/lib/ViewAddFormController.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewCloneFormController.php b/core/modules/views_ui/lib/ViewCloneFormController.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/ViewCloneFormController.php
rename to core/modules/views_ui/lib/ViewCloneFormController.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewDeleteFormController.php b/core/modules/views_ui/lib/ViewDeleteFormController.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/ViewDeleteFormController.php
rename to core/modules/views_ui/lib/ViewDeleteFormController.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php b/core/modules/views_ui/lib/ViewEditFormController.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
rename to core/modules/views_ui/lib/ViewEditFormController.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewFormControllerBase.php b/core/modules/views_ui/lib/ViewFormControllerBase.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/ViewFormControllerBase.php
rename to core/modules/views_ui/lib/ViewFormControllerBase.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewListController.php b/core/modules/views_ui/lib/ViewListController.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/ViewListController.php
rename to core/modules/views_ui/lib/ViewListController.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php b/core/modules/views_ui/lib/ViewPreviewFormController.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php
rename to core/modules/views_ui/lib/ViewPreviewFormController.php
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php b/core/modules/views_ui/lib/ViewUI.php
similarity index 100%
rename from core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php
rename to core/modules/views_ui/lib/ViewUI.php
diff --git a/core/modules/views_ui/tests/Drupal/views_ui/Tests/Form/Ajax/RearrangeFilterTest.php b/core/modules/views_ui/tests/lib/Form/Ajax/RearrangeFilterTest.php
similarity index 100%
rename from core/modules/views_ui/tests/Drupal/views_ui/Tests/Form/Ajax/RearrangeFilterTest.php
rename to core/modules/views_ui/tests/lib/Form/Ajax/RearrangeFilterTest.php
diff --git a/core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewListControllerTest.php b/core/modules/views_ui/tests/lib/ViewListControllerTest.php
similarity index 100%
rename from core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewListControllerTest.php
rename to core/modules/views_ui/tests/lib/ViewListControllerTest.php
diff --git a/core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewUIObjectTest.php b/core/modules/views_ui/tests/lib/ViewUIObjectTest.php
similarity index 100%
rename from core/modules/views_ui/tests/Drupal/views_ui/Tests/ViewUIObjectTest.php
rename to core/modules/views_ui/tests/lib/ViewUIObjectTest.php
diff --git a/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcBasicTest.php b/core/modules/xmlrpc/lib/Tests/XmlRpcBasicTest.php
similarity index 100%
rename from core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcBasicTest.php
rename to core/modules/xmlrpc/lib/Tests/XmlRpcBasicTest.php
diff --git a/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcMessagesTest.php b/core/modules/xmlrpc/lib/Tests/XmlRpcMessagesTest.php
similarity index 100%
rename from core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcMessagesTest.php
rename to core/modules/xmlrpc/lib/Tests/XmlRpcMessagesTest.php
diff --git a/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcValidatorTest.php b/core/modules/xmlrpc/lib/Tests/XmlRpcValidatorTest.php
similarity index 100%
rename from core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcValidatorTest.php
rename to core/modules/xmlrpc/lib/Tests/XmlRpcValidatorTest.php
diff --git a/core/profiles/minimal/lib/Drupal/minimal/Tests/MinimalTest.php b/core/profiles/minimal/lib/Tests/MinimalTest.php
similarity index 100%
rename from core/profiles/minimal/lib/Drupal/minimal/Tests/MinimalTest.php
rename to core/profiles/minimal/lib/Tests/MinimalTest.php
diff --git a/core/profiles/standard/lib/Drupal/standard/Tests/StandardTest.php b/core/profiles/standard/lib/Tests/StandardTest.php
similarity index 100%
rename from core/profiles/standard/lib/Drupal/standard/Tests/StandardTest.php
rename to core/profiles/standard/lib/Tests/StandardTest.php
diff --git a/core/profiles/testing/modules/drupal_system_listing_compatible_test/lib/Drupal/drupal_system_listing_compatible_test/Tests/SystemListingCompatibleTest.php b/core/profiles/testing/modules/drupal_system_listing_compatible_test/lib/Tests/SystemListingCompatibleTest.php
similarity index 100%
rename from core/profiles/testing/modules/drupal_system_listing_compatible_test/lib/Drupal/drupal_system_listing_compatible_test/Tests/SystemListingCompatibleTest.php
rename to core/profiles/testing/modules/drupal_system_listing_compatible_test/lib/Tests/SystemListingCompatibleTest.php
diff --git a/core/scripts/run-tests.sh b/core/scripts/run-tests.sh
index 31ea371..d274252 100755
--- a/core/scripts/run-tests.sh
+++ b/core/scripts/run-tests.sh
@@ -4,7 +4,7 @@
  * This script runs Drupal tests from command line.
  */
 
-require_once __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__ . '/../autoload.php';
 
 use Drupal\Core\StreamWrapper\PublicStream;
 
diff --git a/core/scripts/switch-psr4.sh b/core/scripts/switch-psr4.sh
new file mode 100644
index 0000000..ed76b47
--- /dev/null
+++ b/core/scripts/switch-psr4.sh
@@ -0,0 +1,122 @@
+#!/bin/php
+<?php
+
+/**
+ * @file
+ * Moves class files in extensions to their PSR-4 location.
+ */
+
+// Determine DRUPAL_ROOT.
+$dir = dirname(__FILE__);
+while (!defined('DRUPAL_ROOT')) {
+  if (is_dir($dir . '/core')) {
+    define('DRUPAL_ROOT', $dir);
+  }
+  $dir = dirname($dir);
+}
+
+process_extensions_base_dir(DRUPAL_ROOT . '/core/modules');
+process_extensions_base_dir(DRUPAL_ROOT . '/core/profiles');
+
+function process_extensions_base_dir($dir) {
+  /**
+   * @var SplFileInfo $fileinfo
+   */
+  foreach (new \DirectoryIterator($dir) as $fileinfo) {
+    if ($fileinfo->isDot()) {
+      // do nothing
+    }
+    elseif ($fileinfo->isDir()) {
+      process_candidate_dir($fileinfo->getPathname());
+    }
+  }
+}
+
+function process_candidate_dir($dir) {
+  foreach (new \DirectoryIterator($dir) as $fileinfo) {
+    if ($fileinfo->isDot()) {
+      // Ignore "." and "..".
+    }
+    elseif ($fileinfo->isDir()) {
+      // It's a directory.
+      switch ($fileinfo->getFilename()) {
+        case 'lib':
+        case 'module_autoload_test':
+          // Ignore these directory names.
+          continue;
+        default:
+          // Look for more extensions in subdirectories.
+          process_candidate_dir($fileinfo->getPathname());
+      }
+    }
+    else {
+      // It's a file.
+      if (preg_match('/^(.+).info.yml$/', $fileinfo->getFilename(), $m)) {
+        // It's a *.info.yml file, so we found an extension directory.
+        $extension_name = $m[1];
+      }
+    }
+  }
+  if (isset($extension_name)) {
+    process_extension($extension_name, $dir);
+  }
+}
+
+function process_extension($name, $dir) {
+
+  // Move main module class files.
+  if (is_dir("$dir/lib/Drupal/$name")) {
+    // This is a module directory with a PSR-0 /lib/ folder.
+    // Move to src/ as a temporary location.
+    if (!rename($src = "$dir/lib/Drupal/$name", $dest = "$dir/src")) {
+      throw new Exception("Rename $src to $dest failed.");
+    }
+  }
+
+  // Move class files in tests directory.
+  if (is_dir("$dir/tests/Drupal/$name/Tests")) {
+    // Move to tests/src/ as a temporary location.
+    if (!rename($src = "$dir/tests/Drupal/$name/Tests", $dest = "$dir/tests/src")) {
+      throw new Exception("Rename $src to $dest failed.");
+    }
+  }
+
+  // Clean up empty directories.
+  foreach (array(
+    "lib/Drupal/$name",
+    'lib/Drupal',
+    'lib',
+    "tests/Drupal/$name/Tests",
+    "tests/Drupal/$name",
+    "tests/Drupal",
+  ) as $subdir) {
+    if (!is_dir("$dir/$subdir")) {
+      continue;
+    }
+    if (!is_dir_empty("$dir/$subdir")) {
+      throw new Exception("$dir/$subdir is not empty.");
+    }
+    rmdir("$dir/$subdir");
+  }
+
+  // Move back to lib/ or tests/lib/.
+  if (is_dir("$dir/src")) {
+    rename("$dir/src", "$dir/lib");
+  }
+  if (is_dir("$dir/tests/src")) {
+    rename("$dir/tests/src", "$dir/tests/lib");
+  }
+}
+
+function is_dir_empty($dir) {
+  if (!is_readable($dir)) {
+    return NULL;
+  }
+  $handle = opendir($dir);
+  while (false !== ($entry = readdir($handle))) {
+    if ($entry != "." && $entry != "..") {
+      return FALSE;
+    }
+  }
+  return TRUE;
+}
diff --git a/core/tests/bootstrap.php b/core/tests/bootstrap.php
index 66c4be4..e0be3f8 100644
--- a/core/tests/bootstrap.php
+++ b/core/tests/bootstrap.php
@@ -1,7 +1,7 @@
 <?php
 
 // Register the namespaces we'll need to autoload from.
-$loader = require __DIR__ . "/../vendor/autoload.php";
+$loader = require __DIR__ . "/../autoload.php";
 $loader->add('Drupal\\Tests', __DIR__);
 
 foreach (scandir(__DIR__ . "/../modules") as $module) {
diff --git a/core/update.php b/core/update.php
index ac36b2a..0238871 100644
--- a/core/update.php
+++ b/core/update.php
@@ -22,7 +22,7 @@
 // Change the directory to the Drupal root.
 chdir('..');
 
-require_once __DIR__ . '/vendor/autoload.php';
+require_once __DIR__ . '/autoload.php';
 
 // Exit early if an incompatible PHP version would cause fatal errors.
 // The minimum version is specified explicitly, as DRUPAL_MINIMUM_PHP is not
diff --git a/index.php b/index.php
index 426aa22..5f5ada6 100644
--- a/index.php
+++ b/index.php
@@ -8,7 +8,7 @@
  * See COPYRIGHT.txt and LICENSE.txt files in the "core" directory.
  */
 
-require_once __DIR__ . '/core/vendor/autoload.php';
+require_once __DIR__ . '/core/autoload.php';
 require_once __DIR__ . '/core/includes/bootstrap.inc';
 
 try {