diff --git a/core/modules/migrate/migrate.services.yml b/core/modules/migrate/migrate.services.yml
index 3f2d32d..41c52ff 100644
--- a/core/modules/migrate/migrate.services.yml
+++ b/core/modules/migrate/migrate.services.yml
@@ -5,6 +5,9 @@ services:
       - { name: cache.bin }
     factory: cache_factory:get
     arguments: [migrate]
+  migrate.template_storage:
+    class: Drupal\migrate\MigrateTemplateStorage
+    arguments: ['@config.storage']
   plugin.manager.migrate.source:
     class: Drupal\migrate\Plugin\MigratePluginManager
     arguments: [source, '@container.namespaces', '@cache.discovery', '@module_handler', 'Drupal\migrate\Annotation\MigrateSource']
diff --git a/core/modules/migrate/src/MigrateTemplateStorage.php b/core/modules/migrate/src/MigrateTemplateStorage.php
new file mode 100644
index 0000000..6a62fa9
--- /dev/null
+++ b/core/modules/migrate/src/MigrateTemplateStorage.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate\MigrateTemplateStorage.
+ */
+
+namespace Drupal\migrate;
+
+use Drupal\Component\Discovery\YamlDiscovery;
+use Drupal\Core\Config\ExtensionInstallStorage;
+use Drupal\Core\Config\StorageInterface;
+
+/**
+ * Storage to access migration template configuration in enabled extensions.
+ */
+class MigrateTemplateStorage extends ExtensionInstallStorage {
+
+  /**
+   * Extension sub-directory containing default configuration for migrations.
+   */
+  const MIGRATION_TEMPLATE_DIRECTORY = 'migration_templates';
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(StorageInterface $config_storage, $directory = self::MIGRATION_TEMPLATE_DIRECTORY, $collection = StorageInterface::DEFAULT_COLLECTION, $include_profile = TRUE) {
+    parent::__construct($config_storage, $directory, $collection, $include_profile);
+  }
+
+  /**
+   * Find all migration templates with the specified tag.
+   *
+   * @param $tag
+   *   The tag to match.
+   *
+   * @return array
+   *   Any templates (parsed YAML config) that matched, keyed by the ID.
+   */
+  public function findTemplatesByTag($tag) {
+    $templates = $this->getAllTemplates();
+    $matched_templates = [];
+    foreach ($templates as $template_name => $template) {
+      if (!empty($template['migration_tags'])) {
+        if (in_array($tag, $template['migration_tags'])) {
+          $matched_templates[$template_name] = $template;
+        }
+      }
+    }
+    return $matched_templates;
+  }
+
+  /**
+   * Retrieves all migration templates belonging to enabled extensions.
+   *
+   * @return array
+   *   Array of parsed templates, keyed by the fully-qualified id.
+   */
+  public function getAllTemplates() {
+    // Retrieve the full list of templates, keyed by fully-qualified name,
+    // with the containing folder as the value.
+    $folders = $this->getAllFolders();
+    $templates = [];
+    foreach ($folders as $full_name => $folder) {
+      // The fully qualified name will be in the form migrate.migration.d6_node.
+      // Break out the provider ('migrate') and name ('migration.d6_node').
+      list($provider, $name) = explode('.', $full_name, 2);
+      // Retrieve and parse the template contents.
+      $discovery = new YamlDiscovery($name, array($provider => $folder));
+      $all = $discovery->findAll();
+      $templates[$full_name] = reset($all);
+    }
+
+    return $templates;
+  }
+
+}
diff --git a/core/modules/migrate/src/Tests/TemplateTest.php b/core/modules/migrate/src/Tests/TemplateTest.php
new file mode 100644
index 0000000..b110f6c
--- /dev/null
+++ b/core/modules/migrate/src/Tests/TemplateTest.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate\Tests\TemplateTest
+ */
+
+namespace Drupal\migrate\Tests;
+
+use Drupal\migrate\MigrationStorage;
+
+/**
+ * Test the migration template functionality.
+ *
+ * @group migrate
+ */
+class TemplateTest extends MigrateTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('template_test');
+
+  /**
+   * Test different connection types.
+   */
+  public function testTemplates() {
+    $migration_templates = \Drupal::service('migrate.template_storage')->findTemplatesByTag("Template Test");
+    $expected_url = [
+      'id' => 'url_template',
+      'label' => 'Template test - url',
+      'migration_tags' => ['Template Test'],
+      'source' => ['plugin' => 'empty'],
+      'process' => ['src' => 'foobar'],
+      'destination' => ['plugin' => 'url_alias'],
+    ];
+    $expected_node = [
+      'id' => 'node_template',
+      'label' => 'Template test - node',
+      'migration_tags' => ['Template Test'],
+      'source' => ['plugin' => 'empty'],
+      'process' => ['src' => 'barfoo'],
+      'destination' => ['plugin' => 'entity:node'],
+    ];
+    $this->assertIdentical($migration_templates['migrate.migration.url_template'], $expected_url);
+    $this->assertIdentical($migration_templates['migrate.migration.node_template'], $expected_node);
+    $this->assertFalse(isset($migration_templates['migrate.migration.other_template']));
+  }
+
+}
diff --git a/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.node_template.yml b/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.node_template.yml
new file mode 100644
index 0000000..6eead8b
--- /dev/null
+++ b/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.node_template.yml
@@ -0,0 +1,10 @@
+id: node_template
+label: Template test - node
+migration_tags:
+  - Template Test
+source:
+  plugin: empty
+process:
+  src: barfoo
+destination:
+  plugin: entity:node
diff --git a/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.other_template.yml b/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.other_template.yml
new file mode 100644
index 0000000..3d974f0
--- /dev/null
+++ b/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.other_template.yml
@@ -0,0 +1,10 @@
+id: other_template
+label: Template with a different tag
+migration_tags:
+  - Different Template Test
+source:
+  plugin: empty
+process:
+  src: raboof
+destination:
+  plugin: entity:user
diff --git a/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.url_template.yml b/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.url_template.yml
new file mode 100644
index 0000000..fd82119
--- /dev/null
+++ b/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.url_template.yml
@@ -0,0 +1,10 @@
+id: url_template
+label: Template test - url
+migration_tags:
+  - Template Test
+source:
+  plugin: empty
+process:
+  src: foobar
+destination:
+  plugin: url_alias
diff --git a/core/modules/migrate/tests/modules/template_test/template_test.info.yml b/core/modules/migrate/tests/modules/template_test/template_test.info.yml
new file mode 100644
index 0000000..d396c63
--- /dev/null
+++ b/core/modules/migrate/tests/modules/template_test/template_test.info.yml
@@ -0,0 +1,5 @@
+name: 'Migration template test'
+type: module
+package: Testing
+version: VERSION
+core: 8.x
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_action_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_action_settings.yml
similarity index 81%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_action_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_action_settings.yml
index 1a518fb..a1b6265 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_action_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_action_settings.yml
@@ -11,7 +11,3 @@ process:
 destination:
   plugin: config
   config_name: action.settings
