diff --git a/Assets/Editor Toolbox/Editor/Utilities/InspectorUtility.cs b/Assets/Editor Toolbox/Editor/Utilities/InspectorUtility.cs
index 4e36831a..e3a92a1f 100644
--- a/Assets/Editor Toolbox/Editor/Utilities/InspectorUtility.cs	
+++ b/Assets/Editor Toolbox/Editor/Utilities/InspectorUtility.cs	
@@ -52,7 +52,7 @@ internal static bool GetIsEditorExpanded(Editor editor)
         /// </summary>
         internal static void SetIsEditorExpanded(Editor editor, bool value)
         {
-            InternalEditorUtility.SetIsInspectorExpanded(editor.target, true);
+            InternalEditorUtility.SetIsInspectorExpanded(editor.target, value);
             //NOTE: in older versions Editor's foldouts are based on the m_IsVisible field and the Awake() method
 #if !UNITY_2019_1_OR_NEWER
             const string isVisibleFieldName = "m_IsVisible";
@@ -60,7 +60,7 @@ internal static void SetIsEditorExpanded(Editor editor, bool value)
                 BindingFlags.Instance | BindingFlags.NonPublic);
             if (isVisible != null)
             {
-                isVisible.SetValue(editor, true);
+                isVisible.SetValue(editor, value);
             }
 #endif
         }
diff --git a/Assets/Editor Toolbox/README.md b/Assets/Editor Toolbox/README.md
index c5d629df..c9ce2ee5 100644
--- a/Assets/Editor Toolbox/README.md	
+++ b/Assets/Editor Toolbox/README.md	
@@ -971,11 +971,11 @@ public void Usage()
 Allows to serialize folders in form of assets and retrieve direct paths in Runtime.
 
 ```csharp
-public SerializedDirectory serializeDirectory;
+public SerializedDirectory serializedDirectory;
 
 public void Usage()
 {
-	string path = serializeDirectory.DirectoryPath;
+	string path = serializedDirectory.DirectoryPath;
 }
 ```
 
diff --git a/Assets/Editor Toolbox/Toolbox.asmdef b/Assets/Editor Toolbox/Runtime/Toolbox.asmdef
similarity index 100%
rename from Assets/Editor Toolbox/Toolbox.asmdef
rename to Assets/Editor Toolbox/Runtime/Toolbox.asmdef
diff --git a/Assets/Editor Toolbox/Toolbox.asmdef.meta b/Assets/Editor Toolbox/Runtime/Toolbox.asmdef.meta
similarity index 100%
rename from Assets/Editor Toolbox/Toolbox.asmdef.meta
rename to Assets/Editor Toolbox/Runtime/Toolbox.asmdef.meta
diff --git a/Assets/Examples/Scenes/SampleScene.unity b/Assets/Examples/Scenes/SampleScene.unity
index afd0d538..78ad7593 100644
--- a/Assets/Examples/Scenes/SampleScene.unity
+++ b/Assets/Examples/Scenes/SampleScene.unity
@@ -1828,7 +1828,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1220714192
 MonoBehaviour:
@@ -2207,7 +2207,7 @@ GameObject:
   - component: {fileID: 1438743619}
   - component: {fileID: 1438743618}
   m_Layer: 0
-  m_Name: DecoratorDrawers [Sample]
+  m_Name: ToolboxDecoratorDrawers [Sample]
   m_TagString: Untagged
   m_Icon: {fileID: 2800000, guid: b105bf1fb7fe62e4baba0ffd7b433e7b, type: 3}
   m_NavMeshLayer: 0
@@ -2285,7 +2285,7 @@ GameObject:
   - component: {fileID: 1583836799}
   - component: {fileID: 1583836798}
   m_Layer: 0
-  m_Name: Special & Others [Sample]
+  m_Name: Toolbox Special & Others [Sample]
   m_TagString: Untagged
   m_Icon: {fileID: 2800000, guid: b105bf1fb7fe62e4baba0ffd7b433e7b, type: 3}
   m_NavMeshLayer: 0
@@ -2336,7 +2336,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1584091011
 GameObject:
@@ -2456,7 +2456,7 @@ GameObject:
   - component: {fileID: 1670253092}
   - component: {fileID: 1670253093}
   m_Layer: 0
-  m_Name: ConditionDrawers [Sample]
+  m_Name: ToolboxConditionDrawers [Sample]
   m_TagString: Untagged
   m_Icon: {fileID: 2800000, guid: b105bf1fb7fe62e4baba0ffd7b433e7b, type: 3}
   m_NavMeshLayer: 0