From b03b95feb6b0d1e09de5dfdea40cb16cf34efc9f Mon Sep 17 00:00:00 2001
From: Reiner Jung <reiner.jung@email.uni-kiel.de>
Date: Wed, 22 Jun 2022 16:12:31 +0200
Subject: [PATCH] Added /

---
 bin/2012-msept/run-benchmark-cycle-async.sh   | 56 ++++++-------
 bin/2012-msept/run-benchmark-cycle-sync.sh    | 56 ++++++-------
 bin/2012-msept/run-benchmark-recursive-jmx.sh | 32 +++----
 .../run-benchmark-recursive-linear.sh         | 58 ++++++-------
 bin/2012-msept/run-benchmark-recursive.sh     | 56 ++++++-------
 .../benchmark-kieker-days-ffi-remote.sh       | 64 +++++++-------
 .../benchmark-kieker-days-ffi.sh              | 62 +++++++-------
 .../benchmark-kieker-days-kieker.sh           | 84 +++++++++----------
 .../benchmark-kieker-days-ffi-remote.sh       | 54 ++++++------
 .../benchmark-kieker-days-ffi.sh              | 62 +++++++-------
 .../benchmark-kieker-days-kieker-remote.sh    | 52 ++++++------
 .../benchmark-kieker-days-kieker.sh           | 84 +++++++++----------
 bin/2013-kieker-days/only_r.sh                | 10 +--
 bin/2014-icpe/benchmark-disk-writer.sh        | 74 ++++++++--------
 frameworks/Kieker/benchmark.sh                |  2 +-
 frameworks/OpenTelemetry/benchmark.sh         |  6 +-
 frameworks/inspectIT/benchmark.sh             |  2 +-
 17 files changed, 407 insertions(+), 407 deletions(-)

diff --git a/bin/2012-msept/run-benchmark-cycle-async.sh b/bin/2012-msept/run-benchmark-cycle-async.sh
index 7f5dd44..42f894d 100644
--- a/bin/2012-msept/run-benchmark-cycle-async.sh
+++ b/bin/2012-msept/run-benchmark-cycle-async.sh
@@ -11,13 +11,13 @@ if [ ! -z "$(uname | grep -i WIN)" ]; then CPSEPCHAR=";"; fi
 RESULTS_DIR="${BASE_DIR}tmp/results-benchmark-recursive/"
 echo "Removing and recreating '${RESULTS_DIR}'"
 (${SUDOCMD} rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR}
-mkdir ${RESULTS_DIR}stat/
+mkdir ${RESULTS_DIR}/stat/
 
 # Clear kieker.log and initialize logging
 rm -f ${BASE_DIR}kieker.log
 touch ${BASE_DIR}kieker.log
 
-RESULTSFN="${RESULTS_DIR}results.csv"
+RESULTSFN="${RESULTS_DIR}/results.csv"
 
 JAVA_ARGS="-server"
 JAVA_ARGS="${JAVA_ARGS} -d64"
@@ -59,9 +59,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 
         # 1 No instrumentation
         echo " # ${i}.1 No instrumentation"
-        mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-1.txt &
-        vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-1.txt &
-        iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-1.txt &
+        mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-1.txt &
+        vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-1.txt &
+        iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-1.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_NOINSTR} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-1.csv \
             --totalcalls ${TOTAL_CALLS} \
@@ -71,15 +71,15 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %mpstat
         kill %vmstat
         kill %iostat
-        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-1.log
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-1.log
         sync
         sleep ${SLEEP_TIME}
 
         # 2 Deactivated probe
         echo " # ${i}.2 Deactivated probe"
-        mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-2.txt &
-        vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-2.txt &
-        iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-2.txt &
+        mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-2.txt &
+        vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-2.txt &
+        iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-2.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_KIEKER_DEACTV} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-2.csv \
             --totalcalls ${TOTAL_CALLS} \
@@ -89,7 +89,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %mpstat
         kill %vmstat
         kill %iostat
-        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-2.log
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-2.log
         echo >>${BASE_DIR}kieker.log
         echo >>${BASE_DIR}kieker.log
         sync
@@ -97,9 +97,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 
         # 3 No logging
         echo " # ${i}.3 No logging (null writer)"
-        mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-3.txt &
-        vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-3.txt &
-        iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-3.txt &
+        mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-3.txt &
+        vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-3.txt &
+        iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-3.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-3.csv \
             --totalcalls ${TOTAL_CALLS} \
@@ -109,7 +109,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %mpstat
         kill %vmstat
         kill %iostat
-        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-3.log
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-3.log
         echo >>${BASE_DIR}kieker.log
         echo >>${BASE_DIR}kieker.log
         sync
@@ -117,9 +117,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 
         # 4 Logging
         echo " # ${i}.4 Logging"
-        mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-4.txt &
-        vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-4.txt &
-        iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-4.txt &
+        mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-4.txt &
+        vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-4.txt &
+        iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-4.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-4.csv \
             --totalcalls ${TOTAL_CALLS} \
@@ -129,9 +129,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %mpstat
         kill %vmstat
         kill %iostat
-        mkdir -p ${RESULTS_DIR}kiekerlog/
-        mv ${BASE_DIR}tmp/kieker-* ${RESULTS_DIR}kiekerlog/
-        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-4.log
+        mkdir -p ${RESULTS_DIR}/kiekerlog/
+        mv ${BASE_DIR}tmp/kieker-* ${RESULTS_DIR}/kiekerlog/
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-4.log
         echo >>${BASE_DIR}kieker.log
         echo >>${BASE_DIR}kieker.log
         sync
@@ -140,14 +140,14 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     done
 
 done
