diff --git a/src/main/frontend/chat/controller/AbstractController.ts b/src/main/frontend/chat/controller/AbstractController.ts
index 7d3c8df..d181e1f 100644
--- a/src/main/frontend/chat/controller/AbstractController.ts
+++ b/src/main/frontend/chat/controller/AbstractController.ts
@@ -1,4 +1,4 @@
-import { Model } from "../model/AbstractModel";
+import { Model } from "../../common/model/AbstractModel";
 
 import { View } from "../view/AbstractView";
 // simple restrictions that MVC impose: The Control has a reference to the View and Model + the View has a reference to the Model and the Controller.It also does not have any Observer implementation in the Model, so that the View can update based on it.
diff --git a/src/main/frontend/chat/controller/ChatController.ts b/src/main/frontend/chat/controller/ChatController.ts
index 4b461c1..99d1995 100644
--- a/src/main/frontend/chat/controller/ChatController.ts
+++ b/src/main/frontend/chat/controller/ChatController.ts
@@ -1,12 +1,12 @@
 import { Controller } from "./AbstractController";
-import "../model/AbstractModel"
-import "../model/UserModel"
+import "../../common/model/AbstractModel"
+import "../../common/model/UserModel"
 import "../view/AbstractView"
 import "../view/UserView"
-import { Model } from "../model/AbstractModel";
+import { Model } from "../../common/model/AbstractModel";
 import { View } from "../view/AbstractView";
 import { ChatMessageViewModel } from "../viewmodel/ChatMessageViewModel";
-import { ChatModel } from "../model/ChatModel";
+import { ChatModel } from "../../common/model/ChatModel";
 import { ChatView } from "../view/ChatView";
 
 export class ChatController {
@@ -37,5 +37,5 @@ export class ChatController {
         chatMessageViewModels.push(chatMessageViewModelMock);
     }
 
-    
+
 }
\ No newline at end of file
diff --git a/src/main/frontend/chat/controller/UserController.ts b/src/main/frontend/chat/controller/UserController.ts
index 38d4535..74602e8 100644
--- a/src/main/frontend/chat/controller/UserController.ts
+++ b/src/main/frontend/chat/controller/UserController.ts
@@ -1,13 +1,13 @@
 import { Controller } from "./AbstractController";
-import "../model/AbstractModel"
-import "../model/UserModel"
+import "../../common/model/AbstractModel"
+import "../../common/model/UserModel"
 import "../view/AbstractView"
 import "../view/UserView"
-import { Model } from "../model/AbstractModel";
+import { Model } from "../../common/model/AbstractModel";
 import { View } from "../view/AbstractView";
 import { ActiveUserViewModel } from "../viewmodel/ActiveUserViewModel";
 import { UserView } from "../view/UserView";
-import { UserModel } from "../model/UserModel";
+import { UserModel } from "../../common/model/UserModel";
 
 export class UserController {
     private _model: UserModel;
@@ -46,5 +46,5 @@ export class UserController {
         this._model.getActiveUsers();
     }
 
-    
+
 }
\ No newline at end of file
diff --git a/src/main/frontend/chat/main.ts b/src/main/frontend/chat/main.ts
index bd99907..13f6b34 100644
--- a/src/main/frontend/chat/main.ts
+++ b/src/main/frontend/chat/main.ts
@@ -3,9 +3,9 @@ import * as Handlebars from "handlebars";
 import * as log from "loglevel";
 import { ChatController } from "./controller/ChatController";
 import { UserController } from "./controller/UserController";
-import { ChatModel } from "./model/ChatModel";
-import { ChatModelHelper } from "./model/ChatModelHelper";
-import { UserModel } from "./model/UserModel";
+import { ChatModel } from "../common/model/ChatModel";
+import { ChatModelHelper } from "../common/model/ChatModelHelper";
+import { UserModel } from "../common/model/UserModel";
 import { AlertifyNotificationService } from "./service/AlertifyNotificationService";
 import { EncryptionServiceFactory } from "./service/EncryptionServiceFactory";
 import { FuseSearchService } from "./service/FuseSearchService";
