From 5bcd424bed7ed388f2b13a042dac58988f445b60 Mon Sep 17 00:00:00 2001
From: lorenz <stu203404@mail.uni-kiel.de>
Date: Tue, 8 Mar 2022 18:34:04 +0100
Subject: [PATCH] Align package structure uc4 hzj

---
 .../uc4-hazelcastjet/build.gradle                  |  2 +-
 .../uc4/hazelcastjet}/HistoryService.java          |  2 +-
 .../uc4/hazelcastjet}/Uc4HazelcastJetFactory.java  | 14 ++++++++------
 .../hazelcastjet}/Uc4KafkaPropertiesBuilder.java   |  4 ++--
 .../uc4/hazelcastjet}/Uc4PipelineBuilder.java      | 10 +++++-----
 .../AggregatedActivePowerRecordAccumulator.java    |  2 +-
 .../uc4specifics/ChildParentsTransformer.java      |  2 +-
 .../uc4specifics/EventDeserializer.java            |  2 +-
 .../uc4specifics/HashMapSupplier.java              |  2 +-
 .../ImmutableSensorRegistryUc4Serializer.java      |  2 +-
 .../hazelcastjet}/uc4specifics/SensorGroupKey.java |  2 +-
 .../uc4specifics/SensorGroupKeySerializer.java     |  2 +-
 .../uc4/hazelcastjet}/uc4specifics/ValueGroup.java |  2 +-
 .../uc4specifics/ValueGroupSerializer.java         |  2 +-
 .../uc4/application/Uc4PipelineTest.java           | 11 ++++++-----
 15 files changed, 32 insertions(+), 29 deletions(-)
 rename theodolite-benchmarks/uc4-hazelcastjet/src/main/java/{theodolite/uc4/application => rocks/theodolite/benchmarks/uc4/hazelcastjet}/HistoryService.java (98%)
 rename theodolite-benchmarks/uc4-hazelcastjet/src/main/java/{theodolite/uc4/application => rocks/theodolite/benchmarks/uc4/hazelcastjet}/Uc4HazelcastJetFactory.java (96%)
 rename theodolite-benchmarks/uc4-hazelcastjet/src/main/java/{theodolite/uc4/application => rocks/theodolite/benchmarks/uc4/hazelcastjet}/Uc4KafkaPropertiesBuilder.java (97%)
 rename theodolite-benchmarks/uc4-hazelcastjet/src/main/java/{theodolite/uc4/application => rocks/theodolite/benchmarks/uc4/hazelcastjet}/Uc4PipelineBuilder.java (97%)
 rename theodolite-benchmarks/uc4-hazelcastjet/src/main/java/{theodolite/uc4/application => rocks/theodolite/benchmarks/uc4/hazelcastjet}/uc4specifics/AggregatedActivePowerRecordAccumulator.java (97%)
 rename theodolite-benchmarks/uc4-hazelcastjet/src/main/java/{theodolite/uc4/application => rocks/theodolite/benchmarks/uc4/hazelcastjet}/uc4specifics/ChildParentsTransformer.java (98%)
 rename theodolite-benchmarks/uc4-hazelcastjet/src/main/java/{theodolite/uc4/application => rocks/theodolite/benchmarks/uc4/hazelcastjet}/uc4specifics/EventDeserializer.java (91%)
 rename theodolite-benchmarks/uc4-hazelcastjet/src/main/java/{theodolite/uc4/application => rocks/theodolite/benchmarks/uc4/hazelcastjet}/uc4specifics/HashMapSupplier.java (88%)
 rename theodolite-benchmarks/uc4-hazelcastjet/src/main/java/{theodolite/uc4/application => rocks/theodolite/benchmarks/uc4/hazelcastjet}/uc4specifics/ImmutableSensorRegistryUc4Serializer.java (93%)
 rename theodolite-benchmarks/uc4-hazelcastjet/src/main/java/{theodolite/uc4/application => rocks/theodolite/benchmarks/uc4/hazelcastjet}/uc4specifics/SensorGroupKey.java (93%)
 rename theodolite-benchmarks/uc4-hazelcastjet/src/main/java/{theodolite/uc4/application => rocks/theodolite/benchmarks/uc4/hazelcastjet}/uc4specifics/SensorGroupKeySerializer.java (91%)
 rename theodolite-benchmarks/uc4-hazelcastjet/src/main/java/{theodolite/uc4/application => rocks/theodolite/benchmarks/uc4/hazelcastjet}/uc4specifics/ValueGroup.java (95%)
 rename theodolite-benchmarks/uc4-hazelcastjet/src/main/java/{theodolite/uc4/application => rocks/theodolite/benchmarks/uc4/hazelcastjet}/uc4specifics/ValueGroupSerializer.java (93%)

