*revert

8 files changed, 311 insertions, 325 deletions

diff --git a/bin/SDL2.dll b/bin/SDL2.dll
index 5722660..6202063 100644
--- a/bin/SDL2.dll
+++ b/bin/SDL2.dll
diff --git a/bin/cembed.exe b/bin/cembed.exe
index 5c0f37e..d9d3a6c 100644
--- a/bin/cembed.exe
+++ b/bin/cembed.exe
diff --git a/bin/jin.exe b/bin/jin.exe
index 049caab..64620b8 100644
--- a/bin/jin.exe
+++ b/bin/jin.exe
diff --git a/bin/lua51.dll b/bin/lua51.dll
index 00be29e..58b7cdd 100644
--- a/bin/lua51.dll
+++ b/bin/lua51.dll
diff --git a/build/vc++/libjin-lua/libjin-lua.vcxproj.filters b/build/vc++/libjin-lua/libjin-lua.vcxproj.filters
index b1f68fe..7785d86 100644
--- a/build/vc++/libjin-lua/libjin-lua.vcxproj.filters
+++ b/build/vc++/libjin-lua/libjin-lua.vcxproj.filters
@@ -1,418 +1,411 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="source">
-      <UniqueIdentifier>{f3e85b81-1688-49e4-b85c-65d99ddafad9}</UniqueIdentifier>
+    <Filter Include="source\scripts">
+      <UniqueIdentifier>{352f5242-a96e-4cd1-a2e2-15777d354e42}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\common">
+    <Filter Include="common">
       <UniqueIdentifier>{2264d908-20ee-41c2-8bdc-bc1117959c4f}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\modules">
+    <Filter Include="modules">
       <UniqueIdentifier>{923b475a-00e2-4b8f-925a-ca1e5f9b4689}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\modules\thread">
+    <Filter Include="modules\thread">
       <UniqueIdentifier>{7957774a-4f34-4255-ab2e-8da9b6c71983}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\modules\time">
+    <Filter Include="modules\time">
       <UniqueIdentifier>{ee920041-8798-4827-be04-49f9342ba092}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\modules\net">
