*misc

7 files changed, 376 insertions, 497 deletions

diff --git a/build/modules/asura-base/asura-base.vcxproj b/build/modules/asura-base/asura-base.vcxproj
index df4d426..89ba183 100644
--- a/build/modules/asura-base/asura-base.vcxproj
+++ b/build/modules/asura-base/asura-base.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -18,14 +18,10 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\source\modules\asura-base\Configure.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-base\BuildConfigure.h" />
-  </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{E10B78AA-B90E-4BB7-BAAD-0E2E4C4B9BD1}</ProjectGuid>
-    <RootNamespace>asurabase</RootNamespace>
+    <ProjectGuid>{7D41093F-E356-4C5B-A25F-41779BF86E54}</ProjectGuid>
+    <RootNamespace>asurautils</RootNamespace>
     <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -85,6 +81,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\source\external;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -117,12 +114,117 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\source\external;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\Source\modules\asura-base\Exception.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\FileSystem\Binding\_compressor.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\FileSystem\Binding\_data_buffer.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\FileSystem\Binding\_file.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\FileSystem\Binding\_file_data.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\FileSystem\Binding\_file_manager.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\FileSystem\Binding\_io_task.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\FileSystem\Compressor.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\FileSystem\DataBuffer.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\FileSystem\File.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\FileSystem\FileData.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\FileSystem\FileManager.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\FileSystem\IOBatchTask.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\FileSystem\IOTask.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\Math\Curve.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\Math\Functions.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\Math\Matrix44.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\Math\Quaternion.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\Math\RangedValue.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\Math\Transform.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\Threads\binding\_coroutine.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\Threads\binding\_thread.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\Threads\Conditional.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\Threads\Coroutine.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\Threads\Mutex.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\Threads\Semaphore.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\Threads\Task.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\Threads\Thread.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\Threads\ThreadImplPosix.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\Threads\ThreadImplSDL.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\Threads\ThreadImplStd.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\Threads\ThreadImplWin32.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\Utilities\Hash128.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\Utilities\LinkedList.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\Utilities\StringMap.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\UtilsModule.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\source\modules\asura-base\BuildConfigure.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Classes.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Configure.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-base\Exception.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\FileSystem\Compressor.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\FileSystem\DataBuffer.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\FileSystem\DecodedData.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\FileSystem\File.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\FileSystem\FileData.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\FileSystem\FileManager.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\FileSystem\IOBatchTask.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\FileSystem\IOTask.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\FileSystem\Renewable.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Manager.hpp" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Math\Curve.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Math\Functions.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Math\Matrix44.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Math\Quaternion.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-base\Math\Random.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Math\RangedValue.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Math\Rect.hpp" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Math\Transform.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Math\Vector2.hpp" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Math\Vector3.hpp" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Math\Vector4.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Module.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Scripting\Scripting.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Singleton.hpp" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Threads\Conditional.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Threads\Coroutine.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Threads\Mutex.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Threads\Semaphore.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Threads\Task.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Threads\Thread.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Threads\Threadable.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Threads\ThreadImplPosix.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Threads\ThreadImplSDL.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Threads\ThreadImplStd.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Threads\ThreadImplWin32.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Type.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Utilities\dynamic_bitset.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Utilities\Hash128.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Utilities\LinkedList.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Utilities\StringMap.hpp" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Utils.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\UtilsConfig.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\UtilsModule.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\external\lua51\lua51.vcxproj">