diff --git a/theodolite-benchmarks/uc4-hazelcastjet/build.gradle b/theodolite-benchmarks/uc4-hazelcastjet/build.gradle
index 4799d759f..01daa0b88 100644
--- a/theodolite-benchmarks/uc4-hazelcastjet/build.gradle
+++ b/theodolite-benchmarks/uc4-hazelcastjet/build.gradle
@@ -2,4 +2,4 @@ plugins {
   id 'theodolite.hazelcastjet'
 }
 
-mainClassName = "theodolite.uc4.application.HistoryService"
\ No newline at end of file
+mainClassName = "rocks.theodolite.benchmarks.uc4.hazelcastjet.HistoryService"
\ No newline at end of file
diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/HistoryService.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/HistoryService.java
similarity index 98%
rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/HistoryService.java
rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/HistoryService.java
index c15ef7dce..88dd311bb 100644
--- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/HistoryService.java
+++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/HistoryService.java
@@ -1,4 +1,4 @@
-package theodolite.uc4.application;
+package rocks.theodolite.benchmarks.uc4.hazelcastjet;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4HazelcastJetFactory.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4HazelcastJetFactory.java
similarity index 96%
rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4HazelcastJetFactory.java
rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4HazelcastJetFactory.java
index b0cd0abec..a4dc2d823 100644
--- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4HazelcastJetFactory.java
+++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4HazelcastJetFactory.java
@@ -1,4 +1,4 @@
-package theodolite.uc4.application;
+package rocks.theodolite.benchmarks.uc4.hazelcastjet;
 
 import com.hazelcast.jet.JetInstance;
 import com.hazelcast.jet.config.JobConfig;
@@ -8,13 +8,15 @@ import java.util.Properties;
 import org.slf4j.Logger;
 import rocks.theodolite.benchmarks.commons.hazelcastjet.ConfigurationKeys;
 import rocks.theodolite.benchmarks.commons.hazelcastjet.JetInstanceBuilder;
-import theodolite.uc4.application.uc4specifics.ImmutableSensorRegistryUc4Serializer;
-import theodolite.uc4.application.uc4specifics.SensorGroupKey;
-import theodolite.uc4.application.uc4specifics.SensorGroupKeySerializer;
-import theodolite.uc4.application.uc4specifics.ValueGroup;
-import theodolite.uc4.application.uc4specifics.ValueGroupSerializer;
+import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.ImmutableSensorRegistryUc4Serializer;
+import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.SensorGroupKey;
+import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.SensorGroupKeySerializer;
+import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.ValueGroup;
+import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.ValueGroupSerializer;
 import titan.ccp.model.sensorregistry.ImmutableSensorRegistry;
 
