diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzContext.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzContext.java
index 7b38ab83a..09614f1a7 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzContext.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/DynaWaltzContext.java
@@ -16,6 +16,9 @@
 import com.powsybl.dynawaltz.models.frequencysynchronizers.FrequencySynchronizerModel;
 import com.powsybl.dynawaltz.models.frequencysynchronizers.OmegaRef;
 import com.powsybl.dynawaltz.models.frequencysynchronizers.SetPoint;
+import com.powsybl.dynawaltz.models.macroconnections.MacroConnect;
+import com.powsybl.dynawaltz.models.macroconnections.MacroConnectAttribute;
+import com.powsybl.dynawaltz.models.macroconnections.MacroConnector;
 import com.powsybl.dynawaltz.parameters.ParametersSet;
 import com.powsybl.dynawaltz.xml.MacroStaticReference;
 import com.powsybl.iidm.network.Identifiable;
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/AbstractBlackBoxModel.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/AbstractBlackBoxModel.java
index c0eaf8663..9bf57b720 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/AbstractBlackBoxModel.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/AbstractBlackBoxModel.java
@@ -8,6 +8,8 @@
 
 import com.powsybl.dynawaltz.DynaWaltzContext;
 import com.powsybl.dynawaltz.DynaWaltzParameters;
+import com.powsybl.dynawaltz.models.macroconnections.MacroConnectAttribute;
+import com.powsybl.dynawaltz.models.macroconnections.MacroConnectionSuffix;
 import com.powsybl.dynawaltz.parameters.ParametersSet;
 import com.powsybl.iidm.network.Identifiable;
 
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/Model.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/Model.java
index 1d81e6fb9..a33503c8b 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/Model.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/Model.java
@@ -7,6 +7,7 @@
 package com.powsybl.dynawaltz.models;
 
 import com.powsybl.dynamicsimulation.DynamicModel;
+import com.powsybl.dynawaltz.models.macroconnections.MacroConnectAttribute;
 
 import java.util.List;
 
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automatons/TapChangerBlockingAutomaton.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automatons/TapChangerBlockingAutomaton.java
index fe571f859..22efa11e4 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automatons/TapChangerBlockingAutomaton.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automatons/TapChangerBlockingAutomaton.java
@@ -10,7 +10,7 @@
 import com.powsybl.commons.PowsyblException;
 import com.powsybl.dynawaltz.DynaWaltzContext;
 import com.powsybl.dynawaltz.models.AbstractPureDynamicBlackBoxModel;
-import com.powsybl.dynawaltz.models.MeasurementPoint;
+import com.powsybl.dynawaltz.models.macroconnections.MeasurementPoint;
 import com.powsybl.dynawaltz.models.VarConnection;
 import com.powsybl.dynawaltz.models.buses.BusModel;
 import com.powsybl.dynawaltz.models.transformers.TapChangerModel;
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/AbstractBus.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/AbstractBus.java
index 432d0617a..c73ad40d9 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/AbstractBus.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/AbstractBus.java
@@ -10,7 +10,7 @@
 import com.powsybl.commons.PowsyblException;
 import com.powsybl.dynawaltz.DynaWaltzContext;
 import com.powsybl.dynawaltz.models.AbstractEquipmentBlackBoxModel;
-import com.powsybl.dynawaltz.models.MacroConnectAttribute;
+import com.powsybl.dynawaltz.models.macroconnections.MacroConnectAttribute;
 import com.powsybl.iidm.network.Bus;
 
 import java.util.ArrayList;
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/AbstractDefaultModel.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/AbstractDefaultModel.java
index 3507ea59f..b7c5c158b 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/AbstractDefaultModel.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/defaultmodels/AbstractDefaultModel.java
@@ -1,6 +1,6 @@
 package com.powsybl.dynawaltz.models.defaultmodels;
 
