*rename

354 files changed, 1141 insertions, 2321 deletions

diff --git a/.gitignore b/.gitignore
index f943d9f..71cd91c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 *.ipdb
 *.sbr
 *.bsc
+build/.vs/*
\ No newline at end of file
diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj b/Build/Asura.Editor/Asura.Editor.vcxproj
index 7886653..11dd494 100644
--- a/Build/Asura.Editor/Asura.Editor.vcxproj
+++ b/Build/Asura.Editor/Asura.Editor.vcxproj
@@ -76,7 +76,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\libs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -109,7 +109,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\libs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
diff --git a/Build/Asura.sln b/Build/Asura.sln
index 779d30e..53e6d41 100644
--- a/Build/Asura.sln
+++ b/Build/Asura.sln
@@ -41,17 +41,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Wuff", "3rd-party\Wuff\Wuff
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "physfs", "3rd-party\physfs\physfs.vcxproj", "{AEE37589-DE0D-4139-8BDB-8179FDEFB835}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libs", "libs", "{CD115016-E377-4AC1-8595-DB2836CEFE7E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{CD115016-E377-4AC1-8595-DB2836CEFE7E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-core", "libs\asura-lib-core\asura-lib-core.vcxproj", "{29A6837A-67FA-403F-83FD-E7975649404F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-core", "modules\asura-core\asura-core.vcxproj", "{29A6837A-67FA-403F-83FD-E7975649404F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-box2d", "libs\asura-lib-box2d\asura-lib-box2d.vcxproj", "{ADFEEA50-F8B8-4453-BA88-BA7E7EE74485}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-box2d", "modules\asura-box2d\asura-box2d.vcxproj", "{ADFEEA50-F8B8-4453-BA88-BA7E7EE74485}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-framework", "libs\asura-lib-framework\asura-lib-framework.vcxproj", "{CB05752F-B785-4715-9AA3-818C15ABA5F0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-framework", "modules\asura-framework\asura-framework.vcxproj", "{CB05752F-B785-4715-9AA3-818C15ABA5F0}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-openal", "libs\asura-lib-openal\asura-lib-openal.vcxproj", "{088C6ABA-26A6-43D1-8492-096EDB65597C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-openal", "modules\asura-openal\asura-openal.vcxproj", "{088C6ABA-26A6-43D1-8492-096EDB65597C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-utils", "libs\asura-lib-utils\asura-lib-utils.vcxproj", "{7D41093F-E356-4C5B-A25F-41779BF86E54}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-utils", "modules\asura-utils\asura-utils.vcxproj", "{7D41093F-E356-4C5B-A25F-41779BF86E54}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01-cursor", "tests\01-cursor\01-cursor.vcxproj", "{52D4B84B-0FEB-419F-AED4-2FC896AA93CF}"
 EndProject
@@ -71,13 +71,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Asura.UnPacker", "Asura.UnP
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Asura", "Asura\Asura.vcxproj", "{234E1397-269B-4A6A-9B4D-08EDBFFF210E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-json", "libs\asura-lib-json\asura-lib-json.vcxproj", "{1B83A353-9694-42E0-997E-79E150E1C2E5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-json", "modules\asura-json\asura-json.vcxproj", "{1B83A353-9694-42E0-997E-79E150E1C2E5}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-xml", "libs\asura-lib-xml\asura-lib-xml.vcxproj", "{AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-xml", "modules\asura-xml\asura-xml.vcxproj", "{AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Preprocessor", "Preprocessor\Preprocessor.vcxproj", "{983F6496-7BB2-48E3-B8F4-68C2600EA315}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-steam", "libs\asura-lib-steam\asura-lib-steam.vcxproj", "{129C3826-B418-4C80-A126-0319C7E2A857}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-steam", "modules\asura-steam\asura-steam.vcxproj", "{129C3826-B418-4C80-A126-0319C7E2A857}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "05-physfs", "tests\05-physfs\05-physfs.vcxproj", "{5BECAAB3-9C80-4A62-99BB-E48F4667D9CD}"
 EndProject
@@ -91,7 +91,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxml2", "3rd-party\tinyx
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "06-coroutine", "tests\06-coroutine\06-coroutine.vcxproj", "{C3CD1252-3C8D-45E2-B784-D0016E7F0BD3}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-network", "libs\asura-lib-network\asura-lib-network.vcxproj", "{6361701E-BD43-4AE9-8AE2-5C8F87D436BA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-network", "modules\asura-network\asura-network.vcxproj", "{6361701E-BD43-4AE9-8AE2-5C8F87D436BA}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LuaSocket", "3rd-party\LuaSocket\LuaSocket.vcxproj", "{E15D111A-9E02-4E0D-86FE-62BFCD3C211E}"
 EndProject
@@ -99,7 +99,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plotscript", "3rd-party\Plo
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uuid4", "3rd-party\uuid4\uuid4.vcxproj", "{49F7847E-219E-4A7B-8484-2A33DAC29DD0}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-plot", "libs\asura-lib-plot\asura-lib-plot.vcxproj", "{F248C936-2169-45DF-8FC4-60E56EA23ECC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-plot", "modules\asura-plot\asura-plot.vcxproj", "{F248C936-2169-45DF-8FC4-60E56EA23ECC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/bin/win64/05-physfs.exe b/bin/win64/05-physfs.exe
index 48b20fa..78353c7 100644
--- a/bin/win64/05-physfs.exe
+++ b/bin/win64/05-physfs.exe
diff --git a/build/3rd-party/Luax/x64/Debug/luax_cfunctions.nativecodeanalysis.xml b/build/3rd-party/Luax/x64/Debug/luax_cfunctions.nativecodeanalysis.xml
deleted file mode 100644
index dcdf088..0000000
--- a/build/3rd-party/Luax/x64/Debug/luax_cfunctions.nativecodeanalysis.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS></DEFECTS>
\ No newline at end of file
diff --git a/build/3rd-party/Luax/x64/Debug/luax_class.nativecodeanalysis.xml b/build/3rd-party/Luax/x64/Debug/luax_class.nativecodeanalysis.xml
deleted file mode 100644
index dcdf088..0000000
--- a/build/3rd-party/Luax/x64/Debug/luax_class.nativecodeanalysis.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS></DEFECTS>
\ No newline at end of file
diff --git a/build/3rd-party/Luax/x64/Debug/luax_context.nativecodeanalysis.xml b/build/3rd-party/Luax/x64/Debug/luax_context.nativecodeanalysis.xml
deleted file mode 100644
index 35a3288..0000000
--- a/build/3rd-party/Luax/x64/Debug/luax_context.nativecodeanalysis.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_context.cpp</FILENAME>
-      <LINE>6</LINE>
-      <COLUMN>14</COLUMN>
-    </SFA>
-    <DEFECTCODE>26495</DEFECTCODE>
-    <DESCRIPTION>Variable 'Luax::LuaxContext::objectCount' is uninitialized. Always initialize a member variable (type.6).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxContext::{ctor}</FUNCTION>
-    <DECORATED>??0LuaxContext@Luax@@QEAA@PEAUlua_State@@@Z</DECORATED>
-    <FUNCLINE>6</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-</DEFECTS>
\ No newline at end of file
diff --git a/build/3rd-party/Luax/x64/Debug/luax_enum.nativecodeanalysis.xml b/build/3rd-party/Luax/x64/Debug/luax_enum.nativecodeanalysis.xml
deleted file mode 100644
index dcdf088..0000000
--- a/build/3rd-party/Luax/x64/Debug/luax_enum.nativecodeanalysis.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS></DEFECTS>
\ No newline at end of file
diff --git a/build/3rd-party/Luax/x64/Debug/luax_memberref.nativecodeanalysis.xml b/build/3rd-party/Luax/x64/Debug/luax_memberref.nativecodeanalysis.xml
deleted file mode 100644
index a8b72f2..0000000
--- a/build/3rd-party/Luax/x64/Debug/luax_memberref.nativecodeanalysis.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_memberref.cpp</FILENAME>
-      <LINE>6</LINE>
-      <COLUMN>16</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxMemberRef::{ctor}</FUNCTION>
-    <DECORATED>??0LuaxMemberRef@Luax@@QEAA@XZ</DECORATED>
-    <FUNCLINE>6</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-</DEFECTS>
\ No newline at end of file
diff --git a/build/3rd-party/Luax/x64/Debug/luax_ref.nativecodeanalysis.xml b/build/3rd-party/Luax/x64/Debug/luax_ref.nativecodeanalysis.xml
deleted file mode 100644
index fb05229..0000000
--- a/build/3rd-party/Luax/x64/Debug/luax_ref.nativecodeanalysis.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_ref.cpp</FILENAME>
-      <LINE>7</LINE>
-      <COLUMN>10</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxRef::{ctor}</FUNCTION>
-    <DECORATED>??0LuaxRef@Luax@@QEAA@H@Z</DECORATED>
-    <FUNCLINE>7</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_ref.cpp</FILENAME>
-      <LINE>59</LINE>
-      <COLUMN>16</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxStrongRef::{ctor}</FUNCTION>
-    <DECORATED>??0LuaxStrongRef@Luax@@QEAA@XZ</DECORATED>
-    <FUNCLINE>59</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_ref.cpp</FILENAME>
-      <LINE>64</LINE>
-      <COLUMN>14</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxWeakRef::{ctor}</FUNCTION>
-    <DECORATED>??0LuaxWeakRef@Luax@@QEAA@XZ</DECORATED>
-    <FUNCLINE>64</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-</DEFECTS>
\ No newline at end of file
diff --git a/build/3rd-party/Luax/x64/Debug/luax_reftable.nativecodeanalysis.xml b/build/3rd-party/Luax/x64/Debug/luax_reftable.nativecodeanalysis.xml
deleted file mode 100644
index fcb4b68..0000000
--- a/build/3rd-party/Luax/x64/Debug/luax_reftable.nativecodeanalysis.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_reftable.cpp</FILENAME>
-      <LINE>7</LINE>
-      <COLUMN>15</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxRefTable::{ctor}</FUNCTION>
-    <DECORATED>??0LuaxRefTable@Luax@@QEAA@XZ</DECORATED>
-    <FUNCLINE>7</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_reftable.cpp</FILENAME>
-      <LINE>7</LINE>
-      <COLUMN>15</COLUMN>
-    </SFA>
-    <DEFECTCODE>26495</DEFECTCODE>
-    <DESCRIPTION>Variable 'Luax::LuaxRefTable::mName' is uninitialized. Always initialize a member variable (type.6).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxRefTable::{ctor}</FUNCTION>
-    <DECORATED>??0LuaxRefTable@Luax@@QEAA@XZ</DECORATED>
-    <FUNCLINE>7</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_reftable.cpp</FILENAME>
-      <LINE>7</LINE>
-      <COLUMN>15</COLUMN>
-    </SFA>
-    <DEFECTCODE>26495</DEFECTCODE>
-    <DESCRIPTION>Variable 'Luax::LuaxRefTable::mMode' is uninitialized. Always initialize a member variable (type.6).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxRefTable::{ctor}</FUNCTION>
-    <DECORATED>??0LuaxRefTable@Luax@@QEAA@XZ</DECORATED>
-    <FUNCLINE>7</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-</DEFECTS>
\ No newline at end of file
diff --git a/build/3rd-party/Luax/x64/Debug/luax_runtime.nativecodeanalysis.xml b/build/3rd-party/Luax/x64/Debug/luax_runtime.nativecodeanalysis.xml
deleted file mode 100644
index 8d33c8e..0000000
--- a/build/3rd-party/Luax/x64/Debug/luax_runtime.nativecodeanalysis.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_runtime.cpp</FILENAME>
-      <LINE>13</LINE>
-      <COLUMN>14</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxRuntime::{ctor}</FUNCTION>
-    <DECORATED>??0LuaxRuntime@Luax@@AEAA@XZ</DECORATED>
-    <FUNCLINE>13</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_runtime.cpp</FILENAME>
-      <LINE>30</LINE>
-      <COLUMN>11</COLUMN>
-    </SFA>
-    <DEFECTCODE>26444</DEFECTCODE>
-    <DESCRIPTION>Avoid unnamed objects with custom construction and destruction (es.84).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxRuntime::Open</FUNCTION>
-    <DECORATED>?Open@LuaxRuntime@Luax@@QEAAPEAUlua_State@@XZ</DECORATED>
-    <FUNCLINE>24</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_runtime.cpp</FILENAME>
-      <LINE>43</LINE>
-      <COLUMN>12</COLUMN>
-    </SFA>
-    <DEFECTCODE>26444</DEFECTCODE>
-    <DESCRIPTION>Avoid unnamed objects with custom construction and destruction (es.84).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxRuntime::Close</FUNCTION>
-    <DECORATED>?Close@LuaxRuntime@Luax@@QEAAXPEAUlua_State@@@Z</DECORATED>
-    <FUNCLINE>37</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-</DEFECTS>
\ No newline at end of file
diff --git a/build/3rd-party/Luax/x64/Debug/luax_state.nativecodeanalysis.xml b/build/3rd-party/Luax/x64/Debug/luax_state.nativecodeanalysis.xml
deleted file mode 100644
index dcdf088..0000000
--- a/build/3rd-party/Luax/x64/Debug/luax_state.nativecodeanalysis.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS></DEFECTS>
\ No newline at end of file
diff --git a/build/3rd-party/Luax/x64/Debug/vc.nativecodeanalysis.all.xml b/build/3rd-party/Luax/x64/Debug/vc.nativecodeanalysis.all.xml
deleted file mode 100644
index c1161fd..0000000
--- a/build/3rd-party/Luax/x64/Debug/vc.nativecodeanalysis.all.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><DEFECTS><DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_context.cpp</FILENAME>
-      <LINE>6</LINE>
-      <COLUMN>14</COLUMN>
-    </SFA>
-    <DEFECTCODE>26495</DEFECTCODE>
-    <DESCRIPTION>Variable 'Luax::LuaxContext::objectCount' is uninitialized. Always initialize a member variable (type.6).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxContext::{ctor}</FUNCTION>
-    <DECORATED>??0LuaxContext@Luax@@QEAA@PEAUlua_State@@@Z</DECORATED>
-    <FUNCLINE>6</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT><DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_memberref.cpp</FILENAME>
-      <LINE>6</LINE>
-      <COLUMN>16</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxMemberRef::{ctor}</FUNCTION>
-    <DECORATED>??0LuaxMemberRef@Luax@@QEAA@XZ</DECORATED>
-    <FUNCLINE>6</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT><DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_ref.cpp</FILENAME>
-      <LINE>7</LINE>
-      <COLUMN>10</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxRef::{ctor}</FUNCTION>
-    <DECORATED>??0LuaxRef@Luax@@QEAA@H@Z</DECORATED>
-    <FUNCLINE>7</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT><DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_ref.cpp</FILENAME>
-      <LINE>59</LINE>
-      <COLUMN>16</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxStrongRef::{ctor}</FUNCTION>
-    <DECORATED>??0LuaxStrongRef@Luax@@QEAA@XZ</DECORATED>
-    <FUNCLINE>59</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT><DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_ref.cpp</FILENAME>
-      <LINE>64</LINE>
-      <COLUMN>14</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxWeakRef::{ctor}</FUNCTION>
-    <DECORATED>??0LuaxWeakRef@Luax@@QEAA@XZ</DECORATED>
-    <FUNCLINE>64</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT><DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_reftable.cpp</FILENAME>
-      <LINE>7</LINE>
-      <COLUMN>15</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxRefTable::{ctor}</FUNCTION>
-    <DECORATED>??0LuaxRefTable@Luax@@QEAA@XZ</DECORATED>
-    <FUNCLINE>7</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT><DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_reftable.cpp</FILENAME>
-      <LINE>7</LINE>
-      <COLUMN>15</COLUMN>
-    </SFA>
-    <DEFECTCODE>26495</DEFECTCODE>
-    <DESCRIPTION>Variable 'Luax::LuaxRefTable::mName' is uninitialized. Always initialize a member variable (type.6).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxRefTable::{ctor}</FUNCTION>
-    <DECORATED>??0LuaxRefTable@Luax@@QEAA@XZ</DECORATED>
-    <FUNCLINE>7</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT><DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_runtime.cpp</FILENAME>
-      <LINE>13</LINE>
-      <COLUMN>14</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxRuntime::{ctor}</FUNCTION>
-    <DECORATED>??0LuaxRuntime@Luax@@AEAA@XZ</DECORATED>
-    <FUNCLINE>13</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT><DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_runtime.cpp</FILENAME>
-      <LINE>30</LINE>
-      <COLUMN>11</COLUMN>
-    </SFA>
-    <DEFECTCODE>26444</DEFECTCODE>
-    <DESCRIPTION>Avoid unnamed objects with custom construction and destruction (es.84).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxRuntime::Open</FUNCTION>
-    <DECORATED>?Open@LuaxRuntime@Luax@@QEAAPEAUlua_State@@XZ</DECORATED>
-    <FUNCLINE>24</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT><DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_runtime.cpp</FILENAME>
-      <LINE>43</LINE>
-      <COLUMN>12</COLUMN>
-    </SFA>
-    <DEFECTCODE>26444</DEFECTCODE>
-    <DESCRIPTION>Avoid unnamed objects with custom construction and destruction (es.84).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxRuntime::Close</FUNCTION>
-    <DECORATED>?Close@LuaxRuntime@Luax@@QEAAXPEAUlua_State@@@Z</DECORATED>
-    <FUNCLINE>37</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT></DEFECTS>
\ No newline at end of file
diff --git a/build/Asura.Editor/Asura.Editor.vcxproj b/build/Asura.Editor/Asura.Editor.vcxproj
index 7886653..11dd494 100644
--- a/build/Asura.Editor/Asura.Editor.vcxproj
+++ b/build/Asura.Editor/Asura.Editor.vcxproj
@@ -76,7 +76,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\libs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -109,7 +109,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\libs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
diff --git a/build/Asura.sln b/build/Asura.sln
index 779d30e..53e6d41 100644
--- a/build/Asura.sln
+++ b/build/Asura.sln
@@ -41,17 +41,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Wuff", "3rd-party\Wuff\Wuff
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "physfs", "3rd-party\physfs\physfs.vcxproj", "{AEE37589-DE0D-4139-8BDB-8179FDEFB835}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libs", "libs", "{CD115016-E377-4AC1-8595-DB2836CEFE7E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{CD115016-E377-4AC1-8595-DB2836CEFE7E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-core", "libs\asura-lib-core\asura-lib-core.vcxproj", "{29A6837A-67FA-403F-83FD-E7975649404F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-core", "modules\asura-core\asura-core.vcxproj", "{29A6837A-67FA-403F-83FD-E7975649404F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-box2d", "libs\asura-lib-box2d\asura-lib-box2d.vcxproj", "{ADFEEA50-F8B8-4453-BA88-BA7E7EE74485}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-box2d", "modules\asura-box2d\asura-box2d.vcxproj", "{ADFEEA50-F8B8-4453-BA88-BA7E7EE74485}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-framework", "libs\asura-lib-framework\asura-lib-framework.vcxproj", "{CB05752F-B785-4715-9AA3-818C15ABA5F0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-framework", "modules\asura-framework\asura-framework.vcxproj", "{CB05752F-B785-4715-9AA3-818C15ABA5F0}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-openal", "libs\asura-lib-openal\asura-lib-openal.vcxproj", "{088C6ABA-26A6-43D1-8492-096EDB65597C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-openal", "modules\asura-openal\asura-openal.vcxproj", "{088C6ABA-26A6-43D1-8492-096EDB65597C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-utils", "libs\asura-lib-utils\asura-lib-utils.vcxproj", "{7D41093F-E356-4C5B-A25F-41779BF86E54}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-utils", "modules\asura-utils\asura-utils.vcxproj", "{7D41093F-E356-4C5B-A25F-41779BF86E54}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01-cursor", "tests\01-cursor\01-cursor.vcxproj", "{52D4B84B-0FEB-419F-AED4-2FC896AA93CF}"
 EndProject
@@ -71,13 +71,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Asura.UnPacker", "Asura.UnP
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Asura", "Asura\Asura.vcxproj", "{234E1397-269B-4A6A-9B4D-08EDBFFF210E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-json", "libs\asura-lib-json\asura-lib-json.vcxproj", "{1B83A353-9694-42E0-997E-79E150E1C2E5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-json", "modules\asura-json\asura-json.vcxproj", "{1B83A353-9694-42E0-997E-79E150E1C2E5}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-xml", "libs\asura-lib-xml\asura-lib-xml.vcxproj", "{AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-xml", "modules\asura-xml\asura-xml.vcxproj", "{AB4F8F4A-73B5-4EFF-BD5D-448A3E39C60A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Preprocessor", "Preprocessor\Preprocessor.vcxproj", "{983F6496-7BB2-48E3-B8F4-68C2600EA315}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-steam", "libs\asura-lib-steam\asura-lib-steam.vcxproj", "{129C3826-B418-4C80-A126-0319C7E2A857}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-steam", "modules\asura-steam\asura-steam.vcxproj", "{129C3826-B418-4C80-A126-0319C7E2A857}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "05-physfs", "tests\05-physfs\05-physfs.vcxproj", "{5BECAAB3-9C80-4A62-99BB-E48F4667D9CD}"
 EndProject
@@ -91,7 +91,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxml2", "3rd-party\tinyx
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "06-coroutine", "tests\06-coroutine\06-coroutine.vcxproj", "{C3CD1252-3C8D-45E2-B784-D0016E7F0BD3}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-network", "libs\asura-lib-network\asura-lib-network.vcxproj", "{6361701E-BD43-4AE9-8AE2-5C8F87D436BA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-network", "modules\asura-network\asura-network.vcxproj", "{6361701E-BD43-4AE9-8AE2-5C8F87D436BA}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LuaSocket", "3rd-party\LuaSocket\LuaSocket.vcxproj", "{E15D111A-9E02-4E0D-86FE-62BFCD3C211E}"
 EndProject
@@ -99,7 +99,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plotscript", "3rd-party\Plo
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uuid4", "3rd-party\uuid4\uuid4.vcxproj", "{49F7847E-219E-4A7B-8484-2A33DAC29DD0}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-lib-plot", "libs\asura-lib-plot\asura-lib-plot.vcxproj", "{F248C936-2169-45DF-8FC4-60E56EA23ECC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-plot", "modules\asura-plot\asura-plot.vcxproj", "{F248C936-2169-45DF-8FC4-60E56EA23ECC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/build/libs/asura-lib-core/asura-lib-core.vcxproj b/build/libs/asura-lib-core/asura-lib-core.vcxproj
deleted file mode 100644
index cebc42a..0000000
--- a/build/libs/asura-lib-core/asura-lib-core.vcxproj
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{29A6837A-67FA-403F-83FD-E7975649404F}</ProjectGuid>
-    <RootNamespace>asuracore</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\libs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\libs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\application.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\core_module.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\font\glyph.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\font\string.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\font\ttf.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_canvas.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_color.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_color32.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_image.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_image_data.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_image_decode_task.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_mesh2d.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_shader.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_sprite_batch.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_window.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\canvas.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\color.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\color32.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\gif.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\gl.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\image.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\image_data.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\image_decode_task.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\mesh2d.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\mesh2d_data.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\png_decoder.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\quad.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\render_target.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\shader.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\shape.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\sprite_batch.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\stb_decoder.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\texture.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\input\clipboard.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\input\cursor.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\input\cursor_impl_sdl.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\input\keyboard.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\input\mouse.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\profiler\stats.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\time\timer.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\window\window.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\window\window_impl_glew.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\window\window_impl_glut.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\window\window_impl_sdl.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\application.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\core_config.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\core_module.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\font\glyph.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\font\string.hpp" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\font\ttf.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\font\utf.hpp" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\blend_mode.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\canvas.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\color.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\color32.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\color_palette.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\gif.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\gl.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\image.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\image_data.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\image_decoder.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\image_decode_task.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\mesh2d.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\mesh2d_data.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\pixel_format.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\png_decoder.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\quad.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\render_state.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\render_target.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\shader.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\shape.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\sprite_batch.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\stb_decoder.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\texture.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\clipboard.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\cursor.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\cursor_impl_sdl.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\event.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\input_device.hpp" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\joypad.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\keyboard.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\mouse.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\profiler\stats.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\time\timer.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\type.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\window\window.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\window\window_impl_glew.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\window\window_impl_glut.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\window\window_impl_sdl.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\source\libs\asura-lib-core\font\string.inl" />
-    <None Include="..\..\..\source\libs\asura-lib-core\font\utf.inl" />
-    <None Include="..\..\..\source\libs\asura-lib-core\input\cursor.defs" />
-    <None Include="..\..\..\source\libs\asura-lib-core\input\keyboard.defs" />
-    <None Include="..\..\..\source\libs\asura-lib-core\input\mouse.defs" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/build/libs/asura-lib-core/asura-lib-core.vcxproj.filters b/build/libs/asura-lib-core/asura-lib-core.vcxproj.filters
deleted file mode 100644
index 8ef99f7..0000000
--- a/build/libs/asura-lib-core/asura-lib-core.vcxproj.filters
+++ /dev/null
@@ -1,302 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="graphics">
-      <UniqueIdentifier>{a338aae6-b932-4a59-9a2e-f07283aaea64}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="input">
-      <UniqueIdentifier>{18c6a104-a8f9-4794-80a0-2fe9afdfca3e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="profiler">
-      <UniqueIdentifier>{1a6ed8b6-908c-458d-a036-1ff57db1248a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="font">
-      <UniqueIdentifier>{3a06866e-ed35-485f-94a5-548b522fd1f4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="time">
-      <UniqueIdentifier>{81dedac2-8d27-4c19-bf40-1503f0dbad1b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="graphics\binding">
-      <UniqueIdentifier>{4f6b2c19-1a06-48c9-b89d-52fa27bec5c1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="window">
-      <UniqueIdentifier>{7a73607c-8da6-4865-a992-5c7c8764bd5a}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\application.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\canvas.cpp">
-      <Filter>graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\color.cpp">
-      <Filter>graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\gif.cpp">
-      <Filter>graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\gl.cpp">
-      <Filter>graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\image.cpp">
-      <Filter>graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\image_data.cpp">
-      <Filter>graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\mesh2d.cpp">
-      <Filter>graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\mesh2d_data.cpp">
-      <Filter>graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\png_decoder.cpp">
-      <Filter>graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\quad.cpp">
-      <Filter>graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\render_target.cpp">
-      <Filter>graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\shader.cpp">
-      <Filter>graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\shape.cpp">
-      <Filter>graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\sprite_batch.cpp">
-      <Filter>graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\stb_decoder.cpp">
-      <Filter>graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\texture.cpp">
-      <Filter>graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\input\clipboard.cpp">
-      <Filter>input</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\input\cursor.cpp">
-      <Filter>input</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\input\keyboard.cpp">
-      <Filter>input</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\input\mouse.cpp">
-      <Filter>input</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\font\glyph.cpp">
-      <Filter>font</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\font\string.cpp">
-      <Filter>font</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\font\ttf.cpp">
-      <Filter>font</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\time\timer.cpp">
-      <Filter>time</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\profiler\stats.cpp">
-      <Filter>profiler</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\core_module.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\color32.cpp">
-      <Filter>graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\input\cursor_impl_sdl.cpp">
-      <Filter>input</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\image_decode_task.cpp">
-      <Filter>graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_canvas.cpp">
-      <Filter>graphics\binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_color.cpp">
-      <Filter>graphics\binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_color32.cpp">
-      <Filter>graphics\binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_image.cpp">
-      <Filter>graphics\binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_image_data.cpp">
-      <Filter>graphics\binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_image_decode_task.cpp">
-      <Filter>graphics\binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_mesh2d.cpp">
-      <Filter>graphics\binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_shader.cpp">
-      <Filter>graphics\binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_sprite_batch.cpp">
-      <Filter>graphics\binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\graphics\binding\_window.cpp">
-      <Filter>graphics\binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\window\window.cpp">
-      <Filter>window</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\window\window_impl_glew.cpp">
-      <Filter>window</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\window\window_impl_glut.cpp">
-      <Filter>window</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-core\window\window_impl_sdl.cpp">
-      <Filter>window</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\application.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\blend_mode.h">
-      <Filter>graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\canvas.h">
-      <Filter>graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\color.h">
-      <Filter>graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\color_palette.h">
-      <Filter>graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\gif.h">
-      <Filter>graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\gl.h">
-      <Filter>graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\image.h">
-      <Filter>graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\image_data.h">
-      <Filter>graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\image_decoder.h">
-      <Filter>graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\mesh2d.h">
-      <Filter>graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\mesh2d_data.h">
-      <Filter>graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\pixel_format.h">
-      <Filter>graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\png_decoder.h">
-      <Filter>graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\quad.h">
-      <Filter>graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\render_state.h">
-      <Filter>graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\render_target.h">
-      <Filter>graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\shader.h">
-      <Filter>graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\shape.h">
-      <Filter>graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\sprite_batch.h">
-      <Filter>graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\stb_decoder.h">
-      <Filter>graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\texture.h">
-      <Filter>graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\clipboard.h">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\cursor.h">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\input_device.hpp">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\keyboard.h">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\mouse.h">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\font\glyph.h">
-      <Filter>font</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\font\string.hpp">
-      <Filter>font</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\font\ttf.h">
-      <Filter>font</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\font\utf.hpp">
-      <Filter>font</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\time\timer.h">
-      <Filter>time</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\profiler\stats.h">
-      <Filter>profiler</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\core_module.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\type.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\core_config.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\event.h">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\joypad.h">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\color32.h">
-      <Filter>graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\input\cursor_impl_sdl.h">
-      <Filter>input</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\graphics\image_decode_task.h">
-      <Filter>graphics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\window\window_impl_sdl.h">
-      <Filter>window</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\window\window.h">
-      <Filter>window</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\window\window_impl_glew.h">
-      <Filter>window</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-core\window\window_impl_glut.h">
-      <Filter>window</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\source\libs\asura-lib-core\font\string.inl">
-      <Filter>font</Filter>
-    </None>
-    <None Include="..\..\..\source\libs\asura-lib-core\font\utf.inl">
-      <Filter>font</Filter>
-    </None>
-    <None Include="..\..\..\source\libs\asura-lib-core\input\cursor.defs">
-      <Filter>input</Filter>
-    </None>
-    <None Include="..\..\..\source\libs\asura-lib-core\input\keyboard.defs">
-      <Filter>input</Filter>
-    </None>
-    <None Include="..\..\..\source\libs\asura-lib-core\input\mouse.defs">
-      <Filter>input</Filter>
-    </None>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/build/libs/asura-lib-json/asura-lib-json.vcxproj.filters b/build/libs/asura-lib-json/asura-lib-json.vcxproj.filters
deleted file mode 100644
index 6e05266..0000000
--- a/build/libs/asura-lib-json/asura-lib-json.vcxproj.filters
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-json\json.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-json\json_module.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-json\json.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-json\json_module.h" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/build/libs/asura-lib-log/asura-lib-log.vcxproj b/build/libs/asura-lib-log/asura-lib-log.vcxproj
deleted file mode 100644
index 3f891f1..0000000
--- a/build/libs/asura-lib-log/asura-lib-log.vcxproj
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{73B0F8AB-EF5A-412A-9E34-0FD2574766B7}</ProjectGuid>
-    <RootNamespace>asuraliblog</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/build/libs/asura-lib-openal/asura-lib-openal.vcxproj.filters b/build/libs/asura-lib-openal/asura-lib-openal.vcxproj.filters
deleted file mode 100644
index 19278c7..0000000
--- a/build/libs/asura-lib-openal/asura-lib-openal.vcxproj.filters
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-openal\sound.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-openal\sound_decode_task.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-openal\sound_decoder.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-openal\sound.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-openal\sound_decoder.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-openal\sound_decode_task.h" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/build/libs/asura-lib-steam/asura-lib-steam.vcxproj.filters b/build/libs/asura-lib-steam/asura-lib-steam.vcxproj.filters
deleted file mode 100644
index 3c6f4fd..0000000
--- a/build/libs/asura-lib-steam/asura-lib-steam.vcxproj.filters
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="源文件">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="头文件">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="资源文件">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/asura-lib-utils.vcxproj b/build/libs/asura-lib-utils/asura-lib-utils.vcxproj
deleted file mode 100644
index b7c6576..0000000
--- a/build/libs/asura-lib-utils/asura-lib-utils.vcxproj
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{7D41093F-E356-4C5B-A25F-41779BF86E54}</ProjectGuid>
-    <RootNamespace>asurautils</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\Bin\win64</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\Bin\win64</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\libs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\libs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\exceptions\exception.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\binding\_compressor.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\binding\_data_buffer.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\binding\_file.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\binding\_file_data.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\binding\_file_system.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\binding\_io_task.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\compressor.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\data_buffer.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\decoded_data.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\file.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\file_data.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\file_system.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\io_batch_task.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\io_task.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\math\curve.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\math\functions.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\math\matrix44.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\math\quaternion.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\math\ranged_value.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\math\transform.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\stringmap.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\binding\_coroutine.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\binding\_thread.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\coroutine.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\mutex.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\semaphore.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_posix.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_sdl.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_std.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_win32.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\task.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread_task.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\utils_module.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\exceptions\exception.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\io\compressor.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\io\data_buffer.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\io\decoded_data.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\io\file.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\io\file_data.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\io\file_system.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\io\io_batch_task.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\io\io_task.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\io\reloadable.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\manager.hpp" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\math\curve.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\math\functions.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\math\matrix44.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\math\quaternion.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\math\ranged_value.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\math\rect.hpp" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\math\transform.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\math\vector2.hpp" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\math\vector3.hpp" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\math\vector4.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\module.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\scripting\lua_env.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\scripting\portable.hpp" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\singleton.hpp" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\stringmap.hpp" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\coroutine.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\mutex.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\semaphore.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_posix.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_sdl.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_std.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_win32.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\task.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread_task.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\type.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\utils.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\utils_config.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\utils_module.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\source\libs\asura-lib-utils\math\rect.inl" />
-    <None Include="..\..\..\source\libs\asura-lib-utils\math\vector2.inl" />
-    <None Include="..\..\..\source\libs\asura-lib-utils\math\vector3.inl" />
-    <None Include="..\..\..\source\libs\asura-lib-utils\math\vector4.inl" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\3rd-party\lua51\lua51.vcxproj">
-      <Project>{8b8fca14-fc8a-45b4-bf3c-9340cb586076}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\3rd-party\Luax\Luax.vcxproj">
-      <Project>{1350cee9-b2c2-426a-af4e-f651d51dd592}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\3rd-party\physfs\physfs.vcxproj">
-      <Project>{aee37589-de0d-4139-8bdb-8179fdefb835}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/asura-lib-utils.vcxproj.filters b/build/libs/asura-lib-utils/asura-lib-utils.vcxproj.filters
deleted file mode 100644
index 9e36a55..0000000
--- a/build/libs/asura-lib-utils/asura-lib-utils.vcxproj.filters
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="exceptions">
-      <UniqueIdentifier>{30702383-d458-4486-8d86-bd98db74d3c8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="math">
-      <UniqueIdentifier>{d46782e8-fa86-46be-8e3e-728d313acfed}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scripting">
-      <UniqueIdentifier>{3a94ee03-c8db-4d2e-b0b6-5f6ba157580d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="io">
-      <UniqueIdentifier>{6eb6ffb5-ecd9-408b-a2f4-c14837822850}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="io\binding">
-      <UniqueIdentifier>{b4b078e1-bb8d-4cb3-84b9-963e851be123}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="threading">
-      <UniqueIdentifier>{d617f453-4cd1-451b-801d-2f88d0072303}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="threading\binding">
-      <UniqueIdentifier>{e63982e2-a2ca-4aa2-be11-f98659586c1f}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\exceptions\exception.cpp">
-      <Filter>exceptions</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\math\curve.cpp">
-      <Filter>math</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\math\functions.cpp">
-      <Filter>math</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\math\matrix44.cpp">
-      <Filter>math</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\math\ranged_value.cpp">
-      <Filter>math</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\math\transform.cpp">
-      <Filter>math</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\utils_module.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\stringmap.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\binding\_data_buffer.cpp">
-      <Filter>io\binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\binding\_file_system.cpp">
-      <Filter>io\binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\data_buffer.cpp">
-      <Filter>io</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\decoded_data.cpp">
-      <Filter>io</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\file_system.cpp">
-      <Filter>io</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\file_data.cpp">
-      <Filter>io</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\file.cpp">
-      <Filter>io</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\binding\_file.cpp">
-      <Filter>io\binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\binding\_file_data.cpp">
-      <Filter>io\binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\compressor.cpp">
-      <Filter>io</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\binding\_compressor.cpp">
-      <Filter>io\binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\coroutine.cpp">
-      <Filter>threading</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread.cpp">
-      <Filter>threading</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_posix.cpp">
-      <Filter>threading</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_sdl.cpp">
-      <Filter>threading</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_std.cpp">
-      <Filter>threading</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_win32.cpp">
-      <Filter>threading</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\io_task.cpp">
-      <Filter>io</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\mutex.cpp">
-      <Filter>threading</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\binding\_coroutine.cpp">
-      <Filter>threading\binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\binding\_thread.cpp">
-      <Filter>threading\binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\binding\_io_task.cpp">
-      <Filter>io\binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\math\quaternion.cpp">
-      <Filter>math</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\task.cpp">
-      <Filter>threading</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\thread_task.cpp">
-      <Filter>io</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\threading\semaphore.cpp">
-      <Filter>threading</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-utils\io\io_batch_task.cpp">
-      <Filter>io</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\exceptions\exception.h">
-      <Filter>exceptions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\math\curve.h">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\math\functions.h">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\math\matrix44.h">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\math\ranged_value.h">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\math\rect.hpp">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\math\transform.h">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\math\vector2.hpp">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\math\vector3.hpp">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\math\vector4.h">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\scripting\portable.hpp">
-      <Filter>scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\type.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\utils.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\utils_module.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\module.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\utils_config.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\manager.hpp" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\singleton.hpp" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\stringmap.hpp" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\io\data_buffer.h">
-      <Filter>io</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\io\decoded_data.h">
-      <Filter>io</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\io\file_system.h">
-      <Filter>io</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\io\reloadable.h">
-      <Filter>io</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\io\file_data.h">
-      <Filter>io</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\io\file.h">
-      <Filter>io</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\io\compressor.h">
-      <Filter>io</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\coroutine.h">
-      <Filter>threading</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread.h">
-      <Filter>threading</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_posix.h">
-      <Filter>threading</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_sdl.h">
-      <Filter>threading</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_std.h">
-      <Filter>threading</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread_impl_win32.h">
-      <Filter>threading</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\io\io_task.h">
-      <Filter>io</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\mutex.h">
-      <Filter>threading</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\math\quaternion.h">
-      <Filter>math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\scripting\lua_env.h">
-      <Filter>scripting</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\task.h">
-      <Filter>threading</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\thread_task.h">
-      <Filter>io</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\threading\semaphore.h">
-      <Filter>threading</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-utils\io\io_batch_task.h">
-      <Filter>io</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\source\libs\asura-lib-utils\math\rect.inl">
-      <Filter>math</Filter>
-    </None>
-    <None Include="..\..\..\source\libs\asura-lib-utils\math\vector2.inl">
-      <Filter>math</Filter>
-    </None>
-    <None Include="..\..\..\source\libs\asura-lib-utils\math\vector3.inl">
-      <Filter>math</Filter>
-    </None>
-    <None Include="..\..\..\source\libs\asura-lib-utils\math\vector4.inl">
-      <Filter>math</Filter>
-    </None>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/_compressor.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/_compressor.nativecodeanalysis.xml
deleted file mode 100644
index dcdf088..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/_compressor.nativecodeanalysis.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS></DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/_coroutine.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/_coroutine.nativecodeanalysis.xml
deleted file mode 100644
index dcdf088..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/_coroutine.nativecodeanalysis.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS></DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/_data_buffer.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/_data_buffer.nativecodeanalysis.xml
deleted file mode 100644
index dcdf088..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/_data_buffer.nativecodeanalysis.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS></DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/_file.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/_file.nativecodeanalysis.xml
deleted file mode 100644
index dcdf088..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/_file.nativecodeanalysis.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS></DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/_file_data.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/_file_data.nativecodeanalysis.xml
deleted file mode 100644
index dcdf088..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/_file_data.nativecodeanalysis.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS></DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/_file_system.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/_file_system.nativecodeanalysis.xml
deleted file mode 100644
index 7afbf43..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/_file_system.nativecodeanalysis.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\io\</FILEPATH>
-      <FILENAME>file_system.h</FILENAME>
-      <LINE>105</LINE>
-      <COLUMN>2</COLUMN>
-    </SFA>
-    <DEFECTCODE>26495</DEFECTCODE>
-    <DESCRIPTION>Variable 'AsuraEngine::IO::Filesystem::mInited' is uninitialized. Always initialize a member variable (type.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::IO::Filesystem::{ctor}</FUNCTION>
-    <DECORATED>??0Filesystem@IO@AsuraEngine@@QEAA@XZ</DECORATED>
-    <FUNCLINE>105</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\</FILEPATH>
-      <FILENAME>singleton.hpp</FILENAME>
-      <LINE>33</LINE>
-      <COLUMN>2</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Singleton&lt;AsuraEngine::IO::Filesystem&gt;::{ctor}</FUNCTION>
-    <DECORATED>??0?$Singleton@VFilesystem@IO@AsuraEngine@@@AsuraEngine@@IEAA@XZ</DECORATED>
-    <FUNCLINE>33</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_class.inl</FILENAME>
-      <LINE>79</LINE>
-      <COLUMN>21</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxNativeClass&lt;AsuraEngine::IO::Filesystem&gt;::{ctor}</FUNCTION>
-    <DECORATED>??0?$LuaxNativeClass@VFilesystem@IO@AsuraEngine@@@Luax@@IEAA@XZ</DECORATED>
-    <FUNCLINE>79</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_class.inl</FILENAME>
-      <LINE>100</LINE>
-      <COLUMN>32</COLUMN>
-    </SFA>
-    <DEFECTCODE>26451</DEFECTCODE>
-    <DESCRIPTION>Arithmetic overflow: Using operator '+' on a 4 byte value and then casting the result to a 8 byte value. Cast the value to the wider type before calling operator '+' to avoid overflow (io.2).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxNativeClass&lt;AsuraEngine::IO::Filesystem&gt;::LuaxRetain</FUNCTION>
-    <DECORATED>??$LuaxRetain@VDataBuffer@IO@AsuraEngine@@@?$LuaxNativeClass@VFilesystem@IO@AsuraEngine@@@Luax@@QEAAXAEAVLuaxState@1@PEAVDataBuffer@IO@AsuraEngine@@@Z</DECORATED>
-    <FUNCLINE>90</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-</DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/_thread.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/_thread.nativecodeanalysis.xml
deleted file mode 100644
index 82cf7f3..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/_thread.nativecodeanalysis.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>mutex.h</FILENAME>
-      <LINE>39</LINE>
-      <COLUMN>3</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::MutexImpl::{ctor}</FUNCTION>
-    <DECORATED>??0MutexImpl@Threading@AsuraEngine@@QEAA@XZ</DECORATED>
-    <FUNCLINE>39</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>thread.h</FILENAME>
-      <LINE>90</LINE>
-      <COLUMN>3</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::ThreadImpl::{ctor}</FUNCTION>
-    <DECORATED>??0ThreadImpl@Threading@AsuraEngine@@QEAA@XZ</DECORATED>
-    <FUNCLINE>90</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-</DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/compressor.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/compressor.nativecodeanalysis.xml
deleted file mode 100644
index dcdf088..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/compressor.nativecodeanalysis.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS></DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/coroutine.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/coroutine.nativecodeanalysis.xml
deleted file mode 100644
index dcdf088..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/coroutine.nativecodeanalysis.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS></DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/curve.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/curve.nativecodeanalysis.xml
deleted file mode 100644
index dcdf088..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/curve.nativecodeanalysis.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS></DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/data_buffer.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/data_buffer.nativecodeanalysis.xml
deleted file mode 100644
index b304bdf..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/data_buffer.nativecodeanalysis.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\io\</FILEPATH>
-      <FILENAME>data_buffer.cpp</FILENAME>
-      <LINE>10</LINE>
-      <COLUMN>14</COLUMN>
-    </SFA>
-    <DEFECTCODE>26495</DEFECTCODE>
-    <DESCRIPTION>Variable 'AsuraEngine::IO::DataBuffer::mBytes' is uninitialized. Always initialize a member variable (type.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::IO::DataBuffer::{ctor}</FUNCTION>
-    <DECORATED>??0DataBuffer@IO@AsuraEngine@@QEAA@AEAV012@@Z</DECORATED>
-    <FUNCLINE>10</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\io\</FILEPATH>
-      <FILENAME>data_buffer.cpp</FILENAME>
-      <LINE>10</LINE>
-      <COLUMN>14</COLUMN>
-    </SFA>
-    <DEFECTCODE>26495</DEFECTCODE>
-    <DESCRIPTION>Variable 'AsuraEngine::IO::DataBuffer::mSize' is uninitialized. Always initialize a member variable (type.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::IO::DataBuffer::{ctor}</FUNCTION>
-    <DECORATED>??0DataBuffer@IO@AsuraEngine@@QEAA@AEAV012@@Z</DECORATED>
-    <FUNCLINE>10</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_class.inl</FILENAME>
-      <LINE>79</LINE>
-      <COLUMN>21</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxNativeClass&lt;AsuraEngine::IO::DataBuffer&gt;::{ctor}</FUNCTION>
-    <DECORATED>??0?$LuaxNativeClass@VDataBuffer@IO@AsuraEngine@@@Luax@@IEAA@XZ</DECORATED>
-    <FUNCLINE>79</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-</DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/decoded_data.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/decoded_data.nativecodeanalysis.xml
deleted file mode 100644
index dcdf088..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/decoded_data.nativecodeanalysis.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS></DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/exception.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/exception.nativecodeanalysis.xml
deleted file mode 100644
index 88ba25d..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/exception.nativecodeanalysis.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\exceptions\</FILEPATH>
-      <FILENAME>exception.cpp</FILENAME>
-      <LINE>43</LINE>
-      <COLUMN>13</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Exception::{dtor}</FUNCTION>
-    <DECORATED>??1Exception@AsuraEngine@@UEAA@XZ</DECORATED>
-    <FUNCLINE>43</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-</DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/file.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/file.nativecodeanalysis.xml
deleted file mode 100644
index f60a0ab..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/file.nativecodeanalysis.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_class.inl</FILENAME>
-      <LINE>79</LINE>
-      <COLUMN>21</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxNativeClass&lt;AsuraEngine::IO::File&gt;::{ctor}</FUNCTION>
-    <DECORATED>??0?$LuaxNativeClass@VFile@IO@AsuraEngine@@@Luax@@IEAA@XZ</DECORATED>
-    <FUNCLINE>79</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-</DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/file_data.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/file_data.nativecodeanalysis.xml
deleted file mode 100644
index eb30e9f..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/file_data.nativecodeanalysis.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_class.inl</FILENAME>
-      <LINE>79</LINE>
-      <COLUMN>21</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxNativeClass&lt;AsuraEngine::IO::FileData&gt;::{ctor}</FUNCTION>
-    <DECORATED>??0?$LuaxNativeClass@VFileData@IO@AsuraEngine@@@Luax@@IEAA@XZ</DECORATED>
-    <FUNCLINE>79</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-</DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/file_system.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/file_system.nativecodeanalysis.xml
deleted file mode 100644
index 16b04cf..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/file_system.nativecodeanalysis.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\io\</FILEPATH>
-      <FILENAME>file_system.cpp</FILENAME>
-      <LINE>67</LINE>
-      <COLUMN>14</COLUMN>
-    </SFA>
-    <DEFECTCODE>26444</DEFECTCODE>
-    <DESCRIPTION>Avoid unnamed objects with custom construction and destruction (es.84).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::IO::Filesystem::Unmount</FUNCTION>
-    <DECORATED>?Unmount@Filesystem@IO@AsuraEngine@@QEAA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z</DECORATED>
-    <FUNCLINE>58</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-</DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/functions.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/functions.nativecodeanalysis.xml
deleted file mode 100644
index dcdf088..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/functions.nativecodeanalysis.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS></DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/io_task.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/io_task.nativecodeanalysis.xml
deleted file mode 100644
index dcdf088..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/io_task.nativecodeanalysis.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS></DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/matrix44.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/matrix44.nativecodeanalysis.xml
deleted file mode 100644
index dcdf088..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/matrix44.nativecodeanalysis.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS></DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/mutex.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/mutex.nativecodeanalysis.xml
deleted file mode 100644
index 75c9214..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/mutex.nativecodeanalysis.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>mutex.h</FILENAME>
-      <LINE>39</LINE>
-      <COLUMN>3</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::MutexImpl::{ctor}</FUNCTION>
-    <DECORATED>??0MutexImpl@Threading@AsuraEngine@@QEAA@XZ</DECORATED>
-    <FUNCLINE>39</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>mutex.cpp</FILENAME>
-      <LINE>23</LINE>
-      <COLUMN>9</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::Mutex::{ctor}</FUNCTION>
-    <DECORATED>??0Mutex@Threading@AsuraEngine@@QEAA@XZ</DECORATED>
-    <FUNCLINE>23</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>mutex.cpp</FILENAME>
-      <LINE>52</LINE>
-      <COLUMN>18</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::MutexImplWin32::{ctor}</FUNCTION>
-    <DECORATED>??0MutexImplWin32@Threading@AsuraEngine@@QEAA@XZ</DECORATED>
-    <FUNCLINE>52</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-</DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/ranged_value.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/ranged_value.nativecodeanalysis.xml
deleted file mode 100644
index dcdf088..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/ranged_value.nativecodeanalysis.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS></DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/stringmap.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/stringmap.nativecodeanalysis.xml
deleted file mode 100644
index dcdf088..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/stringmap.nativecodeanalysis.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS></DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/thread.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/thread.nativecodeanalysis.xml
deleted file mode 100644
index c661cd5..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/thread.nativecodeanalysis.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>mutex.h</FILENAME>
-      <LINE>39</LINE>
-      <COLUMN>3</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::MutexImpl::{ctor}</FUNCTION>
-    <DECORATED>??0MutexImpl@Threading@AsuraEngine@@QEAA@XZ</DECORATED>
-    <FUNCLINE>39</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>thread.h</FILENAME>
-      <LINE>90</LINE>
-      <COLUMN>3</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::ThreadImpl::{ctor}</FUNCTION>
-    <DECORATED>??0ThreadImpl@Threading@AsuraEngine@@QEAA@XZ</DECORATED>
-    <FUNCLINE>90</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>thread.cpp</FILENAME>
-      <LINE>13</LINE>
-      <COLUMN>10</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::Thread::{ctor}</FUNCTION>
-    <DECORATED>??0Thread@Threading@AsuraEngine@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z</DECORATED>
-    <FUNCLINE>13</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>thread.cpp</FILENAME>
-      <LINE>13</LINE>
-      <COLUMN>10</COLUMN>
-    </SFA>
-    <DEFECTCODE>26495</DEFECTCODE>
-    <DESCRIPTION>Variable 'AsuraEngine::Threading::Thread::mImpl' is uninitialized. Always initialize a member variable (type.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::Thread::{ctor}</FUNCTION>
-    <DECORATED>??0Thread@Threading@AsuraEngine@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z</DECORATED>
-    <FUNCLINE>13</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_class.inl</FILENAME>
-      <LINE>79</LINE>
-      <COLUMN>21</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxNativeClass&lt;AsuraEngine::Threading::Thread&gt;::{ctor}</FUNCTION>
-    <DECORATED>??0?$LuaxNativeClass@VThread@Threading@AsuraEngine@@@Luax@@IEAA@XZ</DECORATED>
-    <FUNCLINE>79</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-</DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/thread_impl_posix.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/thread_impl_posix.nativecodeanalysis.xml
deleted file mode 100644
index dcdf088..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/thread_impl_posix.nativecodeanalysis.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS></DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/thread_impl_sdl.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/thread_impl_sdl.nativecodeanalysis.xml
deleted file mode 100644
index dcdf088..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/thread_impl_sdl.nativecodeanalysis.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS></DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/thread_impl_std.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/thread_impl_std.nativecodeanalysis.xml
deleted file mode 100644
index dcdf088..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/thread_impl_std.nativecodeanalysis.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS></DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/thread_impl_win32.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/thread_impl_win32.nativecodeanalysis.xml
deleted file mode 100644
index e0b1c6b..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/thread_impl_win32.nativecodeanalysis.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>mutex.h</FILENAME>
-      <LINE>39</LINE>
-      <COLUMN>3</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::MutexImpl::{ctor}</FUNCTION>
-    <DECORATED>??0MutexImpl@Threading@AsuraEngine@@QEAA@XZ</DECORATED>
-    <FUNCLINE>39</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>thread.h</FILENAME>
-      <LINE>90</LINE>
-      <COLUMN>3</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::ThreadImpl::{ctor}</FUNCTION>
-    <DECORATED>??0ThreadImpl@Threading@AsuraEngine@@QEAA@XZ</DECORATED>
-    <FUNCLINE>90</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>thread_impl_win32.cpp</FILENAME>
-      <LINE>16</LINE>
-      <COLUMN>19</COLUMN>
-    </SFA>
-    <DEFECTCODE>26495</DEFECTCODE>
-    <DESCRIPTION>Variable 'AsuraEngine::Threading::ThreadImplWin32::mHandle' is uninitialized. Always initialize a member variable (type.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::ThreadImplWin32::{ctor}</FUNCTION>
-    <DECORATED>??0ThreadImplWin32@Threading@AsuraEngine@@QEAA@XZ</DECORATED>
-    <FUNCLINE>16</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>thread_impl_win32.cpp</FILENAME>
-      <LINE>16</LINE>
-      <COLUMN>19</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::ThreadImplWin32::{ctor}</FUNCTION>
-    <DECORATED>??0ThreadImplWin32@Threading@AsuraEngine@@QEAA@XZ</DECORATED>
-    <FUNCLINE>16</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>thread_impl_win32.cpp</FILENAME>
-      <LINE>49</LINE>
-      <COLUMN>20</COLUMN>
-    </SFA>
-    <DEFECTCODE>6258</DEFECTCODE>
-    <DESCRIPTION>使用 TerminateThread 将不允许进行适当的线程清理。</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::ThreadImplWin32::Kill</FUNCTION>
-    <DECORATED>?Kill@ThreadImplWin32@Threading@AsuraEngine@@UEAAXXZ</DECORATED>
-    <FUNCLINE>47</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-</DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/thread_task.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/thread_task.nativecodeanalysis.xml
deleted file mode 100644
index dcdf088..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/thread_task.nativecodeanalysis.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS></DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/transform.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/transform.nativecodeanalysis.xml
deleted file mode 100644
index dcdf088..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/transform.nativecodeanalysis.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS></DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/utils_module.nativecodeanalysis.xml b/build/libs/asura-lib-utils/x64/Debug/utils_module.nativecodeanalysis.xml
deleted file mode 100644
index 82cf7f3..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/utils_module.nativecodeanalysis.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>mutex.h</FILENAME>
-      <LINE>39</LINE>
-      <COLUMN>3</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::MutexImpl::{ctor}</FUNCTION>
-    <DECORATED>??0MutexImpl@Threading@AsuraEngine@@QEAA@XZ</DECORATED>
-    <FUNCLINE>39</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>thread.h</FILENAME>
-      <LINE>90</LINE>
-      <COLUMN>3</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::ThreadImpl::{ctor}</FUNCTION>
-    <DECORATED>??0ThreadImpl@Threading@AsuraEngine@@QEAA@XZ</DECORATED>
-    <FUNCLINE>90</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-</DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-utils/x64/Debug/vc.nativecodeanalysis.all.xml b/build/libs/asura-lib-utils/x64/Debug/vc.nativecodeanalysis.all.xml
deleted file mode 100644
index 34e76e9..0000000
--- a/build/libs/asura-lib-utils/x64/Debug/vc.nativecodeanalysis.all.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><DEFECTS><DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\exceptions\</FILEPATH>
-      <FILENAME>exception.cpp</FILENAME>
-      <LINE>43</LINE>
-      <COLUMN>13</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Exception::{dtor}</FUNCTION>
-    <DECORATED>??1Exception@AsuraEngine@@UEAA@XZ</DECORATED>
-    <FUNCLINE>43</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT><DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\io\</FILEPATH>
-      <FILENAME>file_system.h</FILENAME>
-      <LINE>105</LINE>
-      <COLUMN>2</COLUMN>
-    </SFA>
-    <DEFECTCODE>26495</DEFECTCODE>
-    <DESCRIPTION>Variable 'AsuraEngine::IO::Filesystem::mInited' is uninitialized. Always initialize a member variable (type.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::IO::Filesystem::{ctor}</FUNCTION>
-    <DECORATED>??0Filesystem@IO@AsuraEngine@@QEAA@XZ</DECORATED>
-    <FUNCLINE>105</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT><DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\</FILEPATH>
-      <FILENAME>singleton.hpp</FILENAME>
-      <LINE>33</LINE>
-      <COLUMN>2</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Singleton&lt;AsuraEngine::IO::Filesystem&gt;::{ctor}</FUNCTION>
-    <DECORATED>??0?$Singleton@VFilesystem@IO@AsuraEngine@@@AsuraEngine@@IEAA@XZ</DECORATED>
-    <FUNCLINE>33</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT><DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_class.inl</FILENAME>
-      <LINE>79</LINE>
-      <COLUMN>21</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxNativeClass&lt;AsuraEngine::IO::Filesystem&gt;::{ctor}</FUNCTION>
-    <DECORATED>??0?$LuaxNativeClass@VFilesystem@IO@AsuraEngine@@@Luax@@IEAA@XZ</DECORATED>
-    <FUNCLINE>79</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT><DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\3rd-party\luax\</FILEPATH>
-      <FILENAME>luax_class.inl</FILENAME>
-      <LINE>100</LINE>
-      <COLUMN>32</COLUMN>
-    </SFA>
-    <DEFECTCODE>26451</DEFECTCODE>
-    <DESCRIPTION>Arithmetic overflow: Using operator '+' on a 4 byte value and then casting the result to a 8 byte value. Cast the value to the wider type before calling operator '+' to avoid overflow (io.2).</DESCRIPTION>
-    <FUNCTION>Luax::LuaxNativeClass&lt;AsuraEngine::IO::Filesystem&gt;::LuaxRetain</FUNCTION>
-    <DECORATED>??$LuaxRetain@VDataBuffer@IO@AsuraEngine@@@?$LuaxNativeClass@VFilesystem@IO@AsuraEngine@@@Luax@@QEAAXAEAVLuaxState@1@PEAVDataBuffer@IO@AsuraEngine@@@Z</DECORATED>
-    <FUNCLINE>90</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT><DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\io\</FILEPATH>
-      <FILENAME>data_buffer.cpp</FILENAME>
-      <LINE>10</LINE>
-      <COLUMN>14</COLUMN>
-    </SFA>
-    <DEFECTCODE>26495</DEFECTCODE>
-    <DESCRIPTION>Variable 'AsuraEngine::IO::DataBuffer::mBytes' is uninitialized. Always initialize a member variable (type.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::IO::DataBuffer::{ctor}</FUNCTION>
-    <DECORATED>??0DataBuffer@IO@AsuraEngine@@QEAA@AEAV012@@Z</DECORATED>
-    <FUNCLINE>10</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT><DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\io\</FILEPATH>
-      <FILENAME>file_system.cpp</FILENAME>
-      <LINE>67</LINE>
-      <COLUMN>14</COLUMN>
-    </SFA>
-    <DEFECTCODE>26444</DEFECTCODE>
-    <DESCRIPTION>Avoid unnamed objects with custom construction and destruction (es.84).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::IO::Filesystem::Unmount</FUNCTION>
-    <DECORATED>?Unmount@Filesystem@IO@AsuraEngine@@QEAA_NAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z</DECORATED>
-    <FUNCLINE>58</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT><DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>mutex.h</FILENAME>
-      <LINE>39</LINE>
-      <COLUMN>3</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::MutexImpl::{ctor}</FUNCTION>
-    <DECORATED>??0MutexImpl@Threading@AsuraEngine@@QEAA@XZ</DECORATED>
-    <FUNCLINE>39</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT><DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>thread.h</FILENAME>
-      <LINE>90</LINE>
-      <COLUMN>3</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::ThreadImpl::{ctor}</FUNCTION>
-    <DECORATED>??0ThreadImpl@Threading@AsuraEngine@@QEAA@XZ</DECORATED>
-    <FUNCLINE>90</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT><DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>mutex.cpp</FILENAME>
-      <LINE>23</LINE>
-      <COLUMN>9</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::Mutex::{ctor}</FUNCTION>
-    <DECORATED>??0Mutex@Threading@AsuraEngine@@QEAA@XZ</DECORATED>
-    <FUNCLINE>23</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT><DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>mutex.cpp</FILENAME>
-      <LINE>52</LINE>
-      <COLUMN>18</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::MutexImplWin32::{ctor}</FUNCTION>
-    <DECORATED>??0MutexImplWin32@Threading@AsuraEngine@@QEAA@XZ</DECORATED>
-    <FUNCLINE>52</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT><DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>thread.cpp</FILENAME>
-      <LINE>13</LINE>
-      <COLUMN>10</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::Thread::{ctor}</FUNCTION>
-    <DECORATED>??0Thread@Threading@AsuraEngine@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z</DECORATED>
-    <FUNCLINE>13</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT><DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>thread.cpp</FILENAME>
-      <LINE>13</LINE>
-      <COLUMN>10</COLUMN>
-    </SFA>
-    <DEFECTCODE>26495</DEFECTCODE>
-    <DESCRIPTION>Variable 'AsuraEngine::Threading::Thread::mImpl' is uninitialized. Always initialize a member variable (type.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::Thread::{ctor}</FUNCTION>
-    <DECORATED>??0Thread@Threading@AsuraEngine@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z</DECORATED>
-    <FUNCLINE>13</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT><DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>thread_impl_win32.cpp</FILENAME>
-      <LINE>16</LINE>
-      <COLUMN>19</COLUMN>
-    </SFA>
-    <DEFECTCODE>26495</DEFECTCODE>
-    <DESCRIPTION>Variable 'AsuraEngine::Threading::ThreadImplWin32::mHandle' is uninitialized. Always initialize a member variable (type.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::ThreadImplWin32::{ctor}</FUNCTION>
-    <DECORATED>??0ThreadImplWin32@Threading@AsuraEngine@@QEAA@XZ</DECORATED>
-    <FUNCLINE>16</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT><DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>thread_impl_win32.cpp</FILENAME>
-      <LINE>16</LINE>
-      <COLUMN>19</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::ThreadImplWin32::{ctor}</FUNCTION>
-    <DECORATED>??0ThreadImplWin32@Threading@AsuraEngine@@QEAA@XZ</DECORATED>
-    <FUNCLINE>16</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT><DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>thread_impl_win32.cpp</FILENAME>
-      <LINE>49</LINE>
-      <COLUMN>20</COLUMN>
-    </SFA>
-    <DEFECTCODE>6258</DEFECTCODE>
-    <DESCRIPTION>使用 TerminateThread 将不允许进行适当的线程清理。</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::ThreadImplWin32::Kill</FUNCTION>
-    <DECORATED>?Kill@ThreadImplWin32@Threading@AsuraEngine@@UEAAXXZ</DECORATED>
-    <FUNCLINE>47</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT></DEFECTS>
\ No newline at end of file
diff --git a/build/libs/asura-lib-xml/asura-lib-xml.vcxproj.user b/build/libs/asura-lib-xml/asura-lib-xml.vcxproj.user
deleted file mode 100644
index be25078..0000000
--- a/build/libs/asura-lib-xml/asura-lib-xml.vcxproj.user
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
-</Project>
\ No newline at end of file
diff --git a/build/libs/asura-lib-box2d/asura-lib-box2d.vcxproj b/build/modules/asura-box2d/asura-box2d.vcxproj
index 8ad3c71..8ad3c71 100644
--- a/build/libs/asura-lib-box2d/asura-lib-box2d.vcxproj
+++ b/build/modules/asura-box2d/asura-box2d.vcxproj
diff --git a/build/libs/asura-lib-box2d/asura-lib-box2d.vcxproj.filters b/build/modules/asura-box2d/asura-box2d.vcxproj.filters
index 9cd8510..9cd8510 100644
--- a/build/libs/asura-lib-box2d/asura-lib-box2d.vcxproj.filters
+++ b/build/modules/asura-box2d/asura-box2d.vcxproj.filters
diff --git a/build/libs/asura-lib-box2d/asura-lib-box2d.vcxproj.user b/build/modules/asura-box2d/asura-box2d.vcxproj.user
index be25078..be25078 100644
--- a/build/libs/asura-lib-box2d/asura-lib-box2d.vcxproj.user
+++ b/build/modules/asura-box2d/asura-box2d.vcxproj.user
diff --git a/build/modules/asura-core/asura-core.vcxproj b/build/modules/asura-core/asura-core.vcxproj
new file mode 100644
index 0000000..c01c3db
--- /dev/null
+++ b/build/modules/asura-core/asura-core.vcxproj
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{29A6837A-67FA-403F-83FD-E7975649404F}</ProjectGuid>
+    <RootNamespace>asuracore</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\source\modules\asura-core\application.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\core_module.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\font\glyph.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\font\string.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\font\ttf.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_canvas.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_color.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_color32.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_image.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_image_data.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_image_decode_task.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_mesh2d.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_shader.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_sprite_batch.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_window.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\canvas.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\color.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\color32.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\gif.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\gl.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\image.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\image_data.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\image_decode_task.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\mesh2d.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\mesh2d_data.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\png_decoder.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\quad.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\render_target.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\shader.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\shape.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\sprite_batch.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\stb_decoder.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\texture.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\input\clipboard.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\input\cursor.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\input\cursor_impl_sdl.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\input\keyboard.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\input\mouse.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\profiler\stats.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\time\timer.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\window\window.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\window\window_impl_glew.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\window\window_impl_glut.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\window\window_impl_sdl.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\source\modules\asura-core\application.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\core_config.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\core_module.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\font\glyph.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\font\string.hpp" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\font\ttf.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\font\utf.hpp" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\blend_mode.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\canvas.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\color.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\color32.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\color_palette.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\gif.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\gl.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\image.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\image_data.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\image_decoder.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\image_decode_task.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\mesh2d.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\mesh2d_data.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\pixel_format.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\png_decoder.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\quad.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\render_state.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\render_target.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\shader.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\shape.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\sprite_batch.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\stb_decoder.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\texture.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\clipboard.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\cursor.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\cursor_impl_sdl.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\event.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\input_device.hpp" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\joypad.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\keyboard.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\mouse.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\profiler\stats.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\time\timer.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\type.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\window\window.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\window\window_impl_glew.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\window\window_impl_glut.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\window\window_impl_sdl.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\source\modules\asura-core\font\string.inl" />
+    <None Include="..\..\..\source\modules\asura-core\font\utf.inl" />
+    <None Include="..\..\..\source\modules\asura-core\input\cursor.defs" />
+    <None Include="..\..\..\source\modules\asura-core\input\keyboard.defs" />
+    <None Include="..\..\..\source\modules\asura-core\input\mouse.defs" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/build/modules/asura-core/asura-core.vcxproj.filters b/build/modules/asura-core/asura-core.vcxproj.filters
new file mode 100644
index 0000000..5bbd204
--- /dev/null
+++ b/build/modules/asura-core/asura-core.vcxproj.filters
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="graphics">
+      <UniqueIdentifier>{a338aae6-b932-4a59-9a2e-f07283aaea64}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="input">
+      <UniqueIdentifier>{18c6a104-a8f9-4794-80a0-2fe9afdfca3e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="profiler">
+      <UniqueIdentifier>{1a6ed8b6-908c-458d-a036-1ff57db1248a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="font">
+      <UniqueIdentifier>{3a06866e-ed35-485f-94a5-548b522fd1f4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="time">
+      <UniqueIdentifier>{81dedac2-8d27-4c19-bf40-1503f0dbad1b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="graphics\binding">
+      <UniqueIdentifier>{4f6b2c19-1a06-48c9-b89d-52fa27bec5c1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="window">
+      <UniqueIdentifier>{7a73607c-8da6-4865-a992-5c7c8764bd5a}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\source\modules\asura-core\application.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\canvas.cpp">
+      <Filter>graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\color.cpp">
+      <Filter>graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\gif.cpp">
+      <Filter>graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\gl.cpp">
+      <Filter>graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\image.cpp">
+      <Filter>graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\image_data.cpp">
+      <Filter>graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\mesh2d.cpp">
+      <Filter>graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\mesh2d_data.cpp">
+      <Filter>graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\png_decoder.cpp">
+      <Filter>graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\quad.cpp">
+      <Filter>graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\render_target.cpp">
+      <Filter>graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\shader.cpp">
+      <Filter>graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\shape.cpp">
+      <Filter>graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\sprite_batch.cpp">
+      <Filter>graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\stb_decoder.cpp">
+      <Filter>graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\texture.cpp">
+      <Filter>graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\input\clipboard.cpp">
+      <Filter>input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\input\cursor.cpp">
+      <Filter>input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\input\keyboard.cpp">
+      <Filter>input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\input\mouse.cpp">
+      <Filter>input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\font\glyph.cpp">
+      <Filter>font</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\font\string.cpp">
+      <Filter>font</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\font\ttf.cpp">
+      <Filter>font</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\time\timer.cpp">
+      <Filter>time</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\profiler\stats.cpp">
+      <Filter>profiler</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\core_module.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\color32.cpp">
+      <Filter>graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\input\cursor_impl_sdl.cpp">
+      <Filter>input</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\image_decode_task.cpp">
+      <Filter>graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_canvas.cpp">
+      <Filter>graphics\binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_color.cpp">
+      <Filter>graphics\binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_color32.cpp">
+      <Filter>graphics\binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_image.cpp">
+      <Filter>graphics\binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_image_data.cpp">
+      <Filter>graphics\binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_image_decode_task.cpp">
+      <Filter>graphics\binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_mesh2d.cpp">
+      <Filter>graphics\binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_shader.cpp">
+      <Filter>graphics\binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_sprite_batch.cpp">
+      <Filter>graphics\binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\graphics\binding\_window.cpp">
+      <Filter>graphics\binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\window\window.cpp">
+      <Filter>window</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\window\window_impl_glew.cpp">
+      <Filter>window</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\window\window_impl_glut.cpp">
+      <Filter>window</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\window\window_impl_sdl.cpp">
+      <Filter>window</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\source\modules\asura-core\application.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\blend_mode.h">
+      <Filter>graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\canvas.h">
+      <Filter>graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\color.h">
+      <Filter>graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\color_palette.h">
+      <Filter>graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\gif.h">
+      <Filter>graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\gl.h">
+      <Filter>graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\image.h">
+      <Filter>graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\image_data.h">
+      <Filter>graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\image_decoder.h">
+      <Filter>graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\mesh2d.h">
+      <Filter>graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\mesh2d_data.h">
+      <Filter>graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\pixel_format.h">
+      <Filter>graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\png_decoder.h">
+      <Filter>graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\quad.h">
+      <Filter>graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\render_state.h">
+      <Filter>graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\render_target.h">
+      <Filter>graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\shader.h">
+      <Filter>graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\shape.h">
+      <Filter>graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\sprite_batch.h">
+      <Filter>graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\stb_decoder.h">
+      <Filter>graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\texture.h">
+      <Filter>graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\clipboard.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\cursor.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\input_device.hpp">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\keyboard.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\mouse.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\font\glyph.h">
+      <Filter>font</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\font\string.hpp">
+      <Filter>font</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\font\ttf.h">
+      <Filter>font</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\font\utf.hpp">
+      <Filter>font</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\time\timer.h">
+      <Filter>time</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\profiler\stats.h">
+      <Filter>profiler</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\core_module.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\type.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\core_config.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\event.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\joypad.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\color32.h">
+      <Filter>graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\input\cursor_impl_sdl.h">
+      <Filter>input</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\graphics\image_decode_task.h">
+      <Filter>graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\window\window_impl_sdl.h">
+      <Filter>window</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\window\window.h">
+      <Filter>window</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\window\window_impl_glew.h">
+      <Filter>window</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-core\window\window_impl_glut.h">
+      <Filter>window</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\source\modules\asura-core\font\string.inl">
+      <Filter>font</Filter>
+    </None>
+    <None Include="..\..\..\source\modules\asura-core\font\utf.inl">
+      <Filter>font</Filter>
+    </None>
+    <None Include="..\..\..\source\modules\asura-core\input\cursor.defs">
+      <Filter>input</Filter>
+    </None>
+    <None Include="..\..\..\source\modules\asura-core\input\keyboard.defs">
+      <Filter>input</Filter>
+    </None>
+    <None Include="..\..\..\source\modules\asura-core\input\mouse.defs">
+      <Filter>input</Filter>
+    </None>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/build/libs/asura-lib-core/asura-lib-core.vcxproj.user b/build/modules/asura-core/asura-core.vcxproj.user
index be25078..be25078 100644
--- a/build/libs/asura-lib-core/asura-lib-core.vcxproj.user
+++ b/build/modules/asura-core/asura-core.vcxproj.user
diff --git a/build/libs/asura-lib-framework/asura-lib-framework.vcxproj b/build/modules/asura-framework/asura-framework.vcxproj
index d2995e8..d2995e8 100644
--- a/build/libs/asura-lib-framework/asura-lib-framework.vcxproj
+++ b/build/modules/asura-framework/asura-framework.vcxproj
diff --git a/build/libs/asura-lib-framework/asura-lib-framework.vcxproj.filters b/build/modules/asura-framework/asura-framework.vcxproj.filters
index 3c6f4fd..3c6f4fd 100644
--- a/build/libs/asura-lib-framework/asura-lib-framework.vcxproj.filters
+++ b/build/modules/asura-framework/asura-framework.vcxproj.filters
diff --git a/build/libs/asura-lib-framework/asura-lib-framework.vcxproj.user b/build/modules/asura-framework/asura-framework.vcxproj.user
index be25078..be25078 100644
--- a/build/libs/asura-lib-framework/asura-lib-framework.vcxproj.user
+++ b/build/modules/asura-framework/asura-framework.vcxproj.user
diff --git a/build/libs/asura-lib-http/asura-lib-http.vcxproj b/build/modules/asura-http/asura-http.vcxproj
index bf15337..bf15337 100644
--- a/build/libs/asura-lib-http/asura-lib-http.vcxproj
+++ b/build/modules/asura-http/asura-http.vcxproj
diff --git a/build/libs/asura-lib-http/asura-lib-http.vcxproj.filters b/build/modules/asura-http/asura-http.vcxproj.filters
index 3c6f4fd..3c6f4fd 100644
--- a/build/libs/asura-lib-http/asura-lib-http.vcxproj.filters
+++ b/build/modules/asura-http/asura-http.vcxproj.filters
diff --git a/build/libs/asura-lib-http/asura-lib-http.vcxproj.user b/build/modules/asura-http/asura-http.vcxproj.user
index be25078..be25078 100644
--- a/build/libs/asura-lib-http/asura-lib-http.vcxproj.user
+++ b/build/modules/asura-http/asura-http.vcxproj.user
diff --git a/build/libs/asura-lib-json/asura-lib-json.vcxproj b/build/modules/asura-json/asura-json.vcxproj
index 168ea89..755ca25 100644
--- a/build/libs/asura-lib-json/asura-lib-json.vcxproj
+++ b/build/modules/asura-json/asura-json.vcxproj
@@ -76,7 +76,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\libs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -109,7 +109,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\libs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -117,12 +117,12 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-json\json.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-json\json_module.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-json\json.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-json\json_module.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-json\json.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-json\json_module.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-json\json.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-json\json_module.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/build/modules/asura-json/asura-json.vcxproj.filters b/build/modules/asura-json/asura-json.vcxproj.filters
new file mode 100644
index 0000000..988e477
--- /dev/null
+++ b/build/modules/asura-json/asura-json.vcxproj.filters
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="..\..\..\source\modules\asura-json\json.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-json\json_module.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\source\modules\asura-json\json.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-json\json_module.h" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/build/libs/asura-lib-json/asura-lib-json.vcxproj.user b/build/modules/asura-json/asura-json.vcxproj.user
index be25078..be25078 100644
--- a/build/libs/asura-lib-json/asura-lib-json.vcxproj.user
+++ b/build/modules/asura-json/asura-json.vcxproj.user
diff --git a/build/libs/asura-lib-network/asura-lib-network.vcxproj b/build/modules/asura-network/asura-network.vcxproj
index 74dd2ae..957bce0 100644
--- a/build/libs/asura-lib-network/asura-lib-network.vcxproj
+++ b/build/modules/asura-network/asura-network.vcxproj
@@ -76,7 +76,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\libs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -109,7 +109,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\libs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
diff --git a/build/libs/asura-lib-network/asura-lib-network.vcxproj.filters b/build/modules/asura-network/asura-network.vcxproj.filters
index 9cd8510..9cd8510 100644
--- a/build/libs/asura-lib-network/asura-lib-network.vcxproj.filters
+++ b/build/modules/asura-network/asura-network.vcxproj.filters
diff --git a/build/libs/asura-lib-log/asura-lib-log.vcxproj.user b/build/modules/asura-network/asura-network.vcxproj.user
index be25078..be25078 100644
--- a/build/libs/asura-lib-log/asura-lib-log.vcxproj.user
+++ b/build/modules/asura-network/asura-network.vcxproj.user
diff --git a/build/libs/asura-lib-openal/asura-lib-openal.vcxproj b/build/modules/asura-openal/asura-openal.vcxproj
index 6ea6e0e..f29350e 100644
--- a/build/libs/asura-lib-openal/asura-lib-openal.vcxproj
+++ b/build/modules/asura-openal/asura-openal.vcxproj
@@ -76,7 +76,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\libs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -109,7 +109,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\libs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -117,14 +117,14 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\source\libs\asura-lib-openal\sound.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-openal\sound_decoder.cpp" />
-    <ClCompile Include="..\..\..\source\libs\asura-lib-openal\sound_decode_task.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-openal\sound.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-openal\sound_decoder.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-openal\sound_decode_task.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\source\libs\asura-lib-openal\sound.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-openal\sound_decoder.h" />
-    <ClInclude Include="..\..\..\source\libs\asura-lib-openal\sound_decode_task.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-openal\sound.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-openal\sound_decoder.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-openal\sound_decode_task.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/build/modules/asura-openal/asura-openal.vcxproj.filters b/build/modules/asura-openal/asura-openal.vcxproj.filters
new file mode 100644
index 0000000..7af022e
--- /dev/null
+++ b/build/modules/asura-openal/asura-openal.vcxproj.filters
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="..\..\..\source\modules\asura-openal\sound.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-openal\sound_decode_task.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-openal\sound_decoder.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\source\modules\asura-openal\sound.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-openal\sound_decoder.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-openal\sound_decode_task.h" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/build/libs/asura-lib-network/asura-lib-network.vcxproj.user b/build/modules/asura-openal/asura-openal.vcxproj.user
index be25078..be25078 100644
--- a/build/libs/asura-lib-network/asura-lib-network.vcxproj.user
+++ b/build/modules/asura-openal/asura-openal.vcxproj.user
diff --git a/build/libs/asura-lib-plot/asura-lib-plot.vcxproj b/build/modules/asura-plot/asura-plot.vcxproj
index b26fbaa..b26fbaa 100644
--- a/build/libs/asura-lib-plot/asura-lib-plot.vcxproj
+++ b/build/modules/asura-plot/asura-plot.vcxproj
diff --git a/build/libs/asura-lib-log/asura-lib-log.vcxproj.filters b/build/modules/asura-plot/asura-plot.vcxproj.filters
index 3c6f4fd..3c6f4fd 100644
--- a/build/libs/asura-lib-log/asura-lib-log.vcxproj.filters
+++ b/build/modules/asura-plot/asura-plot.vcxproj.filters
diff --git a/build/libs/asura-lib-openal/asura-lib-openal.vcxproj.user b/build/modules/asura-plot/asura-plot.vcxproj.user
index be25078..be25078 100644
--- a/build/libs/asura-lib-openal/asura-lib-openal.vcxproj.user
+++ b/build/modules/asura-plot/asura-plot.vcxproj.user
diff --git a/build/libs/asura-lib-socket/asura-lib-socket.vcxproj b/build/modules/asura-socket/asura-socket.vcxproj
index 4b7b44c..e272ece 100644
--- a/build/libs/asura-lib-socket/asura-lib-socket.vcxproj
+++ b/build/modules/asura-socket/asura-socket.vcxproj
@@ -21,7 +21,7 @@
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{FF8319D3-7ADC-41BC-A397-B31690A7AB5F}</ProjectGuid>
-    <RootNamespace>asuralibsocket</RootNamespace>
+    <RootNamespace>asuramodulesocket</RootNamespace>
     <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/build/libs/asura-lib-socket/asura-lib-socket.vcxproj.filters b/build/modules/asura-socket/asura-socket.vcxproj.filters
index 9cd8510..9cd8510 100644
--- a/build/libs/asura-lib-socket/asura-lib-socket.vcxproj.filters
+++ b/build/modules/asura-socket/asura-socket.vcxproj.filters
diff --git a/build/libs/asura-lib-plot/asura-lib-plot.vcxproj.user b/build/modules/asura-socket/asura-socket.vcxproj.user
index be25078..be25078 100644
--- a/build/libs/asura-lib-plot/asura-lib-plot.vcxproj.user
+++ b/build/modules/asura-socket/asura-socket.vcxproj.user
diff --git a/build/libs/asura-lib-steam/asura-lib-steam.vcxproj b/build/modules/asura-steam/asura-steam.vcxproj
index 5863f77..ba3825d 100644
--- a/build/libs/asura-lib-steam/asura-lib-steam.vcxproj
+++ b/build/modules/asura-steam/asura-steam.vcxproj
@@ -21,7 +21,7 @@
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{129C3826-B418-4C80-A126-0319C7E2A857}</ProjectGuid>
-    <RootNamespace>asuralibsteam</RootNamespace>
+    <RootNamespace>asuramodulesteam</RootNamespace>
     <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/build/libs/asura-lib-plot/asura-lib-plot.vcxproj.filters b/build/modules/asura-steam/asura-steam.vcxproj.filters
index 3c6f4fd..3c6f4fd 100644
--- a/build/libs/asura-lib-plot/asura-lib-plot.vcxproj.filters
+++ b/build/modules/asura-steam/asura-steam.vcxproj.filters
diff --git a/build/libs/asura-lib-socket/asura-lib-socket.vcxproj.user b/build/modules/asura-steam/asura-steam.vcxproj.user
index be25078..be25078 100644
--- a/build/libs/asura-lib-socket/asura-lib-socket.vcxproj.user
+++ b/build/modules/asura-steam/asura-steam.vcxproj.user
diff --git a/build/modules/asura-utils/asura-utils.vcxproj b/build/modules/asura-utils/asura-utils.vcxproj
new file mode 100644
index 0000000..f3227f6
--- /dev/null
+++ b/build/modules/asura-utils/asura-utils.vcxproj
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{7D41093F-E356-4C5B-A25F-41779BF86E54}</ProjectGuid>
+    <RootNamespace>asurautils</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir)..\Bin\win64</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)..\Bin\win64</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\exceptions\exception.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\io\binding\_compressor.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\io\binding\_data_buffer.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\io\binding\_file.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\io\binding\_file_data.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\io\binding\_file_system.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\io\binding\_io_task.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\io\compressor.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\io\data_buffer.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\io\decoded_data.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\io\file.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\io\file_data.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\io\file_system.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\io\io_batch_task.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\io\io_task.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\math\curve.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\math\functions.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\math\matrix44.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\math\quaternion.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\math\ranged_value.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\math\transform.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\stringmap.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\threading\binding\_coroutine.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\threading\binding\_thread.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\threading\coroutine.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\threading\mutex.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\threading\semaphore.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\threading\thread.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\threading\thread_impl_posix.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\threading\thread_impl_sdl.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\threading\thread_impl_std.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\threading\thread_impl_win32.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\threading\task.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\threading\thread_task.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\utils_module.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\exceptions\exception.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\io\compressor.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\io\data_buffer.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\io\decoded_data.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\io\file.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\io\file_data.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\io\file_system.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\io\io_batch_task.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\io\io_task.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\io\reloadable.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\manager.hpp" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\math\curve.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\math\functions.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\math\matrix44.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\math\quaternion.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\math\ranged_value.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\math\rect.hpp" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\math\transform.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\math\vector2.hpp" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\math\vector3.hpp" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\math\vector4.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\module.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\scripting\lua_env.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\scripting\portable.hpp" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\singleton.hpp" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\stringmap.hpp" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\threading\coroutine.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\threading\mutex.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\threading\semaphore.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\threading\thread.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\threading\thread_impl_posix.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\threading\thread_impl_sdl.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\threading\thread_impl_std.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\threading\thread_impl_win32.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\threading\task.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\threading\thread_task.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\type.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\utils.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\utils_config.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\utils_module.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\source\modules\asura-utils\math\rect.inl" />
+    <None Include="..\..\..\source\modules\asura-utils\math\vector2.inl" />
+    <None Include="..\..\..\source\modules\asura-utils\math\vector3.inl" />
+    <None Include="..\..\..\source\modules\asura-utils\math\vector4.inl" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\3rd-party\lua51\lua51.vcxproj">
+      <Project>{8b8fca14-fc8a-45b4-bf3c-9340cb586076}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\3rd-party\Luax\Luax.vcxproj">
+      <Project>{1350cee9-b2c2-426a-af4e-f651d51dd592}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\3rd-party\physfs\physfs.vcxproj">
+      <Project>{aee37589-de0d-4139-8bdb-8179fdefb835}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/build/modules/asura-utils/asura-utils.vcxproj.filters b/build/modules/asura-utils/asura-utils.vcxproj.filters
new file mode 100644
index 0000000..fd4711c
--- /dev/null
+++ b/build/modules/asura-utils/asura-utils.vcxproj.filters
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="exceptions">
+      <UniqueIdentifier>{30702383-d458-4486-8d86-bd98db74d3c8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="math">
+      <UniqueIdentifier>{d46782e8-fa86-46be-8e3e-728d313acfed}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="scripting">
+      <UniqueIdentifier>{3a94ee03-c8db-4d2e-b0b6-5f6ba157580d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="io">
+      <UniqueIdentifier>{6eb6ffb5-ecd9-408b-a2f4-c14837822850}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="io\binding">
+      <UniqueIdentifier>{b4b078e1-bb8d-4cb3-84b9-963e851be123}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="threading">
+      <UniqueIdentifier>{d617f453-4cd1-451b-801d-2f88d0072303}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="threading\binding">
+      <UniqueIdentifier>{e63982e2-a2ca-4aa2-be11-f98659586c1f}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\exceptions\exception.cpp">
+      <Filter>exceptions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\math\curve.cpp">
+      <Filter>math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\math\functions.cpp">
+      <Filter>math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\math\matrix44.cpp">
+      <Filter>math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\math\ranged_value.cpp">
+      <Filter>math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\math\transform.cpp">
+      <Filter>math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\utils_module.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\stringmap.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-utils\io\binding\_data_buffer.cpp">
+      <Filter>io\binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\io\binding\_file_system.cpp">
+      <Filter>io\binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\io\data_buffer.cpp">
+      <Filter>io</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\io\decoded_data.cpp">
+      <Filter>io</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\io\file_system.cpp">
+      <Filter>io</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\io\file_data.cpp">
+      <Filter>io</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\io\file.cpp">
+      <Filter>io</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\io\binding\_file.cpp">
+      <Filter>io\binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\io\binding\_file_data.cpp">
+      <Filter>io\binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\io\compressor.cpp">
+      <Filter>io</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\io\binding\_compressor.cpp">
+      <Filter>io\binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\threading\coroutine.cpp">
+      <Filter>threading</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\threading\thread.cpp">
+      <Filter>threading</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\threading\thread_impl_posix.cpp">
+      <Filter>threading</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\threading\thread_impl_sdl.cpp">
+      <Filter>threading</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\threading\thread_impl_std.cpp">
+      <Filter>threading</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\threading\thread_impl_win32.cpp">
+      <Filter>threading</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\io\io_task.cpp">
+      <Filter>io</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\threading\mutex.cpp">
+      <Filter>threading</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\threading\binding\_coroutine.cpp">
+      <Filter>threading\binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\threading\binding\_thread.cpp">
+      <Filter>threading\binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\io\binding\_io_task.cpp">
+      <Filter>io\binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\math\quaternion.cpp">
+      <Filter>math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\threading\task.cpp">
+      <Filter>threading</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\threading\thread_task.cpp">
+      <Filter>io</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\threading\semaphore.cpp">
+      <Filter>threading</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-utils\io\io_batch_task.cpp">
+      <Filter>io</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\exceptions\exception.h">
+      <Filter>exceptions</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\math\curve.h">
+      <Filter>math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\math\functions.h">
+      <Filter>math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\math\matrix44.h">
+      <Filter>math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\math\ranged_value.h">
+      <Filter>math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\math\rect.hpp">
+      <Filter>math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\math\transform.h">
+      <Filter>math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\math\vector2.hpp">
+      <Filter>math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\math\vector3.hpp">
+      <Filter>math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\math\vector4.h">
+      <Filter>math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\scripting\portable.hpp">
+      <Filter>scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\type.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\utils.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\utils_module.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\module.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\utils_config.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\manager.hpp" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\singleton.hpp" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\stringmap.hpp" />
+    <ClInclude Include="..\..\..\source\modules\asura-utils\io\data_buffer.h">
+      <Filter>io</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\io\decoded_data.h">
+      <Filter>io</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\io\file_system.h">
+      <Filter>io</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\io\reloadable.h">
+      <Filter>io</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\io\file_data.h">
+      <Filter>io</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\io\file.h">
+      <Filter>io</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\io\compressor.h">
+      <Filter>io</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\threading\coroutine.h">
+      <Filter>threading</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\threading\thread.h">
+      <Filter>threading</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\threading\thread_impl_posix.h">
+      <Filter>threading</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\threading\thread_impl_sdl.h">
+      <Filter>threading</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\threading\thread_impl_std.h">
+      <Filter>threading</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\threading\thread_impl_win32.h">
+      <Filter>threading</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\io\io_task.h">
+      <Filter>io</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\threading\mutex.h">
+      <Filter>threading</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\math\quaternion.h">
+      <Filter>math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\scripting\lua_env.h">
+      <Filter>scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\threading\task.h">
+      <Filter>threading</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\threading\thread_task.h">
+      <Filter>io</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\threading\semaphore.h">
+      <Filter>threading</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-utils\io\io_batch_task.h">
+      <Filter>io</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\source\modules\asura-utils\math\rect.inl">
+      <Filter>math</Filter>
+    </None>
+    <None Include="..\..\..\source\modules\asura-utils\math\vector2.inl">
+      <Filter>math</Filter>
+    </None>
+    <None Include="..\..\..\source\modules\asura-utils\math\vector3.inl">
+      <Filter>math</Filter>
+    </None>
+    <None Include="..\..\..\source\modules\asura-utils\math\vector4.inl">
+      <Filter>math</Filter>
+    </None>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/build/libs/asura-lib-steam/asura-lib-steam.vcxproj.user b/build/modules/asura-utils/asura-utils.vcxproj.user
index be25078..be25078 100644
--- a/build/libs/asura-lib-steam/asura-lib-steam.vcxproj.user
+++ b/build/modules/asura-utils/asura-utils.vcxproj.user
diff --git a/build/libs/asura-lib-xml/asura-lib-xml.vcxproj b/build/modules/asura-xml/asura-xml.vcxproj
index 112bc8f..112bc8f 100644
--- a/build/libs/asura-lib-xml/asura-lib-xml.vcxproj
+++ b/build/modules/asura-xml/asura-xml.vcxproj
diff --git a/build/libs/asura-lib-xml/asura-lib-xml.vcxproj.filters b/build/modules/asura-xml/asura-xml.vcxproj.filters
index 9cd8510..9cd8510 100644
--- a/build/libs/asura-lib-xml/asura-lib-xml.vcxproj.filters
+++ b/build/modules/asura-xml/asura-xml.vcxproj.filters
diff --git a/build/libs/asura-lib-utils/asura-lib-utils.vcxproj.user b/build/modules/asura-xml/asura-xml.vcxproj.user
index be25078..be25078 100644
--- a/build/libs/asura-lib-utils/asura-lib-utils.vcxproj.user
+++ b/build/modules/asura-xml/asura-xml.vcxproj.user
diff --git a/build/tests/02-luax/02-luax.vcxproj b/build/tests/02-luax/02-luax.vcxproj
index 5a79408..91f3669 100644
--- a/build/tests/02-luax/02-luax.vcxproj
+++ b/build/tests/02-luax/02-luax.vcxproj
@@ -81,7 +81,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\libs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -114,7 +114,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\libs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
diff --git a/build/tests/05-physfs/05-physfs.vcxproj b/build/tests/05-physfs/05-physfs.vcxproj
index 095f8fc..db04cf2 100644
--- a/build/tests/05-physfs/05-physfs.vcxproj
+++ b/build/tests/05-physfs/05-physfs.vcxproj
@@ -81,7 +81,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\libs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -114,7 +114,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\libs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\source\3rd-party;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -125,7 +125,7 @@
     <ClCompile Include="..\..\..\source\tests\05-physfs\main.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\libs\asura-lib-utils\asura-lib-utils.vcxproj">
+    <ProjectReference Include="..\..\modules\asura-utils\asura-utils.vcxproj">
       <Project>{7d41093f-e356-4c5b-a25f-41779bf86e54}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/build/tests/05-physfs/x64/Debug/main.nativecodeanalysis.xml b/build/tests/05-physfs/x64/Debug/main.nativecodeanalysis.xml
deleted file mode 100644
index 82cf7f3..0000000
--- a/build/tests/05-physfs/x64/Debug/main.nativecodeanalysis.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DEFECTS>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>mutex.h</FILENAME>
-      <LINE>39</LINE>
-      <COLUMN>3</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::MutexImpl::{ctor}</FUNCTION>
-    <DECORATED>??0MutexImpl@Threading@AsuraEngine@@QEAA@XZ</DECORATED>
-    <FUNCLINE>39</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-  <DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>thread.h</FILENAME>
-      <LINE>90</LINE>
-      <COLUMN>3</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::ThreadImpl::{ctor}</FUNCTION>
-    <DECORATED>??0ThreadImpl@Threading@AsuraEngine@@QEAA@XZ</DECORATED>
-    <FUNCLINE>90</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT>
-</DEFECTS>
\ No newline at end of file
diff --git a/build/tests/05-physfs/x64/Debug/vc.nativecodeanalysis.all.xml b/build/tests/05-physfs/x64/Debug/vc.nativecodeanalysis.all.xml
deleted file mode 100644
index 55e04e2..0000000
--- a/build/tests/05-physfs/x64/Debug/vc.nativecodeanalysis.all.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><DEFECTS><DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>mutex.h</FILENAME>
-      <LINE>39</LINE>
-      <COLUMN>3</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::MutexImpl::{ctor}</FUNCTION>
-    <DECORATED>??0MutexImpl@Threading@AsuraEngine@@QEAA@XZ</DECORATED>
-    <FUNCLINE>39</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT><DEFECT>
-    <SFA>
-      <FILEPATH>d:\asura\source\libs\asura-lib-utils\threading\</FILEPATH>
-      <FILENAME>thread.h</FILENAME>
-      <LINE>90</LINE>
-      <COLUMN>3</COLUMN>
-    </SFA>
-    <DEFECTCODE>26439</DEFECTCODE>
-    <DESCRIPTION>This kind of function may not throw. Declare it 'noexcept' (f.6).</DESCRIPTION>
-    <FUNCTION>AsuraEngine::Threading::ThreadImpl::{ctor}</FUNCTION>
-    <DECORATED>??0ThreadImpl@Threading@AsuraEngine@@QEAA@XZ</DECORATED>
-    <FUNCLINE>90</FUNCLINE>
-    <PATH></PATH>
-  </DEFECT></DEFECTS>
\ No newline at end of file
diff --git a/source/Asura.Editor/controls/button.h b/source/Asura.Editor/controls/button.h
index 14cd041..3f07c1c 100644
--- a/source/Asura.Editor/controls/button.h
+++ b/source/Asura.Editor/controls/button.h
@@ -3,8 +3,8 @@
 
 #include <vector>
 
-#include <asura-lib-utils/scripting/portable.hpp>
-#include <asura-lib-core/graphics/image.h>
+#include <asura-utils/scripting/portable.hpp>
+#include <asura-core/graphics/image.h>
 
 #include "../core/signal.h"
 #include "widget.h"
diff --git a/source/Asura.Editor/controls/label.h b/source/Asura.Editor/controls/label.h
index 1d053f8..32b61d4 100644
--- a/source/Asura.Editor/controls/label.h
+++ b/source/Asura.Editor/controls/label.h
@@ -1,8 +1,8 @@
 #ifndef __ASURA_EDITOR_LABEL_H__
 #define __ASURA_EDITOR_LABEL_H__
 
-#include <asura-lib-utils/scripting/portable.hpp>
-#include <asura-lib-core/graphics/image.h>
+#include <asura-utils/scripting/portable.hpp>
+#include <asura-core/graphics/image.h>
 
 #include "widget.h"
 
diff --git a/source/Asura.Editor/controls/widget.h b/source/Asura.Editor/controls/widget.h
index 9ffd1fb..c934351 100644
--- a/source/Asura.Editor/controls/widget.h
+++ b/source/Asura.Editor/controls/widget.h
@@ -3,11 +3,11 @@
 
 #include <list>
 
-#include <asura-lib-utils/scripting/portable.hpp>
-#include <asura-lib-utils/type.h>
-#include <asura-lib-utils/math/rect.hpp>
-#include <asura-lib-utils/math/vector2.hpp>
-#include <asura-lib-core/input/event.h>
+#include <asura-utils/scripting/portable.hpp>
+#include <asura-utils/type.h>
+#include <asura-utils/math/rect.hpp>
+#include <asura-utils/math/vector2.hpp>
+#include <asura-core/input/event.h>
 
 namespace AsuraEditor
 {
diff --git a/source/Asura.Editor/core/signal.h b/source/Asura.Editor/core/signal.h
index f1ab9b4..f73f4b1 100644
--- a/source/Asura.Editor/core/signal.h
+++ b/source/Asura.Editor/core/signal.h
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/scripting/portable.hpp>
 
 #include "../widgets/widget.h"
 #include "slot.h"
diff --git a/source/Asura.Editor/core/slot.h b/source/Asura.Editor/core/slot.h
index ff565cf..b62f406 100644
--- a/source/Asura.Editor/core/slot.h
+++ b/source/Asura.Editor/core/slot.h
@@ -1,8 +1,8 @@
 #ifndef __ASURA_EDITOR_SLOT_H__
 #define __ASURA_EDITOR_SLOT_H__
 
-#include <asura-lib-utils/scripting/portable.hpp>
-#include <asura-lib-core/input/event.h>
+#include <asura-utils/scripting/portable.hpp>
+#include <asura-core/input/event.h>
 
 #include "../widgets/widget.h"
 
diff --git a/source/Asura.Editor/dui_module.h b/source/Asura.Editor/dui_module.h
index 48c341f..657c404 100644
--- a/source/Asura.Editor/dui_module.h
+++ b/source/Asura.Editor/dui_module.h
@@ -1,7 +1,7 @@
 #ifndef __ASRUA_EDITOR_DIRECTUI_MODULE_H__
 #define __ASRUA_EDITOR_DIRECTUI_MODULE_H__
 
-#include <asura-lib-utils/module.h>
+#include <asura-utils/module.h>
 
 namespace AsuraEditor
 {
diff --git a/source/Asura.Editor/editor.h b/source/Asura.Editor/editor.h
index b56852f..b086532 100644
--- a/source/Asura.Editor/editor.h
+++ b/source/Asura.Editor/editor.h
@@ -1,7 +1,7 @@
 #ifndef __ASURA_EDITOR_H__
 #define __ASURA_EDITOR_H__
 
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/scripting/portable.hpp>
 
 namespace AsuraEditor
 {
diff --git a/source/libs/asura-lib-core/application.cpp b/source/modules/asura-core/application.cpp
index 0a1c1ef..0a1c1ef 100644
--- a/source/libs/asura-lib-core/application.cpp
+++ b/source/modules/asura-core/application.cpp
diff --git a/source/libs/asura-lib-core/application.h b/source/modules/asura-core/application.h
index 9606819..2285430 100644
--- a/source/libs/asura-lib-core/application.h
+++ b/source/modules/asura-core/application.h
@@ -1,8 +1,8 @@
 #ifndef __ASURA_ENGINE_APPLICATION_H__
 #define __ASURA_ENGINE_APPLICATION_H__
 
-#include <asura-lib-utils/scripting/portable.hpp>
-#include <asura-lib-utils/module.h>
+#include <asura-utils/scripting/portable.hpp>
+#include <asura-utils/module.h>
 #include <queue>
 
 #include "core_config.h"
diff --git a/source/libs/asura-lib-core/core_config.h b/source/modules/asura-core/core_config.h
index 06eecc7..06eecc7 100644
--- a/source/libs/asura-lib-core/core_config.h
+++ b/source/modules/asura-core/core_config.h
diff --git a/source/libs/asura-lib-core/core_module.cpp b/source/modules/asura-core/core_module.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/core_module.cpp
+++ b/source/modules/asura-core/core_module.cpp
diff --git a/source/libs/asura-lib-core/core_module.h b/source/modules/asura-core/core_module.h
index 2cded93..2cded93 100644
--- a/source/libs/asura-lib-core/core_module.h
+++ b/source/modules/asura-core/core_module.h
diff --git a/source/libs/asura-lib-core/font/glyph.cpp b/source/modules/asura-core/font/glyph.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/font/glyph.cpp
+++ b/source/modules/asura-core/font/glyph.cpp
diff --git a/source/libs/asura-lib-core/font/glyph.h b/source/modules/asura-core/font/glyph.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/font/glyph.h
+++ b/source/modules/asura-core/font/glyph.h
diff --git a/source/libs/asura-lib-core/font/string.cpp b/source/modules/asura-core/font/string.cpp
index 8c9c55a..8c9c55a 100644
--- a/source/libs/asura-lib-core/font/string.cpp
+++ b/source/modules/asura-core/font/string.cpp
diff --git a/source/libs/asura-lib-core/font/string.hpp b/source/modules/asura-core/font/string.hpp
index 226735b..226735b 100644
--- a/source/libs/asura-lib-core/font/string.hpp
+++ b/source/modules/asura-core/font/string.hpp
diff --git a/source/libs/asura-lib-core/font/string.inl b/source/modules/asura-core/font/string.inl
index ef18228..ef18228 100644
--- a/source/libs/asura-lib-core/font/string.inl
+++ b/source/modules/asura-core/font/string.inl
diff --git a/source/libs/asura-lib-core/font/ttf.cpp b/source/modules/asura-core/font/ttf.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/font/ttf.cpp
+++ b/source/modules/asura-core/font/ttf.cpp
diff --git a/source/libs/asura-lib-core/font/ttf.h b/source/modules/asura-core/font/ttf.h
index 840b63e..840b63e 100644
--- a/source/libs/asura-lib-core/font/ttf.h
+++ b/source/modules/asura-core/font/ttf.h
diff --git a/source/libs/asura-lib-core/font/utf.hpp b/source/modules/asura-core/font/utf.hpp
index 2e04ee4..2e04ee4 100644
--- a/source/libs/asura-lib-core/font/utf.hpp
+++ b/source/modules/asura-core/font/utf.hpp
diff --git a/source/libs/asura-lib-core/font/utf.inl b/source/modules/asura-core/font/utf.inl
index 69a523b..69a523b 100644
--- a/source/libs/asura-lib-core/font/utf.inl
+++ b/source/modules/asura-core/font/utf.inl
diff --git a/source/libs/asura-lib-core/graphics/binding/_canvas.cpp b/source/modules/asura-core/graphics/binding/_canvas.cpp
index 7927995..7927995 100644
--- a/source/libs/asura-lib-core/graphics/binding/_canvas.cpp
+++ b/source/modules/asura-core/graphics/binding/_canvas.cpp
diff --git a/source/libs/asura-lib-core/graphics/binding/_color.cpp b/source/modules/asura-core/graphics/binding/_color.cpp
index 11e80a1..11e80a1 100644
--- a/source/libs/asura-lib-core/graphics/binding/_color.cpp
+++ b/source/modules/asura-core/graphics/binding/_color.cpp
diff --git a/source/libs/asura-lib-core/graphics/binding/_color32.cpp b/source/modules/asura-core/graphics/binding/_color32.cpp
index 7095866..7095866 100644
--- a/source/libs/asura-lib-core/graphics/binding/_color32.cpp
+++ b/source/modules/asura-core/graphics/binding/_color32.cpp
diff --git a/source/libs/asura-lib-core/graphics/binding/_image.cpp b/source/modules/asura-core/graphics/binding/_image.cpp
index cb008d3..cb008d3 100644
--- a/source/libs/asura-lib-core/graphics/binding/_image.cpp
+++ b/source/modules/asura-core/graphics/binding/_image.cpp
diff --git a/source/libs/asura-lib-core/graphics/binding/_image_data.cpp b/source/modules/asura-core/graphics/binding/_image_data.cpp
index 3ff38f9..3ff38f9 100644
--- a/source/libs/asura-lib-core/graphics/binding/_image_data.cpp
+++ b/source/modules/asura-core/graphics/binding/_image_data.cpp
diff --git a/source/libs/asura-lib-core/graphics/binding/_image_decode_task.cpp b/source/modules/asura-core/graphics/binding/_image_decode_task.cpp
index 76b544b..76b544b 100644
--- a/source/libs/asura-lib-core/graphics/binding/_image_decode_task.cpp
+++ b/source/modules/asura-core/graphics/binding/_image_decode_task.cpp
diff --git a/source/libs/asura-lib-core/graphics/binding/_mesh2d.cpp b/source/modules/asura-core/graphics/binding/_mesh2d.cpp
index 07e9f12..07e9f12 100644
--- a/source/libs/asura-lib-core/graphics/binding/_mesh2d.cpp
+++ b/source/modules/asura-core/graphics/binding/_mesh2d.cpp
diff --git a/source/libs/asura-lib-core/graphics/binding/_shader.cpp b/source/modules/asura-core/graphics/binding/_shader.cpp
index a06e54b..a06e54b 100644
--- a/source/libs/asura-lib-core/graphics/binding/_shader.cpp
+++ b/source/modules/asura-core/graphics/binding/_shader.cpp
diff --git a/source/libs/asura-lib-core/graphics/binding/_sprite_batch.cpp b/source/modules/asura-core/graphics/binding/_sprite_batch.cpp
index 8556c02..8556c02 100644
--- a/source/libs/asura-lib-core/graphics/binding/_sprite_batch.cpp
+++ b/source/modules/asura-core/graphics/binding/_sprite_batch.cpp
diff --git a/source/libs/asura-lib-core/graphics/binding/_window.cpp b/source/modules/asura-core/graphics/binding/_window.cpp
index fc74d6c..fc74d6c 100644
--- a/source/libs/asura-lib-core/graphics/binding/_window.cpp
+++ b/source/modules/asura-core/graphics/binding/_window.cpp
diff --git a/source/libs/asura-lib-core/graphics/blend_mode.h b/source/modules/asura-core/graphics/blend_mode.h
index 775cc45..775cc45 100644
--- a/source/libs/asura-lib-core/graphics/blend_mode.h
+++ b/source/modules/asura-core/graphics/blend_mode.h
diff --git a/source/libs/asura-lib-core/graphics/canvas.cpp b/source/modules/asura-core/graphics/canvas.cpp
index 61787b6..61787b6 100644
--- a/source/libs/asura-lib-core/graphics/canvas.cpp
+++ b/source/modules/asura-core/graphics/canvas.cpp
diff --git a/source/libs/asura-lib-core/graphics/canvas.h b/source/modules/asura-core/graphics/canvas.h
index 5b188ca..7e7b2fd 100644
--- a/source/libs/asura-lib-core/graphics/canvas.h
+++ b/source/modules/asura-core/graphics/canvas.h
@@ -1,9 +1,9 @@
 #ifndef __ASURA_ENGINE_CANVAS_H__
 #define __ASURA_ENGINE_CANVAS_H__
 
-#include <asura-lib-utils/scripting/portable.hpp>
-#include <asura-lib-utils/math/rect.hpp>
-#include <asura-lib-utils/math/vector2.hpp>
+#include <asura-utils/scripting/portable.hpp>
+#include <asura-utils/math/rect.hpp>
+#include <asura-utils/math/vector2.hpp>
 
 #include "gl.h"
 #include "texture.h"
diff --git a/source/libs/asura-lib-core/graphics/color.cpp b/source/modules/asura-core/graphics/color.cpp
index 4d3691e..4d3691e 100644
--- a/source/libs/asura-lib-core/graphics/color.cpp
+++ b/source/modules/asura-core/graphics/color.cpp
diff --git a/source/libs/asura-lib-core/graphics/color.h b/source/modules/asura-core/graphics/color.h
index 607314b..d0d0751 100644
--- a/source/libs/asura-lib-core/graphics/color.h
+++ b/source/modules/asura-core/graphics/color.h
@@ -1,7 +1,7 @@
 #ifndef __ASURA_ENGINE_COLOR_H__
 #define __ASURA_ENGINE_COLOR_H__
 
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/scripting/portable.hpp>
 
 #include "../core_config.h"
 
diff --git a/source/libs/asura-lib-core/graphics/color32.cpp b/source/modules/asura-core/graphics/color32.cpp
index 0ebc77c..0ebc77c 100644
--- a/source/libs/asura-lib-core/graphics/color32.cpp
+++ b/source/modules/asura-core/graphics/color32.cpp
diff --git a/source/libs/asura-lib-core/graphics/color32.h b/source/modules/asura-core/graphics/color32.h
index c64a9b9..b18f66c 100644
--- a/source/libs/asura-lib-core/graphics/color32.h
+++ b/source/modules/asura-core/graphics/color32.h
@@ -1,7 +1,7 @@
 #ifndef __ASURA_ENGINE_COLOR32_H__
 #define __ASURA_ENGINE_COLOR32_H__
 
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/scripting/portable.hpp>
 
 #include "../core_config.h"
 
diff --git a/source/libs/asura-lib-core/graphics/color_palette.h b/source/modules/asura-core/graphics/color_palette.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/graphics/color_palette.h
+++ b/source/modules/asura-core/graphics/color_palette.h
diff --git a/source/libs/asura-lib-core/graphics/gif.cpp b/source/modules/asura-core/graphics/gif.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/graphics/gif.cpp
+++ b/source/modules/asura-core/graphics/gif.cpp
diff --git a/source/libs/asura-lib-core/graphics/gif.h b/source/modules/asura-core/graphics/gif.h
index 8b89858..8b89858 100644
--- a/source/libs/asura-lib-core/graphics/gif.h
+++ b/source/modules/asura-core/graphics/gif.h
diff --git a/source/libs/asura-lib-core/graphics/gl.cpp b/source/modules/asura-core/graphics/gl.cpp
index 7c68c8f..7c68c8f 100644
--- a/source/libs/asura-lib-core/graphics/gl.cpp
+++ b/source/modules/asura-core/graphics/gl.cpp
diff --git a/source/libs/asura-lib-core/graphics/gl.h b/source/modules/asura-core/graphics/gl.h
index bfc60ea..bfc60ea 100644
--- a/source/libs/asura-lib-core/graphics/gl.h
+++ b/source/modules/asura-core/graphics/gl.h
diff --git a/source/libs/asura-lib-core/graphics/image.cpp b/source/modules/asura-core/graphics/image.cpp
index e704945..e704945 100644
--- a/source/libs/asura-lib-core/graphics/image.cpp
+++ b/source/modules/asura-core/graphics/image.cpp
diff --git a/source/libs/asura-lib-core/graphics/image.h b/source/modules/asura-core/graphics/image.h
index 4d9787b..29fd97c 100644
--- a/source/libs/asura-lib-core/graphics/image.h
+++ b/source/modules/asura-core/graphics/image.h
@@ -1,12 +1,12 @@
 #ifndef __ASURA_ENGINE_IMAGE_H__
 #define __ASURA_ENGINE_IMAGE_H__
 
-#include <asura-lib-utils/math/rect.hpp>
-#include <asura-lib-utils/math/vector2.hpp>
-#include <asura-lib-utils/scripting/portable.hpp>
-#include <asura-lib-utils/io/reloadable.h>
-#include <asura-lib-utils/stringmap.hpp>
-#include <asura-lib-utils/manager.hpp>
+#include <asura-utils/math/rect.hpp>
+#include <asura-utils/math/vector2.hpp>
+#include <asura-utils/scripting/portable.hpp>
+#include <asura-utils/io/reloadable.h>
+#include <asura-utils/stringmap.hpp>
+#include <asura-utils/manager.hpp>
 
 #include "texture.h"
 #include "color.h"
diff --git a/source/libs/asura-lib-core/graphics/image_data.cpp b/source/modules/asura-core/graphics/image_data.cpp
index b79dfab..b79dfab 100644
--- a/source/libs/asura-lib-core/graphics/image_data.cpp
+++ b/source/modules/asura-core/graphics/image_data.cpp
diff --git a/source/libs/asura-lib-core/graphics/image_data.h b/source/modules/asura-core/graphics/image_data.h
index 820e276..ea1d53a 100644
--- a/source/libs/asura-lib-core/graphics/image_data.h
+++ b/source/modules/asura-core/graphics/image_data.h
@@ -3,10 +3,10 @@
 
 #include <list>
 
-#include <asura-lib-utils/scripting/portable.hpp>
-#include <asura-lib-utils/io/decoded_data.h>
-#include <asura-lib-utils/io/data_buffer.h>
-#include <asura-lib-utils/threading/thread.h>
+#include <asura-utils/scripting/portable.hpp>
+#include <asura-utils/io/decoded_data.h>
+#include <asura-utils/io/data_buffer.h>
+#include <asura-utils/threading/thread.h>
 
 #include "pixel_format.h"
 #include "color.h"
diff --git a/source/libs/asura-lib-core/graphics/image_decode_task.cpp b/source/modules/asura-core/graphics/image_decode_task.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/graphics/image_decode_task.cpp
+++ b/source/modules/asura-core/graphics/image_decode_task.cpp
diff --git a/source/libs/asura-lib-core/graphics/image_decode_task.h b/source/modules/asura-core/graphics/image_decode_task.h
index a721b3e..ec5ed49 100644
--- a/source/libs/asura-lib-core/graphics/image_decode_task.h
+++ b/source/modules/asura-core/graphics/image_decode_task.h
@@ -1,8 +1,8 @@
 #ifndef __ASURA_IMAGE_DECODE_TASK_H__
 #define __ASURA_IMAGE_DECODE_TASK_H__
 
-#include <asura-lib-utils/threading/thread_task.h>
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/threading/thread_task.h>
+#include <asura-utils/scripting/portable.hpp>
 
 namespace AsuraEngine
 {
diff --git a/source/libs/asura-lib-core/graphics/image_decoder.h b/source/modules/asura-core/graphics/image_decoder.h
index 6f2049a..263c694 100644
--- a/source/libs/asura-lib-core/graphics/image_decoder.h
+++ b/source/modules/asura-core/graphics/image_decoder.h
@@ -1,7 +1,7 @@
 #ifndef __ASURA_ENGINE_IMAGE_DECODER_H__
 #define __ASURA_ENGINE_IMAGE_DECODER_H__
 
-#include <asura-lib-utils/io/data_buffer.h>
+#include <asura-utils/io/data_buffer.h>
 
 #include "image_data.h"
 
diff --git a/source/libs/asura-lib-core/graphics/mesh2d.cpp b/source/modules/asura-core/graphics/mesh2d.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/graphics/mesh2d.cpp
+++ b/source/modules/asura-core/graphics/mesh2d.cpp
diff --git a/source/libs/asura-lib-core/graphics/mesh2d.h b/source/modules/asura-core/graphics/mesh2d.h
index 48b461d..31d3629 100644
--- a/source/libs/asura-lib-core/graphics/mesh2d.h
+++ b/source/modules/asura-core/graphics/mesh2d.h
@@ -1,7 +1,7 @@
 #ifndef __ASURA_ENGINE_MESH2D_H__
 #define __ASURA_ENGINE_MESH2D_H__
 
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/scripting/portable.hpp>
 
 namespace AsuraEngine
 {
diff --git a/source/libs/asura-lib-core/graphics/mesh2d_data.cpp b/source/modules/asura-core/graphics/mesh2d_data.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/graphics/mesh2d_data.cpp
+++ b/source/modules/asura-core/graphics/mesh2d_data.cpp
diff --git a/source/libs/asura-lib-core/graphics/mesh2d_data.h b/source/modules/asura-core/graphics/mesh2d_data.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/graphics/mesh2d_data.h
+++ b/source/modules/asura-core/graphics/mesh2d_data.h
diff --git a/source/libs/asura-lib-core/graphics/pixel_format.h b/source/modules/asura-core/graphics/pixel_format.h
index 8df07d5..8df07d5 100644
--- a/source/libs/asura-lib-core/graphics/pixel_format.h
+++ b/source/modules/asura-core/graphics/pixel_format.h
diff --git a/source/libs/asura-lib-core/graphics/png_decoder.cpp b/source/modules/asura-core/graphics/png_decoder.cpp
index f919090..f919090 100644
--- a/source/libs/asura-lib-core/graphics/png_decoder.cpp
+++ b/source/modules/asura-core/graphics/png_decoder.cpp
diff --git a/source/libs/asura-lib-core/graphics/png_decoder.h b/source/modules/asura-core/graphics/png_decoder.h
index bc871fa..bc871fa 100644
--- a/source/libs/asura-lib-core/graphics/png_decoder.h
+++ b/source/modules/asura-core/graphics/png_decoder.h
diff --git a/source/libs/asura-lib-core/graphics/quad.cpp b/source/modules/asura-core/graphics/quad.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/graphics/quad.cpp
+++ b/source/modules/asura-core/graphics/quad.cpp
diff --git a/source/libs/asura-lib-core/graphics/quad.h b/source/modules/asura-core/graphics/quad.h
index b7dd3d9..b7dd3d9 100644
--- a/source/libs/asura-lib-core/graphics/quad.h
+++ b/source/modules/asura-core/graphics/quad.h
diff --git a/source/libs/asura-lib-core/graphics/render_state.h b/source/modules/asura-core/graphics/render_state.h
index 4d1831c..2b1dd7f 100644
--- a/source/libs/asura-lib-core/graphics/render_state.h
+++ b/source/modules/asura-core/graphics/render_state.h
@@ -1,8 +1,8 @@
 #ifndef __ASURA_ENGINE_RENDER_STATE_H__
 #define __ASURA_ENGINE_RENDER_STATE_H__
 
-#include <asura-lib-utils/math/vector2.hpp>
-#include <asura-lib-utils/math/transform.h>
+#include <asura-utils/math/vector2.hpp>
+#include <asura-utils/math/transform.h>
 
 #include "Shader.h"
 #include "blend_mode.h"
diff --git a/source/libs/asura-lib-core/graphics/render_target.cpp b/source/modules/asura-core/graphics/render_target.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/graphics/render_target.cpp
+++ b/source/modules/asura-core/graphics/render_target.cpp
diff --git a/source/libs/asura-lib-core/graphics/render_target.h b/source/modules/asura-core/graphics/render_target.h
index afa5c6a..b1a695a 100644
--- a/source/libs/asura-lib-core/graphics/render_target.h
+++ b/source/modules/asura-core/graphics/render_target.h
@@ -1,9 +1,9 @@
 #ifndef __ASURA_ENGINE_RENDERTARGET_H__
 #define __ASURA_ENGINE_RENDERTARGET_H__
 
-#include <asura-lib-utils/math/vector2.hpp>
-#include <asura-lib-utils/math/rect.hpp>
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/math/vector2.hpp>
+#include <asura-utils/math/rect.hpp>
+#include <asura-utils/scripting/portable.hpp>
 
 #include "texture.h"
 #include "color.h"
diff --git a/source/libs/asura-lib-core/graphics/shader.cpp b/source/modules/asura-core/graphics/shader.cpp
index 1a85866..1a85866 100644
--- a/source/libs/asura-lib-core/graphics/shader.cpp
+++ b/source/modules/asura-core/graphics/shader.cpp
diff --git a/source/libs/asura-lib-core/graphics/shader.h b/source/modules/asura-core/graphics/shader.h
index 1c81355..97e2c15 100644
--- a/source/libs/asura-lib-core/graphics/shader.h
+++ b/source/modules/asura-core/graphics/shader.h
@@ -4,14 +4,14 @@
 #include <map>
 #include <string>
 
-#include <asura-lib-utils/scripting/portable.hpp>
-#include <asura-lib-utils/io/reloadable.h>
-#include <asura-lib-utils/math/vector2.hpp>
-#include <asura-lib-utils/math/vector3.hpp>
-#include <asura-lib-utils/math/vector4.h>
-#include <asura-lib-utils/math/matrix44.h>
-#include <asura-lib-utils/stringmap.hpp>
-#include <asura-lib-utils/manager.hpp>
+#include <asura-utils/scripting/portable.hpp>
+#include <asura-utils/io/reloadable.h>
+#include <asura-utils/math/vector2.hpp>
+#include <asura-utils/math/vector3.hpp>
+#include <asura-utils/math/vector4.h>
+#include <asura-utils/math/matrix44.h>
+#include <asura-utils/stringmap.hpp>
+#include <asura-utils/manager.hpp>
 
 #include "color.h"
 #include "texture.h"
diff --git a/source/libs/asura-lib-core/graphics/shape.cpp b/source/modules/asura-core/graphics/shape.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/graphics/shape.cpp
+++ b/source/modules/asura-core/graphics/shape.cpp
diff --git a/source/libs/asura-lib-core/graphics/shape.h b/source/modules/asura-core/graphics/shape.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/graphics/shape.h
+++ b/source/modules/asura-core/graphics/shape.h
diff --git a/source/libs/asura-lib-core/graphics/sprite_batch.cpp b/source/modules/asura-core/graphics/sprite_batch.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/graphics/sprite_batch.cpp
+++ b/source/modules/asura-core/graphics/sprite_batch.cpp
diff --git a/source/libs/asura-lib-core/graphics/sprite_batch.h b/source/modules/asura-core/graphics/sprite_batch.h
index d8d9ca6..3143f73 100644
--- a/source/libs/asura-lib-core/graphics/sprite_batch.h
+++ b/source/modules/asura-core/graphics/sprite_batch.h
@@ -1,7 +1,7 @@
 #ifndef __ASURA_ENGINE_SPRITE_BATCH_H__
 #define __ASURA_ENGINE_SPRITE_BATCH_H__
 
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/scripting/portable.hpp>
 
 namespace AsuraEngine
 {
diff --git a/source/libs/asura-lib-core/graphics/stb_decoder.cpp b/source/modules/asura-core/graphics/stb_decoder.cpp
index a13d6b8..eff2e65 100644
--- a/source/libs/asura-lib-core/graphics/stb_decoder.cpp
+++ b/source/modules/asura-core/graphics/stb_decoder.cpp
@@ -1,4 +1,4 @@
-#include <asura-lib-utils/exceptions/exception.h>
+#include <asura-utils/exceptions/exception.h>
 
 #include "stb_decoder.h"
 #include "stb/stb_image.h"
diff --git a/source/libs/asura-lib-core/graphics/stb_decoder.h b/source/modules/asura-core/graphics/stb_decoder.h
index 85bad21..85bad21 100644
--- a/source/libs/asura-lib-core/graphics/stb_decoder.h
+++ b/source/modules/asura-core/graphics/stb_decoder.h
diff --git a/source/libs/asura-lib-core/graphics/texture.cpp b/source/modules/asura-core/graphics/texture.cpp
index 6cb6497..6cb6497 100644
--- a/source/libs/asura-lib-core/graphics/texture.cpp
+++ b/source/modules/asura-core/graphics/texture.cpp
diff --git a/source/libs/asura-lib-core/graphics/texture.h b/source/modules/asura-core/graphics/texture.h
index c412b2e..81ced9f 100644
--- a/source/libs/asura-lib-core/graphics/texture.h
+++ b/source/modules/asura-core/graphics/texture.h
@@ -1,9 +1,9 @@
 #ifndef __ASURA_ENGINE_TEXTURE_H__
 #define __ASURA_ENGINE_TEXTURE_H__
 
-#include <asura-lib-utils/math/rect.hpp>
-#include <asura-lib-utils/math/vector2.hpp>
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/math/rect.hpp>
+#include <asura-utils/math/vector2.hpp>
+#include <asura-utils/scripting/portable.hpp>
 
 #include "../core_config.h"
 
diff --git a/source/libs/asura-lib-core/input/clipboard.cpp b/source/modules/asura-core/input/clipboard.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/input/clipboard.cpp
+++ b/source/modules/asura-core/input/clipboard.cpp
diff --git a/source/libs/asura-lib-core/input/clipboard.h b/source/modules/asura-core/input/clipboard.h
index 4cecd55..4cecd55 100644
--- a/source/libs/asura-lib-core/input/clipboard.h
+++ b/source/modules/asura-core/input/clipboard.h
diff --git a/source/libs/asura-lib-core/input/cursor.cpp b/source/modules/asura-core/input/cursor.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/input/cursor.cpp
+++ b/source/modules/asura-core/input/cursor.cpp
diff --git a/source/libs/asura-lib-core/input/cursor.defs b/source/modules/asura-core/input/cursor.defs
index f8b8492..f8b8492 100644
--- a/source/libs/asura-lib-core/input/cursor.defs
+++ b/source/modules/asura-core/input/cursor.defs
diff --git a/source/libs/asura-lib-core/input/cursor.h b/source/modules/asura-core/input/cursor.h
index 553fda4..05503ee 100644
--- a/source/libs/asura-lib-core/input/cursor.h
+++ b/source/modules/asura-core/input/cursor.h
@@ -3,7 +3,7 @@
 
 #include <SDL2/SDL.h>
 
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/scripting/portable.hpp>
 
 #include "../graphics/image_data.h"
 
diff --git a/source/libs/asura-lib-core/input/cursor_impl_sdl.cpp b/source/modules/asura-core/input/cursor_impl_sdl.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/input/cursor_impl_sdl.cpp
+++ b/source/modules/asura-core/input/cursor_impl_sdl.cpp
diff --git a/source/libs/asura-lib-core/input/cursor_impl_sdl.h b/source/modules/asura-core/input/cursor_impl_sdl.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/input/cursor_impl_sdl.h
+++ b/source/modules/asura-core/input/cursor_impl_sdl.h
diff --git a/source/libs/asura-lib-core/input/event.h b/source/modules/asura-core/input/event.h
index a24e806..a24e806 100644
--- a/source/libs/asura-lib-core/input/event.h
+++ b/source/modules/asura-core/input/event.h
diff --git a/source/libs/asura-lib-core/input/input_device.hpp b/source/modules/asura-core/input/input_device.hpp
index 46f5be8..1d08d09 100644
--- a/source/libs/asura-lib-core/input/input_device.hpp
+++ b/source/modules/asura-core/input/input_device.hpp
@@ -1,7 +1,7 @@
 #ifndef __ASURA_ENGINE_INPUT_BASE_H__
 #define __ASURA_ENGINE_INPUT_BASE_H__
 
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/scripting/portable.hpp>
 
 #include "../core_config.h"
 #include "../singleton.hpp"
diff --git a/source/libs/asura-lib-core/input/joypad.h b/source/modules/asura-core/input/joypad.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/input/joypad.h
+++ b/source/modules/asura-core/input/joypad.h
diff --git a/source/libs/asura-lib-core/input/keyboard.cpp b/source/modules/asura-core/input/keyboard.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/input/keyboard.cpp
+++ b/source/modules/asura-core/input/keyboard.cpp
diff --git a/source/libs/asura-lib-core/input/keyboard.defs b/source/modules/asura-core/input/keyboard.defs
index 8f04dc2..8f04dc2 100644
--- a/source/libs/asura-lib-core/input/keyboard.defs
+++ b/source/modules/asura-core/input/keyboard.defs
diff --git a/source/libs/asura-lib-core/input/keyboard.h b/source/modules/asura-core/input/keyboard.h
index 1480d06..1480d06 100644
--- a/source/libs/asura-lib-core/input/keyboard.h
+++ b/source/modules/asura-core/input/keyboard.h
diff --git a/source/libs/asura-lib-core/input/mouse.cpp b/source/modules/asura-core/input/mouse.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/input/mouse.cpp
+++ b/source/modules/asura-core/input/mouse.cpp
diff --git a/source/libs/asura-lib-core/input/mouse.defs b/source/modules/asura-core/input/mouse.defs
index de1d117..de1d117 100644
--- a/source/libs/asura-lib-core/input/mouse.defs
+++ b/source/modules/asura-core/input/mouse.defs
diff --git a/source/libs/asura-lib-core/input/mouse.h b/source/modules/asura-core/input/mouse.h
index 3ab67fa..3ab67fa 100644
--- a/source/libs/asura-lib-core/input/mouse.h
+++ b/source/modules/asura-core/input/mouse.h
diff --git a/source/libs/asura-lib-core/profiler/stats.cpp b/source/modules/asura-core/profiler/stats.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/profiler/stats.cpp
+++ b/source/modules/asura-core/profiler/stats.cpp
diff --git a/source/libs/asura-lib-core/profiler/stats.h b/source/modules/asura-core/profiler/stats.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/profiler/stats.h
+++ b/source/modules/asura-core/profiler/stats.h
diff --git a/source/libs/asura-lib-core/threading/coroutine.cpp b/source/modules/asura-core/threading/coroutine.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/threading/coroutine.cpp
+++ b/source/modules/asura-core/threading/coroutine.cpp
diff --git a/source/libs/asura-lib-core/threading/coroutine.h b/source/modules/asura-core/threading/coroutine.h
index 1ac6b21..1ac6b21 100644
--- a/source/libs/asura-lib-core/threading/coroutine.h
+++ b/source/modules/asura-core/threading/coroutine.h
diff --git a/source/libs/asura-lib-core/threading/thread.cpp b/source/modules/asura-core/threading/thread.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/threading/thread.cpp
+++ b/source/modules/asura-core/threading/thread.cpp
diff --git a/source/libs/asura-lib-core/threading/thread.h b/source/modules/asura-core/threading/thread.h
index f4d3b48..f4d3b48 100644
--- a/source/libs/asura-lib-core/threading/thread.h
+++ b/source/modules/asura-core/threading/thread.h
diff --git a/source/libs/asura-lib-core/threading/thread_impl_posix.cpp b/source/modules/asura-core/threading/thread_impl_posix.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/threading/thread_impl_posix.cpp
+++ b/source/modules/asura-core/threading/thread_impl_posix.cpp
diff --git a/source/libs/asura-lib-core/threading/thread_impl_posix.h b/source/modules/asura-core/threading/thread_impl_posix.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/threading/thread_impl_posix.h
+++ b/source/modules/asura-core/threading/thread_impl_posix.h
diff --git a/source/libs/asura-lib-core/threading/thread_impl_sdl.cpp b/source/modules/asura-core/threading/thread_impl_sdl.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/threading/thread_impl_sdl.cpp
+++ b/source/modules/asura-core/threading/thread_impl_sdl.cpp
diff --git a/source/libs/asura-lib-core/threading/thread_impl_sdl.h b/source/modules/asura-core/threading/thread_impl_sdl.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/threading/thread_impl_sdl.h
+++ b/source/modules/asura-core/threading/thread_impl_sdl.h
diff --git a/source/libs/asura-lib-core/threading/thread_impl_std.cpp b/source/modules/asura-core/threading/thread_impl_std.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/threading/thread_impl_std.cpp
+++ b/source/modules/asura-core/threading/thread_impl_std.cpp
diff --git a/source/libs/asura-lib-core/threading/thread_impl_std.h b/source/modules/asura-core/threading/thread_impl_std.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/threading/thread_impl_std.h
+++ b/source/modules/asura-core/threading/thread_impl_std.h
diff --git a/source/libs/asura-lib-core/threading/thread_impl_win32.cpp b/source/modules/asura-core/threading/thread_impl_win32.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/threading/thread_impl_win32.cpp
+++ b/source/modules/asura-core/threading/thread_impl_win32.cpp
diff --git a/source/libs/asura-lib-core/threading/thread_impl_win32.h b/source/modules/asura-core/threading/thread_impl_win32.h
index 5d854cc..5d854cc 100644
--- a/source/libs/asura-lib-core/threading/thread_impl_win32.h
+++ b/source/modules/asura-core/threading/thread_impl_win32.h
diff --git a/source/libs/asura-lib-core/threading/thread_task.cpp b/source/modules/asura-core/threading/thread_task.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/threading/thread_task.cpp
+++ b/source/modules/asura-core/threading/thread_task.cpp
diff --git a/source/libs/asura-lib-core/threading/thread_task.h b/source/modules/asura-core/threading/thread_task.h
index 19eb113..19eb113 100644
--- a/source/libs/asura-lib-core/threading/thread_task.h
+++ b/source/modules/asura-core/threading/thread_task.h
diff --git a/source/libs/asura-lib-core/time/timer.cpp b/source/modules/asura-core/time/timer.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/time/timer.cpp
+++ b/source/modules/asura-core/time/timer.cpp
diff --git a/source/libs/asura-lib-core/time/timer.h b/source/modules/asura-core/time/timer.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/time/timer.h
+++ b/source/modules/asura-core/time/timer.h
diff --git a/source/libs/asura-lib-core/type.h b/source/modules/asura-core/type.h
index 88848d5..88848d5 100644
--- a/source/libs/asura-lib-core/type.h
+++ b/source/modules/asura-core/type.h
diff --git a/source/libs/asura-lib-core/window/window.cpp b/source/modules/asura-core/window/window.cpp
index 83a4f53..83a4f53 100644
--- a/source/libs/asura-lib-core/window/window.cpp
+++ b/source/modules/asura-core/window/window.cpp
diff --git a/source/libs/asura-lib-core/window/window.h b/source/modules/asura-core/window/window.h
index 39db73e..052e1ee 100644
--- a/source/libs/asura-lib-core/window/window.h
+++ b/source/modules/asura-core/window/window.h
@@ -1,8 +1,8 @@
 #ifndef __ASURA_ENGINE_WINDOW_H__
 #define __ASURA_ENGINE_WINDOW_H__
 
-#include <asura-lib-utils/scripting/portable.hpp>
-#include <asura-lib-utils/math/vector2.hpp>
+#include <asura-utils/scripting/portable.hpp>
+#include <asura-utils/math/vector2.hpp>
 
 #include "../graphics/render_state.h"
 #include "../graphics/render_target.h"
diff --git a/source/libs/asura-lib-core/window/window_impl_glew.cpp b/source/modules/asura-core/window/window_impl_glew.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/window/window_impl_glew.cpp
+++ b/source/modules/asura-core/window/window_impl_glew.cpp
diff --git a/source/libs/asura-lib-core/window/window_impl_glew.h b/source/modules/asura-core/window/window_impl_glew.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/window/window_impl_glew.h
+++ b/source/modules/asura-core/window/window_impl_glew.h
diff --git a/source/libs/asura-lib-core/window/window_impl_glut.cpp b/source/modules/asura-core/window/window_impl_glut.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/window/window_impl_glut.cpp
+++ b/source/modules/asura-core/window/window_impl_glut.cpp
diff --git a/source/libs/asura-lib-core/window/window_impl_glut.h b/source/modules/asura-core/window/window_impl_glut.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/window/window_impl_glut.h
+++ b/source/modules/asura-core/window/window_impl_glut.h
diff --git a/source/libs/asura-lib-core/window/window_impl_sdl.cpp b/source/modules/asura-core/window/window_impl_sdl.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/window/window_impl_sdl.cpp
+++ b/source/modules/asura-core/window/window_impl_sdl.cpp
diff --git a/source/libs/asura-lib-core/window/window_impl_sdl.h b/source/modules/asura-core/window/window_impl_sdl.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/window/window_impl_sdl.h
+++ b/source/modules/asura-core/window/window_impl_sdl.h
diff --git a/source/libs/asura-lib-framework/compile.bat b/source/modules/asura-framework/compile.bat
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-framework/compile.bat
+++ b/source/modules/asura-framework/compile.bat
diff --git a/source/libs/asura-lib-framework/compile.sh b/source/modules/asura-framework/compile.sh
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-framework/compile.sh
+++ b/source/modules/asura-framework/compile.sh
diff --git a/source/libs/asura-lib-framework/main.cpp b/source/modules/asura-framework/main.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-framework/main.cpp
+++ b/source/modules/asura-framework/main.cpp
diff --git a/source/libs/asura-lib-framework/scripts/ai/behavior_tree.lua b/source/modules/asura-framework/scripts/ai/behavior_tree.lua
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-framework/scripts/ai/behavior_tree.lua
+++ b/source/modules/asura-framework/scripts/ai/behavior_tree.lua
diff --git a/source/libs/asura-lib-framework/scripts/ai/state_graph.lua b/source/modules/asura-framework/scripts/ai/state_graph.lua
index 4f563dc..4f563dc 100644
--- a/source/libs/asura-lib-framework/scripts/ai/state_graph.lua
+++ b/source/modules/asura-framework/scripts/ai/state_graph.lua
diff --git a/source/libs/asura-lib-framework/scripts/ai/state_machine.lua b/source/modules/asura-framework/scripts/ai/state_machine.lua
index 6dc5e14..6dc5e14 100644
--- a/source/libs/asura-lib-framework/scripts/ai/state_machine.lua
+++ b/source/modules/asura-framework/scripts/ai/state_machine.lua
diff --git a/source/libs/asura-lib-framework/scripts/audio/sound.lua b/source/modules/asura-framework/scripts/audio/sound.lua
index d7dea4f..d7dea4f 100644
--- a/source/libs/asura-lib-framework/scripts/audio/sound.lua
+++ b/source/modules/asura-framework/scripts/audio/sound.lua
diff --git a/source/libs/asura-lib-framework/scripts/audio/source.lua b/source/modules/asura-framework/scripts/audio/source.lua
index 7dec511..7dec511 100644
--- a/source/libs/asura-lib-framework/scripts/audio/source.lua
+++ b/source/modules/asura-framework/scripts/audio/source.lua
diff --git a/source/libs/asura-lib-framework/scripts/class.lua b/source/modules/asura-framework/scripts/class.lua
index 6392483..6392483 100644
--- a/source/libs/asura-lib-framework/scripts/class.lua
+++ b/source/modules/asura-framework/scripts/class.lua
diff --git a/source/libs/asura-lib-framework/scripts/component.lua b/source/modules/asura-framework/scripts/component.lua
index b560bd3..b560bd3 100644
--- a/source/libs/asura-lib-framework/scripts/component.lua
+++ b/source/modules/asura-framework/scripts/component.lua
diff --git a/source/libs/asura-lib-framework/scripts/entity.lua b/source/modules/asura-framework/scripts/entity.lua
index ea8e14d..ea8e14d 100644
--- a/source/libs/asura-lib-framework/scripts/entity.lua
+++ b/source/modules/asura-framework/scripts/entity.lua
diff --git a/source/libs/asura-lib-framework/scripts/filesystem/animation_loader.lua b/source/modules/asura-framework/scripts/filesystem/animation_loader.lua
index 9c57c43..9c57c43 100644
--- a/source/libs/asura-lib-framework/scripts/filesystem/animation_loader.lua
+++ b/source/modules/asura-framework/scripts/filesystem/animation_loader.lua
diff --git a/source/libs/asura-lib-framework/scripts/filesystem/asset.lua b/source/modules/asura-framework/scripts/filesystem/asset.lua
index 7cf3905..7cf3905 100644
--- a/source/libs/asura-lib-framework/scripts/filesystem/asset.lua
+++ b/source/modules/asura-framework/scripts/filesystem/asset.lua
diff --git a/source/libs/asura-lib-framework/scripts/filesystem/entity_loader.lua b/source/modules/asura-framework/scripts/filesystem/entity_loader.lua
index 39ae0d9..39ae0d9 100644
--- a/source/libs/asura-lib-framework/scripts/filesystem/entity_loader.lua
+++ b/source/modules/asura-framework/scripts/filesystem/entity_loader.lua
diff --git a/source/libs/asura-lib-framework/scripts/filesystem/image_loader.lua b/source/modules/asura-framework/scripts/filesystem/image_loader.lua
index 6b0bef7..6b0bef7 100644
--- a/source/libs/asura-lib-framework/scripts/filesystem/image_loader.lua
+++ b/source/modules/asura-framework/scripts/filesystem/image_loader.lua
diff --git a/source/libs/asura-lib-framework/scripts/filesystem/loader.lua b/source/modules/asura-framework/scripts/filesystem/loader.lua
index e192e30..e192e30 100644
--- a/source/libs/asura-lib-framework/scripts/filesystem/loader.lua
+++ b/source/modules/asura-framework/scripts/filesystem/loader.lua
diff --git a/source/libs/asura-lib-framework/scripts/filesystem/material_loader.lua b/source/modules/asura-framework/scripts/filesystem/material_loader.lua
index 07ca4e9..07ca4e9 100644
--- a/source/libs/asura-lib-framework/scripts/filesystem/material_loader.lua
+++ b/source/modules/asura-framework/scripts/filesystem/material_loader.lua
diff --git a/source/libs/asura-lib-framework/scripts/filesystem/path_loader.lua b/source/modules/asura-framework/scripts/filesystem/path_loader.lua
index 986e42c..986e42c 100644
--- a/source/libs/asura-lib-framework/scripts/filesystem/path_loader.lua
+++ b/source/modules/asura-framework/scripts/filesystem/path_loader.lua
diff --git a/source/libs/asura-lib-framework/scripts/filesystem/scene_loader.lua b/source/modules/asura-framework/scripts/filesystem/scene_loader.lua
index 45731f8..45731f8 100644
--- a/source/libs/asura-lib-framework/scripts/filesystem/scene_loader.lua
+++ b/source/modules/asura-framework/scripts/filesystem/scene_loader.lua
diff --git a/source/libs/asura-lib-framework/scripts/filesystem/script_loader.lua b/source/modules/asura-framework/scripts/filesystem/script_loader.lua
index e93d903..e93d903 100644
--- a/source/libs/asura-lib-framework/scripts/filesystem/script_loader.lua
+++ b/source/modules/asura-framework/scripts/filesystem/script_loader.lua
diff --git a/source/libs/asura-lib-framework/scripts/filesystem/shader_loader.lua b/source/modules/asura-framework/scripts/filesystem/shader_loader.lua
index 12d88bb..12d88bb 100644
--- a/source/libs/asura-lib-framework/scripts/filesystem/shader_loader.lua
+++ b/source/modules/asura-framework/scripts/filesystem/shader_loader.lua
diff --git a/source/libs/asura-lib-framework/scripts/filesystem/statemap_loader.lua b/source/modules/asura-framework/scripts/filesystem/statemap_loader.lua
index e52e086..e52e086 100644
--- a/source/libs/asura-lib-framework/scripts/filesystem/statemap_loader.lua
+++ b/source/modules/asura-framework/scripts/filesystem/statemap_loader.lua
diff --git a/source/libs/asura-lib-framework/scripts/framework.lua b/source/modules/asura-framework/scripts/framework.lua
index 4643221..4643221 100644
--- a/source/libs/asura-lib-framework/scripts/framework.lua
+++ b/source/modules/asura-framework/scripts/framework.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/animation.lua b/source/modules/asura-framework/scripts/graphics/animation.lua
index 285adaa..285adaa 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/animation.lua
+++ b/source/modules/asura-framework/scripts/graphics/animation.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/animator.lua b/source/modules/asura-framework/scripts/graphics/animator.lua
index fd2f979..fd2f979 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/animator.lua
+++ b/source/modules/asura-framework/scripts/graphics/animator.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/camera.lua b/source/modules/asura-framework/scripts/graphics/camera.lua
index a989de6..a989de6 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/camera.lua
+++ b/source/modules/asura-framework/scripts/graphics/camera.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/canvas.lua b/source/modules/asura-framework/scripts/graphics/canvas.lua
index ce2ca20..ce2ca20 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/canvas.lua
+++ b/source/modules/asura-framework/scripts/graphics/canvas.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/default_shaders.lua b/source/modules/asura-framework/scripts/graphics/default_shaders.lua
index bd54cb9..bd54cb9 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/default_shaders.lua
+++ b/source/modules/asura-framework/scripts/graphics/default_shaders.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/image.lua b/source/modules/asura-framework/scripts/graphics/image.lua
index f5ebaa2..f5ebaa2 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/image.lua
+++ b/source/modules/asura-framework/scripts/graphics/image.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/material.lua b/source/modules/asura-framework/scripts/graphics/material.lua
index 5a6e5bd..5a6e5bd 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/material.lua
+++ b/source/modules/asura-framework/scripts/graphics/material.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/material_manager.lua b/source/modules/asura-framework/scripts/graphics/material_manager.lua
index 086a5db..086a5db 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/material_manager.lua
+++ b/source/modules/asura-framework/scripts/graphics/material_manager.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/mesh2d.lua b/source/modules/asura-framework/scripts/graphics/mesh2d.lua
index 05b2e2e..05b2e2e 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/mesh2d.lua
+++ b/source/modules/asura-framework/scripts/graphics/mesh2d.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/mesh2d_renderer.lua b/source/modules/asura-framework/scripts/graphics/mesh2d_renderer.lua
index 09c8c98..09c8c98 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/mesh2d_renderer.lua
+++ b/source/modules/asura-framework/scripts/graphics/mesh2d_renderer.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/particle_system.lua b/source/modules/asura-framework/scripts/graphics/particle_system.lua
index 065a845..065a845 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/particle_system.lua
+++ b/source/modules/asura-framework/scripts/graphics/particle_system.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/renderer.lua b/source/modules/asura-framework/scripts/graphics/renderer.lua
index 92a6409..92a6409 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/renderer.lua
+++ b/source/modules/asura-framework/scripts/graphics/renderer.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/shader.lua b/source/modules/asura-framework/scripts/graphics/shader.lua
index c411619..c411619 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/shader.lua
+++ b/source/modules/asura-framework/scripts/graphics/shader.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/shaderHelper.lua b/source/modules/asura-framework/scripts/graphics/shaderHelper.lua
index b1b42a6..b1b42a6 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/shaderHelper.lua
+++ b/source/modules/asura-framework/scripts/graphics/shaderHelper.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/shape.lua b/source/modules/asura-framework/scripts/graphics/shape.lua
index 51ea8c3..51ea8c3 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/shape.lua
+++ b/source/modules/asura-framework/scripts/graphics/shape.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/shape_renderer.lua b/source/modules/asura-framework/scripts/graphics/shape_renderer.lua
index 80b48b8..80b48b8 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/shape_renderer.lua
+++ b/source/modules/asura-framework/scripts/graphics/shape_renderer.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/sprite.lua b/source/modules/asura-framework/scripts/graphics/sprite.lua
index 9bf05f4..9bf05f4 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/sprite.lua
+++ b/source/modules/asura-framework/scripts/graphics/sprite.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/sprite_batch_renderer.lua b/source/modules/asura-framework/scripts/graphics/sprite_batch_renderer.lua
index 9ec73d2..9ec73d2 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/sprite_batch_renderer.lua
+++ b/source/modules/asura-framework/scripts/graphics/sprite_batch_renderer.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/sprite_renderer.lua b/source/modules/asura-framework/scripts/graphics/sprite_renderer.lua
index 0a41e08..0a41e08 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/sprite_renderer.lua
+++ b/source/modules/asura-framework/scripts/graphics/sprite_renderer.lua
diff --git a/source/libs/asura-lib-framework/scripts/gui/button.lua b/source/modules/asura-framework/scripts/gui/button.lua
index b122931..b122931 100644
--- a/source/libs/asura-lib-framework/scripts/gui/button.lua
+++ b/source/modules/asura-framework/scripts/gui/button.lua
diff --git a/source/libs/asura-lib-framework/scripts/gui/text.lua b/source/modules/asura-framework/scripts/gui/text.lua
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-framework/scripts/gui/text.lua
+++ b/source/modules/asura-framework/scripts/gui/text.lua
diff --git a/source/libs/asura-lib-framework/scripts/gui/widget.lua b/source/modules/asura-framework/scripts/gui/widget.lua
index 430ade0..430ade0 100644
--- a/source/libs/asura-lib-framework/scripts/gui/widget.lua
+++ b/source/modules/asura-framework/scripts/gui/widget.lua
diff --git a/source/libs/asura-lib-framework/scripts/managers/scene_manager.lua b/source/modules/asura-framework/scripts/managers/scene_manager.lua
index 7886dc6..7886dc6 100644
--- a/source/libs/asura-lib-framework/scripts/managers/scene_manager.lua
+++ b/source/modules/asura-framework/scripts/managers/scene_manager.lua
diff --git a/source/libs/asura-lib-framework/scripts/managers/sprite_manager.lua b/source/modules/asura-framework/scripts/managers/sprite_manager.lua
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-framework/scripts/managers/sprite_manager.lua
+++ b/source/modules/asura-framework/scripts/managers/sprite_manager.lua
diff --git a/source/libs/asura-lib-framework/scripts/math/curve.lua b/source/modules/asura-framework/scripts/math/curve.lua
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-framework/scripts/math/curve.lua
+++ b/source/modules/asura-framework/scripts/math/curve.lua
diff --git a/source/libs/asura-lib-framework/scripts/path/path.lua b/source/modules/asura-framework/scripts/path/path.lua
index 1fc9b3a..1fc9b3a 100644
--- a/source/libs/asura-lib-framework/scripts/path/path.lua
+++ b/source/modules/asura-framework/scripts/path/path.lua
diff --git a/source/libs/asura-lib-framework/scripts/path/path_calculator.lua b/source/modules/asura-framework/scripts/path/path_calculator.lua
index d44da08..d44da08 100644
--- a/source/libs/asura-lib-framework/scripts/path/path_calculator.lua
+++ b/source/modules/asura-framework/scripts/path/path_calculator.lua
diff --git a/source/libs/asura-lib-framework/scripts/path/path_manager.lua b/source/modules/asura-framework/scripts/path/path_manager.lua
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-framework/scripts/path/path_manager.lua
+++ b/source/modules/asura-framework/scripts/path/path_manager.lua
diff --git a/source/libs/asura-lib-framework/scripts/scene.lua b/source/modules/asura-framework/scripts/scene.lua
index 11ac86c..11ac86c 100644
--- a/source/libs/asura-lib-framework/scripts/scene.lua
+++ b/source/modules/asura-framework/scripts/scene.lua
diff --git a/source/libs/asura-lib-framework/scripts/transform.lua b/source/modules/asura-framework/scripts/transform.lua
index 1d34ae6..1d34ae6 100644
--- a/source/libs/asura-lib-framework/scripts/transform.lua
+++ b/source/modules/asura-framework/scripts/transform.lua
diff --git a/source/libs/asura-lib-json/json.cpp b/source/modules/asura-json/json.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-json/json.cpp
+++ b/source/modules/asura-json/json.cpp
diff --git a/source/libs/asura-lib-json/json.h b/source/modules/asura-json/json.h
index 2bdaf53..2bdaf53 100644
--- a/source/libs/asura-lib-json/json.h
+++ b/source/modules/asura-json/json.h
diff --git a/source/libs/asura-lib-json/json_module.cpp b/source/modules/asura-json/json_module.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-json/json_module.cpp
+++ b/source/modules/asura-json/json_module.cpp
diff --git a/source/libs/asura-lib-json/json_module.h b/source/modules/asura-json/json_module.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-json/json_module.h
+++ b/source/modules/asura-json/json_module.h
diff --git a/source/libs/asura-lib-openal/sound.cpp b/source/modules/asura-openal/sound.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-openal/sound.cpp
+++ b/source/modules/asura-openal/sound.cpp
diff --git a/source/libs/asura-lib-openal/sound.h b/source/modules/asura-openal/sound.h
index 6c2d7c2..2b0eab0 100644
--- a/source/libs/asura-lib-openal/sound.h
+++ b/source/modules/asura-openal/sound.h
@@ -1,7 +1,7 @@
 #ifndef __ASURA_ENGINE_SOUND_H__
 #define __ASURA_ENGINE_SOUND_H__
 
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/scripting/portable.hpp>
 
 namespace AsuraEngine
 {
diff --git a/source/libs/asura-lib-openal/sound_decode_task.cpp b/source/modules/asura-openal/sound_decode_task.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-openal/sound_decode_task.cpp
+++ b/source/modules/asura-openal/sound_decode_task.cpp
diff --git a/source/libs/asura-lib-openal/sound_decode_task.h b/source/modules/asura-openal/sound_decode_task.h
index d39013f..9587276 100644
--- a/source/libs/asura-lib-openal/sound_decode_task.h
+++ b/source/modules/asura-openal/sound_decode_task.h
@@ -1,7 +1,7 @@
 #ifndef __ASURA_OPENAL_SOUND_DECODER_TASK_H__
 #define __ASURA_OPENAL_SOUND_DECODER_TASK_H__
 
-#include <asura-lib-utils/threading/thread_task.h>
+#include <asura-utils/threading/thread_task.h>
 
 namespace AsuraEngine
 {
diff --git a/source/libs/asura-lib-openal/sound_decoder.cpp b/source/modules/asura-openal/sound_decoder.cpp
index ad9f761..ad9f761 100644
--- a/source/libs/asura-lib-openal/sound_decoder.cpp
+++ b/source/modules/asura-openal/sound_decoder.cpp
diff --git a/source/libs/asura-lib-openal/sound_decoder.h b/source/modules/asura-openal/sound_decoder.h
index 2a3f087..e28a5a9 100644
--- a/source/libs/asura-lib-openal/sound_decoder.h
+++ b/source/modules/asura-openal/sound_decoder.h
@@ -1,7 +1,7 @@
 #ifndef __ASURA_ENGINE_SOUND_DECODER_H__
 #define __ASURA_ENGINE_SOUND_DECODER_H__
 
-#include <asura-lib-utils/io/data_buffer.h>
+#include <asura-utils/io/data_buffer.h>
 
 #include "sound.h"
 
diff --git a/source/libs/asura-lib-utils/exceptions/exception.cpp b/source/modules/asura-utils/exceptions/exception.cpp
index dbb36ca..dbb36ca 100644
--- a/source/libs/asura-lib-utils/exceptions/exception.cpp
+++ b/source/modules/asura-utils/exceptions/exception.cpp
diff --git a/source/libs/asura-lib-utils/exceptions/exception.h b/source/modules/asura-utils/exceptions/exception.h
index 57c9ed6..57c9ed6 100644
--- a/source/libs/asura-lib-utils/exceptions/exception.h
+++ b/source/modules/asura-utils/exceptions/exception.h
diff --git a/source/libs/asura-lib-utils/io/binding/_compressor.cpp b/source/modules/asura-utils/io/binding/_compressor.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/io/binding/_compressor.cpp
+++ b/source/modules/asura-utils/io/binding/_compressor.cpp
diff --git a/source/libs/asura-lib-utils/io/binding/_data_buffer.cpp b/source/modules/asura-utils/io/binding/_data_buffer.cpp
index cd73b31..cd73b31 100644
--- a/source/libs/asura-lib-utils/io/binding/_data_buffer.cpp
+++ b/source/modules/asura-utils/io/binding/_data_buffer.cpp
diff --git a/source/libs/asura-lib-utils/io/binding/_file.cpp b/source/modules/asura-utils/io/binding/_file.cpp
index c44bc90..c44bc90 100644
--- a/source/libs/asura-lib-utils/io/binding/_file.cpp
+++ b/source/modules/asura-utils/io/binding/_file.cpp
diff --git a/source/libs/asura-lib-utils/io/binding/_file_data.cpp b/source/modules/asura-utils/io/binding/_file_data.cpp
index 09a0643..09a0643 100644
--- a/source/libs/asura-lib-utils/io/binding/_file_data.cpp
+++ b/source/modules/asura-utils/io/binding/_file_data.cpp
diff --git a/source/libs/asura-lib-utils/io/binding/_file_system.cpp b/source/modules/asura-utils/io/binding/_file_system.cpp
index 3843451..3843451 100644
--- a/source/libs/asura-lib-utils/io/binding/_file_system.cpp
+++ b/source/modules/asura-utils/io/binding/_file_system.cpp
diff --git a/source/libs/asura-lib-utils/io/binding/_io_task.cpp b/source/modules/asura-utils/io/binding/_io_task.cpp
index b3c5988..b3c5988 100644
--- a/source/libs/asura-lib-utils/io/binding/_io_task.cpp
+++ b/source/modules/asura-utils/io/binding/_io_task.cpp
diff --git a/source/libs/asura-lib-utils/io/compressor.cpp b/source/modules/asura-utils/io/compressor.cpp
index 095eff4..095eff4 100644
--- a/source/libs/asura-lib-utils/io/compressor.cpp
+++ b/source/modules/asura-utils/io/compressor.cpp
diff --git a/source/libs/asura-lib-utils/io/compressor.h b/source/modules/asura-utils/io/compressor.h
index 30a074c..30a074c 100644
--- a/source/libs/asura-lib-utils/io/compressor.h
+++ b/source/modules/asura-utils/io/compressor.h
diff --git a/source/libs/asura-lib-utils/io/data_buffer.cpp b/source/modules/asura-utils/io/data_buffer.cpp
index 5049b38..5049b38 100644
--- a/source/libs/asura-lib-utils/io/data_buffer.cpp
+++ b/source/modules/asura-utils/io/data_buffer.cpp
diff --git a/source/libs/asura-lib-utils/io/data_buffer.h b/source/modules/asura-utils/io/data_buffer.h
index 445bdf4..445bdf4 100644
--- a/source/libs/asura-lib-utils/io/data_buffer.h
+++ b/source/modules/asura-utils/io/data_buffer.h
diff --git a/source/libs/asura-lib-utils/io/decoded_data.cpp b/source/modules/asura-utils/io/decoded_data.cpp
index 358a7a5..358a7a5 100644
--- a/source/libs/asura-lib-utils/io/decoded_data.cpp
+++ b/source/modules/asura-utils/io/decoded_data.cpp
diff --git a/source/libs/asura-lib-utils/io/decoded_data.h b/source/modules/asura-utils/io/decoded_data.h
index e201e91..e201e91 100644
--- a/source/libs/asura-lib-utils/io/decoded_data.h
+++ b/source/modules/asura-utils/io/decoded_data.h
diff --git a/source/libs/asura-lib-utils/io/file.cpp b/source/modules/asura-utils/io/file.cpp
index 0ff8c90..ed95436 100644
--- a/source/libs/asura-lib-utils/io/file.cpp
+++ b/source/modules/asura-utils/io/file.cpp
@@ -1,6 +1,6 @@
 #include <physfs/physfs.h>
 
-#include <asura-lib-utils/exceptions/exception.h>
+#include <asura-utils/exceptions/exception.h>
 
 #include "file.h"
 
diff --git a/source/libs/asura-lib-utils/io/file.h b/source/modules/asura-utils/io/file.h
index 56077e0..56077e0 100644
--- a/source/libs/asura-lib-utils/io/file.h
+++ b/source/modules/asura-utils/io/file.h
diff --git a/source/libs/asura-lib-utils/io/file_data.cpp b/source/modules/asura-utils/io/file_data.cpp
index 92333cf..92333cf 100644
--- a/source/libs/asura-lib-utils/io/file_data.cpp
+++ b/source/modules/asura-utils/io/file_data.cpp
diff --git a/source/libs/asura-lib-utils/io/file_data.h b/source/modules/asura-utils/io/file_data.h
index 9aa0e3b..cd69477 100644
--- a/source/libs/asura-lib-utils/io/file_data.h
+++ b/source/modules/asura-utils/io/file_data.h
@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/scripting/portable.hpp>
 
 #include "data_buffer.h"
 
diff --git a/source/libs/asura-lib-utils/io/file_system.cpp b/source/modules/asura-utils/io/file_system.cpp
index 20f3cb2..20f3cb2 100644
--- a/source/libs/asura-lib-utils/io/file_system.cpp
+++ b/source/modules/asura-utils/io/file_system.cpp
diff --git a/source/libs/asura-lib-utils/io/file_system.h b/source/modules/asura-utils/io/file_system.h
index 849cbb6..849cbb6 100644
--- a/source/libs/asura-lib-utils/io/file_system.h
+++ b/source/modules/asura-utils/io/file_system.h
diff --git a/source/libs/asura-lib-utils/io/io_batch_task.cpp b/source/modules/asura-utils/io/io_batch_task.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/io/io_batch_task.cpp
+++ b/source/modules/asura-utils/io/io_batch_task.cpp
diff --git a/source/libs/asura-lib-utils/io/io_batch_task.h b/source/modules/asura-utils/io/io_batch_task.h
index c0be921..c0be921 100644
--- a/source/libs/asura-lib-utils/io/io_batch_task.h
+++ b/source/modules/asura-utils/io/io_batch_task.h
diff --git a/source/libs/asura-lib-utils/io/io_task.cpp b/source/modules/asura-utils/io/io_task.cpp
index 361b9c5..361b9c5 100644
--- a/source/libs/asura-lib-utils/io/io_task.cpp
+++ b/source/modules/asura-utils/io/io_task.cpp
diff --git a/source/libs/asura-lib-utils/io/io_task.h b/source/modules/asura-utils/io/io_task.h
index 8f04142..8f04142 100644
--- a/source/libs/asura-lib-utils/io/io_task.h
+++ b/source/modules/asura-utils/io/io_task.h
diff --git a/source/libs/asura-lib-utils/io/reloadable.h b/source/modules/asura-utils/io/reloadable.h
index 22a721c..22a721c 100644
--- a/source/libs/asura-lib-utils/io/reloadable.h
+++ b/source/modules/asura-utils/io/reloadable.h
diff --git a/source/libs/asura-lib-utils/manager.hpp b/source/modules/asura-utils/manager.hpp
index 7b4e272..7b4e272 100644
--- a/source/libs/asura-lib-utils/manager.hpp
+++ b/source/modules/asura-utils/manager.hpp
diff --git a/source/libs/asura-lib-utils/math/curve.cpp b/source/modules/asura-utils/math/curve.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/math/curve.cpp
+++ b/source/modules/asura-utils/math/curve.cpp
diff --git a/source/libs/asura-lib-utils/math/curve.h b/source/modules/asura-utils/math/curve.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/math/curve.h
+++ b/source/modules/asura-utils/math/curve.h
diff --git a/source/libs/asura-lib-utils/math/functions.cpp b/source/modules/asura-utils/math/functions.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/math/functions.cpp
+++ b/source/modules/asura-utils/math/functions.cpp
diff --git a/source/libs/asura-lib-utils/math/functions.h b/source/modules/asura-utils/math/functions.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/math/functions.h
+++ b/source/modules/asura-utils/math/functions.h
diff --git a/source/libs/asura-lib-utils/math/matrix44.cpp b/source/modules/asura-utils/math/matrix44.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/math/matrix44.cpp
+++ b/source/modules/asura-utils/math/matrix44.cpp
diff --git a/source/libs/asura-lib-utils/math/matrix44.h b/source/modules/asura-utils/math/matrix44.h
index 4ab3c0b..4ab3c0b 100644
--- a/source/libs/asura-lib-utils/math/matrix44.h
+++ b/source/modules/asura-utils/math/matrix44.h
diff --git a/source/libs/asura-lib-utils/math/quaternion.cpp b/source/modules/asura-utils/math/quaternion.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/math/quaternion.cpp
+++ b/source/modules/asura-utils/math/quaternion.cpp
diff --git a/source/libs/asura-lib-utils/math/quaternion.h b/source/modules/asura-utils/math/quaternion.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/math/quaternion.h
+++ b/source/modules/asura-utils/math/quaternion.h
diff --git a/source/libs/asura-lib-utils/math/ranged_value.cpp b/source/modules/asura-utils/math/ranged_value.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/math/ranged_value.cpp
+++ b/source/modules/asura-utils/math/ranged_value.cpp
diff --git a/source/libs/asura-lib-utils/math/ranged_value.h b/source/modules/asura-utils/math/ranged_value.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/math/ranged_value.h
+++ b/source/modules/asura-utils/math/ranged_value.h
diff --git a/source/libs/asura-lib-utils/math/rect.hpp b/source/modules/asura-utils/math/rect.hpp
index 1751634..1751634 100644
--- a/source/libs/asura-lib-utils/math/rect.hpp
+++ b/source/modules/asura-utils/math/rect.hpp
diff --git a/source/libs/asura-lib-utils/math/rect.inl b/source/modules/asura-utils/math/rect.inl
index 891a3f8..891a3f8 100644
--- a/source/libs/asura-lib-utils/math/rect.inl
+++ b/source/modules/asura-utils/math/rect.inl
diff --git a/source/libs/asura-lib-utils/math/transform.cpp b/source/modules/asura-utils/math/transform.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/math/transform.cpp
+++ b/source/modules/asura-utils/math/transform.cpp
diff --git a/source/libs/asura-lib-utils/math/transform.h b/source/modules/asura-utils/math/transform.h
index be4c850..be4c850 100644
--- a/source/libs/asura-lib-utils/math/transform.h
+++ b/source/modules/asura-utils/math/transform.h
diff --git a/source/libs/asura-lib-utils/math/vector2.hpp b/source/modules/asura-utils/math/vector2.hpp
index df78255..df78255 100644
--- a/source/libs/asura-lib-utils/math/vector2.hpp
+++ b/source/modules/asura-utils/math/vector2.hpp
diff --git a/source/libs/asura-lib-utils/math/vector2.inl b/source/modules/asura-utils/math/vector2.inl
index 9e131a7..9e131a7 100644
--- a/source/libs/asura-lib-utils/math/vector2.inl
+++ b/source/modules/asura-utils/math/vector2.inl
diff --git a/source/libs/asura-lib-utils/math/vector3.hpp b/source/modules/asura-utils/math/vector3.hpp
index 2b23406..2b23406 100644
--- a/source/libs/asura-lib-utils/math/vector3.hpp
+++ b/source/modules/asura-utils/math/vector3.hpp
diff --git a/source/libs/asura-lib-utils/math/vector3.inl b/source/modules/asura-utils/math/vector3.inl
index 3a2aa93..3a2aa93 100644
--- a/source/libs/asura-lib-utils/math/vector3.inl
+++ b/source/modules/asura-utils/math/vector3.inl
diff --git a/source/libs/asura-lib-utils/math/vector4.h b/source/modules/asura-utils/math/vector4.h
index 13a9d8a..13a9d8a 100644
--- a/source/libs/asura-lib-utils/math/vector4.h
+++ b/source/modules/asura-utils/math/vector4.h
diff --git a/source/libs/asura-lib-utils/math/vector4.inl b/source/modules/asura-utils/math/vector4.inl
index 025bfcc..025bfcc 100644
--- a/source/libs/asura-lib-utils/math/vector4.inl
+++ b/source/modules/asura-utils/math/vector4.inl
diff --git a/source/libs/asura-lib-utils/module.h b/source/modules/asura-utils/module.h
index b22c68c..b22c68c 100644
--- a/source/libs/asura-lib-utils/module.h
+++ b/source/modules/asura-utils/module.h
diff --git a/source/libs/asura-lib-utils/scripting/lua_env.h b/source/modules/asura-utils/scripting/lua_env.h
index e2fc4fc..e2fc4fc 100644
--- a/source/libs/asura-lib-utils/scripting/lua_env.h
+++ b/source/modules/asura-utils/scripting/lua_env.h
diff --git a/source/libs/asura-lib-utils/scripting/portable.hpp b/source/modules/asura-utils/scripting/portable.hpp
index 5badf8d..5badf8d 100644
--- a/source/libs/asura-lib-utils/scripting/portable.hpp
+++ b/source/modules/asura-utils/scripting/portable.hpp
diff --git a/source/libs/asura-lib-utils/singleton.hpp b/source/modules/asura-utils/singleton.hpp
index 0d2777e..0d2777e 100644
--- a/source/libs/asura-lib-utils/singleton.hpp
+++ b/source/modules/asura-utils/singleton.hpp
diff --git a/source/libs/asura-lib-utils/stringmap.cpp b/source/modules/asura-utils/stringmap.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/stringmap.cpp
+++ b/source/modules/asura-utils/stringmap.cpp
diff --git a/source/libs/asura-lib-utils/stringmap.hpp b/source/modules/asura-utils/stringmap.hpp
index ddba128..ddba128 100644
--- a/source/libs/asura-lib-utils/stringmap.hpp
+++ b/source/modules/asura-utils/stringmap.hpp
diff --git a/source/libs/asura-lib-utils/threading/binding/_coroutine.cpp b/source/modules/asura-utils/threading/binding/_coroutine.cpp
index 7f74cca..7f74cca 100644
--- a/source/libs/asura-lib-utils/threading/binding/_coroutine.cpp
+++ b/source/modules/asura-utils/threading/binding/_coroutine.cpp
diff --git a/source/libs/asura-lib-utils/threading/binding/_thread.cpp b/source/modules/asura-utils/threading/binding/_thread.cpp
index a5aff03..a5aff03 100644
--- a/source/libs/asura-lib-utils/threading/binding/_thread.cpp
+++ b/source/modules/asura-utils/threading/binding/_thread.cpp
diff --git a/source/libs/asura-lib-utils/threading/coroutine.cpp b/source/modules/asura-utils/threading/coroutine.cpp
index 9f65c5f..9f65c5f 100644
--- a/source/libs/asura-lib-utils/threading/coroutine.cpp
+++ b/source/modules/asura-utils/threading/coroutine.cpp
diff --git a/source/libs/asura-lib-utils/threading/coroutine.h b/source/modules/asura-utils/threading/coroutine.h
index 01af654..01af654 100644
--- a/source/libs/asura-lib-utils/threading/coroutine.h
+++ b/source/modules/asura-utils/threading/coroutine.h
diff --git a/source/libs/asura-lib-utils/threading/mutex.cpp b/source/modules/asura-utils/threading/mutex.cpp
index 663ac28..ffe67f6 100644
--- a/source/libs/asura-lib-utils/threading/mutex.cpp
+++ b/source/modules/asura-utils/threading/mutex.cpp
@@ -1,4 +1,4 @@
-#include <asura-lib-utils/exceptions/exception.h>
+#include <asura-utils/exceptions/exception.h>
 
 #include "mutex.h"
 
diff --git a/source/libs/asura-lib-utils/threading/mutex.h b/source/modules/asura-utils/threading/mutex.h
index 7e7d877..a3fbea5 100644
--- a/source/libs/asura-lib-utils/threading/mutex.h
+++ b/source/modules/asura-utils/threading/mutex.h
@@ -1,7 +1,7 @@
 #ifndef __ASURA_MUTEX_H__
 #define __ASURA_MUTEX_H__
 
-#include <asura-lib-utils/type.h>
+#include <asura-utils/type.h>
 
 #include "../utils_config.h"
 
diff --git a/source/libs/asura-lib-utils/threading/semaphore.cpp b/source/modules/asura-utils/threading/semaphore.cpp
index d59ec78..12d4aab 100644
--- a/source/libs/asura-lib-utils/threading/semaphore.cpp
+++ b/source/modules/asura-utils/threading/semaphore.cpp
@@ -27,7 +27,7 @@ namespace AsuraEngine
 #ifdef ASURA_THREAD_WIN32 
 			try_create_semaphore(SemaphoreWin32);
 #endif
-			ASSERT(mImpl);
+			//ASSERT(mImpl);
 		}
 
 		Semaphore::~Semaphore()
diff --git a/source/libs/asura-lib-utils/threading/semaphore.h b/source/modules/asura-utils/threading/semaphore.h
index 80773d8..80773d8 100644
--- a/source/libs/asura-lib-utils/threading/semaphore.h
+++ b/source/modules/asura-utils/threading/semaphore.h
diff --git a/source/libs/asura-lib-utils/threading/task.cpp b/source/modules/asura-utils/threading/task.cpp
index 2e84ed4..2e84ed4 100644
--- a/source/libs/asura-lib-utils/threading/task.cpp
+++ b/source/modules/asura-utils/threading/task.cpp
diff --git a/source/libs/asura-lib-utils/threading/task.h b/source/modules/asura-utils/threading/task.h
index fb7aa5f..3b3a79c 100644
--- a/source/libs/asura-lib-utils/threading/task.h
+++ b/source/modules/asura-utils/threading/task.h
@@ -1,8 +1,8 @@
 #ifndef __ASURA_THRAD_TASK_H__
 #define __ASURA_THRAD_TASK_H__
 
-#include <asura-lib-utils/type.h>
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/type.h>
+#include <asura-utils/scripting/portable.hpp>
 
 namespace AsuraEngine
 {
diff --git a/source/libs/asura-lib-utils/threading/thread.cpp b/source/modules/asura-utils/threading/thread.cpp
index 0f4f5da..0f4f5da 100644
--- a/source/libs/asura-lib-utils/threading/thread.cpp
+++ b/source/modules/asura-utils/threading/thread.cpp
diff --git a/source/libs/asura-lib-utils/threading/thread.h b/source/modules/asura-utils/threading/thread.h
index 0e75770..340fca3 100644
--- a/source/libs/asura-lib-utils/threading/thread.h
+++ b/source/modules/asura-utils/threading/thread.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <queue>
 
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/scripting/portable.hpp>
 
 #include "task.h"
 #include "mutex.h"
diff --git a/source/libs/asura-lib-utils/threading/thread_impl_posix.cpp b/source/modules/asura-utils/threading/thread_impl_posix.cpp
index d2ad7af..d2ad7af 100644
--- a/source/libs/asura-lib-utils/threading/thread_impl_posix.cpp
+++ b/source/modules/asura-utils/threading/thread_impl_posix.cpp
diff --git a/source/libs/asura-lib-utils/threading/thread_impl_posix.h b/source/modules/asura-utils/threading/thread_impl_posix.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/threading/thread_impl_posix.h
+++ b/source/modules/asura-utils/threading/thread_impl_posix.h
diff --git a/source/libs/asura-lib-utils/threading/thread_impl_sdl.cpp b/source/modules/asura-utils/threading/thread_impl_sdl.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/threading/thread_impl_sdl.cpp
+++ b/source/modules/asura-utils/threading/thread_impl_sdl.cpp
diff --git a/source/libs/asura-lib-utils/threading/thread_impl_sdl.h b/source/modules/asura-utils/threading/thread_impl_sdl.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/threading/thread_impl_sdl.h
+++ b/source/modules/asura-utils/threading/thread_impl_sdl.h
diff --git a/source/libs/asura-lib-utils/threading/thread_impl_std.cpp b/source/modules/asura-utils/threading/thread_impl_std.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/threading/thread_impl_std.cpp
+++ b/source/modules/asura-utils/threading/thread_impl_std.cpp
diff --git a/source/libs/asura-lib-utils/threading/thread_impl_std.h b/source/modules/asura-utils/threading/thread_impl_std.h
index 0e7d3da..0e7d3da 100644
--- a/source/libs/asura-lib-utils/threading/thread_impl_std.h
+++ b/source/modules/asura-utils/threading/thread_impl_std.h
diff --git a/source/libs/asura-lib-utils/threading/thread_impl_win32.cpp b/source/modules/asura-utils/threading/thread_impl_win32.cpp
index 6871c2d..6871c2d 100644
--- a/source/libs/asura-lib-utils/threading/thread_impl_win32.cpp
+++ b/source/modules/asura-utils/threading/thread_impl_win32.cpp
diff --git a/source/libs/asura-lib-utils/threading/thread_impl_win32.h b/source/modules/asura-utils/threading/thread_impl_win32.h
index a22aeef..a22aeef 100644
--- a/source/libs/asura-lib-utils/threading/thread_impl_win32.h
+++ b/source/modules/asura-utils/threading/thread_impl_win32.h
diff --git a/source/libs/asura-lib-utils/threading/thread_task.cpp b/source/modules/asura-utils/threading/thread_task.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/threading/thread_task.cpp
+++ b/source/modules/asura-utils/threading/thread_task.cpp
diff --git a/source/libs/asura-lib-utils/threading/thread_task.h b/source/modules/asura-utils/threading/thread_task.h
index 1ea0a1a..6592191 100644
--- a/source/libs/asura-lib-utils/threading/thread_task.h
+++ b/source/modules/asura-utils/threading/thread_task.h
@@ -1,8 +1,8 @@
 #ifndef __ASURA_THRAD_TASK_H__
 #define __ASURA_THRAD_TASK_H__
 
-#include <asura-lib-utils/type.h>
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/type.h>
+#include <asura-utils/scripting/portable.hpp>
 
 namespace AsuraEngine
 {
diff --git a/source/libs/asura-lib-utils/type.h b/source/modules/asura-utils/type.h
index 1ed2d42..1ed2d42 100644
--- a/source/libs/asura-lib-utils/type.h
+++ b/source/modules/asura-utils/type.h
diff --git a/source/libs/asura-lib-utils/utils.h b/source/modules/asura-utils/utils.h
index ce1c6a1..ce1c6a1 100644
--- a/source/libs/asura-lib-utils/utils.h
+++ b/source/modules/asura-utils/utils.h
diff --git a/source/libs/asura-lib-utils/utils_config.h b/source/modules/asura-utils/utils_config.h
index 02837dc..02837dc 100644
--- a/source/libs/asura-lib-utils/utils_config.h
+++ b/source/modules/asura-utils/utils_config.h
diff --git a/source/libs/asura-lib-utils/utils_module.cpp b/source/modules/asura-utils/utils_module.cpp
index 61780e6..61780e6 100644
--- a/source/libs/asura-lib-utils/utils_module.cpp
+++ b/source/modules/asura-utils/utils_module.cpp
diff --git a/source/libs/asura-lib-utils/utils_module.h b/source/modules/asura-utils/utils_module.h
index e802730..e802730 100644
--- a/source/libs/asura-lib-utils/utils_module.h
+++ b/source/modules/asura-utils/utils_module.h
diff --git a/source/tests/05-physfs/main.cpp b/source/tests/05-physfs/main.cpp
index 4400c44..0ddade0 100644
--- a/source/tests/05-physfs/main.cpp
+++ b/source/tests/05-physfs/main.cpp
@@ -1,6 +1,6 @@
 #include <string>
 
-#include <asura-lib-utils/utils.h>
+#include <asura-utils/utils.h>
 
 using namespace std;
 using namespace AEScripting;