diff --git a/lib/Drupal/aggregator/Plugin/views/argument/CategoryCid.php b/lib/Drupal/aggregator/Plugin/views/argument/CategoryCid.php
index 273d32a37df315ee0f3a7a23dc26dd3e9260fbd5..9f558a27e17ccd3f192a46104ea0009176991a0a 100644
--- a/lib/Drupal/aggregator/Plugin/views/argument/CategoryCid.php
+++ b/lib/Drupal/aggregator/Plugin/views/argument/CategoryCid.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\aggregator\Plugin\views\argument;
 
-use Drupal\views\Plugins\views\argument\Numeric;
+use Drupal\views\Plugin\views\argument\Numeric;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/aggregator/Plugin/views/argument/Fid.php b/lib/Drupal/aggregator/Plugin/views/argument/Fid.php
index 6406532a6e4594d072f726989dfe5a564f11e56e..5101455f0ae03f4a313a34e1afc8f2b6e83e4736 100644
--- a/lib/Drupal/aggregator/Plugin/views/argument/Fid.php
+++ b/lib/Drupal/aggregator/Plugin/views/argument/Fid.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\aggregator\Plugin\views\argument;
 
-use Drupal\views\Plugins\views\argument\Numeric;
+use Drupal\views\Plugin\views\argument\Numeric;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/aggregator/Plugin/views/argument/Iid.php b/lib/Drupal/aggregator/Plugin/views/argument/Iid.php
index 7de6847d9fe26230c4ed2558a4cc107033cab39c..b1fd3c1424dd1fbe3589cb09affe70d02a3f8ff4 100644
--- a/lib/Drupal/aggregator/Plugin/views/argument/Iid.php
+++ b/lib/Drupal/aggregator/Plugin/views/argument/Iid.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\aggregator\Plugin\views\argument;
 
-use Drupal\views\Plugins\views\argument\Numeric;
+use Drupal\views\Plugin\views\argument\Numeric;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/aggregator/Plugin/views/field/Category.php b/lib/Drupal/aggregator/Plugin/views/field/Category.php
index ed089bd73619836294ecdd983d03ed96bf747685..f486c6c4230469c7c333f5efa83d0775ca3e7e27 100644
--- a/lib/Drupal/aggregator/Plugin/views/field/Category.php
+++ b/lib/Drupal/aggregator/Plugin/views/field/Category.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\aggregator\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/aggregator/Plugin/views/field/TitleLink.php b/lib/Drupal/aggregator/Plugin/views/field/TitleLink.php
index faefc04fd62f1c3ab91c172e69f96bd7db596880..aa2c0757cea8549d362576f1c51ff56e2e4801c7 100644
--- a/lib/Drupal/aggregator/Plugin/views/field/TitleLink.php
+++ b/lib/Drupal/aggregator/Plugin/views/field/TitleLink.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\aggregator\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/aggregator/Plugin/views/field/Xss.php b/lib/Drupal/aggregator/Plugin/views/field/Xss.php
index 12161cd6d2706051d48cbd714ad61d94f608eae0..fd65e8def4133c8e51121c23834d94c778669719 100644
--- a/lib/Drupal/aggregator/Plugin/views/field/Xss.php
+++ b/lib/Drupal/aggregator/Plugin/views/field/Xss.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\aggregator\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/aggregator/Plugin/views/filter/CategoryCid.php b/lib/Drupal/aggregator/Plugin/views/filter/CategoryCid.php
index fb4e171dcf21d6e1e0ea65bb1d74ed61fc6f348a..f7c6f54e7595ac0e922f94d3c4dc4e418b1e8017 100644
--- a/lib/Drupal/aggregator/Plugin/views/filter/CategoryCid.php
+++ b/lib/Drupal/aggregator/Plugin/views/filter/CategoryCid.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\aggregator\Plugin\views\filter;
 
-use Drupal\views\Plugins\views\filter\InOperator;
+use Drupal\views\Plugin\views\filter\InOperator;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/aggregator/Plugin/views/row/Rss.php b/lib/Drupal/aggregator/Plugin/views/row/Rss.php
index 6dfd4545d30e5afb6197166e5d1b1da636da54c8..be14968642cbd94edada19e23e73706e86e0d7e8 100644
--- a/lib/Drupal/aggregator/Plugin/views/row/Rss.php
+++ b/lib/Drupal/aggregator/Plugin/views/row/Rss.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\aggregator\Plugin\views\row;
 
-use Drupal\views\Plugins\views\row\RowPluginBase;
+use Drupal\views\Plugin\views\row\RowPluginBase;
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
diff --git a/lib/Drupal/comment/Plugin/views/argument/UserUid.php b/lib/Drupal/comment/Plugin/views/argument/UserUid.php
index bb816796f0344e1d030f4ddae0467783ff009440..8ed7be356312616790a7b6bc8afef03bec242af7 100644
--- a/lib/Drupal/comment/Plugin/views/argument/UserUid.php
+++ b/lib/Drupal/comment/Plugin/views/argument/UserUid.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\comment\Plugin\views\argument;
 
-use Drupal\views\Plugins\views\argument\ArgumentPluginBase;
+use Drupal\views\Plugin\views\argument\ArgumentPluginBase;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/comment/Plugin/views/field/Comment.php b/lib/Drupal/comment/Plugin/views/field/Comment.php
index 79f313d3fd6756e462e013ba7ebfb8bbe51f6e65..a6e6363a9e32c54b05e33fe96f37d902550c5992 100644
--- a/lib/Drupal/comment/Plugin/views/field/Comment.php
+++ b/lib/Drupal/comment/Plugin/views/field/Comment.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\comment\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/comment/Plugin/views/field/Depth.php b/lib/Drupal/comment/Plugin/views/field/Depth.php
index 9afe3b848a9f2d1ce42cbac84a8c89633d643e60..3dd386db7d0cccec05859188259a6d2b1edc4fc9 100644
--- a/lib/Drupal/comment/Plugin/views/field/Depth.php
+++ b/lib/Drupal/comment/Plugin/views/field/Depth.php
@@ -8,7 +8,7 @@
 namespace Drupal\comment\Plugin\views\field;
 
 use Drupal\Core\Annotation\Plugin;
