change file tree

2 files changed, 419 insertions, 416 deletions

diff --git a/build/vs2015/jin.vcxproj b/build/vs2015/jin.vcxproj
index f50eb32..eedeae5 100644
--- a/build/vs2015/jin.vcxproj
+++ b/build/vs2015/jin.vcxproj
@@ -108,14 +108,14 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\src\;$(SolutionDir)libs\SDL2-2.0.5\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\src\;$(SolutionDir)3rdparty\SDL2-2.0.5\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>opengl32.lib;glu32.lib;SDL2main.lib;SDL2.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)libs\SDL2-2.0.5\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)3rdparty\SDL2-2.0.5\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
       <EntryPointSymbol>
       </EntryPointSymbol>
@@ -135,133 +135,133 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\audio\audio.cpp" />
-    <ClCompile Include="..\..\src\core\game.cpp" />
-    <ClCompile Include="..\..\src\fs\filesystem.cpp" />
-    <ClCompile Include="..\..\src\input\event.cpp" />
-    <ClCompile Include="..\..\src\input\keyboard.cpp" />
-    <ClCompile Include="..\..\src\input\mouse.cpp" />
+    <ClCompile Include="..\..\src\libjin\audio\audio.cpp" />
+    <ClCompile Include="..\..\src\libjin\core\game.cpp" />
+    <ClCompile Include="..\..\src\libjin\fs\filesystem.cpp" />
+    <ClCompile Include="..\..\src\libjin\input\event.cpp" />
+    <ClCompile Include="..\..\src\libjin\input\keyboard.cpp" />
+    <ClCompile Include="..\..\src\libjin\input\mouse.cpp" />
     <ClCompile Include="..\..\src\jinc.cpp" />
-    <ClCompile Include="..\..\src\libs\GLEE\GLee.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lapi.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lauxlib.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lbaselib.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lcode.c" />
-    <ClCompile Include="..\..\src\libs\lua51\ldblib.c" />
-    <ClCompile Include="..\..\src\libs\lua51\ldebug.c" />
-    <ClCompile Include="..\..\src\libs\lua51\ldo.c" />
-    <ClCompile Include="..\..\src\libs\lua51\ldump.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lfunc.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lgc.c" />
-    <ClCompile Include="..\..\src\libs\lua51\linit.c" />
-    <ClCompile Include="..\..\src\libs\lua51\liolib.c" />
-    <ClCompile Include="..\..\src\libs\lua51\llex.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lmathlib.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lmem.c" />
-    <ClCompile Include="..\..\src\libs\lua51\loadlib.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lobject.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lopcodes.c" />
-    <ClCompile Include="..\..\src\libs\lua51\loslib.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lparser.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lstate.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lstring.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lstrlib.c" />
-    <ClCompile Include="..\..\src\libs\lua51\ltable.c" />
-    <ClCompile Include="..\..\src\libs\lua51\ltablib.c" />
-    <ClCompile Include="..\..\src\libs\lua51\ltm.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lundump.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lvm.c" />
-    <ClCompile Include="..\..\src\libs\lua51\lzio.c" />
-    <ClCompile Include="..\..\src\libs\lua51\print.c" />
-    <ClCompile Include="..\..\src\libs\smount\smount.c" />
-    <ClCompile Include="..\..\src\libs\stb\stb_vorbis.c" />
-    <ClCompile Include="..\..\src\libs\tekcos\tekcos.c" />
-    <ClCompile Include="..\..\src\lua\audio\luaopen_audio.cpp" />
-    <ClCompile Include="..\..\src\lua\audio\luaopen_Sound.cpp" />
-    <ClCompile Include="..\..\src\lua\core\luaopen_core.cpp" />
-    <ClCompile Include="..\..\src\lua\debug\luaopen_debug.cpp" />
-    <ClCompile Include="..\..\src\lua\event\luaopen_event.cpp" />
-    <ClCompile Include="..\..\src\lua\filesystem\luaopen_filesystem.cpp" />
-    <ClCompile Include="..\..\src\lua\graphics\luaopen_Canvas.cpp" />
-    <ClCompile Include="..\..\src\lua\graphics\luaopen_Font.cpp" />
-    <ClCompile Include="..\..\src\lua\graphics\luaopen_graphics.cpp" />
-    <ClCompile Include="..\..\src\lua\graphics\luaopen_Image.cpp" />
-    <ClCompile Include="..\..\src\lua\graphics\luaopen_JSL.cpp" />
-    <ClCompile Include="..\..\src\lua\graphics\luaopen_Tilemap.cpp" />
-    <ClCompile Include="..\..\src\lua\keyboard\luaopen_keyboard.cpp" />
-    <ClCompile Include="..\..\src\lua\mouse\luaopen_mouse.cpp" />
-    <ClCompile Include="..\..\src\lua\luaopen_jin.cpp" />
-    <ClCompile Include="..\..\src\lua\net\luaopen_net.cpp" />
-    <ClCompile Include="..\..\src\lua\thread\luaopen_Thread.cpp" />
-    <ClCompile Include="..\..\src\lua\time\luaopen_time.cpp" />
+    <ClCompile Include="..\..\src\3rdparty\GLEE\GLee.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lapi.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lauxlib.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lbaselib.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lcode.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\ldblib.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\ldebug.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\ldo.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\ldump.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lfunc.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lgc.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\linit.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\liolib.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\llex.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lmathlib.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lmem.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\loadlib.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lobject.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lopcodes.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\loslib.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lparser.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lstate.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lstring.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lstrlib.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\ltable.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\ltablib.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\ltm.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lundump.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lvm.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\lzio.c" />
+    <ClCompile Include="..\..\src\3rdparty\lua51\print.c" />
+    <ClCompile Include="..\..\src\3rdparty\smount\smount.c" />
+    <ClCompile Include="..\..\src\3rdparty\stb\stb_vorbis.c" />
+    <ClCompile Include="..\..\src\3rdparty\tekcos\tekcos.c" />
+    <ClCompile Include="..\..\src\script\audio\luaopen_audio.cpp" />
+    <ClCompile Include="..\..\src\script\audio\luaopen_Sound.cpp" />
+    <ClCompile Include="..\..\src\script\core\luaopen_core.cpp" />
+    <ClCompile Include="..\..\src\script\debug\luaopen_debug.cpp" />
+    <ClCompile Include="..\..\src\script\event\luaopen_event.cpp" />
+    <ClCompile Include="..\..\src\script\filesystem\luaopen_filesystem.cpp" />
+    <ClCompile Include="..\..\src\script\graphics\luaopen_Canvas.cpp" />
+    <ClCompile Include="..\..\src\script\graphics\luaopen_Font.cpp" />
+    <ClCompile Include="..\..\src\script\graphics\luaopen_graphics.cpp" />
+    <ClCompile Include="..\..\src\script\graphics\luaopen_Image.cpp" />
+    <ClCompile Include="..\..\src\script\graphics\luaopen_JSL.cpp" />
+    <ClCompile Include="..\..\src\script\graphics\luaopen_Tilemap.cpp" />
+    <ClCompile Include="..\..\src\script\keyboard\luaopen_keyboard.cpp" />
+    <ClCompile Include="..\..\src\script\mouse\luaopen_mouse.cpp" />
+    <ClCompile Include="..\..\src\script\luaopen_jin.cpp" />
+    <ClCompile Include="..\..\src\script\net\luaopen_net.cpp" />
+    <ClCompile Include="..\..\src\script\thread\luaopen_Thread.cpp" />
+    <ClCompile Include="..\..\src\script\time\luaopen_time.cpp" />
     <ClCompile Include="..\..\src\main.cpp" />
