diff --git a/modules/commerce/commerce_migrate_commerce.info.yml b/modules/commerce/commerce_migrate_commerce.info.yml
new file mode 100644
index 0000000..462fd93
--- /dev/null
+++ b/modules/commerce/commerce_migrate_commerce.info.yml
@@ -0,0 +1,9 @@
+name: Commerce Migrate Commerce
+type: module
+description: Provides migrations for Commerce
+core: 8.x
+package: Commerce (contrib)
+dependencies:
+  - commerce
+  - migrate_drupal
+  - commerce_migrate
diff --git a/migration_templates/d7_billing_profile.yml b/modules/commerce/migration_templates/d7_billing_profile.yml
similarity index 100%
rename from migration_templates/d7_billing_profile.yml
rename to modules/commerce/migration_templates/d7_billing_profile.yml
diff --git a/migration_templates/d7_line_item.yml b/modules/commerce/migration_templates/d7_line_item.yml
similarity index 100%
rename from migration_templates/d7_line_item.yml
rename to modules/commerce/migration_templates/d7_line_item.yml
diff --git a/migration_templates/d7_order.yml b/modules/commerce/migration_templates/d7_order.yml
similarity index 100%
rename from migration_templates/d7_order.yml
rename to modules/commerce/migration_templates/d7_order.yml
diff --git a/migration_templates/d7_payment_transaction.yml b/modules/commerce/migration_templates/d7_payment_transaction.yml
similarity index 100%
rename from migration_templates/d7_payment_transaction.yml
rename to modules/commerce/migration_templates/d7_payment_transaction.yml
diff --git a/migration_templates/d7_product.yml b/modules/commerce/migration_templates/d7_product.yml
similarity index 100%
rename from migration_templates/d7_product.yml
rename to modules/commerce/migration_templates/d7_product.yml
diff --git a/migration_templates/d7_product_display.yml b/modules/commerce/migration_templates/d7_product_display.yml
similarity index 100%
rename from migration_templates/d7_product_display.yml
rename to modules/commerce/migration_templates/d7_product_display.yml
diff --git a/migration_templates/d7_product_display_type.yml b/modules/commerce/migration_templates/d7_product_display_type.yml
similarity index 100%
rename from migration_templates/d7_product_display_type.yml
rename to modules/commerce/migration_templates/d7_product_display_type.yml
diff --git a/migration_templates/d7_product_type.yml b/modules/commerce/migration_templates/d7_product_type.yml
similarity index 100%
rename from migration_templates/d7_product_type.yml
rename to modules/commerce/migration_templates/d7_product_type.yml
diff --git a/src/Plugin/migrate/destination/commerce/d7/Profile.php b/modules/commerce/src/Plugin/migrate/destination/d7/Profile.php
similarity index 91%
rename from src/Plugin/migrate/destination/commerce/d7/Profile.php
rename to modules/commerce/src/Plugin/migrate/destination/d7/Profile.php
index b809b10..9eca944 100644
--- a/src/Plugin/migrate/destination/commerce/d7/Profile.php
+++ b/modules/commerce/src/Plugin/migrate/destination/d7/Profile.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\commerce_migrate\Plugin\migrate\destination\commerce\d7;
+namespace Drupal\commerce_migrate_commerce\Plugin\migrate\destination\d7;
 
 use Drupal\migrate\Plugin\migrate\destination\EntityContentBase;
 use Drupal\Core\Entity\ContentEntityInterface;
