From caa7bae6755694af215abdcd79843b415205720f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20D=C3=ADaz=20Roussel?=
 <nicolas.diazroussel@bsc.es>
Date: Fri, 26 Aug 2022 13:57:20 +0200
Subject: [PATCH] Reorganize file structure into model and services

---
 src/app/app.component.ts                      |  4 +--
 src/app/app.module.ts                         |  4 +--
 src/app/auth-config-factory.ts                |  2 +-
 .../document-detail.component.ts              | 10 +++---
 src/app/documents/documents.component.ts      |  4 +--
 src/app/finding.ts                            | 36 -------------------
 src/app/header/header.component.ts            |  2 +-
 .../history-tracking.component.ts             |  4 +--
 src/app/login/login.component.ts              |  2 +-
 src/app/logout/logout.component.ts            |  2 +-
 src/app/menu/menu.component.ts                |  2 +-
 src/app/messages/messages.component.ts        |  2 +-
 src/app/{ => model}/annotation.spec.ts        |  0
 src/app/{ => model}/annotation.ts             |  4 +--
 src/app/{ => model}/auth.config.ts            |  2 +-
 src/app/{ => model}/cdisc-field.spec.ts       |  0
 src/app/{ => model}/cdisc-field.ts            |  0
 src/app/{ => model}/coded-value.spec.ts       |  0
 src/app/{ => model}/coded-value.ts            |  0
 src/app/{ => model}/codelist.spec.ts          |  0
 src/app/{ => model}/codelist.ts               |  0
 src/app/{ => model}/document-tracking.ts      |  0
 src/app/{ => model}/document.spec.ts          |  0
 src/app/{ => model}/document.ts               |  1 -
 src/app/{ => model}/feature.spec.ts           |  0
 src/app/{ => model}/feature.ts                |  0
 src/app/{ => model}/finding.spec.ts           |  0
 src/app/model/finding.ts                      | 20 +++++++++++
 src/app/{ => model}/findingsr.ts              |  0
 src/app/{ => model}/srdomainfinding.ts        |  0
 src/app/{ => model}/tracking.ts               |  0
 .../pretoxsentences-tabulator.component.ts    |  4 +--
 src/app/reports/reports.component.ts          |  4 +--
 .../cdis-send-ct.service.spec.ts              |  0
 .../{ => services}/cdis-send-ct.service.ts    |  6 ++--
 .../config-service.service.spec.ts            |  0
 .../{ => services}/config-service.service.ts  |  2 +-
 .../{ => services}/document.service.spec.ts   |  0
 src/app/{ => services}/document.service.ts    | 14 ++++----
 src/app/{ => services}/login.service.spec.ts  |  0
 src/app/{ => services}/login.service.ts       |  4 +--
 .../{ => services}/message.service.spec.ts    |  0
 src/app/{ => services}/message.service.ts     |  0
 .../upload-files.service.spec.ts              |  0
 .../{ => services}/upload-files.service.ts    |  2 +-
 .../{ => services}/workflow.service.spec.ts   |  0
 src/app/{ => services}/workflow.service.ts    |  2 +-
 .../srdomaintemplate-tabulator.component.ts   |  6 ++--
 .../upload-files/upload-files.component.ts    |  4 +--
 .../workflow-execution.component.ts           |  2 +-
 50 files changed, 67 insertions(+), 84 deletions(-)
 delete mode 100644 src/app/finding.ts
 rename src/app/{ => model}/annotation.spec.ts (100%)
 rename src/app/{ => model}/annotation.ts (65%)
 rename src/app/{ => model}/auth.config.ts (88%)
 rename src/app/{ => model}/cdisc-field.spec.ts (100%)
 rename src/app/{ => model}/cdisc-field.ts (100%)
 rename src/app/{ => model}/coded-value.spec.ts (100%)
 rename src/app/{ => model}/coded-value.ts (100%)
 rename src/app/{ => model}/codelist.spec.ts (100%)
 rename src/app/{ => model}/codelist.ts (100%)
 rename src/app/{ => model}/document-tracking.ts (100%)
 rename src/app/{ => model}/document.spec.ts (100%)
 rename src/app/{ => model}/document.ts (92%)
 rename src/app/{ => model}/feature.spec.ts (100%)
 rename src/app/{ => model}/feature.ts (100%)
 rename src/app/{ => model}/finding.spec.ts (100%)
 create mode 100644 src/app/model/finding.ts
 rename src/app/{ => model}/findingsr.ts (100%)
 rename src/app/{ => model}/srdomainfinding.ts (100%)
 rename src/app/{ => model}/tracking.ts (100%)
 rename src/app/{ => services}/cdis-send-ct.service.spec.ts (100%)
 rename src/app/{ => services}/cdis-send-ct.service.ts (96%)
 rename src/app/{ => services}/config-service.service.spec.ts (100%)
 rename src/app/{ => services}/config-service.service.ts (80%)
 rename src/app/{ => services}/document.service.spec.ts (100%)
 rename src/app/{ => services}/document.service.ts (97%)
 rename src/app/{ => services}/login.service.spec.ts (100%)
 rename src/app/{ => services}/login.service.ts (96%)
 rename src/app/{ => services}/message.service.spec.ts (100%)
 rename src/app/{ => services}/message.service.ts (100%)
 rename src/app/{ => services}/upload-files.service.spec.ts (100%)
 rename src/app/{ => services}/upload-files.service.ts (95%)
 rename src/app/{ => services}/workflow.service.spec.ts (100%)
 rename src/app/{ => services}/workflow.service.ts (96%)

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index c957900..02ac0a5 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,9 +1,9 @@
 import { Component } from '@angular/core';
 import { Router } from '@angular/router';
