diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 88e5f29d9b5..e0443da4f87 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -20,9 +20,10 @@ libs/angular/src/auth @bitwarden/team-auth-dev
 libs/common/src/auth @bitwarden/team-auth-dev
 
 ## Vault team files ##
+apps/browser/src/autofill @bitwarden/team-vault-dev
 apps/browser/src/vault @bitwarden/team-vault-dev
 apps/cli/src/vault @bitwarden/team-vault-dev
 apps/desktop/src/vault @bitwarden/team-vault-dev
-apps/web/src/vault @bitwarden/team-vault-dev
+apps/web/src/app/vault @bitwarden/team-vault-dev
 libs/angular/src/vault @bitwarden/team-vault-dev
 libs/common/src/vault @bitwarden/team-vault-dev
diff --git a/.github/whitelist-capital-letters.txt b/.github/whitelist-capital-letters.txt
index db8e006640d..4cc5f5949d0 100644
--- a/.github/whitelist-capital-letters.txt
+++ b/.github/whitelist-capital-letters.txt
@@ -168,7 +168,6 @@
 ./apps/browser/src/services/vaultTimeout/vaultTimeout.service.ts
 ./apps/browser/src/services/browserCrypto.service.ts
 ./apps/browser/src/services/browserPlatformUtils.service.ts
-./apps/browser/src/services/autofillConstants.ts
 ./apps/browser/src/services/abstractions/abstractKeyGeneration.service.ts
 ./apps/browser/src/services/browserLocalStorage.service.ts
 ./apps/browser/src/services/localBackedSessionStorage.service.ts
diff --git a/apps/browser/src/services/autofillConstants.ts b/apps/browser/src/autofill/services/autofill-constants.ts
similarity index 100%
rename from apps/browser/src/services/autofillConstants.ts
rename to apps/browser/src/autofill/services/autofill-constants.ts
diff --git a/apps/browser/src/autofill/services/autofill.service.ts b/apps/browser/src/autofill/services/autofill.service.ts
index c7f9d879a4e..188ca65509d 100644
--- a/apps/browser/src/autofill/services/autofill.service.ts
+++ b/apps/browser/src/autofill/services/autofill.service.ts
@@ -12,11 +12,6 @@ import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
 
 import { BrowserApi } from "../../browser/browserApi";
 import { BrowserStateService } from "../../services/abstractions/browser-state.service";
-import {
-  AutoFillConstants,
-  CreditCardAutoFillConstants,
-  IdentityAutoFillConstants,
-} from "../../services/autofillConstants";
 import AutofillField from "../models/autofill-field";
 import AutofillPageDetails from "../models/autofill-page-details";
 import AutofillScript from "../models/autofill-script";
@@ -27,6 +22,11 @@ import {
   PageDetail,
   FormData,
 } from "./abstractions/autofill.service";
+import {
+  AutoFillConstants,
+  CreditCardAutoFillConstants,
+  IdentityAutoFillConstants,
+} from "./autofill-constants";
 
 export interface GenerateFillScriptOptions {
   skipUsernameOnlyFill: boolean;