diff --git a/static/admin/js/billing-history.js b/app/modules/billing/static/admin/js/billing-history.js
similarity index 100%
rename from static/admin/js/billing-history.js
rename to app/modules/billing/static/admin/js/billing-history.js
diff --git a/static/admin/js/subscription-tiers.js b/app/modules/billing/static/admin/js/subscription-tiers.js
similarity index 99%
rename from static/admin/js/subscription-tiers.js
rename to app/modules/billing/static/admin/js/subscription-tiers.js
index 547237ab..94b4c041 100644
--- a/static/admin/js/subscription-tiers.js
+++ b/app/modules/billing/static/admin/js/subscription-tiers.js
@@ -1,4 +1,4 @@
-// static/admin/js/subscription-tiers.js
+// app/modules/billing/static/admin/js/subscription-tiers.js
 // noqa: JS-003 - Uses ...baseData which is data() with safety check
 
 const tiersLog = window.LogConfig?.loggers?.subscriptionTiers || window.LogConfig?.createLogger?.('subscriptionTiers') || console;
diff --git a/static/admin/js/subscriptions.js b/app/modules/billing/static/admin/js/subscriptions.js
similarity index 100%
rename from static/admin/js/subscriptions.js
rename to app/modules/billing/static/admin/js/subscriptions.js
diff --git a/static/shared/js/feature-store.js b/app/modules/billing/static/shared/js/feature-store.js
similarity index 99%
rename from static/shared/js/feature-store.js
rename to app/modules/billing/static/shared/js/feature-store.js
index c155563e..5d26106b 100644
--- a/static/shared/js/feature-store.js
+++ b/app/modules/billing/static/shared/js/feature-store.js
@@ -1,4 +1,4 @@
-// static/shared/js/feature-store.js
+// app/modules/billing/static/shared/js/feature-store.js
 /**
  * Feature Store for Alpine.js
  *
diff --git a/static/shared/js/upgrade-prompts.js b/app/modules/billing/static/shared/js/upgrade-prompts.js
similarity index 99%
rename from static/shared/js/upgrade-prompts.js
rename to app/modules/billing/static/shared/js/upgrade-prompts.js
index 0a9804ca..eeff3507 100644
--- a/static/shared/js/upgrade-prompts.js
+++ b/app/modules/billing/static/shared/js/upgrade-prompts.js
@@ -1,4 +1,4 @@
-// static/shared/js/upgrade-prompts.js
+// app/modules/billing/static/shared/js/upgrade-prompts.js
 /**
  * Upgrade Prompts System
  *
diff --git a/static/vendor/js/billing.js b/app/modules/billing/static/vendor/js/billing.js
similarity index 99%
rename from static/vendor/js/billing.js
rename to app/modules/billing/static/vendor/js/billing.js
index bf3247f1..7e5da3ab 100644
--- a/static/vendor/js/billing.js
+++ b/app/modules/billing/static/vendor/js/billing.js
@@ -1,4 +1,4 @@
-// static/vendor/js/billing.js
+// app/modules/billing/static/vendor/js/billing.js
 // Vendor billing and subscription management
 
 const billingLog = window.LogConfig?.createLogger('BILLING') || console;
diff --git a/static/vendor/js/invoices.js b/app/modules/billing/static/vendor/js/invoices.js
similarity index 99%
rename from static/vendor/js/invoices.js
rename to app/modules/billing/static/vendor/js/invoices.js
index 36e48654..6dd16674 100644
--- a/static/vendor/js/invoices.js
+++ b/app/modules/billing/static/vendor/js/invoices.js
@@ -1,4 +1,4 @@
-// static/vendor/js/invoices.js
+// app/modules/billing/static/vendor/js/invoices.js
 /**
  * Vendor invoice management page logic
  */
