diff --git a/README b/README
index d33110a77a0c5d0498315236de79d6ce993248e9..8450f12a9b2b4cee050d5489095889162604a01f 100644
--- a/README
+++ b/README
@@ -19,8 +19,8 @@ For instance, the target "build-kieker" prepares a jar for Kieker
 benchmarking experiments.
 
 All experiments are started with the provided "External Controller"
-scripts. These scripts are available inside the bin/ directory.
-Currently only shell (.sh) scripts are provided.
+scripts. These scripts are available inside the respective bin/ 
+directory. Currently only shell (.sh) scripts are provided.
 
 The default execution of the benchmark requires a 64Bit JVM!
 This can be changed in the respective .sh scripts.
@@ -46,7 +46,7 @@ The top of the files include some configuration parameters, such as
 Furthermore some JVM arguments can be adjusted:
 * JAVAARGS JVM Arguments
 
-Experiments:
+Experiments (outdated):
 Different recursion depth (with MAXRECURSIONDEPTH=1 without recursion)
 -> bin/run-benchmark-recursive.sh
 
@@ -64,6 +64,6 @@ environments and require pfexec permissions to assign subsets of cores
 to the benchmarking system.
 
 Analyzing the data:
-in the folder /bin/r-scripts are some R scripts provided to generate 
+in the folder /bin/r are some R scripts provided to generate 
 graphs to visualize the results. In the top the files, one can configure
 the required paths and the configuration used to analyze the data.
diff --git a/build.xml b/build.xml
index 0abe5e131356f35238c984851ca5b7327a4bc88b..b1099a6b07a77b3eab9a347351eb8f2a2d255542 100644
--- a/build.xml
+++ b/build.xml
@@ -9,7 +9,7 @@
 		<mkdir dir="build" />
 		<mkdir dir="dist" />
 		<mkdir dir="dist/lib" />
-		<mkdir dir="tmp" />
+		<mkdir dir="dist/tmp" />
 	</target>
 
 	<target name="compile" depends="init">
@@ -43,6 +43,7 @@
         <path refid="compile-classpath"/>
       </path>
 		</copy>
+		<copy file="frameworks/Kieker/bin/benchmark.sh" todir="dist" />
 	</target>
 
 	<target name="jar" depends="compile">
@@ -62,10 +63,12 @@
 			</manifest>
 			<zipfileset src="lib/commons-cli-1.2.jar" />
 		</jar>
+		<copy todir="dist/r">
+			<fileset dir="bin/r" />
+		</copy>
 	</target>
 
 	<target name="clean">
-		<!--<delete dir="tmp"/>-->
 		<delete dir="build" />
 		<delete dir="dist" />
 	</target>
diff --git a/frameworks/Kieker/benchmark-disk-writer-0.91-oer.sh b/frameworks/Kieker/bin/benchmark-disk-writer-0.91-oer.sh
similarity index 98%
rename from frameworks/Kieker/benchmark-disk-writer-0.91-oer.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-0.91-oer.sh
index aabc6e6983aaa3d4e0567d615cab116a977cf25a..9796acc2e528adddfc44be670737b8084bd6f802 100644
--- a/frameworks/Kieker/benchmark-disk-writer-0.91-oer.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-0.91-oer.sh
@@ -2,7 +2,7 @@
 
 JAVABIN=""
 
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
 BASEDIR=./
 RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-0.91-oer/"
 
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
 #JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
 #JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
 #JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
 
 JAVAARGS_NOINSTR="${JAVAARGS}"
 JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-0.91_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false"
diff --git a/frameworks/Kieker/benchmark-disk-writer-0.95a-oer.sh b/frameworks/Kieker/bin/benchmark-disk-writer-0.95a-oer.sh
similarity index 98%
rename from frameworks/Kieker/benchmark-disk-writer-0.95a-oer.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-0.95a-oer.sh
index 13a5a5c5a5cd677eac8d13ef223b90a3c0eeb18e..fb8d0de180e736e02b3862f65c0a404fe48e974e 100644
--- a/frameworks/Kieker/benchmark-disk-writer-0.95a-oer.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-0.95a-oer.sh
@@ -2,7 +2,7 @@
 
 JAVABIN=""
 
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
 BASEDIR=./
 RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-0.95a-oer/"
 
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
 #JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
 #JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
 #JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
 
 JAVAARGS_NOINSTR="${JAVAARGS}"
 JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-0.95a_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.0-oer.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.0-oer.sh
similarity index 98%
rename from frameworks/Kieker/benchmark-disk-writer-1.0-oer.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.0-oer.sh
index 34f4ac73b82ff2cac55d08c6cebc36058be27530..4c02391ff1b3967fa30c4d7d314a80c0301e5f7e 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.0-oer.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.0-oer.sh
@@ -2,7 +2,7 @@
 
 JAVABIN=""
 
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
 BASEDIR=./
 RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.0-oer/"
 
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
 #JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
 #JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
 #JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
 
 JAVAARGS_NOINSTR="${JAVAARGS}"
 JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.0_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.1-oer.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.1-oer.sh