-dependencies:
-  module:
-    - action
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_feed.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_aggregator_feed.yml
similarity index 84%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_feed.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_aggregator_feed.yml
index 2daaa8a..e94ae9e 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_feed.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_aggregator_feed.yml
@@ -4,7 +4,6 @@ migration_tags:
   - Drupal 6
 source:
   plugin: d6_aggregator_feed
-
 process:
   fid: fid
   title: title
@@ -16,10 +15,5 @@ process:
   image: image
   etag: etag
   modified: modified
-
 destination:
   plugin: entity:aggregator_feed
-dependencies:
-  module:
-    - aggregator
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_item.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_aggregator_item.yml
similarity index 79%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_item.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_aggregator_item.yml
index aa80302..615c550 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_item.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_aggregator_item.yml
@@ -22,9 +22,3 @@ destination:
 migration_dependencies:
   required:
     - d6_aggregator_feed
-dependencies:
-  config:
-    - migrate.migration.d6_aggregator_feed
-  module:
-    - aggregator
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_aggregator_settings.yml
similarity index 91%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_aggregator_settings.yml
index 9720f6e..5b8e605 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_aggregator_settings.yml
@@ -23,7 +23,3 @@ process:
 destination:
   plugin: config
   config_name: aggregator.settings
-dependencies:
-  module:
-    - aggregator
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_block.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_block.yml
similarity index 91%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_block.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_block.yml
index 1d83119..5f91c16 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_block.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_block.yml
@@ -92,11 +92,3 @@ migration_dependencies:
     - d6_menu
     - d6_custom_block
     - d6_user_role
-dependencies:
-  config:
-    - migrate.migration.d6_custom_block
-    - migrate.migration.d6_menu
-    - migrate.migration.d6_user_role
-  module:
-    - block
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_block_content_body_field.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_block_content_body_field.yml
similarity index 83%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_block_content_body_field.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_block_content_body_field.yml
index 08935ee..e8164e1 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_block_content_body_field.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_block_content_body_field.yml
@@ -23,10 +23,3 @@ destination:
 migration_dependencies:
   required:
     - d6_block_content_type
-dependencies:
-  config:
-    - migrate.migration.d6_block_content_type
-  module:
-    - block_content
-    - field
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_block_content_type.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_block_content_type.yml
similarity index 84%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_block_content_type.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_block_content_type.yml
index f055a61..8dcea2f 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_block_content_type.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_block_content_type.yml
@@ -14,7 +14,3 @@ process:
   label: 'constants/label'
 destination:
   plugin: entity:block_content_type
-dependencies:
-  module:
-    - block_content
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_book.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_book.yml
similarity index 77%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_book.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_book.yml
index c8007e0..683f56a 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_book.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_book.yml
@@ -21,10 +21,3 @@ destination:
 migration_dependencies:
   required:
     - d6_node
-dependencies:
-  config:
-    - migrate.migration.d6_node
-  module:
-    - book
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_book_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_book_settings.yml
similarity index 86%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_book_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_book_settings.yml
index 35302d0..e885d37 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_book_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_book_settings.yml
@@ -15,7 +15,3 @@ process:
 destination:
   plugin: config
   config_name: book.settings
-dependencies:
-  module:
-    - book
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_cck_field_revision.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_cck_field_revision.yml
similarity index 69%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_cck_field_revision.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_cck_field_revision.yml
index b3203f9..fa15989 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_cck_field_revision.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_cck_field_revision.yml
@@ -15,10 +15,3 @@ migration_dependencies:
   required:
     - d6_cck_field_values
     - d6_node_revision
-dependencies:
-  config:
-    - migrate.migration.d6_cck_field_values
-    - migrate.migration.d6_node_revision
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_cck_field_values.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_cck_field_values.yml
similarity index 66%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_cck_field_values.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_cck_field_values.yml
index 0457ecf..27027ba 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_cck_field_values.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_cck_field_values.yml
@@ -19,11 +19,3 @@ migration_dependencies:
     - d6_node
     - d6_field_formatter_settings
     - d6_field_instance_widget_settings