-    <ClCompile Include="..\..\src\render\canvas.cpp" />
-    <ClCompile Include="..\..\src\render\drawable.cpp" />
-    <ClCompile Include="..\..\src\render\font.cpp" />
-    <ClCompile Include="..\..\src\render\graphics.cpp" />
-    <ClCompile Include="..\..\src\render\image.cpp" />
-    <ClCompile Include="..\..\src\render\jsl.cpp" />
-    <ClCompile Include="..\..\src\render\window.cpp" />
+    <ClCompile Include="..\..\src\libjin\render\canvas.cpp" />
+    <ClCompile Include="..\..\src\libjin\render\drawable.cpp" />
+    <ClCompile Include="..\..\src\libjin\render\font.cpp" />
+    <ClCompile Include="..\..\src\libjin\render\graphics.cpp" />
+    <ClCompile Include="..\..\src\libjin\render\image.cpp" />
+    <ClCompile Include="..\..\src\libjin\render\jsl.cpp" />
+    <ClCompile Include="..\..\src\libjin\render\window.cpp" />
     <ClCompile Include="..\..\src\utils\matrix.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\audio\audio.h" />
-    <ClInclude Include="..\..\src\core\game.h" />
-    <ClInclude Include="..\..\src\fs\buffer.h" />
-    <ClInclude Include="..\..\src\fs\filesystem.h" />
-    <ClInclude Include="..\..\src\input\event.h" />
-    <ClInclude Include="..\..\src\input\keyboard.h" />
-    <ClInclude Include="..\..\src\input\mouse.h" />
-    <ClInclude Include="..\..\src\libs\GLEE\GLee.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lapi.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lauxlib.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lcode.h" />
-    <ClInclude Include="..\..\src\libs\lua51\ldebug.h" />
-    <ClInclude Include="..\..\src\libs\lua51\ldo.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lfunc.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lgc.h" />
-    <ClInclude Include="..\..\src\libs\lua51\llex.h" />
-    <ClInclude Include="..\..\src\libs\lua51\llimits.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lmem.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lobject.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lopcodes.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lparser.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lstate.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lstring.h" />
-    <ClInclude Include="..\..\src\libs\lua51\ltable.h" />
-    <ClInclude Include="..\..\src\libs\lua51\ltm.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lua.h" />
-    <ClInclude Include="..\..\src\libs\lua51\luaconf.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lualib.h" />
-    <ClInclude Include="..\..\src\libs\lua51\luax.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lundump.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lvm.h" />
-    <ClInclude Include="..\..\src\libs\lua51\lzio.h" />
-    <ClInclude Include="..\..\src\libs\luax\luax.h" />
-    <ClInclude Include="..\..\src\libs\smount\dirent.h" />
-    <ClInclude Include="..\..\src\libs\smount\smount.h" />
-    <ClInclude Include="..\..\src\libs\stb\stb_image.h" />
-    <ClInclude Include="..\..\src\libs\stb\stb_truetype.h" />
-    <ClInclude Include="..\..\src\libs\tekcos\tekcos.h" />
-    <ClInclude Include="..\..\src\lua\embed\debug.lua.h" />
-    <ClInclude Include="..\..\src\lua\embed\embed.h" />
-    <ClInclude Include="..\..\src\lua\embed\graphics.lua.h" />
-    <ClInclude Include="..\..\src\lua\embed\boot.lua.h" />
-    <ClInclude Include="..\..\src\lua\embed\keyboard.lua.h" />
-    <ClInclude Include="..\..\src\lua\embed\mouse.lua.h" />
-    <ClInclude Include="..\..\src\lua\embed\path.lua.h" />
-    <ClInclude Include="..\..\src\lua\luaopen_jin.h" />
-    <ClInclude Include="..\..\src\lua\luaopen_types.h" />
-    <ClInclude Include="..\..\src\net\net.h" />
-    <ClInclude Include="..\..\src\render\canvas.h" />
-    <ClInclude Include="..\..\src\render\color.h" />
-    <ClInclude Include="..\..\src\render\drawable.h" />
-    <ClInclude Include="..\..\src\render\font.h" />
-    <ClInclude Include="..\..\src\render\graphics.h" />
-    <ClInclude Include="..\..\src\render\image.h" />
-    <ClInclude Include="..\..\src\render\jsl.h" />
-    <ClInclude Include="..\..\src\render\quad.h" />
-    <ClInclude Include="..\..\src\render\window.h" />
+    <ClInclude Include="..\..\src\libjin\audio\audio.h" />
+    <ClInclude Include="..\..\src\libjin\core\game.h" />
+    <ClInclude Include="..\..\src\libjin\fs\buffer.h" />
+    <ClInclude Include="..\..\src\libjin\fs\filesystem.h" />
+    <ClInclude Include="..\..\src\libjin\input\event.h" />
+    <ClInclude Include="..\..\src\libjin\input\keyboard.h" />
+    <ClInclude Include="..\..\src\libjin\input\mouse.h" />
+    <ClInclude Include="..\..\src\3rdparty\GLEE\GLee.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lapi.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lauxlib.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lcode.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\ldebug.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\ldo.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lfunc.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lgc.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\llex.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\llimits.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lmem.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lobject.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lopcodes.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lparser.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lstate.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lstring.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\ltable.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\ltm.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lua.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\luaconf.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lualib.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\luax.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lundump.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lvm.h" />
+    <ClInclude Include="..\..\src\3rdparty\lua51\lzio.h" />
+    <ClInclude Include="..\..\src\3rdparty\luax\luax.h" />
+    <ClInclude Include="..\..\src\3rdparty\smount\dirent.h" />
+    <ClInclude Include="..\..\src\3rdparty\smount\smount.h" />
+    <ClInclude Include="..\..\src\3rdparty\stb\stb_image.h" />
+    <ClInclude Include="..\..\src\3rdparty\stb\stb_truetype.h" />
+    <ClInclude Include="..\..\src\3rdparty\tekcos\tekcos.h" />
+    <ClInclude Include="..\..\src\script\embed\debug.lua.h" />
+    <ClInclude Include="..\..\src\script\embed\embed.h" />
+    <ClInclude Include="..\..\src\script\embed\graphics.lua.h" />
+    <ClInclude Include="..\..\src\script\embed\boot.lua.h" />
+    <ClInclude Include="..\..\src\script\embed\keyboard.lua.h" />
+    <ClInclude Include="..\..\src\script\embed\mouse.lua.h" />
+    <ClInclude Include="..\..\src\script\embed\path.lua.h" />
+    <ClInclude Include="..\..\src\script\luaopen_jin.h" />
+    <ClInclude Include="..\..\src\script\luaopen_types.h" />
+    <ClInclude Include="..\..\src\libjin\net\net.h" />
+    <ClInclude Include="..\..\src\libjin\render\canvas.h" />
+    <ClInclude Include="..\..\src\libjin\render\color.h" />
+    <ClInclude Include="..\..\src\libjin\render\drawable.h" />
+    <ClInclude Include="..\..\src\libjin\render\font.h" />
+    <ClInclude Include="..\..\src\libjin\render\graphics.h" />
+    <ClInclude Include="..\..\src\libjin\render\image.h" />
+    <ClInclude Include="..\..\src\libjin\render\jsl.h" />
+    <ClInclude Include="..\..\src\libjin\render\quad.h" />
+    <ClInclude Include="..\..\src\libjin\render\window.h" />
     <ClInclude Include="..\..\src\res\font.ttf.h" />
     <ClInclude Include="..\..\src\res\icon.png.h" />
     <ClInclude Include="..\..\src\utils\endian.h" />
