diff --git a/includes/admin.inc b/includes/admin.inc
index 1550fd62f5d832f4335de1404dddfa2107f57ea2..869fab557eefe89c92917c294b0c8d69e5786f17 100644
--- a/includes/admin.inc
+++ b/includes/admin.inc
@@ -8,7 +8,7 @@
 use Drupal\Core\Database\Database;
 use Drupal\views\View;
 use Drupal\views\Analyzer;
-use Drupal\views\Plugins\Type\WizardManager;
+use Drupal\views\Plugin\Type\WizardManager;
 
 /**
  * Create an array of Views admin CSS for adding or attaching.
diff --git a/lib/Drupal/views/Plugins/Discovery/ViewsDiscovery.php b/lib/Drupal/views/Plugin/Discovery/ViewsDiscovery.php
similarity index 97%
rename from lib/Drupal/views/Plugins/Discovery/ViewsDiscovery.php
rename to lib/Drupal/views/Plugin/Discovery/ViewsDiscovery.php
index 4c41eeb353a369508cb864ad494c037468b0b2c4..9629cd97465dbc1267c35bda3d9c59469a5f37fc 100644
--- a/lib/Drupal/views/Plugins/Discovery/ViewsDiscovery.php
+++ b/lib/Drupal/views/Plugin/Discovery/ViewsDiscovery.php
@@ -5,7 +5,7 @@
  * Definition of Drupal\views\Plugin\Discovery\ViewsDiscovery.
  */
 
-namespace Drupal\views\Plugins\Discovery;
+namespace Drupal\views\Plugin\Discovery;
 use Drupal\Core\Plugin\Discovery\AnnotatedClassDiscovery;
 
 /**
diff --git a/lib/Drupal/views/Plugins/Type/AccessPluginManager.php b/lib/Drupal/views/Plugin/Type/AccessPluginManager.php
similarity index 69%
rename from lib/Drupal/views/Plugins/Type/AccessPluginManager.php
rename to lib/Drupal/views/Plugin/Type/AccessPluginManager.php
index fb24fa40f188882ea53f289410e46a8d53f4107b..a6cb79a9e969acc3b1e7f3257e7ea5c2faa87de9 100644
--- a/lib/Drupal/views/Plugins/Type/AccessPluginManager.php
+++ b/lib/Drupal/views/Plugin/Type/AccessPluginManager.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\Type\AccessPluginManager.
+ * Definition of Drupal\views\Plugin\Type\AccessPluginManager.
  */
 
-namespace Drupal\views\Plugins\Type;
+namespace Drupal\views\Plugin\Type;
 
 use Drupal\Component\Plugin\PluginManagerBase;
 use Drupal\Component\Plugin\Factory\DefaultFactory;
