From 65bafdc682db46f0f115374ad39f1fbc348832ac Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Mon, 20 Aug 2018 11:51:32 +0800
Subject: *update

---
 build/vs2015/jin.vcxproj         |  70 ++++-----
 build/vs2015/jin.vcxproj.filters | 303 ++++++++++++++++++++-------------------
 2 files changed, 188 insertions(+), 185 deletions(-)

(limited to 'build')

diff --git a/build/vs2015/jin.vcxproj b/build/vs2015/jin.vcxproj
index 1fe13f3..1a2e96e 100644
--- a/build/vs2015/jin.vcxproj
+++ b/build/vs2015/jin.vcxproj
@@ -172,32 +172,31 @@
     <ClCompile Include="..\..\src\libjin\Time\Timer.cpp" />
     <ClCompile Include="..\..\src\libjin\Utils\Log.cpp" />
     <ClCompile Include="..\..\src\libjin\Utils\unittest.cpp" />
-    <ClCompile Include="..\..\src\lua\audio\luaopen_audio.cpp" />
-    <ClCompile Include="..\..\src\lua\audio\luaopen_Source.cpp" />
-    <ClCompile Include="..\..\src\lua\bit\luaopen_bit.cpp" />
-    <ClCompile Include="..\..\src\lua\core\luaopen_core.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\joypad\luaopen_joypad.cpp" />
-    <ClCompile Include="..\..\src\lua\keyboard\luaopen_keyboard.cpp" />
-    <ClCompile Include="..\..\src\lua\math\luaopen_math.cpp" />
-    <ClCompile Include="..\..\src\lua\mouse\luaopen_mouse.cpp" />
-    <ClCompile Include="..\..\src\lua\luaopen_jin.cpp" />
-    <ClCompile Include="..\..\src\lua\net\luaopen_Buffer.cpp" />
-    <ClCompile Include="..\..\src\lua\net\luaopen_net.cpp" />
-    <ClCompile Include="..\..\src\lua\net\luaopen_Socket.cpp" />
-    <ClCompile Include="..\..\src\lua\thread\luaopen_thread.cpp" />
-    <ClCompile Include="..\..\src\lua\time\luaopen_time.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\audio\luaopen_audio.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\audio\luaopen_Source.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\bit\luaopen_bit.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\core\luaopen_core.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\event\luaopen_event.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\filesystem\luaopen_filesystem.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\graphics\luaopen_Canvas.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\graphics\luaopen_Font.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\graphics\luaopen_graphics.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\graphics\luaopen_Image.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\graphics\luaopen_JSL.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\joypad\luaopen_joypad.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\keyboard\luaopen_keyboard.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\luaopen_jin.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\math\luaopen_math.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\mouse\luaopen_mouse.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\net\luaopen_Buffer.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\net\luaopen_net.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\net\luaopen_Socket.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\thread\luaopen_thread.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\thread\Thread.cpp" />
+    <ClCompile Include="..\..\src\lua\modules\time\luaopen_time.cpp" />
     <ClCompile Include="..\..\src\main.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\data\font.ttf.h" />
-    <ClInclude Include="..\..\src\data\icon.png.h" />
     <ClInclude Include="..\..\src\libjin\3rdparty\GLee\GLee.h" />
     <ClInclude Include="..\..\src\libjin\3rdparty\smount\dirent.h" />
     <ClInclude Include="..\..\src\libjin\3rdparty\smount\smount.h" />
@@ -220,7 +219,6 @@
     <ClInclude Include="..\..\src\libjin\Debug\Log.h" />
     <ClInclude Include="..\..\src\libjin\Filesystem\Buffer.h" />
     <ClInclude Include="..\..\src\libjin\Filesystem\Filesystem.h" />
-    <ClInclude Include="..\..\src\3rdparty\luax\luax.h" />
     <ClInclude Include="..\..\src\libjin\Graphics\Canvas.h" />
     <ClInclude Include="..\..\src\libjin\Graphics\Color.h" />
     <ClInclude Include="..\..\src\libjin\Graphics\Drawable.h" />
@@ -260,17 +258,19 @@
     <ClInclude Include="..\..\src\lua\common\Proxy.h" />
     <ClInclude Include="..\..\src\lua\common\Reference.hpp" />
     <ClInclude Include="..\..\src\lua\common\types.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\net.lua.h" />
