diff --git a/apps/web/src/app/modules/loose-components.module.ts b/apps/web/src/app/modules/loose-components.module.ts
index d06e65a6f99..10b4acbd8df 100644
--- a/apps/web/src/app/modules/loose-components.module.ts
+++ b/apps/web/src/app/modules/loose-components.module.ts
@@ -30,22 +30,22 @@ import { UserLayoutComponent } from "../layouts/user-layout.component";
 import { GroupAddEditComponent as OrgGroupAddEditComponent } from "../organizations/groups/group-add-edit.component";
 import { GroupsComponent as OrgGroupsComponent } from "../organizations/groups/groups.component";
 import { OrganizationLayoutComponent } from "../organizations/layouts/organization-layout.component";
+import { BulkConfirmComponent as OrgBulkConfirmComponent } from "../organizations/manage/bulk/bulk-confirm.component";
+import { BulkDeactivateComponent as OrgBulkDeactivateomponent } from "../organizations/manage/bulk/bulk-deactivate.component";
+import { BulkRemoveComponent as OrgBulkRemoveComponent } from "../organizations/manage/bulk/bulk-remove.component";
+import { BulkStatusComponent as OrgBulkStatusComponent } from "../organizations/manage/bulk/bulk-status.component";
 import { CollectionAddEditComponent as OrgCollectionAddEditComponent } from "../organizations/manage/collection-add-edit.component";
 import { CollectionsComponent as OrgManageCollectionsComponent } from "../organizations/manage/collections.component";
+import { EntityEventsComponent as OrgEntityEventsComponent } from "../organizations/manage/entity-events.component";
 import { EventsComponent as OrgEventsComponent } from "../organizations/manage/events.component";
 import { ManageComponent as OrgManageComponent } from "../organizations/manage/manage.component";
+import { PeopleComponent as OrgPeopleComponent } from "../organizations/manage/people.component";
 import { PoliciesComponent as OrgPoliciesComponent } from "../organizations/manage/policies.component";
 import { PolicyEditComponent as OrgPolicyEditComponent } from "../organizations/manage/policy-edit.component";
+import { ResetPasswordComponent as OrgResetPasswordComponent } from "../organizations/manage/reset-password.component";
+import { UserAddEditComponent as OrgUserAddEditComponent } from "../organizations/manage/user-add-edit.component";
 import { UserConfirmComponent as OrgUserConfirmComponent } from "../organizations/manage/user-confirm.component";
-import { BulkConfirmComponent as OrgBulkConfirmComponent } from "../organizations/members/bulk/bulk-confirm.component";
-import { BulkDeactivateComponent as OrgBulkDeactivateomponent } from "../organizations/members/bulk/bulk-deactivate.component";
-import { BulkRemoveComponent as OrgBulkRemoveComponent } from "../organizations/members/bulk/bulk-remove.component";
-import { BulkStatusComponent as OrgBulkStatusComponent } from "../organizations/members/bulk/bulk-status.component";
-import { EntityEventsComponent as OrgEntityEventsComponent } from "../organizations/members/entity-events.component";
-import { MembersComponent as OrgPeopleComponent } from "../organizations/members/members.component";
-import { ResetPasswordComponent as OrgResetPasswordComponent } from "../organizations/members/reset-password.component";
-import { UserAddEditComponent as OrgUserAddEditComponent } from "../organizations/members/user-add-edit.component";
-import { UserGroupsComponent as OrgUserGroupsComponent } from "../organizations/members/user-groups.component";
+import { UserGroupsComponent as OrgUserGroupsComponent } from "../organizations/manage/user-groups.component";
 import { DisableSendPolicyComponent } from "../organizations/policies/disable-send.component";
 import { MasterPasswordPolicyComponent } from "../organizations/policies/master-password.component";
 import { PasswordGeneratorPolicyComponent } from "../organizations/policies/password-generator.component";
