diff --git a/migration_templates/d6_ubercart_order.yml b/modules/ubercart/migration_templates/d6_ubercart_order.yml
similarity index 100%
rename from migration_templates/d6_ubercart_order.yml
rename to modules/ubercart/migration_templates/d6_ubercart_order.yml
diff --git a/migration_templates/d6_ubercart_order_product.yml b/modules/ubercart/migration_templates/d6_ubercart_order_product.yml
similarity index 100%
rename from migration_templates/d6_ubercart_order_product.yml
rename to modules/ubercart/migration_templates/d6_ubercart_order_product.yml
diff --git a/migration_templates/d6_ubercart_product.yml b/modules/ubercart/migration_templates/d6_ubercart_product.yml
similarity index 100%
rename from migration_templates/d6_ubercart_product.yml
rename to modules/ubercart/migration_templates/d6_ubercart_product.yml
diff --git a/migration_templates/d6_ubercart_product_variation.yml b/modules/ubercart/migration_templates/d6_ubercart_product_variation.yml
similarity index 100%
rename from migration_templates/d6_ubercart_product_variation.yml
rename to modules/ubercart/migration_templates/d6_ubercart_product_variation.yml
diff --git a/migration_templates/d6_ubercart_store.yml b/modules/ubercart/migration_templates/d6_ubercart_store.yml
similarity index 100%
rename from migration_templates/d6_ubercart_store.yml
rename to modules/ubercart/migration_templates/d6_ubercart_store.yml
diff --git a/migration_templates/ubercart_currency.yml b/modules/ubercart/migration_templates/ubercart_currency.yml
similarity index 100%
rename from migration_templates/ubercart_currency.yml
rename to modules/ubercart/migration_templates/ubercart_currency.yml
diff --git a/src/Plugin/migrate/source/ubercart/Currency.php b/modules/ubercart/src/Plugin/migrate/source/Currency.php
similarity index 97%
rename from src/Plugin/migrate/source/ubercart/Currency.php
rename to modules/ubercart/src/Plugin/migrate/source/Currency.php
index 5cd88bd..f540998 100644
--- a/src/Plugin/migrate/source/ubercart/Currency.php
+++ b/modules/ubercart/src/Plugin/migrate/source/Currency.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\commerce_migrate\Plugin\migrate\source\ubercart;
+namespace Drupal\commerce_migrate_ubercart\Plugin\migrate\source;
 
 use Drupal\commerce_price\CurrencyImporter;
 use Drupal\migrate\Row;
diff --git a/src/Plugin/migrate/source/ubercart/Store.php b/modules/ubercart/src/Plugin/migrate/source/Store.php
similarity index 93%
rename from src/Plugin/migrate/source/ubercart/Store.php
rename to modules/ubercart/src/Plugin/migrate/source/Store.php
index 49f1a1a..914e610 100644
--- a/src/Plugin/migrate/source/ubercart/Store.php
+++ b/modules/ubercart/src/Plugin/migrate/source/Store.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\commerce_migrate\Plugin\migrate\source\ubercart;
+namespace Drupal\commerce_migrate_ubercart\Plugin\migrate\source;
 
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\source\Variable;
diff --git a/src/Plugin/migrate/source/ubercart/d6/Order.php b/modules/ubercart/src/Plugin/migrate/source/d6/Order.php
similarity index 96%
rename from src/Plugin/migrate/source/ubercart/d6/Order.php
rename to modules/ubercart/src/Plugin/migrate/source/d6/Order.php
index 6e39f9c..d495d08 100644
--- a/src/Plugin/migrate/source/ubercart/d6/Order.php
+++ b/modules/ubercart/src/Plugin/migrate/source/d6/Order.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\commerce_migrate\Plugin\migrate\source\ubercart\d6;
+namespace Drupal\commerce_migrate_ubercart\Plugin\migrate\source\d6;
 
 use Drupal\migrate\Plugin\migrate\source\SqlBase;
 use Drupal\migrate\Row;
diff --git a/src/Plugin/migrate/source/ubercart/d6/OrderProduct.php b/modules/ubercart/src/Plugin/migrate/source/d6/OrderProduct.php
similarity index 96%
rename from src/Plugin/migrate/source/ubercart/d6/OrderProduct.php
rename to modules/ubercart/src/Plugin/migrate/source/d6/OrderProduct.php
index 23c6c95..574c714 100644
--- a/src/Plugin/migrate/source/ubercart/d6/OrderProduct.php
+++ b/modules/ubercart/src/Plugin/migrate/source/d6/OrderProduct.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\commerce_migrate\Plugin\migrate\source\ubercart\d6;
+namespace Drupal\commerce_migrate_ubercart\Plugin\migrate\source\d6;
 
 use Drupal\migrate\Plugin\migrate\source\SqlBase;
 use Drupal\migrate\Row;
