diff --git a/core/modules/migrate_drupal/migration_templates/d6_block.yml b/core/modules/block/migration_templates/d6_block.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_block.yml
rename to core/modules/block/migration_templates/d6_block.yml
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockPluginId.php b/core/modules/block/src/Plugin/migrate/process/d6/BlockPluginId.php
similarity index 95%
rename from core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockPluginId.php
rename to core/modules/block/src/Plugin/migrate/process/d6/BlockPluginId.php
index 01854bd90686b572de2c183bbbd0b761b285665d..55cbd9686230d0b4b316dbbe8fa712c15a7d1734 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockPluginId.php
+++ b/core/modules/block/src/Plugin/migrate/process/d6/BlockPluginId.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\BlockPluginId.
+ * Contains \Drupal\block\Plugin\migrate\process\d6\BlockPluginId.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
+namespace Drupal\block\Plugin\migrate\process\d6;
 
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockRegion.php b/core/modules/block/src/Plugin/migrate/process/d6/BlockRegion.php
similarity index 86%
rename from core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockRegion.php
rename to core/modules/block/src/Plugin/migrate/process/d6/BlockRegion.php
index 0f61515e50b00b132c9fe5b0ac7a55583caa4d09..672645b3d4623f898b60bf4e1777f703b4cb4656 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockRegion.php
+++ b/core/modules/block/src/Plugin/migrate/process/d6/BlockRegion.php
@@ -1,12 +1,12 @@
 <?php
+
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\BlockRegion.
+ * Contains \Drupal\block\Plugin\migrate\process\d6\BlockRegion.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
+namespace Drupal\block\Plugin\migrate\process\d6;
 
-use Drupal\Component\Utility\NestedArray;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockSettings.php b/core/modules/block/src/Plugin/migrate/process/d6/BlockSettings.php
similarity index 92%
rename from core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockSettings.php
rename to core/modules/block/src/Plugin/migrate/process/d6/BlockSettings.php
index 0d05eb2bd08227ca941b68575c6b8f79edbd4bec..2b410eb4e73c8ca6913ea15c4b7d854e83402e85 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockSettings.php
+++ b/core/modules/block/src/Plugin/migrate/process/d6/BlockSettings.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\BlockSettings.
+ * Contains \Drupal\block\Plugin\migrate\process\d6\BlockSettings.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
+namespace Drupal\block\Plugin\migrate\process\d6;
 
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\ProcessPluginBase;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockTheme.php b/core/modules/block/src/Plugin/migrate/process/d6/BlockTheme.php
similarity index 95%
rename from core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockTheme.php
rename to core/modules/block/src/Plugin/migrate/process/d6/BlockTheme.php
index 290ed856e0bccbc5850c2214d7c444d69a325067..16039331c26429a685f6a73c866d5e52f86b933e 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockTheme.php
+++ b/core/modules/block/src/Plugin/migrate/process/d6/BlockTheme.php
@@ -1,10 +1,11 @@
 <?php
+
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\BlockTheme.
+ * Contains \Drupal\block\Plugin\migrate\process\d6\BlockTheme.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
+namespace Drupal\block\Plugin\migrate\process\d6;
 
 use Drupal\migrate\Entity\MigrationInterface;
 use Drupal\migrate\MigrateExecutableInterface;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockVisibility.php b/core/modules/block/src/Plugin/migrate/process/d6/BlockVisibility.php
similarity index 94%
rename from core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockVisibility.php
rename to core/modules/block/src/Plugin/migrate/process/d6/BlockVisibility.php
index f072b17d03afd1eb1f55b1d409c611c05cc25964..9afd1800f47ecfa8ee16def8387d2474643b8376 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockVisibility.php
+++ b/core/modules/block/src/Plugin/migrate/process/d6/BlockVisibility.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\BlockVisibility.
+ * Contains \Drupal\block\Plugin\migrate\process\d6\BlockVisibility.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
+namespace Drupal\block\Plugin\migrate\process\d6;
 
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\migrate\MigrateExecutableInterface;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Block.php b/core/modules/block/src/Plugin/migrate/source/d6/Block.php
similarity index 97%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Block.php
rename to core/modules/block/src/Plugin/migrate/source/d6/Block.php
index b27364153da323e88d8e2fcf68d9b4d3b7c38165..ba13254b2cf378a38a3a58061edd779a9f646b8c 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Block.php
+++ b/core/modules/block/src/Plugin/migrate/source/d6/Block.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\Block.
+ * Contains \Drupal\block\Plugin\migrate\source\d6\Block.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\block\Plugin\migrate\source\d6;
 
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockTest.php b/core/modules/block/src/Tests/Migrate/d6/MigrateBlockTest.php
similarity index 97%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateBlockTest.php
rename to core/modules/block/src/Tests/Migrate/d6/MigrateBlockTest.php
index ceaef07ca3ff1277859c78ad6644868bee3226f7..232fa4a321c5abc289b18564a29d999833c6ba8c 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockTest.php
+++ b/core/modules/block/src/Tests/Migrate/d6/MigrateBlockTest.php
@@ -2,17 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateBlockTest.
+ * Contains \Drupal\block\Tests\Migrate\d6\MigrateBlockTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\block\Tests\Migrate\d6;
 
 use Drupal\block\Entity\Block;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade block settings to block.block.*.yml.
  *
- * @group migrate_drupal
+ * @group block
  */
 class MigrateBlockTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/BlockTest.php b/core/modules/block/tests/src/Unit/Plugin/migrate/source/d6/BlockTest.php
similarity index 85%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/BlockTest.php
rename to core/modules/block/tests/src/Unit/Plugin/migrate/source/d6/BlockTest.php
index 79e3344cfbde85ac3e1a0acde6278f3873ddbe74..861aa2f67d78660e5bedc49c2e6919098eab9bd1 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/BlockTest.php
+++ b/core/modules/block/tests/src/Unit/Plugin/migrate/source/d6/BlockTest.php
@@ -2,23 +2,24 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\BlockTest.
+ * Contains \Drupal\Tests\block\Unit\Plugin\migrate\source\d6\BlockTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\block\Unit\Plugin\migrate\source\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 block source plugin.
  *
- * @group migrate_drupal
+ * @coversDefaultClass \Drupal\block\Plugin\migrate\source\d6\Block
+ * @group block
  */
 class BlockTest extends MigrateSqlSourceTestCase {
 
   // The plugin system is not working during unit testing so the source plugin
   // class needs to be manually specified.
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\Block';
+  const PLUGIN_CLASS = 'Drupal\block\Plugin\migrate\source\d6\Block';
 
   // The fake Migration configuration entity.
   protected $migrationConfiguration = array(