*misc

4 files changed, 207 insertions, 181 deletions

diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj b/Projects/VisualStudio/Editor/Editor.vcxproj
index 1ae6d0d..14bdfb3 100644
--- a/Projects/VisualStudio/Editor/Editor.vcxproj
+++ b/Projects/VisualStudio/Editor/Editor.vcxproj
@@ -161,19 +161,21 @@
     <ClCompile Include="..\..\..\Editor\Scripting\EditorGUI\SplitWindow.bind.cpp" />
     <ClCompile Include="..\..\..\Editor\Scripting\EditorScripting.cpp" />
     <ClCompile Include="..\..\..\Editor\Scripting\IMGUI\GUIButton.bind.cpp" />
+    <ClCompile Include="..\..\..\Editor\Shaders\BuiltinShaders.cpp" />
     <ClCompile Include="..\..\..\Editor\Utils\HelperFuncs.cpp" />
     <ClCompile Include="..\..\..\Editor\Utils\Log.cpp" />
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindCFunctions.cpp" />
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindClass.cpp" />
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindEnum.cpp" />
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindMemberRef.cpp" />
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindRef.cpp" />
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindRefTable.cpp" />
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindState.cpp" />
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindVM.cpp" />
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindWatchDog.cpp" />
     <ClCompile Include="..\..\..\Runtime\Math\Vector2.cpp" />
     <ClCompile Include="..\..\..\Runtime\Math\Vector3.cpp" />
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindCFunctions.cpp" />
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindClass.cpp" />
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindEnum.cpp" />
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindMemberRef.cpp" />
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindRef.cpp" />
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindRefTable.cpp" />
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindState.cpp" />
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindVM.cpp" />
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindWatchDog.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\GL.bind.cpp" />
     <ClCompile Include="..\..\..\Runtime\Utilities\Base64.cpp" />
     <ClCompile Include="..\..\..\Runtime\Utilities\Utf8.cpp" />
   </ItemGroup>
@@ -186,27 +188,28 @@
     <ClInclude Include="..\..\..\Editor\GUI\WinUtils.h" />
     <ClInclude Include="..\..\..\Editor\Resource\ResourceManager.h" />
     <ClInclude Include="..\..\..\Editor\Scripting\EditorScripting.h" />
+    <ClInclude Include="..\..\..\Editor\Shaders\BuiltinShaders.h" />
     <ClInclude Include="..\..\..\Editor\Utils\HelperFuncs.h" />
     <ClInclude Include="..\..\..\Editor\Utils\Log.h" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBind.h" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindCFunctions.h" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindClass.hpp" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindConfig.h" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindEnum.h" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindGlobalState.h" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindInternal.h" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindMemberRef.h" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindRef.h" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindRefTable.h" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindState.h" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindUtility.h" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindVM.h" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindWatchDog.h" />
     <ClInclude Include="..\..\..\Runtime\Math\AABB.h" />
     <ClInclude Include="..\..\..\Runtime\Math\FloatConversion.h" />
     <ClInclude Include="..\..\..\Runtime\Math\Rect.h" />
     <ClInclude Include="..\..\..\Runtime\Math\Vector2.h" />
     <ClInclude Include="..\..\..\Runtime\Math\Vector3.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBind.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindCFunctions.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindClass.hpp" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindConfig.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindEnum.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindGlobalState.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindInternal.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindMemberRef.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindRef.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindRefTable.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindState.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindUtility.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindVM.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindWatchDog.h" />
     <ClInclude Include="..\..\..\Runtime\Utilities\Assert.h" />
     <ClInclude Include="..\..\..\Runtime\Utilities\Base64.h" />
     <ClInclude Include="..\..\..\Runtime\Utilities\Exception.h" />
