diff --git a/backend/src/main/java/org/raddatz/familienarchiv/config/SecurityConfig.java b/backend/src/main/java/org/raddatz/familienarchiv/config/SecurityConfig.java
index 60745045..0db16f15 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/config/SecurityConfig.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/config/SecurityConfig.java
@@ -2,7 +2,7 @@ package org.raddatz.familienarchiv.config;
 
 import lombok.RequiredArgsConstructor;
 
-import org.raddatz.familienarchiv.service.CustomUserDetailsService;
+import org.raddatz.familienarchiv.user.CustomUserDetailsService;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dashboard/DashboardController.java b/backend/src/main/java/org/raddatz/familienarchiv/dashboard/DashboardController.java
index 9c942b43..c6c9d265 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/dashboard/DashboardController.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/dashboard/DashboardController.java
@@ -8,7 +8,7 @@ import org.raddatz.familienarchiv.audit.AuditKind;
 import org.raddatz.familienarchiv.security.Permission;
 import org.raddatz.familienarchiv.security.RequirePermission;
 import org.raddatz.familienarchiv.security.SecurityUtils;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.UserService;
 import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dashboard/DashboardService.java b/backend/src/main/java/org/raddatz/familienarchiv/dashboard/DashboardService.java
index ba44e99a..3b1300fd 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/dashboard/DashboardService.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/dashboard/DashboardService.java
@@ -7,14 +7,14 @@ import org.raddatz.familienarchiv.audit.ActivityFeedRow;
 import org.raddatz.familienarchiv.audit.AuditKind;
 import org.raddatz.familienarchiv.audit.AuditLogQueryService;
 import org.raddatz.familienarchiv.audit.PulseStatsRow;
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.raddatz.familienarchiv.document.Document;
 import org.raddatz.familienarchiv.person.Person;
 import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock;
 import org.raddatz.familienarchiv.document.comment.CommentService;
 import org.raddatz.familienarchiv.document.DocumentService;
 import org.raddatz.familienarchiv.document.transcription.TranscriptionService;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.UserService;
 import org.springframework.stereotype.Service;
 
 import java.time.DayOfWeek;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/BackfillResult.java b/backend/src/main/java/org/raddatz/familienarchiv/document/BackfillResult.java
similarity index 77%
rename from backend/src/main/java/org/raddatz/familienarchiv/dto/BackfillResult.java
rename to backend/src/main/java/org/raddatz/familienarchiv/document/BackfillResult.java
index 3178d68e..e2281938 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/dto/BackfillResult.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/document/BackfillResult.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.dto;
+package org.raddatz.familienarchiv.document;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/BatchMetadataRequest.java b/backend/src/main/java/org/raddatz/familienarchiv/document/BatchMetadataRequest.java
similarity index 82%
rename from backend/src/main/java/org/raddatz/familienarchiv/dto/BatchMetadataRequest.java
rename to backend/src/main/java/org/raddatz/familienarchiv/document/BatchMetadataRequest.java
index 47bc489b..faa32ba1 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/dto/BatchMetadataRequest.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/document/BatchMetadataRequest.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.dto;
+package org.raddatz.familienarchiv.document;
 
 import java.util.List;
 import java.util.UUID;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/BulkEditError.java b/backend/src/main/java/org/raddatz/familienarchiv/document/BulkEditError.java
similarity index 85%
rename from backend/src/main/java/org/raddatz/familienarchiv/dto/BulkEditError.java
rename to backend/src/main/java/org/raddatz/familienarchiv/document/BulkEditError.java
index 2bde3fdd..6cecf69f 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/dto/BulkEditError.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/document/BulkEditError.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.dto;
+package org.raddatz.familienarchiv.document;
 
 import java.util.UUID;
 
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/BulkEditResult.java b/backend/src/main/java/org/raddatz/familienarchiv/document/BulkEditResult.java
similarity index 85%
rename from backend/src/main/java/org/raddatz/familienarchiv/dto/BulkEditResult.java
rename to backend/src/main/java/org/raddatz/familienarchiv/document/BulkEditResult.java
index af8608b1..bf4a6c6e 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/dto/BulkEditResult.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/document/BulkEditResult.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.dto;
+package org.raddatz.familienarchiv.document;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/document/DocumentController.java b/backend/src/main/java/org/raddatz/familienarchiv/document/DocumentController.java
index 41254ca8..640df62a 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/document/DocumentController.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/document/DocumentController.java
@@ -20,9 +20,9 @@ import jakarta.validation.constraints.Min;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.validation.annotation.Validated;
-import org.raddatz.familienarchiv.dto.BatchMetadataRequest;
-import org.raddatz.familienarchiv.dto.BulkEditError;
-import org.raddatz.familienarchiv.dto.BulkEditResult;
+import org.raddatz.familienarchiv.document.BatchMetadataRequest;
+import org.raddatz.familienarchiv.document.BulkEditError;
+import org.raddatz.familienarchiv.document.BulkEditResult;
 import org.raddatz.familienarchiv.document.DocumentBatchMetadataDTO;
 import org.raddatz.familienarchiv.document.DocumentBatchSummary;
 import org.raddatz.familienarchiv.document.DocumentBulkEditDTO;
@@ -38,14 +38,14 @@ import org.raddatz.familienarchiv.document.DocumentSort;
 import org.raddatz.familienarchiv.document.DocumentStatus;
 import org.raddatz.familienarchiv.ocr.TrainingLabel;
 import org.raddatz.familienarchiv.document.DocumentVersion;
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.raddatz.familienarchiv.security.Permission;
 import org.raddatz.familienarchiv.security.RequirePermission;
 import org.raddatz.familienarchiv.security.SecurityUtils;
 import org.raddatz.familienarchiv.document.DocumentService;
 import org.raddatz.familienarchiv.document.DocumentVersionService;
 import org.raddatz.familienarchiv.service.FileService;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.UserService;
 import org.springframework.data.domain.Sort;
 import org.springframework.security.core.Authentication;
 import org.springframework.http.HttpHeaders;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/document/DocumentVersionService.java b/backend/src/main/java/org/raddatz/familienarchiv/document/DocumentVersionService.java
index 03b3897a..94f85dd9 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/document/DocumentVersionService.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/document/DocumentVersionService.java
@@ -7,8 +7,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.raddatz.familienarchiv.document.DocumentVersionSummary;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.exception.ErrorCode;
-import org.raddatz.familienarchiv.model.AppUser;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.AppUser;
+import org.raddatz.familienarchiv.user.UserService;
 import org.raddatz.familienarchiv.document.Document;
 import org.raddatz.familienarchiv.document.DocumentVersion;
 import org.raddatz.familienarchiv.person.Person;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/document/annotation/AnnotationController.java b/backend/src/main/java/org/raddatz/familienarchiv/document/annotation/AnnotationController.java
index a64ecc33..6f4e377b 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/document/annotation/AnnotationController.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/document/annotation/AnnotationController.java
@@ -4,14 +4,14 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.raddatz.familienarchiv.document.annotation.CreateAnnotationDTO;
 import org.raddatz.familienarchiv.document.annotation.UpdateAnnotationDTO;
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.raddatz.familienarchiv.document.Document;
 import org.raddatz.familienarchiv.document.annotation.DocumentAnnotation;
 import org.raddatz.familienarchiv.security.Permission;
 import org.raddatz.familienarchiv.security.RequirePermission;
 import org.raddatz.familienarchiv.document.annotation.AnnotationService;
 import org.raddatz.familienarchiv.document.DocumentService;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.UserService;
 import jakarta.validation.Valid;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.Authentication;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/document/comment/CommentController.java b/backend/src/main/java/org/raddatz/familienarchiv/document/comment/CommentController.java
index 130f5ade..8efd25b8 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/document/comment/CommentController.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/document/comment/CommentController.java
@@ -3,12 +3,12 @@ package org.raddatz.familienarchiv.document.comment;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.raddatz.familienarchiv.document.comment.CreateCommentDTO;
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.raddatz.familienarchiv.document.comment.DocumentComment;
 import org.raddatz.familienarchiv.security.Permission;
 import org.raddatz.familienarchiv.security.RequirePermission;
 import org.raddatz.familienarchiv.document.comment.CommentService;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.UserService;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.*;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/document/comment/CommentService.java b/backend/src/main/java/org/raddatz/familienarchiv/document/comment/CommentService.java
index 50ff734f..33af36ce 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/document/comment/CommentService.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/document/comment/CommentService.java
@@ -5,10 +5,10 @@ import org.raddatz.familienarchiv.audit.AuditKind;
 import org.raddatz.familienarchiv.audit.AuditService;
 import org.raddatz.familienarchiv.document.transcription.MentionDTO;
 import org.raddatz.familienarchiv.document.transcription.TranscriptionService;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.UserService;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.exception.ErrorCode;
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.raddatz.familienarchiv.document.comment.DocumentComment;
 import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock;
 import org.raddatz.familienarchiv.document.comment.CommentRepository;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/document/comment/DocumentComment.java b/backend/src/main/java/org/raddatz/familienarchiv/document/comment/DocumentComment.java