-tar cf ${RESULTS_DIR}kiekerlog.tar ${RESULTS_DIR}kiekerlog
-${SUDOCMD} rm -rf ${RESULTS_DIR}kiekerlog/
-gzip -9 ${RESULTS_DIR}kiekerlog.tar
-tar cf ${RESULTS_DIR}stat.tar ${RESULTS_DIR}stat
-rm -rf ${RESULTS_DIR}stat/
-gzip -9 ${RESULTS_DIR}stat.tar
-mv ${BASE_DIR}kieker.log ${RESULTS_DIR}kieker.log
-[ -f ${RESULTS_DIR}hotspot-1-1-1.log ] && grep "<task " ${RESULTS_DIR}hotspot-*.log >${RESULTS_DIR}log.log
+tar cf ${RESULTS_DIR}/kiekerlog.tar ${RESULTS_DIR}/kiekerlog
+${SUDOCMD} rm -rf ${RESULTS_DIR}/kiekerlog/
+gzip -9 ${RESULTS_DIR}/kiekerlog.tar
+tar cf ${RESULTS_DIR}/stat.tar ${RESULTS_DIR}/stat
+rm -rf ${RESULTS_DIR}/stat/
+gzip -9 ${RESULTS_DIR}/stat.tar
+mv ${BASE_DIR}kieker.log ${RESULTS_DIR}/kieker.log
+[ -f ${RESULTS_DIR}/hotspot-1-1-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
 [ -f ${BASE_DIR}nohup.out ] && cp ${BASE_DIR}nohup.out ${RESULTS_DIR}
 echo -n "" > ${BASE_DIR}nohup.out
 [ -f ${BASE_DIR}errorlog.txt ] && mv ${BASE_DIR}errorlog.txt ${RESULTS_DIR}
diff --git a/bin/2012-msept/run-benchmark-cycle-sync.sh b/bin/2012-msept/run-benchmark-cycle-sync.sh
index 8a02ea4..9f3d3ae 100644
--- a/bin/2012-msept/run-benchmark-cycle-sync.sh
+++ b/bin/2012-msept/run-benchmark-cycle-sync.sh
@@ -11,13 +11,13 @@ if [ ! -z "$(uname | grep -i WIN)" ]; then CPSEPCHAR=";"; fi
 RESULTS_DIR="${BASE_DIR}tmp/results-benchmark-recursive/"
 echo "Removing and recreating '${RESULTS_DIR}'"
 (${SUDOCMD} rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR}
-mkdir ${RESULTS_DIR}stat/
+mkdir ${RESULTS_DIR}/stat/
 
 # Clear kieker.log and initialize logging
 rm -f ${BASE_DIR}kieker.log
 touch ${BASE_DIR}kieker.log
 
-RESULTSFN="${RESULTS_DIR}results.csv"
+RESULTSFN="${RESULTS_DIR}/results.csv"
 
 JAVA_ARGS="-server"
 JAVA_ARGS="${JAVA_ARGS} -d64"
@@ -59,9 +59,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 
 #        # 1 No instrumentation
 #        echo " # ${i}.1 No instrumentation"
-#        mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-1.txt &
-#        vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-1.txt &
-#        iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-1.txt &
+#        mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-1.txt &
+#        vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-1.txt &
+#        iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-1.txt &
 #        ${BINDJAVA} java  ${JAVA_ARGS_NOINSTR} ${JAR} \
 #            --output-filename ${RESULTSFN}-${i}-${j}-1.csv \
 #            --totalcalls ${TOTAL_CALLS} \
@@ -71,15 +71,15 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 #        kill %mpstat
 #        kill %vmstat
 #        kill %iostat
-#        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-1.log
+#        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-1.log
 #        sync
 #        sleep ${SLEEP_TIME}
 #
 #        # 2 Deactivated probe
 #        echo " # ${i}.2 Deactivated probe"
-#        mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-2.txt &
-#        vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-2.txt &
-#        iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-2.txt &
+#        mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-2.txt &
+#        vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-2.txt &
+#        iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-2.txt &
 #        ${BINDJAVA} java  ${JAVA_ARGS_KIEKER_DEACTV} ${JAR} \
 #            --output-filename ${RESULTSFN}-${i}-${j}-2.csv \
 #            --totalcalls ${TOTAL_CALLS} \
@@ -89,7 +89,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 #        kill %mpstat
 #        kill %vmstat
 #        kill %iostat
-#        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-2.log
+#        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-2.log
 #        echo >>${BASE_DIR}kieker.log
 #        echo >>${BASE_DIR}kieker.log
 #        sync
@@ -97,9 +97,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 #
 #        # 3 No logging
 #        echo " # ${i}.3 No logging (null writer)"
-#        mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-3.txt &
-#        vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-3.txt &
-#        iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-3.txt &
+#        mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-3.txt &
+#        vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-3.txt &
+#        iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-3.txt &
 #        ${BINDJAVA} java  ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \
 #            --output-filename ${RESULTSFN}-${i}-${j}-3.csv \
 #            --totalcalls ${TOTAL_CALLS} \
@@ -109,7 +109,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 #        kill %mpstat
 #        kill %vmstat
 #        kill %iostat
-#        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-3.log
+#        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-3.log
 #        echo >>${BASE_DIR}kieker.log
 #        echo >>${BASE_DIR}kieker.log
 #        sync
@@ -117,9 +117,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 
         # 4 Logging
         echo " # ${i}.4 Logging"
-        mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-4.txt &
-        vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-4.txt &
-        iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-4.txt &
+        mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-4.txt &
+        vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-4.txt &
+        iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-4.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-4.csv \
             --totalcalls ${TOTAL_CALLS} \
@@ -129,9 +129,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %mpstat
         kill %vmstat
         kill %iostat
-        mkdir -p ${RESULTS_DIR}kiekerlog/
-        mv ${BASE_DIR}tmp/kieker-* ${RESULTS_DIR}kiekerlog/
-        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-4.log
+        mkdir -p ${RESULTS_DIR}/kiekerlog/
+        mv ${BASE_DIR}tmp/kieker-* ${RESULTS_DIR}/kiekerlog/
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-4.log
         echo >>${BASE_DIR}kieker.log
         echo >>${BASE_DIR}kieker.log
         sync
@@ -140,14 +140,14 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     done
 
 done
-tar cf ${RESULTS_DIR}kiekerlog.tar ${RESULTS_DIR}kiekerlog
-${SUDOCMD} rm -rf ${RESULTS_DIR}kiekerlog/
-gzip -9 ${RESULTS_DIR}kiekerlog.tar
-tar cf ${RESULTS_DIR}stat.tar ${RESULTS_DIR}stat
-rm -rf ${RESULTS_DIR}stat/
-gzip -9 ${RESULTS_DIR}stat.tar
-mv ${BASE_DIR}kieker.log ${RESULTS_DIR}kieker.log
-[ -f ${RESULTS_DIR}hotspot-1-1-1.log ] && grep "<task " ${RESULTS_DIR}hotspot-*.log >${RESULTS_DIR}log.log
+tar cf ${RESULTS_DIR}/kiekerlog.tar ${RESULTS_DIR}/kiekerlog
+${SUDOCMD} rm -rf ${RESULTS_DIR}/kiekerlog/
+gzip -9 ${RESULTS_DIR}/kiekerlog.tar
+tar cf ${RESULTS_DIR}/stat.tar ${RESULTS_DIR}/stat
+rm -rf ${RESULTS_DIR}/stat/
+gzip -9 ${RESULTS_DIR}/stat.tar
+mv ${BASE_DIR}kieker.log ${RESULTS_DIR}/kieker.log
+[ -f ${RESULTS_DIR}/hotspot-1-1-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
 [ -f ${BASE_DIR}nohup.out ] && cp ${BASE_DIR}nohup.out ${RESULTS_DIR}
 echo -n "" > ${BASE_DIR}nohup.out
 [ -f ${BASE_DIR}errorlog.txt ] && mv ${BASE_DIR}errorlog.txt ${RESULTS_DIR}
diff --git a/bin/2012-msept/run-benchmark-recursive-jmx.sh b/bin/2012-msept/run-benchmark-recursive-jmx.sh
index f4c3321..d948fd2 100644
--- a/bin/2012-msept/run-benchmark-recursive-jmx.sh
+++ b/bin/2012-msept/run-benchmark-recursive-jmx.sh
@@ -26,13 +26,13 @@ if [ ! -z "$(uname | grep -i WIN)" ]; then CPSEPCHAR=";"; fi
 RESULTS_DIR="${BASE_DIR}tmp/results-benchmark-recursive/"
 echo "Removing and recreating '${RESULTS_DIR}'"
 (${SUDOCMD} rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR}
-mkdir ${RESULTS_DIR}stat/
+mkdir ${RESULTS_DIR}/stat/
 
 # Clear kieker.log and initialize logging
 rm -f ${BASE_DIR}kieker.log
 touch ${BASE_DIR}kieker.log
 
-RESULTSFN="${RESULTS_DIR}results.csv"
+RESULTSFN="${RESULTS_DIR}/results.csv"
 
 JAVA_ARGS="-server"
 JAVA_ARGS="${JAVA_ARGS} -d64"
@@ -74,9 +74,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 
         # 1 No logging
         echo " # ${i}.1 No logging (null writer)"
-        mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-1.txt &
-        vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-1.txt &
-        iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-1.txt &
+        mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-1.txt &
+        vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-1.txt &
+        iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-1.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-1.csv \
             --totalcalls ${TOTAL_CALLS} \
@@ -86,7 +86,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %mpstat
         kill %vmstat
         kill %iostat
-        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-1.log
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-1.log
         echo >>${BASE_DIR}kieker.log
         echo >>${BASE_DIR}kieker.log
         sync
@@ -94,9 +94,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 
         # 2 Logging
         echo " # ${i}.2 Logging"
-        mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-2.txt &
-        vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-2.txt &
-        iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-2.txt &
+        mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-2.txt &
+        vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-2.txt &
+        iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-2.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-2.csv \
             --totalcalls ${TOTAL_CALLS} \
@@ -106,8 +106,8 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %mpstat
         kill %vmstat
         kill %iostat
-        mkdir -p ${RESULTS_DIR}kiekerlog/
-        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-2.log
+        mkdir -p ${RESULTS_DIR}/kiekerlog/
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-2.log
         echo >>${BASE_DIR}kieker.log
         echo >>${BASE_DIR}kieker.log
         sync
@@ -116,10 +116,10 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     done
 
 done
-tar cf ${RESULTS_DIR}stat.tar ${RESULTS_DIR}stat
-rm -rf ${RESULTS_DIR}stat/
-gzip -9 ${RESULTS_DIR}stat.tar
-mv ${BASE_DIR}kieker.log ${RESULTS_DIR}kieker.log
-[ -f ${RESULTS_DIR}hotspot-1-1-1.log ] && grep "<task " ${RESULTS_DIR}hotspot-*.log >${RESULTS_DIR}log.log
+tar cf ${RESULTS_DIR}/stat.tar ${RESULTS_DIR}/stat
+rm -rf ${RESULTS_DIR}/stat/
+gzip -9 ${RESULTS_DIR}/stat.tar
+mv ${BASE_DIR}kieker.log ${RESULTS_DIR}/kieker.log
+[ -f ${RESULTS_DIR}/hotspot-1-1-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
 [ -f ${BASE_DIR}nohup.out ] && mv ${BASE_DIR}nohup.out ${RESULTS_DIR}
 [ -f ${BASE_DIR}errorlog.txt ] && mv ${BASE_DIR}errorlog.txt ${RESULTS_DIR}
diff --git a/bin/2012-msept/run-benchmark-recursive-linear.sh b/bin/2012-msept/run-benchmark-recursive-linear.sh
index 514cc79..be25029 100644
--- a/bin/2012-msept/run-benchmark-recursive-linear.sh
+++ b/bin/2012-msept/run-benchmark-recursive-linear.sh
@@ -32,7 +32,7 @@ mkdir "${RESULTS_DIR}/stat"
 rm -f ${BASE_DIR}/kieker.log
 touch ${BASE_DIR}/kieker.log
 
-RESULTSFN="${RESULTS_DIR}results.csv"
+RESULTSFN="${RESULTS_DIR}/results.csv"
 
 JAVA_ARGS="-server"
 JAVA_ARGS="${JAVA_ARGS} -d64"
@@ -44,11 +44,11 @@ JAVA_ARGS="${JAVA_ARGS} -verbose:gc -XX:+PrintCompilation"
 JAR="-jar MooBench.jar"
 
 JAVA_ARGS_NOINSTR="${JAVA_ARGS}"
-JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASE_DIR}lib/kieker-1.9-SNAPSHOT_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false"
+JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASE_DIR}/lib/kieker-1.9-SNAPSHOT_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false"
 JAVA_ARGS_KIEKER_DEACTV="${JAVA_ARGS_LTW} -Dkieker.monitoring.adaptiveMonitoring.configFile=META-INF/kieker.monitoring.adaptiveMonitoring.disabled.conf -Dkieker.monitoring.writer=kieker.monitoring.writer.DummyWriter"
 JAVA_ARGS_KIEKER_NOLOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.DummyWriter"
 #JAVA_ARGS_KIEKER_LOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.filesystem.AsyncFsWriter -Dkieker.monitoring.writer.filesystem.AsyncFsWriter.customStoragePath=${BASE_DIR}tmp"
-JAVA_ARGS_KIEKER_LOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.filesystem.AsyncBinaryFsWriter -Dkieker.monitoring.writer.filesystem.AsyncBinaryFsWriter.customStoragePath=${BASE_DIR}tmp"
+JAVA_ARGS_KIEKER_LOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.filesystem.AsyncBinaryFsWriter -Dkieker.monitoring.writer.filesystem.AsyncBinaryFsWriter.customStoragePath=${BASE_DIR}/tmp"
 
 ## Write configuration
 uname -a >${RESULTS_DIR}/configuration.txt
@@ -76,9 +76,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 
         # 1 No instrumentation
         echo " # ${i}.1 No instrumentation"
-        mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-1.txt &
-        vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-1.txt &
-        iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-1.txt &
+        mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-1.txt &
+        vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-1.txt &
+        iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-1.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_NOINSTR} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-1.csv \
             --totalcalls ${TOTAL_CALLS} \
@@ -88,15 +88,15 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %mpstat
         kill %vmstat
         kill %iostat
-        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-1.log
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-1.log
         sync
         sleep ${SLEEP_TIME}
 
         # 2 Deactivated probe
         echo " # ${i}.2 Deactivated probe"
-        mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-2.txt &
-        vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-2.txt &
-        iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-2.txt &
+        mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-2.txt &
+        vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-2.txt &
+        iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-2.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_KIEKER_DEACTV} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-2.csv \
             --totalcalls ${TOTAL_CALLS} \
@@ -106,7 +106,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %mpstat
         kill %vmstat
         kill %iostat
-        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-2.log
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-2.log
         echo >>${BASE_DIR}kieker.log
         echo >>${BASE_DIR}kieker.log
         sync
@@ -114,9 +114,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 
         # 3 No logging
         echo " # ${i}.3 No logging (null writer)"
-        mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-3.txt &
-        vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-3.txt &
-        iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-3.txt &
+        mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-3.txt &
+        vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-3.txt &
+        iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-3.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-3.csv \
             --totalcalls ${TOTAL_CALLS} \
@@ -126,7 +126,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %mpstat
         kill %vmstat
         kill %iostat
-        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-3.log
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-3.log
         echo >>${BASE_DIR}kieker.log
         echo >>${BASE_DIR}kieker.log
         sync
@@ -134,9 +134,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 
         # 4 Logging
         echo " # ${i}.4 Logging"
-        mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-4.txt &
-        vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-4.txt &
-        iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-4.txt &
+        mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-4.txt &
+        vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-4.txt &
+        iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-4.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-4.csv \
             --totalcalls ${TOTAL_CALLS} \
@@ -146,9 +146,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %mpstat
         kill %vmstat
         kill %iostat
-        mkdir -p ${RESULTS_DIR}kiekerlog/
-        mv ${BASE_DIR}tmp/kieker-* ${RESULTS_DIR}kiekerlog/
-        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-4.log
+        mkdir -p ${RESULTS_DIR}/kiekerlog/
+        mv ${BASE_DIR}tmp/kieker-* ${RESULTS_DIR}/kiekerlog/
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-4.log
         echo >>${BASE_DIR}kieker.log
         echo >>${BASE_DIR}kieker.log
         sync
@@ -157,13 +157,13 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     done
 
 done
