diff --git a/theodolite-benchmarks/hazelcastjet-commons/src/main/java/theodolite/commons/hazelcastjet/BenchmarkConfigBuilder.java b/theodolite-benchmarks/hazelcastjet-commons/src/main/java/rocks/theodolite/benchmarks/commons/hazelcastjet/BenchmarkConfigBuilder.java
similarity index 97%
rename from theodolite-benchmarks/hazelcastjet-commons/src/main/java/theodolite/commons/hazelcastjet/BenchmarkConfigBuilder.java
rename to theodolite-benchmarks/hazelcastjet-commons/src/main/java/rocks/theodolite/benchmarks/commons/hazelcastjet/BenchmarkConfigBuilder.java
index 7062f5e1dc1861d67e7f76dced34ac01f11e1955..46dd56a8669cce4d29e8dace1bd6c2649a71e1f0 100644
--- a/theodolite-benchmarks/hazelcastjet-commons/src/main/java/theodolite/commons/hazelcastjet/BenchmarkConfigBuilder.java
+++ b/theodolite-benchmarks/hazelcastjet-commons/src/main/java/rocks/theodolite/benchmarks/commons/hazelcastjet/BenchmarkConfigBuilder.java
@@ -1,4 +1,4 @@
-package theodolite.commons.hazelcastjet;
+package rocks.theodolite.benchmarks.commons.hazelcastjet;
 
 import com.hazelcast.config.Config;
 import com.hazelcast.config.JoinConfig;