diff --git a/src/Plugin/migrate/source/ubercart/d6/Product.php b/modules/ubercart/src/Plugin/migrate/source/d6/Product.php
similarity index 97%
rename from src/Plugin/migrate/source/ubercart/d6/Product.php
rename to modules/ubercart/src/Plugin/migrate/source/d6/Product.php
index f94da24..a6bd40c 100644
--- a/src/Plugin/migrate/source/ubercart/d6/Product.php
+++ b/modules/ubercart/src/Plugin/migrate/source/d6/Product.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\commerce_migrate\Plugin\migrate\source\ubercart\d6;
+namespace Drupal\commerce_migrate_ubercart\Plugin\migrate\source\d6;
 
 use Drupal\Core\State\StateInterface;
 use Drupal\migrate\MigrateException;
diff --git a/src/Plugin/migrate/source/ubercart/d6/ProductVariation.php b/modules/ubercart/src/Plugin/migrate/source/d6/ProductVariation.php
similarity index 96%
rename from src/Plugin/migrate/source/ubercart/d6/ProductVariation.php
rename to modules/ubercart/src/Plugin/migrate/source/d6/ProductVariation.php
index ef867c4..1df77f2 100644
--- a/src/Plugin/migrate/source/ubercart/d6/ProductVariation.php
+++ b/modules/ubercart/src/Plugin/migrate/source/d6/ProductVariation.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\commerce_migrate\Plugin\migrate\source\ubercart\d6;
+namespace Drupal\commerce_migrate_ubercart\Plugin\migrate\source\d6;
 
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
diff --git a/tests/fixtures/uc6.php b/modules/ubercart/tests/fixtures/uc6.php
similarity index 100%
rename from tests/fixtures/uc6.php
rename to modules/ubercart/tests/fixtures/uc6.php
diff --git a/tests/fixtures/uc7.php b/modules/ubercart/tests/fixtures/uc7.php
similarity index 100%
rename from tests/fixtures/uc7.php
rename to modules/ubercart/tests/fixtures/uc7.php
diff --git a/tests/src/Kernel/d6/Ubercart/CurrencyTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/CurrencyTest.php
similarity index 88%
rename from tests/src/Kernel/d6/Ubercart/CurrencyTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d6/CurrencyTest.php
index fd7c9fe..ba9a726 100644
--- a/tests/src/Kernel/d6/Ubercart/CurrencyTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/CurrencyTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d6\Ubercart;
+namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
 
 use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProfileBillingTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProfileBillingTest.php
index 0b36a29..7105686 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProfileBillingTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProfileBillingTest.php
@@ -4,7 +4,6 @@ namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
 
 use Drupal\profile\Entity\Profile;
 use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
