diff --git a/src/antares/craft/service/api_services/output_api.py b/src/antares/craft/service/api_services/services/output.py
similarity index 100%
rename from src/antares/craft/service/api_services/output_api.py
rename to src/antares/craft/service/api_services/services/output.py
diff --git a/src/antares/craft/service/local_services/output_local.py b/src/antares/craft/service/local_services/services/output.py
similarity index 100%
rename from src/antares/craft/service/local_services/output_local.py
rename to src/antares/craft/service/local_services/services/output.py
diff --git a/src/antares/craft/service/service_factory.py b/src/antares/craft/service/service_factory.py
index 7e5c3cfb..258bd1b5 100644
--- a/src/antares/craft/service/service_factory.py
+++ b/src/antares/craft/service/service_factory.py
@@ -17,9 +17,9 @@
 from antares.craft.service.api_services.binding_constraint_api import BindingConstraintApiService
 from antares.craft.service.api_services.hydro_api import HydroApiService
 from antares.craft.service.api_services.link_api import LinkApiService
-from antares.craft.service.api_services.output_api import OutputApiService
 from antares.craft.service.api_services.renewable_api import RenewableApiService
 from antares.craft.service.api_services.run_api import RunApiService
+from antares.craft.service.api_services.services.output import OutputApiService
 from antares.craft.service.api_services.services.settings import StudySettingsAPIService
 from antares.craft.service.api_services.st_storage_api import ShortTermStorageApiService
 from antares.craft.service.api_services.study_api import StudyApiService
@@ -41,9 +41,9 @@
 from antares.craft.service.local_services.binding_constraint_local import BindingConstraintLocalService
 from antares.craft.service.local_services.hydro_local import HydroLocalService
 from antares.craft.service.local_services.link_local import LinkLocalService
-from antares.craft.service.local_services.output_local import OutputLocalService
 from antares.craft.service.local_services.renewable_local import RenewableLocalService
 from antares.craft.service.local_services.run_local import RunLocalService
+from antares.craft.service.local_services.services.output import OutputLocalService
 from antares.craft.service.local_services.services.settings import StudySettingsLocalService
 from antares.craft.service.local_services.st_storage_local import ShortTermStorageLocalService
 from antares.craft.service.local_services.study_local import StudyLocalService
diff --git a/tests/antares/delete/test_delete_api.py b/tests/antares/delete/test_delete_api.py
index a288398c..a75400bc 100644
--- a/tests/antares/delete/test_delete_api.py
+++ b/tests/antares/delete/test_delete_api.py
@@ -33,8 +33,8 @@
 from antares.craft.service.api_services.binding_constraint_api import BindingConstraintApiService
 from antares.craft.service.api_services.hydro_api import HydroApiService
 from antares.craft.service.api_services.link_api import LinkApiService
-from antares.craft.service.api_services.output_api import OutputApiService
 from antares.craft.service.api_services.renewable_api import RenewableApiService
+from antares.craft.service.api_services.services.output import OutputApiService
 from antares.craft.service.api_services.st_storage_api import ShortTermStorageApiService
 from antares.craft.service.api_services.study_api import StudyApiService
 from antares.craft.service.api_services.thermal_api import ThermalApiService
diff --git a/tests/antares/services/api_services/test_study_api.py b/tests/antares/services/api_services/test_study_api.py
index 69b5ae18..9fc6b6a3 100644
--- a/tests/antares/services/api_services/test_study_api.py
+++ b/tests/antares/services/api_services/test_study_api.py
@@ -54,7 +54,7 @@
 from antares.craft.model.settings.study_settings import StudySettingsUpdate
 from antares.craft.model.simulation import AntaresSimulationParameters, Job, JobStatus, Solver
 from antares.craft.model.study import Study, create_study_api, create_variant_api, import_study_api, read_study_api
-from antares.craft.service.api_services.output_api import OutputApiService
+from antares.craft.service.api_services.services.output import OutputApiService
 from antares.craft.service.service_factory import ServiceFactory