diff --git a/frameworks/Kieker/build.gradle b/frameworks/Kieker/build.gradle
index aa2bbd2064175a2214a0c86ddc2a7799b7bd2dd3..f706ba40f9af0ef7fc1697471b56edd8eed63be8 100644
--- a/frameworks/Kieker/build.gradle
+++ b/frameworks/Kieker/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    implementation project(':benchmark')
+    implementation project(':tools:benchmark')
     implementation 'net.kieker-monitoring:kieker:1.14'
     implementation 'net.sourceforge.teetime:teetime:3.0'
     implementation 'org.slf4j:slf4j-api:1.7.+'
diff --git a/frameworks/OpenTelemetry/config.rc b/frameworks/OpenTelemetry/config.rc
index ded519d574de6d4e242d640dc0bf46c71f370e7b..0b46b37240e1ecbb97cb90412c70af205d9f6ff6 100644
--- a/frameworks/OpenTelemetry/config.rc
+++ b/frameworks/OpenTelemetry/config.rc
@@ -9,4 +9,6 @@ AGENT_JAR="${BASE_DIR}/lib/opentelemetry-javaagent.jar"
 #MORE_PARAMS="--quickstart"
 MORE_PARAMS="--application moobench.application.MonitoredClassSimple ${MORE_PARAMS}"
 
+MOOBENCH_BIN="${BASE_DIR}/../../benchmark/bin/benchmark"
+
 
diff --git a/frameworks/OpenTelemetry/functions.sh b/frameworks/OpenTelemetry/functions.sh
index 5fb41bee553ebf2f4a301d69bda518f1c66e82fb..ed6ddc2f45fa871609cd67e9fcd4cdd884152dc8 100644
--- a/frameworks/OpenTelemetry/functions.sh
+++ b/frameworks/OpenTelemetry/functions.sh
@@ -42,13 +42,13 @@ function runNoInstrumentation {
     # No instrumentation
     info " # ${i}.$RECURSION_DEPTH.${k} ${TITLE[$k]}"
     echo " # ${i}.$RECURSION_DEPTH.${k} ${TITLE[$k]}" >> "${BASE_DIR}/OpenTelemetry.log"
-    ${JAVA_BIN} ${JAVA_ARGS_NOINSTR} ${JAR} \
-        --output-filename ${RAWFN}-${i}-$RECURSION_DEPTH-${k}.csv \
-        --total-calls ${TOTAL_NUM_OF_CALLS} \
-        --method-time ${METHOD_TIME} \
-        --total-threads ${THREADS} \
-        --recursion-depth $RECURSION_DEPTH \
-        ${MORE_PARAMS} &> "${RESULTS_DIR}/output_${i}_${RECURSION_DEPTH}_${k}.txt"
+    export BENCHMARK_OPTS="${JAVA_ARGS_NOINSTR}"
+    "${MOOBENCH_BIN}" --output-filename "${RAWFN}-${i}-$RECURSION_DEPTH-${k}.csv" \
+        --total-calls "${TOTAL_NUM_OF_CALLS}" \
+        --method-time "${METHOD_TIME}" \
+        --total-threads "${THREADS}" \
+        --recursion-depth "${RECURSION_DEPTH}" \
+        ${MORE_PARAMS} #&> "${RESULTS_DIR}/output_${i}_${RECURSION_DEPTH}_${k}.txt"
 }
 
 function runOpenTelemetryNoLogging {
diff --git a/settings.gradle b/settings.gradle
index 98876b3d01b443e01aeb54003fe717a5486ecbb7..498031c70b00b5c7976583e31b4bf115fba69169 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -9,7 +9,7 @@
 
 rootProject.name = 'moobench'
 
-include 'benchmark'
+include 'tools:benchmark'
 include 'tools:receiver'
 include 'tools:compile-results'
 include 'frameworks:inspectIT'
diff --git a/benchmark/build.gradle b/tools/benchmark/build.gradle
similarity index 100%
rename from benchmark/build.gradle
rename to tools/benchmark/build.gradle
diff --git a/benchmark/src/main/java/moobench/application/MonitoredClass.java b/tools/benchmark/src/main/java/moobench/application/MonitoredClass.java
similarity index 100%
rename from benchmark/src/main/java/moobench/application/MonitoredClass.java
rename to tools/benchmark/src/main/java/moobench/application/MonitoredClass.java
diff --git a/benchmark/src/main/java/moobench/application/MonitoredClassSimple.java b/tools/benchmark/src/main/java/moobench/application/MonitoredClassSimple.java
similarity index 100%
rename from benchmark/src/main/java/moobench/application/MonitoredClassSimple.java
rename to tools/benchmark/src/main/java/moobench/application/MonitoredClassSimple.java
diff --git a/benchmark/src/main/java/moobench/application/MonitoredClassThreaded.java b/tools/benchmark/src/main/java/moobench/application/MonitoredClassThreaded.java
similarity index 100%
rename from benchmark/src/main/java/moobench/application/MonitoredClassThreaded.java
rename to tools/benchmark/src/main/java/moobench/application/MonitoredClassThreaded.java
diff --git a/benchmark/src/main/java/moobench/benchmark/BenchmarkMain.java b/tools/benchmark/src/main/java/moobench/benchmark/BenchmarkMain.java
similarity index 100%
rename from benchmark/src/main/java/moobench/benchmark/BenchmarkMain.java
rename to tools/benchmark/src/main/java/moobench/benchmark/BenchmarkMain.java
diff --git a/benchmark/src/main/java/moobench/benchmark/BenchmarkParameter.java b/tools/benchmark/src/main/java/moobench/benchmark/BenchmarkParameter.java
similarity index 100%
rename from benchmark/src/main/java/moobench/benchmark/BenchmarkParameter.java
rename to tools/benchmark/src/main/java/moobench/benchmark/BenchmarkParameter.java
diff --git a/benchmark/src/main/java/moobench/benchmark/BenchmarkingThread.java b/tools/benchmark/src/main/java/moobench/benchmark/BenchmarkingThread.java
similarity index 100%
rename from benchmark/src/main/java/moobench/benchmark/BenchmarkingThread.java
rename to tools/benchmark/src/main/java/moobench/benchmark/BenchmarkingThread.java
diff --git a/benchmark/src/main/java/moobench/benchmark/BenchmarkingThreadMilli.java b/tools/benchmark/src/main/java/moobench/benchmark/BenchmarkingThreadMilli.java
similarity index 100%
rename from benchmark/src/main/java/moobench/benchmark/BenchmarkingThreadMilli.java
rename to tools/benchmark/src/main/java/moobench/benchmark/BenchmarkingThreadMilli.java
diff --git a/benchmark/src/main/java/moobench/benchmark/BenchmarkingThreadNano.java b/tools/benchmark/src/main/java/moobench/benchmark/BenchmarkingThreadNano.java
similarity index 100%
rename from benchmark/src/main/java/moobench/benchmark/BenchmarkingThreadNano.java
rename to tools/benchmark/src/main/java/moobench/benchmark/BenchmarkingThreadNano.java