diff --git a/backend/src/main/java/org/raddatz/familienarchiv/controller/DocumentController.java b/backend/src/main/java/org/raddatz/familienarchiv/controller/DocumentController.java
index 980171f1..822f6c21 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/controller/DocumentController.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/controller/DocumentController.java
@@ -36,7 +36,7 @@ import org.raddatz.familienarchiv.exception.ErrorCode;
 import org.raddatz.familienarchiv.model.Document;
 import org.raddatz.familienarchiv.dto.DocumentSort;
 import org.raddatz.familienarchiv.model.DocumentStatus;
-import org.raddatz.familienarchiv.model.TrainingLabel;
+import org.raddatz.familienarchiv.ocr.TrainingLabel;
 import org.raddatz.familienarchiv.model.DocumentVersion;
 import org.raddatz.familienarchiv.model.AppUser;
 import org.raddatz.familienarchiv.security.Permission;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/DocumentUpdateDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/dto/DocumentUpdateDTO.java
index 3e0cad0f..d5aece57 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/dto/DocumentUpdateDTO.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/dto/DocumentUpdateDTO.java
@@ -5,7 +5,7 @@ import java.util.List;
 import java.util.UUID;
 
 import lombok.Data;
-import org.raddatz.familienarchiv.model.ScriptType;
+import org.raddatz.familienarchiv.ocr.ScriptType;
 
 @Data
 public class DocumentUpdateDTO {
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/Document.java b/backend/src/main/java/org/raddatz/familienarchiv/model/Document.java
index 198b89b4..32c2400d 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/model/Document.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/model/Document.java
@@ -9,6 +9,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 
+import org.raddatz.familienarchiv.ocr.ScriptType;
+import org.raddatz.familienarchiv.ocr.TrainingLabel;
 import org.raddatz.familienarchiv.person.Person;
 import org.raddatz.familienarchiv.tag.Tag;
 import java.net.URLEncoder;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/BatchOcrDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/BatchOcrDTO.java
similarity index 91%
rename from backend/src/main/java/org/raddatz/familienarchiv/dto/BatchOcrDTO.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/BatchOcrDTO.java
index 69506437..beac1d12 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/dto/BatchOcrDTO.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/BatchOcrDTO.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.dto;
+package org.raddatz.familienarchiv.ocr;
 
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.Size;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/OcrAsyncRunner.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrAsyncRunner.java
similarity index 96%
rename from backend/src/main/java/org/raddatz/familienarchiv/service/OcrAsyncRunner.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrAsyncRunner.java
index 08f38bda..65f95601 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/service/OcrAsyncRunner.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrAsyncRunner.java
@@ -1,11 +1,15 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.ocr;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.raddatz.familienarchiv.dto.CreateAnnotationDTO;
 import org.raddatz.familienarchiv.model.*;
-import org.raddatz.familienarchiv.repository.OcrJobDocumentRepository;
-import org.raddatz.familienarchiv.repository.OcrJobRepository;
+import org.raddatz.familienarchiv.ocr.OcrJobDocumentRepository;
+import org.raddatz.familienarchiv.ocr.OcrJobRepository;
+import org.raddatz.familienarchiv.service.AnnotationService;
+import org.raddatz.familienarchiv.service.DocumentService;
+import org.raddatz.familienarchiv.service.TranscriptionService;
+import org.raddatz.familienarchiv.service.FileService;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/OcrBatchService.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrBatchService.java
similarity index 89%
rename from backend/src/main/java/org/raddatz/familienarchiv/service/OcrBatchService.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrBatchService.java
index 294ba849..30d6a339 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/service/OcrBatchService.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrBatchService.java
@@ -1,12 +1,12 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.ocr;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.exception.ErrorCode;
 import org.raddatz.familienarchiv.model.*;
-import org.raddatz.familienarchiv.repository.OcrJobDocumentRepository;
-import org.raddatz.familienarchiv.repository.OcrJobRepository;
+import org.raddatz.familienarchiv.ocr.OcrJobDocumentRepository;
+import org.raddatz.familienarchiv.ocr.OcrJobRepository;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/OcrBlockResult.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrBlockResult.java
similarity index 90%
rename from backend/src/main/java/org/raddatz/familienarchiv/service/OcrBlockResult.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrBlockResult.java
index 8eda8e02..1bf2d6f2 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/service/OcrBlockResult.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrBlockResult.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.ocr;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/OcrClient.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrClient.java
similarity index 97%
rename from backend/src/main/java/org/raddatz/familienarchiv/service/OcrClient.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrClient.java
index 6af68718..d9b65ac9 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/service/OcrClient.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrClient.java
@@ -1,6 +1,6 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.ocr;
 
-import org.raddatz.familienarchiv.model.ScriptType;
+import org.raddatz.familienarchiv.ocr.ScriptType;
 import org.springframework.lang.Nullable;
 
 import java.util.ArrayList;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/controller/OcrController.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrController.java
similarity index 87%
rename from backend/src/main/java/org/raddatz/familienarchiv/controller/OcrController.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrController.java
index 785cb062..0e0ca7c6 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/controller/OcrController.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrController.java
@@ -1,25 +1,25 @@
-package org.raddatz.familienarchiv.controller;
+package org.raddatz.familienarchiv.ocr;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.raddatz.familienarchiv.dto.BatchOcrDTO;
-import org.raddatz.familienarchiv.dto.OcrStatusDTO;
-import org.raddatz.familienarchiv.dto.TrainingHistoryResponse;
-import org.raddatz.familienarchiv.dto.TrainingInfoResponse;
-import org.raddatz.familienarchiv.dto.TriggerOcrDTO;
-import org.raddatz.familienarchiv.dto.TriggerSenderTrainingDTO;
+import org.raddatz.familienarchiv.ocr.BatchOcrDTO;
+import org.raddatz.familienarchiv.ocr.OcrStatusDTO;
+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.model.OcrJob;
-import org.raddatz.familienarchiv.model.OcrTrainingRun;
+import org.raddatz.familienarchiv.ocr.OcrJob;
+import org.raddatz.familienarchiv.ocr.OcrTrainingRun;
 import org.raddatz.familienarchiv.security.Permission;
 import org.raddatz.familienarchiv.security.RequirePermission;
-import org.raddatz.familienarchiv.service.OcrBatchService;
-import org.raddatz.familienarchiv.service.OcrProgressService;
-import org.raddatz.familienarchiv.service.OcrService;
-import org.raddatz.familienarchiv.service.OcrTrainingService;
-import org.raddatz.familienarchiv.service.SegmentationTrainingExportService;
-import org.raddatz.familienarchiv.service.SenderModelService;
-import org.raddatz.familienarchiv.service.TrainingDataExportService;
+import org.raddatz.familienarchiv.ocr.OcrBatchService;
+import org.raddatz.familienarchiv.ocr.OcrProgressService;
+import org.raddatz.familienarchiv.ocr.OcrService;
+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.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/OcrDocumentStatus.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrDocumentStatus.java
similarity index 69%
rename from backend/src/main/java/org/raddatz/familienarchiv/model/OcrDocumentStatus.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrDocumentStatus.java
index d96620b3..e098b187 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/model/OcrDocumentStatus.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrDocumentStatus.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.model;
+package org.raddatz.familienarchiv.ocr;
 
 public enum OcrDocumentStatus {
     PENDING,
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/OcrHealthClient.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrHealthClient.java
similarity index 58%
rename from backend/src/main/java/org/raddatz/familienarchiv/service/OcrHealthClient.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrHealthClient.java
index 3a62f592..9f9c28b4 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/service/OcrHealthClient.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrHealthClient.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.ocr;
 
 public interface OcrHealthClient {
     boolean isHealthy();
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/OcrJob.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrJob.java
similarity index 97%
rename from backend/src/main/java/org/raddatz/familienarchiv/model/OcrJob.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrJob.java
index 076d3ef3..00a8f68a 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/model/OcrJob.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrJob.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.model;
+package org.raddatz.familienarchiv.ocr;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.*;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/OcrJobDocument.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrJobDocument.java
similarity index 97%
rename from backend/src/main/java/org/raddatz/familienarchiv/model/OcrJobDocument.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrJobDocument.java
index c8f3f702..431ab065 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/model/OcrJobDocument.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrJobDocument.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.model;
+package org.raddatz.familienarchiv.ocr;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.*;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/repository/OcrJobDocumentRepository.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrJobDocumentRepository.java
similarity index 78%
rename from backend/src/main/java/org/raddatz/familienarchiv/repository/OcrJobDocumentRepository.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrJobDocumentRepository.java
index 3d781804..88b164c5 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/repository/OcrJobDocumentRepository.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrJobDocumentRepository.java
@@ -1,7 +1,7 @@
-package org.raddatz.familienarchiv.repository;
+package org.raddatz.familienarchiv.ocr;
 
-import org.raddatz.familienarchiv.model.OcrDocumentStatus;
-import org.raddatz.familienarchiv.model.OcrJobDocument;
+import org.raddatz.familienarchiv.ocr.OcrDocumentStatus;
+import org.raddatz.familienarchiv.ocr.OcrJobDocument;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/repository/OcrJobRepository.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrJobRepository.java
similarity index 63%
rename from backend/src/main/java/org/raddatz/familienarchiv/repository/OcrJobRepository.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrJobRepository.java
index 5d319ccf..ebc6f28a 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/repository/OcrJobRepository.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrJobRepository.java
@@ -1,6 +1,6 @@
-package org.raddatz.familienarchiv.repository;
+package org.raddatz.familienarchiv.ocr;
 
-import org.raddatz.familienarchiv.model.OcrJob;
+import org.raddatz.familienarchiv.ocr.OcrJob;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.UUID;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/OcrJobStatus.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrJobStatus.java
similarity index 64%
rename from backend/src/main/java/org/raddatz/familienarchiv/model/OcrJobStatus.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrJobStatus.java
index 5f1bf442..0c63cac4 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/model/OcrJobStatus.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrJobStatus.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.model;
+package org.raddatz.familienarchiv.ocr;
 
 public enum OcrJobStatus {
     PENDING,
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/OcrProgressService.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrProgressService.java
similarity index 98%
rename from backend/src/main/java/org/raddatz/familienarchiv/service/OcrProgressService.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrProgressService.java
index 8b3bc798..bb95e0c6 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/service/OcrProgressService.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrProgressService.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.ocr;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/OcrService.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrService.java
similarity index 91%
rename from backend/src/main/java/org/raddatz/familienarchiv/service/OcrService.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrService.java
index 65747df8..252b220c 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/service/OcrService.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrService.java
@@ -1,13 +1,15 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.ocr;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.raddatz.familienarchiv.dto.OcrStatusDTO;
+import org.raddatz.familienarchiv.ocr.OcrStatusDTO;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.exception.ErrorCode;
 import org.raddatz.familienarchiv.model.*;
-import org.raddatz.familienarchiv.repository.OcrJobDocumentRepository;
-import org.raddatz.familienarchiv.repository.OcrJobRepository;
+import org.raddatz.familienarchiv.ocr.OcrJobDocumentRepository;
+import org.raddatz.familienarchiv.ocr.OcrJobRepository;
+import org.raddatz.familienarchiv.service.DocumentService;
+import org.raddatz.familienarchiv.service.FileService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/OcrStatusDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrStatusDTO.java
similarity index 89%
rename from backend/src/main/java/org/raddatz/familienarchiv/dto/OcrStatusDTO.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrStatusDTO.java
index c23ca303..36eb8a0c 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/dto/OcrStatusDTO.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrStatusDTO.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.dto;
+package org.raddatz.familienarchiv.ocr;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/OcrStreamEvent.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrStreamEvent.java
similarity index 91%
rename from backend/src/main/java/org/raddatz/familienarchiv/service/OcrStreamEvent.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrStreamEvent.java
index 6a18063b..11c61b02 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/service/OcrStreamEvent.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrStreamEvent.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.ocr;
 
 import java.util.List;
 
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/OcrTrainingRun.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrTrainingRun.java
similarity index 97%
rename from backend/src/main/java/org/raddatz/familienarchiv/model/OcrTrainingRun.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrTrainingRun.java
index c22081aa..ab32728f 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/model/OcrTrainingRun.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrTrainingRun.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.model;
+package org.raddatz.familienarchiv.ocr;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.*;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/repository/OcrTrainingRunRepository.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrTrainingRunRepository.java
similarity index 82%
rename from backend/src/main/java/org/raddatz/familienarchiv/repository/OcrTrainingRunRepository.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrTrainingRunRepository.java
index fb2e5ca9..728a0f3a 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/repository/OcrTrainingRunRepository.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrTrainingRunRepository.java
@@ -1,7 +1,7 @@
-package org.raddatz.familienarchiv.repository;
+package org.raddatz.familienarchiv.ocr;
 
-import org.raddatz.familienarchiv.model.OcrTrainingRun;
-import org.raddatz.familienarchiv.model.TrainingStatus;
+import org.raddatz.familienarchiv.ocr.OcrTrainingRun;
+import org.raddatz.familienarchiv.ocr.TrainingStatus;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/OcrTrainingService.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrTrainingService.java
similarity index 95%
rename from backend/src/main/java/org/raddatz/familienarchiv/service/OcrTrainingService.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrTrainingService.java
index bb5a7919..c0b396ac 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/service/OcrTrainingService.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrTrainingService.java
@@ -1,16 +1,17 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.ocr;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.raddatz.familienarchiv.dto.TrainingHistoryResponse;
-import org.raddatz.familienarchiv.dto.TrainingInfoResponse;
+import org.raddatz.familienarchiv.ocr.TrainingHistoryResponse;
+import org.raddatz.familienarchiv.ocr.TrainingInfoResponse;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.exception.ErrorCode;
-import org.raddatz.familienarchiv.model.OcrTrainingRun;
-import org.raddatz.familienarchiv.model.SenderModel;
-import org.raddatz.familienarchiv.model.TrainingStatus;
-import org.raddatz.familienarchiv.repository.OcrTrainingRunRepository;
+import org.raddatz.familienarchiv.ocr.OcrTrainingRun;
+import org.raddatz.familienarchiv.ocr.SenderModel;
+import org.raddatz.familienarchiv.ocr.TrainingStatus;
+import org.raddatz.familienarchiv.ocr.OcrTrainingRunRepository;
 import org.raddatz.familienarchiv.person.PersonService;
+import org.raddatz.familienarchiv.service.TranscriptionBlockQueryService;
 import org.slf4j.MDC;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.event.EventListener;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/RestClientOcrClient.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/RestClientOcrClient.java
similarity index 99%
rename from backend/src/main/java/org/raddatz/familienarchiv/service/RestClientOcrClient.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/RestClientOcrClient.java
index 2bda9892..e3e02b94 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/service/RestClientOcrClient.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/RestClientOcrClient.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.ocr;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
-import org.raddatz.familienarchiv.model.ScriptType;
+import org.raddatz.familienarchiv.ocr.ScriptType;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.core.io.ByteArrayResource;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/ScriptType.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/ScriptType.java
similarity index 71%
rename from backend/src/main/java/org/raddatz/familienarchiv/model/ScriptType.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/ScriptType.java
index b6ff83e4..3e5179dc 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/model/ScriptType.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/ScriptType.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.model;
+package org.raddatz.familienarchiv.ocr;
 
 public enum ScriptType {
     UNKNOWN,
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/SegmentationTrainingExportService.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/SegmentationTrainingExportService.java
similarity index 96%
rename from backend/src/main/java/org/raddatz/familienarchiv/service/SegmentationTrainingExportService.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/SegmentationTrainingExportService.java
index c41e2abf..cf3caadc 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/service/SegmentationTrainingExportService.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/SegmentationTrainingExportService.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.ocr;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -8,6 +8,10 @@ import org.apache.pdfbox.rendering.PDFRenderer;
 import org.raddatz.familienarchiv.model.Document;
 import org.raddatz.familienarchiv.model.DocumentAnnotation;
 import org.raddatz.familienarchiv.model.TranscriptionBlock;
+import org.raddatz.familienarchiv.service.AnnotationService;
+import org.raddatz.familienarchiv.service.DocumentService;
+import org.raddatz.familienarchiv.service.TranscriptionBlockQueryService;
+import org.raddatz.familienarchiv.service.FileService;
 import org.springframework.stereotype.Service;
 import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
 
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/SenderModel.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/SenderModel.java
similarity index 97%
rename from backend/src/main/java/org/raddatz/familienarchiv/model/SenderModel.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/SenderModel.java
index 4b8586aa..163529c4 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/model/SenderModel.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/SenderModel.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.model;
+package org.raddatz.familienarchiv.ocr;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/repository/SenderModelRepository.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/SenderModelRepository.java
similarity index 71%
rename from backend/src/main/java/org/raddatz/familienarchiv/repository/SenderModelRepository.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/SenderModelRepository.java
index 0bfb05a5..cab852f3 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/repository/SenderModelRepository.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/SenderModelRepository.java
@@ -1,6 +1,6 @@
-package org.raddatz.familienarchiv.repository;
+package org.raddatz.familienarchiv.ocr;
 
-import org.raddatz.familienarchiv.model.SenderModel;
+import org.raddatz.familienarchiv.ocr.SenderModel;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.Optional;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/SenderModelService.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/SenderModelService.java
similarity index 96%
rename from backend/src/main/java/org/raddatz/familienarchiv/service/SenderModelService.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/SenderModelService.java
index 58a14bb6..90449176 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/service/SenderModelService.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/SenderModelService.java
@@ -1,15 +1,16 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.ocr;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.exception.ErrorCode;
-import org.raddatz.familienarchiv.model.OcrTrainingRun;
-import org.raddatz.familienarchiv.model.SenderModel;
-import org.raddatz.familienarchiv.model.TrainingStatus;
-import org.raddatz.familienarchiv.repository.OcrTrainingRunRepository;
-import org.raddatz.familienarchiv.repository.SenderModelRepository;
+import org.raddatz.familienarchiv.ocr.OcrTrainingRun;
+import org.raddatz.familienarchiv.ocr.SenderModel;
+import org.raddatz.familienarchiv.ocr.TrainingStatus;
+import org.raddatz.familienarchiv.ocr.OcrTrainingRunRepository;
+import org.raddatz.familienarchiv.ocr.SenderModelRepository;
 import org.raddatz.familienarchiv.person.PersonService;
+import org.raddatz.familienarchiv.service.TranscriptionBlockQueryService;
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/TrainingDataExportService.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/TrainingDataExportService.java
similarity index 96%
rename from backend/src/main/java/org/raddatz/familienarchiv/service/TrainingDataExportService.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/TrainingDataExportService.java
index 89f69223..af0452af 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/service/TrainingDataExportService.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/TrainingDataExportService.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.ocr;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -8,6 +8,10 @@ import org.apache.pdfbox.rendering.PDFRenderer;
 import org.raddatz.familienarchiv.model.Document;
 import org.raddatz.familienarchiv.model.DocumentAnnotation;
 import org.raddatz.familienarchiv.model.TranscriptionBlock;
+import org.raddatz.familienarchiv.service.AnnotationService;
+import org.raddatz.familienarchiv.service.DocumentService;
+import org.raddatz.familienarchiv.service.TranscriptionBlockQueryService;
+import org.raddatz.familienarchiv.service.FileService;
 import org.springframework.stereotype.Service;
 import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
 
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/TrainingHistoryResponse.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/TrainingHistoryResponse.java
similarity index 63%
rename from backend/src/main/java/org/raddatz/familienarchiv/dto/TrainingHistoryResponse.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/TrainingHistoryResponse.java
index 10c1f42a..4f60ce60 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/dto/TrainingHistoryResponse.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/TrainingHistoryResponse.java
@@ -1,6 +1,6 @@
-package org.raddatz.familienarchiv.dto;
+package org.raddatz.familienarchiv.ocr;
 
-import org.raddatz.familienarchiv.model.OcrTrainingRun;
+import org.raddatz.familienarchiv.ocr.OcrTrainingRun;
 
 import java.util.List;
 import java.util.Map;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/TrainingInfoResponse.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/TrainingInfoResponse.java
similarity index 72%
rename from backend/src/main/java/org/raddatz/familienarchiv/dto/TrainingInfoResponse.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/TrainingInfoResponse.java
index 6f1c6343..cf4b2bb6 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/dto/TrainingInfoResponse.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/TrainingInfoResponse.java
@@ -1,7 +1,7 @@
-package org.raddatz.familienarchiv.dto;
+package org.raddatz.familienarchiv.ocr;
 
-import org.raddatz.familienarchiv.model.OcrTrainingRun;
-import org.raddatz.familienarchiv.model.SenderModel;
+import org.raddatz.familienarchiv.ocr.OcrTrainingRun;
+import org.raddatz.familienarchiv.ocr.SenderModel;
 
 import java.util.List;
 import java.util.Map;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/TrainingLabel.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/TrainingLabel.java
similarity index 65%
rename from backend/src/main/java/org/raddatz/familienarchiv/model/TrainingLabel.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/TrainingLabel.java
index d78585aa..78e0e3f9 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/model/TrainingLabel.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/TrainingLabel.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.model;
+package org.raddatz.familienarchiv.ocr;
 
 public enum TrainingLabel {
     KURRENT_RECOGNITION,
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/TrainingStatus.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/TrainingStatus.java
similarity index 65%
rename from backend/src/main/java/org/raddatz/familienarchiv/model/TrainingStatus.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/TrainingStatus.java
index e91b9967..c6a0992e 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/model/TrainingStatus.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/TrainingStatus.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.model;
+package org.raddatz.familienarchiv.ocr;
 
 public enum TrainingStatus {
     QUEUED,
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/TriggerOcrDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/TriggerOcrDTO.java
similarity index 73%
rename from backend/src/main/java/org/raddatz/familienarchiv/dto/TriggerOcrDTO.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/TriggerOcrDTO.java
index 89db2cef..74dce485 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/dto/TriggerOcrDTO.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/TriggerOcrDTO.java
@@ -1,9 +1,9 @@
-package org.raddatz.familienarchiv.dto;
+package org.raddatz.familienarchiv.ocr;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.raddatz.familienarchiv.model.ScriptType;
+import org.raddatz.familienarchiv.ocr.ScriptType;
 
 @Data
 @NoArgsConstructor
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/TriggerSenderTrainingDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/TriggerSenderTrainingDTO.java
similarity index 87%
rename from backend/src/main/java/org/raddatz/familienarchiv/dto/TriggerSenderTrainingDTO.java
rename to backend/src/main/java/org/raddatz/familienarchiv/ocr/TriggerSenderTrainingDTO.java
index bae2fcb4..3165cc1c 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/dto/TriggerSenderTrainingDTO.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/TriggerSenderTrainingDTO.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.dto;
+package org.raddatz.familienarchiv.ocr;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/DocumentService.java b/backend/src/main/java/org/raddatz/familienarchiv/service/DocumentService.java
index 65b1b9cb..ff9c7213 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/service/DocumentService.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/service/DocumentService.java
@@ -20,8 +20,8 @@ import org.raddatz.familienarchiv.dto.SearchMatchData;
 import org.raddatz.familienarchiv.tag.TagOperator;
 import org.raddatz.familienarchiv.model.Document;
 import org.raddatz.familienarchiv.model.DocumentStatus;
-import org.raddatz.familienarchiv.model.ScriptType;
-import org.raddatz.familienarchiv.model.TrainingLabel;
+import org.raddatz.familienarchiv.ocr.ScriptType;
+import org.raddatz.familienarchiv.ocr.TrainingLabel;
 import org.raddatz.familienarchiv.person.Person;
 import org.raddatz.familienarchiv.tag.Tag;
 import org.raddatz.familienarchiv.repository.DocumentRepository;
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/TranscriptionService.java b/backend/src/main/java/org/raddatz/familienarchiv/service/TranscriptionService.java
index 3065eefa..c7ff4c1e 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/service/TranscriptionService.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/service/TranscriptionService.java
@@ -13,11 +13,12 @@ import org.raddatz.familienarchiv.exception.ErrorCode;
 import org.raddatz.familienarchiv.model.BlockSource;
 import org.raddatz.familienarchiv.model.Document;
 import org.raddatz.familienarchiv.model.DocumentAnnotation;
-import org.raddatz.familienarchiv.model.ScriptType;
+import org.raddatz.familienarchiv.ocr.ScriptType;
 import org.raddatz.familienarchiv.model.TranscriptionBlock;
 import org.raddatz.familienarchiv.model.TranscriptionBlockVersion;
 import org.raddatz.familienarchiv.repository.TranscriptionBlockRepository;
 import org.raddatz.familienarchiv.repository.TranscriptionBlockVersionRepository;
+import org.raddatz.familienarchiv.ocr.SenderModelService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/OcrAsyncRunnerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrAsyncRunnerTest.java
similarity index 97%
rename from backend/src/test/java/org/raddatz/familienarchiv/service/OcrAsyncRunnerTest.java
rename to backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrAsyncRunnerTest.java
index ddafd4c9..8235e9d5 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/service/OcrAsyncRunnerTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrAsyncRunnerTest.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.ocr;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -7,8 +7,14 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.raddatz.familienarchiv.dto.CreateAnnotationDTO;
 import org.raddatz.familienarchiv.model.*;
-import org.raddatz.familienarchiv.repository.OcrJobDocumentRepository;
-import org.raddatz.familienarchiv.repository.OcrJobRepository;
+import org.raddatz.familienarchiv.ocr.OcrJobDocumentRepository;
+import org.raddatz.familienarchiv.ocr.OcrJobRepository;
+
+import org.raddatz.familienarchiv.service.DocumentService;
+import org.raddatz.familienarchiv.service.TranscriptionService;
+import org.raddatz.familienarchiv.service.AnnotationService;
+import org.raddatz.familienarchiv.service.FileService;
+import org.raddatz.familienarchiv.ocr.SenderModelService;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/OcrBatchServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrBatchServiceTest.java
similarity index 93%
rename from backend/src/test/java/org/raddatz/familienarchiv/service/OcrBatchServiceTest.java
rename to backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrBatchServiceTest.java
index 875b5303..7eb4e61b 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/service/OcrBatchServiceTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrBatchServiceTest.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.ocr;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -8,8 +8,8 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.exception.ErrorCode;
 import org.raddatz.familienarchiv.model.*;
-import org.raddatz.familienarchiv.repository.OcrJobDocumentRepository;
-import org.raddatz.familienarchiv.repository.OcrJobRepository;
+import org.raddatz.familienarchiv.ocr.OcrJobDocumentRepository;
+import org.raddatz.familienarchiv.ocr.OcrJobRepository;
 
 import java.util.List;
 import java.util.UUID;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/OcrClientDefaultStreamTest.java b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrClientDefaultStreamTest.java
similarity index 96%
rename from backend/src/test/java/org/raddatz/familienarchiv/service/OcrClientDefaultStreamTest.java
rename to backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrClientDefaultStreamTest.java
index f865f5d6..61ceb84e 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/service/OcrClientDefaultStreamTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrClientDefaultStreamTest.java
@@ -1,7 +1,7 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.ocr;
 
 import org.junit.jupiter.api.Test;
-import org.raddatz.familienarchiv.model.ScriptType;
+import org.raddatz.familienarchiv.ocr.ScriptType;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/controller/OcrControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrControllerTest.java
similarity index 98%
rename from backend/src/test/java/org/raddatz/familienarchiv/controller/OcrControllerTest.java
rename to backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrControllerTest.java
index 9fe3b28b..43d686cb 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/controller/OcrControllerTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrControllerTest.java
@@ -1,13 +1,13 @@
-package org.raddatz.familienarchiv.controller;
+package org.raddatz.familienarchiv.ocr;
 
 import tools.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.Test;
 import org.raddatz.familienarchiv.config.SecurityConfig;
-import org.raddatz.familienarchiv.dto.BatchOcrDTO;
-import org.raddatz.familienarchiv.dto.OcrStatusDTO;
-import org.raddatz.familienarchiv.dto.TrainingHistoryResponse;
-import org.raddatz.familienarchiv.dto.TrainingInfoResponse;
-import org.raddatz.familienarchiv.dto.TriggerOcrDTO;
+import org.raddatz.familienarchiv.ocr.BatchOcrDTO;
+import org.raddatz.familienarchiv.ocr.OcrStatusDTO;
+import org.raddatz.familienarchiv.ocr.TrainingHistoryResponse;
+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.model.*;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/OcrProgressServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrProgressServiceTest.java
similarity index 95%
rename from backend/src/test/java/org/raddatz/familienarchiv/service/OcrProgressServiceTest.java
rename to backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrProgressServiceTest.java
index 44ed276f..7054cde5 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/service/OcrProgressServiceTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrProgressServiceTest.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.ocr;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/OcrServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrServiceTest.java
similarity index 96%
rename from backend/src/test/java/org/raddatz/familienarchiv/service/OcrServiceTest.java
rename to backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrServiceTest.java
index 0776bae9..2aa3076b 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/service/OcrServiceTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrServiceTest.java
@@ -1,16 +1,18 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.ocr;
 
 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.dto.OcrStatusDTO;
+import org.raddatz.familienarchiv.ocr.OcrStatusDTO;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.exception.ErrorCode;
 import org.raddatz.familienarchiv.model.*;
-import org.raddatz.familienarchiv.repository.OcrJobDocumentRepository;
-import org.raddatz.familienarchiv.repository.OcrJobRepository;
+import org.raddatz.familienarchiv.ocr.OcrJobDocumentRepository;
+import org.raddatz.familienarchiv.ocr.OcrJobRepository;
+
+import org.raddatz.familienarchiv.service.DocumentService;
 
 import java.util.Optional;
 import java.util.UUID;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/OcrStreamEventTest.java b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrStreamEventTest.java
similarity index 97%
rename from backend/src/test/java/org/raddatz/familienarchiv/service/OcrStreamEventTest.java
rename to backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrStreamEventTest.java
index d78d3ce8..498d38c8 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/service/OcrStreamEventTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrStreamEventTest.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.ocr;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/OcrTrainingServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrTrainingServiceTest.java
similarity index 97%
rename from backend/src/test/java/org/raddatz/familienarchiv/service/OcrTrainingServiceTest.java
rename to backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrTrainingServiceTest.java
index c892fe68..4511a3a3 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/service/OcrTrainingServiceTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrTrainingServiceTest.java
@@ -1,17 +1,20 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.ocr;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.raddatz.familienarchiv.dto.TrainingHistoryResponse;
-import org.raddatz.familienarchiv.dto.TrainingInfoResponse;
+import org.raddatz.familienarchiv.ocr.TrainingHistoryResponse;
+import org.raddatz.familienarchiv.ocr.TrainingInfoResponse;
 import org.raddatz.familienarchiv.exception.DomainException;
-import org.raddatz.familienarchiv.model.OcrTrainingRun;
+import org.raddatz.familienarchiv.ocr.OcrTrainingRun;
 import org.raddatz.familienarchiv.person.Person;
-import org.raddatz.familienarchiv.model.SenderModel;
-import org.raddatz.familienarchiv.model.TrainingStatus;
+import org.raddatz.familienarchiv.ocr.SenderModel;
+import org.raddatz.familienarchiv.ocr.TrainingStatus;
 import org.raddatz.familienarchiv.model.TranscriptionBlock;
-import org.raddatz.familienarchiv.repository.OcrTrainingRunRepository;
+import org.raddatz.familienarchiv.ocr.OcrTrainingRunRepository;
 import org.raddatz.familienarchiv.person.PersonService;
+
+import org.raddatz.familienarchiv.ocr.SenderModelService;
+import org.raddatz.familienarchiv.service.TranscriptionBlockQueryService;
 import org.springframework.transaction.support.TransactionCallback;
 import org.springframework.transaction.support.TransactionTemplate;
 
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/RestClientOcrClientStreamTest.java b/backend/src/test/java/org/raddatz/familienarchiv/ocr/RestClientOcrClientStreamTest.java
similarity index 99%
rename from backend/src/test/java/org/raddatz/familienarchiv/service/RestClientOcrClientStreamTest.java
rename to backend/src/test/java/org/raddatz/familienarchiv/ocr/RestClientOcrClientStreamTest.java
index 7fe37483..bbf4cd56 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/service/RestClientOcrClientStreamTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/ocr/RestClientOcrClientStreamTest.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.ocr;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/RestClientOcrClientTrainingTest.java b/backend/src/test/java/org/raddatz/familienarchiv/ocr/RestClientOcrClientTrainingTest.java
similarity index 97%
rename from backend/src/test/java/org/raddatz/familienarchiv/service/RestClientOcrClientTrainingTest.java
rename to backend/src/test/java/org/raddatz/familienarchiv/ocr/RestClientOcrClientTrainingTest.java
index 17f084fa..d201a12f 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/service/RestClientOcrClientTrainingTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/ocr/RestClientOcrClientTrainingTest.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.ocr;
 
 import com.sun.net.httpserver.HttpServer;
 import org.junit.jupiter.api.Test;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/SenderModelServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/ocr/SenderModelServiceTest.java
similarity index 97%
rename from backend/src/test/java/org/raddatz/familienarchiv/service/SenderModelServiceTest.java
rename to backend/src/test/java/org/raddatz/familienarchiv/ocr/SenderModelServiceTest.java
index 1c74e84a..70965cd2 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/service/SenderModelServiceTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/ocr/SenderModelServiceTest.java
@@ -1,18 +1,21 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.ocr;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.raddatz.familienarchiv.model.OcrTrainingRun;
-import org.raddatz.familienarchiv.model.SenderModel;
-import org.raddatz.familienarchiv.model.TrainingStatus;
+import org.raddatz.familienarchiv.ocr.OcrTrainingRun;
+import org.raddatz.familienarchiv.ocr.SenderModel;
+import org.raddatz.familienarchiv.ocr.TrainingStatus;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.exception.ErrorCode;
 import org.raddatz.familienarchiv.person.Person;
-import org.raddatz.familienarchiv.repository.OcrTrainingRunRepository;
-import org.raddatz.familienarchiv.repository.SenderModelRepository;
+import org.raddatz.familienarchiv.ocr.OcrTrainingRunRepository;
+import org.raddatz.familienarchiv.ocr.SenderModelRepository;
 import org.raddatz.familienarchiv.person.PersonService;
+
+import org.raddatz.familienarchiv.ocr.SenderModelService;
+import org.raddatz.familienarchiv.service.TranscriptionBlockQueryService;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.transaction.support.TransactionCallback;
 import org.springframework.transaction.support.TransactionTemplate;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/TrainingDataExportServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/ocr/TrainingDataExportServiceTest.java
similarity index 97%
rename from backend/src/test/java/org/raddatz/familienarchiv/service/TrainingDataExportServiceTest.java
rename to backend/src/test/java/org/raddatz/familienarchiv/ocr/TrainingDataExportServiceTest.java
index eca0c0e0..3073f222 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/service/TrainingDataExportServiceTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/ocr/TrainingDataExportServiceTest.java
@@ -1,4 +1,4 @@
-package org.raddatz.familienarchiv.service;
+package org.raddatz.familienarchiv.ocr;
 
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -12,6 +12,12 @@ import org.raddatz.familienarchiv.model.*;
 import org.raddatz.familienarchiv.repository.AnnotationRepository;
 import org.raddatz.familienarchiv.repository.DocumentRepository;
 import org.raddatz.familienarchiv.repository.TranscriptionBlockRepository;
+
+import org.raddatz.familienarchiv.service.DocumentService;
+import org.raddatz.familienarchiv.service.AnnotationService;
+import org.raddatz.familienarchiv.service.FileService;
+import org.raddatz.familienarchiv.service.TranscriptionBlockQueryService;
+import org.raddatz.familienarchiv.ocr.TrainingLabel;
 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/repository/TrainingBlockQueryTest.java b/backend/src/test/java/org/raddatz/familienarchiv/repository/TrainingBlockQueryTest.java
index eba832dd..d0420f35 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/repository/TrainingBlockQueryTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/repository/TrainingBlockQueryTest.java
@@ -7,6 +7,8 @@ import org.raddatz.familienarchiv.config.FlywayConfig;
 import org.raddatz.familienarchiv.model.*;
 import org.raddatz.familienarchiv.person.Person;
 import org.raddatz.familienarchiv.person.PersonRepository;
+
+import org.raddatz.familienarchiv.ocr.TrainingLabel;
 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/service/TranscriptionServiceGuidedTest.java b/backend/src/test/java/org/raddatz/familienarchiv/service/TranscriptionServiceGuidedTest.java
index dc423326..2593b2a6 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/service/TranscriptionServiceGuidedTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/service/TranscriptionServiceGuidedTest.java
@@ -7,6 +7,7 @@ import org.raddatz.familienarchiv.model.BlockSource;
 import org.raddatz.familienarchiv.model.TranscriptionBlock;
 import org.raddatz.familienarchiv.repository.TranscriptionBlockRepository;
 import org.raddatz.familienarchiv.repository.TranscriptionBlockVersionRepository;
+import org.raddatz.familienarchiv.ocr.SenderModelService;
 
 import java.util.Optional;
 import java.util.UUID;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/TranscriptionServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/service/TranscriptionServiceTest.java
index 4de8613b..adf2439c 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/service/TranscriptionServiceTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/service/TranscriptionServiceTest.java
@@ -18,11 +18,12 @@ import org.raddatz.familienarchiv.model.Document;
 import org.raddatz.familienarchiv.model.DocumentAnnotation;
 import org.raddatz.familienarchiv.person.Person;
 import org.raddatz.familienarchiv.model.PersonMention;
-import org.raddatz.familienarchiv.model.ScriptType;
+import org.raddatz.familienarchiv.ocr.ScriptType;
 import org.raddatz.familienarchiv.model.TranscriptionBlock;
 import org.raddatz.familienarchiv.model.TranscriptionBlockVersion;
 import org.raddatz.familienarchiv.repository.TranscriptionBlockRepository;
 import org.raddatz.familienarchiv.repository.TranscriptionBlockVersionRepository;
+import org.raddatz.familienarchiv.ocr.SenderModelService;
 
 import java.util.Map;