diff --git a/CMakeLists.txt b/CMakeLists.txt
index dbdef3f6..327958f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,6 +51,7 @@ target_include_directories(MinecraftClient PRIVATE
   "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Windows64/Iggy/include"
   "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Client/Xbox/Sentient/Include"
   "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.World/x64headers"
+  "${CMAKE_CURRENT_SOURCE_DIR}/include/"
 )
 target_compile_definitions(MinecraftClient PRIVATE
   $<$<CONFIG:Debug>:_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_DEBUG;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64>
diff --git a/Minecraft.Client/Common/Audio/SoundEngine.cpp b/Minecraft.Client/Common/Audio/SoundEngine.cpp
index 12fa03b4..13826da3 100644
--- a/Minecraft.Client/Common/Audio/SoundEngine.cpp
+++ b/Minecraft.Client/Common/Audio/SoundEngine.cpp
@@ -25,7 +25,7 @@
 #include <vector>
 #include <memory>
 #include <mutex>
-#include "..\Filesystem\Filesystem.h"
+#include <lce_filesystem\lce_filesystem.h>
 
 #ifdef __ORBIS__
 #include <audioout.h>
diff --git a/Minecraft.Client/Minecraft.Client.vcxproj b/Minecraft.Client/Minecraft.Client.vcxproj
index 8f2547d8..fccbc7dd 100644
--- a/Minecraft.Client/Minecraft.Client.vcxproj
+++ b/Minecraft.Client/Minecraft.Client.vcxproj
@@ -1561,7 +1561,7 @@ if not exist "$(TargetDir)\savedata" mkdir "$(TargetDir)\savedata"</Command>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PreprocessorDefinitions>_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_DEBUG;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <CallAttributedProfiling>Disabled</CallAttributedProfiling>
-      <AdditionalIncludeDirectories>Windows64\Iggy\include;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>Windows64\Iggy\include;$(ProjectDir);$(ProjectDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -5585,6 +5585,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
     </None>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\include\lce_filesystem\lce_filesystem.h" />
     <ClInclude Include="AbstractContainerScreen.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
@@ -5717,7 +5718,6 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
     <ClInclude Include="Common\DLC\DLCSkinFile.h" />
     <ClInclude Include="Common\DLC\DLCTextureFile.h" />
     <ClInclude Include="Common\DLC\DLCUIDataFile.h" />
-    <ClInclude Include="Common\Filesystem\Filesystem.h" />
     <ClInclude Include="Common\GameRules\AddEnchantmentRuleDefinition.h" />
     <ClInclude Include="Common\GameRules\AddItemRuleDefinition.h" />
     <ClInclude Include="Common\GameRules\ApplySchematicRuleDefinition.h" />
@@ -28322,6 +28322,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
     <ClInclude Include="ZombieRenderer.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\include\lce_filesystem\lce_filesystem.cpp" />
     <ClCompile Include="AbstractContainerScreen.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|Durango'">true</ExcludedFromBuild>
@@ -28473,7 +28474,6 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU  $(LayoutDir)Image\Loose\CU</Comman
     <ClCompile Include="Common\DLC\DLCSkinFile.cpp" />
     <ClCompile Include="Common\DLC\DLCTextureFile.cpp" />
     <ClCompile Include="Common\DLC\DLCUIDataFile.cpp" />
-    <ClCompile Include="Common\Filesystem\Filesystem.cpp" />
     <ClCompile Include="Common\GameRules\AddEnchantmentRuleDefinition.cpp" />
     <ClCompile Include="Common\GameRules\AddItemRuleDefinition.cpp" />
     <ClCompile Include="Common\GameRules\ApplySchematicRuleDefinition.cpp" />
diff --git a/Minecraft.Client/Minecraft.Client.vcxproj.filters b/Minecraft.Client/Minecraft.Client.vcxproj.filters
index 0f02a16b..ed71bfe0 100644
--- a/Minecraft.Client/Minecraft.Client.vcxproj.filters
+++ b/Minecraft.Client/Minecraft.Client.vcxproj.filters
@@ -729,8 +729,11 @@
     <Filter Include="Windows64\Source Files\Network">
       <UniqueIdentifier>{e5d7fb24-25b8-413c-84ec-974bf0d4a3d1}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Common\Source Files\Filesystem">
-      <UniqueIdentifier>{c79fd64d-7529-4da4-b5f3-2541e084932b}</UniqueIdentifier>
+    <Filter Include="include">
+      <UniqueIdentifier>{d8cdea16-28f5-4993-baf8-26a129e50c84}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="include\lce_filesystem">
+      <UniqueIdentifier>{70b1f1aa-fe50-4aab-9a6c-14df8cb1f231}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -3781,15 +3784,15 @@
     <ClInclude Include="Windows64\Network\WinsockNetLayer.h">
       <Filter>Windows64\Source Files\Network</Filter>
     </ClInclude>
-    <ClInclude Include="Common\Filesystem\Filesystem.h">
-      <Filter>Common\Source Files\Filesystem</Filter>
-    </ClInclude>
     <ClInclude Include="Common\Audio\miniaudio.h">
       <Filter>Common\Source Files\Audio</Filter>
     </ClInclude>
     <ClInclude Include="Common\Audio\stb_vorbis.h">
       <Filter>Common\Source Files\Audio</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\lce_filesystem\Filce_filesystemlesystem.h">
+      <Filter>include\lce_filesystem</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -5943,8 +5946,8 @@
     <ClCompile Include="Windows64\Network\WinsockNetLayer.cpp">
       <Filter>Windows64\Source Files\Network</Filter>
     </ClCompile>
-    <ClCompile Include="Common\Filesystem\Filesystem.cpp">
-      <Filter>Common\Source Files\Filesystem</Filter>
+    <ClCompile Include="..\include\lce_filesystem\lce_filesystem.cpp">
+      <Filter>include\lce_filesystem</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
diff --git a/cmake/ClientSources.cmake b/cmake/ClientSources.cmake
index bb1f331d..6467a243 100644
--- a/cmake/ClientSources.cmake
+++ b/cmake/ClientSources.cmake
@@ -1,4 +1,6 @@
 set(MINECRAFT_CLIENT_SOURCES
+  "../include/lce_filesystem/lce_filesystem.cpp"
+
   "AbstractTexturePack.cpp"
   "AchievementPopup.cpp"
   "AchievementScreen.cpp"
@@ -48,7 +50,6 @@ set(MINECRAFT_CLIENT_SOURCES
   "Common/DLC/DLCSkinFile.cpp"
   "Common/DLC/DLCTextureFile.cpp"
   "Common/DLC/DLCUIDataFile.cpp"
-  "Common/Filesystem/Filesystem.cpp"
   "Common/GameRules/AddEnchantmentRuleDefinition.cpp"
   "Common/GameRules/AddItemRuleDefinition.cpp"
   "Common/GameRules/ApplySchematicRuleDefinition.cpp"
diff --git a/Minecraft.Client/Common/Filesystem/Filesystem.cpp b/include/lce_filesystem/lce_filesystem.cpp
similarity index 97%
rename from Minecraft.Client/Common/Filesystem/Filesystem.cpp
rename to include/lce_filesystem/lce_filesystem.cpp
index 0d225cb5..d0d4d600 100644
--- a/Minecraft.Client/Common/Filesystem/Filesystem.cpp
+++ b/include/lce_filesystem/lce_filesystem.cpp
@@ -1,5 +1,4 @@
-#include "stdafx.h"
-#include "Filesystem.h"
+#include "lce_filesystem.h"
 
 #ifdef _WINDOWS64
 #include <windows.h>
diff --git a/Minecraft.Client/Common/Filesystem/Filesystem.h b/include/lce_filesystem/lce_filesystem.h
similarity index 100%
rename from Minecraft.Client/Common/Filesystem/Filesystem.h
rename to include/lce_filesystem/lce_filesystem.h