diff --git a/frontends/dnet-is-application/src/app/app.component.ts b/frontends/dnet-is-application/src/app/app.component.ts
index 71e729ba..1a02c86c 100644
--- a/frontends/dnet-is-application/src/app/app.component.ts
+++ b/frontends/dnet-is-application/src/app/app.component.ts
@@ -1,5 +1,4 @@
 import { Component, inject } from '@angular/core';
-import { TitleStrategy } from '@angular/router';
 import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
 import { Observable } from 'rxjs';
 import { map, shareReplay } from 'rxjs/operators';
diff --git a/frontends/dnet-is-application/src/app/contexts/contexts.component.ts b/frontends/dnet-is-application/src/app/contexts/contexts.component.ts
index 2f26a105..37188d2a 100644
--- a/frontends/dnet-is-application/src/app/contexts/contexts.component.ts
+++ b/frontends/dnet-is-application/src/app/contexts/contexts.component.ts
@@ -1,14 +1,11 @@
 import { Component, Inject,AfterViewInit, OnInit, ViewChild } from '@angular/core';
 import { ISService } from '../is.service';
 import { MatTableDataSource } from '@angular/material/table';
-import { MatSort, Sort } from '@angular/material/sort';
-import { Context, ContextNode, WfHistoryEntry } from '../model/controller.model';
+import { MatSort } from '@angular/material/sort';
+import { Context, ContextNode } from '../is.model';
 import { ActivatedRoute, Params } from '@angular/router';
