diff --git a/core/modules/field/config/schema/field.schema.yml b/core/modules/field/config/schema/field.schema.yml
index 55760a7..ddb2b7f 100644
--- a/core/modules/field/config/schema/field.schema.yml
+++ b/core/modules/field/config/schema/field.schema.yml
@@ -54,3 +54,43 @@ field.storage.*.*:
 field.field.*.*.*:
   type: field_config_base
   label: 'Field'
+
+migrate.source.d6_field_instance_per_form_display:
+  type: migrate_source_sql
+  label: 'Drupal 6 field instance form display'
+  mapping:
+    constants:
+      type: migrate_entity_constant
+      label: 'Constants'
+
+migrate.source.d6_field:
+  type: migrate_source_sql
+  label: 'Drupal 6 field'
+  mapping:
+    constants:
+      type: migrate_entity_constant
+      label: 'Constants'
+
+migrate.source.d6_field_formatter_settings:
+  type: migrate_source_sql
+  label: 'Drupal 6 field formatter settings'
+  mapping:
+    constants:
+      type: migrate_entity_constant
+      label: 'Constants'
+
+migrate.source.d6_field_instance:
+  type: migrate_source_sql
+  label: 'Drupal 6 field instance'
+  mapping:
+    constants:
+      type: migrate_entity_constant
+      label: 'Constants'
+
+migrate.source.d6_field_instance_per_view_mode:
+  type: migrate_source_sql
+  label: 'Drupal 6 field formatter'
+  mapping:
+    constants:
+      type: migrate_entity_constant
+      label: 'Constants'
diff --git a/core/modules/migrate_drupal/migration_templates/d6_field.yml b/core/modules/field/migration_templates/d6_field.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_field.yml
rename to core/modules/field/migration_templates/d6_field.yml
diff --git a/core/modules/migrate_drupal/migration_templates/d6_field_formatter_settings.yml b/core/modules/field/migration_templates/d6_field_formatter_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_field_formatter_settings.yml
rename to core/modules/field/migration_templates/d6_field_formatter_settings.yml
diff --git a/core/modules/migrate_drupal/migration_templates/d6_field_instance.yml b/core/modules/field/migration_templates/d6_field_instance.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_field_instance.yml
rename to core/modules/field/migration_templates/d6_field_instance.yml
diff --git a/core/modules/migrate_drupal/migration_templates/d6_field_instance_widget_settings.yml b/core/modules/field/migration_templates/d6_field_instance_widget_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_field_instance_widget_settings.yml
rename to core/modules/field/migration_templates/d6_field_instance_widget_settings.yml
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldFormatterSettingsDefaults.php b/core/modules/field/src/Plugin/migrate/process/d6/FieldFormatterSettingsDefaults.php
similarity index 94%
rename from core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldFormatterSettingsDefaults.php
rename to core/modules/field/src/Plugin/migrate/process/d6/FieldFormatterSettingsDefaults.php
index a1b7856..4deeb16 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldFormatterSettingsDefaults.php
+++ b/core/modules/field/src/Plugin/migrate/process/d6/FieldFormatterSettingsDefaults.php
@@ -2,12 +2,11 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\FieldFormatterSettingsDefaults.
+ * Contains \Drupal\field\Plugin\migrate\process\d6\FieldFormatterSettingsDefaults.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
+namespace Drupal\field\Plugin\migrate\process\d6;
 
-use Drupal\migrate\MigrateException;
 use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\Row;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldIdGenerator.php b/core/modules/field/src/Plugin/migrate/process/d6/FieldIdGenerator.php
similarity index 78%
rename from core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldIdGenerator.php
rename to core/modules/field/src/Plugin/migrate/process/d6/FieldIdGenerator.php
index 606edbe..93eca11 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldIdGenerator.php
+++ b/core/modules/field/src/Plugin/migrate/process/d6/FieldIdGenerator.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\FieldIdGenerator.
+ * Contains \Drupal\field\Plugin\migrate\process\d6\FieldIdGenerator.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
+namespace Drupal\field\Plugin\migrate\process\d6;
 
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\ProcessPluginBase;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceDefaults.php b/core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceDefaults.php
similarity index 92%
rename from core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceDefaults.php
rename to core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceDefaults.php
index 0ad1e6c..0b0b7b7 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceDefaults.php
+++ b/core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceDefaults.php
@@ -1,10 +1,11 @@
 <?php
