diff --git a/deps/gsc-tool b/deps/gsc-tool
index 30efba5..f6ae955 160000
--- a/deps/gsc-tool
+++ b/deps/gsc-tool
@@ -1 +1 @@
-Subproject commit 30efba5424e89adc2133caf671c5c4e73208c3dd
+Subproject commit f6ae955f34fbe8cfefa8e9d8112c5c4a993c19bb
diff --git a/deps/premake/gsc-tool.lua b/deps/premake/gsc-tool.lua
index 6f650f4..32efc4d 100644
--- a/deps/premake/gsc-tool.lua
+++ b/deps/premake/gsc-tool.lua
@@ -1,5 +1,5 @@
 gsc_tool = {
-	source = path.join(dependencies.basePath, "gsc-tool/src"),
+	source = path.join(dependencies.basePath, "gsc-tool"),
 }
 
 function gsc_tool.import()
@@ -9,7 +9,7 @@ end
 
 function gsc_tool.includes()
 	includedirs {
-		gsc_tool.source,
+		path.join(gsc_tool.source, "include"),
 	}
 end
 
@@ -19,13 +19,12 @@ function gsc_tool.project()
 		language "C++"
 
 		files {
-			path.join(gsc_tool.source, "utils/**.hpp"),
-			path.join(gsc_tool.source, "utils/**.cpp"),
+			path.join(gsc_tool.source, "include/xsk/utils/*.hpp"),
+			path.join(gsc_tool.source, "src/utils/*.cpp"),
 		}
 
 		includedirs {
-			path.join(gsc_tool.source, "utils"),
-			gsc_tool.source,
+			path.join(gsc_tool.source, "include"),
 		}
 
 		zlib.includes()
@@ -39,23 +38,24 @@ function gsc_tool.project()
 		filter {}
 
 		files {
-			path.join(gsc_tool.source, "stdinc.hpp"),
+			path.join(gsc_tool.source, "include/xsk/stdinc.hpp"),
 
-			path.join(gsc_tool.source, "s1/s1_pc.hpp"),
-			path.join(gsc_tool.source, "s1/s1_pc.cpp"),
-			path.join(gsc_tool.source, "s1/s1_pc_code.cpp"),
-			path.join(gsc_tool.source, "s1/s1_pc_func.cpp"),
-			path.join(gsc_tool.source, "s1/s1_pc_meth.cpp"),
-			path.join(gsc_tool.source, "s1/s1_pc_token.cpp"),
+			path.join(gsc_tool.source, "include/xsk/gsc/engine/s1_pc.hpp"),
+			path.join(gsc_tool.source, "src/gsc/engine/s1_pc.cpp"),
 
-			path.join(gsc_tool.source, "gsc/misc/*.hpp"),
-			path.join(gsc_tool.source, "gsc/misc/*.cpp"),
-			path.join(gsc_tool.source, "gsc/*.hpp"),
-			path.join(gsc_tool.source, "gsc/*.cpp"),
+			path.join(gsc_tool.source, "src/gsc/engine/s1_pc_code.cpp"),
+			path.join(gsc_tool.source, "src/gsc/engine/s1_pc_func.cpp"),
+			path.join(gsc_tool.source, "src/gsc/engine/s1_pc_meth.cpp"),
+			path.join(gsc_tool.source, "src/gsc/engine/s1_pc_token.cpp"),
+
+			path.join(gsc_tool.source, "src/gsc/*.cpp"),
+
+			path.join(gsc_tool.source, "src/gsc/common/*.cpp"),
+			path.join(gsc_tool.source, "include/xsk/gsc/common/*.hpp"),
 		}
 
 		includedirs {
-			gsc_tool.source,
+			path.join(gsc_tool.source, "include"),
 		}
 end
 
diff --git a/src/client/component/gsc/script_loading.hpp b/src/client/component/gsc/script_loading.hpp
index 5d4ce6f..da9c4cd 100644
--- a/src/client/component/gsc/script_loading.hpp
+++ b/src/client/component/gsc/script_loading.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include <s1/s1_pc.hpp>
+#include <xsk/gsc/engine/s1_pc.hpp>
 
 namespace gsc
 {