diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable/app-table-row-scrollable.component.html
similarity index 100%
rename from bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.html
rename to bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable/app-table-row-scrollable.component.html
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable/app-table-row-scrollable.component.ts
similarity index 100%
rename from bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.ts
rename to bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable/app-table-row-scrollable.component.ts
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications/critical-applications.component.html
similarity index 100%
rename from bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.html
rename to bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications/critical-applications.component.html
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications/critical-applications.component.ts
similarity index 99%
rename from bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.ts
rename to bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications/critical-applications.component.ts
index 926941d985f..6e6891aafe3 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications/critical-applications.component.ts
@@ -35,7 +35,7 @@ import { PipesModule } from "@bitwarden/web-vault/app/vault/individual-vault/pip
 import { CreateTasksRequest } from "../../vault/services/abstractions/admin-task.abstraction";
 import { DefaultAdminTaskService } from "../../vault/services/default-admin-task.service";
 
-import { AppTableRowScrollableComponent } from "./app-table-row-scrollable.component";
+import { AppTableRowScrollableComponent } from "./app-table-row-scrollable/app-table-row-scrollable.component";
 import { RiskInsightsTabType } from "./risk-insights.component";
 
 @Component({
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/notified-members-table.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/notified-members-table/notified-members-table.component.html
similarity index 100%
rename from bitwarden_license/bit-web/src/app/dirt/access-intelligence/notified-members-table.component.html
rename to bitwarden_license/bit-web/src/app/dirt/access-intelligence/notified-members-table/notified-members-table.component.html
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/notified-members-table.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/notified-members-table/notified-members-table.component.ts
similarity index 100%
rename from bitwarden_license/bit-web/src/app/dirt/access-intelligence/notified-members-table.component.ts
rename to bitwarden_license/bit-web/src/app/dirt/access-intelligence/notified-members-table/notified-members-table.component.ts
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members-uri.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members-uri/password-health-members-uri.component.html
similarity index 100%
rename from bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members-uri.component.html
rename to bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members-uri/password-health-members-uri.component.html
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members-uri.component.spec.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members-uri/password-health-members-uri.component.spec.ts
similarity index 100%
rename from bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members-uri.component.spec.ts
rename to bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members-uri/password-health-members-uri.component.spec.ts
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members-uri.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members-uri/password-health-members-uri.component.ts
similarity index 100%
rename from bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members-uri.component.ts
rename to bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members-uri/password-health-members-uri.component.ts
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members/password-health-members.component.html
similarity index 100%
rename from bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members.component.html
rename to bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members/password-health-members.component.html
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members/password-health-members.component.ts
similarity index 100%
rename from bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members.component.ts
rename to bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health-members/password-health-members.component.ts
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health/password-health.component.html
similarity index 100%
rename from bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health.component.html
rename to bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health/password-health.component.html
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health.component.spec.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health/password-health.component.spec.ts
similarity index 100%
rename from bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health.component.spec.ts
rename to bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health/password-health.component.spec.ts
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health/password-health.component.ts
similarity index 100%
rename from bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health.component.ts
rename to bitwarden_license/bit-web/src/app/dirt/access-intelligence/password-health/password-health.component.ts
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights-loading.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights/risk-insights-loading.component.html
similarity index 100%
rename from bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights-loading.component.html
rename to bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights/risk-insights-loading.component.html
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights-loading.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights/risk-insights-loading.component.ts
similarity index 100%
rename from bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights-loading.component.ts
rename to bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights/risk-insights-loading.component.ts