diff --git a/pre-run-linux b/pre-run-linux
index 8680252d..790920ab 100644
--- a/pre-run-linux
+++ b/pre-run-linux
@@ -8,18 +8,12 @@ echo "Generating the dynamic code"
 go generate
 
 echo "Building the router generator"
-cd ./router_gen
-go build -o RouterGen
-mv ./RouterGen ..
-cd ..
+go build -o RouterGen "./router_gen"
 echo "Running the router generator"
 ./RouterGen
 
 echo "Building the query generator"
-cd ./cmd/query_gen
-go build -o QueryGen
-mv ./QueryGen ../..
-cd ../..
+go build -o QueryGen "./cmd/query_gen"
 echo "Running the query generator"
 ./QueryGen
 
diff --git a/run-linux b/run-linux
index 1bef3906..8036b39a 100644
--- a/run-linux
+++ b/run-linux
@@ -8,18 +8,12 @@ echo "Generating the dynamic code"
 go generate
 
 echo "Building the router generator"
-cd ./router_gen
-go build -o RouterGen
-mv ./RouterGen ..
-cd ..
+go build -o RouterGen "./router_gen"
 echo "Running the router generator"
 ./RouterGen
 
 echo "Building the query generator"
-cd ./cmd/query_gen
-go build -o QueryGen
-mv ./QueryGen ../..
-cd ../..
+go build -o QueryGen "./cmd/query_gen"
 echo "Running the query generator"
 ./QueryGen