-tar cf ${RESULTS_DIR}kiekerlog.tar ${RESULTS_DIR}kiekerlog
-${SUDOCMD} rm -rf ${RESULTS_DIR}kiekerlog/
-gzip -9 ${RESULTS_DIR}kiekerlog.tar
-tar cf ${RESULTS_DIR}stat.tar ${RESULTS_DIR}stat
-rm -rf ${RESULTS_DIR}stat/
-gzip -9 ${RESULTS_DIR}stat.tar
-mv ${BASE_DIR}kieker.log ${RESULTS_DIR}kieker.log
-[ -f ${RESULTS_DIR}hotspot-1-1-1.log ] && grep "<task " ${RESULTS_DIR}hotspot-*.log >${RESULTS_DIR}log.log
+tar cf ${RESULTS_DIR}/kiekerlog.tar ${RESULTS_DIR}/kiekerlog
+${SUDOCMD} rm -rf ${RESULTS_DIR}/kiekerlog/
+gzip -9 ${RESULTS_DIR}/kiekerlog.tar
+tar cf ${RESULTS_DIR}/stat.tar ${RESULTS_DIR}/stat
+rm -rf ${RESULTS_DIR}/stat/
+gzip -9 ${RESULTS_DIR}/stat.tar
+mv ${BASE_DIR}kieker.log ${RESULTS_DIR}/kieker.log
+[ -f ${RESULTS_DIR}/hotspot-1-1-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
 [ -f ${BASE_DIR}nohup.out ] && mv ${BASE_DIR}nohup.out ${RESULTS_DIR}
 [ -f ${BASE_DIR}errorlog.txt ] && mv ${BASE_DIR}errorlog.txt ${RESULTS_DIR}
diff --git a/bin/2012-msept/run-benchmark-recursive.sh b/bin/2012-msept/run-benchmark-recursive.sh
index 3bff25b..45d5e7e 100644
--- a/bin/2012-msept/run-benchmark-recursive.sh
+++ b/bin/2012-msept/run-benchmark-recursive.sh
@@ -26,13 +26,13 @@ if [ ! -z "$(uname | grep -i WIN)" ]; then CPSEPCHAR=";"; fi
 RESULTS_DIR="${BASE_DIR}tmp/results-benchmark-recursive/"
 echo "Removing and recreating '${RESULTS_DIR}'"
 (${SUDOCMD} rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR}
-mkdir ${RESULTS_DIR}stat/
+mkdir ${RESULTS_DIR}/stat/
 
 # Clear kieker.log and initialize logging
 rm -f ${BASE_DIR}kieker.log
 touch ${BASE_DIR}kieker.log
 
-RESULTSFN="${RESULTS_DIR}results.csv"
+RESULTSFN="${RESULTS_DIR}/results.csv"
 
 JAVA_ARGS="-server"
 JAVA_ARGS="${JAVA_ARGS} -d64"
@@ -75,9 +75,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 
         # 1 No instrumentation
         echo " # ${i}.1 No instrumentation"
-        mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-1.txt &
-        vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-1.txt &
-        iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-1.txt &
+        mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-1.txt &
+        vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-1.txt &
+        iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-1.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_NOINSTR} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-1.csv \
             --totalcalls ${TOTAL_CALLS} \
@@ -87,15 +87,15 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %mpstat
         kill %vmstat
         kill %iostat
-        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-1.log
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-1.log
         sync
         sleep ${SLEEP_TIME}
 
         # 2 Deactivated probe
         echo " # ${i}.2 Deactivated probe"
-        mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-2.txt &
-        vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-2.txt &
-        iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-2.txt &
+        mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-2.txt &
+        vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-2.txt &
+        iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-2.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_KIEKER_DEACTV} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-2.csv \
             --totalcalls ${TOTAL_CALLS} \
@@ -105,7 +105,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %mpstat
         kill %vmstat
         kill %iostat
-        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-2.log
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-2.log
         echo >>${BASE_DIR}kieker.log
         echo >>${BASE_DIR}kieker.log
         sync
@@ -113,9 +113,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 
         # 3 No logging
         echo " # ${i}.3 No logging (null writer)"
-        mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-3.txt &
-        vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-3.txt &
-        iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-3.txt &
+        mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-3.txt &
+        vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-3.txt &
+        iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-3.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-3.csv \
             --totalcalls ${TOTAL_CALLS} \
@@ -125,7 +125,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %mpstat
         kill %vmstat
         kill %iostat
-        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-3.log
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-3.log
         echo >>${BASE_DIR}kieker.log
         echo >>${BASE_DIR}kieker.log
         sync
@@ -133,9 +133,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 
         # 4 Logging
         echo " # ${i}.4 Logging"
-        mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-4.txt &
-        vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-4.txt &
-        iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-4.txt &
+        mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-4.txt &
+        vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-4.txt &
+        iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-4.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-4.csv \
             --totalcalls ${TOTAL_CALLS} \
@@ -145,9 +145,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %mpstat
         kill %vmstat
         kill %iostat
-        mkdir -p ${RESULTS_DIR}kiekerlog/
-        mv ${BASE_DIR}tmp/kieker-* ${RESULTS_DIR}kiekerlog/
-        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-4.log
+        mkdir -p ${RESULTS_DIR}/kiekerlog/
+        mv ${BASE_DIR}tmp/kieker-* ${RESULTS_DIR}/kiekerlog/
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-4.log
         echo >>${BASE_DIR}kieker.log
         echo >>${BASE_DIR}kieker.log
         sync
@@ -156,13 +156,13 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     done
 
 done
-tar cf ${RESULTS_DIR}kiekerlog.tar ${RESULTS_DIR}kiekerlog
-${SUDOCMD} rm -rf ${RESULTS_DIR}kiekerlog/
-gzip -9 ${RESULTS_DIR}kiekerlog.tar
-tar cf ${RESULTS_DIR}stat.tar ${RESULTS_DIR}stat
-rm -rf ${RESULTS_DIR}stat/
-gzip -9 ${RESULTS_DIR}stat.tar
-mv ${BASE_DIR}kieker.log ${RESULTS_DIR}kieker.log
-[ -f ${RESULTS_DIR}hotspot-1-1-1.log ] && grep "<task " ${RESULTS_DIR}hotspot-*.log >${RESULTS_DIR}log.log
+tar cf ${RESULTS_DIR}/kiekerlog.tar ${RESULTS_DIR}/kiekerlog
+${SUDOCMD} rm -rf ${RESULTS_DIR}/kiekerlog/
+gzip -9 ${RESULTS_DIR}/kiekerlog.tar
+tar cf ${RESULTS_DIR}/stat.tar ${RESULTS_DIR}/stat
+rm -rf ${RESULTS_DIR}/stat/
+gzip -9 ${RESULTS_DIR}/stat.tar
+mv ${BASE_DIR}kieker.log ${RESULTS_DIR}/kieker.log
+[ -f ${RESULTS_DIR}/hotspot-1-1-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
 [ -f ${BASE_DIR}nohup.out ] && mv ${BASE_DIR}nohup.out ${RESULTS_DIR}
 [ -f ${BASE_DIR}errorlog.txt ] && mv ${BASE_DIR}errorlog.txt ${RESULTS_DIR}
diff --git a/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi-remote.sh b/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi-remote.sh
index 869ff7d..92f4ee8 100644
--- a/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi-remote.sh
+++ b/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi-remote.sh
@@ -24,12 +24,12 @@ echo "Experiment will take circa ${TIME} seconds."
 
 echo "Removing and recreating '${RESULTS_DIR}'"
 (rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR}
-mkdir ${RESULTS_DIR}stat/
+mkdir ${RESULTS_DIR}/stat/
 
 ssh ${REMOTEHOST} "(rm -rf ${REMOTERESULTS_DIR}) && mkdir ${REMOTERESULTS_DIR}"
-ssh ${REMOTEHOST} "mkdir ${REMOTERESULTS_DIR}stat/"
+ssh ${REMOTEHOST} "mkdir ${REMOTERESULTS_DIR}/stat/"
 
-RAWFN="${RESULTS_DIR}raw"
+RAWFN="${RESULTS_DIR}/raw"
 
 JAVA_ARGS="-server"
 JAVA_ARGS="${JAVA_ARGS} -d64"
@@ -71,7 +71,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     # No instrumentation
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} No instrumentation"
-	sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+	sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
     ${JAVABIN}java  ${JAVA_ARGS_NOINSTR} ${JARNoInstru} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
         --totalcalls ${TOTAL_CALLS} \
@@ -80,15 +80,15 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --recursiondepth ${j} \
         ${MOREPARAMS}
     kill %sar
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEP_TIME}
 
     # Deactivated Probe
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Deactivated Probe"
-	sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ssh ${REMOTEHOST} "nohup ${JAVABIN}java -jar ${REMOTERESULTS_DIR}dist/explorviz_worker.jar >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log &"
+	sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+    ssh ${REMOTEHOST} "nohup ${JAVABIN}java -jar ${REMOTERESULTS_DIR}/dist/explorviz_worker.jar >${REMOTERESULTS_DIR}/worker-${i}-${j}-${k}.log &"
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARDeactived} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -100,15 +100,15 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %sar
     pkill -f 'java -jar'
 	ssh ${REMOTEHOST} "pkill -f 'java -jar'"
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEP_TIME}
 	
     # Collecting
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Collecting"
-	sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ssh ${REMOTEHOST} "nohup ${JAVABIN}java -jar ${REMOTERESULTS_DIR}dist/explorviz_worker.jar >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log &"
+	sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+    ssh ${REMOTEHOST} "nohup ${JAVABIN}java -jar ${REMOTERESULTS_DIR}/dist/explorviz_worker.jar >${REMOTERESULTS_DIR}/worker-${i}-${j}-${k}.log &"
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARCollecting} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -120,15 +120,15 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %sar
     pkill -f 'java -jar'
 	ssh ${REMOTEHOST} "pkill -f 'java -jar'"
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEP_TIME}
 
     # Logging
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging"
-	sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ssh ${REMOTEHOST} "nohup ${JAVABIN}java -jar ${REMOTERESULTS_DIR}dist/explorviz_worker.jar >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log &"
+	sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+    ssh ${REMOTEHOST} "nohup ${JAVABIN}java -jar ${REMOTERESULTS_DIR}/dist/explorviz_worker.jar >${REMOTERESULTS_DIR}/worker-${i}-${j}-${k}.log &"
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARNORMAL} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -140,15 +140,15 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %sar
     pkill -f 'java -jar'
 	ssh ${REMOTEHOST} "pkill -f 'java -jar'"
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEP_TIME}
 	
     # Reconstruction
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Reconstruction"
-	sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ssh ${REMOTEHOST} "nohup ${JAVABIN}java -jar ${REMOTERESULTS_DIR}dist/explorviz_workerReconstruction.jar >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log &"
+	sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+    ssh ${REMOTEHOST} "nohup ${JAVABIN}java -jar ${REMOTERESULTS_DIR}/dist/explorviz_workerReconstruction.jar >${REMOTERESULTS_DIR}/worker-${i}-${j}-${k}.log &"
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARNORMAL} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -160,15 +160,15 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %sar
     pkill -f 'java -jar'
 	ssh ${REMOTEHOST} "pkill -f 'java -jar'"
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEP_TIME}
 
     # Reduction
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Reduction"
-	sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ssh ${REMOTEHOST} "nohup ${JAVABIN}java -jar ${REMOTERESULTS_DIR}dist/explorviz_workerReduction.jar >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log &"
+	sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+    ssh ${REMOTEHOST} "nohup ${JAVABIN}java -jar ${REMOTERESULTS_DIR}/dist/explorviz_workerReduction.jar >${REMOTERESULTS_DIR}/worker-${i}-${j}-${k}.log &"
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARNORMAL} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -180,21 +180,21 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %sar
     pkill -f 'java -jar'
 	ssh ${REMOTEHOST} "pkill -f 'java -jar'"
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEP_TIME}
 	
 done
