From 19a56e0b924fdfc5aa1ccd60ab3dfdf7596d4edd Mon Sep 17 00:00:00 2001
From: lorenz <stu203404@mail.uni-kiel.de>
Date: Thu, 14 Apr 2022 14:03:48 +0200
Subject: [PATCH] Respect package structure of #300

---
 .../model/records/ActivePowerRecord.avsc      |  2 +-
 .../records/AggregatedActivePowerRecord.avsc  |  2 +-
 .../records/DayOfWeekActivePowerRecord.avsc   |  2 +-
 .../records/HourOfDayActivePowerRecord.avsc   |  2 +-
 .../records/HourOfWeekActivePowerRecord.avsc  |  2 +-
 .../records/MonthOfYearActivePowerRecord.avsc |  2 +-
 .../model/records/YearActivePowerRecord.avsc  |  2 +-
 .../model/records/ActivePowerRecord.java      | 38 +++++------
 .../records/AggregatedActivePowerRecord.java  | 46 ++++++-------
 .../records/DayOfWeekActivePowerRecord.java   | 62 ++++++++---------
 .../records/HourOfDayActivePowerRecord.java   | 62 ++++++++---------
 .../records/HourOfWeekActivePowerRecord.java  | 66 +++++++++----------
 .../records/MonthOfYearActivePowerRecord.java | 62 ++++++++---------
 .../model/records/YearActivePowerRecord.java  | 62 ++++++++---------
 .../commons/src/main/avro/ActivePower.avdl    |  2 +-
 .../src/main/avro/AggregatedActivePower.avdl  |  2 +-
 .../src/main/avro/StatsActivePower.avdl       |  2 +-
 ...NameResolvingEnvironmentConfiguration.java |  2 +-
 .../configuration/ServiceConfigurations.java  |  2 +-
 .../commons/configuration/events/Event.java   |  4 +-
 .../configuration/events/EventSerde.java      |  2 +-
 .../model/sensorregistry/AbstractSensor.java  |  2 +-
 .../sensorregistry/AggregatedSensor.java      |  2 +-
 .../ImmutableSensorRegistry.java              | 10 +--
 .../model/sensorregistry/MachineSensor.java   |  2 +-
 .../sensorregistry/MachineSensorImpl.java     |  2 +-
 .../MutableAggregatedSensor.java              |  2 +-
 .../sensorregistry/MutableSensorRegistry.java |  8 +--
 .../commons/model/sensorregistry/Sensor.java  |  2 +-
 .../model/sensorregistry/SensorRegistry.java  |  2 +-
 .../AggregatedSensorSerializer.java           |  4 +-
 .../MachineSensorSerializer.java              |  4 +-
 .../SensorRegistryDeserializer.java           | 12 ++--
 .../SensorRegistrySerializer.java             |  4 +-
 34 files changed, 242 insertions(+), 242 deletions(-)
 rename theodolite-benchmarks/commons/src-gen/main/avro/{ => rocks}/theodolite/commons/model/records/ActivePowerRecord.avsc (83%)
 rename theodolite-benchmarks/commons/src-gen/main/avro/{ => rocks}/theodolite/commons/model/records/AggregatedActivePowerRecord.avsc (88%)
 rename theodolite-benchmarks/commons/src-gen/main/avro/{ => rocks}/theodolite/commons/model/records/DayOfWeekActivePowerRecord.avsc (90%)
 rename theodolite-benchmarks/commons/src-gen/main/avro/{ => rocks}/theodolite/commons/model/records/HourOfDayActivePowerRecord.avsc (90%)
 rename theodolite-benchmarks/commons/src-gen/main/avro/{ => rocks}/theodolite/commons/model/records/HourOfWeekActivePowerRecord.avsc (91%)
 rename theodolite-benchmarks/commons/src-gen/main/avro/{ => rocks}/theodolite/commons/model/records/MonthOfYearActivePowerRecord.avsc (90%)
 rename theodolite-benchmarks/commons/src-gen/main/avro/{ => rocks}/theodolite/commons/model/records/YearActivePowerRecord.avsc (90%)
 rename theodolite-benchmarks/commons/src-gen/main/java/{ => rocks}/theodolite/commons/model/records/ActivePowerRecord.java (85%)
 rename theodolite-benchmarks/commons/src-gen/main/java/{ => rocks}/theodolite/commons/model/records/AggregatedActivePowerRecord.java (85%)
 rename theodolite-benchmarks/commons/src-gen/main/java/{ => rocks}/theodolite/commons/model/records/DayOfWeekActivePowerRecord.java (86%)
 rename theodolite-benchmarks/commons/src-gen/main/java/{ => rocks}/theodolite/commons/model/records/HourOfDayActivePowerRecord.java (86%)
 rename theodolite-benchmarks/commons/src-gen/main/java/{ => rocks}/theodolite/commons/model/records/HourOfWeekActivePowerRecord.java (86%)
 rename theodolite-benchmarks/commons/src-gen/main/java/{ => rocks}/theodolite/commons/model/records/MonthOfYearActivePowerRecord.java (86%)
 rename theodolite-benchmarks/commons/src-gen/main/java/{ => rocks}/theodolite/commons/model/records/YearActivePowerRecord.java (86%)
 rename theodolite-benchmarks/commons/src/main/java/{ => rocks}/theodolite/commons/commons/configuration/NameResolvingEnvironmentConfiguration.java (94%)
 rename theodolite-benchmarks/commons/src/main/java/{ => rocks}/theodolite/commons/commons/configuration/ServiceConfigurations.java (98%)
 rename theodolite-benchmarks/commons/src/main/java/{ => rocks}/theodolite/commons/configuration/events/Event.java (65%)
 rename theodolite-benchmarks/commons/src/main/java/{ => rocks}/theodolite/commons/configuration/events/EventSerde.java (97%)
 rename theodolite-benchmarks/commons/src/main/java/{ => rocks}/theodolite/commons/model/sensorregistry/AbstractSensor.java (87%)
 rename theodolite-benchmarks/commons/src/main/java/{ => rocks}/theodolite/commons/model/sensorregistry/AggregatedSensor.java (94%)
 rename theodolite-benchmarks/commons/src/main/java/{ => rocks}/theodolite/commons/model/sensorregistry/ImmutableSensorRegistry.java (89%)
 rename theodolite-benchmarks/commons/src/main/java/{ => rocks}/theodolite/commons/model/sensorregistry/MachineSensor.java (88%)
 rename theodolite-benchmarks/commons/src/main/java/{ => rocks}/theodolite/commons/model/sensorregistry/MachineSensorImpl.java (89%)
 rename theodolite-benchmarks/commons/src/main/java/{ => rocks}/theodolite/commons/model/sensorregistry/MutableAggregatedSensor.java (95%)
 rename theodolite-benchmarks/commons/src/main/java/{ => rocks}/theodolite/commons/model/sensorregistry/MutableSensorRegistry.java (85%)
 rename theodolite-benchmarks/commons/src/main/java/{ => rocks}/theodolite/commons/model/sensorregistry/Sensor.java (75%)
 rename theodolite-benchmarks/commons/src/main/java/{ => rocks}/theodolite/commons/model/sensorregistry/SensorRegistry.java (93%)
 rename theodolite-benchmarks/commons/src/main/java/{ => rocks}/theodolite/commons/model/sensorregistry/serialization/AggregatedSensorSerializer.java (85%)
 rename theodolite-benchmarks/commons/src/main/java/{ => rocks}/theodolite/commons/model/sensorregistry/serialization/MachineSensorSerializer.java (83%)
 rename theodolite-benchmarks/commons/src/main/java/{ => rocks}/theodolite/commons/model/sensorregistry/serialization/SensorRegistryDeserializer.java (90%)
 rename theodolite-benchmarks/commons/src/main/java/{ => rocks}/theodolite/commons/model/sensorregistry/serialization/SensorRegistrySerializer.java (79%)

