diff --git a/src/plugins/system/mokowaasbrand/src/Extension/MokoWaaSBrand.php b/src/Extension/MokoWaaSBrand.php
similarity index 96%
rename from src/plugins/system/mokowaasbrand/src/Extension/MokoWaaSBrand.php
rename to src/Extension/MokoWaaSBrand.php
index 48f61929..c1306a0a 100644
--- a/src/plugins/system/mokowaasbrand/src/Extension/MokoWaaSBrand.php
+++ b/src/Extension/MokoWaaSBrand.php
@@ -16,9 +16,8 @@
  * DEFGROUP: Joomla.Plugin
  * INGROUP: MokoWaaS-Brand
  * REPO: https://github.com/mokoconsulting-tech/mokowaasbrand
- * VERSION: 01.04.00
- * PATH: /src/plugins/system/mokowaasbrand/src/Extension/MokoWaaSBrand.php
- * BRIEF: Main plugin class for MokoWaaS-Brand system plugin
+ * VERSION: 01.06.00
+ * PATH: /src/Extension/MokoWaaSBrand.php
  * NOTE: Handles Joomla system events for rebranding functionality
  */
 
diff --git a/src/plugins/system/mokowaasbrand/administrator/language/en-GB/index.html b/src/administrator/language/en-GB/index.html
similarity index 100%
rename from src/plugins/system/mokowaasbrand/administrator/language/en-GB/index.html
rename to src/administrator/language/en-GB/index.html
diff --git a/src/plugins/system/mokowaasbrand/administrator/language/en-GB/plg_system_mokowaasbrand.sys.ini b/src/administrator/language/en-GB/plg_system_mokowaasbrand.sys.ini
similarity index 89%
rename from src/plugins/system/mokowaasbrand/administrator/language/en-GB/plg_system_mokowaasbrand.sys.ini
rename to src/administrator/language/en-GB/plg_system_mokowaasbrand.sys.ini
index 6570f4dd..de6fad53 100644
--- a/src/plugins/system/mokowaasbrand/administrator/language/en-GB/plg_system_mokowaasbrand.sys.ini
+++ b/src/administrator/language/en-GB/plg_system_mokowaasbrand.sys.ini
@@ -7,9 +7,9 @@
 ; FILE INFORMATION
 ; Defgroup: Joomla Language
 ; Ingroup: MokoWaaSBrand
-; Version: 01.05.00
+; Version: 01.06.00
 ; File: plg_system_mokowaasbrand.sys.ini
-; Path: /src/plugins/system/mokowaasbrand/language/en-GB/plg_system_mokowaasbrand.sys.ini
+; Path: /src/administrator/language/en-GB/plg_system_mokowaasbrand.sys.ini
 ; Brief: System language strings for MokoWaaSBrand plugin installation
 ; Notes: Contains strings used during plugin installation and management
 ; Variables: (none)
diff --git a/src/plugins/system/mokowaasbrand/administrator/language/en-US/index.html b/src/administrator/language/en-US/index.html
similarity index 100%
rename from src/plugins/system/mokowaasbrand/administrator/language/en-US/index.html
rename to src/administrator/language/en-US/index.html
diff --git a/src/plugins/system/mokowaasbrand/administrator/language/en-US/plg_system_mokowaasbrand.sys.ini b/src/administrator/language/en-US/plg_system_mokowaasbrand.sys.ini
similarity index 91%
rename from src/plugins/system/mokowaasbrand/administrator/language/en-US/plg_system_mokowaasbrand.sys.ini
rename to src/administrator/language/en-US/plg_system_mokowaasbrand.sys.ini
index 883a1fcd..84d34fec 100644
--- a/src/plugins/system/mokowaasbrand/administrator/language/en-US/plg_system_mokowaasbrand.sys.ini
+++ b/src/administrator/language/en-US/plg_system_mokowaasbrand.sys.ini
@@ -9,7 +9,7 @@
 ; Ingroup: MokoWaaSBrand
 ; Version: 01.06.00
 ; File: plg_system_mokowaasbrand.sys.ini
-; Path: /src/plugins/system/mokowaasbrand/language/en-US/plg_system_mokowaasbrand.sys.ini
+; Path: /src/administrator/language/en-US/plg_system_mokowaasbrand.sys.ini
 ; Brief: US English system language strings for MokoWaaSBrand plugin installation
 ; Notes: Contains strings used during plugin installation and management
 ; Variables: (none)