-dependencies:
-  config:
-    - migrate.migration.d6_field_formatter_settings
-    - migrate.migration.d6_field_instance_widget_settings
-    - migrate.migration.d6_node
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment.yml
similarity index 75%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment.yml
index 94fb020..1a41ec7 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment.yml
@@ -43,15 +43,3 @@ migration_dependencies:
     - d6_comment_entity_display
     - d6_comment_entity_form_display
     - d6_filter_format
-dependencies:
-  config:
-    - migrate.migration.d6_comment_entity_display
-    - migrate.migration.d6_comment_entity_form_display
-    - migrate.migration.d6_comment_type
-    - migrate.migration.d6_filter_format
-    - migrate.migration.d6_node
-    - migrate.migration.d6_user
-  module:
-    - comment
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_display.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_entity_display.yml
similarity index 83%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_display.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_entity_display.yml
index 99e373b..e06c08f 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_entity_display.yml
@@ -24,9 +24,3 @@ destination:
 migration_dependencies:
   required:
     - d6_comment_field_instance
-dependencies:
-  config:
-    - migrate.migration.d6_comment_field_instance
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_form_display.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_entity_form_display.yml
similarity index 83%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_form_display.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_entity_form_display.yml
index 059517f..a05a11b 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_form_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_entity_form_display.yml
@@ -23,9 +23,3 @@ destination:
 migration_dependencies:
   required:
     - d6_comment_field_instance
-dependencies:
-  config:
-    - migrate.migration.d6_comment_field_instance
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_form_display_subject.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_entity_form_display_subject.yml
similarity index 87%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_form_display_subject.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_entity_form_display_subject.yml
index 8a36272..a7e3e6b 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_form_display_subject.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_entity_form_display_subject.yml
@@ -30,9 +30,3 @@ destination:
 migration_dependencies:
   required:
     - d6_comment_type
-dependencies:
-  config:
-    - migrate.migration.d6_comment_type
-  module:
-    - comment
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_field.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_field.yml
similarity index 77%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_field.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_field.yml
index ab22f23..aca8783 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_field.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_field.yml
@@ -17,11 +17,3 @@ destination:
 migration_dependencies:
   required:
     - d6_comment_type
-dependencies:
-  config:
-    - migrate.migration.d6_comment_type
-  module:
-    - comment
-    - field
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_field_instance.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_field_instance.yml
similarity index 84%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_field_instance.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_field_instance.yml
index 669ea94..f00b527 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_field_instance.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_field_instance.yml
@@ -32,11 +32,3 @@ migration_dependencies:
   required:
     - d6_comment_field
     - d6_node_type
-dependencies:
-  config:
-    - migrate.migration.d6_comment_field
-    - migrate.migration.d6_node_type
-  module:
-    - field
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_type.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_type.yml
similarity index 82%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_type.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_type.yml
index 35dfde0..54ffec1 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_type.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_type.yml
@@ -13,8 +13,3 @@ process:
   description: description
 destination:
   plugin: entity:comment_type
-dependencies:
-  module:
-    - comment
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_contact_category.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_contact_category.yml
similarity index 87%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_contact_category.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_contact_category.yml
index cab9f3b..d50e4fe 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_contact_category.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_contact_category.yml
@@ -20,7 +20,3 @@ process:
   weight: weight
 destination:
   plugin: entity:contact_form
-dependencies:
-  module:
-    - contact
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_contact_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_contact_settings.yml
similarity index 82%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_contact_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_contact_settings.yml
index d0e4a3d..e0897fe 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_contact_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_contact_settings.yml
@@ -20,9 +20,3 @@ destination:
 migration_dependencies:
   required:
     - d6_contact_category
-dependencies:
-  config:
-    - migrate.migration.d6_contact_category
-  module:
-    - contact
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_custom_block.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_custom_block.yml
similarity index 72%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_custom_block.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_custom_block.yml
index be6cebf..0564f89 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_custom_block.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_custom_block.yml
@@ -22,10 +22,3 @@ migration_dependencies:
   required:
     - d6_filter_format
     - d6_block_content_body_field
-dependencies:
-  config:
-    - migrate.migration.d6_block_content_body_field
-    - migrate.migration.d6_filter_format
-  module:
-    - block_content
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_date_formats.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_date_formats.yml
similarity index 90%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_date_formats.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_date_formats.yml
index 44448e6..c7f3422 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_date_formats.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_date_formats.yml
@@ -19,6 +19,3 @@ process:
   pattern: value
 destination:
   plugin: entity:date_format
-dependencies:
-  module:
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_dblog_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_dblog_settings.yml
similarity index 81%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_dblog_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_dblog_settings.yml
index fb387f5..6c94b1e 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_dblog_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_dblog_settings.yml
@@ -11,7 +11,3 @@ process:
 destination:
   plugin: config
   config_name: dblog.settings
-dependencies:
-  module:
-    - dblog
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_field.yml
similarity index 98%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_field.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_field.yml
index 191c538..9ff9e24 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_field.yml
@@ -131,8 +131,3 @@ process:
 
 destination:
   plugin: md_entity:field_storage_config
-dependencies:
-  module:
-    - field
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_formatter_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_field_formatter_settings.yml
similarity index 97%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_formatter_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_field_formatter_settings.yml
index 883e811..880d77f 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_formatter_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_field_formatter_settings.yml
@@ -261,10 +261,3 @@ migration_dependencies:
   required:
     - d6_field_instance
     - d6_view_modes
-dependencies:
-  config:
-    - migrate.migration.d6_field_instance
-    - migrate.migration.d6_view_modes
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_instance.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_field_instance.yml
similarity index 87%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_instance.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_field_instance.yml
index 5710433..f876dfd 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_instance.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_field_instance.yml
@@ -50,11 +50,3 @@ migration_dependencies:
   required:
     - d6_node_type
     - d6_field
