diff --git a/tests/e2e/models/results/base_case.csv b/tests/e2e/models/andromede-v1/results/base_case.csv
similarity index 100%
rename from tests/e2e/models/results/base_case.csv
rename to tests/e2e/models/andromede-v1/results/base_case.csv
diff --git a/tests/e2e/models/results/bde_case.csv b/tests/e2e/models/andromede-v1/results/bde_case.csv
similarity index 100%
rename from tests/e2e/models/results/bde_case.csv
rename to tests/e2e/models/andromede-v1/results/bde_case.csv
diff --git a/tests/e2e/models/results/cluster_testing1.csv b/tests/e2e/models/andromede-v1/results/cluster_testing1.csv
similarity index 100%
rename from tests/e2e/models/results/cluster_testing1.csv
rename to tests/e2e/models/andromede-v1/results/cluster_testing1.csv
diff --git a/tests/e2e/models/results/cluster_testing2.csv b/tests/e2e/models/andromede-v1/results/cluster_testing2.csv
similarity index 100%
rename from tests/e2e/models/results/cluster_testing2.csv
rename to tests/e2e/models/andromede-v1/results/cluster_testing2.csv
diff --git a/tests/e2e/models/results/dsr_case.csv b/tests/e2e/models/andromede-v1/results/dsr_case.csv
similarity index 100%
rename from tests/e2e/models/results/dsr_case.csv
rename to tests/e2e/models/andromede-v1/results/dsr_case.csv
diff --git a/tests/e2e/models/results/electrolyser_case.csv b/tests/e2e/models/andromede-v1/results/electrolyser_case.csv
similarity index 100%
rename from tests/e2e/models/results/electrolyser_case.csv
rename to tests/e2e/models/andromede-v1/results/electrolyser_case.csv
diff --git a/tests/e2e/models/results/storage_case.csv b/tests/e2e/models/andromede-v1/results/storage_case.csv
similarity index 100%
rename from tests/e2e/models/results/storage_case.csv
rename to tests/e2e/models/andromede-v1/results/storage_case.csv
diff --git a/tests/e2e/models/series/loadClusterTesting.txt b/tests/e2e/models/andromede-v1/series/loadClusterTesting.txt
similarity index 100%
rename from tests/e2e/models/series/loadClusterTesting.txt
rename to tests/e2e/models/andromede-v1/series/loadClusterTesting.txt
diff --git a/tests/e2e/models/series/load_ts_base028.txt b/tests/e2e/models/andromede-v1/series/load_ts_base028.txt
similarity index 100%
rename from tests/e2e/models/series/load_ts_base028.txt
rename to tests/e2e/models/andromede-v1/series/load_ts_base028.txt
diff --git a/tests/e2e/models/series/wind_ts_base028.txt b/tests/e2e/models/andromede-v1/series/wind_ts_base028.txt
similarity index 100%
rename from tests/e2e/models/series/wind_ts_base028.txt
rename to tests/e2e/models/andromede-v1/series/wind_ts_base028.txt
diff --git a/tests/e2e/models/systems/base_validation.yml b/tests/e2e/models/andromede-v1/systems/base_validation.yml
similarity index 100%
rename from tests/e2e/models/systems/base_validation.yml
rename to tests/e2e/models/andromede-v1/systems/base_validation.yml
diff --git a/tests/e2e/models/systems/bde_system.yml b/tests/e2e/models/andromede-v1/systems/bde_system.yml
similarity index 100%
rename from tests/e2e/models/systems/bde_system.yml
rename to tests/e2e/models/andromede-v1/systems/bde_system.yml
diff --git a/tests/e2e/models/systems/cluster_validation_1.yml b/tests/e2e/models/andromede-v1/systems/cluster_validation_1.yml
similarity index 100%
rename from tests/e2e/models/systems/cluster_validation_1.yml
rename to tests/e2e/models/andromede-v1/systems/cluster_validation_1.yml
diff --git a/tests/e2e/models/systems/cluster_validation_2.yml b/tests/e2e/models/andromede-v1/systems/cluster_validation_2.yml
similarity index 100%
rename from tests/e2e/models/systems/cluster_validation_2.yml
rename to tests/e2e/models/andromede-v1/systems/cluster_validation_2.yml
diff --git a/tests/e2e/models/systems/cluster_validation_3.yml b/tests/e2e/models/andromede-v1/systems/cluster_validation_3.yml
similarity index 100%
rename from tests/e2e/models/systems/cluster_validation_3.yml
rename to tests/e2e/models/andromede-v1/systems/cluster_validation_3.yml
diff --git a/tests/e2e/models/systems/dsr_validation.yml b/tests/e2e/models/andromede-v1/systems/dsr_validation.yml
similarity index 100%
rename from tests/e2e/models/systems/dsr_validation.yml
rename to tests/e2e/models/andromede-v1/systems/dsr_validation.yml
diff --git a/tests/e2e/models/systems/electrolyser_validation.yml b/tests/e2e/models/andromede-v1/systems/electrolyser_validation.yml
similarity index 100%
rename from tests/e2e/models/systems/electrolyser_validation.yml
rename to tests/e2e/models/andromede-v1/systems/electrolyser_validation.yml
diff --git a/tests/e2e/models/systems/storage_validation.yml b/tests/e2e/models/andromede-v1/systems/storage_validation.yml
similarity index 100%
rename from tests/e2e/models/systems/storage_validation.yml
rename to tests/e2e/models/andromede-v1/systems/storage_validation.yml
diff --git a/tests/e2e/models/test_andromede_v1_models.py b/tests/e2e/models/andromede-v1/test_andromede_v1_models.py
similarity index 100%
rename from tests/e2e/models/test_andromede_v1_models.py
rename to tests/e2e/models/andromede-v1/test_andromede_v1_models.py
diff --git a/tests/e2e/models/conftest.py b/tests/e2e/models/poc-various-models/conftest.py
similarity index 100%
rename from tests/e2e/models/conftest.py
rename to tests/e2e/models/poc-various-models/conftest.py
diff --git a/tests/e2e/models/libs/__init__.py b/tests/e2e/models/poc-various-models/libs/__init__.py
similarity index 100%
rename from tests/e2e/models/libs/__init__.py
rename to tests/e2e/models/poc-various-models/libs/__init__.py
diff --git a/tests/e2e/models/libs/ac.yml b/tests/e2e/models/poc-various-models/libs/ac.yml
similarity index 100%
rename from tests/e2e/models/libs/ac.yml
rename to tests/e2e/models/poc-various-models/libs/ac.yml
diff --git a/tests/e2e/models/libs/lib_unittest.yml b/tests/e2e/models/poc-various-models/libs/lib_unittest.yml
similarity index 100%
rename from tests/e2e/models/libs/lib_unittest.yml
rename to tests/e2e/models/poc-various-models/libs/lib_unittest.yml
diff --git a/tests/e2e/models/libs/standard.py b/tests/e2e/models/poc-various-models/libs/standard.py
similarity index 100%
rename from tests/e2e/models/libs/standard.py
rename to tests/e2e/models/poc-various-models/libs/standard.py
diff --git a/tests/e2e/models/libs/standard_sc.py b/tests/e2e/models/poc-various-models/libs/standard_sc.py
similarity index 99%
rename from tests/e2e/models/libs/standard_sc.py
rename to tests/e2e/models/poc-various-models/libs/standard_sc.py
index 60e1477d..2cc00e45 100644
--- a/tests/e2e/models/libs/standard_sc.py
+++ b/tests/e2e/models/poc-various-models/libs/standard_sc.py
@@ -10,6 +10,8 @@
 #
 # This file is part of the Antares project.
 