diff --git a/src/main/frontend/chat/model/AbstractModel.ts b/src/main/frontend/chat/model/AbstractModel.ts
deleted file mode 100644
index aba36ec..0000000
--- a/src/main/frontend/chat/model/AbstractModel.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Subject } from "../observe/Observable";
-import { ActiveUserViewModel } from "../viewmodel/ActiveUserViewModel";
-
-export interface Model extends Subject<any> {
-    someBusinessMethod(data: Object): void;
-
-}
\ No newline at end of file
diff --git a/src/main/frontend/chat/view/AbstractView.ts b/src/main/frontend/chat/view/AbstractView.ts
index fe4ee27..09fd3b9 100644
--- a/src/main/frontend/chat/view/AbstractView.ts
+++ b/src/main/frontend/chat/view/AbstractView.ts
@@ -1,5 +1,5 @@
 // simple restrictions that MVC impose: The Control has a reference to the View and Model + the View has a reference to the Model and the Controller.It also does not have any Observer implementation in the Model, so that the View can update based on it.
-import { Model } from "../model/AbstractModel";
+import { Model } from "../../common/model/AbstractModel";
 import { Controller } from "../controller/AbstractController";
 import { Observer } from "../observe/Observer";
 export interface View extends Observer<any> {
diff --git a/src/main/frontend/chat/view/ChatView.ts b/src/main/frontend/chat/view/ChatView.ts
index 3bb8fd2..b594c86 100644
--- a/src/main/frontend/chat/view/ChatView.ts
+++ b/src/main/frontend/chat/view/ChatView.ts
@@ -2,7 +2,7 @@ import * as DOMPurify from "dompurify";
 import * as log from "loglevel";
 import { ChatMessageDTO } from "../dto/ChatMessageDTO";
 import { MessageCipherDTO } from "../dto/MessageCipherDTO";
-import { ChatModel } from "../model/ChatModel";
+import { ChatModel } from "../../common/model/ChatModel";
 import { Observer } from "../observe/Observer";
 import { EncryptionService } from "../service/EncryptionService";
 import { MarkDownService } from "../service/MarkDownService";
@@ -12,7 +12,7 @@ import { ChatViewDeps } from "./ChatViewDeps";
 import { fetchHandler } from "./FetchHandler";
 import { ObserverData } from "../observe/ObserverData";
 import { NotificationService } from "../service/NotificationService";
-import { UserModel } from "../model/UserModel";
+import { UserModel } from "../../common/model/UserModel";
 
 export class ChatView implements Observer<ChatMessageViewModel> {
   private readonly _chatModel: ChatModel;
diff --git a/src/main/frontend/chat/view/ChatViewDeps.ts b/src/main/frontend/chat/view/ChatViewDeps.ts
index 83af2b9..fe5ee2b 100644
--- a/src/main/frontend/chat/view/ChatViewDeps.ts
+++ b/src/main/frontend/chat/view/ChatViewDeps.ts
@@ -1,9 +1,9 @@
 import { ChatMessageViewModel } from "../viewmodel/ChatMessageViewModel";
-import { ChatModel } from "../model/ChatModel";
+import { ChatModel } from "../../common/model/ChatModel";
 import { MarkDownService } from "../service/MarkDownService";
 import { EncryptionService } from "../service/EncryptionService";
 import { NotificationService } from "../service/NotificationService";
-import { UserModel } from "../model/UserModel";
+import { UserModel } from "../../common/model/UserModel";
 
 export interface ChatViewDeps {
     chatModel: ChatModel;
diff --git a/src/main/frontend/chat/view/UserView.ts b/src/main/frontend/chat/view/UserView.ts
index 483a58a..06e49d5 100644
--- a/src/main/frontend/chat/view/UserView.ts
+++ b/src/main/frontend/chat/view/UserView.ts
@@ -1,10 +1,10 @@
 import { Observer } from "../observe/Observer";
 import { ActiveUserViewModel } from "../viewmodel/ActiveUserViewModel";
-import { ChatModel } from "../model/ChatModel";
+import { ChatModel } from "../../common/model/ChatModel";
 import log = require("loglevel");
 import * as DOMPurify from "dompurify";
 import { SearchService } from "../service/SearchService";
-import { UserModel } from "../model/UserModel";
+import { UserModel } from "../../common/model/UserModel";
 import { UserViewDeps } from "./UserViewDeps";
 import { ObserverData } from "../observe/ObserverData";
 import { JsonAPI } from "../singleton/JsonAPI";
diff --git a/src/main/frontend/chat/view/UserViewDeps.ts b/src/main/frontend/chat/view/UserViewDeps.ts
index 491d07c..28f374e 100644
--- a/src/main/frontend/chat/view/UserViewDeps.ts
+++ b/src/main/frontend/chat/view/UserViewDeps.ts
@@ -1,6 +1,6 @@
-import { UserModel } from "../model/UserModel";
+import { UserModel } from "../../common/model/UserModel";
 
-import { ChatModel } from "../model/ChatModel";
+import { ChatModel } from "../../common/model/ChatModel";
 
 import { SearchService } from "../service/SearchService";
 
diff --git a/src/main/frontend/common/model/AbstractModel.ts b/src/main/frontend/common/model/AbstractModel.ts
new file mode 100644
index 0000000..c166c78
--- /dev/null
+++ b/src/main/frontend/common/model/AbstractModel.ts
@@ -0,0 +1,7 @@
+import { Subject } from "../../chat/observe/Observable";
+import { ActiveUserViewModel } from "../../chat/viewmodel/ActiveUserViewModel";
+
+export interface Model extends Subject<any> {
+    someBusinessMethod(data: Object): void;
+
+}
\ No newline at end of file
diff --git a/src/main/frontend/chat/model/ChatModel.ts b/src/main/frontend/common/model/ChatModel.ts
similarity index 93%
rename from src/main/frontend/chat/model/ChatModel.ts
rename to src/main/frontend/common/model/ChatModel.ts
index e03caa3..d95f127 100644
--- a/src/main/frontend/chat/model/ChatModel.ts
+++ b/src/main/frontend/common/model/ChatModel.ts
@@ -1,11 +1,11 @@
-import { Subject } from "../observe/Observable";
-import { Observer } from "../observe/Observer";
-import { JsonAPI } from "../singleton/JsonAPI";
-import { ChatMessageViewModel } from "../viewmodel/ChatMessageViewModel";
+import { Subject } from "../../chat/observe/Observable";
+import { Observer } from "../../chat/observe/Observer";
+import { JsonAPI } from "../../chat/singleton/JsonAPI";
+import { ChatMessageViewModel } from "../../chat/viewmodel/ChatMessageViewModel";
 import { ChatModelHelper } from "./ChatModelHelper";
 import log = require("loglevel");
-import { ObserverData } from "../observe/ObserverData";
-import { ActiveUserViewModel } from "../viewmodel/ActiveUserViewModel";
+import { ObserverData } from "../../chat/observe/ObserverData";
+import { ActiveUserViewModel } from "../../chat/viewmodel/ActiveUserViewModel";
 import moment = require("moment");
 
 interface Params {
@@ -141,7 +141,7 @@ export class ChatModel implements Subject<ChatMessageViewModel> {
     }
   }
 
-  public someBusinessMethod(chatMessageList: ChatMessageViewModel[]): void {}
+  public someBusinessMethod(chatMessageList: ChatMessageViewModel[]): void { }
 
   public clear(): void {
     log.info("Clearing model");
diff --git a/src/main/frontend/chat/model/ChatModelHelper.ts b/src/main/frontend/common/model/ChatModelHelper.ts
similarity index 93%
rename from src/main/frontend/chat/model/ChatModelHelper.ts
rename to src/main/frontend/common/model/ChatModelHelper.ts
index d53ec9a..ee3d4f9 100644
--- a/src/main/frontend/chat/model/ChatModelHelper.ts
+++ b/src/main/frontend/common/model/ChatModelHelper.ts
@@ -1,10 +1,10 @@
 import * as log from "loglevel";
-import { ChatMessageDTO } from "../dto/ChatMessageDTO";
-import { EncryptionService } from "../service/EncryptionService";
-import { NotificationService } from "../service/NotificationService";
-import { JsonAPI } from "../singleton/JsonAPI";
-import { Sprintf } from "../singleton/Sprintf";
-import { ChatMessageViewModel } from "../viewmodel/ChatMessageViewModel";
+import { ChatMessageDTO } from "../../chat/dto/ChatMessageDTO";
+import { EncryptionService } from "../../chat/service/EncryptionService";
+import { NotificationService } from "../../chat/service/NotificationService";
+import { JsonAPI } from "../../chat/singleton/JsonAPI";
+import { Sprintf } from "../../chat/singleton/Sprintf";
+import { ChatMessageViewModel } from "../../chat/viewmodel/ChatMessageViewModel";
 import { fetchErrorHandler } from "./FetchErrorHandler";
 
 export class ChatModelHelper {
@@ -224,7 +224,7 @@ export class ChatModelHelper {
       }
     );
     log.debug(response.clone());
-    if(!response.ok) location.reload();
+    if (!response.ok) location.reload();
     const data: Promise<any> = await response.json();
     function func(data: any) {
       const d1 = data.map((d: any) => {
diff --git a/src/main/frontend/chat/model/FetchErrorHandler.ts b/src/main/frontend/common/model/FetchErrorHandler.ts
similarity index 91%
rename from src/main/frontend/chat/model/FetchErrorHandler.ts
rename to src/main/frontend/common/model/FetchErrorHandler.ts
index 571c5b6..9eb5652 100644
--- a/src/main/frontend/chat/model/FetchErrorHandler.ts
+++ b/src/main/frontend/common/model/FetchErrorHandler.ts
@@ -1,6 +1,6 @@
 import log = require("loglevel");
-import { NotificationService } from "../service/NotificationService";
-import { Sprintf } from "../singleton/Sprintf";
+import { NotificationService } from "../../chat/service/NotificationService";
+import { Sprintf } from "../../chat/singleton/Sprintf";
 // import { sprintf } from "sprintf-js";
 ///<reference path="../SprintfTest.d.ts" />
 
diff --git a/src/main/frontend/chat/model/ModelFactory.ts b/src/main/frontend/common/model/ModelFactory.ts
similarity index 100%
rename from src/main/frontend/chat/model/ModelFactory.ts
rename to src/main/frontend/common/model/ModelFactory.ts
diff --git a/src/main/frontend/chat/model/UserModel.ts b/src/main/frontend/common/model/UserModel.ts
similarity index 90%
rename from src/main/frontend/chat/model/UserModel.ts
rename to src/main/frontend/common/model/UserModel.ts
index 235b6f2..513a00a 100644
--- a/src/main/frontend/chat/model/UserModel.ts
+++ b/src/main/frontend/common/model/UserModel.ts
@@ -1,10 +1,10 @@
 import * as log from "loglevel";
-import { Subject } from "../observe/Observable";
-import { Observer } from "../observe/Observer";
-import { JsonAPI } from "../singleton/JsonAPI";
-import { ActiveUserViewModel } from "../viewmodel/ActiveUserViewModel";
+import { Subject } from "../../chat/observe/Observable";
+import { Observer } from "../../chat/observe/Observer";
+import { JsonAPI } from "../../chat/singleton/JsonAPI";
+import { ActiveUserViewModel } from "../../chat/viewmodel/ActiveUserViewModel";
 import { fetchErrorHandler } from "./FetchErrorHandler";
-import { NotificationService } from "../service/NotificationService";
+import { NotificationService } from "../../chat/service/NotificationService";
 
 export class UserModel implements Subject<ActiveUserViewModel> {
   /**
diff --git a/src/main/frontend/workers/encryption-worker/main.ts b/src/main/frontend/workers/encryption-worker/main.ts
index c5cd2c8..0359cb6 100644
--- a/src/main/frontend/workers/encryption-worker/main.ts
+++ b/src/main/frontend/workers/encryption-worker/main.ts
@@ -2,7 +2,7 @@ import registerPromiseWorker from 'promise-worker/register';
 import * as sjcl from 'sjcl'
 
 
-registerPromiseWorker((payload) => {
+registerPromiseWorker((payload: { passphrase: string, cipher: string }) => {
     // console.log(payload)
     // console.log('decrypted = ' + sjcl.decrypt(payload.passphrase, JSON.stringify(payload.cipher)));
     return sjcl.decrypt(payload.passphrase, JSON.stringify(payload.cipher))