diff --git a/bitwarden_license/src/app/app.module.ts b/bitwarden_license/src/app/app.module.ts
index f9e59bda..dea1a7ce 100644
--- a/bitwarden_license/src/app/app.module.ts
+++ b/bitwarden_license/src/app/app.module.ts
@@ -7,9 +7,9 @@ import { InfiniteScrollModule } from "ngx-infinite-scroll";
 
 import { JslibModule } from "jslib-angular/jslib.module";
 
+import { VaultFilterModule } from "src/app/modules/vault-filter/vault-filter.module";
 import { OssRoutingModule } from "src/app/oss-routing.module";
 import { ServicesModule } from "src/app/services/services.module";
-import { VaultFilterModule } from "src/app/vault/vault-filter/vault-filter.module";
 import { WildcardRoutingModule } from "src/app/wildcard-routing.module";
 
 import { AppRoutingModule } from "./app-routing.module";
diff --git a/src/app/vault/vault-filter/components/collection-filter.component.html b/src/app/modules/vault-filter/components/collection-filter.component.html
similarity index 100%
rename from src/app/vault/vault-filter/components/collection-filter.component.html
rename to src/app/modules/vault-filter/components/collection-filter.component.html
diff --git a/src/app/vault/vault-filter/components/collection-filter.component.ts b/src/app/modules/vault-filter/components/collection-filter.component.ts
similarity index 100%
rename from src/app/vault/vault-filter/components/collection-filter.component.ts
rename to src/app/modules/vault-filter/components/collection-filter.component.ts
diff --git a/src/app/vault/vault-filter/components/folder-filter.component.html b/src/app/modules/vault-filter/components/folder-filter.component.html
similarity index 100%
rename from src/app/vault/vault-filter/components/folder-filter.component.html
rename to src/app/modules/vault-filter/components/folder-filter.component.html
diff --git a/src/app/vault/vault-filter/components/folder-filter.component.ts b/src/app/modules/vault-filter/components/folder-filter.component.ts
similarity index 100%
rename from src/app/vault/vault-filter/components/folder-filter.component.ts
rename to src/app/modules/vault-filter/components/folder-filter.component.ts
diff --git a/src/app/vault/vault-filter/components/organization-filter.component.html b/src/app/modules/vault-filter/components/organization-filter.component.html
similarity index 100%
rename from src/app/vault/vault-filter/components/organization-filter.component.html
rename to src/app/modules/vault-filter/components/organization-filter.component.html
diff --git a/src/app/vault/vault-filter/components/organization-filter.component.ts b/src/app/modules/vault-filter/components/organization-filter.component.ts
similarity index 100%
rename from src/app/vault/vault-filter/components/organization-filter.component.ts
rename to src/app/modules/vault-filter/components/organization-filter.component.ts
diff --git a/src/app/vault/vault-filter/components/organization-options.component.html b/src/app/modules/vault-filter/components/organization-options.component.html
similarity index 100%
rename from src/app/vault/vault-filter/components/organization-options.component.html
rename to src/app/modules/vault-filter/components/organization-options.component.html
diff --git a/src/app/vault/vault-filter/components/organization-options.component.ts b/src/app/modules/vault-filter/components/organization-options.component.ts
similarity index 100%
rename from src/app/vault/vault-filter/components/organization-options.component.ts
rename to src/app/modules/vault-filter/components/organization-options.component.ts
diff --git a/src/app/vault/vault-filter/components/status-filter.component.html b/src/app/modules/vault-filter/components/status-filter.component.html
similarity index 100%
rename from src/app/vault/vault-filter/components/status-filter.component.html
rename to src/app/modules/vault-filter/components/status-filter.component.html
diff --git a/src/app/vault/vault-filter/components/status-filter.component.ts b/src/app/modules/vault-filter/components/status-filter.component.ts
similarity index 100%
rename from src/app/vault/vault-filter/components/status-filter.component.ts
rename to src/app/modules/vault-filter/components/status-filter.component.ts
diff --git a/src/app/vault/vault-filter/components/type-filter.component.html b/src/app/modules/vault-filter/components/type-filter.component.html
similarity index 100%
rename from src/app/vault/vault-filter/components/type-filter.component.html
rename to src/app/modules/vault-filter/components/type-filter.component.html
diff --git a/src/app/vault/vault-filter/components/type-filter.component.ts b/src/app/modules/vault-filter/components/type-filter.component.ts
similarity index 100%
rename from src/app/vault/vault-filter/components/type-filter.component.ts
rename to src/app/modules/vault-filter/components/type-filter.component.ts
diff --git a/src/app/vault/vault-filter/vault-filter.component.html b/src/app/modules/vault-filter/vault-filter.component.html
similarity index 100%
rename from src/app/vault/vault-filter/vault-filter.component.html
rename to src/app/modules/vault-filter/vault-filter.component.html
diff --git a/src/app/vault/vault-filter/vault-filter.component.ts b/src/app/modules/vault-filter/vault-filter.component.ts
similarity index 100%
rename from src/app/vault/vault-filter/vault-filter.component.ts
rename to src/app/modules/vault-filter/vault-filter.component.ts
diff --git a/src/app/vault/vault-filter/vault-filter.module.ts b/src/app/modules/vault-filter/vault-filter.module.ts
similarity index 100%
rename from src/app/vault/vault-filter/vault-filter.module.ts
rename to src/app/modules/vault-filter/vault-filter.module.ts
diff --git a/src/app/vault/vault-filter/vault-filter.service.ts b/src/app/modules/vault-filter/vault-filter.service.ts
similarity index 100%
rename from src/app/vault/vault-filter/vault-filter.service.ts
rename to src/app/modules/vault-filter/vault-filter.service.ts
diff --git a/src/app/organizations/vault/vault-filter/vault-filter.component.ts b/src/app/organizations/vault/vault-filter/vault-filter.component.ts
index 87012759..ad118f79 100644
--- a/src/app/organizations/vault/vault-filter/vault-filter.component.ts
+++ b/src/app/organizations/vault/vault-filter/vault-filter.component.ts
@@ -3,11 +3,11 @@ import { Component } from "@angular/core";
 import { VaultFilterService } from "jslib-angular/modules/vault-filter/vault-filter.service";
 import { Organization } from "jslib-common/models/domain/organization";
 
