diff --git a/drush.services.yml b/drush.services.yml
index a61bab8..2257d42 100644
--- a/drush.services.yml
+++ b/drush.services.yml
@@ -1,6 +1,6 @@
 services:
   migrate_tools.commands:
-    class: Drupal\migrate_tools\Drush\MigrateToolsCommands
+    class: Drupal\migrate_tools\Drush\Commands\MigrateToolsCommands
     arguments: ['@plugin.manager.migration', '@date.formatter', '@entity_type.manager', '@keyvalue']
     tags:
       - { name: drush.command }
diff --git a/src/Drush/MigrateToolsCommands.php b/src/Drush/Commands/MigrateToolsCommands.php
similarity index 99%
rename from src/Drush/MigrateToolsCommands.php
rename to src/Drush/Commands/MigrateToolsCommands.php
index fa69bbe..89c227f 100644
--- a/src/Drush/MigrateToolsCommands.php
+++ b/src/Drush/Commands/MigrateToolsCommands.php
@@ -2,7 +2,7 @@
 
 declare(strict_types = 1);
 
-namespace Drupal\migrate_tools\Drush;
+namespace Drupal\migrate_tools\Drush\Commands;
 
 use Consolidation\OutputFormatters\StructuredData\RowsOfFields;
 use Drupal\Component\Graph\Graph;
diff --git a/tests/src/Kernel/DrushTest.php b/tests/src/Kernel/DrushTest.php
index abb945e..38b3ad0 100644
--- a/tests/src/Kernel/DrushTest.php
+++ b/tests/src/Kernel/DrushTest.php
@@ -6,7 +6,7 @@ namespace Drupal\Tests\migrate_tools\Kernel {
 
   use Drupal\migrate\Plugin\MigrationInterface;
   use Drupal\migrate\Plugin\MigrationPluginManagerInterface;
-  use Drupal\migrate_tools\Drush\MigrateToolsCommands;
+  use Drupal\migrate_tools\Drush\Commands\MigrateToolsCommands;
   use Drupal\migrate_tools\MigrateTools;
   use Drupal\Tests\migrate\Kernel\MigrateTestBase;
   use Drush\Log\DrushLoggerManager;