+
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\FieldInstanceDefaults.
+ * Contains \Drupal\field\Plugin\migrate\process\d6\FieldInstanceDefaults.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
+namespace Drupal\field\Plugin\migrate\process\d6;
 
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\ProcessPluginBase;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceSettings.php b/core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceSettings.php
similarity index 95%
rename from core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceSettings.php
rename to core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceSettings.php
index 6911d4a..a678820 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceSettings.php
+++ b/core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceSettings.php
@@ -1,10 +1,11 @@
 <?php
+
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\FieldInstanceSettings.
+ * Contains \Drupal\field\Plugin\migrate\process\d6\FieldInstanceSettings.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
+namespace Drupal\field\Plugin\migrate\process\d6;
 
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\ProcessPluginBase;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php b/core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php
similarity index 93%
rename from core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php
rename to core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php
index 828221a..f096a6e 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php
+++ b/core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\FieldInstanceWidgetSettings.
+ * Contains \Drupal\field\Plugin\migrate\process\d6\FieldInstanceWidgetSettings.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
+namespace Drupal\field\Plugin\migrate\process\d6;
 
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\ProcessPluginBase;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldSettings.php b/core/modules/field/src/Plugin/migrate/process/d6/FieldSettings.php
similarity index 94%
rename from core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldSettings.php
rename to core/modules/field/src/Plugin/migrate/process/d6/FieldSettings.php
index e96e351..1804f7b 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldSettings.php
+++ b/core/modules/field/src/Plugin/migrate/process/d6/FieldSettings.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\FieldSettings.
+ * Contains \Drupal\field\Plugin\migrate\process\d6\FieldSettings.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
+namespace Drupal\field\Plugin\migrate\process\d6;
 
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\ProcessPluginBase;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldTypeDefaults.php b/core/modules/field/src/Plugin/migrate/process/d6/FieldTypeDefaults.php
similarity index 79%
rename from core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldTypeDefaults.php
rename to core/modules/field/src/Plugin/migrate/process/d6/FieldTypeDefaults.php
index c3ebae0..1f6e2f3 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldTypeDefaults.php
+++ b/core/modules/field/src/Plugin/migrate/process/d6/FieldTypeDefaults.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\FieldTypeDefaults.
+ * Contains \Drupal\field\Plugin\migrate\process\d6\FieldTypeDefaults.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
+namespace Drupal\field\Plugin\migrate\process\d6;
 
 use Drupal\migrate\MigrateException;
 use Drupal\migrate\ProcessPluginBase;
@@ -13,7 +13,7 @@
 use Drupal\migrate\Row;
 
 /**
- * Gives us a change to set per field defaults.
+ * Gives us a chance to set per field defaults.
  *
  * @MigrateProcessPlugin(
  *   id = "field_type_defaults"
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Field.php b/core/modules/field/src/Plugin/migrate/source/d6/Field.php
similarity index 94%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Field.php
rename to core/modules/field/src/Plugin/migrate/source/d6/Field.php
index 3738dce..20d081a 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Field.php
+++ b/core/modules/field/src/Plugin/migrate/source/d6/Field.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\Field.
+ * Contains \Drupal\field\Plugin\migrate\source\d6\Field.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\field\Plugin\migrate\source\d6;
 
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/FieldInstance.php b/core/modules/field/src/Plugin/migrate/source/d6/FieldInstance.php
similarity index 95%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/FieldInstance.php
rename to core/modules/field/src/Plugin/migrate/source/d6/FieldInstance.php
index 5b42504..ff9a0ca 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/FieldInstance.php
+++ b/core/modules/field/src/Plugin/migrate/source/d6/FieldInstance.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\FieldInstance.
+ * Contains \Drupal\field\Plugin\migrate\source\d6\FieldInstance.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\field\Plugin\migrate\source\d6;
 
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/FieldInstancePerFormDisplay.php b/core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerFormDisplay.php
similarity index 94%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/FieldInstancePerFormDisplay.php
rename to core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerFormDisplay.php
index 5bbb04d..a7b9fad 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/FieldInstancePerFormDisplay.php
+++ b/core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerFormDisplay.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\FieldInstancePerFormDisplay.
+ * Contains \Drupal\field\Plugin\migrate\source\d6\FieldInstancePerFormDisplay.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\field\Plugin\migrate\source\d6;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/FieldInstancePerViewMode.php b/core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerViewMode.php
similarity index 94%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/FieldInstancePerViewMode.php
rename to core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerViewMode.php
index a0cf124..f5535e3 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/FieldInstancePerViewMode.php
+++ b/core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerViewMode.php
@@ -2,10 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\FieldInstancePerViewMode.
+ * Contains \Drupal\field\Plugin\migrate\source\d6\FieldInstancePerViewMode.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\field\Plugin\migrate\source\d6;
+
+use Drupal\migrate_drupal\Plugin\migrate\source\d6\ViewModeBase;
 
 /**
  * The field instance per view mode source class.
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldFormatterSettingsTest.php b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldFormatterSettingsTest.php
similarity index 97%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateFieldFormatterSettingsTest.php
rename to core/modules/field/src/Tests/Migrate/d6/MigrateFieldFormatterSettingsTest.php
index 1516954..b556dcf 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldFormatterSettingsTest.php
+++ b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldFormatterSettingsTest.php
@@ -2,17 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateFieldFormatterSettingsTest.
+ * Contains \Drupal\field\Tests\Migrate\d6\MigrateFieldFormatterSettingsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\field\Tests\Migrate\d6;
 
 use Drupal\Core\Entity\Entity\EntityViewMode;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade field formatter settings to entity.display.*.*.yml.
  *
- * @group migrate_drupal
+ * @group field
  */
 class MigrateFieldFormatterSettingsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldInstanceTest.php
