diff --git a/Bigfoot/Benchmarks/CMakeLists.txt b/Bigfoot/Benchmarks/CMakeLists.txt
index 6219887..4c48d68 100644
--- a/Bigfoot/Benchmarks/CMakeLists.txt
+++ b/Bigfoot/Benchmarks/CMakeLists.txt
@@ -2,6 +2,3 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/AssetsForBenchmarking)
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Engine)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Utils)
-if(${TOOLMODE})
-    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Tools)
-endif()
diff --git a/Bigfoot/Sources/CMakeLists.txt b/Bigfoot/Sources/CMakeLists.txt
index 392622c..8eca193 100644
--- a/Bigfoot/Sources/CMakeLists.txt
+++ b/Bigfoot/Sources/CMakeLists.txt
@@ -1,6 +1,3 @@
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Utils)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/System)
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Engine)
-if(${TOOLMODE})
-    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Tools)
-endif()
\ No newline at end of file
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Engine)
\ No newline at end of file
diff --git a/Bigfoot/Tests/CMakeLists.txt b/Bigfoot/Tests/CMakeLists.txt
index 550d037..cbbb5ea 100644
--- a/Bigfoot/Tests/CMakeLists.txt
+++ b/Bigfoot/Tests/CMakeLists.txt
@@ -2,7 +2,4 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Misc)
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Utils)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/System)
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Engine)
-if(${TOOLMODE})
-    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Tools)
-endif()
\ No newline at end of file
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Engine)
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f50841..4904625 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,11 +61,20 @@ SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 SET(CMAKE_INSTALL_RPATH "\${ORIGIN}")
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Bigfoot/Sources)
+if(${TOOLMODE})
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Tools)
+endif()
 if(${BUILD_TESTS})
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Bigfoot/Tests)
+    if(${TOOLMODE})
+        add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Tools/Tests)
+    endif()
 endif()
 if(${BUILD_BENCHMARKS})
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Bigfoot/Benchmarks)
+    if(${TOOLMODE})
+        add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Tools/Benchmarks)
+    endif()
 endif()
 
 add_custom_target(NatVis SOURCES 
diff --git a/Bigfoot/Benchmarks/Tools/CMakeLists.txt b/Tools/Benchmarks/CMakeLists.txt
similarity index 100%
rename from Bigfoot/Benchmarks/Tools/CMakeLists.txt
rename to Tools/Benchmarks/CMakeLists.txt
diff --git a/Bigfoot/Benchmarks/Tools/SasquatchBaker/CMakeLists.txt b/Tools/Benchmarks/SasquatchBaker/CMakeLists.txt
similarity index 100%
rename from Bigfoot/Benchmarks/Tools/SasquatchBaker/CMakeLists.txt
rename to Tools/Benchmarks/SasquatchBaker/CMakeLists.txt
diff --git a/Bigfoot/Benchmarks/Tools/SasquatchBaker/Include/SasquatchBakerBenchmarks/BigFileInfo_generated.hpp b/Tools/Benchmarks/SasquatchBaker/Include/SasquatchBakerBenchmarks/BigFileInfo_generated.hpp
similarity index 100%
rename from Bigfoot/Benchmarks/Tools/SasquatchBaker/Include/SasquatchBakerBenchmarks/BigFileInfo_generated.hpp
rename to Tools/Benchmarks/SasquatchBaker/Include/SasquatchBakerBenchmarks/BigFileInfo_generated.hpp
diff --git a/Bigfoot/Benchmarks/Tools/SasquatchBaker/SasquatchBaker.cpp b/Tools/Benchmarks/SasquatchBaker/SasquatchBaker.cpp
similarity index 100%
rename from Bigfoot/Benchmarks/Tools/SasquatchBaker/SasquatchBaker.cpp
rename to Tools/Benchmarks/SasquatchBaker/SasquatchBaker.cpp
diff --git a/Bigfoot/Sources/Tools/CMakeLists.txt b/Tools/CMakeLists.txt
similarity index 100%
rename from Bigfoot/Sources/Tools/CMakeLists.txt
rename to Tools/CMakeLists.txt
diff --git a/Bigfoot/Sources/Tools/Executables/SasquatchBaker/CMakeLists.txt b/Tools/Executables/SasquatchBaker/CMakeLists.txt
similarity index 100%
rename from Bigfoot/Sources/Tools/Executables/SasquatchBaker/CMakeLists.txt
rename to Tools/Executables/SasquatchBaker/CMakeLists.txt
diff --git a/Bigfoot/Sources/Tools/Executables/SasquatchBaker/main.cpp b/Tools/Executables/SasquatchBaker/main.cpp
similarity index 100%
rename from Bigfoot/Sources/Tools/Executables/SasquatchBaker/main.cpp
rename to Tools/Executables/SasquatchBaker/main.cpp
diff --git a/Bigfoot/Sources/Tools/SasquatchBaker/CMakeLists.txt b/Tools/SasquatchBaker/CMakeLists.txt
similarity index 100%
rename from Bigfoot/Sources/Tools/SasquatchBaker/CMakeLists.txt
rename to Tools/SasquatchBaker/CMakeLists.txt
diff --git a/Bigfoot/Sources/Tools/SasquatchBaker/Include/SasquatchBaker/SasquatchBaker.hpp b/Tools/SasquatchBaker/Include/SasquatchBaker/SasquatchBaker.hpp
similarity index 100%
rename from Bigfoot/Sources/Tools/SasquatchBaker/Include/SasquatchBaker/SasquatchBaker.hpp
rename to Tools/SasquatchBaker/Include/SasquatchBaker/SasquatchBaker.hpp
diff --git a/Bigfoot/Sources/Tools/SasquatchBaker/Include/SasquatchBaker/SasquatchBakerAssertHandler.hpp b/Tools/SasquatchBaker/Include/SasquatchBaker/SasquatchBakerAssertHandler.hpp
similarity index 100%
rename from Bigfoot/Sources/Tools/SasquatchBaker/Include/SasquatchBaker/SasquatchBakerAssertHandler.hpp
rename to Tools/SasquatchBaker/Include/SasquatchBaker/SasquatchBakerAssertHandler.hpp
diff --git a/Bigfoot/Sources/Tools/SasquatchBaker/Include/SasquatchBaker/SasquatchBakerLogger_generated.hpp b/Tools/SasquatchBaker/Include/SasquatchBaker/SasquatchBakerLogger_generated.hpp
similarity index 100%
rename from Bigfoot/Sources/Tools/SasquatchBaker/Include/SasquatchBaker/SasquatchBakerLogger_generated.hpp
rename to Tools/SasquatchBaker/Include/SasquatchBaker/SasquatchBakerLogger_generated.hpp
diff --git a/Bigfoot/Sources/Tools/SasquatchBaker/SasquatchBaker.cpp b/Tools/SasquatchBaker/SasquatchBaker.cpp
similarity index 100%
rename from Bigfoot/Sources/Tools/SasquatchBaker/SasquatchBaker.cpp
rename to Tools/SasquatchBaker/SasquatchBaker.cpp
diff --git a/Bigfoot/Tests/Tools/CMakeLists.txt b/Tools/Tests/CMakeLists.txt
similarity index 100%
rename from Bigfoot/Tests/Tools/CMakeLists.txt
rename to Tools/Tests/CMakeLists.txt
diff --git a/Bigfoot/Tests/Tools/SasquatchBaker/CMakeLists.txt b/Tools/Tests/SasquatchBaker/CMakeLists.txt
similarity index 100%
rename from Bigfoot/Tests/Tools/SasquatchBaker/CMakeLists.txt
rename to Tools/Tests/SasquatchBaker/CMakeLists.txt
diff --git a/Bigfoot/Tests/Tools/SasquatchBaker/Include/SasquatchBakerTests/BigFileInfo_generated.hpp b/Tools/Tests/SasquatchBaker/Include/SasquatchBakerTests/BigFileInfo_generated.hpp
similarity index 100%
rename from Bigfoot/Tests/Tools/SasquatchBaker/Include/SasquatchBakerTests/BigFileInfo_generated.hpp
rename to Tools/Tests/SasquatchBaker/Include/SasquatchBakerTests/BigFileInfo_generated.hpp
diff --git a/Bigfoot/Tests/Tools/SasquatchBaker/SasquatchBaker.cpp b/Tools/Tests/SasquatchBaker/SasquatchBaker.cpp
similarity index 100%
rename from Bigfoot/Tests/Tools/SasquatchBaker/SasquatchBaker.cpp
rename to Tools/Tests/SasquatchBaker/SasquatchBaker.cpp
diff --git a/Bigfoot/Tests/Tools/SasquatchBaker/SasquatchBakerTests/main.cpp b/Tools/Tests/SasquatchBaker/SasquatchBakerTests/main.cpp
similarity index 100%
rename from Bigfoot/Tests/Tools/SasquatchBaker/SasquatchBakerTests/main.cpp
rename to Tools/Tests/SasquatchBaker/SasquatchBakerTests/main.cpp
diff --git a/conanfile.py b/conanfile.py
index 64afada..937763b 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -87,8 +87,9 @@ class Bigfoot(ConanFile):
             self.requires("tracy/0.13.1", transitive_headers=True)
 
         if(self.options.vulkan):
-            self.requires("vulkan-headers/1.4.341.0@bigfootdev/main", override=True)
-            self.requires("vulkan-memory-allocator/3.3.0@bigfootdev/main")
+            self.requires("vulkan-headers/1.4.350.0", override=True)
+            self.requires("volk/1.4.350.0")
+            self.requires("vulkan-memory-allocator/3.3.0")
 
         if(self.options.build_tests):
             self.test_requires("gtest/1.18.0")