-dependencies:
-  config:
-    - migrate.migration.d6_field
-    - migrate.migration.d6_node_type
-  module:
-    - field
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_instance_widget_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_field_instance_widget_settings.yml
similarity index 93%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_instance_widget_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_field_instance_widget_settings.yml
index a343abe..d67a14b 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_instance_widget_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_field_instance_widget_settings.yml
@@ -60,9 +60,3 @@ destination:
 migration_dependencies:
   required:
     - d6_field_instance
-dependencies:
-  config:
-    - migrate.migration.d6_field_instance
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_file.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_file.yml
similarity index 90%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_file.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_file.yml
index 508d0bb..e8ead68 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_file.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_file.yml
@@ -23,7 +23,3 @@ process:
   uid: uid
 destination:
   plugin: entity:file
-dependencies:
-  module:
-    - file
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_file_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_file_settings.yml
similarity index 87%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_file_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_file_settings.yml
index f2ca170..f08d92e 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_file_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_file_settings.yml
@@ -15,7 +15,3 @@ process:
 destination:
   plugin: config
   config_name: file.settings
-dependencies:
-  module:
-    - file
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_filter_format.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_filter_format.yml
similarity index 93%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_filter_format.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_filter_format.yml
index 9efaf7a..16982d3 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_filter_format.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_filter_format.yml
@@ -43,7 +43,3 @@ process:
 destination:
   plugin: entity:filter_format
   no_stub: true
-dependencies:
-  module:
-    - filter
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_forum_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_forum_settings.yml
similarity index 85%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_forum_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_forum_settings.yml
index 72e4814..2df6496 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_forum_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_forum_settings.yml
@@ -27,9 +27,3 @@ destination:
 migration_dependencies:
   required:
     - d6_taxonomy_vocabulary
-dependencies:
-  config:
-    - migrate.migration.d6_taxonomy_vocabulary
-  module:
-    - forum
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_locale_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_locale_settings.yml
similarity index 85%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_locale_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_locale_settings.yml
index a38bd92..e9440cc 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_locale_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_locale_settings.yml
@@ -13,7 +13,3 @@ process:
 destination:
   plugin: config
   config_name: locale.settings
-dependencies:
-  module:
-    - locale
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_menu.yml
similarity index 76%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_menu.yml
index 4def0bf..0d353c2 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_menu.yml
@@ -10,7 +10,3 @@ process:
   description: description
 destination:
   plugin: entity:menu
-dependencies:
-  module:
-    - migrate_drupal
-    - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu_links.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_menu_links.yml
similarity index 88%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu_links.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_menu_links.yml
index c98a3a7..6753160 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu_links.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_menu_links.yml
@@ -45,9 +45,3 @@ destination:
 migration_dependencies:
   required:
     - d6_menu
-dependencies:
-  config:
-    - migrate.migration.d6_menu
-  module:
-    - menu_link_content
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_menu_settings.yml
similarity index 88%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_menu_settings.yml
index 8ec039d..9f332fb 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_menu_settings.yml
@@ -15,7 +15,3 @@ process:
 destination:
   plugin: config
   config_name: menu_ui.settings
-dependencies:
-  module:
-    - menu_ui
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node.yml
similarity index 85%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_node.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node.yml
index 4092a25..947a3cf 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node.yml
@@ -53,12 +53,3 @@ migration_dependencies:
   optional:
     - d6_field_instance_widget_settings
     - d6_field_formatter_settings
-dependencies:
-  config:
-    - migrate.migration.d6_filter_format
-    - migrate.migration.d6_node_settings
-    - migrate.migration.d6_node_type
-    - migrate.migration.d6_user
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_revision.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_revision.yml
similarity index 88%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_revision.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_revision.yml
index 42118b3..0b1a478 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_revision.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_revision.yml
@@ -40,9 +40,3 @@ destination:
 migration_dependencies:
   required:
     - d6_node
-dependencies:
-  config:
-    - migrate.migration.d6_node
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_promote.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_setting_promote.yml
similarity index 81%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_promote.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_setting_promote.yml
index c7f6d24..8f6da35 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_promote.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_setting_promote.yml
@@ -17,9 +17,3 @@ destination:
 migration_dependencies:
   required:
     - d6_node_type
-dependencies:
-  config:
-    - migrate.migration.d6_node_type
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_status.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_setting_status.yml
similarity index 80%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_status.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_setting_status.yml
index ec7afd6..5d3e412 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_status.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_setting_status.yml
@@ -17,9 +17,3 @@ destination:
 migration_dependencies:
   required:
     - d6_node_type
-dependencies:
-  config:
-    - migrate.migration.d6_node_type
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_sticky.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_setting_sticky.yml
similarity index 80%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_sticky.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_setting_sticky.yml
index 4f1b613..8a8f7b7 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_sticky.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_setting_sticky.yml
@@ -17,9 +17,3 @@ destination:
 migration_dependencies:
   required:
     - d6_node_type
-dependencies:
-  config:
-    - migrate.migration.d6_node_type
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_settings.yml
similarity index 81%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_settings.yml
index 336383a..3e12dd6 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_settings.yml
@@ -11,7 +11,3 @@ process:
 destination:
   plugin: config
   config_name: node.settings
-dependencies:
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_type.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_type.yml
similarity index 90%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_type.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_type.yml
index 7bd24ac..009c3a0 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_type.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_type.yml
@@ -22,7 +22,3 @@ process:
   create_body_label: body_label
 destination:
   plugin: entity:node_type