@@ -277,13 +277,13 @@
     <Image Include="..\..\src\res\icon.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\src\libs\lua51\Makefile" />
-    <None Include="..\..\src\lua\embed\debug.lua" />
-    <None Include="..\..\src\lua\embed\graphics.lua" />
-    <None Include="..\..\src\lua\embed\boot.lua" />
-    <None Include="..\..\src\lua\embed\keyboard.lua" />
-    <None Include="..\..\src\lua\embed\mouse.lua" />
-    <None Include="..\..\src\lua\embed\path.lua" />
+    <None Include="..\..\src\3rdparty\lua51\Makefile" />
+    <None Include="..\..\src\script\embed\debug.lua" />
+    <None Include="..\..\src\script\embed\graphics.lua" />
+    <None Include="..\..\src\script\embed\boot.lua" />
+    <None Include="..\..\src\script\embed\keyboard.lua" />
+    <None Include="..\..\src\script\embed\mouse.lua" />
+    <None Include="..\..\src\script\embed\path.lua" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/build/vs2015/jin.vcxproj.filters b/build/vs2015/jin.vcxproj.filters
index 704c1c6..6f376a0 100644
--- a/build/vs2015/jin.vcxproj.filters
+++ b/build/vs2015/jin.vcxproj.filters
@@ -4,22 +4,25 @@
     <Filter Include="src">
       <UniqueIdentifier>{f3e85b81-1688-49e4-b85c-65d99ddafad9}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\audio">