similarity index 97%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php
rename to core/modules/field/src/Tests/Migrate/d6/MigrateFieldInstanceTest.php
index bae1e85..ca21557 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php
+++ b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldInstanceTest.php
@@ -2,18 +2,19 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateFieldInstanceTest.
+ * Contains \Drupal\field\Tests\Migrate\d6\MigrateFieldInstanceTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\field\Tests\Migrate\d6;
 
 use Drupal\field\Entity\FieldConfig;
 use Drupal\link\LinkItemInterface;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Migrate field instances.
  *
- * @group migrate_drupal
+ * @group field
  */
 class MigrateFieldInstanceTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldTest.php b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldTest.php
similarity index 97%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateFieldTest.php
rename to core/modules/field/src/Tests/Migrate/d6/MigrateFieldTest.php
index 1b612b0..907bba5 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldTest.php
+++ b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldTest.php
@@ -2,17 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateFieldTest.
+ * Contains \Drupal\field\Tests\Migrate\d6\MigrateFieldTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\field\Tests\Migrate\d6;
 
 use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Migrate fields.
  *
- * @group migrate_drupal
+ * @group field
  */
 class MigrateFieldTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldWidgetSettingsTest.php b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldWidgetSettingsTest.php
similarity index 96%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateFieldWidgetSettingsTest.php
rename to core/modules/field/src/Tests/Migrate/d6/MigrateFieldWidgetSettingsTest.php
index cc1540d..a3232c4 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldWidgetSettingsTest.php
+++ b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldWidgetSettingsTest.php
@@ -2,15 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateFieldWidgetSettingsTest.
+ * Contains \Drupal\field\Tests\Migrate\d6\MigrateFieldWidgetSettingsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\field\Tests\Migrate\d6;
+
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Migrate field widget settings.
  *
- * @group migrate_drupal
+ * @group field
  */
 class MigrateFieldWidgetSettingsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/FieldInstancePerViewModeTest.php b/core/modules/field/tests/src/Unit/Plugin/migrate/source/d6/FieldInstancePerViewModeTest.php
similarity index 91%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/FieldInstancePerViewModeTest.php
rename to core/modules/field/tests/src/Unit/Plugin/migrate/source/d6/FieldInstancePerViewModeTest.php
index 0bf81f9..7f0065c 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/FieldInstancePerViewModeTest.php
+++ b/core/modules/field/tests/src/Unit/Plugin/migrate/source/d6/FieldInstancePerViewModeTest.php
@@ -2,23 +2,23 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\FieldInstancePerViewModeTest.
+ * Contains \Drupal\Tests\field\Unit\Plugin\migrate\source\d6\FieldInstancePerViewModeTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\field\Unit\Plugin\migrate\source\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 fields per view mode source plugin.
  *
