diff --git a/core/modules/migrate/src/Entity/Migration.php b/core/modules/migrate/src/Entity/Migration.php
index e3f920c..1a7e573 100644
--- a/core/modules/migrate/src/Entity/Migration.php
+++ b/core/modules/migrate/src/Entity/Migration.php
@@ -15,6 +15,8 @@
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
 use Drupal\migrate\Plugin\RequirementsInterface;
 use Drupal\Component\Utility\NestedArray;
+use Drupal\migrate\ExtensionInstallStorage;
+use Drupal\Core\Config\StorageInterface;
 
 /**
  * Defines the Migration entity.
@@ -534,4 +536,29 @@ public function calculateDependencies() {
 
     return $this->dependencies;
   }
+
+  /**
+   * 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 static function templateQuery($tag) {
+    $extension_install_storage = new ExtensionInstallStorage(\Drupal::service('config.storage'), ExtensionInstallStorage::MIGRATION_TEMPLATE_DIRECTORY, StorageInterface::DEFAULT_COLLECTION, TRUE);
+    $templates = $extension_install_storage->getAllTemplates();
+    $matched_templates = [];
+    foreach ($templates as $template_name => $template) {
+      if (!empty($template['migration_tags'])) {
+        if (in_array($tag, $template['migration_tags'])) {
+          $template['template_name'] = $template_name;
+          $matched_templates[$template_name] = $template;
+        }
+      }
+    }
+    return $matched_templates;
+  }
+
 }
diff --git a/core/modules/migrate/src/ExtensionInstallStorage.php b/core/modules/migrate/src/ExtensionInstallStorage.php
new file mode 100644
index 0000000..6718944
--- /dev/null
+++ b/core/modules/migrate/src/ExtensionInstallStorage.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate\ExtensionInstallStorage.
+ */
+
+namespace Drupal\migrate;
+
+use Drupal\Component\Discovery\YamlDiscovery;
+use Drupal\Core\Config\ExtensionInstallStorage as BaseExtensionInstallStorage;
+use Drupal\Core\Config\StorageInterface;
+
+/**
+ * Storage to access migration template configuration in enabled extensions.
+ *
+ * @see \Drupal\Core\Config\ConfigInstaller
+ * @see \Drupal\Core\Config\TypedConfigManager
+ */
+class ExtensionInstallStorage extends BaseExtensionInstallStorage {
+
+  /**
+   * 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);
+  }
+
+  /**
+   * 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) {
+      $first_dot = strpos($full_name, '.');
+      $provider = substr($full_name, 0, $first_dot);
+      $name = substr($full_name, $first_dot + 1);
+      // 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_drupal/config/optional/migrate.migration.d6_action_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_action_settings.yml
similarity index 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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