diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts
index 4edb02c00ed..395f2867ef8 100644
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -89,11 +89,11 @@ import { CipherFileUploadService } from "@bitwarden/common/vault/services/file-u
 import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder-api.service";
 import { SyncNotifierService } from "@bitwarden/common/vault/services/sync/sync-notifier.service";
 import { SyncService } from "@bitwarden/common/vault/services/sync/sync.service";
-import { Fido2AuthenticatorService as Fido2AuthenticatorServiceAbstraction } from "@bitwarden/common/webauthn/abstractions/fido2-authenticator.service.abstraction";
-import { Fido2ClientService as Fido2ClientServiceAbstraction } from "@bitwarden/common/webauthn/abstractions/fido2-client.service.abstraction";
-import { Fido2UserInterfaceService as Fido2UserInterfaceServiceAbstraction } from "@bitwarden/common/webauthn/abstractions/fido2-user-interface.service.abstraction";
-import { Fido2AuthenticatorService } from "@bitwarden/common/webauthn/services/fido2-authenticator.service";
-import { Fido2ClientService } from "@bitwarden/common/webauthn/services/fido2-client.service";
+import { Fido2AuthenticatorService as Fido2AuthenticatorServiceAbstraction } from "@bitwarden/common/fido2/abstractions/fido2-authenticator.service.abstraction";
+import { Fido2ClientService as Fido2ClientServiceAbstraction } from "@bitwarden/common/fido2/abstractions/fido2-client.service.abstraction";
+import { Fido2UserInterfaceService as Fido2UserInterfaceServiceAbstraction } from "@bitwarden/common/fido2/abstractions/fido2-user-interface.service.abstraction";
+import { Fido2AuthenticatorService } from "@bitwarden/common/fido2/services/fido2-authenticator.service";
+import { Fido2ClientService } from "@bitwarden/common/fido2/services/fido2-client.service";
 
 import { BrowserOrganizationService } from "../admin-console/services/browser-organization.service";
 import { BrowserPolicyService } from "../admin-console/services/browser-policy.service";
