diff --git a/Assets/Main/Resources.meta b/Assets/Main/Resources.meta
deleted file mode 100644
index e9d59a3..0000000
--- a/Assets/Main/Resources.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 6b123ad1720f475587c1ef216e5b9217
-timeCreated: 1712972361
\ No newline at end of file
diff --git a/Assets/Test/Scenes.meta b/Assets/Scenes.meta
similarity index 100%
rename from Assets/Test/Scenes.meta
rename to Assets/Scenes.meta
diff --git a/Assets/Test/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity
similarity index 100%
rename from Assets/Test/Scenes/SampleScene.unity
rename to Assets/Scenes/SampleScene.unity
diff --git a/Assets/Test/Scenes/SampleScene.unity.meta b/Assets/Scenes/SampleScene.unity.meta
similarity index 100%
rename from Assets/Test/Scenes/SampleScene.unity.meta
rename to Assets/Scenes/SampleScene.unity.meta
diff --git a/Assets/Test/Settings.meta b/Assets/Settings.meta
similarity index 100%
rename from Assets/Test/Settings.meta
rename to Assets/Settings.meta
diff --git a/Assets/Test/Settings/Lit2DSceneTemplate.scenetemplate b/Assets/Settings/Lit2DSceneTemplate.scenetemplate
similarity index 100%
rename from Assets/Test/Settings/Lit2DSceneTemplate.scenetemplate
rename to Assets/Settings/Lit2DSceneTemplate.scenetemplate
diff --git a/Assets/Test/Settings/Lit2DSceneTemplate.scenetemplate.meta b/Assets/Settings/Lit2DSceneTemplate.scenetemplate.meta
similarity index 100%
rename from Assets/Test/Settings/Lit2DSceneTemplate.scenetemplate.meta
rename to Assets/Settings/Lit2DSceneTemplate.scenetemplate.meta
diff --git a/Assets/Test/Settings/Renderer2D.asset b/Assets/Settings/Renderer2D.asset
similarity index 100%
rename from Assets/Test/Settings/Renderer2D.asset
rename to Assets/Settings/Renderer2D.asset
diff --git a/Assets/Test/Settings/Renderer2D.asset.meta b/Assets/Settings/Renderer2D.asset.meta
similarity index 100%
rename from Assets/Test/Settings/Renderer2D.asset.meta
rename to Assets/Settings/Renderer2D.asset.meta
diff --git a/Assets/Test/Settings/Scenes.meta b/Assets/Settings/Scenes.meta
similarity index 100%
rename from Assets/Test/Settings/Scenes.meta
rename to Assets/Settings/Scenes.meta
diff --git a/Assets/Test/Settings/Scenes/URP2DSceneTemplate.unity b/Assets/Settings/Scenes/URP2DSceneTemplate.unity
similarity index 100%
rename from Assets/Test/Settings/Scenes/URP2DSceneTemplate.unity
rename to Assets/Settings/Scenes/URP2DSceneTemplate.unity
diff --git a/Assets/Test/Settings/Scenes/URP2DSceneTemplate.unity.meta b/Assets/Settings/Scenes/URP2DSceneTemplate.unity.meta
similarity index 100%
rename from Assets/Test/Settings/Scenes/URP2DSceneTemplate.unity.meta
rename to Assets/Settings/Scenes/URP2DSceneTemplate.unity.meta
diff --git a/Assets/Test/Settings/UniversalRP.asset b/Assets/Settings/UniversalRP.asset
similarity index 100%
rename from Assets/Test/Settings/UniversalRP.asset
rename to Assets/Settings/UniversalRP.asset
diff --git a/Assets/Test/Settings/UniversalRP.asset.meta b/Assets/Settings/UniversalRP.asset.meta
similarity index 100%
rename from Assets/Test/Settings/UniversalRP.asset.meta
rename to Assets/Settings/UniversalRP.asset.meta
diff --git a/Assets/Test.meta b/Assets/Test.meta
deleted file mode 100644
index bed67cf..0000000
--- a/Assets/Test.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: f47f753953bd4e0b9ce3b6644f265ddb
-timeCreated: 1712972321
\ No newline at end of file
diff --git a/Assets/Toolkit.meta b/Assets/Toolkit.meta
new file mode 100644
index 0000000..e93dcde
--- /dev/null
+++ b/Assets/Toolkit.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f4f1229d3b7a4c7a9bed3f3fefee70b1
+timeCreated: 1719145172
\ No newline at end of file
diff --git a/Assets/Main.meta b/Assets/Toolkit/Toolkit.meta
similarity index 100%
rename from Assets/Main.meta
rename to Assets/Toolkit/Toolkit.meta
diff --git a/Assets/Main/Ca2d.Toolkit.asmdef b/Assets/Toolkit/Toolkit/Ca2d.Toolkit.asmdef
similarity index 100%
rename from Assets/Main/Ca2d.Toolkit.asmdef
rename to Assets/Toolkit/Toolkit/Ca2d.Toolkit.asmdef
diff --git a/Assets/Main/Ca2d.Toolkit.asmdef.meta b/Assets/Toolkit/Toolkit/Ca2d.Toolkit.asmdef.meta
similarity index 100%
rename from Assets/Main/Ca2d.Toolkit.asmdef.meta
rename to Assets/Toolkit/Toolkit/Ca2d.Toolkit.asmdef.meta
diff --git a/Assets/Main/Scripts.meta b/Assets/Toolkit/Toolkit/Scripts.meta
similarity index 100%
rename from Assets/Main/Scripts.meta
rename to Assets/Toolkit/Toolkit/Scripts.meta
diff --git a/Assets/Main/Scripts/AsDisposable.cs b/Assets/Toolkit/Toolkit/Scripts/AsDisposable.cs
similarity index 100%
rename from Assets/Main/Scripts/AsDisposable.cs
rename to Assets/Toolkit/Toolkit/Scripts/AsDisposable.cs
diff --git a/Assets/Main/Scripts/AsDisposable.cs.meta b/Assets/Toolkit/Toolkit/Scripts/AsDisposable.cs.meta
similarity index 100%
rename from Assets/Main/Scripts/AsDisposable.cs.meta
rename to Assets/Toolkit/Toolkit/Scripts/AsDisposable.cs.meta
diff --git a/Assets/Main/Scripts/Boxing.cs b/Assets/Toolkit/Toolkit/Scripts/Boxing.cs
similarity index 100%
rename from Assets/Main/Scripts/Boxing.cs
rename to Assets/Toolkit/Toolkit/Scripts/Boxing.cs
diff --git a/Assets/Main/Scripts/Boxing.cs.meta b/Assets/Toolkit/Toolkit/Scripts/Boxing.cs.meta
similarity index 100%
rename from Assets/Main/Scripts/Boxing.cs.meta
rename to Assets/Toolkit/Toolkit/Scripts/Boxing.cs.meta
diff --git a/Assets/Main/Scripts/Guard.cs b/Assets/Toolkit/Toolkit/Scripts/Guard.cs
similarity index 100%
rename from Assets/Main/Scripts/Guard.cs
rename to Assets/Toolkit/Toolkit/Scripts/Guard.cs
diff --git a/Assets/Main/Scripts/Guard.cs.meta b/Assets/Toolkit/Toolkit/Scripts/Guard.cs.meta
similarity index 100%
rename from Assets/Main/Scripts/Guard.cs.meta
rename to Assets/Toolkit/Toolkit/Scripts/Guard.cs.meta
diff --git a/Assets/Main/Scripts/ILoggHandler.cs b/Assets/Toolkit/Toolkit/Scripts/ILoggHandler.cs
similarity index 100%
rename from Assets/Main/Scripts/ILoggHandler.cs
rename to Assets/Toolkit/Toolkit/Scripts/ILoggHandler.cs
diff --git a/Assets/Main/Scripts/ILoggHandler.cs.meta b/Assets/Toolkit/Toolkit/Scripts/ILoggHandler.cs.meta
similarity index 100%
rename from Assets/Main/Scripts/ILoggHandler.cs.meta
rename to Assets/Toolkit/Toolkit/Scripts/ILoggHandler.cs.meta
diff --git a/Assets/Main/Scripts/Logg.cs b/Assets/Toolkit/Toolkit/Scripts/Logg.cs
similarity index 100%
rename from Assets/Main/Scripts/Logg.cs
rename to Assets/Toolkit/Toolkit/Scripts/Logg.cs
diff --git a/Assets/Main/Scripts/Logg.cs.meta b/Assets/Toolkit/Toolkit/Scripts/Logg.cs.meta
similarity index 100%
rename from Assets/Main/Scripts/Logg.cs.meta
rename to Assets/Toolkit/Toolkit/Scripts/Logg.cs.meta
diff --git a/Assets/Main/Scripts/LoggHandler.cs b/Assets/Toolkit/Toolkit/Scripts/LoggHandler.cs
similarity index 100%
rename from Assets/Main/Scripts/LoggHandler.cs
rename to Assets/Toolkit/Toolkit/Scripts/LoggHandler.cs
diff --git a/Assets/Main/Scripts/LoggHandler.cs.meta b/Assets/Toolkit/Toolkit/Scripts/LoggHandler.cs.meta
similarity index 100%
rename from Assets/Main/Scripts/LoggHandler.cs.meta
rename to Assets/Toolkit/Toolkit/Scripts/LoggHandler.cs.meta
diff --git a/Assets/Main/Scripts/LoseRequirementException.cs b/Assets/Toolkit/Toolkit/Scripts/LoseRequirementException.cs
similarity index 100%
rename from Assets/Main/Scripts/LoseRequirementException.cs
rename to Assets/Toolkit/Toolkit/Scripts/LoseRequirementException.cs
diff --git a/Assets/Main/Scripts/LoseRequirementException.cs.meta b/Assets/Toolkit/Toolkit/Scripts/LoseRequirementException.cs.meta
similarity index 100%
rename from Assets/Main/Scripts/LoseRequirementException.cs.meta
rename to Assets/Toolkit/Toolkit/Scripts/LoseRequirementException.cs.meta
diff --git a/Assets/Main/Scripts/Option.cs b/Assets/Toolkit/Toolkit/Scripts/Option.cs
similarity index 100%
rename from Assets/Main/Scripts/Option.cs
rename to Assets/Toolkit/Toolkit/Scripts/Option.cs
diff --git a/Assets/Main/Scripts/Option.cs.meta b/Assets/Toolkit/Toolkit/Scripts/Option.cs.meta
similarity index 100%
rename from Assets/Main/Scripts/Option.cs.meta
rename to Assets/Toolkit/Toolkit/Scripts/Option.cs.meta
diff --git a/Assets/Main/Scripts/UnityObjectWarp.cs b/Assets/Toolkit/Toolkit/Scripts/UnityObjectWarp.cs
similarity index 100%
rename from Assets/Main/Scripts/UnityObjectWarp.cs
rename to Assets/Toolkit/Toolkit/Scripts/UnityObjectWarp.cs
diff --git a/Assets/Main/Scripts/UnityObjectWarp.cs.meta b/Assets/Toolkit/Toolkit/Scripts/UnityObjectWarp.cs.meta
similarity index 100%
rename from Assets/Main/Scripts/UnityObjectWarp.cs.meta
rename to Assets/Toolkit/Toolkit/Scripts/UnityObjectWarp.cs.meta
diff --git a/Assets/package.json b/Assets/Toolkit/package.json
similarity index 100%
rename from Assets/package.json
rename to Assets/Toolkit/package.json
diff --git a/Assets/package.json.meta b/Assets/Toolkit/package.json.meta
similarity index 100%
rename from Assets/package.json.meta
rename to Assets/Toolkit/package.json.meta
diff --git a/Assets/Test/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset
similarity index 100%
rename from Assets/Test/UniversalRenderPipelineGlobalSettings.asset
rename to Assets/UniversalRenderPipelineGlobalSettings.asset
diff --git a/Assets/Test/UniversalRenderPipelineGlobalSettings.asset.meta b/Assets/UniversalRenderPipelineGlobalSettings.asset.meta
similarity index 100%
rename from Assets/Test/UniversalRenderPipelineGlobalSettings.asset.meta
rename to Assets/UniversalRenderPipelineGlobalSettings.asset.meta
diff --git a/Ca2d.Toolkit.csproj.DotSettings b/Ca2d.Toolkit.csproj.DotSettings
index aee2b9b..05c8e83 100644
--- a/Ca2d.Toolkit.csproj.DotSettings
+++ b/Ca2d.Toolkit.csproj.DotSettings
@@ -1,3 +1,9 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cmain/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cmain_005Cscripts/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cmain_005Cscripts/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cpackage/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cpackage_005Ctoolkit/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cpackage_005Ctoolkit_005Cscripts/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Ctoolkit_005Ctoolkit_005Cscripts/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Ctoolkit_005Ctoolkit/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Ctoolkit/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file