-use Drupal\views\Plugins\Discovery\ViewsDiscovery;
+use Drupal\views\Plugin\Discovery\ViewsDiscovery;
 
 class AccessPluginManager extends PluginManagerBase {
   public function __construct() {
diff --git a/lib/Drupal/views/Plugins/Type/ArgumentDefaultPluginManager.php b/lib/Drupal/views/Plugin/Type/ArgumentDefaultPluginManager.php
similarity index 79%
rename from lib/Drupal/views/Plugins/Type/ArgumentDefaultPluginManager.php
rename to lib/Drupal/views/Plugin/Type/ArgumentDefaultPluginManager.php
index dcfa4ee1e4e1e9b2ee3c7c0cdde3d0144fd58039..f8266f4e3d9d95dc5181b237c410a18026823166 100644
--- a/lib/Drupal/views/Plugins/Type/ArgumentDefaultPluginManager.php
+++ b/lib/Drupal/views/Plugin/Type/ArgumentDefaultPluginManager.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\Type\ArgumentDefaultPluginManager.
+ * Definition of Drupal\views\Plugin\Type\ArgumentDefaultPluginManager.
  */
 
-namespace Drupal\views\Plugins\Type;
+namespace Drupal\views\Plugin\Type;
 
 use Drupal\Component\Plugin\PluginManagerBase;
 use Drupal\Component\Plugin\Factory\DefaultFactory;
diff --git a/lib/Drupal/views/Plugins/Type/ArgumentValidatorPluginManager.php b/lib/Drupal/views/Plugin/Type/ArgumentValidatorPluginManager.php
similarity index 72%
rename from lib/Drupal/views/Plugins/Type/ArgumentValidatorPluginManager.php
rename to lib/Drupal/views/Plugin/Type/ArgumentValidatorPluginManager.php
index 149ec6643f63d727b03d35c4646849ebf39d1a82..0ac99341f57bfe6ba35edbb5098a9adfccada3ab 100644
--- a/lib/Drupal/views/Plugins/Type/ArgumentValidatorPluginManager.php
+++ b/lib/Drupal/views/Plugin/Type/ArgumentValidatorPluginManager.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\Type\ArgumentValidatorPluginManager.
+ * Definition of Drupal\views\Plugin\Type\ArgumentValidatorPluginManager.
  */
 
-namespace Drupal\views\Plugins\Type;
+namespace Drupal\views\Plugin\Type;
 
 use Drupal\Component\Plugin\PluginManagerBase;
 use Drupal\Component\Plugin\Factory\DefaultFactory;
-use Drupal\views\Plugins\Discovery\ViewsDiscovery;
+use Drupal\views\Plugin\Discovery\ViewsDiscovery;
 use Drupal\Core\Plugin\Discovery\AnnotatedClassDiscovery;
 
 class ArgumentValidatorPluginManager extends PluginManagerBase {
diff --git a/lib/Drupal/views/Plugins/Type/CachePluginManager.php b/lib/Drupal/views/Plugin/Type/CachePluginManager.php
similarity index 72%
rename from lib/Drupal/views/Plugins/Type/CachePluginManager.php
rename to lib/Drupal/views/Plugin/Type/CachePluginManager.php
index cc98746a9adcafcf90f560eccfeef360959ee131..11fdc29df03bed7fdcb69672e6f7aa5c09465d1f 100644
--- a/lib/Drupal/views/Plugins/Type/CachePluginManager.php
+++ b/lib/Drupal/views/Plugin/Type/CachePluginManager.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\Type\CachePluginManager.
+ * Definition of Drupal\views\Plugin\Type\CachePluginManager.
  */
 
-namespace Drupal\views\Plugins\Type;
+namespace Drupal\views\Plugin\Type;
 
 use Drupal\Component\Plugin\PluginManagerBase;
 use Drupal\Component\Plugin\Factory\DefaultFactory;
-use Drupal\views\Plugins\Discovery\ViewsDiscovery;
+use Drupal\views\Plugin\Discovery\ViewsDiscovery;
 use Drupal\Core\Plugin\Discovery\AnnotatedClassDiscovery;
 
 class CachePluginManager extends PluginManagerBase {
diff --git a/lib/Drupal/views/Plugins/Type/DisplayExtenderPluginManager.php b/lib/Drupal/views/Plugin/Type/DisplayExtenderPluginManager.php
similarity index 69%
rename from lib/Drupal/views/Plugins/Type/DisplayExtenderPluginManager.php
rename to lib/Drupal/views/Plugin/Type/DisplayExtenderPluginManager.php
index 4825c49727947ef38c6dab97e099291d279cd1ec..c31ce8a7988daff1baaf7b120b86e5c9342326b9 100644
--- a/lib/Drupal/views/Plugins/Type/DisplayExtenderPluginManager.php
+++ b/lib/Drupal/views/Plugin/Type/DisplayExtenderPluginManager.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\Type\DisplayExtenderPluginManager.
+ * Definition of Drupal\views\Plugin\Type\DisplayExtenderPluginManager.
  */
 
-namespace Drupal\views\Plugins\Type;
+namespace Drupal\views\Plugin\Type;
 
 use Drupal\Component\Plugin\PluginManagerBase;
 use Drupal\Component\Plugin\Factory\DefaultFactory;
-use Drupal\Views\Plugins\Discovery\ViewsDiscovery;
+use Drupal\Views\Plugin\Discovery\ViewsDiscovery;
 
 class DisplayExtenderPluginManager extends PluginManagerBase {
   public function __construct() {
diff --git a/lib/Drupal/views/Plugins/Type/DisplayPluginManager.php b/lib/Drupal/views/Plugin/Type/DisplayPluginManager.php
similarity index 69%
rename from lib/Drupal/views/Plugins/Type/DisplayPluginManager.php
rename to lib/Drupal/views/Plugin/Type/DisplayPluginManager.php
index 990ddee5358f6b6a8202efd90313056a9e99a469..af406b4f61110321b56d429a81582143c116d1a2 100644
--- a/lib/Drupal/views/Plugins/Type/DisplayPluginManager.php
+++ b/lib/Drupal/views/Plugin/Type/DisplayPluginManager.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\Type\DisplayPluginManager.
+ * Definition of Drupal\views\Plugin\Type\DisplayPluginManager.
  */
 
-namespace Drupal\views\Plugins\Type;
+namespace Drupal\views\Plugin\Type;
 
 use Drupal\Component\Plugin\PluginManagerBase;
 use Drupal\Component\Plugin\Factory\DefaultFactory;
-use Drupal\views\Plugins\Discovery\ViewsDiscovery;
+use Drupal\views\Plugin\Discovery\ViewsDiscovery;
 
 class DisplayPluginManager extends PluginManagerBase {
   public function __construct() {
diff --git a/lib/Drupal/views/Plugins/Type/ExposedFormPluginManager.php b/lib/Drupal/views/Plugin/Type/ExposedFormPluginManager.php
similarity index 68%
rename from lib/Drupal/views/Plugins/Type/ExposedFormPluginManager.php
rename to lib/Drupal/views/Plugin/Type/ExposedFormPluginManager.php
index f93c4ad216f40d197bcdd149c28c44a0ae03bfae..fd2d4957345327a021a1cb2ee40dfce734c141e2 100644
--- a/lib/Drupal/views/Plugins/Type/ExposedFormPluginManager.php
+++ b/lib/Drupal/views/Plugin/Type/ExposedFormPluginManager.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\Type\ExposedFormPluginManager.
+ * Definition of Drupal\views\Plugin\Type\ExposedFormPluginManager.
  */
 
-namespace Drupal\views\Plugins\Type;
+namespace Drupal\views\Plugin\Type;
 
 use Drupal\Component\Plugin\PluginManagerBase;
 use Drupal\Component\Plugin\Factory\DefaultFactory;
-use Drupal\Views\Plugins\Discovery\ViewsDiscovery;
+use Drupal\Views\Plugin\Discovery\ViewsDiscovery;
 
 class ExposedFormPluginManager extends PluginManagerBase {
   public function __construct() {
diff --git a/lib/Drupal/views/Plugins/Type/HandlerPluginManager.php b/lib/Drupal/views/Plugin/Type/HandlerPluginManager.php
similarity index 76%
rename from lib/Drupal/views/Plugins/Type/HandlerPluginManager.php
rename to lib/Drupal/views/Plugin/Type/HandlerPluginManager.php
index 836cf6af954ed61f04b372c89105e7fd4f7fe685..a345c11415f412b967486f300ce993cfe33b45d1 100644
--- a/lib/Drupal/views/Plugins/Type/HandlerPluginManager.php
+++ b/lib/Drupal/views/Plugin/Type/HandlerPluginManager.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\Type\HandlerPluginManager.
+ * Definition of Drupal\views\Plugin\Type\HandlerPluginManager.
  */
 
-namespace Drupal\views\Plugins\Type;
+namespace Drupal\views\Plugin\Type;
 
 use Drupal\Component\Plugin\PluginManagerBase;
 use Drupal\Component\Plugin\Factory\DefaultFactory;
-use Drupal\Views\Plugins\Discovery\ViewsDiscovery;
+use Drupal\Views\Plugin\Discovery\ViewsDiscovery;
 
 class HandlerPluginManager extends PluginManagerBase {
   /**
diff --git a/lib/Drupal/views/Plugins/Type/LocalizationPluginManager.php b/lib/Drupal/views/Plugin/Type/LocalizationPluginManager.php
similarity index 68%
rename from lib/Drupal/views/Plugins/Type/LocalizationPluginManager.php
rename to lib/Drupal/views/Plugin/Type/LocalizationPluginManager.php
index a61f92b9b5f5baa6a386b91699a8475be533a0bb..846313e089868148a0da7a48d40314cbe0584dcb 100644
--- a/lib/Drupal/views/Plugins/Type/LocalizationPluginManager.php
+++ b/lib/Drupal/views/Plugin/Type/LocalizationPluginManager.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\Type\LocalizationPluginManager.
+ * Definition of Drupal\views\Plugin\Type\LocalizationPluginManager.
  */
 
-namespace Drupal\views\Plugins\Type;
+namespace Drupal\views\Plugin\Type;
 
 use Drupal\Component\Plugin\PluginManagerBase;
 use Drupal\Component\Plugin\Factory\DefaultFactory;
-use Drupal\Views\Plugins\Discovery\ViewsDiscovery;
+use Drupal\Views\Plugin\Discovery\ViewsDiscovery;
 
 class LocalizationPluginManager extends PluginManagerBase {
   public function __construct() {
diff --git a/lib/Drupal/views/Plugins/Type/PagerPluginManager.php b/lib/Drupal/views/Plugin/Type/PagerPluginManager.php
similarity index 68%
rename from lib/Drupal/views/Plugins/Type/PagerPluginManager.php
rename to lib/Drupal/views/Plugin/Type/PagerPluginManager.php
index 9b7199ee0053a60c2d409ccd2a49d703621d90d8..03ae37bbe3516dfcaf090b2774f01450a5a06a58 100644
--- a/lib/Drupal/views/Plugins/Type/PagerPluginManager.php
+++ b/lib/Drupal/views/Plugin/Type/PagerPluginManager.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\Type\PagerPluginManager.
+ * Definition of Drupal\views\Plugin\Type\PagerPluginManager.
  */
 
-namespace Drupal\views\Plugins\Type;
+namespace Drupal\views\Plugin\Type;
 
 use Drupal\Component\Plugin\PluginManagerBase;
 use Drupal\Component\Plugin\Factory\DefaultFactory;
-use Drupal\Views\Plugins\Discovery\ViewsDiscovery;
+use Drupal\Views\Plugin\Discovery\ViewsDiscovery;
 
 class PagerPluginManager extends PluginManagerBase {
   public function __construct() {
diff --git a/lib/Drupal/views/Plugins/Type/QueryPluginManager.php b/lib/Drupal/views/Plugin/Type/QueryPluginManager.php
similarity index 68%
rename from lib/Drupal/views/Plugins/Type/QueryPluginManager.php
rename to lib/Drupal/views/Plugin/Type/QueryPluginManager.php
index 473fe408bc06680f767e8f9543da8bc383f6fefc..6ff3afd00e10a920260ee81d19a59773967a0074 100644
--- a/lib/Drupal/views/Plugins/Type/QueryPluginManager.php
+++ b/lib/Drupal/views/Plugin/Type/QueryPluginManager.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\Type\QueryPluginManager.
+ * Definition of Drupal\views\Plugin\Type\QueryPluginManager.
  */
 
-namespace Drupal\views\Plugins\Type;
+namespace Drupal\views\Plugin\Type;
 
 use Drupal\Component\Plugin\PluginManagerBase;
 use Drupal\Component\Plugin\Factory\DefaultFactory;
-use Drupal\Views\Plugins\Discovery\ViewsDiscovery;
+use Drupal\Views\Plugin\Discovery\ViewsDiscovery;
 
 class QueryPluginManager extends PluginManagerBase {
   public function __construct() {
diff --git a/lib/Drupal/views/Plugins/Type/RowPluginManager.php b/lib/Drupal/views/Plugin/Type/RowPluginManager.php
similarity index 68%
rename from lib/Drupal/views/Plugins/Type/RowPluginManager.php
rename to lib/Drupal/views/Plugin/Type/RowPluginManager.php
index 488ac6388d0f0cd0766ee12893aa5b8fd0ca758d..ccd86fd4402598b028afce4765c378e78caead47 100644
--- a/lib/Drupal/views/Plugins/Type/RowPluginManager.php
+++ b/lib/Drupal/views/Plugin/Type/RowPluginManager.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\Type\RowPluginManager.
+ * Definition of Drupal\views\Plugin\Type\RowPluginManager.
  */
 
-namespace Drupal\views\Plugins\Type;
+namespace Drupal\views\Plugin\Type;
 
 use Drupal\Component\Plugin\PluginManagerBase;
 use Drupal\Component\Plugin\Factory\DefaultFactory;
-use Drupal\Views\Plugins\Discovery\ViewsDiscovery;
+use Drupal\Views\Plugin\Discovery\ViewsDiscovery;
 
 class RowPluginManager extends PluginManagerBase {
   public function __construct() {
diff --git a/lib/Drupal/views/Plugins/Type/StylePluginManager.php b/lib/Drupal/views/Plugin/Type/StylePluginManager.php
similarity index 68%
rename from lib/Drupal/views/Plugins/Type/StylePluginManager.php
rename to lib/Drupal/views/Plugin/Type/StylePluginManager.php
index 1aa53fabf0b9d16e7e0b1a9c468ee85f4544e5d5..e752ab0a68708defe853903a61a7247e157fab77 100644
--- a/lib/Drupal/views/Plugins/Type/StylePluginManager.php
+++ b/lib/Drupal/views/Plugin/Type/StylePluginManager.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\Type\StylePluginManager.
+ * Definition of Drupal\views\Plugin\Type\StylePluginManager.
  */
 
-namespace Drupal\views\Plugins\Type;
+namespace Drupal\views\Plugin\Type;
 
 use Drupal\Component\Plugin\PluginManagerBase;
 use Drupal\Component\Plugin\Factory\DefaultFactory;
-use Drupal\Views\Plugins\Discovery\ViewsDiscovery;
+use Drupal\Views\Plugin\Discovery\ViewsDiscovery;
 
 
 class StylePluginManager extends PluginManagerBase {
diff --git a/lib/Drupal/views/Plugins/Type/WizardPluginManager.php b/lib/Drupal/views/Plugin/Type/WizardPluginManager.php
similarity index 69%
rename from lib/Drupal/views/Plugins/Type/WizardPluginManager.php
rename to lib/Drupal/views/Plugin/Type/WizardPluginManager.php
index 5171c974d398be5992e6eb3cd1c92aa9b166766d..94762fd58f124c6cd9dae74ee4a684ec345f6b33 100644
--- a/lib/Drupal/views/Plugins/Type/WizardPluginManager.php
+++ b/lib/Drupal/views/Plugin/Type/WizardPluginManager.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\Type\WizardPluginManager.
+ * Definition of Drupal\views\Plugin\Type\WizardPluginManager.
  */
 
-namespace Drupal\views\Plugins\Type;
+namespace Drupal\views\Plugin\Type;
 
 use Drupal\Component\Plugin\PluginManagerBase;
 use Drupal\Component\Plugin\Factory\DefaultFactory;
-use Drupal\views\Plugins\Discovery\ViewsDiscovery;
+use Drupal\views\Plugin\Discovery\ViewsDiscovery;
 
 class WizardPluginManager extends PluginManagerBase {
   public function __construct() {
diff --git a/lib/Drupal/views/Plugins/views/Handler.php b/lib/Drupal/views/Plugin/views/Handler.php
similarity index 99%
rename from lib/Drupal/views/Plugins/views/Handler.php
rename to lib/Drupal/views/Plugin/views/Handler.php
index d7ede51808e2384e87aa897dffb062ccc58152c8..f28dc82edb3fae1da7d8b37500b1bd7f6912946b 100644
--- a/lib/Drupal/views/Plugins/views/Handler.php
+++ b/lib/Drupal/views/Plugin/views/Handler.php
@@ -1,12 +1,12 @@
 <?php
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\Handler
+ * Definition of Drupal\views\Plugin\views\Handler
  */
 
-namespace Drupal\views\Plugins\views;
+namespace Drupal\views\Plugin\views;
 
-use Drupal\views\Plugins\views\Plugin;
+use Drupal\views\Plugin\views\Plugin;
 use Drupal\views\View;
 
 class Handler extends Plugin {
diff --git a/lib/Drupal/views/Plugins/views/Plugin.php b/lib/Drupal/views/Plugin/views/Plugin.php
similarity index 99%
rename from lib/Drupal/views/Plugins/views/Plugin.php
rename to lib/Drupal/views/Plugin/views/Plugin.php
index 50bb553bfa3a440190a1f286c069fec6ac5e9aed..d4723e3a15608b9eda4e8c2c53be1a2ac7bf1d83 100644
--- a/lib/Drupal/views/Plugins/views/Plugin.php
+++ b/lib/Drupal/views/Plugin/views/Plugin.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\Plugin.
+ * Definition of Drupal\views\Plugin\views\Plugin.
  */
 
-namespace Drupal\views\Plugins\views;
+namespace Drupal\views\Plugin\views;
 
 use Drupal\views\ViewsObject;
 use Drupal\Component\Plugin\PluginBase;
diff --git a/lib/Drupal/views/Plugins/views/PluginInterface.php b/lib/Drupal/views/Plugin/views/PluginInterface.php
similarity index 84%
rename from lib/Drupal/views/Plugins/views/PluginInterface.php
rename to lib/Drupal/views/Plugin/views/PluginInterface.php
index 177999d3bf3745aca9b563812c8fd8b8fa32c3cb..5b187917e26f770b92bc69b2b72fbc7236a6794b 100644
--- a/lib/Drupal/views/Plugins/views/PluginInterface.php
+++ b/lib/Drupal/views/Plugin/views/PluginInterface.php
@@ -5,7 +5,7 @@
  * Definition of Drupal\views\Plugin\PluginInterface.
  */
 
-namespace Drupal\views\Plugins\views;
+namespace Drupal\views\Plugin\views;
 
 use Drupal\Component\Plugin\PluginInspectionInterface;
 
diff --git a/lib/Drupal/views/Plugins/views/access/AccessPluginBase.php b/lib/Drupal/views/Plugin/views/access/AccessPluginBase.php
similarity index 93%
rename from lib/Drupal/views/Plugins/views/access/AccessPluginBase.php
rename to lib/Drupal/views/Plugin/views/access/AccessPluginBase.php
index 17a05522388b9f55f49b74616da5276b9b06c235..a844deb078451d743a68f367b0f5b24d6e13f195 100644
--- a/lib/Drupal/views/Plugins/views/access/AccessPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/access/AccessPluginBase.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\access\AccessPluginBase.
+ * Definition of Drupal\views\Plugin\views\access\AccessPluginBase.
  */
 
-namespace Drupal\views\Plugins\views\access;
+namespace Drupal\views\Plugin\views\access;
 
-use Drupal\views\Plugins\views\Plugin;
+use Drupal\views\Plugin\views\Plugin;
 
 /**
  * @defgroup views_access_plugins Views access plugins
diff --git a/lib/Drupal/views/Plugins/views/access/None.php b/lib/Drupal/views/Plugin/views/access/None.php
similarity index 82%
rename from lib/Drupal/views/Plugins/views/access/None.php
rename to lib/Drupal/views/Plugin/views/access/None.php
index b9bdc4bfc64e9e29a069cdfd20b1d7dda3d8ca01..2dccd35e62e3bccccad88652346cf8688c5e7a5a 100644
--- a/lib/Drupal/views/Plugins/views/access/None.php
+++ b/lib/Drupal/views/Plugin/views/access/None.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\access\None.
+ * Definition of Drupal\views\Plugin\views\access\None.
  */
 
-namespace Drupal\views\Plugins\views\access;
+namespace Drupal\views\Plugin\views\access;
 
 use Drupal\Core\Annotation\Translation;
 use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/views/Plugins/views/access/Permission.php b/lib/Drupal/views/Plugin/views/access/Permission.php
similarity index 94%
rename from lib/Drupal/views/Plugins/views/access/Permission.php
rename to lib/Drupal/views/Plugin/views/access/Permission.php
index 60e0a8530791551a75700789ca9b5ddf8bba98a6..37a36ad3fe49b69409bd322fd3b4599249f3d0a6 100644
--- a/lib/Drupal/views/Plugins/views/access/Permission.php
+++ b/lib/Drupal/views/Plugin/views/access/Permission.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\access\Permission.
+ * Definition of Drupal\views\Plugin\views\access\Permission.
  */
 
-namespace Drupal\views\Plugins\views\access;
+namespace Drupal\views\Plugin\views\access;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/access/Role.php b/lib/Drupal/views/Plugin/views/access/Role.php
similarity index 95%
rename from lib/Drupal/views/Plugins/views/access/Role.php
rename to lib/Drupal/views/Plugin/views/access/Role.php
index 5df5e23d20f471b029b237ccad7ce1dd77f35ec8..e0104349efde951bdef51e152a0aa6b1f4ea828f 100644
--- a/lib/Drupal/views/Plugins/views/access/Role.php
+++ b/lib/Drupal/views/Plugin/views/access/Role.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\access\Role.
+ * Definition of Drupal\views\Plugin\views\access\Role.
  */
 
-namespace Drupal\views\Plugins\views\access;
+namespace Drupal\views\Plugin\views\access;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/area/AreaPluginBase.php b/lib/Drupal/views/Plugin/views/area/AreaPluginBase.php
similarity index 91%
rename from lib/Drupal/views/Plugins/views/area/AreaPluginBase.php
rename to lib/Drupal/views/Plugin/views/area/AreaPluginBase.php
index 9a5fab054342f93767dfaf0a472e4df3cbf12f68..0a99bfc63e65e3e18733b92c574ee986dbb27688 100644
--- a/lib/Drupal/views/Plugins/views/area/AreaPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/area/AreaPluginBase.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\area\AreaPluginBase.
+ * Definition of Drupal\views\Plugin\views\area\AreaPluginBase.
  */
 
-namespace Drupal\views\Plugins\views\area;
+namespace Drupal\views\Plugin\views\area;
 
-use Drupal\views\Plugins\views\Plugin;
-use Drupal\views\Plugins\views\Handler;
+use Drupal\views\Plugin\views\Plugin;
+use Drupal\views\Plugin\views\Handler;
 
 /**
  * @defgroup views_area_handlers Views area handlers
diff --git a/lib/Drupal/views/Plugins/views/area/Broken.php b/lib/Drupal/views/Plugin/views/area/Broken.php
similarity index 90%
rename from lib/Drupal/views/Plugins/views/area/Broken.php
rename to lib/Drupal/views/Plugin/views/area/Broken.php
index 20ce56c62661cb815f4a594135a4e2c654f20456..eacb03b9516b5e52cb93ee45960109c292b56a2f 100644
--- a/lib/Drupal/views/Plugins/views/area/Broken.php
+++ b/lib/Drupal/views/Plugin/views/area/Broken.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\sort\Broken
+ * Definition of Drupal\views\Plugin\views\sort\Broken
  */
 
-namespace Drupal\views\Plugins\views\area;
+namespace Drupal\views\Plugin\views\area;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/area/Result.php b/lib/Drupal/views/Plugin/views/area/Result.php
similarity index 96%
rename from lib/Drupal/views/Plugins/views/area/Result.php
rename to lib/Drupal/views/Plugin/views/area/Result.php
index da47b575c7eb67444281e8896fcb9586f885a425..137edca96399a49f5ee200d671570da65e92d915 100644
--- a/lib/Drupal/views/Plugins/views/area/Result.php
+++ b/lib/Drupal/views/Plugin/views/area/Result.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\area\result.
+ * Definition of Drupal\views\Plugin\views\area\result.
  */
 
-namespace Drupal\views\Plugins\views\area;
+namespace Drupal\views\Plugin\views\area;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/area/Text.php b/lib/Drupal/views/Plugin/views/area/Text.php
similarity index 97%
rename from lib/Drupal/views/Plugins/views/area/Text.php
rename to lib/Drupal/views/Plugin/views/area/Text.php
index 79c35062bb487c96f6d1820b707643173da4f6a3..5b281985f215ad4afc010b83d6204f439bf4318f 100644
--- a/lib/Drupal/views/Plugins/views/area/Text.php
+++ b/lib/Drupal/views/Plugin/views/area/Text.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\area\Text.
+ * Definition of Drupal\views\Plugin\views\area\Text.
  */
 
-namespace Drupal\views\Plugins\views\area;
+namespace Drupal\views\Plugin\views\area;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/area/View.php b/lib/Drupal/views/Plugin/views/area/View.php
similarity index 96%
rename from lib/Drupal/views/Plugins/views/area/View.php
rename to lib/Drupal/views/Plugin/views/area/View.php
index 92a6bbe9101a28a3604bc71aee5a004b49c110d0..2e9e790948cf2960be0be7be7c0c030c7ec5bc41 100644
--- a/lib/Drupal/views/Plugins/views/area/View.php
+++ b/lib/Drupal/views/Plugin/views/area/View.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\area\View.
+ * Definition of Drupal\views\Plugin\views\area\View.
  */
 
-namespace Drupal\views\Plugins\views\area;
+namespace Drupal\views\Plugin\views\area;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/argument/ArgumentPluginBase.php b/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
similarity index 99%
rename from lib/Drupal/views/Plugins/views/argument/ArgumentPluginBase.php
rename to lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
index 318197541727057357fe0109386d8370235a47d8..e4a23db0fc1fbad9d6c5d2790aad251a267aa07c 100644
--- a/lib/Drupal/views/Plugins/views/argument/ArgumentPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\argument\ArgumentPluginBase.
+ * Definition of Drupal\views\Plugin\views\argument\ArgumentPluginBase.
  */
 
-namespace Drupal\views\Plugins\views\argument;
+namespace Drupal\views\Plugin\views\argument;
 
-use Drupal\views\Plugins\views\Plugin;
-use Drupal\views\Plugins\views\Handler;
+use Drupal\views\Plugin\views\Plugin;
+use Drupal\views\Plugin\views\Handler;
 
 /**
  * @defgroup views_argument_handlers Views argument handlers
diff --git a/lib/Drupal/views/Plugins/views/argument/Broken.php b/lib/Drupal/views/Plugin/views/argument/Broken.php
similarity index 90%
rename from lib/Drupal/views/Plugins/views/argument/Broken.php
rename to lib/Drupal/views/Plugin/views/argument/Broken.php
index 3873c95145933cde9ca1278f529025bf973aa59e..f8255874b8cd4a5c8543c9c5ee73b7601b5e401b 100644
--- a/lib/Drupal/views/Plugins/views/argument/Broken.php
+++ b/lib/Drupal/views/Plugin/views/argument/Broken.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\sort\Broken
+ * Definition of Drupal\views\Plugin\views\sort\Broken
  */
 
-namespace Drupal\views\Plugins\views\argument;
+namespace Drupal\views\Plugin\views\argument;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/argument/Date.php b/lib/Drupal/views/Plugin/views/argument/Date.php
similarity index 96%
rename from lib/Drupal/views/Plugins/views/argument/Date.php
rename to lib/Drupal/views/Plugin/views/argument/Date.php
index 5569e9d1073f9a9df037ab631d32adba07355f4e..f4375d2e8f060a493f5695c94be9efe3299d5d23 100644
--- a/lib/Drupal/views/Plugins/views/argument/Date.php
+++ b/lib/Drupal/views/Plugin/views/argument/Date.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\argument\Date.
+ * Definition of Drupal\views\Plugin\views\argument\Date.
  */
 
-namespace Drupal\views\Plugins\views\argument;
+namespace Drupal\views\Plugin\views\argument;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/argument/Formula.php b/lib/Drupal/views/Plugin/views/argument/Formula.php
similarity index 93%
rename from lib/Drupal/views/Plugins/views/argument/Formula.php
rename to lib/Drupal/views/Plugin/views/argument/Formula.php
index 4a5ee56898d79e3e291b605bea1eb5699843e2ba..7a4681f0626f1ebdb056575733f30dc638724361 100644
--- a/lib/Drupal/views/Plugins/views/argument/Formula.php
+++ b/lib/Drupal/views/Plugin/views/argument/Formula.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\argument\Formula.
+ * Definition of Drupal\views\Plugin\views\argument\Formula.
  */
 
-namespace Drupal\views\Plugins\views\argument;
+namespace Drupal\views\Plugin\views\argument;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/argument/GroupByNumeric.php b/lib/Drupal/views/Plugin/views/argument/GroupByNumeric.php
similarity index 86%
rename from lib/Drupal/views/Plugins/views/argument/GroupByNumeric.php
rename to lib/Drupal/views/Plugin/views/argument/GroupByNumeric.php
index 9fa6cddf3f39ed89e77de5e5ce65abc806b508b8..bdbdd35ccd6657463b8298bb621f11fbe69c8e59 100644
--- a/lib/Drupal/views/Plugins/views/argument/GroupByNumeric.php
+++ b/lib/Drupal/views/Plugin/views/argument/GroupByNumeric.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\argument\GroupByNumeric.
+ * Definition of Drupal\views\Plugin\views\argument\GroupByNumeric.
  */
 
-namespace Drupal\views\Plugins\views\argument;
+namespace Drupal\views\Plugin\views\argument;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/argument/ManyToOne.php b/lib/Drupal/views/Plugin/views/argument/ManyToOne.php
similarity index 98%
rename from lib/Drupal/views/Plugins/views/argument/ManyToOne.php
rename to lib/Drupal/views/Plugin/views/argument/ManyToOne.php
index e5c519915641e0325da320af5153ae7474dd5dbc..a3a689bbf3626d44af018aad780a0c3d303ffc18 100644
--- a/lib/Drupal/views/Plugins/views/argument/ManyToOne.php
+++ b/lib/Drupal/views/Plugin/views/argument/ManyToOne.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\argument\ManyToOne.
+ * Definition of Drupal\views\Plugin\views\argument\ManyToOne.
  */
 
-namespace Drupal\views\Plugins\views\argument;
+namespace Drupal\views\Plugin\views\argument;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/argument/Null.php b/lib/Drupal/views/Plugin/views/argument/Null.php
similarity index 94%
rename from lib/Drupal/views/Plugins/views/argument/Null.php
rename to lib/Drupal/views/Plugin/views/argument/Null.php
index 536ce16537f6fd167bd9356a178a075952866f91..6b3450d92a9c8a4db2299e2f7faf14402bee5ea4 100644
--- a/lib/Drupal/views/Plugins/views/argument/Null.php
+++ b/lib/Drupal/views/Plugin/views/argument/Null.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\argument\Null.
+ * Definition of Drupal\views\Plugin\views\argument\Null.
  */
 
-namespace Drupal\views\Plugins\views\argument;
+namespace Drupal\views\Plugin\views\argument;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/argument/Numeric.php b/lib/Drupal/views/Plugin/views/argument/Numeric.php
similarity index 96%
rename from lib/Drupal/views/Plugins/views/argument/Numeric.php
rename to lib/Drupal/views/Plugin/views/argument/Numeric.php
index 0a063f923ef4f1eba2801aa2f5757851422570b8..78c84c92782c427bda4f050ba1e79fe697a30283 100644
--- a/lib/Drupal/views/Plugins/views/argument/Numeric.php
+++ b/lib/Drupal/views/Plugin/views/argument/Numeric.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\argument\Numeric.
+ * Definition of Drupal\views\Plugin\views\argument\Numeric.
  */
 
-namespace Drupal\views\Plugins\views\argument;
+namespace Drupal\views\Plugin\views\argument;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/argument/String.php b/lib/Drupal/views/Plugin/views/argument/String.php
similarity index 98%
rename from lib/Drupal/views/Plugins/views/argument/String.php
rename to lib/Drupal/views/Plugin/views/argument/String.php
index d2e64bc1b147d888553c6f28a6fa3066c1e269ab..a60ae686d2323ee8a24473565385f42b1e2e3e45 100644
--- a/lib/Drupal/views/Plugins/views/argument/String.php
+++ b/lib/Drupal/views/Plugin/views/argument/String.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\argument\String.
+ * Definition of Drupal\views\Plugin\views\argument\String.
  */
 
-namespace Drupal\views\Plugins\views\argument;
+namespace Drupal\views\Plugin\views\argument;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/argument_default/ArgumentDefaultPluginBase.php b/lib/Drupal/views/Plugin/views/argument_default/ArgumentDefaultPluginBase.php
similarity index 93%
rename from lib/Drupal/views/Plugins/views/argument_default/ArgumentDefaultPluginBase.php
rename to lib/Drupal/views/Plugin/views/argument_default/ArgumentDefaultPluginBase.php
index 2d8c781dd39d1c57469e0d578c2763d1e95fedbd..a07e6ced9786924bc1066debbc7439dc5700a565 100644
--- a/lib/Drupal/views/Plugins/views/argument_default/ArgumentDefaultPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/argument_default/ArgumentDefaultPluginBase.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\argument_default\ArgumentDefaultPluginBase.
+ * Definition of Drupal\views\Plugin\views\argument_default\ArgumentDefaultPluginBase.
  */
 
-namespace Drupal\views\Plugins\views\argument_default;
+namespace Drupal\views\Plugin\views\argument_default;
 
-use Drupal\views\Plugins\views\Plugin;
+use Drupal\views\Plugin\views\Plugin;
 
 /**
  * @defgroup views_argument_default_plugins Views argument default plugins
diff --git a/lib/Drupal/views/Plugins/views/argument_default/Fixed.php b/lib/Drupal/views/Plugin/views/argument_default/Fixed.php
similarity index 90%
rename from lib/Drupal/views/Plugins/views/argument_default/Fixed.php
rename to lib/Drupal/views/Plugin/views/argument_default/Fixed.php
index cc3cbd353bef1cf641d9f1ab37ebcbbe377cbcfe..4796bb5b28c777c12987676e7062423f1670cb7e 100644
--- a/lib/Drupal/views/Plugins/views/argument_default/Fixed.php
+++ b/lib/Drupal/views/Plugin/views/argument_default/Fixed.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\argument_default\Fixed.
+ * Definition of Drupal\views\Plugin\views\argument_default\Fixed.
  */
 
-namespace Drupal\views\Plugins\views\argument_default;
+namespace Drupal\views\Plugin\views\argument_default;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/argument_default/Php.php b/lib/Drupal/views/Plugin/views/argument_default/Php.php
similarity index 94%
rename from lib/Drupal/views/Plugins/views/argument_default/Php.php
rename to lib/Drupal/views/Plugin/views/argument_default/Php.php
index a72e69fbf2f0d05a771d9049a70bd37c117187ae..704e02f2036842fc478f63962fd06fcfc996876c 100644
--- a/lib/Drupal/views/Plugins/views/argument_default/Php.php
+++ b/lib/Drupal/views/Plugin/views/argument_default/Php.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\argument_default\Php.
+ * Definition of Drupal\views\Plugin\views\argument_default\Php.
  */
 
-namespace Drupal\views\Plugins\views\argument_default;
+namespace Drupal\views\Plugin\views\argument_default;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/argument_default/Raw.php b/lib/Drupal/views/Plugin/views/argument_default/Raw.php
similarity index 92%
rename from lib/Drupal/views/Plugins/views/argument_default/Raw.php
rename to lib/Drupal/views/Plugin/views/argument_default/Raw.php
index c3208637656bdb5aa1578c3911f0a54909fd56b5..e8c70b4b13e8081e32d273a3118d016455bb2302 100644
--- a/lib/Drupal/views/Plugins/views/argument_default/Raw.php
+++ b/lib/Drupal/views/Plugin/views/argument_default/Raw.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\argument_default\Raw.
+ * Definition of Drupal\views\Plugin\views\argument_default\Raw.
  */
 
-namespace Drupal\views\Plugins\views\argument_default;
+namespace Drupal\views\Plugin\views\argument_default;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/argument_validator/ArgumentValidatorPluginBase.php b/lib/Drupal/views/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php
similarity index 93%
rename from lib/Drupal/views/Plugins/views/argument_validator/ArgumentValidatorPluginBase.php
rename to lib/Drupal/views/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php
index d991f2d9d10491bb0e16c368a46d1bfbb0664b7f..705d6217af96bad3aa10d014e6a31694e40ad470 100644
--- a/lib/Drupal/views/Plugins/views/argument_validator/ArgumentValidatorPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\argument_validator\ArgumentValidatorPluginBase.
+ * Definition of Drupal\views\Plugin\views\argument_validator\ArgumentValidatorPluginBase.
  */
 
-namespace Drupal\views\Plugins\views\argument_validator;
+namespace Drupal\views\Plugin\views\argument_validator;
 
-use Drupal\views\Plugins\views\Plugin;
+use Drupal\views\Plugin\views\Plugin;
 
 /**
  * @defgroup views_argument_validate_plugins Views argument validate plugins
diff --git a/lib/Drupal/views/Plugins/views/argument_validator/Numeric.php b/lib/Drupal/views/Plugin/views/argument_validator/Numeric.php
similarity index 77%
rename from lib/Drupal/views/Plugins/views/argument_validator/Numeric.php
rename to lib/Drupal/views/Plugin/views/argument_validator/Numeric.php
index fc88a23342dff782d057b83057a839c3640e2692..fc17f1f8ccae4dba578541264cd2a7982c0c8882 100644
--- a/lib/Drupal/views/Plugins/views/argument_validator/Numeric.php
+++ b/lib/Drupal/views/Plugin/views/argument_validator/Numeric.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\argument_validator\Numeric.
+ * Definition of Drupal\views\Plugin\views\argument_validator\Numeric.
  */
 
-namespace Drupal\views\Plugins\views\argument_validator;
+namespace Drupal\views\Plugin\views\argument_validator;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/argument_validator/Php.php b/lib/Drupal/views/Plugin/views/argument_validator/Php.php
similarity index 93%
rename from lib/Drupal/views/Plugins/views/argument_validator/Php.php
rename to lib/Drupal/views/Plugin/views/argument_validator/Php.php
index e39e61174f5b86096b656bbb1dff43407e7736ec..40e9e6772e1aadd4494436acd98cead02f4dafe8 100644
--- a/lib/Drupal/views/Plugins/views/argument_validator/Php.php
+++ b/lib/Drupal/views/Plugin/views/argument_validator/Php.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\argument_validator\Php.
+ * Definition of Drupal\views\Plugin\views\argument_validator\Php.
  */
 
-namespace Drupal\views\Plugins\views\argument_validator;
+namespace Drupal\views\Plugin\views\argument_validator;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/cache/CachePluginBase.php b/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php
similarity index 98%
rename from lib/Drupal/views/Plugins/views/cache/CachePluginBase.php
rename to lib/Drupal/views/Plugin/views/cache/CachePluginBase.php
index 5ced8b4acb9324c82b68702772a0a2388133f204..f24ba6f580344d14bb10a864bc2221ddabfcf80e 100644
--- a/lib/Drupal/views/Plugins/views/cache/CachePluginBase.php
+++ b/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\cache\CachePluginBase.
+ * Definition of Drupal\views\Plugin\views\cache\CachePluginBase.
  */
 
-namespace Drupal\views\Plugins\views\cache;
+namespace Drupal\views\Plugin\views\cache;
 
-use Drupal\views\Plugins\views\Plugin;
+use Drupal\views\Plugin\views\Plugin;
 
 /**
  * @defgroup views_cache_plugins Views cache plugins
diff --git a/lib/Drupal/views/Plugins/views/cache/None.php b/lib/Drupal/views/Plugin/views/cache/None.php
similarity index 85%
rename from lib/Drupal/views/Plugins/views/cache/None.php
rename to lib/Drupal/views/Plugin/views/cache/None.php
index 076ac137fbc4663e3247002066ee6d34af9430dd..e11b5766e884cb0023c2198bd2b7d514be297192 100644
--- a/lib/Drupal/views/Plugins/views/cache/None.php
+++ b/lib/Drupal/views/Plugin/views/cache/None.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\cache\None.
+ * Definition of Drupal\views\Plugin\views\cache\None.
  */
 
-namespace Drupal\views\Plugins\views\cache;
+namespace Drupal\views\Plugin\views\cache;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/cache/Time.php b/lib/Drupal/views/Plugin/views/cache/Time.php
similarity index 97%
rename from lib/Drupal/views/Plugins/views/cache/Time.php
rename to lib/Drupal/views/Plugin/views/cache/Time.php
index ac581b700fff021ce6ec5eaee596fc47ce8c127d..9920b195ec23e3fae527b5f4e8c7625c3ac921a2 100644
--- a/lib/Drupal/views/Plugins/views/cache/Time.php
+++ b/lib/Drupal/views/Plugin/views/cache/Time.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\cache\Time.
+ * Definition of Drupal\views\Plugin\views\cache\Time.
  */
 
-namespace Drupal\views\Plugins\views\cache;
+namespace Drupal\views\Plugin\views\cache;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/display/Attachment.php b/lib/Drupal/views/Plugin/views/display/Attachment.php
similarity index 98%
rename from lib/Drupal/views/Plugins/views/display/Attachment.php
rename to lib/Drupal/views/Plugin/views/display/Attachment.php
index 158e2918080a19736e5883ffa95a7121f6c81bd3..1c071e038fe305e74e9f5e22d13baf1083df844a 100644
--- a/lib/Drupal/views/Plugins/views/display/Attachment.php
+++ b/lib/Drupal/views/Plugin/views/display/Attachment.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\display\Attachment.
+ * Definition of Drupal\views\Plugin\views\display\Attachment.
  */
 
-namespace Drupal\views\Plugins\views\display;
+namespace Drupal\views\Plugin\views\display;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/display/Block.php b/lib/Drupal/views/Plugin/views/display/Block.php
similarity index 98%
rename from lib/Drupal/views/Plugins/views/display/Block.php
rename to lib/Drupal/views/Plugin/views/display/Block.php
index 6d88e6bb46d796c0711019a74d1c45388e1bb50a..abb47151efaaff5f5765f152cc5225fe4777d309 100644
--- a/lib/Drupal/views/Plugins/views/display/Block.php
+++ b/lib/Drupal/views/Plugin/views/display/Block.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\display\Block.
+ * Definition of Drupal\views\Plugin\views\display\Block.
  */
 
-namespace Drupal\views\Plugins\views\display;
+namespace Drupal\views\Plugin\views\display;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/display/DefaultDisplay.php b/lib/Drupal/views/Plugin/views/display/DefaultDisplay.php
similarity index 94%
rename from lib/Drupal/views/Plugins/views/display/DefaultDisplay.php
rename to lib/Drupal/views/Plugin/views/display/DefaultDisplay.php
index 8015bde999becc7e2afc5530cbfe9f7a97ed78f2..463922e66db5f52559a2cbf0ed76f012687c7bd6 100644
--- a/lib/Drupal/views/Plugins/views/display/DefaultDisplay.php
+++ b/lib/Drupal/views/Plugin/views/display/DefaultDisplay.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\display\DefaultDisplay.
+ * Definition of Drupal\views\Plugin\views\display\DefaultDisplay.
  */
 
-namespace Drupal\views\Plugins\views\display;
+namespace Drupal\views\Plugin\views\display;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/display/DisplayPluginBase.php b/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
similarity index 99%
rename from lib/Drupal/views/Plugins/views/display/DisplayPluginBase.php
rename to lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
index 7e9579914cb3473f5ecd134c91e27d4551e563ef..6572cdf746609386b78dabcacbb3c38a47f65dd2 100644
--- a/lib/Drupal/views/Plugins/views/display/DisplayPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\display\DisplayPluginBase.
+ * Definition of Drupal\views\Plugin\views\display\DisplayPluginBase.
  */
 
-namespace Drupal\views\Plugins\views\display;
+namespace Drupal\views\Plugin\views\display;
 
 use Drupal\views\View;
-use Drupal\views\Plugins\views\Plugin;
-use Drupal\views\Plugins\Type\QueryPluginManager;
+use Drupal\views\Plugin\views\Plugin;
+use Drupal\views\Plugin\Type\QueryPluginManager;
 
 /**
  * @defgroup views_display_plugins Views display plugins
diff --git a/lib/Drupal/views/Plugins/views/display/Embed.php b/lib/Drupal/views/Plugin/views/display/Embed.php
similarity index 88%
rename from lib/Drupal/views/Plugins/views/display/Embed.php
rename to lib/Drupal/views/Plugin/views/display/Embed.php
index ccb14ebd16963287c0d33b7560b161339ee2ecdd..2deb5cc1f85165dc0aaa831beab2029ba2511bda 100644
--- a/lib/Drupal/views/Plugins/views/display/Embed.php
+++ b/lib/Drupal/views/Plugin/views/display/Embed.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\display\Embed.
+ * Definition of Drupal\views\Plugin\views\display\Embed.
  */
 
-namespace Drupal\views\Plugins\views\display;
+namespace Drupal\views\Plugin\views\display;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/display/Feed.php b/lib/Drupal/views/Plugin/views/display/Feed.php
similarity index 98%
rename from lib/Drupal/views/Plugins/views/display/Feed.php
rename to lib/Drupal/views/Plugin/views/display/Feed.php
index 021f963ed786798da821ba0d823aaaa97d700598..e8d2a38f716409bdd576463e33a048dd76e94c77 100644
--- a/lib/Drupal/views/Plugins/views/display/Feed.php
+++ b/lib/Drupal/views/Plugin/views/display/Feed.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\display\Feed.
+ * Definition of Drupal\views\Plugin\views\display\Feed.
  */
 
-namespace Drupal\views\Plugins\views\display;
+namespace Drupal\views\Plugin\views\display;
 
 use Symfony\Component\HttpFoundation\Response;
 use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/views/Plugins/views/display/Page.php b/lib/Drupal/views/Plugin/views/display/Page.php
similarity index 99%
rename from lib/Drupal/views/Plugins/views/display/Page.php
rename to lib/Drupal/views/Plugin/views/display/Page.php
index d94e94ad7a83f8c53971faae36c41a6ff596bd12..fcc8c342927aafe062a5a0426b8e93939ce16577 100644
--- a/lib/Drupal/views/Plugins/views/display/Page.php
+++ b/lib/Drupal/views/Plugin/views/display/Page.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\display\Page.
+ * Definition of Drupal\views\Plugin\views\display\Page.
  */
 
-namespace Drupal\views\Plugins\views\display;
+namespace Drupal\views\Plugin\views\display;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/display_extender/DefaultDisplayExtender.php b/lib/Drupal/views/Plugin/views/display_extender/DefaultDisplayExtender.php
similarity index 86%
rename from lib/Drupal/views/Plugins/views/display_extender/DefaultDisplayExtender.php
rename to lib/Drupal/views/Plugin/views/display_extender/DefaultDisplayExtender.php
index 5dd3be2c275141fb7f5e97aaf83572736721bba2..8171b2a209700d5369545d626ba93b04c3f6cc7f 100644
--- a/lib/Drupal/views/Plugins/views/display_extender/DefaultDisplayExtender.php
+++ b/lib/Drupal/views/Plugin/views/display_extender/DefaultDisplayExtender.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\views\Plugins\views\display_extender;
+namespace Drupal\views\Plugin\views\display_extender;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/display_extender/DisplayExtenderPluginBase.php b/lib/Drupal/views/Plugin/views/display_extender/DisplayExtenderPluginBase.php
similarity index 87%
rename from lib/Drupal/views/Plugins/views/display_extender/DisplayExtenderPluginBase.php
rename to lib/Drupal/views/Plugin/views/display_extender/DisplayExtenderPluginBase.php
index 8170f3ac50ffec1fa80d5ae36e4edec42680bade..beb48042fc829554e6ef9b9a90347f9a17c4369b 100644
--- a/lib/Drupal/views/Plugins/views/display_extender/DisplayExtenderPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/display_extender/DisplayExtenderPluginBase.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\display_extender\DisplayExtenderPluginBase.
+ * Definition of Drupal\views\Plugin\views\display_extender\DisplayExtenderPluginBase.
  */
 
-namespace Drupal\views\Plugins\views\display_extender;
+namespace Drupal\views\Plugin\views\display_extender;
 
-use Drupal\views\Plugins\views\Plugin;
+use Drupal\views\Plugin\views\Plugin;
 use Drupal\Core\Annotation\Translation;
 
 /**
diff --git a/lib/Drupal/views/Plugins/views/exposed_form/Basic.php b/lib/Drupal/views/Plugin/views/exposed_form/Basic.php
similarity index 79%
rename from lib/Drupal/views/Plugins/views/exposed_form/Basic.php
rename to lib/Drupal/views/Plugin/views/exposed_form/Basic.php
index 526a0a3f82ca08c81816b4b70d15b1ca2481edba..87d0848be85f268db5d0a8f8d5a5836a7a3d4907 100644
--- a/lib/Drupal/views/Plugins/views/exposed_form/Basic.php
+++ b/lib/Drupal/views/Plugin/views/exposed_form/Basic.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\exposed_form\Basic.
+ * Definition of Drupal\views\Plugin\views\exposed_form\Basic.
  */
 
-namespace Drupal\views\Plugins\views\exposed_form;
+namespace Drupal\views\Plugin\views\exposed_form;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/exposed_form/ExposedFormPluginBase.php b/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php
similarity index 98%
rename from lib/Drupal/views/Plugins/views/exposed_form/ExposedFormPluginBase.php
rename to lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php
index ccbb0bca052c3456c73b62247d27b7e68c015ae9..ee041cb4e38b1b0504a51343efccbabaefba74de 100644
--- a/lib/Drupal/views/Plugins/views/exposed_form/ExposedFormPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\cache\ExposedFormPluginBase.
+ * Definition of Drupal\views\Plugin\views\cache\ExposedFormPluginBase.
  */
 
-namespace Drupal\views\Plugins\views\exposed_form;
+namespace Drupal\views\Plugin\views\exposed_form;
 
-use Drupal\views\Plugins\views\Plugin;
+use Drupal\views\Plugin\views\Plugin;
 
 /**
  * @defgroup views_exposed_form_plugins Views exposed form plugins
diff --git a/lib/Drupal/views/Plugins/views/exposed_form/InputRequired.php b/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php
similarity index 96%
rename from lib/Drupal/views/Plugins/views/exposed_form/InputRequired.php
rename to lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php
index 3ba1932d7037581e031d258db76cb9dca2d8bfa2..7235705c9f02467c72e2299e450b38544c9b08eb 100644
--- a/lib/Drupal/views/Plugins/views/exposed_form/InputRequired.php
+++ b/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\exposed_form\InputRequired.
+ * Definition of Drupal\views\Plugin\views\exposed_form\InputRequired.
  */
 
-namespace Drupal\views\Plugins\views\exposed_form;
+namespace Drupal\views\Plugin\views\exposed_form;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/field/Boolean.php b/lib/Drupal/views/Plugin/views/field/Boolean.php
similarity index 95%
rename from lib/Drupal/views/Plugins/views/field/Boolean.php
rename to lib/Drupal/views/Plugin/views/field/Boolean.php
index 817373856c5e0a967c93893e372f435d70504052..96ec7d5628bcc32f77cf3d04b7b00fe46347ab95 100644
--- a/lib/Drupal/views/Plugins/views/field/Boolean.php
+++ b/lib/Drupal/views/Plugin/views/field/Boolean.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\field\Boolean.
+ * Definition of Drupal\views\Plugin\views\field\Boolean.
  */
 
-namespace Drupal\views\Plugins\views\field;
+namespace Drupal\views\Plugin\views\field;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/views/Plugins/views/field/Broken.php b/lib/Drupal/views/Plugin/views/field/Broken.php
similarity index 90%
rename from lib/Drupal/views/Plugins/views/field/Broken.php
rename to lib/Drupal/views/Plugin/views/field/Broken.php
index 1ca24abebf134901030fa24ce9d5a2e0ac7983c7..b716be429b064708c559e52c812f7cb644475cac 100644
--- a/lib/Drupal/views/Plugins/views/field/Broken.php
+++ b/lib/Drupal/views/Plugin/views/field/Broken.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\sort\Broken
+ * Definition of Drupal\views\Plugin\views\sort\Broken
  */
 
-namespace Drupal\views\Plugins\views\field;
+namespace Drupal\views\Plugin\views\field;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/field/ContextualLinks.php b/lib/Drupal/views/Plugin/views/field/ContextualLinks.php
similarity index 96%
rename from lib/Drupal/views/Plugins/views/field/ContextualLinks.php
rename to lib/Drupal/views/Plugin/views/field/ContextualLinks.php
index 9c66ca3dd6baf5081b92331ad8cf370a158d3a1e..88a3febdb364b1c0034eeea5a9e979e10d0f4b2c 100644
--- a/lib/Drupal/views/Plugins/views/field/ContextualLinks.php
+++ b/lib/Drupal/views/Plugin/views/field/ContextualLinks.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\field\ContextualLinks.
+ * Definition of Drupal\views\Plugin\views\field\ContextualLinks.
  */
 
-namespace Drupal\views\Plugins\views\field;
+namespace Drupal\views\Plugin\views\field;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/field/Counter.php b/lib/Drupal/views/Plugin/views/field/Counter.php
similarity index 93%
rename from lib/Drupal/views/Plugins/views/field/Counter.php
rename to lib/Drupal/views/Plugin/views/field/Counter.php
index 96f05da12cfe6c8851ed75a4e51818a5f4714b09..1edefb666bea102ae9ad0b42609521019de10067 100644
--- a/lib/Drupal/views/Plugins/views/field/Counter.php
+++ b/lib/Drupal/views/Plugin/views/field/Counter.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\field\Counter.
+ * Definition of Drupal\views\Plugin\views\field\Counter.
  */
 
-namespace Drupal\views\Plugins\views\field;
+namespace Drupal\views\Plugin\views\field;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/field/Custom.php b/lib/Drupal/views/Plugin/views/field/Custom.php
similarity index 93%
rename from lib/Drupal/views/Plugins/views/field/Custom.php
rename to lib/Drupal/views/Plugin/views/field/Custom.php
index 6402b9763397015ec37b32ea548f1885f77779b1..53329f8a888bb8796f73c7fa17378d1f189e7cd8 100644
--- a/lib/Drupal/views/Plugins/views/field/Custom.php
+++ b/lib/Drupal/views/Plugin/views/field/Custom.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\field\Custom.
+ * Definition of Drupal\views\Plugin\views\field\Custom.
  */
 
-namespace Drupal\views\Plugins\views\field;
+namespace Drupal\views\Plugin\views\field;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/field/Date.php b/lib/Drupal/views/Plugin/views/field/Date.php
similarity index 97%
rename from lib/Drupal/views/Plugins/views/field/Date.php
rename to lib/Drupal/views/Plugin/views/field/Date.php
index 463ea28862e0d6d2446ca8930eccd5c5127fcee9..a7614443b687568b67bd42c31a125d2ca8e8a35b 100644
--- a/lib/Drupal/views/Plugins/views/field/Date.php
+++ b/lib/Drupal/views/Plugin/views/field/Date.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\field\Date.
+ * Definition of Drupal\views\Plugin\views\field\Date.
  */
 
-namespace Drupal\views\Plugins\views\field;
+namespace Drupal\views\Plugin\views\field;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/field/Entity.php b/lib/Drupal/views/Plugin/views/field/Entity.php
similarity index 96%
rename from lib/Drupal/views/Plugins/views/field/Entity.php
rename to lib/Drupal/views/Plugin/views/field/Entity.php
index f979cd5b20d52c4b18851fce38d6785f6768b488..333f0f13b2ffb9eecffddad57e3e6c70d4615068 100644
--- a/lib/Drupal/views/Plugins/views/field/Entity.php
+++ b/lib/Drupal/views/Plugin/views/field/Entity.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\field\Entity.
+ * Definition of Drupal\views\Plugin\views\field\Entity.
  */
 
-namespace Drupal\views\Plugins\views\field;
+namespace Drupal\views\Plugin\views\field;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/field/FieldPluginBase.php b/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
similarity index 99%
rename from lib/Drupal/views/Plugins/views/field/FieldPluginBase.php
rename to lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
index 1b51b1faf4a0a63fefc6ecc7ef56dd8bea576cd0..da86d5b0442f0b7d90b4c9d0eb291f9c58a09a69 100644
--- a/lib/Drupal/views/Plugins/views/field/FieldPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\field\FieldPluginBase.
+ * Definition of Drupal\views\Plugin\views\field\FieldPluginBase.
  */
 
-namespace Drupal\views\Plugins\views\field;
+namespace Drupal\views\Plugin\views\field;
 
-use Drupal\views\Plugins\views\Handler;
+use Drupal\views\Plugin\views\Handler;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/views/Plugins/views/field/FileSize.php b/lib/Drupal/views/Plugin/views/field/FileSize.php
similarity index 91%
rename from lib/Drupal/views/Plugins/views/field/FileSize.php
rename to lib/Drupal/views/Plugin/views/field/FileSize.php
index 5876ca24ebf84e6054e1584f3ec391d5c14897fa..14244922c0b7ea094a82619d114a3054a5a8c424 100644
--- a/lib/Drupal/views/Plugins/views/field/FileSize.php
+++ b/lib/Drupal/views/Plugin/views/field/FileSize.php
@@ -1,9 +1,9 @@
 <?php
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\field\FileSize
+ * Definition of Drupal\views\Plugin\views\field\FileSize
  */
-namespace Drupal\views\Plugins\views\field;
+namespace Drupal\views\Plugin\views\field;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/field/MachineName.php b/lib/Drupal/views/Plugin/views/field/MachineName.php
similarity index 95%
rename from lib/Drupal/views/Plugins/views/field/MachineName.php
rename to lib/Drupal/views/Plugin/views/field/MachineName.php
index 7fc2a5bddef9e6b91c668f37597ef1112d11bdb9..a35bf8676a759f8b18a519c932f041f10bb9dd39 100644
--- a/lib/Drupal/views/Plugins/views/field/MachineName.php
+++ b/lib/Drupal/views/Plugin/views/field/MachineName.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\field\MachineName.
+ * Definition of Drupal\views\Plugin\views\field\MachineName.
  */
 
-namespace Drupal\views\Plugins\views\field;
+namespace Drupal\views\Plugin\views\field;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/field/Markup.php b/lib/Drupal/views/Plugin/views/field/Markup.php
similarity index 93%
rename from lib/Drupal/views/Plugins/views/field/Markup.php
rename to lib/Drupal/views/Plugin/views/field/Markup.php
index 32ddef95bc29b4394453174ffcc92ed374625798..d18b625466b4b18177c9c4f558ba57dbab0b954a 100644
--- a/lib/Drupal/views/Plugins/views/field/Markup.php
+++ b/lib/Drupal/views/Plugin/views/field/Markup.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\field\Markup.
+ * Definition of Drupal\views\Plugin\views\field\Markup.
  */
 
-namespace Drupal\views\Plugins\views\field;
+namespace Drupal\views\Plugin\views\field;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/field/Math.php b/lib/Drupal/views/Plugin/views/field/Math.php
similarity index 96%
rename from lib/Drupal/views/Plugins/views/field/Math.php
rename to lib/Drupal/views/Plugin/views/field/Math.php
index ce2f39364ed7e1b73d10b8c4e5fb97cc6aa1fcbc..dc1c40ab651ed2cfc15192b26424bf79a4fba657 100644
--- a/lib/Drupal/views/Plugins/views/field/Math.php
+++ b/lib/Drupal/views/Plugin/views/field/Math.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\field\Math.
+ * Definition of Drupal\views\Plugin\views\field\Math.
  */
 
-namespace Drupal\views\Plugins\views\field;
+namespace Drupal\views\Plugin\views\field;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/field/Numeric.php b/lib/Drupal/views/Plugin/views/field/Numeric.php
similarity index 98%
rename from lib/Drupal/views/Plugins/views/field/Numeric.php
rename to lib/Drupal/views/Plugin/views/field/Numeric.php
index 397846ef05d85ee2c3e6c573ef8dc9a137b36785..69ca4f4c478f0ec7c9be261c84088c3f3ca5bcd4 100644
--- a/lib/Drupal/views/Plugins/views/field/Numeric.php
+++ b/lib/Drupal/views/Plugin/views/field/Numeric.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\field\Numeric.
+ * Definition of Drupal\views\Plugin\views\field\Numeric.
  */
 
-namespace Drupal\views\Plugins\views\field;
+namespace Drupal\views\Plugin\views\field;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/field/PrerenderList.php b/lib/Drupal/views/Plugin/views/field/PrerenderList.php
similarity index 97%
rename from lib/Drupal/views/Plugins/views/field/PrerenderList.php
rename to lib/Drupal/views/Plugin/views/field/PrerenderList.php
index 7c5bae1edcf1f55b1cf8c67b3f0d486d8684d196..11193ca7bb8d76dffbf8036d608f4f1af88c6dfd 100644
--- a/lib/Drupal/views/Plugins/views/field/PrerenderList.php
+++ b/lib/Drupal/views/Plugin/views/field/PrerenderList.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\field\PrerenderList.
+ * Definition of Drupal\views\Plugin\views\field\PrerenderList.
  */
 
-namespace Drupal\views\Plugins\views\field;
+namespace Drupal\views\Plugin\views\field;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/field/Serialized.php b/lib/Drupal/views/Plugin/views/field/Serialized.php
similarity index 95%
rename from lib/Drupal/views/Plugins/views/field/Serialized.php
rename to lib/Drupal/views/Plugin/views/field/Serialized.php
index db3e31d2d2e243a793ff62f64714d4e7088878ec..83a09224c998eae8796fef1ba6ea668f0ff0b46c 100644
--- a/lib/Drupal/views/Plugins/views/field/Serialized.php
+++ b/lib/Drupal/views/Plugin/views/field/Serialized.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\field\Serialized.
+ * Definition of Drupal\views\Plugin\views\field\Serialized.
  */
 
-namespace Drupal\views\Plugins\views\field;
+namespace Drupal\views\Plugin\views\field;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/field/TimeInterval.php b/lib/Drupal/views/Plugin/views/field/TimeInterval.php
similarity index 89%
rename from lib/Drupal/views/Plugins/views/field/TimeInterval.php
rename to lib/Drupal/views/Plugin/views/field/TimeInterval.php
index 38d5ec2cfb90af29ef10ab3f2470c57ee1a2cc03..f0d8698e8ebb7c1de4acd5a6e84bbd6d65d3c5b5 100644
--- a/lib/Drupal/views/Plugins/views/field/TimeInterval.php
+++ b/lib/Drupal/views/Plugin/views/field/TimeInterval.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\field\TimeInterval.
+ * Definition of Drupal\views\Plugin\views\field\TimeInterval.
  */
 
-namespace Drupal\views\Plugins\views\field;
+namespace Drupal\views\Plugin\views\field;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/field/Url.php b/lib/Drupal/views/Plugin/views/field/Url.php
similarity index 91%
rename from lib/Drupal/views/Plugins/views/field/Url.php
rename to lib/Drupal/views/Plugin/views/field/Url.php
index 4db114b16e862c5f424e10d830524370cb972972..d492dfb718456e61e2f5836bf44228e4ab8a169d 100644
--- a/lib/Drupal/views/Plugins/views/field/Url.php
+++ b/lib/Drupal/views/Plugin/views/field/Url.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\field\Url.
+ * Definition of Drupal\views\Plugin\views\field\Url.
  */
 
-namespace Drupal\views\Plugins\views\field;
+namespace Drupal\views\Plugin\views\field;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/field/Xss.php b/lib/Drupal/views/Plugin/views/field/Xss.php
similarity index 70%
rename from lib/Drupal/views/Plugins/views/field/Xss.php
rename to lib/Drupal/views/Plugin/views/field/Xss.php
index 63bbc4c48bea376543b331c1bd8f4c7346493e2f..896a90e9d1da143cc14cc142a4685cdcfa529c9c 100644
--- a/lib/Drupal/views/Plugins/views/field/Xss.php
+++ b/lib/Drupal/views/Plugin/views/field/Xss.php
@@ -1,11 +1,11 @@
 <?php
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\field\Xss
+ * Definition of Drupal\views\Plugin\views\field\Xss
  */
-namespace Drupal\views\Plugins\views\field;
+namespace Drupal\views\Plugin\views\field;
 
-use Drupal\views\Plugins\views\field\FieldPluginBase;
+use Drupal\views\Plugin\views\field\FieldPluginBase;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/views/Plugins/views/filter/BooleanOperator.php b/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php
similarity index 98%
rename from lib/Drupal/views/Plugins/views/filter/BooleanOperator.php
rename to lib/Drupal/views/Plugin/views/filter/BooleanOperator.php
index 8aa665bee50969e9c06a6ffe01d33ed2f831a6ab..a69d0e72907c882f81280f49e64dbed3959b6f6c 100644
--- a/lib/Drupal/views/Plugins/views/filter/BooleanOperator.php
+++ b/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\filter\BooleanOperator.
+ * Definition of Drupal\views\Plugin\views\filter\BooleanOperator.
  */
 
-namespace Drupal\views\Plugins\views\filter;
+namespace Drupal\views\Plugin\views\filter;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/filter/BooleanOperatorString.php b/lib/Drupal/views/Plugin/views/filter/BooleanOperatorString.php
similarity index 88%
rename from lib/Drupal/views/Plugins/views/filter/BooleanOperatorString.php
rename to lib/Drupal/views/Plugin/views/filter/BooleanOperatorString.php
index 6d752c317ed20068f2157128783095f9280f898a..29f7d40353a492220fb8b5c1dbcd219ce7481536 100644
--- a/lib/Drupal/views/Plugins/views/filter/BooleanOperatorString.php
+++ b/lib/Drupal/views/Plugin/views/filter/BooleanOperatorString.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\filter\BooleanOperatorString.
+ * Definition of Drupal\views\Plugin\views\filter\BooleanOperatorString.
  */
 
-namespace Drupal\views\Plugins\views\filter;
+namespace Drupal\views\Plugin\views\filter;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/filter/Broken.php b/lib/Drupal/views/Plugin/views/filter/Broken.php
similarity index 90%
rename from lib/Drupal/views/Plugins/views/filter/Broken.php
rename to lib/Drupal/views/Plugin/views/filter/Broken.php
index 113e5b6e8ae51a1c358d91ffc72d6a2808378cc2..41e28c26ede8777d8680f0505e8a6d6a8f7be03a 100644
--- a/lib/Drupal/views/Plugins/views/filter/Broken.php
+++ b/lib/Drupal/views/Plugin/views/filter/Broken.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\sort\Broken
+ * Definition of Drupal\views\Plugin\views\sort\Broken
  */
 
-namespace Drupal\views\Plugins\views\filter;
+namespace Drupal\views\Plugin\views\filter;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/filter/Combine.php b/lib/Drupal/views/Plugin/views/filter/Combine.php
similarity index 97%
rename from lib/Drupal/views/Plugins/views/filter/Combine.php
rename to lib/Drupal/views/Plugin/views/filter/Combine.php
index 48218e60d017a06880047d9e8ffd37936cdc3df0..8b56c7b88fe9f3a2496d819d3868f557e8aa44f3 100644
--- a/lib/Drupal/views/Plugins/views/filter/Combine.php
+++ b/lib/Drupal/views/Plugin/views/filter/Combine.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\filter\Combine.
+ * Definition of Drupal\views\Plugin\views\filter\Combine.
  */
 
-namespace Drupal\views\Plugins\views\filter;
+namespace Drupal\views\Plugin\views\filter;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/filter/Date.php b/lib/Drupal/views/Plugin/views/filter/Date.php
similarity index 98%
rename from lib/Drupal/views/Plugins/views/filter/Date.php
rename to lib/Drupal/views/Plugin/views/filter/Date.php
index 612bd8261a6d5cdad9c463010c45a4acd9e0158d..81843892ad41e8965de677273284d3cc47042b71 100644
--- a/lib/Drupal/views/Plugins/views/filter/Date.php
+++ b/lib/Drupal/views/Plugin/views/filter/Date.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\filter\Date.
+ * Definition of Drupal\views\Plugin\views\filter\Date.
  */
 
-namespace Drupal\views\Plugins\views\filter;
+namespace Drupal\views\Plugin\views\filter;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/filter/Equality.php b/lib/Drupal/views/Plugin/views/filter/Equality.php
similarity index 90%
rename from lib/Drupal/views/Plugins/views/filter/Equality.php
rename to lib/Drupal/views/Plugin/views/filter/Equality.php
index 2602ad18ca6ad6413f2b39fb5f2c1bdb3275ca0f..9344519bae77039be55cfbf49873ecc000d1de76 100644
--- a/lib/Drupal/views/Plugins/views/filter/Equality.php
+++ b/lib/Drupal/views/Plugin/views/filter/Equality.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\filter\Equality.
+ * Definition of Drupal\views\Plugin\views\filter\Equality.
  */
 
-namespace Drupal\views\Plugins\views\filter;
+namespace Drupal\views\Plugin\views\filter;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/filter/FilterPluginBase.php b/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
similarity index 99%
rename from lib/Drupal/views/Plugins/views/filter/FilterPluginBase.php
rename to lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
index 180897465f26232dcc64c2bb41e877a290627bed..de2c4803d60b1495e84a4d2019b72f6b08204d20 100644
--- a/lib/Drupal/views/Plugins/views/filter/FilterPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\filter\FilterPluginBase.
+ * Definition of Drupal\views\Plugin\views\filter\FilterPluginBase.
  */
 
-namespace Drupal\views\Plugins\views\filter;
+namespace Drupal\views\Plugin\views\filter;
 
-use Drupal\views\Plugins\views\Handler;
+use Drupal\views\Plugin\views\Handler;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/views/Plugins/views/filter/GroupByNumeric.php b/lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php
similarity index 94%
rename from lib/Drupal/views/Plugins/views/filter/GroupByNumeric.php
rename to lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php
index a47b83f33d571eb80d647338db58f3a3dcd34d24..1f486d6f09f6f0d0d9cbd8eec75e692926db07f0 100644
--- a/lib/Drupal/views/Plugins/views/filter/GroupByNumeric.php
+++ b/lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\filter\GroupByNumeric.
+ * Definition of Drupal\views\Plugin\views\filter\GroupByNumeric.
  */
 
-namespace Drupal\views\Plugins\views\filter;
+namespace Drupal\views\Plugin\views\filter;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/filter/InOperator.php b/lib/Drupal/views/Plugin/views/filter/InOperator.php
similarity index 99%
rename from lib/Drupal/views/Plugins/views/filter/InOperator.php
rename to lib/Drupal/views/Plugin/views/filter/InOperator.php
index fa1510516413d3ec4e334cb09d22b14a40d49f0d..c3e8d316b5cd132391a0002f8df322ab1363ec84 100644
--- a/lib/Drupal/views/Plugins/views/filter/InOperator.php
+++ b/lib/Drupal/views/Plugin/views/filter/InOperator.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\filter\InOperator.
+ * Definition of Drupal\views\Plugin\views\filter\InOperator.
  */
 
-namespace Drupal\views\Plugins\views\filter;
+namespace Drupal\views\Plugin\views\filter;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/filter/ManyToOne.php b/lib/Drupal/views/Plugin/views/filter/ManyToOne.php
similarity index 96%
rename from lib/Drupal/views/Plugins/views/filter/ManyToOne.php
rename to lib/Drupal/views/Plugin/views/filter/ManyToOne.php
index 793c3839edb5d85d1fa7c7e413d497de43875929..284cf852325bb59dca91d73be50640c23ddc7b94 100644
--- a/lib/Drupal/views/Plugins/views/filter/ManyToOne.php
+++ b/lib/Drupal/views/Plugin/views/filter/ManyToOne.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\filter\ManyToOne.
+ * Definition of Drupal\views\Plugin\views\filter\ManyToOne.
  */
 
-namespace Drupal\views\Plugins\views\filter;
+namespace Drupal\views\Plugin\views\filter;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/filter/Numeric.php b/lib/Drupal/views/Plugin/views/filter/Numeric.php
similarity index 98%
rename from lib/Drupal/views/Plugins/views/filter/Numeric.php
rename to lib/Drupal/views/Plugin/views/filter/Numeric.php
index 2890fc7c9d3ab228cdb6090a181e4f0d49f1e683..1ddcea24843c9278159c8a00410197d5caf4d0a0 100644
--- a/lib/Drupal/views/Plugins/views/filter/Numeric.php
+++ b/lib/Drupal/views/Plugin/views/filter/Numeric.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\filter\Numeric.
+ * Definition of Drupal\views\Plugin\views\filter\Numeric.
  */
 
-namespace Drupal\views\Plugins\views\filter;
+namespace Drupal\views\Plugin\views\filter;
 
 use Drupal\Core\Database\Database;
 use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/views/Plugins/views/filter/String.php b/lib/Drupal/views/Plugin/views/filter/String.php
similarity index 98%
rename from lib/Drupal/views/Plugins/views/filter/String.php
rename to lib/Drupal/views/Plugin/views/filter/String.php
index 618796402db0116f3b5ad00f872d51df7005b794..8c2ff03e6116befe36fd6ffb5781651774537c7e 100644
--- a/lib/Drupal/views/Plugins/views/filter/String.php
+++ b/lib/Drupal/views/Plugin/views/filter/String.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\filter\String.
+ * Definition of Drupal\views\Plugin\views\filter\String.
  */
 
-namespace Drupal\views\Plugins\views\filter;
+namespace Drupal\views\Plugin\views\filter;
 
 use Drupal\Core\Database\Database;
 use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/views/Plugins/views/localization/Core.php b/lib/Drupal/views/Plugin/views/localization/Core.php
similarity index 96%
rename from lib/Drupal/views/Plugins/views/localization/Core.php
rename to lib/Drupal/views/Plugin/views/localization/Core.php
index 514940e33e526e4b7b732e5e3154480caeedaf12..080a6c153a75e4482119f557ea198f6ad1770e0a 100644
--- a/lib/Drupal/views/Plugins/views/localization/Core.php
+++ b/lib/Drupal/views/Plugin/views/localization/Core.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\localization\Core.
+ * Definition of Drupal\views\Plugin\views\localization\Core.
  */
 
-namespace Drupal\views\Plugins\views\localization;
+namespace Drupal\views\Plugin\views\localization;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/localization/LocalizationPluginBase.php b/lib/Drupal/views/Plugin/views/localization/LocalizationPluginBase.php
similarity index 96%
rename from lib/Drupal/views/Plugins/views/localization/LocalizationPluginBase.php
rename to lib/Drupal/views/Plugin/views/localization/LocalizationPluginBase.php
index bc6cd1913a688f5e16d018d88e02700f849349a9..2df43f3ae86bcd938326bf7e4c41f83edeb3be62 100644
--- a/lib/Drupal/views/Plugins/views/localization/LocalizationPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/localization/LocalizationPluginBase.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\localization\LocalizationPluginBase.
+ * Definition of Drupal\views\Plugin\views\localization\LocalizationPluginBase.
  */
 
-namespace Drupal\views\Plugins\views\localization;
+namespace Drupal\views\Plugin\views\localization;
 
-use Drupal\views\Plugins\views\Plugin;
+use Drupal\views\Plugin\views\Plugin;
 
 /**
  * @defgroup views_localization_plugins Views localization plugins
diff --git a/lib/Drupal/views/Plugins/views/localization/None.php b/lib/Drupal/views/Plugin/views/localization/None.php
similarity index 87%
rename from lib/Drupal/views/Plugins/views/localization/None.php
rename to lib/Drupal/views/Plugin/views/localization/None.php
index d6cd5569fa28e52f48cd08009bbf007b6a3d2b7e..2c04b23a271026d1c9952794d0bc7f6e87219ed3 100644
--- a/lib/Drupal/views/Plugins/views/localization/None.php
+++ b/lib/Drupal/views/Plugin/views/localization/None.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\localization\None.
+ * Definition of Drupal\views\Plugin\views\localization\None.
  */
 
-namespace Drupal\views\Plugins\views\localization;
+namespace Drupal\views\Plugin\views\localization;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/pager/Full.php b/lib/Drupal/views/Plugin/views/pager/Full.php
similarity index 99%
rename from lib/Drupal/views/Plugins/views/pager/Full.php
rename to lib/Drupal/views/Plugin/views/pager/Full.php
index 7946bdd6a78b48fcd37883dcdc42f3d9396abf7c..cf7f888398b4f259c4da348f3b346a6bdaee2e97 100644
--- a/lib/Drupal/views/Plugins/views/pager/Full.php
+++ b/lib/Drupal/views/Plugin/views/pager/Full.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\pager\Full.
+ * Definition of Drupal\views\Plugin\views\pager\Full.
  */
 
-namespace Drupal\views\Plugins\views\pager;
+namespace Drupal\views\Plugin\views\pager;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/pager/Mini.php b/lib/Drupal/views/Plugin/views/pager/Mini.php
similarity index 92%
rename from lib/Drupal/views/Plugins/views/pager/Mini.php
rename to lib/Drupal/views/Plugin/views/pager/Mini.php
index f83552c535d25931ae394c039a1d9f55ae5a4f22..180d03127da220d25ae3c10157e16a1ee97baa81 100644
--- a/lib/Drupal/views/Plugins/views/pager/Mini.php
+++ b/lib/Drupal/views/Plugin/views/pager/Mini.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\pager\Mini.
+ * Definition of Drupal\views\Plugin\views\pager\Mini.
  */
 
-namespace Drupal\views\Plugins\views\pager;
+namespace Drupal\views\Plugin\views\pager;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/pager/None.php b/lib/Drupal/views/Plugin/views/pager/None.php
similarity index 95%
rename from lib/Drupal/views/Plugins/views/pager/None.php
rename to lib/Drupal/views/Plugin/views/pager/None.php
index 20733b37650921a4016d7d9e6b8b00398db1a7fa..f4fa24c95e7df1e36c75be2ef783c0067fd2e595 100644
--- a/lib/Drupal/views/Plugins/views/pager/None.php
+++ b/lib/Drupal/views/Plugin/views/pager/None.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\pager\None.
+ * Definition of Drupal\views\Plugin\views\pager\None.
  */
 
-namespace Drupal\views\Plugins\views\pager;
+namespace Drupal\views\Plugin\views\pager;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/pager/PagerPluginBase.php b/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php
similarity index 97%
rename from lib/Drupal/views/Plugins/views/pager/PagerPluginBase.php
rename to lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php
index 0b5823c995653846d6d55ab9d8dc237fa0fe24de..8e108fbd232aaf2dbfe9d45d1e9128fb8d20b214 100644
--- a/lib/Drupal/views/Plugins/views/pager/PagerPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\pager\PagerPluginBase.
+ * Definition of Drupal\views\Plugin\views\pager\PagerPluginBase.
  */
 
-namespace Drupal\views\Plugins\views\pager;
+namespace Drupal\views\Plugin\views\pager;
 
-use Drupal\views\Plugins\views\Plugin;
+use Drupal\views\Plugin\views\Plugin;
 
 /**
  * @defgroup views_pager_plugins Views pager plugins
diff --git a/lib/Drupal/views/Plugins/views/pager/Some.php b/lib/Drupal/views/Plugin/views/pager/Some.php
similarity index 95%
rename from lib/Drupal/views/Plugins/views/pager/Some.php
rename to lib/Drupal/views/Plugin/views/pager/Some.php
index 4bf1d1de3594ac33a87235a9dc348dfa12f48fc4..8aabd3417880f964a15b9723c174528bdf79fe6d 100644
--- a/lib/Drupal/views/Plugins/views/pager/Some.php
+++ b/lib/Drupal/views/Plugin/views/pager/Some.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\pager\Some.
+ * Definition of Drupal\views\Plugin\views\pager\Some.
  */
 
-namespace Drupal\views\Plugins\views\pager;
+namespace Drupal\views\Plugin\views\pager;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/query/QueryInterface.php b/lib/Drupal/views/Plugin/views/query/QueryInterface.php
similarity index 58%
rename from lib/Drupal/views/Plugins/views/query/QueryInterface.php
rename to lib/Drupal/views/Plugin/views/query/QueryInterface.php
index 22531c1b924d0c19ad478a3c58a18d1ff64977a5..89ef159314b45a43171d239e48a0b3d7c460a503 100644
--- a/lib/Drupal/views/Plugins/views/query/QueryInterface.php
+++ b/lib/Drupal/views/Plugin/views/query/QueryInterface.php
@@ -4,9 +4,9 @@
  * Definition of Drupal\views\Plugin\Query\QueryInterface.
  */
 
-namespace Drupal\views\Plugins\views\query;
+namespace Drupal\views\Plugin\views\query;
 
-use Drupal\views\Plugins\views\PluginInterface;
+use Drupal\views\Plugin\views\PluginInterface;
 
 interface QueryInterface extends PluginInterface {
 
diff --git a/lib/Drupal/views/Plugins/views/query/QueryPluginBase.php b/lib/Drupal/views/Plugin/views/query/QueryPluginBase.php
similarity index 96%
rename from lib/Drupal/views/Plugins/views/query/QueryPluginBase.php
rename to lib/Drupal/views/Plugin/views/query/QueryPluginBase.php
index afbe1e7dc914e624bf9c73ee3822a453b2ed5c28..ce86581d340a542dd19ddbe97a47e8826d2a0866 100644
--- a/lib/Drupal/views/Plugins/views/query/QueryPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/query/QueryPluginBase.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * Definition of Drupal\views\Plugins\views\query\QueryPluginBase.
+ * Definition of Drupal\views\Plugin\views\query\QueryPluginBase.
  */
 
-namespace Drupal\views\Plugins\views\query;
+namespace Drupal\views\Plugin\views\query;
 
-use Drupal\views\Plugins\views\Plugin;
+use Drupal\views\Plugin\views\Plugin;
 
 abstract class QueryPluginBase extends Plugin implements QueryInterface {
   /**
diff --git a/lib/Drupal/views/Plugins/views/query/Sql.php b/lib/Drupal/views/Plugin/views/query/Sql.php
similarity index 99%
rename from lib/Drupal/views/Plugins/views/query/Sql.php
rename to lib/Drupal/views/Plugin/views/query/Sql.php
index 6fa2961e924151b6546095be0bd50df723e62f5d..cdc4423b919b1fbf1c16ca4c1f4a6471ac204053 100644
--- a/lib/Drupal/views/Plugins/views/query/Sql.php
+++ b/lib/Drupal/views/Plugin/views/query/Sql.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\query\Sql.
+ * Definition of Drupal\views\Plugin\views\query\Sql.
  */
 
-namespace Drupal\views\Plugins\views\query;
+namespace Drupal\views\Plugin\views\query;
 
 use Drupal\Core\Database\Database;
 use Drupal\views\Join;
diff --git a/lib/Drupal/views/Plugins/views/relationship/GroupwiseMax.php b/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php
similarity index 99%
rename from lib/Drupal/views/Plugins/views/relationship/GroupwiseMax.php
rename to lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php
index 732677a393e5f743219cb3ca7340a92d15b98126..1874df41b1637ff57905b771ecccead4ca724e83 100644
--- a/lib/Drupal/views/Plugins/views/relationship/GroupwiseMax.php
+++ b/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\relationship\GroupwiseMax.
+ * Definition of Drupal\views\Plugin\views\relationship\GroupwiseMax.
  */
 
-namespace Drupal\views\Plugins\views\relationship;
+namespace Drupal\views\Plugin\views\relationship;
 
 use Drupal\Core\Database\Query\AlterableInterface;
 use Drupal\views\View;
diff --git a/lib/Drupal/views/Plugins/views/relationship/RelationshipPluginBase.php b/lib/Drupal/views/Plugin/views/relationship/RelationshipPluginBase.php
similarity index 97%
rename from lib/Drupal/views/Plugins/views/relationship/RelationshipPluginBase.php
rename to lib/Drupal/views/Plugin/views/relationship/RelationshipPluginBase.php
index 34132c430ec105875e8c3329ef615f3798fdd946..a40b115e65f03232b37b08566975c90eb6acd6f2 100644
--- a/lib/Drupal/views/Plugins/views/relationship/RelationshipPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/relationship/RelationshipPluginBase.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\relationship\RelationshipPluginBase.
+ * Definition of Drupal\views\Plugin\views\relationship\RelationshipPluginBase.
  */
 
-namespace Drupal\views\Plugins\views\relationship;
+namespace Drupal\views\Plugin\views\relationship;
 
-use Drupal\views\Plugins\views\Handler;
+use Drupal\views\Plugin\views\Handler;
 use Drupal\views\Join;
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/row/Fields.php b/lib/Drupal/views/Plugin/views/row/Fields.php
similarity index 97%
rename from lib/Drupal/views/Plugins/views/row/Fields.php
rename to lib/Drupal/views/Plugin/views/row/Fields.php
index 5482652152e3f94410a9a32afe2f0e709c01995c..ca968ea937300e2a4fc3094e4dee862afa1fbce6 100644
--- a/lib/Drupal/views/Plugins/views/row/Fields.php
+++ b/lib/Drupal/views/Plugin/views/row/Fields.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\row\Fields.
+ * Definition of Drupal\views\Plugin\views\row\Fields.
  */
 
-namespace Drupal\views\Plugins\views\row;
+namespace Drupal\views\Plugin\views\row;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/row/RowPluginBase.php b/lib/Drupal/views/Plugin/views/row/RowPluginBase.php
similarity index 96%
rename from lib/Drupal/views/Plugins/views/row/RowPluginBase.php
rename to lib/Drupal/views/Plugin/views/row/RowPluginBase.php
index c19b3ee75def8cb58f261c53712c2492b5b85e07..e073cb058ea3f51a1e39694a24e3d15bf3f9934f 100644
--- a/lib/Drupal/views/Plugins/views/row/RowPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/row/RowPluginBase.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\row\RowPluginBase.
+ * Definition of Drupal\views\Plugin\views\row\RowPluginBase.
  */
 
-namespace Drupal\views\Plugins\views\row;
+namespace Drupal\views\Plugin\views\row;
 
-use Drupal\views\Plugins\views\Plugin;
+use Drupal\views\Plugin\views\Plugin;
 
 /**
  * @defgroup views_row_plugins Views row plugins
diff --git a/lib/Drupal/views/Plugins/views/row/RssFields.php b/lib/Drupal/views/Plugin/views/row/RssFields.php
similarity index 98%
rename from lib/Drupal/views/Plugins/views/row/RssFields.php
rename to lib/Drupal/views/Plugin/views/row/RssFields.php
index 190206a698447817a8924683d6323f87c5a1c9d5..437c6186c16052cc294e7405714df538520ada8f 100644
--- a/lib/Drupal/views/Plugins/views/row/RssFields.php
+++ b/lib/Drupal/views/Plugin/views/row/RssFields.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\row\RssFields.
+ * Definition of Drupal\views\Plugin\views\row\RssFields.
  */
 
-namespace Drupal\views\Plugins\views\row;
+namespace Drupal\views\Plugin\views\row;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/sort/Broken.php b/lib/Drupal/views/Plugin/views/sort/Broken.php
similarity index 90%
rename from lib/Drupal/views/Plugins/views/sort/Broken.php
rename to lib/Drupal/views/Plugin/views/sort/Broken.php
index 0aa29ae8006c040c8f4f587e79ae7fd1c8623d01..3ffbb3bfacbd06eb5821feb2af00169be21c71d5 100644
--- a/lib/Drupal/views/Plugins/views/sort/Broken.php
+++ b/lib/Drupal/views/Plugin/views/sort/Broken.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\sort\Broken
+ * Definition of Drupal\views\Plugin\views\sort\Broken
  */
 
-namespace Drupal\views\Plugins\views\sort;
+namespace Drupal\views\Plugin\views\sort;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/sort/Date.php b/lib/Drupal/views/Plugin/views/sort/Date.php
similarity index 95%
rename from lib/Drupal/views/Plugins/views/sort/Date.php
rename to lib/Drupal/views/Plugin/views/sort/Date.php
index 6fd184cd09b9be2932b31531089969e13307d9fe..a1b27eb46a69f326dff3b826618374fdb70e9be8 100644
--- a/lib/Drupal/views/Plugins/views/sort/Date.php
+++ b/lib/Drupal/views/Plugin/views/sort/Date.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\sort\Date.
+ * Definition of Drupal\views\Plugin\views\sort\Date.
  */
 
-namespace Drupal\views\Plugins\views\sort;
+namespace Drupal\views\Plugin\views\sort;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/sort/GroupByNumeric.php b/lib/Drupal/views/Plugin/views/sort/GroupByNumeric.php
similarity index 88%
rename from lib/Drupal/views/Plugins/views/sort/GroupByNumeric.php
rename to lib/Drupal/views/Plugin/views/sort/GroupByNumeric.php
index b217f7ec50df1954b85535c217831589e14266bf..40997b327fa1643ce9e2fc7a0b2025c4f9f80cce 100644
--- a/lib/Drupal/views/Plugins/views/sort/GroupByNumeric.php
+++ b/lib/Drupal/views/Plugin/views/sort/GroupByNumeric.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\sort\GroupByNumeric.
+ * Definition of Drupal\views\Plugin\views\sort\GroupByNumeric.
  */
 
-namespace Drupal\views\Plugins\views\sort;
+namespace Drupal\views\Plugin\views\sort;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/sort/MenuHierarchy.php b/lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php
similarity index 94%
rename from lib/Drupal/views/Plugins/views/sort/MenuHierarchy.php
rename to lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php
index 8b1b9b686ac1e806ab17b838b5a2ff923f68d171..a9b0b0b929fa0c5a424d8cac7adbab95533aa5ae 100644
--- a/lib/Drupal/views/Plugins/views/sort/MenuHierarchy.php
+++ b/lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\sort\MenuHierarchy.
+ * Definition of Drupal\views\Plugin\views\sort\MenuHierarchy.
  */
 
-namespace Drupal\views\Plugins\views\sort;
+namespace Drupal\views\Plugin\views\sort;
 
 use Drupal\views\Join;
 use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/views/Plugins/views/sort/Random.php b/lib/Drupal/views/Plugin/views/sort/Random.php
similarity index 79%
rename from lib/Drupal/views/Plugins/views/sort/Random.php
rename to lib/Drupal/views/Plugin/views/sort/Random.php
index f3e729085363c094532ac0ce6c83bb673e2b0040..3cd8b1495370efcb3898729735a645d4d7f1af5e 100644
--- a/lib/Drupal/views/Plugins/views/sort/Random.php
+++ b/lib/Drupal/views/Plugin/views/sort/Random.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\sort\Random.
+ * Definition of Drupal\views\Plugin\views\sort\Random.
  */
 
-namespace Drupal\views\Plugins\views\sort;
+namespace Drupal\views\Plugin\views\sort;
 
 use Drupal\Core\Annotation\Plugin;
 
diff --git a/lib/Drupal/views/Plugins/views/sort/SortPluginBase.php b/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php
similarity index 97%
rename from lib/Drupal/views/Plugins/views/sort/SortPluginBase.php
rename to lib/Drupal/views/Plugin/views/sort/SortPluginBase.php
index da5221e74b8b6382fcbaac9eaa78409eae471594..fec0ec1aea3469df469cf28117adec023bb0471d 100644
--- a/lib/Drupal/views/Plugins/views/sort/SortPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\sort\SortPluginBase.
+ * Definition of Drupal\views\Plugin\views\sort\SortPluginBase.
  */
 
-namespace Drupal\views\Plugins\views\sort;
+namespace Drupal\views\Plugin\views\sort;
 
-use Drupal\views\Plugins\views\Handler;
+use Drupal\views\Plugin\views\Handler;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/views/Plugins/views/style/DefaultStyle.php b/lib/Drupal/views/Plugin/views/style/DefaultStyle.php
similarity index 88%
rename from lib/Drupal/views/Plugins/views/style/DefaultStyle.php
rename to lib/Drupal/views/Plugin/views/style/DefaultStyle.php
index 0137660a0e02d1d56ae9b43c96efcf4869489267..73755ae80a7d5722bf298976bae0d55343566202 100644
--- a/lib/Drupal/views/Plugins/views/style/DefaultStyle.php
+++ b/lib/Drupal/views/Plugin/views/style/DefaultStyle.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\style\DefaultStyle.
+ * Definition of Drupal\views\Plugin\views\style\DefaultStyle.
  */
 
-namespace Drupal\views\Plugins\views\style;
+namespace Drupal\views\Plugin\views\style;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/style/DefaultSummary.php b/lib/Drupal/views/Plugin/views/style/DefaultSummary.php
similarity index 93%
rename from lib/Drupal/views/Plugins/views/style/DefaultSummary.php
rename to lib/Drupal/views/Plugin/views/style/DefaultSummary.php
index 33bdc6cefa2173c6a0ce9be38aa3fb4bc357865c..63ed0d17420ad1600120537a42234804f49facbc 100644
--- a/lib/Drupal/views/Plugins/views/style/DefaultSummary.php
+++ b/lib/Drupal/views/Plugin/views/style/DefaultSummary.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\style\StyleSummaryPluginBase.
+ * Definition of Drupal\views\Plugin\views\style\StyleSummaryPluginBase.
  */
 
-namespace Drupal\views\Plugins\views\style;
+namespace Drupal\views\Plugin\views\style;
 
-use Drupal\views\Plugins\views\style\StylePluginBase;
+use Drupal\views\Plugin\views\style\StylePluginBase;
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
diff --git a/lib/Drupal/views/Plugins/views/style/Grid.php b/lib/Drupal/views/Plugin/views/style/Grid.php
similarity index 96%
rename from lib/Drupal/views/Plugins/views/style/Grid.php
rename to lib/Drupal/views/Plugin/views/style/Grid.php
index 38d4c93e70029eac40cbf73930ef4acb3adf752a..aa633c58ab9804750d25384f6ee43e9058346e07 100644
--- a/lib/Drupal/views/Plugins/views/style/Grid.php
+++ b/lib/Drupal/views/Plugin/views/style/Grid.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\style\Grid.
+ * Definition of Drupal\views\Plugin\views\style\Grid.
  */
 
-namespace Drupal\views\Plugins\views\style;
+namespace Drupal\views\Plugin\views\style;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/style/HtmlList.php b/lib/Drupal/views/Plugin/views/style/HtmlList.php
similarity index 94%
rename from lib/Drupal/views/Plugins/views/style/HtmlList.php
rename to lib/Drupal/views/Plugin/views/style/HtmlList.php
index c5df06d02f7c273a0cec618f54caf2d3cba95748..a0a726ba02a4e7975c74dd722099ab10f6cc076d 100644
--- a/lib/Drupal/views/Plugins/views/style/HtmlList.php
+++ b/lib/Drupal/views/Plugin/views/style/HtmlList.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\style\List.
+ * Definition of Drupal\views\Plugin\views\style\List.
  */
 
-namespace Drupal\views\Plugins\views\style;
+namespace Drupal\views\Plugin\views\style;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/style/JumpMenu.php b/lib/Drupal/views/Plugin/views/style/JumpMenu.php
similarity index 98%
rename from lib/Drupal/views/Plugins/views/style/JumpMenu.php
rename to lib/Drupal/views/Plugin/views/style/JumpMenu.php
index 6f4b794fb95afbdee6aaac676732de12b4e40e7d..872857c543949479a6e9d18e31661d910e41dee1 100644
--- a/lib/Drupal/views/Plugins/views/style/JumpMenu.php
+++ b/lib/Drupal/views/Plugin/views/style/JumpMenu.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\style\JumpMenu.
+ * Definition of Drupal\views\Plugin\views\style\JumpMenu.
  */
 
-namespace Drupal\views\Plugins\views\style;
+namespace Drupal\views\Plugin\views\style;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/style/JumpMenuSummary.php b/lib/Drupal/views/Plugin/views/style/JumpMenuSummary.php
similarity index 97%
rename from lib/Drupal/views/Plugins/views/style/JumpMenuSummary.php
rename to lib/Drupal/views/Plugin/views/style/JumpMenuSummary.php
index fe129c1dbbec5061d95451722bd839da03d1d43b..e3a4bf185102845fc426f9b082c2452b67028e88 100644
--- a/lib/Drupal/views/Plugins/views/style/JumpMenuSummary.php
+++ b/lib/Drupal/views/Plugin/views/style/JumpMenuSummary.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\style\JumpMenuStyleSummary.
+ * Definition of Drupal\views\Plugin\views\style\JumpMenuStyleSummary.
  */
 
-namespace Drupal\views\Plugins\views\style;
+namespace Drupal\views\Plugin\views\style;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/style/Rss.php b/lib/Drupal/views/Plugin/views/style/Rss.php
similarity index 97%
rename from lib/Drupal/views/Plugins/views/style/Rss.php
rename to lib/Drupal/views/Plugin/views/style/Rss.php
index 331ce7c45f0a8b3e83e8b132876f62ac58ae84d6..78406c44ecfd62274bf6f997d03268ebdcdc945d 100644
--- a/lib/Drupal/views/Plugins/views/style/Rss.php
+++ b/lib/Drupal/views/Plugin/views/style/Rss.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\style\Rss.
+ * Definition of Drupal\views\Plugin\views\style\Rss.
  */
 
-namespace Drupal\views\Plugins\views\style;
+namespace Drupal\views\Plugin\views\style;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/style/StylePluginBase.php b/lib/Drupal/views/Plugin/views/style/StylePluginBase.php
similarity index 99%
rename from lib/Drupal/views/Plugins/views/style/StylePluginBase.php
rename to lib/Drupal/views/Plugin/views/style/StylePluginBase.php
index 4c4427122759eb6d1aaaba170ab002dbae0a2a7b..c50d81795ac52fc603e89b3e6195cd1928d1fcbe 100644
--- a/lib/Drupal/views/Plugins/views/style/StylePluginBase.php
+++ b/lib/Drupal/views/Plugin/views/style/StylePluginBase.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\style\StylePluginBase.
+ * Definition of Drupal\views\Plugin\views\style\StylePluginBase.
  */
 
-namespace Drupal\views\Plugins\views\style;
+namespace Drupal\views\Plugin\views\style;
 
-use Drupal\views\Plugins\views\Plugin as ViewsPlugin;
+use Drupal\views\Plugin\views\Plugin as ViewsPlugin;
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
diff --git a/lib/Drupal/views/Plugins/views/style/Table.php b/lib/Drupal/views/Plugin/views/style/Table.php
similarity index 99%
rename from lib/Drupal/views/Plugins/views/style/Table.php
rename to lib/Drupal/views/Plugin/views/style/Table.php
index 2ed7192dedd3f28ec5b9e3ae6bea616591860689..95f7d418fabff792d728abfbdba854db3e6a1686 100644
--- a/lib/Drupal/views/Plugins/views/style/Table.php
+++ b/lib/Drupal/views/Plugin/views/style/Table.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\style\Table.
+ * Definition of Drupal\views\Plugin\views\style\Table.
  */
 
-namespace Drupal\views\Plugins\views\style;
+namespace Drupal\views\Plugin\views\style;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/style/UnformattedSummary.php b/lib/Drupal/views/Plugin/views/style/UnformattedSummary.php
similarity index 91%
rename from lib/Drupal/views/Plugins/views/style/UnformattedSummary.php
rename to lib/Drupal/views/Plugin/views/style/UnformattedSummary.php
index 9eb50e96bbe7ca94cb3aaf28446c12037f77d596..b82d5443b50e5f70165761a3a3f8cbcc1095e171 100644
--- a/lib/Drupal/views/Plugins/views/style/UnformattedSummary.php
+++ b/lib/Drupal/views/Plugin/views/style/UnformattedSummary.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\style\UnformattedSummary.
+ * Definition of Drupal\views\Plugin\views\style\UnformattedSummary.
  */
 
-namespace Drupal\views\Plugins\views\style;
+namespace Drupal\views\Plugin\views\style;
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/views/Plugins/views/wizard/Comment.php b/lib/Drupal/views/Plugin/views/wizard/Comment.php
similarity index 97%
rename from lib/Drupal/views/Plugins/views/wizard/Comment.php
rename to lib/Drupal/views/Plugin/views/wizard/Comment.php
index 5f4fee2faf6c17a4e355863fa19d18a4bddf42e6..9d67a1aab902646239d886afd823b37d81c2d70c 100644
--- a/lib/Drupal/views/Plugins/views/wizard/Comment.php
+++ b/lib/Drupal/views/Plugin/views/wizard/Comment.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\wizard\Comment.
+ * Definition of Drupal\views\Plugin\views\wizard\Comment.
  */
 
-namespace Drupal\views\Plugins\views\wizard;
+namespace Drupal\views\Plugin\views\wizard;
 
-use Drupal\views\Plugins\wizard;
+use Drupal\views\Plugin\wizard;
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
diff --git a/lib/Drupal/views/Plugins/views/wizard/File.php b/lib/Drupal/views/Plugin/views/wizard/File.php
similarity index 92%
rename from lib/Drupal/views/Plugins/views/wizard/File.php
rename to lib/Drupal/views/Plugin/views/wizard/File.php
index 976c1c634805f037efa4eb07e54d2b77bff8fae8..12e878187886756c544b650e2176962d7e7563b8 100644
--- a/lib/Drupal/views/Plugins/views/wizard/File.php
+++ b/lib/Drupal/views/Plugin/views/wizard/File.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\wizard\File.
+ * Definition of Drupal\views\Plugin\views\wizard\File.
  */
 
-namespace Drupal\views\Plugins\views\wizard;
+namespace Drupal\views\Plugin\views\wizard;
 
-use Drupal\views\Plugins\views\wizard\WizardPluginBase;
+use Drupal\views\Plugin\views\wizard\WizardPluginBase;
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
diff --git a/lib/Drupal/views/Plugins/views/wizard/Node.php b/lib/Drupal/views/Plugin/views/wizard/Node.php
similarity index 97%
rename from lib/Drupal/views/Plugins/views/wizard/Node.php
rename to lib/Drupal/views/Plugin/views/wizard/Node.php
index 29e943a4953191faae62f2187db09715e7bab648..8ba1886d07281ca2d186c2b01597fe30d96a912c 100644
--- a/lib/Drupal/views/Plugins/views/wizard/Node.php
+++ b/lib/Drupal/views/Plugin/views/wizard/Node.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\wizard\Node.
+ * Definition of Drupal\views\Plugin\views\wizard\Node.
  */
 
-namespace Drupal\views\Plugins\views\wizard;
+namespace Drupal\views\Plugin\views\wizard;
 
-use Drupal\views\Plugins\views\wizard\WizardPluginBase;
+use Drupal\views\Plugin\views\wizard\WizardPluginBase;
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
diff --git a/lib/Drupal/views/Plugins/views/wizard/NodeRevision.php b/lib/Drupal/views/Plugin/views/wizard/NodeRevision.php
similarity index 95%
rename from lib/Drupal/views/Plugins/views/wizard/NodeRevision.php
rename to lib/Drupal/views/Plugin/views/wizard/NodeRevision.php
index d288864c25055e61179da89343196b397552f8ef..b3e2bbc7c63b791d431d2098614a0f106a508772 100644
--- a/lib/Drupal/views/Plugins/views/wizard/NodeRevision.php
+++ b/lib/Drupal/views/Plugin/views/wizard/NodeRevision.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\wizard\NodeRevision.
+ * Definition of Drupal\views\Plugin\views\wizard\NodeRevision.
  */
 
-namespace Drupal\views\Plugins\views\wizard;
+namespace Drupal\views\Plugin\views\wizard;
 
-use Drupal\views\Plugins\views\wizard\WizardPluginBase;
+use Drupal\views\Plugin\views\wizard\WizardPluginBase;
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
diff --git a/lib/Drupal/views/Plugins/views/wizard/TaxonomyTerm.php b/lib/Drupal/views/Plugin/views/wizard/TaxonomyTerm.php
similarity index 92%
rename from lib/Drupal/views/Plugins/views/wizard/TaxonomyTerm.php
rename to lib/Drupal/views/Plugin/views/wizard/TaxonomyTerm.php
index 78c98a65b33f95e3435b35fff279433da1d1bf7e..20e37636ddff2eaeeb44fe1f73c1ac0f78822bd3 100644
--- a/lib/Drupal/views/Plugins/views/wizard/TaxonomyTerm.php
+++ b/lib/Drupal/views/Plugin/views/wizard/TaxonomyTerm.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\wizard\TaxonomyTerm.
+ * Definition of Drupal\views\Plugin\views\wizard\TaxonomyTerm.
  */
 
-namespace Drupal\views\Plugins\views\wizard;
+namespace Drupal\views\Plugin\views\wizard;
 
-use Drupal\views\Plugins\views\wizard\WizardPluginBase;
+use Drupal\views\Plugin\views\wizard\WizardPluginBase;
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
diff --git a/lib/Drupal/views/Plugins/views/wizard/Users.php b/lib/Drupal/views/Plugin/views/wizard/Users.php
similarity index 93%
rename from lib/Drupal/views/Plugins/views/wizard/Users.php
rename to lib/Drupal/views/Plugin/views/wizard/Users.php
index 47236c534533e570e8e22ed5e97ec98c8555942f..317dc607c5d5e6c0b6b427f1371a654034343f11 100644
--- a/lib/Drupal/views/Plugins/views/wizard/Users.php
+++ b/lib/Drupal/views/Plugin/views/wizard/Users.php
@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\wizard\Users.
+ * Definition of Drupal\views\Plugin\views\wizard\Users.
  */
 
-namespace Drupal\views\Plugins\views\wizard;
+namespace Drupal\views\Plugin\views\wizard;
 
-use Drupal\views\Plugins\views\wizard\WizardPluginBase;
+use Drupal\views\Plugin\views\wizard\WizardPluginBase;
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
diff --git a/lib/Drupal/views/Plugins/views/wizard/WizardException.php b/lib/Drupal/views/Plugin/views/wizard/WizardException.php
similarity index 55%
rename from lib/Drupal/views/Plugins/views/wizard/WizardException.php
rename to lib/Drupal/views/Plugin/views/wizard/WizardException.php
index 38d1b043806abeabbea049d81c2cb9ab09f49ac5..d89e1f1ebc2f4bd27f27341dcce21aa9204d615a 100644
--- a/lib/Drupal/views/Plugins/views/wizard/WizardException.php
+++ b/lib/Drupal/views/Plugin/views/wizard/WizardException.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\wizard\WizardException
+ * Definition of Drupal\views\Plugin\views\wizard\WizardException
  */
 
-namespace Drupal\views\Plugins\views\wizard;
+namespace Drupal\views\Plugin\views\wizard;
 
 use Exception;
 
diff --git a/lib/Drupal/views/Plugins/views/wizard/WizardInterface.php b/lib/Drupal/views/Plugin/views/wizard/WizardInterface.php
similarity index 84%
rename from lib/Drupal/views/Plugins/views/wizard/WizardInterface.php
rename to lib/Drupal/views/Plugin/views/wizard/WizardInterface.php
index e0351a011b4992e3a800bd3403544daa2479a5c2..0f0874419243b7c84ac78f1c3668c6a90d66a755 100644
--- a/lib/Drupal/views/Plugins/views/wizard/WizardInterface.php
+++ b/lib/Drupal/views/Plugin/views/wizard/WizardInterface.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * @file
- * Definition of Drupal\views\Plugins\views\wizard\WizardInterface
+ * Definition of Drupal\views\Plugin\views\wizard\WizardInterface
  */
 
-namespace Drupal\views\Plugins\views\wizard;
+namespace Drupal\views\Plugin\views\wizard;
 
 /**
  * Defines a common interface for Views Wizard plugins.
diff --git a/lib/Drupal/views/Plugins/views/wizard/WizardPluginBase.php b/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
similarity index 99%
rename from lib/Drupal/views/Plugins/views/wizard/WizardPluginBase.php
rename to lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
index 6c4227d26131620eaf1596758cd75c04d2f9dfce..8693ede94bf9692d7af73c34fd953ee10a79b602 100644
--- a/lib/Drupal/views/Plugins/views/wizard/WizardPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
@@ -5,10 +5,10 @@
  * Provides the interface and base class for Views Wizard plugins.
  */
 
-namespace Drupal\views\Plugins\views\wizard;
+namespace Drupal\views\Plugin\views\wizard;
 
 use Drupal\views\View;
-use Drupal\views\Plugins\views\wizard\WizardInterface;
+use Drupal\views\Plugin\views\wizard\WizardInterface;
 
 /**
  * A very generic Views Wizard class - can be constructed for any base table.
diff --git a/lib/Drupal/views/Tests/Plugins/DisplayTestCase.php b/lib/Drupal/views/Tests/Plugins/DisplayTestCase.php
index 542d3ff3edf5ceade85c99a894bc124fcabcc01d..76cc457c6a5075ac70dede6c3b73d507fbd736c2 100644
--- a/lib/Drupal/views/Tests/Plugins/DisplayTestCase.php
+++ b/lib/Drupal/views/Tests/Plugins/DisplayTestCase.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Definition of Drupal\views\Tests\Plugins\DisplayTestCase.
+ * Definition of Drupal\views\Tests\Plugin\DisplayTestCase.
  */
 
-namespace Drupal\views\Tests\Plugins;
+namespace Drupal\views\Tests\Plugin;
 
 use Drupal\views\Tests\ViewsSqlTest;
 use Drupal\views\View;
diff --git a/lib/Drupal/views/View.php b/lib/Drupal/views/View.php
index 6de7a8dcb90e511cccb4cf5f4d45d0f680dd6fd3..4d783f08e63b9e84419d8da54ac81b871744d6b4 100644
--- a/lib/Drupal/views/View.php
+++ b/lib/Drupal/views/View.php
@@ -8,8 +8,8 @@
 namespace Drupal\views;
 
 use Symfony\Component\HttpFoundation\Response;
-use Drupal\views\Plugins\Type\QueryPluginManager;
-use Drupal\views\Plugins\Type\DisplayPluginManager;
+use Drupal\views\Plugin\Type\QueryPluginManager;
+use Drupal\views\Plugin\Type\DisplayPluginManager;
 
 /**
  * @defgroup views_objects Objects that represent a View or part of a view
diff --git a/modules/node.views.inc b/modules/node.views.inc
index 4f597270578dee2f95155710b192e1119a9cad68..7e9b2abf011048a2ca6e0497e68add2f503cf801 100644
--- a/modules/node.views.inc
+++ b/modules/node.views.inc
@@ -172,7 +172,7 @@ function node_views_data() {
     'help' => t('Filters out unpublished content if the current user cannot view it.'),
     'filter' => array(
       'field' => 'status',
-      'handler' => 'Drupal\node\Plugins\views\filter\Status',
+      'handler' => 'Drupal\node\Plugin\views\filter\Status',
       'label' => t('Published or admin'),
     ),
   );
diff --git a/views.module b/views.module
index d46165d4878e5b26fc516ecf36c8907491189be9..c7200b2ff9e16188527bc042a2a58dd754149710 100644
--- a/views.module
+++ b/views.module
@@ -14,20 +14,20 @@
 use Drupal\Component\Plugin\PluginManagerInterface;
 
 // @todo: Should views_get_plugin_manager be moved to a ceperate file?
-use Drupal\views\Plugins\Type\StylePluginManager;
-use Drupal\views\Plugins\Type\DisplayPluginManager;
-use Drupal\views\Plugins\Type\AccessPluginManager;
-use Drupal\views\Plugins\Type\ArgumentDefaultPluginManager;
-use Drupal\views\Plugins\Type\ArgumentValidatorPluginManager;
-use Drupal\views\Plugins\Type\CachePluginManager;
-use Drupal\views\Plugins\Type\LocalizationPluginManager;
-use Drupal\views\Plugins\Type\PagerPluginManager;
-use Drupal\views\Plugins\Type\QueryPluginManager;
-use Drupal\views\Plugins\Type\RowPluginManager;
-use Drupal\views\Plugins\Type\ExposedFormPluginManager;
-use Drupal\views\Plugins\Type\HandlerPluginManager;
-use Drupal\views\Plugins\Type\DisplayExtenderPluginManager;
-use Drupal\views\Plugins\Type\WizardPluginManager;
+use Drupal\views\Plugin\Type\StylePluginManager;
+use Drupal\views\Plugin\Type\DisplayPluginManager;
+use Drupal\views\Plugin\Type\AccessPluginManager;
+use Drupal\views\Plugin\Type\ArgumentDefaultPluginManager;
+use Drupal\views\Plugin\Type\ArgumentValidatorPluginManager;
+use Drupal\views\Plugin\Type\CachePluginManager;
+use Drupal\views\Plugin\Type\LocalizationPluginManager;
+use Drupal\views\Plugin\Type\PagerPluginManager;
+use Drupal\views\Plugin\Type\QueryPluginManager;
+use Drupal\views\Plugin\Type\RowPluginManager;
+use Drupal\views\Plugin\Type\ExposedFormPluginManager;
+use Drupal\views\Plugin\Type\HandlerPluginManager;
+use Drupal\views\Plugin\Type\DisplayExtenderPluginManager;
+use Drupal\views\Plugin\Type\WizardPluginManager;
 
 /**
  * Advertise the current views api version
@@ -47,7 +47,7 @@ function views_init() {
   $loader = drupal_classloader();
   foreach ($core_modules as $module) {
     if (function_exists($module . '_views_api')) {
-      $name = $module . '\\Plugins';
+      $name = $module . '\\Plugin';
       $loader->registerNamespace('Drupal\\' . $name, DRUPAL_ROOT . '/' . $path . '/lib');
     }
   }
diff --git a/views_ui.module b/views_ui.module
index 48e0e65aa9c1a96c49b33dc7aa7630f4bc6676f0..7119fc4d6967cbb81381c62633a2be0a47e7d52f 100644
--- a/views_ui.module
+++ b/views_ui.module
@@ -6,7 +6,7 @@
  */
 
 use Drupal\views\View;
-use Drupal\views\Plugins\Type\WizardManager;
+use Drupal\views\Plugin\Type\WizardManager;
 
 /**
  * Implements hook_menu().