+	<Filter Include="src\libjin">
+      <UniqueIdentifier>{f3e85b81-1688-49e4-b85c-65d99ddafad0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\libjin\audio">
       <UniqueIdentifier>{4e3c38b2-8076-4927-993d-e59607d4256a}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\core">
+    <Filter Include="src\libjin\core">
       <UniqueIdentifier>{7467bc99-3a63-4b92-b3ab-b5a3d86ead1b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\input">
+    <Filter Include="src\libjin\input">
       <UniqueIdentifier>{14253521-dbe9-4289-b100-47b4deb41331}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\libs">
+    <Filter Include="src\3rdparty">
       <UniqueIdentifier>{269451af-b8e9-451f-940a-9b679e6116d3}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\net">
+    <Filter Include="src\libjin\net">
       <UniqueIdentifier>{fe12237c-986f-42f3-86d9-1fe848e1e058}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\render">
+    <Filter Include="src\libjin\render">
       <UniqueIdentifier>{23033979-4942-4f08-8a1d-ecc0dec442b5}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\res">
@@ -28,67 +31,67 @@
     <Filter Include="src\utils">
       <UniqueIdentifier>{e9abe7cb-bbbf-4315-a9ab-285b52efa3b7}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\libs\GLee">
+    <Filter Include="src\3rdparty\GLee">
       <UniqueIdentifier>{43dc399e-6dc9-4997-9a64-130e48c1c041}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\libs\stb">
+    <Filter Include="src\3rdparty\stb">
       <UniqueIdentifier>{36e4150d-c477-47c1-a317-ea65f6f64b5c}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\libs\lua51">
+    <Filter Include="src\3rdparty\lua51">
       <UniqueIdentifier>{5b7e6bcc-7957-4d7e-b660-d260726da1c9}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\fs">
+    <Filter Include="src\libjin\fs">
       <UniqueIdentifier>{bb4a9832-a45a-445d-8199-80d3e97f9415}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\libs\luax">
+    <Filter Include="src\3rdparty\luax">
       <UniqueIdentifier>{93b29ece-8318-4b20-a65d-2e79c1a2f816}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua">
+    <Filter Include="src\script">
       <UniqueIdentifier>{e082b09b-1cdc-4c21-967b-eaf7130cf620}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\embed">
+    <Filter Include="src\script\embed">
       <UniqueIdentifier>{cb6d9d4e-046b-44c7-b00a-c316e87e035c}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\libs\smount">
+    <Filter Include="src\3rdparty\smount">
       <UniqueIdentifier>{dd79db1e-9bec-4f8e-8d37-0d82c74a534b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\core">
+    <Filter Include="src\script\core">
       <UniqueIdentifier>{b13ee8dc-41fc-42b3-8b64-f9c261ebfc73}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\graphics">
+    <Filter Include="src\script\graphics">
       <UniqueIdentifier>{1ed523c3-e203-487f-a13f-a35396f814f3}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\audio">
+    <Filter Include="src\script\audio">
       <UniqueIdentifier>{4eb54d6d-e336-42f6-8670-d271a458eb56}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\event">
+    <Filter Include="src\script\event">
       <UniqueIdentifier>{8a740640-925a-4cf6-94d5-89283824a141}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\keyboard">
+    <Filter Include="src\script\keyboard">
       <UniqueIdentifier>{2a701538-aeee-4f48-a285-0b848c9a3b81}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\mouse">
+    <Filter Include="src\script\mouse">
       <UniqueIdentifier>{5b69329e-0aa2-4c77-be52-69c09fdbac65}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\debug">
+    <Filter Include="src\script\debug">
       <UniqueIdentifier>{0280790b-7c7a-406d-8606-b39c944fefaa}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\filesystem">
+    <Filter Include="src\script\filesystem">
       <UniqueIdentifier>{563ed6fb-3d82-4905-b128-835f3818cc4f}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\net">
+    <Filter Include="src\script\net">
       <UniqueIdentifier>{6b79b5bf-69c1-458c-81f3-b386b340d39b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\time">
+    <Filter Include="src\script\time">
       <UniqueIdentifier>{ee920041-8798-4827-be04-49f9342ba092}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\libs\tekcos">
+    <Filter Include="src\3rdparty\tekcos">
       <UniqueIdentifier>{065bf16a-223d-4aae-ab0b-c7b5af5e3596}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\thread">
+    <Filter Include="src\script\thread">
       <UniqueIdentifier>{7957774a-4f34-4255-ab2e-8da9b6c71983}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\embed\script">
+    <Filter Include="src\script\embed\script">
       <UniqueIdentifier>{1b7a28ed-7715-48bc-8793-6e575e887f77}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
@@ -96,331 +99,331 @@
     <ClCompile Include="..\..\src\main.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\GLEE\GLee.c">
-      <Filter>src\libs\GLee</Filter>
+    <ClCompile Include="..\..\src\3rdparty\GLEE\GLee.c">
+      <Filter>src\3rdparty\GLee</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\lapi.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\lapi.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\lauxlib.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\lauxlib.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\lbaselib.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\lbaselib.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\lcode.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\lcode.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\ldblib.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\ldblib.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\ldebug.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\ldebug.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\ldo.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\ldo.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\ldump.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\ldump.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\lfunc.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\lfunc.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\lgc.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\lgc.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\linit.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\linit.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\liolib.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\liolib.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\llex.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\llex.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\lmathlib.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\lmathlib.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\lmem.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\lmem.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\loadlib.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\loadlib.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\lobject.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\lobject.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\lopcodes.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\lopcodes.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\loslib.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\loslib.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\lparser.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\lparser.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\lstate.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\lstate.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\lstring.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\lstring.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\lstrlib.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\lstrlib.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\ltable.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\ltable.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\ltablib.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\ltablib.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\ltm.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\ltm.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\lundump.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\lundump.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\lvm.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\lvm.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\lzio.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\lzio.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\lua51\print.c">
-      <Filter>src\libs\lua51</Filter>
+    <ClCompile Include="..\..\src\3rdparty\lua51\print.c">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\stb\stb_vorbis.c">
-      <Filter>src\libs\stb</Filter>
+    <ClCompile Include="..\..\src\3rdparty\stb\stb_vorbis.c">
+      <Filter>src\3rdparty\stb</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\jinc.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\render\canvas.cpp">
-      <Filter>src\render</Filter>
+    <ClCompile Include="..\..\src\libjin\render\canvas.cpp">
+      <Filter>src\libjin\render</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\render\font.cpp">
-      <Filter>src\render</Filter>
+    <ClCompile Include="..\..\src\libjin\render\font.cpp">
+      <Filter>src\libjin\render</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\render\graphics.cpp">
-      <Filter>src\render</Filter>
+    <ClCompile Include="..\..\src\libjin\render\graphics.cpp">
+      <Filter>src\libjin\render</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\render\image.cpp">
-      <Filter>src\render</Filter>
+    <ClCompile Include="..\..\src\libjin\render\image.cpp">
+      <Filter>src\libjin\render</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\input\event.cpp">
-      <Filter>src\input</Filter>
+    <ClCompile Include="..\..\src\libjin\input\event.cpp">
+      <Filter>src\libjin\input</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\input\mouse.cpp">
-      <Filter>src\input</Filter>
+    <ClCompile Include="..\..\src\libjin\input\mouse.cpp">
+      <Filter>src\libjin\input</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\input\keyboard.cpp">
-      <Filter>src\input</Filter>
+    <ClCompile Include="..\..\src\libjin\input\keyboard.cpp">
+      <Filter>src\libjin\input</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\render\jsl.cpp">
-      <Filter>src\render</Filter>
+    <ClCompile Include="..\..\src\libjin\render\jsl.cpp">
+      <Filter>src\libjin\render</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\render\window.cpp">
-      <Filter>src\render</Filter>
+    <ClCompile Include="..\..\src\libjin\render\window.cpp">
+      <Filter>src\libjin\render</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\core\game.cpp">
-      <Filter>src\core</Filter>
+    <ClCompile Include="..\..\src\libjin\core\game.cpp">
+      <Filter>src\libjin\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\render\drawable.cpp">
-      <Filter>src\render</Filter>
+    <ClCompile Include="..\..\src\libjin\render\drawable.cpp">
+      <Filter>src\libjin\render</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\utils\matrix.cpp">
       <Filter>src\utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\fs\filesystem.cpp">
-      <Filter>src\fs</Filter>
+    <ClCompile Include="..\..\src\libjin\fs\filesystem.cpp">
+      <Filter>src\libjin\fs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\smount\smount.c">
-      <Filter>src\libs\smount</Filter>
+    <ClCompile Include="..\..\src\3rdparty\smount\smount.c">
+      <Filter>src\3rdparty\smount</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\audio\audio.cpp">
-      <Filter>src\audio</Filter>
+    <ClCompile Include="..\..\src\libjin\audio\audio.cpp">
+      <Filter>src\libjin\audio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\libs\tekcos\tekcos.c">
-      <Filter>src\libs\tekcos</Filter>
+    <ClCompile Include="..\..\src\3rdparty\tekcos\tekcos.c">
+      <Filter>src\3rdparty\tekcos</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\audio\luaopen_audio.cpp">
-      <Filter>src\lua\audio</Filter>
+    <ClCompile Include="..\..\src\script\audio\luaopen_audio.cpp">
+      <Filter>src\script\audio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\audio\luaopen_Sound.cpp">
-      <Filter>src\lua\audio</Filter>
+    <ClCompile Include="..\..\src\script\audio\luaopen_Sound.cpp">
+      <Filter>src\script\audio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\core\luaopen_core.cpp">
-      <Filter>src\lua\core</Filter>
+    <ClCompile Include="..\..\src\script\core\luaopen_core.cpp">
+      <Filter>src\script\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\debug\luaopen_debug.cpp">
-      <Filter>src\lua\debug</Filter>
+    <ClCompile Include="..\..\src\script\debug\luaopen_debug.cpp">
+      <Filter>src\script\debug</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\event\luaopen_event.cpp">
-      <Filter>src\lua\event</Filter>
+    <ClCompile Include="..\..\src\script\event\luaopen_event.cpp">
+      <Filter>src\script\event</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\filesystem\luaopen_filesystem.cpp">
-      <Filter>src\lua\filesystem</Filter>
+    <ClCompile Include="..\..\src\script\filesystem\luaopen_filesystem.cpp">
+      <Filter>src\script\filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\graphics\luaopen_Canvas.cpp">
-      <Filter>src\lua\graphics</Filter>
+    <ClCompile Include="..\..\src\script\graphics\luaopen_Canvas.cpp">
+      <Filter>src\script\graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\graphics\luaopen_Font.cpp">
-      <Filter>src\lua\graphics</Filter>
+    <ClCompile Include="..\..\src\script\graphics\luaopen_Font.cpp">
+      <Filter>src\script\graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\graphics\luaopen_graphics.cpp">
-      <Filter>src\lua\graphics</Filter>
+    <ClCompile Include="..\..\src\script\graphics\luaopen_graphics.cpp">
+      <Filter>src\script\graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\graphics\luaopen_Image.cpp">
-      <Filter>src\lua\graphics</Filter>
+    <ClCompile Include="..\..\src\script\graphics\luaopen_Image.cpp">
+      <Filter>src\script\graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\graphics\luaopen_JSL.cpp">
-      <Filter>src\lua\graphics</Filter>
+    <ClCompile Include="..\..\src\script\graphics\luaopen_JSL.cpp">
+      <Filter>src\script\graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\keyboard\luaopen_keyboard.cpp">
-      <Filter>src\lua\keyboard</Filter>
+    <ClCompile Include="..\..\src\script\keyboard\luaopen_keyboard.cpp">
+      <Filter>src\script\keyboard</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\mouse\luaopen_mouse.cpp">
-      <Filter>src\lua\mouse</Filter>
+    <ClCompile Include="..\..\src\script\mouse\luaopen_mouse.cpp">
+      <Filter>src\script\mouse</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\net\luaopen_net.cpp">
-      <Filter>src\lua\net</Filter>
+    <ClCompile Include="..\..\src\script\net\luaopen_net.cpp">
+      <Filter>src\script\net</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\time\luaopen_time.cpp">
-      <Filter>src\lua\time</Filter>
+    <ClCompile Include="..\..\src\script\time\luaopen_time.cpp">
+      <Filter>src\script\time</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\luaopen_jin.cpp">
-      <Filter>src\lua</Filter>
+    <ClCompile Include="..\..\src\script\luaopen_jin.cpp">
+      <Filter>src\script</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\thread\luaopen_Thread.cpp">
-      <Filter>src\lua\thread</Filter>
+    <ClCompile Include="..\..\src\script\thread\luaopen_Thread.cpp">
+      <Filter>src\script\thread</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\graphics\luaopen_Tilemap.cpp">
-      <Filter>src\lua\graphics</Filter>
+    <ClCompile Include="..\..\src\script\graphics\luaopen_Tilemap.cpp">
+      <Filter>src\script\graphics</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\libs\GLEE\GLee.h">
-      <Filter>src\libs\GLee</Filter>
+    <ClInclude Include="..\..\src\3rdparty\GLEE\GLee.h">
+      <Filter>src\3rdparty\GLee</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\lua51\lapi.h">
-      <Filter>src\libs\lua51</Filter>
+    <ClInclude Include="..\..\src\3rdparty\lua51\lapi.h">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\lua51\lauxlib.h">
-      <Filter>src\libs\lua51</Filter>
+    <ClInclude Include="..\..\src\3rdparty\lua51\lauxlib.h">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\lua51\lcode.h">
-      <Filter>src\libs\lua51</Filter>
+    <ClInclude Include="..\..\src\3rdparty\lua51\lcode.h">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\lua51\ldebug.h">
-      <Filter>src\libs\lua51</Filter>
+    <ClInclude Include="..\..\src\3rdparty\lua51\ldebug.h">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\lua51\ldo.h">
-      <Filter>src\libs\lua51</Filter>
+    <ClInclude Include="..\..\src\3rdparty\lua51\ldo.h">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\lua51\lfunc.h">
-      <Filter>src\libs\lua51</Filter>
+    <ClInclude Include="..\..\src\3rdparty\lua51\lfunc.h">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\lua51\lgc.h">
-      <Filter>src\libs\lua51</Filter>
+    <ClInclude Include="..\..\src\3rdparty\lua51\lgc.h">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\lua51\llex.h">
-      <Filter>src\libs\lua51</Filter>
+    <ClInclude Include="..\..\src\3rdparty\lua51\llex.h">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\lua51\llimits.h">
-      <Filter>src\libs\lua51</Filter>
+    <ClInclude Include="..\..\src\3rdparty\lua51\llimits.h">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\lua51\lmem.h">
-      <Filter>src\libs\lua51</Filter>
+    <ClInclude Include="..\..\src\3rdparty\lua51\lmem.h">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\lua51\lobject.h">
-      <Filter>src\libs\lua51</Filter>
+    <ClInclude Include="..\..\src\3rdparty\lua51\lobject.h">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\lua51\lopcodes.h">
-      <Filter>src\libs\lua51</Filter>
+    <ClInclude Include="..\..\src\3rdparty\lua51\lopcodes.h">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\lua51\lparser.h">
-      <Filter>src\libs\lua51</Filter>
+    <ClInclude Include="..\..\src\3rdparty\lua51\lparser.h">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\lua51\lstate.h">
-      <Filter>src\libs\lua51</Filter>
+    <ClInclude Include="..\..\src\3rdparty\lua51\lstate.h">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\lua51\lstring.h">
-      <Filter>src\libs\lua51</Filter>
+    <ClInclude Include="..\..\src\3rdparty\lua51\lstring.h">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\lua51\ltable.h">
-      <Filter>src\libs\lua51</Filter>
+    <ClInclude Include="..\..\src\3rdparty\lua51\ltable.h">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\lua51\ltm.h">
-      <Filter>src\libs\lua51</Filter>
+    <ClInclude Include="..\..\src\3rdparty\lua51\ltm.h">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\lua51\lua.h">
-      <Filter>src\libs\lua51</Filter>
+    <ClInclude Include="..\..\src\3rdparty\lua51\lua.h">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\lua51\luaconf.h">
-      <Filter>src\libs\lua51</Filter>
+    <ClInclude Include="..\..\src\3rdparty\lua51\luaconf.h">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\lua51\lualib.h">
-      <Filter>src\libs\lua51</Filter>
+    <ClInclude Include="..\..\src\3rdparty\lua51\lualib.h">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\lua51\lundump.h">
-      <Filter>src\libs\lua51</Filter>
+    <ClInclude Include="..\..\src\3rdparty\lua51\lundump.h">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\lua51\lvm.h">
-      <Filter>src\libs\lua51</Filter>
+    <ClInclude Include="..\..\src\3rdparty\lua51\lvm.h">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\lua51\lzio.h">
-      <Filter>src\libs\lua51</Filter>
+    <ClInclude Include="..\..\src\3rdparty\lua51\lzio.h">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\stb\stb_image.h">
-      <Filter>src\libs\stb</Filter>
+    <ClInclude Include="..\..\src\3rdparty\stb\stb_image.h">
+      <Filter>src\3rdparty\stb</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\render\canvas.h">
-      <Filter>src\render</Filter>
+    <ClInclude Include="..\..\src\libjin\render\canvas.h">
+      <Filter>src\libjin\render</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\render\color.h">
-      <Filter>src\render</Filter>
+    <ClInclude Include="..\..\src\libjin\render\color.h">
+      <Filter>src\libjin\render</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\render\drawable.h">
-      <Filter>src\render</Filter>
+    <ClInclude Include="..\..\src\libjin\render\drawable.h">
+      <Filter>src\libjin\render</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\render\graphics.h">
-      <Filter>src\render</Filter>
+    <ClInclude Include="..\..\src\libjin\render\graphics.h">
+      <Filter>src\libjin\render</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\render\image.h">
-      <Filter>src\render</Filter>
+    <ClInclude Include="..\..\src\libjin\render\image.h">
+      <Filter>src\libjin\render</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\input\event.h">
-      <Filter>src\input</Filter>
+    <ClInclude Include="..\..\src\libjin\input\event.h">
+      <Filter>src\libjin\input</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\input\mouse.h">
-      <Filter>src\input</Filter>
+    <ClInclude Include="..\..\src\libjin\input\mouse.h">
+      <Filter>src\libjin\input</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\input\keyboard.h">
-      <Filter>src\input</Filter>
+    <ClInclude Include="..\..\src\libjin\input\keyboard.h">
+      <Filter>src\libjin\input</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\render\jsl.h">
-      <Filter>src\render</Filter>
+    <ClInclude Include="..\..\src\libjin\render\jsl.h">
+      <Filter>src\libjin\render</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\render\font.h">
-      <Filter>src\render</Filter>
+    <ClInclude Include="..\..\src\libjin\render\font.h">
+      <Filter>src\libjin\render</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\stb\stb_truetype.h">
-      <Filter>src\libs\stb</Filter>
+    <ClInclude Include="..\..\src\3rdparty\stb\stb_truetype.h">
+      <Filter>src\3rdparty\stb</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\utils\utils.h">
       <Filter>src\utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\lua51\luax.h">
-      <Filter>src\libs\lua51</Filter>
+    <ClInclude Include="..\..\src\3rdparty\lua51\luax.h">
+      <Filter>src\3rdparty\lua51</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\luax\luax.h">
-      <Filter>src\libs\luax</Filter>
+    <ClInclude Include="..\..\src\3rdparty\luax\luax.h">
+      <Filter>src\3rdparty\luax</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\render\window.h">
-      <Filter>src\render</Filter>
+    <ClInclude Include="..\..\src\libjin\render\window.h">
+      <Filter>src\libjin\render</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\core\game.h">
-      <Filter>src\core</Filter>
+    <ClInclude Include="..\..\src\libjin\core\game.h">
+      <Filter>src\libjin\core</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\utils\matrix.h">
       <Filter>src\utils</Filter>
@@ -431,23 +434,23 @@
     <ClInclude Include="..\..\src\utils\math.h">
       <Filter>src\utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\lua\embed\debug.lua.h">
-      <Filter>src\lua\embed</Filter>
+    <ClInclude Include="..\..\src\script\embed\debug.lua.h">
+      <Filter>src\script\embed</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\lua\embed\graphics.lua.h">
-      <Filter>src\lua\embed</Filter>
+    <ClInclude Include="..\..\src\script\embed\graphics.lua.h">
+      <Filter>src\script\embed</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\lua\embed\keyboard.lua.h">
-      <Filter>src\lua\embed</Filter>
+    <ClInclude Include="..\..\src\script\embed\keyboard.lua.h">
+      <Filter>src\script\embed</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\lua\embed\embed.h">
-      <Filter>src\lua\embed</Filter>
+    <ClInclude Include="..\..\src\script\embed\embed.h">
+      <Filter>src\script\embed</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\lua\embed\boot.lua.h">
-      <Filter>src\lua\embed</Filter>
+    <ClInclude Include="..\..\src\script\embed\boot.lua.h">
+      <Filter>src\script\embed</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\lua\embed\mouse.lua.h">
-      <Filter>src\lua\embed</Filter>
+    <ClInclude Include="..\..\src\script\embed\mouse.lua.h">
+      <Filter>src\script\embed</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\res\font.ttf.h">
       <Filter>src\res</Filter>
@@ -455,38 +458,38 @@
     <ClInclude Include="..\..\src\res\icon.png.h">
       <Filter>src\res</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\lua\embed\path.lua.h">
-      <Filter>src\lua\embed</Filter>
+    <ClInclude Include="..\..\src\script\embed\path.lua.h">
+      <Filter>src\script\embed</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\fs\buffer.h">
-      <Filter>src\fs</Filter>
+    <ClInclude Include="..\..\src\libjin\fs\buffer.h">
+      <Filter>src\libjin\fs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\render\quad.h">
-      <Filter>src\render</Filter>
+    <ClInclude Include="..\..\src\libjin\render\quad.h">
+      <Filter>src\libjin\render</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\fs\filesystem.h">
-      <Filter>src\fs</Filter>
+    <ClInclude Include="..\..\src\libjin\fs\filesystem.h">
+      <Filter>src\libjin\fs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\smount\smount.h">
-      <Filter>src\libs\smount</Filter>
+    <ClInclude Include="..\..\src\3rdparty\smount\smount.h">
+      <Filter>src\3rdparty\smount</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\smount\dirent.h">
-      <Filter>src\libs\smount</Filter>
+    <ClInclude Include="..\..\src\3rdparty\smount\dirent.h">
+      <Filter>src\3rdparty\smount</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\audio\audio.h">
-      <Filter>src\audio</Filter>
+    <ClInclude Include="..\..\src\libjin\audio\audio.h">
+      <Filter>src\libjin\audio</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\net\net.h">
-      <Filter>src\net</Filter>
+    <ClInclude Include="..\..\src\libjin\net\net.h">
+      <Filter>src\libjin\net</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libs\tekcos\tekcos.h">
-      <Filter>src\libs\tekcos</Filter>
+    <ClInclude Include="..\..\src\3rdparty\tekcos\tekcos.h">
+      <Filter>src\3rdparty\tekcos</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\lua\luaopen_jin.h">
-      <Filter>src\lua</Filter>
+    <ClInclude Include="..\..\src\script\luaopen_jin.h">
+      <Filter>src\script</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\lua\luaopen_types.h">
-      <Filter>src\lua</Filter>
+    <ClInclude Include="..\..\src\script\luaopen_types.h">
+      <Filter>src\script</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\utils\macros.h">
       <Filter>src\utils</Filter>
@@ -503,26 +506,26 @@
     </Image>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\src\libs\lua51\Makefile">
-      <Filter>src\libs\lua51</Filter>
+    <None Include="..\..\src\3rdparty\lua51\Makefile">
+      <Filter>src\3rdparty\lua51</Filter>
     </None>
-    <None Include="..\..\src\lua\embed\boot.lua">
-      <Filter>src\lua\embed\script</Filter>
+    <None Include="..\..\src\script\embed\boot.lua">
+      <Filter>src\script\embed\script</Filter>
     </None>
-    <None Include="..\..\src\lua\embed\debug.lua">
-      <Filter>src\lua\embed\script</Filter>
+    <None Include="..\..\src\script\embed\debug.lua">
+      <Filter>src\script\embed\script</Filter>
     </None>
-    <None Include="..\..\src\lua\embed\graphics.lua">
-      <Filter>src\lua\embed\script</Filter>
+    <None Include="..\..\src\script\embed\graphics.lua">
+      <Filter>src\script\embed\script</Filter>
     </None>
-    <None Include="..\..\src\lua\embed\keyboard.lua">
-      <Filter>src\lua\embed\script</Filter>
+    <None Include="..\..\src\script\embed\keyboard.lua">
+      <Filter>src\script\embed\script</Filter>
     </None>
-    <None Include="..\..\src\lua\embed\mouse.lua">
-      <Filter>src\lua\embed\script</Filter>
+    <None Include="..\..\src\script\embed\mouse.lua">
+      <Filter>src\script\embed\script</Filter>
     </None>
-    <None Include="..\..\src\lua\embed\path.lua">
-      <Filter>src\lua\embed\script</Filter>
+    <None Include="..\..\src\script\embed\path.lua">
+      <Filter>src\script\embed\script</Filter>
     </None>
   </ItemGroup>
 </Project>
\ No newline at end of file