diff --git a/static/admin/js/vendor-product-create.js b/app/modules/catalog/static/admin/js/product-create.js
similarity index 99%
rename from static/admin/js/vendor-product-create.js
rename to app/modules/catalog/static/admin/js/product-create.js
index 4465af20..7860e2c3 100644
--- a/static/admin/js/vendor-product-create.js
+++ b/app/modules/catalog/static/admin/js/product-create.js
@@ -1,4 +1,4 @@
-// static/admin/js/vendor-product-create.js
+// app/modules/catalog/static/admin/js/product-create.js
 /**
  * Admin vendor product create page logic
  * Create new vendor product entries with translations
diff --git a/static/admin/js/vendor-product-detail.js b/app/modules/catalog/static/admin/js/product-detail.js
similarity index 98%
rename from static/admin/js/vendor-product-detail.js
rename to app/modules/catalog/static/admin/js/product-detail.js
index 6956bc9c..4c5445ee 100644
--- a/static/admin/js/vendor-product-detail.js
+++ b/app/modules/catalog/static/admin/js/product-detail.js
@@ -1,4 +1,4 @@
-// static/admin/js/vendor-product-detail.js
+// app/modules/catalog/static/admin/js/product-detail.js
 /**
  * Admin vendor product detail page logic
  * View and manage individual vendor catalog products
diff --git a/static/admin/js/vendor-product-edit.js b/app/modules/catalog/static/admin/js/product-edit.js
similarity index 99%
rename from static/admin/js/vendor-product-edit.js
rename to app/modules/catalog/static/admin/js/product-edit.js
index 846d4894..0ab7d084 100644
--- a/static/admin/js/vendor-product-edit.js
+++ b/app/modules/catalog/static/admin/js/product-edit.js
@@ -1,4 +1,4 @@
-// static/admin/js/vendor-product-edit.js
+// app/modules/catalog/static/admin/js/product-edit.js
 /**
  * Admin vendor product edit page logic
  * Edit vendor product information with translations
diff --git a/static/admin/js/vendor-products.js b/app/modules/catalog/static/admin/js/products.js
similarity index 100%
rename from static/admin/js/vendor-products.js
rename to app/modules/catalog/static/admin/js/products.js
diff --git a/static/vendor/js/product-create.js b/app/modules/catalog/static/vendor/js/product-create.js
similarity index 98%
rename from static/vendor/js/product-create.js
rename to app/modules/catalog/static/vendor/js/product-create.js
index 6c59d694..278c8b64 100644
--- a/static/vendor/js/product-create.js
+++ b/app/modules/catalog/static/vendor/js/product-create.js
@@ -1,4 +1,4 @@
-// static/vendor/js/product-create.js
+// app/modules/catalog/static/vendor/js/product-create.js
 /**
  * Vendor product creation page logic
  */
