diff --git a/OptiScaler/OptiScaler.vcxproj b/OptiScaler/OptiScaler.vcxproj
index 04f84167..caba98c0 100644
--- a/OptiScaler/OptiScaler.vcxproj
+++ b/OptiScaler/OptiScaler.vcxproj
@@ -336,15 +336,15 @@ copy NUL "$(SolutionDir)x64\Release\a\!! EXTRACT ALL FILES TO GAME FOLDER !!" /Y
     <ClInclude Include="shaders\rcas\precompile\lc_da_sharpen_Shader_Vk.h" />
     <ClInclude Include="hooks\Xell_Hooks.h" />
     <ClInclude Include="nvapi\fakenvapi\al2_proxy.h" />
-    <ClInclude Include="nvapi\fakenvapi\fn_util.h" />
+    <ClInclude Include="low_latency\fn_util.h" />
     <ClInclude Include="nvapi\fakenvapi\fn_vulkan_hooks.h" />
     <ClInclude Include="nvapi\fakenvapi\log.h" />
     <ClInclude Include="nvapi\fakenvapi\low_latency.h" />
-    <ClInclude Include="nvapi\fakenvapi\low_latency_tech\ll_antilag2.h" />
-    <ClInclude Include="nvapi\fakenvapi\low_latency_tech\ll_antilag_vk.h" />
-    <ClInclude Include="nvapi\fakenvapi\low_latency_tech\ll_latencyflex.h" />
-    <ClInclude Include="nvapi\fakenvapi\low_latency_tech\ll_xell.h" />
-    <ClInclude Include="nvapi\fakenvapi\low_latency_tech\low_latency_tech.h" />
+    <ClInclude Include="low_latency\low_latency_tech\ll_antilag2.h" />
+    <ClInclude Include="low_latency\low_latency_tech\ll_antilag_vk.h" />
+    <ClInclude Include="low_latency\low_latency_tech\ll_latencyflex.h" />
+    <ClInclude Include="low_latency\low_latency_tech\ll_xell.h" />
+    <ClInclude Include="low_latency\low_latency_tech\low_latency_tech.h" />
     <ClInclude Include="nvapi\fakenvapi\nvapi_calls.h" />
     <ClInclude Include="proxies\Streamline_Proxy.h" />
     <ClInclude Include="shaders\Shader_Common.h" />
@@ -591,15 +591,15 @@ copy NUL "$(SolutionDir)x64\Release\a\!! EXTRACT ALL FILES TO GAME FOLDER !!" /Y
     <ClCompile Include="inputs\FSR2_Vk.cpp" />
     <ClCompile Include="inputs\XeSS_Dx11.cpp" />
     <ClCompile Include="nvapi\fakenvapi\al2_proxy.cpp" />
-    <ClCompile Include="nvapi\fakenvapi\fn_util.cpp" />
+    <ClCompile Include="low_latency\fn_util.cpp" />
     <ClCompile Include="nvapi\fakenvapi\fn_vulkan_hooks.cpp" />
     <ClCompile Include="nvapi\fakenvapi\log.cpp" />
     <ClCompile Include="nvapi\fakenvapi\low_latency.cpp" />
     <ClCompile Include="nvapi\fakenvapi\low_latency_d3d.cpp" />
-    <ClCompile Include="nvapi\fakenvapi\low_latency_tech\ll_antilag2.cpp" />
-    <ClCompile Include="nvapi\fakenvapi\low_latency_tech\ll_antilag_vk.cpp" />
-    <ClCompile Include="nvapi\fakenvapi\low_latency_tech\ll_latencyflex.cpp" />
-    <ClCompile Include="nvapi\fakenvapi\low_latency_tech\ll_xell.cpp" />
+    <ClCompile Include="low_latency\low_latency_tech\ll_antilag2.cpp" />
+    <ClCompile Include="low_latency\low_latency_tech\ll_antilag_vk.cpp" />
+    <ClCompile Include="low_latency\low_latency_tech\ll_latencyflex.cpp" />
+    <ClCompile Include="low_latency\low_latency_tech\ll_xell.cpp" />
     <ClCompile Include="nvapi\fakenvapi\low_latency_vk.cpp" />
     <ClCompile Include="nvapi\fakenvapi\nvapi_calls.cpp" />
     <ClCompile Include="NVNGX_Parameter.cpp" />
diff --git a/OptiScaler/OptiScaler.vcxproj.filters b/OptiScaler/OptiScaler.vcxproj.filters
index 6941a506..37c66a6b 100644
--- a/OptiScaler/OptiScaler.vcxproj.filters
+++ b/OptiScaler/OptiScaler.vcxproj.filters
@@ -761,25 +761,25 @@
     <ClInclude Include="nvapi\fakenvapi\low_latency.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="nvapi\fakenvapi\low_latency_tech\ll_antilag2.h">