diff --git a/apps/browser/src/browser/webauthn-utils.ts b/apps/browser/src/browser/webauthn-utils.ts
index 16196712762..dc83fe381bc 100644
--- a/apps/browser/src/browser/webauthn-utils.ts
+++ b/apps/browser/src/browser/webauthn-utils.ts
@@ -3,8 +3,8 @@ import {
   CreateCredentialResult,
   AssertCredentialParams,
   AssertCredentialResult,
-} from "@bitwarden/common/webauthn/abstractions/fido2-client.service.abstraction";
-import { Fido2Utils } from "@bitwarden/common/webauthn/abstractions/fido2-utils";
+} from "@bitwarden/common/fido2/abstractions/fido2-client.service.abstraction";
+import { Fido2Utils } from "@bitwarden/common/fido2/abstractions/fido2-utils";
 
 class BitAuthenticatorAttestationResponse implements AuthenticatorAttestationResponse {
   clientDataJSON: ArrayBuffer;
diff --git a/apps/browser/src/fido2/content/content-script.ts b/apps/browser/src/fido2/content/content-script.ts
index 1e19fce9951..2fcf0bef900 100644
--- a/apps/browser/src/fido2/content/content-script.ts
+++ b/apps/browser/src/fido2/content/content-script.ts
@@ -2,7 +2,7 @@ import { Message, MessageType } from "./messaging/message";
 import { Messenger } from "./messaging/messenger";
 
 const s = document.createElement("script");
-s.src = chrome.runtime.getURL("content/webauthn/page-script.js");
+s.src = chrome.runtime.getURL("content/fido2/page-script.js");
 (document.head || document.documentElement).appendChild(s);
 
 const messenger = Messenger.forDOMCommunication(window);
diff --git a/apps/browser/src/fido2/content/messaging/message.ts b/apps/browser/src/fido2/content/messaging/message.ts
index bcab2f12a3b..14d49cd5238 100644
--- a/apps/browser/src/fido2/content/messaging/message.ts
+++ b/apps/browser/src/fido2/content/messaging/message.ts
@@ -3,7 +3,7 @@ import {
   CreateCredentialResult,
   AssertCredentialParams,
   AssertCredentialResult,
-} from "@bitwarden/common/webauthn/abstractions/fido2-client.service.abstraction";
+} from "@bitwarden/common/fido2/abstractions/fido2-client.service.abstraction";
 
 export enum MessageType {
   CredentialCreationRequest,
diff --git a/apps/browser/src/fido2/popup/fido2/fido2.component.ts b/apps/browser/src/fido2/popup/fido2/fido2.component.ts
index e98a83c6804..bbb09d4147a 100644
--- a/apps/browser/src/fido2/popup/fido2/fido2.component.ts
+++ b/apps/browser/src/fido2/popup/fido2/fido2.component.ts
@@ -14,7 +14,7 @@ import {
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-import { Fido2KeyView } from "@bitwarden/common/webauthn/models/view/fido2-key.view";
+import { Fido2KeyView } from "@bitwarden/common/fido2/models/view/fido2-key.view";
 
 import { BrowserApi } from "../../../browser/browserApi";
 import {
diff --git a/apps/browser/src/manifest.json b/apps/browser/src/manifest.json
index 158211fded1..fce874ca65c 100644
--- a/apps/browser/src/manifest.json
+++ b/apps/browser/src/manifest.json
@@ -22,7 +22,7 @@
         "content/autofiller.js",
         "content/notificationBar.js",
         "content/contextMenuHandler.js",
-        "content/webauthn/content-script.js"
+        "content/fido2/content-script.js"
       ],
       "matches": ["http://*/*", "https://*/*", "file:///*"],
       "run_at": "document_start"
@@ -99,7 +99,7 @@
     }
   },
   "web_accessible_resources": [
-    "content/webauthn/page-script.js",
+    "content/fido2/page-script.js",
     "notification/bar.html",
     "images/icon38.png",
     "images/icon38_locked.png"
diff --git a/apps/browser/src/services/fido2/browser-fido2-user-interface.service.ts b/apps/browser/src/services/fido2/browser-fido2-user-interface.service.ts
index d744d0a760b..dd390bb60f9 100644
--- a/apps/browser/src/services/fido2/browser-fido2-user-interface.service.ts
+++ b/apps/browser/src/services/fido2/browser-fido2-user-interface.service.ts
@@ -11,12 +11,12 @@ import {
 } from "rxjs";
 
 import { Utils } from "@bitwarden/common/misc/utils";
-import { UserRequestedFallbackAbortReason } from "@bitwarden/common/webauthn/abstractions/fido2-client.service.abstraction";
+import { UserRequestedFallbackAbortReason } from "@bitwarden/common/fido2/abstractions/fido2-client.service.abstraction";
 import {
   Fido2UserInterfaceService as Fido2UserInterfaceServiceAbstraction,
   Fido2UserInterfaceSession,
   NewCredentialParams,
-} from "@bitwarden/common/webauthn/abstractions/fido2-user-interface.service.abstraction";
+} from "@bitwarden/common/fido2/abstractions/fido2-user-interface.service.abstraction";
 
 import { BrowserApi } from "../../browser/browserApi";
 import { PopupUtilsService } from "../../popup/services/popup-utils.service";
diff --git a/apps/browser/webpack.config.js b/apps/browser/webpack.config.js
index 2ae7e347cf4..68b28cc6b27 100644
--- a/apps/browser/webpack.config.js
+++ b/apps/browser/webpack.config.js
@@ -146,8 +146,8 @@ const mainConfig = {
     "content/notificationBar": "./src/autofill/content/notification-bar.ts",
     "content/contextMenuHandler": "./src/autofill/content/context-menu-handler.ts",
     "content/message_handler": "./src/autofill/content/message_handler.ts",
-    "content/webauthn/content-script": "./src/webauthn/content/content-script.ts",
-    "content/webauthn/page-script": "./src/webauthn/content/page-script.ts",
+    "content/fido2/content-script": "./src/fido2/content/content-script.ts",
+    "content/fido2/page-script": "./src/fido2/content/page-script.ts",
     "notification/bar": "./src/autofill/notification/bar.ts",
     "encrypt-worker": "../../libs/common/src/services/cryptography/encrypt.worker.ts",
   },
