diff --git a/src/popup/app/app.js b/src/popup/app/app.js
index 6157a59726..5c1e0191be 100644
--- a/src/popup/app/app.js
+++ b/src/popup/app/app.js
@@ -37,25 +37,33 @@ window.U2f = U2f;
 
 // Model imports
 import { Attachment } from '../../../node_modules/@bitwarden/jslib/src/models/domain/attachment';
-window.Attachment = Attachment;
 import { Card } from '../../../node_modules/@bitwarden/jslib/src/models/domain/card';
-window.Card = Card;
 import { Cipher } from '../../../node_modules/@bitwarden/jslib/src/models/domain/cipher';
-window.Cipher = Cipher;
 import { CipherString } from '../../../node_modules/@bitwarden/jslib/src/models/domain/cipherString';
-window.CipherString = CipherString;
 import { Field } from '../../../node_modules/@bitwarden/jslib/src/models/domain/field';
-window.Field = Field;
 import { Folder } from '../../../node_modules/@bitwarden/jslib/src/models/domain/folder';
-window.Folder = Folder;
 import { Identity } from '../../../node_modules/@bitwarden/jslib/src/models/domain/identity';
-window.Identity = Identity;
 import { Login } from '../../../node_modules/@bitwarden/jslib/src/models/domain/login';
-window.Login = Login;
 import { SecureNote } from '../../../node_modules/@bitwarden/jslib/src/models/domain/secureNote';
+window.Attachment = Attachment;
+window.Card = Card;
+window.Cipher = Cipher;
+window.CipherString = CipherString;
+window.Field = Field;
+window.Folder = Folder;
+window.Identity = Identity;
+window.Login = Login;
 window.SecureNote = SecureNote;
 
-import * as Data from '../../../node_modules/@bitwarden/jslib/src/models/data';
+import { AttachmentData } from '../../../node_modules/@bitwarden/jslib/src/models/data/attachmentData';
+import { CardData } from '../../../node_modules/@bitwarden/jslib/src/models/data/cardData';
+import { CipherData } from '../../../node_modules/@bitwarden/jslib/src/models/data/cipherData';
+import { CollectionData } from '../../../node_modules/@bitwarden/jslib/src/models/data/collectionData';
+import { FieldData } from '../../../node_modules/@bitwarden/jslib/src/models/data/fieldData';
+import { FolderData } from '../../../node_modules/@bitwarden/jslib/src/models/data/folderData';
+import { IdentityData } from '../../../node_modules/@bitwarden/jslib/src/models/data/identityData';
+import { LoginData } from '../../../node_modules/@bitwarden/jslib/src/models/data/loginData';
+import { SecureNoteData } from '../../../node_modules/@bitwarden/jslib/src/models/data/secureNoteData';
 window.AttachmentData = AttachmentData;
 window.CardData = CardData;
 window.CipherData = CipherData;
@@ -65,7 +73,15 @@ window.FolderData = FolderData;
 window.IdentityData = IdentityData;
 window.LoginData = LoginData;
 window.SecureNoteData = SecureNoteData;
-import * as Request from '../../../node_modules/@bitwarden/jslib/src/models/request';
+
+import { CipherRequest } from '../../../node_modules/@bitwarden/jslib/src/models/request/cipherRequest';
+import { DeviceRequest } from '../../../node_modules/@bitwarden/jslib/src/models/request/deviceRequest';
+import { DeviceTokenRequest } from '../../../node_modules/@bitwarden/jslib/src/models/request/deviceTokenRequest';
+import { FolderRequest } from '../../../node_modules/@bitwarden/jslib/src/models/request/folderRequest';
+import { PasswordHintRequest } from '../../../node_modules/@bitwarden/jslib/src/models/request/passwordHintRequest';
+import { RegisterRequest } from '../../../node_modules/@bitwarden/jslib/src/models/request/registerRequest';
+import { TokenRequest } from '../../../node_modules/@bitwarden/jslib/src/models/request/tokenRequest';
+import { TwoFactorEmailRequest } from '../../../node_modules/@bitwarden/jslib/src/models/request/twoFactorEmailRequest';
 window.CipherRequest = CipherRequest;
 window.DeviceRequest = DeviceRequest;
 window.DeviceTokenRequest = DeviceTokenRequest;
@@ -74,7 +90,21 @@ window.PasswordHintRequest = PasswordHintRequest;
 window.RegisterRequest = RegisterRequest;
 window.TokenRequest = TokenRequest;
 window.TwoFactorEmailRequest = TwoFactorEmailRequest;
-import * as Response from '../../../node_modules/@bitwarden/jslib/src/models/response';
+
+import { AttachmentResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/attachmentResponse';
+import { CipherResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/cipherResponse';
+import { CollectionResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/collectionResponse';
+import { DeviceResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/deviceResponse';
+import { DomainsResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/domainsResponse';
+import { ErrorResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/errorResponse';
+import { FolderResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/folderResponse';
+import { GlobalDomainResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/globalDomainResponse';
+import { IdentityTokenResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/identityTokenResponse';
+import { KeysResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/keysResponse';
+import { ListResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/listResponse';
+import { ProfileOrganizationResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/profileOrganizationResponse';
+import { ProfileResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/profileResponse';
+import { SyncResponse } from '../../../node_modules/@bitwarden/jslib/src/models/response/syncResponse';
 window.AttachmentResponse = AttachmentResponse;
 window.CipherResponse = CipherResponse;
 window.CollectionResponse = CollectionResponse;