-import { VaultFilterComponent as BaseVaultFilterComponent } from "../../../vault/vault-filter/vault-filter.component";
+import { VaultFilterComponent as BaseVaultFilterComponent } from "../../../modules/vault-filter/vault-filter.component";
 
 @Component({
   selector: "app-org-vault-filter",
-  templateUrl: "../../../vault/vault-filter/vault-filter.component.html",
+  templateUrl: "../../../modules/vault-filter/vault-filter.component.html",
 })
 export class VaultFilterComponent extends BaseVaultFilterComponent {
   organization: Organization;
diff --git a/src/app/oss.module.ts b/src/app/oss.module.ts
index 00c13580..68b14592 100644
--- a/src/app/oss.module.ts
+++ b/src/app/oss.module.ts
@@ -85,6 +85,7 @@ import { FooterComponent } from "./layouts/footer.component";
 import { FrontendLayoutComponent } from "./layouts/frontend-layout.component";
 import { NavbarComponent } from "./layouts/navbar.component";
 import { UserLayoutComponent } from "./layouts/user-layout.component";
+import { VaultFilterModule } from "./modules/vault-filter/vault-filter.module";
 import { OrganizationLayoutComponent } from "./organizations/layouts/organization-layout.component";
 import { BulkConfirmComponent as OrgBulkConfirmComponent } from "./organizations/manage/bulk/bulk-confirm.component";
 import { BulkRemoveComponent as OrgBulkRemoveComponent } from "./organizations/manage/bulk/bulk-remove.component";
@@ -215,7 +216,6 @@ import { CiphersComponent } from "./vault/ciphers.component";
 import { CollectionsComponent } from "./vault/collections.component";
 import { FolderAddEditComponent } from "./vault/folder-add-edit.component";
 import { ShareComponent } from "./vault/share.component";
-import { VaultFilterModule } from "./vault/vault-filter/vault-filter.module";
 import { VaultComponent } from "./vault/vault.component";
 
 registerLocaleData(localeAf, "af");
diff --git a/src/app/vault/vault.component.ts b/src/app/vault/vault.component.ts
index 7cbbf390..4dafc7e0 100644
--- a/src/app/vault/vault.component.ts
+++ b/src/app/vault/vault.component.ts
@@ -24,6 +24,7 @@ import { TokenService } from "jslib-common/abstractions/token.service";
 import { CipherType } from "jslib-common/enums/cipherType";
 import { CipherView } from "jslib-common/models/view/cipherView";
 
+import { VaultFilterComponent } from "../modules/vault-filter/vault-filter.component";
 import { UpdateKeyComponent } from "../settings/update-key.component";
 
 import { AddEditComponent } from "./add-edit.component";
@@ -32,7 +33,6 @@ import { CiphersComponent } from "./ciphers.component";
 import { CollectionsComponent } from "./collections.component";
 import { FolderAddEditComponent } from "./folder-add-edit.component";
 import { ShareComponent } from "./share.component";
-import { VaultFilterComponent } from "./vault-filter/vault-filter.component";
 
 const BroadcasterSubscriptionId = "VaultComponent";