+
+
 /**
  * A Hazelcast Jet factory which can build a Hazelcast Jet Instance and Pipeline for the UC4
  * benchmark and lets you start the Hazelcast Jet job. The JetInstance can be built directly as the
diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4KafkaPropertiesBuilder.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4KafkaPropertiesBuilder.java
similarity index 97%
rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4KafkaPropertiesBuilder.java
rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4KafkaPropertiesBuilder.java
index e73e1ae11..eb0c250b6 100644
--- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4KafkaPropertiesBuilder.java
+++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4KafkaPropertiesBuilder.java
@@ -1,4 +1,4 @@
-package theodolite.uc4.application;
+package rocks.theodolite.benchmarks.uc4.hazelcastjet;
 
 import io.confluent.kafka.serializers.KafkaAvroDeserializer;
 import io.confluent.kafka.serializers.KafkaAvroSerializer;
@@ -9,7 +9,7 @@ import org.apache.kafka.clients.producer.ProducerConfig;
 import org.apache.kafka.common.serialization.StringDeserializer;
 import org.apache.kafka.common.serialization.StringSerializer;
 import rocks.theodolite.benchmarks.commons.hazelcastjet.ConfigurationKeys;
-import theodolite.uc4.application.uc4specifics.EventDeserializer;
+import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.EventDeserializer;
 
 /**
  * Builds a read and write Properties objects containing the needed kafka properties used for the
diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4PipelineBuilder.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4PipelineBuilder.java
similarity index 97%
rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4PipelineBuilder.java
rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4PipelineBuilder.java
index 2af2e111a..2efb8250c 100644
--- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/Uc4PipelineBuilder.java
+++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/Uc4PipelineBuilder.java
@@ -1,4 +1,4 @@
-package theodolite.uc4.application;
+package rocks.theodolite.benchmarks.uc4.hazelcastjet;
 
 import com.hazelcast.function.BiFunctionEx;
 import com.hazelcast.jet.Traverser;
@@ -25,10 +25,10 @@ import java.util.Properties;
 import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import theodolite.uc4.application.uc4specifics.AggregatedActivePowerRecordAccumulator;
-import theodolite.uc4.application.uc4specifics.ChildParentsTransformer;
-import theodolite.uc4.application.uc4specifics.SensorGroupKey;
-import theodolite.uc4.application.uc4specifics.ValueGroup;
+import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.AggregatedActivePowerRecordAccumulator;
+import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.ChildParentsTransformer;
+import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.SensorGroupKey;
+import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.ValueGroup;
 import titan.ccp.configuration.events.Event;
 import titan.ccp.model.records.ActivePowerRecord;
 import titan.ccp.model.records.AggregatedActivePowerRecord;
diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/AggregatedActivePowerRecordAccumulator.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/AggregatedActivePowerRecordAccumulator.java
similarity index 97%
rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/AggregatedActivePowerRecordAccumulator.java
rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/AggregatedActivePowerRecordAccumulator.java
index 19e0b49a6..3166f16cd 100644
--- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/AggregatedActivePowerRecordAccumulator.java
+++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/AggregatedActivePowerRecordAccumulator.java
@@ -1,4 +1,4 @@
-package theodolite.uc4.application.uc4specifics;
+package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics;
 
 import titan.ccp.model.records.ActivePowerRecord;
 
diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/ChildParentsTransformer.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ChildParentsTransformer.java
similarity index 98%
rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/ChildParentsTransformer.java
rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ChildParentsTransformer.java
index f4ccdcbe3..ad3b2294c 100644
--- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/ChildParentsTransformer.java
+++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ChildParentsTransformer.java
@@ -1,4 +1,4 @@
-package theodolite.uc4.application.uc4specifics;
+package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics;
 
 import java.util.Map;
 import java.util.Optional;
diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/EventDeserializer.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/EventDeserializer.java
similarity index 91%
rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/EventDeserializer.java
rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/EventDeserializer.java
index 79ae2508b..c8d06b497 100644
--- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/EventDeserializer.java
+++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/EventDeserializer.java
@@ -1,4 +1,4 @@
-package theodolite.uc4.application.uc4specifics;
+package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics;
 
 import java.util.Map;
 import org.apache.kafka.common.serialization.Deserializer;
diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/HashMapSupplier.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/HashMapSupplier.java
similarity index 88%
rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/HashMapSupplier.java
rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/HashMapSupplier.java
index e55278c1d..ec240bf8c 100644
--- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/HashMapSupplier.java
+++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/HashMapSupplier.java
@@ -1,4 +1,4 @@
-package theodolite.uc4.application.uc4specifics;
+package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics;
 
 import com.hazelcast.function.SupplierEx;
 import java.util.HashMap;
diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/ImmutableSensorRegistryUc4Serializer.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ImmutableSensorRegistryUc4Serializer.java
similarity index 93%
rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/ImmutableSensorRegistryUc4Serializer.java
rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ImmutableSensorRegistryUc4Serializer.java
index 54b3724eb..53d22f7f1 100644
--- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/ImmutableSensorRegistryUc4Serializer.java
+++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ImmutableSensorRegistryUc4Serializer.java
@@ -1,4 +1,4 @@
-package theodolite.uc4.application.uc4specifics;
+package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics;
 
 import com.hazelcast.nio.ObjectDataInput;
 import com.hazelcast.nio.ObjectDataOutput;
diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/SensorGroupKey.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/SensorGroupKey.java
similarity index 93%
rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/SensorGroupKey.java
rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/SensorGroupKey.java
index 3680062df..24114cc90 100644
--- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/SensorGroupKey.java
+++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/SensorGroupKey.java
@@ -1,4 +1,4 @@
-package theodolite.uc4.application.uc4specifics;
+package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics;
 
 import java.util.Objects;
 
diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/SensorGroupKeySerializer.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/SensorGroupKeySerializer.java
similarity index 91%
rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/SensorGroupKeySerializer.java
rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/SensorGroupKeySerializer.java
index 9bcc80980..12a46b9d8 100644
--- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/SensorGroupKeySerializer.java
+++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/SensorGroupKeySerializer.java
@@ -1,4 +1,4 @@
-package theodolite.uc4.application.uc4specifics;
+package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics;
 
 import com.hazelcast.nio.ObjectDataInput;
 import com.hazelcast.nio.ObjectDataOutput;
diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/ValueGroup.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ValueGroup.java
similarity index 95%
rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/ValueGroup.java
rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ValueGroup.java
index 1af5d0d00..893efcf74 100644
--- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/ValueGroup.java
+++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ValueGroup.java
@@ -1,4 +1,4 @@
-package theodolite.uc4.application.uc4specifics;
+package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics;
 
 import java.util.Objects;
 import java.util.Set;
diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/ValueGroupSerializer.java b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ValueGroupSerializer.java
similarity index 93%
rename from theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/ValueGroupSerializer.java
rename to theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ValueGroupSerializer.java
index f32dffece..e136d1da0 100644
--- a/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/theodolite/uc4/application/uc4specifics/ValueGroupSerializer.java
+++ b/theodolite-benchmarks/uc4-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc4/hazelcastjet/uc4specifics/ValueGroupSerializer.java
@@ -1,4 +1,4 @@
-package theodolite.uc4.application.uc4specifics;
+package rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics;
 
 import com.hazelcast.nio.ObjectDataInput;
 import com.hazelcast.nio.ObjectDataOutput;
diff --git a/theodolite-benchmarks/uc4-hazelcastjet/src/test/java/theodolite/uc4/application/Uc4PipelineTest.java b/theodolite-benchmarks/uc4-hazelcastjet/src/test/java/theodolite/uc4/application/Uc4PipelineTest.java
index 925f8339e..14d977952 100644
--- a/theodolite-benchmarks/uc4-hazelcastjet/src/test/java/theodolite/uc4/application/Uc4PipelineTest.java
+++ b/theodolite-benchmarks/uc4-hazelcastjet/src/test/java/theodolite/uc4/application/Uc4PipelineTest.java
@@ -22,11 +22,12 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-import theodolite.uc4.application.uc4specifics.ImmutableSensorRegistryUc4Serializer;
-import theodolite.uc4.application.uc4specifics.SensorGroupKey;
-import theodolite.uc4.application.uc4specifics.SensorGroupKeySerializer;
-import theodolite.uc4.application.uc4specifics.ValueGroup;
-import theodolite.uc4.application.uc4specifics.ValueGroupSerializer;
+import rocks.theodolite.benchmarks.uc4.hazelcastjet.Uc4PipelineBuilder;
+import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.ImmutableSensorRegistryUc4Serializer;
+import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.SensorGroupKey;
+import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.SensorGroupKeySerializer;
+import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.ValueGroup;
+import rocks.theodolite.benchmarks.uc4.hazelcastjet.uc4specifics.ValueGroupSerializer;
 import titan.ccp.configuration.events.Event;
 import titan.ccp.model.records.ActivePowerRecord;
 import titan.ccp.model.records.AggregatedActivePowerRecord;
-- 
GitLab