diff --git a/openbas-api/src/main/java/io/openbas/rest/exercise/ExerciseApi.java b/openbas-api/src/main/java/io/openbas/rest/exercise/ExerciseApi.java
index a8e4073b64..627d7a4f4b 100644
--- a/openbas-api/src/main/java/io/openbas/rest/exercise/ExerciseApi.java
+++ b/openbas-api/src/main/java/io/openbas/rest/exercise/ExerciseApi.java
@@ -13,6 +13,7 @@
 import io.openbas.rest.exercise.exports.VariableMixin;
 import io.openbas.rest.exercise.exports.VariableWithValueMixin;
 import io.openbas.rest.exercise.form.*;
+import io.openbas.rest.exercise.service.ExerciseService;
 import io.openbas.rest.helper.RestBehavior;
 import io.openbas.rest.helper.TeamHelper;
 import io.openbas.rest.inject.form.InjectExpectationResultsByAttackPattern;
diff --git a/openbas-api/src/main/java/io/openbas/rest/exercise/ExerciseImportApi.java b/openbas-api/src/main/java/io/openbas/rest/exercise/ExerciseImportApi.java
index 8f2656618a..048f03d95b 100644
--- a/openbas-api/src/main/java/io/openbas/rest/exercise/ExerciseImportApi.java
+++ b/openbas-api/src/main/java/io/openbas/rest/exercise/ExerciseImportApi.java
@@ -4,6 +4,7 @@
 import io.openbas.database.model.ImportMapper;
 import io.openbas.database.repository.ImportMapperRepository;
 import io.openbas.rest.exception.ElementNotFoundException;
+import io.openbas.rest.exercise.service.ExerciseService;
 import io.openbas.rest.helper.RestBehavior;
 import io.openbas.rest.scenario.form.InjectsImportInput;
 import io.openbas.rest.scenario.response.ImportTestSummary;
diff --git a/openbas-api/src/main/java/io/openbas/rest/exercise/ExerciseService.java b/openbas-api/src/main/java/io/openbas/rest/exercise/service/ExerciseService.java
similarity index 99%
rename from openbas-api/src/main/java/io/openbas/rest/exercise/ExerciseService.java
rename to openbas-api/src/main/java/io/openbas/rest/exercise/service/ExerciseService.java
index f2ce95b442..5eb7c59a39 100644
--- a/openbas-api/src/main/java/io/openbas/rest/exercise/ExerciseService.java
+++ b/openbas-api/src/main/java/io/openbas/rest/exercise/service/ExerciseService.java
@@ -1,4 +1,4 @@
-package io.openbas.rest.exercise;
+package io.openbas.rest.exercise.service;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
diff --git a/openbas-api/src/main/java/io/openbas/rest/report/ReportApi.java b/openbas-api/src/main/java/io/openbas/rest/report/ReportApi.java
index 9108650e77..e106879a21 100644
--- a/openbas-api/src/main/java/io/openbas/rest/report/ReportApi.java
+++ b/openbas-api/src/main/java/io/openbas/rest/report/ReportApi.java
@@ -1,7 +1,7 @@
 package io.openbas.rest.report;
 
 import io.openbas.database.model.*;
-import io.openbas.rest.exercise.ExerciseService;
+import io.openbas.rest.exercise.service.ExerciseService;
 import io.openbas.rest.helper.RestBehavior;
 import io.openbas.rest.report.form.ReportInjectCommentInput;
 import io.openbas.rest.report.form.ReportInput;
diff --git a/openbas-api/src/main/java/io/openbas/rest/scenario/ScenarioExerciseApi.java b/openbas-api/src/main/java/io/openbas/rest/scenario/ScenarioExerciseApi.java
index ac1efe5fdc..a6d3e8f536 100644
--- a/openbas-api/src/main/java/io/openbas/rest/scenario/ScenarioExerciseApi.java
+++ b/openbas-api/src/main/java/io/openbas/rest/scenario/ScenarioExerciseApi.java
@@ -2,7 +2,7 @@
 
 import io.openbas.aop.LogExecutionTime;
 import io.openbas.database.model.Exercise;
-import io.openbas.rest.exercise.ExerciseService;
+import io.openbas.rest.exercise.service.ExerciseService;
 import io.openbas.rest.exercise.form.ExerciseSimple;
 import io.openbas.utils.pagination.SearchPaginationInput;
 import jakarta.validation.Valid;
diff --git a/openbas-api/src/test/java/io/openbas/rest/InjectApiTest.java b/openbas-api/src/test/java/io/openbas/rest/InjectApiTest.java
index 03e5a3ddae..2a4f366166 100644
--- a/openbas-api/src/test/java/io/openbas/rest/InjectApiTest.java
+++ b/openbas-api/src/test/java/io/openbas/rest/InjectApiTest.java
@@ -5,7 +5,7 @@
 import io.openbas.database.model.InjectorContract;
 import io.openbas.database.model.*;
 import io.openbas.database.repository.*;
-import io.openbas.rest.exercise.ExerciseService;
+import io.openbas.rest.exercise.service.ExerciseService;
 import io.openbas.rest.inject.form.InjectInput;
 import io.openbas.service.ScenarioService;
 import io.openbas.utils.fixtures.InjectExpectationFixture;
diff --git a/openbas-api/src/test/java/io/openbas/rest/ReportApiTest.java b/openbas-api/src/test/java/io/openbas/rest/ReportApiTest.java
index 7cc1044a83..272262ae4d 100644
--- a/openbas-api/src/test/java/io/openbas/rest/ReportApiTest.java
+++ b/openbas-api/src/test/java/io/openbas/rest/ReportApiTest.java
@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jayway.jsonpath.JsonPath;
 import io.openbas.database.model.*;
-import io.openbas.rest.exercise.ExerciseService;
+import io.openbas.rest.exercise.service.ExerciseService;
 import io.openbas.rest.mapper.MapperApi;
 import io.openbas.rest.report.ReportApi;
 import io.openbas.rest.report.form.ReportInjectCommentInput;
@@ -23,7 +23,6 @@
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
 import java.lang.reflect.Field;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
diff --git a/openbas-api/src/test/java/io/openbas/service/ExerciseServiceTest.java b/openbas-api/src/test/java/io/openbas/service/ExerciseServiceTest.java
index 1f98922be7..543067793a 100644
--- a/openbas-api/src/test/java/io/openbas/service/ExerciseServiceTest.java
+++ b/openbas-api/src/test/java/io/openbas/service/ExerciseServiceTest.java
@@ -2,7 +2,7 @@
 
 import io.openbas.database.model.*;
 import io.openbas.database.repository.*;
-import io.openbas.rest.exercise.ExerciseService;
+import io.openbas.rest.exercise.service.ExerciseService;
 import io.openbas.rest.inject.service.InjectDuplicateService;
 import io.openbas.utils.ExerciseMapper;
 import io.openbas.utils.ResultUtils;