-use Drupal\views\Plugins\views\field\FieldPluginBase;
+use Drupal\views\Plugin\views\field\FieldPluginBase;
 
 /**
  * Field handler to display the depth of a comment.
diff --git a/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php b/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php
index 4056ee06bafa7c4b67bf2a0b80b19893cd3fe447..62ba3a8c71514139d87aa4165d07feadccba5ab8 100644
--- a/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php
+++ b/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\comment\Plugin\views\field;
 
-use Drupal\views\Plugins\views\field\Date;
+use Drupal\views\Plugin\views\field\Date;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/comment/Plugin/views/field/Link.php b/lib/Drupal/comment/Plugin/views/field/Link.php
index b71890d155faa61cc6655223ed3ba5e85c509619..07dc1e73671e8b953a844777ebcbb2c05cfe7e9b 100644
--- a/lib/Drupal/comment/Plugin/views/field/Link.php
+++ b/lib/Drupal/comment/Plugin/views/field/Link.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\comment\Plugin\views\field;
 
-use Drupal\views\Plugins\views\field\Entity;
+use Drupal\views\Plugin\views\field\Entity;
 
 /**
  * Base field handler to present a link.
diff --git a/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php b/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php
index bda4c76d9ceacbc2b288a092432aaf255c5a51a4..b386e82abf62cbaa4c4efe0bf1f6e7b060345bbc 100644
--- a/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php
+++ b/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php
@@ -8,7 +8,7 @@
 namespace Drupal\comment\Plugin\views\field;
 
 use Drupal\views\Join;
-use Drupal\views\Plugins\views\field\FieldPluginBase;
+use Drupal\views\Plugin\views\field\FieldPluginBase;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/comment/Plugin/views/field/NcsLastUpdated.php b/lib/Drupal/comment/Plugin/views/field/NcsLastUpdated.php
index 77091501e853eefb678660a799b1703acc35999e..bdd9df6a709b3adf32a37248623eb0451571257c 100644
--- a/lib/Drupal/comment/Plugin/views/field/NcsLastUpdated.php
+++ b/lib/Drupal/comment/Plugin/views/field/NcsLastUpdated.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\comment\Plugin\views\field;
 
-use Drupal\views\Plugins\views\field\Date;
+use Drupal\views\Plugin\views\field\Date;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/comment/Plugin/views/field/NodeComment.php b/lib/Drupal/comment/Plugin/views/field/NodeComment.php
index 4300f6a270ab5230f605f4a9755543c255818590..415d4f8eb7342e309ff80d8d2eeaa2ca306bf8e5 100644
--- a/lib/Drupal/comment/Plugin/views/field/NodeComment.php
+++ b/lib/Drupal/comment/Plugin/views/field/NodeComment.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\comment\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/comment/Plugin/views/field/NodeLink.php b/lib/Drupal/comment/Plugin/views/field/NodeLink.php
index 9baaff28182ef476527f220a7d0cd245f03c2a8f..b3218ea243adab4dec5fd2b06944eb5e0699c275 100644
--- a/lib/Drupal/comment/Plugin/views/field/NodeLink.php
+++ b/lib/Drupal/comment/Plugin/views/field/NodeLink.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\comment\Plugin\views\field;
 
-use Drupal\views\Plugins\views\field\Entity;
+use Drupal\views\Plugin\views\field\Entity;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php b/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php
index 08e332c577fcaa3a9b462557d9c972a87838ef08..f2abd1c49675b9dbd4c510f121e80ae8c6bdaaa7 100644
--- a/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php
+++ b/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\comment\Plugin\views\field;
 
-use Drupal\views\Plugins\views\field\Numeric;
+use Drupal\views\Plugin\views\field\Numeric;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/comment/Plugin/views/field/Username.php b/lib/Drupal/comment/Plugin/views/field/Username.php
index c14f6fdec94f7c0791cf5aa16c95ee2eb4e87456..ceae5630619cf9a97913142aee0bed43c10d3ed6 100644
--- a/lib/Drupal/comment/Plugin/views/field/Username.php
+++ b/lib/Drupal/comment/Plugin/views/field/Username.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\comment\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/comment/Plugin/views/filter/NcsLastUpdated.php b/lib/Drupal/comment/Plugin/views/filter/NcsLastUpdated.php
index 4603146f43e48cd1f25aafa510ffec19297ff1e0..80c8b36324747d423477e9c29213c4bc4401bc7c 100644
--- a/lib/Drupal/comment/Plugin/views/filter/NcsLastUpdated.php
+++ b/lib/Drupal/comment/Plugin/views/filter/NcsLastUpdated.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\comment\Plugin\views\filter;
 
-use Drupal\views\Plugins\views\filter\Date;
+use Drupal\views\Plugin\views\filter\Date;
 use Drupal\Core\Annotation\Plugin;
 
 
diff --git a/lib/Drupal/comment/Plugin/views/filter/NodeComment.php b/lib/Drupal/comment/Plugin/views/filter/NodeComment.php
index b315f76755a69d2d7082a16f76443fed53493b52..71bd2bdaad6c9d17825dfb768b31aae2ba62c46b 100644
--- a/lib/Drupal/comment/Plugin/views/filter/NodeComment.php
+++ b/lib/Drupal/comment/Plugin/views/filter/NodeComment.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\comment\Plugin\views\filter;
 
-use Drupal\views\Plugins\views\filter\InOperator;
+use Drupal\views\Plugin\views\filter\InOperator;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/comment/Plugin/views/filter/UserUid.php b/lib/Drupal/comment/Plugin/views/filter/UserUid.php
index b4de3aff23bbf1382e42f9ed16f1ab18c1aa3adb..1f49d6294cdcb72aa9d13b50a71326f4d389e473 100644
--- a/lib/Drupal/comment/Plugin/views/filter/UserUid.php
+++ b/lib/Drupal/comment/Plugin/views/filter/UserUid.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\comment\Plugin\views\filter;
 
-use Drupal\views\Plugins\views\filter\FilterPluginBase;
+use Drupal\views\Plugin\views\filter\FilterPluginBase;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/comment/Plugin/views/row/Rss.php b/lib/Drupal/comment/Plugin/views/row/Rss.php
index 217bd94c6c3b82f8a8e1cee1e6deb84403019081..cd9c3e0812754a6b4ad4850272ded7072c288b6b 100644
--- a/lib/Drupal/comment/Plugin/views/row/Rss.php
+++ b/lib/Drupal/comment/Plugin/views/row/Rss.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\comment\Plugin\views\row;
 
-use Drupal\views\Plugins\views\row\RowPluginBase;
+use Drupal\views\Plugin\views\row\RowPluginBase;
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
diff --git a/lib/Drupal/comment/Plugin/views/row/View.php b/lib/Drupal/comment/Plugin/views/row/View.php
index 29726205e421109a9c32ddc9423d3130264d1fd2..cef07287cd4399bb541edca1daf576edcbceca05 100644
--- a/lib/Drupal/comment/Plugin/views/row/View.php
+++ b/lib/Drupal/comment/Plugin/views/row/View.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\comment\Plugin\views\row;
 
-use Drupal\views\Plugins\views\row\RowPluginBase;
+use Drupal\views\Plugin\views\row\RowPluginBase;
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
diff --git a/lib/Drupal/comment/Plugin/views/sort/NcsLastCommentName.php b/lib/Drupal/comment/Plugin/views/sort/NcsLastCommentName.php
index cbab64c57fae6c25c700adeb5765034096df941a..2330d46baf9983f8164cb19299a8df16c84f6002 100644
--- a/lib/Drupal/comment/Plugin/views/sort/NcsLastCommentName.php
+++ b/lib/Drupal/comment/Plugin/views/sort/NcsLastCommentName.php
@@ -8,7 +8,7 @@
 namespace Drupal\comment\Plugin\views\sort;
 
 use Drupal\views\Join;
-use Drupal\views\Plugins\views\sort\SortPluginBase;
+use Drupal\views\Plugin\views\sort\SortPluginBase;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/comment/Plugin/views/sort/NcsLastUpdated.php b/lib/Drupal/comment/Plugin/views/sort/NcsLastUpdated.php
index 7132e5ad674b3e736734440653d53a1f3038c34b..75a911c70b38d4b74369d868dd71feed26f82e50 100644
--- a/lib/Drupal/comment/Plugin/views/sort/NcsLastUpdated.php
+++ b/lib/Drupal/comment/Plugin/views/sort/NcsLastUpdated.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\comment\Plugin\views\sort;
 
-use Drupal\views\Plugins\views\sort\Date;
+use Drupal\views\Plugin\views\sort\Date;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/comment/Plugin/views/sort/Thread.php b/lib/Drupal/comment/Plugin/views/sort/Thread.php
index 9233f1597273ebb05c0dfcee9a8038b6ccea894a..9986c567d34ab88c36e38236023f3f5902c13d78 100644
--- a/lib/Drupal/comment/Plugin/views/sort/Thread.php
+++ b/lib/Drupal/comment/Plugin/views/sort/Thread.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\comment\Plugin\views\sort;
 
-use Drupal\views\Plugins\views\sort\SortPluginBase;
+use Drupal\views\Plugin\views\sort\SortPluginBase;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/field/Plugin/views/argument/FieldList.php b/lib/Drupal/field/Plugin/views/argument/FieldList.php
index 63076dbbff23b99ce29d0750edd72c901b1018e5..5218ef678ffd8be5eff20518690cd78a6aa5b2bc 100644
--- a/lib/Drupal/field/Plugin/views/argument/FieldList.php
+++ b/lib/Drupal/field/Plugin/views/argument/FieldList.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\field\Plugin\views\argument;
 
-use Drupal\views\Plugins\views\argument\Numeric;
+use Drupal\views\Plugin\views\argument\Numeric;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/field/Plugin/views/argument/ListString.php b/lib/Drupal/field/Plugin/views/argument/ListString.php
index f82b4d12a0611d61732261ec633d32856ccd5526..73c94c17b5a091d7bc2529b792200ef58643e459 100644
--- a/lib/Drupal/field/Plugin/views/argument/ListString.php
+++ b/lib/Drupal/field/Plugin/views/argument/ListString.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\field\Plugin\views\argument;
 
-use Drupal\views\Plugins\views\argument\String;
+use Drupal\views\Plugin\views\argument\String;
 use Drupal\Core\Annotation\Plugin;
 
 
diff --git a/lib/Drupal/field/Plugin/views/field/Field.php b/lib/Drupal/field/Plugin/views/field/Field.php
index a79813d176650e5af935009a9046d2a467e5d974..881754863c3cfa077036d0d98dc4492097123830 100644
--- a/lib/Drupal/field/Plugin/views/field/Field.php
+++ b/lib/Drupal/field/Plugin/views/field/Field.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\field\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/field/Plugin/views/filter/FieldList.php b/lib/Drupal/field/Plugin/views/filter/FieldList.php
index 6413a2f00042ceab4a287bb8fa03b118678f1117..af147bcf03b0d0c0eb18945c1566733cd0a49a76 100644
--- a/lib/Drupal/field/Plugin/views/filter/FieldList.php
+++ b/lib/Drupal/field/Plugin/views/filter/FieldList.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\field\Plugin\views\filter;
 
-use Drupal\views\Plugins\views\filter\InOperator;
+use Drupal\views\Plugin\views\filter\InOperator;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/field/Plugin/views/relationship/EntityReverse.php b/lib/Drupal/field/Plugin/views/relationship/EntityReverse.php
index 4e3130d815e79139743b2839d0321c2603d96df3..2ad5de0aa3b8487f9af4ef3a5ae658cceae880b4 100644
--- a/lib/Drupal/field/Plugin/views/relationship/EntityReverse.php
+++ b/lib/Drupal/field/Plugin/views/relationship/EntityReverse.php
@@ -8,7 +8,7 @@
 namespace Drupal\field\Plugin\views\relationship;
 
 use Drupal\views\Join;
-use Drupal\views\Plugins\views\relationship\RelationshipPluginBase;
+use Drupal\views\Plugin\views\relationship\RelationshipPluginBase;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/filter/Plugin/views/field/FormatName.php b/lib/Drupal/filter/Plugin/views/field/FormatName.php
index 0d61e2aba99a1cca2933e66a77cc88904e3101ca..b0f85986881a664eebfaafe87869817c66b2f17b 100644
--- a/lib/Drupal/filter/Plugin/views/field/FormatName.php
+++ b/lib/Drupal/filter/Plugin/views/field/FormatName.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\filter\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/locale/Plugin/views/argument/Group.php b/lib/Drupal/locale/Plugin/views/argument/Group.php
index 23524d4264a4e4238cace2c9fd60df802e57b68b..8a62ce109f42d298934473456c1274ed1f34e775 100644
--- a/lib/Drupal/locale/Plugin/views/argument/Group.php
+++ b/lib/Drupal/locale/Plugin/views/argument/Group.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\locale\Plugin\views\argument;
 
-use Drupal\views\Plugins\views\argument\ArgumentPluginBase;
+use Drupal\views\Plugin\views\argument\ArgumentPluginBase;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/locale/Plugin/views/argument/Language.php b/lib/Drupal/locale/Plugin/views/argument/Language.php
index a6f8081125054a7b34b68fb7f7d9ef8531ba12f2..fe9eca43293684f16a896cdfca6f17780dd388aa 100644
--- a/lib/Drupal/locale/Plugin/views/argument/Language.php
+++ b/lib/Drupal/locale/Plugin/views/argument/Language.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\locale\Plugin\views\argument;
 
-use Drupal\views\Plugins\views\argument\ArgumentPluginBase;
+use Drupal\views\Plugin\views\argument\ArgumentPluginBase;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/locale/Plugin/views/field/Group.php b/lib/Drupal/locale/Plugin/views/field/Group.php
index b95437f24b5834bac45afcafde630f48bec70c21..b11734d1f7cb29e499c2d3915a89f38b1e35a1a4 100644
--- a/lib/Drupal/locale/Plugin/views/field/Group.php
+++ b/lib/Drupal/locale/Plugin/views/field/Group.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\locale\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/locale/Plugin/views/field/Language.php b/lib/Drupal/locale/Plugin/views/field/Language.php
index d86d456ed16b32eb318bc61bcc95a58ae8f526e5..448c79d85ba36c5f10d134309d283d0bf6b517a9 100644
--- a/lib/Drupal/locale/Plugin/views/field/Language.php
+++ b/lib/Drupal/locale/Plugin/views/field/Language.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\locale\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/locale/Plugin/views/field/LinkEdit.php b/lib/Drupal/locale/Plugin/views/field/LinkEdit.php
index 6fa0a469e18b3c1439ec21fbd562691be0bb2d3c..b3c6d9da25ffecb2ea06e0a192e6095e3db5370f 100644
--- a/lib/Drupal/locale/Plugin/views/field/LinkEdit.php
+++ b/lib/Drupal/locale/Plugin/views/field/LinkEdit.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\locale\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/locale/Plugin/views/filter/Group.php b/lib/Drupal/locale/Plugin/views/filter/Group.php
index 48c38e8cc4a802970a4a4e429afeb5a7d2dac082..c5193fb7fc1049b4f37384be1259529d99842c36 100644
--- a/lib/Drupal/locale/Plugin/views/filter/Group.php
+++ b/lib/Drupal/locale/Plugin/views/filter/Group.php
@@ -8,7 +8,7 @@
 namespace Drupal\locale\Plugin\views\filter;
 
 use Drupal\Core\Annotation\Plugin;
-use Drupal\views\Plugins\views\filter\InOperator;
+use Drupal\views\Plugin\views\filter\InOperator;
 
 /**
  * Filter by locale group.
diff --git a/lib/Drupal/locale/Plugin/views/filter/Language.php b/lib/Drupal/locale/Plugin/views/filter/Language.php
index 84ff4d77a236e82650e248d42966f946243722d0..6b743ba8ba60f610deee98dc36baaa718e280233 100644
--- a/lib/Drupal/locale/Plugin/views/filter/Language.php
+++ b/lib/Drupal/locale/Plugin/views/filter/Language.php
@@ -8,7 +8,7 @@
 namespace Drupal\locale\Plugin\views\filter;
 
 use Drupal\Core\Annotation\Plugin;
-use Drupal\views\Plugins\views\filter\InOperator;
+use Drupal\views\Plugin\views\filter\InOperator;
 
 /**
  * Filter by language.
diff --git a/lib/Drupal/locale/Plugin/views/filter/NodeLanguage.php b/lib/Drupal/locale/Plugin/views/filter/NodeLanguage.php
index 3c518e803c693ce5d8a3d401ec1ab5db3e0204b5..a3928dd837b8bf8578a15e5374e1dac233feefed 100644
--- a/lib/Drupal/locale/Plugin/views/filter/NodeLanguage.php
+++ b/lib/Drupal/locale/Plugin/views/filter/NodeLanguage.php
@@ -8,7 +8,7 @@
 namespace Drupal\locale\Plugin\views\filter;
 
 use Drupal\Core\Annotation\Plugin;
-use Drupal\views\Plugins\views\filter\InOperator;
+use Drupal\views\Plugin\views\filter\InOperator;
 
 /**
  * Filter by language.
diff --git a/lib/Drupal/locale/Plugin/views/filter/Version.php b/lib/Drupal/locale/Plugin/views/filter/Version.php
index b19bbc24cb0a1a31fc28ddfe8ad73c3d05151cd5..b63e13a4b0f0361d164bc1f0c0edcace7c90df37 100644
--- a/lib/Drupal/locale/Plugin/views/filter/Version.php
+++ b/lib/Drupal/locale/Plugin/views/filter/Version.php
@@ -8,7 +8,7 @@
 namespace Drupal\locale\Plugin\views\filter;
 
 use Drupal\Core\Annotation\Plugin;
-use Drupal\views\Plugins\views\filter\InOperator;
+use Drupal\views\Plugin\views\filter\InOperator;
 
 /**
  * Filter by version.
diff --git a/lib/Drupal/node/Plugin/views/argument/CreatedDay.php b/lib/Drupal/node/Plugin/views/argument/CreatedDay.php
index 338744e8eb6af843cabbfd822a49658403368e07..9454a765585604a949aa496d8cf231615d322702 100644
--- a/lib/Drupal/node/Plugin/views/argument/CreatedDay.php
+++ b/lib/Drupal/node/Plugin/views/argument/CreatedDay.php
@@ -3,7 +3,7 @@
 namespace Drupal\node\Plugin\views\argument;
 
 use Drupal\Core\Annotation\Plugin;
-use Drupal\views\Plugins\views\argument\Date;
+use Drupal\views\Plugin\views\argument\Date;
 
 /**
  * Argument handler for a day (DD)
diff --git a/lib/Drupal/node/Plugin/views/argument/CreatedFullDate.php b/lib/Drupal/node/Plugin/views/argument/CreatedFullDate.php
index b762984798e339c4fdad75de664480a012110d50..0a157d2f75444fca3f3841d888d9c4f700bd6c04 100644
--- a/lib/Drupal/node/Plugin/views/argument/CreatedFullDate.php
+++ b/lib/Drupal/node/Plugin/views/argument/CreatedFullDate.php
@@ -3,7 +3,7 @@
 namespace Drupal\node\Plugin\views\argument;
 
 use Drupal\Core\Annotation\Plugin;
-use Drupal\views\Plugins\views\argument\Date;
+use Drupal\views\Plugin\views\argument\Date;
 
 /**
  * Argument handler for a full date (CCYYMMDD)
diff --git a/lib/Drupal/node/Plugin/views/argument/CreatedMonth.php b/lib/Drupal/node/Plugin/views/argument/CreatedMonth.php
index de27d692f7fe25921a0a137834e83ba9630afd87..e0d30493b684a1bf603a04570e8ebbd507125e12 100644
--- a/lib/Drupal/node/Plugin/views/argument/CreatedMonth.php
+++ b/lib/Drupal/node/Plugin/views/argument/CreatedMonth.php
@@ -3,7 +3,7 @@
 namespace Drupal\node\Plugin\views\argument;
 
 use Drupal\Core\Annotation\Plugin;
-use Drupal\views\Plugins\views\argument\Date;
+use Drupal\views\Plugin\views\argument\Date;
 
 /**
  * Argument handler for a month (MM)
diff --git a/lib/Drupal/node/Plugin/views/argument/CreatedWeek.php b/lib/Drupal/node/Plugin/views/argument/CreatedWeek.php
index 446887a15d3a06e8f4990c34f798dd3cf7c450ee..49b8645698b21001c0999bec100cb6250ca45de2 100644
--- a/lib/Drupal/node/Plugin/views/argument/CreatedWeek.php
+++ b/lib/Drupal/node/Plugin/views/argument/CreatedWeek.php
@@ -3,7 +3,7 @@
 namespace Drupal\node\Plugin\views\argument;
 
 use Drupal\Core\Annotation\Plugin;
-use Drupal\views\Plugins\views\argument\Date;
+use Drupal\views\Plugin\views\argument\Date;
 
 /**
  * Argument handler for a week.
diff --git a/lib/Drupal/node/Plugin/views/argument/CreatedYear.php b/lib/Drupal/node/Plugin/views/argument/CreatedYear.php
index 7317244d62963286e2887224de212a1a1f8db13b..dfa939f10bf1d1b04ea2437349c5a6002bd2e95a 100644
--- a/lib/Drupal/node/Plugin/views/argument/CreatedYear.php
+++ b/lib/Drupal/node/Plugin/views/argument/CreatedYear.php
@@ -3,7 +3,7 @@
 namespace Drupal\node\Plugin\views\argument;
 
 use Drupal\Core\Annotation\Plugin;
-use Drupal\views\Plugins\views\argument\Date;
+use Drupal\views\Plugin\views\argument\Date;
 
 /**
  * Argument handler for a year (CCYY)
diff --git a/lib/Drupal/node/Plugin/views/argument/CreatedYearMonth.php b/lib/Drupal/node/Plugin/views/argument/CreatedYearMonth.php
index a112cc3829300d77aa5eb4ea23d95246a565a7bd..d2b2e5721f2345c431cb530dedc888a4a3ebdeca 100644
--- a/lib/Drupal/node/Plugin/views/argument/CreatedYearMonth.php
+++ b/lib/Drupal/node/Plugin/views/argument/CreatedYearMonth.php
@@ -3,7 +3,7 @@
 namespace Drupal\node\Plugin\views\argument;
 
 use Drupal\Core\Annotation\Plugin;
-use Drupal\views\Plugins\views\argument\Date;
+use Drupal\views\Plugin\views\argument\Date;
 
 /**
  * Argument handler for a year plus month (CCYYMM)
diff --git a/lib/Drupal/node/Plugin/views/argument/Language.php b/lib/Drupal/node/Plugin/views/argument/Language.php
index 85615ee55a1e62f3260fdded8b0f1a99da33422b..e45dce890885b65a738ed73c938c41a557fbfefe 100644
--- a/lib/Drupal/node/Plugin/views/argument/Language.php
+++ b/lib/Drupal/node/Plugin/views/argument/Language.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\node\Plugin\views\argument;
 
-use Drupal\views\Plugins\views\argument\ArgumentPluginBase;
+use Drupal\views\Plugin\views\argument\ArgumentPluginBase;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/node/Plugin/views/argument/Nid.php b/lib/Drupal/node/Plugin/views/argument/Nid.php
index 4870cee1d3edb5639775fd306aba14ec7526566a..1a3384b0b2091bdbff89f37fd619b72af99e1417 100644
--- a/lib/Drupal/node/Plugin/views/argument/Nid.php
+++ b/lib/Drupal/node/Plugin/views/argument/Nid.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\node\Plugin\views\argument;
 
-use Drupal\views\Plugins\views\argument\Numeric;
+use Drupal\views\Plugin\views\argument\Numeric;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/node/Plugin/views/argument/Type.php b/lib/Drupal/node/Plugin/views/argument/Type.php
index 84f1db0457336cce6c495a31bf832c7fb57f331b..48c3550d12addf5db09f03ffd3f4e7b2dcac82b1 100644
--- a/lib/Drupal/node/Plugin/views/argument/Type.php
+++ b/lib/Drupal/node/Plugin/views/argument/Type.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\node\Plugin\views\argument;
 
-use Drupal\views\Plugins\views\argument\String;
+use Drupal\views\Plugin\views\argument\String;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/node/Plugin/views/argument/Vid.php b/lib/Drupal/node/Plugin/views/argument/Vid.php
index 3db2ddd5fc3e070eefd6560710bb02a0b16cbd99..51c13e819bc7be530e855fc395adeff579cf93e5 100644
--- a/lib/Drupal/node/Plugin/views/argument/Vid.php
+++ b/lib/Drupal/node/Plugin/views/argument/Vid.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\node\Plugin\views\argument;
 
-use Drupal\views\Plugins\views\argument\Numeric;
+use Drupal\views\Plugin\views\argument\Numeric;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/node/Plugin/views/argument_default/Node.php b/lib/Drupal/node/Plugin/views/argument_default/Node.php
index 0ebf9f85d86388e1ad57e64933ce8f316bcdc148..9e169b03ac69526005542bd26c01b5c677b26388 100644
--- a/lib/Drupal/node/Plugin/views/argument_default/Node.php
+++ b/lib/Drupal/node/Plugin/views/argument_default/Node.php
@@ -9,7 +9,7 @@
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
-use Drupal\views\Plugins\views\argument_default\ArgumentDefaultPluginBase;
+use Drupal\views\Plugin\views\argument_default\ArgumentDefaultPluginBase;
 
 /**
  * Default argument plugin to extract a node via menu_get_object
diff --git a/lib/Drupal/node/Plugin/views/argument_validator/Node.php b/lib/Drupal/node/Plugin/views/argument_validator/Node.php
index 83c6d51165450a3ff1e36b6e3985df14fc0c21b9..52f1741023a40363637d5bfcaea06e33c5fd3cb3 100644
--- a/lib/Drupal/node/Plugin/views/argument_validator/Node.php
+++ b/lib/Drupal/node/Plugin/views/argument_validator/Node.php
@@ -9,7 +9,7 @@
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
-use Drupal\views\Plugins\views\argument_validator\ArgumentValidatorPluginBase;
+use Drupal\views\Plugin\views\argument_validator\ArgumentValidatorPluginBase;
 
 /**
  * Validate whether an argument is an acceptable node.
diff --git a/lib/Drupal/node/Plugin/views/field/Link.php b/lib/Drupal/node/Plugin/views/field/Link.php
index d59638bea4897d2744fde8fe8e68e8426ad42cc3..0fd2637908d3a5c9b04f8136856a95b943ce73fb 100644
--- a/lib/Drupal/node/Plugin/views/field/Link.php
+++ b/lib/Drupal/node/Plugin/views/field/Link.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\node\Plugin\views\field;
 
-use Drupal\views\Plugins\views\field\Entity;
+use Drupal\views\Plugin\views\field\Entity;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/node/Plugin/views/field/Node.php b/lib/Drupal/node/Plugin/views/field/Node.php
index b8c88bb43453e4585b34db09f8d514d1d5cdd87b..0ef73c1178efc47d6c5f307cc6cda4f15125a732 100644
--- a/lib/Drupal/node/Plugin/views/field/Node.php
+++ b/lib/Drupal/node/Plugin/views/field/Node.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\node\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/node/Plugin/views/field/Path.php b/lib/Drupal/node/Plugin/views/field/Path.php
index 03dbc6867863c0dbae3d2c833c0d4d8f9ed531a4..482e6348750c369344f2772bbc0f103cbfa0914f 100644
--- a/lib/Drupal/node/Plugin/views/field/Path.php
+++ b/lib/Drupal/node/Plugin/views/field/Path.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\node\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/node/Plugin/views/filter/Access.php b/lib/Drupal/node/Plugin/views/filter/Access.php
index 3fdecf76798a01f95210ce279a7fbfe58dc34e28..e0349330c864e0a1548aee4273f46d5d002b61d9 100644
--- a/lib/Drupal/node/Plugin/views/filter/Access.php
+++ b/lib/Drupal/node/Plugin/views/filter/Access.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\node\Plugin\views\filter;
 
-use Drupal\views\Plugins\views\filter\FilterPluginBase;
+use Drupal\views\Plugin\views\filter\FilterPluginBase;
 
 /**
  * Filter by node_access records.
diff --git a/lib/Drupal/node/Plugin/views/filter/HistoryUserTimestamp.php b/lib/Drupal/node/Plugin/views/filter/HistoryUserTimestamp.php
index 81841a01bf61fdc060fca4beef0ef1c528ff798e..c280a9d27e703fb4e2e8406260235dda2e267115 100644
--- a/lib/Drupal/node/Plugin/views/filter/HistoryUserTimestamp.php
+++ b/lib/Drupal/node/Plugin/views/filter/HistoryUserTimestamp.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\node\Plugin\views\filter;
 
-use Drupal\views\Plugins\views\filter\FilterPluginBase;
+use Drupal\views\Plugin\views\filter\FilterPluginBase;
 
 /**
  * Filter for new content.
diff --git a/lib/Drupal/node/Plugin/views/filter/Status.php b/lib/Drupal/node/Plugin/views/filter/Status.php
index 09fde602907dc63e3ca091cca2cf4b256a0d519a..7926a902b3bae925240c968fc83e2b069721c3d6 100644
--- a/lib/Drupal/node/Plugin/views/filter/Status.php
+++ b/lib/Drupal/node/Plugin/views/filter/Status.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\node\Plugin\views\filter;
 
-use Drupal\views\Plugins\views\filter\FilterPluginBase;
+use Drupal\views\Plugin\views\filter\FilterPluginBase;
 
 /**
  * Filter by published status.
diff --git a/lib/Drupal/node/Plugin/views/filter/Type.php b/lib/Drupal/node/Plugin/views/filter/Type.php
index 00f21d2a6f407f6614e1f774431789ca87be63dd..a591a041981380a7c9b46577653683daa03835bd 100644
--- a/lib/Drupal/node/Plugin/views/filter/Type.php
+++ b/lib/Drupal/node/Plugin/views/filter/Type.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\node\Plugin\views\filter;
 
-use Drupal\views\Plugins\views\filter\InOperator;
+use Drupal\views\Plugin\views\filter\InOperator;
 
 /**
  * Filter by node type.
diff --git a/lib/Drupal/node/Plugin/views/row/Rss.php b/lib/Drupal/node/Plugin/views/row/Rss.php
index ffdc20f4d746aa523f89dc62d6fc7a65c5cc87aa..ed565a7a46c51a496bf31e88957defb92a23cbd9 100644
--- a/lib/Drupal/node/Plugin/views/row/Rss.php
+++ b/lib/Drupal/node/Plugin/views/row/Rss.php
@@ -9,7 +9,7 @@
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
-use Drupal\views\Plugins\views\row\RowPluginBase;
+use Drupal\views\Plugin\views\row\RowPluginBase;
 
 /**
  * Plugin which performs a node_view on the resulting object
diff --git a/lib/Drupal/node/Plugin/views/row/View.php b/lib/Drupal/node/Plugin/views/row/View.php
index f83e11e3ad93a30f6593806c6fa130636fc0eeed..03b7b28d3c3a7a46ec95814efe691c44b5f68839 100644
--- a/lib/Drupal/node/Plugin/views/row/View.php
+++ b/lib/Drupal/node/Plugin/views/row/View.php
@@ -9,7 +9,7 @@
 
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
-use Drupal\views\Plugins\views\row\RowPluginBase;
+use Drupal\views\Plugin\views\row\RowPluginBase;
 
 /**
  * Plugin which performs a node_view on the resulting object.
diff --git a/lib/Drupal/search/Plugin/views/argument/views_handler_argument_search.inc b/lib/Drupal/search/Plugin/views/argument/views_handler_argument_search.inc
index 64175e500b74d4f28ae08b0294a03146e2270ac8..f95efe7f9ae1ef8e29389cebc35e5434e73f2c2d 100644
--- a/lib/Drupal/search/Plugin/views/argument/views_handler_argument_search.inc
+++ b/lib/Drupal/search/Plugin/views/argument/views_handler_argument_search.inc
@@ -6,7 +6,7 @@
  */
 
 use Drupal\views\Join;
