diff --git a/config/services.yml b/config/services.yml
index 23df6a9..a4fb228 100644
--- a/config/services.yml
+++ b/config/services.yml
@@ -29,7 +29,7 @@ services:
       tags: ['command']
     Symfony\Component\EventDispatcher\EventSubscriberInterface:
       tags: ['subscriber']
-    Ymir\Cli\ProjectConfiguration\WordPressConfigurationChangeInterface:
+    Ymir\Cli\ProjectConfiguration\WordPress\WordPressConfigurationChangeInterface:
       tags: ['wordpress_configuration_changes']
 
   GuzzleHttp\:
diff --git a/src/Command/Project/ConfigureProjectCommand.php b/src/Command/Project/ConfigureProjectCommand.php
index 191a8eb..155dcc9 100644
--- a/src/Command/Project/ConfigureProjectCommand.php
+++ b/src/Command/Project/ConfigureProjectCommand.php
@@ -23,7 +23,7 @@
 use Ymir\Cli\Console\Output;
 use Ymir\Cli\Exception\InvalidInputException;
 use Ymir\Cli\ProjectConfiguration\ProjectConfiguration;
-use Ymir\Cli\ProjectConfiguration\WordPressConfigurationChangeInterface;
+use Ymir\Cli\ProjectConfiguration\WordPress\WordPressConfigurationChangeInterface;
 use Ymir\Cli\Support\Arr;
 use Ymir\Cli\Tool\WpCli;
 
diff --git a/src/ProjectConfiguration/AbstractWordPressConfigurationChange.php b/src/ProjectConfiguration/WordPress/AbstractWordPressConfigurationChange.php
similarity index 96%
rename from src/ProjectConfiguration/AbstractWordPressConfigurationChange.php
rename to src/ProjectConfiguration/WordPress/AbstractWordPressConfigurationChange.php
index f870c81..3dc04b0 100644
--- a/src/ProjectConfiguration/AbstractWordPressConfigurationChange.php
+++ b/src/ProjectConfiguration/WordPress/AbstractWordPressConfigurationChange.php
@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Ymir\Cli\ProjectConfiguration;
+namespace Ymir\Cli\ProjectConfiguration\WordPress;
 
 use Ymir\Cli\Support\Arr;
 