diff --git a/src/plugins/system/mokowaasbrand/administrator/language/overrides/en-GB.override.ini b/src/administrator/language/overrides/en-GB.override.ini
similarity index 100%
rename from src/plugins/system/mokowaasbrand/administrator/language/overrides/en-GB.override.ini
rename to src/administrator/language/overrides/en-GB.override.ini
diff --git a/src/plugins/system/mokowaasbrand/administrator/language/overrides/en-US.override.ini b/src/administrator/language/overrides/en-US.override.ini
similarity index 100%
rename from src/plugins/system/mokowaasbrand/administrator/language/overrides/en-US.override.ini
rename to src/administrator/language/overrides/en-US.override.ini
diff --git a/src/plugins/system/mokowaasbrand/administrator/language/overrides/index.html b/src/administrator/language/overrides/index.html
similarity index 100%
rename from src/plugins/system/mokowaasbrand/administrator/language/overrides/index.html
rename to src/administrator/language/overrides/index.html
diff --git a/src/plugins/system/mokowaasbrand/index.html b/src/index.html
similarity index 100%
rename from src/plugins/system/mokowaasbrand/index.html
rename to src/index.html
diff --git a/src/plugins/system/mokowaasbrand/language/en-GB/index.html b/src/language/en-GB/index.html
similarity index 100%
rename from src/plugins/system/mokowaasbrand/language/en-GB/index.html
rename to src/language/en-GB/index.html
diff --git a/src/plugins/system/mokowaasbrand/language/en-GB/plg_system_mokowaasbrand.ini b/src/language/en-GB/plg_system_mokowaasbrand.ini
similarity index 91%
rename from src/plugins/system/mokowaasbrand/language/en-GB/plg_system_mokowaasbrand.ini
rename to src/language/en-GB/plg_system_mokowaasbrand.ini
index 6e0e3bd3..11f76b0c 100644
--- a/src/plugins/system/mokowaasbrand/language/en-GB/plg_system_mokowaasbrand.ini
+++ b/src/language/en-GB/plg_system_mokowaasbrand.ini
@@ -7,9 +7,9 @@
 ; FILE INFORMATION
 ; Defgroup: Joomla Language
 ; Ingroup: MokoWaaSBrand
-; Version: 01.05.00
+; Version: 01.06.00
 ; File: plg_system_mokowaasbrand.ini
-; Path: /src/plugins/system/mokowaasbrand/language/en-GB/plg_system_mokowaasbrand.ini
+; Path: /src/language/en-GB/plg_system_mokowaasbrand.ini
 ; Brief: English language strings for MokoWaaSBrand system plugin
 ; Notes: Contains translatable strings for plugin functionality
 ; Variables: (none)
diff --git a/src/plugins/system/mokowaasbrand/language/en-US/index.html b/src/language/en-US/index.html
similarity index 100%
rename from src/plugins/system/mokowaasbrand/language/en-US/index.html
rename to src/language/en-US/index.html
diff --git a/src/plugins/system/mokowaasbrand/language/en-US/plg_system_mokowaasbrand.ini b/src/language/en-US/plg_system_mokowaasbrand.ini
similarity index 93%
rename from src/plugins/system/mokowaasbrand/language/en-US/plg_system_mokowaasbrand.ini
rename to src/language/en-US/plg_system_mokowaasbrand.ini
index 8f2750e4..74b37788 100644
--- a/src/plugins/system/mokowaasbrand/language/en-US/plg_system_mokowaasbrand.ini
+++ b/src/language/en-US/plg_system_mokowaasbrand.ini
@@ -9,7 +9,7 @@
 ; Ingroup: MokoWaaSBrand
 ; Version: 01.06.00
 ; File: plg_system_mokowaasbrand.ini
-; Path: /src/plugins/system/mokowaasbrand/language/en-US/plg_system_mokowaasbrand.ini
+; Path: /src/language/en-US/plg_system_mokowaasbrand.ini
 ; Brief: US English language strings for MokoWaaSBrand system plugin
 ; Notes: Contains translatable strings for plugin functionality
 ; Variables: (none)
