2 files changed, 23 insertions, 29 deletions
diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj b/Projects/VisualStudio/Editor/Editor.vcxproj
index aaaf748..7fab991 100644
--- a/Projects/VisualStudio/Editor/Editor.vcxproj
+++ b/Projects/VisualStudio/Editor/Editor.vcxproj
@@ -153,7 +153,6 @@
     <ClCompile Include="..\..\..\Editor\Graphics\Graphics.cpp" />
     <ClCompile Include="..\..\..\Editor\GUI\ContainerWindow.cpp" />
     <ClCompile Include="..\..\..\Editor\GUI\Dock.cpp" />
-    <ClCompile Include="..\..\..\Editor\GUI\IMGUI\GUIButton.cpp" />
     <ClCompile Include="..\..\..\Editor\GUI\MainWindow.cpp" />
     <ClCompile Include="..\..\..\Editor\GUI\WindowManager.cpp" />
     <ClCompile Include="..\..\..\Editor\GUI\GUIWindow.cpp" />
@@ -162,15 +161,15 @@
     <ClCompile Include="..\..\..\Editor\GUI\WindowUtil.cpp" />
     <ClCompile Include="..\..\..\Editor\GUI\WinUtils.cpp" />
     <ClCompile Include="..\..\..\Editor\Resource\ResourceManager.cpp" />
-    <ClCompile Include="..\..\..\Editor\Scripting\EditorGUI\ContainerWindow.bind.cpp" />
-    <ClCompile Include="..\..\..\Editor\Scripting\EditorGUI\EditorGUI.bind.cpp" />
-    <ClCompile Include="..\..\..\Editor\Scripting\EditorGUI\GUIWindow.bind.cpp" />
-    <ClCompile Include="..\..\..\Editor\Scripting\EditorGUI\SplitWindow.bind.cpp" />
     <ClCompile Include="..\..\..\Editor\Scripting\EditorScripting.cpp" />
     <ClCompile Include="..\..\..\Editor\Scripting\Editor\Editor.bind.cpp" />
     <ClCompile Include="..\..\..\Editor\Scripting\Editor\EditorApplication.bind.cpp" />
     <ClCompile Include="..\..\..\Editor\Scripting\IMGUI\GUIButton.bind.cpp" />
     <ClCompile Include="..\..\..\Editor\Scripting\EditorScriptingManager.cpp" />
+    <ClCompile Include="..\..\..\Editor\Scripting\Window\ContainerWindow.bind.cpp" />
+    <ClCompile Include="..\..\..\Editor\Scripting\Window\EditorGUI.bind.cpp" />
+    <ClCompile Include="..\..\..\Editor\Scripting\Window\GUIWindow.bind.cpp" />
+    <ClCompile Include="..\..\..\Editor\Scripting\Window\SplitWindow.bind.cpp" />
     <ClCompile Include="..\..\..\Editor\Shaders\BuiltinShaders.cpp" />
     <ClCompile Include="..\..\..\Editor\Utils\EditorUtils.cpp" />
     <ClCompile Include="..\..\..\Editor\Utils\HelperFuncs.cpp" />
@@ -251,6 +250,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\Editor\EditorApplication.h" />
+    <ClInclude Include="..\..\..\Editor\EditorGlobals.h" />
     <ClInclude Include="..\..\..\Editor\EditorManager.h" />
     <ClInclude Include="..\..\..\Editor\FileSystem\FileWatcher.h" />
     <ClInclude Include="..\..\..\Editor\Graphics\Graphics.h" />
diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj.filters b/Projects/VisualStudio/Editor/Editor.vcxproj.filters
index fafbf97..a9af0ec 100644
--- a/Projects/VisualStudio/Editor/Editor.vcxproj.filters
+++ b/Projects/VisualStudio/Editor/Editor.vcxproj.filters
@@ -28,12 +28,6 @@
     <Filter Include="Editor\Resource">
       <UniqueIdentifier>{5b8dba28-42d0-450a-98e1-ca4a65a4fc76}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Editor\Scripting\EditorGUI">
