diff --git a/core/modules/migrate_drupal/migration_templates/d6_search_page.yml b/core/modules/search/migration_templates/d6_search_page.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_search_page.yml
rename to core/modules/search/migration_templates/d6_search_page.yml
diff --git a/core/modules/migrate_drupal/migration_templates/d6_search_settings.yml b/core/modules/search/migration_templates/d6_search_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_search_settings.yml
rename to core/modules/search/migration_templates/d6_search_settings.yml
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/EntitySearchPage.php b/core/modules/search/src/Plugin/migrate/destination/EntitySearchPage.php
similarity index 78%
rename from core/modules/migrate/src/Plugin/migrate/destination/EntitySearchPage.php
rename to core/modules/search/src/Plugin/migrate/destination/EntitySearchPage.php
index 0e623ef..517fe63 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/EntitySearchPage.php
+++ b/core/modules/search/src/Plugin/migrate/destination/EntitySearchPage.php
@@ -2,12 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\destination\EntitySearchPage.
+ * Contains \Drupal\search\Plugin\migrate\destination\EntitySearchPage.
  */
 
-namespace Drupal\migrate\Plugin\migrate\destination;
+namespace Drupal\search\Plugin\migrate\destination;
 
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\migrate\Plugin\migrate\destination\EntityConfigBase;
 use Drupal\migrate\Row;
 
 /**
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/SearchConfigurationRankings.php b/core/modules/search/src/Plugin/migrate/process/d6/SearchConfigurationRankings.php
similarity index 83%
rename from core/modules/migrate_drupal/src/Plugin/migrate/process/d6/SearchConfigurationRankings.php
rename to core/modules/search/src/Plugin/migrate/process/d6/SearchConfigurationRankings.php
index a78666a..410b7ab 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/SearchConfigurationRankings.php
+++ b/core/modules/search/src/Plugin/migrate/process/d6/SearchConfigurationRankings.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\SearchConfigurationRankings.
+ * Contains \Drupal\search\Plugin\migrate\process\d6\SearchConfigurationRankings.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
+namespace Drupal\search\Plugin\migrate\process\d6;
 
 use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\MigrateExecutableInterface;
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSearchConfigsTest.php b/core/modules/search/src/Tests/Migrate/d6/MigrateSearchConfigsTest.php
similarity index 85%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateSearchConfigsTest.php
rename to core/modules/search/src/Tests/Migrate/d6/MigrateSearchConfigsTest.php
index b0b7cd6..4cb4298 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSearchConfigsTest.php
+++ b/core/modules/search/src/Tests/Migrate/d6/MigrateSearchConfigsTest.php
@@ -2,17 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateSearchConfigsTest.
+ * Contains \Drupal\search\Tests\d6\Migrate\SearchConfigsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\search\Tests\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to search.settings.yml.
  *
- * @group migrate_drupal
+ * @group search
  */
 class MigrateSearchConfigsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSearchPageTest.php b/core/modules/search/src/Tests/Migrate/d6/MigrateSearchPageTest.php
similarity index 90%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateSearchPageTest.php
rename to core/modules/search/src/Tests/Migrate/d6/MigrateSearchPageTest.php
index d748c0b..81fc6e1 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSearchPageTest.php
+++ b/core/modules/search/src/Tests/Migrate/d6/MigrateSearchPageTest.php
@@ -2,18 +2,19 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateSearchPageTest.
+ * Contains \Drupal\search\Tests\Migrate\d6\MigrateSearchPageTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\search\Tests\Migrate\d6;
 
 use Drupal\migrate\MigrateExecutable;
 use Drupal\Core\Database\Database;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade search rank settings to search.page.*.yml.
  *
- * @group migrate_drupal
+ * @group search
  */
 class MigrateSearchPageTest extends MigrateDrupal6TestBase {