-import { Observable, combineLatest } from 'rxjs';
-import { map } from 'rxjs/operators';
 import { MatDialog, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { KeyValue, ContextParam } from '../model/controller.model';
-import { FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms';
+import { ContextParam } from '../is.model';
 
 @Component({
   selector: 'app-contexts',
diff --git a/frontends/dnet-is-application/src/app/dsm/dsm.component.ts b/frontends/dnet-is-application/src/app/dsm/dsm.component.ts
index 71a6a7d7..90832a45 100644
--- a/frontends/dnet-is-application/src/app/dsm/dsm.component.ts
+++ b/frontends/dnet-is-application/src/app/dsm/dsm.component.ts
@@ -1,16 +1,12 @@
-import { Component, Inject, AfterViewInit, OnInit, ViewChild } from '@angular/core';
-import { BrowseTerm, Datasource, KeyValue } from '../model/controller.model';
+import { Component, Inject, OnInit, ViewChild } from '@angular/core';
+import { BrowseTerm, Datasource, KeyValue } from '../is.model';
 import { ISService } from '../is.service';
 import { ActivatedRoute, Params } from '@angular/router';
 import { MatDialog, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { MatTable, MatTableDataSource } from '@angular/material/table';
+import { MatTableDataSource } from '@angular/material/table';
 import { MatSort, Sort } from '@angular/material/sort';
-import { Vocabulary, VocabularyTermSynonym } from '../model/controller.model';
-import { Observable, combineLatest } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { Page } from '../model/controller.model';
-import { FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms';
-import { EmitterVisitorContext } from '@angular/compiler';
+import { combineLatest } from 'rxjs';
+import { Page } from '../is.model';
 import { Router } from '@angular/router';
 import { PageEvent } from '@angular/material/paginator';
 
diff --git a/frontends/dnet-is-application/src/app/info/info.component.ts b/frontends/dnet-is-application/src/app/info/info.component.ts
index bfdf6278..37fa4280 100644
--- a/frontends/dnet-is-application/src/app/info/info.component.ts
+++ b/frontends/dnet-is-application/src/app/info/info.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ISService } from '../is.service';
 import { MatTableDataSource } from '@angular/material/table';
-import { KeyValue, Module } from '../model/controller.model';
+import { Module } from '../is.model';
 
 export interface KeyValueDatasource {
   name: string;
diff --git a/frontends/dnet-is-application/src/app/model/controller.model.ts b/frontends/dnet-is-application/src/app/is.model.ts
similarity index 100%
rename from frontends/dnet-is-application/src/app/model/controller.model.ts
rename to frontends/dnet-is-application/src/app/is.model.ts
diff --git a/frontends/dnet-is-application/src/app/is.service.ts b/frontends/dnet-is-application/src/app/is.service.ts
index 00be5f51..c04a34e0 100644
--- a/frontends/dnet-is-application/src/app/is.service.ts
+++ b/frontends/dnet-is-application/src/app/is.service.ts
@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
-import { Page, ResourceType, Protocol, WfHistoryEntry, SimpleResource, Context, ContextNode, Vocabulary, VocabularyTerm, KeyValue, BrowseTerm, Datasource } from './model/controller.model';
-import { Observable, Observer } from 'rxjs';
+import { Page, ResourceType, Protocol, WfHistoryEntry, SimpleResource, Context, ContextNode, Vocabulary, VocabularyTerm, KeyValue, BrowseTerm, Datasource } from './is.model';
 import { FormGroup } from '@angular/forms';
 import { MatSnackBar } from '@angular/material/snack-bar';
 
diff --git a/frontends/dnet-is-application/src/app/main-menu-panels/main-menu-panels.component.ts b/frontends/dnet-is-application/src/app/main-menu-panels/main-menu-panels.component.ts
index 140245f9..06ca8953 100644
--- a/frontends/dnet-is-application/src/app/main-menu-panels/main-menu-panels.component.ts
+++ b/frontends/dnet-is-application/src/app/main-menu-panels/main-menu-panels.component.ts
@@ -1,7 +1,7 @@
-import {Component, ViewChild, ViewEncapsulation} from '@angular/core';
-import { ResourceType } from '../model/controller.model';
+import { Component, ViewChild } from '@angular/core';
+import { ResourceType } from '../is.model';
 import { ISService } from '../is.service';
-import {MatAccordion} from '@angular/material/expansion';
+import { MatAccordion } from '@angular/material/expansion';
 
 
 @Component({
diff --git a/frontends/dnet-is-application/src/app/protocols/protocols.component.ts b/frontends/dnet-is-application/src/app/protocols/protocols.component.ts
index d8388273..675a0fb6 100644
--- a/frontends/dnet-is-application/src/app/protocols/protocols.component.ts
+++ b/frontends/dnet-is-application/src/app/protocols/protocols.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ISService } from '../is.service';
 import { MatTableDataSource } from '@angular/material/table';
-import { Protocol, ProtocolParams } from '../model/controller.model';
+import { Protocol, ProtocolParams } from '../is.model';
 
 export interface ProtocolDatasource {
   protocol: string;
diff --git a/frontends/dnet-is-application/src/app/resources/resources.component.ts b/frontends/dnet-is-application/src/app/resources/resources.component.ts
index 2844d174..c499e88d 100644
--- a/frontends/dnet-is-application/src/app/resources/resources.component.ts
+++ b/frontends/dnet-is-application/src/app/resources/resources.component.ts
@@ -1,13 +1,9 @@
-import { Component, Inject,AfterViewInit, ViewChild, OnInit } from '@angular/core';
+import { Component, Inject, OnInit } from '@angular/core';
 import { ISService } from '../is.service';
-import { MatTableDataSource } from '@angular/material/table';
-import { MatSort, Sort } from '@angular/material/sort';
 import { ActivatedRoute } from '@angular/router';
-import { map } from 'rxjs/operators';
 import { MatDialog, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { ResourceType, SimpleResource } from '../model/controller.model';
-import {FormControl, FormGroup, FormGroupDirective, NgForm, Validators} from '@angular/forms';
-import { ResourceLoader } from '@angular/compiler';
+import { ResourceType, SimpleResource } from '../is.model';
+import { FormControl, FormGroup } from '@angular/forms';
 
 @Component({
   selector: 'app-resources',
diff --git a/frontends/dnet-is-application/src/app/vocabularies/vocabularies.component.ts b/frontends/dnet-is-application/src/app/vocabularies/vocabularies.component.ts
index 52349409..042678f9 100644
--- a/frontends/dnet-is-application/src/app/vocabularies/vocabularies.component.ts
+++ b/frontends/dnet-is-application/src/app/vocabularies/vocabularies.component.ts
@@ -1,15 +1,12 @@
 import { Component, Inject, AfterViewInit, OnInit, ViewChild } from '@angular/core';
 import { ISService } from '../is.service';
 import { MatTable, MatTableDataSource } from '@angular/material/table';
-import { MatSort, Sort } from '@angular/material/sort';
-import { Vocabulary, VocabularyTermSynonym } from '../model/controller.model';
-import { ActivatedRoute, Params } from '@angular/router';
-import { Observable, combineLatest } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { MatSort } from '@angular/material/sort';
+import { Vocabulary, VocabularyTermSynonym } from '../is.model';
+import { ActivatedRoute } from '@angular/router';
 import { MatDialog, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { VocabularyTerm } from '../model/controller.model';
-import { FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms';
-import { EmitterVisitorContext } from '@angular/compiler';
+import { VocabularyTerm } from '../is.model';
+import { FormControl, FormGroup } from '@angular/forms';
 
 @Component({
   selector: 'app-vocabularies',
diff --git a/frontends/dnet-is-application/src/app/wf-history/wf-history.component.ts b/frontends/dnet-is-application/src/app/wf-history/wf-history.component.ts
index 44efc691..bad0b50a 100644
--- a/frontends/dnet-is-application/src/app/wf-history/wf-history.component.ts
+++ b/frontends/dnet-is-application/src/app/wf-history/wf-history.component.ts
@@ -1,13 +1,12 @@
 import { Component, Inject,AfterViewInit, OnInit, ViewChild } from '@angular/core';
 import { ISService } from '../is.service';
 import { MatTableDataSource } from '@angular/material/table';
-import { MatSort, Sort } from '@angular/material/sort';
-import { WfHistoryEntry } from '../model/controller.model';
+import { MatSort  } from '@angular/material/sort';
+import { WfHistoryEntry } from '../is.model';
 import { ActivatedRoute, Params } from '@angular/router';
-import { Observable, combineLatest } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { combineLatest } from 'rxjs';
 import { MatDialog, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { KeyValue } from '../model/controller.model';
+import { KeyValue } from '../is.model';
 
 @Component({
   selector: 'app-wf-history',