-zip -jqr ${RESULTS_DIR}stat.zip ${RESULTS_DIR}stat
-rm -rf ${RESULTS_DIR}stat/
-[ -f ${RESULTS_DIR}hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}hotspot-*.log >${RESULTS_DIR}log.log
+zip -jqr ${RESULTS_DIR}/stat.zip ${RESULTS_DIR}/stat
+rm -rf ${RESULTS_DIR}/stat/
+[ -f ${RESULTS_DIR}/hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
 [ -f ${BASE_DIR}errorlog.txt ] && mv ${BASE_DIR}errorlog.txt ${RESULTS_DIR}
 
 ## Generate Results file
 # Timeseries
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-timeseries.pdf"
+output_fn="${RESULTS_DIR}/results-timeseries.pdf"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
@@ -207,7 +207,7 @@ EOF
 # Timeseries-Average
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-timeseries-average.pdf"
+output_fn="${RESULTS_DIR}/results-timeseries-average.pdf"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
@@ -220,7 +220,7 @@ EOF
 # Throughput
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-throughput.pdf"
+output_fn="${RESULTS_DIR}/results-throughput.pdf"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
@@ -231,7 +231,7 @@ EOF
 # Throughput-Average
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-throughput-average.pdf"
+output_fn="${RESULTS_DIR}/results-throughput-average.pdf"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
@@ -242,8 +242,8 @@ EOF
 # Bars
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-bars.pdf"
-outtxt_fn="${RESULTS_DIR}results-text.txt"
+output_fn="${RESULTS_DIR}/results-bars.pdf"
+outtxt_fn="${RESULTS_DIR}/results-text.txt"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
@@ -255,8 +255,8 @@ source("${R_SCRIPT_DIR}bar.r")
 EOF
 
 ## Clean up raw results
-zip -jqr ${RESULTS_DIR}results.zip ${RAWFN}*
+zip -jqr ${RESULTS_DIR}/results.zip ${RAWFN}*
 rm -f ${RAWFN}*
-zip -jqr ${RESULTS_DIR}worker.zip ${RESULTS_DIR}worker*.log
-rm -f ${RESULTS_DIR}worker*.log
+zip -jqr ${RESULTS_DIR}/worker.zip ${RESULTS_DIR}/worker*.log
+rm -f ${RESULTS_DIR}/worker*.log
 [ -f ${BASE_DIR}nohup.out ] && mv ${BASE_DIR}nohup.out ${RESULTS_DIR}
diff --git a/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi.sh b/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi.sh
index 249b76d..e821c9a 100644
--- a/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi.sh
+++ b/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi.sh
@@ -21,9 +21,9 @@ echo "Experiment will take circa ${TIME} seconds."
 
 echo "Removing and recreating '${RESULTS_DIR}'"
 (rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR}
-mkdir ${RESULTS_DIR}stat/
+mkdir ${RESULTS_DIR}/stat/
 
-RAWFN="${RESULTS_DIR}raw"
+RAWFN="${RESULTS_DIR}/raw"
 
 JAVA_ARGS="-server"
 JAVA_ARGS="${JAVA_ARGS} -d64"
@@ -65,7 +65,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     # No instrumentation
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} No instrumentation"
-	sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+	sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
     ${JAVABIN}java  ${JAVA_ARGS_NOINSTR} ${JARNoInstru} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
         --totalcalls ${TOTAL_CALLS} \
@@ -74,15 +74,15 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --recursiondepth ${j} \
         ${MOREPARAMS}
     kill %sar
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEP_TIME}
 
     # Deactivated Probe
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Deactivated Probe"
-	sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ${JAVABIN}java -jar dist/explorviz_worker.jar >${RESULTS_DIR}worker-${i}-${j}-${k}.log &
+	sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+    ${JAVABIN}java -jar dist/explorviz_worker.jar >${RESULTS_DIR}/worker-${i}-${j}-${k}.log &
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARDeactived} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -93,15 +93,15 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         ${MOREPARAMS}
     kill %sar
     pkill -f 'java -jar'
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEP_TIME}
 	
     # Collecting
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Collecting"
-	sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ${JAVABIN}java -jar dist/explorviz_worker.jar >${RESULTS_DIR}worker-${i}-${j}-${k}.log &
+	sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+    ${JAVABIN}java -jar dist/explorviz_worker.jar >${RESULTS_DIR}/worker-${i}-${j}-${k}.log &
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARCollecting} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -112,15 +112,15 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         ${MOREPARAMS}
     kill %sar
     pkill -f 'java -jar'
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEP_TIME}
 
     # Logging
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging"
-	sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ${JAVABIN}java -jar dist/explorviz_worker.jar >${RESULTS_DIR}worker-${i}-${j}-${k}.log &
+	sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+    ${JAVABIN}java -jar dist/explorviz_worker.jar >${RESULTS_DIR}/worker-${i}-${j}-${k}.log &
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARNORMAL} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -131,15 +131,15 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         ${MOREPARAMS}
     kill %sar
     pkill -f 'java -jar'
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEP_TIME}
 	
     # Reconstruction
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Reconstruction"
-	sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ${JAVABIN}java -jar dist/explorviz_workerReconstruction.jar >${RESULTS_DIR}worker-${i}-${j}-${k}.log &
+	sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+    ${JAVABIN}java -jar dist/explorviz_workerReconstruction.jar >${RESULTS_DIR}/worker-${i}-${j}-${k}.log &
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARNORMAL} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -150,15 +150,15 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         ${MOREPARAMS}
     kill %sar
     pkill -f 'java -jar'
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEP_TIME}
 
     # Reduction
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Reduction"
-	sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ${JAVABIN}java -jar dist/explorviz_workerReduction.jar >${RESULTS_DIR}worker-${i}-${j}-${k}.log &
+	sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+    ${JAVABIN}java -jar dist/explorviz_workerReduction.jar >${RESULTS_DIR}/worker-${i}-${j}-${k}.log &
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARNORMAL} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -169,21 +169,21 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         ${MOREPARAMS}
     kill %sar
     pkill -f 'java -jar'
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEP_TIME}
 	
 done
-zip -jqr ${RESULTS_DIR}stat.zip ${RESULTS_DIR}stat
-rm -rf ${RESULTS_DIR}stat/
-[ -f ${RESULTS_DIR}hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}hotspot-*.log >${RESULTS_DIR}log.log
+zip -jqr ${RESULTS_DIR}/stat.zip ${RESULTS_DIR}/stat
+rm -rf ${RESULTS_DIR}/stat/
+[ -f ${RESULTS_DIR}/hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
 [ -f ${BASE_DIR}errorlog.txt ] && mv ${BASE_DIR}errorlog.txt ${RESULTS_DIR}
 
 ## Generate Results file
 # Timeseries
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-timeseries.pdf"
+output_fn="${RESULTS_DIR}/results-timeseries.pdf"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
@@ -196,7 +196,7 @@ EOF
 # Timeseries-Average
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-timeseries-average.pdf"
+output_fn="${RESULTS_DIR}/results-timeseries-average.pdf"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
@@ -209,7 +209,7 @@ EOF
 # Throughput
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-throughput.pdf"
+output_fn="${RESULTS_DIR}/results-throughput.pdf"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
@@ -220,7 +220,7 @@ EOF
 # Throughput-Average
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-throughput-average.pdf"
+output_fn="${RESULTS_DIR}/results-throughput-average.pdf"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
@@ -231,8 +231,8 @@ EOF
 # Bars
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-bars.pdf"
-outtxt_fn="${RESULTS_DIR}results-text.txt"
+output_fn="${RESULTS_DIR}/results-bars.pdf"
+outtxt_fn="${RESULTS_DIR}/results-text.txt"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
@@ -244,8 +244,8 @@ source("${R_SCRIPT_DIR}bar.r")
 EOF
 
 ## Clean up raw results
-zip -jqr ${RESULTS_DIR}results.zip ${RAWFN}*
+zip -jqr ${RESULTS_DIR}/results.zip ${RAWFN}*
 rm -f ${RAWFN}*
-zip -jqr ${RESULTS_DIR}worker.zip ${RESULTS_DIR}worker*.log
-rm -f ${RESULTS_DIR}worker*.log
+zip -jqr ${RESULTS_DIR}/worker.zip ${RESULTS_DIR}/worker*.log
+rm -f ${RESULTS_DIR}/worker*.log
 [ -f ${BASE_DIR}nohup.out ] && mv ${BASE_DIR}nohup.out ${RESULTS_DIR}
diff --git a/bin/2013-kieker-days-ffi/benchmark-kieker-days-kieker.sh b/bin/2013-kieker-days-ffi/benchmark-kieker-days-kieker.sh
index de6c8f2..0726e40 100644
--- a/bin/2013-kieker-days-ffi/benchmark-kieker-days-kieker.sh
+++ b/bin/2013-kieker-days-ffi/benchmark-kieker-days-kieker.sh
@@ -21,13 +21,13 @@ echo "Experiment will take circa ${TIME} seconds."
 
 echo "Removing and recreating '${RESULTS_DIR}'"
 (rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR}
-mkdir ${RESULTS_DIR}stat/
+mkdir ${RESULTS_DIR}/stat/
 
 # Clear kieker.log and initialize logging
 rm -f ${BASE_DIR}kieker.log
 touch ${BASE_DIR}kieker.log
 
-RAWFN="${RESULTS_DIR}raw"
+RAWFN="${RESULTS_DIR}/raw"
 
 JAVA_ARGS="-server"
 JAVA_ARGS="${JAVA_ARGS} -d64"
@@ -70,9 +70,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} No instrumentation"
     echo " # ${i}.${j}.${k} No instrumentation" >>${BASE_DIR}kieker.log
-    mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-${k}.txt &
-    vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-${k}.txt &
-    iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
+    mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+    vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+    iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
     ${JAVABIN}java  ${JAVA_ARGS_NOINSTR} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
         --totalcalls ${TOTAL_CALLS} \
@@ -83,7 +83,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %mpstat
     kill %vmstat
     kill %iostat
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     echo >>${BASE_DIR}kieker.log
     echo >>${BASE_DIR}kieker.log
     sync
@@ -93,9 +93,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Deactivated probe"
     echo " # ${i}.${j}.${k} Deactivated probe" >>${BASE_DIR}kieker.log
-    mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-${k}.txt &
-    vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-${k}.txt &
-    iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
+    mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+    vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+    iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_DEACTV} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
         --totalcalls ${TOTAL_CALLS} \
