diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts
index afbb4f43aee..fe1a9c8f55d 100644
--- a/apps/browser/src/popup/app-routing.module.ts
+++ b/apps/browser/src/popup/app-routing.module.ts
@@ -26,8 +26,8 @@ import { ShareComponent } from "../vault/popup/components/vault/share.component"
 import { VaultFilterComponent } from "../vault/popup/components/vault/vault-filter.component";
 import { VaultItemsComponent } from "../vault/popup/components/vault/vault-items.component";
 import { ViewComponent } from "../vault/popup/components/vault/view.component";
+import { Fido2Component } from "../webauthn/popup/fido2/fido2.component";
 
-import { Fido2Component } from "./fido2/fido2.component";
 import { GeneratorComponent } from "./generator/generator.component";
 import { PasswordGeneratorHistoryComponent } from "./generator/password-generator-history.component";
 import { SendAddEditComponent } from "./send/send-add-edit.component";
diff --git a/apps/browser/src/popup/app.module.ts b/apps/browser/src/popup/app.module.ts
index 8b931e9b5cf..e378af63646 100644
--- a/apps/browser/src/popup/app.module.ts
+++ b/apps/browser/src/popup/app.module.ts
@@ -47,6 +47,7 @@ import { VaultItemsComponent } from "../vault/popup/components/vault/vault-items
 import { VaultSelectComponent } from "../vault/popup/components/vault/vault-select.component";
 import { ViewCustomFieldsComponent } from "../vault/popup/components/vault/view-custom-fields.component";
 import { ViewComponent } from "../vault/popup/components/vault/view.component";
+import { Fido2Component } from "../webauthn/popup/fido2/fido2.component";
 
 import { AppRoutingModule } from "./app-routing.module";
 import { AppComponent } from "./app.component";
@@ -55,7 +56,6 @@ import { PrivateModeWarningComponent } from "./components/private-mode-warning.c
 import { SendListComponent } from "./components/send-list.component";
 import { SetPinComponent } from "./components/set-pin.component";
 import { UserVerificationComponent } from "./components/user-verification.component";
-import { Fido2Component } from "./fido2/fido2.component";
 import { GeneratorComponent } from "./generator/generator.component";
 import { PasswordGeneratorHistoryComponent } from "./generator/password-generator-history.component";
 import { EffluxDatesComponent as SendEffluxDatesComponent } from "./send/efflux-dates.component";
diff --git a/apps/browser/src/popup/fido2/fido2.component.html b/apps/browser/src/webauthn/popup/fido2/fido2.component.html
similarity index 100%
rename from apps/browser/src/popup/fido2/fido2.component.html
rename to apps/browser/src/webauthn/popup/fido2/fido2.component.html
diff --git a/apps/browser/src/popup/fido2/fido2.component.ts b/apps/browser/src/webauthn/popup/fido2/fido2.component.ts
similarity index 97%
rename from apps/browser/src/popup/fido2/fido2.component.ts
rename to apps/browser/src/webauthn/popup/fido2/fido2.component.ts
index 3e33f7e3d05..c8d510ebb20 100644
--- a/apps/browser/src/popup/fido2/fido2.component.ts
+++ b/apps/browser/src/webauthn/popup/fido2/fido2.component.ts
@@ -10,7 +10,7 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import {
   BrowserFido2Message,
   BrowserFido2UserInterfaceService,
-} from "../../services/fido2/browser-fido2-user-interface.service";
+} from "../../../services/fido2/browser-fido2-user-interface.service";
 
 @Component({
   selector: "app-fido2",