diff --git a/src/plugins/system/mokowaasbrand/language/overrides/en-GB.override.ini b/src/language/overrides/en-GB.override.ini
similarity index 100%
rename from src/plugins/system/mokowaasbrand/language/overrides/en-GB.override.ini
rename to src/language/overrides/en-GB.override.ini
diff --git a/src/plugins/system/mokowaasbrand/language/overrides/en-US.override.ini b/src/language/overrides/en-US.override.ini
similarity index 100%
rename from src/plugins/system/mokowaasbrand/language/overrides/en-US.override.ini
rename to src/language/overrides/en-US.override.ini
diff --git a/src/plugins/system/mokowaasbrand/language/overrides/index.html b/src/language/overrides/index.html
similarity index 100%
rename from src/plugins/system/mokowaasbrand/language/overrides/index.html
rename to src/language/overrides/index.html
diff --git a/src/plugins/system/mokowaasbrand/mokowaasbrand.xml b/src/mokowaasbrand.xml
similarity index 95%
rename from src/plugins/system/mokowaasbrand/mokowaasbrand.xml
rename to src/mokowaasbrand.xml
index ac6a227a..2407d60b 100644
--- a/src/plugins/system/mokowaasbrand/mokowaasbrand.xml
+++ b/src/mokowaasbrand.xml
@@ -17,7 +17,7 @@
  INGROUP: MokoWaaSBrand
  REPO: https://github.com/mokoconsulting-tech/mokowaasbrand
  VERSION: 01.06.00
- PATH: /src/plugins/system/mokowaasbrand/mokowaasbrand.xml
+ PATH: /src/mokowaasbrand.xml
  BRIEF: Plugin manifest for MokoWaaSBrand system plugin
  NOTE: Defines installation metadata, files, and configuration for Joomla
 -->
@@ -31,7 +31,7 @@
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
 	<version>01.06.00</version>
 	<description>PLG_SYSTEM_MOKOWAASBRAND_XML_DESCRIPTION</description>
-	<namespace path="src">Moko\Plugin\System\MokoWaaSBrand</namespace>
+	<namespace path=".">Moko\Plugin\System\MokoWaaSBrand</namespace>
 	<scriptfile>script.php</scriptfile>
 
 	<!-- Update server configuration -->
@@ -41,7 +41,7 @@
 
 	<files>
 		<filename plugin="mokowaasbrand">script.php</filename>
-		<folder>src</folder>
+		<folder>Extension</folder>
 		<folder>services</folder>
 		<folder>language</folder>
 		<folder>administrator</folder>
diff --git a/src/plugins/system/mokowaasbrand/script.php b/src/script.php
similarity index 99%
rename from src/plugins/system/mokowaasbrand/script.php
rename to src/script.php
index 757ae516..26418d32 100644
--- a/src/plugins/system/mokowaasbrand/script.php
+++ b/src/script.php
@@ -17,7 +17,7 @@
  * INGROUP: MokoWaaSBrand
  * REPO: https://github.com/mokoconsulting-tech/mokowaasbrand
  * VERSION: 01.06.00
- * PATH: /src/plugins/system/mokowaasbrand/script.php
+ * PATH: /src/script.php
  * BRIEF: Installation script for MokoWaaSBrand plugin
  * NOTE: Handles installation, update, and uninstallation tasks including language override deployment
  */
diff --git a/src/plugins/system/mokowaasbrand/services/index.html b/src/services/index.html
similarity index 100%
rename from src/plugins/system/mokowaasbrand/services/index.html
rename to src/services/index.html
diff --git a/src/plugins/system/mokowaasbrand/services/provider.php b/src/services/provider.php
similarity index 98%
rename from src/plugins/system/mokowaasbrand/services/provider.php
rename to src/services/provider.php
index 481ab323..4f7da125 100644
--- a/src/plugins/system/mokowaasbrand/services/provider.php
+++ b/src/services/provider.php
@@ -16,7 +16,7 @@
  * DEFGROUP: Joomla.Plugin
  * INGROUP: MokoWaaS-Brand
  * REPO: https://github.com/mokoconsulting-tech/mokowaasbrand
- * VERSION: 01.04.00
+ * VERSION: 01.06.00
  * PATH: /src/services/provider.php
  * BRIEF: Service provider for dependency injection in Joomla 5.x
  * NOTE: Registers the plugin with Joomla's DI container