diff --git a/libs/common/src/webauthn/abstractions/fido2-authenticator.service.abstraction.ts b/libs/common/src/fido2/abstractions/fido2-authenticator.service.abstraction.ts
similarity index 100%
rename from libs/common/src/webauthn/abstractions/fido2-authenticator.service.abstraction.ts
rename to libs/common/src/fido2/abstractions/fido2-authenticator.service.abstraction.ts
diff --git a/libs/common/src/webauthn/abstractions/fido2-client.service.abstraction.ts b/libs/common/src/fido2/abstractions/fido2-client.service.abstraction.ts
similarity index 100%
rename from libs/common/src/webauthn/abstractions/fido2-client.service.abstraction.ts
rename to libs/common/src/fido2/abstractions/fido2-client.service.abstraction.ts
diff --git a/libs/common/src/webauthn/abstractions/fido2-user-interface.service.abstraction.ts b/libs/common/src/fido2/abstractions/fido2-user-interface.service.abstraction.ts
similarity index 100%
rename from libs/common/src/webauthn/abstractions/fido2-user-interface.service.abstraction.ts
rename to libs/common/src/fido2/abstractions/fido2-user-interface.service.abstraction.ts
diff --git a/libs/common/src/webauthn/abstractions/fido2-utils.ts b/libs/common/src/fido2/abstractions/fido2-utils.ts
similarity index 100%
rename from libs/common/src/webauthn/abstractions/fido2-utils.ts
rename to libs/common/src/fido2/abstractions/fido2-utils.ts
diff --git a/libs/common/src/webauthn/abstractions/fido2.service.abstraction.ts b/libs/common/src/fido2/abstractions/fido2.service.abstraction.ts
similarity index 100%
rename from libs/common/src/webauthn/abstractions/fido2.service.abstraction.ts
rename to libs/common/src/fido2/abstractions/fido2.service.abstraction.ts
diff --git a/libs/common/src/webauthn/models/api/fido2-key.api.ts b/libs/common/src/fido2/models/api/fido2-key.api.ts
similarity index 100%
rename from libs/common/src/webauthn/models/api/fido2-key.api.ts
rename to libs/common/src/fido2/models/api/fido2-key.api.ts
diff --git a/libs/common/src/webauthn/models/data/fido2-key.data.ts b/libs/common/src/fido2/models/data/fido2-key.data.ts
similarity index 100%
rename from libs/common/src/webauthn/models/data/fido2-key.data.ts
rename to libs/common/src/fido2/models/data/fido2-key.data.ts
diff --git a/libs/common/src/webauthn/models/domain/fido2-key.ts b/libs/common/src/fido2/models/domain/fido2-key.ts
similarity index 100%
rename from libs/common/src/webauthn/models/domain/fido2-key.ts
rename to libs/common/src/fido2/models/domain/fido2-key.ts
diff --git a/libs/common/src/webauthn/models/view/fido2-key.view.ts b/libs/common/src/fido2/models/view/fido2-key.view.ts
similarity index 100%
rename from libs/common/src/webauthn/models/view/fido2-key.view.ts
rename to libs/common/src/fido2/models/view/fido2-key.view.ts
diff --git a/libs/common/src/webauthn/services/domain-utils.spec.ts b/libs/common/src/fido2/services/domain-utils.spec.ts
similarity index 100%
rename from libs/common/src/webauthn/services/domain-utils.spec.ts
rename to libs/common/src/fido2/services/domain-utils.spec.ts
diff --git a/libs/common/src/webauthn/services/domain-utils.ts b/libs/common/src/fido2/services/domain-utils.ts
similarity index 100%
rename from libs/common/src/webauthn/services/domain-utils.ts
rename to libs/common/src/fido2/services/domain-utils.ts
diff --git a/libs/common/src/webauthn/services/ecdsa-utils.ts b/libs/common/src/fido2/services/ecdsa-utils.ts
similarity index 100%
rename from libs/common/src/webauthn/services/ecdsa-utils.ts
rename to libs/common/src/fido2/services/ecdsa-utils.ts
diff --git a/libs/common/src/webauthn/services/fido2-authenticator.service.spec.ts b/libs/common/src/fido2/services/fido2-authenticator.service.spec.ts
similarity index 100%
rename from libs/common/src/webauthn/services/fido2-authenticator.service.spec.ts
rename to libs/common/src/fido2/services/fido2-authenticator.service.spec.ts
diff --git a/libs/common/src/webauthn/services/fido2-authenticator.service.ts b/libs/common/src/fido2/services/fido2-authenticator.service.ts
similarity index 100%
rename from libs/common/src/webauthn/services/fido2-authenticator.service.ts
rename to libs/common/src/fido2/services/fido2-authenticator.service.ts
diff --git a/libs/common/src/webauthn/services/fido2-client.service.spec.ts b/libs/common/src/fido2/services/fido2-client.service.spec.ts
similarity index 100%
rename from libs/common/src/webauthn/services/fido2-client.service.spec.ts
rename to libs/common/src/fido2/services/fido2-client.service.spec.ts
diff --git a/libs/common/src/webauthn/services/fido2-client.service.ts b/libs/common/src/fido2/services/fido2-client.service.ts
similarity index 100%
rename from libs/common/src/webauthn/services/fido2-client.service.ts
rename to libs/common/src/fido2/services/fido2-client.service.ts
diff --git a/libs/common/src/webauthn/services/fido2.service.ts b/libs/common/src/fido2/services/fido2.service.ts
similarity index 100%
rename from libs/common/src/webauthn/services/fido2.service.ts
rename to libs/common/src/fido2/services/fido2.service.ts
diff --git a/libs/common/src/webauthn/services/noop-fido2-user-interface.service.ts b/libs/common/src/fido2/services/noop-fido2-user-interface.service.ts
similarity index 100%
rename from libs/common/src/webauthn/services/noop-fido2-user-interface.service.ts
rename to libs/common/src/fido2/services/noop-fido2-user-interface.service.ts
diff --git a/libs/common/src/models/api/login.api.ts b/libs/common/src/models/api/login.api.ts
index 7845c9e2ec6..1bf8ca13dd7 100644
--- a/libs/common/src/models/api/login.api.ts
+++ b/libs/common/src/models/api/login.api.ts
@@ -1,4 +1,4 @@
-import { Fido2KeyApi } from "../../webauthn/models/api/fido2-key.api";
+import { Fido2KeyApi } from "../../fido2/models/api/fido2-key.api";
 import { BaseResponse } from "../response/base.response";
 
 import { LoginUriApi } from "./login-uri.api";
