diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
index 7bf06087a9..4f6b124f12 100644
--- a/src/app/app.component.spec.ts
+++ b/src/app/app.component.spec.ts
@@ -6,16 +6,11 @@ import { MatMenuModule } from '@angular/material/menu';
 import { MatToolbarModule } from '@angular/material/toolbar';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import {
-    AppInitService,
-    DspActionModule,
-    DspApiConfigToken,
-    DspApiConnectionToken,
-    DspSearchModule
-} from '@dasch-swiss/dsp-ui';
+import { AppInitService, DspActionModule, DspSearchModule } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { TestConfig } from 'test.config';
 import { AppComponent } from './app.component';
+import { DspApiConfigToken, DspApiConnectionToken } from './main/declarations/dsp-api-tokens';
 import { HeaderComponent } from './main/header/header.component';
 import { SelectLanguageComponent } from './main/select-language/select-language.component';
 import { UserMenuComponent } from './user/user-menu/user-menu.component';
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 2cef8761c9..93d474da4a 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -7,14 +7,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import {
-    DspActionModule,
-    DspApiConfigToken,
-    DspApiConnectionToken,
-    DspCoreModule,
-    DspSearchModule,
-    DspViewerModule
-} from '@dasch-swiss/dsp-ui';
+import { DspActionModule, DspCoreModule, DspSearchModule, DspViewerModule } from '@dasch-swiss/dsp-ui';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { TranslateHttpLoader } from '@ngx-translate/http-loader';
 import { AngularSplitModule } from 'angular-split';
@@ -166,6 +159,7 @@ import { ResourceAndPropertySelectionComponent } from './workspace/search/advanc
 import { SearchSelectPropertyComponent } from './workspace/search/advanced-search/resource-and-property-selection/search-select-property/search-select-property.component';
 import { SearchSelectResourceClassComponent } from './workspace/search/advanced-search/resource-and-property-selection/search-select-resource-class/search-select-resource-class.component';
 import { SearchSelectOntologyComponent } from './workspace/search/advanced-search/search-select-ontology/search-select-ontology.component';
