diff --git a/angular/src/services/jslib-services.module.ts b/angular/src/services/jslib-services.module.ts
index 160c3939..e3da0284 100644
--- a/angular/src/services/jslib-services.module.ts
+++ b/angular/src/services/jslib-services.module.ts
@@ -1,4 +1,4 @@
-import { InjectionToken, Injector, LOCALE_ID, NgModule } from "@angular/core";
+import { Injector, LOCALE_ID, NgModule } from "@angular/core";
 
 import { ApiService as ApiServiceAbstraction } from "jslib-common/abstractions/api.service";
 import { AppIdService as AppIdServiceAbstraction } from "jslib-common/abstractions/appId.service";
@@ -15,11 +15,6 @@ import { ExportService as ExportServiceAbstraction } from "jslib-common/abstract
 import { FileUploadService as FileUploadServiceAbstraction } from "jslib-common/abstractions/fileUpload.service";
 import { FolderService as FolderServiceAbstraction } from "jslib-common/abstractions/folder.service";
 import { I18nService as I18nServiceAbstraction } from "jslib-common/abstractions/i18n.service";
-import {
-  STATE_FACTORY,
-  STATE_SERVICE_USE_CACHE,
-  WINDOW_TOKEN,
-} from "jslib-common/abstractions/injectionTokens";
 import { KeyConnectorService as KeyConnectorServiceAbstraction } from "jslib-common/abstractions/keyConnector.service";
 import { LogService } from "jslib-common/abstractions/log.service";
 import { MessagingService as MessagingServiceAbstraction } from "jslib-common/abstractions/messaging.service";
@@ -35,7 +30,6 @@ import { SendService as SendServiceAbstraction } from "jslib-common/abstractions
 import { SettingsService as SettingsServiceAbstraction } from "jslib-common/abstractions/settings.service";
 import { StateService as StateServiceAbstraction } from "jslib-common/abstractions/state.service";
 import { StateMigrationService as StateMigrationServiceAbstraction } from "jslib-common/abstractions/stateMigration.service";
-import { StorageService as StorageServiceAbstraction } from "jslib-common/abstractions/storage.service";
 import { SyncService as SyncServiceAbstraction } from "jslib-common/abstractions/sync.service";
 import { TokenService as TokenServiceAbstraction } from "jslib-common/abstractions/token.service";
 import { TotpService as TotpServiceAbstraction } from "jslib-common/abstractions/totp.service";
@@ -44,6 +38,11 @@ import { UserVerificationService as UserVerificationServiceAbstraction } from "j
 import { UsernameGenerationService as UsernameGenerationServiceAbstraction } from "jslib-common/abstractions/usernameGeneration.service";
 import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "jslib-common/abstractions/vaultTimeout.service";
 import { StateFactory } from "jslib-common/factories/stateFactory";
+import {
+  STATE_FACTORY,
+  STATE_SERVICE_USE_CACHE,
+  WINDOW_TOKEN,
+} from "jslib-common/misc/injectionTokens";
 import { Account } from "jslib-common/models/domain/account";
 import { GlobalState } from "jslib-common/models/domain/globalState";
 import { ApiService } from "jslib-common/services/api.service";
diff --git a/common/src/abstractions/injectionTokens.ts b/common/src/misc/injectionTokens.ts
similarity index 89%
rename from common/src/abstractions/injectionTokens.ts
rename to common/src/misc/injectionTokens.ts
index e243b289..31077bed 100644
--- a/common/src/abstractions/injectionTokens.ts
+++ b/common/src/misc/injectionTokens.ts
@@ -1,8 +1,8 @@
 import { InjectionToken } from "@angular/core";
 
+import { StorageService } from "../abstractions/storage.service";
 import { StateFactory } from "../factories/stateFactory";
 
-import { StorageService } from "./storage.service";
 
 export const STATE_SERVICE_USE_CACHE = new InjectionToken<boolean>("STATE_SERVICE_USE_CACHE");
 export const STATE_FACTORY = new InjectionToken<StateFactory>("STATE_FACTORY");
diff --git a/common/src/services/state.service.ts b/common/src/services/state.service.ts
index 397f5fae..86174392 100644
--- a/common/src/services/state.service.ts
+++ b/common/src/services/state.service.ts
@@ -1,11 +1,6 @@
 import { Inject, Injectable } from "@angular/core";
 import { BehaviorSubject } from "rxjs";
 
-import {
-  SECURE_STORAGE,
-  STATE_FACTORY,
-  STATE_SERVICE_USE_CACHE,
-} from "../abstractions/injectionTokens";
 import { LogService } from "../abstractions/log.service";
 import { StateService as StateServiceAbstraction } from "../abstractions/state.service";
 import { StateMigrationService } from "../abstractions/stateMigration.service";