-use Drupal\views\Plugins\views\argument\ArgumentPluginBase;
+use Drupal\views\Plugin\views\argument\ArgumentPluginBase;
 
 /**
  * Argument that accepts query keys for search.
diff --git a/lib/Drupal/search/Plugin/views/field/views_handler_field_search_score.inc b/lib/Drupal/search/Plugin/views/field/views_handler_field_search_score.inc
index 97a25c0d33f89318d10f89195f4209365ee07ad1..c899dbbd06c1d9e5cbd93c0fb061e63fc37b3fde 100644
--- a/lib/Drupal/search/Plugin/views/field/views_handler_field_search_score.inc
+++ b/lib/Drupal/search/Plugin/views/field/views_handler_field_search_score.inc
@@ -5,7 +5,7 @@
  * Definition of views_handler_field_search_score.
  */
 
-use Drupal\views\Plugins\views\field\Numeric;
+use Drupal\views\Plugin\views\field\Numeric;
 
 /**
  * Field handler to provide simple renderer that allows linking to a node.
diff --git a/lib/Drupal/search/Plugin/views/filter/views_handler_filter_search.inc b/lib/Drupal/search/Plugin/views/filter/views_handler_filter_search.inc
index 5974399011ed3a3f3588f41881e63c24741c9b59..8df82eca8291ac7041b548d17a8dcb4d6f927ddc 100644
--- a/lib/Drupal/search/Plugin/views/filter/views_handler_filter_search.inc
+++ b/lib/Drupal/search/Plugin/views/filter/views_handler_filter_search.inc
@@ -7,7 +7,7 @@
 
 use Drupal\views\Join;
 use Drupal\search\SearchQuery;
-use Drupal\views\Plugins\views\filter\FilterPluginBase;
+use Drupal\views\Plugin\views\filter\FilterPluginBase;
 
 /**
  * Field handler to provide simple renderer that allows linking to a node.
diff --git a/lib/Drupal/search/Plugin/views/row/views_plugin_row_search_view.inc b/lib/Drupal/search/Plugin/views/row/views_plugin_row_search_view.inc
index b33852aea8f2f095e6ac75f3e57a743af7224659..5806edad652e21fe3fb820a4407137feca3a134e 100644
--- a/lib/Drupal/search/Plugin/views/row/views_plugin_row_search_view.inc
+++ b/lib/Drupal/search/Plugin/views/row/views_plugin_row_search_view.inc
@@ -5,7 +5,7 @@
  * Definition of views_plugin_row_search_view.
  */
 
