diff --git a/src/abstractions/api.service.ts b/src/abstractions/api.service.ts
index 0f13f46c73f..4c7d621c144 100644
--- a/src/abstractions/api.service.ts
+++ b/src/abstractions/api.service.ts
@@ -1,21 +1,17 @@
-import { EnvironmentUrls } from '../models/domain';
+import { EnvironmentUrls } from '../models/domain/environmentUrls';
 
-import {
-    CipherRequest,
-    FolderRequest,
-    PasswordHintRequest,
-    RegisterRequest,
-    TokenRequest,
-    TwoFactorEmailRequest,
-} from '../models/request';
+import { CipherRequest } from '../models/request/cipherRequest';
+import { FolderRequest } from '../models/request/folderRequest';
+import { PasswordHintRequest } from '../models/request/passwordHintRequest';
+import { RegisterRequest } from '../models/request/registerRequest';
+import { TokenRequest } from '../models/request/tokenRequest';
+import { TwoFactorEmailRequest } from '../models/request/twoFactorEmailRequest';
 
-import {
-    CipherResponse,
-    FolderResponse,
-    IdentityTokenResponse,
-    IdentityTwoFactorResponse,
-    SyncResponse,
-} from '../models/response';
+import { CipherResponse } from '../models/response/cipherResponse';
+import { FolderResponse } from '../models/response/folderResponse';
+import { IdentityTokenResponse } from '../models/response/identityTokenResponse';
+import { IdentityTwoFactorResponse } from '../models/response/identityTwoFactorResponse';
+import { SyncResponse } from '../models/response/syncResponse';
 
 export abstract class ApiService {
     urlsSet: boolean;
diff --git a/src/abstractions/auth.service.ts b/src/abstractions/auth.service.ts
index 0faed28c2da..08ca1027297 100644
--- a/src/abstractions/auth.service.ts
+++ b/src/abstractions/auth.service.ts
@@ -1,6 +1,6 @@
-import { TwoFactorProviderType } from '../enums';
+import { TwoFactorProviderType } from '../enums/twoFactorProviderType';
 
-import { AuthResult } from '../models/domain';
+import { AuthResult } from '../models/domain/authResult';
 
 export abstract class AuthService {
     email: string;
diff --git a/src/abstractions/cipher.service.ts b/src/abstractions/cipher.service.ts
index 1df9c72b0f7..330ac71c6c3 100644
--- a/src/abstractions/cipher.service.ts
+++ b/src/abstractions/cipher.service.ts
@@ -1,15 +1,11 @@
-import { CipherData } from '../models/data';
+import { CipherData } from '../models/data/cipherData';
 
-import {
-    Cipher,
-    Field,
-    SymmetricCryptoKey,
-} from '../models/domain';
+import { Cipher } from '../models/domain/cipher';
+import { Field } from '../models/domain/field';
+import { SymmetricCryptoKey } from '../models/domain/symmetricCryptoKey';
 
-import {
-    CipherView,
-    FieldView,
-} from '../models/view';
+import { CipherView } from '../models/view/cipherView';
+import { FieldView } from '../models/view/fieldView';
 
 export abstract class CipherService {
     decryptedCipherCache: CipherView[];
diff --git a/src/abstractions/collection.service.ts b/src/abstractions/collection.service.ts
index 1bcec5cdaf1..6c51478555e 100644
--- a/src/abstractions/collection.service.ts
+++ b/src/abstractions/collection.service.ts
@@ -1,8 +1,8 @@
-import { CollectionData } from '../models/data';
+import { CollectionData } from '../models/data/collectionData';
 
-import { Collection } from '../models/domain';
+import { Collection } from '../models/domain/collection';
 
-import { CollectionView } from '../models/view';
+import { CollectionView } from '../models/view/collectionView';
 
 export abstract class CollectionService {
     decryptedCollectionCache: CollectionView[];
diff --git a/src/abstractions/crypto.service.ts b/src/abstractions/crypto.service.ts
index 1d5de5e127e..dbf5f0da75d 100644
--- a/src/abstractions/crypto.service.ts
+++ b/src/abstractions/crypto.service.ts
@@ -1,9 +1,7 @@
-import {
-    CipherString,
-    SymmetricCryptoKey,
-} from '../models/domain';
+import { CipherString } from '../models/domain/cipherString';
+import { SymmetricCryptoKey } from '../models/domain/symmetricCryptoKey';
 
-import { ProfileOrganizationResponse } from '../models/response';
+import { ProfileOrganizationResponse } from '../models/response/profileOrganizationResponse';
 
 export abstract class CryptoService {
     setKey: (key: SymmetricCryptoKey) => Promise<any>;
diff --git a/src/abstractions/folder.service.ts b/src/abstractions/folder.service.ts
index a6615b27563..381bc013171 100644
--- a/src/abstractions/folder.service.ts
+++ b/src/abstractions/folder.service.ts
@@ -1,8 +1,8 @@
-import { FolderData } from '../models/data';
+import { FolderData } from '../models/data/folderData';
 
-import { Folder } from '../models/domain';
+import { Folder } from '../models/domain/folder';
 
-import { FolderView } from '../models/view';
+import { FolderView } from '../models/view/folderView';
 
 export abstract class FolderService {
     decryptedFolderCache: FolderView[];
diff --git a/src/abstractions/passwordGeneration.service.ts b/src/abstractions/passwordGeneration.service.ts
index 36f532403bf..a8967db2813 100644
--- a/src/abstractions/passwordGeneration.service.ts
+++ b/src/abstractions/passwordGeneration.service.ts
@@ -1,4 +1,4 @@
-import { PasswordHistory } from '../models/domain';
+import { PasswordHistory } from '../models/domain/passwordHistory';
 
 export abstract class PasswordGenerationService {
     generatePassword: (options: any) => string;
diff --git a/src/abstractions/platformUtils.service.ts b/src/abstractions/platformUtils.service.ts
index 99d27951911..3835bd062dc 100644
--- a/src/abstractions/platformUtils.service.ts
+++ b/src/abstractions/platformUtils.service.ts
@@ -1,4 +1,4 @@
-import { DeviceType } from '../enums';
+import { DeviceType } from '../enums/deviceType';
 
 export abstract class PlatformUtilsService {
     getDevice: () => DeviceType;
diff --git a/src/misc/analytics.ts b/src/misc/analytics.ts
index 78962c66f66..98cfdebc5b0 100644
--- a/src/misc/analytics.ts
+++ b/src/misc/analytics.ts
@@ -1,8 +1,6 @@
-import {
-    AppIdService,
-    PlatformUtilsService,
-    StorageService,
-} from '../abstractions';
+import { AppIdService } from '../abstractions/appId.service';
+import { PlatformUtilsService } from '../abstractions/platformUtils.service';
+import { StorageService } from '../abstractions/storage.service';
 
 import { ConstantsService } from '../services/constants.service';
 
diff --git a/src/models/data/attachmentData.ts b/src/models/data/attachmentData.ts
index 792eb07bd1d..85aa452e1e1 100644
--- a/src/models/data/attachmentData.ts
+++ b/src/models/data/attachmentData.ts
@@ -1,4 +1,4 @@
-import { AttachmentResponse } from '../response';
+import { AttachmentResponse } from '../response/attachmentResponse';
 
 export class AttachmentData {
     id: string;
diff --git a/src/models/data/cipherData.ts b/src/models/data/cipherData.ts
index 40468f0a7aa..0a4f83c5204 100644
--- a/src/models/data/cipherData.ts
+++ b/src/models/data/cipherData.ts
@@ -1,4 +1,4 @@
-import { CipherType } from '../../enums';
+import { CipherType } from '../../enums/cipherType';
 
 import { AttachmentData } from './attachmentData';
 import { CardData } from './cardData';
@@ -7,7 +7,7 @@ import { IdentityData } from './identityData';
 import { LoginData } from './loginData';
 import { SecureNoteData } from './secureNoteData';
 
-import { CipherResponse } from '../response';
+import { CipherResponse } from '../response/cipherResponse';
 
 export class CipherData {
     id: string;
diff --git a/src/models/data/collectionData.ts b/src/models/data/collectionData.ts
index 16b44871b38..3b05b9af229 100644
--- a/src/models/data/collectionData.ts
+++ b/src/models/data/collectionData.ts
@@ -1,4 +1,4 @@
-import { CollectionResponse } from '../response';
+import { CollectionResponse } from '../response/collectionResponse';
 
 export class CollectionData {
     id: string;
diff --git a/src/models/data/fieldData.ts b/src/models/data/fieldData.ts
index 3af1d04285a..cd0fb2c42ba 100644
--- a/src/models/data/fieldData.ts
+++ b/src/models/data/fieldData.ts
@@ -1,4 +1,4 @@
-import { FieldType } from '../../enums';
+import { FieldType } from '../../enums/fieldType';
 
 export class FieldData {
     type: FieldType;
diff --git a/src/models/data/folderData.ts b/src/models/data/folderData.ts
index c0a4d0dd2f1..509267c9d41 100644
--- a/src/models/data/folderData.ts
+++ b/src/models/data/folderData.ts
@@ -1,4 +1,4 @@
-import { FolderResponse } from '../response';
+import { FolderResponse } from '../response/folderResponse';
 
 export class FolderData {
     id: string;
diff --git a/src/models/data/secureNoteData.ts b/src/models/data/secureNoteData.ts
index 0a3d64da9d7..4b27125a135 100644
--- a/src/models/data/secureNoteData.ts
+++ b/src/models/data/secureNoteData.ts
@@ -1,4 +1,4 @@
-import { SecureNoteType } from '../../enums';
+import { SecureNoteType } from '../../enums/secureNoteType';
 
 export class SecureNoteData {
     type: SecureNoteType;
diff --git a/src/models/domain/attachment.ts b/src/models/domain/attachment.ts
index b2f82863c1f..7861066e0e6 100644
--- a/src/models/domain/attachment.ts
+++ b/src/models/domain/attachment.ts
@@ -1,9 +1,9 @@
-import { AttachmentData } from '../data';
+import { AttachmentData } from '../data/attachmentData';
 
 import { CipherString } from './cipherString';
 import Domain from './domain';
 
-import { AttachmentView } from '../view';
+import { AttachmentView } from '../view/attachmentView';
 
 export class Attachment extends Domain {
     id: string;
diff --git a/src/models/domain/authResult.ts b/src/models/domain/authResult.ts
index e797781bbb2..cb4bb57c657 100644
--- a/src/models/domain/authResult.ts
+++ b/src/models/domain/authResult.ts
@@ -1,4 +1,4 @@
-import { TwoFactorProviderType } from '../../enums';
+import { TwoFactorProviderType } from '../../enums/twoFactorProviderType';
 
 export class AuthResult {
     twoFactor: boolean = false;
diff --git a/src/models/domain/card.ts b/src/models/domain/card.ts
index a41597ecae0..19a2ad9e504 100644
--- a/src/models/domain/card.ts
+++ b/src/models/domain/card.ts
@@ -1,9 +1,9 @@
-import { CardData } from '../data';
+import { CardData } from '../data/cardData';
 
 import { CipherString } from './cipherString';
 import Domain from './domain';
 
-import { CardView } from '../view';
+import { CardView } from '../view/cardView';
 
 export class Card extends Domain {
     cardholderName: CipherString;
diff --git a/src/models/domain/cipher.ts b/src/models/domain/cipher.ts
index e591c38c599..7f9c18d1f0a 100644
--- a/src/models/domain/cipher.ts
+++ b/src/models/domain/cipher.ts
@@ -1,8 +1,8 @@
-import { CipherType } from '../../enums';
+import { CipherType } from '../../enums/cipherType';
 
-import { CipherData } from '../data';
+import { CipherData } from '../data/cipherData';
 
-import { CipherView } from '../view';
+import { CipherView } from '../view/cipherView';
 
 import { Attachment } from './attachment';
 import { Card } from './card';
diff --git a/src/models/domain/cipherString.ts b/src/models/domain/cipherString.ts
index b6f4bedc08f..d19d191065e 100644
--- a/src/models/domain/cipherString.ts
+++ b/src/models/domain/cipherString.ts
@@ -1,6 +1,6 @@
-import { EncryptionType } from '../../enums';
+import { EncryptionType } from '../../enums/encryptionType';
 
-import { CryptoService } from '../../abstractions';
+import { CryptoService } from '../../abstractions/crypto.service';
 
 export class CipherString {
     encryptedString?: string;
diff --git a/src/models/domain/collection.ts b/src/models/domain/collection.ts
index 9c3136e1894..45fd54cd8c2 100644
--- a/src/models/domain/collection.ts
+++ b/src/models/domain/collection.ts
@@ -1,6 +1,6 @@
-import { CollectionData } from '../data';
+import { CollectionData } from '../data/collectionData';
 
-import { CollectionView } from '../view';
+import { CollectionView } from '../view/collectionView';
 
 import { CipherString } from './cipherString';
 import Domain from './domain';
diff --git a/src/models/domain/domain.ts b/src/models/domain/domain.ts
index d75bec902e3..7fe644740fb 100644
--- a/src/models/domain/domain.ts
+++ b/src/models/domain/domain.ts
@@ -1,6 +1,6 @@
-import { CipherString } from './cipherString';
+import { CipherString } from '../domain/cipherString';
 
-import { View } from '../view';
+import { View } from '../view/view';
 
 export default abstract class Domain {
     protected buildDomainModel<D extends Domain>(domain: D, dataObj: any, map: any,
diff --git a/src/models/domain/field.ts b/src/models/domain/field.ts
index a527edbcaca..023fefe5a9c 100644
--- a/src/models/domain/field.ts
+++ b/src/models/domain/field.ts
@@ -1,11 +1,11 @@
-import { FieldType } from '../../enums';
+import { FieldType } from '../../enums/fieldType';
 
-import { FieldData } from '../data';
+import { FieldData } from '../data/fieldData';
 
 import { CipherString } from './cipherString';
 import Domain from './domain';
 
-import { FieldView } from '../view';
+import { FieldView } from '../view/fieldView';
 
 export class Field extends Domain {
     name: CipherString;
diff --git a/src/models/domain/folder.ts b/src/models/domain/folder.ts
index 80c5057533b..77b9fb310d9 100644
--- a/src/models/domain/folder.ts
+++ b/src/models/domain/folder.ts
@@ -1,6 +1,6 @@
-import { FolderData } from '../data';
+import { FolderData } from '../data/folderData';
 
-import { FolderView } from '../view';
+import { FolderView } from '../view/folderView';
 
 import { CipherString } from './cipherString';
 import Domain from './domain';
diff --git a/src/models/domain/identity.ts b/src/models/domain/identity.ts
index 7ef205a3763..ade03260eaf 100644
--- a/src/models/domain/identity.ts
+++ b/src/models/domain/identity.ts
@@ -1,9 +1,9 @@
-import { IdentityData } from '../data';
+import { IdentityData } from '../data/identityData';
 
 import { CipherString } from './cipherString';
 import Domain from './domain';
 
-import { IdentityView } from '../view';
+import { IdentityView } from '../view/identityView';
 
 export class Identity extends Domain {
     title: CipherString;
diff --git a/src/models/domain/login.ts b/src/models/domain/login.ts
index 743b54ae3a3..1c98dc70314 100644
--- a/src/models/domain/login.ts
+++ b/src/models/domain/login.ts
@@ -1,6 +1,6 @@
-import { LoginData } from '../data';
+import { LoginData } from '../data/loginData';
 
-import { LoginView } from '../view';
+import { LoginView } from '../view/loginView';
 
 import { CipherString } from './cipherString';
 import Domain from './domain';
diff --git a/src/models/domain/secureNote.ts b/src/models/domain/secureNote.ts
index 33640e47942..79724a41937 100644
--- a/src/models/domain/secureNote.ts
+++ b/src/models/domain/secureNote.ts
@@ -1,10 +1,10 @@
-import { SecureNoteType } from '../../enums';
+import { SecureNoteType } from '../../enums/secureNoteType';
 
-import { SecureNoteData } from '../data';
+import { SecureNoteData } from '../data/secureNoteData';
 
 import Domain from './domain';
 
-import { SecureNoteView } from '../view';
+import { SecureNoteView } from '../view/secureNoteView';
 
 export class SecureNote extends Domain {
     type: SecureNoteType;
diff --git a/src/models/domain/symmetricCryptoKey.ts b/src/models/domain/symmetricCryptoKey.ts
index 4b12f98b07b..4e3a5d6c2da 100644
--- a/src/models/domain/symmetricCryptoKey.ts
+++ b/src/models/domain/symmetricCryptoKey.ts
@@ -1,6 +1,6 @@
 import * as forge from 'node-forge';
 
-import { EncryptionType } from '../../enums';
+import { EncryptionType } from '../../enums/encryptionType';
 
 import { SymmetricCryptoKeyBuffers } from './symmetricCryptoKeyBuffers';
 
diff --git a/src/models/request/cipherRequest.ts b/src/models/request/cipherRequest.ts
index ff2a79d972c..232883f3232 100644
--- a/src/models/request/cipherRequest.ts
+++ b/src/models/request/cipherRequest.ts
@@ -1,4 +1,4 @@
-import { CipherType } from '../../enums';
+import { CipherType } from '../../enums/cipherType';
 
 export class CipherRequest {
     type: CipherType;
diff --git a/src/models/request/deviceRequest.ts b/src/models/request/deviceRequest.ts
index 4b29b443836..2aaa42cbe06 100644
--- a/src/models/request/deviceRequest.ts
+++ b/src/models/request/deviceRequest.ts
@@ -1,6 +1,6 @@
-import { DeviceType } from '../../enums';
+import { DeviceType } from '../../enums/deviceType';
 
-import { PlatformUtilsService } from '../../abstractions';
+import { PlatformUtilsService } from '../../abstractions/platformUtils.service';
 
 export class DeviceRequest {
     type: DeviceType;
diff --git a/src/models/request/folderRequest.ts b/src/models/request/folderRequest.ts
index 63d53819b19..54ec76cac52 100644
--- a/src/models/request/folderRequest.ts
+++ b/src/models/request/folderRequest.ts
@@ -1,4 +1,4 @@
-import { Folder } from '../domain';
+import { Folder } from '../domain/folder';
 
 export class FolderRequest {
     name: string;
diff --git a/src/models/response/deviceResponse.ts b/src/models/response/deviceResponse.ts
index 9fe3d37ece3..23d0135b768 100644
--- a/src/models/response/deviceResponse.ts
+++ b/src/models/response/deviceResponse.ts
@@ -1,4 +1,4 @@
-import { DeviceType } from '../../enums';
+import { DeviceType } from '../../enums/deviceType';
 
 export class DeviceResponse {
     id: string;
diff --git a/src/models/response/identityTwoFactorResponse.ts b/src/models/response/identityTwoFactorResponse.ts
index b01b83fb580..2adeeaa053f 100644
--- a/src/models/response/identityTwoFactorResponse.ts
+++ b/src/models/response/identityTwoFactorResponse.ts
@@ -1,4 +1,4 @@
-import { TwoFactorProviderType } from '../../enums';
+import { TwoFactorProviderType } from '../../enums/twoFactorProviderType';
 
 export class IdentityTwoFactorResponse {
     twoFactorProviders: TwoFactorProviderType[];
diff --git a/src/models/view/attachmentView.ts b/src/models/view/attachmentView.ts
index 3fc9c39ff97..49ea57326d1 100644
--- a/src/models/view/attachmentView.ts
+++ b/src/models/view/attachmentView.ts
@@ -1,6 +1,6 @@
 import { View } from './view';
 
-import { Attachment } from '../domain';
+import { Attachment } from '../domain/attachment';
 
 export class AttachmentView implements View {
     id: string;
diff --git a/src/models/view/cardView.ts b/src/models/view/cardView.ts
index 71493956301..26e3308e315 100644
--- a/src/models/view/cardView.ts
+++ b/src/models/view/cardView.ts
@@ -1,6 +1,6 @@
 import { View } from './view';
 
-import { Card } from '../domain';
+import { Card } from '../domain/card';
 
 export class CardView implements View {
     cardholderName: string;
diff --git a/src/models/view/cipherView.ts b/src/models/view/cipherView.ts
index aeb7e43cd7b..b3f232bcbc4 100644
--- a/src/models/view/cipherView.ts
+++ b/src/models/view/cipherView.ts
@@ -1,6 +1,6 @@
-import { CipherType } from '../../enums';
+import { CipherType } from '../../enums/cipherType';
 
-import { Cipher } from '../domain';
+import { Cipher } from '../domain/cipher';
 
 import { AttachmentView } from './attachmentView';
 import { CardView } from './cardView';
diff --git a/src/models/view/collectionView.ts b/src/models/view/collectionView.ts
index 6cdc8a1791b..ab184a2c353 100644
--- a/src/models/view/collectionView.ts
+++ b/src/models/view/collectionView.ts
@@ -1,6 +1,6 @@
 import { View } from './view';
 
-import { Collection } from '../domain';
+import { Collection } from '../domain/collection';
 
 export class CollectionView implements View {
     id: string;
diff --git a/src/models/view/fieldView.ts b/src/models/view/fieldView.ts
index 8e67ff6dc8d..b3f68a584fa 100644
--- a/src/models/view/fieldView.ts
+++ b/src/models/view/fieldView.ts
@@ -1,8 +1,8 @@
-import { FieldType } from '../../enums';
+import { FieldType } from '../../enums/fieldType';
 
 import { View } from './view';
 
-import { Field } from '../domain';
+import { Field } from '../domain/field';
 
 export class FieldView implements View {
     name: string;
diff --git a/src/models/view/folderView.ts b/src/models/view/folderView.ts
index 8f2cfe3e2c1..ebe8ea157a5 100644
--- a/src/models/view/folderView.ts
+++ b/src/models/view/folderView.ts
@@ -1,6 +1,6 @@
 import { View } from './view';
 
-import { Folder } from '../domain';
+import { Folder } from '../domain/folder';
 
 export class FolderView implements View {
     id: string = null;
diff --git a/src/models/view/identityView.ts b/src/models/view/identityView.ts
index 6843e1e3acb..4ae5fa0cf9a 100644
--- a/src/models/view/identityView.ts
+++ b/src/models/view/identityView.ts
@@ -1,6 +1,6 @@
 import { View } from './view';
 
-import { Identity } from '../domain';
+import { Identity } from '../domain/identity';
 
 export class IdentityView implements View {
     title: string = null;
diff --git a/src/models/view/index.ts b/src/models/view/index.ts
index eb1b943c822..0e07c256be0 100644
--- a/src/models/view/index.ts
+++ b/src/models/view/index.ts
@@ -1,9 +1,7 @@
 export { AttachmentView } from './attachmentView';
 export { CardView } from './cardView';
 export { CipherView } from './cipherView';
-export { CollectionView } from './collectionView';
 export { FieldView } from './fieldView';
-export { FolderView } from './folderView';
 export { IdentityView } from './identityView';
 export { LoginView } from './loginView';
 export { SecureNoteView } from './secureNoteView';
diff --git a/src/models/view/loginView.ts b/src/models/view/loginView.ts
index 6c97772b768..c3554c9c382 100644
--- a/src/models/view/loginView.ts
+++ b/src/models/view/loginView.ts
@@ -1,8 +1,8 @@
 import { View } from './view';
 
-import { Login } from '../domain';
+import { Login } from '../domain/login';
 
-import { PlatformUtilsService } from '../../abstractions';
+import { PlatformUtilsService } from '../../abstractions/platformUtils.service';
 
 export class LoginView implements View {
     username: string;
diff --git a/src/models/view/secureNoteView.ts b/src/models/view/secureNoteView.ts
index d6c2867dfa1..1047c41086b 100644
--- a/src/models/view/secureNoteView.ts
+++ b/src/models/view/secureNoteView.ts
@@ -1,8 +1,8 @@
-import { SecureNoteType } from '../../enums';
+import { SecureNoteType } from '../../enums/secureNoteType';
 
 import { View } from './view';
 
-import { SecureNote } from '../domain';
+import { SecureNote } from '../domain/secureNote';
 
 export class SecureNoteView implements View {
     type: SecureNoteType;
diff --git a/src/services/api.service.ts b/src/services/api.service.ts
index 395b411794a..1e452af7554 100644
--- a/src/services/api.service.ts
+++ b/src/services/api.service.ts
@@ -1,30 +1,24 @@
 import { ConstantsService } from './constants.service';
 
-import {
-    ApiService as ApiServiceAbstraction,
-    PlatformUtilsService,
-    TokenService,
-} from '../abstractions';
+import { ApiService as ApiServiceAbstraction } from '../abstractions/api.service';
+import { PlatformUtilsService } from '../abstractions/platformUtils.service';
+import { TokenService } from '../abstractions/token.service';
 
-import { EnvironmentUrls } from '../models/domain';
+import { EnvironmentUrls } from '../models/domain/environmentUrls';
 
-import {
-    CipherRequest,
-    FolderRequest,
-    PasswordHintRequest,
-    RegisterRequest,
-    TokenRequest,
-    TwoFactorEmailRequest,
-} from '../models/request';
+import { CipherRequest } from '../models/request/cipherRequest';
+import { FolderRequest } from '../models/request/folderRequest';
+import { PasswordHintRequest } from '../models/request/passwordHintRequest';
+import { RegisterRequest } from '../models/request/registerRequest';
+import { TokenRequest } from '../models/request/tokenRequest';
+import { TwoFactorEmailRequest } from '../models/request/twoFactorEmailRequest';
 
-import {
-    CipherResponse,
-    ErrorResponse,
-    FolderResponse,
-    IdentityTokenResponse,
-    IdentityTwoFactorResponse,
-    SyncResponse,
-} from '../models/response';
+import { CipherResponse } from '../models/response/cipherResponse';
+import { ErrorResponse } from '../models/response/errorResponse';
+import { FolderResponse } from '../models/response/folderResponse';
+import { IdentityTokenResponse } from '../models/response/identityTokenResponse';
+import { IdentityTwoFactorResponse } from '../models/response/identityTwoFactorResponse';
+import { SyncResponse } from '../models/response/syncResponse';
 
 export class ApiService implements ApiServiceAbstraction {
     urlsSet: boolean = false;
diff --git a/src/services/appId.service.ts b/src/services/appId.service.ts
index 50778bf8eae..430a375571a 100644
--- a/src/services/appId.service.ts
+++ b/src/services/appId.service.ts
@@ -1,9 +1,7 @@
 import { UtilsService } from './utils.service';
 
-import {
-    AppIdService as AppIdServiceInterface,
-    StorageService,
-} from '../abstractions';
+import { AppIdService as AppIdServiceInterface } from '../abstractions/appId.service';
+import { StorageService } from '../abstractions/storage.service';
 
 export class AppIdService implements AppIdServiceInterface {
     constructor(private storageService: StorageService) {
diff --git a/src/services/auth.service.ts b/src/services/auth.service.ts
index 101a53e4f67..a360dc1c1d6 100644
--- a/src/services/auth.service.ts
+++ b/src/services/auth.service.ts
@@ -1,32 +1,24 @@
-import { TwoFactorProviderType } from '../enums';
+import { TwoFactorProviderType } from '../enums/twoFactorProviderType';
 
-import {
-    AuthResult,
-    SymmetricCryptoKey,
-} from '../models/domain';
+import { AuthResult } from '../models/domain/authResult';
+import { SymmetricCryptoKey } from '../models/domain/symmetricCryptoKey';
 
-import {
-    DeviceRequest,
-    TokenRequest,
-} from '../models/request';
+import { DeviceRequest } from '../models/request/deviceRequest';
+import { TokenRequest } from '../models/request/tokenRequest';
 
-import {
-    IdentityTokenResponse,
-    IdentityTwoFactorResponse,
-} from '../models/response';
+import { IdentityTokenResponse } from '../models/response/identityTokenResponse';
+import { IdentityTwoFactorResponse } from '../models/response/identityTwoFactorResponse';
 
 import { ConstantsService } from '../services/constants.service';
 
-import {
-    ApiService,
-    AppIdService,
-    CryptoService,
-    I18nService,
-    MessagingService,
-    PlatformUtilsService,
-    TokenService,
-    UserService,
-} from '../abstractions';
+import { ApiService } from '../abstractions/api.service';
+import { AppIdService } from '../abstractions/appId.service';
+import { CryptoService } from '../abstractions/crypto.service';
+import { I18nService } from '../abstractions/i18n.service';
+import { MessagingService } from '../abstractions/messaging.service';
+import { PlatformUtilsService } from '../abstractions/platformUtils.service';
+import { TokenService } from '../abstractions/token.service';
+import { UserService } from '../abstractions/user.service';
 
 export const TwoFactorProviders = {
     [TwoFactorProviderType.Authenticator]: {
diff --git a/src/services/cipher.service.ts b/src/services/cipher.service.ts
index 9818eab4389..fb8e532d62c 100644
--- a/src/services/cipher.service.ts
+++ b/src/services/cipher.service.ts
@@ -1,47 +1,38 @@
-import { CipherType } from '../enums';
+import { CipherType } from '../enums/cipherType';
 
-import { CipherData } from '../models/data';
-
-import {
-    Card,
-    Cipher,
-    CipherString,
-    Field,
-    Identity,
-    Login,
-    SecureNote,
-    SymmetricCryptoKey,
-} from '../models/domain';
+import { CipherData } from '../models/data/cipherData';
 
+import { Card } from '../models/domain/card';
+import { Cipher } from '../models/domain/cipher';
+import { CipherString } from '../models/domain/cipherString';
 import Domain from '../models/domain/domain';
+import { Field } from '../models/domain/field';
+import { Identity } from '../models/domain/identity';
+import { Login } from '../models/domain/login';
+import { SecureNote } from '../models/domain/secureNote';
+import { SymmetricCryptoKey } from '../models/domain/symmetricCryptoKey';
 
-import { CipherRequest } from '../models/request';
+import { CipherRequest } from '../models/request/cipherRequest';
 
-import {
-    CipherResponse,
-    ErrorResponse,
-} from '../models/response';
+import { CipherResponse } from '../models/response/cipherResponse';
+import { ErrorResponse } from '../models/response/errorResponse';
 
-import {
-    CardView,
-    CipherView,
-    FieldView,
-    IdentityView,
-    LoginView,
-    View,
-} from '../models/view';
+import { CardView } from '../models/view/cardView';
+import { CipherView } from '../models/view/cipherView';
+import { FieldView } from '../models/view/fieldView';
+import { IdentityView } from '../models/view/identityView';
+import { LoginView } from '../models/view/loginView';
+import { View } from '../models/view/view';
 
 import { ConstantsService } from './constants.service';
 
-import {
-    ApiService,
-    CipherService as CipherServiceAbstraction,
-    CryptoService,
-    I18nService,
-    SettingsService,
-    StorageService,
-    UserService,
-} from '../abstractions';
+import { ApiService } from '../abstractions/api.service';
+import { CipherService as CipherServiceAbstraction } from '../abstractions/cipher.service';
+import { CryptoService } from '../abstractions/crypto.service';
+import { I18nService } from '../abstractions/i18n.service';
+import { SettingsService } from '../abstractions/settings.service';
+import { StorageService } from '../abstractions/storage.service';
+import { UserService } from '../abstractions/user.service';
 
 const Keys = {
     ciphersPrefix: 'ciphers_',
diff --git a/src/services/collection.service.ts b/src/services/collection.service.ts
index 58b54be274a..3e7c60c089b 100644
--- a/src/services/collection.service.ts
+++ b/src/services/collection.service.ts
@@ -1,16 +1,14 @@
-import { CollectionData } from '../models/data';
+import { CollectionData } from '../models/data/collectionData';
 
 import { Collection } from '../models/domain';
 
-import { CollectionView } from '../models/view';
+import { CollectionView } from '../models/view/collectionView';
 
-import {
-    CollectionService as CollectionServiceAbstraction,
-    CryptoService,
-    I18nService,
-    StorageService,
-    UserService,
-} from '../abstractions';
+import { CollectionService as CollectionServiceAbstraction } from '../abstractions/collection.service';
+import { CryptoService } from '../abstractions/crypto.service';
+import { I18nService } from '../abstractions/i18n.service';
+import { StorageService } from '../abstractions/storage.service';
+import { UserService } from '../abstractions/user.service';
 
 const Keys = {
     collectionsPrefix: 'collections_',
diff --git a/src/services/constants.service.ts b/src/services/constants.service.ts
index 0210d9faedc..e0c695432c2 100644
--- a/src/services/constants.service.ts
+++ b/src/services/constants.service.ts
@@ -1,4 +1,4 @@
-import { PlatformUtilsService } from '../abstractions';
+import { PlatformUtilsService } from '../abstractions/platformUtils.service';
 
 export class ConstantsService {
     static readonly environmentUrlsKey: string = 'environmentUrls';
diff --git a/src/services/container.service.ts b/src/services/container.service.ts
index 3659eacdfac..fa9a6628ce1 100644
--- a/src/services/container.service.ts
+++ b/src/services/container.service.ts
@@ -1,7 +1,5 @@
-import {
-    CryptoService,
-    PlatformUtilsService,
-} from '../abstractions';
+import { CryptoService } from '../abstractions/crypto.service';
+import { PlatformUtilsService } from '../abstractions/platformUtils.service';
 
 export class ContainerService {
     constructor(private cryptoService: CryptoService,
diff --git a/src/services/crypto.service.ts b/src/services/crypto.service.ts
index a25f1786fe4..e6ad6425743 100644
--- a/src/services/crypto.service.ts
+++ b/src/services/crypto.service.ts
@@ -1,19 +1,14 @@
 import * as forge from 'node-forge';
 
-import { EncryptionType } from '../enums';
+import { EncryptionType } from '../enums/encryptionType';
 
-import {
-    CipherString,
-    EncryptedObject,
-    SymmetricCryptoKey,
-} from '../models/domain';
+import { CipherString } from '../models/domain/cipherString';
+import { EncryptedObject } from '../models/domain/encryptedObject';
+import { SymmetricCryptoKey } from '../models/domain/symmetricCryptoKey';
+import { ProfileOrganizationResponse } from '../models/response/profileOrganizationResponse';
 
-import { ProfileOrganizationResponse } from '../models/response';
-
-import {
-    CryptoService as CryptoServiceAbstraction,
-    StorageService as StorageServiceAbstraction,
-} from '../abstractions';
+import { CryptoService as CryptoServiceAbstraction } from '../abstractions/crypto.service';
+import { StorageService as StorageServiceInterface } from '../abstractions/storage.service';
 
 import { ConstantsService } from './constants.service';
 import { UtilsService } from './utils.service';
@@ -46,8 +41,8 @@ export class CryptoService implements CryptoServiceAbstraction {
     private privateKey: ArrayBuffer;
     private orgKeys: Map<string, SymmetricCryptoKey>;
 
-    constructor(private storageService: StorageServiceAbstraction,
-        private secureStorageService: StorageServiceAbstraction) {
+    constructor(private storageService: StorageServiceInterface,
+        private secureStorageService: StorageServiceInterface) {
     }
 
     async setKey(key: SymmetricCryptoKey): Promise<any> {
diff --git a/src/services/environment.service.ts b/src/services/environment.service.ts
index d9bab748a0d..e1544489f1c 100644
--- a/src/services/environment.service.ts
+++ b/src/services/environment.service.ts
@@ -1,12 +1,10 @@
-import { EnvironmentUrls } from '../models/domain';
+import { EnvironmentUrls } from '../models/domain/environmentUrls';
 
 import { ConstantsService } from './constants.service';
 
-import {
-    ApiService,
-    EnvironmentService as EnvironmentServiceAbstraction,
-    StorageService,
-} from '../abstractions';
+import { ApiService } from '../abstractions/api.service';
+import { EnvironmentService as EnvironmentServiceAbstraction } from '../abstractions/environment.service';
+import { StorageService } from '../abstractions/storage.service';
 
 export class EnvironmentService implements EnvironmentServiceAbstraction {
     baseUrl: string;
diff --git a/src/services/folder.service.ts b/src/services/folder.service.ts
index a8f17698740..81c03a15f50 100644
--- a/src/services/folder.service.ts
+++ b/src/services/folder.service.ts
@@ -1,21 +1,19 @@
-import { FolderData } from '../models/data';
+import { FolderData } from '../models/data/folderData';
 
-import { Folder } from '../models/domain';
+import { Folder } from '../models/domain/folder';
 
-import { FolderRequest } from '../models/request';
+import { FolderRequest } from '../models/request/folderRequest';
 
-import { FolderResponse } from '../models/response';
+import { FolderResponse } from '../models/response/folderResponse';
 
-import { FolderView } from '../models/view';
+import { FolderView } from '../models/view/folderView';
 
-import {
-    ApiService,
-    CryptoService,
-    FolderService as FolderServiceAbstraction,
-    I18nService,
-    StorageService,
-    UserService,
-} from '../abstractions';
+import { ApiService } from '../abstractions/api.service';
+import { CryptoService } from '../abstractions/crypto.service';
+import { FolderService as FolderServiceAbstraction } from '../abstractions/folder.service';
+import { I18nService } from '../abstractions/i18n.service';
+import { StorageService } from '../abstractions/storage.service';
+import { UserService } from '../abstractions/user.service';
 
 const Keys = {
     foldersPrefix: 'folders_',
diff --git a/src/services/lock.service.ts b/src/services/lock.service.ts
index db24c602194..ba54fec1bfa 100644
--- a/src/services/lock.service.ts
+++ b/src/services/lock.service.ts
@@ -1,15 +1,13 @@
 import { ConstantsService } from './constants.service';
 
-import {
-    CipherService,
-    CollectionService,
-    CryptoService,
-    FolderService,
-    LockService as LockServiceAbstraction,
-    MessagingService,
-    PlatformUtilsService,
-    StorageService,
-} from '../abstractions';
+import { CipherService } from '../abstractions/cipher.service';
+import { CollectionService } from '../abstractions/collection.service';
+import { CryptoService } from '../abstractions/crypto.service';
+import { FolderService } from '../abstractions/folder.service';
+import { LockService as LockServiceAbstraction } from '../abstractions/lock.service';
+import { MessagingService } from '../abstractions/messaging.service';
+import { PlatformUtilsService } from '../abstractions/platformUtils.service';
+import { StorageService } from '../abstractions/storage.service';
 
 export class LockService implements LockServiceAbstraction {
     constructor(private cipherService: CipherService, private folderService: FolderService,
diff --git a/src/services/passwordGeneration.service.ts b/src/services/passwordGeneration.service.ts
index 40cc3705c7b..09b728c0502 100644
--- a/src/services/passwordGeneration.service.ts
+++ b/src/services/passwordGeneration.service.ts
@@ -1,15 +1,13 @@
-import {
-    CipherString,
-    PasswordHistory,
-} from '../models/domain';
+import { CipherString } from '../models/domain/cipherString';
+import { PasswordHistory } from '../models/domain/passwordHistory';
 
 import { UtilsService } from './utils.service';
 
+import { CryptoService } from '../abstractions/crypto.service';
 import {
-    CryptoService,
     PasswordGenerationService as PasswordGenerationServiceAbstraction,
-    StorageService,
-} from '../abstractions';
+} from '../abstractions/passwordGeneration.service';
+import { StorageService } from '../abstractions/storage.service';
 
 const DefaultOptions = {
     length: 14,
diff --git a/src/services/settings.service.ts b/src/services/settings.service.ts
index cd9ee2e66ee..506bdf01a08 100644
--- a/src/services/settings.service.ts
+++ b/src/services/settings.service.ts
@@ -1,8 +1,6 @@
-import {
-    SettingsService as SettingsServiceAbstraction,
-    StorageService,
-    UserService,
-} from '../abstractions';
+import { SettingsService as SettingsServiceAbstraction } from '../abstractions/settings.service';
+import { StorageService } from '../abstractions/storage.service';
+import { UserService } from '../abstractions/user.service';
 
 const Keys = {
     settingsPrefix: 'settings_',
diff --git a/src/services/state.service.ts b/src/services/state.service.ts
index d8b845c0103..03a09e30fc2 100644
--- a/src/services/state.service.ts
+++ b/src/services/state.service.ts
@@ -1,4 +1,4 @@
-import { StateService as StateServiceAbstraction } from '../abstractions';
+import { StateService as StateServiceAbstraction } from '../abstractions/state.service';
 
 export class StateService implements StateServiceAbstraction {
     private state: any = {};
diff --git a/src/services/sync.service.ts b/src/services/sync.service.ts
index fdcd16f493b..2a001e01a8a 100644
--- a/src/services/sync.service.ts
+++ b/src/services/sync.service.ts
@@ -1,29 +1,23 @@
-import {
-    ApiService,
-    CipherService,
-    CollectionService,
-    CryptoService,
-    FolderService,
-    MessagingService,
-    SettingsService,
-    StorageService,
-    SyncService as SyncServiceAbstraction,
-    UserService,
-} from '../abstractions';
+import { ApiService } from '../abstractions/api.service';
+import { CipherService } from '../abstractions/cipher.service';
+import { CollectionService } from '../abstractions/collection.service';
+import { CryptoService } from '../abstractions/crypto.service';
+import { FolderService } from '../abstractions/folder.service';
+import { MessagingService } from '../abstractions/messaging.service';
+import { SettingsService } from '../abstractions/settings.service';
+import { StorageService } from '../abstractions/storage.service';
+import { SyncService as SyncServiceAbstraction } from '../abstractions/sync.service';
+import { UserService } from '../abstractions/user.service';
 
-import {
-    CipherData,
-    CollectionData,
-    FolderData,
-} from '../models/data';
+import { CipherData } from '../models/data/cipherData';
+import { CollectionData } from '../models/data/collectionData';
+import { FolderData } from '../models/data/folderData';
 
-import {
-    CipherResponse,
-    CollectionResponse,
-    DomainsResponse,
-    FolderResponse,
-    ProfileResponse,
-} from '../models/response';
+import { CipherResponse } from '../models/response/cipherResponse';
+import { CollectionResponse } from '../models/response/collectionResponse';
+import { DomainsResponse } from '../models/response/domainsResponse';
+import { FolderResponse } from '../models/response/folderResponse';
+import { ProfileResponse } from '../models/response/profileResponse';
 
 const Keys = {
     lastSyncPrefix: 'lastSync_',
diff --git a/src/services/token.service.ts b/src/services/token.service.ts
index 694c2bf78c6..94dbfa10fda 100644
--- a/src/services/token.service.ts
+++ b/src/services/token.service.ts
@@ -1,10 +1,8 @@
 import { ConstantsService } from './constants.service';
 import { UtilsService } from './utils.service';
 
-import {
-    StorageService,
-    TokenService as TokenServiceAbstraction,
-} from '../abstractions';
+import { StorageService } from '../abstractions/storage.service';
+import { TokenService as TokenServiceAbstraction } from '../abstractions/token.service';
 
 const Keys = {
     accessToken: 'accessToken',
diff --git a/src/services/totp.service.ts b/src/services/totp.service.ts
index 1bc57b4be84..e52c11e48c7 100644
--- a/src/services/totp.service.ts
+++ b/src/services/totp.service.ts
@@ -1,9 +1,7 @@
 import { ConstantsService } from './constants.service';
 
-import {
-    StorageService,
-    TotpService as TotpServiceAbstraction,
-} from '../abstractions';
+import { StorageService } from '../abstractions/storage.service';
+import { TotpService as TotpServiceAbstraction } from '../abstractions/totp.service';
 
 const b32Chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567';
 
diff --git a/src/services/user.service.ts b/src/services/user.service.ts
index 5fefef16cee..1949cadb483 100644
--- a/src/services/user.service.ts
+++ b/src/services/user.service.ts
@@ -1,8 +1,6 @@
-import {
-    StorageService,
-    TokenService,
-    UserService as UserServiceAbsrtaction,
-} from '../abstractions';
+import { StorageService } from '../abstractions/storage.service';
+import { TokenService } from '../abstractions/token.service';
+import { UserService as UserServiceAbsrtaction } from '../abstractions/user.service';
 
 const Keys = {
     userId: 'userId',
diff --git a/src/services/utils.service.ts b/src/services/utils.service.ts
index 7a58df6a5ae..359a743a91c 100644
--- a/src/services/utils.service.ts
+++ b/src/services/utils.service.ts
@@ -1,4 +1,4 @@
-import { UtilsService as UtilsServiceAbstraction } from '../abstractions';
+import { UtilsService as UtilsServiceAbstraction } from '../abstractions/utils.service';
 
 export class UtilsService implements UtilsServiceAbstraction {
     static copyToClipboard(text: string, doc?: Document): void {