diff --git a/core/modules/migrate_drupal/migration_templates/d6_file.yml b/core/modules/file/migration_templates/d6_file.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_file.yml
rename to core/modules/file/migration_templates/d6_file.yml
diff --git a/core/modules/migrate_drupal/migration_templates/d6_file_settings.yml b/core/modules/file/migration_templates/d6_file_settings.yml
similarity index 100%
rename from core/modules/migrate_drupal/migration_templates/d6_file_settings.yml
rename to core/modules/file/migration_templates/d6_file_settings.yml
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/File.php b/core/modules/file/src/Plugin/migrate/source/d6/File.php
similarity index 95%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/File.php
rename to core/modules/file/src/Plugin/migrate/source/d6/File.php
index ed307a4..d4351d2 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/File.php
+++ b/core/modules/file/src/Plugin/migrate/source/d6/File.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\File.
+ * Contains \Drupal\file\Plugin\migrate\source\d6\File.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\file\Plugin\migrate\source\d6;
 
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateFileConfigsTest.php b/core/modules/file/src/Tests/d6/MigrateFileConfigsTest.php
similarity index 85%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateFileConfigsTest.php
rename to core/modules/file/src/Tests/d6/MigrateFileConfigsTest.php
index 4e974a0..dd7b315 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateFileConfigsTest.php
+++ b/core/modules/file/src/Tests/d6/MigrateFileConfigsTest.php
@@ -2,17 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateFileConfigsTest.
+ * Contains \Drupal\file\Tests\d6\MigrateFileConfigsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\file\Tests\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to file.settings.yml.
  *
- * @group migrate_drupal
+ * @group file
  */
 class MigrateFileConfigsTest extends MigrateDrupal6TestBase {
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateFileTest.php b/core/modules/file/src/Tests/d6/MigrateFileTest.php
similarity index 95%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateFileTest.php
rename to core/modules/file/src/Tests/d6/MigrateFileTest.php
index fa4d5c8..32beb57 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateFileTest.php
+++ b/core/modules/file/src/Tests/d6/MigrateFileTest.php
@@ -2,21 +2,22 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateFileTest.
+ * Contains \Drupal\file\Tests\d6\MigrateFileTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\file\Tests\d6;
 
 use Drupal\Component\Utility\Random;
 use Drupal\migrate\Tests\MigrateDumpAlterInterface;
 use Drupal\Core\Database\Database;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 use Drupal\simpletest\TestBase;
 use Drupal\file\Entity\File;
 
 /**
  * file migration.
  *
- * @group migrate_drupal
+ * @group file
  */
 class MigrateFileTest extends MigrateDrupal6TestBase implements MigrateDumpAlterInterface {
 
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/FileTest.php b/core/modules/file/tests/src/Unit/Plugin/migrate/source/d6/FileTest.php
similarity index 84%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/FileTest.php
rename to core/modules/file/tests/src/Unit/Plugin/migrate/source/d6/FileTest.php
index 52614c9..90cbafe 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/FileTest.php
+++ b/core/modules/file/tests/src/Unit/Plugin/migrate/source/d6/FileTest.php
@@ -2,21 +2,21 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\FileTest.
+ * Contains \Drupal\Tests\file\Unit\Plugin\migrate\source\d6\FileTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\file\Unit\Plugin\migrate\source\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 file source plugin.
  *
- * @group migrate_drupal
+ * @group file
  */
 class FileTest extends MigrateSqlSourceTestCase {
 
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\File';
+  const PLUGIN_CLASS = 'Drupal\file\Plugin\migrate\source\d6\File';
 
   // The fake Migration configuration entity.
   protected $migrationConfiguration = array(