-use Drupal\views\Plugins\views\row\RowPluginBase;
+use Drupal\views\Plugin\views\row\RowPluginBase;
 
 /**
  * Plugin which performs a node_view on the resulting object.
diff --git a/lib/Drupal/search/Plugin/views/sort/views_handler_sort_search_score.inc b/lib/Drupal/search/Plugin/views/sort/views_handler_sort_search_score.inc
index 0282f69ec4b08821ec938cee2a2ad234ac4719ca..afe303f7a8b35a0eed864f6665a36a7019ac990b 100644
--- a/lib/Drupal/search/Plugin/views/sort/views_handler_sort_search_score.inc
+++ b/lib/Drupal/search/Plugin/views/sort/views_handler_sort_search_score.inc
@@ -5,7 +5,7 @@
  * Definition of views_handler_sort_search_score.
  */
 
-use Drupal\views\Plugins\views\sort\SortPluginBase;
+use Drupal\views\Plugin\views\sort\SortPluginBase;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/statistics/Plugin/views/field/views_handler_field_accesslog_path.inc b/lib/Drupal/statistics/Plugin/views/field/views_handler_field_accesslog_path.inc
index 3ab613a51b27eb0d228692bdbdfc449e9922b316..2d55b3b2047d204287b3257470424ef5a77e8852 100644
--- a/lib/Drupal/statistics/Plugin/views/field/views_handler_field_accesslog_path.inc
+++ b/lib/Drupal/statistics/Plugin/views/field/views_handler_field_accesslog_path.inc
@@ -5,7 +5,7 @@
  * Definition of views_handler_field_accesslog_path.
  */
 