diff --git a/theodolite-benchmarks/commons/src-gen/main/avro/theodolite/commons/model/records/ActivePowerRecord.avsc b/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/ActivePowerRecord.avsc
similarity index 83%
rename from theodolite-benchmarks/commons/src-gen/main/avro/theodolite/commons/model/records/ActivePowerRecord.avsc
rename to theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/ActivePowerRecord.avsc
index d3b397f98..334ff29af 100644
--- a/theodolite-benchmarks/commons/src-gen/main/avro/theodolite/commons/model/records/ActivePowerRecord.avsc
+++ b/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/ActivePowerRecord.avsc
@@ -1,7 +1,7 @@
 {
   "type" : "record",
   "name" : "ActivePowerRecord",
-  "namespace" : "theodolite.commons.model.records",
+  "namespace" : "rocks.theodolite.commons.model.records",
   "fields" : [ {
     "name" : "identifier",
     "type" : "string",
diff --git a/theodolite-benchmarks/commons/src-gen/main/avro/theodolite/commons/model/records/AggregatedActivePowerRecord.avsc b/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/AggregatedActivePowerRecord.avsc
similarity index 88%
rename from theodolite-benchmarks/commons/src-gen/main/avro/theodolite/commons/model/records/AggregatedActivePowerRecord.avsc
rename to theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/AggregatedActivePowerRecord.avsc
index 294751104..4f5762fb1 100644
--- a/theodolite-benchmarks/commons/src-gen/main/avro/theodolite/commons/model/records/AggregatedActivePowerRecord.avsc
+++ b/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/AggregatedActivePowerRecord.avsc
@@ -1,7 +1,7 @@
 {
   "type" : "record",
   "name" : "AggregatedActivePowerRecord",
-  "namespace" : "theodolite.commons.model.records",
+  "namespace" : "rocks.theodolite.commons.model.records",
   "fields" : [ {
     "name" : "identifier",
     "type" : "string",
diff --git a/theodolite-benchmarks/commons/src-gen/main/avro/theodolite/commons/model/records/DayOfWeekActivePowerRecord.avsc b/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/DayOfWeekActivePowerRecord.avsc
similarity index 90%
rename from theodolite-benchmarks/commons/src-gen/main/avro/theodolite/commons/model/records/DayOfWeekActivePowerRecord.avsc
rename to theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/DayOfWeekActivePowerRecord.avsc
index 4f1c43cda..e879a4df8 100644
--- a/theodolite-benchmarks/commons/src-gen/main/avro/theodolite/commons/model/records/DayOfWeekActivePowerRecord.avsc
+++ b/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/DayOfWeekActivePowerRecord.avsc
@@ -1,7 +1,7 @@
 {
   "type" : "record",
   "name" : "DayOfWeekActivePowerRecord",
-  "namespace" : "theodolite.commons.model.records",
+  "namespace" : "rocks.theodolite.commons.model.records",
   "fields" : [ {
     "name" : "identifier",
     "type" : "string"
diff --git a/theodolite-benchmarks/commons/src-gen/main/avro/theodolite/commons/model/records/HourOfDayActivePowerRecord.avsc b/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/HourOfDayActivePowerRecord.avsc
similarity index 90%
rename from theodolite-benchmarks/commons/src-gen/main/avro/theodolite/commons/model/records/HourOfDayActivePowerRecord.avsc
rename to theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/HourOfDayActivePowerRecord.avsc
index 29cce1306..266a7cf9d 100644
--- a/theodolite-benchmarks/commons/src-gen/main/avro/theodolite/commons/model/records/HourOfDayActivePowerRecord.avsc
+++ b/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/HourOfDayActivePowerRecord.avsc
@@ -1,7 +1,7 @@
 {
   "type" : "record",
   "name" : "HourOfDayActivePowerRecord",
-  "namespace" : "theodolite.commons.model.records",
+  "namespace" : "rocks.theodolite.commons.model.records",
   "fields" : [ {
     "name" : "identifier",
     "type" : "string"
diff --git a/theodolite-benchmarks/commons/src-gen/main/avro/theodolite/commons/model/records/HourOfWeekActivePowerRecord.avsc b/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/HourOfWeekActivePowerRecord.avsc
similarity index 91%
rename from theodolite-benchmarks/commons/src-gen/main/avro/theodolite/commons/model/records/HourOfWeekActivePowerRecord.avsc
rename to theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/HourOfWeekActivePowerRecord.avsc
index 451ddd821..325b1f527 100644
--- a/theodolite-benchmarks/commons/src-gen/main/avro/theodolite/commons/model/records/HourOfWeekActivePowerRecord.avsc
+++ b/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/HourOfWeekActivePowerRecord.avsc
@@ -1,7 +1,7 @@
 {
   "type" : "record",
   "name" : "HourOfWeekActivePowerRecord",
-  "namespace" : "theodolite.commons.model.records",
+  "namespace" : "rocks.theodolite.commons.model.records",
   "fields" : [ {
     "name" : "identifier",
     "type" : "string"
diff --git a/theodolite-benchmarks/commons/src-gen/main/avro/theodolite/commons/model/records/MonthOfYearActivePowerRecord.avsc b/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/MonthOfYearActivePowerRecord.avsc
similarity index 90%
rename from theodolite-benchmarks/commons/src-gen/main/avro/theodolite/commons/model/records/MonthOfYearActivePowerRecord.avsc
rename to theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/MonthOfYearActivePowerRecord.avsc
index 9078ab64f..daf964283 100644
--- a/theodolite-benchmarks/commons/src-gen/main/avro/theodolite/commons/model/records/MonthOfYearActivePowerRecord.avsc
+++ b/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/MonthOfYearActivePowerRecord.avsc
@@ -1,7 +1,7 @@
 {
   "type" : "record",
   "name" : "MonthOfYearActivePowerRecord",
-  "namespace" : "theodolite.commons.model.records",
+  "namespace" : "rocks.theodolite.commons.model.records",
   "fields" : [ {
     "name" : "identifier",
     "type" : "string"
diff --git a/theodolite-benchmarks/commons/src-gen/main/avro/theodolite/commons/model/records/YearActivePowerRecord.avsc b/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/YearActivePowerRecord.avsc
similarity index 90%
rename from theodolite-benchmarks/commons/src-gen/main/avro/theodolite/commons/model/records/YearActivePowerRecord.avsc
rename to theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/YearActivePowerRecord.avsc
index e3da3cdcf..12b071e70 100644
--- a/theodolite-benchmarks/commons/src-gen/main/avro/theodolite/commons/model/records/YearActivePowerRecord.avsc
+++ b/theodolite-benchmarks/commons/src-gen/main/avro/rocks/theodolite/commons/model/records/YearActivePowerRecord.avsc
@@ -1,7 +1,7 @@
 {
   "type" : "record",
   "name" : "YearActivePowerRecord",
-  "namespace" : "theodolite.commons.model.records",
+  "namespace" : "rocks.theodolite.commons.model.records",
   "fields" : [ {
     "name" : "identifier",
     "type" : "string"
diff --git a/theodolite-benchmarks/commons/src-gen/main/java/theodolite/commons/model/records/ActivePowerRecord.java b/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/ActivePowerRecord.java
similarity index 85%
rename from theodolite-benchmarks/commons/src-gen/main/java/theodolite/commons/model/records/ActivePowerRecord.java
rename to theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/ActivePowerRecord.java
index 817e7df17..3754b314b 100644
--- a/theodolite-benchmarks/commons/src-gen/main/java/theodolite/commons/model/records/ActivePowerRecord.java
+++ b/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/ActivePowerRecord.java
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT DIRECTLY
  */
-package theodolite.commons.model.records;
+package rocks.theodolite.commons.model.records;
 
 import org.apache.avro.generic.GenericArray;
 import org.apache.avro.specific.SpecificData;
@@ -14,10 +14,10 @@ import org.apache.avro.message.SchemaStore;
 
 @org.apache.avro.specific.AvroGenerated
 public class ActivePowerRecord extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
-  private static final long serialVersionUID = -4772359879403751266L;
+  private static final long serialVersionUID = 5490311872603136978L;
 
 
-  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"ActivePowerRecord\",\"namespace\":\"theodolite.commons.model.records\",\"fields\":[{\"name\":\"identifier\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"doc\":\"*\"},{\"name\":\"timestamp\",\"type\":\"long\",\"doc\":\"*\"},{\"name\":\"valueInW\",\"type\":\"double\",\"doc\":\"*\"}]}");
+  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"ActivePowerRecord\",\"namespace\":\"rocks.theodolite.commons.model.records\",\"fields\":[{\"name\":\"identifier\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"doc\":\"*\"},{\"name\":\"timestamp\",\"type\":\"long\",\"doc\":\"*\"},{\"name\":\"valueInW\",\"type\":\"double\",\"doc\":\"*\"}]}");
   public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; }
 
   private static final SpecificData MODEL$ = new SpecificData();
@@ -156,8 +156,8 @@ public class ActivePowerRecord extends org.apache.avro.specific.SpecificRecordBa
    * Creates a new ActivePowerRecord RecordBuilder.
    * @return A new ActivePowerRecord RecordBuilder
    */
-  public static theodolite.commons.model.records.ActivePowerRecord.Builder newBuilder() {
-    return new theodolite.commons.model.records.ActivePowerRecord.Builder();
+  public static rocks.theodolite.commons.model.records.ActivePowerRecord.Builder newBuilder() {
+    return new rocks.theodolite.commons.model.records.ActivePowerRecord.Builder();
   }
 
   /**
@@ -165,11 +165,11 @@ public class ActivePowerRecord extends org.apache.avro.specific.SpecificRecordBa
    * @param other The existing builder to copy.
    * @return A new ActivePowerRecord RecordBuilder
    */
-  public static theodolite.commons.model.records.ActivePowerRecord.Builder newBuilder(theodolite.commons.model.records.ActivePowerRecord.Builder other) {
+  public static rocks.theodolite.commons.model.records.ActivePowerRecord.Builder newBuilder(rocks.theodolite.commons.model.records.ActivePowerRecord.Builder other) {
     if (other == null) {
-      return new theodolite.commons.model.records.ActivePowerRecord.Builder();
+      return new rocks.theodolite.commons.model.records.ActivePowerRecord.Builder();
     } else {
-      return new theodolite.commons.model.records.ActivePowerRecord.Builder(other);
+      return new rocks.theodolite.commons.model.records.ActivePowerRecord.Builder(other);
     }
   }
 
@@ -178,11 +178,11 @@ public class ActivePowerRecord extends org.apache.avro.specific.SpecificRecordBa
    * @param other The existing instance to copy.
    * @return A new ActivePowerRecord RecordBuilder
    */
-  public static theodolite.commons.model.records.ActivePowerRecord.Builder newBuilder(theodolite.commons.model.records.ActivePowerRecord other) {
+  public static rocks.theodolite.commons.model.records.ActivePowerRecord.Builder newBuilder(rocks.theodolite.commons.model.records.ActivePowerRecord other) {
     if (other == null) {
-      return new theodolite.commons.model.records.ActivePowerRecord.Builder();
+      return new rocks.theodolite.commons.model.records.ActivePowerRecord.Builder();
     } else {
-      return new theodolite.commons.model.records.ActivePowerRecord.Builder(other);
+      return new rocks.theodolite.commons.model.records.ActivePowerRecord.Builder(other);
     }
   }
 
@@ -209,7 +209,7 @@ public class ActivePowerRecord extends org.apache.avro.specific.SpecificRecordBa
      * Creates a Builder by copying an existing Builder.
      * @param other The existing Builder to copy.
      */
-    private Builder(theodolite.commons.model.records.ActivePowerRecord.Builder other) {
+    private Builder(rocks.theodolite.commons.model.records.ActivePowerRecord.Builder other) {
       super(other);
       if (isValidValue(fields()[0], other.identifier)) {
         this.identifier = data().deepCopy(fields()[0].schema(), other.identifier);
@@ -229,7 +229,7 @@ public class ActivePowerRecord extends org.apache.avro.specific.SpecificRecordBa
      * Creates a Builder by copying an existing ActivePowerRecord instance
      * @param other The existing instance to copy.
      */
-    private Builder(theodolite.commons.model.records.ActivePowerRecord other) {
+    private Builder(rocks.theodolite.commons.model.records.ActivePowerRecord other) {
       super(SCHEMA$, MODEL$);
       if (isValidValue(fields()[0], other.identifier)) {
         this.identifier = data().deepCopy(fields()[0].schema(), other.identifier);
@@ -261,7 +261,7 @@ public class ActivePowerRecord extends org.apache.avro.specific.SpecificRecordBa
       * @param value The value of 'identifier'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.ActivePowerRecord.Builder setIdentifier(java.lang.String value) {
+    public rocks.theodolite.commons.model.records.ActivePowerRecord.Builder setIdentifier(java.lang.String value) {
       validate(fields()[0], value);
       this.identifier = value;
       fieldSetFlags()[0] = true;
@@ -283,7 +283,7 @@ public class ActivePowerRecord extends org.apache.avro.specific.SpecificRecordBa
       * *
       * @return This builder.
       */
-    public theodolite.commons.model.records.ActivePowerRecord.Builder clearIdentifier() {
+    public rocks.theodolite.commons.model.records.ActivePowerRecord.Builder clearIdentifier() {
       identifier = null;
       fieldSetFlags()[0] = false;
       return this;
@@ -305,7 +305,7 @@ public class ActivePowerRecord extends org.apache.avro.specific.SpecificRecordBa
       * @param value The value of 'timestamp'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.ActivePowerRecord.Builder setTimestamp(long value) {
+    public rocks.theodolite.commons.model.records.ActivePowerRecord.Builder setTimestamp(long value) {
       validate(fields()[1], value);
       this.timestamp = value;
       fieldSetFlags()[1] = true;
@@ -327,7 +327,7 @@ public class ActivePowerRecord extends org.apache.avro.specific.SpecificRecordBa
       * *
       * @return This builder.
       */
-    public theodolite.commons.model.records.ActivePowerRecord.Builder clearTimestamp() {
+    public rocks.theodolite.commons.model.records.ActivePowerRecord.Builder clearTimestamp() {
       fieldSetFlags()[1] = false;
       return this;
     }
@@ -348,7 +348,7 @@ public class ActivePowerRecord extends org.apache.avro.specific.SpecificRecordBa
       * @param value The value of 'valueInW'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.ActivePowerRecord.Builder setValueInW(double value) {
+    public rocks.theodolite.commons.model.records.ActivePowerRecord.Builder setValueInW(double value) {
       validate(fields()[2], value);
       this.valueInW = value;
       fieldSetFlags()[2] = true;
@@ -370,7 +370,7 @@ public class ActivePowerRecord extends org.apache.avro.specific.SpecificRecordBa
       * *
       * @return This builder.
       */
-    public theodolite.commons.model.records.ActivePowerRecord.Builder clearValueInW() {
+    public rocks.theodolite.commons.model.records.ActivePowerRecord.Builder clearValueInW() {
       fieldSetFlags()[2] = false;
       return this;
     }
diff --git a/theodolite-benchmarks/commons/src-gen/main/java/theodolite/commons/model/records/AggregatedActivePowerRecord.java b/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/AggregatedActivePowerRecord.java
similarity index 85%
rename from theodolite-benchmarks/commons/src-gen/main/java/theodolite/commons/model/records/AggregatedActivePowerRecord.java
rename to theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/AggregatedActivePowerRecord.java
index 73800ddc2..af52ecff4 100644
--- a/theodolite-benchmarks/commons/src-gen/main/java/theodolite/commons/model/records/AggregatedActivePowerRecord.java
+++ b/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/AggregatedActivePowerRecord.java
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT DIRECTLY
  */
-package theodolite.commons.model.records;
+package rocks.theodolite.commons.model.records;
 
 import org.apache.avro.generic.GenericArray;
 import org.apache.avro.specific.SpecificData;
@@ -14,10 +14,10 @@ import org.apache.avro.message.SchemaStore;
 
 @org.apache.avro.specific.AvroGenerated
 public class AggregatedActivePowerRecord extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
-  private static final long serialVersionUID = 1730295472331295596L;
+  private static final long serialVersionUID = -8754457068762464277L;
 
 
-  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"AggregatedActivePowerRecord\",\"namespace\":\"theodolite.commons.model.records\",\"fields\":[{\"name\":\"identifier\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"doc\":\"*\"},{\"name\":\"timestamp\",\"type\":\"long\",\"doc\":\"*\"},{\"name\":\"count\",\"type\":\"long\",\"doc\":\"*\"},{\"name\":\"sumInW\",\"type\":\"double\",\"doc\":\"*\"},{\"name\":\"averageInW\",\"type\":\"double\",\"doc\":\"*\"}]}");
+  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"AggregatedActivePowerRecord\",\"namespace\":\"rocks.theodolite.commons.model.records\",\"fields\":[{\"name\":\"identifier\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"doc\":\"*\"},{\"name\":\"timestamp\",\"type\":\"long\",\"doc\":\"*\"},{\"name\":\"count\",\"type\":\"long\",\"doc\":\"*\"},{\"name\":\"sumInW\",\"type\":\"double\",\"doc\":\"*\"},{\"name\":\"averageInW\",\"type\":\"double\",\"doc\":\"*\"}]}");
   public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; }
 
   private static final SpecificData MODEL$ = new SpecificData();
@@ -188,8 +188,8 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
    * Creates a new AggregatedActivePowerRecord RecordBuilder.
    * @return A new AggregatedActivePowerRecord RecordBuilder
    */
-  public static theodolite.commons.model.records.AggregatedActivePowerRecord.Builder newBuilder() {
-    return new theodolite.commons.model.records.AggregatedActivePowerRecord.Builder();
+  public static rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder newBuilder() {
+    return new rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder();
   }
 
   /**
@@ -197,11 +197,11 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
    * @param other The existing builder to copy.
    * @return A new AggregatedActivePowerRecord RecordBuilder
    */
-  public static theodolite.commons.model.records.AggregatedActivePowerRecord.Builder newBuilder(theodolite.commons.model.records.AggregatedActivePowerRecord.Builder other) {
+  public static rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder newBuilder(rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder other) {
     if (other == null) {
-      return new theodolite.commons.model.records.AggregatedActivePowerRecord.Builder();
+      return new rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder();
     } else {
-      return new theodolite.commons.model.records.AggregatedActivePowerRecord.Builder(other);
+      return new rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder(other);
     }
   }
 
@@ -210,11 +210,11 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
    * @param other The existing instance to copy.
    * @return A new AggregatedActivePowerRecord RecordBuilder
    */
-  public static theodolite.commons.model.records.AggregatedActivePowerRecord.Builder newBuilder(theodolite.commons.model.records.AggregatedActivePowerRecord other) {
+  public static rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder newBuilder(rocks.theodolite.commons.model.records.AggregatedActivePowerRecord other) {
     if (other == null) {
-      return new theodolite.commons.model.records.AggregatedActivePowerRecord.Builder();
+      return new rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder();
     } else {
-      return new theodolite.commons.model.records.AggregatedActivePowerRecord.Builder(other);
+      return new rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder(other);
     }
   }
 
@@ -245,7 +245,7 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
      * Creates a Builder by copying an existing Builder.
      * @param other The existing Builder to copy.
      */
-    private Builder(theodolite.commons.model.records.AggregatedActivePowerRecord.Builder other) {
+    private Builder(rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder other) {
       super(other);
       if (isValidValue(fields()[0], other.identifier)) {
         this.identifier = data().deepCopy(fields()[0].schema(), other.identifier);
@@ -273,7 +273,7 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
      * Creates a Builder by copying an existing AggregatedActivePowerRecord instance
      * @param other The existing instance to copy.
      */
-    private Builder(theodolite.commons.model.records.AggregatedActivePowerRecord other) {
+    private Builder(rocks.theodolite.commons.model.records.AggregatedActivePowerRecord other) {
       super(SCHEMA$, MODEL$);
       if (isValidValue(fields()[0], other.identifier)) {
         this.identifier = data().deepCopy(fields()[0].schema(), other.identifier);
@@ -313,7 +313,7 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
       * @param value The value of 'identifier'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.AggregatedActivePowerRecord.Builder setIdentifier(java.lang.String value) {
+    public rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder setIdentifier(java.lang.String value) {
       validate(fields()[0], value);
       this.identifier = value;
       fieldSetFlags()[0] = true;
@@ -335,7 +335,7 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
       * *
       * @return This builder.
       */
-    public theodolite.commons.model.records.AggregatedActivePowerRecord.Builder clearIdentifier() {
+    public rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder clearIdentifier() {
       identifier = null;
       fieldSetFlags()[0] = false;
       return this;
@@ -357,7 +357,7 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
       * @param value The value of 'timestamp'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.AggregatedActivePowerRecord.Builder setTimestamp(long value) {
+    public rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder setTimestamp(long value) {
       validate(fields()[1], value);
       this.timestamp = value;
       fieldSetFlags()[1] = true;
@@ -379,7 +379,7 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
       * *
       * @return This builder.
       */
-    public theodolite.commons.model.records.AggregatedActivePowerRecord.Builder clearTimestamp() {
+    public rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder clearTimestamp() {
       fieldSetFlags()[1] = false;
       return this;
     }
@@ -400,7 +400,7 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
       * @param value The value of 'count'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.AggregatedActivePowerRecord.Builder setCount(long value) {
+    public rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder setCount(long value) {
       validate(fields()[2], value);
       this.count = value;
       fieldSetFlags()[2] = true;
@@ -422,7 +422,7 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
       * *
       * @return This builder.
       */
-    public theodolite.commons.model.records.AggregatedActivePowerRecord.Builder clearCount() {
+    public rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder clearCount() {
       fieldSetFlags()[2] = false;
       return this;
     }
@@ -443,7 +443,7 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
       * @param value The value of 'sumInW'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.AggregatedActivePowerRecord.Builder setSumInW(double value) {
+    public rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder setSumInW(double value) {
       validate(fields()[3], value);
       this.sumInW = value;
       fieldSetFlags()[3] = true;
@@ -465,7 +465,7 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
       * *
       * @return This builder.
       */
-    public theodolite.commons.model.records.AggregatedActivePowerRecord.Builder clearSumInW() {
+    public rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder clearSumInW() {
       fieldSetFlags()[3] = false;
       return this;
     }
@@ -486,7 +486,7 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
       * @param value The value of 'averageInW'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.AggregatedActivePowerRecord.Builder setAverageInW(double value) {
+    public rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder setAverageInW(double value) {
       validate(fields()[4], value);
       this.averageInW = value;
       fieldSetFlags()[4] = true;
@@ -508,7 +508,7 @@ public class AggregatedActivePowerRecord extends org.apache.avro.specific.Specif
       * *
       * @return This builder.
       */
-    public theodolite.commons.model.records.AggregatedActivePowerRecord.Builder clearAverageInW() {
+    public rocks.theodolite.commons.model.records.AggregatedActivePowerRecord.Builder clearAverageInW() {
       fieldSetFlags()[4] = false;
       return this;
     }
diff --git a/theodolite-benchmarks/commons/src-gen/main/java/theodolite/commons/model/records/DayOfWeekActivePowerRecord.java b/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/DayOfWeekActivePowerRecord.java
similarity index 86%
rename from theodolite-benchmarks/commons/src-gen/main/java/theodolite/commons/model/records/DayOfWeekActivePowerRecord.java
rename to theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/DayOfWeekActivePowerRecord.java
index 2cf0c3d88..bc7659649 100644
--- a/theodolite-benchmarks/commons/src-gen/main/java/theodolite/commons/model/records/DayOfWeekActivePowerRecord.java
+++ b/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/DayOfWeekActivePowerRecord.java
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT DIRECTLY
  */
-package theodolite.commons.model.records;
+package rocks.theodolite.commons.model.records;
 
 import org.apache.avro.generic.GenericArray;
 import org.apache.avro.specific.SpecificData;
@@ -14,10 +14,10 @@ import org.apache.avro.message.SchemaStore;
 
 @org.apache.avro.specific.AvroGenerated
 public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
-  private static final long serialVersionUID = -758726405664358568L;
+  private static final long serialVersionUID = 4537540003856933738L;
 
 
-  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"DayOfWeekActivePowerRecord\",\"namespace\":\"theodolite.commons.model.records\",\"fields\":[{\"name\":\"identifier\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"dayOfWeek\",\"type\":\"int\"},{\"name\":\"periodStart\",\"type\":\"long\"},{\"name\":\"periodEnd\",\"type\":\"long\"},{\"name\":\"count\",\"type\":\"long\"},{\"name\":\"mean\",\"type\":\"double\"},{\"name\":\"populationVariance\",\"type\":\"double\"},{\"name\":\"min\",\"type\":\"double\"},{\"name\":\"max\",\"type\":\"double\"}]}");
+  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"DayOfWeekActivePowerRecord\",\"namespace\":\"rocks.theodolite.commons.model.records\",\"fields\":[{\"name\":\"identifier\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"dayOfWeek\",\"type\":\"int\"},{\"name\":\"periodStart\",\"type\":\"long\"},{\"name\":\"periodEnd\",\"type\":\"long\"},{\"name\":\"count\",\"type\":\"long\"},{\"name\":\"mean\",\"type\":\"double\"},{\"name\":\"populationVariance\",\"type\":\"double\"},{\"name\":\"min\",\"type\":\"double\"},{\"name\":\"max\",\"type\":\"double\"}]}");
   public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; }
 
   private static final SpecificData MODEL$ = new SpecificData();
@@ -243,8 +243,8 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
    * Creates a new DayOfWeekActivePowerRecord RecordBuilder.
    * @return A new DayOfWeekActivePowerRecord RecordBuilder
    */
-  public static theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder newBuilder() {
-    return new theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder();
+  public static rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder newBuilder() {
+    return new rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder();
   }
 
   /**
@@ -252,11 +252,11 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
    * @param other The existing builder to copy.
    * @return A new DayOfWeekActivePowerRecord RecordBuilder
    */
-  public static theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder newBuilder(theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder other) {
+  public static rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder newBuilder(rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder other) {
     if (other == null) {
-      return new theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder();
+      return new rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder();
     } else {
-      return new theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder(other);
+      return new rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder(other);
     }
   }
 
@@ -265,11 +265,11 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
    * @param other The existing instance to copy.
    * @return A new DayOfWeekActivePowerRecord RecordBuilder
    */
-  public static theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder newBuilder(theodolite.commons.model.records.DayOfWeekActivePowerRecord other) {
+  public static rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder newBuilder(rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord other) {
     if (other == null) {
-      return new theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder();
+      return new rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder();
     } else {
-      return new theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder(other);
+      return new rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder(other);
     }
   }
 
@@ -299,7 +299,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
      * Creates a Builder by copying an existing Builder.
      * @param other The existing Builder to copy.
      */
-    private Builder(theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder other) {
+    private Builder(rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder other) {
       super(other);
       if (isValidValue(fields()[0], other.identifier)) {
         this.identifier = data().deepCopy(fields()[0].schema(), other.identifier);
@@ -343,7 +343,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
      * Creates a Builder by copying an existing DayOfWeekActivePowerRecord instance
      * @param other The existing instance to copy.
      */
-    private Builder(theodolite.commons.model.records.DayOfWeekActivePowerRecord other) {
+    private Builder(rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord other) {
       super(SCHEMA$, MODEL$);
       if (isValidValue(fields()[0], other.identifier)) {
         this.identifier = data().deepCopy(fields()[0].schema(), other.identifier);
@@ -397,7 +397,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
       * @param value The value of 'identifier'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder setIdentifier(java.lang.String value) {
+    public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder setIdentifier(java.lang.String value) {
       validate(fields()[0], value);
       this.identifier = value;
       fieldSetFlags()[0] = true;
@@ -417,7 +417,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
       * Clears the value of the 'identifier' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder clearIdentifier() {
+    public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder clearIdentifier() {
       identifier = null;
       fieldSetFlags()[0] = false;
       return this;
@@ -437,7 +437,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
       * @param value The value of 'dayOfWeek'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder setDayOfWeek(int value) {
+    public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder setDayOfWeek(int value) {
       validate(fields()[1], value);
       this.dayOfWeek = value;
       fieldSetFlags()[1] = true;
@@ -457,7 +457,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
       * Clears the value of the 'dayOfWeek' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder clearDayOfWeek() {
+    public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder clearDayOfWeek() {
       fieldSetFlags()[1] = false;
       return this;
     }
@@ -476,7 +476,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
       * @param value The value of 'periodStart'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder setPeriodStart(long value) {
+    public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder setPeriodStart(long value) {
       validate(fields()[2], value);
       this.periodStart = value;
       fieldSetFlags()[2] = true;
@@ -496,7 +496,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
       * Clears the value of the 'periodStart' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder clearPeriodStart() {
+    public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder clearPeriodStart() {
       fieldSetFlags()[2] = false;
       return this;
     }
@@ -515,7 +515,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
       * @param value The value of 'periodEnd'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder setPeriodEnd(long value) {
+    public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder setPeriodEnd(long value) {
       validate(fields()[3], value);
       this.periodEnd = value;
       fieldSetFlags()[3] = true;
@@ -535,7 +535,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
       * Clears the value of the 'periodEnd' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder clearPeriodEnd() {
+    public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder clearPeriodEnd() {
       fieldSetFlags()[3] = false;
       return this;
     }
@@ -554,7 +554,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
       * @param value The value of 'count'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder setCount(long value) {
+    public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder setCount(long value) {
       validate(fields()[4], value);
       this.count = value;
       fieldSetFlags()[4] = true;
@@ -574,7 +574,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
       * Clears the value of the 'count' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder clearCount() {
+    public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder clearCount() {
       fieldSetFlags()[4] = false;
       return this;
     }
@@ -593,7 +593,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
       * @param value The value of 'mean'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder setMean(double value) {
+    public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder setMean(double value) {
       validate(fields()[5], value);
       this.mean = value;
       fieldSetFlags()[5] = true;
@@ -613,7 +613,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
       * Clears the value of the 'mean' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder clearMean() {
+    public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder clearMean() {
       fieldSetFlags()[5] = false;
       return this;
     }
@@ -632,7 +632,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
       * @param value The value of 'populationVariance'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder setPopulationVariance(double value) {
+    public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder setPopulationVariance(double value) {
       validate(fields()[6], value);
       this.populationVariance = value;
       fieldSetFlags()[6] = true;
@@ -652,7 +652,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
       * Clears the value of the 'populationVariance' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder clearPopulationVariance() {
+    public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder clearPopulationVariance() {
       fieldSetFlags()[6] = false;
       return this;
     }
@@ -671,7 +671,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
       * @param value The value of 'min'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder setMin(double value) {
+    public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder setMin(double value) {
       validate(fields()[7], value);
       this.min = value;
       fieldSetFlags()[7] = true;
@@ -691,7 +691,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
       * Clears the value of the 'min' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder clearMin() {
+    public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder clearMin() {
       fieldSetFlags()[7] = false;
       return this;
     }
@@ -710,7 +710,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
       * @param value The value of 'max'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder setMax(double value) {
+    public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder setMax(double value) {
       validate(fields()[8], value);
       this.max = value;
       fieldSetFlags()[8] = true;
@@ -730,7 +730,7 @@ public class DayOfWeekActivePowerRecord extends org.apache.avro.specific.Specifi
       * Clears the value of the 'max' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder clearMax() {
+    public rocks.theodolite.commons.model.records.DayOfWeekActivePowerRecord.Builder clearMax() {
       fieldSetFlags()[8] = false;
       return this;
     }
diff --git a/theodolite-benchmarks/commons/src-gen/main/java/theodolite/commons/model/records/HourOfDayActivePowerRecord.java b/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/HourOfDayActivePowerRecord.java
similarity index 86%
rename from theodolite-benchmarks/commons/src-gen/main/java/theodolite/commons/model/records/HourOfDayActivePowerRecord.java
rename to theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/HourOfDayActivePowerRecord.java
index 77a61394b..2ab363dff 100644
--- a/theodolite-benchmarks/commons/src-gen/main/java/theodolite/commons/model/records/HourOfDayActivePowerRecord.java
+++ b/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/HourOfDayActivePowerRecord.java
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT DIRECTLY
  */
-package theodolite.commons.model.records;
+package rocks.theodolite.commons.model.records;
 
 import org.apache.avro.generic.GenericArray;
 import org.apache.avro.specific.SpecificData;
@@ -14,10 +14,10 @@ import org.apache.avro.message.SchemaStore;
 
 @org.apache.avro.specific.AvroGenerated
 public class HourOfDayActivePowerRecord extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
-  private static final long serialVersionUID = -6848505675940050496L;
+  private static final long serialVersionUID = 7743335456275043826L;
 
 
-  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"HourOfDayActivePowerRecord\",\"namespace\":\"theodolite.commons.model.records\",\"fields\":[{\"name\":\"identifier\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"hourOfDay\",\"type\":\"int\"},{\"name\":\"periodStart\",\"type\":\"long\"},{\"name\":\"periodEnd\",\"type\":\"long\"},{\"name\":\"count\",\"type\":\"long\"},{\"name\":\"mean\",\"type\":\"double\"},{\"name\":\"populationVariance\",\"type\":\"double\"},{\"name\":\"min\",\"type\":\"double\"},{\"name\":\"max\",\"type\":\"double\"}]}");
+  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"HourOfDayActivePowerRecord\",\"namespace\":\"rocks.theodolite.commons.model.records\",\"fields\":[{\"name\":\"identifier\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"hourOfDay\",\"type\":\"int\"},{\"name\":\"periodStart\",\"type\":\"long\"},{\"name\":\"periodEnd\",\"type\":\"long\"},{\"name\":\"count\",\"type\":\"long\"},{\"name\":\"mean\",\"type\":\"double\"},{\"name\":\"populationVariance\",\"type\":\"double\"},{\"name\":\"min\",\"type\":\"double\"},{\"name\":\"max\",\"type\":\"double\"}]}");
   public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; }
 
   private static final SpecificData MODEL$ = new SpecificData();
@@ -243,8 +243,8 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
    * Creates a new HourOfDayActivePowerRecord RecordBuilder.
    * @return A new HourOfDayActivePowerRecord RecordBuilder
    */
-  public static theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder newBuilder() {
-    return new theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder();
+  public static rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder newBuilder() {
+    return new rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder();
   }
 
   /**
@@ -252,11 +252,11 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
    * @param other The existing builder to copy.
    * @return A new HourOfDayActivePowerRecord RecordBuilder
    */
-  public static theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder newBuilder(theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder other) {
+  public static rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder newBuilder(rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder other) {
     if (other == null) {
-      return new theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder();
+      return new rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder();
     } else {
-      return new theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder(other);
+      return new rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder(other);
     }
   }
 
@@ -265,11 +265,11 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
    * @param other The existing instance to copy.
    * @return A new HourOfDayActivePowerRecord RecordBuilder
    */
-  public static theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder newBuilder(theodolite.commons.model.records.HourOfDayActivePowerRecord other) {
+  public static rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder newBuilder(rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord other) {
     if (other == null) {
-      return new theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder();
+      return new rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder();
     } else {
-      return new theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder(other);
+      return new rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder(other);
     }
   }
 
@@ -299,7 +299,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
      * Creates a Builder by copying an existing Builder.
      * @param other The existing Builder to copy.
      */
-    private Builder(theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder other) {
+    private Builder(rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder other) {
       super(other);
       if (isValidValue(fields()[0], other.identifier)) {
         this.identifier = data().deepCopy(fields()[0].schema(), other.identifier);
@@ -343,7 +343,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
      * Creates a Builder by copying an existing HourOfDayActivePowerRecord instance
      * @param other The existing instance to copy.
      */
-    private Builder(theodolite.commons.model.records.HourOfDayActivePowerRecord other) {
+    private Builder(rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord other) {
       super(SCHEMA$, MODEL$);
       if (isValidValue(fields()[0], other.identifier)) {
         this.identifier = data().deepCopy(fields()[0].schema(), other.identifier);
@@ -397,7 +397,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
       * @param value The value of 'identifier'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder setIdentifier(java.lang.String value) {
+    public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder setIdentifier(java.lang.String value) {
       validate(fields()[0], value);
       this.identifier = value;
       fieldSetFlags()[0] = true;
@@ -417,7 +417,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
       * Clears the value of the 'identifier' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder clearIdentifier() {
+    public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder clearIdentifier() {
       identifier = null;
       fieldSetFlags()[0] = false;
       return this;
@@ -437,7 +437,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
       * @param value The value of 'hourOfDay'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder setHourOfDay(int value) {
+    public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder setHourOfDay(int value) {
       validate(fields()[1], value);
       this.hourOfDay = value;
       fieldSetFlags()[1] = true;
@@ -457,7 +457,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
       * Clears the value of the 'hourOfDay' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder clearHourOfDay() {
+    public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder clearHourOfDay() {
       fieldSetFlags()[1] = false;
       return this;
     }
@@ -476,7 +476,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
       * @param value The value of 'periodStart'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder setPeriodStart(long value) {
+    public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder setPeriodStart(long value) {
       validate(fields()[2], value);
       this.periodStart = value;
       fieldSetFlags()[2] = true;
@@ -496,7 +496,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
       * Clears the value of the 'periodStart' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder clearPeriodStart() {
+    public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder clearPeriodStart() {
       fieldSetFlags()[2] = false;
       return this;
     }
@@ -515,7 +515,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
       * @param value The value of 'periodEnd'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder setPeriodEnd(long value) {
+    public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder setPeriodEnd(long value) {
       validate(fields()[3], value);
       this.periodEnd = value;
       fieldSetFlags()[3] = true;
@@ -535,7 +535,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
       * Clears the value of the 'periodEnd' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder clearPeriodEnd() {
+    public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder clearPeriodEnd() {
       fieldSetFlags()[3] = false;
       return this;
     }
@@ -554,7 +554,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
       * @param value The value of 'count'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder setCount(long value) {
+    public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder setCount(long value) {
       validate(fields()[4], value);
       this.count = value;
       fieldSetFlags()[4] = true;
@@ -574,7 +574,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
       * Clears the value of the 'count' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder clearCount() {
+    public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder clearCount() {
       fieldSetFlags()[4] = false;
       return this;
     }
@@ -593,7 +593,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
       * @param value The value of 'mean'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder setMean(double value) {
+    public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder setMean(double value) {
       validate(fields()[5], value);
       this.mean = value;
       fieldSetFlags()[5] = true;
@@ -613,7 +613,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
       * Clears the value of the 'mean' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder clearMean() {
+    public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder clearMean() {
       fieldSetFlags()[5] = false;
       return this;
     }
@@ -632,7 +632,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
       * @param value The value of 'populationVariance'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder setPopulationVariance(double value) {
+    public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder setPopulationVariance(double value) {
       validate(fields()[6], value);
       this.populationVariance = value;
       fieldSetFlags()[6] = true;
@@ -652,7 +652,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
       * Clears the value of the 'populationVariance' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder clearPopulationVariance() {
+    public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder clearPopulationVariance() {
       fieldSetFlags()[6] = false;
       return this;
     }
@@ -671,7 +671,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
       * @param value The value of 'min'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder setMin(double value) {
+    public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder setMin(double value) {
       validate(fields()[7], value);
       this.min = value;
       fieldSetFlags()[7] = true;
@@ -691,7 +691,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
       * Clears the value of the 'min' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder clearMin() {
+    public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder clearMin() {
       fieldSetFlags()[7] = false;
       return this;
     }
@@ -710,7 +710,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
       * @param value The value of 'max'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder setMax(double value) {
+    public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder setMax(double value) {
       validate(fields()[8], value);
       this.max = value;
       fieldSetFlags()[8] = true;
@@ -730,7 +730,7 @@ public class HourOfDayActivePowerRecord extends org.apache.avro.specific.Specifi
       * Clears the value of the 'max' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder clearMax() {
+    public rocks.theodolite.commons.model.records.HourOfDayActivePowerRecord.Builder clearMax() {
       fieldSetFlags()[8] = false;
       return this;
     }
diff --git a/theodolite-benchmarks/commons/src-gen/main/java/theodolite/commons/model/records/HourOfWeekActivePowerRecord.java b/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/HourOfWeekActivePowerRecord.java
similarity index 86%
rename from theodolite-benchmarks/commons/src-gen/main/java/theodolite/commons/model/records/HourOfWeekActivePowerRecord.java
rename to theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/HourOfWeekActivePowerRecord.java
index a9ad313cf..818c5558a 100644
--- a/theodolite-benchmarks/commons/src-gen/main/java/theodolite/commons/model/records/HourOfWeekActivePowerRecord.java
+++ b/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/HourOfWeekActivePowerRecord.java
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT DIRECTLY
  */
-package theodolite.commons.model.records;
+package rocks.theodolite.commons.model.records;
 
 import org.apache.avro.generic.GenericArray;
 import org.apache.avro.specific.SpecificData;
@@ -14,10 +14,10 @@ import org.apache.avro.message.SchemaStore;
 
 @org.apache.avro.specific.AvroGenerated
 public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
-  private static final long serialVersionUID = 170760910567947295L;
+  private static final long serialVersionUID = 2784889086011309745L;
 
 
-  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"HourOfWeekActivePowerRecord\",\"namespace\":\"theodolite.commons.model.records\",\"fields\":[{\"name\":\"identifier\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"dayOfWeek\",\"type\":\"int\"},{\"name\":\"hourOfDay\",\"type\":\"int\"},{\"name\":\"periodStart\",\"type\":\"long\"},{\"name\":\"periodEnd\",\"type\":\"long\"},{\"name\":\"count\",\"type\":\"long\"},{\"name\":\"mean\",\"type\":\"double\"},{\"name\":\"populationVariance\",\"type\":\"double\"},{\"name\":\"min\",\"type\":\"double\"},{\"name\":\"max\",\"type\":\"double\"}]}");
+  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"HourOfWeekActivePowerRecord\",\"namespace\":\"rocks.theodolite.commons.model.records\",\"fields\":[{\"name\":\"identifier\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"dayOfWeek\",\"type\":\"int\"},{\"name\":\"hourOfDay\",\"type\":\"int\"},{\"name\":\"periodStart\",\"type\":\"long\"},{\"name\":\"periodEnd\",\"type\":\"long\"},{\"name\":\"count\",\"type\":\"long\"},{\"name\":\"mean\",\"type\":\"double\"},{\"name\":\"populationVariance\",\"type\":\"double\"},{\"name\":\"min\",\"type\":\"double\"},{\"name\":\"max\",\"type\":\"double\"}]}");
   public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; }
 
   private static final SpecificData MODEL$ = new SpecificData();
@@ -258,8 +258,8 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
    * Creates a new HourOfWeekActivePowerRecord RecordBuilder.
    * @return A new HourOfWeekActivePowerRecord RecordBuilder
    */
-  public static theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder newBuilder() {
-    return new theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder();
+  public static rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder newBuilder() {
+    return new rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder();
   }
 
   /**
@@ -267,11 +267,11 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
    * @param other The existing builder to copy.
    * @return A new HourOfWeekActivePowerRecord RecordBuilder
    */
-  public static theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder newBuilder(theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder other) {
+  public static rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder newBuilder(rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder other) {
     if (other == null) {
-      return new theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder();
+      return new rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder();
     } else {
-      return new theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder(other);
+      return new rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder(other);
     }
   }
 
@@ -280,11 +280,11 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
    * @param other The existing instance to copy.
    * @return A new HourOfWeekActivePowerRecord RecordBuilder
    */
-  public static theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder newBuilder(theodolite.commons.model.records.HourOfWeekActivePowerRecord other) {
+  public static rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder newBuilder(rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord other) {
     if (other == null) {
-      return new theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder();
+      return new rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder();
     } else {
-      return new theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder(other);
+      return new rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder(other);
     }
   }
 
@@ -315,7 +315,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
      * Creates a Builder by copying an existing Builder.
      * @param other The existing Builder to copy.
      */
-    private Builder(theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder other) {
+    private Builder(rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder other) {
       super(other);
       if (isValidValue(fields()[0], other.identifier)) {
         this.identifier = data().deepCopy(fields()[0].schema(), other.identifier);
@@ -363,7 +363,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
      * Creates a Builder by copying an existing HourOfWeekActivePowerRecord instance
      * @param other The existing instance to copy.
      */
-    private Builder(theodolite.commons.model.records.HourOfWeekActivePowerRecord other) {
+    private Builder(rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord other) {
       super(SCHEMA$, MODEL$);
       if (isValidValue(fields()[0], other.identifier)) {
         this.identifier = data().deepCopy(fields()[0].schema(), other.identifier);
@@ -421,7 +421,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
       * @param value The value of 'identifier'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setIdentifier(java.lang.String value) {
+    public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setIdentifier(java.lang.String value) {
       validate(fields()[0], value);
       this.identifier = value;
       fieldSetFlags()[0] = true;
@@ -441,7 +441,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
       * Clears the value of the 'identifier' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearIdentifier() {
+    public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearIdentifier() {
       identifier = null;
       fieldSetFlags()[0] = false;
       return this;
@@ -461,7 +461,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
       * @param value The value of 'dayOfWeek'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setDayOfWeek(int value) {
+    public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setDayOfWeek(int value) {
       validate(fields()[1], value);
       this.dayOfWeek = value;
       fieldSetFlags()[1] = true;
@@ -481,7 +481,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
       * Clears the value of the 'dayOfWeek' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearDayOfWeek() {
+    public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearDayOfWeek() {
       fieldSetFlags()[1] = false;
       return this;
     }
@@ -500,7 +500,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
       * @param value The value of 'hourOfDay'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setHourOfDay(int value) {
+    public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setHourOfDay(int value) {
       validate(fields()[2], value);
       this.hourOfDay = value;
       fieldSetFlags()[2] = true;
@@ -520,7 +520,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
       * Clears the value of the 'hourOfDay' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearHourOfDay() {
+    public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearHourOfDay() {
       fieldSetFlags()[2] = false;
       return this;
     }
@@ -539,7 +539,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
       * @param value The value of 'periodStart'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setPeriodStart(long value) {
+    public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setPeriodStart(long value) {
       validate(fields()[3], value);
       this.periodStart = value;
       fieldSetFlags()[3] = true;
@@ -559,7 +559,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
       * Clears the value of the 'periodStart' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearPeriodStart() {
+    public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearPeriodStart() {
       fieldSetFlags()[3] = false;
       return this;
     }
@@ -578,7 +578,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
       * @param value The value of 'periodEnd'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setPeriodEnd(long value) {
+    public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setPeriodEnd(long value) {
       validate(fields()[4], value);
       this.periodEnd = value;
       fieldSetFlags()[4] = true;
@@ -598,7 +598,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
       * Clears the value of the 'periodEnd' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearPeriodEnd() {
+    public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearPeriodEnd() {
       fieldSetFlags()[4] = false;
       return this;
     }
@@ -617,7 +617,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
       * @param value The value of 'count'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setCount(long value) {
+    public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setCount(long value) {
       validate(fields()[5], value);
       this.count = value;
       fieldSetFlags()[5] = true;
@@ -637,7 +637,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
       * Clears the value of the 'count' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearCount() {
+    public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearCount() {
       fieldSetFlags()[5] = false;
       return this;
     }
@@ -656,7 +656,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
       * @param value The value of 'mean'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setMean(double value) {
+    public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setMean(double value) {
       validate(fields()[6], value);
       this.mean = value;
       fieldSetFlags()[6] = true;
@@ -676,7 +676,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
       * Clears the value of the 'mean' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearMean() {
+    public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearMean() {
       fieldSetFlags()[6] = false;
       return this;
     }
@@ -695,7 +695,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
       * @param value The value of 'populationVariance'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setPopulationVariance(double value) {
+    public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setPopulationVariance(double value) {
       validate(fields()[7], value);
       this.populationVariance = value;
       fieldSetFlags()[7] = true;
@@ -715,7 +715,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
       * Clears the value of the 'populationVariance' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearPopulationVariance() {
+    public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearPopulationVariance() {
       fieldSetFlags()[7] = false;
       return this;
     }
@@ -734,7 +734,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
       * @param value The value of 'min'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setMin(double value) {
+    public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setMin(double value) {
       validate(fields()[8], value);
       this.min = value;
       fieldSetFlags()[8] = true;
@@ -754,7 +754,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
       * Clears the value of the 'min' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearMin() {
+    public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearMin() {
       fieldSetFlags()[8] = false;
       return this;
     }
@@ -773,7 +773,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
       * @param value The value of 'max'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setMax(double value) {
+    public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder setMax(double value) {
       validate(fields()[9], value);
       this.max = value;
       fieldSetFlags()[9] = true;
@@ -793,7 +793,7 @@ public class HourOfWeekActivePowerRecord extends org.apache.avro.specific.Specif
       * Clears the value of the 'max' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearMax() {
+    public rocks.theodolite.commons.model.records.HourOfWeekActivePowerRecord.Builder clearMax() {
       fieldSetFlags()[9] = false;
       return this;
     }
diff --git a/theodolite-benchmarks/commons/src-gen/main/java/theodolite/commons/model/records/MonthOfYearActivePowerRecord.java b/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/MonthOfYearActivePowerRecord.java
similarity index 86%
rename from theodolite-benchmarks/commons/src-gen/main/java/theodolite/commons/model/records/MonthOfYearActivePowerRecord.java
rename to theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/MonthOfYearActivePowerRecord.java
index de85dc080..07e7415aa 100644
--- a/theodolite-benchmarks/commons/src-gen/main/java/theodolite/commons/model/records/MonthOfYearActivePowerRecord.java
+++ b/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/MonthOfYearActivePowerRecord.java
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT DIRECTLY
  */
-package theodolite.commons.model.records;
+package rocks.theodolite.commons.model.records;
 
 import org.apache.avro.generic.GenericArray;
 import org.apache.avro.specific.SpecificData;
@@ -14,10 +14,10 @@ import org.apache.avro.message.SchemaStore;
 
 @org.apache.avro.specific.AvroGenerated
 public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
-  private static final long serialVersionUID = -3792500930026789769L;
+  private static final long serialVersionUID = -7083099557783425969L;
 
 
-  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"MonthOfYearActivePowerRecord\",\"namespace\":\"theodolite.commons.model.records\",\"fields\":[{\"name\":\"identifier\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"monthOfYear\",\"type\":\"int\"},{\"name\":\"periodStart\",\"type\":\"long\"},{\"name\":\"periodEnd\",\"type\":\"long\"},{\"name\":\"count\",\"type\":\"long\"},{\"name\":\"mean\",\"type\":\"double\"},{\"name\":\"populationVariance\",\"type\":\"double\"},{\"name\":\"min\",\"type\":\"double\"},{\"name\":\"max\",\"type\":\"double\"}]}");
+  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"MonthOfYearActivePowerRecord\",\"namespace\":\"rocks.theodolite.commons.model.records\",\"fields\":[{\"name\":\"identifier\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"monthOfYear\",\"type\":\"int\"},{\"name\":\"periodStart\",\"type\":\"long\"},{\"name\":\"periodEnd\",\"type\":\"long\"},{\"name\":\"count\",\"type\":\"long\"},{\"name\":\"mean\",\"type\":\"double\"},{\"name\":\"populationVariance\",\"type\":\"double\"},{\"name\":\"min\",\"type\":\"double\"},{\"name\":\"max\",\"type\":\"double\"}]}");
   public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; }
 
   private static final SpecificData MODEL$ = new SpecificData();
@@ -243,8 +243,8 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
    * Creates a new MonthOfYearActivePowerRecord RecordBuilder.
    * @return A new MonthOfYearActivePowerRecord RecordBuilder
    */
-  public static theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder newBuilder() {
-    return new theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder();
+  public static rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder newBuilder() {
+    return new rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder();
   }
 
   /**
@@ -252,11 +252,11 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
    * @param other The existing builder to copy.
    * @return A new MonthOfYearActivePowerRecord RecordBuilder
    */
-  public static theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder newBuilder(theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder other) {
+  public static rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder newBuilder(rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder other) {
     if (other == null) {
-      return new theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder();
+      return new rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder();
     } else {
-      return new theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder(other);
+      return new rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder(other);
     }
   }
 
@@ -265,11 +265,11 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
    * @param other The existing instance to copy.
    * @return A new MonthOfYearActivePowerRecord RecordBuilder
    */
-  public static theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder newBuilder(theodolite.commons.model.records.MonthOfYearActivePowerRecord other) {
+  public static rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder newBuilder(rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord other) {
     if (other == null) {
-      return new theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder();
+      return new rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder();
     } else {
-      return new theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder(other);
+      return new rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder(other);
     }
   }
 
@@ -299,7 +299,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
      * Creates a Builder by copying an existing Builder.
      * @param other The existing Builder to copy.
      */
-    private Builder(theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder other) {
+    private Builder(rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder other) {
       super(other);
       if (isValidValue(fields()[0], other.identifier)) {
         this.identifier = data().deepCopy(fields()[0].schema(), other.identifier);
@@ -343,7 +343,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
      * Creates a Builder by copying an existing MonthOfYearActivePowerRecord instance
      * @param other The existing instance to copy.
      */
-    private Builder(theodolite.commons.model.records.MonthOfYearActivePowerRecord other) {
+    private Builder(rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord other) {
       super(SCHEMA$, MODEL$);
       if (isValidValue(fields()[0], other.identifier)) {
         this.identifier = data().deepCopy(fields()[0].schema(), other.identifier);
@@ -397,7 +397,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
       * @param value The value of 'identifier'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder setIdentifier(java.lang.String value) {
+    public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder setIdentifier(java.lang.String value) {
       validate(fields()[0], value);
       this.identifier = value;
       fieldSetFlags()[0] = true;
@@ -417,7 +417,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
       * Clears the value of the 'identifier' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder clearIdentifier() {
+    public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder clearIdentifier() {
       identifier = null;
       fieldSetFlags()[0] = false;
       return this;
@@ -437,7 +437,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
       * @param value The value of 'monthOfYear'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder setMonthOfYear(int value) {
+    public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder setMonthOfYear(int value) {
       validate(fields()[1], value);
       this.monthOfYear = value;
       fieldSetFlags()[1] = true;
@@ -457,7 +457,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
       * Clears the value of the 'monthOfYear' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder clearMonthOfYear() {
+    public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder clearMonthOfYear() {
       fieldSetFlags()[1] = false;
       return this;
     }
@@ -476,7 +476,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
       * @param value The value of 'periodStart'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder setPeriodStart(long value) {
+    public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder setPeriodStart(long value) {
       validate(fields()[2], value);
       this.periodStart = value;
       fieldSetFlags()[2] = true;
@@ -496,7 +496,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
       * Clears the value of the 'periodStart' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder clearPeriodStart() {
+    public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder clearPeriodStart() {
       fieldSetFlags()[2] = false;
       return this;
     }
@@ -515,7 +515,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
       * @param value The value of 'periodEnd'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder setPeriodEnd(long value) {
+    public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder setPeriodEnd(long value) {
       validate(fields()[3], value);
       this.periodEnd = value;
       fieldSetFlags()[3] = true;
@@ -535,7 +535,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
       * Clears the value of the 'periodEnd' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder clearPeriodEnd() {
+    public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder clearPeriodEnd() {
       fieldSetFlags()[3] = false;
       return this;
     }
@@ -554,7 +554,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
       * @param value The value of 'count'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder setCount(long value) {
+    public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder setCount(long value) {
       validate(fields()[4], value);
       this.count = value;
       fieldSetFlags()[4] = true;
@@ -574,7 +574,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
       * Clears the value of the 'count' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder clearCount() {
+    public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder clearCount() {
       fieldSetFlags()[4] = false;
       return this;
     }
@@ -593,7 +593,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
       * @param value The value of 'mean'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder setMean(double value) {
+    public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder setMean(double value) {
       validate(fields()[5], value);
       this.mean = value;
       fieldSetFlags()[5] = true;
@@ -613,7 +613,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
       * Clears the value of the 'mean' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder clearMean() {
+    public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder clearMean() {
       fieldSetFlags()[5] = false;
       return this;
     }
@@ -632,7 +632,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
       * @param value The value of 'populationVariance'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder setPopulationVariance(double value) {
+    public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder setPopulationVariance(double value) {
       validate(fields()[6], value);
       this.populationVariance = value;
       fieldSetFlags()[6] = true;
@@ -652,7 +652,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
       * Clears the value of the 'populationVariance' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder clearPopulationVariance() {
+    public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder clearPopulationVariance() {
       fieldSetFlags()[6] = false;
       return this;
     }
@@ -671,7 +671,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
       * @param value The value of 'min'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder setMin(double value) {
+    public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder setMin(double value) {
       validate(fields()[7], value);
       this.min = value;
       fieldSetFlags()[7] = true;
@@ -691,7 +691,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
       * Clears the value of the 'min' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder clearMin() {
+    public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder clearMin() {
       fieldSetFlags()[7] = false;
       return this;
     }
@@ -710,7 +710,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
       * @param value The value of 'max'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder setMax(double value) {
+    public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder setMax(double value) {
       validate(fields()[8], value);
       this.max = value;
       fieldSetFlags()[8] = true;
@@ -730,7 +730,7 @@ public class MonthOfYearActivePowerRecord extends org.apache.avro.specific.Speci
       * Clears the value of the 'max' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder clearMax() {
+    public rocks.theodolite.commons.model.records.MonthOfYearActivePowerRecord.Builder clearMax() {
       fieldSetFlags()[8] = false;
       return this;
     }
diff --git a/theodolite-benchmarks/commons/src-gen/main/java/theodolite/commons/model/records/YearActivePowerRecord.java b/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/YearActivePowerRecord.java
similarity index 86%
rename from theodolite-benchmarks/commons/src-gen/main/java/theodolite/commons/model/records/YearActivePowerRecord.java
rename to theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/YearActivePowerRecord.java
index d466a772f..189cb8cf6 100644
--- a/theodolite-benchmarks/commons/src-gen/main/java/theodolite/commons/model/records/YearActivePowerRecord.java
+++ b/theodolite-benchmarks/commons/src-gen/main/java/rocks/theodolite/commons/model/records/YearActivePowerRecord.java
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT DIRECTLY
  */
-package theodolite.commons.model.records;
+package rocks.theodolite.commons.model.records;
 
 import org.apache.avro.generic.GenericArray;
 import org.apache.avro.specific.SpecificData;
@@ -14,10 +14,10 @@ import org.apache.avro.message.SchemaStore;
 
 @org.apache.avro.specific.AvroGenerated
 public class YearActivePowerRecord extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord {
-  private static final long serialVersionUID = -4368523068038395628L;
+  private static final long serialVersionUID = -7591848668729692169L;
 
 
-  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"YearActivePowerRecord\",\"namespace\":\"theodolite.commons.model.records\",\"fields\":[{\"name\":\"identifier\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"year\",\"type\":\"int\"},{\"name\":\"periodStart\",\"type\":\"long\"},{\"name\":\"periodEnd\",\"type\":\"long\"},{\"name\":\"count\",\"type\":\"long\"},{\"name\":\"mean\",\"type\":\"double\"},{\"name\":\"populationVariance\",\"type\":\"double\"},{\"name\":\"min\",\"type\":\"double\"},{\"name\":\"max\",\"type\":\"double\"}]}");
+  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"YearActivePowerRecord\",\"namespace\":\"rocks.theodolite.commons.model.records\",\"fields\":[{\"name\":\"identifier\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"}},{\"name\":\"year\",\"type\":\"int\"},{\"name\":\"periodStart\",\"type\":\"long\"},{\"name\":\"periodEnd\",\"type\":\"long\"},{\"name\":\"count\",\"type\":\"long\"},{\"name\":\"mean\",\"type\":\"double\"},{\"name\":\"populationVariance\",\"type\":\"double\"},{\"name\":\"min\",\"type\":\"double\"},{\"name\":\"max\",\"type\":\"double\"}]}");
   public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; }
 
   private static final SpecificData MODEL$ = new SpecificData();
@@ -243,8 +243,8 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
    * Creates a new YearActivePowerRecord RecordBuilder.
    * @return A new YearActivePowerRecord RecordBuilder
    */
-  public static theodolite.commons.model.records.YearActivePowerRecord.Builder newBuilder() {
-    return new theodolite.commons.model.records.YearActivePowerRecord.Builder();
+  public static rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder newBuilder() {
+    return new rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder();
   }
 
   /**
@@ -252,11 +252,11 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
    * @param other The existing builder to copy.
    * @return A new YearActivePowerRecord RecordBuilder
    */
-  public static theodolite.commons.model.records.YearActivePowerRecord.Builder newBuilder(theodolite.commons.model.records.YearActivePowerRecord.Builder other) {
+  public static rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder newBuilder(rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder other) {
     if (other == null) {
-      return new theodolite.commons.model.records.YearActivePowerRecord.Builder();
+      return new rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder();
     } else {
-      return new theodolite.commons.model.records.YearActivePowerRecord.Builder(other);
+      return new rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder(other);
     }
   }
 
@@ -265,11 +265,11 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
    * @param other The existing instance to copy.
    * @return A new YearActivePowerRecord RecordBuilder
    */
-  public static theodolite.commons.model.records.YearActivePowerRecord.Builder newBuilder(theodolite.commons.model.records.YearActivePowerRecord other) {
+  public static rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder newBuilder(rocks.theodolite.commons.model.records.YearActivePowerRecord other) {
     if (other == null) {
-      return new theodolite.commons.model.records.YearActivePowerRecord.Builder();
+      return new rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder();
     } else {
-      return new theodolite.commons.model.records.YearActivePowerRecord.Builder(other);
+      return new rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder(other);
     }
   }
 
@@ -299,7 +299,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
      * Creates a Builder by copying an existing Builder.
      * @param other The existing Builder to copy.
      */
-    private Builder(theodolite.commons.model.records.YearActivePowerRecord.Builder other) {
+    private Builder(rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder other) {
       super(other);
       if (isValidValue(fields()[0], other.identifier)) {
         this.identifier = data().deepCopy(fields()[0].schema(), other.identifier);
@@ -343,7 +343,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
      * Creates a Builder by copying an existing YearActivePowerRecord instance
      * @param other The existing instance to copy.
      */
-    private Builder(theodolite.commons.model.records.YearActivePowerRecord other) {
+    private Builder(rocks.theodolite.commons.model.records.YearActivePowerRecord other) {
       super(SCHEMA$, MODEL$);
       if (isValidValue(fields()[0], other.identifier)) {
         this.identifier = data().deepCopy(fields()[0].schema(), other.identifier);
@@ -397,7 +397,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
       * @param value The value of 'identifier'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.YearActivePowerRecord.Builder setIdentifier(java.lang.String value) {
+    public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder setIdentifier(java.lang.String value) {
       validate(fields()[0], value);
       this.identifier = value;
       fieldSetFlags()[0] = true;
@@ -417,7 +417,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
       * Clears the value of the 'identifier' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.YearActivePowerRecord.Builder clearIdentifier() {
+    public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder clearIdentifier() {
       identifier = null;
       fieldSetFlags()[0] = false;
       return this;
@@ -437,7 +437,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
       * @param value The value of 'year'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.YearActivePowerRecord.Builder setYear(int value) {
+    public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder setYear(int value) {
       validate(fields()[1], value);
       this.year = value;
       fieldSetFlags()[1] = true;
@@ -457,7 +457,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
       * Clears the value of the 'year' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.YearActivePowerRecord.Builder clearYear() {
+    public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder clearYear() {
       fieldSetFlags()[1] = false;
       return this;
     }
@@ -476,7 +476,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
       * @param value The value of 'periodStart'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.YearActivePowerRecord.Builder setPeriodStart(long value) {
+    public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder setPeriodStart(long value) {
       validate(fields()[2], value);
       this.periodStart = value;
       fieldSetFlags()[2] = true;
@@ -496,7 +496,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
       * Clears the value of the 'periodStart' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.YearActivePowerRecord.Builder clearPeriodStart() {
+    public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder clearPeriodStart() {
       fieldSetFlags()[2] = false;
       return this;
     }
@@ -515,7 +515,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
       * @param value The value of 'periodEnd'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.YearActivePowerRecord.Builder setPeriodEnd(long value) {
+    public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder setPeriodEnd(long value) {
       validate(fields()[3], value);
       this.periodEnd = value;
       fieldSetFlags()[3] = true;
@@ -535,7 +535,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
       * Clears the value of the 'periodEnd' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.YearActivePowerRecord.Builder clearPeriodEnd() {
+    public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder clearPeriodEnd() {
       fieldSetFlags()[3] = false;
       return this;
     }
@@ -554,7 +554,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
       * @param value The value of 'count'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.YearActivePowerRecord.Builder setCount(long value) {
+    public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder setCount(long value) {
       validate(fields()[4], value);
       this.count = value;
       fieldSetFlags()[4] = true;
@@ -574,7 +574,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
       * Clears the value of the 'count' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.YearActivePowerRecord.Builder clearCount() {
+    public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder clearCount() {
       fieldSetFlags()[4] = false;
       return this;
     }
@@ -593,7 +593,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
       * @param value The value of 'mean'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.YearActivePowerRecord.Builder setMean(double value) {
+    public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder setMean(double value) {
       validate(fields()[5], value);
       this.mean = value;
       fieldSetFlags()[5] = true;
@@ -613,7 +613,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
       * Clears the value of the 'mean' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.YearActivePowerRecord.Builder clearMean() {
+    public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder clearMean() {
       fieldSetFlags()[5] = false;
       return this;
     }
@@ -632,7 +632,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
       * @param value The value of 'populationVariance'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.YearActivePowerRecord.Builder setPopulationVariance(double value) {
+    public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder setPopulationVariance(double value) {
       validate(fields()[6], value);
       this.populationVariance = value;
       fieldSetFlags()[6] = true;
@@ -652,7 +652,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
       * Clears the value of the 'populationVariance' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.YearActivePowerRecord.Builder clearPopulationVariance() {
+    public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder clearPopulationVariance() {
       fieldSetFlags()[6] = false;
       return this;
     }
@@ -671,7 +671,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
       * @param value The value of 'min'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.YearActivePowerRecord.Builder setMin(double value) {
+    public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder setMin(double value) {
       validate(fields()[7], value);
       this.min = value;
       fieldSetFlags()[7] = true;
@@ -691,7 +691,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
       * Clears the value of the 'min' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.YearActivePowerRecord.Builder clearMin() {
+    public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder clearMin() {
       fieldSetFlags()[7] = false;
       return this;
     }
@@ -710,7 +710,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
       * @param value The value of 'max'.
       * @return This builder.
       */
-    public theodolite.commons.model.records.YearActivePowerRecord.Builder setMax(double value) {
+    public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder setMax(double value) {
       validate(fields()[8], value);
       this.max = value;
       fieldSetFlags()[8] = true;
@@ -730,7 +730,7 @@ public class YearActivePowerRecord extends org.apache.avro.specific.SpecificReco
       * Clears the value of the 'max' field.
       * @return This builder.
       */
-    public theodolite.commons.model.records.YearActivePowerRecord.Builder clearMax() {
+    public rocks.theodolite.commons.model.records.YearActivePowerRecord.Builder clearMax() {
       fieldSetFlags()[8] = false;
       return this;
     }
diff --git a/theodolite-benchmarks/commons/src/main/avro/ActivePower.avdl b/theodolite-benchmarks/commons/src/main/avro/ActivePower.avdl
index 26cbba16c..482a98c8c 100644
--- a/theodolite-benchmarks/commons/src/main/avro/ActivePower.avdl
+++ b/theodolite-benchmarks/commons/src/main/avro/ActivePower.avdl
@@ -1,4 +1,4 @@
-@namespace("theodolite.commons.model.records")
+@namespace("rocks.theodolite.commons.model.records")
 protocol ActivePower {
 
   record ActivePowerRecord {
diff --git a/theodolite-benchmarks/commons/src/main/avro/AggregatedActivePower.avdl b/theodolite-benchmarks/commons/src/main/avro/AggregatedActivePower.avdl
index 3eefad92d..23bacac57 100644
--- a/theodolite-benchmarks/commons/src/main/avro/AggregatedActivePower.avdl
+++ b/theodolite-benchmarks/commons/src/main/avro/AggregatedActivePower.avdl
@@ -1,4 +1,4 @@
-@namespace("theodolite.commons.model.records")
+@namespace("rocks.theodolite.commons.model.records")
 protocol AggregatedActivePower {
 
   record AggregatedActivePowerRecord {
diff --git a/theodolite-benchmarks/commons/src/main/avro/StatsActivePower.avdl b/theodolite-benchmarks/commons/src/main/avro/StatsActivePower.avdl
index 14fed0afc..3facc848e 100644
--- a/theodolite-benchmarks/commons/src/main/avro/StatsActivePower.avdl
+++ b/theodolite-benchmarks/commons/src/main/avro/StatsActivePower.avdl
@@ -1,4 +1,4 @@
-@namespace("theodolite.commons.model.records")
+@namespace("rocks.theodolite.commons.model.records")
 protocol StatsActivePower {
 
   record HourOfDayActivePowerRecord {
diff --git a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/commons/configuration/NameResolvingEnvironmentConfiguration.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/commons/configuration/NameResolvingEnvironmentConfiguration.java
similarity index 94%
rename from theodolite-benchmarks/commons/src/main/java/theodolite/commons/commons/configuration/NameResolvingEnvironmentConfiguration.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/commons/configuration/NameResolvingEnvironmentConfiguration.java
index b57b49a8a..6c5c3b6fa 100644
--- a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/commons/configuration/NameResolvingEnvironmentConfiguration.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/commons/configuration/NameResolvingEnvironmentConfiguration.java
@@ -1,4 +1,4 @@
-package theodolite.commons.commons.configuration;
+package rocks.theodolite.commons.commons.configuration;
 
 import java.util.Locale;
 import org.apache.commons.configuration2.EnvironmentConfiguration;
diff --git a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/commons/configuration/ServiceConfigurations.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/commons/configuration/ServiceConfigurations.java
similarity index 98%
rename from theodolite-benchmarks/commons/src/main/java/theodolite/commons/commons/configuration/ServiceConfigurations.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/commons/configuration/ServiceConfigurations.java
index 4ce296697..26d5e9f92 100644
--- a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/commons/configuration/ServiceConfigurations.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/commons/configuration/ServiceConfigurations.java
@@ -1,4 +1,4 @@
-package theodolite.commons.commons.configuration;
+package rocks.theodolite.commons.commons.configuration;
 
 import com.google.common.io.Resources;
 import java.nio.file.Files;
diff --git a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/configuration/events/Event.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/configuration/events/Event.java
similarity index 65%
rename from theodolite-benchmarks/commons/src/main/java/theodolite/commons/configuration/events/Event.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/configuration/events/Event.java
index 84d95d270..916514308 100644
--- a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/configuration/events/Event.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/configuration/events/Event.java
@@ -1,6 +1,6 @@
-package theodolite.commons.configuration.events;
+package rocks.theodolite.commons.configuration.events;
 
-import theodolite.commons.model.sensorregistry.SensorRegistry;
+import rocks.theodolite.commons.model.sensorregistry.SensorRegistry;
 
 /**
  * Events that could occur when modifying a {@link SensorRegistry}. Currently only a general change
diff --git a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/configuration/events/EventSerde.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/configuration/events/EventSerde.java
similarity index 97%
rename from theodolite-benchmarks/commons/src/main/java/theodolite/commons/configuration/events/EventSerde.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/configuration/events/EventSerde.java
index 9fde54ead..65c030756 100644
--- a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/configuration/events/EventSerde.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/configuration/events/EventSerde.java
@@ -1,4 +1,4 @@
-package theodolite.commons.configuration.events;
+package rocks.theodolite.commons.configuration.events;
 
 import java.nio.ByteBuffer;
 import java.util.Map;
diff --git a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/AbstractSensor.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/AbstractSensor.java
similarity index 87%
rename from theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/AbstractSensor.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/AbstractSensor.java
index c572ca108..f495cd574 100644
--- a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/AbstractSensor.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/AbstractSensor.java
@@ -1,4 +1,4 @@
-package theodolite.commons.model.sensorregistry;
+package rocks.theodolite.commons.model.sensorregistry;
 
 import java.util.Optional;
 
diff --git a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/AggregatedSensor.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/AggregatedSensor.java
similarity index 94%
rename from theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/AggregatedSensor.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/AggregatedSensor.java
index 8ac57a92b..dc2fe2c72 100644
--- a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/AggregatedSensor.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/AggregatedSensor.java
@@ -1,4 +1,4 @@
-package theodolite.commons.model.sensorregistry;
+package rocks.theodolite.commons.model.sensorregistry;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/ImmutableSensorRegistry.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/ImmutableSensorRegistry.java
similarity index 89%
rename from theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/ImmutableSensorRegistry.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/ImmutableSensorRegistry.java
index e73a365b4..a9bf03403 100644
--- a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/ImmutableSensorRegistry.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/ImmutableSensorRegistry.java
@@ -1,4 +1,4 @@
-package theodolite.commons.model.sensorregistry;
+package rocks.theodolite.commons.model.sensorregistry;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableList.Builder;
@@ -8,10 +8,10 @@ import com.google.gson.GsonBuilder;
 import java.util.Collection;
 import java.util.Objects;
 import java.util.Optional;
-import theodolite.commons.model.sensorregistry.serialization.AggregatedSensorSerializer;
-import theodolite.commons.model.sensorregistry.serialization.MachineSensorSerializer;
-import theodolite.commons.model.sensorregistry.serialization.SensorRegistryDeserializer;
-import theodolite.commons.model.sensorregistry.serialization.SensorRegistrySerializer;
+import rocks.theodolite.commons.model.sensorregistry.serialization.AggregatedSensorSerializer;
+import rocks.theodolite.commons.model.sensorregistry.serialization.MachineSensorSerializer;
+import rocks.theodolite.commons.model.sensorregistry.serialization.SensorRegistryDeserializer;
+import rocks.theodolite.commons.model.sensorregistry.serialization.SensorRegistrySerializer;
 
 /**
  * Implementation of a {@link SensorRegistry} that is immutable.
diff --git a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/MachineSensor.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/MachineSensor.java
similarity index 88%
rename from theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/MachineSensor.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/MachineSensor.java
index 2e49cf608..158f172e9 100644
--- a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/MachineSensor.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/MachineSensor.java
@@ -1,4 +1,4 @@
-package theodolite.commons.model.sensorregistry;
+package rocks.theodolite.commons.model.sensorregistry;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/MachineSensorImpl.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/MachineSensorImpl.java
similarity index 89%
rename from theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/MachineSensorImpl.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/MachineSensorImpl.java
index 8e5d78bf6..0d30263b6 100644
--- a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/MachineSensorImpl.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/MachineSensorImpl.java
@@ -1,4 +1,4 @@
-package theodolite.commons.model.sensorregistry;
+package rocks.theodolite.commons.model.sensorregistry;
 
 import java.util.Objects;
 
diff --git a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/MutableAggregatedSensor.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/MutableAggregatedSensor.java
similarity index 95%
rename from theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/MutableAggregatedSensor.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/MutableAggregatedSensor.java
index 1a98d92a5..1eb683b4c 100644
--- a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/MutableAggregatedSensor.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/MutableAggregatedSensor.java
@@ -1,4 +1,4 @@
-package theodolite.commons.model.sensorregistry;
+package rocks.theodolite.commons.model.sensorregistry;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/MutableSensorRegistry.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/MutableSensorRegistry.java
similarity index 85%
rename from theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/MutableSensorRegistry.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/MutableSensorRegistry.java
index 5aacbc62f..1096ccba9 100644
--- a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/MutableSensorRegistry.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/MutableSensorRegistry.java
@@ -1,4 +1,4 @@
-package theodolite.commons.model.sensorregistry;
+package rocks.theodolite.commons.model.sensorregistry;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -8,9 +8,9 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import theodolite.commons.model.sensorregistry.serialization.AggregatedSensorSerializer;
-import theodolite.commons.model.sensorregistry.serialization.MachineSensorSerializer;
-import theodolite.commons.model.sensorregistry.serialization.SensorRegistrySerializer;
+import rocks.theodolite.commons.model.sensorregistry.serialization.AggregatedSensorSerializer;
+import rocks.theodolite.commons.model.sensorregistry.serialization.MachineSensorSerializer;
+import rocks.theodolite.commons.model.sensorregistry.serialization.SensorRegistrySerializer;
 
 /**
  * A {@link SensorRegistry} to which sensors can be added.
diff --git a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/Sensor.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/Sensor.java
similarity index 75%
rename from theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/Sensor.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/Sensor.java
index fd0de0b8e..8c2614427 100644
--- a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/Sensor.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/Sensor.java
@@ -1,4 +1,4 @@
-package theodolite.commons.model.sensorregistry;
+package rocks.theodolite.commons.model.sensorregistry;
 
 import java.util.Optional;
 
diff --git a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/SensorRegistry.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/SensorRegistry.java
similarity index 93%
rename from theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/SensorRegistry.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/SensorRegistry.java
index f8540ba2d..df1852879 100644
--- a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/SensorRegistry.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/SensorRegistry.java
@@ -1,4 +1,4 @@
-package theodolite.commons.model.sensorregistry;
+package rocks.theodolite.commons.model.sensorregistry;
 
 import java.util.Collection;
 import java.util.Optional;
diff --git a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/serialization/AggregatedSensorSerializer.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/serialization/AggregatedSensorSerializer.java
similarity index 85%
rename from theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/serialization/AggregatedSensorSerializer.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/serialization/AggregatedSensorSerializer.java
index 9ee6ae9ab..65aa30174 100644
--- a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/serialization/AggregatedSensorSerializer.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/serialization/AggregatedSensorSerializer.java
@@ -1,11 +1,11 @@
-package theodolite.commons.model.sensorregistry.serialization;
+package rocks.theodolite.commons.model.sensorregistry.serialization;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 import java.lang.reflect.Type;
-import theodolite.commons.model.sensorregistry.AggregatedSensor;
+import rocks.theodolite.commons.model.sensorregistry.AggregatedSensor;
 
 /**
  * {@link JsonSerializer} for {@link AggregatedSensor}s.
diff --git a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/serialization/MachineSensorSerializer.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/serialization/MachineSensorSerializer.java
similarity index 83%
rename from theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/serialization/MachineSensorSerializer.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/serialization/MachineSensorSerializer.java
index 9eb119560..8bdba5e3b 100644
--- a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/serialization/MachineSensorSerializer.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/serialization/MachineSensorSerializer.java
@@ -1,11 +1,11 @@
-package theodolite.commons.model.sensorregistry.serialization;
+package rocks.theodolite.commons.model.sensorregistry.serialization;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 import java.lang.reflect.Type;
-import theodolite.commons.model.sensorregistry.MachineSensor;
+import rocks.theodolite.commons.model.sensorregistry.MachineSensor;
 
 /**
  * {@link JsonSerializer} for {@link MachineSensor}s.
diff --git a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/serialization/SensorRegistryDeserializer.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/serialization/SensorRegistryDeserializer.java
similarity index 90%
rename from theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/serialization/SensorRegistryDeserializer.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/serialization/SensorRegistryDeserializer.java
index 5076aca74..df976f560 100644
--- a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/serialization/SensorRegistryDeserializer.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/serialization/SensorRegistryDeserializer.java
@@ -1,4 +1,4 @@
-package theodolite.commons.model.sensorregistry.serialization;
+package rocks.theodolite.commons.model.sensorregistry.serialization;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonDeserializationContext;
@@ -7,11 +7,11 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 import java.lang.reflect.Type;
-import theodolite.commons.model.sensorregistry.AggregatedSensor;
-import theodolite.commons.model.sensorregistry.ImmutableSensorRegistry;
-import theodolite.commons.model.sensorregistry.MutableAggregatedSensor;
-import theodolite.commons.model.sensorregistry.MutableSensorRegistry;
-import theodolite.commons.model.sensorregistry.SensorRegistry;
+import rocks.theodolite.commons.model.sensorregistry.AggregatedSensor;
+import rocks.theodolite.commons.model.sensorregistry.ImmutableSensorRegistry;
+import rocks.theodolite.commons.model.sensorregistry.MutableAggregatedSensor;
+import rocks.theodolite.commons.model.sensorregistry.MutableSensorRegistry;
+import rocks.theodolite.commons.model.sensorregistry.SensorRegistry;
 
 /**
  * {@link JsonDeserializer} for {@link AggregatedSensor}s.
diff --git a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/serialization/SensorRegistrySerializer.java b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/serialization/SensorRegistrySerializer.java
similarity index 79%
rename from theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/serialization/SensorRegistrySerializer.java
rename to theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/serialization/SensorRegistrySerializer.java
index b389c582e..9d829b160 100644
--- a/theodolite-benchmarks/commons/src/main/java/theodolite/commons/model/sensorregistry/serialization/SensorRegistrySerializer.java
+++ b/theodolite-benchmarks/commons/src/main/java/rocks/theodolite/commons/model/sensorregistry/serialization/SensorRegistrySerializer.java
@@ -1,10 +1,10 @@
-package theodolite.commons.model.sensorregistry.serialization;
+package rocks.theodolite.commons.model.sensorregistry.serialization;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 import java.lang.reflect.Type;
-import theodolite.commons.model.sensorregistry.SensorRegistry;
+import rocks.theodolite.commons.model.sensorregistry.SensorRegistry;
 
 /**
  * {@link JsonSerializer} for {@link SensorRegistry}s.
-- 
GitLab