- * @group migrate_drupal
+ * @group field
  */
 class FieldInstancePerViewModeTest 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\FieldInstancePerViewMode';
+  const PLUGIN_CLASS = 'Drupal\field\Plugin\migrate\source\d6\FieldInstancePerViewMode';
 
   // The fake Migration configuration entity.
   protected $migrationConfiguration = array(
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/FieldInstanceTest.php b/core/modules/field/tests/src/Unit/Plugin/migrate/source/d6/FieldInstanceTest.php
similarity index 91%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/FieldInstanceTest.php
rename to core/modules/field/tests/src/Unit/Plugin/migrate/source/d6/FieldInstanceTest.php
index 22300bf..4ae8579 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/FieldInstanceTest.php
+++ b/core/modules/field/tests/src/Unit/Plugin/migrate/source/d6/FieldInstanceTest.php
@@ -2,23 +2,23 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\FieldInstanceTest.
+ * Contains \Drupal\Tests\field\Unit\Plugin\migrate\source\d6\FieldInstanceTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\field\Unit\Plugin\migrate\source\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 field instance source plugin.
  *
- * @group migrate_drupal
+ * @group field
  */
 class FieldInstanceTest 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\FieldInstance';
+  const PLUGIN_CLASS = 'Drupal\field\Plugin\migrate\source\d6\FieldInstance';
 
   // The fake Migration configuration entity.
   protected $migrationConfiguration = [
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/FieldTest.php b/core/modules/field/tests/src/Unit/Plugin/migrate/source/d6/FieldTest.php
similarity index 90%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/FieldTest.php
rename to core/modules/field/tests/src/Unit/Plugin/migrate/source/d6/FieldTest.php
index e95ac4a..21e1654 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/FieldTest.php
+++ b/core/modules/field/tests/src/Unit/Plugin/migrate/source/d6/FieldTest.php
@@ -2,23 +2,23 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\FieldTest.
+ * Contains \Drupal\Tests\field\Unit\Plugin\migrate\source\d6\FieldTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\field\Unit\Plugin\migrate\source\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 field source plugin.
  *
- * @group migrate_drupal
+ * @group field
  */
 class FieldTest 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\Field';
+  const PLUGIN_CLASS = 'Drupal\field\Plugin\migrate\source\d6\Field';
 
   // The fake Migration configuration entity.
   protected $migrationConfiguration = array(
diff --git a/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml b/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml
index 9fdf6d8..7cfcdda 100644
--- a/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml
+++ b/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml
@@ -95,14 +95,6 @@ migrate.source.d6_taxonomy_vocabulary:
       type: migrate_entity_constant
       label: 'Constants'
 
-migrate.source.d6_field_instance_per_form_display:
-  type: migrate_source_sql
-  label: 'Drupal 6 field instance form display'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
 migrate.source.d6_taxonomy_vocabulary_per_type:
   type: migrate_source_sql
   label: 'Drupal 6 field instance form display'
@@ -119,14 +111,6 @@ migrate.source.d6_taxonomy_vocabulary_per_type:
       type: migrate_entity_constant
       label: 'Constants'
 
-migrate.source.d6_field:
-  type: migrate_source_sql
-  label: 'Drupal 6 field'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
 migrate.source.variable_multirow:
   type: migrate_source_sql
   label: 'Drupal variable multirow'
@@ -180,14 +164,6 @@ migrate.source.d6_profile_field:
       type: migrate_entity_constant
       label: 'Constants'
 
-migrate.source.d6_field_formatter_settings:
-  type: migrate_source_sql
-  label: 'Drupal 6 field formatter settings'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
 migrate.source.d6_node_type:
   type: migrate_source_sql
   label: 'Drupal 6 node type'
@@ -224,22 +200,6 @@ migrate.source.d6_upload_instance:
       type: migrate_entity_constant
       label: 'Constants'
 
-migrate.source.d6_field_instance:
-  type: migrate_source_sql
-  label: 'Drupal 6 field instance'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
-migrate.source.d6_field_instance_per_view_mode:
-  type: migrate_source_sql
-  label: 'Drupal 6 field formatter'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
 migrate.source.d6_user:
   type: migrate_source_sql
   label: 'Drupal 6 user'