diff --git a/.eslintrc.js b/.eslintrc.js
index 982cb783dd..43fc335610 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -130,6 +130,11 @@ module.exports = {
           "./packages/modules/workflow-engine-redis/tsconfig.spec.json",
           "./packages/modules/link-modules/tsconfig.spec.json",
           "./packages/modules/user/tsconfig.spec.json",
+
+          "./packages/modules/providers/file-local/tsconfig.spec.json",
+          "./packages/modules/providers/file-s3/tsconfig.spec.json",
+          "./packages/modules/providers/fulfillment-manual/tsconfig.spec.json",
+          "./packages/modules/providers/payment-stripe/tsconfig.spec.json",
         ],
       },
       rules: {
diff --git a/package.json b/package.json
index 931b86f983..8f321a0eb4 100644
--- a/package.json
+++ b/package.json
@@ -5,9 +5,9 @@
     "packages": [
       "packages/medusa",
       "packages/modules/*",
+      "packages/modules/providers/*",
       "packages/core/*",
       "packages/cli/*",
-      "packages/testing/*",
       "packages/medusa-js",
       "packages/medusa-react",
       "packages/*",
diff --git a/packages/file-local/.gitignore b/packages/modules/providers/file-local/.gitignore
similarity index 100%
rename from packages/file-local/.gitignore
rename to packages/modules/providers/file-local/.gitignore
diff --git a/packages/file-local/README.md b/packages/modules/providers/file-local/README.md
similarity index 100%
rename from packages/file-local/README.md
rename to packages/modules/providers/file-local/README.md
diff --git a/packages/file-local/jest.config.js b/packages/modules/providers/file-local/jest.config.js
similarity index 100%
rename from packages/file-local/jest.config.js
rename to packages/modules/providers/file-local/jest.config.js
diff --git a/packages/file-local/package.json b/packages/modules/providers/file-local/package.json
similarity index 100%
rename from packages/file-local/package.json
rename to packages/modules/providers/file-local/package.json
diff --git a/packages/file-local/src/index.ts b/packages/modules/providers/file-local/src/index.ts
similarity index 100%
rename from packages/file-local/src/index.ts
rename to packages/modules/providers/file-local/src/index.ts
diff --git a/packages/file-local/src/services/local-file.ts b/packages/modules/providers/file-local/src/services/local-file.ts
similarity index 100%
rename from packages/file-local/src/services/local-file.ts
rename to packages/modules/providers/file-local/src/services/local-file.ts
diff --git a/packages/file-local/tsconfig.json b/packages/modules/providers/file-local/tsconfig.json
similarity index 100%
rename from packages/file-local/tsconfig.json
rename to packages/modules/providers/file-local/tsconfig.json
diff --git a/packages/file-local/tsconfig.spec.json b/packages/modules/providers/file-local/tsconfig.spec.json
similarity index 100%
rename from packages/file-local/tsconfig.spec.json
rename to packages/modules/providers/file-local/tsconfig.spec.json
diff --git a/packages/file-s3/.gitignore b/packages/modules/providers/file-s3/.gitignore
similarity index 100%
rename from packages/file-s3/.gitignore
rename to packages/modules/providers/file-s3/.gitignore
diff --git a/packages/file-s3/README.md b/packages/modules/providers/file-s3/README.md
similarity index 100%
rename from packages/file-s3/README.md
rename to packages/modules/providers/file-s3/README.md
diff --git a/packages/file-s3/integration-tests/__fixtures__/catphoto.jpg b/packages/modules/providers/file-s3/integration-tests/__fixtures__/catphoto.jpg
similarity index 100%
rename from packages/file-s3/integration-tests/__fixtures__/catphoto.jpg
rename to packages/modules/providers/file-s3/integration-tests/__fixtures__/catphoto.jpg
diff --git a/packages/file-s3/integration-tests/__tests__/services.spec.ts b/packages/modules/providers/file-s3/integration-tests/__tests__/services.spec.ts
similarity index 100%
rename from packages/file-s3/integration-tests/__tests__/services.spec.ts
rename to packages/modules/providers/file-s3/integration-tests/__tests__/services.spec.ts
diff --git a/packages/file-s3/jest.config.js b/packages/modules/providers/file-s3/jest.config.js
similarity index 100%
rename from packages/file-s3/jest.config.js
rename to packages/modules/providers/file-s3/jest.config.js
diff --git a/packages/file-s3/package.json b/packages/modules/providers/file-s3/package.json
similarity index 100%
rename from packages/file-s3/package.json
rename to packages/modules/providers/file-s3/package.json
diff --git a/packages/file-s3/src/index.ts b/packages/modules/providers/file-s3/src/index.ts
similarity index 100%
rename from packages/file-s3/src/index.ts
rename to packages/modules/providers/file-s3/src/index.ts
diff --git a/packages/file-s3/src/services/s3-file.ts b/packages/modules/providers/file-s3/src/services/s3-file.ts
similarity index 100%
rename from packages/file-s3/src/services/s3-file.ts
rename to packages/modules/providers/file-s3/src/services/s3-file.ts
diff --git a/packages/file-s3/tsconfig.json b/packages/modules/providers/file-s3/tsconfig.json
similarity index 100%
rename from packages/file-s3/tsconfig.json
rename to packages/modules/providers/file-s3/tsconfig.json
diff --git a/packages/file-s3/tsconfig.spec.json b/packages/modules/providers/file-s3/tsconfig.spec.json
similarity index 100%
rename from packages/file-s3/tsconfig.spec.json
rename to packages/modules/providers/file-s3/tsconfig.spec.json
diff --git a/packages/fulfillment-manual/.gitignore b/packages/modules/providers/fulfillment-manual/.gitignore
similarity index 100%
rename from packages/fulfillment-manual/.gitignore
rename to packages/modules/providers/fulfillment-manual/.gitignore
diff --git a/packages/fulfillment-manual/CHANGELOG.md b/packages/modules/providers/fulfillment-manual/CHANGELOG.md
similarity index 100%
rename from packages/fulfillment-manual/CHANGELOG.md
rename to packages/modules/providers/fulfillment-manual/CHANGELOG.md
diff --git a/packages/fulfillment-manual/README.md b/packages/modules/providers/fulfillment-manual/README.md
similarity index 100%
rename from packages/fulfillment-manual/README.md
rename to packages/modules/providers/fulfillment-manual/README.md
diff --git a/packages/fulfillment-manual/jest.config.js b/packages/modules/providers/fulfillment-manual/jest.config.js
similarity index 100%
rename from packages/fulfillment-manual/jest.config.js
rename to packages/modules/providers/fulfillment-manual/jest.config.js
diff --git a/packages/fulfillment-manual/package.json b/packages/modules/providers/fulfillment-manual/package.json
similarity index 100%
rename from packages/fulfillment-manual/package.json
rename to packages/modules/providers/fulfillment-manual/package.json
diff --git a/packages/fulfillment-manual/src/index.ts b/packages/modules/providers/fulfillment-manual/src/index.ts
similarity index 100%
rename from packages/fulfillment-manual/src/index.ts
rename to packages/modules/providers/fulfillment-manual/src/index.ts
diff --git a/packages/fulfillment-manual/src/services/manual-fulfillment.ts b/packages/modules/providers/fulfillment-manual/src/services/manual-fulfillment.ts
similarity index 100%
rename from packages/fulfillment-manual/src/services/manual-fulfillment.ts
rename to packages/modules/providers/fulfillment-manual/src/services/manual-fulfillment.ts
diff --git a/packages/fulfillment-manual/tsconfig.json b/packages/modules/providers/fulfillment-manual/tsconfig.json
similarity index 100%
rename from packages/fulfillment-manual/tsconfig.json
rename to packages/modules/providers/fulfillment-manual/tsconfig.json
diff --git a/packages/fulfillment-manual/tsconfig.spec.json b/packages/modules/providers/fulfillment-manual/tsconfig.spec.json
similarity index 100%
rename from packages/fulfillment-manual/tsconfig.spec.json
rename to packages/modules/providers/fulfillment-manual/tsconfig.spec.json
diff --git a/packages/payment-stripe/.gitignore b/packages/modules/providers/payment-stripe/.gitignore
similarity index 100%
rename from packages/payment-stripe/.gitignore
rename to packages/modules/providers/payment-stripe/.gitignore
diff --git a/packages/payment-stripe/CHANGELOG.md b/packages/modules/providers/payment-stripe/CHANGELOG.md
similarity index 100%
rename from packages/payment-stripe/CHANGELOG.md
rename to packages/modules/providers/payment-stripe/CHANGELOG.md
diff --git a/packages/payment-stripe/README.md b/packages/modules/providers/payment-stripe/README.md
similarity index 100%
rename from packages/payment-stripe/README.md
rename to packages/modules/providers/payment-stripe/README.md
diff --git a/packages/payment-stripe/jest.config.js b/packages/modules/providers/payment-stripe/jest.config.js
similarity index 100%
rename from packages/payment-stripe/jest.config.js
rename to packages/modules/providers/payment-stripe/jest.config.js
diff --git a/packages/payment-stripe/package.json b/packages/modules/providers/payment-stripe/package.json
similarity index 100%
rename from packages/payment-stripe/package.json
rename to packages/modules/providers/payment-stripe/package.json
diff --git a/packages/payment-stripe/src/core/stripe-base.ts b/packages/modules/providers/payment-stripe/src/core/stripe-base.ts
similarity index 100%
rename from packages/payment-stripe/src/core/stripe-base.ts
rename to packages/modules/providers/payment-stripe/src/core/stripe-base.ts
diff --git a/packages/payment-stripe/src/index.ts b/packages/modules/providers/payment-stripe/src/index.ts
similarity index 100%
rename from packages/payment-stripe/src/index.ts
rename to packages/modules/providers/payment-stripe/src/index.ts
diff --git a/packages/payment-stripe/src/services/index.ts b/packages/modules/providers/payment-stripe/src/services/index.ts
similarity index 100%
rename from packages/payment-stripe/src/services/index.ts
rename to packages/modules/providers/payment-stripe/src/services/index.ts
diff --git a/packages/payment-stripe/src/services/stripe-bancontact.ts b/packages/modules/providers/payment-stripe/src/services/stripe-bancontact.ts
similarity index 100%
rename from packages/payment-stripe/src/services/stripe-bancontact.ts
rename to packages/modules/providers/payment-stripe/src/services/stripe-bancontact.ts
diff --git a/packages/payment-stripe/src/services/stripe-blik.ts b/packages/modules/providers/payment-stripe/src/services/stripe-blik.ts
similarity index 100%
rename from packages/payment-stripe/src/services/stripe-blik.ts
rename to packages/modules/providers/payment-stripe/src/services/stripe-blik.ts
diff --git a/packages/payment-stripe/src/services/stripe-giropay.ts b/packages/modules/providers/payment-stripe/src/services/stripe-giropay.ts
similarity index 100%
rename from packages/payment-stripe/src/services/stripe-giropay.ts
rename to packages/modules/providers/payment-stripe/src/services/stripe-giropay.ts
diff --git a/packages/payment-stripe/src/services/stripe-ideal.ts b/packages/modules/providers/payment-stripe/src/services/stripe-ideal.ts
similarity index 100%
rename from packages/payment-stripe/src/services/stripe-ideal.ts
rename to packages/modules/providers/payment-stripe/src/services/stripe-ideal.ts
diff --git a/packages/payment-stripe/src/services/stripe-provider.ts b/packages/modules/providers/payment-stripe/src/services/stripe-provider.ts
similarity index 100%
rename from packages/payment-stripe/src/services/stripe-provider.ts
rename to packages/modules/providers/payment-stripe/src/services/stripe-provider.ts
diff --git a/packages/payment-stripe/src/services/stripe-przelewy24.ts b/packages/modules/providers/payment-stripe/src/services/stripe-przelewy24.ts
similarity index 100%
rename from packages/payment-stripe/src/services/stripe-przelewy24.ts
rename to packages/modules/providers/payment-stripe/src/services/stripe-przelewy24.ts
diff --git a/packages/payment-stripe/src/types/index.ts b/packages/modules/providers/payment-stripe/src/types/index.ts
similarity index 100%
rename from packages/payment-stripe/src/types/index.ts
rename to packages/modules/providers/payment-stripe/src/types/index.ts
diff --git a/packages/payment-stripe/tsconfig.json b/packages/modules/providers/payment-stripe/tsconfig.json
similarity index 100%
rename from packages/payment-stripe/tsconfig.json
rename to packages/modules/providers/payment-stripe/tsconfig.json
diff --git a/packages/payment-stripe/tsconfig.spec.json b/packages/modules/providers/payment-stripe/tsconfig.spec.json
similarity index 100%
rename from packages/payment-stripe/tsconfig.spec.json
rename to packages/modules/providers/payment-stripe/tsconfig.spec.json
diff --git a/yarn.lock b/yarn.lock
index f0ba783f86..0c00cb961c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6600,9 +6600,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@medusajs/file-local-next@workspace:packages/file-local":
+"@medusajs/file-local-next@workspace:packages/modules/providers/file-local":
   version: 0.0.0-use.local
-  resolution: "@medusajs/file-local-next@workspace:packages/file-local"
+  resolution: "@medusajs/file-local-next@workspace:packages/modules/providers/file-local"
   dependencies:
     "@medusajs/utils": ^1.11.7
     cross-env: ^5.2.1
@@ -6612,9 +6612,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@medusajs/file-s3@workspace:packages/file-s3":
+"@medusajs/file-s3@workspace:packages/modules/providers/file-s3":
   version: 0.0.0-use.local
-  resolution: "@medusajs/file-s3@workspace:packages/file-s3"
+  resolution: "@medusajs/file-s3@workspace:packages/modules/providers/file-s3"
   dependencies:
     "@aws-sdk/client-s3": ^3.556.0
     "@aws-sdk/s3-request-presigner": ^3.556.0
@@ -6656,9 +6656,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@medusajs/fulfillment-manual@workspace:*, @medusajs/fulfillment-manual@workspace:^, @medusajs/fulfillment-manual@workspace:packages/fulfillment-manual":
+"@medusajs/fulfillment-manual@workspace:*, @medusajs/fulfillment-manual@workspace:^, @medusajs/fulfillment-manual@workspace:packages/modules/providers/fulfillment-manual":
   version: 0.0.0-use.local
-  resolution: "@medusajs/fulfillment-manual@workspace:packages/fulfillment-manual"
+  resolution: "@medusajs/fulfillment-manual@workspace:packages/modules/providers/fulfillment-manual"
   dependencies:
     "@medusajs/utils": ^1.11.7
     body-parser: ^1.19.0
@@ -7037,9 +7037,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@medusajs/payment-stripe@workspace:packages/payment-stripe":
+"@medusajs/payment-stripe@workspace:packages/modules/providers/payment-stripe":
   version: 0.0.0-use.local
-  resolution: "@medusajs/payment-stripe@workspace:packages/payment-stripe"
+  resolution: "@medusajs/payment-stripe@workspace:packages/modules/providers/payment-stripe"
   dependencies:
     "@medusajs/medusa": ^1.20.3
     "@medusajs/utils": ^1.11.7