diff --git a/jslib b/jslib
index da132217da..83548a6753 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit da132217da553365538bbb66a21c40d3966610c1
+Subproject commit 83548a6753a974c57cb373b529a4da3ea5c3b5c0
diff --git a/src/app/common/base.events.component.ts b/src/app/common/base.events.component.ts
index 9b86a6853c..5b22d9c74f 100644
--- a/src/app/common/base.events.component.ts
+++ b/src/app/common/base.events.component.ts
@@ -3,14 +3,14 @@ import { ToasterService } from 'angular2-toaster';
 
 import { ExportService } from 'jslib-common/abstractions/export.service';
 import { I18nService } from 'jslib-common/abstractions/i18n.service';
+import { LogService } from 'jslib-common/abstractions/log.service';
 import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
 
 import { EventView } from 'jslib-common/models/view/eventView';
 
-import { ListResponse } from 'jslib-common/models/response';
 import { EventResponse } from 'jslib-common/models/response/eventResponse';
+import { ListResponse } from 'jslib-common/models/response/listResponse';
 
-import { LogService } from 'jslib-common/abstractions';
 import { EventService } from 'src/app/services/event.service';
 
 @Directive()
diff --git a/src/app/organizations/settings/organization-subscription.component.ts b/src/app/organizations/settings/organization-subscription.component.ts
index 216c1d91d8..3a8f47e347 100644
--- a/src/app/organizations/settings/organization-subscription.component.ts
+++ b/src/app/organizations/settings/organization-subscription.component.ts
@@ -12,8 +12,8 @@ import { ApiService } from 'jslib-common/abstractions/api.service';
 import { I18nService } from 'jslib-common/abstractions/i18n.service';
 import { MessagingService } from 'jslib-common/abstractions/messaging.service';
 import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
+import { UserService } from 'jslib-common/abstractions/user.service';
 
-import { UserService } from 'jslib-common/abstractions';
 import { PlanType } from 'jslib-common/enums/planType';
 
 @Component({
diff --git a/src/app/settings/change-email.component.ts b/src/app/settings/change-email.component.ts
index 5d2777ba7c..82738e8b47 100644
--- a/src/app/settings/change-email.component.ts
+++ b/src/app/settings/change-email.component.ts
@@ -14,7 +14,7 @@ import { UserService } from 'jslib-common/abstractions/user.service';
 import { EmailRequest } from 'jslib-common/models/request/emailRequest';
 import { EmailTokenRequest } from 'jslib-common/models/request/emailTokenRequest';
 
-import { TwoFactorProviderType } from 'jslib-common/enums';
+import { TwoFactorProviderType } from 'jslib-common/enums/twoFactorProviderType';
 
 @Component({
     selector: 'app-change-email',
diff --git a/src/app/settings/emergency-access-view.component.ts b/src/app/settings/emergency-access-view.component.ts
index 2069442087..fc3f0d81f4 100644
--- a/src/app/settings/emergency-access-view.component.ts
+++ b/src/app/settings/emergency-access-view.component.ts
@@ -12,8 +12,9 @@ import { CryptoService } from 'jslib-common/abstractions/crypto.service';
 
 import { ModalService } from 'jslib-angular/services/modal.service';
 
-import { CipherData } from 'jslib-common/models/data';
-import { Cipher, SymmetricCryptoKey } from 'jslib-common/models/domain';
+import { CipherData } from 'jslib-common/models/data/cipherData';
+import { Cipher } from 'jslib-common/models/domain/cipher';
+import { SymmetricCryptoKey } from 'jslib-common/models/domain/symmetricCryptoKey';
 import { EmergencyAccessViewResponse } from 'jslib-common/models/response/emergencyAccessResponse';
 import { CipherView } from 'jslib-common/models/view/cipherView';
 
diff --git a/src/app/vault/bulk-share.component.ts b/src/app/vault/bulk-share.component.ts
index f6306c4dbf..065d57f5b0 100644
--- a/src/app/vault/bulk-share.component.ts
+++ b/src/app/vault/bulk-share.component.ts
@@ -13,7 +13,7 @@ import { CollectionService } from 'jslib-common/abstractions/collection.service'
 import { I18nService } from 'jslib-common/abstractions/i18n.service';
 import { UserService } from 'jslib-common/abstractions/user.service';
 
-import { CipherView } from 'jslib-common/models/view';
+import { CipherView } from 'jslib-common/models/view/cipherView';
 import { CollectionView } from 'jslib-common/models/view/collectionView';
 
 import { Organization } from 'jslib-common/models/domain/organization';
diff --git a/src/services/htmlStorage.service.ts b/src/services/htmlStorage.service.ts
index 79fd8d34d1..ae855bc235 100644
--- a/src/services/htmlStorage.service.ts
+++ b/src/services/htmlStorage.service.ts
@@ -1,6 +1,6 @@
 import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
 import { StorageService } from 'jslib-common/abstractions/storage.service';
-import { ConstantsService } from 'jslib-common/services';
+import { ConstantsService } from 'jslib-common/services/constants.service';
 
 export class HtmlStorageService implements StorageService {
     private localStorageKeys = new Set(['appId', 'anonymousAppId', 'rememberedEmail', 'passwordGenerationOptions',