diff --git a/.gitignore b/.gitignore
index 5b5660cb47f5e96fea66639798c3c5c713ae43e8..e047a13f0b0a621f5286b98285c62a2e0330310c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,9 @@
 # Do not store measurement results
 frameworks/OpenTelemetry-java/raw*
 frameworks/OpenTelemetry-java/results-OpenTelemetry-java/
+frameworks/inspectIT-java/raw*
+frameworks/inspectIT-java/results-inspectIT-java/
+frameworks/Kieker-java/raw*
+frameworks/Kieker-java/results-Kieker-java/
+frameworks/Kieker-python/raw*
+frameworks/Kieker-python/results-Kieker-python/
diff --git a/Jenkinsfile b/Jenkinsfile
index e14d1d553f54f8ba6a02b49cefe9cf6251ac4e77..6152d022711b1ac9f062898ba16a6baade287608 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -44,13 +44,13 @@ pipeline {
 
     stage('Run Benchmark') {
        steps {
-          sh './frameworks/Kieker/python/benchmark.sh'
-          sh './frameworks/Kieker/java/benchmark.sh'
+          sh './frameworks/Kieker-python/benchmark.sh'
+          sh './frameworks/Kieker-java/benchmark.sh'
           sh './frameworks/OpenTelemetry-java/benchmark.sh'
           sh './frameworks/inspectIT-java/benchmark.sh'
 
-          sh 'cp frameworks/Kieker/python/results-python/results.yaml kieker-python-results.yaml'
-          sh 'cp frameworks/Kieker/java/results-java/results.yaml kieker-java-results.yaml'
+          sh 'cp frameworks/Kieker-python/results-Kieker-python/results.yaml kieker-python-results.yaml'
+          sh 'cp frameworks/Kieker-java/results-Kieker-java/results.yaml kieker-java-results.yaml'
           sh 'cp frameworks/OpenTelemetry-java/results-OpenTelemetry/results.yaml open-telementry-results.yaml'
           sh 'cp frameworks/inspectIT-java/results-inspectIT/results.yaml inspect-it-results.yaml'
 
diff --git a/frameworks/Kieker/java/.gitignore b/frameworks/Kieker-java/.gitignore
similarity index 100%
rename from frameworks/Kieker/java/.gitignore
rename to frameworks/Kieker-java/.gitignore
diff --git a/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/LICENSE b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/LICENSE
similarity index 100%
rename from frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/LICENSE
rename to frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/LICENSE
diff --git a/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/collector-2.0.jar b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/collector-2.0.jar
similarity index 100%
rename from frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/collector-2.0.jar
rename to frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/collector-2.0.jar
diff --git a/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/jcommander-1.72.jar b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/jcommander-1.72.jar
similarity index 100%
rename from frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/jcommander-1.72.jar
rename to frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/jcommander-1.72.jar
diff --git a/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/log4j-1.2.17.jar b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/log4j-1.2.17.jar
similarity index 100%
rename from frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/log4j-1.2.17.jar
rename to frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/log4j-1.2.17.jar
diff --git a/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/slf4j-api-1.7.25.jar b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/slf4j-api-1.7.25.jar
similarity index 100%
rename from frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/slf4j-api-1.7.25.jar
rename to frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/slf4j-api-1.7.25.jar
diff --git a/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/slf4j-log4j12-1.7.25.jar b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/slf4j-log4j12-1.7.25.jar
similarity index 100%
rename from frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/slf4j-log4j12-1.7.25.jar
rename to frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/lib/slf4j-log4j12-1.7.25.jar
diff --git a/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/lib/.gitignore b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/lib/.gitignore
similarity index 100%
rename from frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/lib/.gitignore
rename to frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/lib/.gitignore
diff --git a/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/log4j.cfg b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/log4j.cfg
similarity index 100%
rename from frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/log4j.cfg
rename to frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/log4j.cfg
diff --git a/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/moobench-2.0-all.jar b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/moobench-2.0-all.jar
similarity index 100%
rename from frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/moobench-2.0-all.jar
rename to frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/MooBench/moobench-2.0-all.jar
diff --git a/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/README b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/README
similarity index 100%
rename from frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/README
rename to frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/README
diff --git a/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/executeRemoteMicroBenchmark.sh b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/executeRemoteMicroBenchmark.sh
similarity index 100%
rename from frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/executeRemoteMicroBenchmark.sh
rename to frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/executeRemoteMicroBenchmark.sh
diff --git a/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/rerun-benchmark.sh b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/rerun-benchmark.sh
similarity index 100%
rename from frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/rerun-benchmark.sh
rename to frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/rerun-benchmark.sh
diff --git a/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/src/META-INF/kieker.legacy.aop.xml b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/META-INF/kieker.legacy.aop.xml
similarity index 100%
rename from frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/src/META-INF/kieker.legacy.aop.xml
rename to frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/META-INF/kieker.legacy.aop.xml
diff --git a/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/src/META-INF/kieker.logging.properties b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/META-INF/kieker.logging.properties
similarity index 100%
rename from frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/src/META-INF/kieker.logging.properties
rename to frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/META-INF/kieker.logging.properties
diff --git a/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/src/META-INF/kieker.monitoring.properties b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/META-INF/kieker.monitoring.properties
similarity index 100%
rename from frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/src/META-INF/kieker.monitoring.properties
rename to frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/META-INF/kieker.monitoring.properties
diff --git a/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/application/MonitoredClassManualInstrumentation.java b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/application/MonitoredClassManualInstrumentation.java
similarity index 100%
rename from frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/application/MonitoredClassManualInstrumentation.java
rename to frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/application/MonitoredClassManualInstrumentation.java
diff --git a/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/Logger.java b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/Logger.java
similarity index 100%
rename from frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/Logger.java
rename to frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/Logger.java
diff --git a/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestConfiguration1.java b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestConfiguration1.java
similarity index 100%
rename from frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestConfiguration1.java
rename to frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestConfiguration1.java
diff --git a/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestConfiguration2.java b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestConfiguration2.java
similarity index 100%
rename from frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestConfiguration2.java
rename to frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestConfiguration2.java
diff --git a/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestConfiguration3.java b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestConfiguration3.java
similarity index 100%
rename from frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestConfiguration3.java
rename to frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestConfiguration3.java
diff --git a/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestExperiment0.java b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestExperiment0.java
similarity index 100%
rename from frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestExperiment0.java
rename to frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestExperiment0.java
diff --git a/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestExperiment1.java b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestExperiment1.java
similarity index 100%
rename from frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestExperiment1.java
rename to frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestExperiment1.java
diff --git a/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestExperiment2.java b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestExperiment2.java
similarity index 100%
rename from frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestExperiment2.java
rename to frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestExperiment2.java
diff --git a/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestExperiment3.java b/frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestExperiment3.java
similarity index 100%
rename from frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestExperiment3.java
rename to frameworks/Kieker-java/OverheadEvaluationMicrobenchmark/src/main/java/moobench/kieker/tcp/TestExperiment3.java
diff --git a/frameworks/Kieker/java/benchmark.sh b/frameworks/Kieker-java/benchmark.sh
similarity index 100%
rename from frameworks/Kieker/java/benchmark.sh
rename to frameworks/Kieker-java/benchmark.sh
diff --git a/frameworks/Kieker/java/build.gradle b/frameworks/Kieker-java/build.gradle
similarity index 100%
rename from frameworks/Kieker/java/build.gradle
rename to frameworks/Kieker-java/build.gradle
diff --git a/frameworks/Kieker/java/config.rc b/frameworks/Kieker-java/config.rc
similarity index 100%
rename from frameworks/Kieker/java/config.rc
rename to frameworks/Kieker-java/config.rc
diff --git a/frameworks/Kieker/java/functions.sh b/frameworks/Kieker-java/functions.sh
similarity index 100%
rename from frameworks/Kieker/java/functions.sh
rename to frameworks/Kieker-java/functions.sh
diff --git a/frameworks/Kieker/java/kieker.aop.xml b/frameworks/Kieker-java/kieker.aop.xml
similarity index 100%
rename from frameworks/Kieker/java/kieker.aop.xml
rename to frameworks/Kieker-java/kieker.aop.xml
diff --git a/frameworks/Kieker/java/labels.sh b/frameworks/Kieker-java/labels.sh
similarity index 100%
rename from frameworks/Kieker/java/labels.sh
rename to frameworks/Kieker-java/labels.sh
diff --git a/frameworks/Kieker/java/runExponentialSizes.sh b/frameworks/Kieker-java/runExponentialSizes.sh
similarity index 100%
rename from frameworks/Kieker/java/runExponentialSizes.sh
rename to frameworks/Kieker-java/runExponentialSizes.sh
diff --git a/frameworks/Kieker/python/.gitignore b/frameworks/Kieker-python/.gitignore
similarity index 100%
rename from frameworks/Kieker/python/.gitignore
rename to frameworks/Kieker-python/.gitignore
diff --git a/frameworks/Kieker/python/.spyproject/config/backups/codestyle.ini.bak b/frameworks/Kieker-python/.spyproject/config/backups/codestyle.ini.bak
similarity index 100%
rename from frameworks/Kieker/python/.spyproject/config/backups/codestyle.ini.bak
rename to frameworks/Kieker-python/.spyproject/config/backups/codestyle.ini.bak
diff --git a/frameworks/Kieker/python/.spyproject/config/backups/encoding.ini.bak b/frameworks/Kieker-python/.spyproject/config/backups/encoding.ini.bak
similarity index 100%
rename from frameworks/Kieker/python/.spyproject/config/backups/encoding.ini.bak
rename to frameworks/Kieker-python/.spyproject/config/backups/encoding.ini.bak
diff --git a/frameworks/Kieker/python/.spyproject/config/backups/vcs.ini.bak b/frameworks/Kieker-python/.spyproject/config/backups/vcs.ini.bak
similarity index 100%
rename from frameworks/Kieker/python/.spyproject/config/backups/vcs.ini.bak
rename to frameworks/Kieker-python/.spyproject/config/backups/vcs.ini.bak
diff --git a/frameworks/Kieker/python/.spyproject/config/backups/workspace.ini.bak b/frameworks/Kieker-python/.spyproject/config/backups/workspace.ini.bak
similarity index 100%
rename from frameworks/Kieker/python/.spyproject/config/backups/workspace.ini.bak
rename to frameworks/Kieker-python/.spyproject/config/backups/workspace.ini.bak
diff --git a/frameworks/Kieker/python/.spyproject/config/codestyle.ini b/frameworks/Kieker-python/.spyproject/config/codestyle.ini
similarity index 100%
rename from frameworks/Kieker/python/.spyproject/config/codestyle.ini
rename to frameworks/Kieker-python/.spyproject/config/codestyle.ini
diff --git a/frameworks/Kieker/python/.spyproject/config/defaults/defaults-codestyle-0.2.0.ini b/frameworks/Kieker-python/.spyproject/config/defaults/defaults-codestyle-0.2.0.ini
similarity index 100%
rename from frameworks/Kieker/python/.spyproject/config/defaults/defaults-codestyle-0.2.0.ini
rename to frameworks/Kieker-python/.spyproject/config/defaults/defaults-codestyle-0.2.0.ini
diff --git a/frameworks/Kieker/python/.spyproject/config/defaults/defaults-encoding-0.2.0.ini b/frameworks/Kieker-python/.spyproject/config/defaults/defaults-encoding-0.2.0.ini
similarity index 100%
rename from frameworks/Kieker/python/.spyproject/config/defaults/defaults-encoding-0.2.0.ini
rename to frameworks/Kieker-python/.spyproject/config/defaults/defaults-encoding-0.2.0.ini
diff --git a/frameworks/Kieker/python/.spyproject/config/defaults/defaults-vcs-0.2.0.ini b/frameworks/Kieker-python/.spyproject/config/defaults/defaults-vcs-0.2.0.ini
similarity index 100%
rename from frameworks/Kieker/python/.spyproject/config/defaults/defaults-vcs-0.2.0.ini
rename to frameworks/Kieker-python/.spyproject/config/defaults/defaults-vcs-0.2.0.ini
diff --git a/frameworks/Kieker/python/.spyproject/config/defaults/defaults-workspace-0.2.0.ini b/frameworks/Kieker-python/.spyproject/config/defaults/defaults-workspace-0.2.0.ini
similarity index 100%
rename from frameworks/Kieker/python/.spyproject/config/defaults/defaults-workspace-0.2.0.ini
rename to frameworks/Kieker-python/.spyproject/config/defaults/defaults-workspace-0.2.0.ini
diff --git a/frameworks/Kieker/python/.spyproject/config/encoding.ini b/frameworks/Kieker-python/.spyproject/config/encoding.ini
similarity index 100%
rename from frameworks/Kieker/python/.spyproject/config/encoding.ini
rename to frameworks/Kieker-python/.spyproject/config/encoding.ini
diff --git a/frameworks/Kieker/python/.spyproject/config/vcs.ini b/frameworks/Kieker-python/.spyproject/config/vcs.ini
similarity index 100%
rename from frameworks/Kieker/python/.spyproject/config/vcs.ini
rename to frameworks/Kieker-python/.spyproject/config/vcs.ini
diff --git a/frameworks/Kieker/python/.spyproject/config/workspace.ini b/frameworks/Kieker-python/.spyproject/config/workspace.ini
similarity index 100%
rename from frameworks/Kieker/python/.spyproject/config/workspace.ini
rename to frameworks/Kieker-python/.spyproject/config/workspace.ini
diff --git a/frameworks/Kieker/python/benchmark.py b/frameworks/Kieker-python/benchmark.py
similarity index 100%
rename from frameworks/Kieker/python/benchmark.py
rename to frameworks/Kieker-python/benchmark.py
diff --git a/frameworks/Kieker/python/benchmark.sh b/frameworks/Kieker-python/benchmark.sh
similarity index 100%
rename from frameworks/Kieker/python/benchmark.sh
rename to frameworks/Kieker-python/benchmark.sh
diff --git a/frameworks/Kieker/python/config.ini.template b/frameworks/Kieker-python/config.ini.template
similarity index 100%
rename from frameworks/Kieker/python/config.ini.template
rename to frameworks/Kieker-python/config.ini.template
diff --git a/frameworks/Kieker/python/config.rc b/frameworks/Kieker-python/config.rc
similarity index 100%
rename from frameworks/Kieker/python/config.rc
rename to frameworks/Kieker-python/config.rc
diff --git a/frameworks/Kieker/python/config.rc.template b/frameworks/Kieker-python/config.rc.template
similarity index 100%
rename from frameworks/Kieker/python/config.rc.template
rename to frameworks/Kieker-python/config.rc.template
diff --git a/frameworks/Kieker/python/functions.sh b/frameworks/Kieker-python/functions.sh
similarity index 100%
rename from frameworks/Kieker/python/functions.sh
rename to frameworks/Kieker-python/functions.sh
diff --git a/frameworks/Kieker/python/labels.sh b/frameworks/Kieker-python/labels.sh
similarity index 100%
rename from frameworks/Kieker/python/labels.sh
rename to frameworks/Kieker-python/labels.sh
diff --git a/frameworks/Kieker/python/monitored_application.py b/frameworks/Kieker-python/monitored_application.py
similarity index 100%
rename from frameworks/Kieker/python/monitored_application.py
rename to frameworks/Kieker-python/monitored_application.py
diff --git a/frameworks/Kieker/python/monitoring.ini.template b/frameworks/Kieker-python/monitoring.ini.template
similarity index 100%
rename from frameworks/Kieker/python/monitoring.ini.template
rename to frameworks/Kieker-python/monitoring.ini.template
diff --git a/frameworks/Kieker/python/todo.md b/frameworks/Kieker-python/todo.md
similarity index 100%
rename from frameworks/Kieker/python/todo.md
rename to frameworks/Kieker-python/todo.md
diff --git a/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/bin/collector b/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/bin/collector
deleted file mode 100755
index 2d6e5aeda1b757b3b519569a964c6f515e3e42c4..0000000000000000000000000000000000000000
--- a/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/bin/collector
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-##  collector start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/.." >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="collector"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and COLLECTOR_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/lib/collector-2.0.jar:$APP_HOME/lib/jcommander-1.72.jar:$APP_HOME/lib/slf4j-log4j12-1.7.25.jar:$APP_HOME/lib/slf4j-api-1.7.25.jar:$APP_HOME/lib/log4j-1.2.17.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $COLLECTOR_OPTS -classpath "\"$CLASSPATH\"" experiment.TCPReceiverMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"
diff --git a/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/bin/collector.bat b/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/bin/collector.bat
deleted file mode 100755
index 5da030a1b50bf5d0cbcefb215d7313ad60a0e2f1..0000000000000000000000000000000000000000
--- a/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/bin/collector.bat
+++ /dev/null
@@ -1,84 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  collector startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%..
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and COLLECTOR_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\lib\collector-2.0.jar;%APP_HOME%\lib\jcommander-1.72.jar;%APP_HOME%\lib\slf4j-log4j12-1.7.25.jar;%APP_HOME%\lib\slf4j-api-1.7.25.jar;%APP_HOME%\lib\log4j-1.2.17.jar
-
-@rem Execute collector
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %COLLECTOR_OPTS%  -classpath "%CLASSPATH%" experiment.TCPReceiverMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable COLLECTOR_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%COLLECTOR_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/frameworks/runAll.sh b/frameworks/runAll.sh
index ac4a13e08a32f4283bfd2d4b12ee70a07c0b0c36..41198cb2209f036bf66078fec512d5ffc14d49e0 100755
--- a/frameworks/runAll.sh
+++ b/frameworks/runAll.sh
@@ -18,7 +18,7 @@ fi
 cd "${BASE_DIR}"
 
 start=$(pwd)
-for benchmark in inspectIT-java OpenTelemetry-java Kieker
+for benchmark in inspectIT-java OpenTelemetry-java Kieker-java
 do
         cd "${benchmark}"
         ./benchmark.sh &> "${start}/log_${benchmark}.txt"