@@ -226,8 +229,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\..\Runtime\Scripting\LuaBindClass.inc" />
-    <None Include="..\..\..\Runtime\Scripting\LuaBindState.inc" />
+    <None Include="..\..\..\Runtime\LuaBind\LuaBindClass.inc" />
+    <None Include="..\..\..\Runtime\LuaBind\LuaBindState.inc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj.filters b/Projects/VisualStudio/Editor/Editor.vcxproj.filters
index 5c0cfb5..cf4698b 100644
--- a/Projects/VisualStudio/Editor/Editor.vcxproj.filters
+++ b/Projects/VisualStudio/Editor/Editor.vcxproj.filters
@@ -19,9 +19,6 @@
     <Filter Include="Editor\GUI">
       <UniqueIdentifier>{87a57ef1-78d8-42b8-b179-ce1bbb5c4f8b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Runtime\Scripting">
-      <UniqueIdentifier>{f9573ff2-4a53-4953-806e-f0ce0c586910}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Runtime\Graphics">
       <UniqueIdentifier>{6c7e1979-1cd3-40c7-98e1-f063c325d642}</UniqueIdentifier>
     </Filter>
@@ -46,6 +43,18 @@
     <Filter Include="Editor\Scripting\IMGUI">
       <UniqueIdentifier>{337f607e-8c00-4e7b-a925-9380e08a30f0}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Runtime\LuaBind">
+      <UniqueIdentifier>{f9573ff2-4a53-4953-806e-f0ce0c586910}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Runtime\Scripting">
+      <UniqueIdentifier>{c1e200c9-0eec-40e2-a69f-ccaaaa208200}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Runtime\Scripting\GL">
+      <UniqueIdentifier>{0d57b53a-e29a-4ece-a6d8-f5aa13d15891}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Editor\Shaders">
+      <UniqueIdentifier>{707a995f-6856-44c8-857c-14e7834e86e3}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\Editor\GUI\Dock.cpp">
@@ -66,33 +75,6 @@
     <ClCompile Include="..\..\..\Editor\GUI\WinUtils.cpp">
       <Filter>Editor\GUI</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindCFunctions.cpp">
-      <Filter>Runtime\Scripting</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindClass.cpp">
-      <Filter>Runtime\Scripting</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindEnum.cpp">
-      <Filter>Runtime\Scripting</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindMemberRef.cpp">
-      <Filter>Runtime\Scripting</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindRef.cpp">
-      <Filter>Runtime\Scripting</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindRefTable.cpp">
-      <Filter>Runtime\Scripting</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindState.cpp">
-      <Filter>Runtime\Scripting</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindVM.cpp">
-      <Filter>Runtime\Scripting</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindWatchDog.cpp">
-      <Filter>Runtime\Scripting</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\Editor\GUI\ContainnerWindow.cpp">
       <Filter>Editor\GUI</Filter>
     </ClCompile>
@@ -150,6 +132,39 @@
     <ClCompile Include="..\..\..\Editor\Scripting\IMGUI\GUIButton.bind.cpp">
       <Filter>Editor\Scripting\IMGUI</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindCFunctions.cpp">
+      <Filter>Runtime\LuaBind</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindClass.cpp">
+      <Filter>Runtime\LuaBind</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindEnum.cpp">
+      <Filter>Runtime\LuaBind</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindMemberRef.cpp">
+      <Filter>Runtime\LuaBind</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindRef.cpp">
+      <Filter>Runtime\LuaBind</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindRefTable.cpp">
+      <Filter>Runtime\LuaBind</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindState.cpp">
+      <Filter>Runtime\LuaBind</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindVM.cpp">
+      <Filter>Runtime\LuaBind</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindWatchDog.cpp">
+      <Filter>Runtime\LuaBind</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Scripting\GL.bind.cpp">
+      <Filter>Runtime\Scripting\GL</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Editor\Shaders\BuiltinShaders.cpp">
+      <Filter>Editor\Shaders</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\Editor\GUI\Dock.h">
@@ -203,48 +218,6 @@
     <ClInclude Include="..\..\..\Editor\GUI\WinUtils.h">
       <Filter>Editor\GUI</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBind.h">
-      <Filter>Runtime\Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindCFunctions.h">
-      <Filter>Runtime\Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindClass.hpp">
-      <Filter>Runtime\Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindConfig.h">
-      <Filter>Runtime\Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindEnum.h">
-      <Filter>Runtime\Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindGlobalState.h">
-      <Filter>Runtime\Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindInternal.h">
-      <Filter>Runtime\Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindMemberRef.h">
-      <Filter>Runtime\Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindRef.h">
-      <Filter>Runtime\Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindRefTable.h">
-      <Filter>Runtime\Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindState.h">
-      <Filter>Runtime\Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindUtility.h">
-      <Filter>Runtime\Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindVM.h">
-      <Filter>Runtime\Scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindWatchDog.h">
-      <Filter>Runtime\Scripting</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\Editor\Utils\Log.h">
       <Filter>Editor\Utils</Filter>
     </ClInclude>
@@ -266,13 +239,58 @@
     <ClInclude Include="..\..\..\Editor\Scripting\EditorScripting.h">
       <Filter>Editor\Scripting</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBind.h">
+      <Filter>Runtime\LuaBind</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindCFunctions.h">
+      <Filter>Runtime\LuaBind</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindClass.hpp">
+      <Filter>Runtime\LuaBind</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindConfig.h">
+      <Filter>Runtime\LuaBind</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindEnum.h">
+      <Filter>Runtime\LuaBind</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindGlobalState.h">
+      <Filter>Runtime\LuaBind</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindInternal.h">
+      <Filter>Runtime\LuaBind</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindMemberRef.h">
+      <Filter>Runtime\LuaBind</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindRef.h">
+      <Filter>Runtime\LuaBind</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindRefTable.h">
+      <Filter>Runtime\LuaBind</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindState.h">
+      <Filter>Runtime\LuaBind</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindUtility.h">
+      <Filter>Runtime\LuaBind</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindVM.h">
+      <Filter>Runtime\LuaBind</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindWatchDog.h">
+      <Filter>Runtime\LuaBind</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Editor\Shaders\BuiltinShaders.h">
+      <Filter>Editor\Shaders</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\..\Runtime\Scripting\LuaBindClass.inc">
-      <Filter>Runtime\Scripting</Filter>
+    <None Include="..\..\..\Runtime\LuaBind\LuaBindClass.inc">
+      <Filter>Runtime\LuaBind</Filter>
     </None>
-    <None Include="..\..\..\Runtime\Scripting\LuaBindState.inc">
-      <Filter>Runtime\Scripting</Filter>
+    <None Include="..\..\..\Runtime\LuaBind\LuaBindState.inc">
+      <Filter>Runtime\LuaBind</Filter>
     </None>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Projects/VisualStudio/Runtime/Runtime.vcxproj b/Projects/VisualStudio/Runtime/Runtime.vcxproj
index 5ce1d52..2d56bfd 100644
--- a/Projects/VisualStudio/Runtime/Runtime.vcxproj
+++ b/Projects/VisualStudio/Runtime/Runtime.vcxproj
@@ -38,6 +38,20 @@
     <ClInclude Include="..\..\..\Runtime\ImGUI\GUIButton.h" />
     <ClInclude Include="..\..\..\Runtime\ImGUI\GUILabel.h" />
     <ClInclude Include="..\..\..\Runtime\Input\Input.h" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBind.h" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindCFunctions.h" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindClass.hpp" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindConfig.h" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindEnum.h" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindGlobalState.h" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindInternal.h" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindMemberRef.h" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindRef.h" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindRefTable.h" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindState.h" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindUtility.h" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindVM.h" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindWatchDog.h" />
     <ClInclude Include="..\..\..\Runtime\Math\AABB.h" />
     <ClInclude Include="..\..\..\Runtime\Math\Vector2.h" />
     <ClInclude Include="..\..\..\Runtime\Math\Vector3.h" />
@@ -50,20 +64,7 @@
     <ClInclude Include="..\..\..\Runtime\Physics\Rigidbody.h" />
     <ClInclude Include="..\..\..\Runtime\Profiler\FrameStats.h" />
     <ClInclude Include="..\..\..\Runtime\Profiler\Profiler.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBind.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindCFunctions.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindClass.hpp" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindConfig.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindEnum.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindGlobalState.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindInternal.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindMemberRef.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindRef.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindRefTable.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindState.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindUtility.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindVM.h" />
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindWatchDog.h" />
+    <ClInclude Include="..\..\..\Runtime\Runner.h" />
     <ClInclude Include="..\..\..\Runtime\Shaders\ShaderChannel.h" />
     <ClInclude Include="..\..\..\Runtime\Shaders\ShaderDefine.h" />
     <ClInclude Include="..\..\..\Runtime\Shaders\ShaderUniform.h" />
@@ -101,21 +102,21 @@
     <ClCompile Include="..\..\..\Runtime\ImGUI\GUIButton.cpp" />
     <ClCompile Include="..\..\..\Runtime\ImGUI\GUILabel.cpp" />
     <ClCompile Include="..\..\..\Runtime\Input\Input.cpp" />
-    <ClCompile Include="..\..\..\Runtime\main.cpp" />
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindCFunctions.cpp" />
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindClass.cpp" />
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindEnum.cpp" />
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindMemberRef.cpp" />
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindRef.cpp" />
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindRefTable.cpp" />
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindState.cpp" />
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindVM.cpp" />
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindWatchDog.cpp" />
     <ClCompile Include="..\..\..\Runtime\Math\Vector2.cpp" />
     <ClCompile Include="..\..\..\Runtime\Math\Vector3.cpp" />
     <ClCompile Include="..\..\..\Runtime\Mesh\Font.cpp" />
     <ClCompile Include="..\..\..\Runtime\Mesh\Mesh.cpp" />
     <ClCompile Include="..\..\..\Runtime\Physics\Scripting\wrap_Joint.cpp" />
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindCFunctions.cpp" />
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindClass.cpp" />
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindEnum.cpp" />
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindMemberRef.cpp" />
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindRef.cpp" />
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindRefTable.cpp" />
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindState.cpp" />
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindVM.cpp" />
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindWatchDog.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Runner.cpp" />
     <ClCompile Include="..\..\..\Runtime\Shaders\ShaderDefine.cpp" />
     <ClCompile Include="..\..\..\Runtime\Threads\Mutex.cpp" />
     <ClCompile Include="..\..\..\Runtime\Threads\Semaphore.cpp" />
@@ -134,8 +135,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\..\Runtime\Scripting\LuaBindClass.inc" />
-    <None Include="..\..\..\Runtime\Scripting\LuaBindState.inc" />
+    <None Include="..\..\..\Runtime\LuaBind\LuaBindClass.inc" />
+    <None Include="..\..\..\Runtime\LuaBind\LuaBindState.inc" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
diff --git a/Projects/VisualStudio/Runtime/Runtime.vcxproj.filters b/Projects/VisualStudio/Runtime/Runtime.vcxproj.filters
index 8de44e2..86744e8 100644
--- a/Projects/VisualStudio/Runtime/Runtime.vcxproj.filters
+++ b/Projects/VisualStudio/Runtime/Runtime.vcxproj.filters
@@ -40,15 +40,18 @@
     <Filter Include="Graphics\Scripting">
       <UniqueIdentifier>{fb970ccc-e9aa-4f61-854c-0b852503a375}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Scripting">
-      <UniqueIdentifier>{a354c650-8493-41a2-81e5-205495beb0e5}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Physics\Scripting">
       <UniqueIdentifier>{4478c64f-e27a-4be6-a189-8d99e0fc6b15}</UniqueIdentifier>
     </Filter>
     <Filter Include="ImGUI">
       <UniqueIdentifier>{c865b35b-5537-4757-927d-7476009f4de2}</UniqueIdentifier>
     </Filter>
+    <Filter Include="LuaBind">
+      <UniqueIdentifier>{a354c650-8493-41a2-81e5-205495beb0e5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Scripting">
+      <UniqueIdentifier>{e53b1cb1-9d81-47a0-8d40-566d4fd0ef80}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\Runtime\Utilities\NonCopyable.h">
@@ -189,47 +192,48 @@
     <ClInclude Include="..\..\..\Runtime\ImGUI\GUILabel.h">
       <Filter>ImGUI</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBind.h">
-      <Filter>Scripting</Filter>
+    <ClInclude Include="..\..\..\Runtime\Runner.h" />
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBind.h">
+      <Filter>LuaBind</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindCFunctions.h">
-      <Filter>Scripting</Filter>
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindCFunctions.h">
+      <Filter>LuaBind</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindClass.hpp">
-      <Filter>Scripting</Filter>
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindClass.hpp">
+      <Filter>LuaBind</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindConfig.h">
-      <Filter>Scripting</Filter>
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindConfig.h">
+      <Filter>LuaBind</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindEnum.h">
-      <Filter>Scripting</Filter>
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindEnum.h">
+      <Filter>LuaBind</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindGlobalState.h">
-      <Filter>Scripting</Filter>
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindGlobalState.h">
+      <Filter>LuaBind</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindInternal.h">
-      <Filter>Scripting</Filter>
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindInternal.h">
+      <Filter>LuaBind</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindMemberRef.h">
-      <Filter>Scripting</Filter>
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindMemberRef.h">
+      <Filter>LuaBind</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindRef.h">
-      <Filter>Scripting</Filter>
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindRef.h">
+      <Filter>LuaBind</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindRefTable.h">
-      <Filter>Scripting</Filter>
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindRefTable.h">
+      <Filter>LuaBind</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindState.h">
-      <Filter>Scripting</Filter>
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindState.h">
+      <Filter>LuaBind</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindUtility.h">
-      <Filter>Scripting</Filter>
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindUtility.h">
+      <Filter>LuaBind</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindVM.h">
-      <Filter>Scripting</Filter>
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindVM.h">
+      <Filter>LuaBind</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindWatchDog.h">
-      <Filter>Scripting</Filter>
+    <ClInclude Include="..\..\..\Runtime\LuaBind\LuaBindWatchDog.h">
+      <Filter>LuaBind</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
@@ -245,7 +249,6 @@
     <ClCompile Include="..\..\..\Runtime\Graphics\Device.cpp">
       <Filter>Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\main.cpp" />
     <ClCompile Include="..\..\..\Runtime\Math\Vector3.cpp">
       <Filter>Math</Filter>
     </ClCompile>
@@ -324,40 +327,41 @@
     <ClCompile Include="..\..\..\Runtime\ImGUI\GUILabel.cpp">
       <Filter>ImGUI</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindCFunctions.cpp">
-      <Filter>Scripting</Filter>
+    <ClCompile Include="..\..\..\Runtime\Runner.cpp" />
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindCFunctions.cpp">
+      <Filter>LuaBind</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindClass.cpp">
-      <Filter>Scripting</Filter>
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindClass.cpp">
+      <Filter>LuaBind</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindEnum.cpp">
-      <Filter>Scripting</Filter>
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindEnum.cpp">
+      <Filter>LuaBind</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindMemberRef.cpp">
-      <Filter>Scripting</Filter>
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindMemberRef.cpp">
+      <Filter>LuaBind</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindRef.cpp">
-      <Filter>Scripting</Filter>
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindRef.cpp">
+      <Filter>LuaBind</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindRefTable.cpp">
-      <Filter>Scripting</Filter>
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindRefTable.cpp">
+      <Filter>LuaBind</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindState.cpp">
-      <Filter>Scripting</Filter>
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindState.cpp">
+      <Filter>LuaBind</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindVM.cpp">
-      <Filter>Scripting</Filter>
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindVM.cpp">
+      <Filter>LuaBind</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindWatchDog.cpp">
-      <Filter>Scripting</Filter>
+    <ClCompile Include="..\..\..\Runtime\LuaBind\LuaBindWatchDog.cpp">
+      <Filter>LuaBind</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\..\Runtime\Scripting\LuaBindClass.inc">
-      <Filter>Scripting</Filter>
+    <None Include="..\..\..\Runtime\LuaBind\LuaBindClass.inc">
+      <Filter>LuaBind</Filter>
     </None>
-    <None Include="..\..\..\Runtime\Scripting\LuaBindState.inc">
-      <Filter>Scripting</Filter>
+    <None Include="..\..\..\Runtime\LuaBind\LuaBindState.inc">
+      <Filter>LuaBind</Filter>
     </None>
   </ItemGroup>
 </Project>
\ No newline at end of file