diff --git a/scripts/orig-client b/scripts/orig-client
index 38f0c1b..2490047 100755
--- a/scripts/orig-client
+++ b/scripts/orig-client
@@ -1,8 +1,5 @@
 #!/bin/bash
-mkdir -p ./log
-tor -f /etc/torrc > ./log/client-tor-stdout.log 2> ./log/client-tor-stderr.log &
-sleep 2
-mkdir -p ./shared
+mkdir -p $4/{log,shared,res}
 HS="`cat ./shared/onion_services.pub | head -n1`.onion"
 measlat -h $HS -p 7500 -t tor # Used to wait for connections
-measlat -h $HS -p 7500 -t tor -c $1 -i $2 -s $3 > ./res/orig.csv 2> ./log/client-measlat-stderr.log
+measlat -h $HS -p 7500 -t tor -c $1 -i $2 -s $3 > $4/res/orig.csv 2> $4/log/client-measlat-stderr.log
diff --git a/scripts/orig-server b/scripts/orig-server
index 04f2197..dd3cbf5 100755
--- a/scripts/orig-server
+++ b/scripts/orig-server
@@ -1,7 +1,4 @@
 #!/bin/bash
-mkdir -p ./log
-tor -f /etc/torrc > ./log/server-tor-stdout.log 2> ./log/server-tor-stderr.log  &
-sleep 2
-mkdir -p ./shared
-cd ./shared
+mkdir -p $1/{log,shared}
+cd $1/shared
 torecho > ../log/server-udpecho-stdout.log 2> ../log/server-udpecho-stderr.log
diff --git a/scripts/rrhr-server b/scripts/rrhr-server
index 4f6e82b..a43b4e1 100755
--- a/scripts/rrhr-server
+++ b/scripts/rrhr-server
@@ -1,7 +1,6 @@
 #!/bin/bash
 mkdir -p $1/{log,shared}
 cd $1/shared
-pwd
-( sleep 180; dump_circuits > ../log/server-circuits.txt ) &
+#( sleep 180; dump_circuits > ../log/server-circuits.txt ) &
 donar -a rr -l 8 -b -h -d 1,1 -s -e 9000 > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
 udpecho -p 9000 > ../log/server-udpecho-stdout.log 2> ../log/server-udpecho-stderr.log