diff --git a/.gitignore b/.gitignore
index d604b40b6..81275690e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,4 @@ phpunit.xml
 .phpunit.result.cache
 composer.lock
 yarn-error.log
-modules.local/ppcp-button/assets/*
+modules/ppcp-button/assets/*
diff --git a/modules/ppcp-button/services.php b/modules/ppcp-button/services.php
index 3c5811fda..d7fa3d916 100644
--- a/modules/ppcp-button/services.php
+++ b/modules/ppcp-button/services.php
@@ -89,7 +89,7 @@ return array(
 	},
 	'button.url'                        => static function ( ContainerInterface $container ): string {
 		return plugins_url(
-			'/modules.local/ppcp-button/',
+			'/modules/ppcp-button/',
 			dirname( __FILE__, 3 ) . '/woocommerce-paypal-commerce-gateway.php'
 		);
 	},
diff --git a/modules/ppcp-onboarding/services.php b/modules/ppcp-onboarding/services.php
index 73592c3d9..e65308a38 100644
--- a/modules/ppcp-onboarding/services.php
+++ b/modules/ppcp-onboarding/services.php
@@ -108,7 +108,7 @@ return array(
 
 	'onboarding.url'                   => static function ( ContainerInterface $container ): string {
 		return plugins_url(
-			'/modules.local/ppcp-onboarding/',
+			'/modules/ppcp-onboarding/',
 			dirname( __FILE__, 3 ) . '/woocommerce-paypal-commerce-gateway.php'
 		);
 	},
diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php
index 5405349a0..f8c8e5abe 100644
--- a/modules/ppcp-wc-gateway/services.php
+++ b/modules/ppcp-wc-gateway/services.php
@@ -1556,7 +1556,7 @@ return array(
 	},
 	'wcgateway.url'                                => static function ( ContainerInterface $container ): string {
 		return plugins_url(
-			'/modules.local/ppcp-wc-gateway/',
+			'/modules/ppcp-wc-gateway/',
 			dirname( __FILE__, 3 ) . '/woocommerce-paypal-commerce-gateway.php'
 		);
 	},
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 07de90212..f8faa3dbc 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -10,7 +10,7 @@
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">./src</directory>
-            <directory suffix=".php">./modules.local/</directory>
+            <directory suffix=".php">./modules/</directory>
         </whitelist>
     </filter>
     <testsuites>
diff --git a/woocommerce-paypal-commerce-gateway.php b/woocommerce-paypal-commerce-gateway.php
index 18d0bf872..1416d5d98 100644
--- a/woocommerce-paypal-commerce-gateway.php
+++ b/woocommerce-paypal-commerce-gateway.php
@@ -36,9 +36,6 @@ use Inpsyde\PayPalCommerce\ApiClient\Factory\PurchaseUnitFactory;
             foreach (glob(plugin_dir_path(__FILE__).'modules/*/module.php') as $moduleFile) {
                 $modules[] = (@require $moduleFile)();
             }
-            foreach (glob(plugin_dir_path(__FILE__).'modules.local/*/module.php') as $moduleFile) {
-                $modules[] = (@require $moduleFile)();
-            }
             $providers = [];
             foreach ($modules as $module) {
                 /* @var $module ModuleInterface */