diff --git a/timer/aetime.exe b/timer/aetime.exe
deleted file mode 100644
index 6532c3e0..00000000
Binary files a/timer/aetime.exe and /dev/null differ
diff --git a/timer/build.bat b/timer/build.bat
deleted file mode 100644
index 91d19467..00000000
--- a/timer/build.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@echo off
-REM -Zi for debugging
-cl -nologo -DBUILD_WIN32=1 -FC -O2 -TC -EHsc aetime.c /link
-@if ERRORLEVEL 1 exit /B 1
-robocopy . ../ aetime.exe > nul
\ No newline at end of file
diff --git a/timer/build.sh b/timer/build.sh
deleted file mode 100755
index 772a6bec..00000000
--- a/timer/build.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-set -eu
-CXX=${CXX:-clang++}
-
-${CXX} $* -Wwritable-strings -DBUILD_LINUX=1 -I. -O3 -o aetime aetime.c
\ No newline at end of file
diff --git a/timer/aetime b/tools/btime
similarity index 76%
rename from timer/aetime
rename to tools/btime
index 09260228..3cd3eb53 100755
Binary files a/timer/aetime and b/tools/btime differ
diff --git a/tools/build-timer/btime b/tools/build-timer/btime
new file mode 100755
index 00000000..3cd3eb53
Binary files /dev/null and b/tools/build-timer/btime differ
diff --git a/timer/aetime.c b/tools/build-timer/btime.c
similarity index 100%
rename from timer/aetime.c
rename to tools/build-timer/btime.c
diff --git a/tools/build-timer/build.bat b/tools/build-timer/build.bat
new file mode 100644
index 00000000..6f1e1dde
--- /dev/null
+++ b/tools/build-timer/build.bat
@@ -0,0 +1,5 @@
+@echo off
+REM -Zi for debugging
+cl -nologo -DBUILD_WIN32=1 -FC -O2 -TC -EHsc btime.c /link
+@if ERRORLEVEL 1 exit /B 1
+robocopy . ../ aetime.exe > nul
\ No newline at end of file
diff --git a/tools/build-timer/build.sh b/tools/build-timer/build.sh
new file mode 100755
index 00000000..0e225f37
--- /dev/null
+++ b/tools/build-timer/build.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -eu
+CXX=${CXX:-clang++}
+
+${CXX} $* -Wwritable-strings -DBUILD_LINUX=1 -I. -O3 -o btime btime.c
+cp btime ../btime
\ No newline at end of file
diff --git a/tools/shell.sh b/tools/shell.sh
new file mode 100755
index 00000000..bae95353
--- /dev/null
+++ b/tools/shell.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+export PATH=$PWD/tools:$PATH
\ No newline at end of file