ie3-institute · staudtMarius · Jun 24, 2025 · Jun 24, 2025
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Adapted dependabot workflow and added CODEOWNERS [#294](https://github.com/ie3-institute/simonaAPI/issues/294)
 - Refactoring external data connection [#267](https://github.com/ie3-institute/simonaAPI/issues/267)
 - Refactoring data containers [#268](https://github.com/ie3-institute/simonaAPI/issues/268)
+- Refactoring messages [#269](https://github.com/ie3-institute/simonaAPI/issues/269)
+- Refactoring models [#270](https://github.com/ie3-institute/simonaAPI/issues/270)
 
 ## [0.9.0] - 2025-05-09
 

diff --git a/src/main/java/edu/ie3/simona/api/data/connection/BiDirectional.java b/src/main/java/edu/ie3/simona/api/data/connection/BiDirectional.java
@@ -6,9 +6,9 @@
 
 package edu.ie3.simona.api.data.connection;
 
-import edu.ie3.simona.api.data.ontology.DataMessageFromExt;
-import edu.ie3.simona.api.data.ontology.DataResponseMessageToExt;
 import edu.ie3.simona.api.exceptions.UnexpectedResponseMessageException;
+import edu.ie3.simona.api.ontology.DataMessageFromExt;
+import edu.ie3.simona.api.ontology.DataResponseMessageToExt;
 import java.util.concurrent.LinkedBlockingQueue;
 
 /**

diff --git a/src/main/java/edu/ie3/simona/api/data/connection/ExtEmDataConnection.java b/src/main/java/edu/ie3/simona/api/data/connection/ExtEmDataConnection.java
@@ -6,10 +6,10 @@
 
 package edu.ie3.simona.api.data.connection;
 
-import edu.ie3.simona.api.data.em.ontology.EmDataMessageFromExt;
-import edu.ie3.simona.api.data.em.ontology.EmDataResponseMessageToExt;
-import edu.ie3.simona.api.data.em.ontology.ProvideEmSetPointData;
 import edu.ie3.simona.api.data.model.em.EmSetPoint;
+import edu.ie3.simona.api.ontology.em.EmDataMessageFromExt;
+import edu.ie3.simona.api.ontology.em.EmDataResponseMessageToExt;
+import edu.ie3.simona.api.ontology.em.ProvideEmSetPointData;
 import java.util.*;
 import org.slf4j.Logger;
 

diff --git a/src/main/java/edu/ie3/simona/api/data/connection/ExtEvDataConnection.java b/src/main/java/edu/ie3/simona/api/data/connection/ExtEvDataConnection.java
@@ -6,8 +6,8 @@
 
 package edu.ie3.simona.api.data.connection;
 
-import edu.ie3.simona.api.data.ev.model.EvModel;
-import edu.ie3.simona.api.data.ev.ontology.*;
+import edu.ie3.simona.api.data.model.ev.EvModel;
+import edu.ie3.simona.api.ontology.ev.*;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/src/main/java/edu/ie3/simona/api/data/connection/ExtInputDataConnection.java b/src/main/java/edu/ie3/simona/api/data/connection/ExtInputDataConnection.java
@@ -6,9 +6,9 @@
 
 package edu.ie3.simona.api.data.connection;
 
-import edu.ie3.simona.api.data.ontology.DataMessageFromExt;
-import edu.ie3.simona.api.data.ontology.ScheduleDataServiceMessage;
-import edu.ie3.simona.api.simulation.ontology.ControlResponseMessageFromExt;
+import edu.ie3.simona.api.ontology.DataMessageFromExt;
+import edu.ie3.simona.api.ontology.ScheduleDataServiceMessage;
+import edu.ie3.simona.api.ontology.simulation.ControlResponseMessageFromExt;
 import org.apache.pekko.actor.typed.ActorRef;
 
 /**

diff --git a/src/main/java/edu/ie3/simona/api/data/connection/ExtOutputDataConnection.java b/src/main/java/edu/ie3/simona/api/data/connection/ExtOutputDataConnection.java
@@ -6,7 +6,7 @@
 
 package edu.ie3.simona.api.data.connection;
 
-import edu.ie3.simona.api.data.ontology.DataResponseMessageToExt;
+import edu.ie3.simona.api.ontology.DataResponseMessageToExt;
 
 /**
  * Interface for a connection between SIMONA and an external simulation with data flow from SIMONA

diff --git a/src/main/java/edu/ie3/simona/api/data/connection/ExtPrimaryDataConnection.java b/src/main/java/edu/ie3/simona/api/data/connection/ExtPrimaryDataConnection.java
@@ -7,8 +7,8 @@
 package edu.ie3.simona.api.data.connection;
 
 import edu.ie3.datamodel.models.value.Value;
-import edu.ie3.simona.api.data.primarydata.ontology.PrimaryDataMessageFromExt;
-import edu.ie3.simona.api.data.primarydata.ontology.ProvidePrimaryData;
+import edu.ie3.simona.api.ontology.primary.PrimaryDataMessageFromExt;
+import edu.ie3.simona.api.ontology.primary.ProvidePrimaryData;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/src/main/java/edu/ie3/simona/api/data/connection/ExtResultDataConnection.java b/src/main/java/edu/ie3/simona/api/data/connection/ExtResultDataConnection.java
@@ -7,10 +7,10 @@
 package edu.ie3.simona.api.data.connection;
 
 import edu.ie3.datamodel.models.result.ResultEntity;
-import edu.ie3.simona.api.data.results.ontology.ProvideResultEntities;
-import edu.ie3.simona.api.data.results.ontology.RequestResultEntities;
-import edu.ie3.simona.api.data.results.ontology.ResultDataMessageFromExt;
-import edu.ie3.simona.api.data.results.ontology.ResultDataResponseMessageToExt;
+import edu.ie3.simona.api.ontology.results.ProvideResultEntities;
+import edu.ie3.simona.api.ontology.results.RequestResultEntities;
+import edu.ie3.simona.api.ontology.results.ResultDataMessageFromExt;
+import edu.ie3.simona.api.ontology.results.ResultDataResponseMessageToExt;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;

diff --git a/src/main/java/edu/ie3/simona/api/data/connection/ExtResultListener.java b/src/main/java/edu/ie3/simona/api/data/connection/ExtResultListener.java
@@ -6,8 +6,8 @@
 
 package edu.ie3.simona.api.data.connection;
 
-import edu.ie3.simona.api.data.results.ontology.ResultDataResponseMessageToExt;
 import edu.ie3.simona.api.exceptions.UnexpectedResponseMessageException;
+import edu.ie3.simona.api.ontology.results.ResultDataResponseMessageToExt;
 import java.util.concurrent.LinkedBlockingQueue;
 
 /**

diff --git a/...ie3/simona/api/data/ev/model/EvModel.java → ...ie3/simona/api/data/model/ev/EvModel.java b/...ie3/simona/api/data/ev/model/EvModel.java → ...ie3/simona/api/data/model/ev/EvModel.java
@@ -4,7 +4,7 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.data.ev.model;
+package edu.ie3.simona.api.data.model.ev;
 
 import java.util.UUID;
 import javax.measure.quantity.Energy;

diff --git a/...api/data/ontology/DataMessageFromExt.java → ...mona/api/ontology/DataMessageFromExt.java b/...api/data/ontology/DataMessageFromExt.java → ...mona/api/ontology/DataMessageFromExt.java
@@ -4,7 +4,7 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.data.ontology;
+package edu.ie3.simona.api.ontology;
 
 /** Data related messages that are sent from the external simulation to SIMONA */
 public interface DataMessageFromExt {}
diff --git a/...ta/ontology/DataResponseMessageToExt.java → ...pi/ontology/DataResponseMessageToExt.java b/...ta/ontology/DataResponseMessageToExt.java → ...pi/ontology/DataResponseMessageToExt.java
@@ -4,7 +4,7 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.data.ontology;
+package edu.ie3.simona.api.ontology;
 
 /** Data related messages that are sent from SIMONA to the external simulation */
 public interface DataResponseMessageToExt {}
diff --git a/.../ontology/ScheduleDataServiceMessage.java → .../ontology/ScheduleDataServiceMessage.java b/.../ontology/ScheduleDataServiceMessage.java → .../ontology/ScheduleDataServiceMessage.java
@@ -4,9 +4,9 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.data.ontology;
+package edu.ie3.simona.api.ontology;
 
-import edu.ie3.simona.api.simulation.ontology.ControlResponseMessageFromExt;
+import edu.ie3.simona.api.ontology.simulation.ControlResponseMessageFromExt;
 import org.apache.pekko.actor.typed.ActorRef;
 
 public record ScheduleDataServiceMessage(ActorRef<DataMessageFromExt> dataService)

diff --git a/...ata/em/ontology/EmDataMessageFromExt.java → ...api/ontology/em/EmDataMessageFromExt.java b/...ata/em/ontology/EmDataMessageFromExt.java → ...api/ontology/em/EmDataMessageFromExt.java
@@ -4,9 +4,9 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.data.em.ontology;
+package edu.ie3.simona.api.ontology.em;
 
-import edu.ie3.simona.api.data.ontology.DataMessageFromExt;
+import edu.ie3.simona.api.ontology.DataMessageFromExt;
 
 /** Messages that are sent from an external data simulation which provides em data to SIMONA. */
 public interface EmDataMessageFromExt extends DataMessageFromExt {}
diff --git a/.../ontology/EmDataResponseMessageToExt.java → ...tology/em/EmDataResponseMessageToExt.java b/.../ontology/EmDataResponseMessageToExt.java → ...tology/em/EmDataResponseMessageToExt.java
@@ -4,9 +4,9 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.data.em.ontology;
+package edu.ie3.simona.api.ontology.em;
 
-import edu.ie3.simona.api.data.ontology.DataResponseMessageToExt;
+import edu.ie3.simona.api.ontology.DataResponseMessageToExt;
 
 /** Messages that are sent from SIMONA to the external simulation that needs em data. */
 public interface EmDataResponseMessageToExt extends DataResponseMessageToExt {}
diff --git a/...ta/em/ontology/ProvideEmSetPointData.java → ...pi/ontology/em/ProvideEmSetPointData.java b/...ta/em/ontology/ProvideEmSetPointData.java → ...pi/ontology/em/ProvideEmSetPointData.java
@@ -4,7 +4,7 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.data.em.ontology;
+package edu.ie3.simona.api.ontology.em;
 
 import edu.ie3.simona.api.data.model.em.EmSetPoint;
 import java.util.Map;

diff --git a/...ata/ev/ontology/EvDataMessageFromExt.java → ...api/ontology/ev/EvDataMessageFromExt.java b/...ata/ev/ontology/EvDataMessageFromExt.java → ...api/ontology/ev/EvDataMessageFromExt.java
@@ -4,8 +4,8 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.data.ev.ontology;
+package edu.ie3.simona.api.ontology.ev;
 
-import edu.ie3.simona.api.data.ontology.DataMessageFromExt;
+import edu.ie3.simona.api.ontology.DataMessageFromExt;
 
 public interface EvDataMessageFromExt extends DataMessageFromExt {}
diff --git a/.../ontology/EvDataResponseMessageToExt.java → ...tology/ev/EvDataResponseMessageToExt.java b/.../ontology/EvDataResponseMessageToExt.java → ...tology/ev/EvDataResponseMessageToExt.java
@@ -4,9 +4,9 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.data.ev.ontology;
+package edu.ie3.simona.api.ontology.ev;
 
-import edu.ie3.simona.api.data.ontology.DataResponseMessageToExt;
+import edu.ie3.simona.api.ontology.DataResponseMessageToExt;
 
 /** Messages that are sent from SIMONA to the external ev simulation */
 public interface EvDataResponseMessageToExt extends DataResponseMessageToExt {}
diff --git a/.../data/ev/ontology/ProvideArrivingEvs.java → ...a/api/ontology/ev/ProvideArrivingEvs.java b/.../data/ev/ontology/ProvideArrivingEvs.java → ...a/api/ontology/ev/ProvideArrivingEvs.java
@@ -4,9 +4,9 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.data.ev.ontology;
+package edu.ie3.simona.api.ontology.ev;
 
-import edu.ie3.simona.api.data.ev.model.EvModel;
+import edu.ie3.simona.api.data.model.ev.EvModel;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;

diff --git a/...ata/ev/ontology/ProvideCurrentPrices.java → ...api/ontology/ev/ProvideCurrentPrices.java b/...ata/ev/ontology/ProvideCurrentPrices.java → ...api/ontology/ev/ProvideCurrentPrices.java
@@ -4,7 +4,7 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.data.ev.ontology;
+package edu.ie3.simona.api.ontology.ev;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...data/ev/ontology/ProvideDepartingEvs.java → .../api/ontology/ev/ProvideDepartingEvs.java b/...data/ev/ontology/ProvideDepartingEvs.java → .../api/ontology/ev/ProvideDepartingEvs.java
@@ -4,9 +4,9 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.data.ev.ontology;
+package edu.ie3.simona.api.ontology.ev;
 
-import edu.ie3.simona.api.data.ev.model.EvModel;
+import edu.ie3.simona.api.data.model.ev.EvModel;
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/...data/ev/ontology/ProvideEvcsFreeLots.java → .../api/ontology/ev/ProvideEvcsFreeLots.java b/...data/ev/ontology/ProvideEvcsFreeLots.java → .../api/ontology/ev/ProvideEvcsFreeLots.java
@@ -4,7 +4,7 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.data.ev.ontology;
+package edu.ie3.simona.api.ontology.ev;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...ata/ev/ontology/RequestCurrentPrices.java → ...api/ontology/ev/RequestCurrentPrices.java b/...ata/ev/ontology/RequestCurrentPrices.java → ...api/ontology/ev/RequestCurrentPrices.java
@@ -4,7 +4,7 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.data.ev.ontology;
+package edu.ie3.simona.api.ontology.ev;
 
 /** Request current charging prices per charging station. */
 public record RequestCurrentPrices() implements EvDataMessageFromExt {}
diff --git a/...data/ev/ontology/RequestDepartingEvs.java → .../api/ontology/ev/RequestDepartingEvs.java b/...data/ev/ontology/RequestDepartingEvs.java → .../api/ontology/ev/RequestDepartingEvs.java
@@ -4,7 +4,7 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.data.ev.ontology;
+package edu.ie3.simona.api.ontology.ev;
 
 import java.util.List;
 import java.util.Map;

diff --git a/...data/ev/ontology/RequestEvcsFreeLots.java → .../api/ontology/ev/RequestEvcsFreeLots.java b/...data/ev/ontology/RequestEvcsFreeLots.java → .../api/ontology/ev/RequestEvcsFreeLots.java
@@ -4,7 +4,7 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.data.ev.ontology;
+package edu.ie3.simona.api.ontology.ev;
 
 /** Request the number of free lots per charging station from SIMONA */
 public record RequestEvcsFreeLots() implements EvDataMessageFromExt {}
diff --git a/...a/ontology/PrimaryDataMessageFromExt.java → ...gy/primary/PrimaryDataMessageFromExt.java b/...a/ontology/PrimaryDataMessageFromExt.java → ...gy/primary/PrimaryDataMessageFromExt.java
@@ -4,9 +4,9 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.data.primarydata.ontology;
+package edu.ie3.simona.api.ontology.primary;
 
-import edu.ie3.simona.api.data.ontology.DataMessageFromExt;
+import edu.ie3.simona.api.ontology.DataMessageFromExt;
 
 /** Messages that are sent from an external primary data simulation to SIMONA */
 public interface PrimaryDataMessageFromExt extends DataMessageFromExt {}
diff --git a/...marydata/ontology/ProvidePrimaryData.java → .../ontology/primary/ProvidePrimaryData.java b/...marydata/ontology/ProvidePrimaryData.java → .../ontology/primary/ProvidePrimaryData.java
@@ -4,7 +4,7 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.data.primarydata.ontology;
+package edu.ie3.simona.api.ontology.primary;
 
 import edu.ie3.datamodel.models.value.Value;
 import java.util.Map;

diff --git a/...sults/ontology/ProvideResultEntities.java → ...tology/results/ProvideResultEntities.java b/...sults/ontology/ProvideResultEntities.java → ...tology/results/ProvideResultEntities.java
@@ -4,7 +4,7 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.data.results.ontology;
+package edu.ie3.simona.api.ontology.results;
 
 import edu.ie3.datamodel.models.result.ResultEntity;
 import java.util.List;

diff --git a/...sults/ontology/RequestResultEntities.java → ...tology/results/RequestResultEntities.java b/...sults/ontology/RequestResultEntities.java → ...tology/results/RequestResultEntities.java
@@ -4,7 +4,7 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.data.results.ontology;
+package edu.ie3.simona.api.ontology.results;
 
 import java.util.List;
 import java.util.UUID;

diff --git a/...ts/ontology/ResultDataMessageFromExt.java → ...ogy/results/ResultDataMessageFromExt.java b/...ts/ontology/ResultDataMessageFromExt.java → ...ogy/results/ResultDataMessageFromExt.java
@@ -4,9 +4,9 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.data.results.ontology;
+package edu.ie3.simona.api.ontology.results;
 
-import edu.ie3.simona.api.data.ontology.DataMessageFromExt;
+import edu.ie3.simona.api.ontology.DataMessageFromExt;
 
 /** Messages that are sent from an external simulation to the SIMONA */
 public interface ResultDataMessageFromExt extends DataMessageFromExt {}
diff --git a/...ology/ResultDataResponseMessageToExt.java → ...sults/ResultDataResponseMessageToExt.java b/...ology/ResultDataResponseMessageToExt.java → ...sults/ResultDataResponseMessageToExt.java
@@ -4,9 +4,9 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.data.results.ontology;
+package edu.ie3.simona.api.ontology.results;
 
-import edu.ie3.simona.api.data.ontology.DataResponseMessageToExt;
+import edu.ie3.simona.api.ontology.DataResponseMessageToExt;
 
 /** Messages that are sent from SIMONA to the external simulation that needs results */
 public interface ResultDataResponseMessageToExt extends DataResponseMessageToExt {}
diff --git a/...imulation/ontology/ActivationMessage.java → ...ntology/simulation/ActivationMessage.java b/...imulation/ontology/ActivationMessage.java → ...ntology/simulation/ActivationMessage.java
@@ -4,7 +4,7 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.simulation.ontology;
+package edu.ie3.simona.api.ontology.simulation;
 
 /**
  * Message that the external simulation is activated with by SIMONA

diff --git a/...imulation/ontology/CompletionMessage.java → ...ntology/simulation/CompletionMessage.java b/...imulation/ontology/CompletionMessage.java → ...ntology/simulation/CompletionMessage.java
@@ -4,7 +4,7 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.simulation.ontology;
+package edu.ie3.simona.api.ontology.simulation;
 
 import java.util.Optional;
 

diff --git a/...ulation/ontology/ControlMessageToExt.java → ...ology/simulation/ControlMessageToExt.java b/...ulation/ontology/ControlMessageToExt.java → ...ology/simulation/ControlMessageToExt.java
@@ -4,7 +4,7 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.simulation.ontology;
+package edu.ie3.simona.api.ontology.simulation;
 
 /** Interface for control messages from the SIMONA to the external simulation */
 public interface ControlMessageToExt {}
diff --git a/...tology/ControlResponseMessageFromExt.java → ...lation/ControlResponseMessageFromExt.java b/...tology/ControlResponseMessageFromExt.java → ...lation/ControlResponseMessageFromExt.java
@@ -4,7 +4,7 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.simulation.ontology;
+package edu.ie3.simona.api.ontology.simulation;
 
 /** Interface for control messages from the external simulation to SIMONA */
 public interface ControlResponseMessageFromExt {}
diff --git a/...lation/ontology/TerminationCompleted.java → ...logy/simulation/TerminationCompleted.java b/...lation/ontology/TerminationCompleted.java → ...logy/simulation/TerminationCompleted.java
@@ -4,7 +4,7 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.simulation.ontology;
+package edu.ie3.simona.api.ontology.simulation;
 
 /** Message returned to SIMONA indicating that the external simulation terminated */
 public record TerminationCompleted() implements ControlResponseMessageFromExt {}
diff --git a/...mulation/ontology/TerminationMessage.java → ...tology/simulation/TerminationMessage.java b/...mulation/ontology/TerminationMessage.java → ...tology/simulation/TerminationMessage.java
@@ -4,7 +4,7 @@
  * Research group Distribution grid planning and operation
  */
 
-package edu.ie3.simona.api.simulation.ontology;
+package edu.ie3.simona.api.ontology.simulation;
 
 /**
  * Message that is sent once SIMONA is terminating, indicating that the external simulation should

diff --git a/src/main/java/edu/ie3/simona/api/simulation/ExtSimAdapterData.java b/src/main/java/edu/ie3/simona/api/simulation/ExtSimAdapterData.java
@@ -6,8 +6,8 @@
 
 package edu.ie3.simona.api.simulation;
 
-import edu.ie3.simona.api.simulation.ontology.ControlMessageToExt;
-import edu.ie3.simona.api.simulation.ontology.ControlResponseMessageFromExt;
+import edu.ie3.simona.api.ontology.simulation.ControlMessageToExt;
+import edu.ie3.simona.api.ontology.simulation.ControlResponseMessageFromExt;
 import java.util.concurrent.LinkedBlockingQueue;
 import org.apache.pekko.actor.typed.ActorRef;