diff --git a/src/main/java/de/tum/in/www1/artemis/service/ExerciseDeletionService.java b/src/main/java/de/tum/in/www1/artemis/service/ExerciseDeletionService.java
index 52b45e9e1a03..635e8938c36f 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/ExerciseDeletionService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/ExerciseDeletionService.java
@@ -30,6 +30,7 @@
 import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismResultRepository;
 import de.tum.in.www1.artemis.service.metis.conversation.ChannelService;
 import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseService;
+import de.tum.in.www1.artemis.service.quiz.QuizExerciseService;
 import de.tum.in.www1.artemis.service.util.TimeLogUtil;
 
 /**
diff --git a/src/main/java/de/tum/in/www1/artemis/service/ExerciseImportService.java b/src/main/java/de/tum/in/www1/artemis/service/ExerciseImportService.java
index 8e366fb33367..a8cd148403b0 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/ExerciseImportService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/ExerciseImportService.java
@@ -37,7 +37,7 @@ protected ExerciseImportService(ExampleSubmissionRepository exampleSubmissionRep
         this.feedbackService = feedbackService;
     }
 
-    void copyExerciseBasis(final Exercise newExercise, final Exercise importedExercise, final Map<Long, GradingInstruction> gradingInstructionCopyTracker) {
+    protected void copyExerciseBasis(final Exercise newExercise, final Exercise importedExercise, final Map<Long, GradingInstruction> gradingInstructionCopyTracker) {
         if (importedExercise.isCourseExercise()) {
             newExercise.setCourse(importedExercise.getCourseViaExerciseGroupOrCourseMember());
             newExercise.setPresentationScoreEnabled(importedExercise.getPresentationScoreEnabled());
diff --git a/src/main/java/de/tum/in/www1/artemis/service/ExerciseService.java b/src/main/java/de/tum/in/www1/artemis/service/ExerciseService.java
index 5c411e46a070..87aabf1c1eaa 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/ExerciseService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/ExerciseService.java
@@ -58,6 +58,7 @@
 import de.tum.in.www1.artemis.repository.SubmissionRepository;
 import de.tum.in.www1.artemis.repository.TeamRepository;
 import de.tum.in.www1.artemis.repository.UserRepository;
+import de.tum.in.www1.artemis.service.quiz.QuizBatchService;
 import de.tum.in.www1.artemis.service.scheduled.cache.quiz.QuizScheduleService;
 import de.tum.in.www1.artemis.web.rest.dto.CourseManagementOverviewExerciseStatisticsDTO;
 import de.tum.in.www1.artemis.web.rest.dto.DueDateStat;
diff --git a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamImportService.java b/src/main/java/de/tum/in/www1/artemis/service/exam/ExamImportService.java
index a0e23aabf53b..0b8caa4f6350 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamImportService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/exam/ExamImportService.java
@@ -36,11 +36,11 @@
 import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseTaskRepository;
 import de.tum.in.www1.artemis.service.FileUploadExerciseImportService;
 import de.tum.in.www1.artemis.service.ModelingExerciseImportService;
-import de.tum.in.www1.artemis.service.QuizExerciseImportService;
 import de.tum.in.www1.artemis.service.TextExerciseImportService;
 import de.tum.in.www1.artemis.service.metis.conversation.ChannelService;
 import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseImportService;
 import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseService;
+import de.tum.in.www1.artemis.service.quiz.QuizExerciseImportService;
 import de.tum.in.www1.artemis.web.rest.errors.ExamConfigurationException;
 
 @Profile(PROFILE_CORE)
diff --git a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamQuizService.java b/src/main/java/de/tum/in/www1/artemis/service/exam/ExamQuizService.java
index b7b6e39c85c8..1c22317a4afe 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamQuizService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/exam/ExamQuizService.java
@@ -31,8 +31,8 @@
 import de.tum.in.www1.artemis.repository.StudentParticipationRepository;
 import de.tum.in.www1.artemis.repository.SubmissionRepository;
 import de.tum.in.www1.artemis.repository.SubmittedAnswerRepository;
-import de.tum.in.www1.artemis.service.QuizStatisticService;
 import de.tum.in.www1.artemis.service.ResultService;
+import de.tum.in.www1.artemis.service.quiz.QuizStatisticService;
 import de.tum.in.www1.artemis.service.util.TimeLogUtil;
 import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException;
 
diff --git a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamService.java b/src/main/java/de/tum/in/www1/artemis/service/exam/ExamService.java
index 6a23bc2cc2f8..c52509df2c8d 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/exam/ExamService.java
@@ -91,13 +91,13 @@
 import de.tum.in.www1.artemis.service.BonusService;
 import de.tum.in.www1.artemis.service.CourseScoreCalculationService;
 import de.tum.in.www1.artemis.service.ExerciseDeletionService;
-import de.tum.in.www1.artemis.service.QuizPoolService;
 import de.tum.in.www1.artemis.service.TutorLeaderboardService;
 import de.tum.in.www1.artemis.service.connectors.GitService;
 import de.tum.in.www1.artemis.service.export.CourseExamExportService;
 import de.tum.in.www1.artemis.service.messaging.InstanceMessageSendService;
 import de.tum.in.www1.artemis.service.notifications.GroupNotificationService;
 import de.tum.in.www1.artemis.service.plagiarism.PlagiarismCaseService.PlagiarismMapping;
+import de.tum.in.www1.artemis.service.quiz.QuizPoolService;
 import de.tum.in.www1.artemis.service.util.TimeLogUtil;
 import de.tum.in.www1.artemis.web.rest.dto.BonusExampleDTO;
 import de.tum.in.www1.artemis.web.rest.dto.BonusResultDTO;
diff --git a/src/main/java/de/tum/in/www1/artemis/service/exam/StudentExamService.java b/src/main/java/de/tum/in/www1/artemis/service/exam/StudentExamService.java
index 9d27fed05254..38fdf510749d 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/exam/StudentExamService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/exam/StudentExamService.java
@@ -67,12 +67,12 @@
 import de.tum.in.www1.artemis.repository.UserRepository;
 import de.tum.in.www1.artemis.security.SecurityUtils;
 import de.tum.in.www1.artemis.service.ParticipationService;
-import de.tum.in.www1.artemis.service.QuizPoolService;
 import de.tum.in.www1.artemis.service.SubmissionService;
 import de.tum.in.www1.artemis.service.SubmissionVersionService;
 import de.tum.in.www1.artemis.service.WebsocketMessagingService;
 import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseParticipationService;
 import de.tum.in.www1.artemis.service.programming.ProgrammingTriggerService;
+import de.tum.in.www1.artemis.service.quiz.QuizPoolService;
 import de.tum.in.www1.artemis.service.util.ExamExerciseStartPreparationStatus;
 import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException;
 import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException;
diff --git a/src/main/java/de/tum/in/www1/artemis/service/QuizBatchService.java b/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizBatchService.java
similarity index 99%
rename from src/main/java/de/tum/in/www1/artemis/service/QuizBatchService.java
rename to src/main/java/de/tum/in/www1/artemis/service/quiz/QuizBatchService.java
index 9e9c6383f7cf..c1c79fe2e517 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/QuizBatchService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizBatchService.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.service;
+package de.tum.in.www1.artemis.service.quiz;
 
 import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE;
 
diff --git a/src/main/java/de/tum/in/www1/artemis/service/QuizExerciseImportService.java b/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizExerciseImportService.java
similarity index 97%
rename from src/main/java/de/tum/in/www1/artemis/service/QuizExerciseImportService.java
rename to src/main/java/de/tum/in/www1/artemis/service/quiz/QuizExerciseImportService.java
index 87ef371db0d8..3c328b89e72d 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/QuizExerciseImportService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizExerciseImportService.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.service;
+package de.tum.in.www1.artemis.service.quiz;
 
 import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE;
 
@@ -32,6 +32,10 @@
 import de.tum.in.www1.artemis.repository.ExampleSubmissionRepository;
 import de.tum.in.www1.artemis.repository.ResultRepository;
 import de.tum.in.www1.artemis.repository.SubmissionRepository;
+import de.tum.in.www1.artemis.service.ExerciseImportService;
+import de.tum.in.www1.artemis.service.FeedbackService;
+import de.tum.in.www1.artemis.service.FilePathService;
+import de.tum.in.www1.artemis.service.FileService;
 import de.tum.in.www1.artemis.service.metis.conversation.ChannelService;
 
 @Profile(PROFILE_CORE)
diff --git a/src/main/java/de/tum/in/www1/artemis/service/QuizExerciseService.java b/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizExerciseService.java
similarity index 99%
rename from src/main/java/de/tum/in/www1/artemis/service/QuizExerciseService.java
rename to src/main/java/de/tum/in/www1/artemis/service/quiz/QuizExerciseService.java
index d4626b3184c6..a9b445815b80 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/QuizExerciseService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizExerciseService.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.service;
+package de.tum.in.www1.artemis.service.quiz;
 
 import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE;
 
@@ -49,6 +49,9 @@
 import de.tum.in.www1.artemis.repository.QuizSubmissionRepository;
 import de.tum.in.www1.artemis.repository.ResultRepository;
 import de.tum.in.www1.artemis.repository.ShortAnswerMappingRepository;
+import de.tum.in.www1.artemis.service.ExerciseSpecificationService;
+import de.tum.in.www1.artemis.service.FilePathService;
+import de.tum.in.www1.artemis.service.FileService;
 import de.tum.in.www1.artemis.service.scheduled.cache.quiz.QuizScheduleService;
 import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO;
 import de.tum.in.www1.artemis.web.rest.dto.pageablesearch.SearchTermPageableSearchDTO;
diff --git a/src/main/java/de/tum/in/www1/artemis/service/QuizMessagingService.java b/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizMessagingService.java
similarity index 96%
rename from src/main/java/de/tum/in/www1/artemis/service/QuizMessagingService.java
rename to src/main/java/de/tum/in/www1/artemis/service/quiz/QuizMessagingService.java
index a09c049c8b7d..c1510bc26844 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/QuizMessagingService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizMessagingService.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.service;
+package de.tum.in.www1.artemis.service.quiz;
 
 import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE;
 
@@ -16,6 +16,7 @@
 
 import de.tum.in.www1.artemis.domain.quiz.QuizBatch;
 import de.tum.in.www1.artemis.domain.quiz.QuizExercise;
+import de.tum.in.www1.artemis.service.WebsocketMessagingService;
 import de.tum.in.www1.artemis.service.notifications.GroupNotificationService;
 
 @Profile(PROFILE_CORE)
diff --git a/src/main/java/de/tum/in/www1/artemis/service/QuizPoolService.java b/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizPoolService.java
similarity index 99%
rename from src/main/java/de/tum/in/www1/artemis/service/QuizPoolService.java
rename to src/main/java/de/tum/in/www1/artemis/service/quiz/QuizPoolService.java
index af19c7f78ea9..fa47d0cd568e 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/QuizPoolService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizPoolService.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.service;
+package de.tum.in.www1.artemis.service.quiz;
 
 import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE;
 
diff --git a/src/main/java/de/tum/in/www1/artemis/service/QuizService.java b/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizService.java
similarity index 99%
rename from src/main/java/de/tum/in/www1/artemis/service/QuizService.java
rename to src/main/java/de/tum/in/www1/artemis/service/quiz/QuizService.java
index 81bd0b0908bc..5b4d0f967091 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/QuizService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizService.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.service;
+package de.tum.in.www1.artemis.service.quiz;
 
 import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE;
 
diff --git a/src/main/java/de/tum/in/www1/artemis/service/QuizStatisticService.java b/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizStatisticService.java
similarity index 98%
rename from src/main/java/de/tum/in/www1/artemis/service/QuizStatisticService.java
rename to src/main/java/de/tum/in/www1/artemis/service/quiz/QuizStatisticService.java
index ed84f9949eac..c892faf61d45 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/QuizStatisticService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizStatisticService.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.service;
+package de.tum.in.www1.artemis.service.quiz;
 
 import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE;
 
@@ -23,6 +23,7 @@
 import de.tum.in.www1.artemis.repository.QuizSubmissionRepository;
 import de.tum.in.www1.artemis.repository.ResultRepository;
 import de.tum.in.www1.artemis.repository.StudentParticipationRepository;
+import de.tum.in.www1.artemis.service.WebsocketMessagingService;
 import de.tum.in.www1.artemis.service.connectors.lti.LtiNewResultService;
 
 @Profile(PROFILE_CORE)
diff --git a/src/main/java/de/tum/in/www1/artemis/service/QuizSubmissionService.java b/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizSubmissionService.java
similarity index 98%
rename from src/main/java/de/tum/in/www1/artemis/service/QuizSubmissionService.java
rename to src/main/java/de/tum/in/www1/artemis/service/quiz/QuizSubmissionService.java
index ebf7e60e91cc..bc6672d45d69 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/QuizSubmissionService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/quiz/QuizSubmissionService.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.service;
+package de.tum.in.www1.artemis.service.quiz;
 
 import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE;
 
@@ -27,6 +27,9 @@
 import de.tum.in.www1.artemis.repository.QuizExerciseRepository;
 import de.tum.in.www1.artemis.repository.QuizSubmissionRepository;
 import de.tum.in.www1.artemis.repository.ResultRepository;
+import de.tum.in.www1.artemis.service.AbstractQuizSubmissionService;
+import de.tum.in.www1.artemis.service.ParticipationService;
+import de.tum.in.www1.artemis.service.SubmissionVersionService;
 import de.tum.in.www1.artemis.service.scheduled.cache.quiz.QuizScheduleService;
 import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException;
 
diff --git a/src/main/java/de/tum/in/www1/artemis/service/scheduled/cache/quiz/QuizScheduleService.java b/src/main/java/de/tum/in/www1/artemis/service/scheduled/cache/quiz/QuizScheduleService.java
index 1c18bac14a6d..915da6059ea3 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/scheduled/cache/quiz/QuizScheduleService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/scheduled/cache/quiz/QuizScheduleService.java
@@ -58,10 +58,10 @@
 import de.tum.in.www1.artemis.repository.TeamRepository;
 import de.tum.in.www1.artemis.repository.UserRepository;
 import de.tum.in.www1.artemis.security.SecurityUtils;
-import de.tum.in.www1.artemis.service.QuizMessagingService;
-import de.tum.in.www1.artemis.service.QuizStatisticService;
 import de.tum.in.www1.artemis.service.WebsocketMessagingService;
 import de.tum.in.www1.artemis.service.connectors.lti.LtiNewResultService;
+import de.tum.in.www1.artemis.service.quiz.QuizMessagingService;
+import de.tum.in.www1.artemis.service.quiz.QuizStatisticService;
 
 @Profile(PROFILE_CORE)
 @Service
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ExerciseResource.java
index ccadcda18942..b3011cbb4ae8 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/ExerciseResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ExerciseResource.java
@@ -47,10 +47,10 @@
 import de.tum.in.www1.artemis.service.ExerciseDeletionService;
 import de.tum.in.www1.artemis.service.ExerciseService;
 import de.tum.in.www1.artemis.service.ParticipationService;
-import de.tum.in.www1.artemis.service.QuizBatchService;
 import de.tum.in.www1.artemis.service.TutorParticipationService;
 import de.tum.in.www1.artemis.service.exam.ExamAccessService;
 import de.tum.in.www1.artemis.service.exam.ExamDateService;
+import de.tum.in.www1.artemis.service.quiz.QuizBatchService;
 import de.tum.in.www1.artemis.web.rest.dto.StatsForDashboardDTO;
 import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException;
 import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException;
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java
index 6f79f99b250d..412a8501e005 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ParticipationResource.java
@@ -84,8 +84,6 @@
 import de.tum.in.www1.artemis.service.GradingScaleService;
 import de.tum.in.www1.artemis.service.ParticipationAuthorizationCheckService;
 import de.tum.in.www1.artemis.service.ParticipationService;
-import de.tum.in.www1.artemis.service.QuizBatchService;
-import de.tum.in.www1.artemis.service.QuizSubmissionService;
 import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationService;
 import de.tum.in.www1.artemis.service.feature.Feature;
 import de.tum.in.www1.artemis.service.feature.FeatureToggle;
@@ -93,6 +91,8 @@
 import de.tum.in.www1.artemis.service.messaging.InstanceMessageSendService;
 import de.tum.in.www1.artemis.service.notifications.GroupNotificationService;
 import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseParticipationService;
+import de.tum.in.www1.artemis.service.quiz.QuizBatchService;
+import de.tum.in.www1.artemis.service.quiz.QuizSubmissionService;
 import de.tum.in.www1.artemis.service.scheduled.cache.quiz.QuizScheduleService;
 import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException;
 import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException;
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/QuizExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/QuizExerciseResource.java
index c0055638afe5..6ff7a54d544f 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/QuizExerciseResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/QuizExerciseResource.java
@@ -64,15 +64,15 @@
 import de.tum.in.www1.artemis.service.ExerciseService;
 import de.tum.in.www1.artemis.service.FilePathService;
 import de.tum.in.www1.artemis.service.FileService;
-import de.tum.in.www1.artemis.service.QuizBatchService;
-import de.tum.in.www1.artemis.service.QuizExerciseImportService;
-import de.tum.in.www1.artemis.service.QuizExerciseService;
-import de.tum.in.www1.artemis.service.QuizMessagingService;
-import de.tum.in.www1.artemis.service.QuizStatisticService;
 import de.tum.in.www1.artemis.service.exam.ExamDateService;
 import de.tum.in.www1.artemis.service.metis.conversation.ChannelService;
 import de.tum.in.www1.artemis.service.notifications.GroupNotificationScheduleService;
 import de.tum.in.www1.artemis.service.notifications.GroupNotificationService;
+import de.tum.in.www1.artemis.service.quiz.QuizBatchService;
+import de.tum.in.www1.artemis.service.quiz.QuizExerciseImportService;
+import de.tum.in.www1.artemis.service.quiz.QuizExerciseService;
+import de.tum.in.www1.artemis.service.quiz.QuizMessagingService;
+import de.tum.in.www1.artemis.service.quiz.QuizStatisticService;
 import de.tum.in.www1.artemis.service.scheduled.cache.quiz.QuizScheduleService;
 import de.tum.in.www1.artemis.web.rest.dto.QuizBatchJoinDTO;
 import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO;
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/QuizPoolResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/QuizPoolResource.java
index ef243ecc4f28..e5185ba2ea58 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/QuizPoolResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/QuizPoolResource.java
@@ -20,8 +20,8 @@
 import de.tum.in.www1.artemis.security.Role;
 import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor;
 import de.tum.in.www1.artemis.service.AuthorizationCheckService;
-import de.tum.in.www1.artemis.service.QuizPoolService;
 import de.tum.in.www1.artemis.service.exam.ExamAccessService;
+import de.tum.in.www1.artemis.service.quiz.QuizPoolService;
 import de.tum.in.www1.artemis.web.rest.util.HeaderUtil;
 
 /**
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/QuizSubmissionResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/QuizSubmissionResource.java
index 2701b80d62d1..6e248ba9be3d 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/QuizSubmissionResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/QuizSubmissionResource.java
@@ -37,8 +37,8 @@
 import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor;
 import de.tum.in.www1.artemis.service.AuthorizationCheckService;
 import de.tum.in.www1.artemis.service.ParticipationService;
-import de.tum.in.www1.artemis.service.QuizSubmissionService;
 import de.tum.in.www1.artemis.service.exam.ExamSubmissionService;
+import de.tum.in.www1.artemis.service.quiz.QuizSubmissionService;
 import de.tum.in.www1.artemis.web.rest.util.HeaderUtil;
 import de.tum.in.www1.artemis.web.websocket.ResultWebsocketService;
 
diff --git a/src/main/java/de/tum/in/www1/artemis/web/websocket/QuizSubmissionWebsocketService.java b/src/main/java/de/tum/in/www1/artemis/web/websocket/QuizSubmissionWebsocketService.java
index 493838c35777..34c3adbddda0 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/websocket/QuizSubmissionWebsocketService.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/websocket/QuizSubmissionWebsocketService.java
@@ -15,8 +15,8 @@
 import de.tum.in.www1.artemis.domain.quiz.QuizSubmission;
 import de.tum.in.www1.artemis.exception.QuizSubmissionException;
 import de.tum.in.www1.artemis.security.SecurityUtils;
-import de.tum.in.www1.artemis.service.QuizSubmissionService;
 import de.tum.in.www1.artemis.service.WebsocketMessagingService;
+import de.tum.in.www1.artemis.service.quiz.QuizSubmissionService;
 
 @Controller
 @Profile(PROFILE_CORE)
diff --git a/src/test/java/de/tum/in/www1/artemis/AbstractArtemisIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/AbstractArtemisIntegrationTest.java
index 48b37a1d7a1d..d0c00b45cf2b 100644
--- a/src/test/java/de/tum/in/www1/artemis/AbstractArtemisIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/AbstractArtemisIntegrationTest.java
@@ -25,7 +25,7 @@
 
 import de.tum.in.www1.artemis.domain.User;
 import de.tum.in.www1.artemis.domain.VcsRepositoryUri;
-import de.tum.in.www1.artemis.exercise.programmingexercise.MockDelegate;
+import de.tum.in.www1.artemis.exercise.programming.MockDelegate;
 import de.tum.in.www1.artemis.service.FileService;
 import de.tum.in.www1.artemis.service.ModelingSubmissionService;
 import de.tum.in.www1.artemis.service.TextBlockService;
diff --git a/src/test/java/de/tum/in/www1/artemis/BuildPlanIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/BuildPlanIntegrationTest.java
index bd066489eaa3..db8ab14bb24a 100644
--- a/src/test/java/de/tum/in/www1/artemis/BuildPlanIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/BuildPlanIntegrationTest.java
@@ -14,7 +14,7 @@
 import de.tum.in.www1.artemis.domain.ProgrammingExercise;
 import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage;
 import de.tum.in.www1.artemis.domain.enumeration.ProjectType;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.repository.BuildPlanRepository;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
 import de.tum.in.www1.artemis.service.programming.ProgrammingTriggerService;
diff --git a/src/test/java/de/tum/in/www1/artemis/LongFeedbackResourceIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/LongFeedbackResourceIntegrationTest.java
index 3d18ef4b1d7d..121147ac159a 100644
--- a/src/test/java/de/tum/in/www1/artemis/LongFeedbackResourceIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/LongFeedbackResourceIntegrationTest.java
@@ -14,7 +14,7 @@
 import de.tum.in.www1.artemis.domain.ProgrammingExercise;
 import de.tum.in.www1.artemis.domain.Result;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.user.UserUtilService;
 
diff --git a/src/test/java/de/tum/in/www1/artemis/LtiDeepLinkingIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/LtiDeepLinkingIntegrationTest.java
index 2245af49968c..69cb5b774564 100644
--- a/src/test/java/de/tum/in/www1/artemis/LtiDeepLinkingIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/LtiDeepLinkingIntegrationTest.java
@@ -32,7 +32,7 @@
 import de.tum.in.www1.artemis.course.CourseUtilService;
 import de.tum.in.www1.artemis.domain.Course;
 import de.tum.in.www1.artemis.domain.lti.Claims;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.repository.CourseRepository;
 import de.tum.in.www1.artemis.repository.UserRepository;
 import de.tum.in.www1.artemis.user.UserUtilService;
diff --git a/src/test/java/de/tum/in/www1/artemis/LtiQuizIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/LtiQuizIntegrationTest.java
index 1822f3151e34..0d0103d60d6d 100644
--- a/src/test/java/de/tum/in/www1/artemis/LtiQuizIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/LtiQuizIntegrationTest.java
@@ -35,13 +35,13 @@
 import de.tum.in.www1.artemis.domain.quiz.DragAndDropQuestion;
 import de.tum.in.www1.artemis.domain.quiz.QuizExercise;
 import de.tum.in.www1.artemis.domain.quiz.QuizSubmission;
-import de.tum.in.www1.artemis.exercise.quizexercise.QuizExerciseFactory;
+import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.CourseRepository;
 import de.tum.in.www1.artemis.repository.ExerciseRepository;
 import de.tum.in.www1.artemis.repository.QuizExerciseRepository;
 import de.tum.in.www1.artemis.repository.SubmissionRepository;
-import de.tum.in.www1.artemis.service.QuizExerciseService;
+import de.tum.in.www1.artemis.service.quiz.QuizExerciseService;
 import de.tum.in.www1.artemis.user.UserUtilService;
 import de.tum.in.www1.artemis.web.websocket.QuizSubmissionWebsocketService;
 
diff --git a/src/test/java/de/tum/in/www1/artemis/ManagementResourceIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/ManagementResourceIntegrationTest.java
index 6bdc51929d23..a2648b226167 100644
--- a/src/test/java/de/tum/in/www1/artemis/ManagementResourceIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/ManagementResourceIntegrationTest.java
@@ -24,8 +24,8 @@
 import de.tum.in.www1.artemis.domain.ProgrammingExercise;
 import de.tum.in.www1.artemis.domain.ProgrammingSubmission;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseFactory;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.PersistenceAuditEventRepository;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/StatisticsIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/StatisticsIntegrationTest.java
index 98c1f24c4499..6b794c2f05ba 100644
--- a/src/test/java/de/tum/in/www1/artemis/StatisticsIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/StatisticsIntegrationTest.java
@@ -32,9 +32,9 @@
 import de.tum.in.www1.artemis.domain.metis.AnswerPost;
 import de.tum.in.www1.artemis.domain.metis.Post;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.modelingexercise.ModelingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.GradingScaleRepository;
 import de.tum.in.www1.artemis.repository.ParticipantScoreRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/aspects/EnforceRoleInExerciseTest.java b/src/test/java/de/tum/in/www1/artemis/aspects/EnforceRoleInExerciseTest.java
index b899669a1d80..b7a7f71cdeb7 100644
--- a/src/test/java/de/tum/in/www1/artemis/aspects/EnforceRoleInExerciseTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/aspects/EnforceRoleInExerciseTest.java
@@ -10,7 +10,7 @@
 import org.springframework.security.test.context.support.WithMockUser;
 
 import de.tum.in.www1.artemis.domain.ProgrammingExercise;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 
 class EnforceRoleInExerciseTest extends AbstractEnforceRoleInResourceTest {
 
diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/AssessmentComplaintIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/assessment/AssessmentComplaintIntegrationTest.java
index 3c52fecf014d..1db0f785ac0d 100644
--- a/src/test/java/de/tum/in/www1/artemis/assessment/AssessmentComplaintIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/assessment/AssessmentComplaintIntegrationTest.java
@@ -40,10 +40,10 @@
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
 import de.tum.in.www1.artemis.exam.ExamFactory;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.fileuploadexercise.FileUploadExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.modelingexercise.ModelingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.fileupload.FileUploadExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.ComplaintRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java
index 73d33f502525..0e82384191c7 100644
--- a/src/test/java/de/tum/in/www1/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java
@@ -30,7 +30,7 @@
 import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission;
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.modelingexercise.ModelingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.ComplaintRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/ComplaintResponseIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/assessment/ComplaintResponseIntegrationTest.java
index 733fba08f22e..64259293b1b6 100644
--- a/src/test/java/de/tum/in/www1/artemis/assessment/ComplaintResponseIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/assessment/ComplaintResponseIntegrationTest.java
@@ -27,7 +27,7 @@
 import de.tum.in.www1.artemis.domain.enumeration.ComplaintType;
 import de.tum.in.www1.artemis.domain.enumeration.SubmissionType;
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.repository.ComplaintRepository;
 import de.tum.in.www1.artemis.repository.ComplaintResponseRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/ExampleSubmissionIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/assessment/ExampleSubmissionIntegrationTest.java
index 622bb0de98ea..9a3c1551c790 100644
--- a/src/test/java/de/tum/in/www1/artemis/assessment/ExampleSubmissionIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/assessment/ExampleSubmissionIntegrationTest.java
@@ -38,8 +38,8 @@
 import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission;
 import de.tum.in.www1.artemis.domain.participation.TutorParticipation;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.modelingexercise.ModelingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.CourseRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/ExerciseScoresChartIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/assessment/ExerciseScoresChartIntegrationTest.java
index 81b1875f7ec4..d99d19a20ce6 100644
--- a/src/test/java/de/tum/in/www1/artemis/assessment/ExerciseScoresChartIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/assessment/ExerciseScoresChartIntegrationTest.java
@@ -24,7 +24,7 @@
 import de.tum.in.www1.artemis.domain.Team;
 import de.tum.in.www1.artemis.domain.TextExercise;
 import de.tum.in.www1.artemis.domain.User;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.ParticipantScoreRepository;
 import de.tum.in.www1.artemis.repository.TeamRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/GradeStepIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/assessment/GradeStepIntegrationTest.java
index f4fdf3a857c5..6956d4067e55 100644
--- a/src/test/java/de/tum/in/www1/artemis/assessment/GradeStepIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/assessment/GradeStepIntegrationTest.java
@@ -24,7 +24,7 @@
 import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase;
 import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict;
 import de.tum.in.www1.artemis.exam.ExamUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.ExamRepository;
 import de.tum.in.www1.artemis.repository.GradingScaleRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/ParticipantScoreIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/assessment/ParticipantScoreIntegrationTest.java
index dbf5935ac0ca..47497c601bc8 100644
--- a/src/test/java/de/tum/in/www1/artemis/assessment/ParticipantScoreIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/assessment/ParticipantScoreIntegrationTest.java
@@ -30,7 +30,7 @@
 import de.tum.in.www1.artemis.domain.lecture.ExerciseUnit;
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
 import de.tum.in.www1.artemis.exam.ExamUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.lecture.LectureUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.CourseRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/RatingResourceIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/assessment/RatingResourceIntegrationTest.java
index e64f182aaafe..9587063a35fa 100644
--- a/src/test/java/de/tum/in/www1/artemis/assessment/RatingResourceIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/assessment/RatingResourceIntegrationTest.java
@@ -21,7 +21,7 @@
 import de.tum.in.www1.artemis.domain.User;
 import de.tum.in.www1.artemis.domain.enumeration.Language;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.service.RatingService;
diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/ResultServiceIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/assessment/ResultServiceIntegrationTest.java
index 3a6c60b4d528..0cd8b1efc177 100644
--- a/src/test/java/de/tum/in/www1/artemis/assessment/ResultServiceIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/assessment/ResultServiceIntegrationTest.java
@@ -53,12 +53,12 @@
 import de.tum.in.www1.artemis.exam.ExamUtilService;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
 import de.tum.in.www1.artemis.exercise.GradingCriterionUtil;
-import de.tum.in.www1.artemis.exercise.fileuploadexercise.FileUploadExerciseFactory;
-import de.tum.in.www1.artemis.exercise.modelingexercise.ModelingExerciseFactory;
-import de.tum.in.www1.artemis.exercise.modelingexercise.ModelingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.quizexercise.QuizExerciseFactory;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.fileupload.FileUploadExerciseFactory;
+import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseFactory;
+import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.ExamRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/TutorEffortIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/assessment/TutorEffortIntegrationTest.java
index 7e31bbae4836..e4698d3fdd03 100644
--- a/src/test/java/de/tum/in/www1/artemis/assessment/TutorEffortIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/assessment/TutorEffortIntegrationTest.java
@@ -21,7 +21,7 @@
 import de.tum.in.www1.artemis.domain.analytics.TextAssessmentEvent;
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
 import de.tum.in.www1.artemis.domain.statistics.tutor.effort.TutorEffort;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.repository.StudentParticipationRepository;
 import de.tum.in.www1.artemis.repository.TextAssessmentEventRepository;
 import de.tum.in.www1.artemis.repository.TextSubmissionRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java
index c85e0eb84d29..3908eac3f15d 100644
--- a/src/test/java/de/tum/in/www1/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/assessment/TutorLeaderboardServiceIntegrationTest.java
@@ -17,7 +17,7 @@
 import de.tum.in.www1.artemis.domain.Exercise;
 import de.tum.in.www1.artemis.domain.enumeration.AssessmentType;
 import de.tum.in.www1.artemis.domain.modeling.ModelingExercise;
-import de.tum.in.www1.artemis.exercise.modelingexercise.ModelingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.CourseRepository;
 import de.tum.in.www1.artemis.repository.UserRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/authentication/InternalAuthenticationIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/authentication/InternalAuthenticationIntegrationTest.java
index 141ee8bde7eb..74542e17be8d 100644
--- a/src/test/java/de/tum/in/www1/artemis/authentication/InternalAuthenticationIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/authentication/InternalAuthenticationIntegrationTest.java
@@ -35,7 +35,7 @@
 import de.tum.in.www1.artemis.domain.ProgrammingExercise;
 import de.tum.in.www1.artemis.domain.User;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.repository.AuthorityRepository;
 import de.tum.in.www1.artemis.repository.CourseRepository;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/authentication/LdapAuthenticationIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/authentication/LdapAuthenticationIntegrationTest.java
index 678b97964c76..5288deda51f7 100644
--- a/src/test/java/de/tum/in/www1/artemis/authentication/LdapAuthenticationIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/authentication/LdapAuthenticationIntegrationTest.java
@@ -27,7 +27,7 @@
 import de.tum.in.www1.artemis.domain.ProgrammingExercise;
 import de.tum.in.www1.artemis.domain.User;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.repository.AuthorityRepository;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
 import de.tum.in.www1.artemis.repository.UserRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/authentication/UserJenkinsGitlabIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/authentication/UserJenkinsGitlabIntegrationTest.java
index 0c4f4a787335..7a8f66f26724 100644
--- a/src/test/java/de/tum/in/www1/artemis/authentication/UserJenkinsGitlabIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/authentication/UserJenkinsGitlabIntegrationTest.java
@@ -22,7 +22,7 @@
 import de.tum.in.www1.artemis.domain.Course;
 import de.tum.in.www1.artemis.domain.ProgrammingExercise;
 import de.tum.in.www1.artemis.domain.User;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.repository.UserRepository;
 import de.tum.in.www1.artemis.service.connectors.gitlab.GitLabPersonalAccessTokenManagementService;
 import de.tum.in.www1.artemis.service.connectors.gitlab.GitLabUserManagementService;
diff --git a/src/test/java/de/tum/in/www1/artemis/bonus/BonusIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/bonus/BonusIntegrationTest.java
index b02cc90fa721..36f87ba49ddb 100644
--- a/src/test/java/de/tum/in/www1/artemis/bonus/BonusIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/bonus/BonusIntegrationTest.java
@@ -30,7 +30,7 @@
 import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore;
 import de.tum.in.www1.artemis.domain.exam.Exam;
 import de.tum.in.www1.artemis.exam.ExamUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
 import de.tum.in.www1.artemis.repository.BonusRepository;
 import de.tum.in.www1.artemis.repository.CourseRepository;
 import de.tum.in.www1.artemis.repository.ExamRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/competency/LearningPathIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/competency/LearningPathIntegrationTest.java
index e2061a7074a8..d413c9197ad8 100644
--- a/src/test/java/de/tum/in/www1/artemis/competency/LearningPathIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/competency/LearningPathIntegrationTest.java
@@ -30,7 +30,7 @@
 import de.tum.in.www1.artemis.domain.competency.LearningPath;
 import de.tum.in.www1.artemis.domain.lecture.TextUnit;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.lecture.LectureUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.CourseRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/config/MetricsBeanTest.java b/src/test/java/de/tum/in/www1/artemis/config/MetricsBeanTest.java
index 568837ddcc50..524cad5cf8de 100644
--- a/src/test/java/de/tum/in/www1/artemis/config/MetricsBeanTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/config/MetricsBeanTest.java
@@ -22,9 +22,9 @@
 import de.tum.in.www1.artemis.domain.quiz.QuizExercise;
 import de.tum.in.www1.artemis.exam.ExamUtilService;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.quizexercise.QuizExerciseFactory;
-import de.tum.in.www1.artemis.exercise.quizexercise.QuizExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseFactory;
+import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.CourseRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/connector/GitlabRequestMockProvider.java b/src/test/java/de/tum/in/www1/artemis/connector/GitlabRequestMockProvider.java
index 76499d8e3a65..8bbeb53530e7 100644
--- a/src/test/java/de/tum/in/www1/artemis/connector/GitlabRequestMockProvider.java
+++ b/src/test/java/de/tum/in/www1/artemis/connector/GitlabRequestMockProvider.java
@@ -94,7 +94,7 @@
 import de.tum.in.www1.artemis.domain.ProgrammingExercise;
 import de.tum.in.www1.artemis.domain.VcsRepositoryUri;
 import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
 import de.tum.in.www1.artemis.repository.UserRepository;
 import de.tum.in.www1.artemis.service.UriService;
diff --git a/src/test/java/de/tum/in/www1/artemis/course/CourseTestService.java b/src/test/java/de/tum/in/www1/artemis/course/CourseTestService.java
index 60bc22d073dd..fd609c6d5b5c 100644
--- a/src/test/java/de/tum/in/www1/artemis/course/CourseTestService.java
+++ b/src/test/java/de/tum/in/www1/artemis/course/CourseTestService.java
@@ -104,12 +104,12 @@
 import de.tum.in.www1.artemis.exam.ExamFactory;
 import de.tum.in.www1.artemis.exam.ExamUtilService;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.modelingexercise.ModelingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.MockDelegate;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.quizexercise.QuizExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.MockDelegate;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.lecture.LectureUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
diff --git a/src/test/java/de/tum/in/www1/artemis/course/CourseUtilService.java b/src/test/java/de/tum/in/www1/artemis/course/CourseUtilService.java
index 76c8cd87562d..f589b450b483 100644
--- a/src/test/java/de/tum/in/www1/artemis/course/CourseUtilService.java
+++ b/src/test/java/de/tum/in/www1/artemis/course/CourseUtilService.java
@@ -52,14 +52,14 @@
 import de.tum.in.www1.artemis.domain.quiz.QuizSubmission;
 import de.tum.in.www1.artemis.exam.ExamUtilService;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.fileuploadexercise.FileUploadExerciseFactory;
-import de.tum.in.www1.artemis.exercise.fileuploadexercise.FileUploadExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.modelingexercise.ModelingExerciseFactory;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseFactory;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.quizexercise.QuizExerciseFactory;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.fileupload.FileUploadExerciseFactory;
+import de.tum.in.www1.artemis.exercise.fileupload.FileUploadExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseFactory;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.lecture.LectureFactory;
 import de.tum.in.www1.artemis.lecture.LectureUtilService;
 import de.tum.in.www1.artemis.organization.OrganizationUtilService;
diff --git a/src/test/java/de/tum/in/www1/artemis/domain/ExerciseTest.java b/src/test/java/de/tum/in/www1/artemis/domain/ExerciseTest.java
index ed346f73d0b7..8025d5502f88 100644
--- a/src/test/java/de/tum/in/www1/artemis/domain/ExerciseTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/domain/ExerciseTest.java
@@ -21,8 +21,8 @@
 import de.tum.in.www1.artemis.domain.modeling.ModelingExercise;
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
 import de.tum.in.www1.artemis.exam.ExamFactory;
-import de.tum.in.www1.artemis.exercise.modelingexercise.ModelingExerciseFactory;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.service.ExerciseService;
 
diff --git a/src/test/java/de/tum/in/www1/artemis/domain/ResultTest.java b/src/test/java/de/tum/in/www1/artemis/domain/ResultTest.java
index c4fbc0d8fe21..924ce6cf2540 100644
--- a/src/test/java/de/tum/in/www1/artemis/domain/ResultTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/domain/ResultTest.java
@@ -16,7 +16,7 @@
 import de.tum.in.www1.artemis.domain.enumeration.Visibility;
 import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation;
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.repository.ResultRepository;
 
 class ResultTest extends AbstractSpringIntegrationIndependentTest {
diff --git a/src/test/java/de/tum/in/www1/artemis/entitylistener/ResultListenerIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/entitylistener/ResultListenerIntegrationTest.java
index 602c24a6c004..78ac26887ed5 100644
--- a/src/test/java/de/tum/in/www1/artemis/entitylistener/ResultListenerIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/entitylistener/ResultListenerIntegrationTest.java
@@ -31,7 +31,7 @@
 import de.tum.in.www1.artemis.domain.scores.ParticipantScore;
 import de.tum.in.www1.artemis.domain.scores.StudentScore;
 import de.tum.in.www1.artemis.domain.scores.TeamScore;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.ExerciseRepository;
 import de.tum.in.www1.artemis.repository.ParticipantScoreRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/exam/ExamIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exam/ExamIntegrationTest.java
index 2d1df6ea19fa..ef83511e4255 100644
--- a/src/test/java/de/tum/in/www1/artemis/exam/ExamIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exam/ExamIntegrationTest.java
@@ -64,10 +64,10 @@
 import de.tum.in.www1.artemis.domain.quiz.QuizPool;
 import de.tum.in.www1.artemis.domain.quiz.QuizQuestion;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.modelingexercise.ModelingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.quizexercise.QuizExerciseFactory;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.repository.CourseRepository;
 import de.tum.in.www1.artemis.repository.ExamLiveEventRepository;
 import de.tum.in.www1.artemis.repository.ExamRepository;
@@ -80,11 +80,11 @@
 import de.tum.in.www1.artemis.repository.SubmissionRepository;
 import de.tum.in.www1.artemis.repository.UserRepository;
 import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository;
-import de.tum.in.www1.artemis.service.QuizPoolService;
 import de.tum.in.www1.artemis.service.dto.StudentDTO;
 import de.tum.in.www1.artemis.service.exam.ExamAccessService;
 import de.tum.in.www1.artemis.service.exam.ExamDateService;
 import de.tum.in.www1.artemis.service.exam.ExamService;
+import de.tum.in.www1.artemis.service.quiz.QuizPoolService;
 import de.tum.in.www1.artemis.service.scheduled.ParticipantScoreScheduleService;
 import de.tum.in.www1.artemis.service.user.PasswordService;
 import de.tum.in.www1.artemis.user.UserFactory;
diff --git a/src/test/java/de/tum/in/www1/artemis/exam/ExamParticipationIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exam/ExamParticipationIntegrationTest.java
index 08f95492e220..d0668f90701d 100644
--- a/src/test/java/de/tum/in/www1/artemis/exam/ExamParticipationIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exam/ExamParticipationIntegrationTest.java
@@ -60,10 +60,10 @@
 import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase;
 import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict;
 import de.tum.in.www1.artemis.domain.quiz.QuizExercise;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseTestService;
-import de.tum.in.www1.artemis.exercise.quizexercise.QuizExerciseFactory;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseTestService;
+import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.BonusRepository;
 import de.tum.in.www1.artemis.repository.CourseRepository;
@@ -82,9 +82,9 @@
 import de.tum.in.www1.artemis.repository.TeamRepository;
 import de.tum.in.www1.artemis.repository.UserRepository;
 import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository;
-import de.tum.in.www1.artemis.service.QuizSubmissionService;
 import de.tum.in.www1.artemis.service.exam.ExamService;
 import de.tum.in.www1.artemis.service.exam.StudentExamService;
+import de.tum.in.www1.artemis.service.quiz.QuizSubmissionService;
 import de.tum.in.www1.artemis.service.scheduled.ParticipantScoreScheduleService;
 import de.tum.in.www1.artemis.team.TeamUtilService;
 import de.tum.in.www1.artemis.user.UserUtilService;
diff --git a/src/test/java/de/tum/in/www1/artemis/exam/ExamStartTest.java b/src/test/java/de/tum/in/www1/artemis/exam/ExamStartTest.java
index 451281c37ea7..0ee993d98e50 100644
--- a/src/test/java/de/tum/in/www1/artemis/exam/ExamStartTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exam/ExamStartTest.java
@@ -44,11 +44,11 @@
 import de.tum.in.www1.artemis.domain.participation.Participation;
 import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation;
 import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation;
-import de.tum.in.www1.artemis.exercise.modelingexercise.ModelingExerciseFactory;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseFactory;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseTestService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseFactory;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseTestService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.ExamRepository;
 import de.tum.in.www1.artemis.repository.ExerciseGroupRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/exam/ExamUserIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exam/ExamUserIntegrationTest.java
index a935d30dd649..ba779b961ec4 100644
--- a/src/test/java/de/tum/in/www1/artemis/exam/ExamUserIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exam/ExamUserIntegrationTest.java
@@ -38,7 +38,7 @@
 import de.tum.in.www1.artemis.domain.exam.Exam;
 import de.tum.in.www1.artemis.domain.exam.ExamUser;
 import de.tum.in.www1.artemis.domain.exam.StudentExam;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseTestService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseTestService;
 import de.tum.in.www1.artemis.repository.ExamRepository;
 import de.tum.in.www1.artemis.repository.StudentExamRepository;
 import de.tum.in.www1.artemis.repository.UserRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/exam/ExamUtilService.java b/src/test/java/de/tum/in/www1/artemis/exam/ExamUtilService.java
index 2ec80f1ffcc6..cda5fd601d14 100644
--- a/src/test/java/de/tum/in/www1/artemis/exam/ExamUtilService.java
+++ b/src/test/java/de/tum/in/www1/artemis/exam/ExamUtilService.java
@@ -39,16 +39,16 @@
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
 import de.tum.in.www1.artemis.domain.quiz.QuizExercise;
 import de.tum.in.www1.artemis.domain.quiz.QuizPool;
-import de.tum.in.www1.artemis.exercise.fileuploadexercise.FileUploadExerciseFactory;
-import de.tum.in.www1.artemis.exercise.fileuploadexercise.FileUploadExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.modelingexercise.ModelingExerciseFactory;
-import de.tum.in.www1.artemis.exercise.modelingexercise.ModelingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseFactory;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.quizexercise.QuizExerciseFactory;
-import de.tum.in.www1.artemis.exercise.quizexercise.QuizExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.fileupload.FileUploadExerciseFactory;
+import de.tum.in.www1.artemis.exercise.fileupload.FileUploadExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseFactory;
+import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseFactory;
+import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.post.ConversationFactory;
@@ -63,7 +63,7 @@
 import de.tum.in.www1.artemis.repository.SubmissionRepository;
 import de.tum.in.www1.artemis.repository.UserRepository;
 import de.tum.in.www1.artemis.repository.metis.conversation.ConversationRepository;
-import de.tum.in.www1.artemis.service.QuizPoolService;
+import de.tum.in.www1.artemis.service.quiz.QuizPoolService;
 import de.tum.in.www1.artemis.user.UserUtilService;
 
 /**
diff --git a/src/test/java/de/tum/in/www1/artemis/exam/ExerciseGroupIntegrationJenkinsGitlabTest.java b/src/test/java/de/tum/in/www1/artemis/exam/ExerciseGroupIntegrationJenkinsGitlabTest.java
index 66106a0858b3..2d2ba57cc4a8 100644
--- a/src/test/java/de/tum/in/www1/artemis/exam/ExerciseGroupIntegrationJenkinsGitlabTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exam/ExerciseGroupIntegrationJenkinsGitlabTest.java
@@ -28,9 +28,9 @@
 import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage;
 import de.tum.in.www1.artemis.domain.exam.Exam;
 import de.tum.in.www1.artemis.domain.exam.ExerciseGroup;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseFactory;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.repository.ExamRepository;
 import de.tum.in.www1.artemis.repository.ExerciseRepository;
 import de.tum.in.www1.artemis.repository.TextExerciseRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/exam/ProgrammingExamIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exam/ProgrammingExamIntegrationTest.java
index 934ec6d79b73..b19d093a153f 100644
--- a/src/test/java/de/tum/in/www1/artemis/exam/ProgrammingExamIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exam/ProgrammingExamIntegrationTest.java
@@ -36,9 +36,9 @@
 import de.tum.in.www1.artemis.domain.exam.Exam;
 import de.tum.in.www1.artemis.domain.exam.ExerciseGroup;
 import de.tum.in.www1.artemis.domain.exam.StudentExam;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseFactory;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseTestService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseTestService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.ExamRepository;
 import de.tum.in.www1.artemis.repository.ExerciseRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/exam/QuizPoolIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exam/QuizPoolIntegrationTest.java
index ec38cb5069a5..8de49015073e 100644
--- a/src/test/java/de/tum/in/www1/artemis/exam/QuizPoolIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exam/QuizPoolIntegrationTest.java
@@ -23,8 +23,8 @@
 import de.tum.in.www1.artemis.domain.quiz.QuizPool;
 import de.tum.in.www1.artemis.domain.quiz.QuizQuestion;
 import de.tum.in.www1.artemis.domain.quiz.ShortAnswerQuestion;
-import de.tum.in.www1.artemis.exercise.quizexercise.QuizExerciseFactory;
-import de.tum.in.www1.artemis.service.QuizPoolService;
+import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseFactory;
+import de.tum.in.www1.artemis.service.quiz.QuizPoolService;
 import de.tum.in.www1.artemis.user.UserUtilService;
 import de.tum.in.www1.artemis.util.RequestUtilService;
 
diff --git a/src/test/java/de/tum/in/www1/artemis/exam/StudentExamIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exam/StudentExamIntegrationTest.java
index 3dc8017fbe93..417df25f47d2 100644
--- a/src/test/java/de/tum/in/www1/artemis/exam/StudentExamIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exam/StudentExamIntegrationTest.java
@@ -106,8 +106,8 @@
 import de.tum.in.www1.artemis.domain.submissionpolicy.LockRepositoryPolicy;
 import de.tum.in.www1.artemis.domain.submissionpolicy.SubmissionPolicy;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseTestService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseTestService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.BonusRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/AthenaExerciseIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/AthenaExerciseIntegrationTest.java
index 7925ca93777b..9ac0f7b8f685 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/AthenaExerciseIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/AthenaExerciseIntegrationTest.java
@@ -27,9 +27,9 @@
 import de.tum.in.www1.artemis.domain.TextExercise;
 import de.tum.in.www1.artemis.domain.exam.ExerciseGroup;
 import de.tum.in.www1.artemis.exam.ExamUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.repository.CourseRepository;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
 import de.tum.in.www1.artemis.repository.TextExerciseRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/AthenaResourceIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/AthenaResourceIntegrationTest.java
index 22bb3b15927f..7c5d00530307 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/AthenaResourceIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/AthenaResourceIntegrationTest.java
@@ -36,9 +36,9 @@
 import de.tum.in.www1.artemis.domain.modeling.ModelingExercise;
 import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission;
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
-import de.tum.in.www1.artemis.exercise.modelingexercise.ModelingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.repository.CourseRepository;
 import de.tum.in.www1.artemis.repository.FeedbackRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/ExerciseIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/ExerciseIntegrationTest.java
index da31d55d6351..00a627794a4c 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/ExerciseIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/ExerciseIntegrationTest.java
@@ -46,9 +46,9 @@
 import de.tum.in.www1.artemis.domain.quiz.QuizPointStatistic;
 import de.tum.in.www1.artemis.domain.quiz.QuizQuestion;
 import de.tum.in.www1.artemis.exam.ExamUtilService;
-import de.tum.in.www1.artemis.exercise.modelingexercise.ModelingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.CourseRepository;
 import de.tum.in.www1.artemis.repository.ExamRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/ExerciseUtilService.java b/src/test/java/de/tum/in/www1/artemis/exercise/ExerciseUtilService.java
index 6c6f26b72d0a..de62774ce12f 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/ExerciseUtilService.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/ExerciseUtilService.java
@@ -39,10 +39,10 @@
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
 import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase;
 import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict;
-import de.tum.in.www1.artemis.exercise.fileuploadexercise.FileUploadExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.modelingexercise.ModelingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.fileupload.FileUploadExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.post.ConversationFactory;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/fileuploadexercise/FileUploadAssessmentIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/fileuploadexercise/FileUploadAssessmentIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java
index 5e3891f2480a..ce6d8ac1a3d5 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/fileuploadexercise/FileUploadAssessmentIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadAssessmentIntegrationTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.fileuploadexercise;
+package de.tum.in.www1.artemis.exercise.fileupload;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.eq;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/fileuploadexercise/FileUploadExerciseFactory.java b/src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadExerciseFactory.java
similarity index 97%
rename from src/test/java/de/tum/in/www1/artemis/exercise/fileuploadexercise/FileUploadExerciseFactory.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadExerciseFactory.java
index 7450294e718d..86fbb68ec808 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/fileuploadexercise/FileUploadExerciseFactory.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadExerciseFactory.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.fileuploadexercise;
+package de.tum.in.www1.artemis.exercise.fileupload;
 
 import java.time.ZonedDateTime;
 
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/fileuploadexercise/FileUploadExerciseIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/fileuploadexercise/FileUploadExerciseIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java
index 2537662f201a..abe9ae454c59 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/fileuploadexercise/FileUploadExerciseIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadExerciseIntegrationTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.fileuploadexercise;
+package de.tum.in.www1.artemis.exercise.fileupload;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/fileuploadexercise/FileUploadExerciseUtilService.java b/src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadExerciseUtilService.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/fileuploadexercise/FileUploadExerciseUtilService.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadExerciseUtilService.java
index 64eddcb30fff..a4af853f97a4 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/fileuploadexercise/FileUploadExerciseUtilService.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadExerciseUtilService.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.fileuploadexercise;
+package de.tum.in.www1.artemis.exercise.fileupload;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/fileuploadexercise/FileUploadSubmissionIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/fileuploadexercise/FileUploadSubmissionIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java
index e45c9c238250..861ca211a91b 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/fileuploadexercise/FileUploadSubmissionIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/fileupload/FileUploadSubmissionIntegrationTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.fileuploadexercise;
+package de.tum.in.www1.artemis.exercise.fileupload;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -40,7 +40,7 @@
 import de.tum.in.www1.artemis.domain.participation.Participation;
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.modelingexercise.ModelingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.FileUploadSubmissionRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/ApollonConversionIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ApollonConversionIntegrationTest.java
similarity index 97%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/ApollonConversionIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/ApollonConversionIntegrationTest.java
index 426ddabfccbe..b1070c7893a3 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/ApollonConversionIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ApollonConversionIntegrationTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise;
+package de.tum.in.www1.artemis.exercise.modeling;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/ApollonDiagramResourceIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ApollonDiagramResourceIntegrationTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/ApollonDiagramResourceIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/ApollonDiagramResourceIntegrationTest.java
index 1f707aa15233..6b0206001148 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/ApollonDiagramResourceIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ApollonDiagramResourceIntegrationTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise;
+package de.tum.in.www1.artemis.exercise.modeling;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/ModelingAssessmentIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/ModelingAssessmentIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java
index 92ecb66f6da4..97d367be9e91 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/ModelingAssessmentIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingAssessmentIntegrationTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise;
+package de.tum.in.www1.artemis.exercise.modeling;
 
 import static de.tum.in.www1.artemis.util.TestResourceUtils.loadFileFromResources;
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/ModelingComparisonTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingComparisonTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/ModelingComparisonTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingComparisonTest.java
index 8ef123d6cbf6..25e191e37ae0 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/ModelingComparisonTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingComparisonTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise;
+package de.tum.in.www1.artemis.exercise.modeling;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/ModelingExerciseFactory.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingExerciseFactory.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/ModelingExerciseFactory.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingExerciseFactory.java
index 45bd73bb2f15..4287343b27b9 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/ModelingExerciseFactory.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingExerciseFactory.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise;
+package de.tum.in.www1.artemis.exercise.modeling;
 
 import java.time.ZonedDateTime;
 import java.util.HashSet;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/ModelingExerciseIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/ModelingExerciseIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java
index 2e0fc3b332c6..692757e0b171 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/ModelingExerciseIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingExerciseIntegrationTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise;
+package de.tum.in.www1.artemis.exercise.modeling;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.verify;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/ModelingExerciseUtilService.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingExerciseUtilService.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/ModelingExerciseUtilService.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingExerciseUtilService.java
index 0f2e44339237..093131d1d898 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/ModelingExerciseUtilService.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingExerciseUtilService.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise;
+package de.tum.in.www1.artemis.exercise.modeling;
 
 import static com.google.gson.JsonParser.parseString;
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/ModelingSubmissionIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/ModelingSubmissionIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java
index 9fcc40622e9e..30eda851c49a 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/ModelingSubmissionIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/ModelingSubmissionIntegrationTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise;
+package de.tum.in.www1.artemis.exercise.modeling;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -42,7 +42,7 @@
 import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingSubmissionElement;
 import de.tum.in.www1.artemis.exam.ExamUtilService;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.ExamRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/controller/FeedbackSelectorTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/controller/FeedbackSelectorTest.java
similarity index 98%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/controller/FeedbackSelectorTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/controller/FeedbackSelectorTest.java
index 2a61905ef1cf..22c5437b285a 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/controller/FeedbackSelectorTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/controller/FeedbackSelectorTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.controller;
+package de.tum.in.www1.artemis.exercise.modeling.compass.controller;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/controller/ModelClusterFactoryTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/controller/ModelClusterFactoryTest.java
similarity index 98%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/controller/ModelClusterFactoryTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/controller/ModelClusterFactoryTest.java
index 7010ed0f0b97..26b47e3f81ed 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/controller/ModelClusterFactoryTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/controller/ModelClusterFactoryTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.controller;
+package de.tum.in.www1.artemis.exercise.modeling.compass.controller;
 
 import static de.tum.in.www1.artemis.util.TestResourceUtils.loadFileFromResources;
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/controller/UMLModelParserTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/controller/UMLModelParserTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/controller/UMLModelParserTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/controller/UMLModelParserTest.java
index 926aecffc7da..4ff6a35c8b88 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/controller/UMLModelParserTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/controller/UMLModelParserTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.controller;
+package de.tum.in.www1.artemis.exercise.modeling.compass.controller;
 
 import static com.google.gson.JsonParser.parseString;
 import static de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_ACTION_NODE;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/AbstractUMLDiagramTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/AbstractUMLDiagramTest.java
similarity index 98%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/AbstractUMLDiagramTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/AbstractUMLDiagramTest.java
index 9f69214443e7..4ce80ae2151f 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/AbstractUMLDiagramTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/AbstractUMLDiagramTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/UMLDiagramTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/UMLDiagramTest.java
similarity index 98%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/UMLDiagramTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/UMLDiagramTest.java
index 42783f43df2b..6ee07d0ecd79 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/UMLDiagramTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/UMLDiagramTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.doReturn;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/activity/UMLActivityDiagramTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityDiagramTest.java
similarity index 97%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/activity/UMLActivityDiagramTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityDiagramTest.java
index 3113167d02af..cbb4680c5207 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/activity/UMLActivityDiagramTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityDiagramTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.activity;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.activity;
 
 import static com.google.gson.JsonParser.parseString;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -14,7 +14,7 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-import de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.AbstractUMLDiagramTest;
+import de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest;
 import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram;
 import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement;
 import de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivity;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/activity/UMLActivityDiagrams.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityDiagrams.java
similarity index 94%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/activity/UMLActivityDiagrams.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityDiagrams.java
index 9196ce58e8d3..5ed95df0dc74 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/activity/UMLActivityDiagrams.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityDiagrams.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.activity;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.activity;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/activity/UMLActivityNodeTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityNodeTest.java
similarity index 97%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/activity/UMLActivityNodeTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityNodeTest.java
index 7aed2e73d1e7..608875631034 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/activity/UMLActivityNodeTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityNodeTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.activity;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.activity;
 
 import static de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_ACTION_NODE;
 import static de.tum.in.www1.artemis.service.compass.umlmodel.activity.UMLActivityNode.UMLActivityNodeType.ACTIVITY_FINAL_NODE;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/activity/UMLActivityTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityTest.java
similarity index 96%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/activity/UMLActivityTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityTest.java
index fdb11acd182c..b96a8310161a 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/activity/UMLActivityTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLActivityTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.activity;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.activity;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.doReturn;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/activity/UMLControlFlowTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLControlFlowTest.java
similarity index 97%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/activity/UMLControlFlowTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLControlFlowTest.java
index 508077fb6913..c9e31636307d 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/activity/UMLControlFlowTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/UMLControlFlowTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.activity;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.activity;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/bpmn/BPMNDiagramTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/bpmn/BPMNDiagramTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/bpmn/BPMNDiagramTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/bpmn/BPMNDiagramTest.java
index 1d76e38bed7b..c71ac89973ee 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/bpmn/BPMNDiagramTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/bpmn/BPMNDiagramTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.bpmn;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.bpmn;
 
 import static com.google.gson.JsonParser.parseString;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -7,7 +7,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.AbstractUMLDiagramTest;
+import de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest;
 import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram;
 import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement;
 import de.tum.in.www1.artemis.service.compass.umlmodel.bpmn.BPMNAnnotation;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/bpmn/BPMNDiagrams.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/bpmn/BPMNDiagrams.java
similarity index 91%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/bpmn/BPMNDiagrams.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/bpmn/BPMNDiagrams.java
index de4be599edf0..a5f73b5552e4 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/bpmn/BPMNDiagrams.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/bpmn/BPMNDiagrams.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.bpmn;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.bpmn;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/UMLAttributeTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLAttributeTest.java
similarity index 98%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/UMLAttributeTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLAttributeTest.java
index 2e64d140a28b..e41606e5f4c3 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/UMLAttributeTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLAttributeTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.classdiagram;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.classdiagram;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/UMLClassDiagramTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassDiagramTest.java
similarity index 97%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/UMLClassDiagramTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassDiagramTest.java
index a2316f415d5c..e10d6ab969bc 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/UMLClassDiagramTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassDiagramTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.classdiagram;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.classdiagram;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
@@ -12,7 +12,7 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-import de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.AbstractUMLDiagramTest;
+import de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest;
 import de.tum.in.www1.artemis.service.compass.umlmodel.UMLElement;
 import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLAttribute;
 import de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLClass;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/UMLClassDiagrams.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassDiagrams.java
similarity index 92%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/UMLClassDiagrams.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassDiagrams.java
index 486ceec332c2..852012449fad 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/UMLClassDiagrams.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassDiagrams.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.classdiagram;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.classdiagram;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/UMLClassTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassTest.java
similarity index 98%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/UMLClassTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassTest.java
index 9c2c57bb4bb6..49436cdf88c0 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/UMLClassTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLClassTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.classdiagram;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.classdiagram;
 
 import static de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLClass.UMLClassType.ABSTRACT_CLASS;
 import static de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLClass.UMLClassType.CLASS;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/UMLMethodTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLMethodTest.java
similarity index 98%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/UMLMethodTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLMethodTest.java
index d710d7b2862e..61e8d33f3d7e 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/UMLMethodTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLMethodTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.classdiagram;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.classdiagram;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/UMLPackageTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLPackageTest.java
similarity index 95%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/UMLPackageTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLPackageTest.java
index d0dfb12070d5..46f2996b460d 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/UMLPackageTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLPackageTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.classdiagram;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.classdiagram;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/UMLRelationshipTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLRelationshipTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/UMLRelationshipTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLRelationshipTest.java
index 32fabbb7a027..c5fed56fb2f9 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/UMLRelationshipTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/UMLRelationshipTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.classdiagram;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.classdiagram;
 
 import static de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_BIDIRECTIONAL;
 import static de.tum.in.www1.artemis.service.compass.umlmodel.classdiagram.UMLRelationship.UMLRelationshipType.CLASS_UNIDIRECTIONAL;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/communication/UMLCommunicationDiagramTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/communication/UMLCommunicationDiagramTest.java
similarity index 95%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/communication/UMLCommunicationDiagramTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/communication/UMLCommunicationDiagramTest.java
index 0e4e21d74999..a5b0f97bd9c9 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/communication/UMLCommunicationDiagramTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/communication/UMLCommunicationDiagramTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.communication;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.communication;
 
 import static com.google.gson.JsonParser.parseString;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -7,7 +7,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.AbstractUMLDiagramTest;
+import de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest;
 import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram;
 import de.tum.in.www1.artemis.service.compass.umlmodel.communication.UMLCommunicationDiagram;
 import de.tum.in.www1.artemis.service.compass.umlmodel.communication.UMLCommunicationLink;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/communication/UMLCommunicationDiagrams.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/communication/UMLCommunicationDiagrams.java
similarity index 93%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/communication/UMLCommunicationDiagrams.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/communication/UMLCommunicationDiagrams.java
index 23533bab92c2..b4dbd80204fc 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/communication/UMLCommunicationDiagrams.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/communication/UMLCommunicationDiagrams.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.communication;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.communication;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/component/UMLComponentDiagramTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/UMLComponentDiagramTest.java
similarity index 98%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/component/UMLComponentDiagramTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/UMLComponentDiagramTest.java
index 7b43c7d178fc..647cf9570398 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/component/UMLComponentDiagramTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/UMLComponentDiagramTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.component;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.component;
 
 import static com.google.gson.JsonParser.parseString;
 import static de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentRelationship.UMLComponentRelationshipType.COMPONENT_DEPENDENCY;
@@ -10,7 +10,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.AbstractUMLDiagramTest;
+import de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest;
 import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram;
 import de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponent;
 import de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponentDiagram;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/component/UMLComponentDiagrams.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/UMLComponentDiagrams.java
similarity index 94%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/component/UMLComponentDiagrams.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/UMLComponentDiagrams.java
index bdb23f2ef1a2..8e29fd58e0bb 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/component/UMLComponentDiagrams.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/UMLComponentDiagrams.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.component;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.component;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/deployment/UMLDeploymentDiagramTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/UMLDeploymentDiagramTest.java
similarity index 96%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/deployment/UMLDeploymentDiagramTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/UMLDeploymentDiagramTest.java
index b329b8bc0d38..c91ef60a667a 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/deployment/UMLDeploymentDiagramTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/UMLDeploymentDiagramTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.deployment;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.deployment;
 
 import static com.google.gson.JsonParser.parseString;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -7,7 +7,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.AbstractUMLDiagramTest;
+import de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest;
 import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram;
 import de.tum.in.www1.artemis.service.compass.umlmodel.component.UMLComponent;
 import de.tum.in.www1.artemis.service.compass.umlmodel.deployment.UMLArtifact;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/deployment/UMLDeploymentDiagrams.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/UMLDeploymentDiagrams.java
similarity index 94%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/deployment/UMLDeploymentDiagrams.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/UMLDeploymentDiagrams.java
index 7c277ffaca37..7b4c8c66e1e6 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/deployment/UMLDeploymentDiagrams.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/UMLDeploymentDiagrams.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.deployment;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.deployment;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/flowchart/FlowchartTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/FlowchartTest.java
similarity index 88%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/flowchart/FlowchartTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/FlowchartTest.java
index 3ed027e95049..b55fedd9c731 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/flowchart/FlowchartTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/FlowchartTest.java
@@ -1,12 +1,12 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.flowchart;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.flowchart;
 
 import static com.google.gson.JsonParser.parseString;
-import static de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.flowchart.FlowchartUtil.FLOWCHART_MODEL_1A;
-import static de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.flowchart.FlowchartUtil.FLOWCHART_MODEL_1A_V3;
-import static de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.flowchart.FlowchartUtil.FLOWCHART_MODEL_1B;
-import static de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.flowchart.FlowchartUtil.FLOWCHART_MODEL_1B_V3;
-import static de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.flowchart.FlowchartUtil.FLOWCHART_MODEL_2;
-import static de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.flowchart.FlowchartUtil.FLOWCHART_MODEL_2_V3;
+import static de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.flowchart.FlowchartUtil.FLOWCHART_MODEL_1A;
+import static de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.flowchart.FlowchartUtil.FLOWCHART_MODEL_1A_V3;
+import static de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.flowchart.FlowchartUtil.FLOWCHART_MODEL_1B;
+import static de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.flowchart.FlowchartUtil.FLOWCHART_MODEL_1B_V3;
+import static de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.flowchart.FlowchartUtil.FLOWCHART_MODEL_2;
+import static de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.flowchart.FlowchartUtil.FLOWCHART_MODEL_2_V3;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.InstanceOfAssertFactories.type;
 
@@ -14,7 +14,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.AbstractUMLDiagramTest;
+import de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest;
 import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram;
 import de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.Flowchart;
 import de.tum.in.www1.artemis.service.compass.umlmodel.flowchart.FlowchartDecision;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/flowchart/FlowchartUtil.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/FlowchartUtil.java
similarity index 94%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/flowchart/FlowchartUtil.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/FlowchartUtil.java
index 2b0b06fd6046..5f35eb4d9f89 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/flowchart/FlowchartUtil.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/FlowchartUtil.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.flowchart;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.flowchart;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/object/UMLObjectDiagramTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/object/UMLObjectDiagramTest.java
similarity index 94%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/object/UMLObjectDiagramTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/object/UMLObjectDiagramTest.java
index c7c4ea65c881..9d920a91ceb2 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/object/UMLObjectDiagramTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/object/UMLObjectDiagramTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.object;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.object;
 
 import static com.google.gson.JsonParser.parseString;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -7,7 +7,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.AbstractUMLDiagramTest;
+import de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest;
 import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram;
 import de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObject;
 import de.tum.in.www1.artemis.service.compass.umlmodel.object.UMLObjectDiagram;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/object/UMLObjectDiagrams.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/object/UMLObjectDiagrams.java
similarity index 92%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/object/UMLObjectDiagrams.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/object/UMLObjectDiagrams.java
index 3aa2a11a85df..1696bcadb062 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/object/UMLObjectDiagrams.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/object/UMLObjectDiagrams.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.object;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.object;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/petrinet/PetriNetTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/PetriNetTest.java
similarity index 84%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/petrinet/PetriNetTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/PetriNetTest.java
index 4a2e22060a3d..d0dc0f31e331 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/petrinet/PetriNetTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/PetriNetTest.java
@@ -1,12 +1,12 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.petrinet;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.petrinet;
 
 import static com.google.gson.JsonParser.parseString;
-import static de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.petrinet.PetriNets.PETRI_NET_MODEL_1A;
-import static de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.petrinet.PetriNets.PETRI_NET_MODEL_1A_V3;
-import static de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.petrinet.PetriNets.PETRI_NET_MODEL_1B;
-import static de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.petrinet.PetriNets.PETRI_NET_MODEL_1B_V3;
-import static de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.petrinet.PetriNets.PETRI_NET_MODEL_2;
-import static de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.petrinet.PetriNets.PETRI_NET_MODEL_2_V3;
+import static de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.petrinet.PetriNets.PETRI_NET_MODEL_1A;
+import static de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.petrinet.PetriNets.PETRI_NET_MODEL_1A_V3;
+import static de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.petrinet.PetriNets.PETRI_NET_MODEL_1B;
+import static de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.petrinet.PetriNets.PETRI_NET_MODEL_1B_V3;
+import static de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.petrinet.PetriNets.PETRI_NET_MODEL_2;
+import static de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.petrinet.PetriNets.PETRI_NET_MODEL_2_V3;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.InstanceOfAssertFactories.type;
 
@@ -14,7 +14,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.AbstractUMLDiagramTest;
+import de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest;
 import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram;
 import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser;
 import de.tum.in.www1.artemis.service.compass.umlmodel.petrinet.PetriNet;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/petrinet/PetriNets.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/PetriNets.java
similarity index 94%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/petrinet/PetriNets.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/PetriNets.java
index ee2bb1b751e2..a762c34254d5 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/petrinet/PetriNets.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/PetriNets.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.petrinet;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.petrinet;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/syntaxtree/SyntaxTreeTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/SyntaxTreeTest.java
similarity index 96%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/syntaxtree/SyntaxTreeTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/SyntaxTreeTest.java
index 3021f5b9a33b..d793a551188a 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/syntaxtree/SyntaxTreeTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/SyntaxTreeTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.syntaxtree;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.syntaxtree;
 
 import static com.google.gson.JsonParser.parseString;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -8,7 +8,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.AbstractUMLDiagramTest;
+import de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest;
 import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram;
 import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser;
 import de.tum.in.www1.artemis.service.compass.umlmodel.syntaxtree.SyntaxTree;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/syntaxtree/SyntaxTrees.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/SyntaxTrees.java
similarity index 94%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/syntaxtree/SyntaxTrees.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/SyntaxTrees.java
index 0b89431b1746..4709f41b12c3 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/syntaxtree/SyntaxTrees.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/SyntaxTrees.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.syntaxtree;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.syntaxtree;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/usecase/UMLUseCaseDiagramTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/usecase/UMLUseCaseDiagramTest.java
similarity index 95%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/usecase/UMLUseCaseDiagramTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/usecase/UMLUseCaseDiagramTest.java
index 250a60821766..76dec8987c89 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/usecase/UMLUseCaseDiagramTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/usecase/UMLUseCaseDiagramTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.usecase;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.usecase;
 
 import static com.google.gson.JsonParser.parseString;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -7,7 +7,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.AbstractUMLDiagramTest;
+import de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.AbstractUMLDiagramTest;
 import de.tum.in.www1.artemis.service.compass.umlmodel.UMLDiagram;
 import de.tum.in.www1.artemis.service.compass.umlmodel.parsers.UMLModelParser;
 import de.tum.in.www1.artemis.service.compass.umlmodel.usecase.UMLActor;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/usecase/UMLUseCaseDiagrams.java b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/usecase/UMLUseCaseDiagrams.java
similarity index 93%
rename from src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/usecase/UMLUseCaseDiagrams.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/usecase/UMLUseCaseDiagrams.java
index 0e3a48cdec9b..f70f751859a2 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/usecase/UMLUseCaseDiagrams.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/usecase/UMLUseCaseDiagrams.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.modelingexercise.compass.umlmodel.usecase;
+package de.tum.in.www1.artemis.exercise.modeling.compass.umlmodel.usecase;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/AuxiliaryRepositoryServiceTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/AuxiliaryRepositoryServiceTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java
index b23c175bd59e..43b3d2f18790 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/AuxiliaryRepositoryServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/AuxiliaryRepositoryServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ConsistencyCheckGitlabJenkinsIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ConsistencyCheckGitlabJenkinsIntegrationTest.java
similarity index 97%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ConsistencyCheckGitlabJenkinsIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/ConsistencyCheckGitlabJenkinsIntegrationTest.java
index 3b302ad9009b..6808cddc5fd0 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ConsistencyCheckGitlabJenkinsIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ConsistencyCheckGitlabJenkinsIntegrationTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ContinuousIntegrationTestService.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ContinuousIntegrationTestService.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ContinuousIntegrationTestService.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/ContinuousIntegrationTestService.java
index 53871af79e28..3a5e1c3f523a 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ContinuousIntegrationTestService.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ContinuousIntegrationTestService.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.doReturn;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/CourseGitlabJenkinsIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/CourseGitlabJenkinsIntegrationTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/CourseGitlabJenkinsIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/CourseGitlabJenkinsIntegrationTest.java
index b4aa30893046..a659517a221d 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/CourseGitlabJenkinsIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/CourseGitlabJenkinsIntegrationTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.verifyNoInteractions;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/GitServiceTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/GitServiceTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/GitServiceTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/GitServiceTest.java
index 4136bb9d2dfe..ffd756415cc9 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/GitServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/GitServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/GitlabServiceTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/GitlabServiceTest.java
similarity index 94%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/GitlabServiceTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/GitlabServiceTest.java
index a622f2afe407..e228dfe3c973 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/GitlabServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/GitlabServiceTest.java
@@ -1,8 +1,8 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
-import static de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingSubmissionConstants.GITLAB_PUSH_EVENT_REQUEST;
-import static de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingSubmissionConstants.GITLAB_PUSH_EVENT_REQUEST_WITHOUT_COMMIT;
-import static de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingSubmissionConstants.GITLAB_PUSH_EVENT_REQUEST_WRONG_COMMIT_ORDER;
+import static de.tum.in.www1.artemis.exercise.programming.ProgrammingSubmissionConstants.GITLAB_PUSH_EVENT_REQUEST;
+import static de.tum.in.www1.artemis.exercise.programming.ProgrammingSubmissionConstants.GITLAB_PUSH_EVENT_REQUEST_WITHOUT_COMMIT;
+import static de.tum.in.www1.artemis.exercise.programming.ProgrammingSubmissionConstants.GITLAB_PUSH_EVENT_REQUEST_WRONG_COMMIT_ORDER;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/MockDelegate.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/MockDelegate.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/MockDelegate.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/MockDelegate.java
index 913cd5950111..ab8e7e4591ee 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/MockDelegate.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/MockDelegate.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/PlantUmlIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/PlantUmlIntegrationTest.java
similarity index 98%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/PlantUmlIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/PlantUmlIntegrationTest.java
index c2cbec03a72f..9da875df4ba2 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/PlantUmlIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/PlantUmlIntegrationTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingAssessmentIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingAssessmentIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java
index 8d32d987ad88..f56ed2de1875 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingAssessmentIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingAssessmentIntegrationTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.doNothing;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseBuildPlanTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseBuildPlanTest.java
similarity index 97%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseBuildPlanTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseBuildPlanTest.java
index f5154ae7a5b5..51889258dc6a 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseBuildPlanTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseBuildPlanTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseFactory.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseFactory.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseFactory.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseFactory.java
index 5df2b34ba4ee..654b12ec1f69 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseFactory.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseFactory.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static de.tum.in.www1.artemis.exercise.ExerciseFactory.populateExerciseForExam;
 import static java.time.ZonedDateTime.now;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseGitIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseGitIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java
index a3b829a81a17..67f09657452b 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseGitIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseGitIntegrationTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseGitlabJenkinsIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseGitlabJenkinsIntegrationTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseGitlabJenkinsIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseGitlabJenkinsIntegrationTest.java
index 0ea9855ead0a..8d8cd1fb1694 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseGitlabJenkinsIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseGitlabJenkinsIntegrationTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.C;
 import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.EMPTY;
@@ -7,8 +7,8 @@
 import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.KOTLIN;
 import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.PYTHON;
 import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.SWIFT;
-import static de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseTestService.studentLogin;
-import static de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingSubmissionConstants.GITLAB_PUSH_EVENT_REQUEST;
+import static de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseTestService.studentLogin;
+import static de.tum.in.www1.artemis.exercise.programming.ProgrammingSubmissionConstants.GITLAB_PUSH_EVENT_REQUEST;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doThrow;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseGradingServiceTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseGradingServiceTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java
index b6a19f147fb2..d794579e870e 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseGradingServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseGradingServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static de.tum.in.www1.artemis.config.Constants.TEST_CASES_DUPLICATE_NOTIFICATION;
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseIntegrationJenkinsGitlabTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseIntegrationJenkinsGitlabTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java
index 9168cf1c4fd6..5dbbc2e11984 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseIntegrationJenkinsGitlabTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static de.tum.in.www1.artemis.domain.enumeration.BuildPlanType.SOLUTION;
 import static de.tum.in.www1.artemis.domain.enumeration.BuildPlanType.TEMPLATE;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseIntegrationTestService.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseIntegrationTestService.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java
index 63db8225ab3e..d48047487304 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseIntegrationTestService.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseIntegrationTestService.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static de.tum.in.www1.artemis.domain.enumeration.BuildPlanType.SOLUTION;
 import static de.tum.in.www1.artemis.domain.enumeration.BuildPlanType.TEMPLATE;
@@ -90,7 +90,7 @@
 import de.tum.in.www1.artemis.domain.plagiarism.text.TextSubmissionElement;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
 import de.tum.in.www1.artemis.exercise.GradingCriterionUtil;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.plagiarism.PlagiarismUtilService;
 import de.tum.in.www1.artemis.repository.AuxiliaryRepositoryRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java
index 12069798331e..d65634dfce6f 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseLocalVCLocalCIIntegrationTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static de.tum.in.www1.artemis.config.Constants.LOCALCI_RESULTS_DIRECTORY;
 import static de.tum.in.www1.artemis.config.Constants.LOCALCI_WORKING_DIRECTORY;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseParticipationIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseParticipationIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java
index 80dee4e2ffdf..c286e8d89446 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseParticipationIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseParticipationIntegrationTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.doReturn;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseRepositoryServiceTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseRepositoryServiceTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseRepositoryServiceTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseRepositoryServiceTest.java
index 3a02a5818170..964d72f52e23 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseRepositoryServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseRepositoryServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.never;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseResultJenkinsIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseResultJenkinsIntegrationTest.java
similarity index 98%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseResultJenkinsIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseResultJenkinsIntegrationTest.java
index 61cf01b0399c..191d585766a1 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseResultJenkinsIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseResultJenkinsIntegrationTest.java
@@ -1,6 +1,6 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
-import static de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseFactory.DEFAULT_BRANCH;
+import static de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory.DEFAULT_BRANCH;
 import static org.mockito.Mockito.doReturn;
 
 import java.time.ZonedDateTime;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseResultTestService.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseResultTestService.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseResultTestService.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseResultTestService.java
index a56e03e830c3..1f860df7e058 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseResultTestService.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseResultTestService.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static de.tum.in.www1.artemis.config.Constants.NEW_RESULT_TOPIC;
 import static java.util.Comparator.comparing;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseScheduleServiceTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseScheduleServiceTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java
index abefa45f699b..e01b4ac78bb9 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseScheduleServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseScheduleServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.after;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseServiceIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseServiceIntegrationTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseServiceIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseServiceIntegrationTest.java
index fa22debbe3dd..bed40a6f56ea 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseServiceIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseServiceIntegrationTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseServiceTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseServiceTest.java
similarity index 97%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseServiceTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseServiceTest.java
index f24dc8ec5d00..0218f7a9f5a1 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseTemplateIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseTemplateIntegrationTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseTemplateIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseTemplateIntegrationTest.java
index f380fcf7b591..121488751dc2 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseTemplateIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseTemplateIntegrationTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static de.tum.in.www1.artemis.util.TestConstants.COMMIT_HASH_OBJECT_ID;
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseTest.java
index d970ec2b1540..e1b19e1eea18 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseTestCaseServiceTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseTestCaseServiceTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java
index df2cefb9a0d5..bc0aad594c33 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseTestCaseServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseTestCaseServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.any;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseTestService.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseTestService.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseTestService.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseTestService.java
index 98405a64992e..cc881ebf78a6 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseTestService.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseTestService.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static de.tum.in.www1.artemis.domain.enumeration.ExerciseMode.INDIVIDUAL;
 import static de.tum.in.www1.artemis.domain.enumeration.ExerciseMode.TEAM;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseUtilService.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseUtilService.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseUtilService.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseUtilService.java
index 211deddf1117..882b89e2f92a 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseUtilService.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingExerciseUtilService.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java
index 12e7031bc6b4..a89cd7f38615 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java
@@ -1,7 +1,7 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.JAVA;
-import static de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingSubmissionConstants.GITLAB_PUSH_EVENT_REQUEST;
+import static de.tum.in.www1.artemis.exercise.programming.ProgrammingSubmissionConstants.GITLAB_PUSH_EVENT_REQUEST;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.time.ZonedDateTime;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingSubmissionAndResultIntegrationTestService.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java
similarity index 98%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingSubmissionAndResultIntegrationTestService.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java
index 61e8c01f438a..22ca6070899b 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingSubmissionAndResultIntegrationTestService.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingSubmissionAndResultIntegrationTestService.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.JAVA;
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingSubmissionConstants.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingSubmissionConstants.java
similarity index 95%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingSubmissionConstants.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingSubmissionConstants.java
index 5283720c08b1..92ea645b30c2 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingSubmissionConstants.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingSubmissionConstants.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingSubmissionIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingSubmissionIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java
index 21f58221d3c9..60a4e8ea9a2a 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingSubmissionIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/ProgrammingSubmissionIntegrationTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static de.tum.in.www1.artemis.config.Constants.NEW_SUBMISSION_TOPIC;
 import static de.tum.in.www1.artemis.config.Constants.SETUP_COMMIT_MESSAGE;
@@ -53,7 +53,7 @@
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
 import de.tum.in.www1.artemis.exception.ContinuousIntegrationException;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.modelingexercise.ModelingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/RepositoryIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/RepositoryIntegrationTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/RepositoryIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/RepositoryIntegrationTest.java
index 7f963f7d2f46..7c7bcf3264d2 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/RepositoryIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/RepositoryIntegrationTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static de.tum.in.www1.artemis.util.RequestUtilService.parameters;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -74,7 +74,7 @@
 import de.tum.in.www1.artemis.domain.plagiarism.text.TextSubmissionElement;
 import de.tum.in.www1.artemis.exam.ExamUtilService;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.ExamRepository;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/RepositoryProgrammingExerciseParticipationJenkinsIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/RepositoryProgrammingExerciseParticipationJenkinsIntegrationTest.java
similarity index 98%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/RepositoryProgrammingExerciseParticipationJenkinsIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/RepositoryProgrammingExerciseParticipationJenkinsIntegrationTest.java
index f8a18543df44..d2433a8efba6 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/RepositoryProgrammingExerciseParticipationJenkinsIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/RepositoryProgrammingExerciseParticipationJenkinsIntegrationTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.doReturn;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/StaticCodeAnalysisIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/StaticCodeAnalysisIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java
index bba5b9214f0f..473989879cb8 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/StaticCodeAnalysisIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/StaticCodeAnalysisIntegrationTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/SubmissionPolicyIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/SubmissionPolicyIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java
index 1e2f3b275afb..2d5e7dfb2c28 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/SubmissionPolicyIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/SubmissionPolicyIntegrationTest.java
@@ -1,7 +1,7 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static de.tum.in.www1.artemis.domain.Feedback.SUBMISSION_POLICY_FEEDBACK_IDENTIFIER;
-import static de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseResultTestService.convertBuildResultToJsonObject;
+import static de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseResultTestService.convertBuildResultToJsonObject;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Collections;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/TestRepositoryResourceIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/TestRepositoryResourceIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java
index 853091234df1..fff900e6715c 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/TestRepositoryResourceIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programming/TestRepositoryResourceIntegrationTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.programmingexercise;
+package de.tum.in.www1.artemis.exercise.programming;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.any;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/quizexercise/QuizComparisonTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizComparisonTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/quizexercise/QuizComparisonTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizComparisonTest.java
index 3b8480fe5943..e603a9153aff 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/quizexercise/QuizComparisonTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizComparisonTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.quizexercise;
+package de.tum.in.www1.artemis.exercise.quiz;
 
 import static de.tum.in.www1.artemis.service.exam.StudentExamService.isContentEqualTo;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/quizexercise/QuizExerciseFactory.java b/src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizExerciseFactory.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/quizexercise/QuizExerciseFactory.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizExerciseFactory.java
index 553473aaf471..2ec53833b945 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/quizexercise/QuizExerciseFactory.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizExerciseFactory.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.quizexercise;
+package de.tum.in.www1.artemis.exercise.quiz;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/quizexercise/QuizExerciseIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizExerciseIntegrationTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/quizexercise/QuizExerciseIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizExerciseIntegrationTest.java
index 44d33d96d1a1..89d218ca7595 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/quizexercise/QuizExerciseIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizExerciseIntegrationTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.quizexercise;
+package de.tum.in.www1.artemis.exercise.quiz;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.byLessThan;
@@ -81,7 +81,7 @@
 import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository;
 import de.tum.in.www1.artemis.security.SecurityUtils;
 import de.tum.in.www1.artemis.service.ExerciseService;
-import de.tum.in.www1.artemis.service.QuizExerciseService;
+import de.tum.in.www1.artemis.service.quiz.QuizExerciseService;
 import de.tum.in.www1.artemis.user.UserUtilService;
 import de.tum.in.www1.artemis.util.ExerciseIntegrationTestService;
 import de.tum.in.www1.artemis.util.PageableSearchUtilService;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/quizexercise/QuizExerciseUtilService.java b/src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizExerciseUtilService.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/quizexercise/QuizExerciseUtilService.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizExerciseUtilService.java
index 506d7179259e..f2972113abb5 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/quizexercise/QuizExerciseUtilService.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizExerciseUtilService.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.quizexercise;
+package de.tum.in.www1.artemis.exercise.quiz;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/quizexercise/QuizSubmissionIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/quizexercise/QuizSubmissionIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java
index c89ecd8b6e4b..709b4305a1c2 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/quizexercise/QuizSubmissionIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/quiz/QuizSubmissionIntegrationTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.quizexercise;
+package de.tum.in.www1.artemis.exercise.quiz;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
@@ -69,9 +69,9 @@
 import de.tum.in.www1.artemis.repository.QuizSubmissionRepository;
 import de.tum.in.www1.artemis.repository.ResultRepository;
 import de.tum.in.www1.artemis.repository.SubmissionRepository;
-import de.tum.in.www1.artemis.service.QuizBatchService;
-import de.tum.in.www1.artemis.service.QuizExerciseService;
-import de.tum.in.www1.artemis.service.QuizStatisticService;
+import de.tum.in.www1.artemis.service.quiz.QuizBatchService;
+import de.tum.in.www1.artemis.service.quiz.QuizExerciseService;
+import de.tum.in.www1.artemis.service.quiz.QuizStatisticService;
 import de.tum.in.www1.artemis.user.UserUtilService;
 import de.tum.in.www1.artemis.web.websocket.QuizSubmissionWebsocketService;
 
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/textexercise/TextComparisonTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/text/TextComparisonTest.java
similarity index 97%
rename from src/test/java/de/tum/in/www1/artemis/exercise/textexercise/TextComparisonTest.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/text/TextComparisonTest.java
index 24d904ee8842..c7f3894c69f3 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/textexercise/TextComparisonTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/text/TextComparisonTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.textexercise;
+package de.tum.in.www1.artemis.exercise.text;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/textexercise/TextExerciseFactory.java b/src/test/java/de/tum/in/www1/artemis/exercise/text/TextExerciseFactory.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/textexercise/TextExerciseFactory.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/text/TextExerciseFactory.java
index 825ec65c3699..564eaa018674 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/textexercise/TextExerciseFactory.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/text/TextExerciseFactory.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.textexercise;
+package de.tum.in.www1.artemis.exercise.text;
 
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/textexercise/TextExerciseUtilService.java b/src/test/java/de/tum/in/www1/artemis/exercise/text/TextExerciseUtilService.java
similarity index 99%
rename from src/test/java/de/tum/in/www1/artemis/exercise/textexercise/TextExerciseUtilService.java
rename to src/test/java/de/tum/in/www1/artemis/exercise/text/TextExerciseUtilService.java
index d11131824043..fa4a63ff1269 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/textexercise/TextExerciseUtilService.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/text/TextExerciseUtilService.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.exercise.textexercise;
+package de.tum.in.www1.artemis.exercise.text;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/CodeHintIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/hestia/CodeHintIntegrationTest.java
index 0f3822466f44..0d137a9452ca 100644
--- a/src/test/java/de/tum/in/www1/artemis/hestia/CodeHintIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/hestia/CodeHintIntegrationTest.java
@@ -20,7 +20,7 @@
 import de.tum.in.www1.artemis.domain.hestia.CodeHint;
 import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseSolutionEntry;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository;
 import de.tum.in.www1.artemis.repository.hestia.CodeHintRepository;
 import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/CodeHintServiceTest.java b/src/test/java/de/tum/in/www1/artemis/hestia/CodeHintServiceTest.java
index 671c15231456..59ff30f35948 100644
--- a/src/test/java/de/tum/in/www1/artemis/hestia/CodeHintServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/hestia/CodeHintServiceTest.java
@@ -25,7 +25,7 @@
 import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask;
 import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTestCaseType;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository;
 import de.tum.in.www1.artemis.repository.hestia.CodeHintRepository;
 import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/ExerciseHintIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/hestia/ExerciseHintIntegrationTest.java
index 17e35253f47c..f24de0ca7044 100644
--- a/src/test/java/de/tum/in/www1/artemis/hestia/ExerciseHintIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/hestia/ExerciseHintIntegrationTest.java
@@ -30,7 +30,7 @@
 import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask;
 import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/ExerciseHintServiceTest.java b/src/test/java/de/tum/in/www1/artemis/hestia/ExerciseHintServiceTest.java
index e78f312b0baa..9115fa968e0e 100644
--- a/src/test/java/de/tum/in/www1/artemis/hestia/ExerciseHintServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/hestia/ExerciseHintServiceTest.java
@@ -27,7 +27,7 @@
 import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask;
 import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/HestiaDatabaseTest.java b/src/test/java/de/tum/in/www1/artemis/hestia/HestiaDatabaseTest.java
index 62311d6bda57..3c3a049aa759 100644
--- a/src/test/java/de/tum/in/www1/artemis/hestia/HestiaDatabaseTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/hestia/HestiaDatabaseTest.java
@@ -18,7 +18,7 @@
 import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseSolutionEntry;
 import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository;
 import de.tum.in.www1.artemis.repository.hestia.CodeHintRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java
index 91077093d50d..81097a639095 100644
--- a/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java
@@ -13,7 +13,7 @@
 import de.tum.in.www1.artemis.domain.Course;
 import de.tum.in.www1.artemis.domain.ProgrammingExercise;
 import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffReport;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseFactory;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory;
 import de.tum.in.www1.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest;
 import de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseGitDiffReportService;
 import de.tum.in.www1.artemis.user.UserUtilService;
diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java b/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java
index d4dea97da35c..927d060c7feb 100644
--- a/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java
@@ -17,7 +17,7 @@
 import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry;
 import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffReport;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest;
 import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseGitDiffReportRepository;
 import de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseGitDiffReportService;
diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseSolutionEntryIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseSolutionEntryIntegrationTest.java
index b8a2864e6d76..fb8c43e162b7 100644
--- a/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseSolutionEntryIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseSolutionEntryIntegrationTest.java
@@ -19,7 +19,7 @@
 import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseSolutionEntry;
 import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository;
 import de.tum.in.www1.artemis.repository.hestia.CodeHintRepository;
 import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseTaskIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseTaskIntegrationTest.java
index 8bcf1915a5f6..7cd595254f45 100644
--- a/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseTaskIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseTaskIntegrationTest.java
@@ -22,7 +22,7 @@
 import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseSolutionEntry;
 import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository;
 import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseSolutionEntryRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseTaskServiceTest.java b/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseTaskServiceTest.java
index 12dd76f4305f..8fed8584a4d3 100644
--- a/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseTaskServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseTaskServiceTest.java
@@ -20,7 +20,7 @@
 import de.tum.in.www1.artemis.domain.hestia.CodeHint;
 import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository;
 import de.tum.in.www1.artemis.repository.hestia.CodeHintRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/StructuralTestCaseServiceTest.java b/src/test/java/de/tum/in/www1/artemis/hestia/StructuralTestCaseServiceTest.java
index 3e329138451e..f807304864f3 100644
--- a/src/test/java/de/tum/in/www1/artemis/hestia/StructuralTestCaseServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/hestia/StructuralTestCaseServiceTest.java
@@ -18,7 +18,7 @@
 import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase;
 import de.tum.in.www1.artemis.domain.enumeration.Visibility;
 import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTestCaseType;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseFactory;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory;
 import de.tum.in.www1.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository;
 import de.tum.in.www1.artemis.service.hestia.structural.StructuralSolutionEntryGenerationException;
diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/TestwiseCoverageIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/hestia/TestwiseCoverageIntegrationTest.java
index c21034d3322e..e410652e0fcc 100644
--- a/src/test/java/de/tum/in/www1/artemis/hestia/TestwiseCoverageIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/hestia/TestwiseCoverageIntegrationTest.java
@@ -21,7 +21,7 @@
 import de.tum.in.www1.artemis.domain.hestia.CoverageReport;
 import de.tum.in.www1.artemis.domain.hestia.TestwiseCoverageReportEntry;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository;
 import de.tum.in.www1.artemis.repository.ProgrammingSubmissionTestRepository;
 import de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/TestwiseCoverageReportServiceTest.java b/src/test/java/de/tum/in/www1/artemis/hestia/TestwiseCoverageReportServiceTest.java
index 6ec177a9b5cd..9a2ecb5e9b9c 100644
--- a/src/test/java/de/tum/in/www1/artemis/hestia/TestwiseCoverageReportServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/hestia/TestwiseCoverageReportServiceTest.java
@@ -20,7 +20,7 @@
 import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage;
 import de.tum.in.www1.artemis.domain.hestia.TestwiseCoverageReportEntry;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java b/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java
index c6a50db26d3f..ff0521bbd561 100644
--- a/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java
@@ -24,7 +24,7 @@
 import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTestCaseType;
 import de.tum.in.www1.artemis.domain.hestia.TestwiseCoverageReportEntry;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.localvcci.AbstractLocalCILocalVCIntegrationTest;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository;
 import de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/iris/AbstractIrisIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/iris/AbstractIrisIntegrationTest.java
index d5ed3d61bc1a..c96140daaf1c 100644
--- a/src/test/java/de/tum/in/www1/artemis/iris/AbstractIrisIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/iris/AbstractIrisIntegrationTest.java
@@ -24,7 +24,7 @@
 import de.tum.in.www1.artemis.domain.iris.session.IrisChatSession;
 import de.tum.in.www1.artemis.domain.iris.settings.IrisSubSettings;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.repository.CourseRepository;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
 import de.tum.in.www1.artemis.repository.iris.IrisSettingsRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/lecture/AttachmentResourceIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/lecture/AttachmentResourceIntegrationTest.java
index a723826488ba..cb04b768ec5d 100644
--- a/src/test/java/de/tum/in/www1/artemis/lecture/AttachmentResourceIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/lecture/AttachmentResourceIntegrationTest.java
@@ -24,7 +24,7 @@
 import de.tum.in.www1.artemis.domain.Lecture;
 import de.tum.in.www1.artemis.domain.TextExercise;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.repository.AttachmentRepository;
 import de.tum.in.www1.artemis.repository.CourseRepository;
 import de.tum.in.www1.artemis.repository.LectureRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/lecture/CompetencyIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/lecture/CompetencyIntegrationTest.java
index b183f88df81f..7dd0745c4748 100644
--- a/src/test/java/de/tum/in/www1/artemis/lecture/CompetencyIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/lecture/CompetencyIntegrationTest.java
@@ -46,7 +46,7 @@
 import de.tum.in.www1.artemis.domain.lecture.TextUnit;
 import de.tum.in.www1.artemis.domain.participation.Participant;
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.repository.CompetencyRelationRepository;
 import de.tum.in.www1.artemis.repository.CompetencyRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java
index 08fad9ec68f0..768f110c4a87 100644
--- a/src/test/java/de/tum/in/www1/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/localvcci/AbstractLocalCILocalVCIntegrationTest.java
@@ -20,7 +20,7 @@
 import de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation;
 import de.tum.in.www1.artemis.domain.participation.TemplateProgrammingExerciseParticipation;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.AuxiliaryRepositoryRepository;
 import de.tum.in.www1.artemis.repository.ExamRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIResultServiceTest.java b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIResultServiceTest.java
index 629b913c6da6..060014d4c0aa 100644
--- a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIResultServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIResultServiceTest.java
@@ -9,7 +9,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 
 import de.tum.in.www1.artemis.exception.LocalCIException;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseFactory;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory;
 import de.tum.in.www1.artemis.service.connectors.localci.LocalCIResultService;
 
 class LocalCIResultServiceTest extends AbstractLocalCILocalVCIntegrationTest {
diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIServiceTest.java b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIServiceTest.java
index fd6d02d5c261..201083921fd7 100644
--- a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIServiceTest.java
@@ -21,7 +21,7 @@
 import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage;
 import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.service.connectors.BuildScriptProviderService;
 import de.tum.in.www1.artemis.service.connectors.aeolus.AeolusTemplateService;
diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java
index c1635055fd74..b730f2936833 100644
--- a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java
@@ -16,7 +16,7 @@
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
 import de.tum.in.www1.artemis.domain.participation.TemplateProgrammingExerciseParticipation;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCRepositoryUri;
 import de.tum.in.www1.artemis.util.LocalRepository;
 
diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCServiceTest.java b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCServiceTest.java
index f48f8a96ac04..b037de655d28 100644
--- a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCServiceTest.java
@@ -14,7 +14,7 @@
 import de.tum.in.www1.artemis.domain.exam.Exam;
 import de.tum.in.www1.artemis.exam.ExamUtilService;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.service.connectors.ConnectorHealth;
 
 class LocalVCServiceTest extends AbstractSpringIntegrationLocalCILocalVCTest {
diff --git a/src/test/java/de/tum/in/www1/artemis/metis/ChannelIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/metis/ChannelIntegrationTest.java
index baa99dde8709..6d74f1b6048a 100644
--- a/src/test/java/de/tum/in/www1/artemis/metis/ChannelIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/metis/ChannelIntegrationTest.java
@@ -27,7 +27,7 @@
 import de.tum.in.www1.artemis.domain.enumeration.Language;
 import de.tum.in.www1.artemis.domain.metis.conversation.Channel;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.lecture.LectureUtilService;
 import de.tum.in.www1.artemis.post.ConversationUtilService;
 import de.tum.in.www1.artemis.repository.LectureRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/metis/ConversationIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/metis/ConversationIntegrationTest.java
index c881526bd6dc..2dd9baa9c965 100644
--- a/src/test/java/de/tum/in/www1/artemis/metis/ConversationIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/metis/ConversationIntegrationTest.java
@@ -27,7 +27,7 @@
 import de.tum.in.www1.artemis.domain.metis.conversation.Channel;
 import de.tum.in.www1.artemis.exam.ExamUtilService;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.lecture.LectureUtilService;
 import de.tum.in.www1.artemis.post.ConversationUtilService;
 import de.tum.in.www1.artemis.service.dto.ResponsibleUserDTO;
diff --git a/src/test/java/de/tum/in/www1/artemis/notification/GroupNotificationServiceTest.java b/src/test/java/de/tum/in/www1/artemis/notification/GroupNotificationServiceTest.java
index fe60b182d5c6..b9edfa501ba1 100644
--- a/src/test/java/de/tum/in/www1/artemis/notification/GroupNotificationServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/notification/GroupNotificationServiceTest.java
@@ -62,8 +62,8 @@
 import de.tum.in.www1.artemis.domain.notification.Notification;
 import de.tum.in.www1.artemis.domain.quiz.QuizExercise;
 import de.tum.in.www1.artemis.exam.ExamUtilService;
-import de.tum.in.www1.artemis.exercise.quizexercise.QuizExerciseFactory;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
 import de.tum.in.www1.artemis.repository.ExamRepository;
 import de.tum.in.www1.artemis.repository.ExerciseRepository;
 import de.tum.in.www1.artemis.repository.NotificationRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/notification/NotificationResourceIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/notification/NotificationResourceIntegrationTest.java
index 89edd51555f9..df542a5fa2fa 100644
--- a/src/test/java/de/tum/in/www1/artemis/notification/NotificationResourceIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/notification/NotificationResourceIntegrationTest.java
@@ -22,7 +22,7 @@
 import de.tum.in.www1.artemis.domain.notification.Notification;
 import de.tum.in.www1.artemis.domain.notification.NotificationConstants;
 import de.tum.in.www1.artemis.domain.notification.SingleUserNotification;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.repository.CourseRepository;
 import de.tum.in.www1.artemis.repository.NotificationRepository;
 import de.tum.in.www1.artemis.repository.NotificationSettingRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/notification/NotificationScheduleServiceTest.java b/src/test/java/de/tum/in/www1/artemis/notification/NotificationScheduleServiceTest.java
index a1b688ac565e..acc58c6b7964 100644
--- a/src/test/java/de/tum/in/www1/artemis/notification/NotificationScheduleServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/notification/NotificationScheduleServiceTest.java
@@ -28,7 +28,7 @@
 import de.tum.in.www1.artemis.domain.TextSubmission;
 import de.tum.in.www1.artemis.domain.User;
 import de.tum.in.www1.artemis.domain.enumeration.AssessmentType;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.ExerciseRepository;
 import de.tum.in.www1.artemis.repository.NotificationRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/notification/SingleUserNotificationServiceTest.java b/src/test/java/de/tum/in/www1/artemis/notification/SingleUserNotificationServiceTest.java
index 7c49839e6671..58e97088c0da 100644
--- a/src/test/java/de/tum/in/www1/artemis/notification/SingleUserNotificationServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/notification/SingleUserNotificationServiceTest.java
@@ -94,8 +94,8 @@
 import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult;
 import de.tum.in.www1.artemis.domain.plagiarism.text.TextSubmissionElement;
 import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroup;
-import de.tum.in.www1.artemis.exercise.fileuploadexercise.FileUploadExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.fileupload.FileUploadExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.ExerciseRepository;
 import de.tum.in.www1.artemis.repository.NotificationRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationFactory.java b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationFactory.java
index 851fa90c3f1c..4bc9b6c74989 100644
--- a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationFactory.java
+++ b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationFactory.java
@@ -1,6 +1,6 @@
 package de.tum.in.www1.artemis.participation;
 
-import static de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseFactory.DEFAULT_BRANCH;
+import static de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory.DEFAULT_BRANCH;
 import static java.time.ZonedDateTime.now;
 
 import java.time.ZonedDateTime;
diff --git a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
index 01432d81a88a..5156d90f88a8 100644
--- a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
@@ -64,14 +64,14 @@
 import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSpot;
 import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedAnswer;
 import de.tum.in.www1.artemis.domain.quiz.ShortAnswerSubmittedText;
-import de.tum.in.www1.artemis.exercise.fileuploadexercise.FileUploadExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseFactory;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseTestService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.quizexercise.QuizExerciseFactory;
-import de.tum.in.www1.artemis.exercise.quizexercise.QuizExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.fileupload.FileUploadExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseTestService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseFactory;
+import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.repository.CourseRepository;
 import de.tum.in.www1.artemis.repository.ExerciseRepository;
 import de.tum.in.www1.artemis.repository.ResultRepository;
@@ -80,9 +80,9 @@
 import de.tum.in.www1.artemis.repository.TeamRepository;
 import de.tum.in.www1.artemis.service.GradingScaleService;
 import de.tum.in.www1.artemis.service.ParticipationService;
-import de.tum.in.www1.artemis.service.QuizBatchService;
 import de.tum.in.www1.artemis.service.feature.Feature;
 import de.tum.in.www1.artemis.service.feature.FeatureToggleService;
+import de.tum.in.www1.artemis.service.quiz.QuizBatchService;
 import de.tum.in.www1.artemis.service.scheduled.cache.quiz.QuizScheduleService;
 import de.tum.in.www1.artemis.user.UserUtilService;
 import de.tum.in.www1.artemis.util.LocalRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationSubmissionIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationSubmissionIntegrationTest.java
index 5f715f91bcd9..a6ebcd78e885 100644
--- a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationSubmissionIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationSubmissionIntegrationTest.java
@@ -16,7 +16,7 @@
 import de.tum.in.www1.artemis.domain.TextExercise;
 import de.tum.in.www1.artemis.domain.TextSubmission;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.repository.ResultRepository;
 import de.tum.in.www1.artemis.repository.SubmissionRepository;
 import de.tum.in.www1.artemis.user.UserUtilService;
diff --git a/src/test/java/de/tum/in/www1/artemis/participation/SubmissionExportIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/participation/SubmissionExportIntegrationTest.java
index 491468d2de71..41e663b6e40f 100644
--- a/src/test/java/de/tum/in/www1/artemis/participation/SubmissionExportIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/participation/SubmissionExportIntegrationTest.java
@@ -31,9 +31,9 @@
 import de.tum.in.www1.artemis.domain.modeling.ModelingExercise;
 import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission;
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
-import de.tum.in.www1.artemis.exercise.fileuploadexercise.FileUploadExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.modelingexercise.ModelingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.fileupload.FileUploadExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.user.UserUtilService;
 import de.tum.in.www1.artemis.web.rest.dto.SubmissionExportOptionsDTO;
 
diff --git a/src/test/java/de/tum/in/www1/artemis/participation/SubmissionIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/participation/SubmissionIntegrationTest.java
index 8a9ede80fa3d..14796c45f3fd 100644
--- a/src/test/java/de/tum/in/www1/artemis/participation/SubmissionIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/participation/SubmissionIntegrationTest.java
@@ -23,7 +23,7 @@
 import de.tum.in.www1.artemis.domain.enumeration.AssessmentType;
 import de.tum.in.www1.artemis.domain.enumeration.Language;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.repository.CourseRepository;
 import de.tum.in.www1.artemis.repository.ResultRepository;
 import de.tum.in.www1.artemis.repository.SubmissionRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismCaseIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismCaseIntegrationTest.java
index 3731f231d83a..8bb2473a2161 100644
--- a/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismCaseIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismCaseIntegrationTest.java
@@ -31,7 +31,7 @@
 import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict;
 import de.tum.in.www1.artemis.domain.plagiarism.text.TextSubmissionElement;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.repository.UserRepository;
 import de.tum.in.www1.artemis.repository.metis.PostRepository;
 import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismIntegrationTest.java
index f41b7f2051e4..1744bd6f1df4 100644
--- a/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismIntegrationTest.java
@@ -24,7 +24,7 @@
 import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmission;
 import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult;
 import de.tum.in.www1.artemis.domain.plagiarism.text.TextSubmissionElement;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.TextExerciseRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismUtilService.java b/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismUtilService.java
index a9e1adbdf70e..2752b16e60e2 100644
--- a/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismUtilService.java
+++ b/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismUtilService.java
@@ -20,8 +20,8 @@
 import de.tum.in.www1.artemis.domain.enumeration.Language;
 import de.tum.in.www1.artemis.domain.modeling.ModelingExercise;
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
-import de.tum.in.www1.artemis.exercise.modelingexercise.ModelingExerciseFactory;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.CourseRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/post/ConversationUtilService.java b/src/test/java/de/tum/in/www1/artemis/post/ConversationUtilService.java
index 3a827093d33b..ade4a3b36140 100644
--- a/src/test/java/de/tum/in/www1/artemis/post/ConversationUtilService.java
+++ b/src/test/java/de/tum/in/www1/artemis/post/ConversationUtilService.java
@@ -33,7 +33,7 @@
 import de.tum.in.www1.artemis.domain.metis.conversation.OneToOneChat;
 import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
 import de.tum.in.www1.artemis.lecture.LectureFactory;
 import de.tum.in.www1.artemis.lecture.LectureUtilService;
 import de.tum.in.www1.artemis.repository.CourseRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/service/AssessmentServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/AssessmentServiceTest.java
index a9a5d0b53ea0..8f98bc6079ae 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/AssessmentServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/AssessmentServiceTest.java
@@ -35,9 +35,9 @@
 import de.tum.in.www1.artemis.exam.ExamUtilService;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
 import de.tum.in.www1.artemis.exercise.GradingCriterionUtil;
-import de.tum.in.www1.artemis.exercise.fileuploadexercise.FileUploadExerciseFactory;
-import de.tum.in.www1.artemis.exercise.modelingexercise.ModelingExerciseFactory;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.fileupload.FileUploadExerciseFactory;
+import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.CourseRepository;
 import de.tum.in.www1.artemis.repository.ExerciseRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/service/ComplaintResponseServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/ComplaintResponseServiceTest.java
index b36fe5c9aa8c..91c6fb84bf0f 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/ComplaintResponseServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/ComplaintResponseServiceTest.java
@@ -21,7 +21,7 @@
 import de.tum.in.www1.artemis.domain.TextExercise;
 import de.tum.in.www1.artemis.domain.User;
 import de.tum.in.www1.artemis.domain.enumeration.ComplaintType;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.ComplaintRepository;
 import de.tum.in.www1.artemis.repository.ResultRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/service/ConsistencyCheckTestService.java b/src/test/java/de/tum/in/www1/artemis/service/ConsistencyCheckTestService.java
index 9d26b0792515..b2b704f44839 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/ConsistencyCheckTestService.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/ConsistencyCheckTestService.java
@@ -14,8 +14,8 @@
 import de.tum.in.www1.artemis.domain.Course;
 import de.tum.in.www1.artemis.domain.ProgrammingExercise;
 import de.tum.in.www1.artemis.domain.User;
-import de.tum.in.www1.artemis.exercise.programmingexercise.MockDelegate;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.MockDelegate;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
 import de.tum.in.www1.artemis.repository.UserRepository;
 import de.tum.in.www1.artemis.service.dto.ConsistencyErrorDTO;
diff --git a/src/test/java/de/tum/in/www1/artemis/service/CourseServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/CourseServiceTest.java
index 4fac86070ca2..8e245d3b4181 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/CourseServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/CourseServiceTest.java
@@ -26,7 +26,7 @@
 import de.tum.in.www1.artemis.domain.TextSubmission;
 import de.tum.in.www1.artemis.domain.enumeration.Language;
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
 import de.tum.in.www1.artemis.repository.CourseRepository;
 import de.tum.in.www1.artemis.repository.ExerciseRepository;
 import de.tum.in.www1.artemis.repository.StudentParticipationRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/service/DataExportCreationServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/DataExportCreationServiceTest.java
index d405904bdefd..f11896357a19 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/DataExportCreationServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/DataExportCreationServiceTest.java
@@ -56,9 +56,9 @@
 import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict;
 import de.tum.in.www1.artemis.exam.ExamUtilService;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseTestService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.quizexercise.QuizExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseTestService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.post.ConversationUtilService;
 import de.tum.in.www1.artemis.repository.DataExportRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/service/EmailSummaryServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/EmailSummaryServiceTest.java
index 602954fc18e4..6bb7c6d5409d 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/EmailSummaryServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/EmailSummaryServiceTest.java
@@ -28,7 +28,7 @@
 import de.tum.in.www1.artemis.domain.NotificationSetting;
 import de.tum.in.www1.artemis.domain.User;
 import de.tum.in.www1.artemis.domain.enumeration.DifficultyLevel;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
 import de.tum.in.www1.artemis.repository.CourseRepository;
 import de.tum.in.www1.artemis.repository.ExerciseRepository;
 import de.tum.in.www1.artemis.repository.NotificationSettingRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/service/ExerciseDateServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/ExerciseDateServiceTest.java
index b69e7a70df2f..5f924ae0637e 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/ExerciseDateServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/ExerciseDateServiceTest.java
@@ -20,8 +20,8 @@
 import de.tum.in.www1.artemis.domain.participation.Participation;
 import de.tum.in.www1.artemis.exam.ExamUtilService;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.modelingexercise.ModelingExerciseFactory;
-import de.tum.in.www1.artemis.exercise.modelingexercise.ModelingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseFactory;
+import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.ExamRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/service/GitlabCIServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/GitlabCIServiceTest.java
index 1d670c1959c7..0385dbba2ba9 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/GitlabCIServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/GitlabCIServiceTest.java
@@ -38,7 +38,7 @@
 import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation;
 import de.tum.in.www1.artemis.exception.GitLabCIException;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.BuildLogStatisticsEntryRepository;
 import de.tum.in.www1.artemis.repository.BuildPlanRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/service/JenkinsServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/JenkinsServiceTest.java
index 3acfc8fa0a34..aa108d23de5f 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/JenkinsServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/JenkinsServiceTest.java
@@ -37,8 +37,8 @@
 import de.tum.in.www1.artemis.domain.ProgrammingExercise;
 import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage;
 import de.tum.in.www1.artemis.exception.JenkinsException;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ContinuousIntegrationTestService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ContinuousIntegrationTestService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.BuildPlanRepository;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/service/LearningPathServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/LearningPathServiceTest.java
index 78992894bcb1..c9385f311fcb 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/LearningPathServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/LearningPathServiceTest.java
@@ -35,7 +35,7 @@
 import de.tum.in.www1.artemis.domain.competency.RelationType;
 import de.tum.in.www1.artemis.domain.enumeration.DifficultyLevel;
 import de.tum.in.www1.artemis.domain.lecture.LectureUnit;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.lecture.LectureUtilService;
 import de.tum.in.www1.artemis.repository.CompetencyRepository;
 import de.tum.in.www1.artemis.repository.CourseRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/service/ParticipationAuthorizationCheckServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/ParticipationAuthorizationCheckServiceTest.java
index 47eead66938f..2a2e064108d4 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/ParticipationAuthorizationCheckServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/ParticipationAuthorizationCheckServiceTest.java
@@ -17,7 +17,7 @@
 import de.tum.in.www1.artemis.domain.participation.ParticipationInterface;
 import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
 import de.tum.in.www1.artemis.repository.StudentParticipationRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/service/ParticipationLifecycleServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/ParticipationLifecycleServiceTest.java
index 61d5b54735f5..df0007e3268c 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/ParticipationLifecycleServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/ParticipationLifecycleServiceTest.java
@@ -18,7 +18,7 @@
 import de.tum.in.www1.artemis.domain.enumeration.ParticipationLifecycle;
 import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.security.SecurityUtils;
 import de.tum.in.www1.artemis.user.UserUtilService;
diff --git a/src/test/java/de/tum/in/www1/artemis/service/ParticipationServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/ParticipationServiceTest.java
index 377fe392fdcc..34af5ff620f5 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/ParticipationServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/ParticipationServiceTest.java
@@ -29,8 +29,8 @@
 import de.tum.in.www1.artemis.domain.participation.Participant;
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.BuildLogEntryRepository;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/service/ParticipationTeamWebsocketServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/ParticipationTeamWebsocketServiceTest.java
index 6d5c1ccf7b80..57ccb7daead3 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/ParticipationTeamWebsocketServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/ParticipationTeamWebsocketServiceTest.java
@@ -28,8 +28,8 @@
 import de.tum.in.www1.artemis.domain.participation.Participation;
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.modelingexercise.ModelingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.user.UserUtilService;
 import de.tum.in.www1.artemis.web.websocket.dto.SubmissionPatch;
diff --git a/src/test/java/de/tum/in/www1/artemis/service/PresentationPointsCalculationServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/PresentationPointsCalculationServiceTest.java
index aa9e0bf69e85..cdac6403e9d8 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/PresentationPointsCalculationServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/PresentationPointsCalculationServiceTest.java
@@ -16,7 +16,7 @@
 import de.tum.in.www1.artemis.domain.User;
 import de.tum.in.www1.artemis.domain.enumeration.IncludedInOverallScore;
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.ExerciseRepository;
 import de.tum.in.www1.artemis.repository.StudentParticipationRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/service/RepositoryAccessServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/RepositoryAccessServiceTest.java
index c3422da7266b..b1c5ccea8333 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/RepositoryAccessServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/RepositoryAccessServiceTest.java
@@ -1,6 +1,6 @@
 package de.tum.in.www1.artemis.service;
 
-import static de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseResultTestService.convertBuildResultToJsonObject;
+import static de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseResultTestService.convertBuildResultToJsonObject;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.catchThrowableOfType;
@@ -24,8 +24,8 @@
 import de.tum.in.www1.artemis.domain.User;
 import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation;
 import de.tum.in.www1.artemis.domain.submissionpolicy.LockRepositoryPolicy;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseFactory;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
 import de.tum.in.www1.artemis.repository.UserRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/service/ResultServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/ResultServiceTest.java
index a595692b57b2..11b2c91b4f92 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/ResultServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/ResultServiceTest.java
@@ -23,7 +23,7 @@
 import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation;
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.ExamRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/service/SubmissionServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/SubmissionServiceTest.java
index 26bcdbc49de7..1b5d7826084d 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/SubmissionServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/SubmissionServiceTest.java
@@ -38,7 +38,7 @@
 import de.tum.in.www1.artemis.domain.modeling.ModelingExercise;
 import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission;
 import de.tum.in.www1.artemis.exam.ExamUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.ComplaintRepository;
 import de.tum.in.www1.artemis.repository.ExamRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/service/TitleCacheEvictionServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/TitleCacheEvictionServiceTest.java
index caac79334b91..45669457bb30 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/TitleCacheEvictionServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/TitleCacheEvictionServiceTest.java
@@ -14,9 +14,9 @@
 import de.tum.in.www1.artemis.domain.ProgrammingExercise;
 import de.tum.in.www1.artemis.domain.enumeration.DiagramType;
 import de.tum.in.www1.artemis.exam.ExamUtilService;
-import de.tum.in.www1.artemis.exercise.modelingexercise.ModelingExerciseFactory;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.modeling.ModelingExerciseFactory;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.lecture.LectureUtilService;
 import de.tum.in.www1.artemis.organization.OrganizationUtilService;
 import de.tum.in.www1.artemis.repository.ApollonDiagramRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java
index 2ae3af05a5ed..08b2a739e15d 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaFeedbackSendingServiceTest.java
@@ -30,8 +30,8 @@
 import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission;
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
 import de.tum.in.www1.artemis.exercise.GradingCriterionUtil;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.repository.GradingCriterionRepository;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
 import de.tum.in.www1.artemis.repository.TextBlockRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java
index 25b19e11f3a2..5d5a266a2336 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaFeedbackSuggestionsServiceTest.java
@@ -20,8 +20,8 @@
 import de.tum.in.www1.artemis.domain.TextSubmission;
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
 import de.tum.in.www1.artemis.exception.NetworkingException;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.service.dto.athena.ProgrammingFeedbackDTO;
 import de.tum.in.www1.artemis.service.dto.athena.TextFeedbackDTO;
 import de.tum.in.www1.artemis.web.rest.errors.ConflictException;
diff --git a/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java
index 8340d77dc7d5..2484c46adbfa 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaRepositoryExportServiceTest.java
@@ -22,7 +22,7 @@
 import de.tum.in.www1.artemis.domain.ProgrammingSubmission;
 import de.tum.in.www1.artemis.domain.enumeration.RepositoryType;
 import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
 import de.tum.in.www1.artemis.user.UserUtilService;
 import de.tum.in.www1.artemis.util.LocalRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java
index e80cf4408580..99853700d473 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaSubmissionSelectionServiceTest.java
@@ -21,8 +21,8 @@
 import de.tum.in.www1.artemis.domain.ProgrammingSubmission;
 import de.tum.in.www1.artemis.domain.TextExercise;
 import de.tum.in.www1.artemis.domain.TextSubmission;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
 import de.tum.in.www1.artemis.repository.TextExerciseRepository;
 
diff --git a/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java
index b786268c64db..16fe2babdfb4 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/connectors/athena/AthenaSubmissionSendingServiceTest.java
@@ -17,8 +17,8 @@
 import de.tum.in.www1.artemis.domain.TextSubmission;
 import de.tum.in.www1.artemis.domain.enumeration.InitializationState;
 import de.tum.in.www1.artemis.domain.enumeration.Language;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.repository.StudentParticipationRepository;
 import de.tum.in.www1.artemis.repository.SubmissionRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/service/exam/ExamQuizServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/exam/ExamQuizServiceTest.java
index 7934225296b9..212040aca2ea 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/exam/ExamQuizServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/exam/ExamQuizServiceTest.java
@@ -28,14 +28,14 @@
 import de.tum.in.www1.artemis.domain.quiz.QuizQuestion;
 import de.tum.in.www1.artemis.domain.quiz.QuizSubmission;
 import de.tum.in.www1.artemis.exam.ExamUtilService;
-import de.tum.in.www1.artemis.exercise.quizexercise.QuizExerciseFactory;
+import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseFactory;
 import de.tum.in.www1.artemis.repository.ExamRepository;
 import de.tum.in.www1.artemis.repository.ExerciseGroupRepository;
 import de.tum.in.www1.artemis.repository.QuizExerciseRepository;
 import de.tum.in.www1.artemis.repository.QuizSubmissionRepository;
 import de.tum.in.www1.artemis.repository.StudentExamRepository;
 import de.tum.in.www1.artemis.repository.StudentParticipationRepository;
-import de.tum.in.www1.artemis.service.QuizExerciseService;
+import de.tum.in.www1.artemis.service.quiz.QuizExerciseService;
 import de.tum.in.www1.artemis.user.UserUtilService;
 
 class ExamQuizServiceTest extends AbstractSpringIntegrationIndependentTest {
diff --git a/src/test/java/de/tum/in/www1/artemis/service/exam/ExamSubmissionServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/exam/ExamSubmissionServiceTest.java
index f2217fb1b452..7953e1727146 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/exam/ExamSubmissionServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/exam/ExamSubmissionServiceTest.java
@@ -21,8 +21,8 @@
 import de.tum.in.www1.artemis.domain.exam.StudentExam;
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
 import de.tum.in.www1.artemis.exam.ExamUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.ExamRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java
index cf8ea78b1758..99ea095a0d5c 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseFeedbackCreationServiceTest.java
@@ -22,8 +22,8 @@
 import de.tum.in.www1.artemis.domain.enumeration.ProjectType;
 import de.tum.in.www1.artemis.domain.enumeration.StaticCodeAnalysisTool;
 import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTestCaseType;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseFactory;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseFactory;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository;
 import de.tum.in.www1.artemis.service.dto.AbstractBuildResultNotificationDTO;
diff --git a/src/test/java/de/tum/in/www1/artemis/service/scheduled/cache/quiz/QuizCacheTest.java b/src/test/java/de/tum/in/www1/artemis/service/scheduled/cache/quiz/QuizCacheTest.java
index 4789b09607f9..47c68393548c 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/scheduled/cache/quiz/QuizCacheTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/scheduled/cache/quiz/QuizCacheTest.java
@@ -32,13 +32,13 @@
 import de.tum.in.www1.artemis.domain.quiz.QuizBatch;
 import de.tum.in.www1.artemis.domain.quiz.QuizExercise;
 import de.tum.in.www1.artemis.domain.quiz.QuizSubmission;
-import de.tum.in.www1.artemis.exercise.quizexercise.QuizExerciseFactory;
-import de.tum.in.www1.artemis.exercise.quizexercise.QuizExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseFactory;
+import de.tum.in.www1.artemis.exercise.quiz.QuizExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.QuizExerciseRepository;
 import de.tum.in.www1.artemis.repository.QuizSubmissionRepository;
-import de.tum.in.www1.artemis.service.QuizBatchService;
-import de.tum.in.www1.artemis.service.QuizExerciseService;
+import de.tum.in.www1.artemis.service.quiz.QuizBatchService;
+import de.tum.in.www1.artemis.service.quiz.QuizExerciseService;
 import de.tum.in.www1.artemis.user.UserUtilService;
 import de.tum.in.www1.artemis.web.websocket.QuizSubmissionWebsocketService;
 
diff --git a/src/test/java/de/tum/in/www1/artemis/team/TeamIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/team/TeamIntegrationTest.java
index 7631d2590f38..91c3ef97b27e 100644
--- a/src/test/java/de/tum/in/www1/artemis/team/TeamIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/team/TeamIntegrationTest.java
@@ -31,8 +31,8 @@
 import de.tum.in.www1.artemis.domain.modeling.ModelingExercise;
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.CourseRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/text/AssessmentEventIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/text/AssessmentEventIntegrationTest.java
index febe53d52064..844243c3e935 100644
--- a/src/test/java/de/tum/in/www1/artemis/text/AssessmentEventIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/text/AssessmentEventIntegrationTest.java
@@ -18,8 +18,8 @@
 import de.tum.in.www1.artemis.domain.User;
 import de.tum.in.www1.artemis.domain.analytics.TextAssessmentEvent;
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.repository.StudentParticipationRepository;
 import de.tum.in.www1.artemis.repository.TextAssessmentEventRepository;
 import de.tum.in.www1.artemis.repository.TextSubmissionRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/text/TextAssessmentIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/text/TextAssessmentIntegrationTest.java
index 9ab55deb6d0a..f181f0d916c9 100644
--- a/src/test/java/de/tum/in/www1/artemis/text/TextAssessmentIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/text/TextAssessmentIntegrationTest.java
@@ -62,10 +62,10 @@
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
 import de.tum.in.www1.artemis.exam.ExamUtilService;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.fileuploadexercise.FileUploadExerciseFactory;
-import de.tum.in.www1.artemis.exercise.fileuploadexercise.FileUploadExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.fileupload.FileUploadExerciseFactory;
+import de.tum.in.www1.artemis.exercise.fileupload.FileUploadExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.ComplaintRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/text/TextExerciseIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/text/TextExerciseIntegrationTest.java
index 84bfbb32b387..26e089a5c4c4 100644
--- a/src/test/java/de/tum/in/www1/artemis/text/TextExerciseIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/text/TextExerciseIntegrationTest.java
@@ -55,8 +55,8 @@
 import de.tum.in.www1.artemis.exam.ExamUtilService;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
 import de.tum.in.www1.artemis.exercise.GradingCriterionUtil;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.plagiarism.PlagiarismUtilService;
diff --git a/src/test/java/de/tum/in/www1/artemis/text/TextSubmissionIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/text/TextSubmissionIntegrationTest.java
index f6e767339eb1..5ac0bd41e7b5 100644
--- a/src/test/java/de/tum/in/www1/artemis/text/TextSubmissionIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/text/TextSubmissionIntegrationTest.java
@@ -38,8 +38,8 @@
 import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingSubmissionElement;
 import de.tum.in.www1.artemis.domain.plagiarism.text.TextSubmissionElement;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.ExerciseRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/tutorialgroups/TutorialGroupsConfigurationIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/tutorialgroups/TutorialGroupsConfigurationIntegrationTest.java
index 72c0ea7b08ee..b540916b3844 100644
--- a/src/test/java/de/tum/in/www1/artemis/tutorialgroups/TutorialGroupsConfigurationIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/tutorialgroups/TutorialGroupsConfigurationIntegrationTest.java
@@ -20,7 +20,7 @@
 import de.tum.in.www1.artemis.domain.enumeration.Language;
 import de.tum.in.www1.artemis.domain.enumeration.TutorialGroupSessionStatus;
 import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupsConfiguration;
-import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory;
+import de.tum.in.www1.artemis.exercise.text.TextExerciseFactory;
 import de.tum.in.www1.artemis.user.UserFactory;
 
 class TutorialGroupsConfigurationIntegrationTest extends AbstractTutorialGroupIntegrationTest {
diff --git a/src/test/java/de/tum/in/www1/artemis/user/UserTestService.java b/src/test/java/de/tum/in/www1/artemis/user/UserTestService.java
index 5ac53027a4da..685895edb315 100644
--- a/src/test/java/de/tum/in/www1/artemis/user/UserTestService.java
+++ b/src/test/java/de/tum/in/www1/artemis/user/UserTestService.java
@@ -26,8 +26,8 @@
 import de.tum.in.www1.artemis.domain.Authority;
 import de.tum.in.www1.artemis.domain.Course;
 import de.tum.in.www1.artemis.domain.User;
-import de.tum.in.www1.artemis.exercise.programmingexercise.MockDelegate;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.MockDelegate;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.repository.AuthorityRepository;
 import de.tum.in.www1.artemis.repository.CourseRepository;
 import de.tum.in.www1.artemis.repository.UserRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/util/HestiaUtilTestService.java b/src/test/java/de/tum/in/www1/artemis/util/HestiaUtilTestService.java
index 28406a5d955a..e8f40ae6e45f 100644
--- a/src/test/java/de/tum/in/www1/artemis/util/HestiaUtilTestService.java
+++ b/src/test/java/de/tum/in/www1/artemis/util/HestiaUtilTestService.java
@@ -22,7 +22,7 @@
 import de.tum.in.www1.artemis.domain.ProgrammingSubmission;
 import de.tum.in.www1.artemis.domain.Repository;
 import de.tum.in.www1.artemis.domain.enumeration.SubmissionType;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
diff --git a/src/test/java/de/tum/in/www1/artemis/util/IrisUtilTestService.java b/src/test/java/de/tum/in/www1/artemis/util/IrisUtilTestService.java
index 43b6452dee41..eb49aab3c586 100644
--- a/src/test/java/de/tum/in/www1/artemis/util/IrisUtilTestService.java
+++ b/src/test/java/de/tum/in/www1/artemis/util/IrisUtilTestService.java
@@ -10,7 +10,7 @@
 import de.tum.in.www1.artemis.domain.ProgrammingExercise;
 import de.tum.in.www1.artemis.domain.ProgrammingSubmission;
 import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation;
-import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
 import de.tum.in.www1.artemis.repository.ProgrammingSubmissionTestRepository;
 import de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository;
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/activity/activityModel1.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/activityModel1.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/activity/activityModel1.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/activityModel1.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/activity/activityModel1v3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/activityModel1v3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/activity/activityModel1v3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/activityModel1v3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/activity/activityModel2.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/activityModel2.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/activity/activityModel2.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/activityModel2.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/activity/activityModel2v3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/activityModel2v3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/activity/activityModel2v3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/activityModel2v3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/activity/activityModel3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/activityModel3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/activity/activityModel3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/activityModel3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/activity/activityModel3v3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/activityModel3v3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/activity/activityModel3v3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/activity/activityModel3v3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/bpmn/bpmnModel1.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/bpmn/bpmnModel1.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/bpmn/bpmnModel1.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/bpmn/bpmnModel1.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/bpmn/bpmnModel2.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/bpmn/bpmnModel2.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/bpmn/bpmnModel2.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/bpmn/bpmnModel2.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/bpmn/bpmnModel3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/bpmn/bpmnModel3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/bpmn/bpmnModel3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/bpmn/bpmnModel3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/classModel1.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/classModel1.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/classModel1.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/classModel1.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/classModel1v3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/classModel1v3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/classModel1v3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/classModel1v3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/classModel2.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/classModel2.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/classModel2.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/classModel2.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/classModel2v3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/classModel2v3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/classdiagram/classModel2v3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/classdiagram/classModel2v3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/communication/communicationModel1.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/communication/communicationModel1.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/communication/communicationModel1.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/communication/communicationModel1.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/communication/communicationModel1v3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/communication/communicationModel1v3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/communication/communicationModel1v3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/communication/communicationModel1v3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/communication/communicationModel2.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/communication/communicationModel2.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/communication/communicationModel2.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/communication/communicationModel2.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/communication/communicationModel2v3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/communication/communicationModel2v3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/communication/communicationModel2v3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/communication/communicationModel2v3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/component/componentModel1.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/componentModel1.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/component/componentModel1.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/componentModel1.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/component/componentModel1v3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/componentModel1v3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/component/componentModel1v3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/componentModel1v3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/component/componentModel2.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/componentModel2.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/component/componentModel2.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/componentModel2.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/component/componentModel2v3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/componentModel2v3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/component/componentModel2v3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/componentModel2v3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/component/componentModel3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/componentModel3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/component/componentModel3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/componentModel3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/component/componentModel3v3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/componentModel3v3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/component/componentModel3v3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/component/componentModel3v3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/deployment/deploymentModel1.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel1.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/deployment/deploymentModel1.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel1.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/deployment/deploymentModel1v3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel1v3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/deployment/deploymentModel1v3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel1v3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/deployment/deploymentModel2.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel2.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/deployment/deploymentModel2.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel2.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/deployment/deploymentModel2v3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel2v3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/deployment/deploymentModel2v3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel2v3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/deployment/deploymentModel3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/deployment/deploymentModel3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/deployment/deploymentModel3v3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel3v3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/deployment/deploymentModel3v3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/deployment/deploymentModel3v3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/flowchart/flowchartModel1a.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel1a.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/flowchart/flowchartModel1a.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel1a.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/flowchart/flowchartModel1av3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel1av3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/flowchart/flowchartModel1av3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel1av3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/flowchart/flowchartModel1b.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel1b.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/flowchart/flowchartModel1b.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel1b.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/flowchart/flowchartModel1bv3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel1bv3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/flowchart/flowchartModel1bv3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel1bv3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/flowchart/flowchartModel2.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel2.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/flowchart/flowchartModel2.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel2.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/flowchart/flowchartModel2v3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel2v3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/flowchart/flowchartModel2v3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/flowchart/flowchartModel2v3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/object/objectModel1.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/object/objectModel1.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/object/objectModel1.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/object/objectModel1.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/object/objectModel1v3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/object/objectModel1v3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/object/objectModel1v3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/object/objectModel1v3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/object/objectModel2.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/object/objectModel2.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/object/objectModel2.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/object/objectModel2.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/object/objectModel2v3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/object/objectModel2v3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/object/objectModel2v3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/object/objectModel2v3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/petrinet/petriNetModel1a.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel1a.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/petrinet/petriNetModel1a.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel1a.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/petrinet/petriNetModel1av3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel1av3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/petrinet/petriNetModel1av3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel1av3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/petrinet/petriNetModel1b.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel1b.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/petrinet/petriNetModel1b.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel1b.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/petrinet/petriNetModel1bv3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel1bv3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/petrinet/petriNetModel1bv3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel1bv3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/petrinet/petriNetModel2.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel2.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/petrinet/petriNetModel2.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel2.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/petrinet/petriNetModel2v3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel2v3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/petrinet/petriNetModel2v3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/petrinet/petriNetModel2v3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/syntaxtree/syntaxTreeModel1a.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel1a.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/syntaxtree/syntaxTreeModel1a.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel1a.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/syntaxtree/syntaxTreeModel1av3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel1av3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/syntaxtree/syntaxTreeModel1av3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel1av3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/syntaxtree/syntaxTreeModel1b.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel1b.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/syntaxtree/syntaxTreeModel1b.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel1b.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/syntaxtree/syntaxTreeModel1bv3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel1bv3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/syntaxtree/syntaxTreeModel1bv3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel1bv3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/syntaxtree/syntaxTreeModel2.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel2.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/syntaxtree/syntaxTreeModel2.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel2.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/syntaxtree/syntaxTreeModel2v3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel2v3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/syntaxtree/syntaxTreeModel2v3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/syntaxtree/syntaxTreeModel2v3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/usecase/useCaseModel1.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/usecase/useCaseModel1.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/usecase/useCaseModel1.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/usecase/useCaseModel1.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/usecase/useCaseModel1v3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/usecase/useCaseModel1v3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/usecase/useCaseModel1v3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/usecase/useCaseModel1v3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/usecase/useCaseModel2.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/usecase/useCaseModel2.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/usecase/useCaseModel2.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/usecase/useCaseModel2.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/usecase/useCaseModel2v3.json b/src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/usecase/useCaseModel2v3.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/modelingexercise/compass/umlmodel/usecase/useCaseModel2v3.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/modeling/compass/umlmodel/usecase/useCaseModel2v3.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/programmingexercise/gitlabPushEventRequest.json b/src/test/resources/de/tum/in/www1/artemis/exercise/programming/gitlabPushEventRequest.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/programmingexercise/gitlabPushEventRequest.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/programming/gitlabPushEventRequest.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/programmingexercise/gitlabPushEventRequestWithoutCommit.json b/src/test/resources/de/tum/in/www1/artemis/exercise/programming/gitlabPushEventRequestWithoutCommit.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/programmingexercise/gitlabPushEventRequestWithoutCommit.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/programming/gitlabPushEventRequestWithoutCommit.json
diff --git a/src/test/resources/de/tum/in/www1/artemis/exercise/programmingexercise/gitlabPushEventRequestWrongCommitOrder.json b/src/test/resources/de/tum/in/www1/artemis/exercise/programming/gitlabPushEventRequestWrongCommitOrder.json
similarity index 100%
rename from src/test/resources/de/tum/in/www1/artemis/exercise/programmingexercise/gitlabPushEventRequestWrongCommitOrder.json
rename to src/test/resources/de/tum/in/www1/artemis/exercise/programming/gitlabPushEventRequestWrongCommitOrder.json