-import { LoginService } from './login.service';
+import { LoginService } from './services/login.service';
 import { Subscription } from 'rxjs';
 
-import { DocumentService } from './document.service';
+import { DocumentService } from './services/document.service';
 @Component({
   selector: 'app-root',
   templateUrl: './app.component.html',
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index e99b39b..2516873 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -11,7 +11,7 @@ import { LoginComponent } from './login/login.component';
 import { FormsModule } from '@angular/forms';
 import { DocumentDetailComponent } from './document-detail/document-detail.component';
 import { MessagesComponent } from './messages/messages.component';
-import { LoginService } from './login.service';
+import { LoginService } from './services/login.service';
 import { HttpModule } from '@angular/http';
 import {CookieService} from 'ngx-cookie-service';
 import { PretoxsentencesTabulatorComponent } from './pretoxsentences-tabulator/pretoxsentences-tabulator.component';
@@ -26,7 +26,7 @@ import {OAuthModule} from "angular-oauth2-oidc";
 import { UploadFilesComponent } from './upload-files/upload-files.component';
 import { authConfigFactory } from './auth-config-factory';
 import { OAuthModuleConfig} from 'angular-oauth2-oidc';
-import { ConfigServiceService } from './config-service.service';
+import { ConfigServiceService } from './services/config-service.service';
 import { WorkflowExecutionComponent } from './workflow-execution/workflow-execution.component';
 import { ReportsComponent } from './reports/reports.component';
 
diff --git a/src/app/auth-config-factory.ts b/src/app/auth-config-factory.ts
index aef2718..407081c 100644
--- a/src/app/auth-config-factory.ts
+++ b/src/app/auth-config-factory.ts
@@ -1,6 +1,6 @@
 
 import { environment } from '../environments/environment';
-import { ConfigServiceService } from './config-service.service';
+import { ConfigServiceService } from './services/config-service.service';
 import { OAuthModuleConfig} from 'angular-oauth2-oidc';
 export function authConfigFactory(service: ConfigServiceService): OAuthModuleConfig {
     return {
diff --git a/src/app/document-detail/document-detail.component.ts b/src/app/document-detail/document-detail.component.ts
index 635fa35..596af63 100644
--- a/src/app/document-detail/document-detail.component.ts
+++ b/src/app/document-detail/document-detail.component.ts
@@ -1,17 +1,17 @@
 import { Component, OnInit, Input, ViewChild, ElementRef, ViewEncapsulation, AfterViewInit, AfterContentInit } from '@angular/core';
-import { Document } from '../document';
+import { Document } from '../model/document';
 import { ActivatedRoute } from '@angular/router';
 import { Location } from '@angular/common';
-import { DocumentService } from '../document.service';
+import { DocumentService } from '../services/document.service';
 import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
-import { Finding } from '../finding';
-import { Annotation } from '../annotation';
+import { Finding } from '../model/finding';
+import { Annotation } from '../model/annotation';
 import { environment } from './../../environments/environment';
 
 
 import { MatToolbarModule } from '@angular/material/toolbar';
 import { Router } from '@angular/router';
-import { CdisSendCtService } from '../cdis-send-ct.service';
+import { CdisSendCtService } from '../services/cdis-send-ct.service';
 
 //brat
 declare var head: any;
diff --git a/src/app/documents/documents.component.ts b/src/app/documents/documents.component.ts
index dfd5675..ab0feb6 100644
--- a/src/app/documents/documents.component.ts
+++ b/src/app/documents/documents.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnInit, SimpleChanges, EventEmitter, Output } from '@angular/core';
 import { TabulatorFull as Tabulator } from 'tabulator-tables';
-import { Document } from '../document';
-import { DocumentService } from '../document.service';
+import { Document } from '../model/document';
+import { DocumentService } from '../services/document.service';
 import { Router } from '@angular/router';
 
 @Component({
diff --git a/src/app/finding.ts b/src/app/finding.ts
deleted file mode 100644
index d38c639..0000000
--- a/src/app/finding.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { Annotation } from './annotation';
-import { SRDomainFinding } from './srdomainfinding';
-
-export class Finding {
-  findingId: number;
-  //finding_fields: Annotation[];
-  status: string;
-  export: string;
-  finding: Annotation;
-  sex: Annotation;
-  manifestation_finding: Annotation;
-  specimen: Annotation;
-  group: Annotation;
-  study_testcd: Annotation;
-  study_domain: Annotation;
-  is_treatment_related: Annotation;
-  risk_level: Annotation;
-  dose: Annotation;
-  srDomainFindings: SRDomainFinding[];
-
-  // findings: Annotation[];
-  // sexs: Annotation[];
-  // manifestations_finding: Annotation[];
-  // specimens: Annotation[];
-  // groups: Annotation[];
-  // study_testcds: Annotation[];
-  // study_domains: Annotation[];
-  // treatment_related_triggers: Annotation[];
-  // no_treatment_related_triggers: Annotation[];
-  // risk_levels: Annotation[];
-  // routes_of_administration: Annotation[];
-  // dose_quantitys: Annotation[];
-  // dose_frequencys: Annotation[];
-  // dose_durations: Annotation[];
-
-}
diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts
index ad37307..37f229f 100644
--- a/src/app/header/header.component.ts
+++ b/src/app/header/header.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { LoginService } from '../login.service';
+import { LoginService } from '../services/login.service';
 import { environment } from '../../environments/environment';
 @Component({
   selector: 'app-header',
diff --git a/src/app/history-tracking/history-tracking.component.ts b/src/app/history-tracking/history-tracking.component.ts
index 0621e25..d16d73d 100644
--- a/src/app/history-tracking/history-tracking.component.ts
+++ b/src/app/history-tracking/history-tracking.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { DocumentService } from '../document.service';
-import { DocumentTracking } from '../document-tracking';
+import { DocumentService } from '../services/document.service';
+import { DocumentTracking } from '../model/document-tracking';
 import {Tabulator} from 'tabulator-tables';
 @Component({
   selector: 'app-history-tracking',
diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts
index 0dd273b..8839ddb 100644
--- a/src/app/login/login.component.ts
+++ b/src/app/login/login.component.ts
@@ -1,4 +1,4 @@
-import { LoginService } from '../login.service';
+import { LoginService } from '../services/login.service';
 import { Component, OnInit } from '@angular/core';
 import { Router, ActivatedRoute } from '@angular/router';
 
diff --git a/src/app/logout/logout.component.ts b/src/app/logout/logout.component.ts
index 436e00d..1678d91 100644
--- a/src/app/logout/logout.component.ts
+++ b/src/app/logout/logout.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { LoginService } from '../login.service';
+import { LoginService } from '../services/login.service';
 import { Router } from '@angular/router';
 @Component({
   selector: 'app-logout',
diff --git a/src/app/menu/menu.component.ts b/src/app/menu/menu.component.ts
index 899049d..d68df3a 100644
--- a/src/app/menu/menu.component.ts
+++ b/src/app/menu/menu.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { LoginService } from '../login.service';
+import { LoginService } from '../services/login.service';
 @Component({
   selector: 'app-menu',
   templateUrl: './menu.component.html',
diff --git a/src/app/messages/messages.component.ts b/src/app/messages/messages.component.ts
index 2576612..5e54ed3 100644
--- a/src/app/messages/messages.component.ts
+++ b/src/app/messages/messages.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { MessageService } from '../message.service';
+import { MessageService } from '../services/message.service';
 @Component({
   selector: 'app-messages',
   templateUrl: './messages.component.html',
diff --git a/src/app/annotation.spec.ts b/src/app/model/annotation.spec.ts
similarity index 100%
rename from src/app/annotation.spec.ts
rename to src/app/model/annotation.spec.ts
diff --git a/src/app/annotation.ts b/src/app/model/annotation.ts
similarity index 65%
rename from src/app/annotation.ts
rename to src/app/model/annotation.ts
index 27a6a4f..cd741ab 100644
--- a/src/app/annotation.ts
+++ b/src/app/model/annotation.ts
@@ -1,5 +1,5 @@
-import { Feature } from './feature';
-import { Finding } from './finding';
+import { Feature } from '../model/feature';
+import { Finding } from '../model/finding';
 export class Annotation {
   id: number;
   value: string;
diff --git a/src/app/auth.config.ts b/src/app/model/auth.config.ts
similarity index 88%
rename from src/app/auth.config.ts
rename to src/app/model/auth.config.ts
index 78ba077..7e3f941 100644
--- a/src/app/auth.config.ts
+++ b/src/app/model/auth.config.ts
@@ -1,5 +1,5 @@
 import {AuthConfig} from 'angular-oauth2-oidc';
-import { environment } from '../environments/environment';
+import { environment } from '../../environments/environment';
 export const authConfig: AuthConfig = {
   issuer: environment.oauth2_issuer,
   redirectUri: window.location.origin + environment.projectContextPath,
diff --git a/src/app/cdisc-field.spec.ts b/src/app/model/cdisc-field.spec.ts
similarity index 100%
rename from src/app/cdisc-field.spec.ts
rename to src/app/model/cdisc-field.spec.ts
diff --git a/src/app/cdisc-field.ts b/src/app/model/cdisc-field.ts
similarity index 100%
rename from src/app/cdisc-field.ts
rename to src/app/model/cdisc-field.ts
diff --git a/src/app/coded-value.spec.ts b/src/app/model/coded-value.spec.ts
similarity index 100%
rename from src/app/coded-value.spec.ts
rename to src/app/model/coded-value.spec.ts
diff --git a/src/app/coded-value.ts b/src/app/model/coded-value.ts
similarity index 100%
rename from src/app/coded-value.ts
rename to src/app/model/coded-value.ts
diff --git a/src/app/codelist.spec.ts b/src/app/model/codelist.spec.ts
similarity index 100%
rename from src/app/codelist.spec.ts
rename to src/app/model/codelist.spec.ts
diff --git a/src/app/codelist.ts b/src/app/model/codelist.ts
similarity index 100%
rename from src/app/codelist.ts
rename to src/app/model/codelist.ts
diff --git a/src/app/document-tracking.ts b/src/app/model/document-tracking.ts
similarity index 100%
rename from src/app/document-tracking.ts
rename to src/app/model/document-tracking.ts
diff --git a/src/app/document.spec.ts b/src/app/model/document.spec.ts
similarity index 100%
rename from src/app/document.spec.ts
rename to src/app/model/document.spec.ts
diff --git a/src/app/document.ts b/src/app/model/document.ts
similarity index 92%
rename from src/app/document.ts
rename to src/app/model/document.ts
index 4528375..dddaa5c 100644
--- a/src/app/document.ts
+++ b/src/app/model/document.ts
@@ -10,6 +10,5 @@ export class Document {
   statusColor: string = 'warning';
   textWithAnnotations: string;
   findings: SRDomainFinding[];
-  //findingsSR: FindingSR[];
   relevantSentences: Annotation[];
 }
diff --git a/src/app/feature.spec.ts b/src/app/model/feature.spec.ts
similarity index 100%
rename from src/app/feature.spec.ts
rename to src/app/model/feature.spec.ts
diff --git a/src/app/feature.ts b/src/app/model/feature.ts
similarity index 100%
rename from src/app/feature.ts
rename to src/app/model/feature.ts
diff --git a/src/app/finding.spec.ts b/src/app/model/finding.spec.ts
similarity index 100%
rename from src/app/finding.spec.ts
rename to src/app/model/finding.spec.ts
diff --git a/src/app/model/finding.ts b/src/app/model/finding.ts
new file mode 100644
index 0000000..eb13c16
--- /dev/null
+++ b/src/app/model/finding.ts
@@ -0,0 +1,20 @@
+import { Annotation } from './annotation';
+import { SRDomainFinding } from './srdomainfinding';
+
+
+export class Finding {
+  findingId: number;
+  status: string;
+  export: string;
+  finding: Annotation;
+  sex: Annotation;
+  manifestation_finding: Annotation;
+  specimen: Annotation;
+  group: Annotation;
+  study_testcd: Annotation;
+  study_domain: Annotation;
+  is_treatment_related: Annotation;
+  risk_level: Annotation;
+  dose: Annotation;
+  srDomainFindings: SRDomainFinding[];
+}
diff --git a/src/app/findingsr.ts b/src/app/model/findingsr.ts
similarity index 100%
rename from src/app/findingsr.ts
rename to src/app/model/findingsr.ts
diff --git a/src/app/srdomainfinding.ts b/src/app/model/srdomainfinding.ts
similarity index 100%
rename from src/app/srdomainfinding.ts
rename to src/app/model/srdomainfinding.ts
diff --git a/src/app/tracking.ts b/src/app/model/tracking.ts
similarity index 100%
rename from src/app/tracking.ts
rename to src/app/model/tracking.ts
diff --git a/src/app/pretoxsentences-tabulator/pretoxsentences-tabulator.component.ts b/src/app/pretoxsentences-tabulator/pretoxsentences-tabulator.component.ts
index 43b806c..778f791 100644
--- a/src/app/pretoxsentences-tabulator/pretoxsentences-tabulator.component.ts
+++ b/src/app/pretoxsentences-tabulator/pretoxsentences-tabulator.component.ts
@@ -3,8 +3,8 @@ import { TabulatorFull as Tabulator } from 'tabulator-tables';
 
 
 import { ActivatedRoute } from '@angular/router';
-import { DocumentService } from '../document.service';
-import { Document } from '../document';
+import { DocumentService } from '../services/document.service';
+import { Document } from '../model/document';
 
 @Component({
   selector: 'app-pretoxsentences-tabulator',
diff --git a/src/app/reports/reports.component.ts b/src/app/reports/reports.component.ts
index e825964..9ea34c0 100644
--- a/src/app/reports/reports.component.ts
+++ b/src/app/reports/reports.component.ts
@@ -1,9 +1,9 @@
 import { Component, Input, OnInit, SimpleChanges } from '@angular/core';
-import { DocumentService } from '../document.service';
+import { DocumentService } from '../services/document.service';
 import { Report } from '../model/report';
 import { Router } from '@angular/router';
 import {TabulatorFull as Tabulator} from 'tabulator-tables';
-import { WorkflowService } from '../workflow.service';
+import { WorkflowService } from '../services/workflow.service';
 
 @Component({
   selector: 'app-reports',
diff --git a/src/app/cdis-send-ct.service.spec.ts b/src/app/services/cdis-send-ct.service.spec.ts
similarity index 100%
rename from src/app/cdis-send-ct.service.spec.ts
rename to src/app/services/cdis-send-ct.service.spec.ts
diff --git a/src/app/cdis-send-ct.service.ts b/src/app/services/cdis-send-ct.service.ts
similarity index 96%
rename from src/app/cdis-send-ct.service.ts
rename to src/app/services/cdis-send-ct.service.ts
index d907d17..69b7646 100644
--- a/src/app/cdis-send-ct.service.ts
+++ b/src/app/services/cdis-send-ct.service.ts
@@ -1,11 +1,11 @@
 import { Injectable } from '@angular/core';
-import { environment } from './../environments/environment';
+import { environment } from '../../environments/environment';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { catchError, map, tap } from 'rxjs/operators';
 import { MessageService } from './message.service';
 import { Observable, of } from 'rxjs';
-import { CDISCField } from './cdisc-field';
-import { CodeList } from './codelist';
+import { CDISCField } from '../model/cdisc-field';
+import { CodeList } from '../model/codelist';
 @Injectable({
   providedIn: 'root'
 })
diff --git a/src/app/config-service.service.spec.ts b/src/app/services/config-service.service.spec.ts
similarity index 100%
rename from src/app/config-service.service.spec.ts
rename to src/app/services/config-service.service.spec.ts
diff --git a/src/app/config-service.service.ts b/src/app/services/config-service.service.ts
similarity index 80%
rename from src/app/config-service.service.ts
rename to src/app/services/config-service.service.ts
index 43aa901..127ff33 100644
--- a/src/app/config-service.service.ts
+++ b/src/app/services/config-service.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { environment } from '../environments/environment';
+import { environment } from '../../environments/environment';
 
 @Injectable({
   providedIn: 'root'
diff --git a/src/app/document.service.spec.ts b/src/app/services/document.service.spec.ts
similarity index 100%
rename from src/app/document.service.spec.ts
rename to src/app/services/document.service.spec.ts
diff --git a/src/app/document.service.ts b/src/app/services/document.service.ts
similarity index 97%
rename from src/app/document.service.ts
rename to src/app/services/document.service.ts
index 5e019ac..3cd9d8b 100644
--- a/src/app/document.service.ts
+++ b/src/app/services/document.service.ts
@@ -1,15 +1,15 @@
 import { Injectable } from '@angular/core';
-import { Document } from './document';
+import { Document } from '../model/document';
 import { Observable, of } from 'rxjs';
 import { MessageService } from './message.service';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { catchError, map, tap } from 'rxjs/operators';
-import { Finding } from './finding';
-import { Annotation } from './annotation';
-import { Report } from './model/report';
-import { environment } from './../environments/environment';
-import { DocumentTracking } from './document-tracking';
-import { FindingSR } from './findingsr';
+import { Finding } from '../model/finding';
+import { Annotation } from '../model/annotation';
+import { Report } from '../model/report';
+import { environment } from '../../environments/environment';
+import { DocumentTracking } from '../model/document-tracking';
+import { FindingSR } from '../model/findingsr';
 const httpOptions = {
   headers: new HttpHeaders({ 'Content-Type': 'application/json', 'Access-Control-Allow-Origin': '*'  })
 };
diff --git a/src/app/login.service.spec.ts b/src/app/services/login.service.spec.ts
similarity index 100%
rename from src/app/login.service.spec.ts
rename to src/app/services/login.service.spec.ts
diff --git a/src/app/login.service.ts b/src/app/services/login.service.ts
similarity index 96%
rename from src/app/login.service.ts
rename to src/app/services/login.service.ts
index 2592773..ed8a6e2 100644
--- a/src/app/login.service.ts
+++ b/src/app/services/login.service.ts
@@ -2,8 +2,8 @@ import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { map, filter } from 'rxjs/operators';
 import {OAuthService} from "angular-oauth2-oidc";
-import {environment } from './../environments/environment';
-import {authConfig} from "./auth.config";
+import {environment } from '../../environments/environment';
+import {authConfig} from "../model/auth.config";
 @Injectable({
   providedIn: 'root'
 })
diff --git a/src/app/message.service.spec.ts b/src/app/services/message.service.spec.ts
similarity index 100%
rename from src/app/message.service.spec.ts
rename to src/app/services/message.service.spec.ts
diff --git a/src/app/message.service.ts b/src/app/services/message.service.ts
similarity index 100%
rename from src/app/message.service.ts
rename to src/app/services/message.service.ts
diff --git a/src/app/upload-files.service.spec.ts b/src/app/services/upload-files.service.spec.ts
similarity index 100%
rename from src/app/upload-files.service.spec.ts
rename to src/app/services/upload-files.service.spec.ts
diff --git a/src/app/upload-files.service.ts b/src/app/services/upload-files.service.ts
similarity index 95%
rename from src/app/upload-files.service.ts
rename to src/app/services/upload-files.service.ts
index 4dc6a0a..75f3cce 100644
--- a/src/app/upload-files.service.ts
+++ b/src/app/services/upload-files.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpRequest, HttpEvent } from '@angular/common/http';
 import { Observable } from 'rxjs';
-import { environment } from './../environments/environment';
+import { environment } from '../../environments/environment';
 @Injectable({
   providedIn: 'root'
 })
diff --git a/src/app/workflow.service.spec.ts b/src/app/services/workflow.service.spec.ts
similarity index 100%
rename from src/app/workflow.service.spec.ts
rename to src/app/services/workflow.service.spec.ts
diff --git a/src/app/workflow.service.ts b/src/app/services/workflow.service.ts
similarity index 96%
rename from src/app/workflow.service.ts
rename to src/app/services/workflow.service.ts
index ff27344..1019725 100644
--- a/src/app/workflow.service.ts
+++ b/src/app/services/workflow.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { environment } from '../environments/environment';
+import { environment } from '../../environments/environment';
 import { MessageService } from './message.service';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Observable, of, throwError } from 'rxjs';
diff --git a/src/app/srdomaintemplate-tabulator/srdomaintemplate-tabulator.component.ts b/src/app/srdomaintemplate-tabulator/srdomaintemplate-tabulator.component.ts
index 674dcfa..4334f70 100644
--- a/src/app/srdomaintemplate-tabulator/srdomaintemplate-tabulator.component.ts
+++ b/src/app/srdomaintemplate-tabulator/srdomaintemplate-tabulator.component.ts
@@ -1,9 +1,9 @@
 import { Component, Input, OnInit, EventEmitter, Output } from '@angular/core';
 import {TabulatorFull as Tabulator} from 'tabulator-tables';
-import { CdisSendCtService } from '../cdis-send-ct.service';
+import { CdisSendCtService } from '../services/cdis-send-ct.service';
 import { ActivatedRoute } from '@angular/router';
-import { DocumentService } from '../document.service';
-import { Document } from '../document';
+import { DocumentService } from '../services/document.service';
+import { Document } from '../model/document';
 import { cloneDeep } from 'lodash';
 
 @Component({
diff --git a/src/app/upload-files/upload-files.component.ts b/src/app/upload-files/upload-files.component.ts
index 612665d..a2d6aff 100644
--- a/src/app/upload-files/upload-files.component.ts
+++ b/src/app/upload-files/upload-files.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 
-import { UploadFilesService } from 'src/app/upload-files.service';
-import { WorkflowService } from 'src/app/workflow.service';
+import { UploadFilesService } from 'src/app/services/upload-files.service';
+import { WorkflowService } from 'src/app/services/workflow.service';
 import { HttpEventType, HttpResponse } from '@angular/common/http';
 import { Observable } from 'rxjs';
 
diff --git a/src/app/workflow-execution/workflow-execution.component.ts b/src/app/workflow-execution/workflow-execution.component.ts
index 397782e..b1350af 100644
--- a/src/app/workflow-execution/workflow-execution.component.ts
+++ b/src/app/workflow-execution/workflow-execution.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { WorkflowService } from '../workflow.service';
+import { WorkflowService } from '../services/workflow.service';
 
 @Component({
   selector: 'app-workflow-execution',
-- 
GitLab