-    <ClInclude Include="..\..\src\lua\embed\path.lua.h" />
-    <ClInclude Include="..\..\src\lua\luaopen_jin.h" />
-    <ClInclude Include="..\..\src\lua\luax.h" />
-    <ClInclude Include="..\..\src\lua\net\Buffer.h" />
-    <ClInclude Include="..\..\src\lua\thread\Thread.h" />
+    <ClInclude Include="..\..\src\lua\libraries\luax\luax.h" />
+    <ClInclude Include="..\..\src\lua\modules\embed\boot.lua.h" />
+    <ClInclude Include="..\..\src\lua\modules\embed\embed.h" />
+    <ClInclude Include="..\..\src\lua\modules\embed\graphics.lua.h" />
+    <ClInclude Include="..\..\src\lua\modules\embed\keyboard.lua.h" />
+    <ClInclude Include="..\..\src\lua\modules\embed\mouse.lua.h" />
+    <ClInclude Include="..\..\src\lua\modules\embed\net.lua.h" />
+    <ClInclude Include="..\..\src\lua\modules\embed\path.lua.h" />
+    <ClInclude Include="..\..\src\lua\modules\luaopen_jin.h" />
+    <ClInclude Include="..\..\src\lua\modules\luax.h" />
+    <ClInclude Include="..\..\src\lua\modules\net\Buffer.h" />
+    <ClInclude Include="..\..\src\lua\modules\thread\Thread.h" />
+    <ClInclude Include="..\..\src\lua\resources\font.ttf.h" />
     <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/build/vs2015/jin.vcxproj.filters b/build/vs2015/jin.vcxproj.filters
index 5454445..32ab217 100644
--- a/build/vs2015/jin.vcxproj.filters
+++ b/build/vs2015/jin.vcxproj.filters
@@ -7,54 +7,9 @@
     <Filter Include="src\libjin">
       <UniqueIdentifier>{f3e85b81-1688-49e4-b85c-65d99ddafad0}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\3rdparty">