diff --git a/apps/web/src/app/modules/vault/modules/organization-vault/organization-vault.component.ts b/apps/web/src/app/modules/vault/modules/organization-vault/organization-vault.component.ts
index ddf11193cd0..1aee9a0a0a3 100644
--- a/apps/web/src/app/modules/vault/modules/organization-vault/organization-vault.component.ts
+++ b/apps/web/src/app/modules/vault/modules/organization-vault/organization-vault.component.ts
@@ -24,7 +24,7 @@ import { CipherType } from "@bitwarden/common/enums/cipherType";
 import { Organization } from "@bitwarden/common/models/domain/organization";
 import { CipherView } from "@bitwarden/common/models/view/cipherView";
 
-import { EntityEventsComponent } from "../../../../organizations/members/entity-events.component";
+import { EntityEventsComponent } from "../../../../organizations/manage/entity-events.component";
 import { AddEditComponent } from "../../../../organizations/vault/add-edit.component";
 import { AttachmentsComponent } from "../../../../organizations/vault/attachments.component";
 import { CiphersComponent } from "../../../../organizations/vault/ciphers.component";
diff --git a/apps/web/src/app/organizations/members/bulk/bulk-confirm.component.html b/apps/web/src/app/organizations/manage/bulk/bulk-confirm.component.html
similarity index 100%
rename from apps/web/src/app/organizations/members/bulk/bulk-confirm.component.html
rename to apps/web/src/app/organizations/manage/bulk/bulk-confirm.component.html
diff --git a/apps/web/src/app/organizations/members/bulk/bulk-confirm.component.ts b/apps/web/src/app/organizations/manage/bulk/bulk-confirm.component.ts
similarity index 100%
rename from apps/web/src/app/organizations/members/bulk/bulk-confirm.component.ts
rename to apps/web/src/app/organizations/manage/bulk/bulk-confirm.component.ts
diff --git a/apps/web/src/app/organizations/members/bulk/bulk-deactivate.component.html b/apps/web/src/app/organizations/manage/bulk/bulk-deactivate.component.html
similarity index 100%
rename from apps/web/src/app/organizations/members/bulk/bulk-deactivate.component.html
rename to apps/web/src/app/organizations/manage/bulk/bulk-deactivate.component.html
diff --git a/apps/web/src/app/organizations/members/bulk/bulk-deactivate.component.ts b/apps/web/src/app/organizations/manage/bulk/bulk-deactivate.component.ts
similarity index 100%
rename from apps/web/src/app/organizations/members/bulk/bulk-deactivate.component.ts
rename to apps/web/src/app/organizations/manage/bulk/bulk-deactivate.component.ts
diff --git a/apps/web/src/app/organizations/members/bulk/bulk-remove.component.html b/apps/web/src/app/organizations/manage/bulk/bulk-remove.component.html
similarity index 100%
rename from apps/web/src/app/organizations/members/bulk/bulk-remove.component.html
rename to apps/web/src/app/organizations/manage/bulk/bulk-remove.component.html
diff --git a/apps/web/src/app/organizations/members/bulk/bulk-remove.component.ts b/apps/web/src/app/organizations/manage/bulk/bulk-remove.component.ts
similarity index 100%
rename from apps/web/src/app/organizations/members/bulk/bulk-remove.component.ts
rename to apps/web/src/app/organizations/manage/bulk/bulk-remove.component.ts
diff --git a/apps/web/src/app/organizations/members/bulk/bulk-status.component.html b/apps/web/src/app/organizations/manage/bulk/bulk-status.component.html
similarity index 100%
rename from apps/web/src/app/organizations/members/bulk/bulk-status.component.html
rename to apps/web/src/app/organizations/manage/bulk/bulk-status.component.html
diff --git a/apps/web/src/app/organizations/members/bulk/bulk-status.component.ts b/apps/web/src/app/organizations/manage/bulk/bulk-status.component.ts
similarity index 100%
rename from apps/web/src/app/organizations/members/bulk/bulk-status.component.ts
rename to apps/web/src/app/organizations/manage/bulk/bulk-status.component.ts
diff --git a/apps/web/src/app/organizations/members/entity-events.component.html b/apps/web/src/app/organizations/manage/entity-events.component.html
similarity index 100%
rename from apps/web/src/app/organizations/members/entity-events.component.html
rename to apps/web/src/app/organizations/manage/entity-events.component.html
diff --git a/apps/web/src/app/organizations/members/entity-events.component.ts b/apps/web/src/app/organizations/manage/entity-events.component.ts
similarity index 100%
rename from apps/web/src/app/organizations/members/entity-events.component.ts
rename to apps/web/src/app/organizations/manage/entity-events.component.ts
diff --git a/apps/web/src/app/organizations/manage/people.component.html b/apps/web/src/app/organizations/manage/people.component.html
new file mode 100644
index 00000000000..a20a95d20aa
--- /dev/null
+++ b/apps/web/src/app/organizations/manage/people.component.html
@@ -0,0 +1,293 @@
+<div class="page-header">
+  <h1>{{ "people" | i18n }}</h1>
+  <div class="mt-2 d-flex">
+    <div class="btn-group btn-group-sm" role="group">
+      <button
+        type="button"
+        class="btn btn-outline-secondary"
+        [ngClass]="{ active: status == null }"
+        (click)="filter(null)"
+      >
+        {{ "all" | i18n }}
+        <span bitBadge badgeType="info" *ngIf="allCount">{{ allCount }}</span>
+      </button>
+      <button
+        type="button"
+        class="btn btn-outline-secondary"
+        [ngClass]="{ active: status == userStatusType.Invited }"
+        (click)="filter(userStatusType.Invited)"
+      >
+        {{ "invited" | i18n }}
+        <span bitBadge badgeType="info" *ngIf="invitedCount">{{ invitedCount }}</span>
+      </button>
+      <button
+        type="button"
+        class="btn btn-outline-secondary"
+        [ngClass]="{ active: status == userStatusType.Accepted }"
+        (click)="filter(userStatusType.Accepted)"
+      >
+        {{ "accepted" | i18n }}
+        <span bitBadge badgeType="warning" *ngIf="acceptedCount">{{ acceptedCount }}</span>
+      </button>
+      <button
+        type="button"
+        class="btn btn-outline-secondary"
+        [ngClass]="{ active: status == userStatusType.Deactivated }"
+        (click)="filter(userStatusType.Deactivated)"
+      >
+        {{ "deactivated" | i18n }}
+        <span bitBadge badgeType="info" *ngIf="deactivatedCount">{{ deactivatedCount }}</span>
+      </button>
+    </div>
+    <div class="ml-3">
+      <label class="sr-only" for="search">{{ "search" | i18n }}</label>
+      <input
+        type="search"
+        class="form-control form-control-sm"
+        id="search"
+        placeholder="{{ 'search' | i18n }}"
+        [(ngModel)]="searchText"
+      />
+    </div>
+    <div class="dropdown ml-3" appListDropdown>
+      <button
+        class="btn btn-sm btn-outline-secondary dropdown-toggle"
+        type="button"
+        id="bulkActionsButton"
+        data-toggle="dropdown"
+        aria-haspopup="true"
+        aria-expanded="false"
+        appA11yTitle="{{ 'options' | i18n }}"
+      >
+        <i class="bwi bwi-cog" aria-hidden="true"></i>
+      </button>
+      <div class="dropdown-menu dropdown-menu-right" aria-labelledby="bulkActionsButton">
+        <button class="dropdown-item" appStopClick (click)="bulkReinvite()">
+          <i class="bwi bwi-fw bwi-envelope" aria-hidden="true"></i>
+          {{ "reinviteSelected" | i18n }}
+        </button>
+        <button
+          class="dropdown-item text-success"
+          appStopClick
+          (click)="bulkConfirm()"
+          *ngIf="showBulkConfirmUsers"
+        >
+          <i class="bwi bwi-fw bwi-check" aria-hidden="true"></i>
+          {{ "confirmSelected" | i18n }}
+        </button>
+        <button class="dropdown-item" appStopClick (click)="bulkActivate()">
+          <i class="bwi bwi-fw bwi-plus-circle" aria-hidden="true"></i>
+          {{ "activate" | i18n }}
+        </button>
+        <button class="dropdown-item" appStopClick (click)="bulkDeactivate()">
+          <i class="bwi bwi-fw bwi-minus-circle" aria-hidden="true"></i>
+          {{ "deactivate" | i18n }}
+        </button>
+        <button class="dropdown-item text-danger" appStopClick (click)="bulkRemove()">
+          <i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>
+          {{ "remove" | i18n }}
+        </button>
+        <div class="dropdown-divider"></div>
+        <button class="dropdown-item" appStopClick (click)="selectAll(true)">
+          <i class="bwi bwi-fw bwi-check-square" aria-hidden="true"></i>
+          {{ "selectAll" | i18n }}
+        </button>
+        <button class="dropdown-item" appStopClick (click)="selectAll(false)">
+          <i class="bwi bwi-fw bwi-minus-square" aria-hidden="true"></i>
+          {{ "unselectAll" | i18n }}
+        </button>
+      </div>
+    </div>
+    <button type="button" class="btn btn-sm btn-outline-primary ml-3" (click)="invite()">
+      <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
+      {{ "inviteUser" | i18n }}
+    </button>
+  </div>
+</div>
+<ng-container *ngIf="loading">
+  <i
+    class="bwi bwi-spinner bwi-spin text-muted"
+    title="{{ 'loading' | i18n }}"
+    aria-hidden="true"
+  ></i>
+  <span class="sr-only">{{ "loading" | i18n }}</span>
+</ng-container>
+<ng-container
+  *ngIf="
+    !loading &&
+    (isPaging() ? pagedUsers : (users | search: searchText:'name':'email':'id')) as searchedUsers
+  "
+>
+  <p *ngIf="!searchedUsers.length">{{ "noUsersInList" | i18n }}</p>
+  <ng-container *ngIf="searchedUsers.length">
+    <app-callout
+      type="info"
+      title="{{ 'confirmUsers' | i18n }}"
+      icon="bwi bwi-check-circle"
+      *ngIf="showConfirmUsers"
+    >
+      {{ "usersNeedConfirmed" | i18n }}
+    </app-callout>
+    <table
+      class="table table-hover table-list"
+      infiniteScroll
+      [infiniteScrollDistance]="1"
+      [infiniteScrollDisabled]="!isPaging()"
+      (scrolled)="loadMore()"
+    >
+      <tbody>
+        <tr *ngFor="let u of searchedUsers">
+          <td (click)="checkUser(u)" class="table-list-checkbox">
+            <input type="checkbox" [(ngModel)]="u.checked" appStopProp />
+          </td>
+          <td width="30">
+            <app-avatar
+              [data]="u | userName"
+              [email]="u.email"
+              size="25"
+              [circle]="true"
+              [fontSize]="14"
+            >
+            </app-avatar>
+          </td>
+          <td>
+            <a href="#" appStopClick (click)="edit(u)">{{ u.email }}</a>
+            <span bitBadge badgeType="secondary" *ngIf="u.status === userStatusType.Invited">{{
+              "invited" | i18n
+            }}</span>
+            <span bitBadge badgeType="warning" *ngIf="u.status === userStatusType.Accepted">{{
+              "accepted" | i18n
+            }}</span>
+            <span bitBadge badgeType="secondary" *ngIf="u.status === userStatusType.Deactivated">{{
+              "deactivated" | i18n
+            }}</span>
+            <small class="text-muted d-block" *ngIf="u.name">{{ u.name }}</small>
+          </td>
+          <td>
+            <ng-container *ngIf="u.twoFactorEnabled">
+              <i
+                class="bwi bwi-lock"
+                title="{{ 'userUsingTwoStep' | i18n }}"
+                aria-hidden="true"
+              ></i>
+              <span class="sr-only">{{ "userUsingTwoStep" | i18n }}</span>
+            </ng-container>
+            <ng-container *ngIf="showEnrolledStatus(u)">
+              <i
+                class="bwi bwi-key"
+                title="{{ 'enrolledPasswordReset' | i18n }}"
+                aria-hidden="true"
+              ></i>
+              <span class="sr-only">{{ "enrolledPasswordReset" | i18n }}</span>
+            </ng-container>
+          </td>
+          <td>
+            <span *ngIf="u.type === userType.Owner">{{ "owner" | i18n }}</span>
+            <span *ngIf="u.type === userType.Admin">{{ "admin" | i18n }}</span>
+            <span *ngIf="u.type === userType.Manager">{{ "manager" | i18n }}</span>
+            <span *ngIf="u.type === userType.User">{{ "user" | i18n }}</span>
+            <span *ngIf="u.type === userType.Custom">{{ "custom" | i18n }}</span>
+          </td>
+          <td class="table-list-options">
+            <div class="dropdown" appListDropdown>
+              <button
+                class="btn btn-outline-secondary dropdown-toggle"
+                type="button"
+                data-toggle="dropdown"
+                aria-haspopup="true"
+                aria-expanded="false"
+                appA11yTitle="{{ 'options' | i18n }}"
+              >
+                <i class="bwi bwi-cog bwi-lg" aria-hidden="true"></i>
+              </button>
+              <div class="dropdown-menu dropdown-menu-right">
+                <a
+                  class="dropdown-item"
+                  href="#"
+                  appStopClick
+                  (click)="reinvite(u)"
+                  *ngIf="u.status === userStatusType.Invited"
+                >
+                  <i class="bwi bwi-fw bwi-envelope" aria-hidden="true"></i>
+                  {{ "resendInvitation" | i18n }}
+                </a>
+                <a
+                  class="dropdown-item text-success"
+                  href="#"
+                  appStopClick
+                  (click)="confirm(u)"
+                  *ngIf="u.status === userStatusType.Accepted"
+                >
+                  <i class="bwi bwi-fw bwi-check" aria-hidden="true"></i>
+                  {{ "confirm" | i18n }}
+                </a>
+                <a
+                  class="dropdown-item"
+                  href="#"
+                  appStopClick
+                  (click)="groups(u)"
+                  *ngIf="accessGroups"
+                >
+                  <i class="bwi bwi-fw bwi-sitemap" aria-hidden="true"></i>
+                  {{ "groups" | i18n }}
+                </a>
+                <a
+                  class="dropdown-item"
+                  href="#"
+                  appStopClick
+                  (click)="events(u)"
+                  *ngIf="accessEvents && u.status === userStatusType.Confirmed"
+                >
+                  <i class="bwi bwi-fw bwi-file-text" aria-hidden="true"></i>
+                  {{ "eventLogs" | i18n }}
+                </a>
+                <a
+                  class="dropdown-item"
+                  href="#"
+                  appStopClick
+                  (click)="resetPassword(u)"
+                  *ngIf="allowResetPassword(u)"
+                >
+                  <i class="bwi bwi-fw bwi-key" aria-hidden="true"></i>
+                  {{ "resetPassword" | i18n }}
+                </a>
+                <a
+                  class="dropdown-item"
+                  href="#"
+                  appStopClick
+                  (click)="activate(u)"
+                  *ngIf="u.status === userStatusType.Deactivated"
+                >
+                  <i class="bwi bwi-fw bwi-plus-circle" aria-hidden="true"></i>
+                  {{ "activate" | i18n }}
+                </a>
+                <a
+                  class="dropdown-item"
+                  href="#"
+                  appStopClick
+                  (click)="deactivate(u)"
+                  *ngIf="u.status !== userStatusType.Deactivated"
+                >
+                  <i class="bwi bwi-fw bwi-minus-circle" aria-hidden="true"></i>
+                  {{ "deactivate" | i18n }}
+                </a>
+                <a class="dropdown-item text-danger" href="#" appStopClick (click)="remove(u)">
+                  <i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>
+                  {{ "remove" | i18n }}
+                </a>
+              </div>
+            </div>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </ng-container>
+</ng-container>
+<ng-template #addEdit></ng-template>
+<ng-template #groupsTemplate></ng-template>
+<ng-template #eventsTemplate></ng-template>
+<ng-template #confirmTemplate></ng-template>
+<ng-template #resetPasswordTemplate></ng-template>
+<ng-template #bulkStatusTemplate></ng-template>
+<ng-template #bulkConfirmTemplate></ng-template>
+<ng-template #bulkRemoveTemplate></ng-template>
diff --git a/apps/web/src/app/organizations/members/members.component.ts b/apps/web/src/app/organizations/manage/people.component.ts
similarity index 99%
rename from apps/web/src/app/organizations/members/members.component.ts
rename to apps/web/src/app/organizations/manage/people.component.ts
index 99aadfe96de..318b0b20b60 100644
--- a/apps/web/src/app/organizations/members/members.component.ts
+++ b/apps/web/src/app/organizations/manage/people.component.ts
@@ -38,10 +38,10 @@ import { UserAddEditComponent } from "./user-add-edit.component";
 import { UserGroupsComponent } from "./user-groups.component";
 
 @Component({
-  selector: "app-org-members",
-  templateUrl: "members.component.html",
+  selector: "app-org-people",
+  templateUrl: "people.component.html",
 })