@@ -16,6 +11,7 @@ import { StorageLocation } from "../enums/storageLocation";
 import { ThemeType } from "../enums/themeType";
 import { UriMatchType } from "../enums/uriMatchType";
 import { StateFactory } from "../factories/stateFactory";
+import { SECURE_STORAGE, STATE_FACTORY, STATE_SERVICE_USE_CACHE } from "../misc/injectionTokens";
 import { CipherData } from "../models/data/cipherData";
 import { CollectionData } from "../models/data/collectionData";
 import { EventData } from "../models/data/eventData";
diff --git a/common/src/services/stateMigration.service.ts b/common/src/services/stateMigration.service.ts
index ac8e7365..8d2effe3 100644
--- a/common/src/services/stateMigration.service.ts
+++ b/common/src/services/stateMigration.service.ts
@@ -1,12 +1,12 @@
 import { Inject, Injectable } from "@angular/core";
 
-import { SECURE_STORAGE, STATE_FACTORY } from "../abstractions/injectionTokens";
 import { StorageService } from "../abstractions/storage.service";
 import { HtmlStorageLocation } from "../enums/htmlStorageLocation";
 import { KdfType } from "../enums/kdfType";
 import { StateVersion } from "../enums/stateVersion";
 import { ThemeType } from "../enums/themeType";
 import { StateFactory } from "../factories/stateFactory";
+import { SECURE_STORAGE, STATE_FACTORY } from "../misc/injectionTokens";
 import { CipherData } from "../models/data/cipherData";
 import { CollectionData } from "../models/data/collectionData";
 import { EventData } from "../models/data/eventData";
diff --git a/common/src/services/system.service.ts b/common/src/services/system.service.ts
index 709549d1..cdfeebce 100644
--- a/common/src/services/system.service.ts
+++ b/common/src/services/system.service.ts
@@ -1,10 +1,10 @@
 import { Inject, Injectable } from "@angular/core";
 
-import { RELOAD_CALLBACK } from "../abstractions/injectionTokens";
 import { MessagingService } from "../abstractions/messaging.service";
 import { PlatformUtilsService } from "../abstractions/platformUtils.service";
 import { StateService } from "../abstractions/state.service";
 import { SystemService as SystemServiceAbstraction } from "../abstractions/system.service";
+import { RELOAD_CALLBACK } from "../misc/injectionTokens";
 import { Utils } from "../misc/utils";
 
 @Injectable()
diff --git a/common/src/services/webCryptoFunction.service.ts b/common/src/services/webCryptoFunction.service.ts
index baf26980..87b5a8a2 100644
--- a/common/src/services/webCryptoFunction.service.ts
+++ b/common/src/services/webCryptoFunction.service.ts
@@ -2,7 +2,7 @@ import { Inject, Injectable } from "@angular/core";
 import * as forge from "node-forge";
 
 import { CryptoFunctionService } from "../abstractions/cryptoFunction.service";
-import { WINDOW_TOKEN } from "../abstractions/injectionTokens";
+import { WINDOW_TOKEN } from "../misc/injectionTokens";
 import { Utils } from "../misc/utils";
 import { DecryptParameters } from "../models/domain/decryptParameters";
 import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey";
diff --git a/electron/src/services/electronPlatformUtils.service.ts b/electron/src/services/electronPlatformUtils.service.ts
index 9a701d91..4e861a76 100644
--- a/electron/src/services/electronPlatformUtils.service.ts
+++ b/electron/src/services/electronPlatformUtils.service.ts
@@ -2,13 +2,13 @@ import { Inject, Injectable } from "@angular/core";
 import { clipboard, ipcRenderer, shell } from "electron";
 
 import { I18nService } from "jslib-common/abstractions/i18n.service";
-import { CLIENT_TYPE } from "jslib-common/abstractions/injectionTokens";
 import { MessagingService } from "jslib-common/abstractions/messaging.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { StateService } from "jslib-common/abstractions/state.service";
 import { ClientType } from "jslib-common/enums/clientType";
 import { DeviceType } from "jslib-common/enums/deviceType";
 import { ThemeType } from "jslib-common/enums/themeType";
+import { CLIENT_TYPE } from "jslib-common/misc/injectionTokens";
 
 import { isDev, isMacAppStore } from "../utils";
 
diff --git a/node/src/angular-core.noop.ts b/node/src/misc/angular-core.noop.ts
similarity index 61%
rename from node/src/angular-core.noop.ts
rename to node/src/misc/angular-core.noop.ts
index 8b89a03e..441219d2 100644
--- a/node/src/angular-core.noop.ts
+++ b/node/src/misc/angular-core.noop.ts
@@ -1,3 +1,8 @@
+/**
+ * Used to stub out Angular DI in CLI clients (cli and bwdc).
+ * Use webpack.NormalModuleReplacementPlugin to replace @angular/core imports with this file.
+ */
+
 function noopDecorator(...args: any) {
   return;
 }