diff --git a/lib/Controller/AdminController.php b/lib/Controller/AdminController.php
index 1d6dfadc04..98760b726f 100644
--- a/lib/Controller/AdminController.php
+++ b/lib/Controller/AdminController.php
@@ -908,7 +908,7 @@ public function footerTemplatePreviewPdf(string $template = '', int $width = 595
 	#[ApiRoute(verb: 'POST', url: '/api/{apiVersion}/admin/signature-flow/config', requirements: ['apiVersion' => '(v1)'])]
 	public function setSignatureFlowConfig(string $mode): DataResponse {
 		try {
-			$signatureFlow = \OCA\Libresign\Service\SignatureFlow::from($mode);
+			$signatureFlow = \OCA\Libresign\Enum\SignatureFlow::from($mode);
 		} catch (\ValueError) {
 			return new DataResponse([
 				'error' => $this->l10n->t('Invalid signature flow mode. Use "parallel" or "ordered_numeric".'),
@@ -916,7 +916,7 @@ public function setSignatureFlowConfig(string $mode): DataResponse {
 		}
 
 		try {
-			if ($signatureFlow === \OCA\Libresign\Service\SignatureFlow::PARALLEL) {
+			if ($signatureFlow === \OCA\Libresign\Enum\SignatureFlow::PARALLEL) {
 				$this->appConfig->deleteKey(Application::APP_ID, 'signature_flow');
 			} else {
 				$this->appConfig->setValueString(
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index e78fef645a..143b25c190 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -95,7 +95,7 @@ public function index(): TemplateResponse {
 
 		$this->provideSignerSignatues();
 		$this->initialState->provideInitialState('identify_methods', $this->identifyMethodService->getIdentifyMethodsSettings());
-		$this->initialState->provideInitialState('signature_flow', $this->appConfig->getValueString(Application::APP_ID, 'signature_flow', \OCA\Libresign\Service\SignatureFlow::PARALLEL->value));
+		$this->initialState->provideInitialState('signature_flow', $this->appConfig->getValueString(Application::APP_ID, 'signature_flow', \OCA\Libresign\Enum\SignatureFlow::PARALLEL->value));
 		$this->initialState->provideInitialState('legal_information', $this->appConfig->getValueString(Application::APP_ID, 'legal_information'));
 
 		Util::addScript(Application::APP_ID, 'libresign-main');
diff --git a/lib/Db/SignRequest.php b/lib/Db/SignRequest.php
index 4961481d28..3c4e6da98a 100644
--- a/lib/Db/SignRequest.php
+++ b/lib/Db/SignRequest.php
@@ -8,6 +8,7 @@
 
 namespace OCA\Libresign\Db;
 
+use OCA\Libresign\Enum\SignRequestStatus;
 use OCP\AppFramework\Db\Entity;
 use OCP\DB\Types;
 
diff --git a/lib/Db/SignRequestStatus.php b/lib/Enum/SignRequestStatus.php
similarity index 88%
rename from lib/Db/SignRequestStatus.php
rename to lib/Enum/SignRequestStatus.php
index 6b3776dbb7..7767179b66 100644
--- a/lib/Db/SignRequestStatus.php
+++ b/lib/Enum/SignRequestStatus.php
@@ -1,12 +1,13 @@
 <?php
 
 declare(strict_types=1);
+
 /**
  * SPDX-FileCopyrightText: 2025 LibreCode coop and contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\Libresign\Db;
+namespace OCA\Libresign\Enum;
 
 enum SignRequestStatus: int {
 	case DRAFT = 0;
diff --git a/lib/Service/SignatureFlow.php b/lib/Enum/SignatureFlow.php
similarity index 89%
rename from lib/Service/SignatureFlow.php
rename to lib/Enum/SignatureFlow.php
index 721b696d32..ba4d99383c 100644
--- a/lib/Service/SignatureFlow.php
+++ b/lib/Enum/SignatureFlow.php
@@ -1,12 +1,13 @@
 <?php
 
 declare(strict_types=1);
+
 /**
  * SPDX-FileCopyrightText: 2025 LibreCode coop and contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace OCA\Libresign\Service;
+namespace OCA\Libresign\Enum;
 
 /**
  * Signature flow modes
diff --git a/lib/Files/TemplateLoader.php b/lib/Files/TemplateLoader.php
index 6986027d35..a5f826222b 100644
--- a/lib/Files/TemplateLoader.php
+++ b/lib/Files/TemplateLoader.php
@@ -59,7 +59,7 @@ public function handle(Event $event): void {
 
 		$this->initialState->provideInitialState(
 			'signature_flow',
-			$this->appConfig->getValueString(Application::APP_ID, 'signature_flow', \OCA\Libresign\Service\SignatureFlow::PARALLEL->value)
+			$this->appConfig->getValueString(Application::APP_ID, 'signature_flow', \OCA\Libresign\Enum\SignatureFlow::PARALLEL->value)
 		);
 
 		try {
diff --git a/lib/Helper/ValidateHelper.php b/lib/Helper/ValidateHelper.php
index 0e613df31d..fecff24eeb 100644
--- a/lib/Helper/ValidateHelper.php
+++ b/lib/Helper/ValidateHelper.php
@@ -720,14 +720,14 @@ private function validateSignerStatus(string $uuid): void {
 		$signRequest = $this->signRequestMapper->getByUuid($uuid);
 		$status = $signRequest->getStatusEnum();
 
-		if ($status === \OCA\Libresign\Db\SignRequestStatus::DRAFT) {
+		if ($status === \OCA\Libresign\Enum\SignRequestStatus::DRAFT) {
 			throw new LibresignException(json_encode([
 				'action' => JSActions::ACTION_DO_NOTHING,
 				'errors' => [['message' => $this->l10n->t('You are not allowed to sign this document yet')]],
 			]));
 		}
 
-		if ($status === \OCA\Libresign\Db\SignRequestStatus::SIGNED) {
+		if ($status === \OCA\Libresign\Enum\SignRequestStatus::SIGNED) {
 			throw new LibresignException(json_encode([
 				'action' => JSActions::ACTION_DO_NOTHING,
 				'errors' => [['message' => $this->l10n->t('Document already signed')]],
diff --git a/lib/Service/RequestSignatureService.php b/lib/Service/RequestSignatureService.php
index 2a3b5acc99..4dd1e358ce 100644
--- a/lib/Service/RequestSignatureService.php
+++ b/lib/Service/RequestSignatureService.php
@@ -267,14 +267,14 @@ private function associateToSigner(
 		$isNewSignRequest = !$signRequest->getId();
 		$currentStatus = $signRequest->getStatusEnum();
 
-		if ($isNewSignRequest || $currentStatus === \OCA\Libresign\Db\SignRequestStatus::DRAFT) {
+		if ($isNewSignRequest || $currentStatus === \OCA\Libresign\Enum\SignRequestStatus::DRAFT) {
 			$initialStatus = $this->determineInitialStatus($signingOrder);
 			$signRequest->setStatusEnum($initialStatus);
 		}
 
 		$this->saveSignRequest($signRequest);
 
-		$shouldNotify = $notify && $signRequest->getStatusEnum() === \OCA\Libresign\Db\SignRequestStatus::ABLE_TO_SIGN;
+		$shouldNotify = $notify && $signRequest->getStatusEnum() === \OCA\Libresign\Enum\SignRequestStatus::ABLE_TO_SIGN;
 
 		foreach ($identifyMethodsIncances as $identifyMethod) {
 			$identifyMethod->getEntity()->setSignRequestId($signRequest->getId());
@@ -284,14 +284,14 @@ private function associateToSigner(
 		return $signRequest;
 	}
 
-	private function determineInitialStatus(int $signingOrder): \OCA\Libresign\Db\SignRequestStatus {
+	private function determineInitialStatus(int $signingOrder): \OCA\Libresign\Enum\SignRequestStatus {
 		if (!$this->sequentialSigningService->isOrderedNumericFlow()) {
-			return \OCA\Libresign\Db\SignRequestStatus::ABLE_TO_SIGN;
+			return \OCA\Libresign\Enum\SignRequestStatus::ABLE_TO_SIGN;
 		}
 
 		return $signingOrder === 1
-			? \OCA\Libresign\Db\SignRequestStatus::ABLE_TO_SIGN
-			: \OCA\Libresign\Db\SignRequestStatus::DRAFT;
+			? \OCA\Libresign\Enum\SignRequestStatus::ABLE_TO_SIGN
+			: \OCA\Libresign\Enum\SignRequestStatus::DRAFT;
 	}
 
 	/**
diff --git a/lib/Service/SequentialSigningService.php b/lib/Service/SequentialSigningService.php
index db67ad6eb7..7c3398890f 100644
--- a/lib/Service/SequentialSigningService.php
+++ b/lib/Service/SequentialSigningService.php
@@ -10,7 +10,8 @@
 
 use OCA\Libresign\AppInfo\Application;
 use OCA\Libresign\Db\SignRequestMapper;
-use OCA\Libresign\Db\SignRequestStatus;
+use OCA\Libresign\Enum\SignatureFlow;
+use OCA\Libresign\Enum\SignRequestStatus;
 use OCP\IAppConfig;
 
 class SequentialSigningService {
diff --git a/lib/Service/SignFileService.php b/lib/Service/SignFileService.php
index 9ae82dfe96..c67ff9f46d 100644
--- a/lib/Service/SignFileService.php
+++ b/lib/Service/SignFileService.php
@@ -376,7 +376,7 @@ protected function updateSignRequest(string $hash): void {
 		$lastSignedDate = $this->getEngine()->getLastSignedDate();
 		$this->signRequest->setSigned($lastSignedDate);
 		$this->signRequest->setSignedHash($hash);
-		$this->signRequest->setStatusEnum(\OCA\Libresign\Db\SignRequestStatus::SIGNED);
+		$this->signRequest->setStatusEnum(\OCA\Libresign\Enum\SignRequestStatus::SIGNED);
 
 		$this->signRequestMapper->update($this->signRequest);
 
diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php
index 257e5d17e6..eef5e75a17 100644
--- a/lib/Settings/Admin.php
+++ b/lib/Settings/Admin.php
@@ -9,6 +9,7 @@
 namespace OCA\Libresign\Settings;
 
 use OCA\Libresign\AppInfo\Application;
+use OCA\Libresign\Enum\SignatureFlow;
 use OCA\Libresign\Exception\LibresignException;
 use OCA\Libresign\Handler\CertificateEngine\CertificateEngineFactory;
 use OCA\Libresign\Service\CertificatePolicyService;
@@ -16,7 +17,6 @@
 use OCA\Libresign\Service\FooterService;
 use OCA\Libresign\Service\IdentifyMethodService;
 use OCA\Libresign\Service\SignatureBackgroundService;
-use OCA\Libresign\Service\SignatureFlow;
 use OCA\Libresign\Service\SignatureTextService;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Services\IInitialState;