diff --git a/static/vendor/js/products.js b/app/modules/catalog/static/vendor/js/products.js
similarity index 99%
rename from static/vendor/js/products.js
rename to app/modules/catalog/static/vendor/js/products.js
index 4a6b1b80..014de48a 100644
--- a/static/vendor/js/products.js
+++ b/app/modules/catalog/static/vendor/js/products.js
@@ -1,4 +1,4 @@
-// static/vendor/js/products.js
+// app/modules/catalog/static/vendor/js/products.js
 /**
  * Vendor products management page logic
  * View, edit, and manage vendor's product catalog
diff --git a/static/admin/js/customers.js b/app/modules/customers/static/admin/js/customers.js
similarity index 100%
rename from static/admin/js/customers.js
rename to app/modules/customers/static/admin/js/customers.js
diff --git a/static/admin/js/user-create.js b/app/modules/customers/static/admin/js/user-create.js
similarity index 99%
rename from static/admin/js/user-create.js
rename to app/modules/customers/static/admin/js/user-create.js
index 64ae2f90..5b56f4a8 100644
--- a/static/admin/js/user-create.js
+++ b/app/modules/customers/static/admin/js/user-create.js
@@ -1,4 +1,4 @@
-// static/admin/js/user-create.js
+// app/modules/customers/static/admin/js/user-create.js
 
 // Create custom logger for admin user create
 const userCreateLog = window.LogConfig.createLogger('ADMIN-USER-CREATE');
diff --git a/static/admin/js/user-detail.js b/app/modules/customers/static/admin/js/user-detail.js
similarity index 100%
rename from static/admin/js/user-detail.js
rename to app/modules/customers/static/admin/js/user-detail.js
diff --git a/static/admin/js/user-edit.js b/app/modules/customers/static/admin/js/user-edit.js
similarity index 99%
rename from static/admin/js/user-edit.js
rename to app/modules/customers/static/admin/js/user-edit.js
index 19ce01b9..9c51da13 100644
--- a/static/admin/js/user-edit.js
+++ b/app/modules/customers/static/admin/js/user-edit.js
@@ -1,4 +1,4 @@
-// static/admin/js/user-edit.js
+// app/modules/customers/static/admin/js/user-edit.js
 
 // Create custom logger for user edit
 const userEditLog = window.LogConfig.createLogger('USER-EDIT');
diff --git a/static/admin/js/users.js b/app/modules/customers/static/admin/js/users.js
similarity index 100%
rename from static/admin/js/users.js
rename to app/modules/customers/static/admin/js/users.js
diff --git a/static/vendor/js/customers.js b/app/modules/customers/static/vendor/js/customers.js
similarity index 99%
rename from static/vendor/js/customers.js
rename to app/modules/customers/static/vendor/js/customers.js
index c893846c..cf7a8e55 100644
--- a/static/vendor/js/customers.js
+++ b/app/modules/customers/static/vendor/js/customers.js
@@ -1,4 +1,4 @@
-// static/vendor/js/customers.js
+// app/modules/customers/static/vendor/js/customers.js
 /**
  * Vendor customers management page logic
  * View and manage customer relationships
diff --git a/static/admin/js/code-quality-dashboard.js b/app/modules/dev_tools/static/admin/js/code-quality-dashboard.js
similarity index 100%
rename from static/admin/js/code-quality-dashboard.js
rename to app/modules/dev_tools/static/admin/js/code-quality-dashboard.js
diff --git a/static/admin/js/code-quality-violations.js b/app/modules/dev_tools/static/admin/js/code-quality-violations.js
similarity index 100%
rename from static/admin/js/code-quality-violations.js
rename to app/modules/dev_tools/static/admin/js/code-quality-violations.js
diff --git a/static/admin/js/testing-dashboard.js b/app/modules/dev_tools/static/admin/js/testing-dashboard.js
similarity index 100%
rename from static/admin/js/testing-dashboard.js
rename to app/modules/dev_tools/static/admin/js/testing-dashboard.js
diff --git a/static/admin/js/testing-hub.js b/app/modules/dev_tools/static/admin/js/testing-hub.js
similarity index 98%
rename from static/admin/js/testing-hub.js
rename to app/modules/dev_tools/static/admin/js/testing-hub.js
index 6d274355..3fc4c351 100644
--- a/static/admin/js/testing-hub.js
+++ b/app/modules/dev_tools/static/admin/js/testing-hub.js
@@ -1,4 +1,4 @@
-// static/admin/js/testing-hub.js
+// app/modules/dev_tools/static/admin/js/testing-hub.js
 
 // ✅ Use centralized logger - ONE LINE!
 // Create custom logger for testing hub
diff --git a/static/admin/js/inventory.js b/app/modules/inventory/static/admin/js/inventory.js
similarity index 100%
rename from static/admin/js/inventory.js
rename to app/modules/inventory/static/admin/js/inventory.js
diff --git a/static/vendor/js/inventory.js b/app/modules/inventory/static/vendor/js/inventory.js
similarity index 99%
rename from static/vendor/js/inventory.js
rename to app/modules/inventory/static/vendor/js/inventory.js
index 02103cfb..b29f6448 100644
--- a/static/vendor/js/inventory.js
+++ b/app/modules/inventory/static/vendor/js/inventory.js
@@ -1,4 +1,4 @@
-// static/vendor/js/inventory.js
+// app/modules/inventory/static/vendor/js/inventory.js
 /**
  * Vendor inventory management page logic
  * View and manage stock levels
diff --git a/static/admin/js/letzshop-vendor-directory.js b/app/modules/marketplace/static/admin/js/letzshop-vendor-directory.js
similarity index 98%
rename from static/admin/js/letzshop-vendor-directory.js
rename to app/modules/marketplace/static/admin/js/letzshop-vendor-directory.js
index a5f89606..babf218f 100644
--- a/static/admin/js/letzshop-vendor-directory.js
+++ b/app/modules/marketplace/static/admin/js/letzshop-vendor-directory.js
@@ -1,4 +1,4 @@
-// static/admin/js/letzshop-vendor-directory.js
+// app/modules/marketplace/static/admin/js/letzshop-vendor-directory.js
 /**
  * Admin Letzshop Vendor Directory page logic
  * Browse and import vendors from Letzshop marketplace
diff --git a/static/admin/js/letzshop.js b/app/modules/marketplace/static/admin/js/letzshop.js
similarity index 99%
rename from static/admin/js/letzshop.js
rename to app/modules/marketplace/static/admin/js/letzshop.js
index 66493b70..4a10adef 100644
--- a/static/admin/js/letzshop.js
+++ b/app/modules/marketplace/static/admin/js/letzshop.js
@@ -1,4 +1,4 @@
-// static/admin/js/letzshop.js
+// app/modules/marketplace/static/admin/js/letzshop.js
 /**
  * Admin Letzshop management page logic
  */
diff --git a/static/admin/js/marketplace-letzshop.js b/app/modules/marketplace/static/admin/js/marketplace-letzshop.js
similarity index 100%
rename from static/admin/js/marketplace-letzshop.js
rename to app/modules/marketplace/static/admin/js/marketplace-letzshop.js
diff --git a/static/admin/js/marketplace-product-detail.js b/app/modules/marketplace/static/admin/js/marketplace-product-detail.js
similarity index 100%
rename from static/admin/js/marketplace-product-detail.js
rename to app/modules/marketplace/static/admin/js/marketplace-product-detail.js
diff --git a/static/admin/js/marketplace-products.js b/app/modules/marketplace/static/admin/js/marketplace-products.js
similarity index 100%
rename from static/admin/js/marketplace-products.js
rename to app/modules/marketplace/static/admin/js/marketplace-products.js
diff --git a/static/admin/js/marketplace.js b/app/modules/marketplace/static/admin/js/marketplace.js
similarity index 100%
rename from static/admin/js/marketplace.js
rename to app/modules/marketplace/static/admin/js/marketplace.js
diff --git a/static/vendor/js/letzshop.js b/app/modules/marketplace/static/vendor/js/letzshop.js
similarity index 99%
rename from static/vendor/js/letzshop.js
rename to app/modules/marketplace/static/vendor/js/letzshop.js
index cfd6f677..016164f2 100644
--- a/static/vendor/js/letzshop.js
+++ b/app/modules/marketplace/static/vendor/js/letzshop.js
@@ -1,4 +1,4 @@
-// static/vendor/js/letzshop.js
+// app/modules/marketplace/static/vendor/js/letzshop.js
 /**
  * Vendor Letzshop orders management page logic
  */