diff --git a/src/Plugin/migrate/process/d7/CommerceOrderStateDefault.php b/modules/commerce/src/Plugin/migrate/process/d7/CommerceOrderStateDefault.php
similarity index 94%
rename from src/Plugin/migrate/process/d7/CommerceOrderStateDefault.php
rename to modules/commerce/src/Plugin/migrate/process/d7/CommerceOrderStateDefault.php
index 7cf7ef2..a0076cf 100644
--- a/src/Plugin/migrate/process/d7/CommerceOrderStateDefault.php
+++ b/modules/commerce/src/Plugin/migrate/process/d7/CommerceOrderStateDefault.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\commerce_migrate\Plugin\migrate\process\d7;
+namespace Drupal\commerce_migrate_commerce\Plugin\migrate\process\d7;
 
 /**
  * Migrate commerce 1.x order states to commerce 2.x.
diff --git a/src/Plugin/migrate/process/d7/CommerceOrderStateProcessBase.php b/modules/commerce/src/Plugin/migrate/process/d7/CommerceOrderStateProcessBase.php
similarity index 92%
rename from src/Plugin/migrate/process/d7/CommerceOrderStateProcessBase.php
rename to modules/commerce/src/Plugin/migrate/process/d7/CommerceOrderStateProcessBase.php
index c69c4e5..007ac7c 100644
--- a/src/Plugin/migrate/process/d7/CommerceOrderStateProcessBase.php
+++ b/modules/commerce/src/Plugin/migrate/process/d7/CommerceOrderStateProcessBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\commerce_migrate\Plugin\migrate\process\d7;
+namespace Drupal\commerce_migrate_commerce\Plugin\migrate\process\d7;
 
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\ProcessPluginBase;
diff --git a/src/Plugin/migrate/process/d7/CommerceOrderStateValidation.php b/modules/commerce/src/Plugin/migrate/process/d7/CommerceOrderStateValidation.php
similarity index 93%
rename from src/Plugin/migrate/process/d7/CommerceOrderStateValidation.php
rename to modules/commerce/src/Plugin/migrate/process/d7/CommerceOrderStateValidation.php
index 382185a..e9cb755 100644
--- a/src/Plugin/migrate/process/d7/CommerceOrderStateValidation.php
+++ b/modules/commerce/src/Plugin/migrate/process/d7/CommerceOrderStateValidation.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\commerce_migrate\Plugin\migrate\process\d7;
+namespace Drupal\commerce_migrate_commerce\Plugin\migrate\process\d7;
 
 /**
  * Migrate commerce 1.x order states to commerce 2.x.
diff --git a/src/Plugin/migrate/process/d7/CommercePrice.php b/modules/commerce/src/Plugin/migrate/process/d7/CommercePrice.php
similarity index 92%
rename from src/Plugin/migrate/process/d7/CommercePrice.php
rename to modules/commerce/src/Plugin/migrate/process/d7/CommercePrice.php
index 134e766..4badb64 100644
--- a/src/Plugin/migrate/process/d7/CommercePrice.php
+++ b/modules/commerce/src/Plugin/migrate/process/d7/CommercePrice.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\commerce_migrate\Plugin\migrate\process\d7;
+namespace Drupal\commerce_migrate_commerce\Plugin\migrate\process\d7;
 
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\ProcessPluginBase;
diff --git a/src/Plugin/migrate/process/d7/CommerceReference.php b/modules/commerce/src/Plugin/migrate/process/d7/CommerceReference.php
similarity index 88%
rename from src/Plugin/migrate/process/d7/CommerceReference.php
rename to modules/commerce/src/Plugin/migrate/process/d7/CommerceReference.php
index b543d31..a7fda80 100644
--- a/src/Plugin/migrate/process/d7/CommerceReference.php
+++ b/modules/commerce/src/Plugin/migrate/process/d7/CommerceReference.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\commerce_migrate\Plugin\migrate\process\d7;
+namespace Drupal\commerce_migrate_commerce\Plugin\migrate\process\d7;
 
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\ProcessPluginBase;
diff --git a/src/Plugin/migrate/source/commerce/d7/BillingProfile.php b/modules/commerce/src/Plugin/migrate/source/d7/BillingProfile.php
similarity index 96%
rename from src/Plugin/migrate/source/commerce/d7/BillingProfile.php
rename to modules/commerce/src/Plugin/migrate/source/d7/BillingProfile.php
index 518f6a5..5eb093c 100644
--- a/src/Plugin/migrate/source/commerce/d7/BillingProfile.php
+++ b/modules/commerce/src/Plugin/migrate/source/d7/BillingProfile.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\commerce_migrate\Plugin\migrate\source\commerce\d7;
+namespace Drupal\commerce_migrate_commerce\Plugin\migrate\source\d7;
 
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\source\d7\FieldableEntity;
diff --git a/src/Plugin/migrate/source/commerce/d7/LineItem.php b/modules/commerce/src/Plugin/migrate/source/d7/LineItem.php
similarity index 96%
rename from src/Plugin/migrate/source/commerce/d7/LineItem.php
rename to modules/commerce/src/Plugin/migrate/source/d7/LineItem.php
index 20b80d7..f85e8d7 100644
--- a/src/Plugin/migrate/source/commerce/d7/LineItem.php
+++ b/modules/commerce/src/Plugin/migrate/source/d7/LineItem.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\commerce_migrate\Plugin\migrate\source\commerce\d7;
+namespace Drupal\commerce_migrate_commerce\Plugin\migrate\source\d7;
 
 use Drupal\commerce_order\Entity\OrderItemType;
 use Drupal\migrate\Row;
diff --git a/src/Plugin/migrate/source/commerce/d7/Order.php b/modules/commerce/src/Plugin/migrate/source/d7/Order.php
similarity index 97%
rename from src/Plugin/migrate/source/commerce/d7/Order.php
rename to modules/commerce/src/Plugin/migrate/source/d7/Order.php
index f23eda8..ad633d9 100644
--- a/src/Plugin/migrate/source/commerce/d7/Order.php
+++ b/modules/commerce/src/Plugin/migrate/source/d7/Order.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\commerce_migrate\Plugin\migrate\source\commerce\d7;
+namespace Drupal\commerce_migrate_commerce\Plugin\migrate\source\d7;
 
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\source\d7\FieldableEntity;
diff --git a/src/Plugin/migrate/source/commerce/d7/PaymentTransaction.php b/modules/commerce/src/Plugin/migrate/source/d7/PaymentTransaction.php
similarity index 96%
rename from src/Plugin/migrate/source/commerce/d7/PaymentTransaction.php
rename to modules/commerce/src/Plugin/migrate/source/d7/PaymentTransaction.php
index 0643798..7e2580e 100644
--- a/src/Plugin/migrate/source/commerce/d7/PaymentTransaction.php
+++ b/modules/commerce/src/Plugin/migrate/source/d7/PaymentTransaction.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\commerce_migrate\Plugin\migrate\source\commerce\d7;
+namespace Drupal\commerce_migrate_commerce\Plugin\migrate\source\d7;
 
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\source\d7\FieldableEntity;
diff --git a/src/Plugin/migrate/source/commerce/d7/ProductDisplay.php b/modules/commerce/src/Plugin/migrate/source/d7/ProductDisplay.php
similarity index 97%
rename from src/Plugin/migrate/source/commerce/d7/ProductDisplay.php
rename to modules/commerce/src/Plugin/migrate/source/d7/ProductDisplay.php
index d2db3c6..1de40f9 100644
--- a/src/Plugin/migrate/source/commerce/d7/ProductDisplay.php
+++ b/modules/commerce/src/Plugin/migrate/source/d7/ProductDisplay.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\commerce_migrate\Plugin\migrate\source\commerce\d7;
+namespace Drupal\commerce_migrate_commerce\Plugin\migrate\source\d7;
 
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\State\StateInterface;
diff --git a/src/Plugin/migrate/source/commerce/d7/ProductDisplayType.php b/modules/commerce/src/Plugin/migrate/source/d7/ProductDisplayType.php
similarity index 98%
rename from src/Plugin/migrate/source/commerce/d7/ProductDisplayType.php
rename to modules/commerce/src/Plugin/migrate/source/d7/ProductDisplayType.php
index 728052a..c573a30 100644
--- a/src/Plugin/migrate/source/commerce/d7/ProductDisplayType.php
+++ b/modules/commerce/src/Plugin/migrate/source/d7/ProductDisplayType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\commerce_migrate\Plugin\migrate\source\commerce\d7;
+namespace Drupal\commerce_migrate_commerce\Plugin\migrate\source\d7;
 
 use Drupal\migrate\MigrateException;
 use Drupal\migrate\Row;
diff --git a/src/Plugin/migrate/source/commerce/d7/ProductType.php b/modules/commerce/src/Plugin/migrate/source/d7/ProductType.php
similarity index 95%
rename from src/Plugin/migrate/source/commerce/d7/ProductType.php
rename to modules/commerce/src/Plugin/migrate/source/d7/ProductType.php
index 4d4878d..22e0868 100644
--- a/src/Plugin/migrate/source/commerce/d7/ProductType.php
+++ b/modules/commerce/src/Plugin/migrate/source/d7/ProductType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\commerce_migrate\Plugin\migrate\source\commerce\d7;
+namespace Drupal\commerce_migrate_commerce\Plugin\migrate\source\d7;
 
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
diff --git a/src/Plugin/migrate/source/commerce/d7/ProductVariations.php b/modules/commerce/src/Plugin/migrate/source/d7/ProductVariations.php
similarity index 95%
rename from src/Plugin/migrate/source/commerce/d7/ProductVariations.php
rename to modules/commerce/src/Plugin/migrate/source/d7/ProductVariations.php
index bf04a64..b1c9ab2 100644
--- a/src/Plugin/migrate/source/commerce/d7/ProductVariations.php
+++ b/modules/commerce/src/Plugin/migrate/source/d7/ProductVariations.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\commerce_migrate\Plugin\migrate\source\commerce\d7;
+namespace Drupal\commerce_migrate_commerce\Plugin\migrate\source\d7;
 
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\source\d7\FieldableEntity;
diff --git a/tests/fixtures/ck2.php b/modules/commerce/tests/fixtures/ck2.php
similarity index 100%
rename from tests/fixtures/ck2.php
rename to modules/commerce/tests/fixtures/ck2.php
diff --git a/tests/src/Kernel/d7/Commerce/Commerce1TestBase.php b/modules/commerce/tests/src/Kernel/Migrate/d7/Commerce1TestBase.php
similarity index 93%
rename from tests/src/Kernel/d7/Commerce/Commerce1TestBase.php
rename to modules/commerce/tests/src/Kernel/Migrate/d7/Commerce1TestBase.php
index 1d4704c..705f1f6 100644
--- a/tests/src/Kernel/d7/Commerce/Commerce1TestBase.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/Commerce1TestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d7\Commerce;
+namespace Drupal\Tests\commerce_migrate_commerce\Kernel\Migrate\d7;
 
 use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
@@ -26,6 +26,7 @@ abstract class Commerce1TestBase extends MigrateDrupal7TestBase {
     'commerce_store',
     'commerce_order',
     'commerce_migrate',
+    'commerce_migrate_commerce',
   ];
 
   /**
diff --git a/tests/src/Kernel/d7/Commerce/OrderItemTest.php b/modules/commerce/tests/src/Kernel/Migrate/d7/OrderItemTest.php
similarity index 93%
rename from tests/src/Kernel/d7/Commerce/OrderItemTest.php
rename to modules/commerce/tests/src/Kernel/Migrate/d7/OrderItemTest.php
index 8e55188..f802c0e 100644
--- a/tests/src/Kernel/d7/Commerce/OrderItemTest.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/OrderItemTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d7\Commerce;
+namespace Drupal\Tests\commerce_migrate_commerce\Kernel\Migrate\d7;
 
 use Drupal\commerce_order\Entity\OrderItem;
 
 /**
  * Tests order item migration.
  *
- * @group commerce_migrate
+ * @group commerce_migrate_commerce
  */
 class OrderItemTest extends Commerce1TestBase {
 
diff --git a/tests/src/Kernel/d7/Commerce/OrderTest.php b/modules/commerce/tests/src/Kernel/Migrate/d7/OrderTest.php
similarity index 96%
rename from tests/src/Kernel/d7/Commerce/OrderTest.php
rename to modules/commerce/tests/src/Kernel/Migrate/d7/OrderTest.php
index 90e55c2..785f548 100644
--- a/tests/src/Kernel/d7/Commerce/OrderTest.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/OrderTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d7\Commerce;
+namespace Drupal\Tests\commerce_migrate_commerce\Kernel\Migrate\d7;
 
 use Drupal\commerce_order\Entity\Order;
 
 /**
  * Tests line item migration.
  *
- * @group commerce_migrate
+ * @group commerce_migrate_commerce
  */
 class OrderTest extends Commerce1TestBase {
 
diff --git a/tests/src/Kernel/d7/Commerce/ProductTest.php b/modules/commerce/tests/src/Kernel/Migrate/d7/ProductTest.php
similarity index 93%
rename from tests/src/Kernel/d7/Commerce/ProductTest.php
rename to modules/commerce/tests/src/Kernel/Migrate/d7/ProductTest.php
index b043ecc..73faafb 100644
--- a/tests/src/Kernel/d7/Commerce/ProductTest.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/ProductTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d7\Commerce;
+namespace Drupal\Tests\commerce_migrate_commerce\Kernel\Migrate\d7;
 
 use Drupal\commerce_product\Entity\Product;
 
 /**
  * Tests line item migration.
  *
- * @group commerce_migrate
+ * @group commerce_migrate_commerce
  */
 class ProductTest extends Commerce1TestBase {
 
diff --git a/tests/src/Kernel/d7/Commerce/ProductTypeTest.php b/modules/commerce/tests/src/Kernel/Migrate/d7/ProductTypeTest.php
similarity index 94%
rename from tests/src/Kernel/d7/Commerce/ProductTypeTest.php
rename to modules/commerce/tests/src/Kernel/Migrate/d7/ProductTypeTest.php
index a736e8b..0e47f1f 100644
--- a/tests/src/Kernel/d7/Commerce/ProductTypeTest.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/ProductTypeTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d7\Commerce;
+namespace Drupal\Tests\commerce_migrate_commerce\Kernel\Migrate\d7;
 
 use Drupal\commerce_product\Entity\ProductType;
 
 /**
  * Tests line item migration.
  *
- * @group commerce_migrate
+ * @group commerce_migrate_commerce
  */
 class ProductTypeTest extends Commerce1TestBase {
 
diff --git a/tests/src/Kernel/d7/Commerce/ProductVariationTest.php b/modules/commerce/tests/src/Kernel/Migrate/d7/ProductVariationTest.php
similarity index 91%
rename from tests/src/Kernel/d7/Commerce/ProductVariationTest.php
rename to modules/commerce/tests/src/Kernel/Migrate/d7/ProductVariationTest.php
index 3b8b68d..173eb91 100644
--- a/tests/src/Kernel/d7/Commerce/ProductVariationTest.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/ProductVariationTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d7\Commerce;
+namespace Drupal\Tests\commerce_migrate_commerce\Kernel\Migrate\d7;
 
 use Drupal\commerce_product\Entity\ProductVariation;
 
 /**
  * Tests line item migration.
  *
- * @group commerce_migrate
+ * @group commerce_migrate_commerce
  */
 class ProductVariationTest extends Commerce1TestBase {
 
diff --git a/tests/src/Kernel/d7/Commerce/ProductVariationTypeTest.php b/modules/commerce/tests/src/Kernel/Migrate/d7/ProductVariationTypeTest.php
similarity index 91%
rename from tests/src/Kernel/d7/Commerce/ProductVariationTypeTest.php
rename to modules/commerce/tests/src/Kernel/Migrate/d7/ProductVariationTypeTest.php
index 29f5f52..cdf7b78 100644
--- a/tests/src/Kernel/d7/Commerce/ProductVariationTypeTest.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/ProductVariationTypeTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d7\Commerce;
+namespace Drupal\Tests\commerce_migrate_commerce\Kernel\Migrate\d7;
 
 use Drupal\commerce_product\Entity\ProductVariationType;
 
 /**
  * Tests product variation type migration.
  *
- * @group commerce_migrate
+ * @group commerce_migrate_commerce
  */
 class ProductVariationTypeTest extends Commerce1TestBase {
 
diff --git a/tests/src/Kernel/d7/Commerce/ProfileBillingTest.php b/modules/commerce/tests/src/Kernel/Migrate/d7/ProfileBillingTest.php
similarity index 89%
rename from tests/src/Kernel/d7/Commerce/ProfileBillingTest.php
rename to modules/commerce/tests/src/Kernel/Migrate/d7/ProfileBillingTest.php
index 97239cd..53f7142 100644
--- a/tests/src/Kernel/d7/Commerce/ProfileBillingTest.php
+++ b/modules/commerce/tests/src/Kernel/Migrate/d7/ProfileBillingTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d7\Commerce;
+namespace Drupal\Tests\commerce_migrate_commerce\Kernel\Migrate\d7;
 
 use Drupal\profile\Entity\Profile;
 
 /**
  * Tests billing profile migration.
  *
- * @group commerce_migrate
+ * @group commerce_migrate_commerce
  */
 class ProfileBillingTest extends Commerce1TestBase {