diff --git a/src/ProjectConfiguration/BeaverBuilderConfigurationChange.php b/src/ProjectConfiguration/WordPress/BeaverBuilderConfigurationChange.php
similarity index 95%
rename from src/ProjectConfiguration/BeaverBuilderConfigurationChange.php
rename to src/ProjectConfiguration/WordPress/BeaverBuilderConfigurationChange.php
index e623c7d..bca1afb 100644
--- a/src/ProjectConfiguration/BeaverBuilderConfigurationChange.php
+++ b/src/ProjectConfiguration/WordPress/BeaverBuilderConfigurationChange.php
@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Ymir\Cli\ProjectConfiguration;
+namespace Ymir\Cli\ProjectConfiguration\WordPress;
 
 class BeaverBuilderConfigurationChange extends AbstractWordPressConfigurationChange
 {
diff --git a/src/ProjectConfiguration/ElementorConfigurationChange.php b/src/ProjectConfiguration/WordPress/ElementorConfigurationChange.php
similarity index 93%
rename from src/ProjectConfiguration/ElementorConfigurationChange.php
rename to src/ProjectConfiguration/WordPress/ElementorConfigurationChange.php
index c8b0218..0cc1740 100644
--- a/src/ProjectConfiguration/ElementorConfigurationChange.php
+++ b/src/ProjectConfiguration/WordPress/ElementorConfigurationChange.php
@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Ymir\Cli\ProjectConfiguration;
+namespace Ymir\Cli\ProjectConfiguration\WordPress;
 
 class ElementorConfigurationChange extends AbstractWordPressConfigurationChange
 {
diff --git a/src/ProjectConfiguration/OxygenConfigurationChange.php b/src/ProjectConfiguration/WordPress/OxygenConfigurationChange.php
similarity index 94%
rename from src/ProjectConfiguration/OxygenConfigurationChange.php
rename to src/ProjectConfiguration/WordPress/OxygenConfigurationChange.php
index f5354a8..948fe3e 100644
--- a/src/ProjectConfiguration/OxygenConfigurationChange.php
+++ b/src/ProjectConfiguration/WordPress/OxygenConfigurationChange.php
@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Ymir\Cli\ProjectConfiguration;
+namespace Ymir\Cli\ProjectConfiguration\WordPress;
 
 class OxygenConfigurationChange extends AbstractWordPressConfigurationChange
 {
diff --git a/src/ProjectConfiguration/WooCommerceConfigurationChange.php b/src/ProjectConfiguration/WordPress/WooCommerceConfigurationChange.php
similarity index 95%
rename from src/ProjectConfiguration/WooCommerceConfigurationChange.php
rename to src/ProjectConfiguration/WordPress/WooCommerceConfigurationChange.php
index 5d608ce..d9151aa 100644
--- a/src/ProjectConfiguration/WooCommerceConfigurationChange.php
+++ b/src/ProjectConfiguration/WordPress/WooCommerceConfigurationChange.php
@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Ymir\Cli\ProjectConfiguration;
+namespace Ymir\Cli\ProjectConfiguration\WordPress;
 
 class WooCommerceConfigurationChange extends AbstractWordPressConfigurationChange
 {
diff --git a/src/ProjectConfiguration/WordPressConfigurationChangeInterface.php b/src/ProjectConfiguration/WordPress/WordPressConfigurationChangeInterface.php
similarity index 81%
rename from src/ProjectConfiguration/WordPressConfigurationChangeInterface.php
rename to src/ProjectConfiguration/WordPress/WordPressConfigurationChangeInterface.php
index 8ad3000..039dec9 100644
--- a/src/ProjectConfiguration/WordPressConfigurationChangeInterface.php
+++ b/src/ProjectConfiguration/WordPress/WordPressConfigurationChangeInterface.php
@@ -11,7 +11,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Ymir\Cli\ProjectConfiguration;
+namespace Ymir\Cli\ProjectConfiguration\WordPress;
+
+use Ymir\Cli\ProjectConfiguration\ConfigurationChangeInterface;
 
 interface WordPressConfigurationChangeInterface extends ConfigurationChangeInterface
 {
diff --git a/tests/Unit/ProjectConfiguration/BeaverBuilderConfigurationChangeTest.php b/tests/Unit/ProjectConfiguration/WordPress/BeaverBuilderConfigurationChangeTest.php
similarity index 94%
rename from tests/Unit/ProjectConfiguration/BeaverBuilderConfigurationChangeTest.php
rename to tests/Unit/ProjectConfiguration/WordPress/BeaverBuilderConfigurationChangeTest.php
index ee40623..1b41b50 100644
--- a/tests/Unit/ProjectConfiguration/BeaverBuilderConfigurationChangeTest.php
+++ b/tests/Unit/ProjectConfiguration/WordPress/BeaverBuilderConfigurationChangeTest.php
@@ -11,13 +11,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Ymir\Cli\Tests\Unit\ProjectConfiguration;
+namespace Ymir\Cli\Tests\Unit\ProjectConfiguration\WordPress;
 
-use Ymir\Cli\ProjectConfiguration\BeaverBuilderConfigurationChange;
+use Ymir\Cli\ProjectConfiguration\WordPress\BeaverBuilderConfigurationChange;
 use Ymir\Cli\Tests\Unit\TestCase;
 
 /**
- * @covers \Ymir\Cli\ProjectConfiguration\BeaverBuilderConfigurationChange
+ * @covers \Ymir\Cli\ProjectConfiguration\WordPress\BeaverBuilderConfigurationChange
  */
 class BeaverBuilderConfigurationChangeTest extends TestCase
 {
diff --git a/tests/Unit/ProjectConfiguration/ElementorConfigurationChangeTest.php b/tests/Unit/ProjectConfiguration/WordPress/ElementorConfigurationChangeTest.php
similarity index 92%
rename from tests/Unit/ProjectConfiguration/ElementorConfigurationChangeTest.php
rename to tests/Unit/ProjectConfiguration/WordPress/ElementorConfigurationChangeTest.php
index d9d3c6b..e0ed6c5 100644
--- a/tests/Unit/ProjectConfiguration/ElementorConfigurationChangeTest.php
+++ b/tests/Unit/ProjectConfiguration/WordPress/ElementorConfigurationChangeTest.php
@@ -11,13 +11,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Ymir\Cli\Tests\Unit\ProjectConfiguration;
+namespace Ymir\Cli\Tests\Unit\ProjectConfiguration\WordPress;
 
-use Ymir\Cli\ProjectConfiguration\ElementorConfigurationChange;
+use Ymir\Cli\ProjectConfiguration\WordPress\ElementorConfigurationChange;
 use Ymir\Cli\Tests\Unit\TestCase;
 
 /**
- * @covers \Ymir\Cli\ProjectConfiguration\ElementorConfigurationChange
+ * @covers \Ymir\Cli\ProjectConfiguration\WordPress\ElementorConfigurationChange
  */
 class ElementorConfigurationChangeTest extends TestCase
 {
diff --git a/tests/Unit/ProjectConfiguration/OxygenConfigurationChangeTest.php b/tests/Unit/ProjectConfiguration/WordPress/OxygenConfigurationChangeTest.php
similarity index 93%
rename from tests/Unit/ProjectConfiguration/OxygenConfigurationChangeTest.php
rename to tests/Unit/ProjectConfiguration/WordPress/OxygenConfigurationChangeTest.php
index a72bb38..6859c1e 100644
--- a/tests/Unit/ProjectConfiguration/OxygenConfigurationChangeTest.php
+++ b/tests/Unit/ProjectConfiguration/WordPress/OxygenConfigurationChangeTest.php
@@ -11,13 +11,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Ymir\Cli\Tests\Unit\ProjectConfiguration;
+namespace Ymir\Cli\Tests\Unit\ProjectConfiguration\WordPress;
 
-use Ymir\Cli\ProjectConfiguration\OxygenConfigurationChange;
+use Ymir\Cli\ProjectConfiguration\WordPress\OxygenConfigurationChange;
 use Ymir\Cli\Tests\Unit\TestCase;
 
 /**
- * @covers \Ymir\Cli\ProjectConfiguration\OxygenConfigurationChange
+ * @covers \Ymir\Cli\ProjectConfiguration\WordPress\OxygenConfigurationChange
  */
 class OxygenConfigurationChangeTest extends TestCase
 {
diff --git a/tests/Unit/ProjectConfiguration/WooCommerceConfigurationChangeTest.php b/tests/Unit/ProjectConfiguration/WordPress/WooCommerceConfigurationChangeTest.php
similarity index 95%
rename from tests/Unit/ProjectConfiguration/WooCommerceConfigurationChangeTest.php
rename to tests/Unit/ProjectConfiguration/WordPress/WooCommerceConfigurationChangeTest.php
index d8419a1..61a0362 100644
--- a/tests/Unit/ProjectConfiguration/WooCommerceConfigurationChangeTest.php
+++ b/tests/Unit/ProjectConfiguration/WordPress/WooCommerceConfigurationChangeTest.php
@@ -11,13 +11,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Ymir\Cli\Tests\Unit\ProjectConfiguration;
+namespace Ymir\Cli\Tests\Unit\ProjectConfiguration\WordPress;
 
-use Ymir\Cli\ProjectConfiguration\WooCommerceConfigurationChange;
+use Ymir\Cli\ProjectConfiguration\WordPress\WooCommerceConfigurationChange;
 use Ymir\Cli\Tests\Unit\TestCase;
 
 /**
- * @covers \Ymir\Cli\ProjectConfiguration\WooCommerceConfigurationChange
+ * @covers \Ymir\Cli\ProjectConfiguration\WordPress\WooCommerceConfigurationChange
  */
 class WooCommerceConfigurationChangeTest extends TestCase
 {