diff --git a/apps/red-ui/src/app/guards/dossier-files-guard.ts b/apps/red-ui/src/app/guards/dossier-files-guard.ts
index aa805c35d..b6229360b 100644
--- a/apps/red-ui/src/app/guards/dossier-files-guard.ts
+++ b/apps/red-ui/src/app/guards/dossier-files-guard.ts
@@ -4,7 +4,7 @@ import { FilesMapService } from '@services/entity-services/files-map.service';
 import { FilesService } from '@services/entity-services/files.service';
 import { firstValueFrom } from 'rxjs';
 import { DOSSIER_ID } from '@utils/constants';
-import { DossiersService } from '../services/dossiers/dossiers.service';
+import { DossiersService } from '@services/dossiers/dossiers.service';
 
 @Injectable({ providedIn: 'root' })
 export class DossierFilesGuard implements CanActivate {
diff --git a/apps/red-ui/src/app/guards/file-preview.guard.ts b/apps/red-ui/src/app/guards/file-preview.guard.ts
index d858d4295..23ff8f2cb 100644
--- a/apps/red-ui/src/app/guards/file-preview.guard.ts
+++ b/apps/red-ui/src/app/guards/file-preview.guard.ts
@@ -2,7 +2,7 @@ import { Injectable, Injector, ProviderToken } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router';
 import { FilesMapService } from '@services/entity-services/files-map.service';
 import { DOSSIER_ID, FILE_ID } from '@utils/constants';
-import { DossiersService } from '../services/dossiers/dossiers.service';
+import { DossiersService } from '@services/dossiers/dossiers.service';
 
 @Injectable({ providedIn: 'root' })
 export class FilePreviewGuard implements CanActivate {
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts
index ccd38d381..f704bc10f 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts
@@ -11,7 +11,7 @@ import {
 } from '@iqser/common-ui';
 import { DossierState, IDossierState } from '@red/domain';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
-import { ActiveDossiersService } from '../../../../services/dossiers/active-dossiers.service';
+import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
 import { DossierStateService } from '@services/entity-services/dossier-state.service';
 import { firstValueFrom } from 'rxjs';
 import { AdminDialogService } from '../../services/admin-dialog.service';
diff --git a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts
index 11faf7a6b..188ad23c7 100644
--- a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts
@@ -4,8 +4,6 @@ import {
     ConfirmationDialogInput,
     DefaultListingServicesTmp,
     EntitiesService,
-    getLeftDateTime,
-    IListable,
     ListingComponent,
     LoadingService,
     SortingOrders,
diff --git a/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts b/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts
index 2016726c3..2c84c7f4f 100644
--- a/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts
+++ b/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts
@@ -24,7 +24,7 @@ import { AddEditDossierStateDialogComponent } from '../dialogs/add-edit-dossier-
 import { ConfirmDeleteDossierStateDialogComponent } from '../dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { firstValueFrom, forkJoin } from 'rxjs';
-import { ActiveDossiersService } from '../../../services/dossiers/active-dossiers.service';
+import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
 import { UserService } from '../../../services/user.service';
 import { IDossierAttributeConfig, IFileAttributeConfig, IReportTemplate } from '@red/domain';
 import { ReportTemplateService } from '../../../services/report-template.service';
diff --git a/apps/red-ui/src/app/modules/archive/components/table-item/table-item.component.ts b/apps/red-ui/src/app/modules/archive/components/table-item/table-item.component.ts
index eb2fb8997..84c4bcd65 100644
--- a/apps/red-ui/src/app/modules/archive/components/table-item/table-item.component.ts
+++ b/apps/red-ui/src/app/modules/archive/components/table-item/table-item.component.ts
@@ -1,7 +1,7 @@
 import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core';
 import { Dossier, DossierStats } from '@red/domain';
 import { BehaviorSubject, Observable } from 'rxjs';
-import { DossierStatsService } from '../../../../services/dossiers/dossier-stats.service';
+import { DossierStatsService } from '@services/dossiers/dossier-stats.service';
 import { switchMap } from 'rxjs/operators';
 
 @Component({
diff --git a/apps/red-ui/src/app/modules/archive/screens/archived-dossiers-screen/archived-dossiers-screen.component.ts b/apps/red-ui/src/app/modules/archive/screens/archived-dossiers-screen/archived-dossiers-screen.component.ts
index 1cbc63466..b651db513 100644
--- a/apps/red-ui/src/app/modules/archive/screens/archived-dossiers-screen/archived-dossiers-screen.component.ts
+++ b/apps/red-ui/src/app/modules/archive/screens/archived-dossiers-screen/archived-dossiers-screen.component.ts
@@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, forwardRef, Injector } from '@angul
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { ConfigService } from '../../services/config.service';
 import { DefaultListingServicesTmp, EntitiesService, ListingComponent } from '@iqser/common-ui';
-import { ArchivedDossiersService } from '../../../../services/dossiers/archived-dossiers.service';
+import { ArchivedDossiersService } from '@services/dossiers/archived-dossiers.service';
 import { Dossier } from '@red/domain';
 
 @Component({
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.ts
index 6bd016a29..0948c1627 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/force-redaction-dialog/force-annotation-dialog.component.ts
@@ -4,8 +4,7 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { BaseDialogComponent, Toaster } from '@iqser/common-ui';
 import { TranslateService } from '@ngx-translate/core';
 import { UserService } from '@services/user.service';
-import { ManualAnnotationService } from '../../services/manual-annotation.service';
-import { PermissionsService } from '@services/permissions.service';
+import { ManualAnnotationService } from '@services/manual-annotation.service';
 import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
 import { JustificationsService } from '@services/entity-services/justifications.service';
 import { Dossier, ILegalBasisChangeRequest } from '@red/domain';
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts
index d1b8ab602..1395d4911 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts
@@ -2,7 +2,7 @@ import { Component, Inject, Injector, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { ManualRedactionEntryWrapper } from '@models/file/manual-redaction-entry.wrapper';
-import { ManualAnnotationService } from '../../services/manual-annotation.service';
+import { ManualAnnotationService } from '@services/manual-annotation.service';
 import { PermissionsService } from '@services/permissions.service';
 import { JustificationsService } from '@services/entity-services/justifications.service';
 import { Dictionary, Dossier, IAddRedactionRequest } from '@red/domain';
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.ts
index ee4f3070e..5f2ac9a30 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.ts
@@ -1,11 +1,9 @@
 import { Component, Inject, Injector, OnInit } from '@angular/core';
 import { FormBuilder, Validators } from '@angular/forms';
-import { PermissionsService } from '@services/permissions.service';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { AnnotationWrapper } from '@models/file/annotation.wrapper';
 import { imageCategoriesTranslations } from '../../translations/image-categories-translations';
-import { ImageCategory } from '../../models/image-category.model';
-import { Dossier } from '@red/domain';
+import { Dossier, ImageCategory } from '@red/domain';
 import { BaseDialogComponent } from '@iqser/common-ui';
 
 @Component({
diff --git a/apps/red-ui/src/app/modules/dossier/dossiers.module.ts b/apps/red-ui/src/app/modules/dossier/dossiers.module.ts
index 0093f4dd6..94222f209 100644
--- a/apps/red-ui/src/app/modules/dossier/dossiers.module.ts
+++ b/apps/red-ui/src/app/modules/dossier/dossiers.module.ts
@@ -13,7 +13,6 @@ import { SharedDossiersModule } from './shared/shared-dossiers.module';
 import { ResizeAnnotationDialogComponent } from './dialogs/resize-annotation-dialog/resize-annotation-dialog.component';
 import { HighlightActionDialogComponent } from './screens/file-preview-screen/dialogs/highlight-action-dialog/highlight-action-dialog.component';
 import { ColorPickerModule } from 'ngx-color-picker';
-import { ManualAnnotationService } from './services/manual-annotation.service';
 
 const dialogs = [
     ManualAnnotationDialogComponent,
@@ -25,8 +24,6 @@ const dialogs = [
     HighlightActionDialogComponent,
 ];
 
-const services = [ManualAnnotationService];
-
 @NgModule({
     declarations: [...dialogs],
     imports: [
@@ -38,6 +35,5 @@ const services = [ManualAnnotationService];
         OverlayModule,
         ColorPickerModule,
     ],
-    providers: [...services],
 })
 export class DossiersModule {}
diff --git a/apps/red-ui/src/app/modules/dossier/models/image-category.model.ts b/apps/red-ui/src/app/modules/dossier/models/image-category.model.ts
deleted file mode 100644
index cbfc5355f..000000000
--- a/apps/red-ui/src/app/modules/dossier/models/image-category.model.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type ImageCategory = 'signature' | 'logo' | 'formula' | 'image';
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts
index 915058867..dfcd93228 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts
@@ -5,7 +5,7 @@ import { DossierTemplatesService } from '@services/entity-services/dossier-templ
 import { FilesService } from '@services/entity-services/files.service';
 import { firstValueFrom, Observable } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { DossierStatsService } from '../../../../../../services/dossiers/dossier-stats.service';
+import { DossierStatsService } from '@services/dossiers/dossier-stats.service';
 import { FilesMapService } from '@services/entity-services/files-map.service';
 
 @Component({
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts
index bec608190..f1d09e6a6 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts
@@ -8,12 +8,12 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { Dossier, DossierAttributeWithValue, DossierStats, IDossierRequest, StatusSorter, User } from '@red/domain';
 import { ActivatedRoute } from '@angular/router';
 import { firstValueFrom, Observable } from 'rxjs';
-import { DossierStatsService } from '../../../../../../services/dossiers/dossier-stats.service';
+import { DossierStatsService } from '@services/dossiers/dossier-stats.service';
 import { map, pluck, switchMap } from 'rxjs/operators';
 import { DossiersDialogService } from '../../../../services/dossiers-dialog.service';
 import { FilesService } from '@services/entity-services/files.service';
 import { DOSSIER_ID } from '@utils/constants';
-import { DossiersService } from '../../../../../../services/dossiers/dossiers.service';
+import { DossiersService } from '@services/dossiers/dossiers.service';
 
 @Component({
     selector: 'redaction-dossier-details',
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.ts
index 76f4acbfc..89d4641f0 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/dossier-overview-screen-header.component.ts
@@ -21,7 +21,7 @@ import { ConfigService } from '../../config.service';
 import { firstValueFrom } from 'rxjs';
 import { PrimaryFileAttributeService } from '../../../../../../services/primary-file-attribute.service';
 import { Router } from '@angular/router';
-import { DossiersService } from '../../../../../../services/dossiers/dossiers.service';
+import { DossiersService } from '@services/dossiers/dossiers.service';
 
 @Component({
     selector: 'redaction-dossier-overview-screen-header',
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts
index 3cdfc9623..06233304b 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts
@@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
 import { File } from '@red/domain';
 import { UserService } from '@services/user.service';
 import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service';
-import { DossiersService } from '../../../../../../../services/dossiers/dossiers.service';
+import { DossiersService } from '@services/dossiers/dossiers.service';
 
 @Component({
     selector: 'redaction-file-workload',
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts
index f586fca22..29244ba09 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts
@@ -44,7 +44,7 @@ import { FilesMapService } from '@services/entity-services/files-map.service';
 import { FilesService } from '@services/entity-services/files.service';
 import { DOSSIER_ID } from '@utils/constants';
 import { BulkActionsService } from '../services/bulk-actions.service';
-import { DossiersService } from '../../../../../services/dossiers/dossiers.service';
+import { DossiersService } from '@services/dossiers/dossiers.service';
 import { dossiersServiceProvider } from '@services/entity-services/dossiers.service.provider';
 
 @Component({
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts
index fb241f571..9d1de5727 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/services/bulk-actions.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { Dossier, File } from '@red/domain';
 import { DossiersDialogService } from '../../../services/dossiers-dialog.service';
 import { ConfirmationDialogInput, LoadingService } from '@iqser/common-ui';
-import { ActiveDossiersService } from '../../../../../services/dossiers/active-dossiers.service';
+import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
 import { FilesService } from '@services/entity-services/files.service';
 import { FileAssignService } from '../../../shared/services/file-assign.service';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts
index 42ad618cb..f4b1375e2 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts
@@ -8,7 +8,7 @@ import { LongPressEvent } from '@shared/directives/long-press.directive';
 import { UserPreferenceService } from '@services/user-preference.service';
 import { FilesMapService } from '@services/entity-services/files-map.service';
 import { ReanalysisService } from '@services/reanalysis.service';
-import { ActiveDossiersService } from '../../../../../../services/dossiers/active-dossiers.service';
+import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
 import { firstValueFrom } from 'rxjs';
 
 @Component({
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts
index f329fc38c..72d2d8988 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-details/dossiers-listing-details.component.ts
@@ -1,13 +1,13 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { DoughnutChartConfig } from '@shared/components/simple-doughnut-chart/simple-doughnut-chart.component';
 import { FilterService, mapEach } from '@iqser/common-ui';
-import { ActiveDossiersService } from '../../../../../../services/dossiers/active-dossiers.service';
+import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
 import { combineLatest, Observable } from 'rxjs';
 import { DossierStats, FileCountPerWorkflowStatus, StatusSorter } from '@red/domain';
 import { workflowFileStatusTranslations } from '../../../../../../translations/file-status-translations';
 import { TranslateChartService } from '@services/translate-chart.service';
 import { filter, map, switchMap } from 'rxjs/operators';
-import { DossierStatsService } from '../../../../../../services/dossiers/dossier-stats.service';
+import { DossierStatsService } from '@services/dossiers/dossier-stats.service';
 import { DossierStateService } from '@services/entity-services/dossier-state.service';
 import { TranslateService } from '@ngx-translate/core';
 
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.ts
index 209e5bebf..410becc74 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core';
 import { Dossier, DossierStats } from '@red/domain';
-import { DossierStatsService } from '../../../../../../services/dossiers/dossier-stats.service';
+import { DossierStatsService } from '@services/dossiers/dossier-stats.service';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts
index 4cf52fe54..d4d510284 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts
@@ -9,7 +9,7 @@ import { workflowFileStatusTranslations } from '../../../../translations/file-st
 import { dossierMemberChecker, dossierStateChecker, dossierTemplateChecker, RedactionFilterSorter } from '@utils/index';
 import { workloadTranslations } from '../../translations/workload-translations';
 import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service';
-import { DossierStatsService } from '../../../../services/dossiers/dossier-stats.service';
+import { DossierStatsService } from '@services/dossiers/dossier-stats.service';
 import { DossierStateService } from '@services/entity-services/dossier-state.service';
 
 @Injectable()
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts
index 1d78c6fe4..b1f01c516 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts
@@ -8,7 +8,7 @@ import { DossiersDialogService } from '../../../services/dossiers-dialog.service
 import { DefaultListingServicesTmp, EntitiesService, ListingComponent, OnAttach, TableComponent } from '@iqser/common-ui';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { ConfigService } from '../config.service';
-import { ActiveDossiersService } from '../../../../../services/dossiers/active-dossiers.service';
+import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
 import { FilesService } from '@services/entity-services/files.service';
 import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service';
 import { tap } from 'rxjs/operators';
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/comments/comments.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/comments/comments.component.ts
index c61620499..7af877e30 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/comments/comments.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/comments/comments.component.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, HostBinding, Input, OnChanges, ViewChild } from '@angular/core';
 import { File, IComment } from '@red/domain';
-import { ManualAnnotationService } from '../../../../services/manual-annotation.service';
+import { ManualAnnotationService } from '@services/manual-annotation.service';
 import { AnnotationWrapper } from '@models/file/annotation.wrapper';
 import { UserService } from '@services/user.service';
 import { PermissionsService } from '@services/permissions.service';
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.ts
index f77c75107..8ea44bdff 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.ts
@@ -20,7 +20,7 @@ import {
     ManualRedactionEntryWrapper,
 } from '@models/file/manual-redaction-entry.wrapper';
 import { AnnotationWrapper } from '@models/file/annotation.wrapper';
-import { ManualAnnotationService } from '../../../../services/manual-annotation.service';
+import { ManualAnnotationService } from '@services/manual-annotation.service';
 import { environment } from '@environments/environment';
 import { AnnotationDrawService } from '../../services/annotation-draw.service';
 import { AnnotationActionsService } from '../../services/annotation-actions.service';
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts
index c95fb14c6..ee84ab58a 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.ts
@@ -11,7 +11,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { BehaviorSubject, combineLatest, combineLatestWith, firstValueFrom, Observable, switchMap } from 'rxjs';
 import { FilePreviewStateService } from '../../services/file-preview-state.service';
 import { distinctUntilChanged, map } from 'rxjs/operators';
-import { ActiveDossiersService } from '../../../../../../services/dossiers/active-dossiers.service';
+import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
 
 @Component({
     selector: 'redaction-user-management',
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.ts
index 23486c7f9..d232e5ba9 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/dialogs/accept-recommendation-dialog/accept-recommendation-dialog.component.ts
@@ -3,11 +3,11 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { PermissionsService } from '@services/permissions.service';
 import { Dictionary, Dossier } from '@red/domain';
-import { ActiveDossiersService } from '../../../../../../services/dossiers/active-dossiers.service';
+import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
 import { BaseDialogComponent } from '@iqser/common-ui';
 import { DictionaryService } from '@shared/services/dictionary.service';
-import { ManualAnnotationService } from '../../../../services/manual-annotation.service';
-import { AnnotationWrapper } from '../../../../../../models/file/annotation.wrapper';
+import { ManualAnnotationService } from '@services/manual-annotation.service';
+import { AnnotationWrapper } from '@models/file/annotation.wrapper';
 
 export interface AcceptRecommendationData {
     readonly annotations: AnnotationWrapper[];
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-providers.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-providers.ts
index fe385cfad..d1953f066 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-providers.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-providers.ts
@@ -10,7 +10,6 @@ import { FilePreviewStateService } from './services/file-preview-state.service';
 import { PdfViewerDataService } from '../../services/pdf-viewer-data.service';
 import { AnnotationReferencesService } from './services/annotation-references.service';
 import { FilterService } from '@iqser/common-ui';
-import { ManualAnnotationService } from '../../services/manual-annotation.service';
 import { AnnotationProcessingService } from '../../services/annotation-processing.service';
 import { dossiersServiceProvider } from '@services/entity-services/dossiers.service.provider';
 import { PageRotationService } from './services/page-rotation.service';
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts
index fd3f6d422..5c826b35f 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts
@@ -47,8 +47,8 @@ import { SkippedService } from './services/skipped.service';
 import { FilePreviewStateService } from './services/file-preview-state.service';
 import { FileDataModel } from '../../../../models/file/file-data.model';
 import { filePreviewScreenProviders } from './file-preview-providers';
-import { ManualAnnotationService } from '../../services/manual-annotation.service';
-import { DossiersService } from '../../../../services/dossiers/dossiers.service';
+import { ManualAnnotationService } from '@services/manual-annotation.service';
+import { DossiersService } from '@services/dossiers/dossiers.service';
 import { PageRotationService } from './services/page-rotation.service';
 import { ComponentCanDeactivate } from '../../../../guards/can-deactivate.guard';
 import { PdfViewer } from './services/pdf-viewer.service';
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-actions.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-actions.service.ts
index 932ebf2c4..4ab2b05fe 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-actions.service.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-actions.service.ts
@@ -1,6 +1,6 @@
 import { EventEmitter, Inject, Injectable, NgZone } from '@angular/core';
 import { PermissionsService } from '@services/permissions.service';
-import { ManualAnnotationService } from '../../../services/manual-annotation.service';
+import { ManualAnnotationService } from '@services/manual-annotation.service';
 import { AnnotationWrapper } from '@models/file/annotation.wrapper';
 import { Observable } from 'rxjs';
 import { TranslateService } from '@ngx-translate/core';
@@ -14,7 +14,7 @@ import { Dossier, IAddRedactionRequest, ILegalBasisChangeRequest, IRectangle, IR
 import { toPosition } from '../../../utils/pdf-calculation.utils';
 import { AnnotationDrawService } from './annotation-draw.service';
 import { translateQuads } from '@utils/pdf-coordinates';
-import { ActiveDossiersService } from '../../../../../services/dossiers/active-dossiers.service';
+import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
 import {
     AcceptRecommendationData,
     AcceptRecommendationDialogComponent,
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts
index ffe027dad..31c83eef2 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts
@@ -10,7 +10,7 @@ import { IRectangle, ISectionGrid, ISectionRectangle } from '@red/domain';
 import { SkippedService } from './skipped.service';
 import { firstValueFrom } from 'rxjs';
 import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service';
-import { DossiersService } from '../../../../../services/dossiers/dossiers.service';
+import { DossiersService } from '@services/dossiers/dossiers.service';
 import { PdfViewer } from './pdf-viewer.service';
 import { FilePreviewStateService } from './file-preview-state.service';
 import { ViewModeService } from './view-mode.service';
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts
index 05e02184e..53719a8a5 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts
@@ -9,7 +9,7 @@ import { boolFactory } from '@iqser/common-ui';
 import { filter, startWith } from 'rxjs/operators';
 import { FileManagementService } from '@services/entity-services/file-management.service';
 import { DOSSIER_ID, FILE_ID } from '@utils/constants';
-import { DossiersService } from '../../../../../services/dossiers/dossiers.service';
+import { DossiersService } from '@services/dossiers/dossiers.service';
 import { dossiersServiceResolver } from '@services/entity-services/dossiers.service.provider';
 import { wipeFilesCache } from '@red/cache';
 
diff --git a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts
index 95c43b211..a629961b9 100644
--- a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts
@@ -28,7 +28,7 @@ import { UserService } from '@services/user.service';
 import { UserPreferenceService } from '@services/user-preference.service';
 import { LongPressEvent } from '@shared/directives/long-press.directive';
 import { FileAssignService } from '../../services/file-assign.service';
-import { ActiveDossiersService } from '../../../../../services/dossiers/active-dossiers.service';
+import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
 import { FileManagementService } from '@services/entity-services/file-management.service';
 import { FilesService } from '@services/entity-services/files.service';
 import { ReanalysisService, ReanalyzeQueryParams } from '@services/reanalysis.service';
diff --git a/apps/red-ui/src/app/modules/dossier/shared/services/file-assign.service.ts b/apps/red-ui/src/app/modules/dossier/shared/services/file-assign.service.ts
index 49c61d10e..63718d1fe 100644
--- a/apps/red-ui/src/app/modules/dossier/shared/services/file-assign.service.ts
+++ b/apps/red-ui/src/app/modules/dossier/shared/services/file-assign.service.ts
@@ -5,7 +5,7 @@ import { DossiersDialogService } from '../../services/dossiers-dialog.service';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { FilesService } from '@services/entity-services/files.service';
 import { ConfirmationDialogInput, LoadingService, Toaster } from '@iqser/common-ui';
-import { ActiveDossiersService } from '../../../../services/dossiers/active-dossiers.service';
+import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
 import { firstValueFrom, Observable } from 'rxjs';
 import { tap } from 'rxjs/operators';
 
diff --git a/apps/red-ui/src/app/modules/dossier/translations/image-categories-translations.ts b/apps/red-ui/src/app/modules/dossier/translations/image-categories-translations.ts
index 9477421dd..10dcb63be 100644
--- a/apps/red-ui/src/app/modules/dossier/translations/image-categories-translations.ts
+++ b/apps/red-ui/src/app/modules/dossier/translations/image-categories-translations.ts
@@ -1,5 +1,5 @@
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
-import { ImageCategory } from '../models/image-category.model';
+import { ImageCategory } from '@red/domain';
 
 export const imageCategoriesTranslations: { [key in ImageCategory]: string } = {
     signature: _('image-category.signature'),
diff --git a/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts b/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts
index 0fae5de35..bc707022d 100644
--- a/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts
+++ b/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts
@@ -20,8 +20,8 @@ import { RouterHistoryService } from '@services/router-history.service';
 import { Dossier, DossierStatuses, IMatchedDocument, ISearchListItem, ISearchResponse } from '@red/domain';
 import { FilesMapService } from '@services/entity-services/files-map.service';
 import { PlatformSearchService } from '@services/entity-services/platform-search.service';
-import { ActiveDossiersService } from '../../../services/dossiers/active-dossiers.service';
-import { ArchivedDossiersService } from '../../../services/dossiers/archived-dossiers.service';
+import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
+import { ArchivedDossiersService } from '@services/dossiers/archived-dossiers.service';
 
 @Component({
     templateUrl: './search-screen.component.html',
diff --git a/apps/red-ui/src/app/modules/dossier/services/manual-annotation.service.ts b/apps/red-ui/src/app/services/manual-annotation.service.ts
similarity index 97%
rename from apps/red-ui/src/app/modules/dossier/services/manual-annotation.service.ts
rename to apps/red-ui/src/app/services/manual-annotation.service.ts
index 6c14dc6cd..fece80bf6 100644
--- a/apps/red-ui/src/app/modules/dossier/services/manual-annotation.service.ts
+++ b/apps/red-ui/src/app/services/manual-annotation.service.ts
@@ -1,5 +1,6 @@
 import { Injectable, Injector } from '@angular/core';
 import {
+    AnnotationActionMode,
     Dossier,
     IAddRedactionRequest,
     IApproveRequest,
@@ -12,17 +13,16 @@ import {
 import { AnnotationWrapper } from '@models/file/annotation.wrapper';
 import { GenericService, RequiredParam, Toaster, Validate } from '@iqser/common-ui';
 import { map, tap } from 'rxjs/operators';
-import { PermissionsService } from '@services/permissions.service';
-import { AnnotationActionMode } from '../models/annotation-action-mode.model';
+import { PermissionsService } from './permissions.service';
 import { annotationActionsTranslations } from '../translations/annotation-actions-translations';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { HttpErrorResponse, HttpStatusCode } from '@angular/common/http';
-import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
+import { ActiveDossiersService } from './dossiers/active-dossiers.service';
 import { Observable } from 'rxjs';
-import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service';
+import { DictionariesMapService } from './entity-services/dictionaries-map.service';
 import { ManualRedactionEntryType } from '@models/file/manual-redaction-entry.wrapper';
 
-@Injectable()
+@Injectable({ providedIn: 'root' })
 export class ManualAnnotationService extends GenericService<IManualAddResponse> {
     CONFIG: {
         [key in AnnotationActionMode]: string;
diff --git a/apps/red-ui/src/app/modules/dossier/translations/annotation-actions-translations.ts b/apps/red-ui/src/app/translations/annotation-actions-translations.ts
similarity index 98%
rename from apps/red-ui/src/app/modules/dossier/translations/annotation-actions-translations.ts
rename to apps/red-ui/src/app/translations/annotation-actions-translations.ts
index 2910794ae..168f860e0 100644
--- a/apps/red-ui/src/app/modules/dossier/translations/annotation-actions-translations.ts
+++ b/apps/red-ui/src/app/translations/annotation-actions-translations.ts
@@ -1,4 +1,4 @@
-import { AnnotationActionMode } from '../models/annotation-action-mode.model';
+import { AnnotationActionMode } from '@red/domain';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 
 type ActionType = { [key in AnnotationActionMode]?: { error: string; success: string; conflictError?: string } };
diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json
index 9ee85116b..05604dd48 100644
--- a/apps/red-ui/src/assets/config/config.json
+++ b/apps/red-ui/src/assets/config/config.json
@@ -1,7 +1,7 @@
 {
   "ADMIN_CONTACT_NAME": null,
   "ADMIN_CONTACT_URL": null,
-  "API_URL": "https://dev-05.iqser.cloud/redaction-gateway-v1",
+  "API_URL": "https://dev-08.iqser.cloud/redaction-gateway-v1",
   "APP_NAME": "RedactManager",
   "AUTO_READ_TIME": 3,
   "BACKEND_APP_VERSION": "4.4.40",
@@ -17,7 +17,7 @@
   "MAX_RETRIES_ON_SERVER_ERROR": 3,
   "OAUTH_CLIENT_ID": "redaction",
   "OAUTH_IDP_HINT": null,
-  "OAUTH_URL": "https://dev-05.iqser.cloud/auth/realms/redaction",
+  "OAUTH_URL": "https://dev-08.iqser.cloud/auth/realms/redaction",
   "RECENT_PERIOD_IN_HOURS": 24,
   "SELECTION_MODE": "structural",
   "MANUAL_BASE_URL": "https://docs.redactmanager.com/preview"
diff --git a/libs/red-domain/src/index.ts b/libs/red-domain/src/index.ts
index 8220a575e..e1b7070bc 100644
--- a/libs/red-domain/src/index.ts
+++ b/libs/red-domain/src/index.ts
@@ -1,3 +1,4 @@
+export * from './lib/annotations';
 export * from './lib/dossiers';
 export * from './lib/search';
 export * from './lib/shared';
diff --git a/libs/red-domain/src/lib/annotations/index.ts b/libs/red-domain/src/lib/annotations/index.ts
new file mode 100644
index 000000000..fcb073fef
--- /dev/null
+++ b/libs/red-domain/src/lib/annotations/index.ts
@@ -0,0 +1 @@
+export * from './types';
diff --git a/apps/red-ui/src/app/modules/dossier/models/annotation-action-mode.model.ts b/libs/red-domain/src/lib/annotations/types.ts
similarity index 83%
rename from apps/red-ui/src/app/modules/dossier/models/annotation-action-mode.model.ts
rename to libs/red-domain/src/lib/annotations/types.ts
index 83f3965a0..7c16837f6 100644
--- a/apps/red-ui/src/app/modules/dossier/models/annotation-action-mode.model.ts
+++ b/libs/red-domain/src/lib/annotations/types.ts
@@ -1,3 +1,5 @@
+export type ImageCategory = 'signature' | 'logo' | 'formula' | 'image';
+
 export type AnnotationActionMode =
     | 'add'
     | 'approve'