diff --git a/frameworks/Kieker/OverheadEvaluationMicrobenchmark/LICENSE b/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/LICENSE
similarity index 100%
rename from frameworks/Kieker/OverheadEvaluationMicrobenchmark/LICENSE
rename to frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/LICENSE
diff --git a/frameworks/Kieker/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/bin/collector b/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/bin/collector
similarity index 100%
rename from frameworks/Kieker/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/bin/collector
rename to frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/bin/collector
diff --git a/frameworks/Kieker/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/bin/collector.bat b/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/bin/collector.bat
similarity index 100%
rename from frameworks/Kieker/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/bin/collector.bat
rename to frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/collector-2.0/bin/collector.bat
diff --git a/frameworks/Kieker/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/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/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/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/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/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/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/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/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/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/OverheadEvaluationMicrobenchmark/MooBench/lib/.gitignore b/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/lib/.gitignore
similarity index 100%
rename from frameworks/Kieker/OverheadEvaluationMicrobenchmark/MooBench/lib/.gitignore
rename to frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/lib/.gitignore
diff --git a/frameworks/Kieker/OverheadEvaluationMicrobenchmark/MooBench/log4j.cfg b/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/log4j.cfg
similarity index 100%
rename from frameworks/Kieker/OverheadEvaluationMicrobenchmark/MooBench/log4j.cfg
rename to frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/log4j.cfg
diff --git a/frameworks/Kieker/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/OverheadEvaluationMicrobenchmark/MooBench/moobench-2.0-all.jar
rename to frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/MooBench/moobench-2.0-all.jar
diff --git a/frameworks/Kieker/OverheadEvaluationMicrobenchmark/README b/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/README
similarity index 100%
rename from frameworks/Kieker/OverheadEvaluationMicrobenchmark/README
rename to frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/README
diff --git a/frameworks/Kieker/OverheadEvaluationMicrobenchmark/executeRemoteMicroBenchmark.sh b/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/executeRemoteMicroBenchmark.sh
similarity index 100%
rename from frameworks/Kieker/OverheadEvaluationMicrobenchmark/executeRemoteMicroBenchmark.sh
rename to frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/executeRemoteMicroBenchmark.sh
diff --git a/frameworks/Kieker/OverheadEvaluationMicrobenchmark/rerun-benchmark.sh b/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/rerun-benchmark.sh
similarity index 100%
rename from frameworks/Kieker/OverheadEvaluationMicrobenchmark/rerun-benchmark.sh
rename to frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/rerun-benchmark.sh
diff --git a/frameworks/Kieker/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/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/src/META-INF/kieker.logging.properties b/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/src/META-INF/kieker.logging.properties
similarity index 100%
rename from frameworks/Kieker/src/META-INF/kieker.logging.properties
rename to frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/src/META-INF/kieker.logging.properties
diff --git a/frameworks/Kieker/src/META-INF/kieker.monitoring.properties b/frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/src/META-INF/kieker.monitoring.properties
similarity index 100%
rename from frameworks/Kieker/src/META-INF/kieker.monitoring.properties
rename to frameworks/Kieker/java/OverheadEvaluationMicrobenchmark/src/META-INF/kieker.monitoring.properties
diff --git a/frameworks/Kieker/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/benchmark.sh b/frameworks/Kieker/java/benchmark.sh
similarity index 100%
rename from frameworks/Kieker/benchmark.sh
rename to frameworks/Kieker/java/benchmark.sh
diff --git a/frameworks/Kieker/build.gradle b/frameworks/Kieker/java/build.gradle
similarity index 100%
rename from frameworks/Kieker/build.gradle
rename to frameworks/Kieker/java/build.gradle
diff --git a/frameworks/Kieker/config.rc b/frameworks/Kieker/java/config.rc
similarity index 100%
rename from frameworks/Kieker/config.rc
rename to frameworks/Kieker/java/config.rc
diff --git a/frameworks/Kieker/functions.sh b/frameworks/Kieker/java/functions.sh
similarity index 100%
rename from frameworks/Kieker/functions.sh
rename to frameworks/Kieker/java/functions.sh
diff --git a/frameworks/Kieker/kieker.aop.xml b/frameworks/Kieker/java/kieker.aop.xml
similarity index 100%
rename from frameworks/Kieker/kieker.aop.xml
rename to frameworks/Kieker/java/kieker.aop.xml
diff --git a/frameworks/Kieker/labels.sh b/frameworks/Kieker/java/labels.sh
similarity index 100%
rename from frameworks/Kieker/labels.sh
rename to frameworks/Kieker/java/labels.sh
diff --git a/frameworks/Kieker/runExponentialSizes.sh b/frameworks/Kieker/java/runExponentialSizes.sh
similarity index 100%
rename from frameworks/Kieker/runExponentialSizes.sh
rename to frameworks/Kieker/java/runExponentialSizes.sh
diff --git a/frameworks/Kieker/stats.csv.r b/frameworks/Kieker/java/stats.csv.r
similarity index 100%
rename from frameworks/Kieker/stats.csv.r
rename to frameworks/Kieker/java/stats.csv.r
diff --git a/frameworks/Kieker/python/todo.md b/frameworks/Kieker/python/todo.md
new file mode 100644
index 0000000000000000000000000000000000000000..700305b302a7e27ec0702376269efea200829ed4
--- /dev/null
+++ b/frameworks/Kieker/python/todo.md
@@ -0,0 +1,5 @@
+# TODO List
+
+- Create the Moobench main application for Python in moobench/tools/pybenchmark 
+  it should have the same configuration options as the Java version (see notes there)
+