diff --git a/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/AbstractPipelineFactory.java b/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/AbstractPipelineFactory.java
similarity index 95%
rename from theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/AbstractPipelineFactory.java
rename to theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/AbstractPipelineFactory.java
index 78610bd7fd874c5df309e5bf3e1cee8cb679c004..8bf913fc2f7a8d1f18aed63185a014fe43bcab44 100644
--- a/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/AbstractPipelineFactory.java
+++ b/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/AbstractPipelineFactory.java
@@ -1,4 +1,4 @@
-package theodolite.commons.beam;
+package rocks.theodolite.benchmarks.commons.beam;
 
 import io.confluent.kafka.serializers.AbstractKafkaAvroSerDeConfig;
 import io.confluent.kafka.serializers.KafkaAvroDeserializerConfig;
@@ -9,7 +9,7 @@ import org.apache.beam.sdk.coders.CoderRegistry;
 import org.apache.beam.sdk.options.PipelineOptions;
 import org.apache.commons.configuration2.Configuration;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
-import theodolite.commons.beam.kafka.KafkaActivePowerTimestampReader;
+import rocks.theodolite.benchmarks.commons.beam.kafka.KafkaActivePowerTimestampReader;
 
 /**
  * Abstract factory class for creating Beam pipelines from a {@link Configuration} and
diff --git a/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/BeamService.java b/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/BeamService.java
similarity index 97%
rename from theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/BeamService.java
rename to theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/BeamService.java
index 62a9b374afbfede283a01edc8cbb5c705d076191..dd410f8d52e269a863b5d6dab62196c0d9690c98 100644
--- a/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/BeamService.java
+++ b/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/BeamService.java
@@ -1,4 +1,4 @@
-package theodolite.commons.beam;
+package rocks.theodolite.benchmarks.commons.beam;
 
 import java.util.function.Function;
 import org.apache.beam.sdk.Pipeline;
diff --git a/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/ConfigurationKeys.java b/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/ConfigurationKeys.java
similarity index 96%
rename from theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/ConfigurationKeys.java
rename to theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/ConfigurationKeys.java
index 1e4dc593c627282f5c6735a4d91e963d83af6865..487b8de00c35bbe28961f29de7ba0bb9d57e98ec 100644
--- a/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/ConfigurationKeys.java
+++ b/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/ConfigurationKeys.java
@@ -1,4 +1,4 @@
-package theodolite.commons.beam;
+package rocks.theodolite.benchmarks.commons.beam;
 
 /**
  * Keys to access configuration parameters.
diff --git a/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/kafka/ActivePowerRecordDeserializer.java b/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/kafka/ActivePowerRecordDeserializer.java
similarity index 87%
rename from theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/kafka/ActivePowerRecordDeserializer.java
rename to theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/kafka/ActivePowerRecordDeserializer.java
index c53dde3d5f4b7d18822c916a637c356b898fe2cd..0c8d3a4a847cf9422c4e364a31024fb3d0c3f87a 100644
--- a/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/kafka/ActivePowerRecordDeserializer.java
+++ b/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/kafka/ActivePowerRecordDeserializer.java
@@ -1,4 +1,4 @@
-package theodolite.commons.beam.kafka;
+package rocks.theodolite.benchmarks.commons.beam.kafka;
 
 import io.confluent.kafka.streams.serdes.avro.SpecificAvroDeserializer;
 import org.apache.kafka.common.serialization.Deserializer;
diff --git a/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/kafka/EventTimePolicy.java b/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/kafka/EventTimePolicy.java
similarity index 94%
rename from theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/kafka/EventTimePolicy.java
rename to theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/kafka/EventTimePolicy.java
index e568968670b3ea51388f3e2a19da8f64bd7c5391..62e56341518839b96ad059e1c496ea1babb4674d 100644
--- a/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/kafka/EventTimePolicy.java
+++ b/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/kafka/EventTimePolicy.java
@@ -1,4 +1,4 @@
-package theodolite.commons.beam.kafka;
+package rocks.theodolite.benchmarks.commons.beam.kafka;
 
 import java.util.Optional;
 import org.apache.beam.sdk.io.kafka.KafkaRecord;
diff --git a/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/kafka/KafkaActivePowerTimestampReader.java b/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/kafka/KafkaActivePowerTimestampReader.java
similarity index 97%
rename from theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/kafka/KafkaActivePowerTimestampReader.java
rename to theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/kafka/KafkaActivePowerTimestampReader.java
index 7a48bd71d497f65351888425d092decf5adb05f3..e22d5c8eedcd545364511a1461208f30bcb0a75c 100644
--- a/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/kafka/KafkaActivePowerTimestampReader.java
+++ b/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/kafka/KafkaActivePowerTimestampReader.java
@@ -1,4 +1,4 @@
-package theodolite.commons.beam.kafka;
+package rocks.theodolite.benchmarks.commons.beam.kafka;
 
 import java.util.Map;
 import org.apache.beam.sdk.coders.AvroCoder;
diff --git a/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/kafka/KafkaGenericReader.java b/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/kafka/KafkaGenericReader.java
similarity index 96%
rename from theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/kafka/KafkaGenericReader.java
rename to theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/kafka/KafkaGenericReader.java
index e513c3a0e3dffcb9881f389af5ee9f05c52a2b63..000ddcdccd90cf3bc4f0cdaabe004ce74bef5dec 100644
--- a/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/kafka/KafkaGenericReader.java
+++ b/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/kafka/KafkaGenericReader.java
@@ -1,4 +1,4 @@
-package theodolite.commons.beam.kafka;
+package rocks.theodolite.benchmarks.commons.beam.kafka;
 
 import java.util.Map;
 import org.apache.beam.sdk.io.kafka.KafkaIO;
diff --git a/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/kafka/KafkaWriterTransformation.java b/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/kafka/KafkaWriterTransformation.java
similarity index 97%
rename from theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/kafka/KafkaWriterTransformation.java
rename to theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/kafka/KafkaWriterTransformation.java
index 6d33f6f01493c10a1eb6aca56dd309ae58ce4b8d..e9131b513001bf8756495a6aecfe72456959f0c6 100644
--- a/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/kafka/KafkaWriterTransformation.java
+++ b/theodolite-benchmarks/beam-commons/src/main/java/rocks/theodolite/benchmarks/commons/beam/kafka/KafkaWriterTransformation.java
@@ -1,4 +1,4 @@
-package theodolite.commons.beam.kafka;
+package rocks.theodolite.benchmarks.commons.beam.kafka;
 
 import java.util.Map;
 import org.apache.beam.sdk.io.kafka.KafkaIO;
diff --git a/theodolite-benchmarks/uc1-beam-flink/build.gradle b/theodolite-benchmarks/uc1-beam-flink/build.gradle
index cb707ddfd0bf9650beffb851efdca84c08fad84f..fff1a0817b9bfd6f0c631c97aef585465ad15f4d 100644
--- a/theodolite-benchmarks/uc1-beam-flink/build.gradle
+++ b/theodolite-benchmarks/uc1-beam-flink/build.gradle
@@ -16,4 +16,4 @@ sourceSets {
   }
 }
 
-mainClassName = "application.Uc1BeamFlink"
+mainClassName = "rocks.theodolite.benchmarks.uc1.beam.flink.Uc1BeamFlink"
diff --git a/theodolite-benchmarks/uc1-beam-flink/src/main/java/application/Uc1BeamFlink.java b/theodolite-benchmarks/uc1-beam-flink/src/main/java/rocks/theodolite/benchmarks/uc1/beam/flink/Uc1BeamFlink.java
similarity index 81%
rename from theodolite-benchmarks/uc1-beam-flink/src/main/java/application/Uc1BeamFlink.java
rename to theodolite-benchmarks/uc1-beam-flink/src/main/java/rocks/theodolite/benchmarks/uc1/beam/flink/Uc1BeamFlink.java
index 878d08537f87b3e759f96614b8bcaaf669a70f19..e1317219fedf24bc4b0eb4a3f9668da7de196cca 100644
--- a/theodolite-benchmarks/uc1-beam-flink/src/main/java/application/Uc1BeamFlink.java
+++ b/theodolite-benchmarks/uc1-beam-flink/src/main/java/rocks/theodolite/benchmarks/uc1/beam/flink/Uc1BeamFlink.java
@@ -1,7 +1,8 @@
-package application;
+package rocks.theodolite.benchmarks.uc1.beam.flink;
 
 import org.apache.beam.runners.flink.FlinkRunner;
-import theodolite.commons.beam.BeamService;
+import rocks.theodolite.benchmarks.commons.beam.BeamService;
+import rocks.theodolite.benchmarks.uc1.beam.PipelineFactory;
 
 /**
  * Implementation of the use case Database Storage using Apache Beam with the Flink Runner. To
diff --git a/theodolite-benchmarks/uc1-beam-samza/build.gradle b/theodolite-benchmarks/uc1-beam-samza/build.gradle
index 7489af605cf0d67cf18dd81f2122cf3db9cc912f..fab142f6d7a0f8415bda1cc0e41f088b952a11fb 100644
--- a/theodolite-benchmarks/uc1-beam-samza/build.gradle
+++ b/theodolite-benchmarks/uc1-beam-samza/build.gradle
@@ -16,4 +16,4 @@ sourceSets {
   }
 }
 
-mainClassName = "application.Uc1BeamSamza"
+mainClassName = "rocks.theodolite.benchmarks.uc1.beam.samza.Uc1BeamSamza"
diff --git a/theodolite-benchmarks/uc1-beam-samza/src/main/java/application/Uc1BeamSamza.java b/theodolite-benchmarks/uc1-beam-samza/src/main/java/rocks/theodolite/benchmarks/uc1/beam/samza/Uc1BeamSamza.java
similarity index 83%
rename from theodolite-benchmarks/uc1-beam-samza/src/main/java/application/Uc1BeamSamza.java
rename to theodolite-benchmarks/uc1-beam-samza/src/main/java/rocks/theodolite/benchmarks/uc1/beam/samza/Uc1BeamSamza.java
index 2e5cf8a191462ec22da8fc0ab72d1294d6671063..d3455db71bc3520bfa11c4da3a58c32da46337f9 100644
--- a/theodolite-benchmarks/uc1-beam-samza/src/main/java/application/Uc1BeamSamza.java
+++ b/theodolite-benchmarks/uc1-beam-samza/src/main/java/rocks/theodolite/benchmarks/uc1/beam/samza/Uc1BeamSamza.java
@@ -1,7 +1,8 @@
-package application;
+package rocks.theodolite.benchmarks.uc1.beam.samza;
 
 import org.apache.beam.runners.samza.SamzaRunner;
-import theodolite.commons.beam.BeamService;
+import rocks.theodolite.benchmarks.commons.beam.BeamService;
+import rocks.theodolite.benchmarks.uc1.beam.PipelineFactory;
 
 /**
  * Implementation of the use case Database Storage using Apache Beam with the Samza Runner. To
diff --git a/theodolite-benchmarks/uc1-beam/src/main/java/application/ConverterAdapter.java b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/ConverterAdapter.java
similarity index 96%
rename from theodolite-benchmarks/uc1-beam/src/main/java/application/ConverterAdapter.java
rename to theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/ConverterAdapter.java
index e368c3a06cde50ea8d49d84b038fb2ec5aa97d1a..08834a47223e8b4209da79c4cdcbb6a60e027418 100644
--- a/theodolite-benchmarks/uc1-beam/src/main/java/application/ConverterAdapter.java
+++ b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/ConverterAdapter.java
@@ -1,4 +1,4 @@
-package application;
+package rocks.theodolite.benchmarks.uc1.beam;
 
 import org.apache.beam.sdk.transforms.SimpleFunction;
 import org.apache.beam.sdk.values.TypeDescriptor;
diff --git a/theodolite-benchmarks/uc1-beam/src/main/java/application/GenericSink.java b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/GenericSink.java
similarity index 96%
rename from theodolite-benchmarks/uc1-beam/src/main/java/application/GenericSink.java
rename to theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/GenericSink.java
index 04b47cd8c4c6a976fc602fa2fbf93dcaaa36680e..04eae799837b2e5278842d248d135e479f84086b 100644
--- a/theodolite-benchmarks/uc1-beam/src/main/java/application/GenericSink.java
+++ b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/GenericSink.java
@@ -1,4 +1,4 @@
-package application;
+package rocks.theodolite.benchmarks.uc1.beam;
 
 import org.apache.beam.sdk.transforms.MapElements;
 import org.apache.beam.sdk.transforms.PTransform;
diff --git a/theodolite-benchmarks/uc1-beam/src/main/java/application/PipelineFactory.java b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/PipelineFactory.java
similarity index 89%
rename from theodolite-benchmarks/uc1-beam/src/main/java/application/PipelineFactory.java
rename to theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/PipelineFactory.java
index d8d7b172dbb7a132886784ae5b1f0682971b98b5..32658a21b8b80fddb5baf58002a701e8e35b542e 100644
--- a/theodolite-benchmarks/uc1-beam/src/main/java/application/PipelineFactory.java
+++ b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/PipelineFactory.java
@@ -1,4 +1,4 @@
-package application;
+package rocks.theodolite.benchmarks.uc1.beam;
 
 import java.util.function.Function;
 import org.apache.beam.sdk.Pipeline;
@@ -7,8 +7,8 @@ import org.apache.beam.sdk.coders.CoderRegistry;
 import org.apache.beam.sdk.options.PipelineOptions;
 import org.apache.beam.sdk.transforms.Values;
 import org.apache.commons.configuration2.Configuration;
-import theodolite.commons.beam.AbstractPipelineFactory;
-import theodolite.commons.beam.kafka.KafkaActivePowerTimestampReader;
+import rocks.theodolite.benchmarks.commons.beam.AbstractPipelineFactory;
+import rocks.theodolite.benchmarks.commons.beam.kafka.KafkaActivePowerTimestampReader;
 import titan.ccp.model.records.ActivePowerRecord;
 
 /**
diff --git a/theodolite-benchmarks/uc1-beam/src/main/java/application/SinkFactory.java b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/SinkFactory.java
similarity index 91%
rename from theodolite-benchmarks/uc1-beam/src/main/java/application/SinkFactory.java
rename to theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/SinkFactory.java
index 91052827ff58f0bb52d289073c84e31cfc234c31..d4854293b0c26804f0204e58c09a45f13dbf171f 100644
--- a/theodolite-benchmarks/uc1-beam/src/main/java/application/SinkFactory.java
+++ b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/SinkFactory.java
@@ -1,4 +1,4 @@
-package application;
+package rocks.theodolite.benchmarks.uc1.beam;
 
 import org.apache.beam.sdk.transforms.PTransform;
 import org.apache.beam.sdk.values.PCollection;
diff --git a/theodolite-benchmarks/uc1-beam/src/main/java/application/SinkType.java b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/SinkType.java
similarity index 92%
rename from theodolite-benchmarks/uc1-beam/src/main/java/application/SinkType.java
rename to theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/SinkType.java
index 82ca2573ef5108e2f2a9423400ca63be1760d449..da836815e09631e2ebc071badc02618171e0792a 100644
--- a/theodolite-benchmarks/uc1-beam/src/main/java/application/SinkType.java
+++ b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/SinkType.java
@@ -1,10 +1,10 @@
-package application;
+package rocks.theodolite.benchmarks.uc1.beam;
 
-import application.firestore.FirestoreSink;
 import java.util.stream.Stream;
 import org.apache.beam.sdk.transforms.PTransform;
 import org.apache.beam.sdk.values.PCollection;
 import org.apache.commons.configuration2.Configuration;
+import rocks.theodolite.benchmarks.uc1.beam.firestore.FirestoreSink;
 import rocks.theodolite.benchmarks.uc1.commons.logger.LogWriterFactory;
 import titan.ccp.model.records.ActivePowerRecord;
 
diff --git a/theodolite-benchmarks/uc1-beam/src/main/java/application/WriterAdapter.java b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/WriterAdapter.java
similarity index 94%
rename from theodolite-benchmarks/uc1-beam/src/main/java/application/WriterAdapter.java
rename to theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/WriterAdapter.java
index eb9a2670cd8e61ed103a277e9d26072dc926dbeb..4519515cf7d74abb0c447c56df4bbe313133c6a7 100644
--- a/theodolite-benchmarks/uc1-beam/src/main/java/application/WriterAdapter.java
+++ b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/WriterAdapter.java
@@ -1,4 +1,4 @@
-package application;
+package rocks.theodolite.benchmarks.uc1.beam;
 
 import org.apache.beam.sdk.transforms.DoFn;
 import rocks.theodolite.benchmarks.uc1.commons.DatabaseAdapter;
diff --git a/theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/DocumentMapper.java b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/firestore/DocumentMapper.java
similarity index 96%
rename from theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/DocumentMapper.java
rename to theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/firestore/DocumentMapper.java
index ab4617ecd1a46e083c863d26c999a25ee5008836..f0a99ece6cb7f7a1d6063ee1e389472dbe84bab2 100644
--- a/theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/DocumentMapper.java
+++ b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/firestore/DocumentMapper.java
@@ -1,4 +1,4 @@
-package application.firestore;
+package rocks.theodolite.benchmarks.uc1.beam.firestore;
 
 import com.google.firestore.v1.Document;
 import com.google.firestore.v1.Value;
diff --git a/theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/FirestoreConfig.java b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/firestore/FirestoreConfig.java
similarity index 93%
rename from theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/FirestoreConfig.java
rename to theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/firestore/FirestoreConfig.java
index eb62d69f907cc27f3974f09942e5d75ba701a34f..1f5adfcdf5606bc508c59f12846bf773a01264fc 100644
--- a/theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/FirestoreConfig.java
+++ b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/firestore/FirestoreConfig.java
@@ -1,4 +1,4 @@
-package application.firestore;
+package rocks.theodolite.benchmarks.uc1.beam.firestore;
 
 import com.google.auth.oauth2.GoogleCredentials;
 import com.google.cloud.firestore.FirestoreOptions;
diff --git a/theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/FirestoreSink.java b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/firestore/FirestoreSink.java
similarity index 96%
rename from theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/FirestoreSink.java
rename to theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/firestore/FirestoreSink.java
index a1db24eeb9e05f3b8e198621f4a3e7107e095b13..dfe3f240b9727d0fa5027ea5f29cd67def3323ba 100644
--- a/theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/FirestoreSink.java
+++ b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/firestore/FirestoreSink.java
@@ -1,4 +1,4 @@
-package application.firestore;
+package rocks.theodolite.benchmarks.uc1.beam.firestore;
 
 import com.google.cloud.firestore.DocumentSnapshot;
 import com.google.firestore.v1.Document;
diff --git a/theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/UpdateOperationMapper.java b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/firestore/UpdateOperationMapper.java
similarity index 88%
rename from theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/UpdateOperationMapper.java
rename to theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/firestore/UpdateOperationMapper.java
index d67bed2aedbd97bfe4271efa0514c8d4e594683e..fc1170073477eabd7b340f59e97ef8cbe1cf3743 100644
--- a/theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/UpdateOperationMapper.java
+++ b/theodolite-benchmarks/uc1-beam/src/main/java/rocks/theodolite/benchmarks/uc1/beam/firestore/UpdateOperationMapper.java
@@ -1,4 +1,4 @@
-package application.firestore;
+package rocks.theodolite.benchmarks.uc1.beam.firestore;
 
 import com.google.firestore.v1.Document;
 import com.google.firestore.v1.Write;
diff --git a/theodolite-benchmarks/uc2-beam-flink/build.gradle b/theodolite-benchmarks/uc2-beam-flink/build.gradle
index d7a89fd59d7d5b3e0f37613eb2350dc1c9f00e28..095d166fc2dc17957c263cc36255831afb45887d 100644
--- a/theodolite-benchmarks/uc2-beam-flink/build.gradle
+++ b/theodolite-benchmarks/uc2-beam-flink/build.gradle
@@ -16,4 +16,4 @@ sourceSets {
   }
 }
 
-mainClassName = "application.Uc2BeamFlink"
+mainClassName = "rocks.theodolite.benchmarks.uc2.beam.flink.Uc2BeamFlink"
diff --git a/theodolite-benchmarks/uc2-beam-flink/src/main/java/application/Uc2BeamFlink.java b/theodolite-benchmarks/uc2-beam-flink/src/main/java/rocks/theodolite/benchmarks/uc2/beam/flink/Uc2BeamFlink.java
similarity index 76%
rename from theodolite-benchmarks/uc2-beam-flink/src/main/java/application/Uc2BeamFlink.java
rename to theodolite-benchmarks/uc2-beam-flink/src/main/java/rocks/theodolite/benchmarks/uc2/beam/flink/Uc2BeamFlink.java
index 28cc32e434c11c612fc90caefac96d355cb8d972..ab6a9992a5dfca11a182235b467d5be76488ed55 100644
--- a/theodolite-benchmarks/uc2-beam-flink/src/main/java/application/Uc2BeamFlink.java
+++ b/theodolite-benchmarks/uc2-beam-flink/src/main/java/rocks/theodolite/benchmarks/uc2/beam/flink/Uc2BeamFlink.java
@@ -1,7 +1,8 @@
-package application;
+package rocks.theodolite.benchmarks.uc2.beam.flink;
 
 import org.apache.beam.runners.flink.FlinkRunner;
-import theodolite.commons.beam.BeamService;
+import rocks.theodolite.benchmarks.commons.beam.BeamService;
+import rocks.theodolite.benchmarks.uc2.beam.PipelineFactory;
 
 /**
  * Implementation of the use case Downsampling using Apache Beam with the Flink Runner. To execute
diff --git a/theodolite-benchmarks/uc2-beam-samza/build.gradle b/theodolite-benchmarks/uc2-beam-samza/build.gradle
index 67df31321148e5edd058959dce69d0d59f9751c2..c8148e3bb59f59fb06638d33c40a21750323f757 100644
--- a/theodolite-benchmarks/uc2-beam-samza/build.gradle
+++ b/theodolite-benchmarks/uc2-beam-samza/build.gradle
@@ -16,4 +16,4 @@ sourceSets {
   }
 }
 
-mainClassName = "application.Uc2BeamSamza"
+mainClassName = "rocks.theodolite.benchmarks.uc2.beam.samza.Uc2BeamSamza"
diff --git a/theodolite-benchmarks/uc2-beam-samza/src/main/java/application/Uc2BeamSamza.java b/theodolite-benchmarks/uc2-beam-samza/src/main/java/rocks/theodolite/benchmarks/uc2/beam/samza/Uc2BeamSamza.java
similarity index 84%
rename from theodolite-benchmarks/uc2-beam-samza/src/main/java/application/Uc2BeamSamza.java
rename to theodolite-benchmarks/uc2-beam-samza/src/main/java/rocks/theodolite/benchmarks/uc2/beam/samza/Uc2BeamSamza.java
index 496f462795eb53af0e30e41ba66f0c24c71372c7..80981818d401b48ed61ee56987764684df9dd31f 100644
--- a/theodolite-benchmarks/uc2-beam-samza/src/main/java/application/Uc2BeamSamza.java
+++ b/theodolite-benchmarks/uc2-beam-samza/src/main/java/rocks/theodolite/benchmarks/uc2/beam/samza/Uc2BeamSamza.java
@@ -1,7 +1,8 @@
-package application;
+package rocks.theodolite.benchmarks.uc2.beam.samza;
 
 import org.apache.beam.runners.samza.SamzaRunner;
-import theodolite.commons.beam.BeamService;
+import rocks.theodolite.benchmarks.commons.beam.BeamService;
+import rocks.theodolite.benchmarks.uc2.beam.PipelineFactory;
 
 /**
  * Implementation of the use case Downsampling using Apache Beam with the Samza Runner. To run
diff --git a/theodolite-benchmarks/uc2-beam/src/main/java/application/PipelineFactory.java b/theodolite-benchmarks/uc2-beam/src/main/java/rocks/theodolite/benchmarks/uc2/beam/PipelineFactory.java
similarity index 89%
rename from theodolite-benchmarks/uc2-beam/src/main/java/application/PipelineFactory.java
rename to theodolite-benchmarks/uc2-beam/src/main/java/rocks/theodolite/benchmarks/uc2/beam/PipelineFactory.java
index 03ec7446be0351dc0939434788de4feceed89661..6de0b8f956c94af36cd70cf44ab691ff97e11ae9 100644
--- a/theodolite-benchmarks/uc2-beam/src/main/java/application/PipelineFactory.java
+++ b/theodolite-benchmarks/uc2-beam/src/main/java/rocks/theodolite/benchmarks/uc2/beam/PipelineFactory.java
@@ -1,4 +1,4 @@
-package application;
+package rocks.theodolite.benchmarks.uc2.beam;
 
 import com.google.common.math.Stats;
 import com.google.common.math.StatsAccumulator;
@@ -18,10 +18,10 @@ import org.apache.beam.sdk.values.KV;
 import org.apache.commons.configuration2.Configuration;
 import org.apache.kafka.common.serialization.StringSerializer;
 import org.joda.time.Duration;
-import theodolite.commons.beam.AbstractPipelineFactory;
-import theodolite.commons.beam.ConfigurationKeys;
-import theodolite.commons.beam.kafka.KafkaActivePowerTimestampReader;
-import theodolite.commons.beam.kafka.KafkaWriterTransformation;
+import rocks.theodolite.benchmarks.commons.beam.AbstractPipelineFactory;
+import rocks.theodolite.benchmarks.commons.beam.ConfigurationKeys;
+import rocks.theodolite.benchmarks.commons.beam.kafka.KafkaActivePowerTimestampReader;
+import rocks.theodolite.benchmarks.commons.beam.kafka.KafkaWriterTransformation;
 import titan.ccp.model.records.ActivePowerRecord;
 
 /**
diff --git a/theodolite-benchmarks/uc2-beam/src/main/java/application/StatsAggregation.java b/theodolite-benchmarks/uc2-beam/src/main/java/rocks/theodolite/benchmarks/uc2/beam/StatsAggregation.java
similarity index 96%
rename from theodolite-benchmarks/uc2-beam/src/main/java/application/StatsAggregation.java
rename to theodolite-benchmarks/uc2-beam/src/main/java/rocks/theodolite/benchmarks/uc2/beam/StatsAggregation.java
index 688f6677ec6d74e063a07a20c079b783aa71c399..a8956ee4b55c1e545e2c25ce38e2911b7c961337 100644
--- a/theodolite-benchmarks/uc2-beam/src/main/java/application/StatsAggregation.java
+++ b/theodolite-benchmarks/uc2-beam/src/main/java/rocks/theodolite/benchmarks/uc2/beam/StatsAggregation.java
@@ -1,4 +1,4 @@
-package application;
+package rocks.theodolite.benchmarks.uc2.beam;
 
 import com.google.common.math.Stats;
 import com.google.common.math.StatsAccumulator;
diff --git a/theodolite-benchmarks/uc2-beam/src/main/java/application/StatsToString.java b/theodolite-benchmarks/uc2-beam/src/main/java/rocks/theodolite/benchmarks/uc2/beam/StatsToString.java
similarity index 91%
rename from theodolite-benchmarks/uc2-beam/src/main/java/application/StatsToString.java
rename to theodolite-benchmarks/uc2-beam/src/main/java/rocks/theodolite/benchmarks/uc2/beam/StatsToString.java
index 9a73ae8e1681b2c350dee328cba7283cf3386fd7..222c9f3a1be0604f42c0d5d70308253463bb66f5 100644
--- a/theodolite-benchmarks/uc2-beam/src/main/java/application/StatsToString.java
+++ b/theodolite-benchmarks/uc2-beam/src/main/java/rocks/theodolite/benchmarks/uc2/beam/StatsToString.java
@@ -1,4 +1,4 @@
-package application;
+package rocks.theodolite.benchmarks.uc2.beam;
 
 import com.google.common.math.Stats;
 import org.apache.beam.sdk.transforms.SimpleFunction;
diff --git a/theodolite-benchmarks/uc3-beam-flink/build.gradle b/theodolite-benchmarks/uc3-beam-flink/build.gradle
index f3083d10b09bea6c8611809318b5b20650d3fbf6..c2fe5c11b0e24ecfa322d3f825261d2c60d650c4 100644
--- a/theodolite-benchmarks/uc3-beam-flink/build.gradle
+++ b/theodolite-benchmarks/uc3-beam-flink/build.gradle
@@ -16,4 +16,4 @@ sourceSets {
   }
 }
 
-mainClassName = 'application.Uc3BeamFlink'
+mainClassName = 'rocks.theodolite.benchmarks.uc3.beam.flink.Uc3BeamFlink'
diff --git a/theodolite-benchmarks/uc3-beam-flink/src/main/java/application/Uc3BeamFlink.java b/theodolite-benchmarks/uc3-beam-flink/src/main/java/rocks/theodolite/benchmarks/uc3/beam/flink/Uc3BeamFlink.java
similarity index 84%
rename from theodolite-benchmarks/uc3-beam-flink/src/main/java/application/Uc3BeamFlink.java
rename to theodolite-benchmarks/uc3-beam-flink/src/main/java/rocks/theodolite/benchmarks/uc3/beam/flink/Uc3BeamFlink.java
index 50827360223dfb1360ed3697ae732d85db48c1c7..8782559fea6a08ad2c5a92b355149e3a2ee02ea2 100644
--- a/theodolite-benchmarks/uc3-beam-flink/src/main/java/application/Uc3BeamFlink.java
+++ b/theodolite-benchmarks/uc3-beam-flink/src/main/java/rocks/theodolite/benchmarks/uc3/beam/flink/Uc3BeamFlink.java
@@ -1,7 +1,8 @@
-package application;
+package rocks.theodolite.benchmarks.uc3.beam.flink;
 
 import org.apache.beam.runners.flink.FlinkRunner;
-import theodolite.commons.beam.BeamService;
+import rocks.theodolite.benchmarks.commons.beam.BeamService;
+import rocks.theodolite.benchmarks.uc3.beam.PipelineFactory;
 
 /**
  * Implementation of the use case Aggregation based on Time Attributes using Apache Beam with the
diff --git a/theodolite-benchmarks/uc3-beam-samza/build.gradle b/theodolite-benchmarks/uc3-beam-samza/build.gradle
index 849a010336939f27a60ee6cbaab680a6a5d2d60d..b5d47d82b9c6056492ec7c21aebd691f4e335ddb 100644
--- a/theodolite-benchmarks/uc3-beam-samza/build.gradle
+++ b/theodolite-benchmarks/uc3-beam-samza/build.gradle
@@ -16,4 +16,4 @@ sourceSets {
   }
 }
 
-mainClassName = "application.Uc3BeamSamza"
+mainClassName = "rocks.theodolite.benchmarks.uc3.beam.samza.Uc3BeamSamza"
diff --git a/theodolite-benchmarks/uc3-beam-samza/src/main/java/application/Uc3BeamSamza.java b/theodolite-benchmarks/uc3-beam-samza/src/main/java/rocks/theodolite/benchmarks/uc3/beam/samza/Uc3BeamSamza.java
similarity index 84%
rename from theodolite-benchmarks/uc3-beam-samza/src/main/java/application/Uc3BeamSamza.java
rename to theodolite-benchmarks/uc3-beam-samza/src/main/java/rocks/theodolite/benchmarks/uc3/beam/samza/Uc3BeamSamza.java
index 974c5e79e5582768f65fe8341819e8f9857acf49..84e705f6f52f41f5c553a1ef3fb2ebd7ce95e20a 100644
--- a/theodolite-benchmarks/uc3-beam-samza/src/main/java/application/Uc3BeamSamza.java
+++ b/theodolite-benchmarks/uc3-beam-samza/src/main/java/rocks/theodolite/benchmarks/uc3/beam/samza/Uc3BeamSamza.java
@@ -1,7 +1,8 @@
-package application;
+package rocks.theodolite.benchmarks.uc3.beam.samza;
 
 import org.apache.beam.runners.samza.SamzaRunner;
-import theodolite.commons.beam.BeamService;
+import rocks.theodolite.benchmarks.commons.beam.BeamService;
+import rocks.theodolite.benchmarks.uc3.beam.PipelineFactory;
 
 /**
  * Implementation of the use case Aggregation based on Time Attributes using Apache Beam with the
diff --git a/theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDayKey.java b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDayKey.java
similarity index 93%
rename from theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDayKey.java
rename to theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDayKey.java
index 6db59dd65ee494157400b0f4c6eafbdd7655d402..9a18ae48820a8039912f5591b10816688ef7ce21 100644
--- a/theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDayKey.java
+++ b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDayKey.java
@@ -1,4 +1,4 @@
-package application;
+package rocks.theodolite.benchmarks.uc3.beam;
 
 import org.apache.beam.sdk.coders.AvroCoder;
 import org.apache.beam.sdk.coders.DefaultCoder;
diff --git a/theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDayKeyFactory.java b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDayKeyFactory.java
similarity index 92%
rename from theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDayKeyFactory.java
rename to theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDayKeyFactory.java
index b993a0199bc13e9b416f9b9cb77a27635d7fe1e1..a685f324103b23a79fd53bda7eae55d798c40e1d 100644
--- a/theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDayKeyFactory.java
+++ b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDayKeyFactory.java
@@ -1,4 +1,4 @@
-package application;
+package rocks.theodolite.benchmarks.uc3.beam;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
diff --git a/theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDayKeySerde.java b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDayKeySerde.java
similarity index 95%
rename from theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDayKeySerde.java
rename to theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDayKeySerde.java
index a0f8e0bbaf959154bfbab69d83da56c81d55802a..1c09d7d508888b48c2a509d83f55ff49ca967f17 100644
--- a/theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDayKeySerde.java
+++ b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDayKeySerde.java
@@ -1,4 +1,4 @@
-package application;
+package rocks.theodolite.benchmarks.uc3.beam;
 
 import org.apache.kafka.common.serialization.Serde;
 import titan.ccp.common.kafka.simpleserdes.BufferSerde;
diff --git a/theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDayWithStats.java b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDayWithStats.java
similarity index 93%
rename from theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDayWithStats.java
rename to theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDayWithStats.java
index 46232b3f13601d77f6cb7b13ea0bcdc31290357a..0d9aa6ab0342db1d92cfedc874adb8c454d00ef8 100644
--- a/theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDayWithStats.java
+++ b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDayWithStats.java
@@ -1,4 +1,4 @@
-package application;
+package rocks.theodolite.benchmarks.uc3.beam;
 
 import com.google.common.math.Stats;
 import org.apache.beam.sdk.transforms.SimpleFunction;
diff --git a/theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDaykeyCoder.java b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDaykeyCoder.java
similarity index 97%
rename from theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDaykeyCoder.java
rename to theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDaykeyCoder.java
index 196408263ec29a1ec9b45375dd0b53a18e8f60b3..dd84010d16cb9c3882452f6fc5e8851e9f95a334 100644
--- a/theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDaykeyCoder.java
+++ b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDaykeyCoder.java
@@ -1,4 +1,4 @@
-package application;
+package rocks.theodolite.benchmarks.uc3.beam;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/theodolite-benchmarks/uc3-beam/src/main/java/application/MapTimeFormat.java b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/MapTimeFormat.java
similarity index 95%
rename from theodolite-benchmarks/uc3-beam/src/main/java/application/MapTimeFormat.java
rename to theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/MapTimeFormat.java
index 7d8897fb0fd76cd4eb145da6a7ce031f9f45d396..d129a67b1660ffef437e91fc68273c5a6c66a654 100644
--- a/theodolite-benchmarks/uc3-beam/src/main/java/application/MapTimeFormat.java
+++ b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/MapTimeFormat.java
@@ -1,4 +1,4 @@
-package application;
+package rocks.theodolite.benchmarks.uc3.beam;
 
 import java.time.Instant;
 import java.time.LocalDateTime;
diff --git a/theodolite-benchmarks/uc3-beam/src/main/java/application/PipelineFactory.java b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/PipelineFactory.java
similarity index 92%
rename from theodolite-benchmarks/uc3-beam/src/main/java/application/PipelineFactory.java
rename to theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/PipelineFactory.java
index e14010c5e70a058831e5fd5fcfe0bdb042b13c48..0d1f8fdbb3b7af4eedc787b7c7913f86307377fc 100644
--- a/theodolite-benchmarks/uc3-beam/src/main/java/application/PipelineFactory.java
+++ b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/PipelineFactory.java
@@ -1,4 +1,4 @@
-package application;
+package rocks.theodolite.benchmarks.uc3.beam;
 
 import com.google.common.math.Stats;
 import com.google.common.math.StatsAccumulator;
@@ -19,10 +19,10 @@ import org.apache.beam.sdk.values.KV;
 import org.apache.commons.configuration2.Configuration;
 import org.apache.kafka.common.serialization.StringSerializer;
 import org.joda.time.Duration;
-import theodolite.commons.beam.AbstractPipelineFactory;
-import theodolite.commons.beam.ConfigurationKeys;
-import theodolite.commons.beam.kafka.KafkaActivePowerTimestampReader;
-import theodolite.commons.beam.kafka.KafkaWriterTransformation;
+import rocks.theodolite.benchmarks.commons.beam.AbstractPipelineFactory;
+import rocks.theodolite.benchmarks.commons.beam.ConfigurationKeys;
+import rocks.theodolite.benchmarks.commons.beam.kafka.KafkaActivePowerTimestampReader;
+import rocks.theodolite.benchmarks.commons.beam.kafka.KafkaWriterTransformation;
 import titan.ccp.model.records.ActivePowerRecord;
 
 /**
diff --git a/theodolite-benchmarks/uc3-beam/src/main/java/application/StatsAggregation.java b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/StatsAggregation.java
similarity index 96%
rename from theodolite-benchmarks/uc3-beam/src/main/java/application/StatsAggregation.java
rename to theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/StatsAggregation.java
index ee5cfc48bcd42dec41dd2030ad3f4a730fd6ac85..e479c0ab5e192f7e5239c100a05df454bd2973ad 100644
--- a/theodolite-benchmarks/uc3-beam/src/main/java/application/StatsAggregation.java
+++ b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/StatsAggregation.java
@@ -1,4 +1,4 @@
-package application;
+package rocks.theodolite.benchmarks.uc3.beam;
 
 import com.google.common.math.Stats;
 import com.google.common.math.StatsAccumulator;
diff --git a/theodolite-benchmarks/uc3-beam/src/main/java/application/StatsKeyFactory.java b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/StatsKeyFactory.java
similarity index 87%
rename from theodolite-benchmarks/uc3-beam/src/main/java/application/StatsKeyFactory.java
rename to theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/StatsKeyFactory.java
index 820168058f88ca21f8efcf61c7ebed60c08aa200..6f34a50ad171da7d595f23f9b81f4dabfe226fae 100644
--- a/theodolite-benchmarks/uc3-beam/src/main/java/application/StatsKeyFactory.java
+++ b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/StatsKeyFactory.java
@@ -1,4 +1,4 @@
-package application;
+package rocks.theodolite.benchmarks.uc3.beam;
 
 import java.time.LocalDateTime;
 
diff --git a/theodolite-benchmarks/uc4-beam-flink/build.gradle b/theodolite-benchmarks/uc4-beam-flink/build.gradle
index 56cff477d1b67681f21f4d6a0a63818c68b482de..8ccf18a2df2198ebd9749b0af095dffff12bd380 100644
--- a/theodolite-benchmarks/uc4-beam-flink/build.gradle
+++ b/theodolite-benchmarks/uc4-beam-flink/build.gradle
@@ -16,4 +16,4 @@ sourceSets {
   }
 }
 
-mainClassName = 'application.Uc4BeamFlink'
+mainClassName = 'rocks.theodolite.benchmarks.uc4.beam.flink.Uc4BeamFlink'
diff --git a/theodolite-benchmarks/uc4-beam-flink/src/main/java/application/Uc4BeamFlink.java b/theodolite-benchmarks/uc4-beam-flink/src/main/java/rocks/theodolite/benchmarks/uc4/beam/flink/Uc4BeamFlink.java
similarity index 70%
rename from theodolite-benchmarks/uc4-beam-flink/src/main/java/application/Uc4BeamFlink.java
rename to theodolite-benchmarks/uc4-beam-flink/src/main/java/rocks/theodolite/benchmarks/uc4/beam/flink/Uc4BeamFlink.java
index 0d5d2a04f5a86fb343b05c230533fb268d69815c..5d398d610a12890e3fb9c85804a4b59a69163b4f 100644
--- a/theodolite-benchmarks/uc4-beam-flink/src/main/java/application/Uc4BeamFlink.java
+++ b/theodolite-benchmarks/uc4-beam-flink/src/main/java/rocks/theodolite/benchmarks/uc4/beam/flink/Uc4BeamFlink.java
@@ -1,7 +1,8 @@
-package application;
+package rocks.theodolite.benchmarks.uc4.beam.flink;
 
 import org.apache.beam.runners.flink.FlinkRunner;
-import theodolite.commons.beam.BeamService;
+import rocks.theodolite.benchmarks.commons.beam.BeamService;
+import rocks.theodolite.benchmarks.uc4.beam.PipelineFactory;
 
 /**
  * Implementation of the use case Hierarchical Aggregation using Apache Beam with the Flink Runner.
diff --git a/theodolite-benchmarks/uc4-beam-samza/build.gradle b/theodolite-benchmarks/uc4-beam-samza/build.gradle
index 8aecf1ea83c2f9d943400779bbba50cef71ef149..38e21bfd271587d6ef957d0b8ad0ed32c0ab4940 100644
--- a/theodolite-benchmarks/uc4-beam-samza/build.gradle
+++ b/theodolite-benchmarks/uc4-beam-samza/build.gradle
@@ -16,4 +16,4 @@ sourceSets {
   }
 }
 
-mainClassName = "application.Uc4BeamSamza"
+mainClassName = "rocks.theodolite.benchmarks.uc4.beam.samza.Uc4BeamSamza"
diff --git a/theodolite-benchmarks/uc4-beam-samza/src/main/java/application/Uc4BeamSamza.java b/theodolite-benchmarks/uc4-beam-samza/src/main/java/rocks/theodolite/benchmarks/uc4/beam/samza/Uc4BeamSamza.java
similarity index 85%
rename from theodolite-benchmarks/uc4-beam-samza/src/main/java/application/Uc4BeamSamza.java
rename to theodolite-benchmarks/uc4-beam-samza/src/main/java/rocks/theodolite/benchmarks/uc4/beam/samza/Uc4BeamSamza.java
index 25420958d327370138c668ba66fdd9840055daf0..044b3dc4b647dffa02a62d17c9fcdaf15b0a0869 100644
--- a/theodolite-benchmarks/uc4-beam-samza/src/main/java/application/Uc4BeamSamza.java
+++ b/theodolite-benchmarks/uc4-beam-samza/src/main/java/rocks/theodolite/benchmarks/uc4/beam/samza/Uc4BeamSamza.java
@@ -1,7 +1,8 @@
-package application;
+package rocks.theodolite.benchmarks.uc4.beam.samza;
 
 import org.apache.beam.runners.samza.SamzaRunner;
-import theodolite.commons.beam.BeamService;
+import rocks.theodolite.benchmarks.commons.beam.BeamService;
+import rocks.theodolite.benchmarks.uc4.beam.PipelineFactory;
 
 /**
  * Implementation of the use case Hierarchical Aggregation using Apache Beam with the Samza Runner.
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/application/AggregatedActivePowerRecordEventTimePolicy.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/AggregatedActivePowerRecordEventTimePolicy.java
similarity index 96%
rename from theodolite-benchmarks/uc4-beam/src/main/java/application/AggregatedActivePowerRecordEventTimePolicy.java
rename to theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/AggregatedActivePowerRecordEventTimePolicy.java
index dad9eca7d8d50d1b85932ddaa7ffc99418a4b759..3af4957aa210a5f6a184bf4b513202dd4087567f 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/application/AggregatedActivePowerRecordEventTimePolicy.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/AggregatedActivePowerRecordEventTimePolicy.java
@@ -1,4 +1,4 @@
-package application;
+package rocks.theodolite.benchmarks.uc4.beam;
 
 import java.util.Optional;
 import org.apache.beam.sdk.io.kafka.KafkaRecord;
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/application/AggregatedToActive.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/AggregatedToActive.java
similarity index 94%
rename from theodolite-benchmarks/uc4-beam/src/main/java/application/AggregatedToActive.java
rename to theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/AggregatedToActive.java
index bddd43e1e09c54bcfc85e5cbb65d1a6487f53438..63f914dca0e6536d52ce225e791d2e3b89107394 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/application/AggregatedToActive.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/AggregatedToActive.java
@@ -1,4 +1,4 @@
-package application;
+package rocks.theodolite.benchmarks.uc4.beam;
 
 import org.apache.beam.sdk.transforms.SimpleFunction;
 import org.apache.beam.sdk.values.KV;
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/application/DuplicateAsFlatMap.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/DuplicateAsFlatMap.java
similarity index 98%
rename from theodolite-benchmarks/uc4-beam/src/main/java/application/DuplicateAsFlatMap.java
rename to theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/DuplicateAsFlatMap.java
index 347d76dfb3d1d1f09f1091296a322a23bba67ec0..1b430c99bb127f0746772571443f625ae69be54d 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/application/DuplicateAsFlatMap.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/DuplicateAsFlatMap.java
@@ -1,4 +1,4 @@
-package application;
+package rocks.theodolite.benchmarks.uc4.beam;
 
 import com.google.common.base.MoreObjects;
 import java.util.Collections;
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/application/FilterEvents.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/FilterEvents.java
similarity index 92%
rename from theodolite-benchmarks/uc4-beam/src/main/java/application/FilterEvents.java
rename to theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/FilterEvents.java
index 3588443393fdef2e0fd1bf5f1e7c497e5030cf77..6a96d7270640c1cfa3a162e0d506792d577103c5 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/application/FilterEvents.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/FilterEvents.java
@@ -1,4 +1,4 @@
-package application;
+package rocks.theodolite.benchmarks.uc4.beam;
 
 import org.apache.beam.sdk.transforms.SerializableFunction;
 import org.apache.beam.sdk.values.KV;
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/application/FilterNullValues.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/FilterNullValues.java
similarity index 91%
rename from theodolite-benchmarks/uc4-beam/src/main/java/application/FilterNullValues.java
rename to theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/FilterNullValues.java
index 143294f1ff2bfeea77c40ce38cd10ce3eb44be49..9aa48d7b8f6fdc64aad205821ec4db25f606156b 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/application/FilterNullValues.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/FilterNullValues.java
@@ -1,4 +1,4 @@
-package application;
+package rocks.theodolite.benchmarks.uc4.beam;
 
 import org.apache.beam.sdk.transforms.SerializableFunction;
 import org.apache.beam.sdk.values.KV;
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/application/GenerateParentsFn.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/GenerateParentsFn.java
similarity index 97%
rename from theodolite-benchmarks/uc4-beam/src/main/java/application/GenerateParentsFn.java
rename to theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/GenerateParentsFn.java
index 081d9e212633150a6e5fab3482a0a59254cfc8f2..e6f01c3d59c5c92f5d0c51ac807a76f0a37612b1 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/application/GenerateParentsFn.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/GenerateParentsFn.java
@@ -1,4 +1,4 @@
-package application;
+package rocks.theodolite.benchmarks.uc4.beam;
 
 import java.util.Collections;
 import java.util.Iterator;
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/application/PipelineFactory.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/PipelineFactory.java
similarity index 93%
rename from theodolite-benchmarks/uc4-beam/src/main/java/application/PipelineFactory.java
rename to theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/PipelineFactory.java
index c6ec79a1f0c1d03bdb19ce23e6b0dba3f83653dc..4cb707017ff90236df4546b87e472b86eb495e10 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/application/PipelineFactory.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/PipelineFactory.java
@@ -1,4 +1,4 @@
-package application; // NOPMD
+package rocks.theodolite.benchmarks.uc4.beam; // NOPMD
 
 import com.google.common.math.StatsAccumulator;
 import io.confluent.kafka.serializers.AbstractKafkaAvroSerDeConfig;
@@ -35,17 +35,17 @@ import org.apache.commons.configuration2.Configuration;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.common.serialization.StringDeserializer;
 import org.joda.time.Duration;
-import serialization.AggregatedActivePowerRecordCoder;
-import serialization.AggregatedActivePowerRecordDeserializer;
-import serialization.AggregatedActivePowerRecordSerializer;
-import serialization.EventCoder;
-import serialization.EventDeserializer;
-import serialization.SensorParentKeyCoder;
-import theodolite.commons.beam.AbstractPipelineFactory;
-import theodolite.commons.beam.ConfigurationKeys;
-import theodolite.commons.beam.kafka.KafkaActivePowerTimestampReader;
-import theodolite.commons.beam.kafka.KafkaGenericReader;
-import theodolite.commons.beam.kafka.KafkaWriterTransformation;
+import rocks.theodolite.benchmarks.commons.beam.AbstractPipelineFactory;
+import rocks.theodolite.benchmarks.commons.beam.ConfigurationKeys;
+import rocks.theodolite.benchmarks.commons.beam.kafka.KafkaActivePowerTimestampReader;
+import rocks.theodolite.benchmarks.commons.beam.kafka.KafkaGenericReader;
+import rocks.theodolite.benchmarks.commons.beam.kafka.KafkaWriterTransformation;
+import rocks.theodolite.benchmarks.uc4.beam.serialization.AggregatedActivePowerRecordCoder;
+import rocks.theodolite.benchmarks.uc4.beam.serialization.AggregatedActivePowerRecordDeserializer;
+import rocks.theodolite.benchmarks.uc4.beam.serialization.AggregatedActivePowerRecordSerializer;
+import rocks.theodolite.benchmarks.uc4.beam.serialization.EventCoder;
+import rocks.theodolite.benchmarks.uc4.beam.serialization.EventDeserializer;
+import rocks.theodolite.benchmarks.uc4.beam.serialization.SensorParentKeyCoder;
 import titan.ccp.configuration.events.Event;
 import titan.ccp.model.records.ActivePowerRecord;
 import titan.ccp.model.records.AggregatedActivePowerRecord;
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/application/RecordAggregation.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/RecordAggregation.java
similarity index 97%
rename from theodolite-benchmarks/uc4-beam/src/main/java/application/RecordAggregation.java
rename to theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/RecordAggregation.java
index 16fd411b44cc1f955b255be870215ac120bce193..6fbf6ff3f3abcdfd4f5ca0de93d68c2532655b4d 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/application/RecordAggregation.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/RecordAggregation.java
@@ -1,4 +1,4 @@
-package application;
+package rocks.theodolite.benchmarks.uc4.beam;
 
 import java.io.Serializable;
 import org.apache.beam.sdk.coders.AvroCoder;
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/application/SensorParentKey.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/SensorParentKey.java
similarity index 93%
rename from theodolite-benchmarks/uc4-beam/src/main/java/application/SensorParentKey.java
rename to theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/SensorParentKey.java
index 546fc04c2de089a28d8f0fba86a7fbcd5c1cc0a8..28efd63f2cecbc40f9e9fcb3f59301fd86c5909a 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/application/SensorParentKey.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/SensorParentKey.java
@@ -1,4 +1,4 @@
-package application;
+package rocks.theodolite.benchmarks.uc4.beam;
 
 /**
  * A key consisting of the identifier of a sensor and an identifier of parent sensor.
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/application/SetIdForAggregated.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/SetIdForAggregated.java
similarity index 94%
rename from theodolite-benchmarks/uc4-beam/src/main/java/application/SetIdForAggregated.java
rename to theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/SetIdForAggregated.java
index 0279a26ed925408b5383be50a202f5c88cea53aa..23ebb6d0104ef3992b4e2a4763dd23e722fe30f9 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/application/SetIdForAggregated.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/SetIdForAggregated.java
@@ -1,4 +1,4 @@
-package application;
+package rocks.theodolite.benchmarks.uc4.beam;
 
 import org.apache.beam.sdk.transforms.SimpleFunction;
 import org.apache.beam.sdk.values.KV;
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/application/SetKeyToGroup.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/SetKeyToGroup.java
similarity index 92%
rename from theodolite-benchmarks/uc4-beam/src/main/java/application/SetKeyToGroup.java
rename to theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/SetKeyToGroup.java
index 7d8dc70583fb45e02a5a8091b92d724bb22b4a78..3ffba12823aca2da88250eb601615de1ac5177e2 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/application/SetKeyToGroup.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/SetKeyToGroup.java
@@ -1,4 +1,4 @@
-package application;
+package rocks.theodolite.benchmarks.uc4.beam;
 
 import org.apache.beam.sdk.transforms.SimpleFunction;
 import org.apache.beam.sdk.values.KV;
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/application/UpdateChildParentPairs.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/UpdateChildParentPairs.java
similarity index 96%
rename from theodolite-benchmarks/uc4-beam/src/main/java/application/UpdateChildParentPairs.java
rename to theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/UpdateChildParentPairs.java
index cff04e132a93f6c8098c3039232dd48084e6d264..190bb074d4430f23aeabcd123d1f1c4bc937cd0d 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/application/UpdateChildParentPairs.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/UpdateChildParentPairs.java
@@ -1,4 +1,4 @@
-package application;
+package rocks.theodolite.benchmarks.uc4.beam;
 
 import java.util.Set;
 import org.apache.beam.sdk.state.StateSpec;
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/serialization/AggregatedActivePowerRecordCoder.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/AggregatedActivePowerRecordCoder.java
similarity index 96%
rename from theodolite-benchmarks/uc4-beam/src/main/java/serialization/AggregatedActivePowerRecordCoder.java
rename to theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/AggregatedActivePowerRecordCoder.java
index 3e0be0fa456efa3ec67504ea9d0e285ae8b3b913..f460d42de2042064952434f6bf044920f217138a 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/serialization/AggregatedActivePowerRecordCoder.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/AggregatedActivePowerRecordCoder.java
@@ -1,4 +1,4 @@
-package serialization;
+package rocks.theodolite.benchmarks.uc4.beam.serialization;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/serialization/AggregatedActivePowerRecordDeserializer.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/AggregatedActivePowerRecordDeserializer.java
similarity index 86%
rename from theodolite-benchmarks/uc4-beam/src/main/java/serialization/AggregatedActivePowerRecordDeserializer.java
rename to theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/AggregatedActivePowerRecordDeserializer.java
index 3076861a53dac031afd9e8eb913b5a0bafe480c0..2c481f8e6f68a3a0decbcb73c3751f464646b7cf 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/serialization/AggregatedActivePowerRecordDeserializer.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/AggregatedActivePowerRecordDeserializer.java
@@ -1,4 +1,4 @@
-package serialization;
+package rocks.theodolite.benchmarks.uc4.beam.serialization;
 
 import io.confluent.kafka.streams.serdes.avro.SpecificAvroDeserializer;
 import org.apache.kafka.common.serialization.Deserializer;
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/serialization/AggregatedActivePowerRecordSerializer.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/AggregatedActivePowerRecordSerializer.java
similarity index 86%
rename from theodolite-benchmarks/uc4-beam/src/main/java/serialization/AggregatedActivePowerRecordSerializer.java
rename to theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/AggregatedActivePowerRecordSerializer.java
index 26801d8a28b9756214c65c4e8190e15d04bb3e68..073c3d0f94c24872460ae58c6236a0c4e19e0d5d 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/serialization/AggregatedActivePowerRecordSerializer.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/AggregatedActivePowerRecordSerializer.java
@@ -1,4 +1,4 @@
-package serialization;
+package rocks.theodolite.benchmarks.uc4.beam.serialization;
 
 import io.confluent.kafka.streams.serdes.avro.SpecificAvroSerializer;
 import org.apache.kafka.common.serialization.Serializer;
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/serialization/EventCoder.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/EventCoder.java
similarity index 97%
rename from theodolite-benchmarks/uc4-beam/src/main/java/serialization/EventCoder.java
rename to theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/EventCoder.java
index 710beb71dc8776e6309028327b05307aa590a7f6..b96398398e61f3db0f0632f8384d11f30ccc7aca 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/serialization/EventCoder.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/EventCoder.java
@@ -1,4 +1,4 @@
-package serialization;
+package rocks.theodolite.benchmarks.uc4.beam.serialization;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/serialization/EventDeserializer.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/EventDeserializer.java
similarity index 94%
rename from theodolite-benchmarks/uc4-beam/src/main/java/serialization/EventDeserializer.java
rename to theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/EventDeserializer.java
index 34e31a3059d0749848a30979f32e6df6651c1b47..ae9c480e1c76949f8cfa5d27c73282e270232d0a 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/serialization/EventDeserializer.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/EventDeserializer.java
@@ -1,4 +1,4 @@
-package serialization;
+package rocks.theodolite.benchmarks.uc4.beam.serialization;
 
 import java.util.Map;
 import org.apache.kafka.common.serialization.ByteBufferDeserializer;
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/serialization/SensorParentKeyCoder.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/SensorParentKeyCoder.java
similarity index 94%
rename from theodolite-benchmarks/uc4-beam/src/main/java/serialization/SensorParentKeyCoder.java
rename to theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/SensorParentKeyCoder.java
index 3e85c3242fb854bef514787c92bb58ad76526cb4..b75037bce24b5b5ab07c9ef6818c0739f68544b2 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/serialization/SensorParentKeyCoder.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/SensorParentKeyCoder.java
@@ -1,6 +1,5 @@
-package serialization;
+package rocks.theodolite.benchmarks.uc4.beam.serialization;
 
-import application.SensorParentKey;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -11,6 +10,7 @@ import java.util.List;
 import org.apache.beam.sdk.coders.Coder;
 import org.apache.beam.sdk.coders.CoderException;
 import org.apache.kafka.common.serialization.Serde;
+import rocks.theodolite.benchmarks.uc4.beam.SensorParentKey;
 
 /**
  * Wrapper Class that encapsulates a SensorParentKey Serde in a org.apache.beam.sdk.coders.Coder.
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/serialization/SensorParentKeySerde.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/SensorParentKeySerde.java
similarity index 88%
rename from theodolite-benchmarks/uc4-beam/src/main/java/serialization/SensorParentKeySerde.java
rename to theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/SensorParentKeySerde.java
index 468adb3947439c11c4fd9b289f41b68e606bdb1d..64242b3fd2618b154e47cc46ce2fe6f9375be209 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/serialization/SensorParentKeySerde.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/serialization/SensorParentKeySerde.java
@@ -1,7 +1,7 @@
-package serialization;
+package rocks.theodolite.benchmarks.uc4.beam.serialization;
 
-import application.SensorParentKey;
 import org.apache.kafka.common.serialization.Serde;
+import rocks.theodolite.benchmarks.uc4.beam.SensorParentKey;
 import titan.ccp.common.kafka.simpleserdes.BufferSerde;
 import titan.ccp.common.kafka.simpleserdes.ReadBuffer;
 import titan.ccp.common.kafka.simpleserdes.SimpleSerdes;