diff --git a/libs/common/src/vault/models/data/cipher.data.ts b/libs/common/src/vault/models/data/cipher.data.ts
index eac82cf2536..a1760a1da7b 100644
--- a/libs/common/src/vault/models/data/cipher.data.ts
+++ b/libs/common/src/vault/models/data/cipher.data.ts
@@ -1,4 +1,4 @@
-import { Fido2KeyData } from "../../../webauthn/models/data/fido2-key.data";
+import { Fido2KeyData } from "../../../fido2/models/data/fido2-key.data";
 import { CipherRepromptType } from "../../enums/cipher-reprompt-type";
 import { CipherType } from "../../enums/cipher-type";
 import { CipherResponse } from "../response/cipher.response";
diff --git a/libs/common/src/vault/models/data/login.data.ts b/libs/common/src/vault/models/data/login.data.ts
index 8de44975260..b1e5cb011ff 100644
--- a/libs/common/src/vault/models/data/login.data.ts
+++ b/libs/common/src/vault/models/data/login.data.ts
@@ -1,5 +1,5 @@
 import { LoginApi } from "../../../models/api/login.api";
-import { Fido2KeyData } from "../../../webauthn/models/data/fido2-key.data";
+import { Fido2KeyData } from "../../../fido2/models/data/fido2-key.data";
 
 import { LoginUriData } from "./login-uri.data";
 
diff --git a/libs/common/src/vault/models/domain/cipher.ts b/libs/common/src/vault/models/domain/cipher.ts
index d1c8117dc82..028a57cf990 100644
--- a/libs/common/src/vault/models/domain/cipher.ts
+++ b/libs/common/src/vault/models/domain/cipher.ts
@@ -5,7 +5,7 @@ import Domain from "../../../models/domain/domain-base";
 import { EncString } from "../../../models/domain/enc-string";
 import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key";
 import { InitializerKey } from "../../../services/cryptography/initializer-key";
-import { Fido2Key } from "../../../webauthn/models/domain/fido2-key";
+import { Fido2Key } from "../../../fido2/models/domain/fido2-key";
 import { CipherRepromptType } from "../../enums/cipher-reprompt-type";
 import { CipherType } from "../../enums/cipher-type";
 import { CipherData } from "../data/cipher.data";
diff --git a/libs/common/src/vault/models/domain/login.ts b/libs/common/src/vault/models/domain/login.ts
index 6e4e1e21cd7..91805e6a92f 100644
--- a/libs/common/src/vault/models/domain/login.ts
+++ b/libs/common/src/vault/models/domain/login.ts
@@ -3,7 +3,7 @@ import { Jsonify } from "type-fest";
 import Domain from "../../../models/domain/domain-base";
 import { EncString } from "../../../models/domain/enc-string";
 import { SymmetricCryptoKey } from "../../../models/domain/symmetric-crypto-key";
-import { Fido2Key } from "../../../webauthn/models/domain/fido2-key";
+import { Fido2Key } from "../../../fido2/models/domain/fido2-key";
 import { LoginData } from "../data/login.data";
 import { LoginView } from "../view/login.view";
 