-      <UniqueIdentifier>{269451af-b8e9-451f-940a-9b679e6116d3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\3rdparty\luax">
-      <UniqueIdentifier>{93b29ece-8318-4b20-a65d-2e79c1a2f816}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\lua">
       <UniqueIdentifier>{e082b09b-1cdc-4c21-967b-eaf7130cf620}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\embed">
-      <UniqueIdentifier>{cb6d9d4e-046b-44c7-b00a-c316e87e035c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\lua\core">
-      <UniqueIdentifier>{b13ee8dc-41fc-42b3-8b64-f9c261ebfc73}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\lua\graphics">
-      <UniqueIdentifier>{1ed523c3-e203-487f-a13f-a35396f814f3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\lua\audio">
-      <UniqueIdentifier>{4eb54d6d-e336-42f6-8670-d271a458eb56}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\lua\event">
-      <UniqueIdentifier>{8a740640-925a-4cf6-94d5-89283824a141}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\lua\keyboard">
-      <UniqueIdentifier>{2a701538-aeee-4f48-a285-0b848c9a3b81}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\lua\mouse">
-      <UniqueIdentifier>{5b69329e-0aa2-4c77-be52-69c09fdbac65}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\lua\filesystem">
-      <UniqueIdentifier>{563ed6fb-3d82-4905-b128-835f3818cc4f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\lua\net">
-      <UniqueIdentifier>{6b79b5bf-69c1-458c-81f3-b386b340d39b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\lua\time">
-      <UniqueIdentifier>{ee920041-8798-4827-be04-49f9342ba092}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\lua\thread">
-      <UniqueIdentifier>{7957774a-4f34-4255-ab2e-8da9b6c71983}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\data">
-      <UniqueIdentifier>{0340fbad-0c07-4923-afd2-183424c70967}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\lua\joypad">
-      <UniqueIdentifier>{7fd81749-f776-4e5c-b6e2-33372a143560}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\libjin\Audio">
       <UniqueIdentifier>{4e3c38b2-8076-4927-993d-e59607d4256a}</UniqueIdentifier>
     </Filter>
@@ -130,18 +85,66 @@
     <Filter Include="src\libjin\Time">
       <UniqueIdentifier>{2ca0fd6f-0e11-4215-9ca6-c58179928bd5}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\math">
-      <UniqueIdentifier>{98c4385b-893c-4d60-bb82-2a19ee5ff527}</UniqueIdentifier>
-    </Filter>
     <Filter Include="res">
       <UniqueIdentifier>{579f12b8-5758-4be5-9cd7-e1fa62fdef74}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\lua\bit">
+    <Filter Include="src\lua\modules">
+      <UniqueIdentifier>{923b475a-00e2-4b8f-925a-ca1e5f9b4689}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\lua\modules\thread">
+      <UniqueIdentifier>{7957774a-4f34-4255-ab2e-8da9b6c71983}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\lua\modules\time">
+      <UniqueIdentifier>{ee920041-8798-4827-be04-49f9342ba092}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\lua\modules\net">
+      <UniqueIdentifier>{6b79b5bf-69c1-458c-81f3-b386b340d39b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\lua\modules\audio">
+      <UniqueIdentifier>{4eb54d6d-e336-42f6-8670-d271a458eb56}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\lua\modules\bit">
       <UniqueIdentifier>{b042ed61-32e5-4e86-b4f3-1a293de8918d}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\lua\modules\core">
+      <UniqueIdentifier>{b13ee8dc-41fc-42b3-8b64-f9c261ebfc73}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\lua\modules\embed">
+      <UniqueIdentifier>{cb6d9d4e-046b-44c7-b00a-c316e87e035c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\lua\modules\event">
+      <UniqueIdentifier>{8a740640-925a-4cf6-94d5-89283824a141}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\lua\modules\filesystem">
+      <UniqueIdentifier>{563ed6fb-3d82-4905-b128-835f3818cc4f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\lua\modules\graphics">
+      <UniqueIdentifier>{1ed523c3-e203-487f-a13f-a35396f814f3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\lua\modules\joypad">
+      <UniqueIdentifier>{7fd81749-f776-4e5c-b6e2-33372a143560}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\lua\modules\keyboard">
+      <UniqueIdentifier>{2a701538-aeee-4f48-a285-0b848c9a3b81}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\lua\modules\math">
+      <UniqueIdentifier>{98c4385b-893c-4d60-bb82-2a19ee5ff527}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\lua\modules\mouse">
+      <UniqueIdentifier>{5b69329e-0aa2-4c77-be52-69c09fdbac65}</UniqueIdentifier>
+    </Filter>
     <Filter Include="src\lua\common">
       <UniqueIdentifier>{2264d908-20ee-41c2-8bdc-bc1117959c4f}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\lua\libraries">
+      <UniqueIdentifier>{269451af-b8e9-451f-940a-9b679e6116d3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\lua\libraries\luax">
+      <UniqueIdentifier>{93b29ece-8318-4b20-a65d-2e79c1a2f816}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\lua\resources">
+      <UniqueIdentifier>{0340fbad-0c07-4923-afd2-183424c70967}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\main.cpp">
@@ -150,51 +153,6 @@
     <ClCompile Include="..\..\src\jinc.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\audio\luaopen_audio.cpp">
-      <Filter>src\lua\audio</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lua\core\luaopen_core.cpp">
-      <Filter>src\lua\core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lua\event\luaopen_event.cpp">
-      <Filter>src\lua\event</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lua\filesystem\luaopen_filesystem.cpp">
-      <Filter>src\lua\filesystem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lua\graphics\luaopen_Font.cpp">
-      <Filter>src\lua\graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lua\graphics\luaopen_graphics.cpp">
-      <Filter>src\lua\graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lua\graphics\luaopen_Image.cpp">
-      <Filter>src\lua\graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lua\graphics\luaopen_JSL.cpp">
-      <Filter>src\lua\graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lua\keyboard\luaopen_keyboard.cpp">
-      <Filter>src\lua\keyboard</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lua\mouse\luaopen_mouse.cpp">
-      <Filter>src\lua\mouse</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lua\net\luaopen_net.cpp">
-      <Filter>src\lua\net</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lua\time\luaopen_time.cpp">
-      <Filter>src\lua\time</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lua\luaopen_jin.cpp">
-      <Filter>src\lua</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lua\joypad\luaopen_joypad.cpp">
-      <Filter>src\lua\joypad</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lua\audio\luaopen_Source.cpp">
-      <Filter>src\lua\audio</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\libjin\Audio\Audio.cpp">
       <Filter>src\libjin\Audio</Filter>
     </ClCompile>
@@ -288,65 +246,80 @@
     <ClCompile Include="..\..\src\libjin\Time\Timer.cpp">
       <Filter>src\libjin\Time</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\math\luaopen_math.cpp">
-      <Filter>src\lua\math</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\lua\thread\luaopen_thread.cpp">
-      <Filter>src\lua\thread</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\libjin\Net\Socket.cpp">
       <Filter>src\libjin\Net</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\bit\luaopen_bit.cpp">
-      <Filter>src\lua\bit</Filter>
+    <ClCompile Include="..\..\src\lua\modules\audio\luaopen_audio.cpp">
+      <Filter>src\lua\modules\audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\audio\luaopen_Source.cpp">
+      <Filter>src\lua\modules\audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\bit\luaopen_bit.cpp">
+      <Filter>src\lua\modules\bit</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\core\luaopen_core.cpp">
+      <Filter>src\lua\modules\core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\event\luaopen_event.cpp">
+      <Filter>src\lua\modules\event</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\filesystem\luaopen_filesystem.cpp">
+      <Filter>src\lua\modules\filesystem</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\graphics\luaopen_Canvas.cpp">
+      <Filter>src\lua\modules\graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\graphics\luaopen_Font.cpp">
+      <Filter>src\lua\modules\graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\graphics\luaopen_graphics.cpp">
+      <Filter>src\lua\modules\graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\graphics\luaopen_Image.cpp">
+      <Filter>src\lua\modules\graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\graphics\luaopen_JSL.cpp">
+      <Filter>src\lua\modules\graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\joypad\luaopen_joypad.cpp">
+      <Filter>src\lua\modules\joypad</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\keyboard\luaopen_keyboard.cpp">
+      <Filter>src\lua\modules\keyboard</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\math\luaopen_math.cpp">
+      <Filter>src\lua\modules\math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\mouse\luaopen_mouse.cpp">
+      <Filter>src\lua\modules\mouse</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\net\luaopen_Buffer.cpp">
-      <Filter>src\lua\net</Filter>
+    <ClCompile Include="..\..\src\lua\modules\net\luaopen_Buffer.cpp">
+      <Filter>src\lua\modules\net</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\net\luaopen_Socket.cpp">
-      <Filter>src\lua\net</Filter>
+    <ClCompile Include="..\..\src\lua\modules\net\luaopen_net.cpp">
+      <Filter>src\lua\modules\net</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\lua\graphics\luaopen_Canvas.cpp">
-      <Filter>src\lua\graphics</Filter>
+    <ClCompile Include="..\..\src\lua\modules\net\luaopen_Socket.cpp">
+      <Filter>src\lua\modules\net</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\thread\luaopen_thread.cpp">
+      <Filter>src\lua\modules\thread</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\thread\Thread.cpp">
+      <Filter>src\lua\modules\thread</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\time\luaopen_time.cpp">
+      <Filter>src\lua\modules\time</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\lua\modules\luaopen_jin.cpp">
+      <Filter>src\lua\modules</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\3rdparty\luax\luax.h">
-      <Filter>src\3rdparty\luax</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lua\embed\graphics.lua.h">
-      <Filter>src\lua\embed</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lua\embed\keyboard.lua.h">
-      <Filter>src\lua\embed</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lua\embed\embed.h">
-      <Filter>src\lua\embed</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lua\embed\boot.lua.h">
-      <Filter>src\lua\embed</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lua\embed\mouse.lua.h">
-      <Filter>src\lua\embed</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lua\embed\path.lua.h">
-      <Filter>src\lua\embed</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lua\luaopen_jin.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\libjin\jin.h">
       <Filter>src\libjin</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\data\font.ttf.h">
-      <Filter>src\data</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\data\icon.png.h">
-      <Filter>src\data</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lua\luax.h">
-      <Filter>src\lua</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\libjin\modules.h">
       <Filter>src\libjin</Filter>
     </ClInclude>
@@ -515,15 +488,6 @@
     <ClInclude Include="..\..\src\libjin\Net\Socket.h">
       <Filter>src\libjin\Net</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\lua\embed\net.lua.h">
-      <Filter>src\lua\embed</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lua\net\Buffer.h">
-      <Filter>src\lua\net</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\lua\thread\Thread.h">
-      <Filter>src\lua\thread</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\lua\common\Reference.hpp">
       <Filter>src\lua\common</Filter>
     </ClInclude>
@@ -539,6 +503,45 @@
     <ClInclude Include="..\..\src\lua\common\constant.h">
       <Filter>src\lua\common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\lua\modules\embed\boot.lua.h">
+      <Filter>src\lua\modules\embed</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\lua\modules\embed\embed.h">
+      <Filter>src\lua\modules\embed</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\lua\modules\embed\graphics.lua.h">
+      <Filter>src\lua\modules\embed</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\lua\modules\embed\keyboard.lua.h">
+      <Filter>src\lua\modules\embed</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\lua\modules\embed\mouse.lua.h">
+      <Filter>src\lua\modules\embed</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\lua\modules\embed\net.lua.h">
+      <Filter>src\lua\modules\embed</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\lua\modules\embed\path.lua.h">
+      <Filter>src\lua\modules\embed</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\lua\modules\net\Buffer.h">
+      <Filter>src\lua\modules\net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\lua\modules\thread\Thread.h">
+      <Filter>src\lua\modules\thread</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\lua\modules\luaopen_jin.h">
+      <Filter>src\lua\modules</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\lua\modules\luax.h">
+      <Filter>src\lua\modules</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\lua\libraries\luax\luax.h">
+      <Filter>src\lua\libraries\luax</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\lua\resources\font.ttf.h">
+      <Filter>src\lua\resources</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\libjin\README.md">
-- 
cgit v1.1-26-g67d0