-dependencies:
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_profile_values.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_profile_values.yml
similarity index 58%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_profile_values.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_profile_values.yml
index 047de4d..d2b81a5 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_profile_values.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_profile_values.yml
@@ -16,12 +16,3 @@ migration_dependencies:
     - d6_user_profile_field_instance
     - d6_user_profile_entity_display
     - d6_user_profile_entity_form_display
-dependencies:
-  config:
-    - migrate.migration.d6_user
-    - migrate.migration.d6_user_profile_entity_display
-    - migrate.migration.d6_user_profile_entity_form_display
-    - migrate.migration.d6_user_profile_field_instance
-  module:
-    - migrate_drupal
-    - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_search_page.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_search_page.yml
similarity index 90%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_search_page.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_search_page.yml
index 6c05d1f..d12aca6 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_search_page.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_search_page.yml
@@ -23,7 +23,3 @@ process:
     plugin: d6_search_configuration_rankings
 destination:
   plugin: entity:search_page
-dependencies:
-  module:
-    - migrate_drupal
-    - search
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_search_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_search_settings.yml
similarity index 89%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_search_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_search_settings.yml
index 8e832e4..36f5447 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_search_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_search_settings.yml
@@ -20,7 +20,3 @@ process:
 destination:
   plugin: config
   config_name: search.settings
-dependencies:
-  module:
-    - migrate_drupal
-    - search
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_simpletest_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_simpletest_settings.yml
similarity index 90%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_simpletest_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_simpletest_settings.yml
index 0791f11..d616a59 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_simpletest_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_simpletest_settings.yml
@@ -19,7 +19,3 @@ process:
 destination:
   plugin: config
   config_name: simpletest.settings
-dependencies:
-  module:
-    - migrate_drupal
-    - simpletest
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_statistics_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_statistics_settings.yml
similarity index 88%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_statistics_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_statistics_settings.yml
index b223e36..a8820db 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_statistics_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_statistics_settings.yml
@@ -15,7 +15,3 @@ process:
 destination:
   plugin: config
   config_name: statistics.settings
-dependencies:
-  module:
-    - migrate_drupal
-    - statistics
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_syslog_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_syslog_settings.yml
similarity index 83%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_syslog_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_syslog_settings.yml
index e962856..4c9fd49 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_syslog_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_syslog_settings.yml
@@ -13,7 +13,3 @@ process:
 destination:
   plugin: config
   config_name: syslog.settings
-dependencies:
-  module:
-    - migrate_drupal
-    - syslog
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_cron.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_cron.yml
similarity index 86%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_cron.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_cron.yml
index 47be135..01970a9 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_cron.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_cron.yml
@@ -14,7 +14,3 @@ process:
 destination:
   plugin: config
   config_name: system.cron
-dependencies:
-  module:
-    - migrate_drupal
-    - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_file.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_file.yml
similarity index 87%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_file.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_file.yml
index 925b5a9..1405ff5 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_file.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_file.yml
@@ -18,7 +18,3 @@ process:
 destination:
   plugin: config
   config_name: system.file
-dependencies:
-  module:
-    - migrate_drupal
-    - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_filter.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_filter.yml
similarity index 81%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_filter.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_filter.yml
index 8e36db7..739268d 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_filter.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_filter.yml
@@ -11,7 +11,3 @@ process:
 destination:
   plugin: config
   config_name: system.filter
-dependencies:
-  module:
-    - migrate_drupal
-    - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_image.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_image.yml
similarity index 80%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_image.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_image.yml
index 9581291..f19d516 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_image.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_image.yml
@@ -11,7 +11,3 @@ process:
 destination:
   plugin: config
   config_name: system.image
-dependencies:
-  module:
-    - migrate_drupal
-    - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_image_gd.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_image_gd.yml
similarity index 82%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_image_gd.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_image_gd.yml
index 583ca5b..52b9052 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_image_gd.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_image_gd.yml
@@ -11,7 +11,3 @@ process:
 destination:
   plugin: config
   config_name: system.image.gd
-dependencies:
-  module:
-    - migrate_drupal
-    - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_logging.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_logging.yml
similarity index 86%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_logging.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_logging.yml
index b75bc7e..bca03ec 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_logging.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_logging.yml
@@ -19,7 +19,3 @@ process:
 destination:
   plugin: config
   config_name: system.logging
-dependencies:
-  module:
-    - migrate_drupal
-    - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_maintenance.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_maintenance.yml
similarity index 82%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_maintenance.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_maintenance.yml
index 0d93cd1..b902551 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_maintenance.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_maintenance.yml
@@ -11,7 +11,3 @@ process:
 destination:
   plugin: config
   config_name: system.maintenance
-dependencies:
-  module:
-    - migrate_drupal
-    - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_performance.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_performance.yml
similarity index 88%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_performance.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_performance.yml
index a10edfd..edff811 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_performance.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_performance.yml
@@ -18,7 +18,3 @@ process:
 destination:
   plugin: config
   config_name: system.performance
-dependencies:
-  module:
-    - migrate_drupal
-    - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_rss.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_rss.yml
similarity index 84%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_rss.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_rss.yml
index 7f5d3d4..7d5fd14 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_rss.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_rss.yml
@@ -13,7 +13,3 @@ process:
 destination:
   plugin: config
   config_name: system.rss
-dependencies:
-  module:
-    - migrate_drupal
-    - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_site.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_site.yml
similarity index 93%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_site.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_site.yml
index 78bb7ab..04b99ce 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_site.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_site.yml
@@ -39,7 +39,3 @@ process:
 destination:
   plugin: config
   config_name: system.site
