diff --git a/.gitmodules b/.gitmodules
index 8e88cd7..5ca29d4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,11 +1,11 @@
 [submodule "thirdparty/PowerRecomp"]
-	path = thirdparty/PowerRecomp
+	path = tools/PowerRecomp
 	url = https://github.com/hedge-dev/PowerRecomp
 [submodule "thirdparty/ddspp"]
 	path = thirdparty/ddspp
 	url = https://github.com/redorav/ddspp.git
 [submodule "thirdparty/ShaderRecomp"]
-	path = thirdparty/ShaderRecomp
+	path = tools/ShaderRecomp
 	url = https://github.com/hedge-dev/ShaderRecomp.git
 [submodule "thirdparty/libmspack"]
 	path = thirdparty/libmspack
diff --git a/UnleashedRecomp/CMakeLists.txt b/UnleashedRecomp/CMakeLists.txt
index 9a89a0d..79e04da 100644
--- a/UnleashedRecomp/CMakeLists.txt
+++ b/UnleashedRecomp/CMakeLists.txt
@@ -163,7 +163,7 @@ set(LIBMSPACK_C_SOURCES
 
 set_source_files_properties(${LIBMSPACK_C_SOURCES} PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
 
-set(SMOLV_SOURCE_DIR "${SWA_THIRDPARTY_ROOT}/ShaderRecomp/thirdparty/smol-v/source")
+set(SMOLV_SOURCE_DIR "${SWA_TOOLS_ROOT}/ShaderRecomp/thirdparty/smol-v/source")
 set(BC_DIFF_SOURCE_DIR "${SWA_TOOLS_ROOT}/bc_diff")
 
 set(MINIAUDIO_INCLUDE_DIRS "${SWA_THIRDPARTY_ROOT}/miniaudio")
diff --git a/UnleashedRecomp/gpu/shader/csd_filter_ps.hlsl b/UnleashedRecomp/gpu/shader/csd_filter_ps.hlsl
index 1c7da5a..54d2411 100644
--- a/UnleashedRecomp/gpu/shader/csd_filter_ps.hlsl
+++ b/UnleashedRecomp/gpu/shader/csd_filter_ps.hlsl
@@ -1,4 +1,4 @@
-#include "../../../thirdparty/ShaderRecomp/ShaderRecomp/shader_common.h"
+#include "../../../tools/ShaderRecomp/ShaderRecomp/shader_common.h"
 
 #ifdef __spirv__
 
diff --git a/UnleashedRecomp/gpu/shader/enhanced_motion_blur_ps.hlsl b/UnleashedRecomp/gpu/shader/enhanced_motion_blur_ps.hlsl
index 8ecf1f3..6c4de50 100644
--- a/UnleashedRecomp/gpu/shader/enhanced_motion_blur_ps.hlsl
+++ b/UnleashedRecomp/gpu/shader/enhanced_motion_blur_ps.hlsl
@@ -1,4 +1,4 @@
-#include "../../../thirdparty/ShaderRecomp/ShaderRecomp/shader_common.h"
+#include "../../../tools/ShaderRecomp/ShaderRecomp/shader_common.h"
 
 #ifdef __spirv__
 
diff --git a/UnleashedRecomp/gpu/shader/gamma_correction_ps.hlsl b/UnleashedRecomp/gpu/shader/gamma_correction_ps.hlsl
index b1e2f99..48f774f 100644
--- a/UnleashedRecomp/gpu/shader/gamma_correction_ps.hlsl
+++ b/UnleashedRecomp/gpu/shader/gamma_correction_ps.hlsl
@@ -1,4 +1,4 @@
-#include "../../../thirdparty/ShaderRecomp/ShaderRecomp/shader_common.h"
+#include "../../../tools/ShaderRecomp/ShaderRecomp/shader_common.h"
 
 #ifdef __spirv__
 
diff --git a/UnleashedRecomp/gpu/shader/gaussian_blur.hlsli b/UnleashedRecomp/gpu/shader/gaussian_blur.hlsli
index e90b7b6..a10a7be 100644
--- a/UnleashedRecomp/gpu/shader/gaussian_blur.hlsli
+++ b/UnleashedRecomp/gpu/shader/gaussian_blur.hlsli
@@ -1,4 +1,4 @@
-#include "../../../thirdparty/ShaderRecomp/ShaderRecomp/shader_common.h"
+#include "../../../tools/ShaderRecomp/ShaderRecomp/shader_common.h"
 
 #ifdef __spirv__
 
diff --git a/UnleashedRecomp/gpu/shader/movie_common.hlsli b/UnleashedRecomp/gpu/shader/movie_common.hlsli
index 02e92e9..31f52a2 100644
--- a/UnleashedRecomp/gpu/shader/movie_common.hlsli
+++ b/UnleashedRecomp/gpu/shader/movie_common.hlsli
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../../thirdparty/ShaderRecomp/ShaderRecomp/shader_common.h"
+#include "../../../tools/ShaderRecomp/ShaderRecomp/shader_common.h"
 
 #ifdef __spirv__
 
diff --git a/UnleashedRecomp/gpu/video.cpp b/UnleashedRecomp/gpu/video.cpp
index 07b1430..0220a6a 100644
--- a/UnleashedRecomp/gpu/video.cpp
+++ b/UnleashedRecomp/gpu/video.cpp
@@ -34,7 +34,7 @@
 #include <magic_enum.hpp>
 #endif
 
-#include "../../thirdparty/ShaderRecomp/ShaderRecomp/shader_common.h"
+#include "../../tools/ShaderRecomp/ShaderRecomp/shader_common.h"
 #include "shader/copy_vs.hlsl.dxil.h"
 #include "shader/copy_vs.hlsl.spirv.h"
 #include "shader/csd_filter_ps.hlsl.dxil.h"
diff --git a/UnleashedRecompLib/CMakeLists.txt b/UnleashedRecompLib/CMakeLists.txt
index 21ea860..f0cff97 100644
--- a/UnleashedRecompLib/CMakeLists.txt
+++ b/UnleashedRecompLib/CMakeLists.txt
@@ -25,7 +25,7 @@ add_custom_command(
     DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/private/default.xex" "${CMAKE_CURRENT_SOURCE_DIR}/config/SWA.toml"
 )
 
-set(SHADER_RECOMP_ROOT "${SWA_THIRDPARTY_ROOT}/ShaderRecomp/ShaderRecomp")
+set(SHADER_RECOMP_ROOT "${SWA_TOOLS_ROOT}/ShaderRecomp/ShaderRecomp")
 set(SHADER_RECOMP_INCLUDE "${SHADER_RECOMP_ROOT}/shader_common.h")
 
 target_compile_definitions(ShaderRecomp PRIVATE 
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index 696296c..914095f 100644
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -3,8 +3,5 @@ set(MSDF_ATLAS_USE_SKIA OFF)
 set(MSDF_ATLAS_NO_ARTERY_FONT ON)
 set(MSDFGEN_DISABLE_PNG ON)
 
-add_subdirectory(${SWA_THIRDPARTY_ROOT}/PowerRecomp)
-add_subdirectory(${SWA_THIRDPARTY_ROOT}/ShaderRecomp)
 add_subdirectory(${SWA_THIRDPARTY_ROOT}/o1heap)
-add_subdirectory(${SWA_THIRDPARTY_ROOT}/fshasher)
 add_subdirectory(${SWA_THIRDPARTY_ROOT}/msdf-atlas-gen)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 20168ed..8c1ae80 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,2 +1,5 @@
-add_subdirectory(${SWA_TOOLS_ROOT}/file_to_c)
 add_subdirectory(${SWA_TOOLS_ROOT}/bc_diff)
+add_subdirectory(${SWA_TOOLS_ROOT}/file_to_c)
+add_subdirectory(${SWA_TOOLS_ROOT}/fshasher)
+add_subdirectory(${SWA_TOOLS_ROOT}/PowerRecomp)
+add_subdirectory(${SWA_TOOLS_ROOT}/ShaderRecomp)
diff --git a/thirdparty/PowerRecomp b/tools/PowerRecomp
similarity index 100%
rename from thirdparty/PowerRecomp
rename to tools/PowerRecomp
diff --git a/thirdparty/ShaderRecomp b/tools/ShaderRecomp
similarity index 100%
rename from thirdparty/ShaderRecomp
rename to tools/ShaderRecomp
diff --git a/thirdparty/fshasher/CMakeLists.txt b/tools/fshasher/CMakeLists.txt
similarity index 100%
rename from thirdparty/fshasher/CMakeLists.txt
rename to tools/fshasher/CMakeLists.txt
diff --git a/thirdparty/fshasher/fshasher.cpp b/tools/fshasher/fshasher.cpp
similarity index 100%
rename from thirdparty/fshasher/fshasher.cpp
rename to tools/fshasher/fshasher.cpp
diff --git a/thirdparty/fshasher/plainargs.h b/tools/fshasher/plainargs.h
similarity index 100%
rename from thirdparty/fshasher/plainargs.h
rename to tools/fshasher/plainargs.h