+from libs.standard import BALANCE_PORT_TYPE, CONSTANT
+
 from andromede.expression import literal, param, var
 from andromede.expression.expression import port_field
 from andromede.model import (
@@ -22,7 +24,6 @@
     model,
 )
 from andromede.model.port import PortFieldDefinition, PortFieldId
-from tests.e2e.models.libs.standard import BALANCE_PORT_TYPE, CONSTANT
 
 """
 Simple Convertor model.
diff --git a/tests/e2e/models/libs/standard_sc.yml b/tests/e2e/models/poc-various-models/libs/standard_sc.yml
similarity index 100%
rename from tests/e2e/models/libs/standard_sc.yml
rename to tests/e2e/models/poc-various-models/libs/standard_sc.yml
diff --git a/tests/e2e/models/test_ac_link.py b/tests/e2e/models/poc-various-models/test_ac_link.py
similarity index 98%
rename from tests/e2e/models/test_ac_link.py
rename to tests/e2e/models/poc-various-models/test_ac_link.py
index cc190c9c..23b3144f 100644
--- a/tests/e2e/models/test_ac_link.py
+++ b/tests/e2e/models/poc-various-models/test_ac_link.py
@@ -12,6 +12,7 @@
 from pathlib import Path
 
 import pytest
+from libs.standard import BALANCE_PORT_TYPE, DEMAND_MODEL, GENERATOR_MODEL
 
 from andromede.model.library import Library, library
 from andromede.model.parsing import parse_yaml_library
@@ -25,11 +26,6 @@
     PortRef,
     create_component,
 )
-from tests.e2e.models.libs.standard import (
-    BALANCE_PORT_TYPE,
-    DEMAND_MODEL,
-    GENERATOR_MODEL,
-)
 
 
 @pytest.fixture
diff --git a/tests/e2e/models/test_electrolyzer.py b/tests/e2e/models/poc-various-models/test_electrolyzer.py
similarity index 98%
rename from tests/e2e/models/test_electrolyzer.py
rename to tests/e2e/models/poc-various-models/test_electrolyzer.py
index 30ce6b67..9f2681e1 100644
--- a/tests/e2e/models/test_electrolyzer.py
+++ b/tests/e2e/models/poc-various-models/test_electrolyzer.py
@@ -10,6 +10,8 @@
 #
 # This file is part of the Antares project.
 
+from libs.standard import CONSTANT, TIME_AND_SCENARIO_FREE
+
 from andromede.expression import literal, param, var
 from andromede.expression.expression import port_field
 from andromede.model import (
@@ -31,7 +33,6 @@
     PortRef,
     create_component,
 )
-from tests.e2e.models.libs.standard import CONSTANT, TIME_AND_SCENARIO_FREE
 
 ELECTRICAL_PORT = PortType(id="electrical_port", fields=[PortField("flow")])
 
diff --git a/tests/e2e/models/test_electrolyzer_n_inputs.py b/tests/e2e/models/poc-various-models/test_electrolyzer_n_inputs.py
similarity index 98%
rename from tests/e2e/models/test_electrolyzer_n_inputs.py
rename to tests/e2e/models/poc-various-models/test_electrolyzer_n_inputs.py
index a6447134..3ccf8995 100644
--- a/tests/e2e/models/test_electrolyzer_n_inputs.py
+++ b/tests/e2e/models/poc-various-models/test_electrolyzer_n_inputs.py
@@ -12,6 +12,15 @@
 
 import math
 
+from libs.standard import DEMAND_MODEL, GENERATOR_MODEL, NODE_BALANCE_MODEL
+from libs.standard_sc import (
+    CONVERTOR_MODEL,
+    CONVERTOR_RECEIVE_IN,
+    DECOMPOSE_1_FLOW_INTO_2_FLOW,
+    NODE_BALANCE_MODEL_MOD,
+    TWO_INPUTS_CONVERTOR_MODEL,
+)
+
 from andromede.simulation import OutputValues, TimeBlock, build_problem
 from andromede.study import (
     ConstantData,
@@ -21,18 +30,6 @@
     PortRef,
     create_component,
 )
-from tests.e2e.models.libs.standard import (
-    DEMAND_MODEL,
-    GENERATOR_MODEL,
-    NODE_BALANCE_MODEL,
-)
-from tests.e2e.models.libs.standard_sc import (
-    CONVERTOR_MODEL,
-    CONVERTOR_RECEIVE_IN,
-    DECOMPOSE_1_FLOW_INTO_2_FLOW,
-    NODE_BALANCE_MODEL_MOD,
-    TWO_INPUTS_CONVERTOR_MODEL,
-)
 
 """
 This file tests various modellings for an electrolyser with multiple inputs. The models are created in Python directly.