-import com.powsybl.dynawaltz.models.MacroConnectAttribute;
+import com.powsybl.dynawaltz.models.macroconnections.MacroConnectAttribute;
 import com.powsybl.dynawaltz.models.Model;
 import com.powsybl.dynawaltz.xml.DynaWaltzXmlConstants;
 
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/OmegaRef.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/OmegaRef.java
index 9255d8038..fe6cef386 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/OmegaRef.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/OmegaRef.java
@@ -9,7 +9,7 @@
 import com.powsybl.commons.PowsyblException;
 import com.powsybl.dynawaltz.DynaWaltzContext;
 import com.powsybl.dynawaltz.DynaWaltzParameters;
-import com.powsybl.dynawaltz.models.MacroConnectAttribute;
+import com.powsybl.dynawaltz.models.macroconnections.MacroConnectAttribute;
 import com.powsybl.dynawaltz.models.VarConnection;
 import com.powsybl.dynawaltz.models.buses.BusModel;
 import com.powsybl.dynawaltz.parameters.ParametersSet;
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/MacroConnect.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnect.java
similarity index 97%
rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/MacroConnect.java
rename to dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnect.java
index 0fba37105..46d311294 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/MacroConnect.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnect.java
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  * SPDX-License-Identifier: MPL-2.0
  */
-package com.powsybl.dynawaltz.models;
+package com.powsybl.dynawaltz.models.macroconnections;
 
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/MacroConnectAttribute.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnectAttribute.java
similarity index 92%
rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/MacroConnectAttribute.java
rename to dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnectAttribute.java
index 514e33064..c963fc582 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/MacroConnectAttribute.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnectAttribute.java
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  * SPDX-License-Identifier: MPL-2.0
  */
-package com.powsybl.dynawaltz.models;
+package com.powsybl.dynawaltz.models.macroconnections;
 
 /**
  * @author Laurent Issertial <laurent.issertial at rte-france.com>
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/MacroConnectionSuffix.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnectionSuffix.java
similarity index 89%
rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/MacroConnectionSuffix.java
rename to dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnectionSuffix.java
index a0274e026..e220c1645 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/MacroConnectionSuffix.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnectionSuffix.java
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  * SPDX-License-Identifier: MPL-2.0
  */
-package com.powsybl.dynawaltz.models;
+package com.powsybl.dynawaltz.models.macroconnections;
 
 /**
  * @author Laurent Issertial <laurent.issertial at rte-france.com>
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/MacroConnector.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnector.java
similarity index 93%
rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/MacroConnector.java
rename to dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnector.java
index ad5f18743..422279025 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/MacroConnector.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MacroConnector.java
@@ -4,7 +4,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package com.powsybl.dynawaltz.models;
+package com.powsybl.dynawaltz.models.macroconnections;
+
+import com.powsybl.dynawaltz.models.Side;
+import com.powsybl.dynawaltz.models.VarConnection;
 
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/MeasurementPoint.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MeasurementPoint.java
similarity index 95%
rename from dynawaltz/src/main/java/com/powsybl/dynawaltz/models/MeasurementPoint.java
rename to dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MeasurementPoint.java
index 5844725c0..e4b917fd4 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/MeasurementPoint.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/macroconnections/MeasurementPoint.java
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  * SPDX-License-Identifier: MPL-2.0
  */
-package com.powsybl.dynawaltz.models;
+package com.powsybl.dynawaltz.models.macroconnections;
 
 /**
  * @author Laurent Issertial <laurent.issertial at rte-france.com>
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/DydXml.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/DydXml.java
index 313058115..8491c83df 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/DydXml.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/xml/DydXml.java
@@ -9,8 +9,8 @@
 
 import com.powsybl.dynawaltz.DynaWaltzContext;
 import com.powsybl.dynawaltz.models.BlackBoxModel;
-import com.powsybl.dynawaltz.models.MacroConnect;
-import com.powsybl.dynawaltz.models.MacroConnector;
+import com.powsybl.dynawaltz.models.macroconnections.MacroConnect;
+import com.powsybl.dynawaltz.models.macroconnections.MacroConnector;
 
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;