diff --git a/libs/common/src/vault/models/request/cipher.request.ts b/libs/common/src/vault/models/request/cipher.request.ts
index 967464ce23a..8605a9e221d 100644
--- a/libs/common/src/vault/models/request/cipher.request.ts
+++ b/libs/common/src/vault/models/request/cipher.request.ts
@@ -4,7 +4,7 @@ import { IdentityApi } from "../../../models/api/identity.api";
 import { LoginUriApi } from "../../../models/api/login-uri.api";
 import { LoginApi } from "../../../models/api/login.api";
 import { SecureNoteApi } from "../../../models/api/secure-note.api";
-import { Fido2KeyApi } from "../../../webauthn/models/api/fido2-key.api";
+import { Fido2KeyApi } from "../../../fido2/models/api/fido2-key.api";
 import { CipherRepromptType } from "../../enums/cipher-reprompt-type";
 import { CipherType } from "../../enums/cipher-type";
 import { Cipher } from "../domain/cipher";
diff --git a/libs/common/src/vault/models/response/cipher.response.ts b/libs/common/src/vault/models/response/cipher.response.ts
index 7145301dfa8..abc015dabd2 100644
--- a/libs/common/src/vault/models/response/cipher.response.ts
+++ b/libs/common/src/vault/models/response/cipher.response.ts
@@ -4,7 +4,7 @@ import { IdentityApi } from "../../../models/api/identity.api";
 import { LoginApi } from "../../../models/api/login.api";
 import { SecureNoteApi } from "../../../models/api/secure-note.api";
 import { BaseResponse } from "../../../models/response/base.response";
-import { Fido2KeyApi } from "../../../webauthn/models/api/fido2-key.api";
+import { Fido2KeyApi } from "../../../fido2/models/api/fido2-key.api";
 import { CipherRepromptType } from "../../enums/cipher-reprompt-type";
 
 import { AttachmentResponse } from "./attachment.response";
diff --git a/libs/common/src/vault/models/view/cipher.view.ts b/libs/common/src/vault/models/view/cipher.view.ts
index 0b0afbe4be5..2c0845e5e02 100644
--- a/libs/common/src/vault/models/view/cipher.view.ts
+++ b/libs/common/src/vault/models/view/cipher.view.ts
@@ -4,7 +4,7 @@ import { LinkedIdType } from "../../../enums/linkedIdType";
 import { InitializerMetadata } from "../../../interfaces/initializer-metadata.interface";
 import { View } from "../../../models/view/view";
 import { InitializerKey } from "../../../services/cryptography/initializer-key";
-import { Fido2KeyView } from "../../../webauthn/models/view/fido2-key.view";
+import { Fido2KeyView } from "../../../fido2/models/view/fido2-key.view";
 import { CipherRepromptType } from "../../enums/cipher-reprompt-type";
 import { CipherType } from "../../enums/cipher-type";
 import { LocalData } from "../data/local.data";
diff --git a/libs/common/src/vault/models/view/login.view.ts b/libs/common/src/vault/models/view/login.view.ts
index 4b5b46740e5..f9d984e88e3 100644
--- a/libs/common/src/vault/models/view/login.view.ts
+++ b/libs/common/src/vault/models/view/login.view.ts
@@ -3,7 +3,7 @@ import { Jsonify } from "type-fest";
 import { LoginLinkedId as LinkedId } from "../../../enums/linkedIdType";
 import { linkedFieldOption } from "../../../misc/linkedFieldOption.decorator";
 import { Utils } from "../../../misc/utils";
-import { Fido2KeyView } from "../../../webauthn/models/view/fido2-key.view";
+import { Fido2KeyView } from "../../../fido2/models/view/fido2-key.view";
 import { Login } from "../domain/login";
 
 import { ItemView } from "./item.view";
diff --git a/libs/common/src/vault/services/cipher.service.ts b/libs/common/src/vault/services/cipher.service.ts
index 189c494cb93..4215ac3ac5a 100644
--- a/libs/common/src/vault/services/cipher.service.ts
+++ b/libs/common/src/vault/services/cipher.service.ts
@@ -19,7 +19,7 @@ import { EncString } from "../../models/domain/enc-string";
 import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key";
 import { ErrorResponse } from "../../models/response/error.response";
 import { View } from "../../models/view/view";
-import { Fido2Key } from "../../webauthn/models/domain/fido2-key";
+import { Fido2Key } from "../../fido2/models/domain/fido2-key";
 import { CipherService as CipherServiceAbstraction } from "../abstractions/cipher.service";
 import { CipherFileUploadService } from "../abstractions/file-upload/cipher-file-upload.service";
 import { CipherType } from "../enums/cipher-type";