diff --git a/tools/.gitignore b/tools/.gitignore
new file mode 100644
index 00000000..633ffe46
--- /dev/null
+++ b/tools/.gitignore
@@ -0,0 +1,2 @@
+bin
+cmake-build*
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 9c3f9623..514a6778 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.14)
-project(tmctooltest)
+project(tools)
 include(FetchContent)
 
 set(CMAKE_CXX_STANDARD 20)
diff --git a/tools/agb2mid/.gitignore b/tools/agb2mid/.gitignore
deleted file mode 100755
index a1a456b7..00000000
--- a/tools/agb2mid/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-agb2mid
\ No newline at end of file
diff --git a/tools/agb2mid/Makefile b/tools/agb2mid/Makefile
deleted file mode 100755
index 51f96f93..00000000
--- a/tools/agb2mid/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-CXX := g++
-
-CXXFLAGS := -std=c++11 -O2 -Wall -Wno-switch -Werror -g
-
-SRCS := agb.cpp error.cpp main.cpp midi.cpp tables.cpp
-
-HEADERS := agb.h error.h main.h midi.h tables.h
-
-.PHONY: all clean
-
-all: agb2mid
-	@:
-
-agb2mid: $(SRCS) $(HEADERS)
-	$(CXX) $(CXXFLAGS) $(SRCS) -o $@ $(LDFLAGS)
-
-clean:
-	$(RM) agb2mid agb2mid.exe
diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt
index aca9c06a..f7f9aded 100644
--- a/tools/src/CMakeLists.txt
+++ b/tools/src/CMakeLists.txt
@@ -1 +1,2 @@
+add_subdirectory(agb2mid)
 add_subdirectory(asset_processor)
diff --git a/tools/src/agb2mid/CMakeLists.txt b/tools/src/agb2mid/CMakeLists.txt
new file mode 100644
index 00000000..e1bbdc8f
--- /dev/null
+++ b/tools/src/agb2mid/CMakeLists.txt
@@ -0,0 +1,6 @@
+file(GLOB_RECURSE sources *.cpp)
+
+add_executable(agb2mid ${sources})
+target_include_directories(agb2mid PRIVATE .)
+
+install(TARGETS agb2mid RUNTIME DESTINATION bin)
diff --git a/tools/agb2mid/LICENSE b/tools/src/agb2mid/LICENSE
similarity index 100%
rename from tools/agb2mid/LICENSE
rename to tools/src/agb2mid/LICENSE
diff --git a/tools/agb2mid/agb.cpp b/tools/src/agb2mid/agb.cpp
similarity index 100%
rename from tools/agb2mid/agb.cpp
rename to tools/src/agb2mid/agb.cpp
diff --git a/tools/agb2mid/agb.h b/tools/src/agb2mid/agb.h
similarity index 100%
rename from tools/agb2mid/agb.h
rename to tools/src/agb2mid/agb.h
diff --git a/tools/agb2mid/error.cpp b/tools/src/agb2mid/error.cpp
similarity index 100%
rename from tools/agb2mid/error.cpp
rename to tools/src/agb2mid/error.cpp
diff --git a/tools/agb2mid/error.h b/tools/src/agb2mid/error.h
similarity index 100%
rename from tools/agb2mid/error.h
rename to tools/src/agb2mid/error.h
diff --git a/tools/agb2mid/main.cpp b/tools/src/agb2mid/main.cpp
similarity index 100%
rename from tools/agb2mid/main.cpp
rename to tools/src/agb2mid/main.cpp
diff --git a/tools/agb2mid/main.h b/tools/src/agb2mid/main.h
similarity index 100%
rename from tools/agb2mid/main.h
rename to tools/src/agb2mid/main.h
diff --git a/tools/agb2mid/midi.cpp b/tools/src/agb2mid/midi.cpp
similarity index 100%
rename from tools/agb2mid/midi.cpp
rename to tools/src/agb2mid/midi.cpp
diff --git a/tools/agb2mid/midi.h b/tools/src/agb2mid/midi.h
similarity index 100%
rename from tools/agb2mid/midi.h
rename to tools/src/agb2mid/midi.h
diff --git a/tools/agb2mid/tables.cpp b/tools/src/agb2mid/tables.cpp
similarity index 100%
rename from tools/agb2mid/tables.cpp
rename to tools/src/agb2mid/tables.cpp
diff --git a/tools/agb2mid/tables.h b/tools/src/agb2mid/tables.h
similarity index 100%
rename from tools/agb2mid/tables.h
rename to tools/src/agb2mid/tables.h
diff --git a/tools/src/asset_processor/CMakeLists.txt b/tools/src/asset_processor/CMakeLists.txt
index 7681fc18..4e08c83a 100644
--- a/tools/src/asset_processor/CMakeLists.txt
+++ b/tools/src/asset_processor/CMakeLists.txt
@@ -3,3 +3,5 @@ file(GLOB_RECURSE sources *.cpp)
 add_executable(asset_processor ${sources})
 target_include_directories(asset_processor PRIVATE .)
 target_link_libraries(asset_processor PRIVATE nlohmann_json::nlohmann_json filesystem)
+
+install(TARGETS asset_processor RUNTIME DESTINATION bin)