diff --git a/composer.json b/composer.json
index 4a3a9624f..bb2ccbf7c 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,7 @@
     "autoload": {
         "psr-4": {
             "WooCommerce\\PayPalCommerce\\": "src",
-            "WooCommerce\\PayPalCommerce\\Isolated\\": "lib/isolated/",
+            "WooCommerce\\PayPalCommerce\\Common\\": "lib/common/",
             "WooCommerce\\PayPalCommerce\\Vendor\\": "lib/packages/"
         },
         "files": [
diff --git a/lib/isolated/Pattern/SingletonDecorator.php b/lib/common/Pattern/SingletonDecorator.php
similarity index 79%
rename from lib/isolated/Pattern/SingletonDecorator.php
rename to lib/common/Pattern/SingletonDecorator.php
index ea9c85a04..54282dc91 100644
--- a/lib/isolated/Pattern/SingletonDecorator.php
+++ b/lib/common/Pattern/SingletonDecorator.php
@@ -1,7 +1,14 @@
 <?php
+/**
+ * The Singleton Trait can be used to wrap an execution block, so it behaves like a Singleton.
+ * It executes the callable once, on subsequent calls returns the same result.
+ */
 
-namespace WooCommerce\PayPalCommerce\Isolated\Pattern;
+namespace WooCommerce\PayPalCommerce\Common\Pattern;
 
+/**
+ * Class SingletonDecorator.
+ */
 class SingletonDecorator {
 
 	/**
diff --git a/lib/isolated/Pattern/SingletonTrait.php b/lib/common/Pattern/SingletonTrait.php
similarity index 71%
rename from lib/isolated/Pattern/SingletonTrait.php
rename to lib/common/Pattern/SingletonTrait.php
index ecdef9ac0..cf09570c7 100644
--- a/lib/isolated/Pattern/SingletonTrait.php
+++ b/lib/common/Pattern/SingletonTrait.php
@@ -1,7 +1,15 @@
 <?php
+/**
+ * The Singleton Trait can be used to add singleton behaviour to a class.
+ *
+ * @package WooCommerce\PayPalCommerce\Common\Pattern
+ */
 
-namespace WooCommerce\PayPalCommerce\Isolated\Pattern;
+namespace WooCommerce\PayPalCommerce\Common\Pattern;
 
+/**
+ * Class SingletonTrait.
+ */
 trait SingletonTrait {
 	/**
 	 * The single instance of the class.
diff --git a/modules/ppcp-api-client/services.php b/modules/ppcp-api-client/services.php
index fd436ce22..9b6e03cde 100644
--- a/modules/ppcp-api-client/services.php
+++ b/modules/ppcp-api-client/services.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
 
 namespace WooCommerce\PayPalCommerce\ApiClient;
 
-use WooCommerce\PayPalCommerce\Isolated\Pattern\SingletonDecorator;
+use WooCommerce\PayPalCommerce\Common\Pattern\SingletonDecorator;
 use WooCommerce\PayPalCommerce\ApiClient\Authentication\Bearer;
 use WooCommerce\PayPalCommerce\ApiClient\Authentication\PayPalBearer;
 use WooCommerce\PayPalCommerce\ApiClient\Endpoint\BillingAgreementsEndpoint;