diff --git a/core/modules/action/migration_templates/action_settings.yml b/core/modules/action/migrations/action_settings.yml
similarity index 100%
rename from core/modules/action/migration_templates/action_settings.yml
rename to core/modules/action/migrations/action_settings.yml
diff --git a/core/modules/action/migration_templates/d6_action.yml b/core/modules/action/migrations/d6_action.yml
similarity index 100%
rename from core/modules/action/migration_templates/d6_action.yml
rename to core/modules/action/migrations/d6_action.yml
diff --git a/core/modules/action/migration_templates/d7_action.yml b/core/modules/action/migrations/d7_action.yml
similarity index 100%
rename from core/modules/action/migration_templates/d7_action.yml
rename to core/modules/action/migrations/d7_action.yml
diff --git a/core/modules/aggregator/migration_templates/d6_aggregator_feed.yml b/core/modules/aggregator/migrations/d6_aggregator_feed.yml
similarity index 100%
rename from core/modules/aggregator/migration_templates/d6_aggregator_feed.yml
rename to core/modules/aggregator/migrations/d6_aggregator_feed.yml
diff --git a/core/modules/aggregator/migration_templates/d6_aggregator_item.yml b/core/modules/aggregator/migrations/d6_aggregator_item.yml
similarity index 100%
rename from core/modules/aggregator/migration_templates/d6_aggregator_item.yml
rename to core/modules/aggregator/migrations/d6_aggregator_item.yml
diff --git a/core/modules/aggregator/migration_templates/d6_aggregator_settings.yml b/core/modules/aggregator/migrations/d6_aggregator_settings.yml
similarity index 100%
rename from core/modules/aggregator/migration_templates/d6_aggregator_settings.yml
rename to core/modules/aggregator/migrations/d6_aggregator_settings.yml
diff --git a/core/modules/aggregator/migration_templates/d7_aggregator_feed.yml b/core/modules/aggregator/migrations/d7_aggregator_feed.yml
similarity index 100%
rename from core/modules/aggregator/migration_templates/d7_aggregator_feed.yml
rename to core/modules/aggregator/migrations/d7_aggregator_feed.yml
diff --git a/core/modules/aggregator/migration_templates/d7_aggregator_item.yml b/core/modules/aggregator/migrations/d7_aggregator_item.yml
similarity index 100%
rename from core/modules/aggregator/migration_templates/d7_aggregator_item.yml
rename to core/modules/aggregator/migrations/d7_aggregator_item.yml
diff --git a/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml b/core/modules/aggregator/migrations/d7_aggregator_settings.yml
similarity index 100%
rename from core/modules/aggregator/migration_templates/d7_aggregator_settings.yml
rename to core/modules/aggregator/migrations/d7_aggregator_settings.yml
diff --git a/core/modules/ban/migration_templates/d7_blocked_ips.yml b/core/modules/ban/migrations/d7_blocked_ips.yml
similarity index 100%
rename from core/modules/ban/migration_templates/d7_blocked_ips.yml
rename to core/modules/ban/migrations/d7_blocked_ips.yml
diff --git a/core/modules/block/migration_templates/d6_block.yml b/core/modules/block/migrations/d6_block.yml
similarity index 100%
rename from core/modules/block/migration_templates/d6_block.yml
rename to core/modules/block/migrations/d6_block.yml
diff --git a/core/modules/block/migration_templates/d7_block.yml b/core/modules/block/migrations/d7_block.yml
similarity index 100%
rename from core/modules/block/migration_templates/d7_block.yml
rename to core/modules/block/migrations/d7_block.yml
diff --git a/core/modules/block_content/migration_templates/block_content_body_field.yml b/core/modules/block_content/migrations/block_content_body_field.yml
similarity index 100%
rename from core/modules/block_content/migration_templates/block_content_body_field.yml
rename to core/modules/block_content/migrations/block_content_body_field.yml
diff --git a/core/modules/block_content/migration_templates/block_content_entity_display.yml b/core/modules/block_content/migrations/block_content_entity_display.yml
similarity index 100%
rename from core/modules/block_content/migration_templates/block_content_entity_display.yml
rename to core/modules/block_content/migrations/block_content_entity_display.yml
diff --git a/core/modules/block_content/migration_templates/block_content_entity_form_display.yml b/core/modules/block_content/migrations/block_content_entity_form_display.yml
similarity index 100%
rename from core/modules/block_content/migration_templates/block_content_entity_form_display.yml
rename to core/modules/block_content/migrations/block_content_entity_form_display.yml
diff --git a/core/modules/block_content/migration_templates/block_content_type.yml b/core/modules/block_content/migrations/block_content_type.yml
similarity index 100%
rename from core/modules/block_content/migration_templates/block_content_type.yml
rename to core/modules/block_content/migrations/block_content_type.yml
diff --git a/core/modules/block_content/migration_templates/d6_custom_block.yml b/core/modules/block_content/migrations/d6_custom_block.yml
similarity index 100%
rename from core/modules/block_content/migration_templates/d6_custom_block.yml
rename to core/modules/block_content/migrations/d6_custom_block.yml
diff --git a/core/modules/block_content/migration_templates/d7_custom_block.yml b/core/modules/block_content/migrations/d7_custom_block.yml
similarity index 100%
rename from core/modules/block_content/migration_templates/d7_custom_block.yml
rename to core/modules/block_content/migrations/d7_custom_block.yml
diff --git a/core/modules/book/migration_templates/d6_book.yml b/core/modules/book/migrations/d6_book.yml
similarity index 100%
rename from core/modules/book/migration_templates/d6_book.yml
rename to core/modules/book/migrations/d6_book.yml
diff --git a/core/modules/book/migration_templates/d6_book_settings.yml b/core/modules/book/migrations/d6_book_settings.yml
similarity index 100%
rename from core/modules/book/migration_templates/d6_book_settings.yml
rename to core/modules/book/migrations/d6_book_settings.yml
diff --git a/core/modules/comment/migration_templates/d6_comment.yml b/core/modules/comment/migrations/d6_comment.yml
similarity index 100%
rename from core/modules/comment/migration_templates/d6_comment.yml
rename to core/modules/comment/migrations/d6_comment.yml
diff --git a/core/modules/comment/migration_templates/d6_comment_entity_display.yml b/core/modules/comment/migrations/d6_comment_entity_display.yml
similarity index 100%
rename from core/modules/comment/migration_templates/d6_comment_entity_display.yml
rename to core/modules/comment/migrations/d6_comment_entity_display.yml
diff --git a/core/modules/comment/migration_templates/d6_comment_entity_form_display.yml b/core/modules/comment/migrations/d6_comment_entity_form_display.yml
similarity index 100%
rename from core/modules/comment/migration_templates/d6_comment_entity_form_display.yml
rename to core/modules/comment/migrations/d6_comment_entity_form_display.yml
diff --git a/core/modules/comment/migration_templates/d6_comment_entity_form_display_subject.yml b/core/modules/comment/migrations/d6_comment_entity_form_display_subject.yml
similarity index 100%
rename from core/modules/comment/migration_templates/d6_comment_entity_form_display_subject.yml
rename to core/modules/comment/migrations/d6_comment_entity_form_display_subject.yml
diff --git a/core/modules/comment/migration_templates/d6_comment_field.yml b/core/modules/comment/migrations/d6_comment_field.yml
similarity index 100%
rename from core/modules/comment/migration_templates/d6_comment_field.yml
rename to core/modules/comment/migrations/d6_comment_field.yml
diff --git a/core/modules/comment/migration_templates/d6_comment_field_instance.yml b/core/modules/comment/migrations/d6_comment_field_instance.yml
similarity index 100%
rename from core/modules/comment/migration_templates/d6_comment_field_instance.yml
rename to core/modules/comment/migrations/d6_comment_field_instance.yml
diff --git a/core/modules/comment/migration_templates/d6_comment_type.yml b/core/modules/comment/migrations/d6_comment_type.yml
similarity index 100%
rename from core/modules/comment/migration_templates/d6_comment_type.yml
rename to core/modules/comment/migrations/d6_comment_type.yml
diff --git a/core/modules/comment/migration_templates/d7_comment.yml b/core/modules/comment/migrations/d7_comment.yml
similarity index 100%
rename from core/modules/comment/migration_templates/d7_comment.yml
rename to core/modules/comment/migrations/d7_comment.yml
diff --git a/core/modules/comment/migration_templates/d7_comment_entity_display.yml b/core/modules/comment/migrations/d7_comment_entity_display.yml
similarity index 100%
rename from core/modules/comment/migration_templates/d7_comment_entity_display.yml
rename to core/modules/comment/migrations/d7_comment_entity_display.yml
diff --git a/core/modules/comment/migration_templates/d7_comment_entity_form_display.yml b/core/modules/comment/migrations/d7_comment_entity_form_display.yml
similarity index 100%
rename from core/modules/comment/migration_templates/d7_comment_entity_form_display.yml
rename to core/modules/comment/migrations/d7_comment_entity_form_display.yml
diff --git a/core/modules/comment/migration_templates/d7_comment_entity_form_display_subject.yml b/core/modules/comment/migrations/d7_comment_entity_form_display_subject.yml
similarity index 100%
rename from core/modules/comment/migration_templates/d7_comment_entity_form_display_subject.yml
rename to core/modules/comment/migrations/d7_comment_entity_form_display_subject.yml
diff --git a/core/modules/comment/migration_templates/d7_comment_field.yml b/core/modules/comment/migrations/d7_comment_field.yml
similarity index 100%
rename from core/modules/comment/migration_templates/d7_comment_field.yml
rename to core/modules/comment/migrations/d7_comment_field.yml
diff --git a/core/modules/comment/migration_templates/d7_comment_field_instance.yml b/core/modules/comment/migrations/d7_comment_field_instance.yml
similarity index 100%
rename from core/modules/comment/migration_templates/d7_comment_field_instance.yml
rename to core/modules/comment/migrations/d7_comment_field_instance.yml
diff --git a/core/modules/comment/migration_templates/d7_comment_type.yml b/core/modules/comment/migrations/d7_comment_type.yml
similarity index 100%
rename from core/modules/comment/migration_templates/d7_comment_type.yml
rename to core/modules/comment/migrations/d7_comment_type.yml
diff --git a/core/modules/config_translation/migration_templates/d6_system_maintenance_translation.yml b/core/modules/config_translation/migrations/d6_system_maintenance_translation.yml
similarity index 100%
rename from core/modules/config_translation/migration_templates/d6_system_maintenance_translation.yml
rename to core/modules/config_translation/migrations/d6_system_maintenance_translation.yml
diff --git a/core/modules/config_translation/migration_templates/d6_system_site_translation.yml b/core/modules/config_translation/migrations/d6_system_site_translation.yml
similarity index 100%
rename from core/modules/config_translation/migration_templates/d6_system_site_translation.yml
rename to core/modules/config_translation/migrations/d6_system_site_translation.yml
diff --git a/core/modules/config_translation/migration_templates/d6_user_mail_translation.yml b/core/modules/config_translation/migrations/d6_user_mail_translation.yml
similarity index 100%
rename from core/modules/config_translation/migration_templates/d6_user_mail_translation.yml
rename to core/modules/config_translation/migrations/d6_user_mail_translation.yml
diff --git a/core/modules/config_translation/migration_templates/d6_user_profile_field_instance_translation.yml b/core/modules/config_translation/migrations/d6_user_profile_field_instance_translation.yml
similarity index 100%
rename from core/modules/config_translation/migration_templates/d6_user_profile_field_instance_translation.yml
rename to core/modules/config_translation/migrations/d6_user_profile_field_instance_translation.yml
diff --git a/core/modules/config_translation/migration_templates/d6_user_settings_translation.yml b/core/modules/config_translation/migrations/d6_user_settings_translation.yml
similarity index 100%
rename from core/modules/config_translation/migration_templates/d6_user_settings_translation.yml
rename to core/modules/config_translation/migrations/d6_user_settings_translation.yml
diff --git a/core/modules/contact/migration_templates/contact_category.yml b/core/modules/contact/migrations/contact_category.yml
similarity index 100%
rename from core/modules/contact/migration_templates/contact_category.yml
rename to core/modules/contact/migrations/contact_category.yml
diff --git a/core/modules/contact/migration_templates/d6_contact_settings.yml b/core/modules/contact/migrations/d6_contact_settings.yml
similarity index 100%
rename from core/modules/contact/migration_templates/d6_contact_settings.yml
rename to core/modules/contact/migrations/d6_contact_settings.yml
diff --git a/core/modules/contact/migration_templates/d7_contact_settings.yml b/core/modules/contact/migrations/d7_contact_settings.yml
similarity index 100%
rename from core/modules/contact/migration_templates/d7_contact_settings.yml
rename to core/modules/contact/migrations/d7_contact_settings.yml
diff --git a/core/modules/dblog/migration_templates/d6_dblog_settings.yml b/core/modules/dblog/migrations/d6_dblog_settings.yml
similarity index 100%
rename from core/modules/dblog/migration_templates/d6_dblog_settings.yml
rename to core/modules/dblog/migrations/d6_dblog_settings.yml
diff --git a/core/modules/dblog/migration_templates/d7_dblog_settings.yml b/core/modules/dblog/migrations/d7_dblog_settings.yml
similarity index 100%
rename from core/modules/dblog/migration_templates/d7_dblog_settings.yml
rename to core/modules/dblog/migrations/d7_dblog_settings.yml
diff --git a/core/modules/field/migration_templates/d6_field.yml b/core/modules/field/migrations/d6_field.yml
similarity index 100%
rename from core/modules/field/migration_templates/d6_field.yml
rename to core/modules/field/migrations/d6_field.yml
diff --git a/core/modules/field/migration_templates/d6_field_formatter_settings.yml b/core/modules/field/migrations/d6_field_formatter_settings.yml
similarity index 100%
rename from core/modules/field/migration_templates/d6_field_formatter_settings.yml
rename to core/modules/field/migrations/d6_field_formatter_settings.yml
diff --git a/core/modules/field/migration_templates/d6_field_instance.yml b/core/modules/field/migrations/d6_field_instance.yml
similarity index 100%
rename from core/modules/field/migration_templates/d6_field_instance.yml
rename to core/modules/field/migrations/d6_field_instance.yml
diff --git a/core/modules/field/migration_templates/d6_field_instance_widget_settings.yml b/core/modules/field/migrations/d6_field_instance_widget_settings.yml
similarity index 100%
rename from core/modules/field/migration_templates/d6_field_instance_widget_settings.yml
rename to core/modules/field/migrations/d6_field_instance_widget_settings.yml
diff --git a/core/modules/field/migration_templates/d7_field.yml b/core/modules/field/migrations/d7_field.yml
similarity index 100%
rename from core/modules/field/migration_templates/d7_field.yml
rename to core/modules/field/migrations/d7_field.yml
diff --git a/core/modules/field/migration_templates/d7_field_formatter_settings.yml b/core/modules/field/migrations/d7_field_formatter_settings.yml
similarity index 100%
rename from core/modules/field/migration_templates/d7_field_formatter_settings.yml
rename to core/modules/field/migrations/d7_field_formatter_settings.yml
diff --git a/core/modules/field/migration_templates/d7_field_instance.yml b/core/modules/field/migrations/d7_field_instance.yml
similarity index 100%
rename from core/modules/field/migration_templates/d7_field_instance.yml
rename to core/modules/field/migrations/d7_field_instance.yml
diff --git a/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml b/core/modules/field/migrations/d7_field_instance_widget_settings.yml
similarity index 100%
rename from core/modules/field/migration_templates/d7_field_instance_widget_settings.yml
rename to core/modules/field/migrations/d7_field_instance_widget_settings.yml
diff --git a/core/modules/field/migration_templates/d7_view_modes.yml b/core/modules/field/migrations/d7_view_modes.yml
similarity index 100%
rename from core/modules/field/migration_templates/d7_view_modes.yml
rename to core/modules/field/migrations/d7_view_modes.yml
diff --git a/core/modules/file/migration_templates/d6_file.yml b/core/modules/file/migrations/d6_file.yml
similarity index 100%
rename from core/modules/file/migration_templates/d6_file.yml
rename to core/modules/file/migrations/d6_file.yml
diff --git a/core/modules/file/migration_templates/d6_upload.yml b/core/modules/file/migrations/d6_upload.yml
similarity index 100%
rename from core/modules/file/migration_templates/d6_upload.yml
rename to core/modules/file/migrations/d6_upload.yml
diff --git a/core/modules/file/migration_templates/d6_upload_entity_display.yml b/core/modules/file/migrations/d6_upload_entity_display.yml
similarity index 100%
rename from core/modules/file/migration_templates/d6_upload_entity_display.yml
rename to core/modules/file/migrations/d6_upload_entity_display.yml
diff --git a/core/modules/file/migration_templates/d6_upload_entity_form_display.yml b/core/modules/file/migrations/d6_upload_entity_form_display.yml
similarity index 100%
rename from core/modules/file/migration_templates/d6_upload_entity_form_display.yml
rename to core/modules/file/migrations/d6_upload_entity_form_display.yml
diff --git a/core/modules/file/migration_templates/d6_upload_field.yml b/core/modules/file/migrations/d6_upload_field.yml
similarity index 100%
rename from core/modules/file/migration_templates/d6_upload_field.yml
rename to core/modules/file/migrations/d6_upload_field.yml
diff --git a/core/modules/file/migration_templates/d6_upload_field_instance.yml b/core/modules/file/migrations/d6_upload_field_instance.yml
similarity index 100%
rename from core/modules/file/migration_templates/d6_upload_field_instance.yml
rename to core/modules/file/migrations/d6_upload_field_instance.yml
diff --git a/core/modules/file/migration_templates/d7_file.yml b/core/modules/file/migrations/d7_file.yml
similarity index 100%
rename from core/modules/file/migration_templates/d7_file.yml
rename to core/modules/file/migrations/d7_file.yml
diff --git a/core/modules/file/migration_templates/d7_file_private.yml b/core/modules/file/migrations/d7_file_private.yml
similarity index 100%
rename from core/modules/file/migration_templates/d7_file_private.yml
rename to core/modules/file/migrations/d7_file_private.yml
diff --git a/core/modules/file/migration_templates/file_settings.yml b/core/modules/file/migrations/file_settings.yml
similarity index 100%
rename from core/modules/file/migration_templates/file_settings.yml
rename to core/modules/file/migrations/file_settings.yml
diff --git a/core/modules/filter/migration_templates/d6_filter_format.yml b/core/modules/filter/migrations/d6_filter_format.yml
similarity index 100%
rename from core/modules/filter/migration_templates/d6_filter_format.yml
rename to core/modules/filter/migrations/d6_filter_format.yml
diff --git a/core/modules/filter/migration_templates/d7_filter_format.yml b/core/modules/filter/migrations/d7_filter_format.yml
similarity index 100%
rename from core/modules/filter/migration_templates/d7_filter_format.yml
rename to core/modules/filter/migrations/d7_filter_format.yml
diff --git a/core/modules/filter/migration_templates/d7_filter_settings.yml b/core/modules/filter/migrations/d7_filter_settings.yml
similarity index 100%
rename from core/modules/filter/migration_templates/d7_filter_settings.yml
rename to core/modules/filter/migrations/d7_filter_settings.yml
diff --git a/core/modules/forum/migration_templates/d6_forum_settings.yml b/core/modules/forum/migrations/d6_forum_settings.yml
similarity index 100%
rename from core/modules/forum/migration_templates/d6_forum_settings.yml
rename to core/modules/forum/migrations/d6_forum_settings.yml
diff --git a/core/modules/forum/migration_templates/d7_forum_settings.yml b/core/modules/forum/migrations/d7_forum_settings.yml
similarity index 100%
rename from core/modules/forum/migration_templates/d7_forum_settings.yml
rename to core/modules/forum/migrations/d7_forum_settings.yml
diff --git a/core/modules/image/migration_templates/d6_imagecache_presets.yml b/core/modules/image/migrations/d6_imagecache_presets.yml
similarity index 100%
rename from core/modules/image/migration_templates/d6_imagecache_presets.yml
rename to core/modules/image/migrations/d6_imagecache_presets.yml
diff --git a/core/modules/image/migration_templates/d7_image_settings.yml b/core/modules/image/migrations/d7_image_settings.yml
similarity index 100%
rename from core/modules/image/migration_templates/d7_image_settings.yml
rename to core/modules/image/migrations/d7_image_settings.yml
diff --git a/core/modules/image/migration_templates/d7_image_styles.yml b/core/modules/image/migrations/d7_image_styles.yml
similarity index 100%
rename from core/modules/image/migration_templates/d7_image_styles.yml
rename to core/modules/image/migrations/d7_image_styles.yml
diff --git a/core/modules/language/migration_templates/d6_language_content_settings.yml b/core/modules/language/migrations/d6_language_content_settings.yml
similarity index 100%
rename from core/modules/language/migration_templates/d6_language_content_settings.yml
rename to core/modules/language/migrations/d6_language_content_settings.yml
diff --git a/core/modules/language/migration_templates/d6_language_negotiation_settings.yml b/core/modules/language/migrations/d6_language_negotiation_settings.yml
similarity index 100%
rename from core/modules/language/migration_templates/d6_language_negotiation_settings.yml
rename to core/modules/language/migrations/d6_language_negotiation_settings.yml
diff --git a/core/modules/language/migration_templates/d6_language_types.yml b/core/modules/language/migrations/d6_language_types.yml
similarity index 100%
rename from core/modules/language/migration_templates/d6_language_types.yml
rename to core/modules/language/migrations/d6_language_types.yml
diff --git a/core/modules/language/migration_templates/d7_language_content_settings.yml b/core/modules/language/migrations/d7_language_content_settings.yml
similarity index 100%
rename from core/modules/language/migration_templates/d7_language_content_settings.yml
rename to core/modules/language/migrations/d7_language_content_settings.yml
diff --git a/core/modules/language/migration_templates/d7_language_negotiation_settings.yml b/core/modules/language/migrations/d7_language_negotiation_settings.yml
similarity index 100%
rename from core/modules/language/migration_templates/d7_language_negotiation_settings.yml
rename to core/modules/language/migrations/d7_language_negotiation_settings.yml
diff --git a/core/modules/language/migration_templates/d7_language_types.yml b/core/modules/language/migrations/d7_language_types.yml
similarity index 100%
rename from core/modules/language/migration_templates/d7_language_types.yml
rename to core/modules/language/migrations/d7_language_types.yml
diff --git a/core/modules/language/migration_templates/default_language.yml b/core/modules/language/migrations/default_language.yml
similarity index 100%
rename from core/modules/language/migration_templates/default_language.yml
rename to core/modules/language/migrations/default_language.yml
diff --git a/core/modules/language/migration_templates/language.yml b/core/modules/language/migrations/language.yml
similarity index 100%
rename from core/modules/language/migration_templates/language.yml
rename to core/modules/language/migrations/language.yml
diff --git a/core/modules/language/migration_templates/language_prefixes_and_domains.yml b/core/modules/language/migrations/language_prefixes_and_domains.yml
similarity index 100%
rename from core/modules/language/migration_templates/language_prefixes_and_domains.yml
rename to core/modules/language/migrations/language_prefixes_and_domains.yml
diff --git a/core/modules/locale/migration_templates/locale_settings.yml b/core/modules/locale/migrations/locale_settings.yml
similarity index 100%
rename from core/modules/locale/migration_templates/locale_settings.yml
rename to core/modules/locale/migrations/locale_settings.yml
diff --git a/core/modules/menu_link_content/migration_templates/d6_menu_links.yml b/core/modules/menu_link_content/migrations/d6_menu_links.yml
similarity index 100%
rename from core/modules/menu_link_content/migration_templates/d6_menu_links.yml
rename to core/modules/menu_link_content/migrations/d6_menu_links.yml
diff --git a/core/modules/menu_link_content/migration_templates/d7_menu_links.yml b/core/modules/menu_link_content/migrations/d7_menu_links.yml
similarity index 100%
rename from core/modules/menu_link_content/migration_templates/d7_menu_links.yml
rename to core/modules/menu_link_content/migrations/d7_menu_links.yml
diff --git a/core/modules/menu_ui/migration_templates/menu_settings.yml b/core/modules/menu_ui/migrations/menu_settings.yml
similarity index 100%
rename from core/modules/menu_ui/migration_templates/menu_settings.yml
rename to core/modules/menu_ui/migrations/menu_settings.yml
diff --git a/core/modules/migrate/tests/modules/migrate_high_water_test/migration_templates/migrate.migration.high_water_test.yml b/core/modules/migrate/tests/modules/migrate_high_water_test/migrations/migrate.migration.high_water_test.yml
similarity index 100%
rename from core/modules/migrate/tests/modules/migrate_high_water_test/migration_templates/migrate.migration.high_water_test.yml
rename to core/modules/migrate/tests/modules/migrate_high_water_test/migrations/migrate.migration.high_water_test.yml
diff --git a/core/modules/migrate/tests/modules/migrate_migration_directory_test/migrate_migration_directory_test.info.yml b/core/modules/migrate/tests/modules/migrate_migration_directory_test/migrate_migration_directory_test.info.yml
new file mode 100644
index 0000000000..f0ca7c0aa6
--- /dev/null
+++ b/core/modules/migrate/tests/modules/migrate_migration_directory_test/migrate_migration_directory_test.info.yml
@@ -0,0 +1,7 @@
+name: 'Migration directory test'
+type: module
+package: Testing
+version: VERSION
+core: 8.x
+dependencies:
+  - migrate
diff --git a/core/modules/migrate/tests/modules/migrate_migration_directory_test/migration_templates/migrate.migration.migration_templates_test.yml b/core/modules/migrate/tests/modules/migrate_migration_directory_test/migration_templates/migrate.migration.migration_templates_test.yml
new file mode 100644
index 0000000000..2d03236932
--- /dev/null
+++ b/core/modules/migrate/tests/modules/migrate_migration_directory_test/migration_templates/migrate.migration.migration_templates_test.yml
@@ -0,0 +1,15 @@
+id: migration_templates_test
+label: Migration templates test
+source:
+  plugin: embedded_data
+  data_rows:
+    -
+      id: basic
+  ids:
+    id:
+      type: string
+  source_module: block
+process:
+  id: id
+destination:
+  plugin: null
diff --git a/core/modules/migrate/tests/modules/migrate_migration_directory_test/migrations/migrate.migration.migrations_test.yml b/core/modules/migrate/tests/modules/migrate_migration_directory_test/migrations/migrate.migration.migrations_test.yml
new file mode 100644
index 0000000000..4947b13c6f
--- /dev/null
+++ b/core/modules/migrate/tests/modules/migrate_migration_directory_test/migrations/migrate.migration.migrations_test.yml
@@ -0,0 +1,15 @@
+id: migrations_test
+label: Migration templates test
+source:
+  plugin: embedded_data
+  data_rows:
+    -
+      id: basic
+  ids:
+    id:
+      type: string
+  source_module: block
+process:
+  id: id
+destination:
+  plugin: null
diff --git a/core/modules/migrate/tests/modules/migrate_migration_directory_test/migrations_not_found/migrate.migration.migrations_not_found_test.yml b/core/modules/migrate/tests/modules/migrate_migration_directory_test/migrations_not_found/migrate.migration.migrations_not_found_test.yml
new file mode 100644
index 0000000000..094df667dd
--- /dev/null
+++ b/core/modules/migrate/tests/modules/migrate_migration_directory_test/migrations_not_found/migrate.migration.migrations_not_found_test.yml
@@ -0,0 +1,15 @@
+id: migrations_not_found_test
+label: Migration templates test
+source:
+  plugin: embedded_data
+  data_rows:
+    -
+      id: basic
+  ids:
+    id:
+      type: string
+  source_module: block
+process:
+  id: id
+destination:
+  plugin: null
diff --git a/core/modules/migrate/tests/src/Kernel/Plugin/MigrationDirectoryTest.php b/core/modules/migrate/tests/src/Kernel/Plugin/MigrationDirectoryTest.php
new file mode 100644
index 0000000000..969a64aa39
--- /dev/null
+++ b/core/modules/migrate/tests/src/Kernel/Plugin/MigrationDirectoryTest.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Drupal\Tests\migrate\Kernel\Plugin;
+
+use Drupal\migrate\Plugin\Migration;
+use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
+
+/**
+ * Tests that modules exist for all source and destination plugins.
+ *
+ * @group migrate
+ */
+class MigrationDirectoryTest extends MigrateDrupalTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['migrate_migration_directory_test'];
+
+  /**
+   * Tests that migrations in the migration_templates directory are created.
+   */
+  public function testMigrationDirectory() {
+
+    /** @var \Drupal\migrate\Plugin\MigrationPluginManager $plugin_manager */
+    $plugin_manager = $this->container->get('plugin.manager.migration');
+    // Tests a migration in 'migration_templates' is created.
+    $migration = $plugin_manager->createInstance('migration_templates_test');
+    $this->assertInstanceOf(Migration::class, $migration);
+    // Tests a migration in 'migrations' is created.
+    $migration = $plugin_manager->createInstance('migrations_test');
+    $this->assertInstanceOf(Migration::class, $migration);
+    // Tests a migration in 'migrations_not_found' is not created.
+    $migration = $plugin_manager->createInstance('migration_not_found_test');
+    $this->assertFalse($migration);
+  }
+
+}
diff --git a/core/modules/migrate_drupal/tests/modules/migrate_overwrite_test/migration_templates/users.yml b/core/modules/migrate_drupal/tests/modules/migrate_overwrite_test/migrations/users.yml
similarity index 100%
rename from core/modules/migrate_drupal/tests/modules/migrate_overwrite_test/migration_templates/users.yml
rename to core/modules/migrate_drupal/tests/modules/migrate_overwrite_test/migrations/users.yml
diff --git a/core/modules/migrate_drupal_ui/tests/modules/migration_provider_test/migration_templates/migration_provider_no_annotation.yml b/core/modules/migrate_drupal_ui/tests/modules/migration_provider_test/migrations/migration_provider_no_annotation.yml
similarity index 100%
rename from core/modules/migrate_drupal_ui/tests/modules/migration_provider_test/migration_templates/migration_provider_no_annotation.yml
rename to core/modules/migrate_drupal_ui/tests/modules/migration_provider_test/migrations/migration_provider_no_annotation.yml
diff --git a/core/modules/migrate_drupal_ui/tests/modules/migration_provider_test/migration_templates/migration_provider_test.yml b/core/modules/migrate_drupal_ui/tests/modules/migration_provider_test/migrations/migration_provider_test.yml
similarity index 100%
rename from core/modules/migrate_drupal_ui/tests/modules/migration_provider_test/migration_templates/migration_provider_test.yml
rename to core/modules/migrate_drupal_ui/tests/modules/migration_provider_test/migrations/migration_provider_test.yml
diff --git a/core/modules/node/migration_templates/d6_node.yml b/core/modules/node/migrations/d6_node.yml
similarity index 100%
rename from core/modules/node/migration_templates/d6_node.yml
rename to core/modules/node/migrations/d6_node.yml
diff --git a/core/modules/node/migration_templates/d6_node_revision.yml b/core/modules/node/migrations/d6_node_revision.yml
similarity index 100%
rename from core/modules/node/migration_templates/d6_node_revision.yml
rename to core/modules/node/migrations/d6_node_revision.yml
diff --git a/core/modules/node/migration_templates/d6_node_setting_promote.yml b/core/modules/node/migrations/d6_node_setting_promote.yml
similarity index 100%
rename from core/modules/node/migration_templates/d6_node_setting_promote.yml
rename to core/modules/node/migrations/d6_node_setting_promote.yml
diff --git a/core/modules/node/migration_templates/d6_node_setting_status.yml b/core/modules/node/migrations/d6_node_setting_status.yml
similarity index 100%
rename from core/modules/node/migration_templates/d6_node_setting_status.yml
rename to core/modules/node/migrations/d6_node_setting_status.yml
diff --git a/core/modules/node/migration_templates/d6_node_setting_sticky.yml b/core/modules/node/migrations/d6_node_setting_sticky.yml
similarity index 100%
rename from core/modules/node/migration_templates/d6_node_setting_sticky.yml
rename to core/modules/node/migrations/d6_node_setting_sticky.yml
diff --git a/core/modules/node/migration_templates/d6_node_settings.yml b/core/modules/node/migrations/d6_node_settings.yml
similarity index 100%
rename from core/modules/node/migration_templates/d6_node_settings.yml
rename to core/modules/node/migrations/d6_node_settings.yml
diff --git a/core/modules/node/migration_templates/d6_node_translation.yml b/core/modules/node/migrations/d6_node_translation.yml
similarity index 100%
rename from core/modules/node/migration_templates/d6_node_translation.yml
rename to core/modules/node/migrations/d6_node_translation.yml
diff --git a/core/modules/node/migration_templates/d6_node_type.yml b/core/modules/node/migrations/d6_node_type.yml
similarity index 100%
rename from core/modules/node/migration_templates/d6_node_type.yml
rename to core/modules/node/migrations/d6_node_type.yml
diff --git a/core/modules/node/migration_templates/d6_view_modes.yml b/core/modules/node/migrations/d6_view_modes.yml
similarity index 100%
rename from core/modules/node/migration_templates/d6_view_modes.yml
rename to core/modules/node/migrations/d6_view_modes.yml
diff --git a/core/modules/node/migration_templates/d7_node.yml b/core/modules/node/migrations/d7_node.yml
similarity index 100%
rename from core/modules/node/migration_templates/d7_node.yml
rename to core/modules/node/migrations/d7_node.yml
diff --git a/core/modules/node/migration_templates/d7_node_revision.yml b/core/modules/node/migrations/d7_node_revision.yml
similarity index 100%
rename from core/modules/node/migration_templates/d7_node_revision.yml
rename to core/modules/node/migrations/d7_node_revision.yml
diff --git a/core/modules/node/migration_templates/d7_node_settings.yml b/core/modules/node/migrations/d7_node_settings.yml
similarity index 100%
rename from core/modules/node/migration_templates/d7_node_settings.yml
rename to core/modules/node/migrations/d7_node_settings.yml
diff --git a/core/modules/node/migration_templates/d7_node_title_label.yml b/core/modules/node/migrations/d7_node_title_label.yml
similarity index 100%
rename from core/modules/node/migration_templates/d7_node_title_label.yml
rename to core/modules/node/migrations/d7_node_title_label.yml
diff --git a/core/modules/node/migration_templates/d7_node_translation.yml b/core/modules/node/migrations/d7_node_translation.yml
similarity index 100%
rename from core/modules/node/migration_templates/d7_node_translation.yml
rename to core/modules/node/migrations/d7_node_translation.yml
diff --git a/core/modules/node/migration_templates/d7_node_type.yml b/core/modules/node/migrations/d7_node_type.yml
similarity index 100%
rename from core/modules/node/migration_templates/d7_node_type.yml
rename to core/modules/node/migrations/d7_node_type.yml
diff --git a/core/modules/path/migration_templates/d6_url_alias.yml b/core/modules/path/migrations/d6_url_alias.yml
similarity index 100%
rename from core/modules/path/migration_templates/d6_url_alias.yml
rename to core/modules/path/migrations/d6_url_alias.yml
diff --git a/core/modules/path/migration_templates/d7_url_alias.yml b/core/modules/path/migrations/d7_url_alias.yml
similarity index 100%
rename from core/modules/path/migration_templates/d7_url_alias.yml
rename to core/modules/path/migrations/d7_url_alias.yml
diff --git a/core/modules/search/migration_templates/d6_search_settings.yml b/core/modules/search/migrations/d6_search_settings.yml
similarity index 100%
rename from core/modules/search/migration_templates/d6_search_settings.yml
rename to core/modules/search/migrations/d6_search_settings.yml
diff --git a/core/modules/search/migration_templates/d7_search_settings.yml b/core/modules/search/migrations/d7_search_settings.yml
similarity index 100%
rename from core/modules/search/migration_templates/d7_search_settings.yml
rename to core/modules/search/migrations/d7_search_settings.yml
diff --git a/core/modules/search/migration_templates/search_page.yml b/core/modules/search/migrations/search_page.yml
similarity index 100%
rename from core/modules/search/migration_templates/search_page.yml
rename to core/modules/search/migrations/search_page.yml
diff --git a/core/modules/shortcut/migration_templates/d7_shortcut.yml b/core/modules/shortcut/migrations/d7_shortcut.yml
similarity index 100%
rename from core/modules/shortcut/migration_templates/d7_shortcut.yml
rename to core/modules/shortcut/migrations/d7_shortcut.yml
diff --git a/core/modules/shortcut/migration_templates/d7_shortcut_set.yml b/core/modules/shortcut/migrations/d7_shortcut_set.yml
similarity index 100%
rename from core/modules/shortcut/migration_templates/d7_shortcut_set.yml
rename to core/modules/shortcut/migrations/d7_shortcut_set.yml
diff --git a/core/modules/shortcut/migration_templates/d7_shortcut_set_users.yml b/core/modules/shortcut/migrations/d7_shortcut_set_users.yml
similarity index 100%
rename from core/modules/shortcut/migration_templates/d7_shortcut_set_users.yml
rename to core/modules/shortcut/migrations/d7_shortcut_set_users.yml
diff --git a/core/modules/simpletest/migration_templates/d6_simpletest_settings.yml b/core/modules/simpletest/migrations/d6_simpletest_settings.yml
similarity index 100%
rename from core/modules/simpletest/migration_templates/d6_simpletest_settings.yml
rename to core/modules/simpletest/migrations/d6_simpletest_settings.yml
diff --git a/core/modules/simpletest/migration_templates/d7_simpletest_settings.yml b/core/modules/simpletest/migrations/d7_simpletest_settings.yml
similarity index 100%
rename from core/modules/simpletest/migration_templates/d7_simpletest_settings.yml
rename to core/modules/simpletest/migrations/d7_simpletest_settings.yml
diff --git a/core/modules/statistics/migration_templates/statistics_settings.yml b/core/modules/statistics/migrations/statistics_settings.yml
similarity index 100%
rename from core/modules/statistics/migration_templates/statistics_settings.yml
rename to core/modules/statistics/migrations/statistics_settings.yml
diff --git a/core/modules/syslog/migration_templates/d6_syslog_settings.yml b/core/modules/syslog/migrations/d6_syslog_settings.yml
similarity index 100%
rename from core/modules/syslog/migration_templates/d6_syslog_settings.yml
rename to core/modules/syslog/migrations/d6_syslog_settings.yml
diff --git a/core/modules/syslog/migration_templates/d7_syslog_settings.yml b/core/modules/syslog/migrations/d7_syslog_settings.yml
similarity index 100%
rename from core/modules/syslog/migration_templates/d7_syslog_settings.yml
rename to core/modules/syslog/migrations/d7_syslog_settings.yml
diff --git a/core/modules/system/migration_templates/d6_date_formats.yml b/core/modules/system/migrations/d6_date_formats.yml
similarity index 100%
rename from core/modules/system/migration_templates/d6_date_formats.yml
rename to core/modules/system/migrations/d6_date_formats.yml
diff --git a/core/modules/system/migration_templates/d6_menu.yml b/core/modules/system/migrations/d6_menu.yml
similarity index 100%
rename from core/modules/system/migration_templates/d6_menu.yml
rename to core/modules/system/migrations/d6_menu.yml
diff --git a/core/modules/system/migration_templates/d6_system_cron.yml b/core/modules/system/migrations/d6_system_cron.yml
similarity index 100%
rename from core/modules/system/migration_templates/d6_system_cron.yml
rename to core/modules/system/migrations/d6_system_cron.yml
diff --git a/core/modules/system/migration_templates/d6_system_date.yml b/core/modules/system/migrations/d6_system_date.yml
similarity index 100%
rename from core/modules/system/migration_templates/d6_system_date.yml
rename to core/modules/system/migrations/d6_system_date.yml
diff --git a/core/modules/system/migration_templates/d6_system_file.yml b/core/modules/system/migrations/d6_system_file.yml
similarity index 100%
rename from core/modules/system/migration_templates/d6_system_file.yml
rename to core/modules/system/migrations/d6_system_file.yml
diff --git a/core/modules/system/migration_templates/d6_system_performance.yml b/core/modules/system/migrations/d6_system_performance.yml
similarity index 100%
rename from core/modules/system/migration_templates/d6_system_performance.yml
rename to core/modules/system/migrations/d6_system_performance.yml
diff --git a/core/modules/system/migration_templates/d7_global_theme_settings.yml b/core/modules/system/migrations/d7_global_theme_settings.yml
similarity index 100%
rename from core/modules/system/migration_templates/d7_global_theme_settings.yml
rename to core/modules/system/migrations/d7_global_theme_settings.yml
diff --git a/core/modules/system/migration_templates/d7_menu.yml b/core/modules/system/migrations/d7_menu.yml
similarity index 100%
rename from core/modules/system/migration_templates/d7_menu.yml
rename to core/modules/system/migrations/d7_menu.yml
diff --git a/core/modules/system/migration_templates/d7_system_authorize.yml b/core/modules/system/migrations/d7_system_authorize.yml
similarity index 100%
rename from core/modules/system/migration_templates/d7_system_authorize.yml
rename to core/modules/system/migrations/d7_system_authorize.yml
diff --git a/core/modules/system/migration_templates/d7_system_cron.yml b/core/modules/system/migrations/d7_system_cron.yml
similarity index 100%
rename from core/modules/system/migration_templates/d7_system_cron.yml
rename to core/modules/system/migrations/d7_system_cron.yml
diff --git a/core/modules/system/migration_templates/d7_system_date.yml b/core/modules/system/migrations/d7_system_date.yml
similarity index 100%
rename from core/modules/system/migration_templates/d7_system_date.yml
rename to core/modules/system/migrations/d7_system_date.yml
diff --git a/core/modules/system/migration_templates/d7_system_file.yml b/core/modules/system/migrations/d7_system_file.yml
similarity index 100%
rename from core/modules/system/migration_templates/d7_system_file.yml
rename to core/modules/system/migrations/d7_system_file.yml
diff --git a/core/modules/system/migration_templates/d7_system_mail.yml b/core/modules/system/migrations/d7_system_mail.yml
similarity index 100%
rename from core/modules/system/migration_templates/d7_system_mail.yml
rename to core/modules/system/migrations/d7_system_mail.yml
diff --git a/core/modules/system/migration_templates/d7_system_performance.yml b/core/modules/system/migrations/d7_system_performance.yml
similarity index 100%
rename from core/modules/system/migration_templates/d7_system_performance.yml
rename to core/modules/system/migrations/d7_system_performance.yml
diff --git a/core/modules/system/migration_templates/d7_theme_settings.yml b/core/modules/system/migrations/d7_theme_settings.yml
similarity index 100%
rename from core/modules/system/migration_templates/d7_theme_settings.yml
rename to core/modules/system/migrations/d7_theme_settings.yml
diff --git a/core/modules/system/migration_templates/system_image.yml b/core/modules/system/migrations/system_image.yml
similarity index 100%
rename from core/modules/system/migration_templates/system_image.yml
rename to core/modules/system/migrations/system_image.yml
diff --git a/core/modules/system/migration_templates/system_image_gd.yml b/core/modules/system/migrations/system_image_gd.yml
similarity index 100%
rename from core/modules/system/migration_templates/system_image_gd.yml
rename to core/modules/system/migrations/system_image_gd.yml
diff --git a/core/modules/system/migration_templates/system_logging.yml b/core/modules/system/migrations/system_logging.yml
similarity index 100%
rename from core/modules/system/migration_templates/system_logging.yml
rename to core/modules/system/migrations/system_logging.yml
diff --git a/core/modules/system/migration_templates/system_maintenance.yml b/core/modules/system/migrations/system_maintenance.yml
similarity index 100%
rename from core/modules/system/migration_templates/system_maintenance.yml
rename to core/modules/system/migrations/system_maintenance.yml
diff --git a/core/modules/system/migration_templates/system_rss.yml b/core/modules/system/migrations/system_rss.yml
similarity index 100%
rename from core/modules/system/migration_templates/system_rss.yml
rename to core/modules/system/migrations/system_rss.yml
diff --git a/core/modules/system/migration_templates/system_site.yml b/core/modules/system/migrations/system_site.yml
similarity index 100%
rename from core/modules/system/migration_templates/system_site.yml
rename to core/modules/system/migrations/system_site.yml
diff --git a/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml b/core/modules/taxonomy/migrations/d6_taxonomy_term.yml
similarity index 100%
rename from core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml
rename to core/modules/taxonomy/migrations/d6_taxonomy_term.yml
diff --git a/core/modules/taxonomy/migration_templates/d6_taxonomy_term_translation.yml b/core/modules/taxonomy/migrations/d6_taxonomy_term_translation.yml
similarity index 100%
rename from core/modules/taxonomy/migration_templates/d6_taxonomy_term_translation.yml
rename to core/modules/taxonomy/migrations/d6_taxonomy_term_translation.yml
diff --git a/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml b/core/modules/taxonomy/migrations/d6_taxonomy_vocabulary.yml
similarity index 100%
rename from core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml
rename to core/modules/taxonomy/migrations/d6_taxonomy_vocabulary.yml
diff --git a/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary_translation.yml b/core/modules/taxonomy/migrations/d6_taxonomy_vocabulary_translation.yml
similarity index 100%
rename from core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary_translation.yml
rename to core/modules/taxonomy/migrations/d6_taxonomy_vocabulary_translation.yml
diff --git a/core/modules/taxonomy/migration_templates/d6_term_node.yml b/core/modules/taxonomy/migrations/d6_term_node.yml
similarity index 100%
rename from core/modules/taxonomy/migration_templates/d6_term_node.yml
rename to core/modules/taxonomy/migrations/d6_term_node.yml
diff --git a/core/modules/taxonomy/migration_templates/d6_term_node_revision.yml b/core/modules/taxonomy/migrations/d6_term_node_revision.yml
similarity index 100%
rename from core/modules/taxonomy/migration_templates/d6_term_node_revision.yml
rename to core/modules/taxonomy/migrations/d6_term_node_revision.yml
diff --git a/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_display.yml b/core/modules/taxonomy/migrations/d6_vocabulary_entity_display.yml
similarity index 100%
rename from core/modules/taxonomy/migration_templates/d6_vocabulary_entity_display.yml
rename to core/modules/taxonomy/migrations/d6_vocabulary_entity_display.yml
diff --git a/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_form_display.yml b/core/modules/taxonomy/migrations/d6_vocabulary_entity_form_display.yml
similarity index 100%
rename from core/modules/taxonomy/migration_templates/d6_vocabulary_entity_form_display.yml
rename to core/modules/taxonomy/migrations/d6_vocabulary_entity_form_display.yml
diff --git a/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml b/core/modules/taxonomy/migrations/d6_vocabulary_field.yml
similarity index 100%
rename from core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml
rename to core/modules/taxonomy/migrations/d6_vocabulary_field.yml
diff --git a/core/modules/taxonomy/migration_templates/d6_vocabulary_field_instance.yml b/core/modules/taxonomy/migrations/d6_vocabulary_field_instance.yml
similarity index 100%
rename from core/modules/taxonomy/migration_templates/d6_vocabulary_field_instance.yml
rename to core/modules/taxonomy/migrations/d6_vocabulary_field_instance.yml
diff --git a/core/modules/taxonomy/migration_templates/d7_taxonomy_term.yml b/core/modules/taxonomy/migrations/d7_taxonomy_term.yml
similarity index 100%
rename from core/modules/taxonomy/migration_templates/d7_taxonomy_term.yml
rename to core/modules/taxonomy/migrations/d7_taxonomy_term.yml
diff --git a/core/modules/taxonomy/migration_templates/d7_taxonomy_vocabulary.yml b/core/modules/taxonomy/migrations/d7_taxonomy_vocabulary.yml
similarity index 100%
rename from core/modules/taxonomy/migration_templates/d7_taxonomy_vocabulary.yml
rename to core/modules/taxonomy/migrations/d7_taxonomy_vocabulary.yml
diff --git a/core/modules/taxonomy/migration_templates/taxonomy_settings.yml b/core/modules/taxonomy/migrations/taxonomy_settings.yml
similarity index 100%
rename from core/modules/taxonomy/migration_templates/taxonomy_settings.yml
rename to core/modules/taxonomy/migrations/taxonomy_settings.yml
diff --git a/core/modules/text/migration_templates/text_settings.yml b/core/modules/text/migrations/text_settings.yml
similarity index 100%
rename from core/modules/text/migration_templates/text_settings.yml
rename to core/modules/text/migrations/text_settings.yml
diff --git a/core/modules/tracker/migration_templates/d7_tracker_node.yml b/core/modules/tracker/migrations/d7_tracker_node.yml
similarity index 100%
rename from core/modules/tracker/migration_templates/d7_tracker_node.yml
rename to core/modules/tracker/migrations/d7_tracker_node.yml
diff --git a/core/modules/tracker/migration_templates/d7_tracker_settings.yml b/core/modules/tracker/migrations/d7_tracker_settings.yml
similarity index 100%
rename from core/modules/tracker/migration_templates/d7_tracker_settings.yml
rename to core/modules/tracker/migrations/d7_tracker_settings.yml
diff --git a/core/modules/tracker/migration_templates/d7_tracker_user.yml b/core/modules/tracker/migrations/d7_tracker_user.yml
similarity index 100%
rename from core/modules/tracker/migration_templates/d7_tracker_user.yml
rename to core/modules/tracker/migrations/d7_tracker_user.yml
diff --git a/core/modules/update/migration_templates/update_settings.yml b/core/modules/update/migrations/update_settings.yml
similarity index 100%
rename from core/modules/update/migration_templates/update_settings.yml
rename to core/modules/update/migrations/update_settings.yml
diff --git a/core/modules/user/migration_templates/d6_profile_values.yml b/core/modules/user/migrations/d6_profile_values.yml
similarity index 100%
rename from core/modules/user/migration_templates/d6_profile_values.yml
rename to core/modules/user/migrations/d6_profile_values.yml
diff --git a/core/modules/user/migration_templates/d6_user.yml b/core/modules/user/migrations/d6_user.yml
similarity index 100%
rename from core/modules/user/migration_templates/d6_user.yml
rename to core/modules/user/migrations/d6_user.yml
diff --git a/core/modules/user/migration_templates/d6_user_contact_settings.yml b/core/modules/user/migrations/d6_user_contact_settings.yml
similarity index 100%
rename from core/modules/user/migration_templates/d6_user_contact_settings.yml
rename to core/modules/user/migrations/d6_user_contact_settings.yml
diff --git a/core/modules/user/migration_templates/d6_user_mail.yml b/core/modules/user/migrations/d6_user_mail.yml
similarity index 100%
rename from core/modules/user/migration_templates/d6_user_mail.yml
rename to core/modules/user/migrations/d6_user_mail.yml
diff --git a/core/modules/user/migration_templates/d6_user_picture_file.yml b/core/modules/user/migrations/d6_user_picture_file.yml
similarity index 100%
rename from core/modules/user/migration_templates/d6_user_picture_file.yml
rename to core/modules/user/migrations/d6_user_picture_file.yml
diff --git a/core/modules/user/migration_templates/d6_user_role.yml b/core/modules/user/migrations/d6_user_role.yml
similarity index 100%
rename from core/modules/user/migration_templates/d6_user_role.yml
rename to core/modules/user/migrations/d6_user_role.yml
diff --git a/core/modules/user/migration_templates/d6_user_settings.yml b/core/modules/user/migrations/d6_user_settings.yml
similarity index 100%
rename from core/modules/user/migration_templates/d6_user_settings.yml
rename to core/modules/user/migrations/d6_user_settings.yml
diff --git a/core/modules/user/migration_templates/d7_user.yml b/core/modules/user/migrations/d7_user.yml
similarity index 100%
rename from core/modules/user/migration_templates/d7_user.yml
rename to core/modules/user/migrations/d7_user.yml
diff --git a/core/modules/user/migration_templates/d7_user_flood.yml b/core/modules/user/migrations/d7_user_flood.yml
similarity index 100%
rename from core/modules/user/migration_templates/d7_user_flood.yml
rename to core/modules/user/migrations/d7_user_flood.yml
diff --git a/core/modules/user/migration_templates/d7_user_mail.yml b/core/modules/user/migrations/d7_user_mail.yml
similarity index 100%
rename from core/modules/user/migration_templates/d7_user_mail.yml
rename to core/modules/user/migrations/d7_user_mail.yml
diff --git a/core/modules/user/migration_templates/d7_user_role.yml b/core/modules/user/migrations/d7_user_role.yml
similarity index 100%
rename from core/modules/user/migration_templates/d7_user_role.yml
rename to core/modules/user/migrations/d7_user_role.yml
diff --git a/core/modules/user/migration_templates/user_picture_entity_display.yml b/core/modules/user/migrations/user_picture_entity_display.yml
similarity index 100%
rename from core/modules/user/migration_templates/user_picture_entity_display.yml
rename to core/modules/user/migrations/user_picture_entity_display.yml
diff --git a/core/modules/user/migration_templates/user_picture_entity_form_display.yml b/core/modules/user/migrations/user_picture_entity_form_display.yml
similarity index 100%
rename from core/modules/user/migration_templates/user_picture_entity_form_display.yml
rename to core/modules/user/migrations/user_picture_entity_form_display.yml
diff --git a/core/modules/user/migration_templates/user_picture_field.yml b/core/modules/user/migrations/user_picture_field.yml
similarity index 100%
rename from core/modules/user/migration_templates/user_picture_field.yml
rename to core/modules/user/migrations/user_picture_field.yml
diff --git a/core/modules/user/migration_templates/user_picture_field_instance.yml b/core/modules/user/migrations/user_picture_field_instance.yml
similarity index 100%
rename from core/modules/user/migration_templates/user_picture_field_instance.yml
rename to core/modules/user/migrations/user_picture_field_instance.yml
diff --git a/core/modules/user/migration_templates/user_profile_entity_display.yml b/core/modules/user/migrations/user_profile_entity_display.yml
similarity index 100%
rename from core/modules/user/migration_templates/user_profile_entity_display.yml
rename to core/modules/user/migrations/user_profile_entity_display.yml
diff --git a/core/modules/user/migration_templates/user_profile_entity_form_display.yml b/core/modules/user/migrations/user_profile_entity_form_display.yml
similarity index 100%
rename from core/modules/user/migration_templates/user_profile_entity_form_display.yml
rename to core/modules/user/migrations/user_profile_entity_form_display.yml
diff --git a/core/modules/user/migration_templates/user_profile_field.yml b/core/modules/user/migrations/user_profile_field.yml
similarity index 100%
rename from core/modules/user/migration_templates/user_profile_field.yml
rename to core/modules/user/migrations/user_profile_field.yml
diff --git a/core/modules/user/migration_templates/user_profile_field_instance.yml b/core/modules/user/migrations/user_profile_field_instance.yml
similarity index 100%
rename from core/modules/user/migration_templates/user_profile_field_instance.yml
rename to core/modules/user/migrations/user_profile_field_instance.yml