@@ -106,7 +106,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %mpstat
     kill %vmstat
     kill %iostat
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     echo >>${BASE_DIR}kieker.log
     echo >>${BASE_DIR}kieker.log
     sync
@@ -116,9 +116,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} No logging (null writer)"
     echo " # ${i}.${j}.${k} No logging (null writer)" >>${BASE_DIR}kieker.log
-    mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-${k}.txt &
-    vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-${k}.txt &
-    iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
+    mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+    vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+    iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
         --totalcalls ${TOTAL_CALLS} \
@@ -129,7 +129,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %mpstat
     kill %vmstat
     kill %iostat
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     echo >>${BASE_DIR}kieker.log
     echo >>${BASE_DIR}kieker.log
     sync
@@ -139,10 +139,10 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging"
     echo " # ${i}.${j}.${k} Logging" >>${BASE_DIR}kieker.log
-    mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-${k}.txt &
-    vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-${k}.txt &
-    iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
-    ${JAVABIN}java -jar dist/KiekerTCPReader1.jar 2>${RESULTS_DIR}worker-${i}-${j}-${k}.log &
+    mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+    vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+    iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
+    ${JAVABIN}java -jar dist/KiekerTCPReader1.jar 2>${RESULTS_DIR}/worker-${i}-${j}-${k}.log &
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -156,7 +156,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %iostat
     pkill -f 'java -jar'
     rm -rf ${BASE_DIR}tmp/kieker-*
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     echo >>${BASE_DIR}kieker.log
     echo >>${BASE_DIR}kieker.log
     sync
@@ -166,10 +166,10 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging"
     echo " # ${i}.${j}.${k} Logging" >>${BASE_DIR}kieker.log
-    mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-${k}.txt &
-    vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-${k}.txt &
-    iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
-    ${JAVABIN}java -jar dist/KiekerTCPReader2.jar 2>${RESULTS_DIR}worker-${i}-${j}-${k}.log &
+    mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+    vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+    iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
+    ${JAVABIN}java -jar dist/KiekerTCPReader2.jar 2>${RESULTS_DIR}/worker-${i}-${j}-${k}.log &
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -183,7 +183,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %iostat
     pkill -f 'java -jar'
     rm -rf ${BASE_DIR}tmp/kieker-*
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     echo >>${BASE_DIR}kieker.log
     echo >>${BASE_DIR}kieker.log
     sync
@@ -193,10 +193,10 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging"
     echo " # ${i}.${j}.${k} Logging" >>${BASE_DIR}kieker.log
-    mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-${k}.txt &
-    vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-${k}.txt &
-    iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
-    ${JAVABIN}java -jar dist/KiekerTCPReader3.jar 2>${RESULTS_DIR}worker-${i}-${j}-${k}.log &
+    mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+    vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+    iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
+    ${JAVABIN}java -jar dist/KiekerTCPReader3.jar 2>${RESULTS_DIR}/worker-${i}-${j}-${k}.log &
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -210,24 +210,24 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %iostat
     pkill -f 'java -jar'
     rm -rf ${BASE_DIR}tmp/kieker-*
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     echo >>${BASE_DIR}kieker.log
     echo >>${BASE_DIR}kieker.log
     sync
     sleep ${SLEEP_TIME}
 	
 done
-zip -jqr ${RESULTS_DIR}stat.zip ${RESULTS_DIR}stat
-rm -rf ${RESULTS_DIR}stat/
-mv ${BASE_DIR}kieker.log ${RESULTS_DIR}kieker.log
-[ -f ${RESULTS_DIR}hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}hotspot-*.log >${RESULTS_DIR}log.log
+zip -jqr ${RESULTS_DIR}/stat.zip ${RESULTS_DIR}/stat
+rm -rf ${RESULTS_DIR}/stat/
+mv ${BASE_DIR}kieker.log ${RESULTS_DIR}/kieker.log
+[ -f ${RESULTS_DIR}/hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
 [ -f ${BASE_DIR}errorlog.txt ] && mv ${BASE_DIR}errorlog.txt ${RESULTS_DIR}
 
 ## Generate Results file
 # Timeseries
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-timeseries.pdf"
+output_fn="${RESULTS_DIR}/results-timeseries.pdf"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
@@ -240,7 +240,7 @@ EOF
 # Timeseries-Average
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-timeseries-average.pdf"
+output_fn="${RESULTS_DIR}/results-timeseries-average.pdf"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
@@ -253,7 +253,7 @@ EOF
 # Throughput
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-throughput.pdf"
+output_fn="${RESULTS_DIR}/results-throughput.pdf"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
@@ -264,7 +264,7 @@ EOF
 # Throughput-Average
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-throughput-average.pdf"
+output_fn="${RESULTS_DIR}/results-throughput-average.pdf"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
@@ -275,8 +275,8 @@ EOF
 # Bars
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-bars.pdf"
-outtxt_fn="${RESULTS_DIR}results-text.txt"
+output_fn="${RESULTS_DIR}/results-bars.pdf"
+outtxt_fn="${RESULTS_DIR}/results-text.txt"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
@@ -288,8 +288,8 @@ source("${R_SCRIPT_DIR}bar.r")
 EOF
 
 ## Clean up raw results
-zip -jqr ${RESULTS_DIR}results.zip ${RAWFN}*
+zip -jqr ${RESULTS_DIR}/results.zip ${RAWFN}*
 rm -f ${RAWFN}*
-zip -jqr ${RESULTS_DIR}worker.zip ${RESULTS_DIR}worker*.log
-rm -f ${RESULTS_DIR}worker*.log
+zip -jqr ${RESULTS_DIR}/worker.zip ${RESULTS_DIR}/worker*.log
+rm -f ${RESULTS_DIR}/worker*.log
 [ -f ${BASE_DIR}nohup.out ] && mv ${BASE_DIR}nohup.out ${RESULTS_DIR}
diff --git a/bin/2013-kieker-days/benchmark-kieker-days-ffi-remote.sh b/bin/2013-kieker-days/benchmark-kieker-days-ffi-remote.sh
index f0b5e93..84c044b 100644
--- a/bin/2013-kieker-days/benchmark-kieker-days-ffi-remote.sh
+++ b/bin/2013-kieker-days/benchmark-kieker-days-ffi-remote.sh
@@ -24,12 +24,12 @@ echo "Experiment will take circa ${TIME} seconds."
 
 echo "Removing and recreating '${RESULTS_DIR}'"
 (rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR}
-mkdir ${RESULTS_DIR}stat/
+mkdir ${RESULTS_DIR}/stat/
 
 ssh ${REMOTEHOST} "(rm -rf ${REMOTERESULTS_DIR}) && mkdir ${REMOTERESULTS_DIR}"
-ssh ${REMOTEHOST} "mkdir ${REMOTERESULTS_DIR}stat/"
+ssh ${REMOTEHOST} "mkdir ${REMOTERESULTS_DIR}/stat/"
 
-RAWFN="${RESULTS_DIR}raw"
+RAWFN="${RESULTS_DIR}/raw"
 
 JAVA_ARGS="-server"
 JAVA_ARGS="${JAVA_ARGS} -d64"
@@ -70,7 +70,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     # No instrumentation
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} No instrumentation"
-	#sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+	#sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
     ${JAVABIN}java  ${JAVA_ARGS_NOINSTR} ${JARNoInstru} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
         --totalcalls ${TOTAL_CALLS} \
@@ -79,15 +79,15 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --recursiondepth ${j} \
         ${MOREPARAMS}
     #kill %sar
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEP_TIME}
 
     # Deactivated Probe
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Deactivated Probe"
-	#sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASE_DIR}dist/explorviz_worker.jar </dev/null >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log 2>&1 &"
+	#sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+    ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASE_DIR}dist/explorviz_worker.jar </dev/null >${REMOTERESULTS_DIR}/worker-${i}-${j}-${k}.log 2>&1 &"
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARDeactived} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -99,15 +99,15 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     #kill %sar
     killall java
 	ssh ${REMOTEHOST} "killall java"
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEP_TIME}
 	
     # Collecting
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Collecting"
-	#sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASE_DIR}dist/explorviz_worker.jar </dev/null >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log 2>&1 &"
+	#sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+    ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASE_DIR}dist/explorviz_worker.jar </dev/null >${REMOTERESULTS_DIR}/worker-${i}-${j}-${k}.log 2>&1 &"
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARCollecting} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -119,15 +119,15 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     #kill %sar
     killall java
 	ssh ${REMOTEHOST} "killall java"
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEP_TIME}
 
     # Logging
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging"
-	#sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASE_DIR}dist/explorviz_worker.jar </dev/null >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log 2>&1 &"
+	#sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+    ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASE_DIR}dist/explorviz_worker.jar </dev/null >${REMOTERESULTS_DIR}/worker-${i}-${j}-${k}.log 2>&1 &"
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARNORMAL} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -139,15 +139,15 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     #kill %sar
     killall java
 	ssh ${REMOTEHOST} "killall java"
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEP_TIME}
 	
     # Reconstruction
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Reconstruction"
-	#sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASE_DIR}dist/explorviz_workerReconstruction.jar </dev/null >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log 2>&1 &"
+	#sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+    ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASE_DIR}dist/explorviz_workerReconstruction.jar </dev/null >${REMOTERESULTS_DIR}/worker-${i}-${j}-${k}.log 2>&1 &"
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARNORMAL} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -159,15 +159,15 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     #kill %sar
     killall java
 	ssh ${REMOTEHOST} "killall java"
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEP_TIME}
 
     # Reduction
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Reduction"
-	#sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASE_DIR}dist/explorviz_workerReduction.jar </dev/null >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log 2>&1 &"
+	#sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+    ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASE_DIR}dist/explorviz_workerReduction.jar </dev/null >${REMOTERESULTS_DIR}/worker-${i}-${j}-${k}.log 2>&1 &"
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARNORMAL} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -179,21 +179,21 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     #kill %sar
     killall java
 	ssh ${REMOTEHOST} "killall java"
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEP_TIME}
 	
 done
