[AC-1011] Admin Console / Billing code ownership (#4973)

* refactor: move SCIM component to admin-console, refs EC-1011

* refactor: move scimProviderType to admin-console, refs EC-1011

* refactor: move scim-config.api to admin-console, refs EC-1011

* refactor: create models folder and nest existing api contents, refs EC-1011

* refactor: move scim-config to admin-console models, refs EC-1011

* refactor: move billing.component to billing, refs EC-1011

* refactor: remove nested app folder from new billing structure, refs EC-1011

* refactor: move organizations/billing to billing, refs EC-1011

* refactor: move add-credit and adjust-payment to billing/settings, refs EC-1011

* refactor: billing history/sync to billing, refs EC-1011

* refactor: move org plans, payment/method to billing/settings, refs EC-1011

* fix: update legacy file paths for payment-method and tax-info, refs EC-1011

* fix: update imports for scim component, refs EC-1011

* refactor: move subscription and tax-info into billing, refs EC-1011

* refactor: move user-subscription to billing, refs EC-1011

* refactor: move images/cards to billing and update base path, refs EC-1011

* refactor: move payment-method, plan subscription, and plan to billing, refs EC-1011

* refactor: move transaction-type to billing, refs EC-1011

* refactor: move billing-sync-config to billing, refs EC-1011

* refactor: move billing-sync and bit-pay-invoice request to billing, refs EC-1011

* refactor: move org subscription and tax info update requests to billing, refs EC-1011

* fix: broken paths to billing, refs EC-1011

* refactor: move payment request to billing, refs EC-1011

* fix: update remaining imports for payment-request, refs EC-1011

* refactor: move tax-info-update to billing, refs EC-1011

* refactor: move billing-payment, billing-history, and billing responses to billing, refs EC-1011

* refactor: move organization-subscription-responset to billing, refs EC-1011

* refactor: move payment and plan responses to billing, refs EC-1011

* refactor: move subscription response to billing ,refs EC-1011

* refactor: move tax info and rate responses to billing, refs EC-1011

* fix: update remaining path to base response for tax-rate response, refs EC-1011

* refactor: (browser) move organization-service to admin-console, refs EC-1011

* refactor: (browser) move organizaiton-service to admin-console, refs EC-1011

* refactor: (cli) move share command to admin-console, refs EC-1011

* refactor: move organization-collect request model to admin-console, refs EC-1011

* refactor: (web) move organization, collection/user responses to admin-console, refs EC-1011

* refactor: (cli) move selection-read-only to admin-console, refs EC-1011

* refactor: (desktop) move organization-filter to admin-console, refs EC-1011

* refactor: (web) move organization-switcher to admin-console, refs EC-1011

* refactor: (web) move access-selector to admin-console, refs EC-1011

* refactor: (web) move create folder to admin-console, refs EC-1011

* refactor: (web) move org guards folder to admin-console, refs EC-1011

* refactor: (web) move org layout to admin-console, refs EC-1011

* refactor: move manage collections to admin console, refs EC-1011

* refactor: (web) move collection-dialog to admin-console, refs EC-1011

* refactor: (web) move entity users/events and events component to admin-console, refs EC-1011

* refactor: (web) move groups/group-add-edit to admin-console, refs EC-1011

* refactor: (web) move manage, org-manage module, and user-confirm to admin-console, refs EC-1011

* refactor: (web) move people to admin-console, refs EC-1011

* refactor: (web) move reset-password to admin-console, refs EC-1011

* refactor: (web) move organization-routing and module to admin-console, refs EC-1011

* refactor: move admin-console and billing within app scope, refs EC-1011

* fix: update leftover merge conflicts, refs EC-1011

* refactor: (web) member-dialog to admin-console, refs EC-1011

* refactor: (web) move policies to admin-console, refs EC-1011

* refactor: (web) move reporting to admin-console, refs EC-1011

* refactor: (web) move settings to admin-console, refs EC-1011

* refactor: (web) move sponsorships to admin-console, refs EC-1011

* refactor: (web) move tools to admin-console, refs EC-1011

* refactor: (web) move users to admin-console, refs EC-1011

* refactor: (web) move collections to admin-console, refs EC-1011

* refactor: (web) move create-organization to admin-console, refs EC-1011

* refactor: (web) move licensed components to admin-console, refs EC-1011

* refactor: (web) move bit organization modules to admin-console, refs EC-1011

* fix: update leftover import statements for organizations.module, refs EC-1011

* refactor: (web) move personal vault and max timeout to admin-console, refs EC-1011

* refactor: (web) move providers to admin-console, refs EC-1011

* refactor: (libs) move organization service to admin-console, refs EC-1011

* refactor: (libs) move profile org/provider responses and other misc org responses to admin-console, refs EC-1011

* refactor: (libs) move provider request and selectionion-read-only request to admin-console, refs EC-1011

* fix: update missed import path for provider-user-update request, refs EC-1011

* refactor: (libs) move abstractions to admin-console, refs EC-1011

* refactor: (libs) move org/provider enums to admin-console, refs EC-1011

* fix: update downstream import statements from libs changes, refs EC-1011

* refactor: (libs) move data files to admin-console, refs EC-1011

* refactor: (libs) move domain to admin-console, refs EC-1011

* refactor: (libs) move request objects to admin-console, refs EC-1011

* fix: update downstream import changes from libs, refs EC-1011

* refactor: move leftover provider files to admin-console, refs EC-1011

* refactor: (browser) move group policy environment to admin-console, refs EC-1011

* fix: (browser) update downstream import statements, refs EC-1011

* fix: (desktop) update downstream libs moves, refs EC-1011

* fix: (cli) update downstream import changes from libs, refs EC-1011

* refactor: move org-auth related files to admin-console, refs EC-1011

* refactor: (libs) move request objects to admin-console, refs EC-1011

* refactor: move persmissions to admin-console, refs EC-1011

* refactor: move sponsored families to admin-console and fix libs changes, refs EC-1011

* refactor: move collections to admin-console, refs EC-1011

* refactor: move spec file back to spec scope, refs EC-1011

* fix: update downstream imports due to libs changes, refs EC-1011

* fix: udpate downstream import changes due to libs, refs EC-1011

* fix: update downstream imports due to libs changes, refs EC-1011

* fix: update downstream imports from libs changes, refs EC-1011

* fix: update path malformation in jslib-services.module, refs EC-1011

* fix: lint errors from improper casing, refs AC-1011

* fix: update downstream filename changes, refs AC-1011

* fix: (cli) update downstream filename changes, refs AC-1011

* fix: (desktop) update downstream filename changes, refs AC-1011

* fix: (browser) update downstream filename changes, refs AC-1011

* fix: lint errors, refs AC-1011

* fix: prettier, refs AC-1011

* fix: lint fixes for import order, refs AC-1011

* fix: update import path for provider user type, refs AC-1011

* fix: update new codes import paths for admin console structure, refs AC-1011

* fix: lint/prettier, refs AC-1011

* fix: update layout stories path, refs AC-1011

* fix: update comoponents card icons base variable in styles, refs AC-1011

* fix: update provider service path in permissions guard spec, refs AC-1011

* fix: update provider permission guard path, refs AC-1011

* fix: remove unecessary TODO for shared index export statement, refs AC-1011

* refactor: move browser-organization service and cli organization-user response out of admin-console, refs AC-1011

* refactor: move web/browser/desktop collections component to vault domain, refs AC-1011

* refactor: move organization.module out of admin-console scope, refs AC-1011

* fix: prettier, refs AC-1011

* refactor: move organizations-api-key.request out of admin-console scope, refs AC-1011

apps/web/src/app/accounts/trial-initiation/trial-initiation.component.spec.ts

@@ -11,13 +11,13 @@ import { BehaviorSubject, of } from "rxjs";
 import { I18nPipe } from "@bitwarden/angular/pipes/i18n.pipe";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction";
-import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
-import { PlanType } from "@bitwarden/common/enums/planType";
-import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options";
+import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
+import { PolicyResponse } from "@bitwarden/common/admin-console/models/response/policy.response";
+import { PlanType } from "@bitwarden/common/billing/enums/plan-type";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
-import { PolicyResponse } from "@bitwarden/common/models/response/policy.response";
 
 import { RouterService } from "../../core";
 

apps/web/src/app/accounts/trial-initiation/trial-initiation.component.ts

@@ -7,14 +7,14 @@ import { first, Subject, takeUntil } from "rxjs";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction";
-import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
-import { PlanType } from "@bitwarden/common/enums/planType";
+import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { PolicyData } from "@bitwarden/common/admin-console/models/data/policy.data";
+import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
+import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
+import { PlanType } from "@bitwarden/common/billing/enums/plan-type";
 import { ProductType } from "@bitwarden/common/enums/productType";
-import { PolicyData } from "@bitwarden/common/models/data/policy.data";
-import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options";
-import { Policy } from "@bitwarden/common/models/domain/policy";
 import { ReferenceEventRequest } from "@bitwarden/common/models/request/reference-event.request";
 
 import { RouterService } from "./../../core/router.service";

apps/web/src/app/accounts/trial-initiation/trial-initiation.module.ts

@@ -5,10 +5,10 @@ import { NgModule } from "@angular/core";
 import { FormFieldModule } from "@bitwarden/components";
 
 import { RegisterFormModule } from "../../../auth/register-form/register-form.module";
-import { OrganizationCreateModule } from "../../organizations/create/organization-create.module";
+import { OrganizationCreateModule } from "../../admin-console/organizations/create/organization-create.module";
+import { BillingComponent } from "../../billing/accounts/trial-initiation/billing.component";
 import { LooseComponentsModule, SharedModule } from "../../shared";
 
-import { BillingComponent } from "./billing.component";
 import { ConfirmationDetailsComponent } from "./confirmation-details.component";
 import { AbmEnterpriseContentComponent } from "./content/abm-enterprise-content.component";
 import { AbmTeamsContentComponent } from "./content/abm-teams-content.component";

apps/web/src/app/admin-console/components/organization-switcher.component.ts

@@ -6,9 +6,9 @@ import {
   canAccessAdmin,
   isNotProviderUser,
   OrganizationService,
-} from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
+} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { Utils } from "@bitwarden/common/misc/utils";
-import { Organization } from "@bitwarden/common/models/domain/organization";
 
 @Component({
   selector: "app-organization-switcher",

apps/web/src/app/admin-console/organizations/create/organization-create.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from "@angular/core";
 
-import { SharedModule } from "../../shared";
+import { SharedModule } from "../../../shared";
 
 import { OrganizationInformationComponent } from "./organization-information.component";
 

apps/web/src/app/admin-console/organizations/guards/org-permissions.guard.spec.ts

@@ -7,10 +7,10 @@ import {
 import { mock, MockProxy } from "jest-mock-extended";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType";
-import { Organization } from "@bitwarden/common/models/domain/organization";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { OrganizationUserType } from "@bitwarden/common/admin-console/enums/organization-user-type";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 
 import { OrganizationPermissionsGuard } from "./org-permissions.guard";

apps/web/src/app/admin-console/organizations/guards/org-permissions.guard.ts

@@ -2,12 +2,12 @@ import { Injectable } from "@angular/core";
 import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from "@angular/router";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import {
   canAccessOrgAdmin,
   OrganizationService,
-} from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
-import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { Organization } from "@bitwarden/common/models/domain/organization";
+} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 
 @Injectable({

apps/web/src/app/admin-console/organizations/guards/org-redirect.guard.ts

@@ -4,7 +4,7 @@ import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from
 import {
   canAccessOrgAdmin,
   OrganizationService,
-} from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
+} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 
 @Injectable({
   providedIn: "root",

apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts

@@ -11,8 +11,8 @@ import {
   canAccessVaultTab,
   getOrganizationById,
   OrganizationService,
-} from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
-import { Organization } from "@bitwarden/common/models/domain/organization";
+} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 
 @Component({
   selector: "app-organization-layout",

apps/web/src/app/admin-console/organizations/manage/collections.component.ts

@@ -5,22 +5,22 @@ import { first } from "rxjs/operators";
 
 import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
-import { ProductType } from "@bitwarden/common/enums/productType";
-import { CollectionData } from "@bitwarden/common/models/data/collection.data";
-import { Collection } from "@bitwarden/common/models/domain/collection";
-import { Organization } from "@bitwarden/common/models/domain/organization";
+import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { CollectionData } from "@bitwarden/common/admin-console/models/data/collection.data";
+import { Collection } from "@bitwarden/common/admin-console/models/domain/collection";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import {
   CollectionDetailsResponse,
   CollectionResponse,
-} from "@bitwarden/common/models/response/collection.response";
+} from "@bitwarden/common/admin-console/models/response/collection.response";
+import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view";
+import { ProductType } from "@bitwarden/common/enums/productType";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
-import { CollectionView } from "@bitwarden/common/models/view/collection.view";
 import {
   DialogService,
   SimpleDialogCloseType,
@@ -28,9 +28,11 @@ import {
   SimpleDialogType,
 } from "@bitwarden/components";
 
-import { CollectionDialogResult, openCollectionDialog } from "../shared";
-
-import { EntityUsersComponent } from "./entity-users.component";
+import { EntityUsersComponent } from "../manage/entity-users.component";
+import {
+  CollectionDialogResult,
+  openCollectionDialog,
+} from "../shared/components/collection-dialog";
 
 @Component({
   selector: "app-org-manage-collections",

apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts

@@ -9,7 +9,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti
 import { EventResponse } from "@bitwarden/common/models/response/event.response";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
 
-import { EventService } from "../../core";
+import { EventService } from "../../../core";
 
 @Component({
   selector: "app-entity-events",

apps/web/src/app/admin-console/organizations/manage/entity-users.component.ts

@@ -7,10 +7,10 @@ import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
 import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/abstractions/organization-user/responses";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType";
-import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType";
+import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums/organization-user-status-type";
+import { OrganizationUserType } from "@bitwarden/common/admin-console/enums/organization-user-type";
+import { SelectionReadOnlyRequest } from "@bitwarden/common/admin-console/models/request/selection-read-only.request";
 import { Utils } from "@bitwarden/common/misc/utils";
-import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selection-read-only.request";
 
 @Component({
   selector: "app-entity-users",

apps/web/src/app/admin-console/organizations/manage/events.component.ts

@@ -9,15 +9,15 @@ import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
-import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { ProviderService } from "@bitwarden/common/abstractions/provider.service";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { EventSystemUser } from "@bitwarden/common/enums/event-system-user";
-import { Organization } from "@bitwarden/common/models/domain/organization";
 import { EventResponse } from "@bitwarden/common/models/response/event.response";
 
-import { BaseEventsComponent } from "../../common/base.events.component";
-import { EventService } from "../../core";
+import { BaseEventsComponent } from "../../../common/base.events.component";
+import { EventService } from "../../../core";
 
 const EVENT_SYSTEM_USER_TO_TRANSLATION: Record<EventSystemUser, string> = {
   [EventSystemUser.SCIM]: null, // SCIM acronym not able to be translated so just display SCIM

apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts

@@ -4,18 +4,18 @@ import { FormBuilder, Validators } from "@angular/forms";
 import { catchError, combineLatest, from, map, of, Subject, switchMap, takeUntil } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { CollectionData } from "@bitwarden/common/models/data/collection.data";
-import { Collection } from "@bitwarden/common/models/domain/collection";
-import { CollectionDetailsResponse } from "@bitwarden/common/models/response/collection.response";
+import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service";
+import { CollectionData } from "@bitwarden/common/admin-console/models/data/collection.data";
+import { Collection } from "@bitwarden/common/admin-console/models/domain/collection";
+import { CollectionDetailsResponse } from "@bitwarden/common/admin-console/models/response/collection.response";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { DialogService } from "@bitwarden/components";
 
-import { GroupService, GroupView } from "../core";
+import { GroupService, GroupView } from "../../../organizations/core";
 import {
   AccessItemType,
   AccessItemValue,

apps/web/src/app/admin-console/organizations/manage/groups.component.ts

@@ -17,23 +17,23 @@ import { first } from "rxjs/operators";
 import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe";
 import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
-import { Utils } from "@bitwarden/common/misc/utils";
-import { CollectionData } from "@bitwarden/common/models/data/collection.data";
-import { Collection } from "@bitwarden/common/models/domain/collection";
+import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service";
+import { CollectionData } from "@bitwarden/common/admin-console/models/data/collection.data";
+import { Collection } from "@bitwarden/common/admin-console/models/domain/collection";
 import {
   CollectionDetailsResponse,
   CollectionResponse,
-} from "@bitwarden/common/models/response/collection.response";
+} from "@bitwarden/common/admin-console/models/response/collection.response";
+import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view";
+import { Utils } from "@bitwarden/common/misc/utils";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
-import { CollectionView } from "@bitwarden/common/models/view/collection.view";
 import { DialogService } from "@bitwarden/components";
 
-import { GroupService, GroupView } from "../core";
+import { GroupService, GroupView } from "../../../organizations/core";
 
 import {
   GroupAddEditDialogResultType,

apps/web/src/app/admin-console/organizations/manage/manage.component.ts

@@ -1,8 +1,8 @@
 import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 
-import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
-import { Organization } from "@bitwarden/common/models/domain/organization";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 
 @Component({
   selector: "app-org-manage",

apps/web/src/app/admin-console/organizations/manage/organization-manage.module.ts

@@ -1,9 +1,8 @@
 import { ScrollingModule } from "@angular/cdk/scrolling";
 import { NgModule } from "@angular/core";
 
-import { SharedModule } from "../../shared";
-
-import { EntityUsersComponent } from "./entity-users.component";
+import { EntityUsersComponent } from "../../../admin-console/organizations/manage/entity-users.component";
+import { SharedModule } from "../../../shared";
 
 @NgModule({
   imports: [SharedModule, ScrollingModule],

apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts

@@ -5,16 +5,16 @@ import { combineLatest, of, shareReplay, Subject, switchMap, takeUntil } from "r
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
-import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType";
-import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType";
-import { PermissionsApi } from "@bitwarden/common/models/api/permissions.api";
-import { Organization } from "@bitwarden/common/models/domain/organization";
-import { CollectionView } from "@bitwarden/common/models/view/collection.view";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums/organization-user-status-type";
+import { OrganizationUserType } from "@bitwarden/common/admin-console/enums/organization-user-type";
+import { PermissionsApi } from "@bitwarden/common/admin-console/models/api/permissions.api";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view";
 import { DialogService } from "@bitwarden/components";
 
-import { flagEnabled } from "../../../../../utils/flags";
+import { flagEnabled } from "../../../../../../utils/flags";
 import {
   CollectionAccessSelectionView,
   CollectionAdminService,
@@ -22,7 +22,7 @@ import {
   GroupView,
   OrganizationUserAdminView,
   UserAdminService,
-} from "../../../core";
+} from "../../../../../organizations/core";
 import {
   AccessItemType,
   AccessItemValue,

apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.module.ts

@@ -2,7 +2,7 @@ import { NgModule } from "@angular/core";
 
 import { RadioButtonModule } from "@bitwarden/components";
 
-import { SharedOrganizationModule } from "../../../shared";
+import { SharedOrganizationModule } from "../../../../../organizations/shared";
 
 import { MemberDialogComponent } from "./member-dialog.component";
 import { NestedCheckboxComponent } from "./nested-checkbox.component";

apps/web/src/app/admin-console/organizations/members/components/reset-password.component.ts

@@ -17,11 +17,11 @@ import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
 import { OrganizationUserResetPasswordRequest } from "@bitwarden/common/abstractions/organization-user/requests";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
 import { KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config";
 import { Utils } from "@bitwarden/common/misc/utils";
 import { EncString } from "@bitwarden/common/models/domain/enc-string";
-import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options";
 import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
 

apps/web/src/app/admin-console/organizations/members/people.component.ts

@@ -17,7 +17,6 @@ import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe";
 import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe";
 import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
@@ -27,23 +26,24 @@ import {
   OrganizationUserBulkResponse,
   OrganizationUserUserDetailsResponse,
 } from "@bitwarden/common/abstractions/organization-user/responses";
-import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction";
-import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { PolicyApiServiceAbstraction as PolicyApiService } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction";
-import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { ValidationService } from "@bitwarden/common/abstractions/validation.service";
-import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType";
-import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType";
-import { PolicyType } from "@bitwarden/common/enums/policyType";
+import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service";
+import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { PolicyApiServiceAbstraction as PolicyApiService } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums/organization-user-status-type";
+import { OrganizationUserType } from "@bitwarden/common/admin-console/enums/organization-user-type";
+import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type";
+import { CollectionData } from "@bitwarden/common/admin-console/models/data/collection.data";
+import { Collection } from "@bitwarden/common/admin-console/models/domain/collection";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { OrganizationKeysRequest } from "@bitwarden/common/admin-console/models/request/organization-keys.request";
+import { CollectionDetailsResponse } from "@bitwarden/common/admin-console/models/response/collection.response";
 import { ProductType } from "@bitwarden/common/enums/productType";
-import { CollectionData } from "@bitwarden/common/models/data/collection.data";
-import { Collection } from "@bitwarden/common/models/domain/collection";
-import { Organization } from "@bitwarden/common/models/domain/organization";
-import { OrganizationKeysRequest } from "@bitwarden/common/models/request/organization-keys.request";
-import { CollectionDetailsResponse } from "@bitwarden/common/models/response/collection.response";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import {
@@ -53,15 +53,15 @@ import {
   SimpleDialogType,
 } from "@bitwarden/components";
 
-import { BasePeopleComponent } from "../../common/base.people.component";
-import { GroupService } from "../core";
-import { OrganizationUserView } from "../core/views/organization-user.view";
-import { EntityEventsComponent } from "../manage/entity-events.component";
+import { EntityEventsComponent } from "../../../admin-console/organizations/manage/entity-events.component";
+import { BasePeopleComponent } from "../../../common/base.people.component";
+import { GroupService } from "../../../organizations/core";
+import { OrganizationUserView } from "../../../organizations/core/views/organization-user.view";
+import { BulkConfirmComponent } from "../../../organizations/members/components/bulk/bulk-confirm.component";
+import { BulkRemoveComponent } from "../../../organizations/members/components/bulk/bulk-remove.component";
+import { BulkRestoreRevokeComponent } from "../../../organizations/members/components/bulk/bulk-restore-revoke.component";
+import { BulkStatusComponent } from "../../../organizations/members/components/bulk/bulk-status.component";
 
-import { BulkConfirmComponent } from "./components/bulk/bulk-confirm.component";
-import { BulkRemoveComponent } from "./components/bulk/bulk-remove.component";
-import { BulkRestoreRevokeComponent } from "./components/bulk/bulk-restore-revoke.component";
-import { BulkStatusComponent } from "./components/bulk/bulk-status.component";
 import {
   MemberDialogResult,
   MemberDialogTab,

apps/web/src/app/admin-console/organizations/organization-routing.module.ts

@@ -9,17 +9,16 @@ import {
   canAccessVaultTab,
   canAccessReportingTab,
   canAccessSettingsTab,
-} from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
-import { Organization } from "@bitwarden/common/models/domain/organization";
+} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 
-import { VaultModule } from "../vault/org-vault/vault.module";
-
-import { OrganizationPermissionsGuard } from "./guards/org-permissions.guard";
-import { OrganizationRedirectGuard } from "./guards/org-redirect.guard";
-import { OrganizationLayoutComponent } from "./layouts/organization-layout.component";
-import { CollectionsComponent } from "./manage/collections.component";
-import { GroupsComponent } from "./manage/groups.component";
-import { ManageComponent } from "./manage/manage.component";
+import { OrganizationPermissionsGuard } from "../../admin-console/organizations/guards/org-permissions.guard";
+import { OrganizationRedirectGuard } from "../../admin-console/organizations/guards/org-redirect.guard";
+import { OrganizationLayoutComponent } from "../../admin-console/organizations/layouts/organization-layout.component";
+import { CollectionsComponent } from "../../admin-console/organizations/manage/collections.component";
+import { GroupsComponent } from "../../admin-console/organizations/manage/groups.component";
+import { ManageComponent } from "../../admin-console/organizations/manage/manage.component";
+import { VaultModule } from "../../vault/org-vault/vault.module";
 
 const routes: Routes = [
   {
@@ -45,11 +44,14 @@ const routes: Routes = [
       },
       {
         path: "settings",
-        loadChildren: () => import("./settings").then((m) => m.OrganizationSettingsModule),
+        loadChildren: () =>
+          import("./settings/organization-settings.module").then(
+            (m) => m.OrganizationSettingsModule
+          ),
       },
       {
         path: "members",
-        loadChildren: () => import("./members").then((m) => m.MembersModule),
+        loadChildren: () => import("../../organizations/members").then((m) => m.MembersModule),
       },
       {
         path: "groups",
@@ -76,14 +78,16 @@ const routes: Routes = [
       {
         path: "reporting",
         loadChildren: () =>
-          import("./reporting/organization-reporting.module").then(
+          import("../organizations/reporting/organization-reporting.module").then(
             (m) => m.OrganizationReportingModule
           ),
       },
       {
         path: "billing",
         loadChildren: () =>
-          import("./billing/organization-billing.module").then((m) => m.OrganizationBillingModule),
+          import("../../billing/organizations/organization-billing.module").then(
+            (m) => m.OrganizationBillingModule
+          ),
       },
     ],
   },

apps/web/src/app/admin-console/organizations/policies/base-policy.component.ts

@@ -1,10 +1,10 @@
 import { Directive, Input, OnInit } from "@angular/core";
 import { UntypedFormControl, UntypedFormGroup } from "@angular/forms";
 
-import { PolicyType } from "@bitwarden/common/enums/policyType";
-import { Organization } from "@bitwarden/common/models/domain/organization";
-import { PolicyRequest } from "@bitwarden/common/models/request/policy.request";
-import { PolicyResponse } from "@bitwarden/common/models/response/policy.response";
+import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { PolicyRequest } from "@bitwarden/common/admin-console/models/request/policy.request";
+import { PolicyResponse } from "@bitwarden/common/admin-console/models/response/policy.response";
 
 export abstract class BasePolicy {
   abstract name: string;

apps/web/src/app/admin-console/organizations/policies/disable-send.component.ts

@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
 
-import { PolicyType } from "@bitwarden/common/enums/policyType";
+import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type";
 
 import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
 

apps/web/src/app/admin-console/organizations/policies/master-password.component.ts

@@ -2,8 +2,8 @@ import { Component } from "@angular/core";
 import { UntypedFormBuilder } from "@angular/forms";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
-import { PolicyType } from "@bitwarden/common/enums/policyType";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type";
 
 import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
 

apps/web/src/app/admin-console/organizations/policies/password-generator.component.ts

@@ -2,7 +2,7 @@ import { Component } from "@angular/core";
 import { UntypedFormBuilder } from "@angular/forms";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { PolicyType } from "@bitwarden/common/enums/policyType";
+import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type";
 
 import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
 

apps/web/src/app/admin-console/organizations/policies/personal-ownership.component.ts

@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
 
-import { PolicyType } from "@bitwarden/common/enums/policyType";
+import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type";
 
 import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
 

apps/web/src/app/admin-console/organizations/policies/policies.component.ts

@@ -3,13 +3,13 @@ import { ActivatedRoute, Router } from "@angular/router";
 import { first } from "rxjs/operators";
 
 import { ModalService } from "@bitwarden/angular/services/modal.service";
-import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
-import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction";
-import { PolicyType } from "@bitwarden/common/enums/policyType";
-import { Organization } from "@bitwarden/common/models/domain/organization";
-import { PolicyResponse } from "@bitwarden/common/models/response/policy.response";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
+import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { PolicyResponse } from "@bitwarden/common/admin-console/models/response/policy.response";
 
-import { PolicyListService } from "../../core";
+import { PolicyListService } from "../../../core";
 import { BasePolicy } from "../policies";
 
 import { PolicyEditComponent } from "./policy-edit.component";

apps/web/src/app/admin-console/organizations/policies/policies.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from "@angular/core";
 
-import { LooseComponentsModule, SharedModule } from "../../shared";
+import { LooseComponentsModule, SharedModule } from "../../../shared";
 
 import { DisableSendPolicyComponent } from "./disable-send.component";
 import { MasterPasswordPolicyComponent } from "./master-password.component";

apps/web/src/app/admin-console/organizations/policies/policy-edit.component.ts

@@ -12,10 +12,10 @@ import {
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction";
-import { PolicyType } from "@bitwarden/common/enums/policyType";
-import { PolicyRequest } from "@bitwarden/common/models/request/policy.request";
-import { PolicyResponse } from "@bitwarden/common/models/response/policy.response";
+import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
+import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type";
+import { PolicyRequest } from "@bitwarden/common/admin-console/models/request/policy.request";
+import { PolicyResponse } from "@bitwarden/common/admin-console/models/response/policy.response";
 
 import { BasePolicy, BasePolicyComponent } from "../policies";
 

apps/web/src/app/admin-console/organizations/policies/require-sso.component.ts

@@ -1,9 +1,9 @@
 import { Component } from "@angular/core";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { PolicyType } from "@bitwarden/common/enums/policyType";
-import { Organization } from "@bitwarden/common/models/domain/organization";
-import { PolicyRequest } from "@bitwarden/common/models/request/policy.request";
+import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { PolicyRequest } from "@bitwarden/common/admin-console/models/request/policy.request";
 
 import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
 

apps/web/src/app/admin-console/organizations/policies/reset-password.component.ts

@@ -1,9 +1,9 @@
 import { Component } from "@angular/core";
 import { UntypedFormBuilder } from "@angular/forms";
 
-import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
-import { PolicyType } from "@bitwarden/common/enums/policyType";
-import { Organization } from "@bitwarden/common/models/domain/organization";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 
 import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
 

apps/web/src/app/admin-console/organizations/policies/send-options.component.ts

@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 import { UntypedFormBuilder } from "@angular/forms";
 
-import { PolicyType } from "@bitwarden/common/enums/policyType";
+import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type";
 
 import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
 

apps/web/src/app/admin-console/organizations/policies/single-org.component.ts

@@ -1,8 +1,8 @@
 import { Component } from "@angular/core";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { PolicyType } from "@bitwarden/common/enums/policyType";
-import { PolicyRequest } from "@bitwarden/common/models/request/policy.request";
+import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type";
+import { PolicyRequest } from "@bitwarden/common/admin-console/models/request/policy.request";
 
 import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
 

apps/web/src/app/admin-console/organizations/policies/two-factor-authentication.component.ts

@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
 
-import { PolicyType } from "@bitwarden/common/enums/policyType";
+import { PolicyType } from "@bitwarden/common/admin-console/enums/policy-type";
 
 import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
 

apps/web/src/app/admin-console/organizations/reporting/organization-reporting-routing.module.ts

@@ -1,17 +1,17 @@
 import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
 
-import { canAccessReportingTab } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
-import { Organization } from "@bitwarden/common/models/domain/organization";
+import { canAccessReportingTab } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 
+import { ExposedPasswordsReportComponent } from "../../../admin-console/organizations/tools/exposed-passwords-report.component";
+import { InactiveTwoFactorReportComponent } from "../../../admin-console/organizations/tools/inactive-two-factor-report.component";
+import { ReusedPasswordsReportComponent } from "../../../admin-console/organizations/tools/reused-passwords-report.component";
+import { UnsecuredWebsitesReportComponent } from "../../../admin-console/organizations/tools/unsecured-websites-report.component";
+import { WeakPasswordsReportComponent } from "../../../admin-console/organizations/tools/weak-passwords-report.component";
 import { OrganizationPermissionsGuard } from "../guards/org-permissions.guard";
 import { OrganizationRedirectGuard } from "../guards/org-redirect.guard";
 import { EventsComponent } from "../manage/events.component";
-import { ExposedPasswordsReportComponent } from "../tools/exposed-passwords-report.component";
-import { InactiveTwoFactorReportComponent } from "../tools/inactive-two-factor-report.component";
-import { ReusedPasswordsReportComponent } from "../tools/reused-passwords-report.component";
-import { UnsecuredWebsitesReportComponent } from "../tools/unsecured-websites-report.component";
-import { WeakPasswordsReportComponent } from "../tools/weak-passwords-report.component";
 
 import { ReportingComponent } from "./reporting.component";
 import { ReportsHomeComponent } from "./reports-home.component";

apps/web/src/app/admin-console/organizations/reporting/organization-reporting.module.ts

@@ -1,7 +1,7 @@
 import { NgModule } from "@angular/core";
 
-import { ReportsSharedModule } from "../../reports";
-import { SharedModule } from "../../shared/shared.module";
+import { ReportsSharedModule } from "../../../reports";
+import { SharedModule } from "../../../shared/shared.module";
 
 import { OrganizationReportingRoutingModule } from "./organization-reporting-routing.module";
 import { ReportingComponent } from "./reporting.component";

apps/web/src/app/admin-console/organizations/reporting/reporting.component.ts

@@ -2,8 +2,8 @@ import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import { map, Observable, shareReplay, startWith, switchMap } from "rxjs";
 
-import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
-import { Organization } from "@bitwarden/common/models/domain/organization";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 
 @Component({
   selector: "app-org-reporting",

apps/web/src/app/admin-console/organizations/reporting/reports-home.component.ts

@@ -4,7 +4,7 @@ import { filter, Subject, takeUntil } from "rxjs";
 
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 
-import { ReportVariant, reports, ReportType, ReportEntry } from "../../reports";
+import { ReportVariant, reports, ReportType, ReportEntry } from "../../../reports";
 
 @Component({
   selector: "app-org-reports-home",

apps/web/src/app/admin-console/organizations/settings/account.component.ts

@@ -5,15 +5,15 @@ import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction";
-import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { OrganizationKeysRequest } from "@bitwarden/common/models/request/organization-keys.request";
-import { OrganizationUpdateRequest } from "@bitwarden/common/models/request/organization-update.request";
-import { OrganizationResponse } from "@bitwarden/common/models/response/organization.response";
+import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { OrganizationKeysRequest } from "@bitwarden/common/admin-console/models/request/organization-keys.request";
+import { OrganizationUpdateRequest } from "@bitwarden/common/admin-console/models/request/organization-update.request";
+import { OrganizationResponse } from "@bitwarden/common/admin-console/models/response/organization.response";
 
-import { ApiKeyComponent } from "../../settings/api-key.component";
-import { PurgeVaultComponent } from "../../settings/purge-vault.component";
+import { ApiKeyComponent } from "../../../settings/api-key.component";
+import { PurgeVaultComponent } from "../../../settings/purge-vault.component";
 
 import { DeleteOrganizationComponent } from "./delete-organization.component";
 

apps/web/src/app/admin-console/organizations/settings/delete-organization.component.ts

@@ -2,10 +2,10 @@ import { Component, EventEmitter, OnInit, Output } from "@angular/core";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { OrganizationApiServiceAbstraction } from "@bitwarden/common/abstractions/organization/organization-api.service.abstraction";
-import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction";
+import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Utils } from "@bitwarden/common/misc/utils";
 import { Verification } from "@bitwarden/common/types/verification";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";

apps/web/src/app/admin-console/organizations/settings/organization-settings-routing.module.ts

@@ -1,12 +1,12 @@
 import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
 
-import { canAccessSettingsTab } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
-import { Organization } from "@bitwarden/common/models/domain/organization";
+import { canAccessSettingsTab } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 
-import { OrganizationPermissionsGuard } from "../guards/org-permissions.guard";
-import { OrganizationRedirectGuard } from "../guards/org-redirect.guard";
-import { PoliciesComponent } from "../policies";
+import { OrganizationPermissionsGuard } from "../../organizations/guards/org-permissions.guard";
+import { OrganizationRedirectGuard } from "../../organizations/guards/org-redirect.guard";
+import { PoliciesComponent } from "../../organizations/policies";
 
 import { AccountComponent } from "./account.component";
 import { SettingsComponent } from "./settings.component";

apps/web/src/app/admin-console/organizations/settings/organization-settings.module.ts

@@ -1,7 +1,7 @@
 import { NgModule } from "@angular/core";
 
-import { LooseComponentsModule, SharedModule } from "../../shared";
-import { PoliciesModule } from "../policies";
+import { LooseComponentsModule, SharedModule } from "../../../shared";
+import { PoliciesModule } from "../../organizations/policies";
 
 import { AccountComponent } from "./account.component";
 import { DeleteOrganizationComponent } from "./delete-organization.component";

apps/web/src/app/admin-console/organizations/settings/settings.component.ts

@@ -2,8 +2,8 @@ import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import { Observable, switchMap } from "rxjs";
 
-import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
-import { Organization } from "@bitwarden/common/models/domain/organization";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 
 @Component({
   selector: "app-org-settings",

apps/web/src/app/admin-console/organizations/settings/two-factor-setup.component.ts

@@ -4,16 +4,16 @@ import { ActivatedRoute } from "@angular/router";
 import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
-import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
+import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
 
-import { TwoFactorDuoComponent } from "../../../auth/settings/two-factor-duo.component";
-import { TwoFactorSetupComponent as BaseTwoFactorSetupComponent } from "../../../auth/settings/two-factor-setup.component";
+import { TwoFactorDuoComponent } from "../../../../auth/settings/two-factor-duo.component";
+import { TwoFactorSetupComponent as BaseTwoFactorSetupComponent } from "../../../../auth/settings/two-factor-setup.component";
 
 @Component({
   selector: "app-two-factor-setup",
-  templateUrl: "../../../auth/settings/two-factor-setup.component.html",
+  templateUrl: "../../../../auth/settings/two-factor-setup.component.html",
 })
 // eslint-disable-next-line rxjs-angular/prefer-takeuntil
 export class TwoFactorSetupComponent extends BaseTwoFactorSetupComponent {

apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.spec.ts

@@ -2,8 +2,8 @@ import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType";
-import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType";
+import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums/organization-user-status-type";
+import { OrganizationUserType } from "@bitwarden/common/admin-console/enums/organization-user-type";
 import {
   AvatarModule,
   BadgeModule,
@@ -15,7 +15,7 @@ import {
 } from "@bitwarden/components";
 import { SelectItemView } from "@bitwarden/components/src/multi-select/models/select-item-view";
 
-import { PreloadedEnglishI18nModule } from "../../../../tests/preloaded-english-i18n.module";
+import { PreloadedEnglishI18nModule } from "../../../../../tests/preloaded-english-i18n.module";
 
 import { AccessSelectorComponent, PermissionMode } from "./access-selector.component";
 import { AccessItemType, CollectionPermission } from "./access-selector.models";

apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.models.ts

@@ -1,8 +1,8 @@
-import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType";
-import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType";
+import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums/organization-user-status-type";
+import { OrganizationUserType } from "@bitwarden/common/admin-console/enums/organization-user-type";
 import { SelectItemView } from "@bitwarden/components";
 
-import { CollectionAccessSelectionView } from "../../../core";
+import { CollectionAccessSelectionView } from "../../../../../organizations/core";
 
 /**
  * Permission options that replace/correspond with readOnly and hidePassword server fields.

apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from "@angular/core";
 
-import { SharedModule } from "../../../../shared/shared.module";
+import { SharedModule } from "../../../../../shared";
 
 import { AccessSelectorComponent } from "./access-selector.component";
 import { UserTypePipe } from "./user-type.pipe";

apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.stories.ts

@@ -3,8 +3,8 @@ import { action } from "@storybook/addon-actions";
 import { Meta, moduleMetadata, Story } from "@storybook/angular";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType";
-import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType";
+import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums/organization-user-status-type";
+import { OrganizationUserType } from "@bitwarden/common/admin-console/enums/organization-user-type";
 import {
   AvatarModule,
   BadgeModule,
@@ -16,7 +16,7 @@ import {
   TabsModule,
 } from "@bitwarden/components";
 
-import { PreloadedEnglishI18nModule } from "../../../../tests/preloaded-english-i18n.module";
+import { PreloadedEnglishI18nModule } from "../../../../../tests/preloaded-english-i18n.module";
 
 import { AccessSelectorComponent } from "./access-selector.component";
 import { AccessItemType, AccessItemView, CollectionPermission } from "./access-selector.models";

apps/web/src/app/admin-console/organizations/shared/components/access-selector/user-type.pipe.ts

@@ -1,7 +1,7 @@
 import { Pipe, PipeTransform } from "@angular/core";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { OrganizationUserType } from "@bitwarden/common/enums/organizationUserType";
+import { OrganizationUserType } from "@bitwarden/common/admin-console/enums/organization-user-type";
 
 @Pipe({
   name: "userType",

apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.component.ts

@@ -6,10 +6,10 @@ import { combineLatest, of, shareReplay, Subject, switchMap, takeUntil } from "r
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service";
 import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/abstractions/organization-user/responses";
-import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
-import { Organization } from "@bitwarden/common/models/domain/organization";
-import { CollectionView } from "@bitwarden/common/src/models/view/collection.view";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view";
 import { BitValidators, DialogService } from "@bitwarden/components";
 
 import {
@@ -17,7 +17,7 @@ import {
   CollectionAdminView,
   GroupService,
   GroupView,
-} from "../../../core";
+} from "../../../../../organizations/core";
 import {
   AccessItemType,
   AccessItemValue,

apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.module.ts

@@ -2,8 +2,8 @@ import { NgModule } from "@angular/core";
 
 import { SelectModule } from "@bitwarden/components";
 
-import { SharedModule } from "../../../../shared/shared.module";
-import { AccessSelectorModule } from "../access-selector";
+import { AccessSelectorModule } from "../../../../../admin-console/organizations/shared/components/access-selector/access-selector.module";
+import { SharedModule } from "../../../../../shared";
 
 import { CollectionDialogComponent } from "./collection-dialog.component";
 

apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.ts

@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 import { Params } from "@angular/router";
 
-import { BaseAcceptComponent } from "../../common/base.accept.component";
+import { BaseAcceptComponent } from "../../../common/base.accept.component";
 
 @Component({
   selector: "app-accept-family-sponsorship",