index badd0e2b..b16ac667 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/document/comment/DocumentComment.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/document/comment/DocumentComment.java
@@ -7,7 +7,7 @@ import lombok.*;
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.UpdateTimestamp;
 import org.raddatz.familienarchiv.document.transcription.MentionDTO;
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AppUser;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/repository/CompletionStatsRow.java b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/CompletionStatsRow.java
similarity index 68%
rename from backend/src/main/java/org/raddatz/familienarchiv/repository/CompletionStatsRow.java
rename to backend/src/main/java/org/raddatz/familienarchiv/document/transcription/CompletionStatsRow.java
index f1680df5..638dab35 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/repository/CompletionStatsRow.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/CompletionStatsRow.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.repository;
+package org.raddatz.familienarchiv.document.transcription;
 
 import java.util.UUID;
 
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockController.java b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockController.java
index 9ea2e0ee..0a2240a4 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockController.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockController.java
@@ -12,7 +12,7 @@ import org.raddatz.familienarchiv.security.Permission;
 import org.raddatz.familienarchiv.security.RequirePermission;
 import org.raddatz.familienarchiv.security.SecurityUtils;
 import org.raddatz.familienarchiv.document.transcription.TranscriptionService;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.UserService;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.*;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockQueryService.java b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockQueryService.java
index e71666e5..3daa2544 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockQueryService.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockQueryService.java
@@ -2,7 +2,7 @@ package org.raddatz.familienarchiv.document.transcription;
 
 import lombok.RequiredArgsConstructor;
 import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock;
-import org.raddatz.familienarchiv.repository.CompletionStatsRow;
+import org.raddatz.familienarchiv.document.transcription.CompletionStatsRow;
 import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockRepository;
 import org.springframework.stereotype.Service;
 
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockRepository.java b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockRepository.java
index dbb89bda..4da9ee8e 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockRepository.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockRepository.java
@@ -1,7 +1,7 @@
 package org.raddatz.familienarchiv.document.transcription;
 
 import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock;
-import org.raddatz.familienarchiv.repository.CompletionStatsRow;
+import org.raddatz.familienarchiv.document.transcription.CompletionStatsRow;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/geschichte/Geschichte.java b/backend/src/main/java/org/raddatz/familienarchiv/geschichte/Geschichte.java
index e7be603f..a50679f2 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/geschichte/Geschichte.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/geschichte/Geschichte.java
@@ -6,7 +6,7 @@ import lombok.*;
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.UpdateTimestamp;
 
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.raddatz.familienarchiv.document.Document;
 import org.raddatz.familienarchiv.person.Person;
 import java.time.LocalDateTime;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/geschichte/GeschichteService.java b/backend/src/main/java/org/raddatz/familienarchiv/geschichte/GeschichteService.java
index 28d11e16..d6d38048 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/geschichte/GeschichteService.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/geschichte/GeschichteService.java
@@ -7,7 +7,7 @@ import org.owasp.html.PolicyFactory;
 import org.raddatz.familienarchiv.geschichte.GeschichteUpdateDTO;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.exception.ErrorCode;
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.raddatz.familienarchiv.document.Document;
 import org.raddatz.familienarchiv.geschichte.Geschichte;
 import org.raddatz.familienarchiv.geschichte.GeschichteStatus;
@@ -17,7 +17,7 @@ import org.raddatz.familienarchiv.geschichte.GeschichteSpecifications;
 import org.raddatz.familienarchiv.security.Permission;
 import org.raddatz.familienarchiv.document.DocumentService;
 import org.raddatz.familienarchiv.person.PersonService;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.UserService;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.security.core.Authentication;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/notification/Notification.java b/backend/src/main/java/org/raddatz/familienarchiv/notification/Notification.java
index 1f7ea56a..fe0649e3 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/notification/Notification.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/notification/Notification.java
@@ -5,7 +5,7 @@ import jakarta.persistence.*;
 import lombok.*;
 import org.hibernate.annotations.CreationTimestamp;
 
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AppUser;
 import java.time.LocalDateTime;
 import java.util.UUID;
 
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/notification/NotificationController.java b/backend/src/main/java/org/raddatz/familienarchiv/notification/NotificationController.java
index ddcf4b8b..88310296 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/notification/NotificationController.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/notification/NotificationController.java
@@ -6,13 +6,13 @@ import lombok.RequiredArgsConstructor;
 import io.swagger.v3.oas.annotations.Parameter;
 import org.raddatz.familienarchiv.notification.NotificationDTO;
 import org.raddatz.familienarchiv.notification.NotificationPreferenceDTO;
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.raddatz.familienarchiv.notification.NotificationType;
 import org.raddatz.familienarchiv.security.Permission;
 import org.raddatz.familienarchiv.security.RequirePermission;
 import org.raddatz.familienarchiv.notification.NotificationService;
 import org.raddatz.familienarchiv.service.SseEmitterRegistry;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.UserService;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/notification/NotificationService.java b/backend/src/main/java/org/raddatz/familienarchiv/notification/NotificationService.java
index f0df3e26..db6e0e8c 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/notification/NotificationService.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/notification/NotificationService.java
@@ -5,11 +5,11 @@ import lombok.extern.slf4j.Slf4j;
 import org.raddatz.familienarchiv.notification.NotificationDTO;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.exception.ErrorCode;
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.raddatz.familienarchiv.document.comment.DocumentComment;
 import org.raddatz.familienarchiv.document.DocumentService;
 import org.raddatz.familienarchiv.service.SseEmitterRegistry;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.UserService;
 import org.raddatz.familienarchiv.notification.Notification;
 import org.raddatz.familienarchiv.notification.NotificationType;
 import org.raddatz.familienarchiv.notification.NotificationRepository;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrController.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrController.java
index 0e0ca7c6..e93948c4 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrController.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrController.java
@@ -8,7 +8,7 @@ import org.raddatz.familienarchiv.ocr.TrainingHistoryResponse;
 import org.raddatz.familienarchiv.ocr.TrainingInfoResponse;
 import org.raddatz.familienarchiv.ocr.TriggerOcrDTO;
 import org.raddatz.familienarchiv.ocr.TriggerSenderTrainingDTO;
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.raddatz.familienarchiv.ocr.OcrJob;
 import org.raddatz.familienarchiv.ocr.OcrTrainingRun;
 import org.raddatz.familienarchiv.security.Permission;
@@ -20,7 +20,7 @@ import org.raddatz.familienarchiv.ocr.OcrTrainingService;
 import org.raddatz.familienarchiv.ocr.SegmentationTrainingExportService;
 import org.raddatz.familienarchiv.ocr.SenderModelService;
 import org.raddatz.familienarchiv.ocr.TrainingDataExportService;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.UserService;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/person/Person.java b/backend/src/main/java/org/raddatz/familienarchiv/person/Person.java
index 4068d74d..b3ad7b0d 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/person/Person.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/person/Person.java
@@ -5,7 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.*;
 import lombok.*;
 