-use Drupal\views\Plugins\views\field\FieldPluginBase;
+use Drupal\views\Plugin\views\field\FieldPluginBase;
 
 /**
  * Field handler to provide simple renderer that turns a URL into a clickable link.
diff --git a/lib/Drupal/taxonomy/Plugin/views/argument/views_handler_argument_vocabulary_machine_name.inc b/lib/Drupal/taxonomy/Plugin/views/argument/views_handler_argument_vocabulary_machine_name.inc
index 2ec835b2dce437b0d0445eacccbaf8df7b2d4411..c4da1bf3d77afe123537588010a5e45a0571e521 100644
--- a/lib/Drupal/taxonomy/Plugin/views/argument/views_handler_argument_vocabulary_machine_name.inc
+++ b/lib/Drupal/taxonomy/Plugin/views/argument/views_handler_argument_vocabulary_machine_name.inc
@@ -5,7 +5,7 @@
  * Definition of views_handler_argument_vocabulary_machine_name.
  */
 
-use Drupal\views\Plugins\views\argument\String;
+use Drupal\views\Plugin\views\argument\String;
 
 /**
  * Argument handler to accept a vocabulary machine name.
diff --git a/lib/Drupal/taxonomy/Plugin/views/argument/views_handler_argument_vocabulary_vid.inc b/lib/Drupal/taxonomy/Plugin/views/argument/views_handler_argument_vocabulary_vid.inc
index eba45978b783db35bac172be4aa63164a6631879..899ee9660e49f8d4a0f9624a8d381c61cb2de04d 100644
--- a/lib/Drupal/taxonomy/Plugin/views/argument/views_handler_argument_vocabulary_vid.inc
+++ b/lib/Drupal/taxonomy/Plugin/views/argument/views_handler_argument_vocabulary_vid.inc
@@ -5,7 +5,7 @@
  * Definition of views_handler_argument_vocabulary_vid.
  */
 