+    <ClInclude Include="low_latency\low_latency_tech\ll_antilag2.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="nvapi\fakenvapi\low_latency_tech\ll_antilag_vk.h">
+    <ClInclude Include="low_latency\low_latency_tech\ll_antilag_vk.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="nvapi\fakenvapi\low_latency_tech\ll_latencyflex.h">
+    <ClInclude Include="low_latency\low_latency_tech\ll_latencyflex.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="nvapi\fakenvapi\low_latency_tech\ll_xell.h">
+    <ClInclude Include="low_latency\low_latency_tech\ll_xell.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="nvapi\fakenvapi\low_latency_tech\low_latency_tech.h">
+    <ClInclude Include="low_latency\low_latency_tech\low_latency_tech.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="nvapi\fakenvapi\nvapi_calls.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="nvapi\fakenvapi\fn_util.h">
+    <ClInclude Include="low_latency\fn_util.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="nvapi\fakenvapi\fn_vulkan_hooks.h">
@@ -1265,16 +1265,16 @@
     <ClCompile Include="nvapi\fakenvapi\low_latency_d3d.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="nvapi\fakenvapi\low_latency_tech\ll_antilag2.cpp">
+    <ClCompile Include="low_latency\low_latency_tech\ll_antilag2.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="nvapi\fakenvapi\low_latency_tech\ll_antilag_vk.cpp">
+    <ClCompile Include="low_latency\low_latency_tech\ll_antilag_vk.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="nvapi\fakenvapi\low_latency_tech\ll_latencyflex.cpp">
+    <ClCompile Include="low_latency\low_latency_tech\ll_latencyflex.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="nvapi\fakenvapi\low_latency_tech\ll_xell.cpp">
+    <ClCompile Include="low_latency\low_latency_tech\ll_xell.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="nvapi\fakenvapi\low_latency_vk.cpp">
@@ -1283,7 +1283,7 @@
     <ClCompile Include="nvapi\fakenvapi\nvapi_calls.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="nvapi\fakenvapi\fn_util.cpp">
+    <ClCompile Include="low_latency\fn_util.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="nvapi\fakenvapi\fn_vulkan_hooks.cpp">
diff --git a/OptiScaler/nvapi/fakenvapi/fn_util.cpp b/OptiScaler/low_latency/fn_util.cpp
similarity index 100%
rename from OptiScaler/nvapi/fakenvapi/fn_util.cpp
rename to OptiScaler/low_latency/fn_util.cpp
diff --git a/OptiScaler/nvapi/fakenvapi/fn_util.h b/OptiScaler/low_latency/fn_util.h
old mode 100755
new mode 100644
similarity index 100%
rename from OptiScaler/nvapi/fakenvapi/fn_util.h
rename to OptiScaler/low_latency/fn_util.h
diff --git a/OptiScaler/nvapi/fakenvapi/low_latency_tech/ll_antilag2.cpp b/OptiScaler/low_latency/low_latency_tech/ll_antilag2.cpp
similarity index 99%
rename from OptiScaler/nvapi/fakenvapi/low_latency_tech/ll_antilag2.cpp
rename to OptiScaler/low_latency/low_latency_tech/ll_antilag2.cpp
index a7027567..235e157f 100644
--- a/OptiScaler/nvapi/fakenvapi/low_latency_tech/ll_antilag2.cpp
+++ b/OptiScaler/low_latency/low_latency_tech/ll_antilag2.cpp
@@ -1,6 +1,7 @@
 #include "pch.h"
 #include "ll_antilag2.h"
 #include <nvapi/fakenvapi/al2_proxy.h>
