Move items outside of common directory

apps/red-ui/src/app/app.module.ts

@@ -40,7 +40,7 @@ import { AuthModule } from './auth/auth.module';
 import { FileUploadDownloadModule } from './upload-download/file-upload-download.module';
 import { FullPageLoadingIndicatorComponent } from './utils/full-page-loading-indicator/full-page-loading-indicator.component';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
-import { InitialsAvatarComponent } from './common/initials-avatar/initials-avatar.component';
+import { InitialsAvatarComponent } from './components/initials-avatar/initials-avatar.component';
 import { StatusBarComponent } from './components/status-bar/status-bar.component';
 import { LogoComponent } from './logo/logo.component';
 import { SimpleDoughnutChartComponent } from './components/simple-doughnut-chart/simple-doughnut-chart.component';
@@ -57,7 +57,7 @@ import { HumanizePipe } from './utils/humanize.pipe';
 import { CommentsComponent } from './components/comments/comments.component';
 import { ManualAnnotationDialogComponent } from './dialogs/manual-redaction-dialog/manual-annotation-dialog.component';
 import { ToastComponent } from './components/toast/toast.component';
-import { FilterComponent } from './common/filter/filter.component';
+import { FilterComponent } from './components/filter/filter.component';
 import { TableColNameComponent } from './components/table-col-name/table-col-name.component';
 import { ProjectDetailsComponent } from './screens/project-overview-screen/project-details/project-details.component';
 import { PageIndicatorComponent } from './screens/file/page-indicator/page-indicator.component';
@@ -65,13 +65,13 @@ import { NeedsWorkBadgeComponent } from './components/needs-work-badge/needs-wor
 import { ProjectListingEmptyComponent } from './screens/empty-states/project-listing-empty/project-listing-empty.component';
 import { AnnotationActionsComponent } from './screens/file/annotation-actions/annotation-actions.component';
 import { ProjectListingDetailsComponent } from './screens/project-listing-screen/project-listing-details/project-listing-details.component';
-import { FileActionsComponent } from './common/file-actions/file-actions.component';
+import { FileActionsComponent } from './components/file-actions/file-actions.component';
 import { TypeAnnotationIconComponent } from './components/type-annotation-icon/type-annotation-icon.component';
 import { TypeFilterComponent } from './components/type-filter/type-filter.component';
 import { DictionaryAnnotationIconComponent } from './components/dictionary-annotation-icon/dictionary-annotation-icon.component';
 import { BulkActionsComponent } from './screens/project-overview-screen/bulk-actions/bulk-actions.component';
 import { HttpCacheInterceptor } from '@redaction/red-cache';
-import { HiddenActionComponent } from './common/hidden-action/hidden-action.component';
+import { HiddenActionComponent } from './components/hidden-action/hidden-action.component';
 import { IconButtonComponent } from './components/buttons/icon-button/icon-button.component';
 import { UserButtonComponent } from './components/buttons/user-button/user-button.component';
 import { CircleButtonComponent } from './components/buttons/circle-button/circle-button.component';

apps/red-ui/src/app/components/admin-page-header/admin-breadcrumbs.component.ts

@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
 import { AppStateService } from '../../state/app-state.service';