+    <Filter Include="modules\net">
       <UniqueIdentifier>{6b79b5bf-69c1-458c-81f3-b386b340d39b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\modules\audio">
+    <Filter Include="modules\audio">
       <UniqueIdentifier>{4eb54d6d-e336-42f6-8670-d271a458eb56}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\modules\bit">
+    <Filter Include="modules\bit">
       <UniqueIdentifier>{b042ed61-32e5-4e86-b4f3-1a293de8918d}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\modules\core">
+    <Filter Include="modules\core">
       <UniqueIdentifier>{b13ee8dc-41fc-42b3-8b64-f9c261ebfc73}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\modules\event">
+    <Filter Include="modules\event">
       <UniqueIdentifier>{8a740640-925a-4cf6-94d5-89283824a141}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\modules\filesystem">
+    <Filter Include="modules\filesystem">
       <UniqueIdentifier>{563ed6fb-3d82-4905-b128-835f3818cc4f}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\modules\graphics">
+    <Filter Include="modules\graphics">
       <UniqueIdentifier>{1ed523c3-e203-487f-a13f-a35396f814f3}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\modules\joypad">
+    <Filter Include="modules\joypad">
       <UniqueIdentifier>{7fd81749-f776-4e5c-b6e2-33372a143560}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\modules\keyboard">
+    <Filter Include="modules\keyboard">
       <UniqueIdentifier>{2a701538-aeee-4f48-a285-0b848c9a3b81}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\modules\math">
+    <Filter Include="modules\math">
       <UniqueIdentifier>{98c4385b-893c-4d60-bb82-2a19ee5ff527}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\modules\mouse">
+    <Filter Include="modules\mouse">
       <UniqueIdentifier>{5b69329e-0aa2-4c77-be52-69c09fdbac65}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\resources">
+    <Filter Include="modules\ai">
+      <UniqueIdentifier>{fc3fecf1-63e8-4d28-97a7-bf6a1817f57b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="resources">
       <UniqueIdentifier>{0340fbad-0c07-4923-afd2-183424c70967}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\scripts">
+    <Filter Include="scripts">
       <UniqueIdentifier>{9cf92f3f-bcc5-442b-aa92-c88eeb1c5e45}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\modules\ai">
-      <UniqueIdentifier>{fc3fecf1-63e8-4d28-97a7-bf6a1817f57b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="source\scripts">
-      <UniqueIdentifier>{352f5242-a96e-4cd1-a2e2-15777d354e42}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="source\scripts\ai">
+    <Filter Include="scripts\ai">
       <UniqueIdentifier>{a35265c5-45dc-4465-84ca-9fdb554f552d}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\scripts\graphics">
+    <Filter Include="scripts\graphics">
       <UniqueIdentifier>{9483f3df-efb9-472f-9458-497aa4d9ed3d}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\scripts\keyboard">
+    <Filter Include="scripts\keyboard">
       <UniqueIdentifier>{478c3bff-4f7b-4ad2-b3da-a00d17c29aca}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\scripts\mouse">
+    <Filter Include="scripts\mouse">
       <UniqueIdentifier>{15116842-caf0-4d04-8de3-59aea4f8580b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\scripts\net">
+    <Filter Include="scripts\net">
       <UniqueIdentifier>{98bafc52-f4a3-4966-aa99-0d3a2dc938f2}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\scripts\path">
+    <Filter Include="scripts\path">
       <UniqueIdentifier>{54e1484f-22ae-407e-9f59-f4baab8905d5}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\scripts\time">
+    <Filter Include="scripts\time">
       <UniqueIdentifier>{b54c1887-3e6d-48b6-8d1c-1293a732bc55}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\scripts\utils">
+    <Filter Include="scripts\utils">
       <UniqueIdentifier>{0016b44e-9b02-4e61-af6a-61c1ea1426eb}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\scripts\tiledmap">
+    <Filter Include="scripts\tiledmap">
       <UniqueIdentifier>{d1b9c82a-60a9-4c4b-a631-4fc34b08342a}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\scripts\physics">
+    <Filter Include="scripts\physics">
       <UniqueIdentifier>{1a9ea013-c770-410a-a2ec-a9b51d1c4112}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\scripts\audio">
+    <Filter Include="scripts\audio">
       <UniqueIdentifier>{76da0223-0e72-44da-8abe-8dd97c1cec35}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\ai\l_ai.cpp">
-      <Filter>source\modules\ai</Filter>
+      <Filter>modules\ai</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\ai\l_behavior_tree.cpp">
-      <Filter>source\modules\ai</Filter>
+      <Filter>modules\ai</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\ai\l_state_machine.cpp">
-      <Filter>source\modules\ai</Filter>
+      <Filter>modules\ai</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\audio\l_audio.cpp">
-      <Filter>source\modules\audio</Filter>
+      <Filter>modules\audio</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\audio\l_source.cpp">
-      <Filter>source\modules\audio</Filter>
+      <Filter>modules\audio</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\bit\l_bit.cpp">
-      <Filter>source\modules\bit</Filter>
+      <Filter>modules\bit</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\core\l_core.cpp">
-      <Filter>source\modules\core</Filter>
+      <Filter>modules\core</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\event\l_event.cpp">
-      <Filter>source\modules\event</Filter>
+      <Filter>modules\event</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\filesystem\l_filesystem.cpp">
-      <Filter>source\modules\filesystem</Filter>
+      <Filter>modules\filesystem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\graphics\l_animation.cpp">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\graphics\l_animator.cpp">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\graphics\l_bitmap.cpp">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\graphics\l_canvas.cpp">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\graphics\l_graphics.cpp">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\graphics\l_mesh.cpp">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\graphics\l_page.cpp">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\graphics\l_particle_system.cpp">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\graphics\l_shader.cpp">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\graphics\l_sprite.cpp">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\graphics\l_spritesheet.cpp">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\graphics\l_text.cpp">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\graphics\l_texture.cpp">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\graphics\l_texture_font.cpp">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\graphics\l_ttf.cpp">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\graphics\l_ttf_data.cpp">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\joypad\l_joypad.cpp">
-      <Filter>source\modules\joypad</Filter>
+      <Filter>modules\joypad</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\keyboard\l_keyboard.cpp">
-      <Filter>source\modules\keyboard</Filter>
+      <Filter>modules\keyboard</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\math\l_math.cpp">
-      <Filter>source\modules\math</Filter>
+      <Filter>modules\math</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\mouse\l_mouse.cpp">
-      <Filter>source\modules\mouse</Filter>
+      <Filter>modules\mouse</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\net\l_buffer.cpp">
-      <Filter>source\modules\net</Filter>
+      <Filter>modules\net</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\net\l_net.cpp">
-      <Filter>source\modules\net</Filter>
+      <Filter>modules\net</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\net\l_socket.cpp">
-      <Filter>source\modules\net</Filter>
+      <Filter>modules\net</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\thread\l_thread.cpp">
-      <Filter>source\modules\thread</Filter>
+      <Filter>modules\thread</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\time\l_time.cpp">
-      <Filter>source\modules\time</Filter>
+      <Filter>modules\time</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\modules\time\l_timer.cpp">
-      <Filter>source\modules\time</Filter>
+      <Filter>modules\time</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\common\l_callback.cpp">
-      <Filter>source\common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\common\l_function.cpp">
-      <Filter>source\common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\common\l_object.cpp">
-      <Filter>source\common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\common\l_port.h">
-      <Filter>source\common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\common\l_reference.cpp">
-      <Filter>source\common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\common\l_runtime.cpp">
-      <Filter>source\common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin-lua\common\l_shared.cpp">
-      <Filter>source\common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin-lua\l_jin.cpp">
-      <Filter>source</Filter>
+      <Filter>common</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin-lua\l_jin.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\libjin-lua\resources\font.ttf.h">
-      <Filter>source\resources</Filter>
+      <Filter>resources</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\ai\l_ai.h">
-      <Filter>source\modules\ai</Filter>
+      <Filter>modules\ai</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\ai\l_behavior_tree.h">
-      <Filter>source\modules\ai</Filter>
+      <Filter>modules\ai</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\ai\l_state_machine.h">
-      <Filter>source\modules\ai</Filter>
+      <Filter>modules\ai</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\audio\l_audio.h">
-      <Filter>source\modules\audio</Filter>
+      <Filter>modules\audio</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\audio\l_source.h">
-      <Filter>source\modules\audio</Filter>
+      <Filter>modules\audio</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\bit\l_bit.h">
-      <Filter>source\modules\bit</Filter>
+      <Filter>modules\bit</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\core\l_core.h">
-      <Filter>source\modules\core</Filter>
+      <Filter>modules\core</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\event\l_event.h">
-      <Filter>source\modules\event</Filter>
+      <Filter>modules\event</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\filesystem\l_filesystem.h">
-      <Filter>source\modules\filesystem</Filter>
+      <Filter>modules\filesystem</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\graphics\l_animation.h">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\graphics\l_animator.h">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\graphics\l_bitmap.h">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\graphics\l_canvas.h">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\graphics\l_graphics.h">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\graphics\l_mesh.h">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\graphics\l_page.h">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\graphics\l_particle_system.h">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\graphics\l_shader.h">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\graphics\l_sprite.h">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\graphics\l_spritesheet.h">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\graphics\l_text.h">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\graphics\l_texture.h">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\graphics\l_texture_font.h">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\graphics\l_ttf.h">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\graphics\l_ttf_data.h">
-      <Filter>source\modules\graphics</Filter>
+      <Filter>modules\graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\joypad\l_joypad.h">
-      <Filter>source\modules\joypad</Filter>
+      <Filter>modules\joypad</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\keyboard\l_keyboard.h">
-      <Filter>source\modules\keyboard</Filter>
+      <Filter>modules\keyboard</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\math\l_math.h">
-      <Filter>source\modules\math</Filter>
+      <Filter>modules\math</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\mouse\l_mouse.h">
-      <Filter>source\modules\mouse</Filter>
+      <Filter>modules\mouse</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\net\l_buffer.h">
-      <Filter>source\modules\net</Filter>
+      <Filter>modules\net</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\net\l_net.h">
-      <Filter>source\modules\net</Filter>
+      <Filter>modules\net</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\net\l_socket.h">
-      <Filter>source\modules\net</Filter>
+      <Filter>modules\net</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\thread\l_thread.h">
-      <Filter>source\modules\thread</Filter>
+      <Filter>modules\thread</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\time\l_time.h">
-      <Filter>source\modules\time</Filter>
+      <Filter>modules\time</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\time\l_timer.h">
-      <Filter>source\modules\time</Filter>
+      <Filter>modules\time</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\modules\l_modules.h">
-      <Filter>source\modules</Filter>
+      <Filter>modules</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\common\l_callback.h">
-      <Filter>source\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\common\l_common.h">
-      <Filter>source\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\common\l_constant.h">
-      <Filter>source\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\common\l_function.h">
-      <Filter>source\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\common\l_object.h">
-      <Filter>source\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\common\l_reference.h">
-      <Filter>source\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\common\l_shared.hpp">
-      <Filter>source\common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin-lua\l_jin.h">
-      <Filter>source</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin-lua\common\je_lua.h">
-      <Filter>source\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin-lua\l_jin.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\src\libjin-lua\scripts\ai\state_machine.lua">
-      <Filter>source\scripts\ai</Filter>
+      <Filter>scripts\ai</Filter>
     </None>
     <None Include="..\..\..\src\libjin-lua\scripts\ai\ai.lua">
-      <Filter>source\scripts\ai</Filter>
+      <Filter>scripts\ai</Filter>
     </None>
     <None Include="..\..\..\src\libjin-lua\scripts\keyboard\keyboard.lua">
-      <Filter>source\scripts\keyboard</Filter>
+      <Filter>scripts\keyboard</Filter>
     </None>
     <None Include="..\..\..\src\libjin-lua\scripts\mouse\mouse.lua">
-      <Filter>source\scripts\mouse</Filter>
+      <Filter>scripts\mouse</Filter>
     </None>
     <None Include="..\..\..\src\libjin-lua\scripts\net\net.lua">
-      <Filter>source\scripts\net</Filter>
+      <Filter>scripts\net</Filter>
     </None>
     <None Include="..\..\..\src\libjin-lua\scripts\path\path.lua">
-      <Filter>source\scripts\path</Filter>
+      <Filter>scripts\path</Filter>
     </None>
     <None Include="..\..\..\src\libjin-lua\scripts\time\time.lua">
-      <Filter>source\scripts\time</Filter>
+      <Filter>scripts\time</Filter>
     </None>
     <None Include="..\..\..\src\libjin-lua\scripts\log.lua">
-      <Filter>source\scripts</Filter>
+      <Filter>scripts</Filter>
     </None>
     <None Include="..\..\..\src\libjin-lua\scripts\utils\json.lua">
-      <Filter>source\scripts\utils</Filter>
+      <Filter>scripts\utils</Filter>
     </None>
     <None Include="..\..\..\src\libjin-lua\scripts\utils\xml.lua">
-      <Filter>source\scripts\utils</Filter>
+      <Filter>scripts\utils</Filter>
     </None>
     <None Include="..\..\..\src\libjin-lua\scripts\tiledmap\tiledmap.lua">
-      <Filter>source\scripts\tiledmap</Filter>
+      <Filter>scripts\tiledmap</Filter>
     </None>
     <None Include="..\..\..\src\libjin-lua\scripts\physics\physics.lua">
-      <Filter>source\scripts\physics</Filter>
+      <Filter>scripts\physics</Filter>
     </None>
     <None Include="..\..\..\src\libjin-lua\scripts\audio\audio.lua">
-      <Filter>source\scripts\audio</Filter>
+      <Filter>scripts\audio</Filter>
     </None>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\..\src\libjin-lua\scripts\app.lua">
-      <Filter>source\scripts</Filter>
+      <Filter>scripts</Filter>
     </Text>
     <Text Include="..\..\..\src\libjin-lua\scripts\graphics\graphics.lua">
-      <Filter>source\scripts\graphics</Filter>
+      <Filter>scripts\graphics</Filter>
     </Text>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/build/vc++/libjin/libjin.vcxproj.filters b/build/vc++/libjin/libjin.vcxproj.filters
index dce0348..7156e41 100644
--- a/build/vc++/libjin/libjin.vcxproj.filters
+++ b/build/vc++/libjin/libjin.vcxproj.filters
@@ -1,485 +1,478 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="source">
-      <UniqueIdentifier>{708c6303-1b76-4db4-bac5-be6fa9179e98}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="source\utils">
-      <UniqueIdentifier>{6259760f-501a-4b52-b9a1-4abb4d788a99}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="source\time">
-      <UniqueIdentifier>{492364c7-464b-488e-aae0-15aca7824f32}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="source\net">
-      <UniqueIdentifier>{125ecddc-2a19-4da8-9e81-da40ccfb1be7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="source\math">
-      <UniqueIdentifier>{17b71ceb-a8ff-4ec0-aa18-b51e265bec34}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="source\input">
-      <UniqueIdentifier>{e4d464ae-1cb5-47fd-b24a-fd35708aead0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="source\graphics">
-      <UniqueIdentifier>{bb6c372a-520b-4de3-ab14-64839a6166d9}</UniqueIdentifier>
+    <Filter Include="ai">
+      <UniqueIdentifier>{caecef4f-a2c6-4d0a-8052-20e400378f3a}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\game">
-      <UniqueIdentifier>{c002d452-c7a0-4161-a419-c10fd3d1c297}</UniqueIdentifier>
+    <Filter Include="audio">
+      <UniqueIdentifier>{27146cd2-84fe-4eaf-a45b-641a463d381b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\filesystem">
-      <UniqueIdentifier>{3a98cf95-d45a-4a0e-b3fe-65b5accdb75f}</UniqueIdentifier>
+    <Filter Include="audio\sdl">
+      <UniqueIdentifier>{2dc5e4ca-0904-4b49-8043-5d02db438008}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\common">
+    <Filter Include="common">
       <UniqueIdentifier>{908f94da-1fc4-42db-abe9-8c8e17051f9d}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\audio">
-      <UniqueIdentifier>{27146cd2-84fe-4eaf-a45b-641a463d381b}</UniqueIdentifier>
+    <Filter Include="core">
+      <UniqueIdentifier>{410ae074-3f19-4ca1-bbf4-380f2ba67500}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\audio\sdl">
-      <UniqueIdentifier>{2dc5e4ca-0904-4b49-8043-5d02db438008}</UniqueIdentifier>
+    <Filter Include="filesystem">
+      <UniqueIdentifier>{3a98cf95-d45a-4a0e-b3fe-65b5accdb75f}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\core">
-      <UniqueIdentifier>{410ae074-3f19-4ca1-bbf4-380f2ba67500}</UniqueIdentifier>
+    <Filter Include="game">
+      <UniqueIdentifier>{c002d452-c7a0-4161-a419-c10fd3d1c297}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\ai">
-      <UniqueIdentifier>{caecef4f-a2c6-4d0a-8052-20e400378f3a}</UniqueIdentifier>
+    <Filter Include="graphics">
+      <UniqueIdentifier>{bb6c372a-520b-4de3-ab14-64839a6166d9}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\graphics\animations">
+    <Filter Include="graphics\animations">
       <UniqueIdentifier>{75436e7f-5196-4981-a0f0-f2eaf5e97dce}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\graphics\fonts">
+    <Filter Include="graphics\fonts">
       <UniqueIdentifier>{ce02dfa9-2afe-4295-b14f-c786d65456cd}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\graphics\particles">
+    <Filter Include="graphics\particles">
       <UniqueIdentifier>{6d44a7c8-3ed7-4377-920b-2d8c98f34435}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\graphics\shaders">
+    <Filter Include="graphics\shaders">
       <UniqueIdentifier>{bed786b4-6d8a-4c8d-b04f-67eb0f7435b8}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\graphics\shaders\built-in">
+    <Filter Include="graphics\shaders\built-in">
       <UniqueIdentifier>{9bb29b2f-9812-4a0b-ad27-fd57756c0717}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\threads">
+    <Filter Include="input">
+      <UniqueIdentifier>{e4d464ae-1cb5-47fd-b24a-fd35708aead0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="math">
+      <UniqueIdentifier>{17b71ceb-a8ff-4ec0-aa18-b51e265bec34}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="net">
+      <UniqueIdentifier>{125ecddc-2a19-4da8-9e81-da40ccfb1be7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="threads">
       <UniqueIdentifier>{5d5c96c3-1065-4e74-9521-f4d756d4057f}</UniqueIdentifier>
     </Filter>
+    <Filter Include="time">
+      <UniqueIdentifier>{492364c7-464b-488e-aae0-15aca7824f32}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="utils">
+      <UniqueIdentifier>{6259760f-501a-4b52-b9a1-4abb4d788a99}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\src\libjin\jin.h">
-      <Filter>source</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\ai\ai.h">
-      <Filter>source\ai</Filter>
+      <Filter>ai</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\ai\behavior_tree.h">
-      <Filter>source\ai</Filter>
+      <Filter>ai</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\ai\state_machine.h">
-      <Filter>source\ai</Filter>
+      <Filter>ai</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Audio\SDL\sdl_audio.h">
-      <Filter>source\audio\sdl</Filter>
+      <Filter>audio\sdl</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Audio\SDL\sdl_source.h">
-      <Filter>source\audio\sdl</Filter>
+      <Filter>audio\sdl</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Audio\audio_manager.h">
-      <Filter>source\audio</Filter>
+      <Filter>audio</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Audio\source.h">
-      <Filter>source\audio</Filter>
+      <Filter>audio</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Common\array.hpp">
-      <Filter>source\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Common\common.h">
-      <Filter>source\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Common\exception.h">
-      <Filter>source\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Common\noncopyable.h">
-      <Filter>source\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Common\object.h">
-      <Filter>source\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Common\singleton.hpp">
-      <Filter>source\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Common\pool.hpp">
-      <Filter>source\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\common\string.h">
-      <Filter>source\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Common\stringmap.hpp">
-      <Filter>source\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Common\subsystem.hpp">
-      <Filter>source\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Common\temporary.h">
-      <Filter>source\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Common\types.h">
-      <Filter>source\common</Filter>
+      <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\core\configuration.h">
-      <Filter>source\core</Filter>
+      <Filter>core</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\core\version.h">
-      <Filter>source\core</Filter>
+      <Filter>core</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Filesystem\asset_database.h">
-      <Filter>source\filesystem</Filter>
+      <Filter>filesystem</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Filesystem\buffer.h">
-      <Filter>source\filesystem</Filter>
+      <Filter>filesystem</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Game\application.h">
-      <Filter>source\game</Filter>
+      <Filter>game</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Game\gameobject.h">
-      <Filter>source\game</Filter>
+      <Filter>game</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\graphics\animations\animation.h">
-      <Filter>source\graphics\animations</Filter>
+      <Filter>graphics\animations</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\graphics\animations\animator.h">
-      <Filter>source\graphics\animations</Filter>
+      <Filter>graphics\animations</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\graphics\fonts\decoder.h">
-      <Filter>source\graphics\fonts</Filter>
+      <Filter>graphics\fonts</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\graphics\fonts\font.h">
-      <Filter>source\graphics\fonts</Filter>
+      <Filter>graphics\fonts</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\graphics\fonts\page.h">
-      <Filter>source\graphics\fonts</Filter>
+      <Filter>graphics\fonts</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\graphics\fonts\text.h">
-      <Filter>source\graphics\fonts</Filter>
+      <Filter>graphics\fonts</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\graphics\fonts\texture_font.h">
-      <Filter>source\graphics\fonts</Filter>
+      <Filter>graphics\fonts</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\graphics\fonts\ttf.h">
-      <Filter>source\graphics\fonts</Filter>
+      <Filter>graphics\fonts</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\graphics\particles\particle.h">
-      <Filter>source\graphics\particles</Filter>
+      <Filter>graphics\particles</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\graphics\particles\particle_emitter.h">
-      <Filter>source\graphics\particles</Filter>
+      <Filter>graphics\particles</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\graphics\particles\particle_pool.h">
-      <Filter>source\graphics\particles</Filter>
+      <Filter>graphics\particles</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\graphics\particles\particle_system.h">
-      <Filter>source\graphics\particles</Filter>
+      <Filter>graphics\particles</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\graphics\shaders\built-in\default.shader.h">
-      <Filter>source\graphics\shaders\built-in</Filter>
+      <Filter>graphics\shaders\built-in</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\graphics\shaders\built-in\font.shader.h">
-      <Filter>source\graphics\shaders\built-in</Filter>
+      <Filter>graphics\shaders\built-in</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\graphics\shaders\built-in\texture.shader.h">
-      <Filter>source\graphics\shaders\built-in</Filter>
+      <Filter>graphics\shaders\built-in</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\graphics\shaders\jsl_compiler.h">
-      <Filter>source\graphics\shaders</Filter>
+      <Filter>graphics\shaders</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\graphics\shaders\shader.h">
-      <Filter>source\graphics\shaders</Filter>
+      <Filter>graphics\shaders</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Graphics\bitmap.h">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Graphics\canvas.h">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Graphics\color.h">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Graphics\gl.h">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Graphics\graphic.h">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Graphics\graphics.h">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Graphics\image.h">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Graphics\mesh.h">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\graphics\renderable.h">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Graphics\shapes.h">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Graphics\sprite.h">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\graphics\sprite_batch.h">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\graphics\sprite_sheet.h">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Graphics\texture.h">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\graphics\vertex.h">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Graphics\window.h">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Input\event.h">
-      <Filter>source\input</Filter>
+      <Filter>input</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Input\input.h">
-      <Filter>source\input</Filter>
+      <Filter>input</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Input\joypad.h">
-      <Filter>source\input</Filter>
+      <Filter>input</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Input\keyboard.h">
-      <Filter>source\input</Filter>
+      <Filter>input</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Input\mouse.h">
-      <Filter>source\input</Filter>
+      <Filter>input</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\math\bbox.h">
-      <Filter>source\math</Filter>
+      <Filter>math</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\math\bezier_curve.h">
-      <Filter>source\math</Filter>
+      <Filter>math</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Math\constant.h">
-      <Filter>source\math</Filter>
+      <Filter>math</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\math\ellipse.h">
-      <Filter>source\math</Filter>
+      <Filter>math</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Math\math.h">
-      <Filter>source\math</Filter>
+      <Filter>math</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Math\matrix.h">
-      <Filter>source\math</Filter>
+      <Filter>math</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\math\percentage.h">
-      <Filter>source\math</Filter>
+      <Filter>math</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Math\quad.h">
-      <Filter>source\math</Filter>
+      <Filter>math</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\math\random.h">
-      <Filter>source\math</Filter>
+      <Filter>math</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\math\ranged_value.h">
-      <Filter>source\math</Filter>
+      <Filter>math</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Math\transform.h">
-      <Filter>source\math</Filter>
+      <Filter>math</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Math\vector2.hpp">
-      <Filter>source\math</Filter>
+      <Filter>math</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Math\vector3.hpp">
-      <Filter>source\math</Filter>
+      <Filter>math</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Math\vector4.hpp">
-      <Filter>source\math</Filter>
+      <Filter>math</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Net\net_manager.h">
-      <Filter>source\net</Filter>
+      <Filter>net</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Net\socket.h">
-      <Filter>source\net</Filter>
+      <Filter>net</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\threads\thread.h">
-      <Filter>source\threads</Filter>
+      <Filter>threads</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Time\timer.h">
-      <Filter>source\time</Filter>
+      <Filter>time</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Utils\endian.h">
-      <Filter>source\utils</Filter>
+      <Filter>utils</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Utils\log.h">
-      <Filter>source\utils</Filter>
+      <Filter>utils</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Utils\macros.h">
-      <Filter>source\utils</Filter>
+      <Filter>utils</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Utils\utils.h">
-      <Filter>source\utils</Filter>
+      <Filter>utils</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\jin.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\..\src\libjin\README.md">
-      <Filter>source</Filter>
-    </None>
     <None Include="..\..\..\src\libjin\core\README.md">
-      <Filter>source\core</Filter>
+      <Filter>core</Filter>
     </None>
+    <None Include="..\..\..\src\libjin\README.md" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\libjin\ai\behavior_tree.cpp">
-      <Filter>source\ai</Filter>
+      <Filter>ai</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\ai\state_machine.cpp">
-      <Filter>source\ai</Filter>
+      <Filter>ai</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Audio\SDL\sdl_audio.cpp">
-      <Filter>source\audio\sdl</Filter>
+      <Filter>audio\sdl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Audio\SDL\sdl_source.cpp">
-      <Filter>source\audio\sdl</Filter>
+      <Filter>audio\sdl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Audio\audio_manager.cpp">
-      <Filter>source\audio</Filter>
+      <Filter>audio</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Audio\source.cpp">
-      <Filter>source\audio</Filter>
+      <Filter>audio</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Common\exception.cpp">
-      <Filter>source\common</Filter>
+      <Filter>common</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Filesystem\asset_database.cpp">
-      <Filter>source\filesystem</Filter>
+      <Filter>filesystem</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Game\application.cpp">
-      <Filter>source\game</Filter>
+      <Filter>game</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Game\gameobject.cpp">
-      <Filter>source\game</Filter>
+      <Filter>game</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\graphics\animations\animation.cpp">
-      <Filter>source\graphics\animations</Filter>
+      <Filter>graphics\animations</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\graphics\animations\animator.cpp">
-      <Filter>source\graphics\animations</Filter>
+      <Filter>graphics\animations</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\graphics\fonts\decoder.cpp">
-      <Filter>source\graphics\fonts</Filter>
+      <Filter>graphics\fonts</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\graphics\fonts\text.cpp">
-      <Filter>source\graphics\fonts</Filter>
+      <Filter>graphics\fonts</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\graphics\fonts\texture_font.cpp">
-      <Filter>source\graphics\fonts</Filter>
+      <Filter>graphics\fonts</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\graphics\fonts\ttf.cpp">
-      <Filter>source\graphics\fonts</Filter>
+      <Filter>graphics\fonts</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\graphics\particles\particle.cpp">
-      <Filter>source\graphics\particles</Filter>
+      <Filter>graphics\particles</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\graphics\particles\particle_emitter.cpp">
-      <Filter>source\graphics\particles</Filter>
+      <Filter>graphics\particles</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\graphics\particles\particle_system.cpp">
-      <Filter>source\graphics\particles</Filter>
+      <Filter>graphics\particles</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\graphics\shaders\jsl_compiler.cpp">
-      <Filter>source\graphics\shaders</Filter>
+      <Filter>graphics\shaders</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\graphics\shaders\shader.cpp">
-      <Filter>source\graphics\shaders</Filter>
+      <Filter>graphics\shaders</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Graphics\bitmap.cpp">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Graphics\canvas.cpp">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Graphics\color.cpp">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Graphics\gl.cpp">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Graphics\graphic.cpp">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Graphics\image.cpp">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Graphics\mesh.cpp">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Graphics\shapes.cpp">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Graphics\sprite.cpp">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\graphics\sprite_batch.cpp">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\graphics\sprite_sheet.cpp">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Graphics\texture.cpp">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Graphics\window.cpp">
-      <Filter>source\graphics</Filter>
+      <Filter>graphics</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Input\event.cpp">
-      <Filter>source\input</Filter>
+      <Filter>input</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Input\joypad.cpp">
-      <Filter>source\input</Filter>
+      <Filter>input</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Input\keyboard.cpp">
-      <Filter>source\input</Filter>
+      <Filter>input</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Input\mouse.cpp">
-      <Filter>source\input</Filter>
+      <Filter>input</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\math\bezier_curve.cpp">
-      <Filter>source\math</Filter>
+      <Filter>math</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\math\ellipse.cpp">
-      <Filter>source\math</Filter>
+      <Filter>math</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Math\matrix.cpp">
-      <Filter>source\math</Filter>
+      <Filter>math</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\math\random.cpp">
-      <Filter>source\math</Filter>
+      <Filter>math</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\math\ranged_value.cpp">
-      <Filter>source\math</Filter>
+      <Filter>math</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Math\transform.cpp">
-      <Filter>source\math</Filter>
+      <Filter>math</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Net\net_manager.cpp">
-      <Filter>source\net</Filter>
+      <Filter>net</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Net\socket.cpp">
-      <Filter>source\net</Filter>
+      <Filter>net</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\threads\thread.cpp">
-      <Filter>source\threads</Filter>
+      <Filter>threads</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Time\timer.cpp">
-      <Filter>source\time</Filter>
+      <Filter>time</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Utils\log.cpp">
-      <Filter>source\utils</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Utils\unittest.cpp">
-      <Filter>source\utils</Filter>
+      <Filter>utils</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/3rdparty/LuaJIT-2.0.5/src/buildvm.lib b/src/3rdparty/LuaJIT-2.0.5/src/buildvm.lib
index c7be727..d4372fd 100644
--- a/src/3rdparty/LuaJIT-2.0.5/src/buildvm.lib
+++ b/src/3rdparty/LuaJIT-2.0.5/src/buildvm.lib
diff --git a/src/3rdparty/LuaJIT-2.0.5/src/minilua.lib b/src/3rdparty/LuaJIT-2.0.5/src/minilua.lib
index e2b3ac3..a3cce18 100644
--- a/src/3rdparty/LuaJIT-2.0.5/src/minilua.lib
+++ b/src/3rdparty/LuaJIT-2.0.5/src/minilua.lib