diff --git a/.gitignore b/.gitignore
index 9d9d686e6517a08446a51b864dcc0df9a8e8e7e7..dab7b95353ecc3addd50c5a1e3c914cc637743ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,13 +11,13 @@
 **/bin/**
 frameworks/log_*
 results/
-frameworks/Kieker/scripts/benchmark/
-frameworks/Kieker/scripts/data/
+frameworks/Kieker/benchmark/
+frameworks/Kieker/data/
 frameworks/Kieker/MooBench.jar
-frameworks/Kieker/scripts/kieker-*-aspectj.jar
-frameworks/Kieker/scripts/receiver/
+frameworks/Kieker/kieker-*-aspectj.jar
+frameworks/Kieker/receiver/
 frameworks/Kieker/results-Kieker/
-frameworks/Kieker/scripts/benchmark_*
+frameworks/Kieker/benchmark_*
 frameworks/SPASSmeter/spassmeter.log
 frameworks/SPASSmeter/tmp/
 frameworks/SPASSmeter/MooBench.jar
@@ -40,8 +40,7 @@ frameworks/OpenTelemetry/jaeger-1.24.0-linux-amd64/
 frameworks/OpenTelemetry/prometheus-2.28.1.linux-amd64/
 frameworks/OpenTelemetry/prometheus-2.28.1.linux-amd64.tar.gz
 
-frameworks/Kieker/scripts/kieker-1.15-SNAPSHOT.jar
-frameworks/Kieker/scripts/compile-results/
+frameworks/Kieker/compile-results/
 tools/getConfidenceIntervalTable/*csv
 /.gradle/
 /build/
diff --git a/frameworks/Kieker/Benchmark (Kicker).launch b/frameworks/Kieker/Benchmark (Kicker).launch
deleted file mode 100644
index 43cf8336cd59e1045fb26bb8d226e0a8251980c1..0000000000000000000000000000000000000000
--- a/frameworks/Kieker/Benchmark (Kicker).launch	
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/MooBench/src/mooBench/benchmark/Benchmark.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="mooBench.benchmark.Benchmark"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-d 10 -h 1 -m 0 -t 10 -o tmp/test.txt -q -a mooBench.monitoredApplication.MonitoredClassManualInstrumentation"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="MooBench"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:frameworks/Kieker/lib/kicker-1.10_aspectj.jar&#13;&#10;-Dkicker.monitoring.debug=true&#13;&#10;-Dkicker.monitoring.skipDefaultAOPConfiguration=true&#13;&#10;-Dkicker.monitoring.writer=kicker.monitoring.writer.filesystem.AsyncFsWriter"/>
-</launchConfiguration>
diff --git a/frameworks/Kieker/Benchmark (Kicker-objectinterfaces).launch b/frameworks/Kieker/Benchmark (Kicker-objectinterfaces).launch
deleted file mode 100644
index 944b3f2bc26a626970cc7e230f9e7af78fe89cbe..0000000000000000000000000000000000000000
--- a/frameworks/Kieker/Benchmark (Kicker-objectinterfaces).launch	
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/MooBench/src/mooBench/benchmark/Benchmark.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="mooBench.benchmark.Benchmark"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-d 10 -h 1 -m 0 -t 10 -o tmp/test.txt -q -a mooBench.monitoredApplication.MonitoredClassManualInstrumentation"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="MooBench"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:frameworks/Kieker/lib/kicker-1.10_aspectj.jar&#13;&#10;-Dkicker.monitoring.debug=true&#13;&#10;-Dkicker.monitoring.skipDefaultAOPConfiguration=true&#13;&#10;-Dkicker.monitoring.writer=kicker.monitoring.writer.filesystem.AsyncFsWriter&#13;&#10;-Dorg.aspectj.weaver.loadtime.configuration=META-INF/aop-objectinterfaces.xml"/>
-</launchConfiguration>
diff --git a/frameworks/Kieker/Benchmark (Kicker-objects).launch b/frameworks/Kieker/Benchmark (Kicker-objects).launch
deleted file mode 100644
index f570d79be163b315d49ace06215f96ca2e8674ab..0000000000000000000000000000000000000000
--- a/frameworks/Kieker/Benchmark (Kicker-objects).launch	
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/MooBench/src/mooBench/benchmark/Benchmark.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="mooBench.benchmark.Benchmark"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-d 10 -h 1 -m 0 -t 10 -o tmp/test.txt -q -a mooBench.monitoredApplication.MonitoredClassManualInstrumentation"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="MooBench"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:frameworks/Kieker/lib/kicker-1.10_aspectj.jar&#13;&#10;-Dkicker.monitoring.debug=true&#13;&#10;-Dkicker.monitoring.skipDefaultAOPConfiguration=true&#13;&#10;-Dkicker.monitoring.writer=kicker.monitoring.writer.filesystem.AsyncFsWriter&#13;&#10;-Dorg.aspectj.weaver.loadtime.configuration=META-INF/aop-objects.xml"/>
-</launchConfiguration>
diff --git a/frameworks/Kieker/Benchmark (Kieker).launch b/frameworks/Kieker/Benchmark (Kieker).launch
deleted file mode 100644
index b2f4493cb912b8397637950634a8d53bd2dc1e5d..0000000000000000000000000000000000000000
--- a/frameworks/Kieker/Benchmark (Kieker).launch	
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/MooBench/src/mooBench/benchmark/Benchmark.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="mooBench.benchmark.Benchmark"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-d 10 -h 1 -m 0 -t 1000000 -o tmp/test.txt -q"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="MooBench"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:frameworks/Kieker/lib/kieker-1.11-SNAPSHOT_aspectj.jar&#13;&#10;-Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.aop.xml&#13;&#10;-Dorg.aspectj.weaver.showWeaveInfo=true -Daj.weaving.verbose=true&#13;&#10;-Dkieker.monitoring.writer=kieker.monitoring.writer.tcp.TCPWriter"/>
-</launchConfiguration>
diff --git a/frameworks/Kieker/scripts/benchmark.sh b/frameworks/Kieker/benchmark.sh
similarity index 93%
rename from frameworks/Kieker/scripts/benchmark.sh
rename to frameworks/Kieker/benchmark.sh
index 109a82a10d024df8f91f1396d85f23f256573d00..85baa7143c9822da0b2dd879f0a23d3df1ba399a 100755
--- a/frameworks/Kieker/scripts/benchmark.sh
+++ b/frameworks/Kieker/benchmark.sh
@@ -16,18 +16,14 @@ else
 	exit 1
 fi
 
-source ../../common-functions.sh
-
-# Only temporary fix: Overwrite Kieker results folder here
-RESULTS_DIR=../results-Kieker
-RAWFN=$RESULTS_DIR"/raw"
+source ../common-functions.sh
 
 getKiekerAgent
 
 # copy receiver
-tar -xvpf ${BASE_DIR}/../../../tools/receiver/build/distributions/receiver.tar
+tar -xvpf ${BASE_DIR}/../../tools/receiver/build/distributions/receiver.tar
 # copy result compiler
-tar -xvpf ${BASE_DIR}/../../../tools/compile-results/build/distributions/compile-results.tar
+tar -xvpf ${BASE_DIR}/../../tools/compile-results/build/distributions/compile-results.tar
 
 if [ -f "${BASE_DIR}/common-functions" ] ; then
 	. ${BASE_DIR}/common-functions
@@ -87,7 +83,7 @@ declare -a RECEIVER
 declare -a TITLE
 
 # Configurations
-source ../labels.sh
+source labels.sh
 WRITER_CONFIG[0]=""
 WRITER_CONFIG[1]="-Dkieker.monitoring.enabled=false -Dkieker.monitoring.writer=kieker.monitoring.writer.dump.DumpWriter"
 WRITER_CONFIG[2]="-Dkieker.monitoring.enabled=true -Dkieker.monitoring.writer=kieker.monitoring.writer.dump.DumpWriter"
@@ -138,9 +134,9 @@ function execute-experiment() {
        BENCHMARK_OPTS="${JAVA_ARGS} ${LTW_ARGS} ${KIEKER_ARGS} ${kieker_parameters}"
     fi
     
-    echo ${BENCHMARK_OPTS}" -jar ../MooBench.jar"
+    echo ${BENCHMARK_OPTS}" -jar MooBench.jar"
 
-    ${JAVABIN}java ${BENCHMARK_OPTS} -jar ../MooBench.jar \
+    ${JAVABIN}java ${BENCHMARK_OPTS} -jar MooBench.jar \
 	--application moobench.application.MonitoredClassSimple \
         --output-filename ${RAWFN}-${loop}-${recursion}-${index}.csv \
         --total-calls ${TOTAL_NUM_OF_CALLS} \
diff --git a/frameworks/Kieker/scripts/common-functions b/frameworks/Kieker/common-functions
similarity index 100%
rename from frameworks/Kieker/scripts/common-functions
rename to frameworks/Kieker/common-functions
diff --git a/frameworks/Kieker/scripts/config b/frameworks/Kieker/config
similarity index 70%
rename from frameworks/Kieker/scripts/config
rename to frameworks/Kieker/config
index 927b73687344de711285af779d50a13b4cc7740b..5ed8d82e0f7b0dda6de73f0ecb63f100f57e5821 100644
--- a/frameworks/Kieker/scripts/config
+++ b/frameworks/Kieker/config
@@ -4,7 +4,7 @@
 # path setup
 JAVA_BIN="java"
 
-RSCRIPT_PATH="../../stats.csv.r"
+RSCRIPT_PATH="../stats.csv.r"
 
 DATA_DIR="${BASE_DIR}/data"
 AGENT="${BASE_DIR}/kieker-1.15-SNAPSHOT-aspectj.jar"
@@ -12,6 +12,6 @@ AGENT="${BASE_DIR}/kieker-1.15-SNAPSHOT-aspectj.jar"
 BATCH_MODE="yes"
 
 # in-jar locations
-AOP="file:"$(pwd)"/../src/META-INF/kieker.aop.xml"
+AOP="file:"$(pwd)"/src/META-INF/kieker.aop.xml"
 
 # end
diff --git a/frameworks/Kieker/scripts/run-benchmark.sh b/frameworks/Kieker/run-benchmark.sh
similarity index 100%
rename from frameworks/Kieker/scripts/run-benchmark.sh
rename to frameworks/Kieker/run-benchmark.sh
diff --git a/frameworks/Kieker/scripts/runExponentialSizes.sh b/frameworks/Kieker/runExponentialSizes.sh
similarity index 100%
rename from frameworks/Kieker/scripts/runExponentialSizes.sh
rename to frameworks/Kieker/runExponentialSizes.sh
diff --git a/frameworks/Kieker/scripts/stats.csv.r b/frameworks/Kieker/stats.csv.r
similarity index 100%
rename from frameworks/Kieker/scripts/stats.csv.r
rename to frameworks/Kieker/stats.csv.r