-use Drupal\views\Plugins\views\argument\Numeric;
+use Drupal\views\Plugin\views\argument\Numeric;
 
 /**
  * Argument handler to accept a vocabulary id.
diff --git a/lib/Drupal/taxonomy/Plugin/views/relationship/views_handler_relationship_node_term_data.inc b/lib/Drupal/taxonomy/Plugin/views/relationship/views_handler_relationship_node_term_data.inc
index f50867a7e0f44664ed3259a8209c9ff0a4508044..4111725d94b6c608c5eb9d585b2d24b6ac20e222 100644
--- a/lib/Drupal/taxonomy/Plugin/views/relationship/views_handler_relationship_node_term_data.inc
+++ b/lib/Drupal/taxonomy/Plugin/views/relationship/views_handler_relationship_node_term_data.inc
@@ -6,7 +6,7 @@
  */
 
 use Drupal\views\Join;
-use Drupal\views\Plugins\views\relationship\RelationshipPluginBase;
+use Drupal\views\Plugin\views\relationship\RelationshipPluginBase;
 
 /**
  * Relationship handler to return the taxonomy terms of nodes.
diff --git a/lib/Drupal/translation/Plugin/views/relationship/views_handler_relationship_translation.inc b/lib/Drupal/translation/Plugin/views/relationship/views_handler_relationship_translation.inc
index ef27dca7cf1778a684aa13a910e1c542e44c7896..9766322a193fcc7e7bca7b2e4156e95f43323187 100644
--- a/lib/Drupal/translation/Plugin/views/relationship/views_handler_relationship_translation.inc
+++ b/lib/Drupal/translation/Plugin/views/relationship/views_handler_relationship_translation.inc
@@ -6,7 +6,7 @@
  */
 
 use Drupal\views\Join;
