diff --git a/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/ConfigurationKeys.java b/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/ConfigurationKeys.java
index d1c01e1c27e549979a9226dc1a2baf7979bf49c9..1f7aca45c77536719c350199be8fec47919569d0 100644
--- a/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/ConfigurationKeys.java
+++ b/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/ConfigurationKeys.java
@@ -46,6 +46,8 @@ public final class ConfigurationKeys {
   public static final String TRIGGER_INTERVAL  = "trigger.interval";
 
 
+
+
   private ConfigurationKeys() {
   }
 
diff --git a/theodolite-benchmarks/uc3-beam-flink/src/main/java/application/EventTimePolicy.java b/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/kafka/EventTimePolicy.java
similarity index 96%
rename from theodolite-benchmarks/uc3-beam-flink/src/main/java/application/EventTimePolicy.java
rename to theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/kafka/EventTimePolicy.java
index 627c13da90126a8b2bc34c689683960d5e566671..42b317928ca444b3da9ad951e6615a2c631ff469 100644
--- a/theodolite-benchmarks/uc3-beam-flink/src/main/java/application/EventTimePolicy.java
+++ b/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/kafka/EventTimePolicy.java
@@ -1,4 +1,4 @@
-package application;
+package theodolite.commons.beam.kafka;
 
 import java.util.Optional;
 
diff --git a/theodolite-benchmarks/uc3-beam-flink/src/main/java/application/Uc3ApplicationBeam.java b/theodolite-benchmarks/uc3-beam-flink/src/main/java/application/Uc3BeamFlink.java
similarity index 99%
rename from theodolite-benchmarks/uc3-beam-flink/src/main/java/application/Uc3ApplicationBeam.java
rename to theodolite-benchmarks/uc3-beam-flink/src/main/java/application/Uc3BeamFlink.java
index 7a8a0965787f357194d3f009b8cad4574444692e..62b3889354c7ca466d44970603d35d0a4f516b45 100644
--- a/theodolite-benchmarks/uc3-beam-flink/src/main/java/application/Uc3ApplicationBeam.java
+++ b/theodolite-benchmarks/uc3-beam-flink/src/main/java/application/Uc3BeamFlink.java
@@ -76,6 +76,7 @@ public final class Uc3ApplicationBeam {
         System.getenv(AGGREGATION_ADVANCE_DAYS) == null
             ? "1" : System.getenv(AGGREGATION_ADVANCE_DAYS));
     final Duration advance = Duration.standardDays(aggregationAdvance);
+
     final int triggerInterval = Integer.parseInt(
         System.getenv(TRIGGER_INTERVAL) == null
             ? "15" : System.getenv(TRIGGER_INTERVAL));
diff --git a/theodolite-benchmarks/uc3-beam-flink/src/main/java/application/HourOfDayKey.java b/theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDayKey.java
similarity index 100%
rename from theodolite-benchmarks/uc3-beam-flink/src/main/java/application/HourOfDayKey.java
rename to theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDayKey.java
diff --git a/theodolite-benchmarks/uc3-beam-flink/src/main/java/application/HourOfDayKeyFactory.java b/theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDayKeyFactory.java
similarity index 100%
rename from theodolite-benchmarks/uc3-beam-flink/src/main/java/application/HourOfDayKeyFactory.java
rename to theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDayKeyFactory.java
diff --git a/theodolite-benchmarks/uc3-beam-flink/src/main/java/application/HourOfDayKeySerde.java b/theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDayKeySerde.java
similarity index 100%
rename from theodolite-benchmarks/uc3-beam-flink/src/main/java/application/HourOfDayKeySerde.java
rename to theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDayKeySerde.java
diff --git a/theodolite-benchmarks/uc3-beam-flink/src/main/java/application/HourOfDaykeyCoder.java b/theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDaykeyCoder.java
similarity index 100%
rename from theodolite-benchmarks/uc3-beam-flink/src/main/java/application/HourOfDaykeyCoder.java
rename to theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDaykeyCoder.java
diff --git a/theodolite-benchmarks/uc3-beam-flink/src/main/java/application/MapTimeFormat.java b/theodolite-benchmarks/uc3-beam/src/main/java/application/MapTimeFormat.java
similarity index 100%
rename from theodolite-benchmarks/uc3-beam-flink/src/main/java/application/MapTimeFormat.java
rename to theodolite-benchmarks/uc3-beam/src/main/java/application/MapTimeFormat.java
diff --git a/theodolite-benchmarks/uc3-beam-flink/src/main/java/application/StatsAggregation.java b/theodolite-benchmarks/uc3-beam/src/main/java/application/StatsAggregation.java
similarity index 100%
rename from theodolite-benchmarks/uc3-beam-flink/src/main/java/application/StatsAggregation.java
rename to theodolite-benchmarks/uc3-beam/src/main/java/application/StatsAggregation.java
diff --git a/theodolite-benchmarks/uc3-beam-flink/src/main/java/application/StatsKeyFactory.java b/theodolite-benchmarks/uc3-beam/src/main/java/application/StatsKeyFactory.java
similarity index 100%
rename from theodolite-benchmarks/uc3-beam-flink/src/main/java/application/StatsKeyFactory.java
rename to theodolite-benchmarks/uc3-beam/src/main/java/application/StatsKeyFactory.java