+      <Project>{8b8fca14-fc8a-45b4-bf3c-9340cb586076}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\external\Luax\Luax.vcxproj">
+      <Project>{1350cee9-b2c2-426a-af4e-f651d51dd592}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\external\physfs\physfs.vcxproj">
+      <Project>{aee37589-de0d-4139-8bdb-8179fdefb835}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\source\modules\asura-base\Math\Rect.inc" />
+    <None Include="..\..\..\source\modules\asura-base\Math\Vector2.inc" />
+    <None Include="..\..\..\source\modules\asura-base\Math\Vector3.inc" />
+    <None Include="..\..\..\source\modules\asura-base\Math\Vector4.inc" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/build/modules/asura-base/asura-base.vcxproj.filters b/build/modules/asura-base/asura-base.vcxproj.filters
index d1db8b3..5f639bc 100644
--- a/build/modules/asura-base/asura-base.vcxproj.filters
+++ b/build/modules/asura-base/asura-base.vcxproj.filters
@@ -1,7 +1,267 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
+    <Filter Include="Math">
+      <UniqueIdentifier>{d46782e8-fa86-46be-8e3e-728d313acfed}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Scripting">
+      <UniqueIdentifier>{3a94ee03-c8db-4d2e-b0b6-5f6ba157580d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Threads">
+      <UniqueIdentifier>{d617f453-4cd1-451b-801d-2f88d0072303}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Threads\binding">
+      <UniqueIdentifier>{e63982e2-a2ca-4aa2-be11-f98659586c1f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Utilities">
+      <UniqueIdentifier>{2c79a63b-6330-4c76-b70e-b235a4b301d9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="FileSystem">
+      <UniqueIdentifier>{6eb6ffb5-ecd9-408b-a2f4-c14837822850}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="FileSystem\Binding">
+      <UniqueIdentifier>{b4b078e1-bb8d-4cb3-84b9-963e851be123}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\source\modules\asura-base\Math\Curve.cpp">
+      <Filter>Math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\Math\Functions.cpp">
+      <Filter>Math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\Math\Matrix44.cpp">
+      <Filter>Math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\Math\Quaternion.cpp">
+      <Filter>Math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\Math\RangedValue.cpp">
+      <Filter>Math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\Math\Transform.cpp">
+      <Filter>Math</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\UtilsModule.cpp" />
+    <ClCompile Include="..\..\..\source\modules\asura-base\Threads\binding\_coroutine.cpp">
+      <Filter>Threads\binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\Threads\binding\_thread.cpp">
+      <Filter>Threads\binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\Threads\Conditional.cpp">
+      <Filter>Threads</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\Threads\Coroutine.cpp">
+      <Filter>Threads</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\Threads\Mutex.cpp">
+      <Filter>Threads</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\Threads\Semaphore.cpp">
+      <Filter>Threads</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\Threads\Task.cpp">
+      <Filter>Threads</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\Threads\Thread.cpp">
+      <Filter>Threads</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\Threads\ThreadImplPosix.cpp">
+      <Filter>Threads</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\Threads\ThreadImplSDL.cpp">
+      <Filter>Threads</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\Threads\ThreadImplStd.cpp">
+      <Filter>Threads</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\Threads\ThreadImplWin32.cpp">
+      <Filter>Threads</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\Utilities\Hash128.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\Utilities\LinkedList.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\Utilities\StringMap.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\FileSystem\Binding\_compressor.cpp">
+      <Filter>FileSystem\Binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\FileSystem\Binding\_data_buffer.cpp">
+      <Filter>FileSystem\Binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\FileSystem\Binding\_file.cpp">
+      <Filter>FileSystem\Binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\FileSystem\Binding\_file_data.cpp">
+      <Filter>FileSystem\Binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\FileSystem\Binding\_io_task.cpp">
+      <Filter>FileSystem\Binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\FileSystem\Compressor.cpp">
+      <Filter>FileSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\FileSystem\DataBuffer.cpp">
+      <Filter>FileSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\FileSystem\File.cpp">
+      <Filter>FileSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\FileSystem\FileData.cpp">
+      <Filter>FileSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\FileSystem\IOBatchTask.cpp">
+      <Filter>FileSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\FileSystem\IOTask.cpp">
+      <Filter>FileSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\FileSystem\FileManager.cpp">
+      <Filter>FileSystem</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-base\FileSystem\Binding\_file_manager.cpp">
+      <Filter>FileSystem\Binding</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\modules\asura-base\Exception.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\source\modules\asura-base\Math\Curve.h">
+      <Filter>Math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\Math\Functions.h">
+      <Filter>Math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\Math\Matrix44.h">
+      <Filter>Math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\Math\Quaternion.h">
+      <Filter>Math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\Math\RangedValue.h">
+      <Filter>Math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\Math\Rect.hpp">
+      <Filter>Math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\Math\Transform.h">
+      <Filter>Math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\Math\Vector2.hpp">
+      <Filter>Math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\Math\Vector3.hpp">
+      <Filter>Math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\Math\Vector4.h">
+      <Filter>Math</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\Classes.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Manager.hpp" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Module.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Singleton.hpp" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Utils.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\UtilsConfig.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\UtilsModule.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Type.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Threads\Conditional.h">
+      <Filter>Threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\Threads\Coroutine.h">
+      <Filter>Threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\Threads\Mutex.h">
+      <Filter>Threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\Threads\Semaphore.h">
+      <Filter>Threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\Threads\Task.h">
+      <Filter>Threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\Threads\Thread.h">
+      <Filter>Threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\Threads\Threadable.h">
+      <Filter>Threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\Threads\ThreadImplPosix.h">
+      <Filter>Threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\Threads\ThreadImplSDL.h">
+      <Filter>Threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\Threads\ThreadImplStd.h">
+      <Filter>Threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\Threads\ThreadImplWin32.h">
+      <Filter>Threads</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\source\modules\asura-base\BuildConfigure.h" />
     <ClInclude Include="..\..\..\source\modules\asura-base\Configure.h" />
+    <ClInclude Include="..\..\..\source\modules\asura-base\Utilities\dynamic_bitset.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\Utilities\Hash128.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\Utilities\LinkedList.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\Utilities\StringMap.hpp">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\Scripting\Scripting.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\FileSystem\Compressor.h">
+      <Filter>FileSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\FileSystem\DataBuffer.h">
+      <Filter>FileSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\FileSystem\DecodedData.h">
+      <Filter>FileSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\FileSystem\File.h">
+      <Filter>FileSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\FileSystem\FileData.h">
+      <Filter>FileSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\FileSystem\IOBatchTask.h">
+      <Filter>FileSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\FileSystem\IOTask.h">
+      <Filter>FileSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\FileSystem\Renewable.h">
+      <Filter>FileSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\source\modules\asura-base\FileSystem\FileManager.h">
+      <Filter>FileSystem</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\modules\asura-base\Exception.h" />
+    <ClInclude Include="..\..\..\Source\modules\asura-base\Math\Random.h">
+      <Filter>Math</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\source\modules\asura-base\Math\Rect.inc">
+      <Filter>Math</Filter>
+    </None>
+    <None Include="..\..\..\source\modules\asura-base\Math\Vector2.inc">
+      <Filter>Math</Filter>
+    </None>
+    <None Include="..\..\..\source\modules\asura-base\Math\Vector3.inc">
+      <Filter>Math</Filter>
+    </None>
+    <None Include="..\..\..\source\modules\asura-base\Math\Vector4.inc">
+      <Filter>Math</Filter>
+    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/build/modules/asura-core/asura-core.vcxproj b/build/modules/asura-core/asura-core.vcxproj
index 68347b5..f548922 100644
--- a/build/modules/asura-core/asura-core.vcxproj
+++ b/build/modules/asura-core/asura-core.vcxproj
@@ -82,6 +82,7 @@
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
       <AdditionalIncludeDirectories>$(SolutionDir)..\source\external;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -115,6 +116,7 @@
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
       <AdditionalIncludeDirectories>$(SolutionDir)..\source\external;$(SolutionDir)..\source\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -127,7 +129,7 @@
     <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\_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\_gfx_device.cpp" />
@@ -241,7 +243,6 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\Threads\Channel.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Threads\ThreadEx.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\WindowImplGlew.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Window\WindowImplGlut.h" />
@@ -257,7 +258,7 @@
     <ProjectReference Include="..\..\external\stb\stb.vcxproj">
       <Project>{6ba52bbb-8da5-4f51-be3f-1e49f5089498}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\asura-utils\asura-utils.vcxproj">
+    <ProjectReference Include="..\asura-base\asura-base.vcxproj">
       <Project>{7d41093f-e356-4c5b-a25f-41779bf86e54}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/build/modules/asura-core/asura-core.vcxproj.filters b/build/modules/asura-core/asura-core.vcxproj.filters
index 6240784..cf39389 100644
--- a/build/modules/asura-core/asura-core.vcxproj.filters
+++ b/build/modules/asura-core/asura-core.vcxproj.filters
@@ -42,9 +42,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <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>
@@ -227,6 +224,9 @@
     <ClCompile Include="..\..\..\source\modules\asura-core\Input\InputAxis.cpp">
       <Filter>Input</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\source\modules\asura-core\Graphics\binding\_canvas.cpp">
+      <Filter>Graphics\Binding</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\source\modules\asura-core\Font\Glyph.h">
@@ -367,7 +367,6 @@
     <ClInclude Include="..\..\..\source\modules\asura-core\Application.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\CoreConfig.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\CoreModule.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-core\Type.h" />
     <ClInclude Include="..\..\..\source\modules\asura-core\Threads\Channel.h">
       <Filter>Threads</Filter>
     </ClInclude>
diff --git a/build/modules/asura-utils/asura-utils.vcxproj b/build/modules/asura-utils/asura-utils.vcxproj
deleted file mode 100644
index 40ea6b6..0000000
--- a/build/modules/asura-utils/asura-utils.vcxproj
+++ /dev/null
@@ -1,225 +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\external;$(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\external;$(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\DataBuffer.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-utils\IO\File.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-utils\IO\FileData.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-utils\IO\FileSystem.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-utils\IO\IOBatchTask.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-utils\IO\IOTask.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\RangedValue.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-utils\Math\Transform.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-utils\StringMap.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-utils\Threads\binding\_coroutine.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-utils\Threads\binding\_thread.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-utils\Threads\Conditional.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-utils\Threads\Coroutine.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-utils\Threads\Mutex.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-utils\Threads\Semaphore.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-utils\Threads\Task.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-utils\Threads\Thread.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-utils\Threads\ThreadImplPosix.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-utils\Threads\ThreadImplSDL.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-utils\Threads\ThreadImplStd.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-utils\Threads\ThreadImplWin32.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-utils\UtilsModule.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Classes.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\dynamic_bitset.h" />
-    <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\DataBuffer.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\IO\DecodedData.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\IO\File.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\IO\FileData.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\IO\FileSystem.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\IO\IOBatchTask.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\IO\IOTask.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\Rand\Rand.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Math\Rand\Random.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Math\RangedValue.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\Portable.hpp" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Singleton.hpp" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\StringMap.hpp" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Threads\Conditional.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Threads\Coroutine.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Threads\Mutex.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Threads\Semaphore.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Threads\Task.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Threads\Thread.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Threads\Threadable.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Threads\ThreadImplPosix.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Threads\ThreadImplSDL.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Threads\ThreadImplStd.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Threads\ThreadImplWin32.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Type.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Utils.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\UtilsConfig.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\UtilsModule.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\external\lua51\lua51.vcxproj">
-      <Project>{8b8fca14-fc8a-45b4-bf3c-9340cb586076}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\external\Luax\Luax.vcxproj">
-      <Project>{1350cee9-b2c2-426a-af4e-f651d51dd592}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\external\physfs\physfs.vcxproj">
-      <Project>{aee37589-de0d-4139-8bdb-8179fdefb835}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\source\modules\asura-utils\Math\Rect.inc" />
-    <None Include="..\..\..\source\modules\asura-utils\Math\Vector2.inc" />
-    <None Include="..\..\..\source\modules\asura-utils\Math\Vector3.inc" />
-    <None Include="..\..\..\source\modules\asura-utils\Math\Vector4.inc" />
-  </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
deleted file mode 100644
index c0488cb..0000000
--- a/build/modules/asura-utils/asura-utils.vcxproj.filters
+++ /dev/null
@@ -1,254 +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="IO">
-      <UniqueIdentifier>{6eb6ffb5-ecd9-408b-a2f4-c14837822850}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="IO\binding">
-      <UniqueIdentifier>{b4b078e1-bb8d-4cb3-84b9-963e851be123}</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="Threads">
-      <UniqueIdentifier>{d617f453-4cd1-451b-801d-2f88d0072303}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Threads\binding">
-      <UniqueIdentifier>{e63982e2-a2ca-4aa2-be11-f98659586c1f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Math\Rand">
-      <UniqueIdentifier>{6f471cc5-a89f-4be8-ba69-f04a5dd187f0}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <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\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\binding\_compressor.cpp">
-      <Filter>IO\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\Exceptions\Exception.cpp">
-      <Filter>Exceptions</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-utils\IO\Compressor.cpp">
-      <Filter>IO</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-utils\IO\DataBuffer.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\FileData.cpp">
-      <Filter>IO</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-utils\IO\FileSystem.cpp">
-      <Filter>IO</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-utils\IO\IOBatchTask.cpp">
-      <Filter>IO</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-utils\IO\IOTask.cpp">
-      <Filter>IO</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\Quaternion.cpp">
-      <Filter>Math</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-utils\Math\RangedValue.cpp">
-      <Filter>Math</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-utils\Math\Transform.cpp">
-      <Filter>Math</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-utils\StringMap.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-utils\UtilsModule.cpp" />
-    <ClCompile Include="..\..\..\source\modules\asura-utils\Threads\binding\_coroutine.cpp">
-      <Filter>Threads\binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-utils\Threads\binding\_thread.cpp">
-      <Filter>Threads\binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-utils\Threads\Conditional.cpp">
-      <Filter>Threads</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-utils\Threads\Coroutine.cpp">
-      <Filter>Threads</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-utils\Threads\Mutex.cpp">
-      <Filter>Threads</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-utils\Threads\Semaphore.cpp">
-      <Filter>Threads</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-utils\Threads\Task.cpp">
-      <Filter>Threads</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-utils\Threads\Thread.cpp">
-      <Filter>Threads</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-utils\Threads\ThreadImplPosix.cpp">
-      <Filter>Threads</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-utils\Threads\ThreadImplSDL.cpp">
-      <Filter>Threads</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-utils\Threads\ThreadImplStd.cpp">
-      <Filter>Threads</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\modules\asura-utils\Threads\ThreadImplWin32.cpp">
-      <Filter>Threads</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Exceptions\Exception.h">
-      <Filter>Exceptions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-utils\IO\Compressor.h">
-      <Filter>IO</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-utils\IO\DataBuffer.h">
-      <Filter>IO</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-utils\IO\DecodedData.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\FileData.h">
-      <Filter>IO</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-utils\IO\FileSystem.h">
-      <Filter>IO</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-utils\IO\IOBatchTask.h">
-      <Filter>IO</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-utils\IO\IOTask.h">
-      <Filter>IO</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\Quaternion.h">
-      <Filter>Math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Math\RangedValue.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\Classes.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Manager.hpp" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Module.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Singleton.hpp" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\StringMap.hpp" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Utils.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\UtilsConfig.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\UtilsModule.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Math\Rand\Rand.h">
-      <Filter>Math\Rand</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Type.h" />
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Math\Rand\Random.h">
-      <Filter>Math\Rand</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Threads\Conditional.h">
-      <Filter>Threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Threads\Coroutine.h">
-      <Filter>Threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Threads\Mutex.h">
-      <Filter>Threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Threads\Semaphore.h">
-      <Filter>Threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Threads\Task.h">
-      <Filter>Threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Threads\Thread.h">
-      <Filter>Threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Threads\Threadable.h">
-      <Filter>Threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Threads\ThreadImplPosix.h">
-      <Filter>Threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Threads\ThreadImplSDL.h">
-      <Filter>Threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Threads\ThreadImplStd.h">
-      <Filter>Threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-utils\Threads\ThreadImplWin32.h">
-      <Filter>Threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\modules\asura-utils\dynamic_bitset.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\source\modules\asura-utils\Math\Rect.inc">
-      <Filter>Math</Filter>
-    </None>
-    <None Include="..\..\..\source\modules\asura-utils\Math\Vector2.inc">
-      <Filter>Math</Filter>
-    </None>
-    <None Include="..\..\..\source\modules\asura-utils\Math\Vector3.inc">
-      <Filter>Math</Filter>
-    </None>
-    <None Include="..\..\..\source\modules\asura-utils\Math\Vector4.inc">
-      <Filter>Math</Filter>
-    </None>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/build/modules/asura-utils/asura-utils.vcxproj.user b/build/modules/asura-utils/asura-utils.vcxproj.user
deleted file mode 100644
index be25078..0000000
--- a/build/modules/asura-utils/asura-utils.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