-zip -jqr ${RESULTS_DIR}stat.zip ${RESULTS_DIR}stat
-rm -rf ${RESULTS_DIR}stat/
-[ -f ${RESULTS_DIR}hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}hotspot-*.log >${RESULTS_DIR}log.log
+zip -jqr ${RESULTS_DIR}/stat.zip ${RESULTS_DIR}/stat
+rm -rf ${RESULTS_DIR}/stat/
+[ -f ${RESULTS_DIR}/hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
 [ -f ${BASE_DIR}errorlog.txt ] && mv ${BASE_DIR}errorlog.txt ${RESULTS_DIR}
 
 ## Generate Results file
 # Bars
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-outtxt_fn="${RESULTS_DIR}results-text.txt"
+outtxt_fn="${RESULTS_DIR}/results-text.txt"
 configs.threads=${THREADS}
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
@@ -204,8 +204,8 @@ source("${R_SCRIPT_DIR}stats.r")
 EOF
 
 ## Clean up raw results
-zip -jqr ${RESULTS_DIR}results.zip ${RAWFN}*
+zip -jqr ${RESULTS_DIR}/results.zip ${RAWFN}*
 rm -f ${RAWFN}*
-zip -jqr ${RESULTS_DIR}worker.zip ${RESULTS_DIR}worker*.log
-rm -f ${RESULTS_DIR}worker*.log
+zip -jqr ${RESULTS_DIR}/worker.zip ${RESULTS_DIR}/worker*.log
+rm -f ${RESULTS_DIR}/worker*.log
 [ -f ${BASE_DIR}nohup.out ] && mv ${BASE_DIR}nohup.out ${RESULTS_DIR}
diff --git a/bin/2013-kieker-days/benchmark-kieker-days-ffi.sh b/bin/2013-kieker-days/benchmark-kieker-days-ffi.sh
index 249b76d..e821c9a 100644
--- a/bin/2013-kieker-days/benchmark-kieker-days-ffi.sh
+++ b/bin/2013-kieker-days/benchmark-kieker-days-ffi.sh
@@ -21,9 +21,9 @@ echo "Experiment will take circa ${TIME} seconds."
 
 echo "Removing and recreating '${RESULTS_DIR}'"
 (rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR}
-mkdir ${RESULTS_DIR}stat/
+mkdir ${RESULTS_DIR}/stat/
 
-RAWFN="${RESULTS_DIR}raw"
+RAWFN="${RESULTS_DIR}/raw"
 
 JAVA_ARGS="-server"
 JAVA_ARGS="${JAVA_ARGS} -d64"
@@ -65,7 +65,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     # No instrumentation
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} No instrumentation"
-	sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+	sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
     ${JAVABIN}java  ${JAVA_ARGS_NOINSTR} ${JARNoInstru} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
         --totalcalls ${TOTAL_CALLS} \
@@ -74,15 +74,15 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --recursiondepth ${j} \
         ${MOREPARAMS}
     kill %sar
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEP_TIME}
 
     # Deactivated Probe
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Deactivated Probe"
-	sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ${JAVABIN}java -jar dist/explorviz_worker.jar >${RESULTS_DIR}worker-${i}-${j}-${k}.log &
+	sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+    ${JAVABIN}java -jar dist/explorviz_worker.jar >${RESULTS_DIR}/worker-${i}-${j}-${k}.log &
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARDeactived} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -93,15 +93,15 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         ${MOREPARAMS}
     kill %sar
     pkill -f 'java -jar'
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEP_TIME}
 	
     # Collecting
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Collecting"
-	sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ${JAVABIN}java -jar dist/explorviz_worker.jar >${RESULTS_DIR}worker-${i}-${j}-${k}.log &
+	sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+    ${JAVABIN}java -jar dist/explorviz_worker.jar >${RESULTS_DIR}/worker-${i}-${j}-${k}.log &
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARCollecting} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -112,15 +112,15 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         ${MOREPARAMS}
     kill %sar
     pkill -f 'java -jar'
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEP_TIME}
 
     # Logging
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging"
-	sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ${JAVABIN}java -jar dist/explorviz_worker.jar >${RESULTS_DIR}worker-${i}-${j}-${k}.log &
+	sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+    ${JAVABIN}java -jar dist/explorviz_worker.jar >${RESULTS_DIR}/worker-${i}-${j}-${k}.log &
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARNORMAL} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -131,15 +131,15 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         ${MOREPARAMS}
     kill %sar
     pkill -f 'java -jar'
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEP_TIME}
 	
     # Reconstruction
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Reconstruction"
-	sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ${JAVABIN}java -jar dist/explorviz_workerReconstruction.jar >${RESULTS_DIR}worker-${i}-${j}-${k}.log &
+	sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+    ${JAVABIN}java -jar dist/explorviz_workerReconstruction.jar >${RESULTS_DIR}/worker-${i}-${j}-${k}.log &
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARNORMAL} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -150,15 +150,15 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         ${MOREPARAMS}
     kill %sar
     pkill -f 'java -jar'
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEP_TIME}
 
     # Reduction
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Reduction"
-	sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ${JAVABIN}java -jar dist/explorviz_workerReduction.jar >${RESULTS_DIR}worker-${i}-${j}-${k}.log &
+	sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+    ${JAVABIN}java -jar dist/explorviz_workerReduction.jar >${RESULTS_DIR}/worker-${i}-${j}-${k}.log &
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARNORMAL} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -169,21 +169,21 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         ${MOREPARAMS}
     kill %sar
     pkill -f 'java -jar'
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEP_TIME}
 	
 done
-zip -jqr ${RESULTS_DIR}stat.zip ${RESULTS_DIR}stat
-rm -rf ${RESULTS_DIR}stat/
-[ -f ${RESULTS_DIR}hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}hotspot-*.log >${RESULTS_DIR}log.log
+zip -jqr ${RESULTS_DIR}/stat.zip ${RESULTS_DIR}/stat
+rm -rf ${RESULTS_DIR}/stat/
+[ -f ${RESULTS_DIR}/hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
 [ -f ${BASE_DIR}errorlog.txt ] && mv ${BASE_DIR}errorlog.txt ${RESULTS_DIR}
 
 ## Generate Results file
 # Timeseries
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-timeseries.pdf"
+output_fn="${RESULTS_DIR}/results-timeseries.pdf"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
@@ -196,7 +196,7 @@ EOF
 # Timeseries-Average
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-timeseries-average.pdf"
+output_fn="${RESULTS_DIR}/results-timeseries-average.pdf"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
@@ -209,7 +209,7 @@ EOF
 # Throughput
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-throughput.pdf"
+output_fn="${RESULTS_DIR}/results-throughput.pdf"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
@@ -220,7 +220,7 @@ EOF
 # Throughput-Average
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-throughput-average.pdf"
+output_fn="${RESULTS_DIR}/results-throughput-average.pdf"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
@@ -231,8 +231,8 @@ EOF
 # Bars
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-bars.pdf"
-outtxt_fn="${RESULTS_DIR}results-text.txt"
+output_fn="${RESULTS_DIR}/results-bars.pdf"
+outtxt_fn="${RESULTS_DIR}/results-text.txt"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
@@ -244,8 +244,8 @@ source("${R_SCRIPT_DIR}bar.r")
 EOF
 
 ## Clean up raw results
-zip -jqr ${RESULTS_DIR}results.zip ${RAWFN}*
+zip -jqr ${RESULTS_DIR}/results.zip ${RAWFN}*
 rm -f ${RAWFN}*
-zip -jqr ${RESULTS_DIR}worker.zip ${RESULTS_DIR}worker*.log
-rm -f ${RESULTS_DIR}worker*.log
+zip -jqr ${RESULTS_DIR}/worker.zip ${RESULTS_DIR}/worker*.log
+rm -f ${RESULTS_DIR}/worker*.log
 [ -f ${BASE_DIR}nohup.out ] && mv ${BASE_DIR}nohup.out ${RESULTS_DIR}
diff --git a/bin/2013-kieker-days/benchmark-kieker-days-kieker-remote.sh b/bin/2013-kieker-days/benchmark-kieker-days-kieker-remote.sh
index cfc56a9..588e51f 100644
--- a/bin/2013-kieker-days/benchmark-kieker-days-kieker-remote.sh
+++ b/bin/2013-kieker-days/benchmark-kieker-days-kieker-remote.sh
@@ -24,16 +24,16 @@ echo "Experiment will take circa ${TIME} seconds."
 
 echo "Removing and recreating '${RESULTS_DIR}'"
 (rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR}
-mkdir ${RESULTS_DIR}stat/
+mkdir ${RESULTS_DIR}/stat/
 
 ssh ${REMOTEHOST} "(rm -rf ${REMOTERESULTS_DIR}) && mkdir ${REMOTERESULTS_DIR}"
-ssh ${REMOTEHOST} "mkdir ${REMOTERESULTS_DIR}stat/"
+ssh ${REMOTEHOST} "mkdir ${REMOTERESULTS_DIR}/stat/"
 
 # Clear kieker.log and initialize logging
 rm -f ${BASE_DIR}kieker.log
 touch ${BASE_DIR}kieker.log
 
-RAWFN="${RESULTS_DIR}raw"
+RAWFN="${RESULTS_DIR}/raw"
 
 JAVA_ARGS="-server"
 JAVA_ARGS="${JAVA_ARGS} -d64"
@@ -76,7 +76,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} No instrumentation"
     echo " # ${i}.${j}.${k} No instrumentation" >>${BASE_DIR}kieker.log
-    #sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+    #sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
     ${JAVABIN}java  ${JAVA_ARGS_NOINSTR} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
         --totalcalls ${TOTAL_CALLS} \
@@ -85,7 +85,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --recursiondepth ${j} \
         ${MOREPARAMS}
     #kill %sar
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     echo >>${BASE_DIR}kieker.log
     echo >>${BASE_DIR}kieker.log
     sync
@@ -95,7 +95,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Deactivated probe"
     echo " # ${i}.${j}.${k} Deactivated probe" >>${BASE_DIR}kieker.log
-    #sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+    #sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_DEACTV} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
         --totalcalls ${TOTAL_CALLS} \
@@ -104,7 +104,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --recursiondepth ${j} \
         ${MOREPARAMS}
     #kill %sar
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     echo >>${BASE_DIR}kieker.log
     echo >>${BASE_DIR}kieker.log
     sync
@@ -114,7 +114,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} No logging (null writer)"
     echo " # ${i}.${j}.${k} No logging (null writer)" >>${BASE_DIR}kieker.log
-    #sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+    #sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
         --totalcalls ${TOTAL_CALLS} \
@@ -123,7 +123,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --recursiondepth ${j} \
         ${MOREPARAMS}
     #kill %sar
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     echo >>${BASE_DIR}kieker.log
     echo >>${BASE_DIR}kieker.log
     sync
@@ -133,8 +133,8 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging"
     echo " # ${i}.${j}.${k} Logging" >>${BASE_DIR}kieker.log
-    #sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-	ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASE_DIR}dist/KiekerTCPReader1.jar </dev/null >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log 2>&1 &"
+    #sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+	ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASE_DIR}dist/KiekerTCPReader1.jar </dev/null >${REMOTERESULTS_DIR}/worker-${i}-${j}-${k}.log 2>&1 &"
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -147,7 +147,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     killall java
 	ssh ${REMOTEHOST} "killall java"
     rm -rf ${BASE_DIR}tmp/kieker-*
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     echo >>${BASE_DIR}kieker.log
     echo >>${BASE_DIR}kieker.log
     sync
@@ -157,8 +157,8 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging"
     echo " # ${i}.${j}.${k} Logging" >>${BASE_DIR}kieker.log
-    #sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-	ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASE_DIR}dist/KiekerTCPReader2.jar </dev/null >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log 2>&1 &"
+    #sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+	ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASE_DIR}dist/KiekerTCPReader2.jar </dev/null >${REMOTERESULTS_DIR}/worker-${i}-${j}-${k}.log 2>&1 &"
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -171,7 +171,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     killall java
 	ssh ${REMOTEHOST} "killall java"
     rm -rf ${BASE_DIR}tmp/kieker-*
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     echo >>${BASE_DIR}kieker.log
     echo >>${BASE_DIR}kieker.log
     sync
