diff --git a/.gitmodules b/.gitmodules
index e9ea04f7..814a8396 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,8 +2,8 @@
 	path = game_re/third_party/spdlog
 	url = https://github.com/gabime/spdlog.git
 [submodule "tooling2/third_party/tree-sitter"]
-	path = tooling2/third_party/tree-sitter
+	path = tooling/third_party/tree-sitter
 	url = https://github.com/guusw/tree-sitter.git
 [submodule "tooling2/third_party/tree-sitter-cpp"]
-	path = tooling2/third_party/tree-sitter-cpp
+	path = tooling/third_party/tree-sitter-cpp
 	url = https://github.com/guusw/tree-sitter-cpp.git
diff --git a/tooling2/.editorconfig b/tooling/.editorconfig
similarity index 100%
rename from tooling2/.editorconfig
rename to tooling/.editorconfig
diff --git a/tooling2/.gitignore b/tooling/.gitignore
similarity index 100%
rename from tooling2/.gitignore
rename to tooling/.gitignore
diff --git a/tooling2/CMakeLists.txt b/tooling/CMakeLists.txt
similarity index 100%
rename from tooling2/CMakeLists.txt
rename to tooling/CMakeLists.txt
diff --git a/tooling2/cmake-variants.yaml b/tooling/cmake-variants.yaml
similarity index 100%
rename from tooling2/cmake-variants.yaml
rename to tooling/cmake-variants.yaml
diff --git a/tooling2/files.sh b/tooling/files.sh
similarity index 100%
rename from tooling2/files.sh
rename to tooling/files.sh
diff --git a/tooling2/setup b/tooling/setup
similarity index 100%
rename from tooling2/setup
rename to tooling/setup
diff --git a/tooling2/third_party/CLI11/CLI11.hpp b/tooling/third_party/CLI11/CLI11.hpp
similarity index 100%
rename from tooling2/third_party/CLI11/CLI11.hpp
rename to tooling/third_party/CLI11/CLI11.hpp
diff --git a/tooling2/third_party/sqlite/shell.c b/tooling/third_party/sqlite/shell.c
similarity index 100%
rename from tooling2/third_party/sqlite/shell.c
rename to tooling/third_party/sqlite/shell.c
diff --git a/tooling2/third_party/sqlite/sqlite3.c b/tooling/third_party/sqlite/sqlite3.c
similarity index 100%
rename from tooling2/third_party/sqlite/sqlite3.c
rename to tooling/third_party/sqlite/sqlite3.c
diff --git a/tooling2/third_party/sqlite/sqlite3.h b/tooling/third_party/sqlite/sqlite3.h
similarity index 100%
rename from tooling2/third_party/sqlite/sqlite3.h
rename to tooling/third_party/sqlite/sqlite3.h
diff --git a/tooling2/third_party/sqlite/sqlite3ext.h b/tooling/third_party/sqlite/sqlite3ext.h
similarity index 100%
rename from tooling2/third_party/sqlite/sqlite3ext.h
rename to tooling/third_party/sqlite/sqlite3ext.h
diff --git a/tooling2/third_party/tree-sitter b/tooling/third_party/tree-sitter
similarity index 100%
rename from tooling2/third_party/tree-sitter
rename to tooling/third_party/tree-sitter
diff --git a/tooling2/third_party/tree-sitter-cpp b/tooling/third_party/tree-sitter-cpp
similarity index 100%
rename from tooling2/third_party/tree-sitter-cpp
rename to tooling/third_party/tree-sitter-cpp
diff --git a/tooling2/tool.cpp b/tooling/tool.cpp
similarity index 100%
rename from tooling2/tool.cpp
rename to tooling/tool.cpp