diff --git a/tests/e2e/models/test_electrolyzer_n_inputs_yaml.py b/tests/e2e/models/poc-various-models/test_electrolyzer_n_inputs_yaml.py
similarity index 100%
rename from tests/e2e/models/test_electrolyzer_n_inputs_yaml.py
rename to tests/e2e/models/poc-various-models/test_electrolyzer_n_inputs_yaml.py
diff --git a/tests/e2e/models/test_quota_co2.py b/tests/e2e/models/poc-various-models/test_quota_co2.py
similarity index 95%
rename from tests/e2e/models/test_quota_co2.py
rename to tests/e2e/models/poc-various-models/test_quota_co2.py
index 6e826c92..ccdcd494 100644
--- a/tests/e2e/models/test_quota_co2.py
+++ b/tests/e2e/models/poc-various-models/test_quota_co2.py
@@ -16,6 +16,9 @@
 
 import math
 
+from libs.standard import DEMAND_MODEL, LINK_MODEL, NODE_BALANCE_MODEL
+from libs.standard_sc import C02_POWER_MODEL, QUOTA_CO2_MODEL
+
 from andromede.simulation import OutputValues, TimeBlock, build_problem
 from andromede.study import (
     ConstantData,
@@ -25,8 +28,6 @@
     PortRef,
     create_component,
 )
