diff --git a/core/modules/contact/config/schema/contact.schema.yml b/core/modules/contact/config/schema/contact.schema.yml
index 5a62e9d..e8df71a 100644
--- a/core/modules/contact/config/schema/contact.schema.yml
+++ b/core/modules/contact/config/schema/contact.schema.yml
@@ -43,3 +43,14 @@ contact.settings:
     user_default_enabled:
       type: boolean
       label: 'Personal contact form enabled by default'
+
+migrate.source.d6_contact_settings:
+  type: migrate_source_sql
+  label: 'Drupal 6 contact settings'
+  mapping:
+    variables:
+      type: sequence
+      label: 'Variables'
+      sequence:
+        type: string
+        label: 'Variable'
diff --git a/core/modules/migrate_drupal/migration_templates/d6_contact_category.yml b/core/modules/contact/migration_templates/d6_contact_category.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_contact_category.yml
rename to core/modules/contact/migration_templates/d6_contact_category.yml
diff --git a/core/modules/migrate_drupal/migration_templates/d6_contact_settings.yml b/core/modules/contact/migration_templates/d6_contact_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_contact_settings.yml
rename to core/modules/contact/migration_templates/d6_contact_settings.yml
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/ContactCategory.php b/core/modules/contact/src/Plugin/migrate/source/d6/ContactCategory.php
similarity index 91%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/ContactCategory.php
rename to core/modules/contact/src/Plugin/migrate/source/d6/ContactCategory.php
index 97ecdc3..153b597 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/ContactCategory.php
+++ b/core/modules/contact/src/Plugin/migrate/source/d6/ContactCategory.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\ContactCategory.
+ * Contains \Drupal\contact\Plugin\migrate\source\d6\ContactCategory.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\contact\Plugin\migrate\source\d6;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 use Drupal\migrate\Row;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/ContactSettings.php b/core/modules/contact/src/Plugin/migrate/source/d6/ContactSettings.php
similarity index 80%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/ContactSettings.php
rename to core/modules/contact/src/Plugin/migrate/source/d6/ContactSettings.php
index 6bcfd7a..48e7a5e 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/ContactSettings.php
+++ b/core/modules/contact/src/Plugin/migrate/source/d6/ContactSettings.php
@@ -2,10 +2,11 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\ContactSettings.
+ * Contains \Drupal\contact\Plugin\migrate\source\d6\ContactSettings.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\contact\Plugin\migrate\source\d6;
+
 use Drupal\migrate_drupal\Plugin\migrate\source\Variable;
 
 /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateContactCategoryTest.php b/core/modules/contact/src/Tests/Migrate/d6/MigrateContactCategoryTest.php
similarity index 90%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateContactCategoryTest.php
rename to core/modules/contact/src/Tests/Migrate/d6/MigrateContactCategoryTest.php
index 4cc5033..459b515 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateContactCategoryTest.php
+++ b/core/modules/contact/src/Tests/Migrate/d6/MigrateContactCategoryTest.php
@@ -2,17 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateContactCategoryTest.
+ * Contains \Drupal\contact\Tests\Migrate\d6\MigrateContactCategoryTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\contact\Tests\Migrate\d6;
 
 use Drupal\contact\Entity\ContactForm;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Migrate contact categories to contact.form.*.yml.
  *
- * @group migrate_drupal
+ * @group contact
  */
 class MigrateContactCategoryTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateContactConfigsTest.php b/core/modules/contact/src/Tests/Migrate/d6/MigrateContactConfigsTest.php
similarity index 87%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateContactConfigsTest.php
rename to core/modules/contact/src/Tests/Migrate/d6/MigrateContactConfigsTest.php
index 44971d0..99eb405 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateContactConfigsTest.php
+++ b/core/modules/contact/src/Tests/Migrate/d6/MigrateContactConfigsTest.php
@@ -2,17 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateContactConfigsTest.
+ * Contains \Drupal\contact\Tests\Migrate\d6\MigrateContactConfigsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\contact\Tests\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to contact.settings.yml.
  *
- * @group migrate_drupal
+ * @group contact
  */
 class MigrateContactConfigsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/ContactCategoryTest.php b/core/modules/contact/tests/src/Unit/Plugin/migrate/source/d6/ContactCategoryTest.php
similarity index 82%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/ContactCategoryTest.php
rename to core/modules/contact/tests/src/Unit/Plugin/migrate/source/d6/ContactCategoryTest.php
index a3c4055..0a77e64 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/ContactCategoryTest.php
+++ b/core/modules/contact/tests/src/Unit/Plugin/migrate/source/d6/ContactCategoryTest.php
@@ -2,21 +2,21 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\ContactCategoryTest.
+ * Contains \Drupal\Tests\contact\Unit\Plugin\migrate\source\d6\ContactCategoryTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\contact\Unit\Plugin\migrate\source\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 contact category source plugin.
  *
- * @group migrate_drupal
+ * @group contact
  */
 class ContactCategoryTest extends MigrateSqlSourceTestCase {
 
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\ContactCategory';
+  const PLUGIN_CLASS = 'Drupal\contact\Plugin\migrate\source\d6\ContactCategory';
 
   protected $migrationConfiguration = array(
     'id' => 'test',
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..0bab8e3 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
@@ -146,17 +146,6 @@ migrate.source.d6_comment_variable:
       type: migrate_entity_constant
       label: 'Constants'
 
-migrate.source.d6_contact_settings:
-  type: migrate_source_sql
-  label: 'Drupal 6 contact settings'
-  mapping:
-    variables:
-      type: sequence
-      label: 'Variables'
-      sequence:
-        type: string
-        label: 'Variable'
-
 migrate.source.d6_view_mode:
   type: migrate_source_sql
   label: 'Drupal 6 view mode'