diff --git a/Editor/EditorAddons/Drawers/Gizmo/GizmoDrawer.cs b/Editor/EditorAddons/Drawers/Gizmo/GizmoDrawer.cs
index 69ce6f2..f13b1d0 100644
--- a/Editor/EditorAddons/Drawers/Gizmo/GizmoDrawer.cs
+++ b/Editor/EditorAddons/Drawers/Gizmo/GizmoDrawer.cs
@@ -7,6 +7,8 @@
 using UnityEngine;
 #if UNITY_2022_1_OR_NEWER
 using GizmoUtility = Better.Attributes.EditorAddons.Drawers.Utilities.GizmoUtility;
+#else
+using Better.Attributes.EditorAddons.Drawers.Utilities;
 #endif
 
 namespace Better.Attributes.EditorAddons.Drawers.Gizmo
diff --git a/Samples.meta b/Samples.meta
deleted file mode 100644
index 5cc0ac4..0000000
--- a/Samples.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 6e16a3a99b3da294a91e0e3ebf190ad4
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Samples/TestSamples.meta b/Samples~/TestSamples.meta
similarity index 100%
rename from Samples/TestSamples.meta
rename to Samples~/TestSamples.meta
diff --git a/Samples/TestSamples/GameObject.prefab b/Samples~/TestSamples/GameObject.prefab
similarity index 100%
rename from Samples/TestSamples/GameObject.prefab
rename to Samples~/TestSamples/GameObject.prefab
diff --git a/Samples/TestSamples/GameObject.prefab.meta b/Samples~/TestSamples/GameObject.prefab.meta
similarity index 100%
rename from Samples/TestSamples/GameObject.prefab.meta
rename to Samples~/TestSamples/GameObject.prefab.meta
diff --git a/Samples/TestSamples/New Prefab.prefab b/Samples~/TestSamples/New Prefab.prefab
similarity index 100%
rename from Samples/TestSamples/New Prefab.prefab
rename to Samples~/TestSamples/New Prefab.prefab
diff --git a/Samples/TestSamples/New Prefab.prefab.meta b/Samples~/TestSamples/New Prefab.prefab.meta
similarity index 100%
rename from Samples/TestSamples/New Prefab.prefab.meta
rename to Samples~/TestSamples/New Prefab.prefab.meta
diff --git a/Samples/TestSamples/Scenes.meta b/Samples~/TestSamples/Scenes.meta
similarity index 100%
rename from Samples/TestSamples/Scenes.meta
rename to Samples~/TestSamples/Scenes.meta
diff --git a/Samples/TestSamples/Scenes/Sample.unity b/Samples~/TestSamples/Scenes/Sample.unity
similarity index 100%
rename from Samples/TestSamples/Scenes/Sample.unity
rename to Samples~/TestSamples/Scenes/Sample.unity
diff --git a/Samples/TestSamples/Scenes/Sample.unity.meta b/Samples~/TestSamples/Scenes/Sample.unity.meta
similarity index 100%
rename from Samples/TestSamples/Scenes/Sample.unity.meta
rename to Samples~/TestSamples/Scenes/Sample.unity.meta
diff --git a/Samples/TestSamples/Scripts.meta b/Samples~/TestSamples/Scripts.meta
similarity index 100%
rename from Samples/TestSamples/Scripts.meta
rename to Samples~/TestSamples/Scripts.meta
diff --git a/Samples/TestSamples/Scripts/Interfaces.meta b/Samples~/TestSamples/Scripts/Interfaces.meta
similarity index 100%
rename from Samples/TestSamples/Scripts/Interfaces.meta
rename to Samples~/TestSamples/Scripts/Interfaces.meta
diff --git a/Samples/TestSamples/Scripts/Interfaces/ISomeInterface.cs b/Samples~/TestSamples/Scripts/Interfaces/ISomeInterface.cs
similarity index 100%
rename from Samples/TestSamples/Scripts/Interfaces/ISomeInterface.cs
rename to Samples~/TestSamples/Scripts/Interfaces/ISomeInterface.cs
diff --git a/Samples/TestSamples/Scripts/Interfaces/ISomeInterface.cs.meta b/Samples~/TestSamples/Scripts/Interfaces/ISomeInterface.cs.meta
similarity index 100%
rename from Samples/TestSamples/Scripts/Interfaces/ISomeInterface.cs.meta
rename to Samples~/TestSamples/Scripts/Interfaces/ISomeInterface.cs.meta
diff --git a/Samples/TestSamples/Scripts/Models.meta b/Samples~/TestSamples/Scripts/Models.meta
similarity index 100%
rename from Samples/TestSamples/Scripts/Models.meta
rename to Samples~/TestSamples/Scripts/Models.meta
diff --git a/Samples/TestSamples/Scripts/Models/SomeAbstractClass.cs b/Samples~/TestSamples/Scripts/Models/SomeAbstractClass.cs
similarity index 100%
rename from Samples/TestSamples/Scripts/Models/SomeAbstractClass.cs
rename to Samples~/TestSamples/Scripts/Models/SomeAbstractClass.cs
diff --git a/Samples/TestSamples/Scripts/Models/SomeAbstractClass.cs.meta b/Samples~/TestSamples/Scripts/Models/SomeAbstractClass.cs.meta
similarity index 100%
rename from Samples/TestSamples/Scripts/Models/SomeAbstractClass.cs.meta
rename to Samples~/TestSamples/Scripts/Models/SomeAbstractClass.cs.meta
diff --git a/Samples/TestSamples/Scripts/Models/SomeAbstractClassImplementation1.cs b/Samples~/TestSamples/Scripts/Models/SomeAbstractClassImplementation1.cs
similarity index 100%
rename from Samples/TestSamples/Scripts/Models/SomeAbstractClassImplementation1.cs
rename to Samples~/TestSamples/Scripts/Models/SomeAbstractClassImplementation1.cs
diff --git a/Samples/TestSamples/Scripts/Models/SomeAbstractClassImplementation1.cs.meta b/Samples~/TestSamples/Scripts/Models/SomeAbstractClassImplementation1.cs.meta
similarity index 100%
rename from Samples/TestSamples/Scripts/Models/SomeAbstractClassImplementation1.cs.meta
rename to Samples~/TestSamples/Scripts/Models/SomeAbstractClassImplementation1.cs.meta
diff --git a/Samples/TestSamples/Scripts/Models/SomeAbstractClassImplementation2.cs b/Samples~/TestSamples/Scripts/Models/SomeAbstractClassImplementation2.cs
similarity index 100%
rename from Samples/TestSamples/Scripts/Models/SomeAbstractClassImplementation2.cs
rename to Samples~/TestSamples/Scripts/Models/SomeAbstractClassImplementation2.cs
diff --git a/Samples/TestSamples/Scripts/Models/SomeAbstractClassImplementation2.cs.meta b/Samples~/TestSamples/Scripts/Models/SomeAbstractClassImplementation2.cs.meta
similarity index 100%
rename from Samples/TestSamples/Scripts/Models/SomeAbstractClassImplementation2.cs.meta
rename to Samples~/TestSamples/Scripts/Models/SomeAbstractClassImplementation2.cs.meta
diff --git a/Samples/TestSamples/Scripts/Models/SomeClass.cs b/Samples~/TestSamples/Scripts/Models/SomeClass.cs
similarity index 100%
rename from Samples/TestSamples/Scripts/Models/SomeClass.cs
rename to Samples~/TestSamples/Scripts/Models/SomeClass.cs
diff --git a/Samples/TestSamples/Scripts/Models/SomeClass.cs.meta b/Samples~/TestSamples/Scripts/Models/SomeClass.cs.meta
similarity index 100%
rename from Samples/TestSamples/Scripts/Models/SomeClass.cs.meta
rename to Samples~/TestSamples/Scripts/Models/SomeClass.cs.meta
diff --git a/Samples/TestSamples/Scripts/Models/SomeInterfaceImplementation17.cs b/Samples~/TestSamples/Scripts/Models/SomeInterfaceImplementation17.cs
similarity index 100%
rename from Samples/TestSamples/Scripts/Models/SomeInterfaceImplementation17.cs
rename to Samples~/TestSamples/Scripts/Models/SomeInterfaceImplementation17.cs
diff --git a/Samples/TestSamples/Scripts/Models/SomeInterfaceImplementation17.cs.meta b/Samples~/TestSamples/Scripts/Models/SomeInterfaceImplementation17.cs.meta
similarity index 100%
rename from Samples/TestSamples/Scripts/Models/SomeInterfaceImplementation17.cs.meta
rename to Samples~/TestSamples/Scripts/Models/SomeInterfaceImplementation17.cs.meta
diff --git a/Samples/TestSamples/Scripts/Models/SomeInterfaceImplementation2.cs b/Samples~/TestSamples/Scripts/Models/SomeInterfaceImplementation2.cs
similarity index 100%
rename from Samples/TestSamples/Scripts/Models/SomeInterfaceImplementation2.cs
rename to Samples~/TestSamples/Scripts/Models/SomeInterfaceImplementation2.cs
diff --git a/Samples/TestSamples/Scripts/Models/SomeInterfaceImplementation2.cs.meta b/Samples~/TestSamples/Scripts/Models/SomeInterfaceImplementation2.cs.meta
similarity index 100%
rename from Samples/TestSamples/Scripts/Models/SomeInterfaceImplementation2.cs.meta
rename to Samples~/TestSamples/Scripts/Models/SomeInterfaceImplementation2.cs.meta
diff --git a/Samples/TestSamples/Scripts/Models/SomeInterfaceImplementation21.cs b/Samples~/TestSamples/Scripts/Models/SomeInterfaceImplementation21.cs
similarity index 100%
rename from Samples/TestSamples/Scripts/Models/SomeInterfaceImplementation21.cs
rename to Samples~/TestSamples/Scripts/Models/SomeInterfaceImplementation21.cs
diff --git a/Samples/TestSamples/Scripts/Models/SomeInterfaceImplementation21.cs.meta b/Samples~/TestSamples/Scripts/Models/SomeInterfaceImplementation21.cs.meta
similarity index 100%
rename from Samples/TestSamples/Scripts/Models/SomeInterfaceImplementation21.cs.meta
rename to Samples~/TestSamples/Scripts/Models/SomeInterfaceImplementation21.cs.meta
diff --git a/Samples/TestSamples/Scripts/Models/SomeInterfaceImplementation3.cs b/Samples~/TestSamples/Scripts/Models/SomeInterfaceImplementation3.cs
similarity index 100%
rename from Samples/TestSamples/Scripts/Models/SomeInterfaceImplementation3.cs
rename to Samples~/TestSamples/Scripts/Models/SomeInterfaceImplementation3.cs
diff --git a/Samples/TestSamples/Scripts/Models/SomeInterfaceImplementation3.cs.meta b/Samples~/TestSamples/Scripts/Models/SomeInterfaceImplementation3.cs.meta
similarity index 100%
rename from Samples/TestSamples/Scripts/Models/SomeInterfaceImplementation3.cs.meta
rename to Samples~/TestSamples/Scripts/Models/SomeInterfaceImplementation3.cs.meta
diff --git a/Samples/TestSamples/Scripts/OtherModels.meta b/Samples~/TestSamples/Scripts/OtherModels.meta
similarity index 100%
rename from Samples/TestSamples/Scripts/OtherModels.meta
rename to Samples~/TestSamples/Scripts/OtherModels.meta
diff --git a/Samples/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation1.cs b/Samples~/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation1.cs
similarity index 100%
rename from Samples/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation1.cs
rename to Samples~/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation1.cs
diff --git a/Samples/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation1.cs.meta b/Samples~/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation1.cs.meta
similarity index 100%
rename from Samples/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation1.cs.meta
rename to Samples~/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation1.cs.meta
diff --git a/Samples/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation14.cs b/Samples~/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation14.cs
similarity index 100%
rename from Samples/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation14.cs
rename to Samples~/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation14.cs
diff --git a/Samples/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation14.cs.meta b/Samples~/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation14.cs.meta
similarity index 100%
rename from Samples/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation14.cs.meta
rename to Samples~/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation14.cs.meta
diff --git a/Samples/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation15.cs b/Samples~/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation15.cs
similarity index 100%
rename from Samples/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation15.cs
rename to Samples~/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation15.cs
diff --git a/Samples/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation15.cs.meta b/Samples~/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation15.cs.meta
similarity index 100%
rename from Samples/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation15.cs.meta
rename to Samples~/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation15.cs.meta
diff --git a/Samples/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation16.cs b/Samples~/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation16.cs
similarity index 100%
rename from Samples/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation16.cs
rename to Samples~/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation16.cs
diff --git a/Samples/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation16.cs.meta b/Samples~/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation16.cs.meta
similarity index 100%
rename from Samples/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation16.cs.meta
rename to Samples~/TestSamples/Scripts/OtherModels/SomeInterfaceImplementation16.cs.meta
diff --git a/Samples/TestSamples/Scripts/PreviewTest.cs b/Samples~/TestSamples/Scripts/PreviewTest.cs
similarity index 100%
rename from Samples/TestSamples/Scripts/PreviewTest.cs
rename to Samples~/TestSamples/Scripts/PreviewTest.cs
diff --git a/Samples/TestSamples/Scripts/PreviewTest.cs.meta b/Samples~/TestSamples/Scripts/PreviewTest.cs.meta
similarity index 100%
rename from Samples/TestSamples/Scripts/PreviewTest.cs.meta
rename to Samples~/TestSamples/Scripts/PreviewTest.cs.meta
diff --git a/Samples/TestSamples/Scripts/RemovableTest.cs b/Samples~/TestSamples/Scripts/RemovableTest.cs
similarity index 100%
rename from Samples/TestSamples/Scripts/RemovableTest.cs
rename to Samples~/TestSamples/Scripts/RemovableTest.cs
diff --git a/Samples/TestSamples/Scripts/RemovableTest.cs.meta b/Samples~/TestSamples/Scripts/RemovableTest.cs.meta
similarity index 100%
rename from Samples/TestSamples/Scripts/RemovableTest.cs.meta
rename to Samples~/TestSamples/Scripts/RemovableTest.cs.meta
diff --git a/Samples/TestSamples/Scripts/Test.cs b/Samples~/TestSamples/Scripts/Test.cs
similarity index 100%
rename from Samples/TestSamples/Scripts/Test.cs
rename to Samples~/TestSamples/Scripts/Test.cs
diff --git a/Samples/TestSamples/Scripts/Test.cs.meta b/Samples~/TestSamples/Scripts/Test.cs.meta
similarity index 100%
rename from Samples/TestSamples/Scripts/Test.cs.meta
rename to Samples~/TestSamples/Scripts/Test.cs.meta
diff --git a/Samples/TestSamples/Scripts/TestScriptableObject.cs b/Samples~/TestSamples/Scripts/TestScriptableObject.cs
similarity index 100%
rename from Samples/TestSamples/Scripts/TestScriptableObject.cs
rename to Samples~/TestSamples/Scripts/TestScriptableObject.cs
diff --git a/Samples/TestSamples/Scripts/TestScriptableObject.cs.meta b/Samples~/TestSamples/Scripts/TestScriptableObject.cs.meta
similarity index 100%
rename from Samples/TestSamples/Scripts/TestScriptableObject.cs.meta
rename to Samples~/TestSamples/Scripts/TestScriptableObject.cs.meta
diff --git a/Samples/TestSamples/TestScriptableObject.asset b/Samples~/TestSamples/TestScriptableObject.asset
similarity index 100%
rename from Samples/TestSamples/TestScriptableObject.asset
rename to Samples~/TestSamples/TestScriptableObject.asset
diff --git a/Samples/TestSamples/TestScriptableObject.asset.meta b/Samples~/TestSamples/TestScriptableObject.asset.meta
similarity index 100%
rename from Samples/TestSamples/TestScriptableObject.asset.meta
rename to Samples~/TestSamples/TestScriptableObject.asset.meta
diff --git a/Samples/TestSamples/logo-social.png b/Samples~/TestSamples/logo-social.png
similarity index 100%
rename from Samples/TestSamples/logo-social.png
rename to Samples~/TestSamples/logo-social.png
diff --git a/Samples/TestSamples/logo-social.png.meta b/Samples~/TestSamples/logo-social.png.meta
similarity index 100%
rename from Samples/TestSamples/logo-social.png.meta
rename to Samples~/TestSamples/logo-social.png.meta
diff --git a/package.json b/package.json
index ae92714..518a273 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.uurha.betterattributes",
   "displayName": "Unity Better Attributes",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "unity": "2018.3",
   "description": "Unity attributes, allows to serialize interfaces, draw handles for Vector3/Vector2/Quaternion/Bounds, create read only fields.",
   "dependencies": {