-      <UniqueIdentifier>{848489fc-f661-4b10-91f5-db1687293b95}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Editor\Scripting\EditorGUILayout">
-      <UniqueIdentifier>{87edd159-c171-4ccb-9094-9e5061c980d0}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Editor\Scripting\Resource">
       <UniqueIdentifier>{476cedf1-fc4a-48a5-8782-bed16dabb86e}</UniqueIdentifier>
     </Filter>
@@ -76,9 +70,6 @@
     <Filter Include="Runtime\FileSystem">
       <UniqueIdentifier>{78c0524a-9039-474a-9a2e-fa243e84d60e}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Editor\GUI\IMGUI">
-      <UniqueIdentifier>{47032dd6-dca2-478f-b594-d08c0b22e119}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Runtime\Profiling">
       <UniqueIdentifier>{dbc5b9a8-4107-4324-aa71-e6a9a7b6d23d}</UniqueIdentifier>
     </Filter>
@@ -118,6 +109,9 @@
     <Filter Include="Runtime\Events">
       <UniqueIdentifier>{ebaa23ba-fd66-4554-8a90-959097e25cf3}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Editor\Scripting\Window">
+      <UniqueIdentifier>{848489fc-f661-4b10-91f5-db1687293b95}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\Editor\GUI\Dock.cpp">
@@ -159,21 +153,9 @@
     <ClCompile Include="..\..\..\Editor\Resource\ResourceManager.cpp">
       <Filter>Editor\Resource</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Editor\Scripting\EditorGUI\EditorGUI.bind.cpp">
-      <Filter>Editor\Scripting\EditorGUI</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\Editor\Scripting\EditorScripting.cpp">
       <Filter>Editor\Scripting</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Editor\Scripting\EditorGUI\ContainerWindow.bind.cpp">
-      <Filter>Editor\Scripting\EditorGUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Editor\Scripting\EditorGUI\GUIWindow.bind.cpp">
-      <Filter>Editor\Scripting\EditorGUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Editor\Scripting\EditorGUI\SplitWindow.bind.cpp">
-      <Filter>Editor\Scripting\EditorGUI</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\Editor\Scripting\IMGUI\GUIButton.bind.cpp">
       <Filter>Editor\Scripting\IMGUI</Filter>
     </ClCompile>
@@ -243,9 +225,6 @@
     <ClCompile Include="..\..\..\Editor\GUI\ContainerWindow.cpp">
       <Filter>Editor\GUI</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Editor\GUI\IMGUI\GUIButton.cpp">
-      <Filter>Editor\GUI\IMGUI</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\Runtime\Graphics\Shader.cpp">
       <Filter>Runtime\Graphics</Filter>
     </ClCompile>
@@ -424,6 +403,18 @@
     <ClCompile Include="..\..\..\Editor\Scripting\EditorScriptingManager.cpp">
       <Filter>Editor\Scripting</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\Editor\Scripting\Window\ContainerWindow.bind.cpp">
+      <Filter>Editor\Scripting\Window</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Editor\Scripting\Window\EditorGUI.bind.cpp">
+      <Filter>Editor\Scripting\Window</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Editor\Scripting\Window\GUIWindow.bind.cpp">
+      <Filter>Editor\Scripting\Window</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Editor\Scripting\Window\SplitWindow.bind.cpp">
+      <Filter>Editor\Scripting\Window</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\Editor\GUI\Dock.h">
@@ -762,6 +753,9 @@
     <ClInclude Include="..\..\..\Editor\Scripting\EditorScriptingManager.h">
       <Filter>Editor\Scripting</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Editor\EditorGlobals.h">
+      <Filter>Editor\Scripting</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\Runtime\Lua\LuaBind\LuaBindClass.inc">