-use Drupal\views\Plugins\views\relationship\RelationshipPluginBase;
+use Drupal\views\Plugin\views\relationship\RelationshipPluginBase;
 
 /**
  * Handles relationships for content translation sets and provides multiple
diff --git a/lib/Drupal/user/Plugin/views/argument/views_handler_argument_user_uid.inc b/lib/Drupal/user/Plugin/views/argument/views_handler_argument_user_uid.inc
index c38cd74e45033c53275c0a60a0b853e13de1ec9f..e1532221a498114e870c9a385a0013a23fc1ccdf 100644
--- a/lib/Drupal/user/Plugin/views/argument/views_handler_argument_user_uid.inc
+++ b/lib/Drupal/user/Plugin/views/argument/views_handler_argument_user_uid.inc
@@ -5,7 +5,7 @@
  * Definition of views_handler_argument_user_uid.
  */
 
-use Drupal\views\Plugins\views\argument\Numeric;
+use Drupal\views\Plugin\views\argument\Numeric;
 
 /**
  * Argument handler to accept a user id.
diff --git a/lib/Drupal/user/Plugin/views/argument/views_handler_argument_users_roles_rid.inc b/lib/Drupal/user/Plugin/views/argument/views_handler_argument_users_roles_rid.inc
index 7502a2fe096ec4425b0f872a87892176d5b9d2fa..b82102760f4e58be0e43aebdda3bcdcb8e694aae 100644
--- a/lib/Drupal/user/Plugin/views/argument/views_handler_argument_users_roles_rid.inc
+++ b/lib/Drupal/user/Plugin/views/argument/views_handler_argument_users_roles_rid.inc
@@ -5,7 +5,7 @@
  * Definition of views_handler_argument_users_roles_rid.
  */
 
-use Drupal\views\Plugins\views\argument\ManyToOne;
+use Drupal\views\Plugin\views\argument\ManyToOne;
 
 /**
  * Allow role ID(s) as argument.
diff --git a/lib/Drupal/user/Plugin/views/argument_default/views_plugin_argument_default_current_user.inc b/lib/Drupal/user/Plugin/views/argument_default/views_plugin_argument_default_current_user.inc
index 0b10ec066fddcaae9aec5e68ccf65362d28b6c93..e6d5f06ce16fb0e02ac75dfed97bbe70aba428f8 100644
--- a/lib/Drupal/user/Plugin/views/argument_default/views_plugin_argument_default_current_user.inc
+++ b/lib/Drupal/user/Plugin/views/argument_default/views_plugin_argument_default_current_user.inc
@@ -5,7 +5,7 @@
  * Contains the current user argument default plugin.
  */
 
-use Drupal\views\Plugins\views\argument_default\ArgumentDefaultPluginBase;
+use Drupal\views\Plugin\views\argument_default\ArgumentDefaultPluginBase;
 
 /**
  * Default argument plugin to extract the global $user
diff --git a/lib/Drupal/user/Plugin/views/argument_default/views_plugin_argument_default_user.inc b/lib/Drupal/user/Plugin/views/argument_default/views_plugin_argument_default_user.inc
index 02764f21ff7ea23e627fb49c3f27eaac6231d307..ea2f9185b022b1a3d59c97fd084c23c5fb4f9c04 100644
--- a/lib/Drupal/user/Plugin/views/argument_default/views_plugin_argument_default_user.inc
+++ b/lib/Drupal/user/Plugin/views/argument_default/views_plugin_argument_default_user.inc
@@ -5,7 +5,7 @@
  * Contains the user from URL argument default plugin.
  */
 