-export class MembersComponent
+export class PeopleComponent
   extends BasePeopleComponent<OrganizationUserUserDetailsResponse>
   implements OnInit
 {
diff --git a/apps/web/src/app/organizations/members/reset-password.component.html b/apps/web/src/app/organizations/manage/reset-password.component.html
similarity index 100%
rename from apps/web/src/app/organizations/members/reset-password.component.html
rename to apps/web/src/app/organizations/manage/reset-password.component.html
diff --git a/apps/web/src/app/organizations/members/reset-password.component.ts b/apps/web/src/app/organizations/manage/reset-password.component.ts
similarity index 100%
rename from apps/web/src/app/organizations/members/reset-password.component.ts
rename to apps/web/src/app/organizations/manage/reset-password.component.ts
diff --git a/apps/web/src/app/organizations/members/user-add-edit.component.html b/apps/web/src/app/organizations/manage/user-add-edit.component.html
similarity index 100%
rename from apps/web/src/app/organizations/members/user-add-edit.component.html
rename to apps/web/src/app/organizations/manage/user-add-edit.component.html
diff --git a/apps/web/src/app/organizations/members/user-add-edit.component.ts b/apps/web/src/app/organizations/manage/user-add-edit.component.ts
similarity index 100%
rename from apps/web/src/app/organizations/members/user-add-edit.component.ts
rename to apps/web/src/app/organizations/manage/user-add-edit.component.ts
diff --git a/apps/web/src/app/organizations/members/user-groups.component.html b/apps/web/src/app/organizations/manage/user-groups.component.html
similarity index 100%
rename from apps/web/src/app/organizations/members/user-groups.component.html
rename to apps/web/src/app/organizations/manage/user-groups.component.html
diff --git a/apps/web/src/app/organizations/members/user-groups.component.ts b/apps/web/src/app/organizations/manage/user-groups.component.ts
similarity index 100%
rename from apps/web/src/app/organizations/members/user-groups.component.ts
rename to apps/web/src/app/organizations/manage/user-groups.component.ts
diff --git a/apps/web/src/app/organizations/members/members.component.html b/apps/web/src/app/organizations/members/members.component.html
index 93460d49b09..880967155ac 100644
--- a/apps/web/src/app/organizations/members/members.component.html
+++ b/apps/web/src/app/organizations/members/members.component.html
@@ -1,7 +1,7 @@
 <div class="container page-content">
   <div class="page-header d-flex">
     <h1>{{ "members" | i18n }}</h1>
-    <div class="ml-auto d-flex">
+    <div class="mt-2 d-flex ml-auto">
       <div class="btn-group btn-group-sm" role="group">
         <button
           type="button"
diff --git a/apps/web/src/app/organizations/organization-routing.module.ts b/apps/web/src/app/organizations/organization-routing.module.ts
index 544047a22bc..443f1b0e296 100644
--- a/apps/web/src/app/organizations/organization-routing.module.ts
+++ b/apps/web/src/app/organizations/organization-routing.module.ts
@@ -16,7 +16,7 @@ import { GroupsComponent } from "./groups/groups.component";
 import { PermissionsGuard } from "./guards/permissions.guard";
 import { OrganizationLayoutComponent } from "./layouts/organization-layout.component";
 import { EventsComponent } from "./manage/events.component";
-import { MembersComponent } from "./members/members.component";
+import { PeopleComponent } from "./manage/people.component";
 import { NavigationPermissionsService } from "./services/navigation-permissions.service";
 import { AccountComponent } from "./settings/account.component";
 import { SettingsComponent } from "./settings/settings.component";
@@ -58,7 +58,7 @@ const routes: Routes = [
       },
       {
         path: "members",
-        component: MembersComponent,
+        component: PeopleComponent,
         canActivate: [PermissionsGuard],
         data: {
           titleId: "members",
diff --git a/bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-confirm.component.ts b/bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-confirm.component.ts
index 7ea184aac8a..f2ab04b9cd7 100644
--- a/bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-confirm.component.ts
+++ b/bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-confirm.component.ts
@@ -4,12 +4,12 @@ import { ProviderUserStatusType } from "@bitwarden/common/enums/providerUserStat
 import { ProviderUserBulkConfirmRequest } from "@bitwarden/common/models/request/provider/providerUserBulkConfirmRequest";
 import { ProviderUserBulkRequest } from "@bitwarden/common/models/request/provider/providerUserBulkRequest";
 
-import { BulkConfirmComponent as OrganizationBulkConfirmComponent } from "src/app/organizations/members/bulk/bulk-confirm.component";
-import { BulkUserDetails } from "src/app/organizations/members/bulk/bulk-status.component";
+import { BulkConfirmComponent as OrganizationBulkConfirmComponent } from "src/app/organizations/manage/bulk/bulk-confirm.component";
+import { BulkUserDetails } from "src/app/organizations/manage/bulk/bulk-status.component";
 
 @Component({
   templateUrl:
-    "../../../../../../../apps/web/src/app/organizations/members/bulk/bulk-confirm.component.html",
+    "../../../../../../../apps/web/src/app/organizations/manage/bulk/bulk-confirm.component.html",
 })
 export class BulkConfirmComponent extends OrganizationBulkConfirmComponent {
   @Input() providerId: string;
diff --git a/bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-remove.component.ts b/bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-remove.component.ts
index 575d7c98f3e..3bc70541f08 100644
--- a/bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-remove.component.ts
+++ b/bitwarden_license/bit-web/src/app/providers/manage/bulk/bulk-remove.component.ts
@@ -2,11 +2,11 @@ import { Component, Input } from "@angular/core";
 
 import { ProviderUserBulkRequest } from "@bitwarden/common/models/request/provider/providerUserBulkRequest";
 
-import { BulkRemoveComponent as OrganizationBulkRemoveComponent } from "src/app/organizations/members/bulk/bulk-remove.component";
+import { BulkRemoveComponent as OrganizationBulkRemoveComponent } from "src/app/organizations/manage/bulk/bulk-remove.component";
 
 @Component({
   templateUrl:
-    "../../../../../../../apps/web/src/app/organizations/members/bulk/bulk-remove.component.html",
+    "../../../../../../../apps/web/src/app/organizations/manage/bulk/bulk-remove.component.html",
 })
 export class BulkRemoveComponent extends OrganizationBulkRemoveComponent {
   @Input() providerId: string;
diff --git a/bitwarden_license/bit-web/src/app/providers/manage/people.component.ts b/bitwarden_license/bit-web/src/app/providers/manage/people.component.ts
index cf29cccf0f9..9c585bbe5f1 100644
--- a/bitwarden_license/bit-web/src/app/providers/manage/people.component.ts
+++ b/bitwarden_license/bit-web/src/app/providers/manage/people.component.ts
@@ -23,8 +23,8 @@ import { ProviderUserBulkResponse } from "@bitwarden/common/models/response/prov
 import { ProviderUserUserDetailsResponse } from "@bitwarden/common/models/response/provider/providerUserResponse";
 
 import { BasePeopleComponent } from "src/app/common/base.people.component";
-import { BulkStatusComponent } from "src/app/organizations/members/bulk/bulk-status.component";
-import { EntityEventsComponent } from "src/app/organizations/members/entity-events.component";
+import { BulkStatusComponent } from "src/app/organizations/manage/bulk/bulk-status.component";
+import { EntityEventsComponent } from "src/app/organizations/manage/entity-events.component";
 
 import { BulkConfirmComponent } from "./bulk/bulk-confirm.component";
 import { BulkRemoveComponent } from "./bulk/bulk-remove.component";