-import { UserPreferenceService } from '../../common/service/user-preference.service';
-import { PermissionsService } from '../../common/service/permissions.service';
+import { UserPreferenceService } from '../../utils/user-preference.service';
+import { PermissionsService } from '../../utils/permissions.service';
 
 @Component({
     selector: 'redaction-admin-breadcrumbs',

apps/red-ui/src/app/components/buttons/file-download-btn/file-download-btn.component.ts

@@ -1,5 +1,5 @@
 import { Component, Input } from '@angular/core';
-import { PermissionsService } from '../../../common/service/permissions.service';
+import { PermissionsService } from '../../../utils/permissions.service';
 import { ProjectWrapper } from '../../../state/model/project.wrapper';
 import { FileStatusWrapper } from '../../../screens/file/model/file-status.wrapper';
 import { FileDownloadService } from '../../../upload-download/file-download.service';

apps/red-ui/src/app/components/file-actions/file-actions.component.ts

@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { PermissionsService } from '../service/permissions.service';
+import { PermissionsService } from '../../utils/permissions.service';
 import { FileStatusWrapper } from '../../screens/file/model/file-status.wrapper';
 import { DialogService } from '../../dialogs/dialog.service';
 import { AppStateService } from '../../state/app-state.service';

apps/red-ui/src/app/components/filter/utils/filter-utils.ts

@@ -1,7 +1,7 @@
 import { FilterModel } from '../model/filter.model';
 import { FileStatusWrapper } from '../../../screens/file/model/file-status.wrapper';
 import { ProjectWrapper } from '../../../state/model/project.wrapper';
-import { PermissionsService } from '../../service/permissions.service';
+import { PermissionsService } from '../../../utils/permissions.service';
 
 export function processFilters(oldFilters: FilterModel[], newFilters: FilterModel[]) {
     copySettings(oldFilters, newFilters);

apps/red-ui/src/app/components/needs-work-badge/needs-work-badge.component.ts

@@ -1,6 +1,6 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { AppStateService } from '../../state/app-state.service';
-import { PermissionsService } from '../../common/service/permissions.service';
+import { PermissionsService } from '../../utils/permissions.service';
 import { FileStatusWrapper } from '../../screens/file/model/file-status.wrapper';
 import { ProjectWrapper } from '../../state/model/project.wrapper';
 

apps/red-ui/src/app/components/rule-set-actions/rule-set-actions.component.ts

@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { DialogService } from '../../dialogs/dialog.service';
-import { PermissionsService } from '../../common/service/permissions.service';
+import { PermissionsService } from '../../utils/permissions.service';
 import { AppStateService } from '../../state/app-state.service';
 import { Router } from '@angular/router';
 

apps/red-ui/src/app/components/rule-set-view-switch/tabs.component.ts

@@ -1,8 +1,8 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { AppStateService } from '../../state/app-state.service';
-import { UserPreferenceService } from '../../common/service/user-preference.service';
-import { PermissionsService } from '../../common/service/permissions.service';
+import { UserPreferenceService } from '../../utils/user-preference.service';
+import { PermissionsService } from '../../utils/permissions.service';
 
 @Component({
     selector: 'redaction-tabs',

apps/red-ui/src/app/components/simple-doughnut-chart/simple-doughnut-chart.component.ts

@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
 import { Color } from '../../utils/types';
-import { FilterModel } from '../../common/filter/model/filter.model';
+import { FilterModel } from '../filter/model/filter.model';
 
 export class DoughnutChartConfig {
     value: number;

apps/red-ui/src/app/components/team-members/team-members.component.ts

@@ -1,5 +1,5 @@
 import { Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { PermissionsService } from '../../common/service/permissions.service';
+import { PermissionsService } from '../../utils/permissions.service';
 
 @Component({
     selector: 'redaction-team-members',

apps/red-ui/src/app/components/type-filter/type-filter.component.ts

@@ -1,5 +1,5 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { FilterModel } from '../../common/filter/model/filter.model';
+import { FilterModel } from '../filter/model/filter.model';
 import { AppStateService } from '../../state/app-state.service';
 import { DEFAULT_RUL_SET_UUID } from '../../utils/rule-set-default';
 

apps/red-ui/src/app/dialogs/force-redaction-dialog/force-redaction-dialog.component.ts

@@ -7,7 +7,7 @@ import { NotificationService } from '../../notification/notification.service';
 import { TranslateService } from '@ngx-translate/core';
 import { UserService } from '../../user/user.service';
 import { ManualAnnotationService } from '../../screens/file/service/manual-annotation.service';
-import { PermissionsService } from '../../common/service/permissions.service';
+import { PermissionsService } from '../../utils/permissions.service';
 
 export interface LegalBasisOption {
     label?: string;

apps/red-ui/src/app/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts

@@ -9,7 +9,7 @@ import { UserService } from '../../user/user.service';
 import { ManualRedactionEntryWrapper } from '../../screens/file/model/manual-redaction-entry.wrapper';
 import { ManualAnnotationService } from '../../screens/file/service/manual-annotation.service';
 import { ManualAnnotationResponse } from '../../screens/file/model/manual-annotation-response';
-import { PermissionsService } from '../../common/service/permissions.service';
+import { PermissionsService } from '../../utils/permissions.service';
 
 export interface LegalBasisOption {
     label?: string;

apps/red-ui/src/app/screens/admin/audit-screen/audit-screen.component.ts

@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { PermissionsService } from '../../../common/service/permissions.service';
+import { PermissionsService } from '../../../utils/permissions.service';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { AuditControllerService, AuditResponse, AuditSearchRequest } from '@redaction/red-ui-http';
 import { TranslateService } from '@ngx-translate/core';

apps/red-ui/src/app/screens/admin/default-colors-screen/default-colors-screen.component.ts

@@ -3,7 +3,7 @@ import { AppStateService } from '../../../state/app-state.service';
 import { Colors, DictionaryControllerService, TypeValue } from '@redaction/red-ui-http';
 import { ActivatedRoute } from '@angular/router';
 import { SortingOption, SortingService } from '../../../utils/sorting.service';
-import { PermissionsService } from '../../../common/service/permissions.service';
+import { PermissionsService } from '../../../utils/permissions.service';
 import { DialogService } from '../../../dialogs/dialog.service';
 
 @Component({

apps/red-ui/src/app/screens/admin/dictionary-listing-screen/dictionary-listing-screen.component.ts

@@ -6,7 +6,7 @@ import { DialogService } from '../../../dialogs/dialog.service';
 import { AppStateService } from '../../../state/app-state.service';
 import { tap } from 'rxjs/operators';
 import { forkJoin } from 'rxjs';
-import { PermissionsService } from '../../../common/service/permissions.service';
+import { PermissionsService } from '../../../utils/permissions.service';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { debounce } from '../../../utils/debounce';
 import { ActivatedRoute } from '@angular/router';

apps/red-ui/src/app/screens/admin/dictionary-overview-screen/dictionary-overview-screen.component.ts

@@ -2,7 +2,7 @@ import { Component, ElementRef, ViewChild } from '@angular/core';
 import { DictionaryControllerService, TypeValue } from '@redaction/red-ui-http';
 import { DialogService } from '../../../dialogs/dialog.service';
 import { AppStateService } from '../../../state/app-state.service';
-import { PermissionsService } from '../../../common/service/permissions.service';
+import { PermissionsService } from '../../../utils/permissions.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { AceEditorComponent } from 'ng2-ace-editor';
 import { debounce } from '../../../utils/debounce';

apps/red-ui/src/app/screens/admin/digital-signature-screen/digital-signature-screen.component.ts

@@ -3,7 +3,7 @@ import { DigitalSignature, DigitalSignatureControllerService } from '@redaction/
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { NotificationService, NotificationType } from '../../../notification/notification.service';
 import { TranslateService } from '@ngx-translate/core';
-import { PermissionsService } from '../../../common/service/permissions.service';
+import { PermissionsService } from '../../../utils/permissions.service';
 import { lastIndexOfEnd } from '../../../utils/functions';
 
 @Component({

apps/red-ui/src/app/screens/admin/file-attributes-listing-screen/file-attributes-listing-screen.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { PermissionsService } from '../../../common/service/permissions.service';
+import { PermissionsService } from '../../../utils/permissions.service';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { FileAttribute, FileAttributesControllerService } from '@redaction/red-ui-http';
 import { AppStateService } from '../../../state/app-state.service';

apps/red-ui/src/app/screens/admin/license-information-screen/license-information-screen.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { PermissionsService } from '../../../common/service/permissions.service';
+import { PermissionsService } from '../../../utils/permissions.service';
 import { LicenseReport, LicenseReportControllerService } from '@redaction/red-ui-http';
 import { AppConfigService } from '../../../app-config/app-config.service';
 import * as moment from 'moment';

apps/red-ui/src/app/screens/admin/rule-sets-listing-screen/rule-sets-listing-screen.component.ts

@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { SortingOption, SortingService } from '../../../utils/sorting.service';
 import { DialogService } from '../../../dialogs/dialog.service';
 import { AppStateService } from '../../../state/app-state.service';
-import { PermissionsService } from '../../../common/service/permissions.service';
+import { PermissionsService } from '../../../utils/permissions.service';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { debounce } from '../../../utils/debounce';
 import { RuleSetModel } from '@redaction/red-ui-http';

apps/red-ui/src/app/screens/admin/rules-screen/rules-screen.component.ts

@@ -1,5 +1,5 @@
 import { Component, ElementRef, ViewChild } from '@angular/core';
-import { PermissionsService } from '../../../common/service/permissions.service';
+import { PermissionsService } from '../../../utils/permissions.service';
 import { AceEditorComponent } from 'ng2-ace-editor';
 import { RulesControllerService, RuleSetModel } from '@redaction/red-ui-http';
 import { NotificationService, NotificationType } from '../../../notification/notification.service';

apps/red-ui/src/app/screens/admin/user-listing-screen/user-listing-screen.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { PermissionsService } from '../../../common/service/permissions.service';
+import { PermissionsService } from '../../../utils/permissions.service';
 import { UserService } from '../../../user/user.service';
 import { User } from '@redaction/red-ui-http';
 import { FormBuilder, FormGroup } from '@angular/forms';

apps/red-ui/src/app/screens/admin/watermark-screen/watermark-screen.component.ts

@@ -1,5 +1,5 @@
 import { ChangeDetectorRef, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
-import { PermissionsService } from '../../../common/service/permissions.service';
+import { PermissionsService } from '../../../utils/permissions.service';
 import WebViewer, { WebViewerInstance } from '@pdftron/webviewer';
 import { AppStateService } from '../../../state/app-state.service';
 import { environment } from '../../../../environments/environment';

apps/red-ui/src/app/screens/base-screen/base-screen.component.ts

@@ -2,8 +2,8 @@ import { Component } from '@angular/core';
 import { UserService } from '../../user/user.service';
 import { AppStateService } from '../../state/app-state.service';
 import { LanguageService } from '../../i18n/language.service';
-import { PermissionsService } from '../../common/service/permissions.service';
-import { UserPreferenceService } from '../../common/service/user-preference.service';
+import { PermissionsService } from '../../utils/permissions.service';
+import { UserPreferenceService } from '../../utils/user-preference.service';
 import { Router } from '@angular/router';
 import { AppConfigService } from '../../app-config/app-config.service';
 import { Title } from '@angular/platform-browser';

apps/red-ui/src/app/screens/file/annotation-actions/annotation-actions.component.ts

@@ -1,9 +1,9 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { AnnotationWrapper } from '../model/annotation.wrapper';
 import { AppStateService } from '../../../state/app-state.service';
-import { PermissionsService } from '../../../common/service/permissions.service';
+import { PermissionsService } from '../../../utils/permissions.service';
 import { AnnotationPermissions } from '../model/annotation.permissions';
-import { AnnotationActionsService } from '../../../common/service/annotation-actions.service';
+import { AnnotationActionsService } from '../../../utils/annotation-actions.service';
 import { Annotations, WebViewerInstance } from '@pdftron/webviewer';
 
 @Component({

apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts

@@ -15,15 +15,15 @@ import { AnnotationData, FileDataModel } from '../model/file-data.model';
 import { FileActionService } from '../service/file-action.service';
 import { AnnotationDrawService } from '../service/annotation-draw.service';
 import { AnnotationProcessingService } from '../service/annotation-processing.service';
-import { FilterModel } from '../../../common/filter/model/filter.model';
+import { FilterModel } from '../../../components/filter/model/filter.model';
 import { tap } from 'rxjs/operators';
 import { NotificationService } from '../../../notification/notification.service';
 import { TranslateService } from '@ngx-translate/core';
 import { FileStatusWrapper } from '../model/file-status.wrapper';
-import { PermissionsService } from '../../../common/service/permissions.service';
+import { PermissionsService } from '../../../utils/permissions.service';
 import { Subscription, timer } from 'rxjs';
-import { handleFilterDelta, processFilters } from '../../../common/filter/utils/filter-utils';
-import { UserPreferenceService } from '../../../common/service/user-preference.service';
+import { handleFilterDelta, processFilters } from '../../../components/filter/utils/filter-utils';
+import { UserPreferenceService } from '../../../utils/user-preference.service';
 import { UserService } from '../../../user/user.service';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { FileManagementControllerService, StatusControllerService } from '@redaction/red-ui-http';

apps/red-ui/src/app/screens/file/model/file-status.wrapper.ts

@@ -1,5 +1,5 @@
 import { FileStatus } from '@redaction/red-ui-http';
-import { StatusSorter } from '../../../common/sorters/status-sorter';
+import { StatusSorter } from '../../../utils/sorters/status-sorter';
 
 export class FileStatusWrapper {
     constructor(public fileStatus: FileStatus, public reviewerName: string) {}

apps/red-ui/src/app/screens/file/page-indicator/page-indicator.component.ts

@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges } from '@angular/core';
 import { ViewedPages, ViewedPagesControllerService } from '@redaction/red-ui-http';
 import { AppStateService } from '../../../state/app-state.service';
-import { PermissionsService } from '../../../common/service/permissions.service';
+import { PermissionsService } from '../../../utils/permissions.service';
 import { AppConfigKey, AppConfigService } from '../../../app-config/app-config.service';
 import { Subscription } from 'rxjs';
 

apps/red-ui/src/app/screens/file/pdf-viewer/pdf-viewer.component.ts

@@ -24,8 +24,8 @@ import { FileStatusWrapper } from '../model/file-status.wrapper';
 import { KeycloakService } from 'keycloak-angular';
 import { environment } from '../../../../environments/environment';
 import { AnnotationDrawService } from '../service/annotation-draw.service';
-import { AnnotationActionsService } from '../../../common/service/annotation-actions.service';
-import { UserPreferenceService } from '../../../common/service/user-preference.service';
+import { AnnotationActionsService } from '../../../utils/annotation-actions.service';
+import { UserPreferenceService } from '../../../utils/user-preference.service';
 import { translateQuads } from '../../../utils/pdf-coordinates';
 import Tool = Tools.Tool;
 

apps/red-ui/src/app/screens/file/service/annotation-draw.service.ts

@@ -4,7 +4,7 @@ import { Rectangle, RedactionLogControllerService, SectionGrid, SectionRectangle
 import { hexToRgb } from '../../../utils/functions';
 import { AppStateService } from '../../../state/app-state.service';
 import { AnnotationWrapper } from '../model/annotation.wrapper';
-import { UserPreferenceService } from '../../../common/service/user-preference.service';
+import { UserPreferenceService } from '../../../utils/user-preference.service';
 
 @Injectable({
     providedIn: 'root'

apps/red-ui/src/app/screens/file/service/annotation-processing.service.ts

@@ -1,9 +1,9 @@
 import { Injectable } from '@angular/core';
 import { AppStateService } from '../../../state/app-state.service';
 import { AnnotationWrapper } from '../model/annotation.wrapper';
-import { FilterModel } from '../../../common/filter/model/filter.model';
-import { handleCheckedValue } from '../../../common/filter/utils/filter-utils';
-import { SuperTypeSorter } from '../../../common/sorters/super-type-sorter';
+import { FilterModel } from '../../../components/filter/model/filter.model';
+import { handleCheckedValue } from '../../../components/filter/utils/filter-utils';
+import { SuperTypeSorter } from '../../../utils/sorters/super-type-sorter';
 import { getFirstRelevantTextPart } from '../../../utils/functions';
 
 @Injectable({

apps/red-ui/src/app/screens/file/service/file-action.service.ts

@@ -4,7 +4,7 @@ import { AppStateService } from '../../../state/app-state.service';
 import { UserService } from '../../../user/user.service';
 import { FileStatus, ReanalysisControllerService, StatusControllerService } from '@redaction/red-ui-http';
 import { FileStatusWrapper } from '../model/file-status.wrapper';
-import { PermissionsService } from '../../../common/service/permissions.service';
+import { PermissionsService } from '../../../utils/permissions.service';
 import { isArray } from 'rxjs/internal-compatibility';
 
 @Injectable({

apps/red-ui/src/app/screens/file/service/manual-annotation.service.ts

@@ -6,7 +6,7 @@ import { NotificationService, NotificationType } from '../../../notification/not
 import { TranslateService } from '@ngx-translate/core';
 import { tap } from 'rxjs/operators';
 import { UserService } from '../../../user/user.service';
-import { PermissionsService } from '../../../common/service/permissions.service';
+import { PermissionsService } from '../../../utils/permissions.service';
 
 @Injectable({
     providedIn: 'root'

apps/red-ui/src/app/screens/file/service/pdf-viewer-data.service.ts

@@ -10,7 +10,7 @@ import {
 import { FileType } from '../model/file-type';
 import { FileDataModel } from '../model/file-data.model';
 import { AppStateService } from '../../../state/app-state.service';
-import { PermissionsService } from '../../../common/service/permissions.service';
+import { PermissionsService } from '../../../utils/permissions.service';
 import { FileStatusWrapper } from '../model/file-status.wrapper';
 
 @Injectable({

apps/red-ui/src/app/screens/project-listing-screen/project-listing-actions/project-listing-actions.component.ts

@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { PermissionsService } from '../../../common/service/permissions.service';
+import { PermissionsService } from '../../../utils/permissions.service';
 import { ProjectWrapper } from '../../../state/model/project.wrapper';
-import { StatusSorter } from '../../../common/sorters/status-sorter';
+import { StatusSorter } from '../../../utils/sorters/status-sorter';
 import { download } from '../../../utils/file-download-utils';
 import { computerize } from '../../../utils/functions';
 import { FileManagementControllerService } from '@redaction/red-ui-http';

apps/red-ui/src/app/screens/project-listing-screen/project-listing-details/project-listing-details.component.ts

@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { DoughnutChartConfig } from '../../../components/simple-doughnut-chart/simple-doughnut-chart.component';
 import { AppStateService } from '../../../state/app-state.service';
-import { FilterModel } from '../../../common/filter/model/filter.model';
+import { FilterModel } from '../../../components/filter/model/filter.model';
 
 @Component({
     selector: 'redaction-project-listing-details',

apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.ts

@@ -5,7 +5,7 @@ import { UserService } from '../../user/user.service';
 import { DoughnutChartConfig } from '../../components/simple-doughnut-chart/simple-doughnut-chart.component';
 import { groupBy, humanize } from '../../utils/functions';
 import { DialogService } from '../../dialogs/dialog.service';
-import { FilterModel } from '../../common/filter/model/filter.model';
+import { FilterModel } from '../../components/filter/model/filter.model';
 import {
     annotationFilterChecker,
     getFilteredEntities,
@@ -13,20 +13,20 @@ import {
     projectMemberChecker,
     projectStatusChecker,
     ruleSetChecker
-} from '../../common/filter/utils/filter-utils';
+} from '../../components/filter/utils/filter-utils';
 import { TranslateService } from '@ngx-translate/core';
 import { SortingOption, SortingService } from '../../utils/sorting.service';
-import { PermissionsService } from '../../common/service/permissions.service';
+import { PermissionsService } from '../../utils/permissions.service';
 import { ProjectWrapper } from '../../state/model/project.wrapper';
 import { Subscription, timer } from 'rxjs';
 import { tap } from 'rxjs/operators';
 import { TranslateChartService } from '../../utils/translate-chart.service';
-import { RedactionFilterSorter } from '../../common/sorters/redaction-filter-sorter';
-import { StatusSorter } from '../../common/sorters/status-sorter';
+import { RedactionFilterSorter } from '../../utils/sorters/redaction-filter-sorter';
+import { StatusSorter } from '../../utils/sorters/status-sorter';
 import { Router } from '@angular/router';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { debounce } from '../../utils/debounce';
-import { FilterComponent } from '../../common/filter/filter.component';
+import { FilterComponent } from '../../components/filter/filter.component';
 
 @Component({
     selector: 'redaction-project-listing-screen',

apps/red-ui/src/app/screens/project-overview-screen/bulk-actions/bulk-actions.component.ts

@@ -3,7 +3,7 @@ import { AppStateService } from '../../../state/app-state.service';
 import { UserService } from '../../../user/user.service';
 import { FileManagementControllerService, ReanalysisControllerService } from '@redaction/red-ui-http';
 import { DialogService } from '../../../dialogs/dialog.service';
-import { PermissionsService } from '../../../common/service/permissions.service';
+import { PermissionsService } from '../../../utils/permissions.service';
 import { FileStatusWrapper } from '../../file/model/file-status.wrapper';
 import { FileActionService } from '../../file/service/file-action.service';
 import { Observable } from 'rxjs';

apps/red-ui/src/app/screens/project-overview-screen/project-details/project-details.component.ts

@@ -4,10 +4,10 @@ import { groupBy } from '../../../utils/functions';
 import { DoughnutChartConfig } from '../../../components/simple-doughnut-chart/simple-doughnut-chart.component';
 import { DialogService } from '../../../dialogs/dialog.service';
 import { Router } from '@angular/router';
-import { FilterModel } from '../../../common/filter/model/filter.model';
-import { PermissionsService } from '../../../common/service/permissions.service';
+import { FilterModel } from '../../../components/filter/model/filter.model';
+import { PermissionsService } from '../../../utils/permissions.service';
 import { TranslateChartService } from '../../../utils/translate-chart.service';
-import { StatusSorter } from '../../../common/sorters/status-sorter';
+import { StatusSorter } from '../../../utils/sorters/status-sorter';
 
 @Component({
     selector: 'redaction-project-details',

apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts

@@ -9,23 +9,23 @@ import { StatusOverlayService } from '../../upload-download/status-overlay.servi
 import { DialogService } from '../../dialogs/dialog.service';
 import { TranslateService } from '@ngx-translate/core';
 import { FileActionService } from '../file/service/file-action.service';
-import { FilterModel } from '../../common/filter/model/filter.model';
+import { FilterModel } from '../../components/filter/model/filter.model';
 import * as moment from 'moment';
 import { ProjectDetailsComponent } from './project-details/project-details.component';
 import { FileStatusWrapper } from '../file/model/file-status.wrapper';
-import { annotationFilterChecker, getFilteredEntities, keyChecker, processFilters } from '../../common/filter/utils/filter-utils';
+import { annotationFilterChecker, getFilteredEntities, keyChecker, processFilters } from '../../components/filter/utils/filter-utils';
 import { SortingOption, SortingService } from '../../utils/sorting.service';
-import { PermissionsService } from '../../common/service/permissions.service';
+import { PermissionsService } from '../../utils/permissions.service';
 import { UserService } from '../../user/user.service';
 import { FileManagementControllerService, FileStatus } from '@redaction/red-ui-http';
 import { Subscription, timer } from 'rxjs';
 import { tap } from 'rxjs/operators';
-import { RedactionFilterSorter } from '../../common/sorters/redaction-filter-sorter';
-import { StatusSorter } from '../../common/sorters/status-sorter';
+import { RedactionFilterSorter } from '../../utils/sorters/redaction-filter-sorter';
+import { StatusSorter } from '../../utils/sorters/status-sorter';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { debounce } from '../../utils/debounce';
 import { convertFiles, handleFileDrop } from '../../utils/file-drop-utils';
-import { FilterComponent } from '../../common/filter/filter.component';
+import { FilterComponent } from '../../components/filter/filter.component';
 
 @Component({
     selector: 'redaction-project-overview-screen',

apps/red-ui/src/app/upload-download/file-download.service.ts

@@ -9,7 +9,7 @@ import { FileStatusWrapper } from '../screens/file/model/file-status.wrapper';
 import { mergeMap, tap } from 'rxjs/operators';
 import { DownloadStatusWrapper } from './model/download-status.wrapper';
 import { AppStateService } from '../state/app-state.service';
-import { PermissionsService } from '../common/service/permissions.service';
+import { PermissionsService } from '../utils/permissions.service';
 import { KeycloakService } from 'keycloak-angular';
 
 @Injectable({

apps/red-ui/src/app/utils/annotation-actions.service.ts

@@ -1,13 +1,13 @@
 import { EventEmitter, Injectable, NgZone } from '@angular/core';
 import { PermissionsService } from './permissions.service';
-import { ManualAnnotationService } from '../../screens/file/service/manual-annotation.service';
-import { DialogService } from '../../dialogs/dialog.service';
-import { AnnotationWrapper } from '../../screens/file/model/annotation.wrapper';
+import { ManualAnnotationService } from '../screens/file/service/manual-annotation.service';
+import { DialogService } from '../dialogs/dialog.service';
+import { AnnotationWrapper } from '../screens/file/model/annotation.wrapper';
 import { Observable } from 'rxjs';
 import { TranslateService } from '@ngx-translate/core';
 import { AddRedactionRequest } from '@redaction/red-ui-http';
-import { getFirstRelevantTextPart } from '../../utils/functions';
-import { AnnotationPermissions } from '../../screens/file/model/annotation.permissions';
+import { getFirstRelevantTextPart } from './functions';
+import { AnnotationPermissions } from '../screens/file/model/annotation.permissions';
 
 @Injectable({
     providedIn: 'root'

apps/red-ui/src/app/utils/permissions.service.ts

@@ -1,9 +1,9 @@
 import { Injectable } from '@angular/core';
-import { AppStateService } from '../../state/app-state.service';
-import { UserService, UserWrapper } from '../../user/user.service';
-import { FileStatusWrapper } from '../../screens/file/model/file-status.wrapper';
+import { AppStateService } from '../state/app-state.service';
+import { UserService, UserWrapper } from '../user/user.service';
+import { FileStatusWrapper } from '../screens/file/model/file-status.wrapper';
 import { User } from '@redaction/red-ui-http';
-import { ProjectWrapper } from '../../state/model/project.wrapper';
+import { ProjectWrapper } from '../state/model/project.wrapper';
 
 @Injectable({
     providedIn: 'root'