similarity index 98%
rename from frameworks/Kieker/benchmark-disk-writer-1.1-oer.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.1-oer.sh
index b664712316817c0fcc6a81c5cf8af3d54c6a537e..756acd7ffa1ba2fe7aa9cf317816c06a4ad5d178 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.1-oer.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.1-oer.sh
@@ -2,7 +2,7 @@
 
 JAVABIN=""
 
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
 BASEDIR=./
 RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.1-oer/"
 
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
 #JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
 #JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
 #JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
 
 JAVAARGS_NOINSTR="${JAVAARGS}"
 JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.1_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.2-oer.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.2-oer.sh
similarity index 98%
rename from frameworks/Kieker/benchmark-disk-writer-1.2-oer.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.2-oer.sh
index c881347b0ce5979c8afa8c7e1438f12c167928f5..f8b92944838bcbe7a538d0e0d4dbb7512fb7b1ed 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.2-oer.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.2-oer.sh
@@ -2,7 +2,7 @@
 
 JAVABIN=""
 
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
 BASEDIR=./
 RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.2-oer/"
 
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
 #JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
 #JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
 #JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
 
 JAVAARGS_NOINSTR="${JAVAARGS}"
 JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.2_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.3-oer.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.3-oer.sh
similarity index 98%
rename from frameworks/Kieker/benchmark-disk-writer-1.3-oer.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.3-oer.sh
index 18cab9e64bded0667d9c78318dafcbcf7944eba0..e5e5feb259e7351adeb90e9f31f4fdfc2aece8fd 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.3-oer.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.3-oer.sh
@@ -2,7 +2,7 @@
 
 JAVABIN=""
 
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
 BASEDIR=./
 RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.3-oer/"
 
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
 #JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
 #JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
 #JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
 
 JAVAARGS_NOINSTR="${JAVAARGS}"
 JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.3_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.4-oer.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.4-oer.sh
similarity index 98%
rename from frameworks/Kieker/benchmark-disk-writer-1.4-oer.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.4-oer.sh
index 91d21d083e38bf9d9b4023ba94814ed9a5f3f677..047461815dc44334f2f08486cc9d9a3037e77c1c 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.4-oer.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.4-oer.sh
@@ -2,7 +2,7 @@
 
 JAVABIN=""
 
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
 BASEDIR=./
 RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.4-oer/"
 
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
 #JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
 #JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
 #JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
 
 JAVAARGS_NOINSTR="${JAVAARGS}"
 JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.4_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.5-event.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.5-event.sh
similarity index 99%
rename from frameworks/Kieker/benchmark-disk-writer-1.5-event.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.5-event.sh
index d28db41aeeb514d99c2b58e4e42d36bba88dc0b6..563f83a843ce049c34ee43ea25d464b1c011eb05 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.5-event.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.5-event.sh
@@ -2,7 +2,7 @@
 
 JAVABIN=""
 
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
 BASEDIR=./
 RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.5-event/"
 
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
 #JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
 #JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
 #JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
 
 JAVAARGS_NOINSTR="${JAVAARGS}"
 JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.5_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.aop.xml"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.5-oer.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.5-oer.sh
similarity index 99%
rename from frameworks/Kieker/benchmark-disk-writer-1.5-oer.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.5-oer.sh
index b82c5fc9682646a3e459d83c2d6f4eee4db512b8..1a0bbdd0c6c8093254718f1506b003317bada869 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.5-oer.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.5-oer.sh
@@ -2,7 +2,7 @@
 
 JAVABIN=""
 
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
 BASEDIR=./
 RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.5-oer/"
 
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
 #JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
 #JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
 #JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
 
 JAVAARGS_NOINSTR="${JAVAARGS}"
 JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.5_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.legacy.aop.xml"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.6-event.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.6-event.sh
similarity index 99%
rename from frameworks/Kieker/benchmark-disk-writer-1.6-event.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.6-event.sh
index da7ead1ece02210c368764ff9f169fb13857c40f..407b2af7a53793c6c9f86d23e2a1d7efbc417daa 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.6-event.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.6-event.sh
@@ -2,7 +2,7 @@
 
 JAVABIN=""
 
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
 BASEDIR=./
 RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.6-event/"
 
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
 #JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
 #JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
 #JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
 
 JAVAARGS_NOINSTR="${JAVAARGS}"
 JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.6_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.aop.xml"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.6-oer.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.6-oer.sh
similarity index 99%
rename from frameworks/Kieker/benchmark-disk-writer-1.6-oer.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.6-oer.sh
index a8f1eca6418f3efe79cbe7f921e6a9b2abaf955c..d3ae283ba82239153a59fe71a6af615b2e1b5750 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.6-oer.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.6-oer.sh
@@ -2,7 +2,7 @@
 
 JAVABIN=""
 
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
 BASEDIR=./
 RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.6-oer/"
 
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
 #JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
 #JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
 #JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
 
 JAVAARGS_NOINSTR="${JAVAARGS}"
 JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.6_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.legacy.aop.xml"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.7-event.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.7-event.sh