-use Drupal\views\Plugins\views\argument_default\ArgumentDefaultPluginBase;
+use Drupal\views\Plugin\views\argument_default\ArgumentDefaultPluginBase;
 
 /**
  * Default argument plugin to extract a user via menu_get_object.
diff --git a/lib/Drupal/user/Plugin/views/argument_validate/views_plugin_argument_validate_user.inc b/lib/Drupal/user/Plugin/views/argument_validate/views_plugin_argument_validate_user.inc
index 74eb23f06420c42af717167fc4e30fb9831335cf..2db795f45e503a4f759adf5b47c2f49ef0b3968b 100644
--- a/lib/Drupal/user/Plugin/views/argument_validate/views_plugin_argument_validate_user.inc
+++ b/lib/Drupal/user/Plugin/views/argument_validate/views_plugin_argument_validate_user.inc
@@ -5,7 +5,7 @@
  * Definition of views_plugin_argument_validate_user.
  */
 
-use Drupal\views\Plugins\views\argument_validator\ArgumentValidatorPluginBase;
+use Drupal\views\Plugin\views\argument_validator\ArgumentValidatorPluginBase;
 
 /**
  * Validate whether an argument is a valid user.
diff --git a/lib/Drupal/user/Plugin/views/field/views_handler_field_user_picture.inc b/lib/Drupal/user/Plugin/views/field/views_handler_field_user_picture.inc
index 4bc80c62b3bafa23b7548b2c99733088bd4e1f84..a8e465d683f6112205588823ebe789417eba6494 100644
--- a/lib/Drupal/user/Plugin/views/field/views_handler_field_user_picture.inc
+++ b/lib/Drupal/user/Plugin/views/field/views_handler_field_user_picture.inc
@@ -5,7 +5,7 @@
  * Definition of views_handler_field_user_picture.
  */
 
-use Drupal\views\Plugins\views\field\FieldPluginBase;
+use Drupal\views\Plugin\views\field\FieldPluginBase;
 
 /**
  * Field handler to provide simple renderer that allows using a themed user link.
diff --git a/lib/Drupal/user/Plugin/views/field/views_handler_field_user_roles.inc b/lib/Drupal/user/Plugin/views/field/views_handler_field_user_roles.inc
index 6ee5062ab50d7e78a16b775ae6b952362d6073d0..b734eb714dd9c357635ab2b8460cdc6b5193075a 100644
--- a/lib/Drupal/user/Plugin/views/field/views_handler_field_user_roles.inc
+++ b/lib/Drupal/user/Plugin/views/field/views_handler_field_user_roles.inc
@@ -5,7 +5,7 @@
  * Definition of views_handler_field_user_roles.
  */
 
-use Drupal\views\Plugins\views\field\PrerenderList;
+use Drupal\views\Plugin\views\field\PrerenderList;
 
 /**
  * Field handler to provide a list of roles.
diff --git a/lib/Drupal/user/Plugin/views/filter/views_handler_filter_user_current.inc b/lib/Drupal/user/Plugin/views/filter/views_handler_filter_user_current.inc
index 8ac8ba8579b271b8ecab05e4946a867d5c3ff089..56106eac533d9575fe795095a6d145801a2639dd 100644
--- a/lib/Drupal/user/Plugin/views/filter/views_handler_filter_user_current.inc
+++ b/lib/Drupal/user/Plugin/views/filter/views_handler_filter_user_current.inc
@@ -5,7 +5,7 @@
  * Definition of views_handler_filter_user_current.
  */
 
-use Drupal\views\Plugins\views\filter\BooleanOperator;
+use Drupal\views\Plugin\views\filter\BooleanOperator;
 
 /**
  * Filter handler for the current user.
diff --git a/lib/Drupal/user/Plugin/views/filter/views_handler_filter_user_name.inc b/lib/Drupal/user/Plugin/views/filter/views_handler_filter_user_name.inc
index 966fd96def6d9bb6aee57f0486530b414e80b518..1b68d3e6d09f409c26a50a23b27d917da73dfb63 100644
--- a/lib/Drupal/user/Plugin/views/filter/views_handler_filter_user_name.inc
+++ b/lib/Drupal/user/Plugin/views/filter/views_handler_filter_user_name.inc
@@ -5,7 +5,7 @@
  * Definition of views_handler_filter_user_name.
  */
 
-use Drupal\views\Plugins\views\filter\InOperator;
+use Drupal\views\Plugin\views\filter\InOperator;
 
 /**
  * Filter handler for usernames.
diff --git a/lib/Drupal/user/Plugin/views/filter/views_handler_filter_user_permissions.inc b/lib/Drupal/user/Plugin/views/filter/views_handler_filter_user_permissions.inc
index 14c2aeaabc71e70ea662e35a3562c6f88238e583..bf163a16797f06a97c5931508b330003d0fe8df6 100644
--- a/lib/Drupal/user/Plugin/views/filter/views_handler_filter_user_permissions.inc
+++ b/lib/Drupal/user/Plugin/views/filter/views_handler_filter_user_permissions.inc
@@ -5,7 +5,7 @@
  * Definition of views_handler_filter_user_permissions.
  */
 
-use Drupal\views\Plugins\views\filter\ManyToOne;
+use Drupal\views\Plugin\views\filter\ManyToOne;
 
 /**
  * Filter handler for user roles.
diff --git a/lib/Drupal/user/Plugin/views/filter/views_handler_filter_user_roles.inc b/lib/Drupal/user/Plugin/views/filter/views_handler_filter_user_roles.inc
index e0f96d8e29e997830dad8d76236f0f95dde34419..dbceece2a9b54fdce38b6f1c69a60b7ade7bcd4c 100644
--- a/lib/Drupal/user/Plugin/views/filter/views_handler_filter_user_roles.inc
+++ b/lib/Drupal/user/Plugin/views/filter/views_handler_filter_user_roles.inc
@@ -5,7 +5,7 @@
  * Definition of views_handler_filter_user_roles.
  */
 
-use Drupal\views\Plugins\views\filter\ManyToOne;
+use Drupal\views\Plugin\views\filter\ManyToOne;
 
 /**
  * Filter handler for user roles.
diff --git a/lib/Drupal/user/Plugin/views/row/views_plugin_row_user_view.inc b/lib/Drupal/user/Plugin/views/row/views_plugin_row_user_view.inc
index 336d4d91daccc8784de7343518709b89a7c2d24c..4e3ee0c8f82953ce6a5ef3f51208aa8f95b6b48a 100644
--- a/lib/Drupal/user/Plugin/views/row/views_plugin_row_user_view.inc
+++ b/lib/Drupal/user/Plugin/views/row/views_plugin_row_user_view.inc
@@ -5,7 +5,7 @@
  * Contains the user view row plugin.
  */
 
-use Drupal\views\Plugins\views\row\RowPluginBase;
+use Drupal\views\Plugin\views\row\RowPluginBase;
 
 /**
  * A row plugin which renders a user via user_view.