diff --git a/theodolite-benchmarks/hazelcastjet-commons/src/main/java/theodolite/commons/hazelcastjet/ClusterConfig.java b/theodolite-benchmarks/hazelcastjet-commons/src/main/java/rocks/theodolite/benchmarks/commons/hazelcastjet/ClusterConfig.java
similarity index 97%
rename from theodolite-benchmarks/hazelcastjet-commons/src/main/java/theodolite/commons/hazelcastjet/ClusterConfig.java
rename to theodolite-benchmarks/hazelcastjet-commons/src/main/java/rocks/theodolite/benchmarks/commons/hazelcastjet/ClusterConfig.java
index 53af54d93f84a4ab8181e1d0e273c7809e178738..c5a2141799eb97dbedc5fc82fa456b2efee3a813 100644
--- a/theodolite-benchmarks/hazelcastjet-commons/src/main/java/theodolite/commons/hazelcastjet/ClusterConfig.java
+++ b/theodolite-benchmarks/hazelcastjet-commons/src/main/java/rocks/theodolite/benchmarks/commons/hazelcastjet/ClusterConfig.java
@@ -1,4 +1,4 @@
-package theodolite.commons.hazelcastjet;
+package rocks.theodolite.benchmarks.commons.hazelcastjet;
 
 /**
  * Configuration of a load generator cluster.
diff --git a/theodolite-benchmarks/hazelcastjet-commons/src/main/java/theodolite/commons/hazelcastjet/ConfigurationKeys.java b/theodolite-benchmarks/hazelcastjet-commons/src/main/java/rocks/theodolite/benchmarks/commons/hazelcastjet/ConfigurationKeys.java
similarity index 95%
rename from theodolite-benchmarks/hazelcastjet-commons/src/main/java/theodolite/commons/hazelcastjet/ConfigurationKeys.java
rename to theodolite-benchmarks/hazelcastjet-commons/src/main/java/rocks/theodolite/benchmarks/commons/hazelcastjet/ConfigurationKeys.java
index e4575a5de74263cd344332b54830d3670c24fa7e..d1705888430c92ee0cec50ea06871746bbe06cb5 100644
--- a/theodolite-benchmarks/hazelcastjet-commons/src/main/java/theodolite/commons/hazelcastjet/ConfigurationKeys.java
+++ b/theodolite-benchmarks/hazelcastjet-commons/src/main/java/rocks/theodolite/benchmarks/commons/hazelcastjet/ConfigurationKeys.java
@@ -1,4 +1,4 @@
-package theodolite.commons.hazelcastjet;
+package rocks.theodolite.benchmarks.commons.hazelcastjet;
 
 /**
  * Configuration Keys used for Hazelcast Jet Benchmark implementations.
diff --git a/theodolite-benchmarks/hazelcastjet-commons/src/main/java/theodolite/commons/hazelcastjet/JetInstanceBuilder.java b/theodolite-benchmarks/hazelcastjet-commons/src/main/java/rocks/theodolite/benchmarks/commons/hazelcastjet/JetInstanceBuilder.java
similarity index 94%
rename from theodolite-benchmarks/hazelcastjet-commons/src/main/java/theodolite/commons/hazelcastjet/JetInstanceBuilder.java
rename to theodolite-benchmarks/hazelcastjet-commons/src/main/java/rocks/theodolite/benchmarks/commons/hazelcastjet/JetInstanceBuilder.java
index 9006c7a34d878b58f403bb90b74d3eb65c30e1e0..cc2ee052d5e2ed7e7b372baf7b59f24ef3e26e8f 100644
--- a/theodolite-benchmarks/hazelcastjet-commons/src/main/java/theodolite/commons/hazelcastjet/JetInstanceBuilder.java
+++ b/theodolite-benchmarks/hazelcastjet-commons/src/main/java/rocks/theodolite/benchmarks/commons/hazelcastjet/JetInstanceBuilder.java
@@ -1,4 +1,4 @@
-package theodolite.commons.hazelcastjet;
+package rocks.theodolite.benchmarks.commons.hazelcastjet;
 
 import com.hazelcast.config.Config;
 import com.hazelcast.jet.Jet;
@@ -36,9 +36,8 @@ public class JetInstanceBuilder {
       final String bootstrapServerDefault, final String hzKubernetesServiceDnsKey) {
     // Use ClusterConfigBuilder to build a cluster config for this microservice
     final BenchmarkConfigBuilder configBuilder = new BenchmarkConfigBuilder();
-    final Config config =
+    this.config =
         configBuilder.buildFromEnv(logger, bootstrapServerDefault, hzKubernetesServiceDnsKey);
-    this.config = config;
     return this;
   }
 
@@ -46,7 +45,7 @@ public class JetInstanceBuilder {
    * Builds and returns a JetInstance. If a config is set, the JetInstance will contain the set
    * config.
    *
-   * @return
+   * @return JetInstance
    */
   public JetInstance build() {
     final JetInstance jet = Jet.newJetInstance();
diff --git a/theodolite-benchmarks/uc1-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc1/hazelcastjet/Uc1HazelcastJetFactory.java b/theodolite-benchmarks/uc1-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc1/hazelcastjet/Uc1HazelcastJetFactory.java
index 3ed9b90a82750288992a0c53312d93ff8afa9a3a..d69c93f740abb9cc8353fb14bcdd44edd13faca6 100644
--- a/theodolite-benchmarks/uc1-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc1/hazelcastjet/Uc1HazelcastJetFactory.java
+++ b/theodolite-benchmarks/uc1-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc1/hazelcastjet/Uc1HazelcastJetFactory.java
@@ -6,8 +6,8 @@ import com.hazelcast.jet.pipeline.Pipeline;
 import java.util.Objects;
 import java.util.Properties;
 import org.slf4j.Logger;
-import theodolite.commons.hazelcastjet.ConfigurationKeys;
-import theodolite.commons.hazelcastjet.JetInstanceBuilder;
+import rocks.theodolite.benchmarks.commons.hazelcastjet.ConfigurationKeys;
+import rocks.theodolite.benchmarks.commons.hazelcastjet.JetInstanceBuilder;
 
 /**
  * A Hazelcast Jet factory which can build a Hazelcast Jet Instance and Pipeline for the UC1
diff --git a/theodolite-benchmarks/uc1-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc1/hazelcastjet/Uc1KafkaPropertiesBuilder.java b/theodolite-benchmarks/uc1-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc1/hazelcastjet/Uc1KafkaPropertiesBuilder.java
index 6b79d9f2e11f3e76bbc819be2f13c99de64cadbf..b9a6b1d0dba381b8e8f1ee371c0d36a1552e187f 100644
--- a/theodolite-benchmarks/uc1-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc1/hazelcastjet/Uc1KafkaPropertiesBuilder.java
+++ b/theodolite-benchmarks/uc1-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc1/hazelcastjet/Uc1KafkaPropertiesBuilder.java
@@ -5,7 +5,7 @@ import java.util.Objects;
 import java.util.Properties;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.common.serialization.StringDeserializer;
-import theodolite.commons.hazelcastjet.ConfigurationKeys;
+import rocks.theodolite.benchmarks.commons.hazelcastjet.ConfigurationKeys;
 
 /**
  * Builds a Properties object containing the needed kafka properties used for the UC1 benchmark of
diff --git a/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/Uc2HazelcastJetFactory.java b/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/Uc2HazelcastJetFactory.java
index a3c3d624fbd85d7fd3fb9427cddd6e135be83fb6..4151f56fbbc5beeaf5dd94caa618c9b77cc5543f 100644
--- a/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/Uc2HazelcastJetFactory.java
+++ b/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/Uc2HazelcastJetFactory.java
@@ -7,8 +7,8 @@ import com.hazelcast.jet.pipeline.Pipeline;
 import java.util.Objects;
 import java.util.Properties;
 import org.slf4j.Logger;
-import theodolite.commons.hazelcastjet.ConfigurationKeys;
-import theodolite.commons.hazelcastjet.JetInstanceBuilder;
+import rocks.theodolite.benchmarks.commons.hazelcastjet.ConfigurationKeys;
+import rocks.theodolite.benchmarks.commons.hazelcastjet.JetInstanceBuilder;
 import theodolite.uc2.application.uc2specifics.StatsAccumulatorSerializer;
 
 /**
diff --git a/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/Uc2KafkaPropertiesBuilder.java b/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/Uc2KafkaPropertiesBuilder.java
index 8a990306627be88ba7a291d86faccc878f463a4d..702b5664d5279846913116d3dc48f3e63932a948 100644
--- a/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/Uc2KafkaPropertiesBuilder.java
+++ b/theodolite-benchmarks/uc2-hazelcastjet/src/main/java/theodolite/uc2/application/Uc2KafkaPropertiesBuilder.java
@@ -6,7 +6,7 @@ import java.util.Properties;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.common.serialization.StringDeserializer;
 import org.apache.kafka.common.serialization.StringSerializer;
-import theodolite.commons.hazelcastjet.ConfigurationKeys;
+import rocks.theodolite.benchmarks.commons.hazelcastjet.ConfigurationKeys;
 
 /**
  * Builds a read and write Properties objects containing the needed kafka properties used for the
diff --git a/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/Uc3HazelcastJetFactory.java b/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/Uc3HazelcastJetFactory.java
index ca21acca747b17b2d5457e971cc8a68f553a353b..273de79afb1c6824ed4da0136782112ffccf2ba1 100644
--- a/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/Uc3HazelcastJetFactory.java
+++ b/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/Uc3HazelcastJetFactory.java
@@ -6,8 +6,8 @@ import com.hazelcast.jet.pipeline.Pipeline;
 import java.util.Objects;
 import java.util.Properties;
 import org.slf4j.Logger;
-import theodolite.commons.hazelcastjet.ConfigurationKeys;
-import theodolite.commons.hazelcastjet.JetInstanceBuilder;
+import rocks.theodolite.benchmarks.commons.hazelcastjet.ConfigurationKeys;
+import rocks.theodolite.benchmarks.commons.hazelcastjet.JetInstanceBuilder;
 import theodolite.uc3.application.uc3specifics.HourOfDayKey;
 import theodolite.uc3.application.uc3specifics.HourOfDayKeySerializer;
 
diff --git a/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/Uc3KafkaPropertiesBuilder.java b/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/Uc3KafkaPropertiesBuilder.java
index e2cf9b53f4215047431edae8041e4267c7a2ae39..b2625019f88a9d0a8156e311ed5f5bdb95d399b2 100644
--- a/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/Uc3KafkaPropertiesBuilder.java
+++ b/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/theodolite/uc3/application/Uc3KafkaPropertiesBuilder.java
@@ -7,7 +7,7 @@ import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.clients.producer.ProducerConfig;
 import org.apache.kafka.common.serialization.StringDeserializer;
 import org.apache.kafka.common.serialization.StringSerializer;
-import theodolite.commons.hazelcastjet.ConfigurationKeys;
+import rocks.theodolite.benchmarks.commons.hazelcastjet.ConfigurationKeys;
 
 /**
  * Builds a read and write Properties objects containing the needed kafka properties used for the
diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4HazelcastJetFactory.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4HazelcastJetFactory.java
index 69466250f008b0e8eedffc64a6fc1dce1c670cc5..b0cd0abec0b32b806ebb5a06a35003b6afe75568 100644
--- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4HazelcastJetFactory.java
+++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4HazelcastJetFactory.java
@@ -6,8 +6,8 @@ import com.hazelcast.jet.pipeline.Pipeline;
 import java.util.Objects;
 import java.util.Properties;
 import org.slf4j.Logger;
-import theodolite.commons.hazelcastjet.ConfigurationKeys;
-import theodolite.commons.hazelcastjet.JetInstanceBuilder;
+import rocks.theodolite.benchmarks.commons.hazelcastjet.ConfigurationKeys;
+import rocks.theodolite.benchmarks.commons.hazelcastjet.JetInstanceBuilder;
 import theodolite.uc4.application.uc4specifics.ImmutableSensorRegistryUc4Serializer;
 import theodolite.uc4.application.uc4specifics.SensorGroupKey;
 import theodolite.uc4.application.uc4specifics.SensorGroupKeySerializer;
diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4KafkaPropertiesBuilder.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4KafkaPropertiesBuilder.java
index fe58073734dd2aacd0f21bb7125d3e7b5b898d46..e73e1ae11933c2208e39f26e3b8af689bfb1d516 100644
--- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4KafkaPropertiesBuilder.java
+++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4KafkaPropertiesBuilder.java
@@ -8,7 +8,7 @@ import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.clients.producer.ProducerConfig;
 import org.apache.kafka.common.serialization.StringDeserializer;
 import org.apache.kafka.common.serialization.StringSerializer;
-import theodolite.commons.hazelcastjet.ConfigurationKeys;
+import rocks.theodolite.benchmarks.commons.hazelcastjet.ConfigurationKeys;
 import theodolite.uc4.application.uc4specifics.EventDeserializer;
 
 /**