-from tests.e2e.models.libs.standard import DEMAND_MODEL, LINK_MODEL, NODE_BALANCE_MODEL
-from tests.e2e.models.libs.standard_sc import C02_POWER_MODEL, QUOTA_CO2_MODEL
 
 
 def test_quota_co2() -> None:
diff --git a/tests/e2e/models/test_quota_co2_yaml.py b/tests/e2e/models/poc-various-models/test_quota_co2_yaml.py
similarity index 100%
rename from tests/e2e/models/test_quota_co2_yaml.py
rename to tests/e2e/models/poc-various-models/test_quota_co2_yaml.py
diff --git a/tests/e2e/models/test_short_term_storage_complex.py b/tests/e2e/models/poc-various-models/test_short_term_storage_complex.py
similarity index 98%
rename from tests/e2e/models/test_short_term_storage_complex.py
rename to tests/e2e/models/poc-various-models/test_short_term_storage_complex.py
index 3518c5ad..b7833682 100644
--- a/tests/e2e/models/test_short_term_storage_complex.py
+++ b/tests/e2e/models/poc-various-models/test_short_term_storage_complex.py
@@ -1,6 +1,13 @@
 import math
 
 import pandas as pd
+from libs.standard import (
+    DEMAND_MODEL,
+    NODE_BALANCE_MODEL,
+    SPILLAGE_MODEL,
+    UNSUPPLIED_ENERGY_MODEL,
+)
+from libs.standard_sc import SHORT_TERM_STORAGE_COMPLEX
 
 from andromede.simulation import BlockBorderManagement, TimeBlock, build_problem
 from andromede.study import (
@@ -12,13 +19,6 @@
     TimeScenarioSeriesData,
     create_component,
 )
-from tests.e2e.models.libs.standard import (
-    DEMAND_MODEL,
-    NODE_BALANCE_MODEL,
-    SPILLAGE_MODEL,
-    UNSUPPLIED_ENERGY_MODEL,
-)
-from tests.e2e.models.libs.standard_sc import SHORT_TERM_STORAGE_COMPLEX
 
 
 def generate_data(