diff --git a/static/vendor/js/marketplace.js b/app/modules/marketplace/static/vendor/js/marketplace.js
similarity index 99%
rename from static/vendor/js/marketplace.js
rename to app/modules/marketplace/static/vendor/js/marketplace.js
index 3c7a2659..99335504 100644
--- a/static/vendor/js/marketplace.js
+++ b/app/modules/marketplace/static/vendor/js/marketplace.js
@@ -1,4 +1,4 @@
-// static/vendor/js/marketplace.js
+// app/modules/marketplace/static/vendor/js/marketplace.js
 /**
  * Vendor marketplace import page logic
  */
diff --git a/static/vendor/js/onboarding.js b/app/modules/marketplace/static/vendor/js/onboarding.js
similarity index 99%
rename from static/vendor/js/onboarding.js
rename to app/modules/marketplace/static/vendor/js/onboarding.js
index 8a84397e..d5c155b0 100644
--- a/static/vendor/js/onboarding.js
+++ b/app/modules/marketplace/static/vendor/js/onboarding.js
@@ -1,4 +1,4 @@
-// static/vendor/js/onboarding.js
+// app/modules/marketplace/static/vendor/js/onboarding.js
 // noqa: js-003 - Standalone page without vendor layout (no base.html extends)
 // noqa: js-004 - Standalone page has no currentPage sidebar highlight
 /**
diff --git a/static/admin/js/email-templates.js b/app/modules/messaging/static/admin/js/email-templates.js
similarity index 100%
rename from static/admin/js/email-templates.js
rename to app/modules/messaging/static/admin/js/email-templates.js
diff --git a/static/admin/js/messages.js b/app/modules/messaging/static/admin/js/messages.js
similarity index 100%
rename from static/admin/js/messages.js
rename to app/modules/messaging/static/admin/js/messages.js
diff --git a/static/admin/js/notifications.js b/app/modules/messaging/static/admin/js/notifications.js
similarity index 100%
rename from static/admin/js/notifications.js
rename to app/modules/messaging/static/admin/js/notifications.js
diff --git a/static/vendor/js/email-templates.js b/app/modules/messaging/static/vendor/js/email-templates.js
similarity index 100%
rename from static/vendor/js/email-templates.js
rename to app/modules/messaging/static/vendor/js/email-templates.js
diff --git a/static/vendor/js/messages.js b/app/modules/messaging/static/vendor/js/messages.js
similarity index 100%
rename from static/vendor/js/messages.js
rename to app/modules/messaging/static/vendor/js/messages.js
diff --git a/static/vendor/js/notifications.js b/app/modules/messaging/static/vendor/js/notifications.js
similarity index 99%
rename from static/vendor/js/notifications.js
rename to app/modules/messaging/static/vendor/js/notifications.js
index efcf0abb..626e9499 100644
--- a/static/vendor/js/notifications.js
+++ b/app/modules/messaging/static/vendor/js/notifications.js
@@ -1,4 +1,4 @@
-// static/vendor/js/notifications.js
+// app/modules/messaging/static/vendor/js/notifications.js
 /**
  * Vendor notifications center page logic
  * View and manage notifications
diff --git a/static/admin/js/background-tasks.js b/app/modules/monitoring/static/admin/js/background-tasks.js
similarity index 100%
rename from static/admin/js/background-tasks.js
rename to app/modules/monitoring/static/admin/js/background-tasks.js
diff --git a/static/admin/js/imports.js b/app/modules/monitoring/static/admin/js/imports.js
similarity index 100%
rename from static/admin/js/imports.js
rename to app/modules/monitoring/static/admin/js/imports.js
diff --git a/static/admin/js/logs.js b/app/modules/monitoring/static/admin/js/logs.js
similarity index 100%
rename from static/admin/js/logs.js
rename to app/modules/monitoring/static/admin/js/logs.js
diff --git a/static/admin/js/monitoring.js b/app/modules/monitoring/static/admin/js/monitoring.js
similarity index 100%
rename from static/admin/js/monitoring.js
rename to app/modules/monitoring/static/admin/js/monitoring.js
diff --git a/static/admin/js/orders.js b/app/modules/orders/static/admin/js/orders.js
similarity index 100%
rename from static/admin/js/orders.js
rename to app/modules/orders/static/admin/js/orders.js
diff --git a/static/vendor/js/order-detail.js b/app/modules/orders/static/vendor/js/order-detail.js
similarity index 99%
rename from static/vendor/js/order-detail.js
rename to app/modules/orders/static/vendor/js/order-detail.js
index ba6c63f2..7a07f574 100644
--- a/static/vendor/js/order-detail.js
+++ b/app/modules/orders/static/vendor/js/order-detail.js
@@ -1,4 +1,4 @@
-// static/vendor/js/order-detail.js
+// app/modules/orders/static/vendor/js/order-detail.js
 /**
  * Vendor order detail page logic
  * View order details, manage status, handle shipments, and invoice integration
diff --git a/static/vendor/js/orders.js b/app/modules/orders/static/vendor/js/orders.js
similarity index 99%
rename from static/vendor/js/orders.js
rename to app/modules/orders/static/vendor/js/orders.js
index 526ee078..59b6f9f7 100644
--- a/static/vendor/js/orders.js
+++ b/app/modules/orders/static/vendor/js/orders.js
@@ -1,4 +1,4 @@
-// static/vendor/js/orders.js
+// app/modules/orders/static/vendor/js/orders.js
 /**
  * Vendor orders management page logic
  * View and manage vendor's orders
diff --git a/app/templates/admin/billing-history.html b/app/templates/admin/billing-history.html
index 3ce8261e..cc355056 100644
--- a/app/templates/admin/billing-history.html
+++ b/app/templates/admin/billing-history.html
@@ -203,5 +203,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('static', path='admin/js/billing-history.js') }}"></script>
+<script src="{{ url_for('billing_static', path='admin/js/billing-history.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/admin/customers.html b/app/templates/admin/customers.html
index 0b73d889..cc55ed97 100644
--- a/app/templates/admin/customers.html
+++ b/app/templates/admin/customers.html
@@ -315,5 +315,5 @@
     document.head.appendChild(script);
 })();
 </script>
-<script src="{{ url_for('static', path='admin/js/customers.js') }}"></script>
+<script src="{{ url_for('customers_static', path='admin/js/customers.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/admin/email-templates.html b/app/templates/admin/email-templates.html
index cb350247..5934d565 100644
--- a/app/templates/admin/email-templates.html
+++ b/app/templates/admin/email-templates.html
@@ -362,5 +362,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('static', path='admin/js/email-templates.js') }}"></script>
+<script src="{{ url_for('messaging_static', path='admin/js/email-templates.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/admin/inventory.html b/app/templates/admin/inventory.html
index da5d633d..8be7bf6c 100644
--- a/app/templates/admin/inventory.html
+++ b/app/templates/admin/inventory.html
@@ -599,5 +599,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('static', path='admin/js/inventory.js') }}"></script>
+<script src="{{ url_for('inventory_static', path='admin/js/inventory.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/admin/letzshop-vendor-directory.html b/app/templates/admin/letzshop-vendor-directory.html
index 28e2554f..cdb0db60 100644
--- a/app/templates/admin/letzshop-vendor-directory.html
+++ b/app/templates/admin/letzshop-vendor-directory.html
@@ -426,5 +426,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('static', path='admin/js/letzshop-vendor-directory.js') }}"></script>
+<script src="{{ url_for('marketplace_static', path='admin/js/letzshop-vendor-directory.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/admin/logs.html b/app/templates/admin/logs.html
index e711ca86..a2494713 100644
--- a/app/templates/admin/logs.html
+++ b/app/templates/admin/logs.html
@@ -407,5 +407,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('static', path='admin/js/logs.js') }}"></script>
+<script src="{{ url_for('monitoring_static', path='admin/js/logs.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/admin/marketplace-letzshop.html b/app/templates/admin/marketplace-letzshop.html
index 684aafe0..7cc0e481 100644
--- a/app/templates/admin/marketplace-letzshop.html
+++ b/app/templates/admin/marketplace-letzshop.html
@@ -599,5 +599,5 @@
     document.head.appendChild(script);
 })();
 </script>
-<script src="{{ url_for('static', path='admin/js/marketplace-letzshop.js') }}"></script>
+<script src="{{ url_for('marketplace_static', path='admin/js/marketplace-letzshop.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/admin/marketplace-product-detail.html b/app/templates/admin/marketplace-product-detail.html
index 0b253be8..4f8be3ab 100644
--- a/app/templates/admin/marketplace-product-detail.html
+++ b/app/templates/admin/marketplace-product-detail.html
@@ -388,5 +388,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('static', path='admin/js/marketplace-product-detail.js') }}"></script>
+<script src="{{ url_for('marketplace_static', path='admin/js/marketplace-product-detail.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/admin/marketplace-products.html b/app/templates/admin/marketplace-products.html
index 33cd03f5..f96e8c9c 100644
--- a/app/templates/admin/marketplace-products.html
+++ b/app/templates/admin/marketplace-products.html
@@ -472,5 +472,5 @@
     document.head.appendChild(script);
 })();
 </script>
-<script src="{{ url_for('static', path='admin/js/marketplace-products.js') }}"></script>
+<script src="{{ url_for('marketplace_static', path='admin/js/marketplace-products.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/admin/marketplace.html b/app/templates/admin/marketplace.html
index bfaf66ae..8872206d 100644
--- a/app/templates/admin/marketplace.html
+++ b/app/templates/admin/marketplace.html
@@ -347,5 +347,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('static', path='admin/js/marketplace.js') }}?v=2"></script>
+<script src="{{ url_for('marketplace_static', path='admin/js/marketplace.js') }}?v=2"></script>
 {% endblock %}
diff --git a/app/templates/admin/messages.html b/app/templates/admin/messages.html
index 4cfcf73d..88ac3c39 100644
--- a/app/templates/admin/messages.html
+++ b/app/templates/admin/messages.html
@@ -332,5 +332,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('static', path='admin/js/messages.js') }}"></script>
+<script src="{{ url_for('messaging_static', path='admin/js/messages.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/admin/notifications.html b/app/templates/admin/notifications.html
index 5526572b..97712e62 100644
--- a/app/templates/admin/notifications.html
+++ b/app/templates/admin/notifications.html
@@ -357,5 +357,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('static', path='admin/js/notifications.js') }}"></script>
+<script src="{{ url_for('messaging_static', path='admin/js/notifications.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/admin/orders.html b/app/templates/admin/orders.html
index 95521067..433fda41 100644
--- a/app/templates/admin/orders.html
+++ b/app/templates/admin/orders.html
@@ -641,5 +641,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('static', path='admin/js/orders.js') }}"></script>
+<script src="{{ url_for('orders_static', path='admin/js/orders.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/admin/subscription-tiers.html b/app/templates/admin/subscription-tiers.html
index 120f018e..c3e4f946 100644
--- a/app/templates/admin/subscription-tiers.html
+++ b/app/templates/admin/subscription-tiers.html
@@ -475,5 +475,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('static', path='admin/js/subscription-tiers.js') }}"></script>
+<script src="{{ url_for('billing_static', path='admin/js/subscription-tiers.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/admin/subscriptions.html b/app/templates/admin/subscriptions.html
index c8e283f1..4967a802 100644
--- a/app/templates/admin/subscriptions.html
+++ b/app/templates/admin/subscriptions.html
@@ -325,5 +325,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('static', path='admin/js/subscriptions.js') }}"></script>
+<script src="{{ url_for('billing_static', path='admin/js/subscriptions.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/admin/testing-hub.html b/app/templates/admin/testing-hub.html
index cb6cd3d2..11d0af71 100644
--- a/app/templates/admin/testing-hub.html
+++ b/app/templates/admin/testing-hub.html
@@ -218,5 +218,5 @@
 
 {% block extra_scripts %}
 {# ✅ CRITICAL: Load JavaScript file #}
-<script src="{{ url_for('static', path='admin/js/testing-hub.js') }}"></script>
+<script src="{{ url_for('dev_tools_static', path='admin/js/testing-hub.js') }}"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/admin/user-create.html b/app/templates/admin/user-create.html
index 3e417830..fe64e72a 100644
--- a/app/templates/admin/user-create.html
+++ b/app/templates/admin/user-create.html
@@ -189,5 +189,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('static', path='admin/js/user-create.js') }}"></script>
+<script src="{{ url_for('customers_static', path='admin/js/user-create.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/admin/user-detail.html b/app/templates/admin/user-detail.html
index cd08f985..7052f6e6 100644
--- a/app/templates/admin/user-detail.html
+++ b/app/templates/admin/user-detail.html
@@ -221,5 +221,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('static', path='admin/js/user-detail.js') }}"></script>
+<script src="{{ url_for('customers_static', path='admin/js/user-detail.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/admin/user-edit.html b/app/templates/admin/user-edit.html
index 01878d9e..0fc216f6 100644
--- a/app/templates/admin/user-edit.html
+++ b/app/templates/admin/user-edit.html
@@ -269,5 +269,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('static', path='admin/js/user-edit.js') }}"></script>
+<script src="{{ url_for('customers_static', path='admin/js/user-edit.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/admin/users.html b/app/templates/admin/users.html
index 948fc6e3..6055d6dd 100644
--- a/app/templates/admin/users.html
+++ b/app/templates/admin/users.html
@@ -240,5 +240,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('static', path='admin/js/users.js') }}"></script>
+<script src="{{ url_for('customers_static', path='admin/js/users.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/admin/vendor-product-create.html b/app/templates/admin/vendor-product-create.html
index 572a3afe..ddb19bb4 100644
--- a/app/templates/admin/vendor-product-create.html
+++ b/app/templates/admin/vendor-product-create.html
@@ -508,5 +508,5 @@
 })();
 </script>
 <script src="{{ url_for('static', path='shared/js/media-picker.js') }}"></script>
-<script src="{{ url_for('static', path='admin/js/vendor-product-create.js') }}"></script>
+<script src="{{ url_for('catalog_static', path='admin/js/product-create.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/admin/vendor-product-detail.html b/app/templates/admin/vendor-product-detail.html
index 396d29d4..493483f5 100644
--- a/app/templates/admin/vendor-product-detail.html
+++ b/app/templates/admin/vendor-product-detail.html
@@ -354,5 +354,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('static', path='admin/js/vendor-product-detail.js') }}"></script>
+<script src="{{ url_for('catalog_static', path='admin/js/product-detail.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/admin/vendor-product-edit.html b/app/templates/admin/vendor-product-edit.html
index 28a31ef9..11750cca 100644
--- a/app/templates/admin/vendor-product-edit.html
+++ b/app/templates/admin/vendor-product-edit.html
@@ -499,5 +499,5 @@
 
 {% block extra_scripts %}
 <script src="{{ url_for('static', path='shared/js/media-picker.js') }}"></script>
-<script src="{{ url_for('static', path='admin/js/vendor-product-edit.js') }}"></script>
+<script src="{{ url_for('catalog_static', path='admin/js/product-edit.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/admin/vendor-products.html b/app/templates/admin/vendor-products.html
index 293814dc..7c23bddc 100644
--- a/app/templates/admin/vendor-products.html
+++ b/app/templates/admin/vendor-products.html
@@ -396,5 +396,5 @@
     document.head.appendChild(script);
 })();
 </script>
-<script src="{{ url_for('static', path='admin/js/vendor-products.js') }}"></script>
+<script src="{{ url_for('catalog_static', path='admin/js/products.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/vendor/base.html b/app/templates/vendor/base.html
index d25f1059..c39c42ef 100644
--- a/app/templates/vendor/base.html
+++ b/app/templates/vendor/base.html
@@ -72,10 +72,10 @@
     <script src="{{ url_for('static', path='shared/js/api-client.js') }}"></script>
 
     <!-- 6. SIXTH: Feature Store (depends on API Client, registers with Alpine) -->
-    <script src="{{ url_for('static', path='shared/js/feature-store.js') }}"></script>
+    <script src="{{ url_for('billing_static', path='shared/js/feature-store.js') }}"></script>
 
     <!-- 7. SEVENTH: Upgrade Prompts (depends on API Client, registers with Alpine) -->
-    <script src="{{ url_for('static', path='shared/js/upgrade-prompts.js') }}"></script>
+    <script src="{{ url_for('billing_static', path='shared/js/upgrade-prompts.js') }}"></script>
 
     <!-- 8. EIGHTH: Alpine.js v3 with CDN fallback (with defer) -->
     <script>
diff --git a/app/templates/vendor/billing.html b/app/templates/vendor/billing.html
index 04641a1b..79af1e06 100644
--- a/app/templates/vendor/billing.html
+++ b/app/templates/vendor/billing.html
@@ -424,5 +424,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="/static/vendor/js/billing.js"></script>
+<script src="/static/modules/billing/vendor/js/billing.js"></script>
 {% endblock %}
diff --git a/app/templates/vendor/customers.html b/app/templates/vendor/customers.html
index 5330e016..85f0e737 100644
--- a/app/templates/vendor/customers.html
+++ b/app/templates/vendor/customers.html
@@ -264,5 +264,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('static', path='vendor/js/customers.js') }}"></script>
+<script src="{{ url_for('customers_static', path='vendor/js/customers.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/vendor/email-templates.html b/app/templates/vendor/email-templates.html
index 1a2ccadb..e14ac273 100644
--- a/app/templates/vendor/email-templates.html
+++ b/app/templates/vendor/email-templates.html
@@ -326,5 +326,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('static', path='vendor/js/email-templates.js') }}"></script>
+<script src="{{ url_for('messaging_static', path='vendor/js/email-templates.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/vendor/inventory.html b/app/templates/vendor/inventory.html
index 9e2311c0..6e03494d 100644
--- a/app/templates/vendor/inventory.html
+++ b/app/templates/vendor/inventory.html
@@ -370,5 +370,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('static', path='vendor/js/inventory.js') }}"></script>
+<script src="{{ url_for('inventory_static', path='vendor/js/inventory.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/vendor/invoices.html b/app/templates/vendor/invoices.html
index 7fb160ca..d63026be 100644
--- a/app/templates/vendor/invoices.html
+++ b/app/templates/vendor/invoices.html
@@ -10,7 +10,7 @@
 {% block alpine_data %}vendorInvoices(){% endblock %}
 
 {% block extra_scripts %}
-<script src="/static/vendor/js/invoices.js"></script>
+<script src="/static/modules/billing/vendor/js/invoices.js"></script>
 {% endblock %}
 
 {% block content %}
diff --git a/app/templates/vendor/letzshop.html b/app/templates/vendor/letzshop.html
index 9888fda4..5cef1107 100644
--- a/app/templates/vendor/letzshop.html
+++ b/app/templates/vendor/letzshop.html
@@ -9,7 +9,7 @@
 {% block alpine_data %}vendorLetzshop(){% endblock %}
 
 {% block extra_scripts %}
-<script src="/static/vendor/js/letzshop.js"></script>
+<script src="/static/modules/marketplace/vendor/js/letzshop.js"></script>
 {% endblock %}
 
 {% block content %}
diff --git a/app/templates/vendor/marketplace.html b/app/templates/vendor/marketplace.html
index bd71b550..7bf72a33 100644
--- a/app/templates/vendor/marketplace.html
+++ b/app/templates/vendor/marketplace.html
@@ -11,7 +11,7 @@
 {% block alpine_data %}vendorMarketplace(){% endblock %}
 
 {% block extra_scripts %}
-<script src="/static/vendor/js/marketplace.js"></script>
+<script src="/static/modules/marketplace/vendor/js/marketplace.js"></script>
 {% endblock %}
 
 {% block content %}
diff --git a/app/templates/vendor/messages.html b/app/templates/vendor/messages.html
index 5d58715b..4bc9fe64 100644
--- a/app/templates/vendor/messages.html
+++ b/app/templates/vendor/messages.html
@@ -275,5 +275,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('static', path='vendor/js/messages.js') }}"></script>
+<script src="{{ url_for('messaging_static', path='vendor/js/messages.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/vendor/notifications.html b/app/templates/vendor/notifications.html
index fb0600c6..c9335933 100644
--- a/app/templates/vendor/notifications.html
+++ b/app/templates/vendor/notifications.html
@@ -226,5 +226,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('static', path='vendor/js/notifications.js') }}"></script>
+<script src="{{ url_for('messaging_static', path='vendor/js/notifications.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/vendor/onboarding.html b/app/templates/vendor/onboarding.html
index 2e98aafb..bea86df2 100644
--- a/app/templates/vendor/onboarding.html
+++ b/app/templates/vendor/onboarding.html
@@ -378,6 +378,6 @@
     <script src="{{ url_for('static', path='shared/js/utils.js') }}"></script>
     <script src="{{ url_for('static', path='shared/js/api-client.js') }}"></script>
     <script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3.14.0/dist/cdn.min.js"></script>
-    <script src="{{ url_for('static', path='vendor/js/onboarding.js') }}"></script>
+    <script src="{{ url_for('marketplace_static', path='vendor/js/onboarding.js') }}"></script>
 </body>
 </html>
diff --git a/app/templates/vendor/order-detail.html b/app/templates/vendor/order-detail.html
index 622c6dfe..0b60e64e 100644
--- a/app/templates/vendor/order-detail.html
+++ b/app/templates/vendor/order-detail.html
@@ -451,5 +451,5 @@
         orderId: {{ order_id }}
     };
 </script>
-<script src="{{ url_for('static', path='vendor/js/order-detail.js') }}"></script>
+<script src="{{ url_for('orders_static', path='vendor/js/order-detail.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/vendor/orders.html b/app/templates/vendor/orders.html
index a84c8863..7846b2c1 100644
--- a/app/templates/vendor/orders.html
+++ b/app/templates/vendor/orders.html
@@ -330,5 +330,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('static', path='vendor/js/orders.js') }}"></script>
+<script src="{{ url_for('orders_static', path='vendor/js/orders.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/vendor/product-create.html b/app/templates/vendor/product-create.html
index 55699c41..398fd601 100644
--- a/app/templates/vendor/product-create.html
+++ b/app/templates/vendor/product-create.html
@@ -170,5 +170,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('static', path='vendor/js/product-create.js') }}"></script>
+<script src="{{ url_for('catalog_static', path='vendor/js/product-create.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/vendor/products.html b/app/templates/vendor/products.html
index 116e85a6..aff4ab90 100644
--- a/app/templates/vendor/products.html
+++ b/app/templates/vendor/products.html
@@ -364,5 +364,5 @@
 {% endblock %}
 
 {% block extra_scripts %}
-<script src="{{ url_for('static', path='vendor/js/products.js') }}"></script>
+<script src="{{ url_for('catalog_static', path='vendor/js/products.js') }}"></script>
 {% endblock %}