diff --git a/src/background.js b/src/background.js
index ba85b466..dff97168 100644
--- a/src/background.js
+++ b/src/background.js
@@ -1,6 +1,40 @@
+// Service imports
 import LockService from './services/lockService.js';
 import UtilsService from './services/utils.service';
-import * as models from './models/models';
+
+// Model imports
+import { AttachmentData } from './models/data/attachmentData';
+import { CardData } from './models/data/cardData';
+import { CipherData } from './models/data/cipherData';
+import { FieldData } from './models/data/fieldData';
+import { FolderData } from './models/data/folderData';
+import { IdentityData } from './models/data/identityData';
+import { LoginData } from './models/data/loginData';
+import { SecureNoteData } from './models/data/secureNoteData';
+
+import { CipherString } from './models/domain/cipherString';
+
+import { DeviceRequest } from './models/request/deviceRequest';
+import { DeviceTokenRequest } from './models/request/deviceTokenRequest';
+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 { AttachmentResponse } from './models/response/attachmentResponse';
+import { CipherResponse } from './models/response/cipherResponse';
+import { DeviceResponse } from './models/response/deviceResponse';
+import { DomainsResponse } from './models/response/domainsResponse';
+import { ErrorResponse } from './models/response/errorResponse';
+import { FolderResponse } from './models/response/folderResponse';
+import { GlobalDomainResponse } from './models/response/globalDomainResponse';
+import { IdentityTokenResponse } from './models/response/identityTokenResponse';
+import { KeysResponse } from './models/response/keysResponse';
+import { ListResponse } from './models/response/listResponse';
+import { ProfileOrganizationResponse } from './models/response/profileOrganizationResponse';
+import { ProfileResponse } from './models/response/profileResponse';
+import { SyncResponse } from './models/response/syncResponse';
 
 var bg_isBackground = true,
     bg_utilsService,
diff --git a/src/models/data/dataModels.ts b/src/models/data/dataModels.ts
deleted file mode 100644
index 6cb0d533..00000000
--- a/src/models/data/dataModels.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { AttachmentData } from './attachmentData';
-import { CardData } from './cardData';
-import { CipherData } from './cipherData';
-import { FieldData } from './fieldData';
-import { FolderData } from './folderData';
-import { IdentityData } from './identityData';
-import { LoginData } from './loginData';
-import { SecureNoteData } from './secureNoteData';
diff --git a/src/models/domain/domainModels.ts b/src/models/domain/domainModels.ts
deleted file mode 100644
index f4b00943..00000000
--- a/src/models/domain/domainModels.ts
+++ /dev/null
@@ -1 +0,0 @@
-import { CipherString } from './cipherString';
diff --git a/src/models/models.ts b/src/models/models.ts
deleted file mode 100644
index 42bb593a..00000000
--- a/src/models/models.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as dataModels from './data/dataModels';
-import * as domainModels from './domain/domainModels';
-import * as requestModels from './request/requestModels';
-import * as responseModels from './response/responseModels';
diff --git a/src/models/request/requestModels.ts b/src/models/request/requestModels.ts
deleted file mode 100644
index 706ae5fd..00000000
--- a/src/models/request/requestModels.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { DeviceRequest } from './deviceRequest';
-import { DeviceTokenRequest } from './deviceTokenRequest';
-import { FolderRequest } from './folderRequest';
-import { PasswordHintRequest } from './passwordHintRequest';
-import { RegisterRequest } from './registerRequest';
-import { TokenRequest } from './tokenRequest';
-import { TwoFactorEmailRequest } from './twoFactorEmailRequest';
diff --git a/src/models/response/responseModels.ts b/src/models/response/responseModels.ts
deleted file mode 100644
index aa8812a0..00000000
--- a/src/models/response/responseModels.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { AttachmentResponse } from './attachmentResponse';
-import { CipherResponse } from './cipherResponse';
-import { DeviceResponse } from './deviceResponse';
-import { DomainsResponse } from './domainsResponse';
-import { ErrorResponse } from './errorResponse';
-import { FolderResponse } from './folderResponse';
-import { GlobalDomainResponse } from './globalDomainResponse';
-import { IdentityTokenResponse } from './identityTokenResponse';
-import { KeysResponse } from './keysResponse';
-import { ListResponse } from './listResponse';
-import { ProfileOrganizationResponse } from './profileOrganizationResponse';
-import { ProfileResponse } from './profileResponse';
-import { SyncResponse } from './syncResponse';
diff --git a/src/popup/app/app.js b/src/popup/app/app.js
index ccf6c94f..8d677584 100644
--- a/src/popup/app/app.js
+++ b/src/popup/app/app.js
@@ -29,7 +29,39 @@ require('../less/popup.less');
 
 import ComponentsModule from './components/components.module';
 
-import * as models from '../../models/models';
+// Model imports
+import { AttachmentData } from '../../models/data/attachmentData';
+import { CardData } from '../../models/data/cardData';
+import { CipherData } from '../../models/data/cipherData';
+import { FieldData } from '../../models/data/fieldData';
+import { FolderData } from '../../models/data/folderData';
+import { IdentityData } from '../../models/data/identityData';
+import { LoginData } from '../../models/data/loginData';
+import { SecureNoteData } from '../../models/data/secureNoteData';
+
+import { CipherString } from '../../models/domain/cipherString';
+
+import { DeviceRequest } from '../../models/request/deviceRequest';
+import { DeviceTokenRequest } from '../../models/request/deviceTokenRequest';
+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 { AttachmentResponse } from '../../models/response/attachmentResponse';
+import { CipherResponse } from '../../models/response/cipherResponse';
+import { DeviceResponse } from '../../models/response/deviceResponse';
+import { DomainsResponse } from '../../models/response/domainsResponse';
+import { ErrorResponse } from '../../models/response/errorResponse';
+import { FolderResponse } from '../../models/response/folderResponse';
+import { GlobalDomainResponse } from '../../models/response/globalDomainResponse';
+import { IdentityTokenResponse } from '../../models/response/identityTokenResponse';
+import { KeysResponse } from '../../models/response/keysResponse';
+import { ListResponse } from '../../models/response/listResponse';
+import { ProfileOrganizationResponse } from '../../models/response/profileOrganizationResponse';
+import { ProfileResponse } from '../../models/response/profileResponse';
+import { SyncResponse } from '../../models/response/syncResponse';
 
 angular
     .module('bit', [