-use Drupal\Tests\commerce_migrate\Kernel\d6\Ubercart\Ubercart6TestBase;
 
 /**
  * Tests billing profile migration.
diff --git a/tests/src/Kernel/d6/Ubercart/OrderItemTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/OrderItemTest.php
similarity index 96%
rename from tests/src/Kernel/d6/Ubercart/OrderItemTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d6/OrderItemTest.php
index 546d1af..40dfd72 100644
--- a/tests/src/Kernel/d6/Ubercart/OrderItemTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/OrderItemTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d6\Ubercart;
+namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
 
 use Drupal\commerce_order\Entity\OrderItem;
 use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
diff --git a/tests/src/Kernel/d6/Ubercart/OrderTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/OrderTest.php
similarity index 98%
rename from tests/src/Kernel/d6/Ubercart/OrderTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d6/OrderTest.php
index 1eb740a..99c7c45 100644
--- a/tests/src/Kernel/d6/Ubercart/OrderTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/OrderTest.php
@@ -22,7 +22,6 @@ class OrderTest extends Ubercart6TestBase {
   public static $modules = [
     'path',
     'commerce_product',
-    'commerce_migrate_ubercart',
   ];
 
   /**
diff --git a/tests/src/Kernel/d6/Ubercart/ProductTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/ProductTest.php
similarity index 95%
rename from tests/src/Kernel/d6/Ubercart/ProductTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d6/ProductTest.php
index ff0d8e4..933981f 100644
--- a/tests/src/Kernel/d6/Ubercart/ProductTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/ProductTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d6\Ubercart;
+namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
 
 use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
diff --git a/tests/src/Kernel/d6/Ubercart/ProductVariationTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/ProductVariationTest.php
similarity index 95%
rename from tests/src/Kernel/d6/Ubercart/ProductVariationTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d6/ProductVariationTest.php
index f6ed749..e65c0f4 100644
--- a/tests/src/Kernel/d6/Ubercart/ProductVariationTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/ProductVariationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d6\Ubercart;
+namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
 
 use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
diff --git a/tests/src/Kernel/d6/Ubercart/StoreTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/StoreTest.php
similarity index 93%
rename from tests/src/Kernel/d6/Ubercart/StoreTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d6/StoreTest.php
index f03c0c0..31b754f 100644
--- a/tests/src/Kernel/d6/Ubercart/StoreTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/StoreTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d6\Ubercart;
+namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
 
 use Drupal\commerce_store\Entity\Store;
 use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
diff --git a/tests/src/Kernel/d6/Ubercart/Ubercart6TestBase.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/Ubercart6TestBase.php
similarity index 87%
rename from tests/src/Kernel/d6/Ubercart/Ubercart6TestBase.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d6/Ubercart6TestBase.php
index e6d1206..d472171 100644
--- a/tests/src/Kernel/d6/Ubercart/Ubercart6TestBase.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/Ubercart6TestBase.php
@@ -1,9 +1,12 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d6\Ubercart;
+namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
 
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
+/**
+ * Test base for Ubercart D6 tests.
+ */
 abstract class Ubercart6TestBase extends MigrateDrupal6TestBase {
 
   /**
@@ -26,6 +29,7 @@ abstract class Ubercart6TestBase extends MigrateDrupal6TestBase {
     'state_machine',
     'text',
     'views',
+    'commerce_migrate_ubercart',
   ];
 
   /**
diff --git a/tests/src/Kernel/d7/Ubercart/CurrencyTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d7/CurrencyTest.php
similarity index 95%
rename from tests/src/Kernel/d7/Ubercart/CurrencyTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d7/CurrencyTest.php
index ecfcb33..c1ddc3d 100644
--- a/tests/src/Kernel/d7/Ubercart/CurrencyTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d7/CurrencyTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d7\Ubercart;
+namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d7;
 
 use Drupal\commerce_price\Entity\Currency;
 use Drupal\commerce_price\Entity\CurrencyInterface;
diff --git a/tests/src/Kernel/d7/Ubercart/StoreTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d7/StoreTest.php
similarity index 96%
rename from tests/src/Kernel/d7/Ubercart/StoreTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d7/StoreTest.php
index a52de1a..f0618a3 100644
--- a/tests/src/Kernel/d7/Ubercart/StoreTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d7/StoreTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d7\Ubercart;
+namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d7;
 
 use Drupal\address\Plugin\Field\FieldType\AddressItem;
 use Drupal\commerce_store\Entity\Store;
diff --git a/tests/src/Kernel/d7/Ubercart/Ubercart7FixtureTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d7/Ubercart7FixtureTest.php
similarity index 89%
rename from tests/src/Kernel/d7/Ubercart/Ubercart7FixtureTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d7/Ubercart7FixtureTest.php
index 789c2a6..22d2a77 100644
--- a/tests/src/Kernel/d7/Ubercart/Ubercart7FixtureTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d7/Ubercart7FixtureTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d7\Ubercart;
+namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d7;
 
 use Drupal\user\Entity\User;
 
diff --git a/tests/src/Kernel/d7/Ubercart/Ubercart7TestBase.php b/modules/ubercart/tests/src/Kernel/Migrate/d7/Ubercart7TestBase.php
similarity index 94%
rename from tests/src/Kernel/d7/Ubercart/Ubercart7TestBase.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d7/Ubercart7TestBase.php
index 46bc814..c85a1c8 100644
--- a/tests/src/Kernel/d7/Ubercart/Ubercart7TestBase.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d7/Ubercart7TestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d7\Ubercart;
+namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d7;
 
 use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
@@ -29,6 +29,7 @@ abstract class Ubercart7TestBase extends MigrateDrupal7TestBase {
     'state_machine',
     'text',
     'views',
+    'commerce_migrate_ubercart',
   ];
 
   /**