diff --git a/src/FileMigrationHelper.php b/src/Migration/FileMigrationHelper.php
similarity index 99%
rename from src/FileMigrationHelper.php
rename to src/Migration/FileMigrationHelper.php
index b02104b9..6695bde7 100644
--- a/src/FileMigrationHelper.php
+++ b/src/Migration/FileMigrationHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SilverStripe\Assets;
+namespace SilverStripe\Assets\Migration;
 
 use SilverStripe\Assets\Flysystem\FlysystemAssetStore;
 use SilverStripe\Assets\Storage\AssetStore;
diff --git a/src/LegacyThumbnailMigrationHelper.php b/src/Migration/LegacyThumbnailMigrationHelper.php
similarity index 98%
rename from src/LegacyThumbnailMigrationHelper.php
rename to src/Migration/LegacyThumbnailMigrationHelper.php
index f8df1a1b..00b4bb9b 100644
--- a/src/LegacyThumbnailMigrationHelper.php
+++ b/src/Migration/LegacyThumbnailMigrationHelper.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace SilverStripe\Assets;
+namespace SilverStripe\Assets\Migration;
 
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
+use SilverStripe\Assets\File;
 use SilverStripe\Assets\FilenameParsing\LegacyFileIDHelper;
 use SilverStripe\Assets\Flysystem\FlysystemAssetStore;
+use SilverStripe\Assets\Folder;
 use SilverStripe\Core\Config\Configurable;
 use SilverStripe\Core\Environment;
 use SilverStripe\Core\Injector\Injectable;
diff --git a/tests/php/FileMigrationHelperTest.php b/tests/php/Migration/FileMigrationHelperTest.php
similarity index 94%
rename from tests/php/FileMigrationHelperTest.php
rename to tests/php/Migration/FileMigrationHelperTest.php
index 58e299ab..a2aa81cb 100644
--- a/tests/php/FileMigrationHelperTest.php
+++ b/tests/php/Migration/FileMigrationHelperTest.php
@@ -1,17 +1,15 @@
 <?php
 
-namespace SilverStripe\Assets\Tests;
+namespace SilverStripe\Assets\Tests\Migration;
 
 use Silverstripe\Assets\Dev\TestAssetStore;
 use SilverStripe\Assets\File;
-use SilverStripe\Assets\FileMigrationHelper;
+use SilverStripe\Assets\Migration\FileMigrationHelper;
 use SilverStripe\Assets\Filesystem;
 use SilverStripe\Assets\Flysystem\FlysystemAssetStore;
 use SilverStripe\Assets\Folder;
-use SilverStripe\Assets\Image;
 use SilverStripe\Assets\Tests\FileMigrationHelperTest\Extension;
 use SilverStripe\Core\Config\Config;
-use SilverStripe\Core\Convert;
 use SilverStripe\Dev\SapphireTest;
 
 /**
@@ -49,7 +47,7 @@ public function setUp()
         TestAssetStore::activate('FileMigrationHelperTest/assets');
 
         // Ensure that each file has a local record file in this new assets base
-        $from = __DIR__ . '/ImageTest/test-image-low-quality.jpg';
+        $from = __DIR__ . '/../ImageTest/test-image-low-quality.jpg';
         foreach (File::get()->exclude('ClassName', Folder::class) as $file) {
             $dest = TestAssetStore::base_path() . '/' . $file->generateFilename();
             Filesystem::makeFolder(dirname($dest));
diff --git a/tests/php/FileMigrationHelperTest.yml b/tests/php/Migration/FileMigrationHelperTest.yml
similarity index 100%
rename from tests/php/FileMigrationHelperTest.yml
rename to tests/php/Migration/FileMigrationHelperTest.yml
diff --git a/tests/php/LegacyThumbnailMigrationHelperTest.php b/tests/php/Migration/LegacyThumbnailMigrationHelperTest.php
similarity index 97%
rename from tests/php/LegacyThumbnailMigrationHelperTest.php
rename to tests/php/Migration/LegacyThumbnailMigrationHelperTest.php
index a40356a7..59740687 100644
--- a/tests/php/LegacyThumbnailMigrationHelperTest.php
+++ b/tests/php/Migration/LegacyThumbnailMigrationHelperTest.php
@@ -1,19 +1,16 @@
 <?php
 
-namespace SilverStripe\Assets\Tests;
+namespace SilverStripe\Assets\Tests\Migration;
 
 use Silverstripe\Assets\Dev\TestAssetStore;
 use SilverStripe\Assets\File;
-use SilverStripe\Assets\FileMigrationHelper;
 use SilverStripe\Assets\FilenameParsing\ParsedFileID;
 use SilverStripe\Assets\Filesystem;
-use SilverStripe\Assets\Flysystem\FlysystemAssetStore;
 use SilverStripe\Assets\Folder;
 use SilverStripe\Assets\Image;
-use SilverStripe\Assets\LegacyThumbnailMigrationHelper;
+use SilverStripe\Assets\Migration\LegacyThumbnailMigrationHelper;
 use SilverStripe\Assets\Storage\AssetStore;
 use SilverStripe\Assets\Tests\FileMigrationHelperTest\Extension;
-use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Convert;
 use SilverStripe\Dev\SapphireTest;
 
@@ -49,7 +46,7 @@ public function setUp()
         TestAssetStore::activate('LegacyThumbnailMigrationHelperTest/assets');
 
         // Ensure that each file has a local record file in this new assets base
-        $from = $this->joinPaths(__DIR__, 'ImageTest/test-image-low-quality.jpg');
+        $from = $this->joinPaths(__DIR__, '..', 'ImageTest/test-image-low-quality.jpg');
         foreach (File::get()->exclude('ClassName', Folder::class) as $file) {
             /** @var $file File */
             $file->setFromLocalFile($from, $file->generateFilename());
diff --git a/tests/php/LegacyThumbnailMigrationHelperTest.yml b/tests/php/Migration/LegacyThumbnailMigrationHelperTest.yml
similarity index 100%
rename from tests/php/LegacyThumbnailMigrationHelperTest.yml
rename to tests/php/Migration/LegacyThumbnailMigrationHelperTest.yml