diff --git a/src/main/java/mops/gruppen2/controller/APIController.java b/src/main/java/mops/gruppen2/controller/APIController.java
index 9971d78..e52fb80 100644
--- a/src/main/java/mops/gruppen2/controller/APIController.java
+++ b/src/main/java/mops/gruppen2/controller/APIController.java
@@ -3,10 +3,10 @@ package mops.gruppen2.controller;
 
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import mops.gruppen2.domain.Exceptions.EventException;
 import mops.gruppen2.domain.Group;
-import mops.gruppen2.domain.apiWrapper.UpdatedGroupRequestMapper;
+import mops.gruppen2.domain.api.GroupRequestWrapper;
 import mops.gruppen2.domain.event.Event;
+import mops.gruppen2.domain.exception.EventException;
 import mops.gruppen2.service.APIFormatterService;
 import mops.gruppen2.service.EventService;
 import mops.gruppen2.service.GroupService;
@@ -36,10 +36,10 @@ public class APIController {
     @GetMapping("/updateGroups/{status}")
     @Secured("ROLE_api_user")
     @ApiOperation("Gibt alle Gruppen zurück in denen sich etwas geändert hat")
-    public UpdatedGroupRequestMapper updateGroup(@ApiParam("Letzter Status des Anfragestellers") @PathVariable Long status) throws EventException {
+    public GroupRequestWrapper updateGroup(@ApiParam("Letzter Status des Anfragestellers") @PathVariable Long status) throws EventException {
         List<Event> events = eventService.getNewEvents(status);
 
-        return APIFormatterService.wrapp(eventService.getMaxEvent_id(), groupService.projectEventList(events));
+        return APIFormatterService.wrap(eventService.getMaxEvent_id(), groupService.projectEventList(events));
     }
 
     @GetMapping("/getGroupIdsOfUser/{teilnehmer}")
diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
index a2b5ae7..8d05649 100644
--- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
+++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
@@ -1,10 +1,10 @@
 package mops.gruppen2.controller;
 
 import mops.gruppen2.config.Gruppen2Config;
-import mops.gruppen2.domain.Exceptions.EventException;
 import mops.gruppen2.domain.Group;
 import mops.gruppen2.domain.Role;
 import mops.gruppen2.domain.User;
+import mops.gruppen2.domain.exception.EventException;
 import mops.gruppen2.security.Account;
 import mops.gruppen2.service.ControllerService;
 import mops.gruppen2.service.CsvService;
diff --git a/src/main/java/mops/gruppen2/domain/apiWrapper/UpdatedGroupRequestMapper.java b/src/main/java/mops/gruppen2/domain/api/GroupRequestWrapper.java
similarity index 56%
rename from src/main/java/mops/gruppen2/domain/apiWrapper/UpdatedGroupRequestMapper.java
rename to src/main/java/mops/gruppen2/domain/api/GroupRequestWrapper.java
index dba6f39..0cccda5 100644
--- a/src/main/java/mops/gruppen2/domain/apiWrapper/UpdatedGroupRequestMapper.java
+++ b/src/main/java/mops/gruppen2/domain/api/GroupRequestWrapper.java
@@ -1,12 +1,15 @@
-package mops.gruppen2.domain.apiWrapper;
+package mops.gruppen2.domain.api;
 
 import lombok.AllArgsConstructor;
 import mops.gruppen2.domain.Group;
 
 import java.util.List;
 
+/**
+ * Kombiniert den Status und die Gruppenliste zur ausgabe über die API
+ */
 @AllArgsConstructor
-public class UpdatedGroupRequestMapper {
+public class GroupRequestWrapper {
 
     private final Long status;
     private final List<Group> groupList;
diff --git a/src/main/java/mops/gruppen2/domain/event/AddUserEvent.java b/src/main/java/mops/gruppen2/domain/event/AddUserEvent.java
index 83f2698..8432889 100644
--- a/src/main/java/mops/gruppen2/domain/event/AddUserEvent.java
+++ b/src/main/java/mops/gruppen2/domain/event/AddUserEvent.java
@@ -3,11 +3,11 @@ package mops.gruppen2.domain.event;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import mops.gruppen2.domain.Exceptions.EventException;
-import mops.gruppen2.domain.Exceptions.UserAlreadyExistsException;
 import mops.gruppen2.domain.Group;
 import mops.gruppen2.domain.Role;
 import mops.gruppen2.domain.User;
+import mops.gruppen2.domain.exception.EventException;
+import mops.gruppen2.domain.exception.UserAlreadyExistsException;
 
 /**
  * Fügt einen einzelnen Nutzer einer Gruppe hinzu.
diff --git a/src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java b/src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java
index ba444eb..df3971a 100644
--- a/src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java
+++ b/src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java
@@ -2,10 +2,10 @@ package mops.gruppen2.domain.event;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import mops.gruppen2.domain.Exceptions.EventException;
-import mops.gruppen2.domain.Exceptions.UserNotFoundException;
 import mops.gruppen2.domain.Group;
 import mops.gruppen2.domain.User;
+import mops.gruppen2.domain.exception.EventException;
+import mops.gruppen2.domain.exception.UserNotFoundException;
 
 /**
  * Entfernt ein einzelnes Mitglied einer Gruppe.
diff --git a/src/main/java/mops/gruppen2/domain/event/Event.java b/src/main/java/mops/gruppen2/domain/event/Event.java
index 37e226a..3b75d6b 100644
--- a/src/main/java/mops/gruppen2/domain/event/Event.java
+++ b/src/main/java/mops/gruppen2/domain/event/Event.java
@@ -5,8 +5,8 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import mops.gruppen2.domain.Exceptions.EventException;
 import mops.gruppen2.domain.Group;
+import mops.gruppen2.domain.exception.EventException;
 
 
 @JsonTypeInfo(
diff --git a/src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java b/src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java
index 795c79d..1ac72d8 100644
--- a/src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java
+++ b/src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java
@@ -3,9 +3,9 @@ package mops.gruppen2.domain.event;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import mops.gruppen2.domain.Exceptions.UserNotFoundException;
 import mops.gruppen2.domain.Group;
 import mops.gruppen2.domain.Role;
+import mops.gruppen2.domain.exception.UserNotFoundException;
 
 /**
  * Aktualisiert die Gruppenrolle eines Teilnehmers.
diff --git a/src/main/java/mops/gruppen2/domain/Exceptions/EventException.java b/src/main/java/mops/gruppen2/domain/exception/EventException.java
similarity index 84%
rename from src/main/java/mops/gruppen2/domain/Exceptions/EventException.java
rename to src/main/java/mops/gruppen2/domain/exception/EventException.java
index 893accc..96e974d 100644
--- a/src/main/java/mops/gruppen2/domain/Exceptions/EventException.java
+++ b/src/main/java/mops/gruppen2/domain/exception/EventException.java
@@ -1,4 +1,4 @@
-package mops.gruppen2.domain.Exceptions;
+package mops.gruppen2.domain.exception;
 
 public class EventException extends Exception {
 
diff --git a/src/main/java/mops/gruppen2/domain/Exceptions/UserAlreadyExistsException.java b/src/main/java/mops/gruppen2/domain/exception/UserAlreadyExistsException.java
similarity index 78%
rename from src/main/java/mops/gruppen2/domain/Exceptions/UserAlreadyExistsException.java
rename to src/main/java/mops/gruppen2/domain/exception/UserAlreadyExistsException.java
index 6aae039..d189424 100644
--- a/src/main/java/mops/gruppen2/domain/Exceptions/UserAlreadyExistsException.java
+++ b/src/main/java/mops/gruppen2/domain/exception/UserAlreadyExistsException.java
@@ -1,4 +1,4 @@
-package mops.gruppen2.domain.Exceptions;
+package mops.gruppen2.domain.exception;
 
 public class UserAlreadyExistsException extends EventException {
 
diff --git a/src/main/java/mops/gruppen2/domain/Exceptions/UserNotFoundException.java b/src/main/java/mops/gruppen2/domain/exception/UserNotFoundException.java
similarity index 76%
rename from src/main/java/mops/gruppen2/domain/Exceptions/UserNotFoundException.java
rename to src/main/java/mops/gruppen2/domain/exception/UserNotFoundException.java
index ac5fc2e..84a434e 100644
--- a/src/main/java/mops/gruppen2/domain/Exceptions/UserNotFoundException.java
+++ b/src/main/java/mops/gruppen2/domain/exception/UserNotFoundException.java
@@ -1,4 +1,4 @@
-package mops.gruppen2.domain.Exceptions;
+package mops.gruppen2.domain.exception;
 
 public class UserNotFoundException extends EventException {
 
diff --git a/src/main/java/mops/gruppen2/service/APIFormatterService.java b/src/main/java/mops/gruppen2/service/APIFormatterService.java
index ee9d376..ea72a8c 100644
--- a/src/main/java/mops/gruppen2/service/APIFormatterService.java
+++ b/src/main/java/mops/gruppen2/service/APIFormatterService.java
@@ -1,7 +1,7 @@
 package mops.gruppen2.service;
 
 import mops.gruppen2.domain.Group;
-import mops.gruppen2.domain.apiWrapper.UpdatedGroupRequestMapper;
+import mops.gruppen2.domain.api.GroupRequestWrapper;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -9,7 +9,7 @@ import java.util.List;
 @Service
 public class APIFormatterService {
 
-    static public UpdatedGroupRequestMapper wrapp(Long status, List<Group> groupList) {
-        return new UpdatedGroupRequestMapper(status, groupList);
+    static public GroupRequestWrapper wrap(Long status, List<Group> groupList) {
+        return new GroupRequestWrapper(status, groupList);
     }
 }
diff --git a/src/main/java/mops/gruppen2/service/ControllerService.java b/src/main/java/mops/gruppen2/service/ControllerService.java
index c38455e..5df58cb 100644
--- a/src/main/java/mops/gruppen2/service/ControllerService.java
+++ b/src/main/java/mops/gruppen2/service/ControllerService.java
@@ -1,6 +1,5 @@
 package mops.gruppen2.service;
 
-import mops.gruppen2.domain.Exceptions.EventException;
 import mops.gruppen2.domain.Group;
 import mops.gruppen2.domain.GroupType;
 import mops.gruppen2.domain.Role;
@@ -13,6 +12,7 @@ import mops.gruppen2.domain.event.DeleteUserEvent;
 import mops.gruppen2.domain.event.UpdateGroupDescriptionEvent;
 import mops.gruppen2.domain.event.UpdateGroupTitleEvent;
 import mops.gruppen2.domain.event.UpdateRoleEvent;
+import mops.gruppen2.domain.exception.EventException;
 import mops.gruppen2.security.Account;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/mops/gruppen2/service/GroupService.java b/src/main/java/mops/gruppen2/service/GroupService.java
index b741cac..15244c9 100644
--- a/src/main/java/mops/gruppen2/service/GroupService.java
+++ b/src/main/java/mops/gruppen2/service/GroupService.java
@@ -1,9 +1,9 @@
 package mops.gruppen2.service;
 
-import mops.gruppen2.domain.Exceptions.EventException;
 import mops.gruppen2.domain.Group;
 import mops.gruppen2.domain.dto.EventDTO;
 import mops.gruppen2.domain.event.Event;
+import mops.gruppen2.domain.exception.EventException;
 import mops.gruppen2.repository.EventRepository;
 import mops.gruppen2.security.Account;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/mops/gruppen2/service/UserService.java b/src/main/java/mops/gruppen2/service/UserService.java
index df969a3..7d58320 100644
--- a/src/main/java/mops/gruppen2/service/UserService.java
+++ b/src/main/java/mops/gruppen2/service/UserService.java
@@ -1,9 +1,9 @@
 package mops.gruppen2.service;
 
-import mops.gruppen2.domain.Exceptions.EventException;
 import mops.gruppen2.domain.Group;
 import mops.gruppen2.domain.User;
 import mops.gruppen2.domain.event.Event;
+import mops.gruppen2.domain.exception.EventException;
 import mops.gruppen2.repository.EventRepository;
 import org.springframework.stereotype.Service;
 
diff --git a/src/test/java/mops/gruppen2/domain/GroupTest.java b/src/test/java/mops/gruppen2/domain/GroupTest.java
index 1f3cba3..2c7e475 100644
--- a/src/test/java/mops/gruppen2/domain/GroupTest.java
+++ b/src/test/java/mops/gruppen2/domain/GroupTest.java
@@ -1,18 +1,5 @@
 package mops.gruppen2.domain;
 
-import mops.gruppen2.domain.Exceptions.UserAlreadyExistsException;
-import mops.gruppen2.domain.Exceptions.UserNotFoundException;
-import mops.gruppen2.domain.event.*;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
-
 class GroupTest {
 /*
     @BeforeEach
diff --git a/src/test/java/mops/gruppen2/domain/event/AddUserEventTest.java b/src/test/java/mops/gruppen2/domain/event/AddUserEventTest.java
index 649166f..a21e824 100644
--- a/src/test/java/mops/gruppen2/domain/event/AddUserEventTest.java
+++ b/src/test/java/mops/gruppen2/domain/event/AddUserEventTest.java
@@ -1,14 +1,13 @@
 package mops.gruppen2.domain.event;
 
-import mops.gruppen2.domain.Exceptions.EventException;
-import mops.gruppen2.domain.Exceptions.UserAlreadyExistsException;
 import mops.gruppen2.domain.Group;
 import mops.gruppen2.domain.User;
+import mops.gruppen2.domain.exception.EventException;
+import mops.gruppen2.domain.exception.UserAlreadyExistsException;
 import org.junit.jupiter.api.Test;
 
-import static mops.gruppen2.domain.Role.MEMBER;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class AddUserEventTest {
 
@@ -32,4 +31,4 @@ class AddUserEventTest {
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/mops/gruppen2/domain/event/DeleteUserEventTest.java b/src/test/java/mops/gruppen2/domain/event/DeleteUserEventTest.java
index 6f3c67a..e79b53c 100644
--- a/src/test/java/mops/gruppen2/domain/event/DeleteUserEventTest.java
+++ b/src/test/java/mops/gruppen2/domain/event/DeleteUserEventTest.java
@@ -1,15 +1,14 @@
 package mops.gruppen2.domain.event;
 
-import mops.gruppen2.domain.Exceptions.EventException;
-import mops.gruppen2.domain.Exceptions.UserAlreadyExistsException;
-import mops.gruppen2.domain.Exceptions.UserNotFoundException;
 import mops.gruppen2.domain.Group;
 import mops.gruppen2.domain.User;
+import mops.gruppen2.domain.exception.EventException;
+import mops.gruppen2.domain.exception.UserNotFoundException;
 import org.junit.jupiter.api.Test;
 
 import static mops.gruppen2.domain.Role.MEMBER;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class DeleteUserEventTest {
 
@@ -53,4 +52,4 @@ class DeleteUserEventTest {
 
         assertThat(group.getMembers().size()).isEqualTo(1);
     }
-}
\ No newline at end of file
+}