diff --git a/apps/browser/src/auth/popup/lock.component.html b/apps/browser/src/key-management/lock/popup/lock.component.html
similarity index 100%
rename from apps/browser/src/auth/popup/lock.component.html
rename to apps/browser/src/key-management/lock/popup/lock.component.html
diff --git a/apps/browser/src/auth/popup/lock.component.ts b/apps/browser/src/key-management/lock/popup/lock.component.ts
similarity index 95%
rename from apps/browser/src/auth/popup/lock.component.ts
rename to apps/browser/src/key-management/lock/popup/lock.component.ts
index 66de3fb89d2..fa9f27eff9a 100644
--- a/apps/browser/src/auth/popup/lock.component.ts
+++ b/apps/browser/src/key-management/lock/popup/lock.component.ts
@@ -4,7 +4,7 @@ import { Component, NgZone, OnInit } from "@angular/core";
 import { Router } from "@angular/router";
 import { firstValueFrom } from "rxjs";
 
-import { LockComponent as BaseLockComponent } from "@bitwarden/angular/auth/components/lock.component";
+import { LockComponent as BaseLockComponent } from "@bitwarden/angular/key-management/components/lock.component";
 import { PinServiceAbstraction } from "@bitwarden/auth/common";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout-settings.service";
@@ -33,9 +33,9 @@ import {
   BiometricStateService,
 } from "@bitwarden/key-management";
 
-import { BiometricErrors, BiometricErrorTypes } from "../../models/biometricErrors";
-import { BrowserRouterService } from "../../platform/popup/services/browser-router.service";
-import { fido2PopoutSessionData$ } from "../../vault/popup/utils/fido2-popout-session-data";
+import { BiometricErrors, BiometricErrorTypes } from "../../../models/biometricErrors";
+import { BrowserRouterService } from "../../../platform/popup/services/browser-router.service";
+import { fido2PopoutSessionData$ } from "../../../vault/popup/utils/fido2-popout-session-data";
 
 @Component({
   selector: "app-lock",
diff --git a/apps/desktop/src/auth/lock.component.html b/apps/desktop/src/key-management/lock/components/lock.component.html
similarity index 100%
rename from apps/desktop/src/auth/lock.component.html
rename to apps/desktop/src/key-management/lock/components/lock.component.html
diff --git a/apps/desktop/src/auth/lock.component.spec.ts b/apps/desktop/src/key-management/lock/components/lock.component.spec.ts
similarity index 99%
rename from apps/desktop/src/auth/lock.component.spec.ts
rename to apps/desktop/src/key-management/lock/components/lock.component.spec.ts
index 4e59acf89c1..d84cd32873a 100644
--- a/apps/desktop/src/auth/lock.component.spec.ts
+++ b/apps/desktop/src/key-management/lock/components/lock.component.spec.ts
@@ -6,7 +6,7 @@ import { ActivatedRoute } from "@angular/router";
 import { MockProxy, mock } from "jest-mock-extended";
 import { of } from "rxjs";
 
-import { LockComponent as BaseLockComponent } from "@bitwarden/angular/auth/components/lock.component";
+import { LockComponent as BaseLockComponent } from "@bitwarden/angular/key-management/components/lock.component";
 import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe";
 import { PinServiceAbstraction } from "@bitwarden/auth/common";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
@@ -40,7 +40,7 @@ import {
   BiometricStateService,
 } from "@bitwarden/key-management";
 
-import { BiometricsService } from "../key-management/biometrics/biometrics.service";
+import { BiometricsService } from "../../biometrics/biometrics.service";
 
 import { LockComponent } from "./lock.component";
 
diff --git a/apps/desktop/src/auth/lock.component.ts b/apps/desktop/src/key-management/lock/components/lock.component.ts
similarity index 99%
rename from apps/desktop/src/auth/lock.component.ts
rename to apps/desktop/src/key-management/lock/components/lock.component.ts
index ea2ac546ec1..7c01f4fc21a 100644
--- a/apps/desktop/src/auth/lock.component.ts
+++ b/apps/desktop/src/key-management/lock/components/lock.component.ts
@@ -4,7 +4,7 @@ import { Component, NgZone, OnDestroy, OnInit } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
 import { firstValueFrom, map, switchMap } from "rxjs";
 
-import { LockComponent as BaseLockComponent } from "@bitwarden/angular/auth/components/lock.component";
+import { LockComponent as BaseLockComponent } from "@bitwarden/angular/key-management/components/lock.component";
 import { PinServiceAbstraction } from "@bitwarden/auth/common";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout-settings.service";
diff --git a/apps/web/src/app/auth/lock.component.html b/apps/web/src/app/key-management/lock/components/lock.component.html
similarity index 100%
rename from apps/web/src/app/auth/lock.component.html
rename to apps/web/src/app/key-management/lock/components/lock.component.html
diff --git a/apps/web/src/app/auth/lock.component.ts b/apps/web/src/app/key-management/lock/components/lock.component.ts
similarity index 92%
rename from apps/web/src/app/auth/lock.component.ts
rename to apps/web/src/app/key-management/lock/components/lock.component.ts
index 36e9c81f2c7..6d20e08a02b 100644
--- a/apps/web/src/app/auth/lock.component.ts
+++ b/apps/web/src/app/key-management/lock/components/lock.component.ts
@@ -3,9 +3,9 @@
 import { Component, OnInit, inject } from "@angular/core";
 import { FormBuilder, Validators } from "@angular/forms";
 
-import { LockComponent as BaseLockComponent } from "@bitwarden/angular/auth/components/lock.component";
+import { LockComponent as BaseLockComponent } from "@bitwarden/angular/key-management/components/lock.component";
 
-import { SharedModule } from "../shared";
+import { SharedModule } from "../../../shared";
 
 @Component({
   selector: "app-lock",
diff --git a/libs/angular/src/auth/components/lock.component.ts b/libs/angular/src/key-management/components/lock.component.ts
similarity index 100%
rename from libs/angular/src/auth/components/lock.component.ts
rename to libs/angular/src/key-management/components/lock.component.ts