-dependencies:
-  module:
-    - migrate_drupal
-    - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_taxonomy_settings.yml
similarity index 86%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_taxonomy_settings.yml
index 094e9d7..3fe9e1f 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_taxonomy_settings.yml
@@ -13,7 +13,3 @@ process:
 destination:
   plugin: config
   config_name: taxonomy.settings
-dependencies:
-  module:
-    - migrate_drupal
-    - taxonomy
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_term.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_taxonomy_term.yml
similarity index 82%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_term.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_taxonomy_term.yml
index c70d3c8..546f95f 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_term.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_taxonomy_term.yml
@@ -27,9 +27,3 @@ destination:
 migration_dependencies:
   required:
     - d6_taxonomy_vocabulary
-dependencies:
-  config:
-    - migrate.migration.d6_taxonomy_vocabulary
-  module:
-    - migrate_drupal
-    - taxonomy
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_vocabulary.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_taxonomy_vocabulary.yml
similarity index 88%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_vocabulary.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_taxonomy_vocabulary.yml
index 1a9cb9c..414d2cb 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_vocabulary.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_taxonomy_vocabulary.yml
@@ -21,7 +21,3 @@ process:
   weight: weight
 destination:
   plugin: entity:taxonomy_vocabulary
-dependencies:
-  module:
-    - migrate_drupal
-    - taxonomy
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_term_node.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_term_node.yml
similarity index 66%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_term_node.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_term_node.yml
index 6d0befe..4eaf935 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_term_node.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_term_node.yml
@@ -20,11 +20,3 @@ migration_dependencies:
     - d6_vocabulary_entity_display
     - d6_vocabulary_entity_form_display
     - d6_node
-dependencies:
-  config:
-    - migrate.migration.d6_node
-    - migrate.migration.d6_vocabulary_entity_display
-    - migrate.migration.d6_vocabulary_entity_form_display
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_term_node_revision.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_term_node_revision.yml
similarity index 75%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_term_node_revision.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_term_node_revision.yml
index 9193738..319d000 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_term_node_revision.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_term_node_revision.yml
@@ -20,10 +20,3 @@ migration_dependencies:
   required:
     - d6_term_node
     - d6_node_revision
-dependencies:
-  config:
-    - migrate.migration.d6_node_revision
-    - migrate.migration.d6_term_node
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_text_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_text_settings.yml
similarity index 82%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_text_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_text_settings.yml
index 56d3303..8f6fff3 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_text_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_text_settings.yml
@@ -11,7 +11,3 @@ process:
 destination:
   plugin: config
   config_name: text.settings
-dependencies:
-  module:
-    - migrate_drupal
-    - text
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_update_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_update_settings.yml
similarity index 90%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_update_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_update_settings.yml
index 8a61e51..4e87350 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_update_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_update_settings.yml
@@ -19,7 +19,3 @@ process:
 destination:
   plugin: config
   config_name: update.settings
-dependencies:
-  module:
-    - migrate_drupal
-    - update
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload.yml
similarity index 77%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload.yml
index fedda76..2d04241 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload.yml
@@ -25,10 +25,3 @@ migration_dependencies:
   required:
     - d6_file
     - d6_node
-dependencies:
-  config:
-    - migrate.migration.d6_file
-    - migrate.migration.d6_node
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_entity_display.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload_entity_display.yml
similarity index 84%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_entity_display.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload_entity_display.yml
index 8daf13f..28e154b 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_entity_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload_entity_display.yml
@@ -25,9 +25,3 @@ destination:
 migration_dependencies:
   required:
     - d6_upload_field_instance
-dependencies:
-  config:
-    - migrate.migration.d6_upload_field_instance
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_entity_form_display.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload_entity_form_display.yml
similarity index 85%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_entity_form_display.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload_entity_form_display.yml
index f248d1d..7725659 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_entity_form_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload_entity_form_display.yml
@@ -26,9 +26,3 @@ destination:
 migration_dependencies:
   required:
     - d6_upload_field_instance
-dependencies:
-  config:
-    - migrate.migration.d6_upload_field_instance
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_field.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload_field.yml
similarity index 88%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_field.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload_field.yml
index 15df33a..e92b801 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_field.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload_field.yml
@@ -21,9 +21,3 @@ process:
   'settings/display_field': 'constants/display_field'
 destination:
   plugin: md_entity:field_storage_config
-dependencies:
-  module:
-    - field
-    - file
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_field_instance.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload_field_instance.yml
similarity index 78%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_field_instance.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload_field_instance.yml
index 7013512..4410ec0 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_field_instance.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload_field_instance.yml
@@ -22,11 +22,3 @@ migration_dependencies:
   required:
     - d6_upload_field
     - d6_node_type
-dependencies:
-  config:
-    - migrate.migration.d6_node_type
-    - migrate.migration.d6_upload_field
-  module:
-    - field
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_url_alias.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_url_alias.yml
similarity index 88%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_url_alias.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_url_alias.yml
index 454ded8..7fcbaec 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_url_alias.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_url_alias.yml
@@ -19,9 +19,5 @@ process:
       - constants/slash
       - dst
   langcode: language
-
 destination:
   plugin: url_alias
-dependencies:
-  module:
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user.yml
similarity index 87%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user.yml
index b55e2ec..05ff4a0 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user.yml
@@ -35,9 +35,3 @@ migration_dependencies:
     - d6_user_picture_file
     - d6_user_picture_entity_display
     - d6_user_picture_entity_form_display