similarity index 99%
rename from frameworks/Kieker/benchmark-disk-writer-1.7-event.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.7-event.sh
index 41235784f10ef702d948df15bbe0b1b7df166733..0df9a6105d2ddaa5771863410f8f2392e2a7a4f5 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.7-event.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.7-event.sh
@@ -2,7 +2,7 @@
 
 JAVABIN=""
 
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
 BASEDIR=./
 RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.7-event/"
 
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
 #JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
 #JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
 #JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
 
 JAVAARGS_NOINSTR="${JAVAARGS}"
 JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.7_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.aop.xml"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.7-oer.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.7-oer.sh
similarity index 99%
rename from frameworks/Kieker/benchmark-disk-writer-1.7-oer.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.7-oer.sh
index 127bb9cdf4e7862f84781cb27d91c395a17807e7..69782eb1688e89121ee7d350043b54fd53c17b5b 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.7-oer.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.7-oer.sh
@@ -2,7 +2,7 @@
 
 JAVABIN=""
 
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
 BASEDIR=./
 RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.7-oer/"
 
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
 #JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
 #JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
 #JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
 
 JAVAARGS_NOINSTR="${JAVAARGS}"
 JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.7_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.legacy.aop.xml"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.8-event.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.8-event.sh
similarity index 99%
rename from frameworks/Kieker/benchmark-disk-writer-1.8-event.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.8-event.sh
index b078a17d0ca8aedfce95539c66887b84991815f0..da27f9600e524768197843f33a9749c1b07e8c26 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.8-event.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.8-event.sh
@@ -2,7 +2,7 @@
 
 JAVABIN=""
 
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
 BASEDIR=./
 RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.8-event/"
 
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
 #JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
 #JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
 #JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
 
 JAVAARGS_NOINSTR="${JAVAARGS}"
 JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.8_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.aop.xml"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.8-oer.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.8-oer.sh
similarity index 99%
rename from frameworks/Kieker/benchmark-disk-writer-1.8-oer.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.8-oer.sh
index 3c4e29e06a240c2533ca683406216992954640c9..25aa2066fad95826649a235bc44900054b5fbf17 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.8-oer.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.8-oer.sh
@@ -2,7 +2,7 @@
 
 JAVABIN=""
 
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
 BASEDIR=./
 RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.8-oer/"
 
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
 #JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
 #JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
 #JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
 
 JAVAARGS_NOINSTR="${JAVAARGS}"
 JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.8_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.legacy.aop.xml"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.9-event.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.9-event.sh
similarity index 99%
rename from frameworks/Kieker/benchmark-disk-writer-1.9-event.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.9-event.sh
index e5f11a49b4d846a6f271b83d15b3a8d7d974aa0f..1e868be25f03b07b5b81b305f987a94b0b832020 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.9-event.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.9-event.sh
@@ -2,7 +2,7 @@
 
 JAVABIN=""
 
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
 BASEDIR=./
 RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.9-event/"
 
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
 #JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
 #JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
 #JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
 
 JAVAARGS_NOINSTR="${JAVAARGS}"
 JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.9_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.aop.xml"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.9-oer.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.9-oer.sh
similarity index 99%
rename from frameworks/Kieker/benchmark-disk-writer-1.9-oer.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.9-oer.sh
index ea5c04b986e8771941814376dd37e2f76707570d..f7972fd2cb5beff394f7a2e3b9301d76dea32196 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.9-oer.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.9-oer.sh
@@ -2,7 +2,7 @@
 
 JAVABIN=""
 
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
 BASEDIR=./
 RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.9-oer/"
 
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
 #JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
 #JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
 #JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
 
 JAVAARGS_NOINSTR="${JAVAARGS}"
 JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.9_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.legacy.aop.xml"
diff --git a/bin/Kieker.sh b/frameworks/Kieker/bin/benchmark.sh
similarity index 98%
rename from bin/Kieker.sh
rename to frameworks/Kieker/bin/benchmark.sh
index 1702726886b4f24cb2f104f25a0bb34beb56e895..4830d49ab4372f967de1fbee63b1fd1fc1f44cfa 100644
--- a/bin/Kieker.sh
+++ b/frameworks/Kieker/bin/benchmark.sh
@@ -2,7 +2,7 @@
 
 JAVABIN=""
 
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
 BASEDIR=./
 RESULTSDIR="${BASEDIR}tmp/results-kieker/"
 
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
 #JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
 #JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
 #JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
 
 JAVAARGS_NOINSTR="${JAVAARGS}"
 JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.9_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.aop.xml"
diff --git a/frameworks/Kieker/run-benchmark-all.sh b/frameworks/Kieker/bin/run-benchmark-all.sh
similarity index 100%
rename from frameworks/Kieker/run-benchmark-all.sh
rename to frameworks/Kieker/bin/run-benchmark-all.sh
diff --git a/tmp/.gitignore b/tmp/.gitignore
deleted file mode 100644
index 5e7d2734cfc60289debf74293817c0a8f572ff32..0000000000000000000000000000000000000000
--- a/tmp/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore