diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 581f240..31bb37f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,7 +27,7 @@ jobs:
         id: get_version
         uses: martinbeentjes/npm-get-version-action@v1.3.1
         with:
-          path: Unity-Package/Assets/root
+          path: Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem
 
       - name: Find previous version tag
         id: prev_tag
@@ -193,7 +193,7 @@ jobs:
       UPM_SERVICE_ACCOUNT_KEY_ID: ${{ secrets.UPM_SERVICE_ACCOUNT_KEY_ID }}
       UPM_SERVICE_ACCOUNT_KEY_SECRET: ${{ secrets.UPM_SERVICE_ACCOUNT_KEY_SECRET }}
       UPM_ORG_ID: ${{ secrets.UPM_ORG_ID }}
-      PACKAGE_DIR: Unity-Package/Assets/root
+      PACKAGE_DIR: Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem
       DIST_DIR: /tmp/signed-upm-dist
     steps:
       - name: Verify signing secrets are configured
diff --git a/CLAUDE.md b/CLAUDE.md
index e834d28..e7ab78a 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -6,7 +6,7 @@ Unity package `com.ivanmurzak.unity.mcp.particlesystem` exposing two MCP tools 
 
 ## Build / run
 
-- Package source: `Unity-Package/Assets/root/` (Editor + Runtime + Tests)
+- Package source: `Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/` (Editor + Runtime + Tests)
 - Update Unity-MCP dependency: `.\commands\update-ai-game-developer.ps1` (`-WhatIf` to preview)
 - Bump version: `.\commands\bump-version.ps1 -NewVersion "x.y.z"` (`-WhatIf` to preview)
 - Tests run inside Unity Editor (NUnit + `[UnityTest]`); CI uses `game-ci/unity-test-runner@v4`.
diff --git a/Installer/Assets/Packages/manifest.json b/Installer/Assets/Packages/manifest.json
index e3fc14c..d2d630a 100644
--- a/Installer/Assets/Packages/manifest.json
+++ b/Installer/Assets/Packages/manifest.json
@@ -20,11 +20,7 @@
       "url": "https://package.openupm.com",
       "scopes": [
         "com.ivanmurzak",
-        "extensions.unity",
-        "org.nuget.com.ivanmurzak",
-        "org.nuget.microsoft",
-        "org.nuget.system",
-        "org.nuget.r3"
+        "extensions.unity"
       ]
     }
   ]
diff --git a/Installer/Assets/com.IvanMurzak/AI Particle System Installer/README.md b/Installer/Assets/com.IvanMurzak/AI Particle System Installer/README.md
index 0babaf2..02e3ec9 100644
--- a/Installer/Assets/com.IvanMurzak/AI Particle System Installer/README.md	
+++ b/Installer/Assets/com.IvanMurzak/AI Particle System Installer/README.md	
@@ -45,7 +45,7 @@ cd Commands
 Follow the instruction - [manual package rename](https://github.com/IvanMurzak/Unity-Package-Template/blob/main/Docs/Manual-Package-Rename.md)
 
 
-#### 3️⃣ Customize `Assets/root/package.json`
+#### 3️⃣ Customize `Packages/com.ivanmurzak.unity.mcp.particlesystem/package.json`
 
 - 👉 **Update** `name`
   > Sample: `com.github.your_name.package`
@@ -65,7 +65,7 @@ Follow the instruction - [manual package rename](https://github.com/IvanMurzak/U
 <details>
   <summary><b>❌ NO</b></summary>
 
-- 👉 **Delete** `Assets/root/Tests` folder
+- 👉 **Delete** `Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests` folder
 - 👉 **Delete** `.github/workflows` folder
 
 </details>
@@ -86,7 +86,7 @@ Follow the instruction - [manual package rename](https://github.com/IvanMurzak/U
 
 </details>
 
-#### 4️⃣ Add files into `Assets/root` folder
+#### 4️⃣ Add files into `Packages/com.ivanmurzak.unity.mcp.particlesystem` folder
 
 [Unity guidelines](https://docs.unity3d.com/Manual/cus-layout.html) about organizing files into the package root directory
 
@@ -121,7 +121,7 @@ Follow the instruction - [manual package rename](https://github.com/IvanMurzak/U
 ##### Final polishing
 
 - Update the `README.md` file (this file) with information about your package.
-- Copy the updated `README.md` to `Assets/root` as well.
+- Copy the updated `README.md` to `Packages/com.ivanmurzak.unity.mcp.particlesystem` as well.
 
 > ⚠️ Everything outside of the `root` folder won't be added to your package. But still could be used for testing or showcasing your package at your repository.
 
diff --git a/Unity-Package/Assets/root.meta b/Unity-Package/Assets/root.meta
deleted file mode 100644
index b444c15..0000000
--- a/Unity-Package/Assets/root.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 3ef88453d7757594f8fcbd883c1be3d2
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Unity-Package/Assets/root/CHANGELOG.md b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/CHANGELOG.md
similarity index 100%
rename from Unity-Package/Assets/root/CHANGELOG.md
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/CHANGELOG.md
diff --git a/Unity-Package/Assets/root/CHANGELOG.md.meta b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/CHANGELOG.md.meta
similarity index 100%
rename from Unity-Package/Assets/root/CHANGELOG.md.meta
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/CHANGELOG.md.meta
diff --git a/Unity-Package/Assets/root/Documentation~/.gitignore b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Documentation~/.gitignore
similarity index 100%
rename from Unity-Package/Assets/root/Documentation~/.gitignore
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Documentation~/.gitignore
diff --git a/Unity-Package/Assets/root/Editor.meta b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor.meta
similarity index 100%
rename from Unity-Package/Assets/root/Editor.meta
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor.meta
diff --git a/Unity-Package/Assets/root/Editor/Gizmos.meta b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Gizmos.meta
similarity index 100%
rename from Unity-Package/Assets/root/Editor/Gizmos.meta
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Gizmos.meta
diff --git a/Unity-Package/Assets/root/Editor/Gizmos/.gitignore b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Gizmos/.gitignore
similarity index 100%
rename from Unity-Package/Assets/root/Editor/Gizmos/.gitignore
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Gizmos/.gitignore
diff --git a/Unity-Package/Assets/root/Editor/Gizmos/icon.png b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Gizmos/icon.png
similarity index 100%
rename from Unity-Package/Assets/root/Editor/Gizmos/icon.png
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Gizmos/icon.png
diff --git a/Unity-Package/Assets/root/Editor/Gizmos/icon.png.meta b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Gizmos/icon.png.meta
similarity index 100%
rename from Unity-Package/Assets/root/Editor/Gizmos/icon.png.meta
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Gizmos/icon.png.meta
diff --git a/Unity-Package/Assets/root/Editor/Scripts.meta b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts.meta
similarity index 100%
rename from Unity-Package/Assets/root/Editor/Scripts.meta
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts.meta
diff --git a/Unity-Package/Assets/root/Editor/Scripts/.gitignore b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/.gitignore
similarity index 100%
rename from Unity-Package/Assets/root/Editor/Scripts/.gitignore
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/.gitignore
diff --git a/Unity-Package/Assets/root/Editor/Scripts/Data.meta b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/Data.meta
similarity index 100%
rename from Unity-Package/Assets/root/Editor/Scripts/Data.meta
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/Data.meta
diff --git a/Unity-Package/Assets/root/Editor/Scripts/Data/GetParticleSystemResponse.cs b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/Data/GetParticleSystemResponse.cs
similarity index 100%
rename from Unity-Package/Assets/root/Editor/Scripts/Data/GetParticleSystemResponse.cs
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/Data/GetParticleSystemResponse.cs
diff --git a/Unity-Package/Assets/root/Editor/Scripts/Data/GetParticleSystemResponse.cs.meta b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/Data/GetParticleSystemResponse.cs.meta
similarity index 100%
rename from Unity-Package/Assets/root/Editor/Scripts/Data/GetParticleSystemResponse.cs.meta
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/Data/GetParticleSystemResponse.cs.meta
diff --git a/Unity-Package/Assets/root/Editor/Scripts/Data/ModifyParticleSystemResponse.cs b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/Data/ModifyParticleSystemResponse.cs
similarity index 100%
rename from Unity-Package/Assets/root/Editor/Scripts/Data/ModifyParticleSystemResponse.cs
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/Data/ModifyParticleSystemResponse.cs
diff --git a/Unity-Package/Assets/root/Editor/Scripts/Data/ModifyParticleSystemResponse.cs.meta b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/Data/ModifyParticleSystemResponse.cs.meta
similarity index 100%
rename from Unity-Package/Assets/root/Editor/Scripts/Data/ModifyParticleSystemResponse.cs.meta
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/Data/ModifyParticleSystemResponse.cs.meta
diff --git a/Unity-Package/Assets/root/Editor/Scripts/Data/ParticleSystemData.cs b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/Data/ParticleSystemData.cs
similarity index 100%
rename from Unity-Package/Assets/root/Editor/Scripts/Data/ParticleSystemData.cs
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/Data/ParticleSystemData.cs
diff --git a/Unity-Package/Assets/root/Editor/Scripts/Data/ParticleSystemData.cs.meta b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/Data/ParticleSystemData.cs.meta
similarity index 100%
rename from Unity-Package/Assets/root/Editor/Scripts/Data/ParticleSystemData.cs.meta
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/Data/ParticleSystemData.cs.meta
diff --git a/Unity-Package/Assets/root/Editor/Scripts/Tools.meta b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/Tools.meta
similarity index 100%
rename from Unity-Package/Assets/root/Editor/Scripts/Tools.meta
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/Tools.meta
diff --git a/Unity-Package/Assets/root/Editor/Scripts/Tools/ParticleSystem.Get.cs b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/Tools/ParticleSystem.Get.cs
similarity index 100%
rename from Unity-Package/Assets/root/Editor/Scripts/Tools/ParticleSystem.Get.cs
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/Tools/ParticleSystem.Get.cs
diff --git a/Unity-Package/Assets/root/Editor/Scripts/Tools/ParticleSystem.Get.cs.meta b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/Tools/ParticleSystem.Get.cs.meta
similarity index 100%
rename from Unity-Package/Assets/root/Editor/Scripts/Tools/ParticleSystem.Get.cs.meta
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/Tools/ParticleSystem.Get.cs.meta
diff --git a/Unity-Package/Assets/root/Editor/Scripts/Tools/ParticleSystem.Modify.cs b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/Tools/ParticleSystem.Modify.cs
similarity index 100%
rename from Unity-Package/Assets/root/Editor/Scripts/Tools/ParticleSystem.Modify.cs
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/Tools/ParticleSystem.Modify.cs
diff --git a/Unity-Package/Assets/root/Editor/Scripts/Tools/ParticleSystem.Modify.cs.meta b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/Tools/ParticleSystem.Modify.cs.meta
similarity index 100%
rename from Unity-Package/Assets/root/Editor/Scripts/Tools/ParticleSystem.Modify.cs.meta
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/Tools/ParticleSystem.Modify.cs.meta
diff --git a/Unity-Package/Assets/root/Editor/Scripts/Tools/ParticleSystem.cs b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/Tools/ParticleSystem.cs
similarity index 100%
rename from Unity-Package/Assets/root/Editor/Scripts/Tools/ParticleSystem.cs
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/Tools/ParticleSystem.cs
diff --git a/Unity-Package/Assets/root/Editor/Scripts/Tools/ParticleSystem.cs.meta b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/Tools/ParticleSystem.cs.meta
similarity index 100%
rename from Unity-Package/Assets/root/Editor/Scripts/Tools/ParticleSystem.cs.meta
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/Tools/ParticleSystem.cs.meta
diff --git a/Unity-Package/Assets/root/Editor/Scripts/com.IvanMurzak.Unity.MCP.ParticleSystem.Editor.asmdef b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/com.IvanMurzak.Unity.MCP.ParticleSystem.Editor.asmdef
similarity index 100%
rename from Unity-Package/Assets/root/Editor/Scripts/com.IvanMurzak.Unity.MCP.ParticleSystem.Editor.asmdef
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/com.IvanMurzak.Unity.MCP.ParticleSystem.Editor.asmdef
diff --git a/Unity-Package/Assets/root/Editor/Scripts/com.IvanMurzak.Unity.MCP.ParticleSystem.Editor.asmdef.meta b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/com.IvanMurzak.Unity.MCP.ParticleSystem.Editor.asmdef.meta
similarity index 100%
rename from Unity-Package/Assets/root/Editor/Scripts/com.IvanMurzak.Unity.MCP.ParticleSystem.Editor.asmdef.meta
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Editor/Scripts/com.IvanMurzak.Unity.MCP.ParticleSystem.Editor.asmdef.meta
diff --git a/Unity-Package/Assets/root/LICENSE b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/LICENSE
similarity index 100%
rename from Unity-Package/Assets/root/LICENSE
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/LICENSE
diff --git a/Unity-Package/Assets/root/LICENSE.meta b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/LICENSE.meta
similarity index 100%
rename from Unity-Package/Assets/root/LICENSE.meta
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/LICENSE.meta
diff --git a/Unity-Package/Assets/root/README.md b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/README.md
similarity index 100%
rename from Unity-Package/Assets/root/README.md
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/README.md
diff --git a/Unity-Package/Assets/root/README.md.meta b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/README.md.meta
similarity index 100%
rename from Unity-Package/Assets/root/README.md.meta
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/README.md.meta
diff --git a/Unity-Package/Assets/root/Runtime.meta b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Runtime.meta
similarity index 100%
rename from Unity-Package/Assets/root/Runtime.meta
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Runtime.meta
diff --git a/Unity-Package/Assets/root/Runtime/.gitignore b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Runtime/.gitignore
similarity index 100%
rename from Unity-Package/Assets/root/Runtime/.gitignore
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Runtime/.gitignore
diff --git a/Unity-Package/Assets/root/Runtime/com.IvanMurzak.Unity.MCP.ParticleSystem.Runtime.asmdef b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Runtime/com.IvanMurzak.Unity.MCP.ParticleSystem.Runtime.asmdef
similarity index 100%
rename from Unity-Package/Assets/root/Runtime/com.IvanMurzak.Unity.MCP.ParticleSystem.Runtime.asmdef
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Runtime/com.IvanMurzak.Unity.MCP.ParticleSystem.Runtime.asmdef
diff --git a/Unity-Package/Assets/root/Runtime/com.IvanMurzak.Unity.MCP.ParticleSystem.Runtime.asmdef.meta b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Runtime/com.IvanMurzak.Unity.MCP.ParticleSystem.Runtime.asmdef.meta
similarity index 100%
rename from Unity-Package/Assets/root/Runtime/com.IvanMurzak.Unity.MCP.ParticleSystem.Runtime.asmdef.meta
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Runtime/com.IvanMurzak.Unity.MCP.ParticleSystem.Runtime.asmdef.meta
diff --git a/Unity-Package/Assets/root/Samples~/.gitignore b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Samples~/.gitignore
similarity index 100%
rename from Unity-Package/Assets/root/Samples~/.gitignore
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Samples~/.gitignore
diff --git a/Unity-Package/Assets/root/Tests.meta b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests.meta
similarity index 100%
rename from Unity-Package/Assets/root/Tests.meta
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests.meta
diff --git a/Unity-Package/Assets/root/Tests/Editor.meta b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Editor.meta
similarity index 100%
rename from Unity-Package/Assets/root/Tests/Editor.meta
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Editor.meta
diff --git a/Unity-Package/Assets/root/Tests/Editor/.gitignore b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Editor/.gitignore
similarity index 100%
rename from Unity-Package/Assets/root/Tests/Editor/.gitignore
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Editor/.gitignore
diff --git a/Unity-Package/Assets/root/Tests/Editor/BaseTest.cs b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Editor/BaseTest.cs
similarity index 100%
rename from Unity-Package/Assets/root/Tests/Editor/BaseTest.cs
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Editor/BaseTest.cs
diff --git a/Unity-Package/Assets/root/Tests/Editor/BaseTest.cs.meta b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Editor/BaseTest.cs.meta
similarity index 100%
rename from Unity-Package/Assets/root/Tests/Editor/BaseTest.cs.meta
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Editor/BaseTest.cs.meta
diff --git a/Unity-Package/Assets/root/Tests/Editor/TestToolParticleSystemGet.cs b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Editor/TestToolParticleSystemGet.cs
similarity index 100%
rename from Unity-Package/Assets/root/Tests/Editor/TestToolParticleSystemGet.cs
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Editor/TestToolParticleSystemGet.cs
diff --git a/Unity-Package/Assets/root/Tests/Editor/TestToolParticleSystemGet.cs.meta b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Editor/TestToolParticleSystemGet.cs.meta
similarity index 100%
rename from Unity-Package/Assets/root/Tests/Editor/TestToolParticleSystemGet.cs.meta
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Editor/TestToolParticleSystemGet.cs.meta
diff --git a/Unity-Package/Assets/root/Tests/Editor/TestToolParticleSystemModify.cs b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Editor/TestToolParticleSystemModify.cs
similarity index 100%
rename from Unity-Package/Assets/root/Tests/Editor/TestToolParticleSystemModify.cs
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Editor/TestToolParticleSystemModify.cs
diff --git a/Unity-Package/Assets/root/Tests/Editor/TestToolParticleSystemModify.cs.meta b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Editor/TestToolParticleSystemModify.cs.meta
similarity index 100%
rename from Unity-Package/Assets/root/Tests/Editor/TestToolParticleSystemModify.cs.meta
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Editor/TestToolParticleSystemModify.cs.meta
diff --git a/Unity-Package/Assets/root/Tests/Editor/com.IvanMurzak.Unity.MCP.ParticleSystem.Editor.Tests.asmdef b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Editor/com.IvanMurzak.Unity.MCP.ParticleSystem.Editor.Tests.asmdef
similarity index 100%
rename from Unity-Package/Assets/root/Tests/Editor/com.IvanMurzak.Unity.MCP.ParticleSystem.Editor.Tests.asmdef
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Editor/com.IvanMurzak.Unity.MCP.ParticleSystem.Editor.Tests.asmdef
diff --git a/Unity-Package/Assets/root/Tests/Editor/com.IvanMurzak.Unity.MCP.ParticleSystem.Editor.Tests.asmdef.meta b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Editor/com.IvanMurzak.Unity.MCP.ParticleSystem.Editor.Tests.asmdef.meta
similarity index 100%
rename from Unity-Package/Assets/root/Tests/Editor/com.IvanMurzak.Unity.MCP.ParticleSystem.Editor.Tests.asmdef.meta
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Editor/com.IvanMurzak.Unity.MCP.ParticleSystem.Editor.Tests.asmdef.meta
diff --git a/Unity-Package/Assets/root/Tests/Runtime.meta b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Runtime.meta
similarity index 100%
rename from Unity-Package/Assets/root/Tests/Runtime.meta
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Runtime.meta
diff --git a/Unity-Package/Assets/root/Tests/Runtime/.gitignore b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Runtime/.gitignore
similarity index 100%
rename from Unity-Package/Assets/root/Tests/Runtime/.gitignore
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Runtime/.gitignore
diff --git a/Unity-Package/Assets/root/Tests/Runtime/DemoTest.cs b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Runtime/DemoTest.cs
similarity index 100%
rename from Unity-Package/Assets/root/Tests/Runtime/DemoTest.cs
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Runtime/DemoTest.cs
diff --git a/Unity-Package/Assets/root/Tests/Runtime/DemoTest.cs.meta b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Runtime/DemoTest.cs.meta
similarity index 100%
rename from Unity-Package/Assets/root/Tests/Runtime/DemoTest.cs.meta
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Runtime/DemoTest.cs.meta
diff --git a/Unity-Package/Assets/root/Tests/Runtime/com.IvanMurzak.Unity.MCP.ParticleSystem.Tests.asmdef b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Runtime/com.IvanMurzak.Unity.MCP.ParticleSystem.Tests.asmdef
similarity index 100%
rename from Unity-Package/Assets/root/Tests/Runtime/com.IvanMurzak.Unity.MCP.ParticleSystem.Tests.asmdef
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Runtime/com.IvanMurzak.Unity.MCP.ParticleSystem.Tests.asmdef
diff --git a/Unity-Package/Assets/root/Tests/Runtime/com.IvanMurzak.Unity.MCP.ParticleSystem.Tests.asmdef.meta b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Runtime/com.IvanMurzak.Unity.MCP.ParticleSystem.Tests.asmdef.meta
similarity index 100%
rename from Unity-Package/Assets/root/Tests/Runtime/com.IvanMurzak.Unity.MCP.ParticleSystem.Tests.asmdef.meta
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Runtime/com.IvanMurzak.Unity.MCP.ParticleSystem.Tests.asmdef.meta
diff --git a/Unity-Package/Assets/root/package.json b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/package.json
similarity index 100%
rename from Unity-Package/Assets/root/package.json
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/package.json
diff --git a/Unity-Package/Assets/root/package.json.meta b/Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/package.json.meta
similarity index 100%
rename from Unity-Package/Assets/root/package.json.meta
rename to Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/package.json.meta
diff --git a/Unity-Tests/2022.3.62f3/Packages/manifest.json b/Unity-Tests/2022.3.62f3/Packages/manifest.json
index 7351267..e6e5ed8 100644
--- a/Unity-Tests/2022.3.62f3/Packages/manifest.json
+++ b/Unity-Tests/2022.3.62f3/Packages/manifest.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "com.ivanmurzak.unity.mcp.particlesystem": "file:./../../../Unity-Package/Assets/root",
+    "com.ivanmurzak.unity.mcp.particlesystem": "file:./../../../Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem",
     "com.unity.feature.development": "1.0.1",
     "com.unity.test-framework": "1.1.33",
     "com.unity.ugui": "1.0.0",
@@ -40,8 +40,7 @@
       "url": "https://package.openupm.com",
       "scopes": [
         "com.ivanmurzak",
-        "extensions.unity",
-        "org.nuget"
+        "extensions.unity"
       ]
     }
   ],
diff --git a/Unity-Tests/2022.3.62f3/Packages/packages-lock.json b/Unity-Tests/2022.3.62f3/Packages/packages-lock.json
index d0f24e6..80cf717 100644
--- a/Unity-Tests/2022.3.62f3/Packages/packages-lock.json
+++ b/Unity-Tests/2022.3.62f3/Packages/packages-lock.json
@@ -12,7 +12,7 @@
       "url": "https://package.openupm.com"
     },
     "com.ivanmurzak.unity.mcp.particlesystem": {
-      "version": "file:./../../../Unity-Package/Assets/root",
+      "version": "file:./../../../Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem",
       "depth": 0,
       "source": "local",
       "dependencies": {
diff --git a/Unity-Tests/2023.2.22f1/Packages/manifest.json b/Unity-Tests/2023.2.22f1/Packages/manifest.json
index 3f7a5a5..8ac2344 100644
--- a/Unity-Tests/2023.2.22f1/Packages/manifest.json
+++ b/Unity-Tests/2023.2.22f1/Packages/manifest.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "com.ivanmurzak.unity.mcp.particlesystem": "file:./../../../Unity-Package/Assets/root",
+    "com.ivanmurzak.unity.mcp.particlesystem": "file:./../../../Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem",
     "com.unity.feature.development": "1.0.2",
     "com.unity.test-framework": "1.3.9",
     "com.unity.ugui": "2.0.0",
@@ -43,8 +43,7 @@
       "url": "https://package.openupm.com",
       "scopes": [
         "com.ivanmurzak",
-        "extensions.unity",
-        "org.nuget"
+        "extensions.unity"
       ]
     }
   ],
diff --git a/Unity-Tests/2023.2.22f1/Packages/packages-lock.json b/Unity-Tests/2023.2.22f1/Packages/packages-lock.json
index 977f362..a772e9b 100644
--- a/Unity-Tests/2023.2.22f1/Packages/packages-lock.json
+++ b/Unity-Tests/2023.2.22f1/Packages/packages-lock.json
@@ -12,7 +12,7 @@
       "url": "https://package.openupm.com"
     },
     "com.ivanmurzak.unity.mcp.particlesystem": {
-      "version": "file:./../../../Unity-Package/Assets/root",
+      "version": "file:./../../../Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem",
       "depth": 0,
       "source": "local",
       "dependencies": {
diff --git a/Unity-Tests/6000.3.1f1/Packages/manifest.json b/Unity-Tests/6000.3.1f1/Packages/manifest.json
index b3fa72c..fb89bbe 100644
--- a/Unity-Tests/6000.3.1f1/Packages/manifest.json
+++ b/Unity-Tests/6000.3.1f1/Packages/manifest.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "com.ivanmurzak.unity.mcp.particlesystem": "file:./../../../Unity-Package/Assets/root",
+    "com.ivanmurzak.unity.mcp.particlesystem": "file:./../../../Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem",
     "com.unity.feature.development": "1.0.1",
     "com.unity.ide.visualstudio": "2.0.25",
     "com.unity.test-framework": "1.6.0",
@@ -44,8 +44,7 @@
       "url": "https://package.openupm.com",
       "scopes": [
         "com.ivanmurzak",
-        "extensions.unity",
-        "org.nuget"
+        "extensions.unity"
       ]
     }
   ],
diff --git a/Unity-Tests/6000.3.1f1/Packages/packages-lock.json b/Unity-Tests/6000.3.1f1/Packages/packages-lock.json
index d5d063e..8059e0a 100644
--- a/Unity-Tests/6000.3.1f1/Packages/packages-lock.json
+++ b/Unity-Tests/6000.3.1f1/Packages/packages-lock.json
@@ -12,7 +12,7 @@
       "url": "https://package.openupm.com"
     },
     "com.ivanmurzak.unity.mcp.particlesystem": {
-      "version": "file:./../../../Unity-Package/Assets/root",
+      "version": "file:./../../../Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem",
       "depth": 0,
       "source": "local",
       "dependencies": {
diff --git a/commands/bump-version.ps1 b/commands/bump-version.ps1
index 07de5e1..9f22d57 100644
--- a/commands/bump-version.ps1
+++ b/commands/bump-version.ps1
@@ -38,7 +38,7 @@ $ErrorActionPreference = "Stop"
 # Version file locations (relative to script root)
 $VersionFiles = @(
     @{
-        Path        = "Unity-Package/Assets/root/package.json"
+        Path        = "Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/package.json"
         Pattern     = '"version":\s*"[\d\.]+"'
         Replace     = '"version": "{VERSION}"'
         Description = "Unity package version"
@@ -70,7 +70,7 @@ function Test-SemanticVersion {
 
 function Get-CurrentVersion {
     # Extract current version from package.json
-    $packageJsonPath = "Unity-Package/Assets/root/package.json"
+    $packageJsonPath = "Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/package.json"
     if (-not (Test-Path $packageJsonPath)) {
         throw "Could not find package.json at: $packageJsonPath"
     }
diff --git a/commands/get-version.ps1 b/commands/get-version.ps1
index b0eebac..82d4fac 100644
--- a/commands/get-version.ps1
+++ b/commands/get-version.ps1
@@ -1,6 +1,6 @@
 $scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
 $repoRoot = Split-Path -Parent $scriptDir
-$packageJsonPath = Join-Path $repoRoot "Unity-Package/Assets/root/package.json"
+$packageJsonPath = Join-Path $repoRoot "Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/package.json"
 if (Test-Path $packageJsonPath) {
     $content = Get-Content $packageJsonPath -Raw
     if ($content -match '"version":\s*"([\d\.]+)"') {
diff --git a/commands/update-ai-game-developer.ps1 b/commands/update-ai-game-developer.ps1
index 85ce264..50897b0 100644
--- a/commands/update-ai-game-developer.ps1
+++ b/commands/update-ai-game-developer.ps1
@@ -33,7 +33,7 @@ $GitHubRepo = "IvanMurzak/Unity-MCP"
 
 # Files to update
 $TargetFiles = @(
-    "Unity-Package/Assets/root/package.json",
+    "Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/package.json",
     "Unity-Package/Packages/manifest.json"
 )
 
diff --git a/commands/use-local-mcp.ps1 b/commands/use-local-mcp.ps1
index 9d98803..1f1f8a2 100644
--- a/commands/use-local-mcp.ps1
+++ b/commands/use-local-mcp.ps1
@@ -47,7 +47,7 @@ Push-Location $repoRoot
 $ErrorActionPreference = "Stop"
 $PackageName = "com.ivanmurzak.unity.mcp"
 $ManifestPath = "Unity-Package/Packages/manifest.json"
-$PackageJsonPath = "Unity-Package/Assets/root/package.json"
+$PackageJsonPath = "Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/package.json"
 $LocalFilePath = "file:./../../../../Unity-MCP/Unity-MCP-Plugin/Assets/root"
 
 function Write-ColorText {
diff --git a/docs/Deploy-GitHub.md b/docs/Deploy-GitHub.md
index 9ba8f8a..b50dff4 100644
--- a/docs/Deploy-GitHub.md
+++ b/docs/Deploy-GitHub.md
@@ -6,7 +6,7 @@ GitHub public repository could be used as a host for your package and directly i
 
 ## Deploy
 
-1. Increment package version in the file `Assets/root/package.json`. It has `version` property.
+1. Increment package version in the file `Packages/com.ivanmurzak.unity.mcp.particlesystem/package.json`. It has `version` property.
    > Any further updates should be done by incrementing package version and making another GitHub release.
 2. Create GitHub Release
    1. Go to your GitHub repository
diff --git a/docs/Deploy-OpenUPM.md b/docs/Deploy-OpenUPM.md
index f7eda06..9f7417f 100644
--- a/docs/Deploy-OpenUPM.md
+++ b/docs/Deploy-OpenUPM.md
@@ -8,9 +8,9 @@ OpenUPM is a registry of package made for Unity. It takes package sources from G
 
 ### Do each update
 
-⚠️ Make sure you done editing `package.json` and files in `Assets/root` folder. Because it is going to be public with no ability to discard it.
+⚠️ Make sure you done editing `package.json` and files in `Packages/com.ivanmurzak.unity.mcp.particlesystem` folder. Because it is going to be public with no ability to discard it.
 
-1. Increment package version in the file `Assets/root/package.json`. It has `version` property.
+1. Increment package version in the file `Packages/com.ivanmurzak.unity.mcp.particlesystem/package.json`. It has `version` property.
    > Any further updates should be done with incrementing package version and making another GitHub release.
    > Versions lower than `1.0.0` is represented in Unity as "preview".
 2. Create GitHub Release
diff --git a/docs/Deploy-npmjs.md b/docs/Deploy-npmjs.md
index 7a1c433..f0c0d67 100644
--- a/docs/Deploy-npmjs.md
+++ b/docs/Deploy-npmjs.md
@@ -23,7 +23,7 @@ npm adduser
 
 ### Deploy
 
-⚠️ Make sure you done editing `package.json` and files in `Assets/root` folder. Because it is going to be public with no ability to discard it.
+⚠️ Make sure you done editing `package.json` and files in `Packages/com.ivanmurzak.unity.mcp.particlesystem` folder. Because it is going to be public with no ability to discard it.
 
 1. Increment `version` in `package.json` file
     > Any further updates should be done with incrementing package version.
diff --git a/docs/Manual-Package-Rename.md b/docs/Manual-Package-Rename.md
index 6dd427d..b90256b 100644
--- a/docs/Manual-Package-Rename.md
+++ b/docs/Manual-Package-Rename.md
@@ -1,6 +1,6 @@
 # Manual `Package` rename
 
-#### 1️⃣ Customize `Assets/root/package.json`
+#### 1️⃣ Customize `Packages/com.ivanmurzak.unity.mcp.particlesystem/package.json`
 
 - 👉 **Update** `name`
   > Sample: `com.github.your_name.package`
@@ -14,7 +14,7 @@
 <details>
   <summary><b>❌ NO - click</b></summary>
 
-  - 👉 **Delete** `Assets/root/Tests` folder
+  - 👉 **Delete** `Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests` folder
   - 👉 **Delete** `.github/workflows` folder
 
 </details>
@@ -25,8 +25,8 @@
   - 👉 **Repeat** these actions for these files.
 
   - Update the files:
-    - `Assets/root/Tests/Base/Package.Editor.Tests.asmdef`
-    - `Assets/root/Tests/Base/Package.Tests.asmdef`
+    - `Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Base/Package.Editor.Tests.asmdef`
+    - `Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Base/Package.Tests.asmdef`
 
   - Apply these actions to files above:
     - 👉 **Rename** the `Package` part of the file name
diff --git a/docs/claude/architecture.md b/docs/claude/architecture.md
index ff0121f..1fc34d5 100644
--- a/docs/claude/architecture.md
+++ b/docs/claude/architecture.md
@@ -5,7 +5,7 @@
 ```
 Unity-AI-ParticleSystem/
 ├── Unity-Package/          # Main Unity project containing the UPM package
-│   └── Assets/root/        # The actual package contents (published to OpenUPM)
+│   └── Packages/com.ivanmurzak.unity.mcp.particlesystem/        # The actual package contents (published to OpenUPM)
 │       ├── Editor/Scripts/
 │       │   ├── Tools/      # MCP tool implementations (partial classes)
 │       │   └── Data/       # Response/data models
@@ -41,7 +41,7 @@ The package depends on `com.ivanmurzak.unity.mcp` (the Unity-MCP platform). To u
 
 ## Tests
 
-Tests are Unity NUnit tests under `Unity-Package/Assets/root/Tests/Editor/`. They use `[UnityTest]` (coroutines) and inherit from `BaseTest`, which provides:
+Tests are Unity NUnit tests under `Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/Tests/Editor/`. They use `[UnityTest]` (coroutines) and inherit from `BaseTest`, which provides:
 - `CreateGameObjectWithParticleSystem(name)` — creates a test GameObject with a ParticleSystem
 - `RunToolAllowWarnings(toolName, json)` — invokes a tool via JSON and asserts no errors
 
diff --git a/docs/claude/ci.md b/docs/claude/ci.md
index 2dd593c..3af00b5 100644
--- a/docs/claude/ci.md
+++ b/docs/claude/ci.md
@@ -1,7 +1,7 @@
 # CI/CD
 
 **`release.yml`** — triggers on push to `main`:
-1. Reads version from `Unity-Package/Assets/root/package.json`
+1. Reads version from `Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/package.json`
 2. Skips if git tag for that version already exists
 3. Builds the `.unitypackage` installer via `com.IvanMurzak.Unity.MCP.ParticleSystem.Installer.PackageExporter.ExportPackage`
 4. Runs Unity tests (editmode, playmode, standalone) across Unity 2022.3.62f3, 2023.2.22f1, and 6000.3.1f1
diff --git a/docs/claude/release.md b/docs/claude/release.md
index fe16c8c..aed658b 100644
--- a/docs/claude/release.md
+++ b/docs/claude/release.md
@@ -1,6 +1,6 @@
 # Version Management
 
-Version is tracked in `Unity-Package/Assets/root/package.json`. To bump the version across all files (package.json, Installer constant, README download URLs):
+Version is tracked in `Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/package.json`. To bump the version across all files (package.json, Installer constant, README download URLs):
 ```powershell
 .\commands\bump-version.ps1 -NewVersion "1.0.23"
 # Preview only:
@@ -8,7 +8,7 @@ Version is tracked in `Unity-Package/Assets/root/package.json`. To bump the vers
 ```
 
 Files updated by `bump-version.ps1`:
-- `Unity-Package/Assets/root/package.json`
+- `Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/package.json`
 - `Installer/Assets/com.IvanMurzak/AI Particle System Installer/Installer.cs`
-- `Unity-Package/Assets/root/README.md`
+- `Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/README.md`
 - `README.md`
diff --git a/docs/openupm-signing.md b/docs/openupm-signing.md
index a710cdb..fe474b1 100644
--- a/docs/openupm-signing.md
+++ b/docs/openupm-signing.md
@@ -23,7 +23,7 @@ References:
 The signing step is implemented as the `build-signed-upm-package` job in
 [`.github/workflows/release.yml`](../.github/workflows/release.yml). It runs in
 parallel with tests and builds on every version-bump release commit, packs the
-package at `Unity-Package/Assets/root/` with Unity's UPM CLI, verifies the
+package at `Unity-Package/Packages/com.ivanmurzak.unity.mcp.particlesystem/` with Unity's UPM CLI, verifies the
 resulting archive contains `package/.attestation.p7m` and that its basename begins
 with `com.ivanmurzak.unity.mcp.particlesystem-`, and uploads the signed `.tgz` as
 a `signed-upm-package` workflow artifact.