+import { DspApiConfigToken, DspApiConnectionToken } from './main/declarations/dsp-api-tokens';
 
 // translate: AoT requires an exported function for factories
 export function httpLoaderFactory(httpClient: HttpClient) {
diff --git a/src/app/main/cache/cache.service.spec.ts b/src/app/main/cache/cache.service.spec.ts
index 92e47d567c..e79f34fc49 100644
--- a/src/app/main/cache/cache.service.spec.ts
+++ b/src/app/main/cache/cache.service.spec.ts
@@ -2,7 +2,8 @@ import { TestBed } from '@angular/core/testing';
 import { MatDialogModule } from '@angular/material/dialog';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { DspActionModule, DspApiConnectionToken, DspCoreModule } from '@dasch-swiss/dsp-ui';
+import { DspActionModule, DspCoreModule } from '@dasch-swiss/dsp-ui';
+import { DspApiConnectionToken } from '../declarations/dsp-api-tokens';
 import { CacheService } from './cache.service';
 
 describe('CacheService', () => {
diff --git a/src/app/main/error/error-handler.service.spec.ts b/src/app/main/error/error-handler.service.spec.ts
index 56b6822462..614742af2e 100644
--- a/src/app/main/error/error-handler.service.spec.ts
+++ b/src/app/main/error/error-handler.service.spec.ts
@@ -2,7 +2,8 @@ import { TestBed } from '@angular/core/testing';
 import { MatDialogModule } from '@angular/material/dialog';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { DspActionModule, DspApiConnectionToken, DspCoreModule } from '@dasch-swiss/dsp-ui';
+import { DspActionModule, DspCoreModule } from '@dasch-swiss/dsp-ui';
+import { DspApiConnectionToken } from '../declarations/dsp-api-tokens';
 import { ErrorHandlerService } from './error-handler.service';
 
 describe('ErrorHandlerService', () => {
diff --git a/src/app/main/error/error-handler.service.ts b/src/app/main/error/error-handler.service.ts
index 4cecfed627..e7343294be 100644
--- a/src/app/main/error/error-handler.service.ts
+++ b/src/app/main/error/error-handler.service.ts
@@ -1,8 +1,10 @@
 import { Inject, Injectable } from '@angular/core';
 import { MatDialog, MatDialogConfig } from '@angular/material/dialog';
 import { ApiResponseData, ApiResponseError, KnoraApiConnection, LogoutResponse } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken, NotificationService, SessionService } from '@dasch-swiss/dsp-ui';
+import { DspApiConnectionToken } from '../declarations/dsp-api-tokens';
 import { DialogComponent } from '../dialog/dialog.component';
+import { NotificationService } from '../services/notification.service';
+import { SessionService } from '../services/session.service';
 
 @Injectable({
     providedIn: 'root'
diff --git a/src/app/main/guard/auth.guard.ts b/src/app/main/guard/auth.guard.ts
index 75c33cb26a..07c73592e8 100644
--- a/src/app/main/guard/auth.guard.ts
+++ b/src/app/main/guard/auth.guard.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
-import { SessionService } from '@dasch-swiss/dsp-ui';
+import { SessionService } from '../services/session.service';
 
 @Injectable({
     providedIn: 'root'
diff --git a/src/app/main/header/header.component.html b/src/app/main/header/header.component.html
index d78e08e897..5d2e39a905 100644
--- a/src/app/main/header/header.component.html
+++ b/src/app/main/header/header.component.html
@@ -13,12 +13,12 @@ <h1 class="mat-headline phone-tablet-only">DSP</h1>
     <!-- search-panel (in desktop and tablet version) -->
     <span class="action">
         <!-- button to reactivate when dsp-app will be used as a research platform again: -->
-        <dsp-search-panel
+        <app-search-panel
             [projectfilter]="true"
             [advanced]="true"
             [expert]="true"
             (search)="doSearch($event)">
-        </dsp-search-panel>
+        </app-search-panel>
 
     </span>
 
diff --git a/src/app/main/header/header.component.spec.ts b/src/app/main/header/header.component.spec.ts
index 9558b5aa21..379779e3a6 100644
--- a/src/app/main/header/header.component.spec.ts
+++ b/src/app/main/header/header.component.spec.ts
@@ -1,4 +1,5 @@
 import { HttpClientModule } from '@angular/common/http';
+import { Component, Input, OnInit, ViewChild } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { MatIconModule } from '@angular/material/icon';
 import { MatListModule } from '@angular/material/list';
@@ -8,30 +9,55 @@ import { By } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import {
-    AppInitService,
-    DspActionModule,
-    DspApiConfigToken,
-    DspApiConnectionToken,
-    DspCoreModule,
-    DspSearchModule
-} from '@dasch-swiss/dsp-ui';
+import { DspActionModule, DspSearchModule } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
+import { AppInitService } from 'src/app/app-init.service';
 import { ComponentCommunicationEventService, EmitEvent, Events } from 'src/app/main/services/component-communication-event.service';
 import { UserMenuComponent } from 'src/app/user/user-menu/user-menu.component';
 import { TestConfig } from 'test.config';
+import { DspApiConfigToken, DspApiConnectionToken } from '../declarations/dsp-api-tokens';
 import { SelectLanguageComponent } from '../select-language/select-language.component';
 import { HeaderComponent } from './header.component';
 
+/**
+ * test host component to simulate parent component.
+ */
+@Component({
+    template: '<app-header #header></app-header>'
+})
+class TestHostHeaderComponent {
+    @ViewChild('header') headerComp: HeaderComponent;
+}
+
+/**
+ * test component to simulate search panel component.
+ */
+@Component({
+    selector: 'app-search-panel',
+    template: ''
+})
+class TestSearchPanelComponent {
+    @Input() projectfilter?: boolean = false;
+    @Input() filterbyproject?: string;
+    @Input() limitToProject?: string;
+    @Input() advanced?: boolean = false;
+    @Input() expert?: boolean = false;
+}
+
 describe('HeaderComponent', () => {
-    let component: HeaderComponent;
-    let fixture: ComponentFixture<HeaderComponent>;
+    let testHostComponent: TestHostHeaderComponent;
+    let testHostFixture: ComponentFixture<TestHostHeaderComponent>;
+    let hostCompDe;
+    let headerCompDe;
+
     let componentCommsService: ComponentCommunicationEventService;
 
     beforeEach(waitForAsync(() => {
         TestBed.configureTestingModule({
             declarations: [
                 HeaderComponent,
+                TestHostHeaderComponent,
+                TestSearchPanelComponent,
                 SelectLanguageComponent,
                 UserMenuComponent
             ],
@@ -39,7 +65,6 @@ describe('HeaderComponent', () => {
                 BrowserAnimationsModule,
                 HttpClientModule,
                 DspActionModule,
-                DspCoreModule,
                 DspSearchModule,
                 MatIconModule,
                 MatListModule,
@@ -66,55 +91,59 @@ describe('HeaderComponent', () => {
     }));
 
     beforeEach(() => {
-        fixture = TestBed.createComponent(HeaderComponent);
-        component = fixture.componentInstance;
-        fixture.detectChanges();
+        testHostFixture = TestBed.createComponent(TestHostHeaderComponent);
+        testHostComponent = testHostFixture.componentInstance;
+        testHostFixture.detectChanges();
+
+        hostCompDe = testHostFixture.debugElement;
+        headerCompDe = hostCompDe.query(By.directive(HeaderComponent));
     });
 
     it('should create', () => {
-        expect(component).toBeTruthy();
+        expect(testHostComponent).toBeTruthy();
     });
 
     it('should display the lamp icon button', () => {
-        const lampIconBtn = fixture.debugElement.query(By.css('button.home-button'));
-        expect(lampIconBtn).toBeDefined();
+        const lampIconBtn = testHostFixture.debugElement.query(By.css('button.home-button'));
+        expect(lampIconBtn).toBeTruthy();
     });
 
     it('should display the link to the help page', () => {
-        const helpBtn = fixture.debugElement.query(By.css('button.help'));
-        expect(helpBtn).toBeDefined();
+        const helpBtn = testHostFixture.debugElement.query(By.css('button.help'));
+        expect(helpBtn).toBeTruthy();
 
         const helpBtnLabel = helpBtn.nativeElement.innerHTML;
         expect(helpBtnLabel).toEqual('Help');
     });
 
     it('should display the login button', () => {
-        const loginBtn = fixture.debugElement.query(By.css('button.login-button'));
-        expect(loginBtn).toBeDefined();
+        const loginBtn = testHostFixture.debugElement.query(By.css('button.login-button'));
+        expect(loginBtn).toBeTruthy();
 
         const loginBtnLabel = loginBtn.nativeElement.innerHTML;
         expect(loginBtnLabel).toEqual('LOGIN');
     });
 
-    it('should display fulltext-search', () => {
-        const searchPanel = fixture.debugElement.query(By.css('dsp-fulltext-search-panel'));
-        expect(searchPanel).toBeDefined();
+    it('should display search panel', () => {
+        const searchPanel = testHostFixture.debugElement.query(By.css('app-search-panel'));
+        expect(searchPanel).toBeTruthy();
     });
 
     it('should subscribe to component communication when the loginSuccess event is emitted', () => {
         componentCommsService.emit(new EmitEvent(Events.loginSuccess));
-        fixture.detectChanges();
-        expect(component.componentCommsSubscription.closed).toBe(false);
+        testHostFixture.detectChanges();
+        expect(testHostComponent.headerComp.componentCommsSubscription.closed).toBe(false);
     });
 
     it('should unsubscribe from changes on destruction', () => {
 
-        expect(component.componentCommsSubscription.closed).toBe(false);
+        expect(testHostComponent.headerComp.componentCommsSubscription.closed).toBe(false);
 
-        fixture.destroy();
+        testHostFixture.destroy();
 
-        expect(component.componentCommsSubscription.closed).toBe(true);
+        expect(testHostComponent.headerComp.componentCommsSubscription.closed).toBe(true);
 
     });
 
 });
+
diff --git a/src/app/main/header/header.component.ts b/src/app/main/header/header.component.ts
index 0f816d77d0..03147a0b5a 100644
--- a/src/app/main/header/header.component.ts
+++ b/src/app/main/header/header.component.ts
@@ -3,10 +3,12 @@ import { MatDialog, MatDialogConfig } from '@angular/material/dialog';
 import { MatIconRegistry } from '@angular/material/icon';
 import { DomSanitizer } from '@angular/platform-browser';
 import { NavigationStart, Router } from '@angular/router';
-import { NotificationService, SearchParams, SessionService } from '@dasch-swiss/dsp-ui';
+import { SearchParams } from '@dasch-swiss/dsp-ui';
 import { Subscription } from 'rxjs';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ComponentCommunicationEventService, Events } from 'src/app/main/services/component-communication-event.service';
+import { NotificationService } from '../services/notification.service';
+import { SessionService } from '../services/session.service';
 
 const { version: appVersion } = require('../../../../package.json');
 
diff --git a/src/app/main/help/help.component.spec.ts b/src/app/main/help/help.component.spec.ts
index eeb12e9148..02f669c32a 100644
--- a/src/app/main/help/help.component.spec.ts
+++ b/src/app/main/help/help.component.spec.ts
@@ -6,8 +6,9 @@ import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { AppInitService, DspApiConfigToken, DspApiConnectionToken } from '@dasch-swiss/dsp-ui';
+import { AppInitService } from '@dasch-swiss/dsp-ui';
 import { TestConfig } from 'test.config';
+import { DspApiConfigToken, DspApiConnectionToken } from '../declarations/dsp-api-tokens';
 import { DialogComponent } from '../dialog/dialog.component';
 import { ErrorComponent } from '../error/error.component';
 import { FooterComponent } from '../footer/footer.component';
diff --git a/src/app/main/help/help.component.ts b/src/app/main/help/help.component.ts
index 794ed61d0d..68063269f2 100644
--- a/src/app/main/help/help.component.ts
+++ b/src/app/main/help/help.component.ts
@@ -1,6 +1,6 @@
 import { Component, Inject, OnInit } from '@angular/core';
 import { ApiResponseData, ApiResponseError, HealthResponse, KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken } from '@dasch-swiss/dsp-ui';
+import { DspApiConnectionToken } from '../declarations/dsp-api-tokens';
 import { ErrorHandlerService } from '../error/error-handler.service';
 import { GridItem } from '../grid/grid.component';
 
diff --git a/src/app/main/login/login.component.html b/src/app/main/login/login.component.html
index 79a3e7db33..7fbe734322 100644
--- a/src/app/main/login/login.component.html
+++ b/src/app/main/login/login.component.html
@@ -1,3 +1,3 @@
 <div class="login-page">
-    <dsp-login-form (loginSuccess)="login($event)" (logoutSuccess)="logout($event)"></dsp-login-form>
+    <app-login-form (loginSuccess)="login($event)" (logoutSuccess)="logout($event)"></app-login-form>
 </div>
diff --git a/src/app/main/login/login.component.spec.ts b/src/app/main/login/login.component.spec.ts
index 1350e0d138..e306b5fc22 100644
--- a/src/app/main/login/login.component.spec.ts
+++ b/src/app/main/login/login.component.spec.ts
@@ -1,27 +1,46 @@
+import { Component } from '@angular/core';
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import {
-    AppInitService,
-    DspActionModule,
-    DspApiConfigToken,
-    DspApiConnectionToken,
-    DspCoreModule
-} from '@dasch-swiss/dsp-ui';
+import { DspActionModule } from '@dasch-swiss/dsp-ui';
+import { AppInitService } from 'src/app/app-init.service';
 import { TestConfig } from 'test.config';
+import { DspApiConfigToken, DspApiConnectionToken } from '../declarations/dsp-api-tokens';
 import { LoginComponent } from './login.component';
 
+/**
+ * test host component to simulate parent component.
+ */
+@Component({
+    template: '<app-login></app-login>'
+})
+class TestHostLoginComponent { }
+
+/**
+ * test component to simulate child component.
+ */
+@Component({
+    selector: 'app-login-form',
+    template: ''
+})
+class TestLoginFormComponent { }
+
 describe('LoginComponent', () => {
-    let component: LoginComponent;
-    let fixture: ComponentFixture<LoginComponent>;
+    let testHostComponent: TestHostLoginComponent;
+    let testHostFixture: ComponentFixture<TestHostLoginComponent>;
+    let hostCompDe;
+    let loginComponentDe;
 
     beforeEach(waitForAsync(() => {
         TestBed.configureTestingModule({
-            declarations: [LoginComponent],
+            declarations: [
+                LoginComponent,
+                TestHostLoginComponent,
+                TestLoginFormComponent
+            ],
             imports: [
                 DspActionModule,
-                DspCoreModule,
                 RouterTestingModule
             ],
             providers: [
@@ -39,18 +58,23 @@ describe('LoginComponent', () => {
     }));
 
     beforeEach(() => {
-        fixture = TestBed.createComponent(LoginComponent);
-        component = fixture.componentInstance;
-        fixture.detectChanges();
+        testHostFixture = TestBed.createComponent(TestHostLoginComponent);
+        testHostComponent = testHostFixture.componentInstance;
+        testHostFixture.detectChanges();
+
+        hostCompDe = testHostFixture.debugElement;
+        loginComponentDe = hostCompDe.query(By.directive(LoginComponent));
+
+        expect(testHostComponent).toBeTruthy();
     });
 
     it('should create', () => {
-        expect(component).toBeTruthy();
+        expect(testHostComponent).toBeTruthy();
     });
 
     it('should define the login form', () => {
-        const loginForm = fixture.debugElement.query(By.css('app-login dsp-login-form'));
-        expect(loginForm).toBeDefined();
+        const loginForm = testHostFixture.debugElement.query(By.css('app-login app-login-form'));
+        expect(loginForm).toBeTruthy();
     });
 
 });
diff --git a/src/app/main/main.component.spec.ts b/src/app/main/main.component.spec.ts
index cf728d2a89..515f0989d8 100644
--- a/src/app/main/main.component.spec.ts
+++ b/src/app/main/main.component.spec.ts
@@ -9,14 +9,16 @@ import { By } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { AppInitService, DspActionModule, DspApiConfigToken, DspApiConnectionToken, SessionService } from '@dasch-swiss/dsp-ui';
+import { AppInitService, DspActionModule } from '@dasch-swiss/dsp-ui';
 import { of } from 'rxjs';
 import { TestConfig } from 'test.config';
+import { DspApiConfigToken, DspApiConnectionToken } from './declarations/dsp-api-tokens';
 import { DialogComponent } from './dialog/dialog.component';
 import { ErrorComponent } from './error/error.component';
 import { FooterComponent } from './footer/footer.component';
 import { GridComponent } from './grid/grid.component';
 import { MainComponent } from './main.component';
+import { SessionService } from './services/session.service';
 
 describe('MainComponent', () => {
     let component: MainComponent;
diff --git a/src/app/main/main.component.ts b/src/app/main/main.component.ts
index 9e294b4201..9c08c7b478 100644
--- a/src/app/main/main.component.ts
+++ b/src/app/main/main.component.ts
@@ -2,9 +2,10 @@ import { Component, Inject, OnInit } from '@angular/core';
 import { Title } from '@angular/platform-browser';
 import { Router } from '@angular/router';
 import { ApiResponseData, ApiResponseError, Constants, KnoraApiConnection, ProjectsResponse } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken, SessionService } from '@dasch-swiss/dsp-ui';
+import { DspApiConnectionToken } from './declarations/dsp-api-tokens';
 import { ErrorHandlerService } from './error/error-handler.service';
 import { GridItem } from './grid/grid.component';
+import { SessionService } from './services/session.service';
 
 @Component({
     selector: 'app-main',
diff --git a/src/app/project/board/board.component.spec.ts b/src/app/project/board/board.component.spec.ts
index eb3b9573fa..46f5015976 100644
--- a/src/app/project/board/board.component.spec.ts
+++ b/src/app/project/board/board.component.spec.ts
@@ -7,8 +7,9 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { AppInitService, DspActionModule, DspApiConfigToken, DspApiConnectionToken, DspCoreModule } from '@dasch-swiss/dsp-ui';
+import { AppInitService, DspActionModule, DspCoreModule } from '@dasch-swiss/dsp-ui';
 import { of } from 'rxjs';
+import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorComponent } from 'src/app/main/error/error.component';
 import { TestConfig } from 'test.config';
diff --git a/src/app/project/board/board.component.ts b/src/app/project/board/board.component.ts
index c515cacdf2..f41cfd6297 100644
--- a/src/app/project/board/board.component.ts
+++ b/src/app/project/board/board.component.ts
@@ -11,9 +11,10 @@ import {
     ReadProject,
     SingleProject
 } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken, Session, SessionService } from '@dasch-swiss/dsp-ui';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
+import { Session, SessionService } from 'src/app/main/services/session.service';
 import { CacheService } from '../../main/cache/cache.service';
 
 export interface DatasetRadioOption {
diff --git a/src/app/project/collaboration/add-user/add-user.component.spec.ts b/src/app/project/collaboration/add-user/add-user.component.spec.ts
index eca24eab1c..3386e74254 100644
--- a/src/app/project/collaboration/add-user/add-user.component.spec.ts
+++ b/src/app/project/collaboration/add-user/add-user.component.spec.ts
@@ -7,14 +7,9 @@ import { MatInputModule } from '@angular/material/input';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import {
-    AppInitService,
-    DspActionModule,
-    DspApiConfigToken,
-    DspApiConnectionToken,
-    DspCoreModule
-} from '@dasch-swiss/dsp-ui';
+import { AppInitService, DspActionModule, DspCoreModule } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
+import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorComponent } from 'src/app/main/error/error.component';
 import { TestConfig } from 'test.config';
diff --git a/src/app/project/collaboration/add-user/add-user.component.ts b/src/app/project/collaboration/add-user/add-user.component.ts
index e6434d72ad..73c78105de 100644
--- a/src/app/project/collaboration/add-user/add-user.component.ts
+++ b/src/app/project/collaboration/add-user/add-user.component.ts
@@ -6,16 +6,16 @@ import {
     ApiResponseError,
     KnoraApiConnection,
     MembersResponse,
-    ProjectResponse,
     ReadProject,
     ReadUser,
     UserResponse,
     UsersResponse
 } from '@dasch-swiss/dsp-js';
-import { AutocompleteItem, DspApiConnectionToken, existingNamesValidator } from '@dasch-swiss/dsp-ui';
+import { AutocompleteItem, existingNamesValidator } from '@dasch-swiss/dsp-ui';
 import { Observable } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
 
diff --git a/src/app/project/collaboration/collaboration.component.spec.ts b/src/app/project/collaboration/collaboration.component.spec.ts
index 036eda056d..2e9174b7f5 100644
--- a/src/app/project/collaboration/collaboration.component.spec.ts
+++ b/src/app/project/collaboration/collaboration.component.spec.ts
@@ -11,15 +11,10 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import {
-    AppInitService,
-    DspActionModule,
-    DspApiConfigToken,
-    DspApiConnectionToken,
-    DspCoreModule
-} from '@dasch-swiss/dsp-ui';
+import { AppInitService, DspActionModule, DspCoreModule } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
+import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorComponent } from 'src/app/main/error/error.component';
 import { UsersListComponent } from 'src/app/system/users/users-list/users-list.component';
diff --git a/src/app/project/collaboration/collaboration.component.ts b/src/app/project/collaboration/collaboration.component.ts
index d704421bd4..b2517fdabf 100644
--- a/src/app/project/collaboration/collaboration.component.ts
+++ b/src/app/project/collaboration/collaboration.component.ts
@@ -6,12 +6,12 @@ import {
     ApiResponseError,
     KnoraApiConnection,
     MembersResponse,
-    ProjectResponse,
     ReadProject,
     ReadUser
 } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken, Session, SessionService } from '@dasch-swiss/dsp-ui';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
+import { Session, SessionService } from 'src/app/main/services/session.service';
 import { CacheService } from '../../main/cache/cache.service';
 import { AddUserComponent } from './add-user/add-user.component';
 
diff --git a/src/app/project/collaboration/select-group/select-group.component.spec.ts b/src/app/project/collaboration/select-group/select-group.component.spec.ts
index 33f01a8343..d287a163af 100644
--- a/src/app/project/collaboration/select-group/select-group.component.spec.ts
+++ b/src/app/project/collaboration/select-group/select-group.component.spec.ts
@@ -7,12 +7,8 @@ import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import {
-    AppInitService,
-    DspApiConfigToken,
-    DspApiConnectionToken,
-    DspCoreModule
-} from '@dasch-swiss/dsp-ui';
+import { AppInitService, DspCoreModule } from '@dasch-swiss/dsp-ui';
+import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorComponent } from 'src/app/main/error/error.component';
 import { TestConfig } from 'test.config';
diff --git a/src/app/project/collaboration/select-group/select-group.component.ts b/src/app/project/collaboration/select-group/select-group.component.ts
index 7b40525821..de811b5009 100644
--- a/src/app/project/collaboration/select-group/select-group.component.ts
+++ b/src/app/project/collaboration/select-group/select-group.component.ts
@@ -1,8 +1,9 @@
 import { Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular/core';
 import { FormControl } from '@angular/forms';
 import { ApiResponseData, ApiResponseError, GroupsResponse, KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { AutocompleteItem, DspApiConnectionToken } from '@dasch-swiss/dsp-ui';
+import { AutocompleteItem } from '@dasch-swiss/dsp-ui';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
 
 @Component({
diff --git a/src/app/project/list/list-info-form/list-info-form.component.html b/src/app/project/list/list-info-form/list-info-form.component.html
index f39251bff9..fbb43212b6 100644
--- a/src/app/project/list/list-info-form/list-info-form.component.html
+++ b/src/app/project/list/list-info-form/list-info-form.component.html
@@ -1,20 +1,20 @@
 <div>
-    <dsp-progress-indicator *ngIf="loading"></dsp-progress-indicator>
+    <app-progress-indicator *ngIf="loading"></app-progress-indicator>
 
     <div *ngIf="!loading" class="form-content list-info">
 
         <!-- list label -->
-        <dsp-string-literal-input [placeholder]="'List label *'" [value]="labels"
+        <app-string-literal-input [placeholder]="'List label *'" [value]="labels"
             (dataChanged)="handleData($event, 'labels')">
-        </dsp-string-literal-input>
+        </app-string-literal-input>
         <mat-hint class="invalid-form string-literal-error" *ngIf="labelInvalidMessage">{{ labelInvalidMessage }}</mat-hint>
 
         <br><br>
 
         <!-- list description / comment -->
-        <dsp-string-literal-input [textarea]="true" [placeholder]="'List description'" [value]="comments"
+        <app-string-literal-input [textarea]="true" [placeholder]="'List description'" [value]="comments"
             (dataChanged)="handleData($event, 'comments')" [language]="labels.length ? labels[0].language : 'en'">
-        </dsp-string-literal-input>
+        </app-string-literal-input>
 
         <div class="form-panel form-action">
             <span>
diff --git a/src/app/project/list/list-info-form/list-info-form.component.spec.ts b/src/app/project/list/list-info-form/list-info-form.component.spec.ts
index b67d0438aa..7454c0aec9 100644
--- a/src/app/project/list/list-info-form/list-info-form.component.spec.ts
+++ b/src/app/project/list/list-info-form/list-info-form.component.spec.ts
@@ -11,14 +11,11 @@ import { MatInputModule } from '@angular/material/input';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { ApiResponseData, CreateListRequest, ListInfoResponse, ListResponse, ListsEndpointAdmin, UpdateListInfoRequest } from '@dasch-swiss/dsp-js';
-import {
-    DspActionModule,
-    DspApiConnectionToken,
-    DspCoreModule
-} from '@dasch-swiss/dsp-ui';
+import { DspActionModule, DspCoreModule } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 import { AjaxResponse } from 'rxjs/ajax';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogHeaderComponent } from 'src/app/main/dialog/dialog-header/dialog-header.component';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorComponent } from 'src/app/main/error/error.component';
diff --git a/src/app/project/list/list-info-form/list-info-form.component.ts b/src/app/project/list/list-info-form/list-info-form.component.ts
index 0f85179880..affc8bda04 100644
--- a/src/app/project/list/list-info-form/list-info-form.component.ts
+++ b/src/app/project/list/list-info-form/list-info-form.component.ts
@@ -13,7 +13,7 @@ import {
     StringLiteral,
     UpdateListInfoRequest
 } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken } from '@dasch-swiss/dsp-ui';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
 
 @Component({
diff --git a/src/app/project/list/list-item-form/edit-list-item/edit-list-item.component.html b/src/app/project/list/list-item-form/edit-list-item/edit-list-item.component.html
index 9948d8e245..cc5bffdc3a 100644
--- a/src/app/project/list/list-item-form/edit-list-item/edit-list-item.component.html
+++ b/src/app/project/list/list-item-form/edit-list-item/edit-list-item.component.html
@@ -1,25 +1,25 @@
-<dsp-progress-indicator *ngIf="loading"></dsp-progress-indicator>
+<app-progress-indicator *ngIf="loading"></app-progress-indicator>
 
 <div *ngIf="!loading" class="form-content list-info">
 
     <!-- list label -->
-    <dsp-string-literal-input
+    <app-string-literal-input
         [placeholder]="'Child node label *'"
         [value]="labels"
         (dataChanged)="handleData($event, 'labels')">
-    </dsp-string-literal-input>
+    </app-string-literal-input>
     <mat-hint class="invalid-form string-literal-error" *ngIf="formInvalidMessage">{{ formInvalidMessage }}</mat-hint>
 
     <br><br>
 
     <!-- list description / comment -->
-    <dsp-string-literal-input
+    <app-string-literal-input
         [textarea]="true"
         [placeholder]="'Child node description'"
         [value]="comments"
         (dataChanged)="handleData($event, 'comments')"
         [language]="labels.length ? labels[0].language : 'en'">
-    </dsp-string-literal-input>
+    </app-string-literal-input>
 
     <div class="form-panel form-action">
         <span>
diff --git a/src/app/project/list/list-item-form/edit-list-item/edit-list-item.component.spec.ts b/src/app/project/list/list-item-form/edit-list-item/edit-list-item.component.spec.ts
index 2f7560c414..b7d7ae53b5 100644
--- a/src/app/project/list/list-item-form/edit-list-item/edit-list-item.component.spec.ts
+++ b/src/app/project/list/list-item-form/edit-list-item/edit-list-item.component.spec.ts
@@ -3,10 +3,11 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ApiResponseData, CreateChildNodeRequest, ListNodeInfoResponse, ListsEndpointAdmin, UpdateChildNodeRequest } from '@dasch-swiss/dsp-js';
-import { DspActionModule, DspApiConnectionToken, ProgressIndicatorComponent } from '@dasch-swiss/dsp-ui';
+import { DspActionModule, ProgressIndicatorComponent } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 import { AjaxResponse } from 'rxjs/ajax';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { EditListItemComponent } from './edit-list-item.component';
 
 /**
diff --git a/src/app/project/list/list-item-form/edit-list-item/edit-list-item.component.ts b/src/app/project/list/list-item-form/edit-list-item/edit-list-item.component.ts
index 625d1756bc..af531b73af 100644
--- a/src/app/project/list/list-item-form/edit-list-item/edit-list-item.component.ts
+++ b/src/app/project/list/list-item-form/edit-list-item/edit-list-item.component.ts
@@ -12,8 +12,8 @@ import {
     StringLiteral,
     UpdateChildNodeRequest
 } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken } from '@dasch-swiss/dsp-ui';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
 
 @Component({
diff --git a/src/app/project/list/list-item-form/list-item-form.component.html b/src/app/project/list/list-item-form/list-item-form.component.html
index c590cb40ca..3570be8ee9 100644
--- a/src/app/project/list/list-item-form/list-item-form.component.html
+++ b/src/app/project/list/list-item-form/list-item-form.component.html
@@ -1,15 +1,15 @@
 <!-- add new node item -->
 <div class="new-list-item medium-field" *ngIf="newNode">
-    <dsp-string-literal-input class="list-item-label" [placeholder]="placeholder" [value]="[]"
+    <app-string-literal-input class="list-item-label" [placeholder]="placeholder" [value]="[]"
         (dataChanged)="handleData($event)" [language]="language" (enter)="createChildNode()">
-    </dsp-string-literal-input>
+    </app-string-literal-input>
     <button *ngIf="!loading" mat-icon-button matSuffix [disabled]="!labels?.length" class="add-node-btn"
         (click)="createChildNode()">
         <mat-icon>
             add
         </mat-icon>
     </button>
-    <dsp-progress-indicator [status]="0" *ngIf="loading" class="progress-indicator"></dsp-progress-indicator>
+    <app-progress-indicator [status]="0" *ngIf="loading" class="progress-indicator"></app-progress-indicator>
 </div>
 
 <!-- node item -->
@@ -17,10 +17,10 @@
     *ngIf="!newNode"
     (mouseenter)="mouseEnter()"
     (mouseleave)="mouseLeave()">
-    <dsp-string-literal-input class="list-item-label"
-        [placeholder]="labels | dspStringifyStringLiteral:'all' | dspTruncate: 128" [value]="labels" [readonly]="true"
+    <app-string-literal-input class="list-item-label"
+        [placeholder]="labels | appStringifyStringLiteral:'all' | appTruncate: 128" [value]="labels" [readonly]="true"
         (dataChanged)="handleData($event)" [language]="language">
-    </dsp-string-literal-input>
+    </app-string-literal-input>
     <div class="action-bubble" *ngIf="showActionBubble" [@simpleFadeAnimation]="'in'">
         <div class="button-container">
             <button mat-button
diff --git a/src/app/project/list/list-item-form/list-item-form.component.spec.ts b/src/app/project/list/list-item-form/list-item-form.component.spec.ts
index f8b470ade0..89f5b54f60 100644
--- a/src/app/project/list/list-item-form/list-item-form.component.spec.ts
+++ b/src/app/project/list/list-item-form/list-item-form.component.spec.ts
@@ -10,15 +10,15 @@ import { MatDialogHarness } from '@angular/material/dialog/testing';
 import { MatIconModule } from '@angular/material/icon';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ApiResponseData, DeleteListNodeResponse, ListsEndpointAdmin, StringLiteral } from '@dasch-swiss/dsp-js';
-import {
-    DspActionModule,
-    DspApiConnectionToken
-} from '@dasch-swiss/dsp-ui';
+import { DspActionModule } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 import { AjaxResponse } from 'rxjs/ajax';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogHeaderComponent } from 'src/app/main/dialog/dialog-header/dialog-header.component';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
+import { StringifyStringLiteralPipe } from 'src/app/main/pipes/string-transformation/stringify-string-literal.pipe';
+import { TruncatePipe } from 'src/app/main/pipes/string-transformation/truncate.pipe';
 import { ListItemFormComponent, ListNodeOperation } from './list-item-form.component';
 
 /**
@@ -82,7 +82,9 @@ describe('ListItemFormComponent', () => {
                 ListItemFormComponent,
                 TestHostComponent,
                 DialogComponent,
-                DialogHeaderComponent
+                DialogHeaderComponent,
+                StringifyStringLiteralPipe,
+                TruncatePipe
             ],
             imports: [
                 BrowserAnimationsModule,
diff --git a/src/app/project/list/list-item-form/list-item-form.component.ts b/src/app/project/list/list-item-form/list-item-form.component.ts
index 5d50bbe58d..e677e0c6f6 100644
--- a/src/app/project/list/list-item-form/list-item-form.component.ts
+++ b/src/app/project/list/list-item-form/list-item-form.component.ts
@@ -13,7 +13,7 @@ import {
     ListNodeInfoResponse,
     StringLiteral
 } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken } from '@dasch-swiss/dsp-ui';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
 
diff --git a/src/app/project/list/list-item/list-item.component.spec.ts b/src/app/project/list/list-item/list-item.component.spec.ts
index 8ad8cb70fa..3008237ccc 100644
--- a/src/app/project/list/list-item/list-item.component.spec.ts
+++ b/src/app/project/list/list-item/list-item.component.spec.ts
@@ -3,12 +3,10 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatIconModule } from '@angular/material/icon';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ApiResponseData, ListNode, ListNodeInfo, ListResponse, ListsEndpointAdmin, RepositionChildNodeResponse } from '@dasch-swiss/dsp-js';
-import {
-    DspActionModule,
-    DspApiConnectionToken
-} from '@dasch-swiss/dsp-ui';
+import { DspActionModule } from '@dasch-swiss/dsp-ui';
 import { of } from 'rxjs';
 import { AjaxResponse } from 'rxjs/ajax';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ListNodeOperation } from '../list-item-form/list-item-form.component';
 import { ListItemComponent } from './list-item.component';
 
diff --git a/src/app/project/list/list-item/list-item.component.ts b/src/app/project/list/list-item/list-item.component.ts
index 6f6e7c6ad0..0cb0488197 100644
--- a/src/app/project/list/list-item/list-item.component.ts
+++ b/src/app/project/list/list-item/list-item.component.ts
@@ -9,7 +9,7 @@ import {
     RepositionChildNodeRequest,
     RepositionChildNodeResponse
 } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken } from '@dasch-swiss/dsp-ui';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
 import { ListNodeOperation } from '../list-item-form/list-item-form.component';
 
diff --git a/src/app/project/list/list.component.html b/src/app/project/list/list.component.html
index 6b48ef5320..5c97665b40 100644
--- a/src/app/project/list/list.component.html
+++ b/src/app/project/list/list.component.html
@@ -1,6 +1,6 @@
 <div *ngIf="projectAdmin" class="content large middle">
 
-    <dsp-progress-indicator *ngIf="loading"></dsp-progress-indicator>
+    <app-progress-indicator *ngIf="loading"></app-progress-indicator>
 
     <!-- header toolbar -->
     <div class="app-toolbar transparent more-space-bottom" *ngIf="!loading">
@@ -32,8 +32,8 @@ <h2 class="mat-title">
                             <mat-select [formControl]="listForm.controls['list']" [(value)]="listIri">
 
                                 <mat-option *ngFor="let list of lists; let first = first" [value]="list.id"
-                                    [matTooltip]="list.comments | dspStringifyStringLiteral" matTooltipPosition="below">
-                                    {{list.labels | dspStringifyStringLiteral:'all'}}
+                                    [matTooltip]="list.comments | appStringifyStringLiteral" matTooltipPosition="below">
+                                    {{list.labels | appStringifyStringLiteral:'all'}}
                                 </mat-option>
 
                             </mat-select>
@@ -60,11 +60,11 @@ <h2 class="mat-title">
 
         <mat-toolbar class="more-space-bottom">
             <mat-toolbar-row>
-                <h3 class="mat-title" [matTooltip]="list.labels |dspStringifyStringLiteral:'all'"
-                    matTooltipPosition="above">{{list.labels | dspStringifyStringLiteral}}</h3>
+                <h3 class="mat-title" [matTooltip]="list.labels |appStringifyStringLiteral:'all'"
+                    matTooltipPosition="above">{{list.labels | appStringifyStringLiteral}}</h3>
                 <span class="fill-remaining-space"></span>
-                <p class="mat-body" [matTooltip]="list.comments | dspStringifyStringLiteral" matTooltipPosition="above">
-                    {{list.comments | dspStringifyStringLiteral | dspTruncate:64}}</p>
+                <p class="mat-body" [matTooltip]="list.comments | appStringifyStringLiteral" matTooltipPosition="above">
+                    {{list.comments | appStringifyStringLiteral | appTruncate:64}}</p>
                 <span class="fill-remaining-space"></span>
                 <button mat-button
                     (click)="$event.stopPropagation(); openDialog('editListInfo', list.labels[0].value, list.id)"
@@ -91,6 +91,6 @@ <h2 class="mat-title">
 </div>
 
 <div class="mobile-only">
-    <dsp-message [message]="{status: 415, statusText: 'This content is not supported on small devices.'}">
-    </dsp-message>
+    <app-message [message]="{status: 415, statusText: 'This content is not supported on small devices.'}">
+    </app-message>
 </div>
diff --git a/src/app/project/list/list.component.spec.ts b/src/app/project/list/list.component.spec.ts
index 581cc7488a..41baefbbc9 100644
--- a/src/app/project/list/list.component.spec.ts
+++ b/src/app/project/list/list.component.spec.ts
@@ -16,19 +16,17 @@ import { MatTooltipModule } from '@angular/material/tooltip';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute, Router } from '@angular/router';
 import { ApiResponseData, DeleteListResponse, ListNodeInfo, ListsEndpointAdmin, ListsResponse, MockProjects, ProjectResponse, ProjectsEndpointAdmin, ReadProject } from '@dasch-swiss/dsp-js';
-import {
-    DspActionModule,
-    DspApiConnectionToken,
-    DspCoreModule,
-    Session,
-    SessionService
-} from '@dasch-swiss/dsp-ui';
+import { DspActionModule, DspCoreModule } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 import { AjaxResponse } from 'rxjs/ajax';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogHeaderComponent } from 'src/app/main/dialog/dialog-header/dialog-header.component';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
+import { StringifyStringLiteralPipe } from 'src/app/main/pipes/string-transformation/stringify-string-literal.pipe';
+import { TruncatePipe } from 'src/app/main/pipes/string-transformation/truncate.pipe';
+import { Session, SessionService } from 'src/app/main/services/session.service';
 import { TestConfig } from 'test.config';
 import { ListComponent } from './list.component';
 
@@ -86,7 +84,9 @@ describe('ListComponent', () => {
                 MockListItemComponent,
                 MockListItemFormComponent,
                 DialogComponent,
-                DialogHeaderComponent
+                DialogHeaderComponent,
+                StringifyStringLiteralPipe,
+                TruncatePipe
             ],
             imports: [
                 BrowserAnimationsModule,
diff --git a/src/app/project/list/list.component.ts b/src/app/project/list/list.component.ts
index 5b16cf76f4..fbee16f4dd 100644
--- a/src/app/project/list/list.component.ts
+++ b/src/app/project/list/list.component.ts
@@ -15,11 +15,12 @@ import {
     ReadProject,
     StringLiteral
 } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken, Session, SessionService } from '@dasch-swiss/dsp-ui';
 import { AppGlobal } from 'src/app/app-global';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
+import { Session, SessionService } from 'src/app/main/services/session.service';
 
 @Component({
     selector: 'app-list',
diff --git a/src/app/project/ontology/ontology-form/ontology-form.component.spec.ts b/src/app/project/ontology/ontology-form/ontology-form.component.spec.ts
index 7f62f05ffe..24edb6bf3c 100644
--- a/src/app/project/ontology/ontology-form/ontology-form.component.spec.ts
+++ b/src/app/project/ontology/ontology-form/ontology-form.component.spec.ts
@@ -7,16 +7,11 @@ import { By } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection, MockProjects } from '@dasch-swiss/dsp-js';
-import {
-    AppInitService,
-    DspActionModule,
-    DspApiConfigToken,
-    DspApiConnectionToken,
-    DspCoreModule
-} from '@dasch-swiss/dsp-ui';
+import { AppInitService, DspActionModule, DspCoreModule } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { TestConfig } from 'test.config';
 import { OntologyFormComponent } from './ontology-form.component';
 
diff --git a/src/app/project/ontology/ontology-form/ontology-form.component.ts b/src/app/project/ontology/ontology-form/ontology-form.component.ts
index a416226634..aa31094264 100644
--- a/src/app/project/ontology/ontology-form/ontology-form.component.ts
+++ b/src/app/project/ontology/ontology-form/ontology-form.component.ts
@@ -9,8 +9,9 @@ import {
     ReadProject,
     UpdateOntologyMetadata
 } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken, existingNamesValidator } from '@dasch-swiss/dsp-ui';
+import { existingNamesValidator } from '@dasch-swiss/dsp-ui';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
 import { OntologyService } from '../ontology.service';
 
diff --git a/src/app/project/ontology/ontology-visualizer/ontology-visualizer.component.spec.ts b/src/app/project/ontology/ontology-visualizer/ontology-visualizer.component.spec.ts
index 8a777eb04e..09d826a04d 100644
--- a/src/app/project/ontology/ontology-visualizer/ontology-visualizer.component.spec.ts
+++ b/src/app/project/ontology/ontology-visualizer/ontology-visualizer.component.spec.ts
@@ -11,13 +11,8 @@ import {
     ResourceClassDefinition,
     ResourcePropertyDefinition
 } from '@dasch-swiss/dsp-js';
-import {
-    AppInitService,
-    DspActionModule,
-    DspApiConfigToken,
-    DspApiConnectionToken,
-    DspCoreModule
-} from '@dasch-swiss/dsp-ui';
+import { AppInitService, DspActionModule, DspCoreModule } from '@dasch-swiss/dsp-ui';
+import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ErrorComponent } from 'src/app/main/error/error.component';
 import { TestConfig } from 'test.config';
 import { OntologyVisualizerComponent } from './ontology-visualizer.component';
diff --git a/src/app/project/ontology/ontology-visualizer/ontology-visualizer.component.ts b/src/app/project/ontology/ontology-visualizer/ontology-visualizer.component.ts
index 394653659f..4905c11685 100644
--- a/src/app/project/ontology/ontology-visualizer/ontology-visualizer.component.ts
+++ b/src/app/project/ontology/ontology-visualizer/ontology-visualizer.component.ts
@@ -1,6 +1,6 @@
 import { Component, Inject, Input, OnInit, Output } from '@angular/core';
 import { ClassDefinition, KnoraApiConnection, ReadOntology } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken } from '@dasch-swiss/dsp-ui';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { Link, Node } from '../../../../../node_modules/d3-force-3d';
 import { OntologyService } from '../ontology.service';
 
diff --git a/src/app/project/ontology/ontology.component.spec.ts b/src/app/project/ontology/ontology.component.spec.ts
index 59e38ae7ab..3c8f6314b0 100644
--- a/src/app/project/ontology/ontology.component.spec.ts
+++ b/src/app/project/ontology/ontology.component.spec.ts
@@ -14,14 +14,12 @@ import { MatTooltipModule } from '@angular/material/tooltip';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
-import { ApiResponseData, CanDoResponse, ListNodeInfo, ListsEndpointAdmin, ListsResponse, MockList, MockOntology, OntologiesEndpointV2, OntologiesMetadata, ReadOntology } from '@dasch-swiss/dsp-js';
-import {
-    DspActionModule, DspApiConnectionToken,
-    DspCoreModule
-} from '@dasch-swiss/dsp-ui';
+import { ApiResponseData, CanDoResponse, ListNodeInfo, ListsEndpointAdmin, ListsResponse, MockOntology, OntologiesEndpointV2, OntologiesMetadata, ReadOntology } from '@dasch-swiss/dsp-js';
+import { DspActionModule, DspCoreModule } from '@dasch-swiss/dsp-ui';
 import { of } from 'rxjs';
 import { AjaxResponse } from 'rxjs/ajax';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorComponent } from 'src/app/main/error/error.component';
 import { TestConfig } from 'test.config';
diff --git a/src/app/project/ontology/ontology.component.ts b/src/app/project/ontology/ontology.component.ts
index 248f30ed19..0563717bcb 100644
--- a/src/app/project/ontology/ontology.component.ts
+++ b/src/app/project/ontology/ontology.component.ts
@@ -21,10 +21,12 @@ import {
     ReadProject,
     UpdateOntology
 } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken, Session, SessionService, SortingService } from '@dasch-swiss/dsp-ui';
+import { SortingService } from '@dasch-swiss/dsp-ui';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
+import { Session, SessionService } from 'src/app/main/services/session.service';
 import { DefaultProperties, PropertyCategory, PropertyInfoObject } from './default-data/default-properties';
 import { DefaultClass, DefaultResourceClasses } from './default-data/default-resource-classes';
 import { OntologyService } from './ontology.service';
diff --git a/src/app/project/ontology/property-form/property-form.component.html b/src/app/project/ontology/property-form/property-form.component.html
index 323eca7746..ca148a3587 100644
--- a/src/app/project/ontology/property-form/property-form.component.html
+++ b/src/app/project/ontology/property-form/property-form.component.html
@@ -33,9 +33,9 @@
 
         <!-- label -->
         <div class="large-field string-literal-container">
-            <dsp-string-literal-input [placeholder]="'Property label *'" [value]="labels" [disabled]="(resClassIri && propertyInfo.propDef)"
+            <app-string-literal-input [placeholder]="'Property label *'" [value]="labels" [disabled]="(resClassIri && propertyInfo.propDef)"
                 (dataChanged)="handleData($event, 'labels')">
-            </dsp-string-literal-input>
+            </app-string-literal-input>
             <mat-hint class="string-literal-error" *ngIf="!labels.length">
                 Label is required
             </mat-hint>
@@ -43,9 +43,9 @@
 
         <!-- comment/description -->
         <div class="large-field string-literal-container">
-            <dsp-string-literal-input [textarea]="true" [placeholder]="'Comment'" [value]="comments" [disabled]="(resClassIri && propertyInfo.propDef)"
+            <app-string-literal-input [textarea]="true" [placeholder]="'Comment'" [value]="comments" [disabled]="(resClassIri && propertyInfo.propDef)"
                 (dataChanged)="handleData($event, 'comments')">
-            </dsp-string-literal-input>
+            </app-string-literal-input>
         </div>
 
         <!-- depending on type: display gui attribute -->
@@ -119,8 +119,8 @@
         <button mat-raised-button type="button" color="primary"
             [disabled]="!labels.length || (propertyForm.enabled && !propertyForm.valid)" (click)="submitData()"
             class="submit">
-            <dsp-progress-indicator [color]="'white'" [status]="0" *ngIf="loading" class="submit-progress">
-            </dsp-progress-indicator>
+            <app-progress-indicator [color]="'white'" [status]="0" *ngIf="loading" class="submit-progress">
+            </app-progress-indicator>
             <mat-icon *ngIf="error && !loading">close</mat-icon>
             {{error ? 'Failed' : (resClassIri ? 'Add to class' : (propertyInfo.propDef ? 'Update' : 'Save'))}}
         </button>
diff --git a/src/app/project/ontology/property-form/property-form.component.spec.ts b/src/app/project/ontology/property-form/property-form.component.spec.ts
index 2c6ba634ac..bd0b9a921b 100644
--- a/src/app/project/ontology/property-form/property-form.component.spec.ts
+++ b/src/app/project/ontology/property-form/property-form.component.spec.ts
@@ -13,10 +13,11 @@ import { By } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { MockOntology, ReadOntology } from '@dasch-swiss/dsp-js';
-import { DspActionModule, DspApiConnectionToken } from '@dasch-swiss/dsp-ui';
+import { DspActionModule } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { PropertyInfoObject } from '../default-data/default-properties';
 import { PropertyFormComponent } from './property-form.component';
 
diff --git a/src/app/project/ontology/property-form/property-form.component.ts b/src/app/project/ontology/property-form/property-form.component.ts
index eacd85d839..7783000c85 100644
--- a/src/app/project/ontology/property-form/property-form.component.ts
+++ b/src/app/project/ontology/property-form/property-form.component.ts
@@ -18,8 +18,9 @@ import {
     UpdateResourcePropertyGuiElement,
     UpdateResourcePropertyLabel
 } from '@dasch-swiss/dsp-js';
-import { AutocompleteItem, DspApiConnectionToken } from '@dasch-swiss/dsp-ui';
+import { AutocompleteItem } from '@dasch-swiss/dsp-ui';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
 import { DefaultProperties, DefaultProperty, PropertyCategory, PropertyInfoObject } from '../default-data/default-properties';
 import { OntologyService } from '../ontology.service';
diff --git a/src/app/project/ontology/property-info/property-info.component.spec.ts b/src/app/project/ontology/property-info/property-info.component.spec.ts
index 177a0d8d1a..740e56155e 100644
--- a/src/app/project/ontology/property-info/property-info.component.spec.ts
+++ b/src/app/project/ontology/property-info/property-info.component.spec.ts
@@ -22,9 +22,10 @@ import {
     ReadOntology,
     ResourcePropertyDefinitionWithAllLanguages
 } from '@dasch-swiss/dsp-js';
-import { DspActionModule, DspApiConnectionToken } from '@dasch-swiss/dsp-ui';
+import { DspActionModule } from '@dasch-swiss/dsp-ui';
 import { of } from 'rxjs';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogHeaderComponent } from 'src/app/main/dialog/dialog-header/dialog-header.component';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { PropertyFormComponent } from '../property-form/property-form.component';
diff --git a/src/app/project/ontology/property-info/property-info.component.ts b/src/app/project/ontology/property-info/property-info.component.ts
index 02dbb4e6ef..15c6cfbc1e 100644
--- a/src/app/project/ontology/property-info/property-info.component.ts
+++ b/src/app/project/ontology/property-info/property-info.component.ts
@@ -12,8 +12,8 @@ import {
     ResourceClassDefinitionWithAllLanguages,
     ResourcePropertyDefinitionWithAllLanguages
 } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken } from '@dasch-swiss/dsp-ui';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
 import {
     DefaultProperties,
diff --git a/src/app/project/ontology/resource-class-form/resource-class-form.component.html b/src/app/project/ontology/resource-class-form/resource-class-form.component.html
index 49777ee8dc..85acdcaf30 100644
--- a/src/app/project/ontology/resource-class-form/resource-class-form.component.html
+++ b/src/app/project/ontology/resource-class-form/resource-class-form.component.html
@@ -7,10 +7,10 @@
 
             <!-- label -->
             <div class="large-field string-literal-container">
-                <dsp-string-literal-input [placeholder]="'Label *'" [value]="resourceClassLabels"
+                <app-string-literal-input [placeholder]="'Label *'" [value]="resourceClassLabels"
                     (enter)="submitData()"
                     (dataChanged)="handleData($event, 'labels')">
-                </dsp-string-literal-input>
+                </app-string-literal-input>
                 <mat-hint class="string-literal-error" *ngIf="formErrors.label">
                     {{ formErrors.label }}
                 </mat-hint>
@@ -18,8 +18,8 @@
 
             <!-- description -->
             <div class="large-field string-literal-container more-space-top">
-                <dsp-string-literal-input [placeholder]="'Comment *'" [value]="resourceClassComments" [textarea]="true"
-                    (dataChanged)="handleData($event, 'comments')"></dsp-string-literal-input>
+                <app-string-literal-input [placeholder]="'Comment *'" [value]="resourceClassComments" [textarea]="true"
+                    (dataChanged)="handleData($event, 'comments')"></app-string-literal-input>
             </div>
         </div>
 
@@ -40,8 +40,8 @@
                 <button *ngIf="edit" mat-raised-button type="button" color="primary"
                     [disabled]="!resourceClassLabels.length || !resourceClassComments.length"
                     (click)="submitData()">
-                    <dsp-progress-indicator [color]="'white'" [status]="0" *ngIf="loading" class="submit-progress">
-                    </dsp-progress-indicator>
+                    <app-progress-indicator [color]="'white'" [status]="0" *ngIf="loading" class="submit-progress">
+                    </app-progress-indicator>
                     <mat-icon *ngIf="error && !loading">close</mat-icon>
                     {{error ? 'Failed' : 'Update'}}
                 </button>
diff --git a/src/app/project/ontology/resource-class-form/resource-class-form.component.spec.ts b/src/app/project/ontology/resource-class-form/resource-class-form.component.spec.ts
index d15e8f29c5..efa60dd726 100644
--- a/src/app/project/ontology/resource-class-form/resource-class-form.component.spec.ts
+++ b/src/app/project/ontology/resource-class-form/resource-class-form.component.spec.ts
@@ -1,4 +1,5 @@
 import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { Component } from '@angular/core';
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
 import { MatAutocompleteModule } from '@angular/material/autocomplete';
@@ -13,21 +14,26 @@ import { MatSlideToggleModule } from '@angular/material/slide-toggle';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection, MockOntology, ReadOntology } from '@dasch-swiss/dsp-js';
-import {
-    AppInitService,
-    DspActionModule,
-    DspApiConfigToken,
-    DspApiConnectionToken
-} from '@dasch-swiss/dsp-ui';
+import { DspActionModule } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
+import { AppInitService } from 'src/app/app-init.service';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorComponent } from 'src/app/main/error/error.component';
 import { TestConfig } from 'test.config';
 import { PropertyFormComponent } from '../property-form/property-form.component';
 import { ResourceClassFormComponent } from './resource-class-form.component';
 
+/**
+ * test host component to simulate parent component.
+ */
+@Component({
+    template: '<app-resource-class-form></app-resource-class-form>'
+})
+class TestHostResourceClassFormComponent { }
+
 describe('ResourceClassFormComponent', () => {
     let component: ResourceClassFormComponent;
     let fixture: ComponentFixture<ResourceClassFormComponent>;
@@ -37,7 +43,7 @@ describe('ResourceClassFormComponent', () => {
     beforeEach(waitForAsync(() => {
         TestBed.configureTestingModule({
             declarations: [
-                ResourceClassFormComponent,
+                TestHostResourceClassFormComponent,
                 PropertyFormComponent,
                 DialogComponent,
                 ErrorComponent
diff --git a/src/app/project/ontology/resource-class-form/resource-class-form.component.ts b/src/app/project/ontology/resource-class-form/resource-class-form.component.ts
index 30eec7a5a4..b3491e2bc6 100644
--- a/src/app/project/ontology/resource-class-form/resource-class-form.component.ts
+++ b/src/app/project/ontology/resource-class-form/resource-class-form.component.ts
@@ -12,9 +12,9 @@ import {
     UpdateResourceClassLabel
 } from '@dasch-swiss/dsp-js';
 import { StringLiteralV2 } from '@dasch-swiss/dsp-js/src/models/v2/string-literal-v2';
-import { DspApiConnectionToken } from '@dasch-swiss/dsp-ui';
 import { AppGlobal } from 'src/app/app-global';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
 import { OntologyService } from '../ontology.service';
 
diff --git a/src/app/project/ontology/resource-class-info/resource-class-info.component.spec.ts b/src/app/project/ontology/resource-class-info/resource-class-info.component.spec.ts
index a852b3b408..b5c0e35c1d 100644
--- a/src/app/project/ontology/resource-class-info/resource-class-info.component.spec.ts
+++ b/src/app/project/ontology/resource-class-info/resource-class-info.component.spec.ts
@@ -6,9 +6,10 @@ import { MatMenuModule } from '@angular/material/menu';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { By } from '@angular/platform-browser';
 import { CanDoResponse, ClassDefinition, Constants, MockOntology, OntologiesEndpointV2, ReadOntology } from '@dasch-swiss/dsp-js';
-import { DspActionModule, DspApiConnectionToken, SortingService } from '@dasch-swiss/dsp-ui';
+import { DspActionModule, SortingService } from '@dasch-swiss/dsp-ui';
 import { of } from 'rxjs';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ResourceClassInfoComponent } from './resource-class-info.component';
 
 /**
diff --git a/src/app/project/ontology/resource-class-info/resource-class-info.component.ts b/src/app/project/ontology/resource-class-info/resource-class-info.component.ts
index 321dd8555f..47435744e8 100644
--- a/src/app/project/ontology/resource-class-info/resource-class-info.component.ts
+++ b/src/app/project/ontology/resource-class-info/resource-class-info.component.ts
@@ -15,10 +15,11 @@ import {
     UpdateOntology,
     UpdateResourceClassCardinality
 } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken, NotificationService } from '@dasch-swiss/dsp-ui';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
+import { NotificationService } from 'src/app/main/services/notification.service';
 import { DefaultProperties, DefaultProperty, PropertyCategory, PropertyInfoObject } from '../default-data/default-properties';
 import { DefaultClass, DefaultResourceClasses } from '../default-data/default-resource-classes';
 import { CardinalityInfo } from '../ontology.component';
diff --git a/src/app/project/permission/permission.component.spec.ts b/src/app/project/permission/permission.component.spec.ts
index e970621a79..dcc2b83f41 100644
--- a/src/app/project/permission/permission.component.spec.ts
+++ b/src/app/project/permission/permission.component.spec.ts
@@ -5,13 +5,9 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import {
-    AppInitService,
-    DspActionModule,
-    DspApiConfigToken,
-    DspApiConnectionToken
-} from '@dasch-swiss/dsp-ui';
+import { AppInitService, DspActionModule } from '@dasch-swiss/dsp-ui';
 import { of } from 'rxjs';
+import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorComponent } from 'src/app/main/error/error.component';
 import { GroupsListComponent } from 'src/app/system/groups/groups-list/groups-list.component';
diff --git a/src/app/project/permission/permission.component.ts b/src/app/project/permission/permission.component.ts
index ffa52c8eac..c2807f9a12 100644
--- a/src/app/project/permission/permission.component.ts
+++ b/src/app/project/permission/permission.component.ts
@@ -2,16 +2,15 @@ import { Component, Inject, OnInit, ViewChild } from '@angular/core';
 import { Title } from '@angular/platform-browser';
 import { ActivatedRoute, Params } from '@angular/router';
 import {
-    ApiResponseData,
     ApiResponseError,
     KnoraApiConnection,
-    ProjectResponse,
     ReadGroup,
     ReadProject
 } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken, Session, SessionService } from '@dasch-swiss/dsp-ui';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
+import { Session, SessionService } from 'src/app/main/services/session.service';
 import { AddGroupComponent } from './add-group/add-group.component';
 
 @Component({
diff --git a/src/app/project/project-form/project-form.component.html b/src/app/project/project-form/project-form.component.html
index f6db525a8b..da79a16fe0 100644
--- a/src/app/project/project-form/project-form.component.html
+++ b/src/app/project/project-form/project-form.component.html
@@ -1,9 +1,9 @@
 <div class="no-shadow">
 
-    <dsp-progress-indicator *ngIf="loading"></dsp-progress-indicator>
+    <app-progress-indicator *ngIf="loading"></app-progress-indicator>
 
     <!-- success message after updating -->
-    <dsp-message *ngIf="success" [message]="successMessage" [short]="true"></dsp-message>
+    <app-message *ngIf="success" [message]="successMessage" [short]="true"></app-message>
 
     <!-- content -->
     <form *ngIf="!loading && project.status" [formGroup]="form" class="form-content project-data"
@@ -38,10 +38,10 @@
         </mat-form-field>
 
         <!-- description -->
-        <dsp-string-literal-input placeholder="{{'appLabels.form.project.general.description' | translate}} *"
+        <app-string-literal-input placeholder="{{'appLabels.form.project.general.description' | translate}} *"
             [disabled]="!project.status" [textarea]="true" [value]="project.description"
             (dataChanged)="getStringLiteral($event)">
-        </dsp-string-literal-input>
+        </app-string-literal-input>
         <mat-hint class="string-literal-error" *ngIf="formErrors.description">
             {{ formErrors.description }}
         </mat-hint>
diff --git a/src/app/project/project-form/project-form.component.spec.ts b/src/app/project/project-form/project-form.component.spec.ts
index 0260d8d1db..3fcd4647ae 100644
--- a/src/app/project/project-form/project-form.component.spec.ts
+++ b/src/app/project/project-form/project-form.component.spec.ts
@@ -6,14 +6,9 @@ import { MatInputModule } from '@angular/material/input';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import {
-    AppInitService,
-    DspActionModule,
-    DspApiConfigToken,
-    DspApiConnectionToken,
-    DspCoreModule
-} from '@dasch-swiss/dsp-ui';
+import { AppInitService, DspActionModule, DspCoreModule } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
+import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorComponent } from 'src/app/main/error/error.component';
 import { TestConfig } from 'test.config';
diff --git a/src/app/project/project-form/project-form.component.ts b/src/app/project/project-form/project-form.component.ts
index 8d2ae41725..18420ff2e5 100644
--- a/src/app/project/project-form/project-form.component.ts
+++ b/src/app/project/project-form/project-form.component.ts
@@ -15,8 +15,10 @@ import {
     UpdateProjectRequest,
     UserResponse
 } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken, existingNamesValidator, SessionService } from '@dasch-swiss/dsp-ui';
+import { existingNamesValidator } from '@dasch-swiss/dsp-ui';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
+import { SessionService } from 'src/app/main/services/session.service';
 import { CacheService } from '../../main/cache/cache.service';
 
 @Component({
diff --git a/src/app/project/project.component.spec.ts b/src/app/project/project.component.spec.ts
index 811c44d40b..95908506cc 100644
--- a/src/app/project/project.component.spec.ts
+++ b/src/app/project/project.component.spec.ts
@@ -4,14 +4,9 @@ import { MatTabsModule } from '@angular/material/tabs';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import {
-    AppInitService,
-    DspActionModule,
-    DspApiConfigToken,
-    DspApiConnectionToken,
-    DspCoreModule
-} from '@dasch-swiss/dsp-ui';
+import { AppInitService, DspActionModule, DspCoreModule } from '@dasch-swiss/dsp-ui';
 import { TestConfig } from 'test.config';
+import { DspApiConfigToken, DspApiConnectionToken } from '../main/declarations/dsp-api-tokens';
 import { DialogComponent } from '../main/dialog/dialog.component';
 import { ErrorComponent } from '../main/error/error.component';
 import { ProjectComponent } from './project.component';
diff --git a/src/app/project/project.component.ts b/src/app/project/project.component.ts
index ed5d8db544..62cdefdc50 100644
--- a/src/app/project/project.component.ts
+++ b/src/app/project/project.component.ts
@@ -2,10 +2,11 @@ import { Component, Inject, OnInit } from '@angular/core';
 import { Title } from '@angular/platform-browser';
 import { ActivatedRoute } from '@angular/router';
 import { ApiResponseData, ApiResponseError, KnoraApiConnection, ProjectResponse, ReadProject } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken, Session, SessionService } from '@dasch-swiss/dsp-ui';
 import { AppGlobal } from '../app-global';
 import { CacheService } from '../main/cache/cache.service';
+import { DspApiConnectionToken } from '../main/declarations/dsp-api-tokens';
 import { MenuItem } from '../main/declarations/menu-item';
+import { Session, SessionService } from '../main/services/session.service';
 
 @Component({
     selector: 'app-project',
diff --git a/src/app/system/projects/projects-list/projects-list.component.spec.ts b/src/app/system/projects/projects-list/projects-list.component.spec.ts
index 302e8d53c4..5bf4006140 100644
--- a/src/app/system/projects/projects-list/projects-list.component.spec.ts
+++ b/src/app/system/projects/projects-list/projects-list.component.spec.ts
@@ -7,13 +7,8 @@ import { MatMenuModule } from '@angular/material/menu';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import {
-    AppInitService,
-    DspActionModule,
-    DspApiConfigToken,
-    DspApiConnectionToken,
-    DspCoreModule
-} from '@dasch-swiss/dsp-ui';
+import { AppInitService, DspActionModule, DspCoreModule } from '@dasch-swiss/dsp-ui';
+import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorComponent } from 'src/app/main/error/error.component';
 import { TestConfig } from 'test.config';
diff --git a/src/app/system/projects/projects-list/projects-list.component.ts b/src/app/system/projects/projects-list/projects-list.component.ts
index 0d9143f6f6..2ca5e50266 100644
--- a/src/app/system/projects/projects-list/projects-list.component.ts
+++ b/src/app/system/projects/projects-list/projects-list.component.ts
@@ -10,15 +10,12 @@ import {
     StoredProject,
     UpdateProjectRequest
 } from '@dasch-swiss/dsp-js';
-import {
-    DspApiConnectionToken,
-    Session,
-    SessionService,
-    SortingService
-} from '@dasch-swiss/dsp-ui';
+import { SortingService } from '@dasch-swiss/dsp-ui';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
+import { Session, SessionService } from 'src/app/main/services/session.service';
 
 @Component({
     selector: 'app-projects-list',
diff --git a/src/app/system/projects/projects.component.spec.ts b/src/app/system/projects/projects.component.spec.ts
index e3caafb02c..2fa12940bf 100644
--- a/src/app/system/projects/projects.component.spec.ts
+++ b/src/app/system/projects/projects.component.spec.ts
@@ -7,13 +7,8 @@ import { MatMenuModule } from '@angular/material/menu';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import {
-    AppInitService,
-    DspActionModule,
-    DspApiConfigToken,
-    DspApiConnectionToken,
-    DspCoreModule
-} from '@dasch-swiss/dsp-ui';
+import { AppInitService, DspActionModule, DspCoreModule } from '@dasch-swiss/dsp-ui';
+import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorComponent } from 'src/app/main/error/error.component';
 import { TestConfig } from 'test.config';
diff --git a/src/app/system/projects/projects.component.ts b/src/app/system/projects/projects.component.ts
index 0ae7a5f5ad..ee0c37941d 100644
--- a/src/app/system/projects/projects.component.ts
+++ b/src/app/system/projects/projects.component.ts
@@ -2,10 +2,11 @@ import { Component, Inject, Input, OnInit } from '@angular/core';
 import { MatDialog, MatDialogConfig } from '@angular/material/dialog';
 import { Title } from '@angular/platform-browser';
 import { ApiResponseData, ApiResponseError, KnoraApiConnection, ProjectsResponse, StoredProject, UserResponse } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken, Session, SessionService } from '@dasch-swiss/dsp-ui';
 import { AdminPermissions } from 'src/app/main/declarations/admin-permissions';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
+import { Session, SessionService } from 'src/app/main/services/session.service';
 import { CacheService } from '../../main/cache/cache.service';
 
 /**
diff --git a/src/app/system/system.component.spec.ts b/src/app/system/system.component.spec.ts
index a0b1a99415..dd2e039292 100644
--- a/src/app/system/system.component.spec.ts
+++ b/src/app/system/system.component.spec.ts
@@ -3,9 +3,11 @@ import { MatIconModule } from '@angular/material/icon';
 import { MatTabsModule } from '@angular/material/tabs';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { DspActionModule, DspApiConnectionToken, SessionService } from '@dasch-swiss/dsp-ui';
+import { DspActionModule } from '@dasch-swiss/dsp-ui';
 import { TestConfig } from 'test.config';
+import { DspApiConnectionToken } from '../main/declarations/dsp-api-tokens';
 import { ErrorComponent } from '../main/error/error.component';
+import { SessionService } from '../main/services/session.service';
 import { SystemComponent } from './system.component';
 
 describe('SystemComponent', () => {
diff --git a/src/app/system/system.component.ts b/src/app/system/system.component.ts
index 1066e72c75..e722af7ee4 100644
--- a/src/app/system/system.component.ts
+++ b/src/app/system/system.component.ts
@@ -3,7 +3,7 @@ import { Title } from '@angular/platform-browser';
 
 import { AppGlobal } from '../app-global';
 import { MenuItem } from '../main/declarations/menu-item';
-import { SessionService } from '@dasch-swiss/dsp-ui';
+import { SessionService } from '../main/services/session.service';
 
 @Component({
     selector: 'app-system',
diff --git a/src/app/system/users/users-list/users-list.component.spec.ts b/src/app/system/users/users-list/users-list.component.spec.ts
index bc0f426668..85a686ef1c 100644
--- a/src/app/system/users/users-list/users-list.component.spec.ts
+++ b/src/app/system/users/users-list/users-list.component.spec.ts
@@ -10,14 +10,9 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import {
-    AppInitService,
-    DspActionModule,
-    DspApiConfigToken,
-    DspApiConnectionToken,
-    DspCoreModule
-} from '@dasch-swiss/dsp-ui';
+import { AppInitService, DspActionModule, DspCoreModule } from '@dasch-swiss/dsp-ui';
 import { of } from 'rxjs';
+import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorComponent } from 'src/app/main/error/error.component';
 import { SelectGroupComponent } from 'src/app/project/collaboration/select-group/select-group.component';
diff --git a/src/app/system/users/users-list/users-list.component.ts b/src/app/system/users/users-list/users-list.component.ts
index 8e3f1a5e52..7097d6df1b 100644
--- a/src/app/system/users/users-list/users-list.component.ts
+++ b/src/app/system/users/users-list/users-list.component.ts
@@ -8,15 +8,16 @@ import {
     GroupsResponse,
     KnoraApiConnection,
     Permissions,
-    ProjectResponse,
     ReadProject,
     ReadUser,
     UserResponse
 } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken, Session, SessionService, SortingService } from '@dasch-swiss/dsp-ui';
+import { SortingService } from '@dasch-swiss/dsp-ui';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
+import { Session, SessionService } from 'src/app/main/services/session.service';
 
 @Component({
     selector: 'app-users-list',
diff --git a/src/app/system/users/users.component.spec.ts b/src/app/system/users/users.component.spec.ts
index f2af61b72f..e9046456ef 100644
--- a/src/app/system/users/users.component.spec.ts
+++ b/src/app/system/users/users.component.spec.ts
@@ -9,13 +9,8 @@ import { MatSelectModule } from '@angular/material/select';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import {
-    AppInitService,
-    DspActionModule,
-    DspApiConfigToken,
-    DspApiConnectionToken,
-    DspCoreModule
-} from '@dasch-swiss/dsp-ui';
+import { AppInitService, DspActionModule, DspCoreModule } from '@dasch-swiss/dsp-ui';
+import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorComponent } from 'src/app/main/error/error.component';
 import { SelectGroupComponent } from 'src/app/project/collaboration/select-group/select-group.component';
diff --git a/src/app/system/users/users.component.ts b/src/app/system/users/users.component.ts
index 8fef81ba53..a65a9cbb0a 100644
--- a/src/app/system/users/users.component.ts
+++ b/src/app/system/users/users.component.ts
@@ -8,7 +8,7 @@ import {
     UserResponse,
     UsersResponse
 } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken } from '@dasch-swiss/dsp-ui';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
 
 @Component({
diff --git a/src/app/user/account/account.component.spec.ts b/src/app/user/account/account.component.spec.ts
index a2336ab919..f2e4740bf9 100644
--- a/src/app/user/account/account.component.spec.ts
+++ b/src/app/user/account/account.component.spec.ts
@@ -8,14 +8,9 @@ import { MatInputModule } from '@angular/material/input';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import {
-    AppInitService,
-    DspActionModule,
-    DspApiConfigToken,
-    DspApiConnectionToken,
-    DspCoreModule
-} from '@dasch-swiss/dsp-ui';
+import { AppInitService, DspActionModule, DspCoreModule } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
+import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorComponent } from 'src/app/main/error/error.component';
 import { TestConfig } from 'test.config';
diff --git a/src/app/user/account/account.component.ts b/src/app/user/account/account.component.ts
index bf3a7818a8..bc9ac335c1 100644
--- a/src/app/user/account/account.component.ts
+++ b/src/app/user/account/account.component.ts
@@ -9,9 +9,10 @@ import {
     ReadUser,
     UserResponse
 } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken, SessionService } from '@dasch-swiss/dsp-ui';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
+import { SessionService } from 'src/app/main/services/session.service';
 import { CacheService } from '../../main/cache/cache.service';
 
 @Component({
diff --git a/src/app/user/dashboard/dashboard.component.spec.ts b/src/app/user/dashboard/dashboard.component.spec.ts
index 279f94eb4a..fffe7ec4b2 100644
--- a/src/app/user/dashboard/dashboard.component.spec.ts
+++ b/src/app/user/dashboard/dashboard.component.spec.ts
@@ -6,13 +6,8 @@ import { MatMenuModule } from '@angular/material/menu';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import {
-    AppInitService,
-    DspActionModule,
-    DspApiConfigToken,
-    DspApiConnectionToken,
-    DspCoreModule
-} from '@dasch-swiss/dsp-ui';
+import { AppInitService, DspActionModule, DspCoreModule } from '@dasch-swiss/dsp-ui';
+import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorComponent } from 'src/app/main/error/error.component';
 import { ProjectsListComponent } from 'src/app/system/projects/projects-list/projects-list.component';
diff --git a/src/app/user/dashboard/dashboard.component.ts b/src/app/user/dashboard/dashboard.component.ts
index 10c6837765..771fab343a 100644
--- a/src/app/user/dashboard/dashboard.component.ts
+++ b/src/app/user/dashboard/dashboard.component.ts
@@ -1,9 +1,10 @@
 import { Component, Inject, OnInit } from '@angular/core';
 import { Title } from '@angular/platform-browser';
 import { ApiResponseData, ApiResponseError, KnoraApiConnection, ReadUser, UserResponse } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken, Session, SessionService } from '@dasch-swiss/dsp-ui';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
+import { Session, SessionService } from 'src/app/main/services/session.service';
 
 @Component({
     selector: 'app-dashboard',
diff --git a/src/app/user/membership/membership.component.spec.ts b/src/app/user/membership/membership.component.spec.ts
index 6fbb7baa5b..0328e78f05 100644
--- a/src/app/user/membership/membership.component.spec.ts
+++ b/src/app/user/membership/membership.component.spec.ts
@@ -8,13 +8,8 @@ import { MatSelectModule } from '@angular/material/select';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import {
-    AppInitService,
-    DspActionModule,
-    DspApiConfigToken,
-    DspApiConnectionToken,
-    DspCoreModule
-} from '@dasch-swiss/dsp-ui';
+import { AppInitService, DspActionModule, DspCoreModule } from '@dasch-swiss/dsp-ui';
+import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorComponent } from 'src/app/main/error/error.component';
 import { TestConfig } from 'test.config';
diff --git a/src/app/user/membership/membership.component.ts b/src/app/user/membership/membership.component.ts
index 207d9da7b9..3aa96d2233 100644
--- a/src/app/user/membership/membership.component.ts
+++ b/src/app/user/membership/membership.component.ts
@@ -11,9 +11,11 @@ import {
     UserResponse
 } from '@dasch-swiss/dsp-js';
 import { PermissionsData } from '@dasch-swiss/dsp-js/src/models/admin/permissions-data';
-import { AutocompleteItem, DspApiConnectionToken, Session } from '@dasch-swiss/dsp-ui';
+import { AutocompleteItem } from '@dasch-swiss/dsp-ui';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
+import { Session } from 'src/app/main/services/session.service';
 
 // --> TODO replace it by IPermissions from dsp-js
 export interface IPermissions {
diff --git a/src/app/user/profile/profile.component.spec.ts b/src/app/user/profile/profile.component.spec.ts
index 543b52b93f..17063e98fe 100644
--- a/src/app/user/profile/profile.component.spec.ts
+++ b/src/app/user/profile/profile.component.spec.ts
@@ -6,13 +6,8 @@ import { MatIconModule } from '@angular/material/icon';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import {
-    AppInitService,
-    DspActionModule,
-    DspApiConfigToken,
-    DspApiConnectionToken,
-    DspCoreModule
-} from '@dasch-swiss/dsp-ui';
+import { AppInitService, DspActionModule, DspCoreModule } from '@dasch-swiss/dsp-ui';
+import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorComponent } from 'src/app/main/error/error.component';
 import { TestConfig } from 'test.config';
diff --git a/src/app/user/profile/profile.component.ts b/src/app/user/profile/profile.component.ts
index 20a268cd8a..e1e9f5b141 100644
--- a/src/app/user/profile/profile.component.ts
+++ b/src/app/user/profile/profile.component.ts
@@ -8,8 +8,9 @@ import {
     ReadUser,
     UserResponse
 } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken, SessionService } from '@dasch-swiss/dsp-ui';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
+import { SessionService } from 'src/app/main/services/session.service';
 import { CacheService } from '../../main/cache/cache.service';
 import { DialogComponent } from '../../main/dialog/dialog.component';
 
diff --git a/src/app/user/user-form/password-form/password-form.component.spec.ts b/src/app/user/user-form/password-form/password-form.component.spec.ts
index 87c103dc66..86010b884b 100644
--- a/src/app/user/user-form/password-form/password-form.component.spec.ts
+++ b/src/app/user/user-form/password-form/password-form.component.spec.ts
@@ -6,14 +6,9 @@ import { MatInputModule } from '@angular/material/input';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import {
-    AppInitService,
-    DspActionModule,
-    DspApiConfigToken,
-    DspApiConnectionToken,
-    DspCoreModule
-} from '@dasch-swiss/dsp-ui';
+import { AppInitService, DspActionModule, DspCoreModule } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
+import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorComponent } from 'src/app/main/error/error.component';
 import { TestConfig } from 'test.config';
diff --git a/src/app/user/user-form/password-form/password-form.component.ts b/src/app/user/user-form/password-form/password-form.component.ts
index a9b31b3695..c36120d025 100644
--- a/src/app/user/user-form/password-form/password-form.component.ts
+++ b/src/app/user/user-form/password-form/password-form.component.ts
@@ -8,9 +8,11 @@ import {
     ReadUser,
     UserResponse
 } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken, DspMessageData, SessionService } from '@dasch-swiss/dsp-ui';
+import { DspMessageData } from '@dasch-swiss/dsp-ui';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
+import { SessionService } from 'src/app/main/services/session.service';
 
 @Component({
     selector: 'app-password-form',
diff --git a/src/app/user/user-form/user-form.component.spec.ts b/src/app/user/user-form/user-form.component.spec.ts
index 62af9d3f0a..709c5578bc 100644
--- a/src/app/user/user-form/user-form.component.spec.ts
+++ b/src/app/user/user-form/user-form.component.spec.ts
@@ -7,14 +7,9 @@ import { MatSlideToggleModule } from '@angular/material/slide-toggle';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import {
-    AppInitService,
-    DspActionModule,
-    DspApiConfigToken,
-    DspApiConnectionToken,
-    DspCoreModule
-} from '@dasch-swiss/dsp-ui';
+import { AppInitService, DspActionModule, DspCoreModule } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
+import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorComponent } from 'src/app/main/error/error.component';
 import { TestConfig } from 'test.config';
diff --git a/src/app/user/user-form/user-form.component.ts b/src/app/user/user-form/user-form.component.ts
index aea06cb619..8d74b39fd0 100644
--- a/src/app/user/user-form/user-form.component.ts
+++ b/src/app/user/user-form/user-form.component.ts
@@ -15,9 +15,11 @@ import {
     UserResponse,
     UsersResponse
 } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken, existingNamesValidator, Session, SessionService } from '@dasch-swiss/dsp-ui';
+import { existingNamesValidator } from '@dasch-swiss/dsp-ui';
 import { AppGlobal } from 'src/app/app-global';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
+import { Session, SessionService } from 'src/app/main/services/session.service';
 import { CacheService } from '../../main/cache/cache.service';
 
 @Component({
diff --git a/src/app/user/user-menu/user-menu.component.spec.ts b/src/app/user/user-menu/user-menu.component.spec.ts
index 83c05f4362..c3c7c4cced 100644
--- a/src/app/user/user-menu/user-menu.component.spec.ts
+++ b/src/app/user/user-menu/user-menu.component.spec.ts
@@ -6,13 +6,8 @@ import { MatMenuModule } from '@angular/material/menu';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import {
-    AppInitService,
-    DspActionModule,
-    DspApiConfigToken,
-    DspApiConnectionToken,
-    DspCoreModule
-} from '@dasch-swiss/dsp-ui';
+import { AppInitService, DspActionModule, DspCoreModule } from '@dasch-swiss/dsp-ui';
+import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorComponent } from 'src/app/main/error/error.component';
 import { TestConfig } from 'test.config';
diff --git a/src/app/user/user-menu/user-menu.component.ts b/src/app/user/user-menu/user-menu.component.ts
index 248f3c7075..5656249c30 100644
--- a/src/app/user/user-menu/user-menu.component.ts
+++ b/src/app/user/user-menu/user-menu.component.ts
@@ -7,10 +7,11 @@ import {
     ReadUser,
     UserResponse
 } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken, SessionService } from '@dasch-swiss/dsp-ui';
 import { AppGlobal } from 'src/app/app-global';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
+import { SessionService } from 'src/app/main/services/session.service';
 import { MenuItem } from '../../main/declarations/menu-item';
 
 @Component({
diff --git a/src/app/user/user.component.spec.ts b/src/app/user/user.component.spec.ts
index 2d1d99b9e2..c0fdc7daca 100644
--- a/src/app/user/user.component.spec.ts
+++ b/src/app/user/user.component.spec.ts
@@ -12,15 +12,10 @@ import { MatTabsModule } from '@angular/material/tabs';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import {
-    AppInitService,
-    DspActionModule,
-    DspApiConfigToken,
-    DspApiConnectionToken,
-    DspCoreModule
-} from '@dasch-swiss/dsp-ui';
+import { AppInitService, DspActionModule, DspCoreModule } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { TestConfig } from 'test.config';
+import { DspApiConfigToken, DspApiConnectionToken } from '../main/declarations/dsp-api-tokens';
 import { DialogComponent } from '../main/dialog/dialog.component';
 import { ErrorComponent } from '../main/error/error.component';
 import { ProjectsListComponent } from '../system/projects/projects-list/projects-list.component';
diff --git a/src/app/user/user.component.ts b/src/app/user/user.component.ts
index 46c6837bc2..41e57e3012 100644
--- a/src/app/user/user.component.ts
+++ b/src/app/user/user.component.ts
@@ -2,10 +2,11 @@ import { Component, Inject, OnInit } from '@angular/core';
 import { Title } from '@angular/platform-browser';
 import { ActivatedRoute } from '@angular/router';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken, Session, SessionService } from '@dasch-swiss/dsp-ui';
 import { AppGlobal } from '../app-global';
 import { CacheService } from '../main/cache/cache.service';
+import { DspApiConnectionToken } from '../main/declarations/dsp-api-tokens';
 import { MenuItem } from '../main/declarations/menu-item';
+import { Session, SessionService } from '../main/services/session.service';
 
 @Component({
     selector: 'app-user',
diff --git a/src/app/workspace/intermediate/intermediate.component.spec.ts b/src/app/workspace/intermediate/intermediate.component.spec.ts
index 5ec766c9e6..10bd5958f9 100644
--- a/src/app/workspace/intermediate/intermediate.component.spec.ts
+++ b/src/app/workspace/intermediate/intermediate.component.spec.ts
@@ -6,7 +6,8 @@ import { MatIconModule } from '@angular/material/icon';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { By } from '@angular/platform-browser';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { AppInitService, DspActionModule, DspApiConfigToken, DspApiConnectionToken, FilteredResources } from '@dasch-swiss/dsp-ui';
+import { AppInitService, DspActionModule, FilteredResources } from '@dasch-swiss/dsp-ui';
+import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { TestConfig } from 'test.config';
 import { IntermediateComponent } from './intermediate.component';
 
diff --git a/src/app/workspace/resource/incoming.service.spec.ts b/src/app/workspace/resource/incoming.service.spec.ts
index 3d287987c9..cc11231e38 100644
--- a/src/app/workspace/resource/incoming.service.spec.ts
+++ b/src/app/workspace/resource/incoming.service.spec.ts
@@ -1,5 +1,5 @@
 import { TestBed } from '@angular/core/testing';
-import { DspApiConnectionToken } from '@dasch-swiss/dsp-ui';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { IncomingService } from './incoming.service';
 
 describe('IncomingService', () => {
diff --git a/src/app/workspace/resource/incoming.service.ts b/src/app/workspace/resource/incoming.service.ts
index 70afcae560..073968839b 100644
--- a/src/app/workspace/resource/incoming.service.ts
+++ b/src/app/workspace/resource/incoming.service.ts
@@ -1,7 +1,7 @@
 import { Inject, Injectable } from '@angular/core';
 import { ApiResponseError, CountQueryResponse, KnoraApiConnection, ReadResourceSequence } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken } from '@dasch-swiss/dsp-ui';
 import { Observable } from 'rxjs';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 
 @Injectable({
     providedIn: 'root'
diff --git a/src/app/workspace/resource/project.service.spec.ts b/src/app/workspace/resource/project.service.spec.ts
index ca524ee8ed..7bb73d0605 100644
--- a/src/app/workspace/resource/project.service.spec.ts
+++ b/src/app/workspace/resource/project.service.spec.ts
@@ -2,7 +2,8 @@ import { TestBed } from '@angular/core/testing';
 import { MatDialogModule } from '@angular/material/dialog';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { DspActionModule, DspApiConnectionToken, DspCoreModule } from '@dasch-swiss/dsp-ui';
+import { DspActionModule, DspCoreModule } from '@dasch-swiss/dsp-ui';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ProjectService } from './project.service';
 
 
diff --git a/src/app/workspace/resource/project.service.ts b/src/app/workspace/resource/project.service.ts
index 75993b872c..adc491d68e 100644
--- a/src/app/workspace/resource/project.service.ts
+++ b/src/app/workspace/resource/project.service.ts
@@ -1,10 +1,11 @@
 import { Inject, Injectable } from '@angular/core';
 import { ApiResponseData, ApiResponseError, Constants, KnoraApiConnection, ProjectsResponse, StoredProject, UserResponse } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken, SessionService } from '@dasch-swiss/dsp-ui';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
+import { SessionService } from 'src/app/main/services/session.service';
 
 @Injectable({
     providedIn: 'root'
diff --git a/src/app/workspace/resource/properties/properties.component.spec.ts b/src/app/workspace/resource/properties/properties.component.spec.ts
index 8a42419fc3..d38582719f 100644
--- a/src/app/workspace/resource/properties/properties.component.spec.ts
+++ b/src/app/workspace/resource/properties/properties.component.spec.ts
@@ -8,11 +8,9 @@ import { MatTooltipModule } from '@angular/material/tooltip';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 import {
-    ApiResponseData,
     ApiResponseError,
     Constants,
     IHasPropertyWithPropertyDefinition,
-    KnoraApiConnection,
     MockProjects,
     MockResource,
     MockUsers,
@@ -27,8 +25,6 @@ import {
 import {
     AppInitService,
     DspActionModule,
-    DspApiConfigToken,
-    DspApiConnectionToken,
     EmitEvent,
     Events,
     PropertyInfoValues,
@@ -36,10 +32,10 @@ import {
     ValueOperationEventService
 } from '@dasch-swiss/dsp-ui';
 import { of, Subscription } from 'rxjs';
-import { TestConfig } from 'test.config';
 import { DspResource } from '../dsp-resource';
 import { PropertiesComponent } from './properties.component';
 import { IncomingService } from '../incoming.service';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 
 /**
  * test host component to simulate parent component.
diff --git a/src/app/workspace/resource/properties/properties.component.ts b/src/app/workspace/resource/properties/properties.component.ts
index 9e57a90ddf..86a26ccf16 100644
--- a/src/app/workspace/resource/properties/properties.component.ts
+++ b/src/app/workspace/resource/properties/properties.component.ts
@@ -28,9 +28,7 @@ import {
 import {
     AddedEventValue,
     DeletedEventValue,
-    DspApiConnectionToken,
     Events,
-    NotificationService,
     UpdatedEventValues,
     UserService,
     ValueOperationEventService,
@@ -43,6 +41,8 @@ import { DspResource } from '../dsp-resource';
 import { RepresentationConstants } from '../representation/file-representation';
 import { IncomingService } from '../incoming.service';
 import { PageEvent } from '@angular/material/paginator';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
+import { NotificationService } from 'src/app/main/services/notification.service';
 
 // object of property information from ontology class, properties and property values
 export interface PropertyInfoValues {
diff --git a/src/app/workspace/resource/representation/upload/upload-file.service.spec.ts b/src/app/workspace/resource/representation/upload/upload-file.service.spec.ts
index dd453cea51..562627d86e 100644
--- a/src/app/workspace/resource/representation/upload/upload-file.service.spec.ts
+++ b/src/app/workspace/resource/representation/upload/upload-file.service.spec.ts
@@ -1,7 +1,7 @@
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
-import { Session, SessionService } from '@dasch-swiss/dsp-ui';
 import { AppInitService } from 'src/app/app-init.service';
+import { Session, SessionService } from 'src/app/main/services/session.service';
 import { UploadedFileResponse, UploadFileService } from './upload-file.service';
 
 describe('UploadFileService', () => {
diff --git a/src/app/workspace/resource/representation/upload/upload-file.service.ts b/src/app/workspace/resource/representation/upload/upload-file.service.ts
index 5864621bb0..4c3ecfefb9 100644
--- a/src/app/workspace/resource/representation/upload/upload-file.service.ts
+++ b/src/app/workspace/resource/representation/upload/upload-file.service.ts
@@ -1,8 +1,8 @@
 import { HttpClient, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { SessionService } from '@dasch-swiss/dsp-ui';
 import { Observable } from 'rxjs';
 import { AppInitService } from 'src/app/app-init.service';
+import { SessionService } from 'src/app/main/services/session.service';
 
 export interface UploadedFile {
     fileType: string;
diff --git a/src/app/workspace/resource/representation/upload/upload.component.ts b/src/app/workspace/resource/representation/upload/upload.component.ts
index dee48a2f0a..c5bb370f6b 100644
--- a/src/app/workspace/resource/representation/upload/upload.component.ts
+++ b/src/app/workspace/resource/representation/upload/upload.component.ts
@@ -10,7 +10,7 @@ import {
     UpdateFileValue,
     UpdateStillImageFileValue
 } from '@dasch-swiss/dsp-js';
-import { NotificationService } from '@dasch-swiss/dsp-ui';
+import { NotificationService } from 'src/app/main/services/notification.service';
 import { UploadedFileResponse, UploadFileService } from './upload-file.service';
 
 // https://stackoverflow.com/questions/45661010/dynamic-nested-reactive-form-expressionchangedafterithasbeencheckederror
diff --git a/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.spec.ts b/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.spec.ts
index 5f391254ab..786e3de2a4 100644
--- a/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.spec.ts
+++ b/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.spec.ts
@@ -35,19 +35,14 @@ import {
     UsersEndpointAdmin
 } from '@dasch-swiss/dsp-js';
 import { OntologyCache } from '@dasch-swiss/dsp-js/src/cache/ontology-cache/OntologyCache';
-import {
-    DspActionModule,
-    DspApiConnectionToken,
-    IntValueComponent,
-    Session,
-    SessionService,
-    ValueService
-} from '@dasch-swiss/dsp-ui';
+import { DspActionModule, IntValueComponent, ValueService } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 import { AjaxResponse } from 'rxjs/ajax';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { BaseValueDirective } from 'src/app/main/directive/base-value.directive';
+import { Session, SessionService } from 'src/app/main/services/session.service';
 import { ResourceInstanceFormComponent } from './resource-instance-form.component';
 import { SwitchPropertiesComponent } from './select-properties/switch-properties/switch-properties.component';
 
diff --git a/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.ts b/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.ts
index 10e418c007..370a297253 100644
--- a/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.ts
+++ b/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.ts
@@ -15,10 +15,8 @@ import {
     ResourcePropertyDefinition,
     StoredProject
 } from '@dasch-swiss/dsp-js';
-import {
-    DspApiConnectionToken
-} from '@dasch-swiss/dsp-ui';
 import { Subscription } from 'rxjs';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
 import { ProjectService } from '../project.service';
 import { SelectOntologyComponent } from './select-ontology/select-ontology.component';
diff --git a/src/app/workspace/resource/resource-instance-form/select-project/select-project.component.spec.ts b/src/app/workspace/resource/resource-instance-form/select-project/select-project.component.spec.ts
index 81261a60ca..058e356a82 100644
--- a/src/app/workspace/resource/resource-instance-form/select-project/select-project.component.spec.ts
+++ b/src/app/workspace/resource/resource-instance-form/select-project/select-project.component.spec.ts
@@ -2,14 +2,12 @@ import { HarnessLoader } from '@angular/cdk/testing';
 import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
 import { Component, Inject, OnInit, ViewChild } from '@angular/core';
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { FormBuilder, FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { FormBuilder, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatSelectModule } from '@angular/material/select';
 import { MatSelectHarness } from '@angular/material/select/testing';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { KnoraApiConnection, MockProjects, StoredProject } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken } from '@dasch-swiss/dsp-ui';
-import { TestConfig } from 'test.config';
+import { MockProjects, StoredProject } from '@dasch-swiss/dsp-js';
 import { SelectProjectComponent } from './select-project.component';
 
 
diff --git a/src/app/workspace/resource/resource-link-form/resource-link-form.component.spec.ts b/src/app/workspace/resource/resource-link-form/resource-link-form.component.spec.ts
index d830de8fd0..f4a86a4446 100644
--- a/src/app/workspace/resource/resource-link-form/resource-link-form.component.spec.ts
+++ b/src/app/workspace/resource/resource-link-form/resource-link-form.component.spec.ts
@@ -24,17 +24,13 @@ import {
     UserResponse,
     UsersEndpointAdmin
 } from '@dasch-swiss/dsp-js';
-import {
-    DspActionModule,
-    DspApiConnectionToken,
-    FilteredResources,
-    Session,
-    SessionService
-} from '@dasch-swiss/dsp-ui';
+import { DspActionModule, FilteredResources } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 import { AjaxResponse } from 'rxjs/ajax';
 import { CacheService } from 'src/app/main/cache/cache.service';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
+import { Session, SessionService } from 'src/app/main/services/session.service';
 import { ResourceLinkFormComponent } from './resource-link-form.component';
 
 const resolvedPromise = Promise.resolve(null);
diff --git a/src/app/workspace/resource/resource-link-form/resource-link-form.component.ts b/src/app/workspace/resource/resource-link-form/resource-link-form.component.ts
index b598ff4a18..45e56b4664 100644
--- a/src/app/workspace/resource/resource-link-form/resource-link-form.component.ts
+++ b/src/app/workspace/resource/resource-link-form/resource-link-form.component.ts
@@ -11,7 +11,8 @@ import {
     ReadResource,
     StoredProject
 } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken, FilteredResources } from '@dasch-swiss/dsp-ui';
+import { FilteredResources } from '@dasch-swiss/dsp-ui';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
 import { ProjectService } from '../project.service';
 
diff --git a/src/app/workspace/resource/resource.component.spec.ts b/src/app/workspace/resource/resource.component.spec.ts
index a6f2d7428a..ab6675f7fa 100644
--- a/src/app/workspace/resource/resource.component.spec.ts
+++ b/src/app/workspace/resource/resource.component.spec.ts
@@ -2,13 +2,8 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { MatIconModule } from '@angular/material/icon';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import {
-    AppInitService,
-    DspApiConfigToken,
-    DspApiConnectionToken,
-    DspCoreModule,
-    DspViewerModule
-} from '@dasch-swiss/dsp-ui';
+import { AppInitService, DspCoreModule, DspViewerModule } from '@dasch-swiss/dsp-ui';
+import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { TestConfig } from 'test.config';
 import { ResourceComponent } from './resource.component';
 
diff --git a/src/app/workspace/resource/resource.component.ts b/src/app/workspace/resource/resource.component.ts
index 99a4d1196a..048787e84e 100644
--- a/src/app/workspace/resource/resource.component.ts
+++ b/src/app/workspace/resource/resource.component.ts
@@ -18,16 +18,12 @@ import {
     ReadResourceSequence,
     ReadStillImageFileValue, SystemPropertyDefinition
 } from '@dasch-swiss/dsp-js';
-import {
-    DspApiConnectionToken,
-    NotificationService,
-    PropertyInfoValues,
-    Session,
-    SessionService,
-    ValueOperationEventService
-} from '@dasch-swiss/dsp-ui';
+import { PropertyInfoValues, ValueOperationEventService } from '@dasch-swiss/dsp-ui';
 import { Subscription } from 'rxjs';
+import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ErrorHandlerService } from 'src/app/main/error/error-handler.service';
+import { NotificationService } from 'src/app/main/services/notification.service';
+import { Session, SessionService } from 'src/app/main/services/session.service';
 import { DspCompoundPosition, DspResource } from './dsp-resource';
 import { IncomingService } from './incoming.service';
 import { FileRepresentation, RepresentationConstants } from './representation/file-representation';
diff --git a/src/app/workspace/results/results.component.html b/src/app/workspace/results/results.component.html
index 792585252d..db89c3c8e7 100644
--- a/src/app/workspace/results/results.component.html
+++ b/src/app/workspace/results/results.component.html
@@ -3,9 +3,9 @@
 
     <as-split direction="horizontal">
         <as-split-area [size]="40">
-            <dsp-list-view [search]="searchParams" [displayViewSwitch]="false" [withMultipleSelection]="true"
+            <app-list-view [search]="searchParams" [displayViewSwitch]="false" [withMultipleSelection]="true"
             (selectedResources)="openSelectedResources($event)">
-            </dsp-list-view>
+            </app-list-view>
         </as-split-area>
         <as-split-area [size]="60" *ngIf="selectedResources?.count > 0">
             <div [ngSwitch]="viewMode">
diff --git a/src/app/workspace/results/results.component.spec.ts b/src/app/workspace/results/results.component.spec.ts
index ad8f005363..384d180378 100644
--- a/src/app/workspace/results/results.component.spec.ts
+++ b/src/app/workspace/results/results.component.spec.ts
@@ -1,14 +1,9 @@
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import {
-    AppInitService,
-    DspApiConfigToken,
-    DspApiConnectionToken,
-    DspCoreModule,
-    DspViewerModule
-} from '@dasch-swiss/dsp-ui';
+import { AppInitService, DspCoreModule, DspViewerModule } from '@dasch-swiss/dsp-ui';
 import { AngularSplitModule } from 'angular-split';
+import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { TestConfig } from 'test.config';
 import { ResourceComponent } from '../resource/resource.component';
 import { ResultsComponent } from './results.component';
diff --git a/test.config.ts b/test.config.ts
index 4498459ead..c3522443e1 100644
--- a/test.config.ts
+++ b/test.config.ts
@@ -1,5 +1,5 @@
 import { KnoraApiConfig } from '@dasch-swiss/dsp-js';
-import { Session } from '@dasch-swiss/dsp-ui';
+import { Session } from 'src/app/main/services/session.service';
 
 export class TestConfig {