-import org.raddatz.familienarchiv.model.DisplayNameFormatter;
+import org.raddatz.familienarchiv.user.DisplayNameFormatter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/person/PersonSummaryDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/person/PersonSummaryDTO.java
index 11f12b21..68cbbe1b 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/person/PersonSummaryDTO.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/person/PersonSummaryDTO.java
@@ -21,7 +21,7 @@ public interface PersonSummaryDTO {
     long getDocumentCount();
 
     default String getDisplayName() {
-        return org.raddatz.familienarchiv.model.DisplayNameFormatter.format(
+        return org.raddatz.familienarchiv.user.DisplayNameFormatter.format(
                 getTitle(), getFirstName(), getLastName());
     }
 }
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/security/SecurityUtils.java b/backend/src/main/java/org/raddatz/familienarchiv/security/SecurityUtils.java
index dd5dceb7..9a3a729d 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/security/SecurityUtils.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/security/SecurityUtils.java
@@ -1,8 +1,8 @@
 package org.raddatz.familienarchiv.security;
 
 import org.raddatz.familienarchiv.exception.DomainException;
-import org.raddatz.familienarchiv.model.AppUser;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.AppUser;
+import org.raddatz.familienarchiv.user.UserService;
 import org.springframework.security.core.Authentication;
 
 import java.util.UUID;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/controller/AdminController.java b/backend/src/main/java/org/raddatz/familienarchiv/user/AdminController.java
similarity index 96%
rename from backend/src/main/java/org/raddatz/familienarchiv/controller/AdminController.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/AdminController.java
index c9aaa5a0..562be7f9 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/controller/AdminController.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/AdminController.java
@@ -1,6 +1,6 @@
-package org.raddatz.familienarchiv.controller;
+package org.raddatz.familienarchiv.user;
 
-import org.raddatz.familienarchiv.dto.BackfillResult;
+import org.raddatz.familienarchiv.document.BackfillResult;
 import org.raddatz.familienarchiv.security.Permission;
 import org.raddatz.familienarchiv.security.RequirePermission;
 import org.raddatz.familienarchiv.document.DocumentService;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/AdminUpdateUserRequest.java b/backend/src/main/java/org/raddatz/familienarchiv/user/AdminUpdateUserRequest.java
similarity index 89%
rename from backend/src/main/java/org/raddatz/familienarchiv/dto/AdminUpdateUserRequest.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/AdminUpdateUserRequest.java
index a92a8db2..9365a7b1 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/dto/AdminUpdateUserRequest.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/AdminUpdateUserRequest.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.dto;
+package org.raddatz.familienarchiv.user;
 
 import lombok.Data;
 
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/AppUser.java b/backend/src/main/java/org/raddatz/familienarchiv/user/AppUser.java
similarity index 97%
rename from backend/src/main/java/org/raddatz/familienarchiv/model/AppUser.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/AppUser.java
index b69d71bb..bfc0d525 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/model/AppUser.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/AppUser.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.model;
+package org.raddatz.familienarchiv.user;
 
 import jakarta.persistence.*;
 import jakarta.validation.constraints.Email;
@@ -7,7 +7,7 @@ import jakarta.validation.constraints.Pattern;
 import lombok.*;
 
 import org.hibernate.annotations.CreationTimestamp;
-import org.raddatz.familienarchiv.dto.CreateUserRequest;
+import org.raddatz.familienarchiv.user.CreateUserRequest;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/repository/AppUserRepository.java b/backend/src/main/java/org/raddatz/familienarchiv/user/AppUserRepository.java
similarity index 89%
rename from backend/src/main/java/org/raddatz/familienarchiv/repository/AppUserRepository.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/AppUserRepository.java
index 03d4674d..34db47d5 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/repository/AppUserRepository.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/AppUserRepository.java
@@ -1,6 +1,6 @@
-package org.raddatz.familienarchiv.repository;
+package org.raddatz.familienarchiv.user;
 
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/controller/AuthController.java b/backend/src/main/java/org/raddatz/familienarchiv/user/AuthController.java
similarity index 77%
rename from backend/src/main/java/org/raddatz/familienarchiv/controller/AuthController.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/AuthController.java
index 7ad891b1..3cd5d3f6 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/controller/AuthController.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/AuthController.java
@@ -1,14 +1,14 @@
-package org.raddatz.familienarchiv.controller;
+package org.raddatz.familienarchiv.user;
 
 import jakarta.validation.Valid;
-import org.raddatz.familienarchiv.dto.ForgotPasswordRequest;
-import org.raddatz.familienarchiv.dto.InvitePrefillDTO;
-import org.raddatz.familienarchiv.dto.RegisterRequest;
-import org.raddatz.familienarchiv.dto.ResetPasswordRequest;
-import org.raddatz.familienarchiv.model.AppUser;
-import org.raddatz.familienarchiv.model.InviteToken;
-import org.raddatz.familienarchiv.service.InviteService;
-import org.raddatz.familienarchiv.service.PasswordResetService;
+import org.raddatz.familienarchiv.user.ForgotPasswordRequest;
+import org.raddatz.familienarchiv.user.InvitePrefillDTO;
+import org.raddatz.familienarchiv.user.RegisterRequest;
+import org.raddatz.familienarchiv.user.ResetPasswordRequest;
+import org.raddatz.familienarchiv.user.AppUser;
+import org.raddatz.familienarchiv.user.InviteToken;
+import org.raddatz.familienarchiv.user.InviteService;
+import org.raddatz.familienarchiv.user.PasswordResetService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/controller/AuthE2EController.java b/backend/src/main/java/org/raddatz/familienarchiv/user/AuthE2EController.java
similarity index 91%
rename from backend/src/main/java/org/raddatz/familienarchiv/controller/AuthE2EController.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/AuthE2EController.java
index 7d37e441..2b802a0a 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/controller/AuthE2EController.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/AuthE2EController.java
@@ -1,8 +1,8 @@
-package org.raddatz.familienarchiv.controller;
+package org.raddatz.familienarchiv.user;
 
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
-import org.raddatz.familienarchiv.service.PasswordResetTestHelper;
+import org.raddatz.familienarchiv.user.PasswordResetTestHelper;
 import org.springframework.context.annotation.Profile;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/ChangePasswordDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/user/ChangePasswordDTO.java
similarity index 76%
rename from backend/src/main/java/org/raddatz/familienarchiv/dto/ChangePasswordDTO.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/ChangePasswordDTO.java
index 51a171e2..d3b221cc 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/dto/ChangePasswordDTO.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/ChangePasswordDTO.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.dto;
+package org.raddatz.familienarchiv.user;
 
 import lombok.Data;
 
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/CreateInviteRequest.java b/backend/src/main/java/org/raddatz/familienarchiv/user/CreateInviteRequest.java
similarity index 90%
rename from backend/src/main/java/org/raddatz/familienarchiv/dto/CreateInviteRequest.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/CreateInviteRequest.java
index 0a729db9..cdc225a8 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/dto/CreateInviteRequest.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/CreateInviteRequest.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.dto;
+package org.raddatz.familienarchiv.user;
 
 import lombok.Data;
 
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/CreateUserRequest.java b/backend/src/main/java/org/raddatz/familienarchiv/user/CreateUserRequest.java
similarity index 93%
rename from backend/src/main/java/org/raddatz/familienarchiv/dto/CreateUserRequest.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/CreateUserRequest.java
index a48ff565..d00c04c1 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/dto/CreateUserRequest.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/CreateUserRequest.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.dto;
+package org.raddatz.familienarchiv.user;
 
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/CustomUserDetailsService.java b/backend/src/main/java/org/raddatz/familienarchiv/user/CustomUserDetailsService.java
similarity index 92%
rename from backend/src/main/java/org/raddatz/familienarchiv/service/CustomUserDetailsService.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/CustomUserDetailsService.java
index 28377e70..a6284278 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/service/CustomUserDetailsService.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/CustomUserDetailsService.java
@@ -1,10 +1,10 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.user;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import org.raddatz.familienarchiv.model.AppUser;
-import org.raddatz.familienarchiv.repository.AppUserRepository;
+import org.raddatz.familienarchiv.user.AppUser;
+import org.raddatz.familienarchiv.user.AppUserRepository;
 import org.raddatz.familienarchiv.security.Permission;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.User;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/DisplayNameFormatter.java b/backend/src/main/java/org/raddatz/familienarchiv/user/DisplayNameFormatter.java
similarity index 89%
rename from backend/src/main/java/org/raddatz/familienarchiv/model/DisplayNameFormatter.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/DisplayNameFormatter.java
index 8ec42a85..d18cc67d 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/model/DisplayNameFormatter.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/DisplayNameFormatter.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.model;
+package org.raddatz.familienarchiv.user;
 
 public class DisplayNameFormatter {
 
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/ForgotPasswordRequest.java b/backend/src/main/java/org/raddatz/familienarchiv/user/ForgotPasswordRequest.java
similarity index 69%
rename from backend/src/main/java/org/raddatz/familienarchiv/dto/ForgotPasswordRequest.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/ForgotPasswordRequest.java
index 82e8dae2..8fe96c97 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/dto/ForgotPasswordRequest.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/ForgotPasswordRequest.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.dto;
+package org.raddatz.familienarchiv.user;
 
 import lombok.Data;
 
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/controller/GroupController.java b/backend/src/main/java/org/raddatz/familienarchiv/user/GroupController.java
similarity index 89%
rename from backend/src/main/java/org/raddatz/familienarchiv/controller/GroupController.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/GroupController.java
index 0b495e02..0c42a31c 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/controller/GroupController.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/GroupController.java
@@ -1,13 +1,13 @@
-package org.raddatz.familienarchiv.controller;
+package org.raddatz.familienarchiv.user;
 
 import java.util.List;
 import java.util.UUID;
 
-import org.raddatz.familienarchiv.dto.GroupDTO;
-import org.raddatz.familienarchiv.model.UserGroup;
+import org.raddatz.familienarchiv.user.GroupDTO;
+import org.raddatz.familienarchiv.user.UserGroup;
 import org.raddatz.familienarchiv.security.Permission;
 import org.raddatz.familienarchiv.security.RequirePermission;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.UserService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/GroupDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/user/GroupDTO.java
similarity index 80%
rename from backend/src/main/java/org/raddatz/familienarchiv/dto/GroupDTO.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/GroupDTO.java
index 46c9f161..4b4de57f 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/dto/GroupDTO.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/GroupDTO.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.dto;
+package org.raddatz.familienarchiv.user;
 
 import java.util.Set;
 
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/controller/InviteController.java b/backend/src/main/java/org/raddatz/familienarchiv/user/InviteController.java
similarity index 85%
rename from backend/src/main/java/org/raddatz/familienarchiv/controller/InviteController.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/InviteController.java
index e6dcbb6c..af502d78 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/controller/InviteController.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/InviteController.java
@@ -1,13 +1,13 @@
-package org.raddatz.familienarchiv.controller;
+package org.raddatz.familienarchiv.user;
 
 import lombok.RequiredArgsConstructor;
-import org.raddatz.familienarchiv.dto.CreateInviteRequest;
-import org.raddatz.familienarchiv.dto.InviteListItemDTO;
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.CreateInviteRequest;
+import org.raddatz.familienarchiv.user.InviteListItemDTO;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.raddatz.familienarchiv.security.Permission;
 import org.raddatz.familienarchiv.security.RequirePermission;
-import org.raddatz.familienarchiv.service.InviteService;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.InviteService;
+import org.raddatz.familienarchiv.user.UserService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/InviteListItemDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/user/InviteListItemDTO.java
similarity index 96%
rename from backend/src/main/java/org/raddatz/familienarchiv/dto/InviteListItemDTO.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/InviteListItemDTO.java
index 8983f698..4e0cd8a6 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/dto/InviteListItemDTO.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/InviteListItemDTO.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.dto;
+package org.raddatz.familienarchiv.user;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/InvitePrefillDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/user/InvitePrefillDTO.java
similarity index 92%
rename from backend/src/main/java/org/raddatz/familienarchiv/dto/InvitePrefillDTO.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/InvitePrefillDTO.java
index 1c76b011..0f2d2539 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/dto/InvitePrefillDTO.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/InvitePrefillDTO.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.dto;
+package org.raddatz.familienarchiv.user;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/InviteService.java b/backend/src/main/java/org/raddatz/familienarchiv/user/InviteService.java
similarity index 93%
rename from backend/src/main/java/org/raddatz/familienarchiv/service/InviteService.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/InviteService.java
index 79c19703..e1cedf02 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/service/InviteService.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/InviteService.java
@@ -1,16 +1,16 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.user;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.raddatz.familienarchiv.dto.CreateInviteRequest;
-import org.raddatz.familienarchiv.dto.InviteListItemDTO;
-import org.raddatz.familienarchiv.dto.RegisterRequest;
+import org.raddatz.familienarchiv.user.CreateInviteRequest;
+import org.raddatz.familienarchiv.user.InviteListItemDTO;
+import org.raddatz.familienarchiv.user.RegisterRequest;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.exception.ErrorCode;
-import org.raddatz.familienarchiv.model.AppUser;
-import org.raddatz.familienarchiv.model.InviteToken;
-import org.raddatz.familienarchiv.model.UserGroup;
-import org.raddatz.familienarchiv.repository.InviteTokenRepository;
+import org.raddatz.familienarchiv.user.AppUser;
+import org.raddatz.familienarchiv.user.InviteToken;
+import org.raddatz.familienarchiv.user.UserGroup;
+import org.raddatz.familienarchiv.user.InviteTokenRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/InviteToken.java b/backend/src/main/java/org/raddatz/familienarchiv/user/InviteToken.java
similarity index 97%
rename from backend/src/main/java/org/raddatz/familienarchiv/model/InviteToken.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/InviteToken.java
index f1b79b77..e38fff1f 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/model/InviteToken.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/InviteToken.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.model;
+package org.raddatz.familienarchiv.user;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.*;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/repository/InviteTokenRepository.java b/backend/src/main/java/org/raddatz/familienarchiv/user/InviteTokenRepository.java
similarity index 91%
rename from backend/src/main/java/org/raddatz/familienarchiv/repository/InviteTokenRepository.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/InviteTokenRepository.java
index 0104c9f0..07771f28 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/repository/InviteTokenRepository.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/InviteTokenRepository.java
@@ -1,7 +1,7 @@
-package org.raddatz.familienarchiv.repository;
+package org.raddatz.familienarchiv.user;
 
 import jakarta.persistence.LockModeType;
-import org.raddatz.familienarchiv.model.InviteToken;
+import org.raddatz.familienarchiv.user.InviteToken;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Lock;
 import org.springframework.data.jpa.repository.Query;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/PasswordResetService.java b/backend/src/main/java/org/raddatz/familienarchiv/user/PasswordResetService.java
similarity index 94%
rename from backend/src/main/java/org/raddatz/familienarchiv/service/PasswordResetService.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/PasswordResetService.java
index ec6ab08b..850ea94d 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/service/PasswordResetService.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/PasswordResetService.java
@@ -1,16 +1,16 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.user;
 
 import java.security.SecureRandom;
 import java.time.LocalDateTime;
 import java.util.HexFormat;
 import java.util.Optional;
 
-import org.raddatz.familienarchiv.dto.ResetPasswordRequest;
+import org.raddatz.familienarchiv.user.ResetPasswordRequest;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.exception.ErrorCode;
-import org.raddatz.familienarchiv.model.AppUser;
-import org.raddatz.familienarchiv.model.PasswordResetToken;
-import org.raddatz.familienarchiv.repository.PasswordResetTokenRepository;
+import org.raddatz.familienarchiv.user.AppUser;
+import org.raddatz.familienarchiv.user.PasswordResetToken;
+import org.raddatz.familienarchiv.user.PasswordResetTokenRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.mail.MailException;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/PasswordResetTestHelper.java b/backend/src/main/java/org/raddatz/familienarchiv/user/PasswordResetTestHelper.java
similarity index 94%
rename from backend/src/main/java/org/raddatz/familienarchiv/service/PasswordResetTestHelper.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/PasswordResetTestHelper.java
index 0ddbacdb..b55a7157 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/service/PasswordResetTestHelper.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/PasswordResetTestHelper.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.user;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Profile;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/PasswordResetToken.java b/backend/src/main/java/org/raddatz/familienarchiv/user/PasswordResetToken.java
similarity index 96%
rename from backend/src/main/java/org/raddatz/familienarchiv/model/PasswordResetToken.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/PasswordResetToken.java
index 686b9f48..7720b26b 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/model/PasswordResetToken.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/PasswordResetToken.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.model;
+package org.raddatz.familienarchiv.user;
 
 import java.time.LocalDateTime;
 import java.util.UUID;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/repository/PasswordResetTokenRepository.java b/backend/src/main/java/org/raddatz/familienarchiv/user/PasswordResetTokenRepository.java
similarity index 88%
rename from backend/src/main/java/org/raddatz/familienarchiv/repository/PasswordResetTokenRepository.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/PasswordResetTokenRepository.java
index d2c5fa28..c7087f41 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/repository/PasswordResetTokenRepository.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/PasswordResetTokenRepository.java
@@ -1,10 +1,10 @@
-package org.raddatz.familienarchiv.repository;
+package org.raddatz.familienarchiv.user;
 
 import java.time.LocalDateTime;
 import java.util.Optional;
 import java.util.UUID;
 
-import org.raddatz.familienarchiv.model.PasswordResetToken;
+import org.raddatz.familienarchiv.user.PasswordResetToken;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/RegisterRequest.java b/backend/src/main/java/org/raddatz/familienarchiv/user/RegisterRequest.java
similarity index 90%
rename from backend/src/main/java/org/raddatz/familienarchiv/dto/RegisterRequest.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/RegisterRequest.java
index c715670f..c42be8e6 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/dto/RegisterRequest.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/RegisterRequest.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.dto;
+package org.raddatz.familienarchiv.user;
 
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/ResetPasswordRequest.java b/backend/src/main/java/org/raddatz/familienarchiv/user/ResetPasswordRequest.java
similarity index 75%
rename from backend/src/main/java/org/raddatz/familienarchiv/dto/ResetPasswordRequest.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/ResetPasswordRequest.java
index d46a6a6b..08c6a04f 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/dto/ResetPasswordRequest.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/ResetPasswordRequest.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.dto;
+package org.raddatz.familienarchiv.user;
 
 import lombok.Data;
 
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/UpdateProfileDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/user/UpdateProfileDTO.java
similarity index 85%
rename from backend/src/main/java/org/raddatz/familienarchiv/dto/UpdateProfileDTO.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/UpdateProfileDTO.java
index ff8fdc13..0e32d513 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/dto/UpdateProfileDTO.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/UpdateProfileDTO.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.dto;
+package org.raddatz.familienarchiv.user;
 
 import lombok.Data;
 
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/controller/UserController.java b/backend/src/main/java/org/raddatz/familienarchiv/user/UserController.java
similarity index 91%
rename from backend/src/main/java/org/raddatz/familienarchiv/controller/UserController.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/UserController.java
index b52150f2..543074e1 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/controller/UserController.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/UserController.java
@@ -1,18 +1,18 @@
-package org.raddatz.familienarchiv.controller;
+package org.raddatz.familienarchiv.user;
 
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
 import jakarta.validation.Valid;
-import org.raddatz.familienarchiv.dto.AdminUpdateUserRequest;
-import org.raddatz.familienarchiv.dto.ChangePasswordDTO;
-import org.raddatz.familienarchiv.dto.CreateUserRequest;
-import org.raddatz.familienarchiv.dto.UpdateProfileDTO;
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AdminUpdateUserRequest;
+import org.raddatz.familienarchiv.user.ChangePasswordDTO;
+import org.raddatz.familienarchiv.user.CreateUserRequest;
+import org.raddatz.familienarchiv.user.UpdateProfileDTO;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.raddatz.familienarchiv.security.Permission;
 import org.raddatz.familienarchiv.security.RequirePermission;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.UserService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.Authentication;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/config/DataInitializer.java b/backend/src/main/java/org/raddatz/familienarchiv/user/UserDataInitializer.java
similarity index 96%
rename from backend/src/main/java/org/raddatz/familienarchiv/config/DataInitializer.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/UserDataInitializer.java
index e5d18363..edcf9b9a 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/config/DataInitializer.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/UserDataInitializer.java
@@ -1,20 +1,20 @@
-package org.raddatz.familienarchiv.config;
+package org.raddatz.familienarchiv.user;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.springframework.context.annotation.DependsOn;
 import org.raddatz.familienarchiv.document.Document;
 import org.raddatz.familienarchiv.document.DocumentStatus;
 import org.raddatz.familienarchiv.person.Person;
 import org.raddatz.familienarchiv.tag.Tag;
-import org.raddatz.familienarchiv.model.UserGroup;
-import org.raddatz.familienarchiv.repository.AppUserRepository;
+import org.raddatz.familienarchiv.user.UserGroup;
+import org.raddatz.familienarchiv.user.AppUserRepository;
 import org.raddatz.familienarchiv.document.DocumentRepository;
 import org.raddatz.familienarchiv.person.PersonRepository;
 import org.raddatz.familienarchiv.tag.TagRepository;
-import org.raddatz.familienarchiv.repository.UserGroupRepository;
+import org.raddatz.familienarchiv.user.UserGroupRepository;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.context.annotation.Bean;
@@ -29,7 +29,7 @@ import java.util.Set;
 @RequiredArgsConstructor
 @Slf4j
 @DependsOn("flyway")
-public class DataInitializer {
+public class UserDataInitializer {
 
     @Value("${app.admin.email:admin@familyarchive.local}")
     private String adminEmail;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/UserGroup.java b/backend/src/main/java/org/raddatz/familienarchiv/user/UserGroup.java
similarity index 95%
rename from backend/src/main/java/org/raddatz/familienarchiv/model/UserGroup.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/UserGroup.java
index 7b68087b..3a7fc683 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/model/UserGroup.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/UserGroup.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.model;
+package org.raddatz.familienarchiv.user;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.*;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/repository/UserGroupRepository.java b/backend/src/main/java/org/raddatz/familienarchiv/user/UserGroupRepository.java
similarity index 75%
rename from backend/src/main/java/org/raddatz/familienarchiv/repository/UserGroupRepository.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/UserGroupRepository.java
index 65912b01..5b9bc815 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/repository/UserGroupRepository.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/UserGroupRepository.java
@@ -1,6 +1,6 @@
-package org.raddatz.familienarchiv.repository;
+package org.raddatz.familienarchiv.user;
 
-import org.raddatz.familienarchiv.model.UserGroup;
+import org.raddatz.familienarchiv.user.UserGroup;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/controller/UserSearchController.java b/backend/src/main/java/org/raddatz/familienarchiv/user/UserSearchController.java
similarity index 86%
rename from backend/src/main/java/org/raddatz/familienarchiv/controller/UserSearchController.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/UserSearchController.java
index d0fad59b..79c4bdd2 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/controller/UserSearchController.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/UserSearchController.java
@@ -1,11 +1,11 @@
-package org.raddatz.familienarchiv.controller;
+package org.raddatz.familienarchiv.user;
 
 import lombok.RequiredArgsConstructor;
 import org.raddatz.familienarchiv.document.transcription.MentionDTO;
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.raddatz.familienarchiv.security.Permission;
 import org.raddatz.familienarchiv.security.RequirePermission;
-import org.raddatz.familienarchiv.service.UserSearchService;
+import org.raddatz.familienarchiv.user.UserSearchService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/UserSearchService.java b/backend/src/main/java/org/raddatz/familienarchiv/user/UserSearchService.java
similarity index 77%
rename from backend/src/main/java/org/raddatz/familienarchiv/service/UserSearchService.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/UserSearchService.java
index a2232be8..c0699195 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/service/UserSearchService.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/UserSearchService.java
@@ -1,8 +1,8 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.user;
 
 import lombok.RequiredArgsConstructor;
-import org.raddatz.familienarchiv.model.AppUser;
-import org.raddatz.familienarchiv.repository.AppUserRepository;
+import org.raddatz.familienarchiv.user.AppUser;
+import org.raddatz.familienarchiv.user.AppUserRepository;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/UserService.java b/backend/src/main/java/org/raddatz/familienarchiv/user/UserService.java
similarity index 95%
rename from backend/src/main/java/org/raddatz/familienarchiv/service/UserService.java
rename to backend/src/main/java/org/raddatz/familienarchiv/user/UserService.java
index 8ab3f843..91fd12fd 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/service/UserService.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/UserService.java
@@ -1,21 +1,21 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.user;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import org.raddatz.familienarchiv.audit.AuditKind;
 import org.raddatz.familienarchiv.audit.AuditService;
-import org.raddatz.familienarchiv.dto.AdminUpdateUserRequest;
-import org.raddatz.familienarchiv.dto.ChangePasswordDTO;
-import org.raddatz.familienarchiv.dto.CreateUserRequest;
-import org.raddatz.familienarchiv.dto.UpdateProfileDTO;
-import org.raddatz.familienarchiv.dto.GroupDTO;
+import org.raddatz.familienarchiv.user.AdminUpdateUserRequest;
+import org.raddatz.familienarchiv.user.ChangePasswordDTO;
+import org.raddatz.familienarchiv.user.CreateUserRequest;
+import org.raddatz.familienarchiv.user.UpdateProfileDTO;
+import org.raddatz.familienarchiv.user.GroupDTO;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.exception.ErrorCode;
-import org.raddatz.familienarchiv.model.AppUser;
-import org.raddatz.familienarchiv.model.UserGroup;
-import org.raddatz.familienarchiv.repository.AppUserRepository;
-import org.raddatz.familienarchiv.repository.UserGroupRepository;
+import org.raddatz.familienarchiv.user.AppUser;
+import org.raddatz.familienarchiv.user.UserGroup;
+import org.raddatz.familienarchiv.user.AppUserRepository;
+import org.raddatz.familienarchiv.user.UserGroupRepository;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/audit/AuditLogQueryServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/audit/AuditLogQueryServiceTest.java
index c7e78a3c..d9a2296f 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/audit/AuditLogQueryServiceTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/audit/AuditLogQueryServiceTest.java
@@ -6,7 +6,7 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/audit/UserManagementAuditIntegrationTest.java b/backend/src/test/java/org/raddatz/familienarchiv/audit/UserManagementAuditIntegrationTest.java
index 6eeda488..b8238074 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/audit/UserManagementAuditIntegrationTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/audit/UserManagementAuditIntegrationTest.java
@@ -3,13 +3,13 @@ package org.raddatz.familienarchiv.audit;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.raddatz.familienarchiv.PostgresContainerConfig;
-import org.raddatz.familienarchiv.dto.AdminUpdateUserRequest;
-import org.raddatz.familienarchiv.dto.CreateUserRequest;
-import org.raddatz.familienarchiv.dto.GroupDTO;
-import org.raddatz.familienarchiv.model.AppUser;
-import org.raddatz.familienarchiv.model.UserGroup;
-import org.raddatz.familienarchiv.repository.AppUserRepository;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.AdminUpdateUserRequest;
+import org.raddatz.familienarchiv.user.CreateUserRequest;
+import org.raddatz.familienarchiv.user.GroupDTO;
+import org.raddatz.familienarchiv.user.AppUser;
+import org.raddatz.familienarchiv.user.UserGroup;
+import org.raddatz.familienarchiv.user.AppUserRepository;
+import org.raddatz.familienarchiv.user.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Import;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/controller/StatsControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/controller/StatsControllerTest.java
index 85e8bff2..e3dd2392 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/controller/StatsControllerTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/controller/StatsControllerTest.java
@@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test;
 import org.raddatz.familienarchiv.config.SecurityConfig;
 import org.raddatz.familienarchiv.dto.StatsDTO;
 import org.raddatz.familienarchiv.security.PermissionAspect;
-import org.raddatz.familienarchiv.service.CustomUserDetailsService;
+import org.raddatz.familienarchiv.user.CustomUserDetailsService;
 import org.raddatz.familienarchiv.service.StatsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/dashboard/DashboardControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/dashboard/DashboardControllerTest.java
index 786eebfb..daa0cf8e 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/dashboard/DashboardControllerTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/dashboard/DashboardControllerTest.java
@@ -3,10 +3,10 @@ package org.raddatz.familienarchiv.dashboard;
 import org.junit.jupiter.api.Test;
 import org.raddatz.familienarchiv.audit.AuditKind;
 import org.raddatz.familienarchiv.config.SecurityConfig;
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.raddatz.familienarchiv.security.PermissionAspect;
-import org.raddatz.familienarchiv.service.CustomUserDetailsService;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.CustomUserDetailsService;
+import org.raddatz.familienarchiv.user.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;
 import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/dashboard/DashboardServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/dashboard/DashboardServiceTest.java
index 78315cad..472bbaf3 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/dashboard/DashboardServiceTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/dashboard/DashboardServiceTest.java
@@ -9,13 +9,13 @@ import org.raddatz.familienarchiv.audit.ActivityFeedRow;
 import org.raddatz.familienarchiv.audit.AuditKind;
 import org.raddatz.familienarchiv.audit.AuditLogQueryService;
 import org.raddatz.familienarchiv.audit.PulseStatsRow;
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.raddatz.familienarchiv.document.Document;
 import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock;
 import org.raddatz.familienarchiv.document.comment.CommentService;
 import org.raddatz.familienarchiv.document.DocumentService;
 import org.raddatz.familienarchiv.document.transcription.TranscriptionService;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.UserService;
 
 import java.time.Instant;
 import java.time.LocalDateTime;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/document/DocumentControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/document/DocumentControllerTest.java
index 1e0b23cf..9814af00 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/document/DocumentControllerTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/document/DocumentControllerTest.java
@@ -6,17 +6,17 @@ import org.raddatz.familienarchiv.document.DocumentSearchResult;
 import org.raddatz.familienarchiv.document.DocumentVersionSummary;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.exception.ErrorCode;
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.raddatz.familienarchiv.document.Document;
 import org.raddatz.familienarchiv.document.DocumentStatus;
 import org.raddatz.familienarchiv.document.DocumentVersion;
 import org.raddatz.familienarchiv.person.Person;
 import org.raddatz.familienarchiv.security.PermissionAspect;
-import org.raddatz.familienarchiv.service.CustomUserDetailsService;
+import org.raddatz.familienarchiv.user.CustomUserDetailsService;
 import org.raddatz.familienarchiv.document.DocumentService;
 import org.raddatz.familienarchiv.document.DocumentVersionService;
 import org.raddatz.familienarchiv.service.FileService;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
 import org.raddatz.familienarchiv.config.SecurityConfig;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/document/DocumentVersionServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/document/DocumentVersionServiceTest.java
index c3cb9727..5f682183 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/document/DocumentVersionServiceTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/document/DocumentVersionServiceTest.java
@@ -9,13 +9,13 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.raddatz.familienarchiv.document.DocumentVersionSummary;
 import org.raddatz.familienarchiv.exception.DomainException;
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.raddatz.familienarchiv.document.Document;
 import org.raddatz.familienarchiv.document.DocumentVersion;
 import org.raddatz.familienarchiv.person.Person;
 import org.raddatz.familienarchiv.tag.Tag;
 import org.raddatz.familienarchiv.document.DocumentVersionRepository;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.UserService;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;
 
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/document/annotation/AnnotationControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/document/annotation/AnnotationControllerTest.java
index ae996e46..d14428b8 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/document/annotation/AnnotationControllerTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/document/annotation/AnnotationControllerTest.java
@@ -8,9 +8,9 @@ import org.raddatz.familienarchiv.document.Document;
 import org.raddatz.familienarchiv.document.annotation.DocumentAnnotation;
 import org.raddatz.familienarchiv.security.PermissionAspect;
 import org.raddatz.familienarchiv.document.annotation.AnnotationService;
-import org.raddatz.familienarchiv.service.CustomUserDetailsService;
+import org.raddatz.familienarchiv.user.CustomUserDetailsService;
 import org.raddatz.familienarchiv.document.DocumentService;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;
 import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/document/comment/CommentControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/document/comment/CommentControllerTest.java
index 45aa3369..0998df49 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/document/comment/CommentControllerTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/document/comment/CommentControllerTest.java
@@ -5,8 +5,8 @@ import org.raddatz.familienarchiv.config.SecurityConfig;
 import org.raddatz.familienarchiv.document.comment.DocumentComment;
 import org.raddatz.familienarchiv.security.PermissionAspect;
 import org.raddatz.familienarchiv.document.comment.CommentService;
-import org.raddatz.familienarchiv.service.CustomUserDetailsService;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.CustomUserDetailsService;
+import org.raddatz.familienarchiv.user.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;
 import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/document/comment/CommentServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/document/comment/CommentServiceTest.java
index ccbd371d..f832cb46 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/document/comment/CommentServiceTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/document/comment/CommentServiceTest.java
@@ -8,12 +8,12 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import org.raddatz.familienarchiv.audit.AuditKind;
 import org.raddatz.familienarchiv.audit.AuditService;
 import org.raddatz.familienarchiv.document.transcription.TranscriptionService;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.UserService;
 import org.raddatz.familienarchiv.exception.DomainException;
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.raddatz.familienarchiv.document.comment.DocumentComment;
 import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock;
-import org.raddatz.familienarchiv.model.UserGroup;
+import org.raddatz.familienarchiv.user.UserGroup;
 import org.raddatz.familienarchiv.document.comment.CommentRepository;
 import org.raddatz.familienarchiv.notification.NotificationService;
 
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockControllerTest.java
index 601acd99..a10e54de 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockControllerTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockControllerTest.java
@@ -4,13 +4,13 @@ import org.junit.jupiter.api.Test;
 import org.raddatz.familienarchiv.config.SecurityConfig;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.exception.ErrorCode;
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock;
 import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockVersion;
 import org.raddatz.familienarchiv.security.PermissionAspect;
-import org.raddatz.familienarchiv.service.CustomUserDetailsService;
+import org.raddatz.familienarchiv.user.CustomUserDetailsService;
 import org.raddatz.familienarchiv.document.transcription.TranscriptionService;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;
 import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockRepositoryIntegrationTest.java b/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockRepositoryIntegrationTest.java
index b350da56..b7344d03 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockRepositoryIntegrationTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockRepositoryIntegrationTest.java
@@ -2,7 +2,7 @@ package org.raddatz.familienarchiv.document.transcription;
 
 import org.junit.jupiter.api.Test;
 import org.raddatz.familienarchiv.PostgresContainerConfig;
-import org.raddatz.familienarchiv.repository.CompletionStatsRow;
+import org.raddatz.familienarchiv.document.transcription.CompletionStatsRow;
 import org.raddatz.familienarchiv.config.FlywayConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionQueueControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionQueueControllerTest.java
index c811c7fc..91a34b0e 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionQueueControllerTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionQueueControllerTest.java
@@ -7,7 +7,7 @@ import org.raddatz.familienarchiv.document.transcription.TranscriptionWeeklyStat
 import org.raddatz.familienarchiv.document.DocumentRepository;
 import org.raddatz.familienarchiv.person.PersonRepository;
 import org.raddatz.familienarchiv.security.PermissionAspect;
-import org.raddatz.familienarchiv.service.CustomUserDetailsService;
+import org.raddatz.familienarchiv.user.CustomUserDetailsService;
 import org.raddatz.familienarchiv.document.transcription.TranscriptionQueueService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/geschichte/GeschichteControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/geschichte/GeschichteControllerTest.java
index f90a993c..9ae28c2e 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/geschichte/GeschichteControllerTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/geschichte/GeschichteControllerTest.java
@@ -9,7 +9,7 @@ import org.raddatz.familienarchiv.exception.ErrorCode;
 import org.raddatz.familienarchiv.geschichte.Geschichte;
 import org.raddatz.familienarchiv.geschichte.GeschichteStatus;
 import org.raddatz.familienarchiv.security.PermissionAspect;
-import org.raddatz.familienarchiv.service.CustomUserDetailsService;
+import org.raddatz.familienarchiv.user.CustomUserDetailsService;
 import org.raddatz.familienarchiv.geschichte.GeschichteService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/geschichte/GeschichteServiceIntegrationTest.java b/backend/src/test/java/org/raddatz/familienarchiv/geschichte/GeschichteServiceIntegrationTest.java
index f27e8bb0..e0cb9f27 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/geschichte/GeschichteServiceIntegrationTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/geschichte/GeschichteServiceIntegrationTest.java
@@ -5,11 +5,11 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.raddatz.familienarchiv.PostgresContainerConfig;
 import org.raddatz.familienarchiv.geschichte.GeschichteUpdateDTO;
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.raddatz.familienarchiv.geschichte.Geschichte;
 import org.raddatz.familienarchiv.geschichte.GeschichteStatus;
 import org.raddatz.familienarchiv.person.Person;
-import org.raddatz.familienarchiv.repository.AppUserRepository;
+import org.raddatz.familienarchiv.user.AppUserRepository;
 import org.raddatz.familienarchiv.geschichte.GeschichteRepository;
 import org.raddatz.familienarchiv.person.PersonRepository;
 import org.raddatz.familienarchiv.security.Permission;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/geschichte/GeschichteServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/geschichte/GeschichteServiceTest.java
index d10dc4fa..0a51d319 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/geschichte/GeschichteServiceTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/geschichte/GeschichteServiceTest.java
@@ -10,7 +10,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import org.raddatz.familienarchiv.geschichte.GeschichteUpdateDTO;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.exception.ErrorCode;
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.raddatz.familienarchiv.document.Document;
 import org.raddatz.familienarchiv.geschichte.Geschichte;
 import org.raddatz.familienarchiv.geschichte.GeschichteStatus;
@@ -19,7 +19,7 @@ import org.raddatz.familienarchiv.geschichte.GeschichteRepository;
 import org.raddatz.familienarchiv.security.Permission;
 import org.raddatz.familienarchiv.document.DocumentService;
 import org.raddatz.familienarchiv.person.PersonService;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.UserService;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/notification/NotificationControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/notification/NotificationControllerTest.java
index 6a9ffd42..cbbda92c 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/notification/NotificationControllerTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/notification/NotificationControllerTest.java
@@ -5,13 +5,13 @@ import org.raddatz.familienarchiv.config.SecurityConfig;
 import org.raddatz.familienarchiv.notification.NotificationDTO;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.exception.ErrorCode;
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.raddatz.familienarchiv.notification.NotificationType;
 import org.raddatz.familienarchiv.security.PermissionAspect;
-import org.raddatz.familienarchiv.service.CustomUserDetailsService;
+import org.raddatz.familienarchiv.user.CustomUserDetailsService;
 import org.raddatz.familienarchiv.notification.NotificationService;
 import org.raddatz.familienarchiv.service.SseEmitterRegistry;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;
 import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/notification/NotificationRepositoryTest.java b/backend/src/test/java/org/raddatz/familienarchiv/notification/NotificationRepositoryTest.java
index 10489e7b..0f63450a 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/notification/NotificationRepositoryTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/notification/NotificationRepositoryTest.java
@@ -4,10 +4,10 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.raddatz.familienarchiv.PostgresContainerConfig;
 import org.raddatz.familienarchiv.config.FlywayConfig;
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.raddatz.familienarchiv.notification.Notification;
 import org.raddatz.familienarchiv.notification.NotificationType;
-import org.raddatz.familienarchiv.repository.AppUserRepository;
+import org.raddatz.familienarchiv.user.AppUserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase;
 import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/notification/NotificationServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/notification/NotificationServiceTest.java
index 950b6a1e..51b8a3b7 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/notification/NotificationServiceTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/notification/NotificationServiceTest.java
@@ -9,11 +9,12 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import org.raddatz.familienarchiv.notification.NotificationDTO;
 import org.raddatz.familienarchiv.document.comment.DocumentComment;
 import org.raddatz.familienarchiv.exception.DomainException;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.raddatz.familienarchiv.model.*;
 import org.raddatz.familienarchiv.notification.NotificationRepository;
 import org.raddatz.familienarchiv.document.DocumentService;
 import org.raddatz.familienarchiv.service.SseEmitterRegistry;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.UserService;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.mail.MailException;
 import org.springframework.mail.MailSendException;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrControllerTest.java
index 63a9eb2c..eec681bd 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrControllerTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrControllerTest.java
@@ -10,6 +10,8 @@ import org.raddatz.familienarchiv.ocr.TrainingInfoResponse;
 import org.raddatz.familienarchiv.ocr.TriggerOcrDTO;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.exception.ErrorCode;
+import org.raddatz.familienarchiv.user.UserService;
+import org.raddatz.familienarchiv.user.CustomUserDetailsService;
 import org.raddatz.familienarchiv.model.*;
 import org.raddatz.familienarchiv.document.Document;
 import org.raddatz.familienarchiv.document.DocumentStatus;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/person/PersonControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/person/PersonControllerTest.java
index 47c1ff76..b05a1c67 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/person/PersonControllerTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/person/PersonControllerTest.java
@@ -9,7 +9,7 @@ import org.raddatz.familienarchiv.person.Person;
 import org.raddatz.familienarchiv.person.PersonNameAlias;
 import org.raddatz.familienarchiv.person.PersonNameAliasType;
 import org.raddatz.familienarchiv.security.PermissionAspect;
-import org.raddatz.familienarchiv.service.CustomUserDetailsService;
+import org.raddatz.familienarchiv.user.CustomUserDetailsService;
 import org.raddatz.familienarchiv.document.DocumentService;
 import org.raddatz.familienarchiv.person.PersonService;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/person/relationship/RelationshipControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/person/relationship/RelationshipControllerTest.java
index 1161b6de..aa00c409 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/person/relationship/RelationshipControllerTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/person/relationship/RelationshipControllerTest.java
@@ -8,8 +8,8 @@ import org.raddatz.familienarchiv.person.relationship.dto.NetworkDTO;
 import org.raddatz.familienarchiv.person.relationship.dto.PersonNodeDTO;
 import org.raddatz.familienarchiv.person.relationship.dto.RelationshipDTO;
 import org.raddatz.familienarchiv.security.PermissionAspect;
-import org.raddatz.familienarchiv.service.CustomUserDetailsService;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.CustomUserDetailsService;
+import org.raddatz.familienarchiv.user.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;
 import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/security/SecurityUtilsTest.java b/backend/src/test/java/org/raddatz/familienarchiv/security/SecurityUtilsTest.java
index 78f0dc24..99fde225 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/security/SecurityUtilsTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/security/SecurityUtilsTest.java
@@ -5,8 +5,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.raddatz.familienarchiv.exception.DomainException;
-import org.raddatz.familienarchiv.model.AppUser;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.AppUser;
+import org.raddatz.familienarchiv.user.UserService;
 import org.springframework.security.core.Authentication;
 
 import java.util.UUID;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/tag/TagControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/tag/TagControllerTest.java
index ccb7f736..44e7cb82 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/tag/TagControllerTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/tag/TagControllerTest.java
@@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test;
 import org.raddatz.familienarchiv.tag.TagTreeNodeDTO;
 import org.raddatz.familienarchiv.tag.Tag;
 import org.raddatz.familienarchiv.security.PermissionAspect;
-import org.raddatz.familienarchiv.service.CustomUserDetailsService;
+import org.raddatz.familienarchiv.user.CustomUserDetailsService;
 import org.raddatz.familienarchiv.document.DocumentService;
 import org.raddatz.familienarchiv.tag.TagService;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/controller/AdminControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/user/AdminControllerTest.java
similarity index 98%
rename from backend/src/test/java/org/raddatz/familienarchiv/controller/AdminControllerTest.java
rename to backend/src/test/java/org/raddatz/familienarchiv/user/AdminControllerTest.java
index 5cb43c5d..2f6a1b1e 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/controller/AdminControllerTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/user/AdminControllerTest.java
@@ -1,10 +1,10 @@
-package org.raddatz.familienarchiv.controller;
+package org.raddatz.familienarchiv.user;
 
 import org.junit.jupiter.api.Test;
 import org.raddatz.familienarchiv.config.SecurityConfig;
 import org.raddatz.familienarchiv.document.Document;
 import org.raddatz.familienarchiv.security.PermissionAspect;
-import org.raddatz.familienarchiv.service.CustomUserDetailsService;
+import org.raddatz.familienarchiv.user.CustomUserDetailsService;
 import org.raddatz.familienarchiv.document.DocumentService;
 import org.raddatz.familienarchiv.document.DocumentVersionService;
 import org.raddatz.familienarchiv.service.MassImportService;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/model/AppUserTest.java b/backend/src/test/java/org/raddatz/familienarchiv/user/AppUserTest.java
similarity index 96%
rename from backend/src/test/java/org/raddatz/familienarchiv/model/AppUserTest.java
rename to backend/src/test/java/org/raddatz/familienarchiv/user/AppUserTest.java
index 8fec24fd..dfde28cf 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/model/AppUserTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/user/AppUserTest.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.model;
+package org.raddatz.familienarchiv.user;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/controller/AuthControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/user/AuthControllerTest.java
similarity index 94%
rename from backend/src/test/java/org/raddatz/familienarchiv/controller/AuthControllerTest.java
rename to backend/src/test/java/org/raddatz/familienarchiv/user/AuthControllerTest.java
index 4401075c..006e1b7d 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/controller/AuthControllerTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/user/AuthControllerTest.java
@@ -1,18 +1,18 @@
-package org.raddatz.familienarchiv.controller;
+package org.raddatz.familienarchiv.user;
 
 import tools.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.Test;
 import org.raddatz.familienarchiv.config.SecurityConfig;
-import org.raddatz.familienarchiv.dto.InvitePrefillDTO;
-import org.raddatz.familienarchiv.dto.RegisterRequest;
+import org.raddatz.familienarchiv.user.InvitePrefillDTO;
+import org.raddatz.familienarchiv.user.RegisterRequest;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.exception.ErrorCode;
-import org.raddatz.familienarchiv.model.AppUser;
-import org.raddatz.familienarchiv.model.InviteToken;
+import org.raddatz.familienarchiv.user.AppUser;
+import org.raddatz.familienarchiv.user.InviteToken;
 import org.raddatz.familienarchiv.security.PermissionAspect;
-import org.raddatz.familienarchiv.service.CustomUserDetailsService;
-import org.raddatz.familienarchiv.service.InviteService;
-import org.raddatz.familienarchiv.service.PasswordResetService;
+import org.raddatz.familienarchiv.user.CustomUserDetailsService;
+import org.raddatz.familienarchiv.user.InviteService;
+import org.raddatz.familienarchiv.user.PasswordResetService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;
 import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/CustomUserDetailsServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/user/CustomUserDetailsServiceTest.java
similarity index 96%
rename from backend/src/test/java/org/raddatz/familienarchiv/service/CustomUserDetailsServiceTest.java
rename to backend/src/test/java/org/raddatz/familienarchiv/user/CustomUserDetailsServiceTest.java
index a2cb51b1..c41e43a7 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/service/CustomUserDetailsServiceTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/user/CustomUserDetailsServiceTest.java
@@ -1,13 +1,13 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.user;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.raddatz.familienarchiv.model.AppUser;
-import org.raddatz.familienarchiv.model.UserGroup;
-import org.raddatz.familienarchiv.repository.AppUserRepository;
+import org.raddatz.familienarchiv.user.AppUser;
+import org.raddatz.familienarchiv.user.UserGroup;
+import org.raddatz.familienarchiv.user.AppUserRepository;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/controller/InviteControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/user/InviteControllerTest.java
similarity index 94%
rename from backend/src/test/java/org/raddatz/familienarchiv/controller/InviteControllerTest.java
rename to backend/src/test/java/org/raddatz/familienarchiv/user/InviteControllerTest.java
index ebe682b9..e864210c 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/controller/InviteControllerTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/user/InviteControllerTest.java
@@ -1,16 +1,16 @@
-package org.raddatz.familienarchiv.controller;
+package org.raddatz.familienarchiv.user;
 
 import tools.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.Test;
 import org.raddatz.familienarchiv.config.SecurityConfig;
-import org.raddatz.familienarchiv.dto.CreateInviteRequest;
-import org.raddatz.familienarchiv.dto.InviteListItemDTO;
-import org.raddatz.familienarchiv.model.AppUser;
-import org.raddatz.familienarchiv.model.InviteToken;
+import org.raddatz.familienarchiv.user.CreateInviteRequest;
+import org.raddatz.familienarchiv.user.InviteListItemDTO;
+import org.raddatz.familienarchiv.user.AppUser;
+import org.raddatz.familienarchiv.user.InviteToken;
 import org.raddatz.familienarchiv.security.PermissionAspect;
-import org.raddatz.familienarchiv.service.CustomUserDetailsService;
-import org.raddatz.familienarchiv.service.InviteService;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.CustomUserDetailsService;
+import org.raddatz.familienarchiv.user.InviteService;
+import org.raddatz.familienarchiv.user.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;
 import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/InviteServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/user/InviteServiceTest.java
similarity index 96%
rename from backend/src/test/java/org/raddatz/familienarchiv/service/InviteServiceTest.java
rename to backend/src/test/java/org/raddatz/familienarchiv/user/InviteServiceTest.java
index e8c2e4a9..8826dfd4 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/service/InviteServiceTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/user/InviteServiceTest.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.user;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -6,14 +6,14 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.raddatz.familienarchiv.dto.CreateInviteRequest;
-import org.raddatz.familienarchiv.dto.RegisterRequest;
+import org.raddatz.familienarchiv.user.CreateInviteRequest;
+import org.raddatz.familienarchiv.user.RegisterRequest;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.exception.ErrorCode;
-import org.raddatz.familienarchiv.model.AppUser;
-import org.raddatz.familienarchiv.model.InviteToken;
-import org.raddatz.familienarchiv.model.UserGroup;
-import org.raddatz.familienarchiv.repository.InviteTokenRepository;
+import org.raddatz.familienarchiv.user.AppUser;
+import org.raddatz.familienarchiv.user.InviteToken;
+import org.raddatz.familienarchiv.user.UserGroup;
+import org.raddatz.familienarchiv.user.InviteTokenRepository;
 
 import java.time.LocalDateTime;
 import java.util.*;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/PasswordResetServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/user/PasswordResetServiceTest.java
similarity index 96%
rename from backend/src/test/java/org/raddatz/familienarchiv/service/PasswordResetServiceTest.java
rename to backend/src/test/java/org/raddatz/familienarchiv/user/PasswordResetServiceTest.java
index ccf4f487..00baef9c 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/service/PasswordResetServiceTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/user/PasswordResetServiceTest.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.user;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -18,11 +18,11 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.raddatz.familienarchiv.dto.ResetPasswordRequest;
+import org.raddatz.familienarchiv.user.ResetPasswordRequest;
 import org.raddatz.familienarchiv.exception.DomainException;
-import org.raddatz.familienarchiv.model.AppUser;
-import org.raddatz.familienarchiv.model.PasswordResetToken;
-import org.raddatz.familienarchiv.repository.PasswordResetTokenRepository;
+import org.raddatz.familienarchiv.user.AppUser;
+import org.raddatz.familienarchiv.user.PasswordResetToken;
+import org.raddatz.familienarchiv.user.PasswordResetTokenRepository;
 import org.springframework.mail.MailSendException;
 import org.springframework.mail.SimpleMailMessage;
 import org.springframework.mail.javamail.JavaMailSender;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/PasswordResetTestHelperTest.java b/backend/src/test/java/org/raddatz/familienarchiv/user/PasswordResetTestHelperTest.java
similarity index 96%
rename from backend/src/test/java/org/raddatz/familienarchiv/service/PasswordResetTestHelperTest.java
rename to backend/src/test/java/org/raddatz/familienarchiv/user/PasswordResetTestHelperTest.java
index c770fc0f..ae9745c1 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/service/PasswordResetTestHelperTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/user/PasswordResetTestHelperTest.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.user;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/controller/UserControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/user/UserControllerTest.java
similarity index 97%
rename from backend/src/test/java/org/raddatz/familienarchiv/controller/UserControllerTest.java
rename to backend/src/test/java/org/raddatz/familienarchiv/user/UserControllerTest.java
index d4686ab4..b6db1b24 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/controller/UserControllerTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/user/UserControllerTest.java
@@ -1,11 +1,11 @@
-package org.raddatz.familienarchiv.controller;
+package org.raddatz.familienarchiv.user;
 
 import org.junit.jupiter.api.Test;
 import org.raddatz.familienarchiv.config.SecurityConfig;
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.raddatz.familienarchiv.security.PermissionAspect;
-import org.raddatz.familienarchiv.service.CustomUserDetailsService;
-import org.raddatz.familienarchiv.service.UserService;
+import org.raddatz.familienarchiv.user.CustomUserDetailsService;
+import org.raddatz.familienarchiv.user.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;
 import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/controller/UserSearchControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/user/UserSearchControllerTest.java
similarity index 94%
rename from backend/src/test/java/org/raddatz/familienarchiv/controller/UserSearchControllerTest.java
rename to backend/src/test/java/org/raddatz/familienarchiv/user/UserSearchControllerTest.java
index 85dbadba..4b1a02c6 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/controller/UserSearchControllerTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/user/UserSearchControllerTest.java
@@ -1,11 +1,11 @@
-package org.raddatz.familienarchiv.controller;
+package org.raddatz.familienarchiv.user;
 
 import org.junit.jupiter.api.Test;
 import org.raddatz.familienarchiv.config.SecurityConfig;
-import org.raddatz.familienarchiv.model.AppUser;
+import org.raddatz.familienarchiv.user.AppUser;
 import org.raddatz.familienarchiv.security.PermissionAspect;
-import org.raddatz.familienarchiv.service.CustomUserDetailsService;
-import org.raddatz.familienarchiv.service.UserSearchService;
+import org.raddatz.familienarchiv.user.CustomUserDetailsService;
+import org.raddatz.familienarchiv.user.UserSearchService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;
 import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/UserSearchServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/user/UserSearchServiceTest.java
similarity index 93%
rename from backend/src/test/java/org/raddatz/familienarchiv/service/UserSearchServiceTest.java
rename to backend/src/test/java/org/raddatz/familienarchiv/user/UserSearchServiceTest.java
index a427f511..c98c88cd 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/service/UserSearchServiceTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/user/UserSearchServiceTest.java
@@ -1,12 +1,12 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.user;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.raddatz.familienarchiv.model.AppUser;
-import org.raddatz.familienarchiv.repository.AppUserRepository;
+import org.raddatz.familienarchiv.user.AppUser;
+import org.raddatz.familienarchiv.user.AppUserRepository;
 import org.springframework.data.domain.PageRequest;
 
 import java.util.List;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/UserServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/user/UserServiceTest.java
similarity index 97%
rename from backend/src/test/java/org/raddatz/familienarchiv/service/UserServiceTest.java
rename to backend/src/test/java/org/raddatz/familienarchiv/user/UserServiceTest.java
index abe0a969..f0fd6e46 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/service/UserServiceTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/user/UserServiceTest.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.user;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -8,16 +8,16 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.raddatz.familienarchiv.audit.AuditKind;
 import org.raddatz.familienarchiv.audit.AuditService;
-import org.raddatz.familienarchiv.dto.AdminUpdateUserRequest;
-import org.raddatz.familienarchiv.dto.ChangePasswordDTO;
-import org.raddatz.familienarchiv.dto.CreateUserRequest;
-import org.raddatz.familienarchiv.dto.UpdateProfileDTO;
+import org.raddatz.familienarchiv.user.AdminUpdateUserRequest;
+import org.raddatz.familienarchiv.user.ChangePasswordDTO;
+import org.raddatz.familienarchiv.user.CreateUserRequest;
+import org.raddatz.familienarchiv.user.UpdateProfileDTO;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.exception.ErrorCode;
-import org.raddatz.familienarchiv.model.AppUser;
-import org.raddatz.familienarchiv.model.UserGroup;
-import org.raddatz.familienarchiv.repository.AppUserRepository;
-import org.raddatz.familienarchiv.repository.UserGroupRepository;
+import org.raddatz.familienarchiv.user.AppUser;
+import org.raddatz.familienarchiv.user.UserGroup;
+import org.raddatz.familienarchiv.user.AppUserRepository;
+import org.raddatz.familienarchiv.user.UserGroupRepository;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
 import java.util.List;
@@ -472,7 +472,7 @@ class UserServiceTest {
         when(groupRepository.findById(id)).thenReturn(Optional.of(group));
         when(groupRepository.save(any())).thenAnswer(inv -> inv.getArgument(0));
 
-        org.raddatz.familienarchiv.dto.GroupDTO dto = new org.raddatz.familienarchiv.dto.GroupDTO();
+        org.raddatz.familienarchiv.user.GroupDTO dto = new org.raddatz.familienarchiv.user.GroupDTO();
         dto.setName("NewName");
         dto.setPermissions(Set.of("WRITE_ALL"));
 
@@ -489,7 +489,7 @@ class UserServiceTest {
         when(groupRepository.findById(id)).thenReturn(Optional.of(group));
         when(groupRepository.save(any())).thenAnswer(inv -> inv.getArgument(0));
 
-        org.raddatz.familienarchiv.dto.GroupDTO dto = new org.raddatz.familienarchiv.dto.GroupDTO();
+        org.raddatz.familienarchiv.user.GroupDTO dto = new org.raddatz.familienarchiv.user.GroupDTO();
         dto.setName(null);
         dto.setPermissions(Set.of("ADMIN"));
 
@@ -506,7 +506,7 @@ class UserServiceTest {
         when(groupRepository.findById(id)).thenReturn(Optional.of(group));
         when(groupRepository.save(any())).thenAnswer(inv -> inv.getArgument(0));
 
-        org.raddatz.familienarchiv.dto.GroupDTO dto = new org.raddatz.familienarchiv.dto.GroupDTO();
+        org.raddatz.familienarchiv.user.GroupDTO dto = new org.raddatz.familienarchiv.user.GroupDTO();
         dto.setName("NewName");
         dto.setPermissions(null);
 
@@ -889,7 +889,7 @@ class UserServiceTest {
 
     @Test
     void createGroup_createsGroupWithNameAndPermissions() {
-        org.raddatz.familienarchiv.dto.GroupDTO dto = new org.raddatz.familienarchiv.dto.GroupDTO();
+        org.raddatz.familienarchiv.user.GroupDTO dto = new org.raddatz.familienarchiv.user.GroupDTO();
         dto.setName("Familie");
         dto.setPermissions(Set.of("READ_ALL", "WRITE_ALL"));