diff --git a/src/main/frontend/chat/service/EncryptionServiceFactory.ts b/src/main/frontend/chat/service/EncryptionServiceFactory.ts
index 4c10083..458a587 100644
--- a/src/main/frontend/chat/service/EncryptionServiceFactory.ts
+++ b/src/main/frontend/chat/service/EncryptionServiceFactory.ts
@@ -1,5 +1,5 @@
-import { EncryptionService } from "./EncryptionService";
-import { SJCLEncryptionService } from "./SJCLEncryptionService";
+import { EncryptionService } from "../../common/service/EncryptionService";
+import { SJCLEncryptionService } from "../../common/service/SJCLEncryptionService";
 // import PromiseWorker = require('promise-worker');
 import PromiseWorker from "promise-worker";
 
diff --git a/src/main/frontend/chat/view/ChatView.ts b/src/main/frontend/chat/view/ChatView.ts
index b594c86..85516c6 100644
--- a/src/main/frontend/chat/view/ChatView.ts
+++ b/src/main/frontend/chat/view/ChatView.ts
@@ -4,7 +4,7 @@ import { ChatMessageDTO } from "../dto/ChatMessageDTO";
 import { MessageCipherDTO } from "../dto/MessageCipherDTO";
 import { ChatModel } from "../../common/model/ChatModel";
 import { Observer } from "../observe/Observer";
-import { EncryptionService } from "../service/EncryptionService";
+import { EncryptionService } from "../../common/service/EncryptionService";
 import { MarkDownService } from "../service/MarkDownService";
 import { JsonAPI } from "../singleton/JsonAPI";
 import { ChatMessageViewModel } from "../viewmodel/ChatMessageViewModel";
diff --git a/src/main/frontend/chat/view/ChatViewDeps.ts b/src/main/frontend/chat/view/ChatViewDeps.ts
index fe5ee2b..fc2a633 100644
--- a/src/main/frontend/chat/view/ChatViewDeps.ts
+++ b/src/main/frontend/chat/view/ChatViewDeps.ts
@@ -1,7 +1,7 @@
 import { ChatMessageViewModel } from "../viewmodel/ChatMessageViewModel";
 import { ChatModel } from "../../common/model/ChatModel";
 import { MarkDownService } from "../service/MarkDownService";
-import { EncryptionService } from "../service/EncryptionService";
+import { EncryptionService } from "../../common/service/EncryptionService";
 import { NotificationService } from "../service/NotificationService";
 import { UserModel } from "../../common/model/UserModel";
 
diff --git a/src/main/frontend/common/model/ChatModelHelper.ts b/src/main/frontend/common/model/ChatModelHelper.ts
index 0eaf5f4..9e5cb3d 100644
--- a/src/main/frontend/common/model/ChatModelHelper.ts
+++ b/src/main/frontend/common/model/ChatModelHelper.ts
@@ -1,6 +1,6 @@
 import * as log from "loglevel";
 import { ChatMessageDTO } from "../../chat/dto/ChatMessageDTO";
-import { EncryptionService } from "../../chat/service/EncryptionService";
+import { EncryptionService } from "../service/EncryptionService";
 import { NotificationService } from "../../chat/service/NotificationService";
 import { JsonAPI } from "../../chat/singleton/JsonAPI";
 import { Sprintf } from "../../chat/singleton/Sprintf";
diff --git a/src/main/frontend/chat/service/EncryptionService.ts b/src/main/frontend/common/service/EncryptionService.ts
similarity index 78%
rename from src/main/frontend/chat/service/EncryptionService.ts
rename to src/main/frontend/common/service/EncryptionService.ts
index cd7f07c..3ce5ca4 100644
--- a/src/main/frontend/chat/service/EncryptionService.ts
+++ b/src/main/frontend/common/service/EncryptionService.ts
@@ -1,4 +1,4 @@
-import { MessageCipherDTO } from "../dto/MessageCipherDTO";
+import { MessageCipherDTO } from "../../chat/dto/MessageCipherDTO";
 
 export interface EncryptionService {
     encrypt(passphrase: string, plainText: string): any;
diff --git a/src/main/frontend/chat/service/SJCLEncryptionService.ts b/src/main/frontend/common/service/SJCLEncryptionService.ts
similarity index 94%
rename from src/main/frontend/chat/service/SJCLEncryptionService.ts
rename to src/main/frontend/common/service/SJCLEncryptionService.ts
index d059e4b..133bf4a 100644
--- a/src/main/frontend/chat/service/SJCLEncryptionService.ts
+++ b/src/main/frontend/common/service/SJCLEncryptionService.ts
@@ -1,6 +1,6 @@
 import { EncryptionService } from "./EncryptionService";
 import * as sjcl from "sjcl";
-import { MessageCipherDTO } from "../dto/MessageCipherDTO";
+import { MessageCipherDTO } from "../../chat/dto/MessageCipherDTO";
 import PromiseWorker from "promise-worker";
 export class SJCLEncryptionService implements EncryptionService {
     private _params: sjcl.SjclCipherParams = { mode: "gcm", ts: 128, adata: "", iter: 10000 };