@@ -181,8 +181,8 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging"
     echo " # ${i}.${j}.${k} Logging" >>${BASE_DIR}kieker.log
-    #sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-	ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASE_DIR}dist/KiekerTCPReader3.jar </dev/null >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log 2>&1 &"
+    #sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+	ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASE_DIR}dist/KiekerTCPReader3.jar </dev/null >${REMOTERESULTS_DIR}/worker-${i}-${j}-${k}.log 2>&1 &"
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -195,24 +195,24 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     killall java
 	ssh ${REMOTEHOST} "killall java"
     rm -rf ${BASE_DIR}tmp/kieker-*
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     echo >>${BASE_DIR}kieker.log
     echo >>${BASE_DIR}kieker.log
     sync
     sleep ${SLEEP_TIME}
 	
 done
-zip -jqr ${RESULTS_DIR}stat.zip ${RESULTS_DIR}stat
-rm -rf ${RESULTS_DIR}stat/
-mv ${BASE_DIR}kieker.log ${RESULTS_DIR}kieker.log
-[ -f ${RESULTS_DIR}hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}hotspot-*.log >${RESULTS_DIR}log.log
+zip -jqr ${RESULTS_DIR}/stat.zip ${RESULTS_DIR}/stat
+rm -rf ${RESULTS_DIR}/stat/
+mv ${BASE_DIR}kieker.log ${RESULTS_DIR}/kieker.log
+[ -f ${RESULTS_DIR}/hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
 [ -f ${BASE_DIR}errorlog.txt ] && mv ${BASE_DIR}errorlog.txt ${RESULTS_DIR}
 
 ## Generate Results file
 # Bars
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-outtxt_fn="${RESULTS_DIR}results-text.txt"
+outtxt_fn="${RESULTS_DIR}/results-text.txt"
 configs.threads=${THREADS}
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
@@ -223,8 +223,8 @@ source("${R_SCRIPT_DIR}stats.r")
 EOF
 
 ## Clean up raw results
-zip -jqr ${RESULTS_DIR}results.zip ${RAWFN}*
+zip -jqr ${RESULTS_DIR}/results.zip ${RAWFN}*
 rm -f ${RAWFN}*
-zip -jqr ${RESULTS_DIR}worker.zip ${RESULTS_DIR}worker*.log
-rm -f ${RESULTS_DIR}worker*.log
+zip -jqr ${RESULTS_DIR}/worker.zip ${RESULTS_DIR}/worker*.log
+rm -f ${RESULTS_DIR}/worker*.log
 [ -f ${BASE_DIR}nohup.out ] && mv ${BASE_DIR}nohup.out ${RESULTS_DIR}
diff --git a/bin/2013-kieker-days/benchmark-kieker-days-kieker.sh b/bin/2013-kieker-days/benchmark-kieker-days-kieker.sh
index de6c8f2..0726e40 100644
--- a/bin/2013-kieker-days/benchmark-kieker-days-kieker.sh
+++ b/bin/2013-kieker-days/benchmark-kieker-days-kieker.sh
@@ -21,13 +21,13 @@ echo "Experiment will take circa ${TIME} seconds."
 
 echo "Removing and recreating '${RESULTS_DIR}'"
 (rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR}
-mkdir ${RESULTS_DIR}stat/
+mkdir ${RESULTS_DIR}/stat/
 
 # Clear kieker.log and initialize logging
 rm -f ${BASE_DIR}kieker.log
 touch ${BASE_DIR}kieker.log
 
-RAWFN="${RESULTS_DIR}raw"
+RAWFN="${RESULTS_DIR}/raw"
 
 JAVA_ARGS="-server"
 JAVA_ARGS="${JAVA_ARGS} -d64"
@@ -70,9 +70,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} No instrumentation"
     echo " # ${i}.${j}.${k} No instrumentation" >>${BASE_DIR}kieker.log
-    mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-${k}.txt &
-    vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-${k}.txt &
-    iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
+    mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+    vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+    iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
     ${JAVABIN}java  ${JAVA_ARGS_NOINSTR} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
         --totalcalls ${TOTAL_CALLS} \
@@ -83,7 +83,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %mpstat
     kill %vmstat
     kill %iostat
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     echo >>${BASE_DIR}kieker.log
     echo >>${BASE_DIR}kieker.log
     sync
@@ -93,9 +93,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Deactivated probe"
     echo " # ${i}.${j}.${k} Deactivated probe" >>${BASE_DIR}kieker.log
-    mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-${k}.txt &
-    vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-${k}.txt &
-    iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
+    mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+    vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+    iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_DEACTV} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
         --totalcalls ${TOTAL_CALLS} \
@@ -106,7 +106,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %mpstat
     kill %vmstat
     kill %iostat
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     echo >>${BASE_DIR}kieker.log
     echo >>${BASE_DIR}kieker.log
     sync
@@ -116,9 +116,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} No logging (null writer)"
     echo " # ${i}.${j}.${k} No logging (null writer)" >>${BASE_DIR}kieker.log
-    mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-${k}.txt &
-    vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-${k}.txt &
-    iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
+    mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+    vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+    iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
         --totalcalls ${TOTAL_CALLS} \
@@ -129,7 +129,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %mpstat
     kill %vmstat
     kill %iostat
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     echo >>${BASE_DIR}kieker.log
     echo >>${BASE_DIR}kieker.log
     sync
@@ -139,10 +139,10 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging"
     echo " # ${i}.${j}.${k} Logging" >>${BASE_DIR}kieker.log
-    mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-${k}.txt &
-    vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-${k}.txt &
-    iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
-    ${JAVABIN}java -jar dist/KiekerTCPReader1.jar 2>${RESULTS_DIR}worker-${i}-${j}-${k}.log &
+    mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+    vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+    iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
+    ${JAVABIN}java -jar dist/KiekerTCPReader1.jar 2>${RESULTS_DIR}/worker-${i}-${j}-${k}.log &
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -156,7 +156,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %iostat
     pkill -f 'java -jar'
     rm -rf ${BASE_DIR}tmp/kieker-*
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     echo >>${BASE_DIR}kieker.log
     echo >>${BASE_DIR}kieker.log
     sync
@@ -166,10 +166,10 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging"
     echo " # ${i}.${j}.${k} Logging" >>${BASE_DIR}kieker.log
-    mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-${k}.txt &
-    vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-${k}.txt &
-    iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
-    ${JAVABIN}java -jar dist/KiekerTCPReader2.jar 2>${RESULTS_DIR}worker-${i}-${j}-${k}.log &
+    mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+    vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+    iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
+    ${JAVABIN}java -jar dist/KiekerTCPReader2.jar 2>${RESULTS_DIR}/worker-${i}-${j}-${k}.log &
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -183,7 +183,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %iostat
     pkill -f 'java -jar'
     rm -rf ${BASE_DIR}tmp/kieker-*
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     echo >>${BASE_DIR}kieker.log
     echo >>${BASE_DIR}kieker.log
     sync
@@ -193,10 +193,10 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging"
     echo " # ${i}.${j}.${k} Logging" >>${BASE_DIR}kieker.log
-    mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-${k}.txt &
-    vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-${k}.txt &
-    iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
-    ${JAVABIN}java -jar dist/KiekerTCPReader3.jar 2>${RESULTS_DIR}worker-${i}-${j}-${k}.log &
+    mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+    vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+    iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
+    ${JAVABIN}java -jar dist/KiekerTCPReader3.jar 2>${RESULTS_DIR}/worker-${i}-${j}-${k}.log &
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -210,24 +210,24 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %iostat
     pkill -f 'java -jar'
     rm -rf ${BASE_DIR}tmp/kieker-*
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     echo >>${BASE_DIR}kieker.log
     echo >>${BASE_DIR}kieker.log
     sync
     sleep ${SLEEP_TIME}
 	
 done
-zip -jqr ${RESULTS_DIR}stat.zip ${RESULTS_DIR}stat
-rm -rf ${RESULTS_DIR}stat/
-mv ${BASE_DIR}kieker.log ${RESULTS_DIR}kieker.log
-[ -f ${RESULTS_DIR}hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}hotspot-*.log >${RESULTS_DIR}log.log
+zip -jqr ${RESULTS_DIR}/stat.zip ${RESULTS_DIR}/stat
+rm -rf ${RESULTS_DIR}/stat/
+mv ${BASE_DIR}kieker.log ${RESULTS_DIR}/kieker.log
+[ -f ${RESULTS_DIR}/hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
 [ -f ${BASE_DIR}errorlog.txt ] && mv ${BASE_DIR}errorlog.txt ${RESULTS_DIR}
 
 ## Generate Results file
 # Timeseries
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-timeseries.pdf"
+output_fn="${RESULTS_DIR}/results-timeseries.pdf"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
@@ -240,7 +240,7 @@ EOF
 # Timeseries-Average
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-timeseries-average.pdf"
+output_fn="${RESULTS_DIR}/results-timeseries-average.pdf"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
@@ -253,7 +253,7 @@ EOF
 # Throughput
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-throughput.pdf"
+output_fn="${RESULTS_DIR}/results-throughput.pdf"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
@@ -264,7 +264,7 @@ EOF
 # Throughput-Average
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-throughput-average.pdf"
+output_fn="${RESULTS_DIR}/results-throughput-average.pdf"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
@@ -275,8 +275,8 @@ EOF
 # Bars
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-bars.pdf"
-outtxt_fn="${RESULTS_DIR}results-text.txt"
+output_fn="${RESULTS_DIR}/results-bars.pdf"
+outtxt_fn="${RESULTS_DIR}/results-text.txt"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
@@ -288,8 +288,8 @@ source("${R_SCRIPT_DIR}bar.r")
 EOF
 
 ## Clean up raw results
-zip -jqr ${RESULTS_DIR}results.zip ${RAWFN}*
+zip -jqr ${RESULTS_DIR}/results.zip ${RAWFN}*
 rm -f ${RAWFN}*
-zip -jqr ${RESULTS_DIR}worker.zip ${RESULTS_DIR}worker*.log
-rm -f ${RESULTS_DIR}worker*.log
+zip -jqr ${RESULTS_DIR}/worker.zip ${RESULTS_DIR}/worker*.log
+rm -f ${RESULTS_DIR}/worker*.log
 [ -f ${BASE_DIR}nohup.out ] && mv ${BASE_DIR}nohup.out ${RESULTS_DIR}
diff --git a/bin/2013-kieker-days/only_r.sh b/bin/2013-kieker-days/only_r.sh
index e98be1b..2eafaa7 100644
--- a/bin/2013-kieker-days/only_r.sh
+++ b/bin/2013-kieker-days/only_r.sh
@@ -13,12 +13,12 @@ RECURSIONDEPTH=10       ## 10
 TOTAL_CALLS=20000000     ## 20000000
 METHOD_TIME=0            ## 0
 
-RAWFN="${RESULTS_DIR}raw"
+RAWFN="${RESULTS_DIR}/raw"
 
 # Timeseries
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-timeseries.pdf"
+output_fn="${RESULTS_DIR}/results-timeseries.pdf"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
@@ -31,7 +31,7 @@ EOF
 # Timeseries-Average
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-timeseries-average.pdf"
+output_fn="${RESULTS_DIR}/results-timeseries-average.pdf"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
@@ -44,7 +44,7 @@ EOF
 # Throughput
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-throughput.pdf"
+output_fn="${RESULTS_DIR}/results-throughput.pdf"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
@@ -55,7 +55,7 @@ EOF
 # Throughput-Average
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-throughput-average.pdf"
+output_fn="${RESULTS_DIR}/results-throughput-average.pdf"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
diff --git a/bin/2014-icpe/benchmark-disk-writer.sh b/bin/2014-icpe/benchmark-disk-writer.sh
index f08d20d..952be7d 100644
--- a/bin/2014-icpe/benchmark-disk-writer.sh
+++ b/bin/2014-icpe/benchmark-disk-writer.sh
@@ -21,13 +21,13 @@ echo "Experiment will take circa ${TIME} seconds."
 
 echo "Removing and recreating '${RESULTS_DIR}'"
 (rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR}
-mkdir ${RESULTS_DIR}stat/
+mkdir ${RESULTS_DIR}/stat/
 
 # Clear kieker.log and initialize logging
 rm -f ${BASE_DIR}kieker.log
 touch ${BASE_DIR}kieker.log
 
-RAWFN="${RESULTS_DIR}raw"
+RAWFN="${RESULTS_DIR}/raw"
 
 JAVA_ARGS="-server"
 JAVA_ARGS="${JAVA_ARGS} -d64"
@@ -72,9 +72,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} No instrumentation"
     echo " # ${i}.${j}.${k} No instrumentation" >>${BASE_DIR}kieker.log