-dependencies:
-  config:
-    - migrate.migration.d6_user_role
-  module:
-    - migrate_drupal
-    - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_contact_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_contact_settings.yml
similarity index 80%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_contact_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_contact_settings.yml
index 7da9e52..0429155 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_contact_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_contact_settings.yml
@@ -21,9 +21,3 @@ destination:
 migration_dependencies:
   required:
     - d6_user
-dependencies:
-  config:
-    - migrate.migration.d6_user
-  module:
-    - contact
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_mail.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_mail.yml
similarity index 96%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_mail.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_mail.yml
index 15ea0d4..bc3badf 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_mail.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_mail.yml
@@ -37,7 +37,3 @@ process:
 destination:
   plugin: config
   config_name: user.mail
-dependencies:
-  module:
-    - migrate_drupal
-    - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_entity_display.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_entity_display.yml
similarity index 85%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_entity_display.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_entity_display.yml
index dd6be79..f38bc36 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_entity_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_entity_display.yml
@@ -28,9 +28,3 @@ destination:
 migration_dependencies:
   required:
     - d6_user_picture_field_instance
-dependencies:
-  config:
-    - migrate.migration.d6_user_picture_field_instance
-  module:
-    - migrate_drupal
-    - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_entity_form_display.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_entity_form_display.yml
similarity index 85%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_entity_form_display.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_entity_form_display.yml
index 9d2182b..4e42228 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_entity_form_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_entity_form_display.yml
@@ -27,9 +27,3 @@ destination:
 migration_dependencies:
   required:
     - d6_user_picture_field_instance
-dependencies:
-  config:
-    - migrate.migration.d6_user_picture_field_instance
-  module:
-    - migrate_drupal
-    - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_field.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_field.yml
similarity index 86%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_field.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_field.yml
index eefb62d..27a39a2 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_field.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_field.yml
@@ -18,9 +18,3 @@ process:
   cardinality: 'constants/cardinality'
 destination:
   plugin: md_entity:field_storage_config
-dependencies:
-  module:
-    - field
-    - image
-    - migrate_drupal
-    - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_field_instance.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_field_instance.yml
similarity index 86%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_field_instance.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_field_instance.yml
index 14dfc0e..7dc83b1 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_field_instance.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_field_instance.yml
@@ -28,10 +28,3 @@ destination:
 migration_dependencies:
   required:
     - d6_user_picture_field
-dependencies:
-  config:
-    - migrate.migration.d6_user_picture_field
-  module:
-    - field
-    - migrate_drupal
-    - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_file.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_file.yml
similarity index 91%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_file.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_file.yml
index 9be0121..0bc5a0b 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_file.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_file.yml
@@ -24,7 +24,3 @@ migration_dependencies:
   # migration as an optional dependency to ensure it runs first.
   optional:
     - d6_file
-dependencies:
-  module:
-    - file
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_entity_display.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_profile_entity_display.yml
similarity index 94%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_entity_display.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_profile_entity_display.yml
index 7da0e7a..3e7b467 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_entity_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_profile_entity_display.yml
@@ -38,7 +38,3 @@ process:
       4: true # PROFILE_HIDDEN
 destination:
   plugin: component_entity_display
-dependencies:
-  module:
-    - migrate_drupal
-    - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_entity_form_display.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_profile_entity_form_display.yml
similarity index 95%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_entity_form_display.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_profile_entity_form_display.yml
index 18fab1b..d1cde0b 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_entity_form_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_profile_entity_form_display.yml
@@ -47,7 +47,3 @@ process:
       4: true # PROFILE_HIDDEN
 destination:
   plugin: component_entity_form_display
-dependencies:
-  module:
-    - migrate_drupal
-    - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_field.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_profile_field.yml
similarity index 91%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_field.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_profile_field.yml
index 1f84573..9917673 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_field.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_profile_field.yml
@@ -32,8 +32,3 @@ process:
       list: -1
 destination:
   plugin: md_entity:field_storage_config
-dependencies:
-  module:
-    - field
-    - migrate_drupal
-    - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_field_instance.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_profile_field_instance.yml
similarity index 79%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_field_instance.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_profile_field_instance.yml
index 30c5938..ec0e526 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_field_instance.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_profile_field_instance.yml
@@ -19,10 +19,3 @@ destination:
 migration_dependencies:
   required:
     - d6_user_profile_field
-dependencies:
-  config:
-    - migrate.migration.d6_user_profile_field
-  module:
-    - field
-    - migrate_drupal
-    - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_role.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_role.yml
similarity index 92%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_role.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_role.yml
index 46edcc8..e15058b 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_role.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_role.yml
@@ -44,9 +44,3 @@ destination:
 migration_dependencies:
   required:
     - d6_filter_format
-dependencies:
-  config:
-    - migrate.migration.d6_filter_format
-  module:
-    - migrate_drupal
-    - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_settings.yml
similarity index 92%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_settings.yml
index 09e2eb7..5984d51 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_settings.yml
@@ -26,7 +26,3 @@ process:
 destination:
   plugin: config
   config_name: user.settings
-dependencies:
-  module:
-    - migrate_drupal
-    - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_view_modes.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_view_modes.yml
similarity index 92%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_view_modes.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_view_modes.yml
index f8bf6fd..e2e0c8f 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_view_modes.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_view_modes.yml
@@ -35,10 +35,5 @@ process:
       full: "Full"
   targetEntityType: 'constants/targetEntityType'
   status: 'constants/status'
-
 destination:
   plugin: entity:entity_view_mode
-dependencies:
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_entity_display.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_vocabulary_entity_display.yml
similarity index 84%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_entity_display.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_vocabulary_entity_display.yml
index 5c0c9c2..9295acd 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_entity_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_vocabulary_entity_display.yml
@@ -26,9 +26,3 @@ destination:
 migration_dependencies:
   required:
     - d6_vocabulary_field_instance