+#include <nvapi/fakenvapi/log.h>
 
 inline HRESULT AntiLag2::al2_sleep()
 {
diff --git a/OptiScaler/nvapi/fakenvapi/low_latency_tech/ll_antilag2.h b/OptiScaler/low_latency/low_latency_tech/ll_antilag2.h
similarity index 100%
rename from OptiScaler/nvapi/fakenvapi/low_latency_tech/ll_antilag2.h
rename to OptiScaler/low_latency/low_latency_tech/ll_antilag2.h
diff --git a/OptiScaler/nvapi/fakenvapi/low_latency_tech/ll_antilag_vk.cpp b/OptiScaler/low_latency/low_latency_tech/ll_antilag_vk.cpp
similarity index 100%
rename from OptiScaler/nvapi/fakenvapi/low_latency_tech/ll_antilag_vk.cpp
rename to OptiScaler/low_latency/low_latency_tech/ll_antilag_vk.cpp
diff --git a/OptiScaler/nvapi/fakenvapi/low_latency_tech/ll_antilag_vk.h b/OptiScaler/low_latency/low_latency_tech/ll_antilag_vk.h
similarity index 100%
rename from OptiScaler/nvapi/fakenvapi/low_latency_tech/ll_antilag_vk.h
rename to OptiScaler/low_latency/low_latency_tech/ll_antilag_vk.h
diff --git a/OptiScaler/nvapi/fakenvapi/low_latency_tech/ll_latencyflex.cpp b/OptiScaler/low_latency/low_latency_tech/ll_latencyflex.cpp
similarity index 100%
rename from OptiScaler/nvapi/fakenvapi/low_latency_tech/ll_latencyflex.cpp
rename to OptiScaler/low_latency/low_latency_tech/ll_latencyflex.cpp
diff --git a/OptiScaler/nvapi/fakenvapi/low_latency_tech/ll_latencyflex.h b/OptiScaler/low_latency/low_latency_tech/ll_latencyflex.h
similarity index 100%
rename from OptiScaler/nvapi/fakenvapi/low_latency_tech/ll_latencyflex.h
rename to OptiScaler/low_latency/low_latency_tech/ll_latencyflex.h
diff --git a/OptiScaler/nvapi/fakenvapi/low_latency_tech/ll_xell.cpp b/OptiScaler/low_latency/low_latency_tech/ll_xell.cpp
similarity index 99%
rename from OptiScaler/nvapi/fakenvapi/low_latency_tech/ll_xell.cpp
rename to OptiScaler/low_latency/low_latency_tech/ll_xell.cpp
index 72a07e42..e856f5f9 100644
--- a/OptiScaler/nvapi/fakenvapi/low_latency_tech/ll_xell.cpp
+++ b/OptiScaler/low_latency/low_latency_tech/ll_xell.cpp
@@ -3,6 +3,7 @@
 
 #include <magic_enum.hpp>
 #include <proxies/XeLL_Proxy.h>
+#include <nvapi/fakenvapi/log.h>
 
 void XeLL::xell_sleep(uint32_t frame_id)
 {
diff --git a/OptiScaler/nvapi/fakenvapi/low_latency_tech/ll_xell.h b/OptiScaler/low_latency/low_latency_tech/ll_xell.h
similarity index 100%
rename from OptiScaler/nvapi/fakenvapi/low_latency_tech/ll_xell.h
rename to OptiScaler/low_latency/low_latency_tech/ll_xell.h
diff --git a/OptiScaler/nvapi/fakenvapi/low_latency_tech/low_latency_tech.h b/OptiScaler/low_latency/low_latency_tech/low_latency_tech.h
similarity index 98%
rename from OptiScaler/nvapi/fakenvapi/low_latency_tech/low_latency_tech.h
rename to OptiScaler/low_latency/low_latency_tech/low_latency_tech.h
index 617a1570..041effb8 100644
--- a/OptiScaler/nvapi/fakenvapi/low_latency_tech/low_latency_tech.h
+++ b/OptiScaler/low_latency/low_latency_tech/low_latency_tech.h
@@ -3,8 +3,8 @@
 #include <dxgi.h>
 #include <d3d12.h>
 
-#include "../log.h"
 #include <magic_enum.hpp>
+#include "low_latency/fn_util.h"
 
 #define INVALID_ID 0xFFFFFFFFFFFFFFFF
 
diff --git a/OptiScaler/misc/UeLowLatency.cpp b/OptiScaler/misc/UeLowLatency.cpp
index 6fd3d7be..6d27a20d 100644
--- a/OptiScaler/misc/UeLowLatency.cpp
+++ b/OptiScaler/misc/UeLowLatency.cpp
@@ -2,9 +2,9 @@
 #include "UeLowLatency.h"
 #include <hooks/Reflex_Hooks.h>
 
-#include "nvapi/fakenvapi/low_latency_tech/ll_antilag2.h"
-// #include "nvapi/fakenvapi/low_latency_tech/ll_xell.h"
-#include "nvapi/fakenvapi/low_latency_tech/ll_latencyflex.h"
+#include <low_latency/low_latency_tech/ll_antilag2.h>
+// #include <low_latency/low_latency_tech/ll_xell.h>
+#include <low_latency/low_latency_tech/ll_latencyflex.h>
 
 void UeLowLatency::init()
 {
diff --git a/OptiScaler/misc/UeLowLatency.h b/OptiScaler/misc/UeLowLatency.h
index c82a125d..2c50d467 100644
--- a/OptiScaler/misc/UeLowLatency.h
+++ b/OptiScaler/misc/UeLowLatency.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "nvapi/fakenvapi/low_latency_tech/low_latency_tech.h"
+#include <low_latency/low_latency_tech/low_latency_tech.h>
 
 typedef void (*PFN_FLTickExternal)(int64_t frameId, float DeltaSeconds, bool bIdleMode);
 typedef void (*PFN_setTickCallback)(PFN_FLTickExternal callback);
diff --git a/OptiScaler/nvapi/fakenvapi.h b/OptiScaler/nvapi/fakenvapi.h
index d8cfa079..ad1a9852 100644
--- a/OptiScaler/nvapi/fakenvapi.h
+++ b/OptiScaler/nvapi/fakenvapi.h
@@ -3,7 +3,7 @@
 #include <dxgi.h>
 #include <d3d12.h>
 #include <unordered_map>
-#include "fakenvapi/fn_util.h"
+#include "low_latency/fn_util.h"
 
 class fakenvapi
 {
diff --git a/OptiScaler/nvapi/fakenvapi/log.h b/OptiScaler/nvapi/fakenvapi/log.h
index a00f4238..0f4050a5 100755
--- a/OptiScaler/nvapi/fakenvapi/log.h
+++ b/OptiScaler/nvapi/fakenvapi/log.h
@@ -7,7 +7,7 @@
 #include <nvapi.h>
 #include "spdlog/spdlog.h"
 #include "spdlog/sinks/basic_file_sink.h"
-#include "fn_util.h"
+#include "low_latency/fn_util.h"
 #include "config.h"
 
 #define OK() Ok(__func__)
diff --git a/OptiScaler/nvapi/fakenvapi/low_latency.h b/OptiScaler/nvapi/fakenvapi/low_latency.h
index fecd5fcb..b74e7557 100644
--- a/OptiScaler/nvapi/fakenvapi/low_latency.h
+++ b/OptiScaler/nvapi/fakenvapi/low_latency.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "low_latency_tech/low_latency_tech.h"
+#include "low_latency/low_latency_tech/low_latency_tech.h"
 
 #include <dxgi.h>
 #include <d3d12.h>
 
-#include "fn_util.h"
+#include "low_latency/fn_util.h"
 #include <optional>
 
 #define FRAME_REPORTS_BUFFER_SIZE 70
diff --git a/OptiScaler/nvapi/fakenvapi/low_latency_d3d.cpp b/OptiScaler/nvapi/fakenvapi/low_latency_d3d.cpp
index 54d8c89d..428e369f 100644
--- a/OptiScaler/nvapi/fakenvapi/low_latency_d3d.cpp
+++ b/OptiScaler/nvapi/fakenvapi/low_latency_d3d.cpp
@@ -1,9 +1,9 @@
 #include "pch.h"
 #include "low_latency.h"
 
-#include "low_latency_tech/ll_antilag2.h"
-#include "low_latency_tech/ll_latencyflex.h"
-#include "low_latency_tech/ll_xell.h"
+#include "low_latency/low_latency_tech/ll_antilag2.h"
+#include "low_latency/low_latency_tech/ll_latencyflex.h"
+#include "low_latency/low_latency_tech/ll_xell.h"
 
 #include "log.h"
 #include "config.h"
diff --git a/OptiScaler/nvapi/fakenvapi/low_latency_vk.cpp b/OptiScaler/nvapi/fakenvapi/low_latency_vk.cpp
index 31a4785d..99714ce2 100644
--- a/OptiScaler/nvapi/fakenvapi/low_latency_vk.cpp
+++ b/OptiScaler/nvapi/fakenvapi/low_latency_vk.cpp
@@ -1,8 +1,8 @@
 #include "pch.h"
 #include "low_latency.h"
 
-#include "low_latency_tech/ll_antilag_vk.h"
-#include "low_latency_tech/ll_latencyflex.h"
+#include "low_latency/low_latency_tech/ll_antilag_vk.h"
+#include "low_latency/low_latency_tech/ll_latencyflex.h"
 
 #include "log.h"
 #include "config.h"
diff --git a/OptiScaler/nvapi/fakenvapi/nvapi_calls.h b/OptiScaler/nvapi/fakenvapi/nvapi_calls.h
index 637ac220..d07588f4 100644
--- a/OptiScaler/nvapi/fakenvapi/nvapi_calls.h
+++ b/OptiScaler/nvapi/fakenvapi/nvapi_calls.h
@@ -6,7 +6,7 @@
 
 #include "low_latency.h"
 
-#include "fn_util.h"
+#include "low_latency/fn_util.h"
 #include "log.h"
 #include "fn_vulkan_hooks.h"