-    mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-${k}.txt &
-    vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-${k}.txt &
-    iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
+    mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+    vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+    iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
     ${JAVABIN}java  ${JAVA_ARGS_NOINSTR} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
         --totalcalls ${TOTAL_CALLS} \
@@ -85,7 +85,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %mpstat
     kill %vmstat
     kill %iostat
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     echo >>${BASE_DIR}kieker.log
     echo >>${BASE_DIR}kieker.log
     sync
@@ -95,9 +95,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Deactivated probe"
     echo " # ${i}.${j}.${k} Deactivated probe" >>${BASE_DIR}kieker.log
-    mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-${k}.txt &
-    vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-${k}.txt &
-    iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
+    mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+    vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+    iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_DEACTV} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
         --totalcalls ${TOTAL_CALLS} \
@@ -108,7 +108,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %mpstat
     kill %vmstat
     kill %iostat
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     echo >>${BASE_DIR}kieker.log
     echo >>${BASE_DIR}kieker.log
     sync
@@ -118,9 +118,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} No logging (null writer)"
     echo " # ${i}.${j}.${k} No logging (null writer)" >>${BASE_DIR}kieker.log
-    mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-${k}.txt &
-    vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-${k}.txt &
-    iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
+    mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+    vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+    iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
         --totalcalls ${TOTAL_CALLS} \
@@ -131,7 +131,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %mpstat
     kill %vmstat
     kill %iostat
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     echo >>${BASE_DIR}kieker.log
     echo >>${BASE_DIR}kieker.log
     sync
@@ -141,9 +141,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging 1"
     echo " # ${i}.${j}.${k} Logging 1" >>${BASE_DIR}kieker.log
-    mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-${k}.txt &
-    vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-${k}.txt &
-    iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
+    mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+    vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+    iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_LOGGING1} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
         --totalcalls ${TOTAL_CALLS} \
@@ -155,7 +155,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %vmstat
     kill %iostat
     rm -rf ${BASE_DIR}tmp/kieker-*
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     echo >>${BASE_DIR}kieker.log
     echo >>${BASE_DIR}kieker.log
     sync
@@ -165,9 +165,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging 2"
     echo " # ${i}.${j}.${k} Logging 2" >>${BASE_DIR}kieker.log
-    mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-${k}.txt &
-    vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-${k}.txt &
-    iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
+    mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+    vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+    iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_LOGGING2} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
         --totalcalls ${TOTAL_CALLS} \
@@ -179,7 +179,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %vmstat
     kill %iostat
     rm -rf ${BASE_DIR}tmp/kieker-*
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     echo >>${BASE_DIR}kieker.log
     echo >>${BASE_DIR}kieker.log
     sync
@@ -189,9 +189,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging 3"
     echo " # ${i}.${j}.${k} Logging 3" >>${BASE_DIR}kieker.log
-    mpstat 1 > ${RESULTS_DIR}stat/mpstat-${i}-${j}-${k}.txt &
-    vmstat 1 > ${RESULTS_DIR}stat/vmstat-${i}-${j}-${k}.txt &
-    iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
+    mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+    vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+    iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_LOGGING3} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
         --totalcalls ${TOTAL_CALLS} \
@@ -203,24 +203,24 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %vmstat
     kill %iostat
     rm -rf ${BASE_DIR}tmp/kieker-*
-    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     echo >>${BASE_DIR}kieker.log
     echo >>${BASE_DIR}kieker.log
     sync
     sleep ${SLEEP_TIME}
 
 done
-zip -jqr ${RESULTS_DIR}stat.zip ${RESULTS_DIR}stat
-rm -rf ${RESULTS_DIR}stat/
-mv ${BASE_DIR}kieker.log ${RESULTS_DIR}kieker.log
-[ -f ${RESULTS_DIR}hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}hotspot-*.log >${RESULTS_DIR}log.log
+zip -jqr ${RESULTS_DIR}/stat.zip ${RESULTS_DIR}/stat
+rm -rf ${RESULTS_DIR}/stat/
+mv ${BASE_DIR}kieker.log ${RESULTS_DIR}/kieker.log
+[ -f ${RESULTS_DIR}/hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
 [ -f ${BASE_DIR}errorlog.txt ] && mv ${BASE_DIR}errorlog.txt ${RESULTS_DIR}
 
 ## Generate Results file
 # Timeseries
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-timeseries.pdf"
+output_fn="${RESULTS_DIR}/results-timeseries.pdf"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","Writer1","Writer2","Writer3")
@@ -233,7 +233,7 @@ EOF
 # Timeseries-Average
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-timeseries-average.pdf"
+output_fn="${RESULTS_DIR}/results-timeseries-average.pdf"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","Writer1","Writer2","Writer3")
@@ -246,7 +246,7 @@ EOF
 # Throughput
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-throughput.pdf"
+output_fn="${RESULTS_DIR}/results-throughput.pdf"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","Writer1","Writer2","Writer3")
@@ -257,7 +257,7 @@ EOF
 # Throughput-Average
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-throughput-average.pdf"
+output_fn="${RESULTS_DIR}/results-throughput-average.pdf"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","Writer1","Writer2","Writer3")
@@ -268,8 +268,8 @@ EOF
 # Bars
 R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
-output_fn="${RESULTS_DIR}results-bars.pdf"
-outtxt_fn="${RESULTS_DIR}results-text.txt"
+output_fn="${RESULTS_DIR}/results-bars.pdf"
+outtxt_fn="${RESULTS_DIR}/results-text.txt"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","Writer1","Writer2","Writer3")
@@ -281,6 +281,6 @@ source("${R_SCRIPT_DIR}bar.r")
 EOF
 
 ## Clean up raw results
-zip -jqr ${RESULTS_DIR}results.zip ${RAWFN}*
+zip -jqr ${RESULTS_DIR}/results.zip ${RAWFN}*
 rm -f ${RAWFN}*
 [ -f ${BASE_DIR}nohup.out ] && mv ${BASE_DIR}nohup.out ${RESULTS_DIR}
diff --git a/frameworks/Kieker/benchmark.sh b/frameworks/Kieker/benchmark.sh
index 1aefa62..3a78792 100644
--- a/frameworks/Kieker/benchmark.sh
+++ b/frameworks/Kieker/benchmark.sh
@@ -151,7 +151,7 @@ function execute-experiment() {
 
     rm -rf ${DATA_DIR}/kieker-*
 
-    [ -f ${DATA_DIR}/hotspot.log ] && mv ${DATA_DIR}/hotspot.log ${RESULTS_DIR}hotspot-${loop}-${recursion}-${index}.log
+    [ -f ${DATA_DIR}/hotspot.log ] && mv ${DATA_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${loop}-${recursion}-${index}.log
     echo >> ${DATA_DIR}/kieker.log
     echo >> ${DATA_DIR}/kieker.log
     sync
diff --git a/frameworks/OpenTelemetry/benchmark.sh b/frameworks/OpenTelemetry/benchmark.sh
index 19bb214..075caef 100644
--- a/frameworks/OpenTelemetry/benchmark.sh
+++ b/frameworks/OpenTelemetry/benchmark.sh
@@ -133,7 +133,7 @@ echo "Experiment will take circa ${TIME} seconds."
 
 echo "Cleaning and recreating '${RESULTS_DIR}'"
 (rm -rf ${RESULTS_DIR}/**csv) && mkdir -p ${RESULTS_DIR}
-#mkdir ${RESULTS_DIR}stat/
+#mkdir ${RESULTS_DIR}/stat/
 
 # Clear OpenTelemetry.log and initialize logging
 rm -f ${BASE_DIR}/OpenTelemetry.log
@@ -189,8 +189,8 @@ run-r
 
 cleanup-results
 
-#zip -jqr ${RESULTS_DIR}stat.zip ${RESULTS_DIR}stat
-#rm -rf ${RESULTS_DIR}stat/
+#zip -jqr ${RESULTS_DIR}/stat.zip ${RESULTS_DIR}/stat
+#rm -rf ${RESULTS_DIR}/stat/
 mv ${BASE_DIR}/OpenTelemetry.log ${RESULTS_DIR}/OpenTelemetry.log
 [ -f "${RESULTS_DIR}/hotspot-1-${RECURSION_DEPTH}-1.log" ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log > "${RESULTS_DIR}/log.log"
 [ -f "${BASE_DIR}/errorlog.txt" ] && mv "${BASE_DIR}/errorlog.txt" ${RESULTS_DIR}
diff --git a/frameworks/inspectIT/benchmark.sh b/frameworks/inspectIT/benchmark.sh
index 0ae1459..73d7b1d 100644
--- a/frameworks/inspectIT/benchmark.sh
+++ b/frameworks/inspectIT/benchmark.sh
@@ -162,7 +162,7 @@ for ((i=1;i<=${NUM_OF_LOOPS};i+=1)); do
 done
 
 mv "${BASE_DIR}/inspectIT.log" "${RESULTS_DIR}/inspectIT.log"
-[ -f "${RESULTS_DIR}/Hotspot-1-${RECURSION_DEPTH}-1.log" ] && grep "<task " ${RESULTS_DIR}hotspot-*.log > "${RESULTS_DIR}/log.log"
+[ -f "${RESULTS_DIR}/Hotspot-1-${RECURSION_DEPTH}-1.log" ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log > "${RESULTS_DIR}/log.log"
 [ -f "${BASE_DIR}/errorlog.txt" ] && mv "${BASE_DIR}/errorlog.txt" "${RESULTS_DIR}"
 
 # Create R labels
-- 
GitLab