-dependencies:
-  config:
-    - migrate.migration.d6_vocabulary_field_instance
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_entity_form_display.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_vocabulary_entity_form_display.yml
similarity index 84%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_entity_form_display.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_vocabulary_entity_form_display.yml
index 91b540a..3dbc95b 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_entity_form_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_vocabulary_entity_form_display.yml
@@ -24,9 +24,3 @@ destination:
 migration_dependencies:
   required:
     - d6_vocabulary_field_instance
-dependencies:
-  config:
-    - migrate.migration.d6_vocabulary_field_instance
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_field.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_vocabulary_field.yml
similarity index 81%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_field.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_vocabulary_field.yml
index e11864f..c2c8cf8 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_field.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_vocabulary_field.yml
@@ -23,11 +23,3 @@ destination:
 migration_dependencies:
   required:
     - d6_taxonomy_vocabulary
-dependencies:
-  config:
-    - migrate.migration.d6_taxonomy_vocabulary
-  module:
-    - entity_reference
-    - field
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_field_instance.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_vocabulary_field_instance.yml
similarity index 85%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_field_instance.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_vocabulary_field_instance.yml
index 166155f..3d7ff35 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_field_instance.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_vocabulary_field_instance.yml
@@ -23,10 +23,3 @@ destination:
 migration_dependencies:
   required:
     - d6_vocabulary_field
-dependencies:
-  config:
-    - migrate.migration.d6_vocabulary_field
-  module:
-    - field
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php b/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php
index b8a436f..673514c 100644
--- a/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php
+++ b/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php
@@ -8,6 +8,8 @@
 namespace Drupal\migrate_drupal\Tests;
 
 use Drupal\migrate\Tests\MigrateTestBase;
+use Drupal\migrate\Entity\Migration;
+use Drupal\Component\Plugin\Exception\PluginNotFoundException;
 
 /**
  * Base class for Drupal migration tests.
@@ -42,4 +44,26 @@ protected function getDumpDirectory() {
     return __DIR__ . '/Table';
   }
 
+  /**
+   * Turn all the migration templates for the specified drupal version into
+   * real migration entities so we can test them.
+   *
+   * @param string $version
+   *  Drupal version as provided in migration_tags - e.g., 'Drupal 6'.
+   */
+  protected function installMigrations($version) {
+    $migration_templates = \Drupal::service('migrate.template_storage')->findTemplatesByTag($version);
+    foreach ($migration_templates as $template) {
+      try {
+        $migration = Migration::create($template);
+        $migration->save();
+      }
+      catch (PluginNotFoundException $e) {
+        // Migrations requiring modules not enabled will throw an exception.
+        // Ignoring this exception is equivalent to placing config in the
+        // optional subdirectory - the migrations we require for the test will
+        // be successfully saved.
+      }
+    }
+  }
 }
diff --git a/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php b/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php
index 6b01174..f1b9f31 100644
--- a/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php
+++ b/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php
@@ -8,9 +8,6 @@
 namespace Drupal\migrate_drupal\Tests;
 
 use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Core\Config\ExtensionInstallStorage;
-use Drupal\Core\Config\InstallStorage;
-use Drupal\Core\Config\StorageInterface;
 use Drupal\migrate\MigrateExecutable;
 use Drupal\simpletest\TestBase;
 
@@ -58,7 +55,6 @@ public function testDrupal() {
     $this->loadDumps($dumps);
 
     $classes = $this->getTestClassesList();
-    $extension_install_storage = new ExtensionInstallStorage(\Drupal::service('config.storage'), InstallStorage::CONFIG_OPTIONAL_DIRECTORY, StorageInterface::DEFAULT_COLLECTION, TRUE);
     foreach ($classes as $class) {
       if (is_subclass_of($class, '\Drupal\migrate\Tests\MigrateDumpAlterInterface')) {
         $class::migrateDumpAlter($this);
@@ -68,16 +64,6 @@ public function testDrupal() {
     // Run every migration in the order specified by the storage controller.
     foreach (entity_load_multiple('migration', static::$migrations) as $migration) {
       (new MigrateExecutable($migration, $this))->import();
-
-      // Ensure that the default migration has the correct dependencies.
-      list($base_name, ) = explode(':', $migration->id(), 2);
-      $default_configuration = $extension_install_storage->read('migrate.migration.' . $base_name);
-      $default_dependencies = isset($default_configuration['dependencies']) ? $default_configuration['dependencies'] : [];
-      $this->assertEqual($default_dependencies, $migration->getDependencies(), SafeMarkup::format('Dependencies in @id match after installing. Default configuration @first is equal to active configuration @second.', array(
-        '@id' => $migration->id(),
-        '@first' => var_export($default_dependencies, TRUE),
-        '@second' => var_export($migration->getDependencies(), TRUE)
-      )));
     }
     foreach ($classes as $class) {
       $test_object = new $class($this->testId);
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
index 697ab2c..b277e3b 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
@@ -198,6 +198,8 @@ protected function setUp() {
       'name' => $this->randomMachineName(),
       'status' => 1,
     ])->enforceIsNew(TRUE)->save();
+
+    $this->installMigrations('Drupal 6');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php
index e508718..cad03da 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php
@@ -15,6 +15,14 @@
 abstract class MigrateDrupal6TestBase extends MigrateDrupalTestBase {
 
   /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installMigrations('Drupal 6');
+  }
+
+  /**
      * {@inheritdoc}
      */
   protected function getDumpDirectory() {