From 6b2864e1601ad9839bdd37dba5a8e2d48f665702 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89mile=20R=C3=A9?= <nemile.re@gmail.com>
Date: Tue, 30 Dec 2025 10:37:23 +0100
Subject: [PATCH] Move console to a relay multi project config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Émile Ré <nemile.re@gmail.com>
---
 apps/console/package.json                     |    2 +-
 apps/console/relay.config.json                |   25 +
 apps/console/relay.core.json                  |    8 -
 apps/console/relay.iam.json                   |    8 -
 .../core}/AssetGraphCreateMutation.graphql.ts |    0
 .../core}/AssetGraphDeleteMutation.graphql.ts |    0
 .../core}/AssetGraphListQuery.graphql.ts      |    0
 .../core}/AssetGraphNodeQuery.graphql.ts      |    0
 .../core}/AssetGraphUpdateMutation.graphql.ts |    0
 .../core}/AssetsListQuery.graphql.ts          |    0
 .../core}/AssetsPageFragment.graphql.ts       |    0
 .../core}/AuditGraphCreateMutation.graphql.ts |    0
 .../core}/AuditGraphDeleteMutation.graphql.ts |    0
 .../AuditGraphDeleteReportMutation.graphql.ts |    0
 .../core}/AuditGraphListQuery.graphql.ts      |    0
 .../core}/AuditGraphNodeQuery.graphql.ts      |    0
 .../core}/AuditGraphUpdateMutation.graphql.ts |    0
 .../AuditGraphUploadReportMutation.graphql.ts |    0
 .../core}/AuditSelectFieldQuery.graphql.ts    |    0
 .../core}/AuditsListQuery.graphql.ts          |    0
 .../core}/AuditsPageFragment.graphql.ts       |    0
 .../ComplianceReportListQuery.graphql.ts      |    0
 ...lImprovementGraphCreateMutation.graphql.ts |    0
 ...lImprovementGraphDeleteMutation.graphql.ts |    0
 ...tinualImprovementGraphListQuery.graphql.ts |    0
 ...tinualImprovementGraphNodeQuery.graphql.ts |    0
 ...lImprovementGraphUpdateMutation.graphql.ts |    0
 ...ntinualImprovementsPageFragment.graphql.ts |    0
 ...ualImprovementsPageRefetchQuery.graphql.ts |    0
 ...reateAuditDialogFrameworksQuery.graphql.ts |    0
 .../CreateContactDialogMutation.graphql.ts    |    0
 .../CreateDocumentDialogMutation.graphql.ts   |    0
 ...ateEvidenceDialogUploadMutation.graphql.ts |    0
 ...eateMeetingDialogCreateMutation.graphql.ts |    0
 .../CreatePeopleDialogMutation.graphql.ts     |    0
 ...ateRiskAssessmentDialogMutation.graphql.ts |    0
 .../CreateServiceDialogMutation.graphql.ts    |    0
 .../core}/DataListQuery.graphql.ts            |    0
 .../core}/DataPageFragment.graphql.ts         |    0
 .../core}/DatumGraphCreateMutation.graphql.ts |    0
 .../core}/DatumGraphDeleteMutation.graphql.ts |    0
 .../core}/DatumGraphListQuery.graphql.ts      |    0
 .../core}/DatumGraphNodeQuery.graphql.ts      |    0
 .../core}/DatumGraphUpdateMutation.graphql.ts |    0
 ...ssociateAgreementDialogMutation.graphql.ts |    0
 ...aPrivacyAgreementDialogMutation.graphql.ts |    0
 .../DeleteDomainDialogMutation.graphql.ts     |    0
 ...ocumentControlsTabControlsQuery.graphql.ts |    0
 .../DocumentControlsTabFragment.graphql.ts    |    0
 ...ntrolsTab_attachControlMutation.graphql.ts |    0
 ...ntrolsTab_detachControlMutation.graphql.ts |    0
 ...umentDetailPageDocumentFragment.graphql.ts |    0
 ...mentDetailPageExportPDFMutation.graphql.ts |    0
 ...cumentDetailPagePublishMutation.graphql.ts |    0
 ...ocumentDetailPageUpdateMutation.graphql.ts |    0
 ...raphBulkDeleteDocumentsMutation.graphql.ts |    0
 ...raphBulkExportDocumentsMutation.graphql.ts |    0
 ...ocumentGraphDeleteDraftMutation.graphql.ts |    0
 .../DocumentGraphDeleteMutation.graphql.ts    |    0
 .../core}/DocumentGraphListQuery.graphql.ts   |    0
 .../core}/DocumentGraphNodeQuery.graphql.ts   |    0
 ...endSigningNotificationsMutation.graphql.ts |    0
 .../core}/DocumentRowFragment.graphql.ts      |    0
 ...cumentSignaturesTabRefetchQuery.graphql.ts |    0
 ...uresTab_cancelSignatureMutation.graphql.ts |    0
 ...resTab_requestSignatureMutation.graphql.ts |    0
 ...DocumentSignaturesTab_signature.graphql.ts |    0
 .../DocumentSignaturesTab_version.graphql.ts  |    0
 .../core}/DocumentsListQuery.graphql.ts       |    0
 .../DocumentsPageListFragment.graphql.ts      |    0
 .../core}/DocumentsPageRowFragment.graphql.ts |    0
 .../core}/DomainCardFragment.graphql.ts       |    0
 .../core}/DomainDialogFragment.graphql.ts     |    0
 .../core}/DomainSettingsPageQuery.graphql.ts  |    0
 ...ssociateAgreementDialogMutation.graphql.ts |    0
 ...EditContactDialogUpdateMutation.graphql.ts |    0
 .../EditControlDialogLinkMutation.graphql.ts  |    0
 ...aPrivacyAgreementDialogMutation.graphql.ts |    0
 ...EditServiceDialogUpdateMutation.graphql.ts |    0
 ...ntSignaturePageDocumentFragment.graphql.ts |    0
 ...rePageExportSignablePDFMutation.graphql.ts |    0
 ...loyeeDocumentSignaturePageQuery.graphql.ts |    0
 ...cumentSignaturePageSignMutation.graphql.ts |    0
 .../EmployeeDocumentsPageQuery.graphql.ts     |    0
 .../core}/EvidenceGraphFileQuery.graphql.ts   |    0
 .../core}/FormRiskDialogMutation.graphql.ts   |    0
 ...ormRiskDialogUpdateRiskMutation.graphql.ts |    0
 ...workControlDialogCreateMutation.graphql.ts |    0
 .../FrameworkControlDialogFragment.graphql.ts |    0
 ...workControlDialogUpdateMutation.graphql.ts |    0
 ...kControlPageAttachAuditMutation.graphql.ts |    0
 ...ntrolPageAttachDocumentMutation.graphql.ts |    0
 ...meworkControlPageAttachMutation.graphql.ts |    0
 ...rolPageAttachObligationMutation.graphql.ts |    0
 ...ntrolPageAttachSnapshotMutation.graphql.ts |    0
 ...achStateOfApplicabilityMutation.graphql.ts |    0
 ...ontrolPageDeleteControlMutation.graphql.ts |    0
 ...kControlPageDetachAuditMutation.graphql.ts |    0
 ...ntrolPageDetachDocumentMutation.graphql.ts |    0
 ...meworkControlPageDetachMutation.graphql.ts |    0
 ...rolPageDetachObligationMutation.graphql.ts |    0
 ...ntrolPageDetachSnapshotMutation.graphql.ts |    0
 ...achStateOfApplicabilityMutation.graphql.ts |    0
 ...tailPageExportFrameworkMutation.graphql.ts |    0
 .../FrameworkDetailPageFragment.graphql.ts    |    0
 ...orkStateOfApplicabilityMutation.graphql.ts |    0
 .../FrameworkFormDialogMutation.graphql.ts    |    0
 ...ameworkFormDialogUpdateMutation.graphql.ts |    0
 .../FrameworkGraphControlNodeQuery.graphql.ts |    0
 .../FrameworkGraphDeleteMutation.graphql.ts   |    0
 .../core}/FrameworkGraphListQuery.graphql.ts  |    0
 .../core}/FrameworkGraphNodeQuery.graphql.ts  |    0
 .../FrameworksPageCardFragment.graphql.ts     |    0
 .../FrameworksPageImportMutation.graphql.ts   |    0
 .../ImportAssessmentDialogMutation.graphql.ts |    0
 .../LinkControlDialogLinkMutation.graphql.ts  |    0
 .../core}/LinkControlDialogQuery.graphql.ts   |    0
 ...LinkControlDialogUnlinkMutation.graphql.ts |    0
 .../core}/LinkedAuditsCardFragment.graphql.ts |    0
 .../LinkedAuditsDialogFragment.graphql.ts     |    0
 .../core}/LinkedAuditsDialogQuery.graphql.ts  |    0
 ...inkedAuditsDialogQuery_fragment.graphql.ts |    0
 .../LinkedControlsCardFragment.graphql.ts     |    0
 ...nkedControlsDialogControlsQuery.graphql.ts |    0
 .../LinkedControlsDialogFragment.graphql.ts   |    0
 .../LinkedControlsDialogQuery.graphql.ts      |    0
 .../LinkedDocumentsCardFragment.graphql.ts    |    0
 .../LinkedDocumentsDialogFragment.graphql.ts  |    0
 .../LinkedDocumentsDialogQuery.graphql.ts     |    0
 ...edDocumentsDialogQuery_fragment.graphql.ts |    0
 .../LinkedMeasuresCardFragment.graphql.ts     |    0
 .../LinkedObligationsCardFragment.graphql.ts  |    0
 ...LinkedObligationsDialogFragment.graphql.ts |    0
 .../LinkedObligationsDialogQuery.graphql.ts   |    0
 ...ObligationsDialogQuery_fragment.graphql.ts |    0
 .../core}/LinkedRisksCardFragment.graphql.ts  |    0
 .../core}/LinkedRisksDialogQuery.graphql.ts   |    0
 .../LinkedSnapshotsCardFragment.graphql.ts    |    0
 .../LinkedSnapshotsDialogFragment.graphql.ts  |    0
 .../LinkedSnapshotsDialogQuery.graphql.ts     |    0
 ...edSnapshotsDialogQuery_fragment.graphql.ts |    0
 ...atesOfApplicabilityCardFragment.graphql.ts |    0
 ...tatesOfApplicabilityDialogQuery.graphql.ts |    0
 .../core/MainLayoutQuery.graphql.ts}          |   24 +-
 ...easureControlsTabAttachMutation.graphql.ts |    0
 ...MeasureControlsTabControlsQuery.graphql.ts |    0
 ...easureControlsTabDetachMutation.graphql.ts |    0
 .../MeasureControlsTabFragment.graphql.ts     |    0
 ...easureDetailPageTasksCountQuery.graphql.ts |    0
 ...asureEvidencesTabDeleteMutation.graphql.ts |    0
 .../MeasureEvidencesTabFragment.graphql.ts    |    0
 ...reEvidencesTabFragment_evidence.graphql.ts |    0
 .../core}/MeasureEvidencesTabQuery.graphql.ts |    0
 ...MeasureFormDialogCreateMutation.graphql.ts |    0
 ...easureFormDialogMeasureFragment.graphql.ts |    0
 .../MeasureGraphDeleteMutation.graphql.ts     |    0
 .../core}/MeasureGraphListQuery.graphql.ts    |    0
 .../core}/MeasureGraphNodeQuery.graphql.ts    |    0
 .../MeasureGraphUpdateMutation.graphql.ts     |    0
 .../MeasureRisksTabCreateMutation.graphql.ts  |    0
 .../MeasureRisksTabDetachMutation.graphql.ts  |    0
 .../core}/MeasureRisksTabFragment.graphql.ts  |    0
 .../core}/MeasureTasksTabQuery.graphql.ts     |    0
 .../core}/MeasuresPageFragment.graphql.ts     |    0
 .../MeasuresPageImportMutation.graphql.ts     |    0
 ...eetingDetailPageMeetingFragment.graphql.ts |    0
 .../MeetingGraphCreateMutation.graphql.ts     |    0
 .../MeetingGraphDeleteMutation.graphql.ts     |    0
 .../core}/MeetingGraphListQuery.graphql.ts    |    0
 .../core}/MeetingGraphNodeQuery.graphql.ts    |    0
 .../MeetingGraphUpdateMutation.graphql.ts     |    0
 .../core}/MeetingsListQuery.graphql.ts        |    0
 .../core}/MeetingsPageListFragment.graphql.ts |    0
 .../core}/MeetingsPageRowFragment.graphql.ts  |    0
 ...tingsPage_UpdateSummaryMutation.graphql.ts |    0
 .../core}/NewDomainDialogMutation.graphql.ts  |    0
 .../NonconformitiesPageFragment.graphql.ts    |    0
 ...NonconformitiesPageRefetchQuery.graphql.ts |    0
 ...onconformityGraphCreateMutation.graphql.ts |    0
 ...onconformityGraphDeleteMutation.graphql.ts |    0
 .../NonconformityGraphListQuery.graphql.ts    |    0
 .../NonconformityGraphNodeQuery.graphql.ts    |    0
 ...onconformityGraphUpdateMutation.graphql.ts |    0
 .../ObligationGraphCreateMutation.graphql.ts  |    0
 .../ObligationGraphDeleteMutation.graphql.ts  |    0
 .../core}/ObligationGraphListQuery.graphql.ts |    0
 .../core}/ObligationGraphNodeQuery.graphql.ts |    0
 .../ObligationGraphUpdateMutation.graphql.ts  |    0
 .../core}/ObligationsPageFragment.graphql.ts  |    0
 .../ObligationsPageRefetchQuery.graphql.ts    |    0
 .../PeopleGraphDeleteMutation.graphql.ts      |    0
 .../core}/PeopleGraphNodeQuery.graphql.ts     |    0
 .../PeopleGraphPaginatedFragment.graphql.ts   |    0
 .../PeopleGraphPaginatedQuery.graphql.ts      |    0
 .../core}/PeopleGraphQuery.graphql.ts         |    0
 .../PeopleGraphUpdateMutation.graphql.ts      |    0
 .../core}/PeopleListQuery.graphql.ts          |    0
 ...ssingActivitiesPageDPIAFragment.graphql.ts |    0
 ...gActivitiesPageDPIARefetchQuery.graphql.ts |    0
 ...vitiesPageExportDPIAPDFMutation.graphql.ts |    0
 ...ActivitiesPageExportPDFMutation.graphql.ts |    0
 ...ivitiesPageExportTIAPDFMutation.graphql.ts |    0
 ...rocessingActivitiesPageFragment.graphql.ts |    0
 ...ssingActivitiesPageRefetchQuery.graphql.ts |    0
 ...essingActivitiesPageTIAFragment.graphql.ts |    0
 ...ngActivitiesPageTIARefetchQuery.graphql.ts |    0
 ...ActivityGraphCreateDPIAMutation.graphql.ts |    0
 ...singActivityGraphCreateMutation.graphql.ts |    0
 ...gActivityGraphCreateTIAMutation.graphql.ts |    0
 ...ActivityGraphDeleteDPIAMutation.graphql.ts |    0
 ...singActivityGraphDeleteMutation.graphql.ts |    0
 ...gActivityGraphDeleteTIAMutation.graphql.ts |    0
 ...rocessingActivityGraphListQuery.graphql.ts |    0
 ...rocessingActivityGraphNodeQuery.graphql.ts |    0
 ...ActivityGraphUpdateDPIAMutation.graphql.ts |    0
 ...singActivityGraphUpdateMutation.graphql.ts |    0
 ...gActivityGraphUpdateTIAMutation.graphql.ts |    0
 .../PublishDocumentsDialogMutation.graphql.ts |    0
 ...ightsRequestGraphCreateMutation.graphql.ts |    0
 ...ightsRequestGraphDeleteMutation.graphql.ts |    0
 .../RightsRequestGraphListQuery.graphql.ts    |    0
 .../RightsRequestGraphNodeQuery.graphql.ts    |    0
 ...ightsRequestGraphUpdateMutation.graphql.ts |    0
 .../RightsRequestsPageFragment.graphql.ts     |    0
 .../RightsRequestsPageRefetchQuery.graphql.ts |    0
 .../RiskControlsTabControlsQuery.graphql.ts   |    0
 .../core}/RiskControlsTabFragment.graphql.ts  |    0
 .../RiskDocumentsTabCreateMutation.graphql.ts |    0
 .../RiskDocumentsTabDetachMutation.graphql.ts |    0
 .../core}/RiskDocumentsTabFragment.graphql.ts |    0
 .../core}/RiskGraphDeleteMutation.graphql.ts  |    0
 .../core}/RiskGraphFragment.graphql.ts        |    0
 .../core}/RiskGraphListQuery.graphql.ts       |    0
 .../core}/RiskGraphNodeQuery.graphql.ts       |    0
 .../RiskMeasuresTabCreateMutation.graphql.ts  |    0
 .../RiskMeasuresTabDetachMutation.graphql.ts  |    0
 .../core}/RiskMeasuresTabFragment.graphql.ts  |    0
 ...iskObligationsTabCreateMutation.graphql.ts |    0
 ...iskObligationsTabDetachMutation.graphql.ts |    0
 .../RiskObligationsTabFragment.graphql.ts     |    0
 .../core}/RiskOverviewTabFragment.graphql.ts  |    0
 .../core}/RisksListQuery.graphql.ts           |    0
 ...ignatureDocumentsDialogMutation.graphql.ts |    0
 .../core}/SnapshotBannerQuery.graphql.ts      |    0
 ...napshotFormDialogCreateMutation.graphql.ts |    0
 .../SnapshotGraphCreateMutation.graphql.ts    |    0
 .../SnapshotGraphDeleteMutation.graphql.ts    |    0
 .../core}/SnapshotGraphListQuery.graphql.ts   |    0
 .../core}/SnapshotGraphNodeQuery.graphql.ts   |    0
 .../core}/SnapshotsPageFragment.graphql.ts    |    0
 ...rolsFieldFrameworkControlsQuery.graphql.ts |    0
 ...ityControlsFieldFrameworksQuery.graphql.ts |    0
 ...pplicabilityControlsTabFragment.graphql.ts |    0
 ...cabilityControlsTabRefetchQuery.graphql.ts |    0
 ...bilityControlsTabUnlinkMutation.graphql.ts |    0
 ...abilityDetailPageExportMutation.graphql.ts |    0
 ...pplicabilityGraphCreateMutation.graphql.ts |    0
 ...pplicabilityGraphDeleteMutation.graphql.ts |    0
 ...fApplicabilityGraphForEditQuery.graphql.ts |    0
 ...teOfApplicabilityGraphNodeQuery.graphql.ts |    0
 ...icabilityGraphPaginatedFragment.graphql.ts |    0
 ...pplicabilityGraphPaginatedQuery.graphql.ts |    0
 ...pplicabilityGraphUpdateMutation.graphql.ts |    0
 .../StateOfApplicabilityListQuery.graphql.ts  |    0
 .../TaskFormDialogCreateMutation.graphql.ts   |    0
 .../core}/TaskFormDialogFragment.graphql.ts   |    0
 .../TaskFormDialogUpdateMutation.graphql.ts   |    0
 .../core}/TaskGraphQuery.graphql.ts           |    0
 .../core}/TasksCardDeleteMutation.graphql.ts  |    0
 .../core}/TasksPageFragment.graphql.ts        |    0
 .../core}/TasksPageFragment_query.graphql.ts  |    0
 ...CenterAccessGraphCreateMutation.graphql.ts |    0
 ...CenterAccessGraphDeleteMutation.graphql.ts |    0
 ...sGraphLoadDocumentAccessesQuery.graphql.ts |    0
 ...enterAccessGraphPaginationQuery.graphql.ts |    0
 .../TrustCenterAccessGraphQuery.graphql.ts    |    0
 ...CenterAccessGraphUpdateMutation.graphql.ts |    0
 ...TrustCenterAccessGraph_accesses.graphql.ts |    0
 ...rustCenterAccessTokenGraphQuery.graphql.ts |    0
 ...tCenterAuditGraphUpdateMutation.graphql.ts |    0
 .../TrustCenterAuditsCardFragment.graphql.ts  |    0
 .../TrustCenterDocumentGraphQuery.graphql.ts  |    0
 ...nterDocumentGraphUpdateMutation.graphql.ts |    0
 ...rustCenterDocumentsCardFragment.graphql.ts |    0
 ...stCenterFileGraphCreateMutation.graphql.ts |    0
 ...stCenterFileGraphDeleteMutation.graphql.ts |    0
 ...stCenterFileGraphUpdateMutation.graphql.ts |    0
 .../TrustCenterFilesCardFragment.graphql.ts   |    0
 ...ustCenterGraphDeleteNDAMutation.graphql.ts |    0
 .../core}/TrustCenterGraphQuery.graphql.ts    |    0
 .../TrustCenterGraphUpdateMutation.graphql.ts |    0
 ...ustCenterGraphUploadNDAMutation.graphql.ts |    0
 ...terReferenceGraphCreateMutation.graphql.ts |    0
 ...terReferenceGraphDeleteMutation.graphql.ts |    0
 .../TrustCenterReferenceGraphQuery.graphql.ts |    0
 ...terReferenceGraphUpdateMutation.graphql.ts |    0
 ...eferenceGraphUpdateRankMutation.graphql.ts |    0
 ...CenterVendorGraphUpdateMutation.graphql.ts |    0
 .../TrustCenterVendorsCardFragment.graphql.ts |    0
 ...dateVersionDialogCreateMutation.graphql.ts |    0
 ...dateVersionDialogUpdateMutation.graphql.ts |    0
 ...ssociateAgreementDialogMutation.graphql.ts |    0
 ...aPrivacyAgreementDialogMutation.graphql.ts |    0
 ...mplianceTabDeleteReportMutation.graphql.ts |    0
 .../VendorComplianceTabFragment.graphql.ts    |    0
 ...dorComplianceTabFragment_report.graphql.ts |    0
 ...mplianceTabUploadReportMutation.graphql.ts |    0
 .../core}/VendorContactsListQuery.graphql.ts  |    0
 ...ontactsTabDeleteContactMutation.graphql.ts |    0
 .../VendorContactsTabFragment.graphql.ts      |    0
 ...ndorContactsTabFragment_contact.graphql.ts |    0
 .../VendorGraphCreateMutation.graphql.ts      |    0
 .../VendorGraphDeleteMutation.graphql.ts      |    0
 .../core}/VendorGraphListQuery.graphql.ts     |    0
 .../core}/VendorGraphNodeQuery.graphql.ts     |    0
 .../VendorGraphPaginatedFragment.graphql.ts   |    0
 .../core}/VendorGraphSelectQuery.graphql.ts   |    0
 ...inessAssociateAgreementFragment.graphql.ts |    0
 ...TabDataPrivacyAgreementFragment.graphql.ts |    0
 ...VendorRiskAssessmentTabFragment.graphql.ts |    0
 ...ssessmentTabFragment_assessment.graphql.ts |    0
 .../VendorRiskAssessmentTabQuery.graphql.ts   |    0
 .../core}/VendorServicesListQuery.graphql.ts  |    0
 ...ervicesTabDeleteServiceMutation.graphql.ts |    0
 .../VendorServicesTabFragment.graphql.ts      |    0
 ...ndorServicesTabFragment_service.graphql.ts |    0
 .../core}/VendorsListQuery.graphql.ts         |    0
 .../core}/VersionActionsFragment.graphql.ts   |    0
 .../core}/VersionRowFragment.graphql.ts       |    0
 .../usePaginatedMeasuresFragment.graphql.ts   |    0
 .../usePaginatedMeasuresQuery.graphql.ts      |    0
 ...PaginatedMeasuresQuery_fragment.graphql.ts |    0
 .../core}/useRiskFormFragment.graphql.ts      |    0
 .../core}/useVendorFormFragment.graphql.ts    |    0
 .../core}/useVendorFormMutation.graphql.ts    |    0
 .../iam}/APIKeysPageQuery.graphql.ts          |    0
 ...EditMemberDialog_updateMutation.graphql.ts |    0
 .../EditSAMLConfigurationFormQuery.graphql.ts |    0
 ...onfigurationForm_updateMutation.graphql.ts |    0
 .../iam}/GeneralSettingsPageQuery.graphql.ts  |    0
 ...eralSettingsPage_deleteMutation.graphql.ts |    0
 .../iam}/InvitationCardFragment.graphql.ts    |    0
 .../iam}/InvitationListFragment.graphql.ts    |    0
 ...tationListFragment_RefetchQuery.graphql.ts |    0
 .../InvitationListItemFragment.graphql.ts     |    0
 ...stItem_DeleteInvitationMutation.graphql.ts |    0
 ...ionListItem_permissionsFragment.graphql.ts |    0
 .../iam}/InviteUserDialogMutation.graphql.ts  |    0
 ...eUserDialog_currentRoleFragment.graphql.ts |    0
 .../iam}/MemberListFragment.graphql.ts        |    0
 ...MemberListFragment_RefetchQuery.graphql.ts |    0
 .../iam}/MemberListItemFragment.graphql.ts    |    0
 ...berListItem_currentRoleFragment.graphql.ts |    0
 ...berListItem_permissionsFragment.graphql.ts |    0
 .../MemberListItem_removeMutation.graphql.ts  |    0
 .../iam}/MembersPageQuery.graphql.ts          |    0
 .../iam}/MembershipCardFragment.graphql.ts    |    0
 .../MembershipCard_assumeMutation.graphql.ts  |    0
 .../iam}/MembershipLayoutQuery.graphql.ts     |    0
 ...ershipsDropdownMenuItemFragment.graphql.ts |    0
 ...DropdownMenuItem_assumeMutation.graphql.ts |    0
 .../MembershipsDropdownMenuQuery.graphql.ts   |    0
 ...psDropdown_organizationFragment.graphql.ts |    0
 ...bershipsDropdown_viewerFragment.graphql.ts |    0
 .../iam}/MembershipsPageQuery.graphql.ts      |    0
 .../NewOrganizationPageMutation.graphql.ts    |    0
 ...onfigurationForm_createMutation.graphql.ts |    0
 .../iam}/OrganizationFormFragment.graphql.ts  |    0
 ...rm_deleteHorizontalLogoMutation.graphql.ts |    0
 ...OrganizationForm_updateMutation.graphql.ts |    0
 ...ersonalAPIKeyListCreateMutation.graphql.ts |    0
 .../PersonalAPIKeyListFragment.graphql.ts     |    0
 ...alAPIKeyListRevealTokenMutation.graphql.ts |    0
 ...ersonalAPIKeyListRevokeMutation.graphql.ts |    0
 .../SAMLConfigurationListFragment.graphql.ts  |    0
 ...onfigurationList_deleteMutation.graphql.ts |    0
 .../iam}/SAMLSettingsPageQuery.graphql.ts     |    0
 .../iam}/SessionDropdownFragment.graphql.ts   |    0
 .../SessionDropdownSignOutMutation.graphql.ts |    0
 .../iam}/SidebarFragment.graphql.ts           |    0
 .../iam}/SignInPageMutation.graphql.ts        |    0
 .../console/src/components/SnapshotBanner.tsx |   24 +-
 .../src/components/assets/AssetsTable.tsx     |   44 +-
 .../components/assets/ReadOnlyAssetsTable.tsx |   51 +-
 .../components/audits/LinkedAuditsCard.tsx    |   15 +-
 .../components/audits/LinkedAuditsDialog.tsx  |   43 +-
 .../controls/LinkedControlsCard.tsx           |    7 +-
 .../controls/LinkedControlsDialog.tsx         |    8 +-
 .../documents/LinkedDocumentsCard.tsx         |    7 +-
 .../documents/LinkedDocumentsDialog.tsx       |   23 +-
 .../src/components/form/AuditSelectField.tsx  |   29 +-
 .../form/ProcessingActivityEnumOptions.tsx    |    6 +-
 .../StateOfApplicabilityControlsField.tsx     | 1067 ++++++++++-------
 .../measures/LinkedMeasuresCard.tsx           |   17 +-
 .../obligations/LinkedObligationsCard.tsx     |   40 +-
 .../obligations/LinkedObligationsDialog.tsx   |   37 +-
 .../organizations/SlackConnection.tsx         |   19 +-
 .../src/components/risks/LinkedRisksCard.tsx  |   14 +-
 .../components/risks/LinkedRisksDialog.tsx    |   11 +-
 .../snapshots/LinkedSnapshotsCard.tsx         |   18 +-
 .../snapshots/LinkedSnapshotsDialog.tsx       |   17 +-
 .../LinkedStatesOfApplicabilityCard.tsx       |  448 +++----
 .../LinkedStatesOfApplicabilityDialog.tsx     |  381 +++---
 .../src/components/table/PeopleCell.tsx       |    2 +-
 .../src/components/table/VendorsCell.tsx      |    2 +-
 .../src/components/tasks/TaskFormDialog.tsx   |   19 +-
 .../src/components/tasks/TasksCard.tsx        |   10 +-
 .../trustCenter/TrustCenterAuditsCard.tsx     |   47 +-
 .../trustCenter/TrustCenterDocumentsCard.tsx  |   45 +-
 .../trustCenter/TrustCenterFilesCard.tsx      |   55 +-
 .../trustCenter/TrustCenterVendorsCard.tsx    |   19 +-
 apps/console/src/hooks/forms/useRiskForm.tsx  |    2 +-
 .../console/src/hooks/forms/useVendorForm.tsx |    2 +-
 apps/console/src/hooks/graph/DocumentGraph.ts |   35 +-
 apps/console/src/hooks/graph/MeasureGraph.ts  |    4 +-
 apps/console/src/hooks/graph/MeetingGraph.ts  |   25 +-
 apps/console/src/hooks/graph/PeopleGraph.ts   |    8 +-
 apps/console/src/hooks/graph/RiskGraph.ts     |   11 +-
 .../hooks/graph/StateOfApplicabilityGraph.ts  |    6 +-
 .../src/hooks/graph/TrustCenterAccessGraph.ts |   41 +-
 .../src/hooks/graph/TrustCenterAuditGraph.ts  |    4 +-
 .../hooks/graph/TrustCenterDocumentGraph.ts   |    8 +-
 .../src/hooks/graph/TrustCenterGraph.ts       |   42 +-
 .../hooks/graph/TrustCenterReferenceGraph.ts  |   31 +-
 .../src/hooks/graph/TrustCenterVendorGraph.ts |    4 +-
 apps/console/src/hooks/graph/VendorGraph.ts   |   18 +-
 .../src/hooks/graph/usePaginatedMeasures.ts   |   16 +-
 apps/console/src/layouts/MainLayout.tsx       |  556 +++++++++
 .../src/pages/iam/apiKeys/APIKeysPage.tsx     |    2 +-
 .../pages/iam/apiKeys/APIKeysPageLoader.tsx   |    2 +-
 .../_components/PersonalAPIKeyList.tsx        |   24 +-
 .../console/src/pages/iam/auth/SignInPage.tsx |    2 +-
 .../iam/memberships/MembershipLayout.tsx      |    2 +-
 .../memberships/MembershipLayoutLoader.tsx    |    2 +-
 .../iam/memberships/MembershipsDropdown.tsx   |    6 +-
 .../memberships/MembershipsDropdownMenu.tsx   |    2 +-
 .../MembershipsDropdownMenuItem.tsx           |    4 +-
 .../pages/iam/memberships/MembershipsPage.tsx |    2 +-
 .../iam/memberships/MembershipsPageLoader.tsx |    2 +-
 .../_components/InvitationCard.tsx            |    2 +-
 .../_components/MembershipCard.tsx            |    8 +-
 .../_components/SessionDropdown.tsx           |    2 +-
 .../iam/memberships/_components/Sidebar.tsx   |    2 +-
 .../iam/organizations/NewOrganizationPage.tsx |    2 +-
 .../settings/GeneralSettingsPage.tsx          |    4 +-
 .../settings/GeneralSettingsPageLoader.tsx    |    2 +-
 .../organizations/settings/MembersPage.tsx    |    2 +-
 .../settings/MembersPageLoader.tsx            |    2 +-
 .../settings/SAMLSettingsPage.tsx             |    4 +-
 .../settings/SAMLSettingsPageLoader.tsx       |    2 +-
 .../settings/_components/EditMemberDialog.tsx |    2 +-
 .../_components/EditSAMLConfigurationForm.tsx |    4 +-
 .../settings/_components/InvitationList.tsx   |    6 +-
 .../_components/InvitationListItem.tsx        |    4 +-
 .../settings/_components/InviteUserDialog.tsx |    2 +-
 .../settings/_components/MemberList.tsx       |    6 +-
 .../settings/_components/MemberListItem.tsx   |    6 +-
 .../_components/NewSAMLConfigurationForm.tsx  |    2 +-
 .../settings/_components/OrganizationForm.tsx |    2 +-
 .../_components/SAMLConfigurationList.tsx     |   18 +-
 .../organizations/assets/AssetDetailsPage.tsx |   78 +-
 .../pages/organizations/assets/AssetsPage.tsx |   30 +-
 .../organizations/audits/AuditDetailsPage.tsx |   18 +-
 .../pages/organizations/audits/AuditsPage.tsx |   19 +-
 .../audits/dialogs/CreateAuditDialog.tsx      |   42 +-
 .../ContinualImprovementDetailsPage.tsx       |   71 +-
 .../ContinualImprovementsPage.tsx             |   94 +-
 .../src/pages/organizations/data/DataPage.tsx |   64 +-
 .../organizations/data/DatumDetailsPage.tsx   |   48 +-
 .../documents/DocumentDetailPage.tsx          |   40 +-
 .../organizations/documents/DocumentsPage.tsx |   26 +-
 .../dialogs/CreateDocumentDialog.tsx          |    2 +-
 .../dialogs/PublishDocumentsDialog.tsx        |   27 +-
 .../dialogs/SignatureDocumentsDialog.tsx      |   34 +-
 .../documents/dialogs/UpdateVersionDialog.tsx |   12 +-
 .../documents/tabs/DocumentControlsTab.tsx    |    2 +-
 .../documents/tabs/DocumentDescriptionTab.tsx |    2 +-
 .../documents/tabs/DocumentSignaturesTab.tsx  |   56 +-
 .../EmployeeDocumentSignaturePage.tsx         |   22 +-
 .../EmployeeDocumentSignaturePageLoader.tsx   |    4 +-
 .../employee/EmployeeDocumentsPage.tsx        |    4 +-
 .../employee/EmployeeDocumentsPageLoader.tsx  |    4 +-
 .../employee/_components/DocumentRow.tsx      |    2 +-
 .../employee/_components/VersionActions.tsx   |    4 +-
 .../employee/_components/VersionRow.tsx       |    8 +-
 .../frameworks/FrameworkControlPage.tsx       |  809 +++++++------
 .../frameworks/FrameworkDetailPage.tsx        |  405 ++++---
 .../frameworks/FrameworksPage.tsx             |   10 +-
 .../dialogs/FrameworkControlDialog.tsx        |  355 +++---
 .../measures/MeasureDetailPage.tsx            |   13 +-
 .../organizations/measures/MeasuresPage.tsx   |   26 +-
 .../dialog/EvidenceDownloadDialog.tsx         |    7 +-
 .../measures/dialog/EvidencePreviewDialog.tsx |    5 +-
 .../measures/dialog/MeasureFormDialog.tsx     |    2 +-
 .../measures/tabs/MeasureControlsTab.tsx      |    7 +-
 .../measures/tabs/MeasureEvidencesTab.tsx     |   53 +-
 .../measures/tabs/MeasureRisksTab.tsx         |    2 +-
 .../measures/tabs/MeasureTasksTab.tsx         |    2 +-
 .../meetings/MeetingDetailPage.tsx            |   12 +-
 .../organizations/meetings/MeetingsPage.tsx   |   24 +-
 .../meetings/dialogs/CreateMeetingDialog.tsx  |    4 +-
 .../dialogs/UpdateMeetingMinutesDialog.tsx    |    3 +-
 .../meetings/tabs/MeetingMinutesTab.tsx       |    5 +-
 .../nonconformities/NonconformitiesPage.tsx   |   97 +-
 .../NonconformityDetailsPage.tsx              |   57 +-
 .../obligations/ObligationDetailsPage.tsx     |  652 +++++-----
 .../obligations/ObligationsPage.tsx           |   73 +-
 .../organizations/people/PeopleDetailPage.tsx |    4 +-
 .../organizations/people/PeopleListPage.tsx   |    9 +-
 .../people/tabs/PeopleProfileTab.tsx          |   22 +-
 .../people/tabs/PeopleRoleTab.tsx             |    8 +-
 .../ProcessingActivitiesPage.tsx              |  238 ++--
 .../ProcessingActivityDetailsPage.tsx         |  440 +++++--
 .../RightsRequestDetailsPage.tsx              |   54 +-
 .../rightsRequests/RightsRequestsPage.tsx     |   62 +-
 .../organizations/risks/FormRiskDialog.tsx    |   10 +-
 .../organizations/risks/RiskDetailPage.tsx    |   51 +-
 .../pages/organizations/risks/RisksPage.tsx   |   78 +-
 .../risks/tabs/RiskControlsTab.tsx            |    2 +-
 .../risks/tabs/RiskDocumentsTab.tsx           |    2 +-
 .../risks/tabs/RiskMeasuresTab.tsx            |    2 +-
 .../risks/tabs/RiskObligationsTab.tsx         |    7 +-
 .../risks/tabs/RiskOverviewTab.tsx            |    2 +-
 .../settings/DomainSettingsPage.tsx           |    6 +-
 .../settings/DomainSettingsPageLoader.tsx     |    2 +-
 .../_components/DeleteDomainDialog.tsx        |    2 +-
 .../settings/_components/DomainCard.tsx       |    2 +-
 .../settings/_components/DomainDialog.tsx     |    2 +-
 .../settings/_components/NewDomainDialog.tsx  |    2 +-
 .../snapshots/SnapshotDetailPage.tsx          |   13 +-
 .../organizations/snapshots/SnapshotsPage.tsx |   28 +-
 .../StateOfApplicabilityDetailPage.tsx        |  671 ++++++-----
 .../StatesOfApplicabilityPage.tsx             |  324 ++---
 .../CreateStateOfApplicabilityDialog.tsx      |  185 +--
 .../tabs/StateOfApplicabilityControlsTab.tsx  |  597 +++++----
 .../tabs/StateOfApplicabilityOverviewTab.tsx  |   88 +-
 .../pages/organizations/tasks/TasksPage.tsx   |    8 +-
 .../TrustCenterAccessEditDialog.tsx           |  179 ++-
 .../trustCenter/TrustCenterAuditsTab.tsx      |    2 +-
 .../trustCenter/TrustCenterDocumentsTab.tsx   |    8 +-
 .../trustCenter/TrustCenterFilesTab.tsx       |  141 ++-
 .../trustCenter/TrustCenterOverviewTab.tsx    |   55 +-
 .../trustCenter/TrustCenterPage.tsx           |    4 +-
 .../trustCenter/TrustCenterVendorsTab.tsx     |    5 +-
 .../vendors/VendorDetailPage.tsx              |   38 +-
 .../organizations/vendors/VendorsPage.tsx     |   39 +-
 .../vendors/tabs/VendorCertificationsTab.tsx  |   15 +-
 .../vendors/tabs/VendorComplianceTab.tsx      |   30 +-
 .../vendors/tabs/VendorContactsTab.tsx        |   35 +-
 .../vendors/tabs/VendorOverviewTab.tsx        |  124 +-
 .../vendors/tabs/VendorRiskAssessmentTab.tsx  |   17 +-
 .../vendors/tabs/VendorServicesTab.tsx        |   31 +-
 apps/console/src/routes/assetRoutes.ts        |    4 +-
 apps/console/src/routes/auditRoutes.ts        |    4 +-
 .../src/routes/continualImprovementRoutes.ts  |    4 +-
 apps/console/src/routes/dataRoutes.ts         |    4 +-
 apps/console/src/routes/documentsRoutes.ts    |    4 +-
 apps/console/src/routes/frameworkRoutes.ts    |    6 +-
 apps/console/src/routes/measureRoutes.ts      |    4 +-
 apps/console/src/routes/meetingsRoutes.ts     |    4 +-
 .../console/src/routes/nonconformityRoutes.ts |    4 +-
 apps/console/src/routes/obligationRoutes.ts   |    4 +-
 apps/console/src/routes/peopleRoutes.ts       |    4 +-
 .../src/routes/processingActivityRoutes.ts    |    4 +-
 .../console/src/routes/rightsRequestRoutes.ts |   52 +-
 apps/console/src/routes/riskRoutes.ts         |    4 +-
 apps/console/src/routes/snapshotsRoutes.ts    |    4 +-
 .../src/routes/statesOfApplicabilityRoutes.ts |    4 +-
 apps/console/src/routes/taskRoutes.ts         |    2 +-
 apps/console/src/routes/trustCenterRoutes.ts  |    2 +-
 apps/console/src/routes/vendorRoutes.ts       |    4 +-
 apps/console/vite.config.ts                   |   22 +-
 572 files changed, 6400 insertions(+), 4263 deletions(-)
 create mode 100644 apps/console/relay.config.json
 delete mode 100644 apps/console/relay.core.json
 delete mode 100644 apps/console/relay.iam.json
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/AssetGraphCreateMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/AssetGraphDeleteMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/AssetGraphListQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/AssetGraphNodeQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/AssetGraphUpdateMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/assets/__generated__ => __generated__/core}/AssetsListQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/assets/__generated__ => __generated__/core}/AssetsPageFragment.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/AuditGraphCreateMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/AuditGraphDeleteMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/AuditGraphDeleteReportMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/AuditGraphListQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/AuditGraphNodeQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/AuditGraphUpdateMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/AuditGraphUploadReportMutation.graphql.ts (100%)
 rename apps/console/src/{components/form/__generated__ => __generated__/core}/AuditSelectFieldQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/audits/__generated__ => __generated__/core}/AuditsListQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/audits/__generated__ => __generated__/core}/AuditsPageFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/tabs/__generated__ => __generated__/core}/ComplianceReportListQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/ContinualImprovementGraphCreateMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/ContinualImprovementGraphDeleteMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/ContinualImprovementGraphListQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/ContinualImprovementGraphNodeQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/ContinualImprovementGraphUpdateMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/continualImprovements/__generated__ => __generated__/core}/ContinualImprovementsPageFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/continualImprovements/__generated__ => __generated__/core}/ContinualImprovementsPageRefetchQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/audits/dialogs/__generated__ => __generated__/core}/CreateAuditDialogFrameworksQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/dialogs/__generated__ => __generated__/core}/CreateContactDialogMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/documents/dialogs/__generated__ => __generated__/core}/CreateDocumentDialogMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/measures/dialog/__generated__ => __generated__/core}/CreateEvidenceDialogUploadMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/meetings/dialogs/__generated__ => __generated__/core}/CreateMeetingDialogCreateMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/people/dialogs/__generated__ => __generated__/core}/CreatePeopleDialogMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/dialogs/__generated__ => __generated__/core}/CreateRiskAssessmentDialogMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/dialogs/__generated__ => __generated__/core}/CreateServiceDialogMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/data/__generated__ => __generated__/core}/DataListQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/data/__generated__ => __generated__/core}/DataPageFragment.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/DatumGraphCreateMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/DatumGraphDeleteMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/DatumGraphListQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/DatumGraphNodeQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/DatumGraphUpdateMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/dialogs/__generated__ => __generated__/core}/DeleteBusinessAssociateAgreementDialogMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/dialogs/__generated__ => __generated__/core}/DeleteDataPrivacyAgreementDialogMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/settings/_components/__generated__ => __generated__/core}/DeleteDomainDialogMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/documents/tabs/__generated__ => __generated__/core}/DocumentControlsTabControlsQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/documents/tabs/__generated__ => __generated__/core}/DocumentControlsTabFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/documents/tabs/__generated__ => __generated__/core}/DocumentControlsTab_attachControlMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/documents/tabs/__generated__ => __generated__/core}/DocumentControlsTab_detachControlMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/documents/__generated__ => __generated__/core}/DocumentDetailPageDocumentFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/documents/__generated__ => __generated__/core}/DocumentDetailPageExportPDFMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/documents/__generated__ => __generated__/core}/DocumentDetailPagePublishMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/documents/__generated__ => __generated__/core}/DocumentDetailPageUpdateMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/DocumentGraphBulkDeleteDocumentsMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/DocumentGraphBulkExportDocumentsMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/DocumentGraphDeleteDraftMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/DocumentGraphDeleteMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/DocumentGraphListQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/DocumentGraphNodeQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/DocumentGraphSendSigningNotificationsMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/employee/_components/__generated__ => __generated__/core}/DocumentRowFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/documents/tabs/__generated__ => __generated__/core}/DocumentSignaturesTabRefetchQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/documents/tabs/__generated__ => __generated__/core}/DocumentSignaturesTab_cancelSignatureMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/documents/tabs/__generated__ => __generated__/core}/DocumentSignaturesTab_requestSignatureMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/documents/tabs/__generated__ => __generated__/core}/DocumentSignaturesTab_signature.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/documents/tabs/__generated__ => __generated__/core}/DocumentSignaturesTab_version.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/documents/__generated__ => __generated__/core}/DocumentsListQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/documents/__generated__ => __generated__/core}/DocumentsPageListFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/documents/__generated__ => __generated__/core}/DocumentsPageRowFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/settings/_components/__generated__ => __generated__/core}/DomainCardFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/settings/_components/__generated__ => __generated__/core}/DomainDialogFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/settings/__generated__ => __generated__/core}/DomainSettingsPageQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/dialogs/__generated__ => __generated__/core}/EditBusinessAssociateAgreementDialogMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/dialogs/__generated__ => __generated__/core}/EditContactDialogUpdateMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/states-of-applicability/dialogs/__generated__ => __generated__/core}/EditControlDialogLinkMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/dialogs/__generated__ => __generated__/core}/EditDataPrivacyAgreementDialogMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/dialogs/__generated__ => __generated__/core}/EditServiceDialogUpdateMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/employee/__generated__ => __generated__/core}/EmployeeDocumentSignaturePageDocumentFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/employee/__generated__ => __generated__/core}/EmployeeDocumentSignaturePageExportSignablePDFMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/employee/__generated__ => __generated__/core}/EmployeeDocumentSignaturePageQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/employee/__generated__ => __generated__/core}/EmployeeDocumentSignaturePageSignMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/employee/__generated__ => __generated__/core}/EmployeeDocumentsPageQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/EvidenceGraphFileQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/risks/__generated__ => __generated__/core}/FormRiskDialogMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/risks/__generated__ => __generated__/core}/FormRiskDialogUpdateRiskMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/frameworks/dialogs/__generated__ => __generated__/core}/FrameworkControlDialogCreateMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/frameworks/dialogs/__generated__ => __generated__/core}/FrameworkControlDialogFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/frameworks/dialogs/__generated__ => __generated__/core}/FrameworkControlDialogUpdateMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/frameworks/__generated__ => __generated__/core}/FrameworkControlPageAttachAuditMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/frameworks/__generated__ => __generated__/core}/FrameworkControlPageAttachDocumentMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/frameworks/__generated__ => __generated__/core}/FrameworkControlPageAttachMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/frameworks/__generated__ => __generated__/core}/FrameworkControlPageAttachObligationMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/frameworks/__generated__ => __generated__/core}/FrameworkControlPageAttachSnapshotMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/frameworks/__generated__ => __generated__/core}/FrameworkControlPageAttachStateOfApplicabilityMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/frameworks/__generated__ => __generated__/core}/FrameworkControlPageDeleteControlMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/frameworks/__generated__ => __generated__/core}/FrameworkControlPageDetachAuditMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/frameworks/__generated__ => __generated__/core}/FrameworkControlPageDetachDocumentMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/frameworks/__generated__ => __generated__/core}/FrameworkControlPageDetachMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/frameworks/__generated__ => __generated__/core}/FrameworkControlPageDetachObligationMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/frameworks/__generated__ => __generated__/core}/FrameworkControlPageDetachSnapshotMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/frameworks/__generated__ => __generated__/core}/FrameworkControlPageDetachStateOfApplicabilityMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/frameworks/__generated__ => __generated__/core}/FrameworkDetailPageExportFrameworkMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/frameworks/__generated__ => __generated__/core}/FrameworkDetailPageFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/frameworks/__generated__ => __generated__/core}/FrameworkDetailPageGenerateFrameworkStateOfApplicabilityMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/frameworks/dialogs/__generated__ => __generated__/core}/FrameworkFormDialogMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/frameworks/dialogs/__generated__ => __generated__/core}/FrameworkFormDialogUpdateMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/FrameworkGraphControlNodeQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/FrameworkGraphDeleteMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/FrameworkGraphListQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/FrameworkGraphNodeQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/frameworks/__generated__ => __generated__/core}/FrameworksPageCardFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/frameworks/__generated__ => __generated__/core}/FrameworksPageImportMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/dialogs/__generated__ => __generated__/core}/ImportAssessmentDialogMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/states-of-applicability/dialogs/__generated__ => __generated__/core}/LinkControlDialogLinkMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/states-of-applicability/dialogs/__generated__ => __generated__/core}/LinkControlDialogQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/states-of-applicability/dialogs/__generated__ => __generated__/core}/LinkControlDialogUnlinkMutation.graphql.ts (100%)
 rename apps/console/src/{components/audits/__generated__ => __generated__/core}/LinkedAuditsCardFragment.graphql.ts (100%)
 rename apps/console/src/{components/audits/__generated__ => __generated__/core}/LinkedAuditsDialogFragment.graphql.ts (100%)
 rename apps/console/src/{components/audits/__generated__ => __generated__/core}/LinkedAuditsDialogQuery.graphql.ts (100%)
 rename apps/console/src/{components/audits/__generated__ => __generated__/core}/LinkedAuditsDialogQuery_fragment.graphql.ts (100%)
 rename apps/console/src/{components/controls/__generated__ => __generated__/core}/LinkedControlsCardFragment.graphql.ts (100%)
 rename apps/console/src/{components/controls/__generated__ => __generated__/core}/LinkedControlsDialogControlsQuery.graphql.ts (100%)
 rename apps/console/src/{components/controls/__generated__ => __generated__/core}/LinkedControlsDialogFragment.graphql.ts (100%)
 rename apps/console/src/{components/controls/__generated__ => __generated__/core}/LinkedControlsDialogQuery.graphql.ts (100%)
 rename apps/console/src/{components/documents/__generated__ => __generated__/core}/LinkedDocumentsCardFragment.graphql.ts (100%)
 rename apps/console/src/{components/documents/__generated__ => __generated__/core}/LinkedDocumentsDialogFragment.graphql.ts (100%)
 rename apps/console/src/{components/documents/__generated__ => __generated__/core}/LinkedDocumentsDialogQuery.graphql.ts (100%)
 rename apps/console/src/{components/documents/__generated__ => __generated__/core}/LinkedDocumentsDialogQuery_fragment.graphql.ts (100%)
 rename apps/console/src/{components/measures/__generated__ => __generated__/core}/LinkedMeasuresCardFragment.graphql.ts (100%)
 rename apps/console/src/{components/obligations/__generated__ => __generated__/core}/LinkedObligationsCardFragment.graphql.ts (100%)
 rename apps/console/src/{components/obligations/__generated__ => __generated__/core}/LinkedObligationsDialogFragment.graphql.ts (100%)
 rename apps/console/src/{components/obligations/__generated__ => __generated__/core}/LinkedObligationsDialogQuery.graphql.ts (100%)
 rename apps/console/src/{components/obligations/__generated__ => __generated__/core}/LinkedObligationsDialogQuery_fragment.graphql.ts (100%)
 rename apps/console/src/{components/risks/__generated__ => __generated__/core}/LinkedRisksCardFragment.graphql.ts (100%)
 rename apps/console/src/{components/risks/__generated__ => __generated__/core}/LinkedRisksDialogQuery.graphql.ts (100%)
 rename apps/console/src/{components/snapshots/__generated__ => __generated__/core}/LinkedSnapshotsCardFragment.graphql.ts (100%)
 rename apps/console/src/{components/snapshots/__generated__ => __generated__/core}/LinkedSnapshotsDialogFragment.graphql.ts (100%)
 rename apps/console/src/{components/snapshots/__generated__ => __generated__/core}/LinkedSnapshotsDialogQuery.graphql.ts (100%)
 rename apps/console/src/{components/snapshots/__generated__ => __generated__/core}/LinkedSnapshotsDialogQuery_fragment.graphql.ts (100%)
 rename apps/console/src/{components/states-of-applicability/__generated__ => __generated__/core}/LinkedStatesOfApplicabilityCardFragment.graphql.ts (100%)
 rename apps/console/src/{components/states-of-applicability/__generated__ => __generated__/core}/LinkedStatesOfApplicabilityDialogQuery.graphql.ts (100%)
 rename apps/console/src/{layouts/__generated__/EmployeeLayoutQuery.graphql.ts => __generated__/core/MainLayoutQuery.graphql.ts} (79%)
 rename apps/console/src/{pages/organizations/measures/tabs/__generated__ => __generated__/core}/MeasureControlsTabAttachMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/measures/tabs/__generated__ => __generated__/core}/MeasureControlsTabControlsQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/measures/tabs/__generated__ => __generated__/core}/MeasureControlsTabDetachMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/measures/tabs/__generated__ => __generated__/core}/MeasureControlsTabFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/measures/__generated__ => __generated__/core}/MeasureDetailPageTasksCountQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/measures/tabs/__generated__ => __generated__/core}/MeasureEvidencesTabDeleteMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/measures/tabs/__generated__ => __generated__/core}/MeasureEvidencesTabFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/measures/tabs/__generated__ => __generated__/core}/MeasureEvidencesTabFragment_evidence.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/measures/tabs/__generated__ => __generated__/core}/MeasureEvidencesTabQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/measures/dialog/__generated__ => __generated__/core}/MeasureFormDialogCreateMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/measures/dialog/__generated__ => __generated__/core}/MeasureFormDialogMeasureFragment.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/MeasureGraphDeleteMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/MeasureGraphListQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/MeasureGraphNodeQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/MeasureGraphUpdateMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/measures/tabs/__generated__ => __generated__/core}/MeasureRisksTabCreateMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/measures/tabs/__generated__ => __generated__/core}/MeasureRisksTabDetachMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/measures/tabs/__generated__ => __generated__/core}/MeasureRisksTabFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/measures/tabs/__generated__ => __generated__/core}/MeasureTasksTabQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/measures/__generated__ => __generated__/core}/MeasuresPageFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/measures/__generated__ => __generated__/core}/MeasuresPageImportMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/meetings/__generated__ => __generated__/core}/MeetingDetailPageMeetingFragment.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/MeetingGraphCreateMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/MeetingGraphDeleteMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/MeetingGraphListQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/MeetingGraphNodeQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/MeetingGraphUpdateMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/meetings/__generated__ => __generated__/core}/MeetingsListQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/meetings/__generated__ => __generated__/core}/MeetingsPageListFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/meetings/__generated__ => __generated__/core}/MeetingsPageRowFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/meetings/__generated__ => __generated__/core}/MeetingsPage_UpdateSummaryMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/settings/_components/__generated__ => __generated__/core}/NewDomainDialogMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/nonconformities/__generated__ => __generated__/core}/NonconformitiesPageFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/nonconformities/__generated__ => __generated__/core}/NonconformitiesPageRefetchQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/NonconformityGraphCreateMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/NonconformityGraphDeleteMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/NonconformityGraphListQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/NonconformityGraphNodeQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/NonconformityGraphUpdateMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/ObligationGraphCreateMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/ObligationGraphDeleteMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/ObligationGraphListQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/ObligationGraphNodeQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/ObligationGraphUpdateMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/obligations/__generated__ => __generated__/core}/ObligationsPageFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/obligations/__generated__ => __generated__/core}/ObligationsPageRefetchQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/PeopleGraphDeleteMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/PeopleGraphNodeQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/PeopleGraphPaginatedFragment.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/PeopleGraphPaginatedQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/PeopleGraphQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/PeopleGraphUpdateMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/PeopleListQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/processingActivities/__generated__ => __generated__/core}/ProcessingActivitiesPageDPIAFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/processingActivities/__generated__ => __generated__/core}/ProcessingActivitiesPageDPIARefetchQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/processingActivities/__generated__ => __generated__/core}/ProcessingActivitiesPageExportDPIAPDFMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/processingActivities/__generated__ => __generated__/core}/ProcessingActivitiesPageExportPDFMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/processingActivities/__generated__ => __generated__/core}/ProcessingActivitiesPageExportTIAPDFMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/processingActivities/__generated__ => __generated__/core}/ProcessingActivitiesPageFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/processingActivities/__generated__ => __generated__/core}/ProcessingActivitiesPageRefetchQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/processingActivities/__generated__ => __generated__/core}/ProcessingActivitiesPageTIAFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/processingActivities/__generated__ => __generated__/core}/ProcessingActivitiesPageTIARefetchQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/ProcessingActivityGraphCreateDPIAMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/ProcessingActivityGraphCreateMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/ProcessingActivityGraphCreateTIAMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/ProcessingActivityGraphDeleteDPIAMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/ProcessingActivityGraphDeleteMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/ProcessingActivityGraphDeleteTIAMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/ProcessingActivityGraphListQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/ProcessingActivityGraphNodeQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/ProcessingActivityGraphUpdateDPIAMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/ProcessingActivityGraphUpdateMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/ProcessingActivityGraphUpdateTIAMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/documents/dialogs/__generated__ => __generated__/core}/PublishDocumentsDialogMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/RightsRequestGraphCreateMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/RightsRequestGraphDeleteMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/RightsRequestGraphListQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/RightsRequestGraphNodeQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/RightsRequestGraphUpdateMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/rightsRequests/__generated__ => __generated__/core}/RightsRequestsPageFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/rightsRequests/__generated__ => __generated__/core}/RightsRequestsPageRefetchQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/risks/tabs/__generated__ => __generated__/core}/RiskControlsTabControlsQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/risks/tabs/__generated__ => __generated__/core}/RiskControlsTabFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/risks/tabs/__generated__ => __generated__/core}/RiskDocumentsTabCreateMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/risks/tabs/__generated__ => __generated__/core}/RiskDocumentsTabDetachMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/risks/tabs/__generated__ => __generated__/core}/RiskDocumentsTabFragment.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/RiskGraphDeleteMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/RiskGraphFragment.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/RiskGraphListQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/RiskGraphNodeQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/risks/tabs/__generated__ => __generated__/core}/RiskMeasuresTabCreateMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/risks/tabs/__generated__ => __generated__/core}/RiskMeasuresTabDetachMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/risks/tabs/__generated__ => __generated__/core}/RiskMeasuresTabFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/risks/tabs/__generated__ => __generated__/core}/RiskObligationsTabCreateMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/risks/tabs/__generated__ => __generated__/core}/RiskObligationsTabDetachMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/risks/tabs/__generated__ => __generated__/core}/RiskObligationsTabFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/risks/tabs/__generated__ => __generated__/core}/RiskOverviewTabFragment.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/RisksListQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/documents/dialogs/__generated__ => __generated__/core}/SignatureDocumentsDialogMutation.graphql.ts (100%)
 rename apps/console/src/{components/__generated__ => __generated__/core}/SnapshotBannerQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/snapshots/dialog/__generated__ => __generated__/core}/SnapshotFormDialogCreateMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/SnapshotGraphCreateMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/SnapshotGraphDeleteMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/SnapshotGraphListQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/SnapshotGraphNodeQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/snapshots/__generated__ => __generated__/core}/SnapshotsPageFragment.graphql.ts (100%)
 rename apps/console/src/{components/form/__generated__ => __generated__/core}/StateOfApplicabilityControlsFieldFrameworkControlsQuery.graphql.ts (100%)
 rename apps/console/src/{components/form/__generated__ => __generated__/core}/StateOfApplicabilityControlsFieldFrameworksQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/states-of-applicability/tabs/__generated__ => __generated__/core}/StateOfApplicabilityControlsTabFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/states-of-applicability/tabs/__generated__ => __generated__/core}/StateOfApplicabilityControlsTabRefetchQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/states-of-applicability/tabs/__generated__ => __generated__/core}/StateOfApplicabilityControlsTabUnlinkMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/states-of-applicability/__generated__ => __generated__/core}/StateOfApplicabilityDetailPageExportMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/StateOfApplicabilityGraphCreateMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/StateOfApplicabilityGraphDeleteMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/StateOfApplicabilityGraphForEditQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/StateOfApplicabilityGraphNodeQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/StateOfApplicabilityGraphPaginatedFragment.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/StateOfApplicabilityGraphPaginatedQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/StateOfApplicabilityGraphUpdateMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/StateOfApplicabilityListQuery.graphql.ts (100%)
 rename apps/console/src/{components/tasks/__generated__ => __generated__/core}/TaskFormDialogCreateMutation.graphql.ts (100%)
 rename apps/console/src/{components/tasks/__generated__ => __generated__/core}/TaskFormDialogFragment.graphql.ts (100%)
 rename apps/console/src/{components/tasks/__generated__ => __generated__/core}/TaskFormDialogUpdateMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/TaskGraphQuery.graphql.ts (100%)
 rename apps/console/src/{components/tasks/__generated__ => __generated__/core}/TasksCardDeleteMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/tasks/__generated__ => __generated__/core}/TasksPageFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/tasks/__generated__ => __generated__/core}/TasksPageFragment_query.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/TrustCenterAccessGraphCreateMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/TrustCenterAccessGraphDeleteMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/TrustCenterAccessGraphLoadDocumentAccessesQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/TrustCenterAccessGraphPaginationQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/TrustCenterAccessGraphQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/TrustCenterAccessGraphUpdateMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/TrustCenterAccessGraph_accesses.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/TrustCenterAccessTokenGraphQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/TrustCenterAuditGraphUpdateMutation.graphql.ts (100%)
 rename apps/console/src/{components/trustCenter/__generated__ => __generated__/core}/TrustCenterAuditsCardFragment.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/TrustCenterDocumentGraphQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/TrustCenterDocumentGraphUpdateMutation.graphql.ts (100%)
 rename apps/console/src/{components/trustCenter/__generated__ => __generated__/core}/TrustCenterDocumentsCardFragment.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/TrustCenterFileGraphCreateMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/TrustCenterFileGraphDeleteMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/TrustCenterFileGraphUpdateMutation.graphql.ts (100%)
 rename apps/console/src/{components/trustCenter/__generated__ => __generated__/core}/TrustCenterFilesCardFragment.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/TrustCenterGraphDeleteNDAMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/TrustCenterGraphQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/TrustCenterGraphUpdateMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/TrustCenterGraphUploadNDAMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/TrustCenterReferenceGraphCreateMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/TrustCenterReferenceGraphDeleteMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/TrustCenterReferenceGraphQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/TrustCenterReferenceGraphUpdateMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/TrustCenterReferenceGraphUpdateRankMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/TrustCenterVendorGraphUpdateMutation.graphql.ts (100%)
 rename apps/console/src/{components/trustCenter/__generated__ => __generated__/core}/TrustCenterVendorsCardFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/documents/dialogs/__generated__ => __generated__/core}/UpdateVersionDialogCreateMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/documents/dialogs/__generated__ => __generated__/core}/UpdateVersionDialogUpdateMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/dialogs/__generated__ => __generated__/core}/UploadBusinessAssociateAgreementDialogMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/dialogs/__generated__ => __generated__/core}/UploadDataPrivacyAgreementDialogMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/tabs/__generated__ => __generated__/core}/VendorComplianceTabDeleteReportMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/tabs/__generated__ => __generated__/core}/VendorComplianceTabFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/tabs/__generated__ => __generated__/core}/VendorComplianceTabFragment_report.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/tabs/__generated__ => __generated__/core}/VendorComplianceTabUploadReportMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/tabs/__generated__ => __generated__/core}/VendorContactsListQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/tabs/__generated__ => __generated__/core}/VendorContactsTabDeleteContactMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/tabs/__generated__ => __generated__/core}/VendorContactsTabFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/tabs/__generated__ => __generated__/core}/VendorContactsTabFragment_contact.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/VendorGraphCreateMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/VendorGraphDeleteMutation.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/VendorGraphListQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/VendorGraphNodeQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/VendorGraphPaginatedFragment.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/VendorGraphSelectQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/tabs/__generated__ => __generated__/core}/VendorOverviewTabBusinessAssociateAgreementFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/tabs/__generated__ => __generated__/core}/VendorOverviewTabDataPrivacyAgreementFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/tabs/__generated__ => __generated__/core}/VendorRiskAssessmentTabFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/tabs/__generated__ => __generated__/core}/VendorRiskAssessmentTabFragment_assessment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/tabs/__generated__ => __generated__/core}/VendorRiskAssessmentTabQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/tabs/__generated__ => __generated__/core}/VendorServicesListQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/tabs/__generated__ => __generated__/core}/VendorServicesTabDeleteServiceMutation.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/tabs/__generated__ => __generated__/core}/VendorServicesTabFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/vendors/tabs/__generated__ => __generated__/core}/VendorServicesTabFragment_service.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/VendorsListQuery.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/employee/_components/__generated__ => __generated__/core}/VersionActionsFragment.graphql.ts (100%)
 rename apps/console/src/{pages/organizations/employee/_components/__generated__ => __generated__/core}/VersionRowFragment.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/usePaginatedMeasuresFragment.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/usePaginatedMeasuresQuery.graphql.ts (100%)
 rename apps/console/src/{hooks/graph/__generated__ => __generated__/core}/usePaginatedMeasuresQuery_fragment.graphql.ts (100%)
 rename apps/console/src/{hooks/forms/__generated__ => __generated__/core}/useRiskFormFragment.graphql.ts (100%)
 rename apps/console/src/{hooks/forms/__generated__ => __generated__/core}/useVendorFormFragment.graphql.ts (100%)
 rename apps/console/src/{hooks/forms/__generated__ => __generated__/core}/useVendorFormMutation.graphql.ts (100%)
 rename apps/console/src/{pages/iam/apiKeys/__generated__ => __generated__/iam}/APIKeysPageQuery.graphql.ts (100%)
 rename apps/console/src/{pages/iam/organizations/settings/_components/__generated__ => __generated__/iam}/EditMemberDialog_updateMutation.graphql.ts (100%)
 rename apps/console/src/{pages/iam/organizations/settings/_components/__generated__ => __generated__/iam}/EditSAMLConfigurationFormQuery.graphql.ts (100%)
 rename apps/console/src/{pages/iam/organizations/settings/_components/__generated__ => __generated__/iam}/EditSAMLConfigurationForm_updateMutation.graphql.ts (100%)
 rename apps/console/src/{pages/iam/organizations/settings/__generated__ => __generated__/iam}/GeneralSettingsPageQuery.graphql.ts (100%)
 rename apps/console/src/{pages/iam/organizations/settings/__generated__ => __generated__/iam}/GeneralSettingsPage_deleteMutation.graphql.ts (100%)
 rename apps/console/src/{pages/iam/memberships/_components/__generated__ => __generated__/iam}/InvitationCardFragment.graphql.ts (100%)
 rename apps/console/src/{pages/iam/organizations/settings/_components/__generated__ => __generated__/iam}/InvitationListFragment.graphql.ts (100%)
 rename apps/console/src/{pages/iam/organizations/settings/_components/__generated__ => __generated__/iam}/InvitationListFragment_RefetchQuery.graphql.ts (100%)
 rename apps/console/src/{pages/iam/organizations/settings/_components/__generated__ => __generated__/iam}/InvitationListItemFragment.graphql.ts (100%)
 rename apps/console/src/{pages/iam/organizations/settings/_components/__generated__ => __generated__/iam}/InvitationListItem_DeleteInvitationMutation.graphql.ts (100%)
 rename apps/console/src/{pages/iam/organizations/settings/_components/__generated__ => __generated__/iam}/InvitationListItem_permissionsFragment.graphql.ts (100%)
 rename apps/console/src/{pages/iam/organizations/settings/_components/__generated__ => __generated__/iam}/InviteUserDialogMutation.graphql.ts (100%)
 rename apps/console/src/{pages/iam/organizations/settings/_components/__generated__ => __generated__/iam}/InviteUserDialog_currentRoleFragment.graphql.ts (100%)
 rename apps/console/src/{pages/iam/organizations/settings/_components/__generated__ => __generated__/iam}/MemberListFragment.graphql.ts (100%)
 rename apps/console/src/{pages/iam/organizations/settings/_components/__generated__ => __generated__/iam}/MemberListFragment_RefetchQuery.graphql.ts (100%)
 rename apps/console/src/{pages/iam/organizations/settings/_components/__generated__ => __generated__/iam}/MemberListItemFragment.graphql.ts (100%)
 rename apps/console/src/{pages/iam/organizations/settings/_components/__generated__ => __generated__/iam}/MemberListItem_currentRoleFragment.graphql.ts (100%)
 rename apps/console/src/{pages/iam/organizations/settings/_components/__generated__ => __generated__/iam}/MemberListItem_permissionsFragment.graphql.ts (100%)
 rename apps/console/src/{pages/iam/organizations/settings/_components/__generated__ => __generated__/iam}/MemberListItem_removeMutation.graphql.ts (100%)
 rename apps/console/src/{pages/iam/organizations/settings/__generated__ => __generated__/iam}/MembersPageQuery.graphql.ts (100%)
 rename apps/console/src/{pages/iam/memberships/_components/__generated__ => __generated__/iam}/MembershipCardFragment.graphql.ts (100%)
 rename apps/console/src/{pages/iam/memberships/_components/__generated__ => __generated__/iam}/MembershipCard_assumeMutation.graphql.ts (100%)
 rename apps/console/src/{pages/iam/memberships/__generated__ => __generated__/iam}/MembershipLayoutQuery.graphql.ts (100%)
 rename apps/console/src/{pages/iam/memberships/__generated__ => __generated__/iam}/MembershipsDropdownMenuItemFragment.graphql.ts (100%)
 rename apps/console/src/{pages/iam/memberships/__generated__ => __generated__/iam}/MembershipsDropdownMenuItem_assumeMutation.graphql.ts (100%)
 rename apps/console/src/{pages/iam/memberships/__generated__ => __generated__/iam}/MembershipsDropdownMenuQuery.graphql.ts (100%)
 rename apps/console/src/{pages/iam/memberships/__generated__ => __generated__/iam}/MembershipsDropdown_organizationFragment.graphql.ts (100%)
 rename apps/console/src/{pages/iam/memberships/__generated__ => __generated__/iam}/MembershipsDropdown_viewerFragment.graphql.ts (100%)
 rename apps/console/src/{pages/iam/memberships/__generated__ => __generated__/iam}/MembershipsPageQuery.graphql.ts (100%)
 rename apps/console/src/{pages/iam/organizations/__generated__ => __generated__/iam}/NewOrganizationPageMutation.graphql.ts (100%)
 rename apps/console/src/{pages/iam/organizations/settings/_components/__generated__ => __generated__/iam}/NewSAMLConfigurationForm_createMutation.graphql.ts (100%)
 rename apps/console/src/{pages/iam/organizations/settings/_components/__generated__ => __generated__/iam}/OrganizationFormFragment.graphql.ts (100%)
 rename apps/console/src/{pages/iam/organizations/settings/_components/__generated__ => __generated__/iam}/OrganizationForm_deleteHorizontalLogoMutation.graphql.ts (100%)
 rename apps/console/src/{pages/iam/organizations/settings/_components/__generated__ => __generated__/iam}/OrganizationForm_updateMutation.graphql.ts (100%)
 rename apps/console/src/{pages/iam/apiKeys/_components/__generated__ => __generated__/iam}/PersonalAPIKeyListCreateMutation.graphql.ts (100%)
 rename apps/console/src/{pages/iam/apiKeys/_components/__generated__ => __generated__/iam}/PersonalAPIKeyListFragment.graphql.ts (100%)
 rename apps/console/src/{pages/iam/apiKeys/_components/__generated__ => __generated__/iam}/PersonalAPIKeyListRevealTokenMutation.graphql.ts (100%)
 rename apps/console/src/{pages/iam/apiKeys/_components/__generated__ => __generated__/iam}/PersonalAPIKeyListRevokeMutation.graphql.ts (100%)
 rename apps/console/src/{pages/iam/organizations/settings/_components/__generated__ => __generated__/iam}/SAMLConfigurationListFragment.graphql.ts (100%)
 rename apps/console/src/{pages/iam/organizations/settings/_components/__generated__ => __generated__/iam}/SAMLConfigurationList_deleteMutation.graphql.ts (100%)
 rename apps/console/src/{pages/iam/organizations/settings/__generated__ => __generated__/iam}/SAMLSettingsPageQuery.graphql.ts (100%)
 rename apps/console/src/{pages/iam/memberships/_components/__generated__ => __generated__/iam}/SessionDropdownFragment.graphql.ts (100%)
 rename apps/console/src/{pages/iam/memberships/_components/__generated__ => __generated__/iam}/SessionDropdownSignOutMutation.graphql.ts (100%)
 rename apps/console/src/{pages/iam/memberships/_components/__generated__ => __generated__/iam}/SidebarFragment.graphql.ts (100%)
 rename apps/console/src/{pages/iam/auth/__generated__ => __generated__/iam}/SignInPageMutation.graphql.ts (100%)
 create mode 100644 apps/console/src/layouts/MainLayout.tsx

diff --git a/apps/console/package.json b/apps/console/package.json
index b626839a5..c2b86e58e 100644
--- a/apps/console/package.json
+++ b/apps/console/package.json
@@ -5,7 +5,7 @@
   "type": "module",
   "scripts": {
     "dev": "vite",
-    "relay": "find src -type d -name \"__generated__\" -exec rm -rf {} + && npx relay-compiler ./relay.core.json && npx relay-compiler ./relay.iam.json",
+    "relay": "find src -type d -name \"__generated__\" -exec rm -rf {} + && npx relay-compiler",
     "build": "tsc -b && vite build",
     "lint": "eslint .",
     "check": "tsc --noEmit -p tsconfig.app.json",
diff --git a/apps/console/relay.config.json b/apps/console/relay.config.json
new file mode 100644
index 000000000..c973efb97
--- /dev/null
+++ b/apps/console/relay.config.json
@@ -0,0 +1,25 @@
+{
+  "root": "../..",
+  "projects": {
+    "iam": {
+      "schema": "pkg/server/api/connect/v1/schema.graphql",
+      "language": "typescript",
+      "eagerEsModules": true,
+      "noFutureProofEnums": true,
+      "output": "apps/console/src/__generated__/iam",
+      "relativizeJsModulePaths": false
+    },
+    "core": {
+      "schema": "pkg/server/api/console/v1/schema.graphql",
+      "language": "typescript",
+      "eagerEsModules": true,
+      "noFutureProofEnums": true,
+      "output": "apps/console/src/__generated__/core",
+      "relativizeJsModulePaths": false
+    }
+  },
+  "sources": {
+    "apps/console/src/pages/iam": "iam",
+    "apps/console/src": "core"
+  }
+}
diff --git a/apps/console/relay.core.json b/apps/console/relay.core.json
deleted file mode 100644
index 8353e0da6..000000000
--- a/apps/console/relay.core.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "src": "./src",
-  "schema": "../../pkg/server/api/console/v1/schema.graphql",
-  "language": "typescript",
-  "eagerEsModules": true,
-  "noFutureProofEnums": true,
-  "excludes": ["**/iam/**/*", "**/node_modules/**", "**/__generated__/**"]
-}
diff --git a/apps/console/relay.iam.json b/apps/console/relay.iam.json
deleted file mode 100644
index eed3f19a9..000000000
--- a/apps/console/relay.iam.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "src": "./src/pages/iam",
-  "schema": "../../pkg/server/api/connect/v1/schema.graphql",
-  "language": "typescript",
-  "eagerEsModules": true,
-  "noFutureProofEnums": true,
-  "excludes": ["**/node_modules/**", "**/__generated__/**"]
-}
diff --git a/apps/console/src/hooks/graph/__generated__/AssetGraphCreateMutation.graphql.ts b/apps/console/src/__generated__/core/AssetGraphCreateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/AssetGraphCreateMutation.graphql.ts
rename to apps/console/src/__generated__/core/AssetGraphCreateMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/AssetGraphDeleteMutation.graphql.ts b/apps/console/src/__generated__/core/AssetGraphDeleteMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/AssetGraphDeleteMutation.graphql.ts
rename to apps/console/src/__generated__/core/AssetGraphDeleteMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/AssetGraphListQuery.graphql.ts b/apps/console/src/__generated__/core/AssetGraphListQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/AssetGraphListQuery.graphql.ts
rename to apps/console/src/__generated__/core/AssetGraphListQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/AssetGraphNodeQuery.graphql.ts b/apps/console/src/__generated__/core/AssetGraphNodeQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/AssetGraphNodeQuery.graphql.ts
rename to apps/console/src/__generated__/core/AssetGraphNodeQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/AssetGraphUpdateMutation.graphql.ts b/apps/console/src/__generated__/core/AssetGraphUpdateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/AssetGraphUpdateMutation.graphql.ts
rename to apps/console/src/__generated__/core/AssetGraphUpdateMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/assets/__generated__/AssetsListQuery.graphql.ts b/apps/console/src/__generated__/core/AssetsListQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/assets/__generated__/AssetsListQuery.graphql.ts
rename to apps/console/src/__generated__/core/AssetsListQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/assets/__generated__/AssetsPageFragment.graphql.ts b/apps/console/src/__generated__/core/AssetsPageFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/assets/__generated__/AssetsPageFragment.graphql.ts
rename to apps/console/src/__generated__/core/AssetsPageFragment.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/AuditGraphCreateMutation.graphql.ts b/apps/console/src/__generated__/core/AuditGraphCreateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/AuditGraphCreateMutation.graphql.ts
rename to apps/console/src/__generated__/core/AuditGraphCreateMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/AuditGraphDeleteMutation.graphql.ts b/apps/console/src/__generated__/core/AuditGraphDeleteMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/AuditGraphDeleteMutation.graphql.ts
rename to apps/console/src/__generated__/core/AuditGraphDeleteMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/AuditGraphDeleteReportMutation.graphql.ts b/apps/console/src/__generated__/core/AuditGraphDeleteReportMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/AuditGraphDeleteReportMutation.graphql.ts
rename to apps/console/src/__generated__/core/AuditGraphDeleteReportMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/AuditGraphListQuery.graphql.ts b/apps/console/src/__generated__/core/AuditGraphListQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/AuditGraphListQuery.graphql.ts
rename to apps/console/src/__generated__/core/AuditGraphListQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/AuditGraphNodeQuery.graphql.ts b/apps/console/src/__generated__/core/AuditGraphNodeQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/AuditGraphNodeQuery.graphql.ts
rename to apps/console/src/__generated__/core/AuditGraphNodeQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/AuditGraphUpdateMutation.graphql.ts b/apps/console/src/__generated__/core/AuditGraphUpdateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/AuditGraphUpdateMutation.graphql.ts
rename to apps/console/src/__generated__/core/AuditGraphUpdateMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/AuditGraphUploadReportMutation.graphql.ts b/apps/console/src/__generated__/core/AuditGraphUploadReportMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/AuditGraphUploadReportMutation.graphql.ts
rename to apps/console/src/__generated__/core/AuditGraphUploadReportMutation.graphql.ts
diff --git a/apps/console/src/components/form/__generated__/AuditSelectFieldQuery.graphql.ts b/apps/console/src/__generated__/core/AuditSelectFieldQuery.graphql.ts
similarity index 100%
rename from apps/console/src/components/form/__generated__/AuditSelectFieldQuery.graphql.ts
rename to apps/console/src/__generated__/core/AuditSelectFieldQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/audits/__generated__/AuditsListQuery.graphql.ts b/apps/console/src/__generated__/core/AuditsListQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/audits/__generated__/AuditsListQuery.graphql.ts
rename to apps/console/src/__generated__/core/AuditsListQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/audits/__generated__/AuditsPageFragment.graphql.ts b/apps/console/src/__generated__/core/AuditsPageFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/audits/__generated__/AuditsPageFragment.graphql.ts
rename to apps/console/src/__generated__/core/AuditsPageFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/tabs/__generated__/ComplianceReportListQuery.graphql.ts b/apps/console/src/__generated__/core/ComplianceReportListQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/tabs/__generated__/ComplianceReportListQuery.graphql.ts
rename to apps/console/src/__generated__/core/ComplianceReportListQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/ContinualImprovementGraphCreateMutation.graphql.ts b/apps/console/src/__generated__/core/ContinualImprovementGraphCreateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/ContinualImprovementGraphCreateMutation.graphql.ts
rename to apps/console/src/__generated__/core/ContinualImprovementGraphCreateMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/ContinualImprovementGraphDeleteMutation.graphql.ts b/apps/console/src/__generated__/core/ContinualImprovementGraphDeleteMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/ContinualImprovementGraphDeleteMutation.graphql.ts
rename to apps/console/src/__generated__/core/ContinualImprovementGraphDeleteMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/ContinualImprovementGraphListQuery.graphql.ts b/apps/console/src/__generated__/core/ContinualImprovementGraphListQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/ContinualImprovementGraphListQuery.graphql.ts
rename to apps/console/src/__generated__/core/ContinualImprovementGraphListQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/ContinualImprovementGraphNodeQuery.graphql.ts b/apps/console/src/__generated__/core/ContinualImprovementGraphNodeQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/ContinualImprovementGraphNodeQuery.graphql.ts
rename to apps/console/src/__generated__/core/ContinualImprovementGraphNodeQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/ContinualImprovementGraphUpdateMutation.graphql.ts b/apps/console/src/__generated__/core/ContinualImprovementGraphUpdateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/ContinualImprovementGraphUpdateMutation.graphql.ts
rename to apps/console/src/__generated__/core/ContinualImprovementGraphUpdateMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/continualImprovements/__generated__/ContinualImprovementsPageFragment.graphql.ts b/apps/console/src/__generated__/core/ContinualImprovementsPageFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/continualImprovements/__generated__/ContinualImprovementsPageFragment.graphql.ts
rename to apps/console/src/__generated__/core/ContinualImprovementsPageFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/continualImprovements/__generated__/ContinualImprovementsPageRefetchQuery.graphql.ts b/apps/console/src/__generated__/core/ContinualImprovementsPageRefetchQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/continualImprovements/__generated__/ContinualImprovementsPageRefetchQuery.graphql.ts
rename to apps/console/src/__generated__/core/ContinualImprovementsPageRefetchQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/audits/dialogs/__generated__/CreateAuditDialogFrameworksQuery.graphql.ts b/apps/console/src/__generated__/core/CreateAuditDialogFrameworksQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/audits/dialogs/__generated__/CreateAuditDialogFrameworksQuery.graphql.ts
rename to apps/console/src/__generated__/core/CreateAuditDialogFrameworksQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/dialogs/__generated__/CreateContactDialogMutation.graphql.ts b/apps/console/src/__generated__/core/CreateContactDialogMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/dialogs/__generated__/CreateContactDialogMutation.graphql.ts
rename to apps/console/src/__generated__/core/CreateContactDialogMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/documents/dialogs/__generated__/CreateDocumentDialogMutation.graphql.ts b/apps/console/src/__generated__/core/CreateDocumentDialogMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/documents/dialogs/__generated__/CreateDocumentDialogMutation.graphql.ts
rename to apps/console/src/__generated__/core/CreateDocumentDialogMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/measures/dialog/__generated__/CreateEvidenceDialogUploadMutation.graphql.ts b/apps/console/src/__generated__/core/CreateEvidenceDialogUploadMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/measures/dialog/__generated__/CreateEvidenceDialogUploadMutation.graphql.ts
rename to apps/console/src/__generated__/core/CreateEvidenceDialogUploadMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/meetings/dialogs/__generated__/CreateMeetingDialogCreateMutation.graphql.ts b/apps/console/src/__generated__/core/CreateMeetingDialogCreateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/meetings/dialogs/__generated__/CreateMeetingDialogCreateMutation.graphql.ts
rename to apps/console/src/__generated__/core/CreateMeetingDialogCreateMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/people/dialogs/__generated__/CreatePeopleDialogMutation.graphql.ts b/apps/console/src/__generated__/core/CreatePeopleDialogMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/people/dialogs/__generated__/CreatePeopleDialogMutation.graphql.ts
rename to apps/console/src/__generated__/core/CreatePeopleDialogMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/dialogs/__generated__/CreateRiskAssessmentDialogMutation.graphql.ts b/apps/console/src/__generated__/core/CreateRiskAssessmentDialogMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/dialogs/__generated__/CreateRiskAssessmentDialogMutation.graphql.ts
rename to apps/console/src/__generated__/core/CreateRiskAssessmentDialogMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/dialogs/__generated__/CreateServiceDialogMutation.graphql.ts b/apps/console/src/__generated__/core/CreateServiceDialogMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/dialogs/__generated__/CreateServiceDialogMutation.graphql.ts
rename to apps/console/src/__generated__/core/CreateServiceDialogMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/data/__generated__/DataListQuery.graphql.ts b/apps/console/src/__generated__/core/DataListQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/data/__generated__/DataListQuery.graphql.ts
rename to apps/console/src/__generated__/core/DataListQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/data/__generated__/DataPageFragment.graphql.ts b/apps/console/src/__generated__/core/DataPageFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/data/__generated__/DataPageFragment.graphql.ts
rename to apps/console/src/__generated__/core/DataPageFragment.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/DatumGraphCreateMutation.graphql.ts b/apps/console/src/__generated__/core/DatumGraphCreateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/DatumGraphCreateMutation.graphql.ts
rename to apps/console/src/__generated__/core/DatumGraphCreateMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/DatumGraphDeleteMutation.graphql.ts b/apps/console/src/__generated__/core/DatumGraphDeleteMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/DatumGraphDeleteMutation.graphql.ts
rename to apps/console/src/__generated__/core/DatumGraphDeleteMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/DatumGraphListQuery.graphql.ts b/apps/console/src/__generated__/core/DatumGraphListQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/DatumGraphListQuery.graphql.ts
rename to apps/console/src/__generated__/core/DatumGraphListQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/DatumGraphNodeQuery.graphql.ts b/apps/console/src/__generated__/core/DatumGraphNodeQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/DatumGraphNodeQuery.graphql.ts
rename to apps/console/src/__generated__/core/DatumGraphNodeQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/DatumGraphUpdateMutation.graphql.ts b/apps/console/src/__generated__/core/DatumGraphUpdateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/DatumGraphUpdateMutation.graphql.ts
rename to apps/console/src/__generated__/core/DatumGraphUpdateMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/dialogs/__generated__/DeleteBusinessAssociateAgreementDialogMutation.graphql.ts b/apps/console/src/__generated__/core/DeleteBusinessAssociateAgreementDialogMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/dialogs/__generated__/DeleteBusinessAssociateAgreementDialogMutation.graphql.ts
rename to apps/console/src/__generated__/core/DeleteBusinessAssociateAgreementDialogMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/dialogs/__generated__/DeleteDataPrivacyAgreementDialogMutation.graphql.ts b/apps/console/src/__generated__/core/DeleteDataPrivacyAgreementDialogMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/dialogs/__generated__/DeleteDataPrivacyAgreementDialogMutation.graphql.ts
rename to apps/console/src/__generated__/core/DeleteDataPrivacyAgreementDialogMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/settings/_components/__generated__/DeleteDomainDialogMutation.graphql.ts b/apps/console/src/__generated__/core/DeleteDomainDialogMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/settings/_components/__generated__/DeleteDomainDialogMutation.graphql.ts
rename to apps/console/src/__generated__/core/DeleteDomainDialogMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/documents/tabs/__generated__/DocumentControlsTabControlsQuery.graphql.ts b/apps/console/src/__generated__/core/DocumentControlsTabControlsQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/documents/tabs/__generated__/DocumentControlsTabControlsQuery.graphql.ts
rename to apps/console/src/__generated__/core/DocumentControlsTabControlsQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/documents/tabs/__generated__/DocumentControlsTabFragment.graphql.ts b/apps/console/src/__generated__/core/DocumentControlsTabFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/documents/tabs/__generated__/DocumentControlsTabFragment.graphql.ts
rename to apps/console/src/__generated__/core/DocumentControlsTabFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/documents/tabs/__generated__/DocumentControlsTab_attachControlMutation.graphql.ts b/apps/console/src/__generated__/core/DocumentControlsTab_attachControlMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/documents/tabs/__generated__/DocumentControlsTab_attachControlMutation.graphql.ts
rename to apps/console/src/__generated__/core/DocumentControlsTab_attachControlMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/documents/tabs/__generated__/DocumentControlsTab_detachControlMutation.graphql.ts b/apps/console/src/__generated__/core/DocumentControlsTab_detachControlMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/documents/tabs/__generated__/DocumentControlsTab_detachControlMutation.graphql.ts
rename to apps/console/src/__generated__/core/DocumentControlsTab_detachControlMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/documents/__generated__/DocumentDetailPageDocumentFragment.graphql.ts b/apps/console/src/__generated__/core/DocumentDetailPageDocumentFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/documents/__generated__/DocumentDetailPageDocumentFragment.graphql.ts
rename to apps/console/src/__generated__/core/DocumentDetailPageDocumentFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/documents/__generated__/DocumentDetailPageExportPDFMutation.graphql.ts b/apps/console/src/__generated__/core/DocumentDetailPageExportPDFMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/documents/__generated__/DocumentDetailPageExportPDFMutation.graphql.ts
rename to apps/console/src/__generated__/core/DocumentDetailPageExportPDFMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/documents/__generated__/DocumentDetailPagePublishMutation.graphql.ts b/apps/console/src/__generated__/core/DocumentDetailPagePublishMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/documents/__generated__/DocumentDetailPagePublishMutation.graphql.ts
rename to apps/console/src/__generated__/core/DocumentDetailPagePublishMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/documents/__generated__/DocumentDetailPageUpdateMutation.graphql.ts b/apps/console/src/__generated__/core/DocumentDetailPageUpdateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/documents/__generated__/DocumentDetailPageUpdateMutation.graphql.ts
rename to apps/console/src/__generated__/core/DocumentDetailPageUpdateMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/DocumentGraphBulkDeleteDocumentsMutation.graphql.ts b/apps/console/src/__generated__/core/DocumentGraphBulkDeleteDocumentsMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/DocumentGraphBulkDeleteDocumentsMutation.graphql.ts
rename to apps/console/src/__generated__/core/DocumentGraphBulkDeleteDocumentsMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/DocumentGraphBulkExportDocumentsMutation.graphql.ts b/apps/console/src/__generated__/core/DocumentGraphBulkExportDocumentsMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/DocumentGraphBulkExportDocumentsMutation.graphql.ts
rename to apps/console/src/__generated__/core/DocumentGraphBulkExportDocumentsMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/DocumentGraphDeleteDraftMutation.graphql.ts b/apps/console/src/__generated__/core/DocumentGraphDeleteDraftMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/DocumentGraphDeleteDraftMutation.graphql.ts
rename to apps/console/src/__generated__/core/DocumentGraphDeleteDraftMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/DocumentGraphDeleteMutation.graphql.ts b/apps/console/src/__generated__/core/DocumentGraphDeleteMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/DocumentGraphDeleteMutation.graphql.ts
rename to apps/console/src/__generated__/core/DocumentGraphDeleteMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/DocumentGraphListQuery.graphql.ts b/apps/console/src/__generated__/core/DocumentGraphListQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/DocumentGraphListQuery.graphql.ts
rename to apps/console/src/__generated__/core/DocumentGraphListQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/DocumentGraphNodeQuery.graphql.ts b/apps/console/src/__generated__/core/DocumentGraphNodeQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/DocumentGraphNodeQuery.graphql.ts
rename to apps/console/src/__generated__/core/DocumentGraphNodeQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/DocumentGraphSendSigningNotificationsMutation.graphql.ts b/apps/console/src/__generated__/core/DocumentGraphSendSigningNotificationsMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/DocumentGraphSendSigningNotificationsMutation.graphql.ts
rename to apps/console/src/__generated__/core/DocumentGraphSendSigningNotificationsMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/employee/_components/__generated__/DocumentRowFragment.graphql.ts b/apps/console/src/__generated__/core/DocumentRowFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/employee/_components/__generated__/DocumentRowFragment.graphql.ts
rename to apps/console/src/__generated__/core/DocumentRowFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/documents/tabs/__generated__/DocumentSignaturesTabRefetchQuery.graphql.ts b/apps/console/src/__generated__/core/DocumentSignaturesTabRefetchQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/documents/tabs/__generated__/DocumentSignaturesTabRefetchQuery.graphql.ts
rename to apps/console/src/__generated__/core/DocumentSignaturesTabRefetchQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/documents/tabs/__generated__/DocumentSignaturesTab_cancelSignatureMutation.graphql.ts b/apps/console/src/__generated__/core/DocumentSignaturesTab_cancelSignatureMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/documents/tabs/__generated__/DocumentSignaturesTab_cancelSignatureMutation.graphql.ts
rename to apps/console/src/__generated__/core/DocumentSignaturesTab_cancelSignatureMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/documents/tabs/__generated__/DocumentSignaturesTab_requestSignatureMutation.graphql.ts b/apps/console/src/__generated__/core/DocumentSignaturesTab_requestSignatureMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/documents/tabs/__generated__/DocumentSignaturesTab_requestSignatureMutation.graphql.ts
rename to apps/console/src/__generated__/core/DocumentSignaturesTab_requestSignatureMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/documents/tabs/__generated__/DocumentSignaturesTab_signature.graphql.ts b/apps/console/src/__generated__/core/DocumentSignaturesTab_signature.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/documents/tabs/__generated__/DocumentSignaturesTab_signature.graphql.ts
rename to apps/console/src/__generated__/core/DocumentSignaturesTab_signature.graphql.ts
diff --git a/apps/console/src/pages/organizations/documents/tabs/__generated__/DocumentSignaturesTab_version.graphql.ts b/apps/console/src/__generated__/core/DocumentSignaturesTab_version.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/documents/tabs/__generated__/DocumentSignaturesTab_version.graphql.ts
rename to apps/console/src/__generated__/core/DocumentSignaturesTab_version.graphql.ts
diff --git a/apps/console/src/pages/organizations/documents/__generated__/DocumentsListQuery.graphql.ts b/apps/console/src/__generated__/core/DocumentsListQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/documents/__generated__/DocumentsListQuery.graphql.ts
rename to apps/console/src/__generated__/core/DocumentsListQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/documents/__generated__/DocumentsPageListFragment.graphql.ts b/apps/console/src/__generated__/core/DocumentsPageListFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/documents/__generated__/DocumentsPageListFragment.graphql.ts
rename to apps/console/src/__generated__/core/DocumentsPageListFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/documents/__generated__/DocumentsPageRowFragment.graphql.ts b/apps/console/src/__generated__/core/DocumentsPageRowFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/documents/__generated__/DocumentsPageRowFragment.graphql.ts
rename to apps/console/src/__generated__/core/DocumentsPageRowFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/settings/_components/__generated__/DomainCardFragment.graphql.ts b/apps/console/src/__generated__/core/DomainCardFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/settings/_components/__generated__/DomainCardFragment.graphql.ts
rename to apps/console/src/__generated__/core/DomainCardFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/settings/_components/__generated__/DomainDialogFragment.graphql.ts b/apps/console/src/__generated__/core/DomainDialogFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/settings/_components/__generated__/DomainDialogFragment.graphql.ts
rename to apps/console/src/__generated__/core/DomainDialogFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/settings/__generated__/DomainSettingsPageQuery.graphql.ts b/apps/console/src/__generated__/core/DomainSettingsPageQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/settings/__generated__/DomainSettingsPageQuery.graphql.ts
rename to apps/console/src/__generated__/core/DomainSettingsPageQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/dialogs/__generated__/EditBusinessAssociateAgreementDialogMutation.graphql.ts b/apps/console/src/__generated__/core/EditBusinessAssociateAgreementDialogMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/dialogs/__generated__/EditBusinessAssociateAgreementDialogMutation.graphql.ts
rename to apps/console/src/__generated__/core/EditBusinessAssociateAgreementDialogMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/dialogs/__generated__/EditContactDialogUpdateMutation.graphql.ts b/apps/console/src/__generated__/core/EditContactDialogUpdateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/dialogs/__generated__/EditContactDialogUpdateMutation.graphql.ts
rename to apps/console/src/__generated__/core/EditContactDialogUpdateMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/states-of-applicability/dialogs/__generated__/EditControlDialogLinkMutation.graphql.ts b/apps/console/src/__generated__/core/EditControlDialogLinkMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/states-of-applicability/dialogs/__generated__/EditControlDialogLinkMutation.graphql.ts
rename to apps/console/src/__generated__/core/EditControlDialogLinkMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/dialogs/__generated__/EditDataPrivacyAgreementDialogMutation.graphql.ts b/apps/console/src/__generated__/core/EditDataPrivacyAgreementDialogMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/dialogs/__generated__/EditDataPrivacyAgreementDialogMutation.graphql.ts
rename to apps/console/src/__generated__/core/EditDataPrivacyAgreementDialogMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/dialogs/__generated__/EditServiceDialogUpdateMutation.graphql.ts b/apps/console/src/__generated__/core/EditServiceDialogUpdateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/dialogs/__generated__/EditServiceDialogUpdateMutation.graphql.ts
rename to apps/console/src/__generated__/core/EditServiceDialogUpdateMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/employee/__generated__/EmployeeDocumentSignaturePageDocumentFragment.graphql.ts b/apps/console/src/__generated__/core/EmployeeDocumentSignaturePageDocumentFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/employee/__generated__/EmployeeDocumentSignaturePageDocumentFragment.graphql.ts
rename to apps/console/src/__generated__/core/EmployeeDocumentSignaturePageDocumentFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/employee/__generated__/EmployeeDocumentSignaturePageExportSignablePDFMutation.graphql.ts b/apps/console/src/__generated__/core/EmployeeDocumentSignaturePageExportSignablePDFMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/employee/__generated__/EmployeeDocumentSignaturePageExportSignablePDFMutation.graphql.ts
rename to apps/console/src/__generated__/core/EmployeeDocumentSignaturePageExportSignablePDFMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/employee/__generated__/EmployeeDocumentSignaturePageQuery.graphql.ts b/apps/console/src/__generated__/core/EmployeeDocumentSignaturePageQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/employee/__generated__/EmployeeDocumentSignaturePageQuery.graphql.ts
rename to apps/console/src/__generated__/core/EmployeeDocumentSignaturePageQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/employee/__generated__/EmployeeDocumentSignaturePageSignMutation.graphql.ts b/apps/console/src/__generated__/core/EmployeeDocumentSignaturePageSignMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/employee/__generated__/EmployeeDocumentSignaturePageSignMutation.graphql.ts
rename to apps/console/src/__generated__/core/EmployeeDocumentSignaturePageSignMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/employee/__generated__/EmployeeDocumentsPageQuery.graphql.ts b/apps/console/src/__generated__/core/EmployeeDocumentsPageQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/employee/__generated__/EmployeeDocumentsPageQuery.graphql.ts
rename to apps/console/src/__generated__/core/EmployeeDocumentsPageQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/EvidenceGraphFileQuery.graphql.ts b/apps/console/src/__generated__/core/EvidenceGraphFileQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/EvidenceGraphFileQuery.graphql.ts
rename to apps/console/src/__generated__/core/EvidenceGraphFileQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/risks/__generated__/FormRiskDialogMutation.graphql.ts b/apps/console/src/__generated__/core/FormRiskDialogMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/risks/__generated__/FormRiskDialogMutation.graphql.ts
rename to apps/console/src/__generated__/core/FormRiskDialogMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/risks/__generated__/FormRiskDialogUpdateRiskMutation.graphql.ts b/apps/console/src/__generated__/core/FormRiskDialogUpdateRiskMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/risks/__generated__/FormRiskDialogUpdateRiskMutation.graphql.ts
rename to apps/console/src/__generated__/core/FormRiskDialogUpdateRiskMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/frameworks/dialogs/__generated__/FrameworkControlDialogCreateMutation.graphql.ts b/apps/console/src/__generated__/core/FrameworkControlDialogCreateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/frameworks/dialogs/__generated__/FrameworkControlDialogCreateMutation.graphql.ts
rename to apps/console/src/__generated__/core/FrameworkControlDialogCreateMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/frameworks/dialogs/__generated__/FrameworkControlDialogFragment.graphql.ts b/apps/console/src/__generated__/core/FrameworkControlDialogFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/frameworks/dialogs/__generated__/FrameworkControlDialogFragment.graphql.ts
rename to apps/console/src/__generated__/core/FrameworkControlDialogFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/frameworks/dialogs/__generated__/FrameworkControlDialogUpdateMutation.graphql.ts b/apps/console/src/__generated__/core/FrameworkControlDialogUpdateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/frameworks/dialogs/__generated__/FrameworkControlDialogUpdateMutation.graphql.ts
rename to apps/console/src/__generated__/core/FrameworkControlDialogUpdateMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/frameworks/__generated__/FrameworkControlPageAttachAuditMutation.graphql.ts b/apps/console/src/__generated__/core/FrameworkControlPageAttachAuditMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/frameworks/__generated__/FrameworkControlPageAttachAuditMutation.graphql.ts
rename to apps/console/src/__generated__/core/FrameworkControlPageAttachAuditMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/frameworks/__generated__/FrameworkControlPageAttachDocumentMutation.graphql.ts b/apps/console/src/__generated__/core/FrameworkControlPageAttachDocumentMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/frameworks/__generated__/FrameworkControlPageAttachDocumentMutation.graphql.ts
rename to apps/console/src/__generated__/core/FrameworkControlPageAttachDocumentMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/frameworks/__generated__/FrameworkControlPageAttachMutation.graphql.ts b/apps/console/src/__generated__/core/FrameworkControlPageAttachMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/frameworks/__generated__/FrameworkControlPageAttachMutation.graphql.ts
rename to apps/console/src/__generated__/core/FrameworkControlPageAttachMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/frameworks/__generated__/FrameworkControlPageAttachObligationMutation.graphql.ts b/apps/console/src/__generated__/core/FrameworkControlPageAttachObligationMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/frameworks/__generated__/FrameworkControlPageAttachObligationMutation.graphql.ts
rename to apps/console/src/__generated__/core/FrameworkControlPageAttachObligationMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/frameworks/__generated__/FrameworkControlPageAttachSnapshotMutation.graphql.ts b/apps/console/src/__generated__/core/FrameworkControlPageAttachSnapshotMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/frameworks/__generated__/FrameworkControlPageAttachSnapshotMutation.graphql.ts
rename to apps/console/src/__generated__/core/FrameworkControlPageAttachSnapshotMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/frameworks/__generated__/FrameworkControlPageAttachStateOfApplicabilityMutation.graphql.ts b/apps/console/src/__generated__/core/FrameworkControlPageAttachStateOfApplicabilityMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/frameworks/__generated__/FrameworkControlPageAttachStateOfApplicabilityMutation.graphql.ts
rename to apps/console/src/__generated__/core/FrameworkControlPageAttachStateOfApplicabilityMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/frameworks/__generated__/FrameworkControlPageDeleteControlMutation.graphql.ts b/apps/console/src/__generated__/core/FrameworkControlPageDeleteControlMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/frameworks/__generated__/FrameworkControlPageDeleteControlMutation.graphql.ts
rename to apps/console/src/__generated__/core/FrameworkControlPageDeleteControlMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/frameworks/__generated__/FrameworkControlPageDetachAuditMutation.graphql.ts b/apps/console/src/__generated__/core/FrameworkControlPageDetachAuditMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/frameworks/__generated__/FrameworkControlPageDetachAuditMutation.graphql.ts
rename to apps/console/src/__generated__/core/FrameworkControlPageDetachAuditMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/frameworks/__generated__/FrameworkControlPageDetachDocumentMutation.graphql.ts b/apps/console/src/__generated__/core/FrameworkControlPageDetachDocumentMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/frameworks/__generated__/FrameworkControlPageDetachDocumentMutation.graphql.ts
rename to apps/console/src/__generated__/core/FrameworkControlPageDetachDocumentMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/frameworks/__generated__/FrameworkControlPageDetachMutation.graphql.ts b/apps/console/src/__generated__/core/FrameworkControlPageDetachMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/frameworks/__generated__/FrameworkControlPageDetachMutation.graphql.ts
rename to apps/console/src/__generated__/core/FrameworkControlPageDetachMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/frameworks/__generated__/FrameworkControlPageDetachObligationMutation.graphql.ts b/apps/console/src/__generated__/core/FrameworkControlPageDetachObligationMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/frameworks/__generated__/FrameworkControlPageDetachObligationMutation.graphql.ts
rename to apps/console/src/__generated__/core/FrameworkControlPageDetachObligationMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/frameworks/__generated__/FrameworkControlPageDetachSnapshotMutation.graphql.ts b/apps/console/src/__generated__/core/FrameworkControlPageDetachSnapshotMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/frameworks/__generated__/FrameworkControlPageDetachSnapshotMutation.graphql.ts
rename to apps/console/src/__generated__/core/FrameworkControlPageDetachSnapshotMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/frameworks/__generated__/FrameworkControlPageDetachStateOfApplicabilityMutation.graphql.ts b/apps/console/src/__generated__/core/FrameworkControlPageDetachStateOfApplicabilityMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/frameworks/__generated__/FrameworkControlPageDetachStateOfApplicabilityMutation.graphql.ts
rename to apps/console/src/__generated__/core/FrameworkControlPageDetachStateOfApplicabilityMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/frameworks/__generated__/FrameworkDetailPageExportFrameworkMutation.graphql.ts b/apps/console/src/__generated__/core/FrameworkDetailPageExportFrameworkMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/frameworks/__generated__/FrameworkDetailPageExportFrameworkMutation.graphql.ts
rename to apps/console/src/__generated__/core/FrameworkDetailPageExportFrameworkMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/frameworks/__generated__/FrameworkDetailPageFragment.graphql.ts b/apps/console/src/__generated__/core/FrameworkDetailPageFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/frameworks/__generated__/FrameworkDetailPageFragment.graphql.ts
rename to apps/console/src/__generated__/core/FrameworkDetailPageFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/frameworks/__generated__/FrameworkDetailPageGenerateFrameworkStateOfApplicabilityMutation.graphql.ts b/apps/console/src/__generated__/core/FrameworkDetailPageGenerateFrameworkStateOfApplicabilityMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/frameworks/__generated__/FrameworkDetailPageGenerateFrameworkStateOfApplicabilityMutation.graphql.ts
rename to apps/console/src/__generated__/core/FrameworkDetailPageGenerateFrameworkStateOfApplicabilityMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/frameworks/dialogs/__generated__/FrameworkFormDialogMutation.graphql.ts b/apps/console/src/__generated__/core/FrameworkFormDialogMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/frameworks/dialogs/__generated__/FrameworkFormDialogMutation.graphql.ts
rename to apps/console/src/__generated__/core/FrameworkFormDialogMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/frameworks/dialogs/__generated__/FrameworkFormDialogUpdateMutation.graphql.ts b/apps/console/src/__generated__/core/FrameworkFormDialogUpdateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/frameworks/dialogs/__generated__/FrameworkFormDialogUpdateMutation.graphql.ts
rename to apps/console/src/__generated__/core/FrameworkFormDialogUpdateMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/FrameworkGraphControlNodeQuery.graphql.ts b/apps/console/src/__generated__/core/FrameworkGraphControlNodeQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/FrameworkGraphControlNodeQuery.graphql.ts
rename to apps/console/src/__generated__/core/FrameworkGraphControlNodeQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/FrameworkGraphDeleteMutation.graphql.ts b/apps/console/src/__generated__/core/FrameworkGraphDeleteMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/FrameworkGraphDeleteMutation.graphql.ts
rename to apps/console/src/__generated__/core/FrameworkGraphDeleteMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/FrameworkGraphListQuery.graphql.ts b/apps/console/src/__generated__/core/FrameworkGraphListQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/FrameworkGraphListQuery.graphql.ts
rename to apps/console/src/__generated__/core/FrameworkGraphListQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/FrameworkGraphNodeQuery.graphql.ts b/apps/console/src/__generated__/core/FrameworkGraphNodeQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/FrameworkGraphNodeQuery.graphql.ts
rename to apps/console/src/__generated__/core/FrameworkGraphNodeQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/frameworks/__generated__/FrameworksPageCardFragment.graphql.ts b/apps/console/src/__generated__/core/FrameworksPageCardFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/frameworks/__generated__/FrameworksPageCardFragment.graphql.ts
rename to apps/console/src/__generated__/core/FrameworksPageCardFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/frameworks/__generated__/FrameworksPageImportMutation.graphql.ts b/apps/console/src/__generated__/core/FrameworksPageImportMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/frameworks/__generated__/FrameworksPageImportMutation.graphql.ts
rename to apps/console/src/__generated__/core/FrameworksPageImportMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/dialogs/__generated__/ImportAssessmentDialogMutation.graphql.ts b/apps/console/src/__generated__/core/ImportAssessmentDialogMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/dialogs/__generated__/ImportAssessmentDialogMutation.graphql.ts
rename to apps/console/src/__generated__/core/ImportAssessmentDialogMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/states-of-applicability/dialogs/__generated__/LinkControlDialogLinkMutation.graphql.ts b/apps/console/src/__generated__/core/LinkControlDialogLinkMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/states-of-applicability/dialogs/__generated__/LinkControlDialogLinkMutation.graphql.ts
rename to apps/console/src/__generated__/core/LinkControlDialogLinkMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/states-of-applicability/dialogs/__generated__/LinkControlDialogQuery.graphql.ts b/apps/console/src/__generated__/core/LinkControlDialogQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/states-of-applicability/dialogs/__generated__/LinkControlDialogQuery.graphql.ts
rename to apps/console/src/__generated__/core/LinkControlDialogQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/states-of-applicability/dialogs/__generated__/LinkControlDialogUnlinkMutation.graphql.ts b/apps/console/src/__generated__/core/LinkControlDialogUnlinkMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/states-of-applicability/dialogs/__generated__/LinkControlDialogUnlinkMutation.graphql.ts
rename to apps/console/src/__generated__/core/LinkControlDialogUnlinkMutation.graphql.ts
diff --git a/apps/console/src/components/audits/__generated__/LinkedAuditsCardFragment.graphql.ts b/apps/console/src/__generated__/core/LinkedAuditsCardFragment.graphql.ts
similarity index 100%
rename from apps/console/src/components/audits/__generated__/LinkedAuditsCardFragment.graphql.ts
rename to apps/console/src/__generated__/core/LinkedAuditsCardFragment.graphql.ts
diff --git a/apps/console/src/components/audits/__generated__/LinkedAuditsDialogFragment.graphql.ts b/apps/console/src/__generated__/core/LinkedAuditsDialogFragment.graphql.ts
similarity index 100%
rename from apps/console/src/components/audits/__generated__/LinkedAuditsDialogFragment.graphql.ts
rename to apps/console/src/__generated__/core/LinkedAuditsDialogFragment.graphql.ts
diff --git a/apps/console/src/components/audits/__generated__/LinkedAuditsDialogQuery.graphql.ts b/apps/console/src/__generated__/core/LinkedAuditsDialogQuery.graphql.ts
similarity index 100%
rename from apps/console/src/components/audits/__generated__/LinkedAuditsDialogQuery.graphql.ts
rename to apps/console/src/__generated__/core/LinkedAuditsDialogQuery.graphql.ts
diff --git a/apps/console/src/components/audits/__generated__/LinkedAuditsDialogQuery_fragment.graphql.ts b/apps/console/src/__generated__/core/LinkedAuditsDialogQuery_fragment.graphql.ts
similarity index 100%
rename from apps/console/src/components/audits/__generated__/LinkedAuditsDialogQuery_fragment.graphql.ts
rename to apps/console/src/__generated__/core/LinkedAuditsDialogQuery_fragment.graphql.ts
diff --git a/apps/console/src/components/controls/__generated__/LinkedControlsCardFragment.graphql.ts b/apps/console/src/__generated__/core/LinkedControlsCardFragment.graphql.ts
similarity index 100%
rename from apps/console/src/components/controls/__generated__/LinkedControlsCardFragment.graphql.ts
rename to apps/console/src/__generated__/core/LinkedControlsCardFragment.graphql.ts
diff --git a/apps/console/src/components/controls/__generated__/LinkedControlsDialogControlsQuery.graphql.ts b/apps/console/src/__generated__/core/LinkedControlsDialogControlsQuery.graphql.ts
similarity index 100%
rename from apps/console/src/components/controls/__generated__/LinkedControlsDialogControlsQuery.graphql.ts
rename to apps/console/src/__generated__/core/LinkedControlsDialogControlsQuery.graphql.ts
diff --git a/apps/console/src/components/controls/__generated__/LinkedControlsDialogFragment.graphql.ts b/apps/console/src/__generated__/core/LinkedControlsDialogFragment.graphql.ts
similarity index 100%
rename from apps/console/src/components/controls/__generated__/LinkedControlsDialogFragment.graphql.ts
rename to apps/console/src/__generated__/core/LinkedControlsDialogFragment.graphql.ts
diff --git a/apps/console/src/components/controls/__generated__/LinkedControlsDialogQuery.graphql.ts b/apps/console/src/__generated__/core/LinkedControlsDialogQuery.graphql.ts
similarity index 100%
rename from apps/console/src/components/controls/__generated__/LinkedControlsDialogQuery.graphql.ts
rename to apps/console/src/__generated__/core/LinkedControlsDialogQuery.graphql.ts
diff --git a/apps/console/src/components/documents/__generated__/LinkedDocumentsCardFragment.graphql.ts b/apps/console/src/__generated__/core/LinkedDocumentsCardFragment.graphql.ts
similarity index 100%
rename from apps/console/src/components/documents/__generated__/LinkedDocumentsCardFragment.graphql.ts
rename to apps/console/src/__generated__/core/LinkedDocumentsCardFragment.graphql.ts
diff --git a/apps/console/src/components/documents/__generated__/LinkedDocumentsDialogFragment.graphql.ts b/apps/console/src/__generated__/core/LinkedDocumentsDialogFragment.graphql.ts
similarity index 100%
rename from apps/console/src/components/documents/__generated__/LinkedDocumentsDialogFragment.graphql.ts
rename to apps/console/src/__generated__/core/LinkedDocumentsDialogFragment.graphql.ts
diff --git a/apps/console/src/components/documents/__generated__/LinkedDocumentsDialogQuery.graphql.ts b/apps/console/src/__generated__/core/LinkedDocumentsDialogQuery.graphql.ts
similarity index 100%
rename from apps/console/src/components/documents/__generated__/LinkedDocumentsDialogQuery.graphql.ts
rename to apps/console/src/__generated__/core/LinkedDocumentsDialogQuery.graphql.ts
diff --git a/apps/console/src/components/documents/__generated__/LinkedDocumentsDialogQuery_fragment.graphql.ts b/apps/console/src/__generated__/core/LinkedDocumentsDialogQuery_fragment.graphql.ts
similarity index 100%
rename from apps/console/src/components/documents/__generated__/LinkedDocumentsDialogQuery_fragment.graphql.ts
rename to apps/console/src/__generated__/core/LinkedDocumentsDialogQuery_fragment.graphql.ts
diff --git a/apps/console/src/components/measures/__generated__/LinkedMeasuresCardFragment.graphql.ts b/apps/console/src/__generated__/core/LinkedMeasuresCardFragment.graphql.ts
similarity index 100%
rename from apps/console/src/components/measures/__generated__/LinkedMeasuresCardFragment.graphql.ts
rename to apps/console/src/__generated__/core/LinkedMeasuresCardFragment.graphql.ts
diff --git a/apps/console/src/components/obligations/__generated__/LinkedObligationsCardFragment.graphql.ts b/apps/console/src/__generated__/core/LinkedObligationsCardFragment.graphql.ts
similarity index 100%
rename from apps/console/src/components/obligations/__generated__/LinkedObligationsCardFragment.graphql.ts
rename to apps/console/src/__generated__/core/LinkedObligationsCardFragment.graphql.ts
diff --git a/apps/console/src/components/obligations/__generated__/LinkedObligationsDialogFragment.graphql.ts b/apps/console/src/__generated__/core/LinkedObligationsDialogFragment.graphql.ts
similarity index 100%
rename from apps/console/src/components/obligations/__generated__/LinkedObligationsDialogFragment.graphql.ts
rename to apps/console/src/__generated__/core/LinkedObligationsDialogFragment.graphql.ts
diff --git a/apps/console/src/components/obligations/__generated__/LinkedObligationsDialogQuery.graphql.ts b/apps/console/src/__generated__/core/LinkedObligationsDialogQuery.graphql.ts
similarity index 100%
rename from apps/console/src/components/obligations/__generated__/LinkedObligationsDialogQuery.graphql.ts
rename to apps/console/src/__generated__/core/LinkedObligationsDialogQuery.graphql.ts
diff --git a/apps/console/src/components/obligations/__generated__/LinkedObligationsDialogQuery_fragment.graphql.ts b/apps/console/src/__generated__/core/LinkedObligationsDialogQuery_fragment.graphql.ts
similarity index 100%
rename from apps/console/src/components/obligations/__generated__/LinkedObligationsDialogQuery_fragment.graphql.ts
rename to apps/console/src/__generated__/core/LinkedObligationsDialogQuery_fragment.graphql.ts
diff --git a/apps/console/src/components/risks/__generated__/LinkedRisksCardFragment.graphql.ts b/apps/console/src/__generated__/core/LinkedRisksCardFragment.graphql.ts
similarity index 100%
rename from apps/console/src/components/risks/__generated__/LinkedRisksCardFragment.graphql.ts
rename to apps/console/src/__generated__/core/LinkedRisksCardFragment.graphql.ts
diff --git a/apps/console/src/components/risks/__generated__/LinkedRisksDialogQuery.graphql.ts b/apps/console/src/__generated__/core/LinkedRisksDialogQuery.graphql.ts
similarity index 100%
rename from apps/console/src/components/risks/__generated__/LinkedRisksDialogQuery.graphql.ts
rename to apps/console/src/__generated__/core/LinkedRisksDialogQuery.graphql.ts
diff --git a/apps/console/src/components/snapshots/__generated__/LinkedSnapshotsCardFragment.graphql.ts b/apps/console/src/__generated__/core/LinkedSnapshotsCardFragment.graphql.ts
similarity index 100%
rename from apps/console/src/components/snapshots/__generated__/LinkedSnapshotsCardFragment.graphql.ts
rename to apps/console/src/__generated__/core/LinkedSnapshotsCardFragment.graphql.ts
diff --git a/apps/console/src/components/snapshots/__generated__/LinkedSnapshotsDialogFragment.graphql.ts b/apps/console/src/__generated__/core/LinkedSnapshotsDialogFragment.graphql.ts
similarity index 100%
rename from apps/console/src/components/snapshots/__generated__/LinkedSnapshotsDialogFragment.graphql.ts
rename to apps/console/src/__generated__/core/LinkedSnapshotsDialogFragment.graphql.ts
diff --git a/apps/console/src/components/snapshots/__generated__/LinkedSnapshotsDialogQuery.graphql.ts b/apps/console/src/__generated__/core/LinkedSnapshotsDialogQuery.graphql.ts
similarity index 100%
rename from apps/console/src/components/snapshots/__generated__/LinkedSnapshotsDialogQuery.graphql.ts
rename to apps/console/src/__generated__/core/LinkedSnapshotsDialogQuery.graphql.ts
diff --git a/apps/console/src/components/snapshots/__generated__/LinkedSnapshotsDialogQuery_fragment.graphql.ts b/apps/console/src/__generated__/core/LinkedSnapshotsDialogQuery_fragment.graphql.ts
similarity index 100%
rename from apps/console/src/components/snapshots/__generated__/LinkedSnapshotsDialogQuery_fragment.graphql.ts
rename to apps/console/src/__generated__/core/LinkedSnapshotsDialogQuery_fragment.graphql.ts
diff --git a/apps/console/src/components/states-of-applicability/__generated__/LinkedStatesOfApplicabilityCardFragment.graphql.ts b/apps/console/src/__generated__/core/LinkedStatesOfApplicabilityCardFragment.graphql.ts
similarity index 100%
rename from apps/console/src/components/states-of-applicability/__generated__/LinkedStatesOfApplicabilityCardFragment.graphql.ts
rename to apps/console/src/__generated__/core/LinkedStatesOfApplicabilityCardFragment.graphql.ts
diff --git a/apps/console/src/components/states-of-applicability/__generated__/LinkedStatesOfApplicabilityDialogQuery.graphql.ts b/apps/console/src/__generated__/core/LinkedStatesOfApplicabilityDialogQuery.graphql.ts
similarity index 100%
rename from apps/console/src/components/states-of-applicability/__generated__/LinkedStatesOfApplicabilityDialogQuery.graphql.ts
rename to apps/console/src/__generated__/core/LinkedStatesOfApplicabilityDialogQuery.graphql.ts
diff --git a/apps/console/src/layouts/__generated__/EmployeeLayoutQuery.graphql.ts b/apps/console/src/__generated__/core/MainLayoutQuery.graphql.ts
similarity index 79%
rename from apps/console/src/layouts/__generated__/EmployeeLayoutQuery.graphql.ts
rename to apps/console/src/__generated__/core/MainLayoutQuery.graphql.ts
index 52b327aa5..6db37dbe4 100644
--- a/apps/console/src/layouts/__generated__/EmployeeLayoutQuery.graphql.ts
+++ b/apps/console/src/__generated__/core/MainLayoutQuery.graphql.ts
@@ -1,5 +1,5 @@
 /**
- * @generated SignedSource<<e1da65c68225be2c9a9768b31a0bf255>>
+ * @generated SignedSource<<f441167b6ed9402b92fcdf6dbaa77170>>
  * @lightSyntaxTransform
  * @nogrep
  */
@@ -9,10 +9,10 @@
 // @ts-nocheck
 
 import { ConcreteRequest } from 'relay-runtime';
-export type EmployeeLayoutQuery$variables = {
+export type MainLayoutQuery$variables = {
   organizationId: string;
 };
-export type EmployeeLayoutQuery$data = {
+export type MainLayoutQuery$data = {
   readonly organization: {
     readonly id?: string;
     readonly logoUrl?: string | null | undefined;
@@ -22,9 +22,9 @@ export type EmployeeLayoutQuery$data = {
     readonly id: string;
   };
 };
-export type EmployeeLayoutQuery = {
-  response: EmployeeLayoutQuery$data;
-  variables: EmployeeLayoutQuery$variables;
+export type MainLayoutQuery = {
+  response: MainLayoutQuery$data;
+  variables: MainLayoutQuery$variables;
 };
 
 const node: ConcreteRequest = (function(){
@@ -80,7 +80,7 @@ return {
     "argumentDefinitions": (v0/*: any*/),
     "kind": "Fragment",
     "metadata": null,
-    "name": "EmployeeLayoutQuery",
+    "name": "MainLayoutQuery",
     "selections": [
       (v2/*: any*/),
       {
@@ -112,7 +112,7 @@ return {
   "operation": {
     "argumentDefinitions": (v0/*: any*/),
     "kind": "Operation",
-    "name": "EmployeeLayoutQuery",
+    "name": "MainLayoutQuery",
     "selections": [
       (v2/*: any*/),
       {
@@ -146,16 +146,16 @@ return {
     ]
   },
   "params": {
-    "cacheID": "2a4f5ec8a38110f9fe87a7f83cc38612",
+    "cacheID": "2ec49ff40720bacec29e7b6b1bf1408b",
     "id": null,
     "metadata": {},
-    "name": "EmployeeLayoutQuery",
+    "name": "MainLayoutQuery",
     "operationKind": "query",
-    "text": "query EmployeeLayoutQuery(\n  $organizationId: ID!\n) {\n  viewer {\n    id\n  }\n  organization: node(id: $organizationId) {\n    __typename\n    ... on Organization {\n      id\n      name\n      logoUrl\n    }\n    id\n  }\n}\n"
+    "text": "query MainLayoutQuery(\n  $organizationId: ID!\n) {\n  viewer {\n    id\n  }\n  organization: node(id: $organizationId) {\n    __typename\n    ... on Organization {\n      id\n      name\n      logoUrl\n    }\n    id\n  }\n}\n"
   }
 };
 })();
 
-(node as any).hash = "71cd50a44823e7919089a137ca0c282e";
+(node as any).hash = "d958a2acbd9d13698b9c2b350b05d5a0";
 
 export default node;
diff --git a/apps/console/src/pages/organizations/measures/tabs/__generated__/MeasureControlsTabAttachMutation.graphql.ts b/apps/console/src/__generated__/core/MeasureControlsTabAttachMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/measures/tabs/__generated__/MeasureControlsTabAttachMutation.graphql.ts
rename to apps/console/src/__generated__/core/MeasureControlsTabAttachMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/measures/tabs/__generated__/MeasureControlsTabControlsQuery.graphql.ts b/apps/console/src/__generated__/core/MeasureControlsTabControlsQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/measures/tabs/__generated__/MeasureControlsTabControlsQuery.graphql.ts
rename to apps/console/src/__generated__/core/MeasureControlsTabControlsQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/measures/tabs/__generated__/MeasureControlsTabDetachMutation.graphql.ts b/apps/console/src/__generated__/core/MeasureControlsTabDetachMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/measures/tabs/__generated__/MeasureControlsTabDetachMutation.graphql.ts
rename to apps/console/src/__generated__/core/MeasureControlsTabDetachMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/measures/tabs/__generated__/MeasureControlsTabFragment.graphql.ts b/apps/console/src/__generated__/core/MeasureControlsTabFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/measures/tabs/__generated__/MeasureControlsTabFragment.graphql.ts
rename to apps/console/src/__generated__/core/MeasureControlsTabFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/measures/__generated__/MeasureDetailPageTasksCountQuery.graphql.ts b/apps/console/src/__generated__/core/MeasureDetailPageTasksCountQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/measures/__generated__/MeasureDetailPageTasksCountQuery.graphql.ts
rename to apps/console/src/__generated__/core/MeasureDetailPageTasksCountQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/measures/tabs/__generated__/MeasureEvidencesTabDeleteMutation.graphql.ts b/apps/console/src/__generated__/core/MeasureEvidencesTabDeleteMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/measures/tabs/__generated__/MeasureEvidencesTabDeleteMutation.graphql.ts
rename to apps/console/src/__generated__/core/MeasureEvidencesTabDeleteMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/measures/tabs/__generated__/MeasureEvidencesTabFragment.graphql.ts b/apps/console/src/__generated__/core/MeasureEvidencesTabFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/measures/tabs/__generated__/MeasureEvidencesTabFragment.graphql.ts
rename to apps/console/src/__generated__/core/MeasureEvidencesTabFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/measures/tabs/__generated__/MeasureEvidencesTabFragment_evidence.graphql.ts b/apps/console/src/__generated__/core/MeasureEvidencesTabFragment_evidence.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/measures/tabs/__generated__/MeasureEvidencesTabFragment_evidence.graphql.ts
rename to apps/console/src/__generated__/core/MeasureEvidencesTabFragment_evidence.graphql.ts
diff --git a/apps/console/src/pages/organizations/measures/tabs/__generated__/MeasureEvidencesTabQuery.graphql.ts b/apps/console/src/__generated__/core/MeasureEvidencesTabQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/measures/tabs/__generated__/MeasureEvidencesTabQuery.graphql.ts
rename to apps/console/src/__generated__/core/MeasureEvidencesTabQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/measures/dialog/__generated__/MeasureFormDialogCreateMutation.graphql.ts b/apps/console/src/__generated__/core/MeasureFormDialogCreateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/measures/dialog/__generated__/MeasureFormDialogCreateMutation.graphql.ts
rename to apps/console/src/__generated__/core/MeasureFormDialogCreateMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/measures/dialog/__generated__/MeasureFormDialogMeasureFragment.graphql.ts b/apps/console/src/__generated__/core/MeasureFormDialogMeasureFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/measures/dialog/__generated__/MeasureFormDialogMeasureFragment.graphql.ts
rename to apps/console/src/__generated__/core/MeasureFormDialogMeasureFragment.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/MeasureGraphDeleteMutation.graphql.ts b/apps/console/src/__generated__/core/MeasureGraphDeleteMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/MeasureGraphDeleteMutation.graphql.ts
rename to apps/console/src/__generated__/core/MeasureGraphDeleteMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/MeasureGraphListQuery.graphql.ts b/apps/console/src/__generated__/core/MeasureGraphListQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/MeasureGraphListQuery.graphql.ts
rename to apps/console/src/__generated__/core/MeasureGraphListQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/MeasureGraphNodeQuery.graphql.ts b/apps/console/src/__generated__/core/MeasureGraphNodeQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/MeasureGraphNodeQuery.graphql.ts
rename to apps/console/src/__generated__/core/MeasureGraphNodeQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/MeasureGraphUpdateMutation.graphql.ts b/apps/console/src/__generated__/core/MeasureGraphUpdateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/MeasureGraphUpdateMutation.graphql.ts
rename to apps/console/src/__generated__/core/MeasureGraphUpdateMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/measures/tabs/__generated__/MeasureRisksTabCreateMutation.graphql.ts b/apps/console/src/__generated__/core/MeasureRisksTabCreateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/measures/tabs/__generated__/MeasureRisksTabCreateMutation.graphql.ts
rename to apps/console/src/__generated__/core/MeasureRisksTabCreateMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/measures/tabs/__generated__/MeasureRisksTabDetachMutation.graphql.ts b/apps/console/src/__generated__/core/MeasureRisksTabDetachMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/measures/tabs/__generated__/MeasureRisksTabDetachMutation.graphql.ts
rename to apps/console/src/__generated__/core/MeasureRisksTabDetachMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/measures/tabs/__generated__/MeasureRisksTabFragment.graphql.ts b/apps/console/src/__generated__/core/MeasureRisksTabFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/measures/tabs/__generated__/MeasureRisksTabFragment.graphql.ts
rename to apps/console/src/__generated__/core/MeasureRisksTabFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/measures/tabs/__generated__/MeasureTasksTabQuery.graphql.ts b/apps/console/src/__generated__/core/MeasureTasksTabQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/measures/tabs/__generated__/MeasureTasksTabQuery.graphql.ts
rename to apps/console/src/__generated__/core/MeasureTasksTabQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/measures/__generated__/MeasuresPageFragment.graphql.ts b/apps/console/src/__generated__/core/MeasuresPageFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/measures/__generated__/MeasuresPageFragment.graphql.ts
rename to apps/console/src/__generated__/core/MeasuresPageFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/measures/__generated__/MeasuresPageImportMutation.graphql.ts b/apps/console/src/__generated__/core/MeasuresPageImportMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/measures/__generated__/MeasuresPageImportMutation.graphql.ts
rename to apps/console/src/__generated__/core/MeasuresPageImportMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/meetings/__generated__/MeetingDetailPageMeetingFragment.graphql.ts b/apps/console/src/__generated__/core/MeetingDetailPageMeetingFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/meetings/__generated__/MeetingDetailPageMeetingFragment.graphql.ts
rename to apps/console/src/__generated__/core/MeetingDetailPageMeetingFragment.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/MeetingGraphCreateMutation.graphql.ts b/apps/console/src/__generated__/core/MeetingGraphCreateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/MeetingGraphCreateMutation.graphql.ts
rename to apps/console/src/__generated__/core/MeetingGraphCreateMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/MeetingGraphDeleteMutation.graphql.ts b/apps/console/src/__generated__/core/MeetingGraphDeleteMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/MeetingGraphDeleteMutation.graphql.ts
rename to apps/console/src/__generated__/core/MeetingGraphDeleteMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/MeetingGraphListQuery.graphql.ts b/apps/console/src/__generated__/core/MeetingGraphListQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/MeetingGraphListQuery.graphql.ts
rename to apps/console/src/__generated__/core/MeetingGraphListQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/MeetingGraphNodeQuery.graphql.ts b/apps/console/src/__generated__/core/MeetingGraphNodeQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/MeetingGraphNodeQuery.graphql.ts
rename to apps/console/src/__generated__/core/MeetingGraphNodeQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/MeetingGraphUpdateMutation.graphql.ts b/apps/console/src/__generated__/core/MeetingGraphUpdateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/MeetingGraphUpdateMutation.graphql.ts
rename to apps/console/src/__generated__/core/MeetingGraphUpdateMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/meetings/__generated__/MeetingsListQuery.graphql.ts b/apps/console/src/__generated__/core/MeetingsListQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/meetings/__generated__/MeetingsListQuery.graphql.ts
rename to apps/console/src/__generated__/core/MeetingsListQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/meetings/__generated__/MeetingsPageListFragment.graphql.ts b/apps/console/src/__generated__/core/MeetingsPageListFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/meetings/__generated__/MeetingsPageListFragment.graphql.ts
rename to apps/console/src/__generated__/core/MeetingsPageListFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/meetings/__generated__/MeetingsPageRowFragment.graphql.ts b/apps/console/src/__generated__/core/MeetingsPageRowFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/meetings/__generated__/MeetingsPageRowFragment.graphql.ts
rename to apps/console/src/__generated__/core/MeetingsPageRowFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/meetings/__generated__/MeetingsPage_UpdateSummaryMutation.graphql.ts b/apps/console/src/__generated__/core/MeetingsPage_UpdateSummaryMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/meetings/__generated__/MeetingsPage_UpdateSummaryMutation.graphql.ts
rename to apps/console/src/__generated__/core/MeetingsPage_UpdateSummaryMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/settings/_components/__generated__/NewDomainDialogMutation.graphql.ts b/apps/console/src/__generated__/core/NewDomainDialogMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/settings/_components/__generated__/NewDomainDialogMutation.graphql.ts
rename to apps/console/src/__generated__/core/NewDomainDialogMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/nonconformities/__generated__/NonconformitiesPageFragment.graphql.ts b/apps/console/src/__generated__/core/NonconformitiesPageFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/nonconformities/__generated__/NonconformitiesPageFragment.graphql.ts
rename to apps/console/src/__generated__/core/NonconformitiesPageFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/nonconformities/__generated__/NonconformitiesPageRefetchQuery.graphql.ts b/apps/console/src/__generated__/core/NonconformitiesPageRefetchQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/nonconformities/__generated__/NonconformitiesPageRefetchQuery.graphql.ts
rename to apps/console/src/__generated__/core/NonconformitiesPageRefetchQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/NonconformityGraphCreateMutation.graphql.ts b/apps/console/src/__generated__/core/NonconformityGraphCreateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/NonconformityGraphCreateMutation.graphql.ts
rename to apps/console/src/__generated__/core/NonconformityGraphCreateMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/NonconformityGraphDeleteMutation.graphql.ts b/apps/console/src/__generated__/core/NonconformityGraphDeleteMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/NonconformityGraphDeleteMutation.graphql.ts
rename to apps/console/src/__generated__/core/NonconformityGraphDeleteMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/NonconformityGraphListQuery.graphql.ts b/apps/console/src/__generated__/core/NonconformityGraphListQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/NonconformityGraphListQuery.graphql.ts
rename to apps/console/src/__generated__/core/NonconformityGraphListQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/NonconformityGraphNodeQuery.graphql.ts b/apps/console/src/__generated__/core/NonconformityGraphNodeQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/NonconformityGraphNodeQuery.graphql.ts
rename to apps/console/src/__generated__/core/NonconformityGraphNodeQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/NonconformityGraphUpdateMutation.graphql.ts b/apps/console/src/__generated__/core/NonconformityGraphUpdateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/NonconformityGraphUpdateMutation.graphql.ts
rename to apps/console/src/__generated__/core/NonconformityGraphUpdateMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/ObligationGraphCreateMutation.graphql.ts b/apps/console/src/__generated__/core/ObligationGraphCreateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/ObligationGraphCreateMutation.graphql.ts
rename to apps/console/src/__generated__/core/ObligationGraphCreateMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/ObligationGraphDeleteMutation.graphql.ts b/apps/console/src/__generated__/core/ObligationGraphDeleteMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/ObligationGraphDeleteMutation.graphql.ts
rename to apps/console/src/__generated__/core/ObligationGraphDeleteMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/ObligationGraphListQuery.graphql.ts b/apps/console/src/__generated__/core/ObligationGraphListQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/ObligationGraphListQuery.graphql.ts
rename to apps/console/src/__generated__/core/ObligationGraphListQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/ObligationGraphNodeQuery.graphql.ts b/apps/console/src/__generated__/core/ObligationGraphNodeQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/ObligationGraphNodeQuery.graphql.ts
rename to apps/console/src/__generated__/core/ObligationGraphNodeQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/ObligationGraphUpdateMutation.graphql.ts b/apps/console/src/__generated__/core/ObligationGraphUpdateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/ObligationGraphUpdateMutation.graphql.ts
rename to apps/console/src/__generated__/core/ObligationGraphUpdateMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/obligations/__generated__/ObligationsPageFragment.graphql.ts b/apps/console/src/__generated__/core/ObligationsPageFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/obligations/__generated__/ObligationsPageFragment.graphql.ts
rename to apps/console/src/__generated__/core/ObligationsPageFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/obligations/__generated__/ObligationsPageRefetchQuery.graphql.ts b/apps/console/src/__generated__/core/ObligationsPageRefetchQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/obligations/__generated__/ObligationsPageRefetchQuery.graphql.ts
rename to apps/console/src/__generated__/core/ObligationsPageRefetchQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/PeopleGraphDeleteMutation.graphql.ts b/apps/console/src/__generated__/core/PeopleGraphDeleteMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/PeopleGraphDeleteMutation.graphql.ts
rename to apps/console/src/__generated__/core/PeopleGraphDeleteMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/PeopleGraphNodeQuery.graphql.ts b/apps/console/src/__generated__/core/PeopleGraphNodeQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/PeopleGraphNodeQuery.graphql.ts
rename to apps/console/src/__generated__/core/PeopleGraphNodeQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/PeopleGraphPaginatedFragment.graphql.ts b/apps/console/src/__generated__/core/PeopleGraphPaginatedFragment.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/PeopleGraphPaginatedFragment.graphql.ts
rename to apps/console/src/__generated__/core/PeopleGraphPaginatedFragment.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/PeopleGraphPaginatedQuery.graphql.ts b/apps/console/src/__generated__/core/PeopleGraphPaginatedQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/PeopleGraphPaginatedQuery.graphql.ts
rename to apps/console/src/__generated__/core/PeopleGraphPaginatedQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/PeopleGraphQuery.graphql.ts b/apps/console/src/__generated__/core/PeopleGraphQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/PeopleGraphQuery.graphql.ts
rename to apps/console/src/__generated__/core/PeopleGraphQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/PeopleGraphUpdateMutation.graphql.ts b/apps/console/src/__generated__/core/PeopleGraphUpdateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/PeopleGraphUpdateMutation.graphql.ts
rename to apps/console/src/__generated__/core/PeopleGraphUpdateMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/PeopleListQuery.graphql.ts b/apps/console/src/__generated__/core/PeopleListQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/PeopleListQuery.graphql.ts
rename to apps/console/src/__generated__/core/PeopleListQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/processingActivities/__generated__/ProcessingActivitiesPageDPIAFragment.graphql.ts b/apps/console/src/__generated__/core/ProcessingActivitiesPageDPIAFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/processingActivities/__generated__/ProcessingActivitiesPageDPIAFragment.graphql.ts
rename to apps/console/src/__generated__/core/ProcessingActivitiesPageDPIAFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/processingActivities/__generated__/ProcessingActivitiesPageDPIARefetchQuery.graphql.ts b/apps/console/src/__generated__/core/ProcessingActivitiesPageDPIARefetchQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/processingActivities/__generated__/ProcessingActivitiesPageDPIARefetchQuery.graphql.ts
rename to apps/console/src/__generated__/core/ProcessingActivitiesPageDPIARefetchQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/processingActivities/__generated__/ProcessingActivitiesPageExportDPIAPDFMutation.graphql.ts b/apps/console/src/__generated__/core/ProcessingActivitiesPageExportDPIAPDFMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/processingActivities/__generated__/ProcessingActivitiesPageExportDPIAPDFMutation.graphql.ts
rename to apps/console/src/__generated__/core/ProcessingActivitiesPageExportDPIAPDFMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/processingActivities/__generated__/ProcessingActivitiesPageExportPDFMutation.graphql.ts b/apps/console/src/__generated__/core/ProcessingActivitiesPageExportPDFMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/processingActivities/__generated__/ProcessingActivitiesPageExportPDFMutation.graphql.ts
rename to apps/console/src/__generated__/core/ProcessingActivitiesPageExportPDFMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/processingActivities/__generated__/ProcessingActivitiesPageExportTIAPDFMutation.graphql.ts b/apps/console/src/__generated__/core/ProcessingActivitiesPageExportTIAPDFMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/processingActivities/__generated__/ProcessingActivitiesPageExportTIAPDFMutation.graphql.ts
rename to apps/console/src/__generated__/core/ProcessingActivitiesPageExportTIAPDFMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/processingActivities/__generated__/ProcessingActivitiesPageFragment.graphql.ts b/apps/console/src/__generated__/core/ProcessingActivitiesPageFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/processingActivities/__generated__/ProcessingActivitiesPageFragment.graphql.ts
rename to apps/console/src/__generated__/core/ProcessingActivitiesPageFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/processingActivities/__generated__/ProcessingActivitiesPageRefetchQuery.graphql.ts b/apps/console/src/__generated__/core/ProcessingActivitiesPageRefetchQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/processingActivities/__generated__/ProcessingActivitiesPageRefetchQuery.graphql.ts
rename to apps/console/src/__generated__/core/ProcessingActivitiesPageRefetchQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/processingActivities/__generated__/ProcessingActivitiesPageTIAFragment.graphql.ts b/apps/console/src/__generated__/core/ProcessingActivitiesPageTIAFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/processingActivities/__generated__/ProcessingActivitiesPageTIAFragment.graphql.ts
rename to apps/console/src/__generated__/core/ProcessingActivitiesPageTIAFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/processingActivities/__generated__/ProcessingActivitiesPageTIARefetchQuery.graphql.ts b/apps/console/src/__generated__/core/ProcessingActivitiesPageTIARefetchQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/processingActivities/__generated__/ProcessingActivitiesPageTIARefetchQuery.graphql.ts
rename to apps/console/src/__generated__/core/ProcessingActivitiesPageTIARefetchQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/ProcessingActivityGraphCreateDPIAMutation.graphql.ts b/apps/console/src/__generated__/core/ProcessingActivityGraphCreateDPIAMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/ProcessingActivityGraphCreateDPIAMutation.graphql.ts
rename to apps/console/src/__generated__/core/ProcessingActivityGraphCreateDPIAMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/ProcessingActivityGraphCreateMutation.graphql.ts b/apps/console/src/__generated__/core/ProcessingActivityGraphCreateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/ProcessingActivityGraphCreateMutation.graphql.ts
rename to apps/console/src/__generated__/core/ProcessingActivityGraphCreateMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/ProcessingActivityGraphCreateTIAMutation.graphql.ts b/apps/console/src/__generated__/core/ProcessingActivityGraphCreateTIAMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/ProcessingActivityGraphCreateTIAMutation.graphql.ts
rename to apps/console/src/__generated__/core/ProcessingActivityGraphCreateTIAMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/ProcessingActivityGraphDeleteDPIAMutation.graphql.ts b/apps/console/src/__generated__/core/ProcessingActivityGraphDeleteDPIAMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/ProcessingActivityGraphDeleteDPIAMutation.graphql.ts
rename to apps/console/src/__generated__/core/ProcessingActivityGraphDeleteDPIAMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/ProcessingActivityGraphDeleteMutation.graphql.ts b/apps/console/src/__generated__/core/ProcessingActivityGraphDeleteMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/ProcessingActivityGraphDeleteMutation.graphql.ts
rename to apps/console/src/__generated__/core/ProcessingActivityGraphDeleteMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/ProcessingActivityGraphDeleteTIAMutation.graphql.ts b/apps/console/src/__generated__/core/ProcessingActivityGraphDeleteTIAMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/ProcessingActivityGraphDeleteTIAMutation.graphql.ts
rename to apps/console/src/__generated__/core/ProcessingActivityGraphDeleteTIAMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/ProcessingActivityGraphListQuery.graphql.ts b/apps/console/src/__generated__/core/ProcessingActivityGraphListQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/ProcessingActivityGraphListQuery.graphql.ts
rename to apps/console/src/__generated__/core/ProcessingActivityGraphListQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/ProcessingActivityGraphNodeQuery.graphql.ts b/apps/console/src/__generated__/core/ProcessingActivityGraphNodeQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/ProcessingActivityGraphNodeQuery.graphql.ts
rename to apps/console/src/__generated__/core/ProcessingActivityGraphNodeQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/ProcessingActivityGraphUpdateDPIAMutation.graphql.ts b/apps/console/src/__generated__/core/ProcessingActivityGraphUpdateDPIAMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/ProcessingActivityGraphUpdateDPIAMutation.graphql.ts
rename to apps/console/src/__generated__/core/ProcessingActivityGraphUpdateDPIAMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/ProcessingActivityGraphUpdateMutation.graphql.ts b/apps/console/src/__generated__/core/ProcessingActivityGraphUpdateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/ProcessingActivityGraphUpdateMutation.graphql.ts
rename to apps/console/src/__generated__/core/ProcessingActivityGraphUpdateMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/ProcessingActivityGraphUpdateTIAMutation.graphql.ts b/apps/console/src/__generated__/core/ProcessingActivityGraphUpdateTIAMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/ProcessingActivityGraphUpdateTIAMutation.graphql.ts
rename to apps/console/src/__generated__/core/ProcessingActivityGraphUpdateTIAMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/documents/dialogs/__generated__/PublishDocumentsDialogMutation.graphql.ts b/apps/console/src/__generated__/core/PublishDocumentsDialogMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/documents/dialogs/__generated__/PublishDocumentsDialogMutation.graphql.ts
rename to apps/console/src/__generated__/core/PublishDocumentsDialogMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/RightsRequestGraphCreateMutation.graphql.ts b/apps/console/src/__generated__/core/RightsRequestGraphCreateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/RightsRequestGraphCreateMutation.graphql.ts
rename to apps/console/src/__generated__/core/RightsRequestGraphCreateMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/RightsRequestGraphDeleteMutation.graphql.ts b/apps/console/src/__generated__/core/RightsRequestGraphDeleteMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/RightsRequestGraphDeleteMutation.graphql.ts
rename to apps/console/src/__generated__/core/RightsRequestGraphDeleteMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/RightsRequestGraphListQuery.graphql.ts b/apps/console/src/__generated__/core/RightsRequestGraphListQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/RightsRequestGraphListQuery.graphql.ts
rename to apps/console/src/__generated__/core/RightsRequestGraphListQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/RightsRequestGraphNodeQuery.graphql.ts b/apps/console/src/__generated__/core/RightsRequestGraphNodeQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/RightsRequestGraphNodeQuery.graphql.ts
rename to apps/console/src/__generated__/core/RightsRequestGraphNodeQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/RightsRequestGraphUpdateMutation.graphql.ts b/apps/console/src/__generated__/core/RightsRequestGraphUpdateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/RightsRequestGraphUpdateMutation.graphql.ts
rename to apps/console/src/__generated__/core/RightsRequestGraphUpdateMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/rightsRequests/__generated__/RightsRequestsPageFragment.graphql.ts b/apps/console/src/__generated__/core/RightsRequestsPageFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/rightsRequests/__generated__/RightsRequestsPageFragment.graphql.ts
rename to apps/console/src/__generated__/core/RightsRequestsPageFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/rightsRequests/__generated__/RightsRequestsPageRefetchQuery.graphql.ts b/apps/console/src/__generated__/core/RightsRequestsPageRefetchQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/rightsRequests/__generated__/RightsRequestsPageRefetchQuery.graphql.ts
rename to apps/console/src/__generated__/core/RightsRequestsPageRefetchQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/risks/tabs/__generated__/RiskControlsTabControlsQuery.graphql.ts b/apps/console/src/__generated__/core/RiskControlsTabControlsQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/risks/tabs/__generated__/RiskControlsTabControlsQuery.graphql.ts
rename to apps/console/src/__generated__/core/RiskControlsTabControlsQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/risks/tabs/__generated__/RiskControlsTabFragment.graphql.ts b/apps/console/src/__generated__/core/RiskControlsTabFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/risks/tabs/__generated__/RiskControlsTabFragment.graphql.ts
rename to apps/console/src/__generated__/core/RiskControlsTabFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/risks/tabs/__generated__/RiskDocumentsTabCreateMutation.graphql.ts b/apps/console/src/__generated__/core/RiskDocumentsTabCreateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/risks/tabs/__generated__/RiskDocumentsTabCreateMutation.graphql.ts
rename to apps/console/src/__generated__/core/RiskDocumentsTabCreateMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/risks/tabs/__generated__/RiskDocumentsTabDetachMutation.graphql.ts b/apps/console/src/__generated__/core/RiskDocumentsTabDetachMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/risks/tabs/__generated__/RiskDocumentsTabDetachMutation.graphql.ts
rename to apps/console/src/__generated__/core/RiskDocumentsTabDetachMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/risks/tabs/__generated__/RiskDocumentsTabFragment.graphql.ts b/apps/console/src/__generated__/core/RiskDocumentsTabFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/risks/tabs/__generated__/RiskDocumentsTabFragment.graphql.ts
rename to apps/console/src/__generated__/core/RiskDocumentsTabFragment.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/RiskGraphDeleteMutation.graphql.ts b/apps/console/src/__generated__/core/RiskGraphDeleteMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/RiskGraphDeleteMutation.graphql.ts
rename to apps/console/src/__generated__/core/RiskGraphDeleteMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/RiskGraphFragment.graphql.ts b/apps/console/src/__generated__/core/RiskGraphFragment.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/RiskGraphFragment.graphql.ts
rename to apps/console/src/__generated__/core/RiskGraphFragment.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/RiskGraphListQuery.graphql.ts b/apps/console/src/__generated__/core/RiskGraphListQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/RiskGraphListQuery.graphql.ts
rename to apps/console/src/__generated__/core/RiskGraphListQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/RiskGraphNodeQuery.graphql.ts b/apps/console/src/__generated__/core/RiskGraphNodeQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/RiskGraphNodeQuery.graphql.ts
rename to apps/console/src/__generated__/core/RiskGraphNodeQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/risks/tabs/__generated__/RiskMeasuresTabCreateMutation.graphql.ts b/apps/console/src/__generated__/core/RiskMeasuresTabCreateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/risks/tabs/__generated__/RiskMeasuresTabCreateMutation.graphql.ts
rename to apps/console/src/__generated__/core/RiskMeasuresTabCreateMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/risks/tabs/__generated__/RiskMeasuresTabDetachMutation.graphql.ts b/apps/console/src/__generated__/core/RiskMeasuresTabDetachMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/risks/tabs/__generated__/RiskMeasuresTabDetachMutation.graphql.ts
rename to apps/console/src/__generated__/core/RiskMeasuresTabDetachMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/risks/tabs/__generated__/RiskMeasuresTabFragment.graphql.ts b/apps/console/src/__generated__/core/RiskMeasuresTabFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/risks/tabs/__generated__/RiskMeasuresTabFragment.graphql.ts
rename to apps/console/src/__generated__/core/RiskMeasuresTabFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/risks/tabs/__generated__/RiskObligationsTabCreateMutation.graphql.ts b/apps/console/src/__generated__/core/RiskObligationsTabCreateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/risks/tabs/__generated__/RiskObligationsTabCreateMutation.graphql.ts
rename to apps/console/src/__generated__/core/RiskObligationsTabCreateMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/risks/tabs/__generated__/RiskObligationsTabDetachMutation.graphql.ts b/apps/console/src/__generated__/core/RiskObligationsTabDetachMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/risks/tabs/__generated__/RiskObligationsTabDetachMutation.graphql.ts
rename to apps/console/src/__generated__/core/RiskObligationsTabDetachMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/risks/tabs/__generated__/RiskObligationsTabFragment.graphql.ts b/apps/console/src/__generated__/core/RiskObligationsTabFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/risks/tabs/__generated__/RiskObligationsTabFragment.graphql.ts
rename to apps/console/src/__generated__/core/RiskObligationsTabFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/risks/tabs/__generated__/RiskOverviewTabFragment.graphql.ts b/apps/console/src/__generated__/core/RiskOverviewTabFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/risks/tabs/__generated__/RiskOverviewTabFragment.graphql.ts
rename to apps/console/src/__generated__/core/RiskOverviewTabFragment.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/RisksListQuery.graphql.ts b/apps/console/src/__generated__/core/RisksListQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/RisksListQuery.graphql.ts
rename to apps/console/src/__generated__/core/RisksListQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/documents/dialogs/__generated__/SignatureDocumentsDialogMutation.graphql.ts b/apps/console/src/__generated__/core/SignatureDocumentsDialogMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/documents/dialogs/__generated__/SignatureDocumentsDialogMutation.graphql.ts
rename to apps/console/src/__generated__/core/SignatureDocumentsDialogMutation.graphql.ts
diff --git a/apps/console/src/components/__generated__/SnapshotBannerQuery.graphql.ts b/apps/console/src/__generated__/core/SnapshotBannerQuery.graphql.ts
similarity index 100%
rename from apps/console/src/components/__generated__/SnapshotBannerQuery.graphql.ts
rename to apps/console/src/__generated__/core/SnapshotBannerQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/snapshots/dialog/__generated__/SnapshotFormDialogCreateMutation.graphql.ts b/apps/console/src/__generated__/core/SnapshotFormDialogCreateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/snapshots/dialog/__generated__/SnapshotFormDialogCreateMutation.graphql.ts
rename to apps/console/src/__generated__/core/SnapshotFormDialogCreateMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/SnapshotGraphCreateMutation.graphql.ts b/apps/console/src/__generated__/core/SnapshotGraphCreateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/SnapshotGraphCreateMutation.graphql.ts
rename to apps/console/src/__generated__/core/SnapshotGraphCreateMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/SnapshotGraphDeleteMutation.graphql.ts b/apps/console/src/__generated__/core/SnapshotGraphDeleteMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/SnapshotGraphDeleteMutation.graphql.ts
rename to apps/console/src/__generated__/core/SnapshotGraphDeleteMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/SnapshotGraphListQuery.graphql.ts b/apps/console/src/__generated__/core/SnapshotGraphListQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/SnapshotGraphListQuery.graphql.ts
rename to apps/console/src/__generated__/core/SnapshotGraphListQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/SnapshotGraphNodeQuery.graphql.ts b/apps/console/src/__generated__/core/SnapshotGraphNodeQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/SnapshotGraphNodeQuery.graphql.ts
rename to apps/console/src/__generated__/core/SnapshotGraphNodeQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/snapshots/__generated__/SnapshotsPageFragment.graphql.ts b/apps/console/src/__generated__/core/SnapshotsPageFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/snapshots/__generated__/SnapshotsPageFragment.graphql.ts
rename to apps/console/src/__generated__/core/SnapshotsPageFragment.graphql.ts
diff --git a/apps/console/src/components/form/__generated__/StateOfApplicabilityControlsFieldFrameworkControlsQuery.graphql.ts b/apps/console/src/__generated__/core/StateOfApplicabilityControlsFieldFrameworkControlsQuery.graphql.ts
similarity index 100%
rename from apps/console/src/components/form/__generated__/StateOfApplicabilityControlsFieldFrameworkControlsQuery.graphql.ts
rename to apps/console/src/__generated__/core/StateOfApplicabilityControlsFieldFrameworkControlsQuery.graphql.ts
diff --git a/apps/console/src/components/form/__generated__/StateOfApplicabilityControlsFieldFrameworksQuery.graphql.ts b/apps/console/src/__generated__/core/StateOfApplicabilityControlsFieldFrameworksQuery.graphql.ts
similarity index 100%
rename from apps/console/src/components/form/__generated__/StateOfApplicabilityControlsFieldFrameworksQuery.graphql.ts
rename to apps/console/src/__generated__/core/StateOfApplicabilityControlsFieldFrameworksQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/states-of-applicability/tabs/__generated__/StateOfApplicabilityControlsTabFragment.graphql.ts b/apps/console/src/__generated__/core/StateOfApplicabilityControlsTabFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/states-of-applicability/tabs/__generated__/StateOfApplicabilityControlsTabFragment.graphql.ts
rename to apps/console/src/__generated__/core/StateOfApplicabilityControlsTabFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/states-of-applicability/tabs/__generated__/StateOfApplicabilityControlsTabRefetchQuery.graphql.ts b/apps/console/src/__generated__/core/StateOfApplicabilityControlsTabRefetchQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/states-of-applicability/tabs/__generated__/StateOfApplicabilityControlsTabRefetchQuery.graphql.ts
rename to apps/console/src/__generated__/core/StateOfApplicabilityControlsTabRefetchQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/states-of-applicability/tabs/__generated__/StateOfApplicabilityControlsTabUnlinkMutation.graphql.ts b/apps/console/src/__generated__/core/StateOfApplicabilityControlsTabUnlinkMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/states-of-applicability/tabs/__generated__/StateOfApplicabilityControlsTabUnlinkMutation.graphql.ts
rename to apps/console/src/__generated__/core/StateOfApplicabilityControlsTabUnlinkMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/states-of-applicability/__generated__/StateOfApplicabilityDetailPageExportMutation.graphql.ts b/apps/console/src/__generated__/core/StateOfApplicabilityDetailPageExportMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/states-of-applicability/__generated__/StateOfApplicabilityDetailPageExportMutation.graphql.ts
rename to apps/console/src/__generated__/core/StateOfApplicabilityDetailPageExportMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/StateOfApplicabilityGraphCreateMutation.graphql.ts b/apps/console/src/__generated__/core/StateOfApplicabilityGraphCreateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/StateOfApplicabilityGraphCreateMutation.graphql.ts
rename to apps/console/src/__generated__/core/StateOfApplicabilityGraphCreateMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/StateOfApplicabilityGraphDeleteMutation.graphql.ts b/apps/console/src/__generated__/core/StateOfApplicabilityGraphDeleteMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/StateOfApplicabilityGraphDeleteMutation.graphql.ts
rename to apps/console/src/__generated__/core/StateOfApplicabilityGraphDeleteMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/StateOfApplicabilityGraphForEditQuery.graphql.ts b/apps/console/src/__generated__/core/StateOfApplicabilityGraphForEditQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/StateOfApplicabilityGraphForEditQuery.graphql.ts
rename to apps/console/src/__generated__/core/StateOfApplicabilityGraphForEditQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/StateOfApplicabilityGraphNodeQuery.graphql.ts b/apps/console/src/__generated__/core/StateOfApplicabilityGraphNodeQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/StateOfApplicabilityGraphNodeQuery.graphql.ts
rename to apps/console/src/__generated__/core/StateOfApplicabilityGraphNodeQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/StateOfApplicabilityGraphPaginatedFragment.graphql.ts b/apps/console/src/__generated__/core/StateOfApplicabilityGraphPaginatedFragment.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/StateOfApplicabilityGraphPaginatedFragment.graphql.ts
rename to apps/console/src/__generated__/core/StateOfApplicabilityGraphPaginatedFragment.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/StateOfApplicabilityGraphPaginatedQuery.graphql.ts b/apps/console/src/__generated__/core/StateOfApplicabilityGraphPaginatedQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/StateOfApplicabilityGraphPaginatedQuery.graphql.ts
rename to apps/console/src/__generated__/core/StateOfApplicabilityGraphPaginatedQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/StateOfApplicabilityGraphUpdateMutation.graphql.ts b/apps/console/src/__generated__/core/StateOfApplicabilityGraphUpdateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/StateOfApplicabilityGraphUpdateMutation.graphql.ts
rename to apps/console/src/__generated__/core/StateOfApplicabilityGraphUpdateMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/StateOfApplicabilityListQuery.graphql.ts b/apps/console/src/__generated__/core/StateOfApplicabilityListQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/StateOfApplicabilityListQuery.graphql.ts
rename to apps/console/src/__generated__/core/StateOfApplicabilityListQuery.graphql.ts
diff --git a/apps/console/src/components/tasks/__generated__/TaskFormDialogCreateMutation.graphql.ts b/apps/console/src/__generated__/core/TaskFormDialogCreateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/components/tasks/__generated__/TaskFormDialogCreateMutation.graphql.ts
rename to apps/console/src/__generated__/core/TaskFormDialogCreateMutation.graphql.ts
diff --git a/apps/console/src/components/tasks/__generated__/TaskFormDialogFragment.graphql.ts b/apps/console/src/__generated__/core/TaskFormDialogFragment.graphql.ts
similarity index 100%
rename from apps/console/src/components/tasks/__generated__/TaskFormDialogFragment.graphql.ts
rename to apps/console/src/__generated__/core/TaskFormDialogFragment.graphql.ts
diff --git a/apps/console/src/components/tasks/__generated__/TaskFormDialogUpdateMutation.graphql.ts b/apps/console/src/__generated__/core/TaskFormDialogUpdateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/components/tasks/__generated__/TaskFormDialogUpdateMutation.graphql.ts
rename to apps/console/src/__generated__/core/TaskFormDialogUpdateMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/TaskGraphQuery.graphql.ts b/apps/console/src/__generated__/core/TaskGraphQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/TaskGraphQuery.graphql.ts
rename to apps/console/src/__generated__/core/TaskGraphQuery.graphql.ts
diff --git a/apps/console/src/components/tasks/__generated__/TasksCardDeleteMutation.graphql.ts b/apps/console/src/__generated__/core/TasksCardDeleteMutation.graphql.ts
similarity index 100%
rename from apps/console/src/components/tasks/__generated__/TasksCardDeleteMutation.graphql.ts
rename to apps/console/src/__generated__/core/TasksCardDeleteMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/tasks/__generated__/TasksPageFragment.graphql.ts b/apps/console/src/__generated__/core/TasksPageFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/tasks/__generated__/TasksPageFragment.graphql.ts
rename to apps/console/src/__generated__/core/TasksPageFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/tasks/__generated__/TasksPageFragment_query.graphql.ts b/apps/console/src/__generated__/core/TasksPageFragment_query.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/tasks/__generated__/TasksPageFragment_query.graphql.ts
rename to apps/console/src/__generated__/core/TasksPageFragment_query.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/TrustCenterAccessGraphCreateMutation.graphql.ts b/apps/console/src/__generated__/core/TrustCenterAccessGraphCreateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/TrustCenterAccessGraphCreateMutation.graphql.ts
rename to apps/console/src/__generated__/core/TrustCenterAccessGraphCreateMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/TrustCenterAccessGraphDeleteMutation.graphql.ts b/apps/console/src/__generated__/core/TrustCenterAccessGraphDeleteMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/TrustCenterAccessGraphDeleteMutation.graphql.ts
rename to apps/console/src/__generated__/core/TrustCenterAccessGraphDeleteMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/TrustCenterAccessGraphLoadDocumentAccessesQuery.graphql.ts b/apps/console/src/__generated__/core/TrustCenterAccessGraphLoadDocumentAccessesQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/TrustCenterAccessGraphLoadDocumentAccessesQuery.graphql.ts
rename to apps/console/src/__generated__/core/TrustCenterAccessGraphLoadDocumentAccessesQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/TrustCenterAccessGraphPaginationQuery.graphql.ts b/apps/console/src/__generated__/core/TrustCenterAccessGraphPaginationQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/TrustCenterAccessGraphPaginationQuery.graphql.ts
rename to apps/console/src/__generated__/core/TrustCenterAccessGraphPaginationQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/TrustCenterAccessGraphQuery.graphql.ts b/apps/console/src/__generated__/core/TrustCenterAccessGraphQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/TrustCenterAccessGraphQuery.graphql.ts
rename to apps/console/src/__generated__/core/TrustCenterAccessGraphQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/TrustCenterAccessGraphUpdateMutation.graphql.ts b/apps/console/src/__generated__/core/TrustCenterAccessGraphUpdateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/TrustCenterAccessGraphUpdateMutation.graphql.ts
rename to apps/console/src/__generated__/core/TrustCenterAccessGraphUpdateMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/TrustCenterAccessGraph_accesses.graphql.ts b/apps/console/src/__generated__/core/TrustCenterAccessGraph_accesses.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/TrustCenterAccessGraph_accesses.graphql.ts
rename to apps/console/src/__generated__/core/TrustCenterAccessGraph_accesses.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/TrustCenterAccessTokenGraphQuery.graphql.ts b/apps/console/src/__generated__/core/TrustCenterAccessTokenGraphQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/TrustCenterAccessTokenGraphQuery.graphql.ts
rename to apps/console/src/__generated__/core/TrustCenterAccessTokenGraphQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/TrustCenterAuditGraphUpdateMutation.graphql.ts b/apps/console/src/__generated__/core/TrustCenterAuditGraphUpdateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/TrustCenterAuditGraphUpdateMutation.graphql.ts
rename to apps/console/src/__generated__/core/TrustCenterAuditGraphUpdateMutation.graphql.ts
diff --git a/apps/console/src/components/trustCenter/__generated__/TrustCenterAuditsCardFragment.graphql.ts b/apps/console/src/__generated__/core/TrustCenterAuditsCardFragment.graphql.ts
similarity index 100%
rename from apps/console/src/components/trustCenter/__generated__/TrustCenterAuditsCardFragment.graphql.ts
rename to apps/console/src/__generated__/core/TrustCenterAuditsCardFragment.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/TrustCenterDocumentGraphQuery.graphql.ts b/apps/console/src/__generated__/core/TrustCenterDocumentGraphQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/TrustCenterDocumentGraphQuery.graphql.ts
rename to apps/console/src/__generated__/core/TrustCenterDocumentGraphQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/TrustCenterDocumentGraphUpdateMutation.graphql.ts b/apps/console/src/__generated__/core/TrustCenterDocumentGraphUpdateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/TrustCenterDocumentGraphUpdateMutation.graphql.ts
rename to apps/console/src/__generated__/core/TrustCenterDocumentGraphUpdateMutation.graphql.ts
diff --git a/apps/console/src/components/trustCenter/__generated__/TrustCenterDocumentsCardFragment.graphql.ts b/apps/console/src/__generated__/core/TrustCenterDocumentsCardFragment.graphql.ts
similarity index 100%
rename from apps/console/src/components/trustCenter/__generated__/TrustCenterDocumentsCardFragment.graphql.ts
rename to apps/console/src/__generated__/core/TrustCenterDocumentsCardFragment.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/TrustCenterFileGraphCreateMutation.graphql.ts b/apps/console/src/__generated__/core/TrustCenterFileGraphCreateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/TrustCenterFileGraphCreateMutation.graphql.ts
rename to apps/console/src/__generated__/core/TrustCenterFileGraphCreateMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/TrustCenterFileGraphDeleteMutation.graphql.ts b/apps/console/src/__generated__/core/TrustCenterFileGraphDeleteMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/TrustCenterFileGraphDeleteMutation.graphql.ts
rename to apps/console/src/__generated__/core/TrustCenterFileGraphDeleteMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/TrustCenterFileGraphUpdateMutation.graphql.ts b/apps/console/src/__generated__/core/TrustCenterFileGraphUpdateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/TrustCenterFileGraphUpdateMutation.graphql.ts
rename to apps/console/src/__generated__/core/TrustCenterFileGraphUpdateMutation.graphql.ts
diff --git a/apps/console/src/components/trustCenter/__generated__/TrustCenterFilesCardFragment.graphql.ts b/apps/console/src/__generated__/core/TrustCenterFilesCardFragment.graphql.ts
similarity index 100%
rename from apps/console/src/components/trustCenter/__generated__/TrustCenterFilesCardFragment.graphql.ts
rename to apps/console/src/__generated__/core/TrustCenterFilesCardFragment.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/TrustCenterGraphDeleteNDAMutation.graphql.ts b/apps/console/src/__generated__/core/TrustCenterGraphDeleteNDAMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/TrustCenterGraphDeleteNDAMutation.graphql.ts
rename to apps/console/src/__generated__/core/TrustCenterGraphDeleteNDAMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/TrustCenterGraphQuery.graphql.ts b/apps/console/src/__generated__/core/TrustCenterGraphQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/TrustCenterGraphQuery.graphql.ts
rename to apps/console/src/__generated__/core/TrustCenterGraphQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/TrustCenterGraphUpdateMutation.graphql.ts b/apps/console/src/__generated__/core/TrustCenterGraphUpdateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/TrustCenterGraphUpdateMutation.graphql.ts
rename to apps/console/src/__generated__/core/TrustCenterGraphUpdateMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/TrustCenterGraphUploadNDAMutation.graphql.ts b/apps/console/src/__generated__/core/TrustCenterGraphUploadNDAMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/TrustCenterGraphUploadNDAMutation.graphql.ts
rename to apps/console/src/__generated__/core/TrustCenterGraphUploadNDAMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/TrustCenterReferenceGraphCreateMutation.graphql.ts b/apps/console/src/__generated__/core/TrustCenterReferenceGraphCreateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/TrustCenterReferenceGraphCreateMutation.graphql.ts
rename to apps/console/src/__generated__/core/TrustCenterReferenceGraphCreateMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/TrustCenterReferenceGraphDeleteMutation.graphql.ts b/apps/console/src/__generated__/core/TrustCenterReferenceGraphDeleteMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/TrustCenterReferenceGraphDeleteMutation.graphql.ts
rename to apps/console/src/__generated__/core/TrustCenterReferenceGraphDeleteMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/TrustCenterReferenceGraphQuery.graphql.ts b/apps/console/src/__generated__/core/TrustCenterReferenceGraphQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/TrustCenterReferenceGraphQuery.graphql.ts
rename to apps/console/src/__generated__/core/TrustCenterReferenceGraphQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/TrustCenterReferenceGraphUpdateMutation.graphql.ts b/apps/console/src/__generated__/core/TrustCenterReferenceGraphUpdateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/TrustCenterReferenceGraphUpdateMutation.graphql.ts
rename to apps/console/src/__generated__/core/TrustCenterReferenceGraphUpdateMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/TrustCenterReferenceGraphUpdateRankMutation.graphql.ts b/apps/console/src/__generated__/core/TrustCenterReferenceGraphUpdateRankMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/TrustCenterReferenceGraphUpdateRankMutation.graphql.ts
rename to apps/console/src/__generated__/core/TrustCenterReferenceGraphUpdateRankMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/TrustCenterVendorGraphUpdateMutation.graphql.ts b/apps/console/src/__generated__/core/TrustCenterVendorGraphUpdateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/TrustCenterVendorGraphUpdateMutation.graphql.ts
rename to apps/console/src/__generated__/core/TrustCenterVendorGraphUpdateMutation.graphql.ts
diff --git a/apps/console/src/components/trustCenter/__generated__/TrustCenterVendorsCardFragment.graphql.ts b/apps/console/src/__generated__/core/TrustCenterVendorsCardFragment.graphql.ts
similarity index 100%
rename from apps/console/src/components/trustCenter/__generated__/TrustCenterVendorsCardFragment.graphql.ts
rename to apps/console/src/__generated__/core/TrustCenterVendorsCardFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/documents/dialogs/__generated__/UpdateVersionDialogCreateMutation.graphql.ts b/apps/console/src/__generated__/core/UpdateVersionDialogCreateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/documents/dialogs/__generated__/UpdateVersionDialogCreateMutation.graphql.ts
rename to apps/console/src/__generated__/core/UpdateVersionDialogCreateMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/documents/dialogs/__generated__/UpdateVersionDialogUpdateMutation.graphql.ts b/apps/console/src/__generated__/core/UpdateVersionDialogUpdateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/documents/dialogs/__generated__/UpdateVersionDialogUpdateMutation.graphql.ts
rename to apps/console/src/__generated__/core/UpdateVersionDialogUpdateMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/dialogs/__generated__/UploadBusinessAssociateAgreementDialogMutation.graphql.ts b/apps/console/src/__generated__/core/UploadBusinessAssociateAgreementDialogMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/dialogs/__generated__/UploadBusinessAssociateAgreementDialogMutation.graphql.ts
rename to apps/console/src/__generated__/core/UploadBusinessAssociateAgreementDialogMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/dialogs/__generated__/UploadDataPrivacyAgreementDialogMutation.graphql.ts b/apps/console/src/__generated__/core/UploadDataPrivacyAgreementDialogMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/dialogs/__generated__/UploadDataPrivacyAgreementDialogMutation.graphql.ts
rename to apps/console/src/__generated__/core/UploadDataPrivacyAgreementDialogMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorComplianceTabDeleteReportMutation.graphql.ts b/apps/console/src/__generated__/core/VendorComplianceTabDeleteReportMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorComplianceTabDeleteReportMutation.graphql.ts
rename to apps/console/src/__generated__/core/VendorComplianceTabDeleteReportMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorComplianceTabFragment.graphql.ts b/apps/console/src/__generated__/core/VendorComplianceTabFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorComplianceTabFragment.graphql.ts
rename to apps/console/src/__generated__/core/VendorComplianceTabFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorComplianceTabFragment_report.graphql.ts b/apps/console/src/__generated__/core/VendorComplianceTabFragment_report.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorComplianceTabFragment_report.graphql.ts
rename to apps/console/src/__generated__/core/VendorComplianceTabFragment_report.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorComplianceTabUploadReportMutation.graphql.ts b/apps/console/src/__generated__/core/VendorComplianceTabUploadReportMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorComplianceTabUploadReportMutation.graphql.ts
rename to apps/console/src/__generated__/core/VendorComplianceTabUploadReportMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorContactsListQuery.graphql.ts b/apps/console/src/__generated__/core/VendorContactsListQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorContactsListQuery.graphql.ts
rename to apps/console/src/__generated__/core/VendorContactsListQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorContactsTabDeleteContactMutation.graphql.ts b/apps/console/src/__generated__/core/VendorContactsTabDeleteContactMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorContactsTabDeleteContactMutation.graphql.ts
rename to apps/console/src/__generated__/core/VendorContactsTabDeleteContactMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorContactsTabFragment.graphql.ts b/apps/console/src/__generated__/core/VendorContactsTabFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorContactsTabFragment.graphql.ts
rename to apps/console/src/__generated__/core/VendorContactsTabFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorContactsTabFragment_contact.graphql.ts b/apps/console/src/__generated__/core/VendorContactsTabFragment_contact.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorContactsTabFragment_contact.graphql.ts
rename to apps/console/src/__generated__/core/VendorContactsTabFragment_contact.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/VendorGraphCreateMutation.graphql.ts b/apps/console/src/__generated__/core/VendorGraphCreateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/VendorGraphCreateMutation.graphql.ts
rename to apps/console/src/__generated__/core/VendorGraphCreateMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/VendorGraphDeleteMutation.graphql.ts b/apps/console/src/__generated__/core/VendorGraphDeleteMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/VendorGraphDeleteMutation.graphql.ts
rename to apps/console/src/__generated__/core/VendorGraphDeleteMutation.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/VendorGraphListQuery.graphql.ts b/apps/console/src/__generated__/core/VendorGraphListQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/VendorGraphListQuery.graphql.ts
rename to apps/console/src/__generated__/core/VendorGraphListQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/VendorGraphNodeQuery.graphql.ts b/apps/console/src/__generated__/core/VendorGraphNodeQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/VendorGraphNodeQuery.graphql.ts
rename to apps/console/src/__generated__/core/VendorGraphNodeQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/VendorGraphPaginatedFragment.graphql.ts b/apps/console/src/__generated__/core/VendorGraphPaginatedFragment.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/VendorGraphPaginatedFragment.graphql.ts
rename to apps/console/src/__generated__/core/VendorGraphPaginatedFragment.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/VendorGraphSelectQuery.graphql.ts b/apps/console/src/__generated__/core/VendorGraphSelectQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/VendorGraphSelectQuery.graphql.ts
rename to apps/console/src/__generated__/core/VendorGraphSelectQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorOverviewTabBusinessAssociateAgreementFragment.graphql.ts b/apps/console/src/__generated__/core/VendorOverviewTabBusinessAssociateAgreementFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorOverviewTabBusinessAssociateAgreementFragment.graphql.ts
rename to apps/console/src/__generated__/core/VendorOverviewTabBusinessAssociateAgreementFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorOverviewTabDataPrivacyAgreementFragment.graphql.ts b/apps/console/src/__generated__/core/VendorOverviewTabDataPrivacyAgreementFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorOverviewTabDataPrivacyAgreementFragment.graphql.ts
rename to apps/console/src/__generated__/core/VendorOverviewTabDataPrivacyAgreementFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorRiskAssessmentTabFragment.graphql.ts b/apps/console/src/__generated__/core/VendorRiskAssessmentTabFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorRiskAssessmentTabFragment.graphql.ts
rename to apps/console/src/__generated__/core/VendorRiskAssessmentTabFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorRiskAssessmentTabFragment_assessment.graphql.ts b/apps/console/src/__generated__/core/VendorRiskAssessmentTabFragment_assessment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorRiskAssessmentTabFragment_assessment.graphql.ts
rename to apps/console/src/__generated__/core/VendorRiskAssessmentTabFragment_assessment.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorRiskAssessmentTabQuery.graphql.ts b/apps/console/src/__generated__/core/VendorRiskAssessmentTabQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorRiskAssessmentTabQuery.graphql.ts
rename to apps/console/src/__generated__/core/VendorRiskAssessmentTabQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorServicesListQuery.graphql.ts b/apps/console/src/__generated__/core/VendorServicesListQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorServicesListQuery.graphql.ts
rename to apps/console/src/__generated__/core/VendorServicesListQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorServicesTabDeleteServiceMutation.graphql.ts b/apps/console/src/__generated__/core/VendorServicesTabDeleteServiceMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorServicesTabDeleteServiceMutation.graphql.ts
rename to apps/console/src/__generated__/core/VendorServicesTabDeleteServiceMutation.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorServicesTabFragment.graphql.ts b/apps/console/src/__generated__/core/VendorServicesTabFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorServicesTabFragment.graphql.ts
rename to apps/console/src/__generated__/core/VendorServicesTabFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorServicesTabFragment_service.graphql.ts b/apps/console/src/__generated__/core/VendorServicesTabFragment_service.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/vendors/tabs/__generated__/VendorServicesTabFragment_service.graphql.ts
rename to apps/console/src/__generated__/core/VendorServicesTabFragment_service.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/VendorsListQuery.graphql.ts b/apps/console/src/__generated__/core/VendorsListQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/VendorsListQuery.graphql.ts
rename to apps/console/src/__generated__/core/VendorsListQuery.graphql.ts
diff --git a/apps/console/src/pages/organizations/employee/_components/__generated__/VersionActionsFragment.graphql.ts b/apps/console/src/__generated__/core/VersionActionsFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/employee/_components/__generated__/VersionActionsFragment.graphql.ts
rename to apps/console/src/__generated__/core/VersionActionsFragment.graphql.ts
diff --git a/apps/console/src/pages/organizations/employee/_components/__generated__/VersionRowFragment.graphql.ts b/apps/console/src/__generated__/core/VersionRowFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/organizations/employee/_components/__generated__/VersionRowFragment.graphql.ts
rename to apps/console/src/__generated__/core/VersionRowFragment.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/usePaginatedMeasuresFragment.graphql.ts b/apps/console/src/__generated__/core/usePaginatedMeasuresFragment.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/usePaginatedMeasuresFragment.graphql.ts
rename to apps/console/src/__generated__/core/usePaginatedMeasuresFragment.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/usePaginatedMeasuresQuery.graphql.ts b/apps/console/src/__generated__/core/usePaginatedMeasuresQuery.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/usePaginatedMeasuresQuery.graphql.ts
rename to apps/console/src/__generated__/core/usePaginatedMeasuresQuery.graphql.ts
diff --git a/apps/console/src/hooks/graph/__generated__/usePaginatedMeasuresQuery_fragment.graphql.ts b/apps/console/src/__generated__/core/usePaginatedMeasuresQuery_fragment.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/graph/__generated__/usePaginatedMeasuresQuery_fragment.graphql.ts
rename to apps/console/src/__generated__/core/usePaginatedMeasuresQuery_fragment.graphql.ts
diff --git a/apps/console/src/hooks/forms/__generated__/useRiskFormFragment.graphql.ts b/apps/console/src/__generated__/core/useRiskFormFragment.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/forms/__generated__/useRiskFormFragment.graphql.ts
rename to apps/console/src/__generated__/core/useRiskFormFragment.graphql.ts
diff --git a/apps/console/src/hooks/forms/__generated__/useVendorFormFragment.graphql.ts b/apps/console/src/__generated__/core/useVendorFormFragment.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/forms/__generated__/useVendorFormFragment.graphql.ts
rename to apps/console/src/__generated__/core/useVendorFormFragment.graphql.ts
diff --git a/apps/console/src/hooks/forms/__generated__/useVendorFormMutation.graphql.ts b/apps/console/src/__generated__/core/useVendorFormMutation.graphql.ts
similarity index 100%
rename from apps/console/src/hooks/forms/__generated__/useVendorFormMutation.graphql.ts
rename to apps/console/src/__generated__/core/useVendorFormMutation.graphql.ts
diff --git a/apps/console/src/pages/iam/apiKeys/__generated__/APIKeysPageQuery.graphql.ts b/apps/console/src/__generated__/iam/APIKeysPageQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/apiKeys/__generated__/APIKeysPageQuery.graphql.ts
rename to apps/console/src/__generated__/iam/APIKeysPageQuery.graphql.ts
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/__generated__/EditMemberDialog_updateMutation.graphql.ts b/apps/console/src/__generated__/iam/EditMemberDialog_updateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/organizations/settings/_components/__generated__/EditMemberDialog_updateMutation.graphql.ts
rename to apps/console/src/__generated__/iam/EditMemberDialog_updateMutation.graphql.ts
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/__generated__/EditSAMLConfigurationFormQuery.graphql.ts b/apps/console/src/__generated__/iam/EditSAMLConfigurationFormQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/organizations/settings/_components/__generated__/EditSAMLConfigurationFormQuery.graphql.ts
rename to apps/console/src/__generated__/iam/EditSAMLConfigurationFormQuery.graphql.ts
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/__generated__/EditSAMLConfigurationForm_updateMutation.graphql.ts b/apps/console/src/__generated__/iam/EditSAMLConfigurationForm_updateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/organizations/settings/_components/__generated__/EditSAMLConfigurationForm_updateMutation.graphql.ts
rename to apps/console/src/__generated__/iam/EditSAMLConfigurationForm_updateMutation.graphql.ts
diff --git a/apps/console/src/pages/iam/organizations/settings/__generated__/GeneralSettingsPageQuery.graphql.ts b/apps/console/src/__generated__/iam/GeneralSettingsPageQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/organizations/settings/__generated__/GeneralSettingsPageQuery.graphql.ts
rename to apps/console/src/__generated__/iam/GeneralSettingsPageQuery.graphql.ts
diff --git a/apps/console/src/pages/iam/organizations/settings/__generated__/GeneralSettingsPage_deleteMutation.graphql.ts b/apps/console/src/__generated__/iam/GeneralSettingsPage_deleteMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/organizations/settings/__generated__/GeneralSettingsPage_deleteMutation.graphql.ts
rename to apps/console/src/__generated__/iam/GeneralSettingsPage_deleteMutation.graphql.ts
diff --git a/apps/console/src/pages/iam/memberships/_components/__generated__/InvitationCardFragment.graphql.ts b/apps/console/src/__generated__/iam/InvitationCardFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/memberships/_components/__generated__/InvitationCardFragment.graphql.ts
rename to apps/console/src/__generated__/iam/InvitationCardFragment.graphql.ts
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/__generated__/InvitationListFragment.graphql.ts b/apps/console/src/__generated__/iam/InvitationListFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/organizations/settings/_components/__generated__/InvitationListFragment.graphql.ts
rename to apps/console/src/__generated__/iam/InvitationListFragment.graphql.ts
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/__generated__/InvitationListFragment_RefetchQuery.graphql.ts b/apps/console/src/__generated__/iam/InvitationListFragment_RefetchQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/organizations/settings/_components/__generated__/InvitationListFragment_RefetchQuery.graphql.ts
rename to apps/console/src/__generated__/iam/InvitationListFragment_RefetchQuery.graphql.ts
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/__generated__/InvitationListItemFragment.graphql.ts b/apps/console/src/__generated__/iam/InvitationListItemFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/organizations/settings/_components/__generated__/InvitationListItemFragment.graphql.ts
rename to apps/console/src/__generated__/iam/InvitationListItemFragment.graphql.ts
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/__generated__/InvitationListItem_DeleteInvitationMutation.graphql.ts b/apps/console/src/__generated__/iam/InvitationListItem_DeleteInvitationMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/organizations/settings/_components/__generated__/InvitationListItem_DeleteInvitationMutation.graphql.ts
rename to apps/console/src/__generated__/iam/InvitationListItem_DeleteInvitationMutation.graphql.ts
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/__generated__/InvitationListItem_permissionsFragment.graphql.ts b/apps/console/src/__generated__/iam/InvitationListItem_permissionsFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/organizations/settings/_components/__generated__/InvitationListItem_permissionsFragment.graphql.ts
rename to apps/console/src/__generated__/iam/InvitationListItem_permissionsFragment.graphql.ts
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/__generated__/InviteUserDialogMutation.graphql.ts b/apps/console/src/__generated__/iam/InviteUserDialogMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/organizations/settings/_components/__generated__/InviteUserDialogMutation.graphql.ts
rename to apps/console/src/__generated__/iam/InviteUserDialogMutation.graphql.ts
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/__generated__/InviteUserDialog_currentRoleFragment.graphql.ts b/apps/console/src/__generated__/iam/InviteUserDialog_currentRoleFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/organizations/settings/_components/__generated__/InviteUserDialog_currentRoleFragment.graphql.ts
rename to apps/console/src/__generated__/iam/InviteUserDialog_currentRoleFragment.graphql.ts
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/__generated__/MemberListFragment.graphql.ts b/apps/console/src/__generated__/iam/MemberListFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/organizations/settings/_components/__generated__/MemberListFragment.graphql.ts
rename to apps/console/src/__generated__/iam/MemberListFragment.graphql.ts
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/__generated__/MemberListFragment_RefetchQuery.graphql.ts b/apps/console/src/__generated__/iam/MemberListFragment_RefetchQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/organizations/settings/_components/__generated__/MemberListFragment_RefetchQuery.graphql.ts
rename to apps/console/src/__generated__/iam/MemberListFragment_RefetchQuery.graphql.ts
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/__generated__/MemberListItemFragment.graphql.ts b/apps/console/src/__generated__/iam/MemberListItemFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/organizations/settings/_components/__generated__/MemberListItemFragment.graphql.ts
rename to apps/console/src/__generated__/iam/MemberListItemFragment.graphql.ts
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/__generated__/MemberListItem_currentRoleFragment.graphql.ts b/apps/console/src/__generated__/iam/MemberListItem_currentRoleFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/organizations/settings/_components/__generated__/MemberListItem_currentRoleFragment.graphql.ts
rename to apps/console/src/__generated__/iam/MemberListItem_currentRoleFragment.graphql.ts
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/__generated__/MemberListItem_permissionsFragment.graphql.ts b/apps/console/src/__generated__/iam/MemberListItem_permissionsFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/organizations/settings/_components/__generated__/MemberListItem_permissionsFragment.graphql.ts
rename to apps/console/src/__generated__/iam/MemberListItem_permissionsFragment.graphql.ts
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/__generated__/MemberListItem_removeMutation.graphql.ts b/apps/console/src/__generated__/iam/MemberListItem_removeMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/organizations/settings/_components/__generated__/MemberListItem_removeMutation.graphql.ts
rename to apps/console/src/__generated__/iam/MemberListItem_removeMutation.graphql.ts
diff --git a/apps/console/src/pages/iam/organizations/settings/__generated__/MembersPageQuery.graphql.ts b/apps/console/src/__generated__/iam/MembersPageQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/organizations/settings/__generated__/MembersPageQuery.graphql.ts
rename to apps/console/src/__generated__/iam/MembersPageQuery.graphql.ts
diff --git a/apps/console/src/pages/iam/memberships/_components/__generated__/MembershipCardFragment.graphql.ts b/apps/console/src/__generated__/iam/MembershipCardFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/memberships/_components/__generated__/MembershipCardFragment.graphql.ts
rename to apps/console/src/__generated__/iam/MembershipCardFragment.graphql.ts
diff --git a/apps/console/src/pages/iam/memberships/_components/__generated__/MembershipCard_assumeMutation.graphql.ts b/apps/console/src/__generated__/iam/MembershipCard_assumeMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/memberships/_components/__generated__/MembershipCard_assumeMutation.graphql.ts
rename to apps/console/src/__generated__/iam/MembershipCard_assumeMutation.graphql.ts
diff --git a/apps/console/src/pages/iam/memberships/__generated__/MembershipLayoutQuery.graphql.ts b/apps/console/src/__generated__/iam/MembershipLayoutQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/memberships/__generated__/MembershipLayoutQuery.graphql.ts
rename to apps/console/src/__generated__/iam/MembershipLayoutQuery.graphql.ts
diff --git a/apps/console/src/pages/iam/memberships/__generated__/MembershipsDropdownMenuItemFragment.graphql.ts b/apps/console/src/__generated__/iam/MembershipsDropdownMenuItemFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/memberships/__generated__/MembershipsDropdownMenuItemFragment.graphql.ts
rename to apps/console/src/__generated__/iam/MembershipsDropdownMenuItemFragment.graphql.ts
diff --git a/apps/console/src/pages/iam/memberships/__generated__/MembershipsDropdownMenuItem_assumeMutation.graphql.ts b/apps/console/src/__generated__/iam/MembershipsDropdownMenuItem_assumeMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/memberships/__generated__/MembershipsDropdownMenuItem_assumeMutation.graphql.ts
rename to apps/console/src/__generated__/iam/MembershipsDropdownMenuItem_assumeMutation.graphql.ts
diff --git a/apps/console/src/pages/iam/memberships/__generated__/MembershipsDropdownMenuQuery.graphql.ts b/apps/console/src/__generated__/iam/MembershipsDropdownMenuQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/memberships/__generated__/MembershipsDropdownMenuQuery.graphql.ts
rename to apps/console/src/__generated__/iam/MembershipsDropdownMenuQuery.graphql.ts
diff --git a/apps/console/src/pages/iam/memberships/__generated__/MembershipsDropdown_organizationFragment.graphql.ts b/apps/console/src/__generated__/iam/MembershipsDropdown_organizationFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/memberships/__generated__/MembershipsDropdown_organizationFragment.graphql.ts
rename to apps/console/src/__generated__/iam/MembershipsDropdown_organizationFragment.graphql.ts
diff --git a/apps/console/src/pages/iam/memberships/__generated__/MembershipsDropdown_viewerFragment.graphql.ts b/apps/console/src/__generated__/iam/MembershipsDropdown_viewerFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/memberships/__generated__/MembershipsDropdown_viewerFragment.graphql.ts
rename to apps/console/src/__generated__/iam/MembershipsDropdown_viewerFragment.graphql.ts
diff --git a/apps/console/src/pages/iam/memberships/__generated__/MembershipsPageQuery.graphql.ts b/apps/console/src/__generated__/iam/MembershipsPageQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/memberships/__generated__/MembershipsPageQuery.graphql.ts
rename to apps/console/src/__generated__/iam/MembershipsPageQuery.graphql.ts
diff --git a/apps/console/src/pages/iam/organizations/__generated__/NewOrganizationPageMutation.graphql.ts b/apps/console/src/__generated__/iam/NewOrganizationPageMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/organizations/__generated__/NewOrganizationPageMutation.graphql.ts
rename to apps/console/src/__generated__/iam/NewOrganizationPageMutation.graphql.ts
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/__generated__/NewSAMLConfigurationForm_createMutation.graphql.ts b/apps/console/src/__generated__/iam/NewSAMLConfigurationForm_createMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/organizations/settings/_components/__generated__/NewSAMLConfigurationForm_createMutation.graphql.ts
rename to apps/console/src/__generated__/iam/NewSAMLConfigurationForm_createMutation.graphql.ts
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/__generated__/OrganizationFormFragment.graphql.ts b/apps/console/src/__generated__/iam/OrganizationFormFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/organizations/settings/_components/__generated__/OrganizationFormFragment.graphql.ts
rename to apps/console/src/__generated__/iam/OrganizationFormFragment.graphql.ts
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/__generated__/OrganizationForm_deleteHorizontalLogoMutation.graphql.ts b/apps/console/src/__generated__/iam/OrganizationForm_deleteHorizontalLogoMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/organizations/settings/_components/__generated__/OrganizationForm_deleteHorizontalLogoMutation.graphql.ts
rename to apps/console/src/__generated__/iam/OrganizationForm_deleteHorizontalLogoMutation.graphql.ts
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/__generated__/OrganizationForm_updateMutation.graphql.ts b/apps/console/src/__generated__/iam/OrganizationForm_updateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/organizations/settings/_components/__generated__/OrganizationForm_updateMutation.graphql.ts
rename to apps/console/src/__generated__/iam/OrganizationForm_updateMutation.graphql.ts
diff --git a/apps/console/src/pages/iam/apiKeys/_components/__generated__/PersonalAPIKeyListCreateMutation.graphql.ts b/apps/console/src/__generated__/iam/PersonalAPIKeyListCreateMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/apiKeys/_components/__generated__/PersonalAPIKeyListCreateMutation.graphql.ts
rename to apps/console/src/__generated__/iam/PersonalAPIKeyListCreateMutation.graphql.ts
diff --git a/apps/console/src/pages/iam/apiKeys/_components/__generated__/PersonalAPIKeyListFragment.graphql.ts b/apps/console/src/__generated__/iam/PersonalAPIKeyListFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/apiKeys/_components/__generated__/PersonalAPIKeyListFragment.graphql.ts
rename to apps/console/src/__generated__/iam/PersonalAPIKeyListFragment.graphql.ts
diff --git a/apps/console/src/pages/iam/apiKeys/_components/__generated__/PersonalAPIKeyListRevealTokenMutation.graphql.ts b/apps/console/src/__generated__/iam/PersonalAPIKeyListRevealTokenMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/apiKeys/_components/__generated__/PersonalAPIKeyListRevealTokenMutation.graphql.ts
rename to apps/console/src/__generated__/iam/PersonalAPIKeyListRevealTokenMutation.graphql.ts
diff --git a/apps/console/src/pages/iam/apiKeys/_components/__generated__/PersonalAPIKeyListRevokeMutation.graphql.ts b/apps/console/src/__generated__/iam/PersonalAPIKeyListRevokeMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/apiKeys/_components/__generated__/PersonalAPIKeyListRevokeMutation.graphql.ts
rename to apps/console/src/__generated__/iam/PersonalAPIKeyListRevokeMutation.graphql.ts
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/__generated__/SAMLConfigurationListFragment.graphql.ts b/apps/console/src/__generated__/iam/SAMLConfigurationListFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/organizations/settings/_components/__generated__/SAMLConfigurationListFragment.graphql.ts
rename to apps/console/src/__generated__/iam/SAMLConfigurationListFragment.graphql.ts
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/__generated__/SAMLConfigurationList_deleteMutation.graphql.ts b/apps/console/src/__generated__/iam/SAMLConfigurationList_deleteMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/organizations/settings/_components/__generated__/SAMLConfigurationList_deleteMutation.graphql.ts
rename to apps/console/src/__generated__/iam/SAMLConfigurationList_deleteMutation.graphql.ts
diff --git a/apps/console/src/pages/iam/organizations/settings/__generated__/SAMLSettingsPageQuery.graphql.ts b/apps/console/src/__generated__/iam/SAMLSettingsPageQuery.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/organizations/settings/__generated__/SAMLSettingsPageQuery.graphql.ts
rename to apps/console/src/__generated__/iam/SAMLSettingsPageQuery.graphql.ts
diff --git a/apps/console/src/pages/iam/memberships/_components/__generated__/SessionDropdownFragment.graphql.ts b/apps/console/src/__generated__/iam/SessionDropdownFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/memberships/_components/__generated__/SessionDropdownFragment.graphql.ts
rename to apps/console/src/__generated__/iam/SessionDropdownFragment.graphql.ts
diff --git a/apps/console/src/pages/iam/memberships/_components/__generated__/SessionDropdownSignOutMutation.graphql.ts b/apps/console/src/__generated__/iam/SessionDropdownSignOutMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/memberships/_components/__generated__/SessionDropdownSignOutMutation.graphql.ts
rename to apps/console/src/__generated__/iam/SessionDropdownSignOutMutation.graphql.ts
diff --git a/apps/console/src/pages/iam/memberships/_components/__generated__/SidebarFragment.graphql.ts b/apps/console/src/__generated__/iam/SidebarFragment.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/memberships/_components/__generated__/SidebarFragment.graphql.ts
rename to apps/console/src/__generated__/iam/SidebarFragment.graphql.ts
diff --git a/apps/console/src/pages/iam/auth/__generated__/SignInPageMutation.graphql.ts b/apps/console/src/__generated__/iam/SignInPageMutation.graphql.ts
similarity index 100%
rename from apps/console/src/pages/iam/auth/__generated__/SignInPageMutation.graphql.ts
rename to apps/console/src/__generated__/iam/SignInPageMutation.graphql.ts
diff --git a/apps/console/src/components/SnapshotBanner.tsx b/apps/console/src/components/SnapshotBanner.tsx
index 25a865e4d..b8cbe6698 100644
--- a/apps/console/src/components/SnapshotBanner.tsx
+++ b/apps/console/src/components/SnapshotBanner.tsx
@@ -2,8 +2,13 @@ import { IconClock } from "@probo/ui";
 import { useTranslate } from "@probo/i18n";
 import { useLazyLoadQuery, graphql } from "react-relay";
 import { useLocation } from "react-router";
-import type { SnapshotBannerQuery } from "./__generated__/SnapshotBannerQuery.graphql";
-import { getSnapshotTypeUrlPath, getSnapshotTypeLabel, sprintf, formatDate } from "@probo/helpers";
+import type { SnapshotBannerQuery } from "/__generated__/core/SnapshotBannerQuery.graphql";
+import {
+  getSnapshotTypeUrlPath,
+  getSnapshotTypeLabel,
+  sprintf,
+  formatDate,
+} from "@probo/helpers";
 
 const snapshotQuery = graphql`
   query SnapshotBannerQuery($snapshotId: ID!) {
@@ -31,14 +36,19 @@ export function SnapshotBanner({ snapshotId }: Props) {
   const { __ } = useTranslate();
   const location = useLocation();
 
-  const data = useLazyLoadQuery<SnapshotBannerQuery>(snapshotQuery, { snapshotId });
+  const data = useLazyLoadQuery<SnapshotBannerQuery>(snapshotQuery, {
+    snapshotId,
+  });
   const snapshot = data.node;
 
   if (!snapshot) {
     return null;
   }
 
-  if (snapshot.type && !isSnapshotTypeValidForUrl(snapshot.type, location.pathname)) {
+  if (
+    snapshot.type &&
+    !isSnapshotTypeValidForUrl(snapshot.type, location.pathname)
+  ) {
     throw new Error("PAGE_NOT_FOUND");
   }
 
@@ -47,13 +57,15 @@ export function SnapshotBanner({ snapshotId }: Props) {
       <IconClock className="text-warning-600 flex-shrink-0" size={20} />
       <div className="flex-1">
         <div className="flex items-center gap-2 mb-1">
-          <span className="font-medium text-warning-800">{__("Snapshot")} {snapshot.name}</span>
+          <span className="font-medium text-warning-800">
+            {__("Snapshot")} {snapshot.name}
+          </span>
         </div>
         <p className="text-sm text-warning-700">
           {sprintf(
             __("You are viewing a %s snapshot from %s"),
             getSnapshotTypeLabel(__, snapshot.type).toLocaleLowerCase(),
-            formatDate(snapshot.createdAt)
+            formatDate(snapshot.createdAt),
           )}
         </p>
       </div>
diff --git a/apps/console/src/components/assets/AssetsTable.tsx b/apps/console/src/components/assets/AssetsTable.tsx
index b9e4a84eb..27b57db28 100644
--- a/apps/console/src/components/assets/AssetsTable.tsx
+++ b/apps/console/src/components/assets/AssetsTable.tsx
@@ -1,6 +1,19 @@
-import { getAssetTypeVariant, promisifyMutation, sprintf } from "@probo/helpers";
+import {
+  getAssetTypeVariant,
+  promisifyMutation,
+  sprintf,
+} from "@probo/helpers";
 import { useTranslate } from "@probo/i18n";
-import { ActionDropdown, Badge, DropdownItem, IconPencil, IconTrashCan, SelectCell, TextCell, useConfirm } from "@probo/ui";
+import {
+  ActionDropdown,
+  Badge,
+  DropdownItem,
+  IconPencil,
+  IconTrashCan,
+  SelectCell,
+  TextCell,
+  useConfirm,
+} from "@probo/ui";
 import { useMutation } from "react-relay";
 import type { usePaginationFragmentHookType } from "react-relay/relay-hooks/usePaginationFragment";
 import { Link } from "react-router";
@@ -8,9 +21,16 @@ import { z } from "zod";
 import { EditableTable } from "../table/EditableTable";
 import { PeopleCell } from "../table/PeopleCell";
 import { VendorsCell } from "../table/VendorsCell";
-import { createAssetMutation, deleteAssetMutation, updateAssetMutation } from "/hooks/graph/AssetGraph";
-import type { AssetGraphDeleteMutation } from "/hooks/graph/__generated__/AssetGraphDeleteMutation.graphql";
-import type { AssetsPageFragment$data, AssetsPageFragment$key } from "/pages/organizations/assets/__generated__/AssetsPageFragment.graphql";
+import {
+  createAssetMutation,
+  deleteAssetMutation,
+  updateAssetMutation,
+} from "/hooks/graph/AssetGraph";
+import type { AssetGraphDeleteMutation } from "/__generated__/core/AssetGraphDeleteMutation.graphql";
+import type {
+  AssetsPageFragment$data,
+  AssetsPageFragment$key,
+} from "/__generated__/core/AssetsPageFragment.graphql";
 import type { OperationType } from "relay-runtime";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 
@@ -73,7 +93,7 @@ export function AssetsTable(props: Props) {
         ...defaultValue,
         organizationId,
       }}
-      action={({ item }) =>
+      action={({ item }) => (
         <ActionDropdown>
           <DropdownItem asChild>
             <Link to={`/organizations/${organizationId}/assets/${item.id}`}>
@@ -89,7 +109,7 @@ export function AssetsTable(props: Props) {
             {__("Delete")}
           </DropdownItem>
         </ActionDropdown>
-      }
+      )}
       row={({ item }) => (
         <>
           <TextCell name="name" defaultValue={item?.name ?? ""} required />
@@ -105,9 +125,7 @@ export function AssetsTable(props: Props) {
           />
           <TextCell
             name="dataTypesStored"
-            defaultValue={
-              item?.dataTypesStored ?? defaultValue.dataTypesStored
-            }
+            defaultValue={item?.dataTypesStored ?? defaultValue.dataTypesStored}
             required
           />
           <TextCell
@@ -123,9 +141,7 @@ export function AssetsTable(props: Props) {
           <VendorsCell
             name="vendorIds"
             organizationId={organizationId}
-            defaultValue={
-              item?.vendors?.edges?.map((edge) => edge.node) ?? []
-            }
+            defaultValue={item?.vendors?.edges?.map((edge) => edge.node) ?? []}
           />
         </>
       )}
@@ -162,4 +178,4 @@ const useDeleteAsset = (connectionId: string) => {
       },
     );
   };
-};
\ No newline at end of file
+};
diff --git a/apps/console/src/components/assets/ReadOnlyAssetsTable.tsx b/apps/console/src/components/assets/ReadOnlyAssetsTable.tsx
index 24252f9aa..ebae035d9 100644
--- a/apps/console/src/components/assets/ReadOnlyAssetsTable.tsx
+++ b/apps/console/src/components/assets/ReadOnlyAssetsTable.tsx
@@ -2,7 +2,10 @@ import { Avatar, Badge, Tbody, Td, Th, Thead, Tr } from "@probo/ui";
 import { SortableTable } from "../SortableTable";
 import { useTranslate } from "@probo/i18n";
 import type { usePaginationFragmentHookType } from "react-relay/relay-hooks/usePaginationFragment";
-import type { AssetsPageFragment$data, AssetsPageFragment$key } from "/pages/organizations/assets/__generated__/AssetsPageFragment.graphql";
+import type {
+  AssetsPageFragment$data,
+  AssetsPageFragment$key,
+} from "/__generated__/core/AssetsPageFragment.graphql";
 import type { OperationType } from "relay-runtime";
 import type { NodeOf } from "/types";
 import { useOrganizationId } from "/hooks/useOrganizationId";
@@ -26,32 +29,25 @@ export function ReadOnlyAssetsTable(props: Props) {
 
   return (
     <SortableTable {...pagination} pageSize={10}>
-        <Thead>
-          <Tr>
-            <Th>{__("Name")}</Th>
-            <Th>{__("Type")}</Th>
-            <Th>{__("Amount")}</Th>
-            <Th>{__("Owner")}</Th>
-            <Th>{__("Vendors")}</Th>
-          </Tr>
-        </Thead>
-        <Tbody>
-          {assets.map((entry) => (
-            <AssetRow
-              key={entry.id}
-              entry={entry}
-            />
-          ))}
-        </Tbody>
-      </SortableTable>
+      <Thead>
+        <Tr>
+          <Th>{__("Name")}</Th>
+          <Th>{__("Type")}</Th>
+          <Th>{__("Amount")}</Th>
+          <Th>{__("Owner")}</Th>
+          <Th>{__("Vendors")}</Th>
+        </Tr>
+      </Thead>
+      <Tbody>
+        {assets.map((entry) => (
+          <AssetRow key={entry.id} entry={entry} />
+        ))}
+      </Tbody>
+    </SortableTable>
   );
 }
 
-function AssetRow({
-  entry,
-}: {
-  entry: AssetEntry;
-}) {
+function AssetRow({ entry }: { entry: AssetEntry }) {
   const organizationId = useOrganizationId();
   const { __ } = useTranslate();
   const { snapshotId } = useParams<{ snapshotId?: string }>();
@@ -60,8 +56,9 @@ function AssetRow({
   return (
     <Tr
       to={
-        snapshotId ?
-          `/organizations/${organizationId}/snapshots/${snapshotId}/assets/${entry.id}` : `/organizations/${organizationId}/assets/${entry.id}`
+        snapshotId
+          ? `/organizations/${organizationId}/snapshots/${snapshotId}/assets/${entry.id}`
+          : `/organizations/${organizationId}/assets/${entry.id}`
       }
     >
       <Td>{entry.name}</Td>
@@ -101,4 +98,4 @@ function AssetRow({
       </Td>
     </Tr>
   );
-}
\ No newline at end of file
+}
diff --git a/apps/console/src/components/audits/LinkedAuditsCard.tsx b/apps/console/src/components/audits/LinkedAuditsCard.tsx
index e7bcfd585..5621ac074 100644
--- a/apps/console/src/components/audits/LinkedAuditsCard.tsx
+++ b/apps/console/src/components/audits/LinkedAuditsCard.tsx
@@ -15,7 +15,7 @@ import {
   TrButton,
 } from "@probo/ui";
 import { useTranslate } from "@probo/i18n";
-import type { LinkedAuditsCardFragment$key } from "./__generated__/LinkedAuditsCardFragment.graphql";
+import type { LinkedAuditsCardFragment$key } from "/__generated__/core/LinkedAuditsCardFragment.graphql";
 import { useFragment } from "react-relay";
 import { useMemo, useState } from "react";
 import { sprintf, getAuditStateVariant } from "@probo/helpers";
@@ -123,7 +123,10 @@ export function LinkedAuditsCard<Params>(props: Props<Params>) {
         <Tbody>
           {audits.length === 0 && (
             <Tr>
-              <Td colSpan={props.readOnly ? 2 : 3} className="text-center text-txt-secondary">
+              <Td
+                colSpan={props.readOnly ? 2 : 3}
+                className="text-center text-txt-secondary"
+              >
                 {__("No audits linked")}
               </Td>
             </Tr>
@@ -177,13 +180,9 @@ function AuditRow(props: {
     <Tr to={`/organizations/${organizationId}/audits/${audit.id}`}>
       <Td>
         <div className="flex flex-col">
-          <div className="font-medium">
-            {audit.framework?.name}
-          </div>
+          <div className="font-medium">{audit.framework?.name}</div>
           {audit.name && (
-            <div className="text-sm text-txt-secondary">
-              {audit.name}
-            </div>
+            <div className="text-sm text-txt-secondary">{audit.name}</div>
           )}
         </div>
       </Td>
diff --git a/apps/console/src/components/audits/LinkedAuditsDialog.tsx b/apps/console/src/components/audits/LinkedAuditsDialog.tsx
index d675840a2..c5947ea34 100644
--- a/apps/console/src/components/audits/LinkedAuditsDialog.tsx
+++ b/apps/console/src/components/audits/LinkedAuditsDialog.tsx
@@ -16,13 +16,13 @@ import { getAuditStateVariant } from "@probo/helpers";
 import { Suspense, useMemo, useState, type ReactNode } from "react";
 import { graphql } from "relay-runtime";
 import { useLazyLoadQuery, usePaginationFragment } from "react-relay";
-import type { LinkedAuditsDialogQuery } from "./__generated__/LinkedAuditsDialogQuery.graphql";
+import type { LinkedAuditsDialogQuery } from "/__generated__/core/LinkedAuditsDialogQuery.graphql";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import type { NodeOf } from "/types";
 import type {
   LinkedAuditsDialogFragment$data,
   LinkedAuditsDialogFragment$key,
-} from "./__generated__/LinkedAuditsDialogFragment.graphql";
+} from "/__generated__/core/LinkedAuditsDialogFragment.graphql";
 
 const auditsQuery = graphql`
   query LinkedAuditsDialogQuery($organizationId: ID!) {
@@ -53,17 +53,17 @@ const auditsFragment = graphql`
       orderBy: $order
     ) @connection(key: "LinkedAuditsDialogQuery_audits") {
       edges {
-                 node {
-           id
-           name
-           state
-           validFrom
-           validUntil
-           framework {
-             id
-             name
-           }
-         }
+        node {
+          id
+          name
+          state
+          validFrom
+          validUntil
+          framework {
+            id
+            name
+          }
+        }
       }
     }
   }
@@ -99,18 +99,21 @@ function LinkedAuditsDialogContent(props: Omit<Props, "children">) {
   });
   const { data, loadNext, hasNext, isLoadingNext } = usePaginationFragment(
     auditsFragment,
-    query.organization as LinkedAuditsDialogFragment$key
+    query.organization as LinkedAuditsDialogFragment$key,
   );
   const { __ } = useTranslate();
   const [search, setSearch] = useState("");
-  const audits = useMemo(() => data.audits?.edges?.map((edge) => edge.node) ?? [], [data.audits]);
+  const audits = useMemo(
+    () => data.audits?.edges?.map((edge) => edge.node) ?? [],
+    [data.audits],
+  );
   const linkedIds = useMemo(() => {
     return new Set(props.linkedAudits?.map((a) => a.id) ?? []);
   }, [props.linkedAudits]);
 
   const filteredAudits = useMemo(() => {
     return audits.filter((audit) =>
-      (audit.name || "").toLowerCase().includes(search.toLowerCase())
+      (audit.name || "").toLowerCase().includes(search.toLowerCase()),
     );
   }, [audits, search]);
 
@@ -168,13 +171,9 @@ function AuditRow(props: RowProps) {
       onClick={() => onClick(props.audit.id)}
     >
       <div className="flex flex-col items-start gap-1">
-        <div className="font-medium">
-          {props.audit.framework?.name}
-        </div>
+        <div className="font-medium">{props.audit.framework?.name}</div>
         {props.audit.name && (
-          <div className="text-sm text-txt-secondary">
-            {props.audit.name}
-          </div>
+          <div className="text-sm text-txt-secondary">{props.audit.name}</div>
         )}
       </div>
       <Badge color={getAuditStateVariant(props.audit.state)}>
diff --git a/apps/console/src/components/controls/LinkedControlsCard.tsx b/apps/console/src/components/controls/LinkedControlsCard.tsx
index 0c6384aca..9abe40266 100644
--- a/apps/console/src/components/controls/LinkedControlsCard.tsx
+++ b/apps/console/src/components/controls/LinkedControlsCard.tsx
@@ -11,7 +11,7 @@ import {
   TrButton,
 } from "@probo/ui";
 import { useTranslate } from "@probo/i18n";
-import type { LinkedControlsCardFragment$key } from "./__generated__/LinkedControlsCardFragment.graphql";
+import type { LinkedControlsCardFragment$key } from "/__generated__/core/LinkedControlsCardFragment.graphql";
 import { useFragment } from "react-relay";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import { LinkedControlsDialog } from "./LinkedControlsDialog";
@@ -103,7 +103,10 @@ export function LinkedControlsCard<Params>(props: Props<Params>) {
       <Tbody>
         {controls.length === 0 && (
           <Tr>
-            <Td colSpan={props.readOnly ? 2 : 3} className="text-center text-txt-secondary">
+            <Td
+              colSpan={props.readOnly ? 2 : 3}
+              className="text-center text-txt-secondary"
+            >
               {__("No controls linked")}
             </Td>
           </Tr>
diff --git a/apps/console/src/components/controls/LinkedControlsDialog.tsx b/apps/console/src/components/controls/LinkedControlsDialog.tsx
index d3557d4fe..4eebf15e1 100644
--- a/apps/console/src/components/controls/LinkedControlsDialog.tsx
+++ b/apps/console/src/components/controls/LinkedControlsDialog.tsx
@@ -22,11 +22,11 @@ import { useTranslate } from "@probo/i18n";
 import { graphql } from "relay-runtime";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import { useLazyLoadQuery, usePaginationFragment } from "react-relay";
-import type { LinkedControlsDialogQuery } from "./__generated__/LinkedControlsDialogQuery.graphql";
+import type { LinkedControlsDialogQuery } from "/__generated__/core/LinkedControlsDialogQuery.graphql";
 import type {
   LinkedControlsDialogFragment$data,
   LinkedControlsDialogFragment$key,
-} from "./__generated__/LinkedControlsDialogFragment.graphql";
+} from "/__generated__/core/LinkedControlsDialogFragment.graphql";
 import type { NodeOf } from "/types";
 import { useDebounceCallback } from "usehooks-ts";
 
@@ -126,7 +126,7 @@ function LinkedControlsDialogContent(props: Props & { ref: SearchRef }) {
   const { data, loadNext, hasNext, isLoadingNext, refetch } =
     usePaginationFragment(
       controlsFragment,
-      mainData.organization as LinkedControlsDialogFragment$key
+      mainData.organization as LinkedControlsDialogFragment$key,
     );
 
   const controls = data.controls?.edges?.map((edge) => edge.node) ?? [];
@@ -171,7 +171,7 @@ function ControlRow(
   props: {
     control: NodeOf<LinkedControlsDialogFragment$data["controls"]>;
     controlIds: Set<string>;
-  } & Props
+  } & Props,
 ) {
   const { __ } = useTranslate();
   const isLinked = props.controlIds.has(props.control.id);
diff --git a/apps/console/src/components/documents/LinkedDocumentsCard.tsx b/apps/console/src/components/documents/LinkedDocumentsCard.tsx
index ffb14c25b..8c2e6c25d 100644
--- a/apps/console/src/components/documents/LinkedDocumentsCard.tsx
+++ b/apps/console/src/components/documents/LinkedDocumentsCard.tsx
@@ -16,7 +16,7 @@ import {
   TrButton,
 } from "@probo/ui";
 import { useTranslate } from "@probo/i18n";
-import type { LinkedDocumentsCardFragment$key } from "./__generated__/LinkedDocumentsCardFragment.graphql";
+import type { LinkedDocumentsCardFragment$key } from "/__generated__/core/LinkedDocumentsCardFragment.graphql";
 import { useFragment } from "react-relay";
 import { useMemo, useState } from "react";
 import { sprintf } from "@probo/helpers";
@@ -137,7 +137,10 @@ export function LinkedDocumentsCard<Params>(props: Props<Params>) {
         <Tbody>
           {documents.length === 0 && (
             <Tr>
-              <Td colSpan={props.readOnly ? 3 : 4} className="text-center text-txt-secondary">
+              <Td
+                colSpan={props.readOnly ? 3 : 4}
+                className="text-center text-txt-secondary"
+              >
                 {__("No documents linked")}
               </Td>
             </Tr>
diff --git a/apps/console/src/components/documents/LinkedDocumentsDialog.tsx b/apps/console/src/components/documents/LinkedDocumentsDialog.tsx
index 37c972412..2d07c7b82 100644
--- a/apps/console/src/components/documents/LinkedDocumentsDialog.tsx
+++ b/apps/console/src/components/documents/LinkedDocumentsDialog.tsx
@@ -15,13 +15,13 @@ import { useTranslate } from "@probo/i18n";
 import { Suspense, useMemo, useState, type ReactNode } from "react";
 import { graphql } from "relay-runtime";
 import { useLazyLoadQuery, usePaginationFragment } from "react-relay";
-import type { LinkedDocumentsDialogQuery } from "./__generated__/LinkedDocumentsDialogQuery.graphql";
+import type { LinkedDocumentsDialogQuery } from "/__generated__/core/LinkedDocumentsDialogQuery.graphql";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import type { NodeOf } from "/types";
 import type {
   LinkedDocumentsDialogFragment$data,
   LinkedDocumentsDialogFragment$key,
-} from "./__generated__/LinkedDocumentsDialogFragment.graphql";
+} from "/__generated__/core/LinkedDocumentsDialogFragment.graphql";
 
 const documentsQuery = graphql`
   query LinkedDocumentsDialogQuery($organizationId: ID!) {
@@ -88,23 +88,30 @@ export function LinkedDocumentDialog({ children, ...props }: Props) {
 
 function LinkedDocumentsDialogContent(props: Omit<Props, "children">) {
   const organizationId = useOrganizationId();
-  const query = useLazyLoadQuery<LinkedDocumentsDialogQuery>(documentsQuery, {
-    organizationId,
-  }, { fetchPolicy: "network-only" });
+  const query = useLazyLoadQuery<LinkedDocumentsDialogQuery>(
+    documentsQuery,
+    {
+      organizationId,
+    },
+    { fetchPolicy: "network-only" },
+  );
   const { data, loadNext, hasNext, isLoadingNext } = usePaginationFragment(
     documentsFragment,
-    query.organization as LinkedDocumentsDialogFragment$key
+    query.organization as LinkedDocumentsDialogFragment$key,
   );
   const { __ } = useTranslate();
   const [search, setSearch] = useState("");
-  const documents = useMemo(() => data.documents?.edges?.map((edge) => edge.node) ?? [], [data.documents]);
+  const documents = useMemo(
+    () => data.documents?.edges?.map((edge) => edge.node) ?? [],
+    [data.documents],
+  );
   const linkedIds = useMemo(() => {
     return new Set(props.linkedDocuments?.map((m) => m.id) ?? []);
   }, [props.linkedDocuments]);
 
   const filteredDocuments = useMemo(() => {
     return documents.filter((document) =>
-      document.title.toLowerCase().includes(search.toLowerCase())
+      document.title.toLowerCase().includes(search.toLowerCase()),
     );
   }, [documents, search]);
 
diff --git a/apps/console/src/components/form/AuditSelectField.tsx b/apps/console/src/components/form/AuditSelectField.tsx
index bcfe22b5a..fa26768af 100644
--- a/apps/console/src/components/form/AuditSelectField.tsx
+++ b/apps/console/src/components/form/AuditSelectField.tsx
@@ -1,10 +1,15 @@
 import { Field, Option, Select, Badge } from "@probo/ui";
 import { Suspense, type ComponentProps } from "react";
 import { useTranslate } from "@probo/i18n";
-import { type Control, Controller, type FieldValues, type Path } from "react-hook-form";
+import {
+  type Control,
+  Controller,
+  type FieldValues,
+  type Path,
+} from "react-hook-form";
 import { useLazyLoadQuery, graphql } from "react-relay";
 import { getAuditStateVariant, getAuditStateLabel } from "@probo/helpers";
-import type { AuditSelectFieldQuery } from "./__generated__/AuditSelectFieldQuery.graphql";
+import type { AuditSelectFieldQuery } from "/__generated__/core/AuditSelectFieldQuery.graphql";
 
 const auditsQuery = graphql`
   query AuditSelectFieldQuery($organizationId: ID!) {
@@ -60,12 +65,19 @@ export function AuditSelectField<T extends FieldValues = FieldValues>({
 }
 
 function AuditSelectWithQuery<T extends FieldValues = FieldValues>(
-  props: Pick<Props<T>, "organizationId" | "control" | "name" | "disabled">
+  props: Pick<Props<T>, "organizationId" | "control" | "name" | "disabled">,
 ) {
   const { __ } = useTranslate();
   const { name, organizationId, control } = props;
-  const data = useLazyLoadQuery<AuditSelectFieldQuery>(auditsQuery, { organizationId }, { fetchPolicy: "network-only" });
-  const audits = data?.organization?.audits?.edges?.map((edge) => edge.node).filter((node) => node !== null) ?? [];
+  const data = useLazyLoadQuery<AuditSelectFieldQuery>(
+    auditsQuery,
+    { organizationId },
+    { fetchPolicy: "network-only" },
+  );
+  const audits =
+    data?.organization?.audits?.edges
+      ?.map((edge) => edge.node)
+      .filter((node) => node !== null) ?? [];
 
   const NONE_VALUE = "__NONE__";
 
@@ -79,7 +91,9 @@ function AuditSelectWithQuery<T extends FieldValues = FieldValues>(
           id={name}
           variant="editor"
           placeholder={__("Select an audit")}
-          onValueChange={(value) => field.onChange(value === NONE_VALUE ? "" : value)}
+          onValueChange={(value) =>
+            field.onChange(value === NONE_VALUE ? "" : value)
+          }
           key={audits?.length.toString() ?? "0"}
           {...field}
           className="w-full"
@@ -94,8 +108,7 @@ function AuditSelectWithQuery<T extends FieldValues = FieldValues>(
                 <span>
                   {audit.name
                     ? `${audit.framework.name} - ${audit.name}`
-                    : audit.framework.name
-                  }
+                    : audit.framework.name}
                 </span>
                 <div className="ml-3">
                   <Badge variant={getAuditStateVariant(audit.state)}>
diff --git a/apps/console/src/components/form/ProcessingActivityEnumOptions.tsx b/apps/console/src/components/form/ProcessingActivityEnumOptions.tsx
index 29acb27c8..70d8b11ec 100644
--- a/apps/console/src/components/form/ProcessingActivityEnumOptions.tsx
+++ b/apps/console/src/components/form/ProcessingActivityEnumOptions.tsx
@@ -5,7 +5,7 @@ import type {
   ProcessingActivityLawfulBasis,
   ProcessingActivityDataProtectionImpactAssessment,
   ProcessingActivityTransferImpactAssessment,
-} from "../../hooks/graph/__generated__/ProcessingActivityGraphCreateMutation.graphql";
+} from "/__generated__/core/ProcessingActivityGraphCreateMutation.graphql";
 
 export function SpecialOrCriminalDataOptions() {
   const { __ } = useTranslate();
@@ -58,7 +58,7 @@ export function LawfulBasisOptions() {
 
 export function getLawfulBasisLabel(
   value: ProcessingActivityLawfulBasis | null | undefined,
-  __: (key: string) => string
+  __: (key: string) => string,
 ): string {
   if (!value) return "-";
 
@@ -76,7 +76,7 @@ export function getLawfulBasisLabel(
 
 export function getResidualRiskLabel(
   value: "LOW" | "MEDIUM" | "HIGH" | null | undefined,
-  __: (key: string) => string
+  __: (key: string) => string,
 ): string {
   if (!value) return "-";
 
diff --git a/apps/console/src/components/form/StateOfApplicabilityControlsField.tsx b/apps/console/src/components/form/StateOfApplicabilityControlsField.tsx
index e37ff243d..49f7c4e6d 100644
--- a/apps/console/src/components/form/StateOfApplicabilityControlsField.tsx
+++ b/apps/console/src/components/form/StateOfApplicabilityControlsField.tsx
@@ -1,518 +1,681 @@
 import { useTranslate } from "@probo/i18n";
 import {
-  Field,
-  Select,
-  Option,
-  Checkbox,
-  Textarea,
-  Spinner,
-  Button,
-  IconChevronDown,
-  IconChevronUp,
-  IconTrashCan,
-  IconPlusLarge,
+    Field,
+    Select,
+    Option,
+    Checkbox,
+    Textarea,
+    Spinner,
+    Button,
+    IconChevronDown,
+    IconChevronUp,
+    IconTrashCan,
+    IconPlusLarge,
 } from "@probo/ui";
 import { Suspense, useState, useMemo, useEffect } from "react";
-import { Controller, type Control, type UseFormSetValue, type FieldValues, type Path, type PathValue } from "react-hook-form";
+import {
+    Controller,
+    type Control,
+    type UseFormSetValue,
+    type FieldValues,
+    type Path,
+    type PathValue,
+} from "react-hook-form";
 import { useLazyLoadQuery } from "react-relay";
 import { graphql } from "relay-runtime";
 import { useOrganizationId } from "/hooks/useOrganizationId";
-import type { StateOfApplicabilityControlsFieldFrameworksQuery } from "./__generated__/StateOfApplicabilityControlsFieldFrameworksQuery.graphql";
-import type { StateOfApplicabilityControlsFieldFrameworkControlsQuery } from "./__generated__/StateOfApplicabilityControlsFieldFrameworkControlsQuery.graphql";
+import type { StateOfApplicabilityControlsFieldFrameworksQuery } from "/__generated__/core/StateOfApplicabilityControlsFieldFrameworksQuery.graphql";
+import type { StateOfApplicabilityControlsFieldFrameworkControlsQuery } from "/__generated__/core/StateOfApplicabilityControlsFieldFrameworkControlsQuery.graphql";
 
 const frameworksQuery = graphql`
-  query StateOfApplicabilityControlsFieldFrameworksQuery($organizationId: ID!) {
-    organization: node(id: $organizationId) {
-      ... on Organization {
-        frameworks(first: 100) {
-          edges {
-            node {
-              id
-              name
+    query StateOfApplicabilityControlsFieldFrameworksQuery(
+        $organizationId: ID!
+    ) {
+        organization: node(id: $organizationId) {
+            ... on Organization {
+                frameworks(first: 100) {
+                    edges {
+                        node {
+                            id
+                            name
+                        }
+                    }
+                }
             }
-          }
         }
-      }
     }
-  }
 `;
 
 const frameworkControlsQuery = graphql`
-  query StateOfApplicabilityControlsFieldFrameworkControlsQuery(
-    $frameworkId: ID!
-  ) {
-    framework: node(id: $frameworkId) {
-      ... on Framework {
-        id
-        controls(first: 500, orderBy: { field: SECTION_TITLE, direction: ASC }) {
-          edges {
-            node {
-              id
-              sectionTitle
-              name
+    query StateOfApplicabilityControlsFieldFrameworkControlsQuery(
+        $frameworkId: ID!
+    ) {
+        framework: node(id: $frameworkId) {
+            ... on Framework {
+                id
+                controls(
+                    first: 500
+                    orderBy: { field: SECTION_TITLE, direction: ASC }
+                ) {
+                    edges {
+                        node {
+                            id
+                            sectionTitle
+                            name
+                        }
+                    }
+                }
             }
-          }
         }
-      }
     }
-  }
 `;
 
 type ControlSelection = {
-  controlId: string;
-  state: "EXCLUDED" | "IMPLEMENTED" | "NOT_IMPLEMENTED";
-  exclusionJustification?: string;
+    controlId: string;
+    state: "EXCLUDED" | "IMPLEMENTED" | "NOT_IMPLEMENTED";
+    exclusionJustification?: string;
 };
 
 type FrameworkData = {
-  id: string;
-  name: string;
-  controls: Array<{
     id: string;
-    sectionTitle: string;
     name: string;
-  }>;
+    controls: Array<{
+        id: string;
+        sectionTitle: string;
+        name: string;
+    }>;
 };
 
 type Props<T extends FieldValues = FieldValues> = {
-  control: Control<T>;
-  setValue: UseFormSetValue<T>;
-  name: string;
-  initialControls?: ControlSelection[];
-  initialFrameworkIds?: Set<string>;
+    control: Control<T>;
+    setValue: UseFormSetValue<T>;
+    name: string;
+    initialControls?: ControlSelection[];
+    initialFrameworkIds?: Set<string>;
 };
 
-export function StateOfApplicabilityControlsField<T extends FieldValues = FieldValues>({ control, setValue, name, initialControls, initialFrameworkIds }: Props<T>) {
-  const { __ } = useTranslate();
-  const organizationId = useOrganizationId();
+export function StateOfApplicabilityControlsField<
+    T extends FieldValues = FieldValues,
+>({ control, setValue, name, initialControls, initialFrameworkIds }: Props<T>) {
+    const { __ } = useTranslate();
+    const organizationId = useOrganizationId();
 
-  // Initialize form value with initialControls
-  useEffect(() => {
-    if (initialControls && initialControls.length > 0) {
-      setValue(name as Path<T>, initialControls as PathValue<T, Path<T>>);
-    }
-  }, [initialControls, setValue, name]);
+    // Initialize form value with initialControls
+    useEffect(() => {
+        if (initialControls && initialControls.length > 0) {
+            setValue(name as Path<T>, initialControls as PathValue<T, Path<T>>);
+        }
+    }, [initialControls, setValue, name]);
 
-  // Initialize framework selection from initialFrameworkIds
-  const [selectedFrameworkIds, setSelectedFrameworkIds] = useState<Set<string>>(initialFrameworkIds || new Set());
-  const [expandedFrameworks, setExpandedFrameworks] = useState<Set<string>>(initialFrameworkIds || new Set());
-  const [frameworkDataMap, setFrameworkDataMap] = useState<Map<string, FrameworkData>>(new Map());
-  const [newFrameworkId, setNewFrameworkId] = useState<string>("");
+    // Initialize framework selection from initialFrameworkIds
+    const [selectedFrameworkIds, setSelectedFrameworkIds] = useState<
+        Set<string>
+    >(initialFrameworkIds || new Set());
+    const [expandedFrameworks, setExpandedFrameworks] = useState<Set<string>>(
+        initialFrameworkIds || new Set(),
+    );
+    const [frameworkDataMap, setFrameworkDataMap] = useState<
+        Map<string, FrameworkData>
+    >(new Map());
+    const [newFrameworkId, setNewFrameworkId] = useState<string>("");
 
-  // Update framework selection when initialFrameworkIds changes
-  useEffect(() => {
-    if (initialFrameworkIds) {
-      setSelectedFrameworkIds(initialFrameworkIds);
-      setExpandedFrameworks(initialFrameworkIds);
-    }
-  }, [initialFrameworkIds]);
+    // Update framework selection when initialFrameworkIds changes
+    useEffect(() => {
+        if (initialFrameworkIds) {
+            setSelectedFrameworkIds(initialFrameworkIds);
+            setExpandedFrameworks(initialFrameworkIds);
+        }
+    }, [initialFrameworkIds]);
 
-  const addFramework = (frameworkId: string) => {
-    if (!frameworkId || selectedFrameworkIds.has(frameworkId)) return;
-    setSelectedFrameworkIds(new Set([...selectedFrameworkIds, frameworkId]));
-    setExpandedFrameworks(new Set([...expandedFrameworks, frameworkId]));
-    setNewFrameworkId("");
-  };
+    const addFramework = (frameworkId: string) => {
+        if (!frameworkId || selectedFrameworkIds.has(frameworkId)) return;
+        setSelectedFrameworkIds(
+            new Set([...selectedFrameworkIds, frameworkId]),
+        );
+        setExpandedFrameworks(new Set([...expandedFrameworks, frameworkId]));
+        setNewFrameworkId("");
+    };
 
-  const removeFramework = (frameworkId: string) => {
-    const newSet = new Set(selectedFrameworkIds);
-    newSet.delete(frameworkId);
-    setSelectedFrameworkIds(newSet);
+    const removeFramework = (frameworkId: string) => {
+        const newSet = new Set(selectedFrameworkIds);
+        newSet.delete(frameworkId);
+        setSelectedFrameworkIds(newSet);
 
-    const newExpanded = new Set(expandedFrameworks);
-    newExpanded.delete(frameworkId);
-    setExpandedFrameworks(newExpanded);
+        const newExpanded = new Set(expandedFrameworks);
+        newExpanded.delete(frameworkId);
+        setExpandedFrameworks(newExpanded);
 
-    const newMap = new Map(frameworkDataMap);
-    newMap.delete(frameworkId);
-    setFrameworkDataMap(newMap);
-  };
+        const newMap = new Map(frameworkDataMap);
+        newMap.delete(frameworkId);
+        setFrameworkDataMap(newMap);
+    };
 
-  const toggleFramework = (frameworkId: string) => {
-    const newExpanded = new Set(expandedFrameworks);
-    if (newExpanded.has(frameworkId)) {
-      newExpanded.delete(frameworkId);
-    } else {
-      newExpanded.add(frameworkId);
-    }
-    setExpandedFrameworks(newExpanded);
-  };
+    const toggleFramework = (frameworkId: string) => {
+        const newExpanded = new Set(expandedFrameworks);
+        if (newExpanded.has(frameworkId)) {
+            newExpanded.delete(frameworkId);
+        } else {
+            newExpanded.add(frameworkId);
+        }
+        setExpandedFrameworks(newExpanded);
+    };
 
-  return (
-    <div className="space-y-4">
-      <div>
-        <h4 className="font-medium text-txt-primary mb-4">
-          {__("Select Controls")}
-        </h4>
+    return (
+        <div className="space-y-4">
+            <div>
+                <h4 className="font-medium text-txt-primary mb-4">
+                    {__("Select Controls")}
+                </h4>
 
-        <div className="space-y-3">
-          <Field label={__("Add Framework")}>
-            <Suspense fallback={<Select variant="editor" disabled placeholder={__("Loading...")} />}>
-              <FrameworkSelect
-                organizationId={organizationId}
-                selectedFrameworkIds={selectedFrameworkIds}
-                value={newFrameworkId}
-                onValueChange={setNewFrameworkId}
-                onAdd={addFramework}
-              />
-            </Suspense>
-          </Field>
+                <div className="space-y-3">
+                    <Field label={__("Add Framework")}>
+                        <Suspense
+                            fallback={
+                                <Select
+                                    variant="editor"
+                                    disabled
+                                    placeholder={__("Loading...")}
+                                />
+                            }
+                        >
+                            <FrameworkSelect
+                                organizationId={organizationId}
+                                selectedFrameworkIds={selectedFrameworkIds}
+                                value={newFrameworkId}
+                                onValueChange={setNewFrameworkId}
+                                onAdd={addFramework}
+                            />
+                        </Suspense>
+                    </Field>
 
-          {Array.from(selectedFrameworkIds).map((frameworkId) => (
-            <Suspense
-              key={frameworkId}
-              fallback={
-                <div className="flex items-center justify-center py-8">
-                  <Spinner />
+                    {Array.from(selectedFrameworkIds).map((frameworkId) => (
+                        <Suspense
+                            key={frameworkId}
+                            fallback={
+                                <div className="flex items-center justify-center py-8">
+                                    <Spinner />
+                                </div>
+                            }
+                        >
+                            <FrameworkSection
+                                frameworkId={frameworkId}
+                                isExpanded={expandedFrameworks.has(frameworkId)}
+                                onToggle={() => toggleFramework(frameworkId)}
+                                onRemove={() => removeFramework(frameworkId)}
+                                control={control}
+                                name={name}
+                                frameworkDataMap={frameworkDataMap}
+                                setFrameworkDataMap={setFrameworkDataMap}
+                            />
+                        </Suspense>
+                    ))}
                 </div>
-              }
-            >
-              <FrameworkSection
-                frameworkId={frameworkId}
-                isExpanded={expandedFrameworks.has(frameworkId)}
-                onToggle={() => toggleFramework(frameworkId)}
-                onRemove={() => removeFramework(frameworkId)}
-                control={control}
-                name={name}
-                frameworkDataMap={frameworkDataMap}
-                setFrameworkDataMap={setFrameworkDataMap}
-              />
-            </Suspense>
-          ))}
+            </div>
         </div>
-      </div>
-    </div>
-  );
+    );
 }
 
 function FrameworkSelect({
-  organizationId,
-  selectedFrameworkIds,
-  value,
-  onValueChange,
-  onAdd,
+    organizationId,
+    selectedFrameworkIds,
+    value,
+    onValueChange,
+    onAdd,
 }: {
-  organizationId: string;
-  selectedFrameworkIds: Set<string>;
-  value: string;
-  onValueChange: (value: string) => void;
-  onAdd: (frameworkId: string) => void;
+    organizationId: string;
+    selectedFrameworkIds: Set<string>;
+    value: string;
+    onValueChange: (value: string) => void;
+    onAdd: (frameworkId: string) => void;
 }) {
-  const { __ } = useTranslate();
-  const data = useLazyLoadQuery<StateOfApplicabilityControlsFieldFrameworksQuery>(
-    frameworksQuery,
-    { organizationId },
-    { fetchPolicy: "network-only" }
-  );
-  const frameworks: Array<{ id: string; name: string }> =
-    (data?.organization && "frameworks" in data.organization && data.organization.frameworks?.edges
-      ?.map((edge) => edge.node)
-      .filter((node): node is NonNullable<typeof node> => node !== null)) || [];
+    const { __ } = useTranslate();
+    const data =
+        useLazyLoadQuery<StateOfApplicabilityControlsFieldFrameworksQuery>(
+            frameworksQuery,
+            { organizationId },
+            { fetchPolicy: "network-only" },
+        );
+    const frameworks: Array<{ id: string; name: string }> =
+        (data?.organization &&
+            "frameworks" in data.organization &&
+            data.organization.frameworks?.edges
+                ?.map((edge) => edge.node)
+                .filter(
+                    (node): node is NonNullable<typeof node> => node !== null,
+                )) ||
+        [];
 
-  const availableFrameworks = frameworks.filter(
-    (framework: { id: string; name: string }) => !selectedFrameworkIds.has(framework.id)
-  );
+    const availableFrameworks = frameworks.filter(
+        (framework: { id: string; name: string }) =>
+            !selectedFrameworkIds.has(framework.id),
+    );
 
-  return (
-    <div className="flex gap-2">
-      <Select
-        variant="editor"
-        placeholder={__("Select a framework")}
-        onValueChange={onValueChange}
-        value={value}
-        className="flex-1"
-      >
-        {availableFrameworks.map((framework: { id: string; name: string }) => (
-          <Option key={framework.id} value={framework.id}>
-            {framework.name}
-          </Option>
-        ))}
-      </Select>
-      <Button
-        type="button"
-        variant="secondary"
-        icon={IconPlusLarge}
-        onClick={() => onAdd(value)}
-        disabled={!value || selectedFrameworkIds.has(value)}
-      >
-        {__("Add")}
-      </Button>
-    </div>
-  );
+    return (
+        <div className="flex gap-2">
+            <Select
+                variant="editor"
+                placeholder={__("Select a framework")}
+                onValueChange={onValueChange}
+                value={value}
+                className="flex-1"
+            >
+                {availableFrameworks.map(
+                    (framework: { id: string; name: string }) => (
+                        <Option key={framework.id} value={framework.id}>
+                            {framework.name}
+                        </Option>
+                    ),
+                )}
+            </Select>
+            <Button
+                type="button"
+                variant="secondary"
+                icon={IconPlusLarge}
+                onClick={() => onAdd(value)}
+                disabled={!value || selectedFrameworkIds.has(value)}
+            >
+                {__("Add")}
+            </Button>
+        </div>
+    );
 }
 
 function FrameworkSection<T extends FieldValues = FieldValues>({
-  frameworkId,
-  isExpanded,
-  onToggle,
-  onRemove,
-  control,
-  name,
-  frameworkDataMap,
-  setFrameworkDataMap,
+    frameworkId,
+    isExpanded,
+    onToggle,
+    onRemove,
+    control,
+    name,
+    frameworkDataMap,
+    setFrameworkDataMap,
 }: {
-  frameworkId: string;
-  isExpanded: boolean;
-  onToggle: () => void;
-  onRemove: () => void;
-  control: Control<T>;
-  name: string;
-  frameworkDataMap: Map<string, FrameworkData>;
-  setFrameworkDataMap: React.Dispatch<React.SetStateAction<Map<string, FrameworkData>>>;
+    frameworkId: string;
+    isExpanded: boolean;
+    onToggle: () => void;
+    onRemove: () => void;
+    control: Control<T>;
+    name: string;
+    frameworkDataMap: Map<string, FrameworkData>;
+    setFrameworkDataMap: React.Dispatch<
+        React.SetStateAction<Map<string, FrameworkData>>
+    >;
 }) {
-  const { __ } = useTranslate();
-  const data = useLazyLoadQuery<StateOfApplicabilityControlsFieldFrameworkControlsQuery>(
-    frameworkControlsQuery,
-    { frameworkId },
-    { fetchPolicy: "network-only" }
-  );
+    const { __ } = useTranslate();
+    const data =
+        useLazyLoadQuery<StateOfApplicabilityControlsFieldFrameworkControlsQuery>(
+            frameworkControlsQuery,
+            { frameworkId },
+            { fetchPolicy: "network-only" },
+        );
 
-  const framework = data?.framework && "controls" in data.framework ? data.framework : null;
-  const frameworkName: string = framework && "name" in framework && typeof framework.name === "string" ? framework.name : "";
-  const controls: Array<{ id: string; sectionTitle: string; name: string }> = useMemo(
-    () =>
-      (framework?.controls?.edges
-        ?.map((edge) => edge.node)
-        .filter((node): node is NonNullable<typeof node> => node !== null)) ?? [],
-    [framework]
-  );
+    const framework =
+        data?.framework && "controls" in data.framework ? data.framework : null;
+    const frameworkName: string =
+        framework && "name" in framework && typeof framework.name === "string"
+            ? framework.name
+            : "";
+    const controls: Array<{ id: string; sectionTitle: string; name: string }> =
+        useMemo(
+            () =>
+                framework?.controls?.edges
+                    ?.map((edge) => edge.node)
+                    .filter(
+                        (node): node is NonNullable<typeof node> =>
+                            node !== null,
+                    ) ?? [],
+            [framework],
+        );
 
-  useEffect(() => {
-    if (framework && !frameworkDataMap.has(frameworkId)) {
-      setFrameworkDataMap((prev) => {
-        const newMap = new Map(prev);
-        newMap.set(frameworkId, {
-          id: frameworkId,
-          name: frameworkName,
-          controls,
-        });
-        return newMap;
-      });
-    }
-  }, [framework, frameworkId, frameworkName, controls, frameworkDataMap, setFrameworkDataMap]);
-
-  const cachedData = frameworkDataMap.get(frameworkId);
-  const displayName: string = cachedData?.name || frameworkName;
-  const displayControls: Array<{ id: string; sectionTitle: string; name: string }> = cachedData?.controls || controls;
-
-  return (
-    <div className="border border-border-low rounded-lg">
-      <div className="flex items-center justify-between p-4">
-        <button
-          type="button"
-          onClick={onToggle}
-          className="flex items-center gap-2 flex-1 text-left hover:bg-subtle -m-4 p-4 rounded-lg"
-        >
-          {isExpanded ? (
-            <IconChevronUp size={16} className="text-txt-tertiary" />
-          ) : (
-            <IconChevronDown size={16} className="text-txt-tertiary" />
-          )}
-          <span className="font-medium text-txt-primary">{displayName}</span>
-          <span className="text-sm text-txt-tertiary">
-            ({displayControls.length} {__("controls")})
-          </span>
-        </button>
-        <Button
-          type="button"
-          variant="secondary"
-          icon={IconTrashCan}
-          onClick={onRemove}
-          className="ml-2"
-        >
-          {__("Remove")}
-        </Button>
-      </div>
-
-      {isExpanded && (
-        <div className="border-t border-border-low">
-          <Controller
-            control={control}
-            name={name as Path<T>}
-            render={({ field }) => {
-              const selectedControls: ControlSelection[] = (Array.isArray(field.value) ? field.value : []) as ControlSelection[];
-              const selectedControlIds = new Set(
-                selectedControls.map((c: ControlSelection) => c.controlId)
-              );
-
-              const toggleControl = (controlId: string) => {
-                const isSelected = selectedControlIds.has(controlId);
-                if (isSelected) {
-                  field.onChange(
-                    selectedControls.filter((c: ControlSelection) => c.controlId !== controlId)
-                  );
-                } else {
-                  field.onChange([
-                    ...selectedControls,
-                    {
-                      controlId,
-                      state: "IMPLEMENTED" as const,
-                      exclusionJustification: undefined,
-                    },
-                  ]);
-                }
-              };
-
-              const updateControlState = (
-                controlId: string,
-                state: "EXCLUDED" | "IMPLEMENTED" | "NOT_IMPLEMENTED"
-              ) => {
-                field.onChange(
-                  selectedControls.map((c: ControlSelection) =>
-                    c.controlId === controlId ? { ...c, state } : c
-                  )
-                );
-              };
-
-              const updateJustification = (
-                controlId: string,
-                exclusionJustification: string
-              ) => {
-                field.onChange(
-                  selectedControls.map((c: ControlSelection) =>
-                    c.controlId === controlId
-                      ? { ...c, exclusionJustification }
-                      : c
-                  )
-                );
-              };
-
-              const getControlState = (controlId: string) => {
-                const selected = selectedControls.find((c: ControlSelection) => c.controlId === controlId);
-                return selected?.state || "IMPLEMENTED";
-              };
-
-              const getExclusionJustification = (controlId: string) => {
-                const selected = selectedControls.find((c: ControlSelection) => c.controlId === controlId);
-                return selected?.exclusionJustification || "";
-              };
-
-              const selectAll = () => {
-                const newSelectedControls: ControlSelection[] = [...selectedControls];
-                displayControls.forEach((ctrl) => {
-                  if (!selectedControlIds.has(ctrl.id)) {
-                    newSelectedControls.push({
-                      controlId: ctrl.id,
-                      state: "IMPLEMENTED" as const,
-                      exclusionJustification: undefined,
-                    });
-                  }
+    useEffect(() => {
+        if (framework && !frameworkDataMap.has(frameworkId)) {
+            setFrameworkDataMap((prev) => {
+                const newMap = new Map(prev);
+                newMap.set(frameworkId, {
+                    id: frameworkId,
+                    name: frameworkName,
+                    controls,
                 });
-                field.onChange(newSelectedControls);
-              };
+                return newMap;
+            });
+        }
+    }, [
+        framework,
+        frameworkId,
+        frameworkName,
+        controls,
+        frameworkDataMap,
+        setFrameworkDataMap,
+    ]);
 
-              const deselectAll = () => {
-                const controlIdsToRemove = new Set(displayControls.map((ctrl) => ctrl.id));
-                const newSelectedControls = selectedControls.filter(
-                  (c: ControlSelection) => !controlIdsToRemove.has(c.controlId)
-                );
-                field.onChange(newSelectedControls);
-              };
+    const cachedData = frameworkDataMap.get(frameworkId);
+    const displayName: string = cachedData?.name || frameworkName;
+    const displayControls: Array<{
+        id: string;
+        sectionTitle: string;
+        name: string;
+    }> = cachedData?.controls || controls;
 
-              const allSelected = displayControls.length > 0 && displayControls.every((ctrl) => selectedControlIds.has(ctrl.id));
-
-              return (
-                <div className="p-4 space-y-4">
-                  {displayControls.length > 0 && (
-                    <div className="flex justify-end">
-                      <Button
-                        type="button"
-                        variant="quaternary"
-                        onClick={allSelected ? deselectAll : selectAll}
-                        className="text-xs h-7 min-h-7"
-                      >
-                        {allSelected ? __("Deselect All") : __("Select All")}
-                      </Button>
-                    </div>
-                  )}
-                  <div className="border border-border-low rounded-lg max-h-96 overflow-y-auto">
-                    {displayControls.length === 0 ? (
-                      <div className="p-4 text-center text-txt-tertiary">
-                        {__("No controls found in this framework")}
-                      </div>
+    return (
+        <div className="border border-border-low rounded-lg">
+            <div className="flex items-center justify-between p-4">
+                <button
+                    type="button"
+                    onClick={onToggle}
+                    className="flex items-center gap-2 flex-1 text-left hover:bg-subtle -m-4 p-4 rounded-lg"
+                >
+                    {isExpanded ? (
+                        <IconChevronUp
+                            size={16}
+                            className="text-txt-tertiary"
+                        />
                     ) : (
-                      <div className="divide-y divide-border-low">
-                        {displayControls.map((ctrl) => {
-                          const isSelected = selectedControlIds.has(ctrl.id);
-                          const state = getControlState(ctrl.id);
-                          const exclusionJustification = getExclusionJustification(
-                            ctrl.id
-                          );
-
-                          return (
-                            <div key={ctrl.id} className="p-4 space-y-3">
-                              <div className="flex items-start gap-3">
-                                <Checkbox
-                                  checked={isSelected}
-                                  onChange={() => toggleControl(ctrl.id)}
-                                />
-                                <div className="flex-1 min-w-0">
-                                  <div className="font-medium">
-                                    {ctrl.sectionTitle}: {ctrl.name}
-                                  </div>
-                                </div>
-                              </div>
-
-                              {isSelected && (
-                                <div className="ml-7 space-y-2">
-                                  <Field label={__("State")}>
-                                    <Select
-                                      variant="editor"
-                                      value={state}
-                                      onValueChange={(value) =>
-                                        updateControlState(
-                                          ctrl.id,
-                                          value as
-                                            | "EXCLUDED"
-                                            | "IMPLEMENTED"
-                                            | "NOT_IMPLEMENTED"
-                                        )
-                                      }
-                                      className="w-full"
-                                    >
-                                      <Option value="IMPLEMENTED">
-                                        {__("Implemented")}
-                                      </Option>
-                                      <Option value="NOT_IMPLEMENTED">
-                                        {__("Not Implemented")}
-                                      </Option>
-                                      <Option value="EXCLUDED">
-                                        {__("Excluded")}
-                                      </Option>
-                                    </Select>
-                                  </Field>
-
-                                  {state === "EXCLUDED" || state === "NOT_IMPLEMENTED" && (
-                                    <Field label={__("Justification")}>
-                                      <Textarea
-                                        value={exclusionJustification}
-                                        onChange={(e) =>
-                                          updateJustification(
-                                            ctrl.id,
-                                            e.target.value
-                                          )
-                                        }
-                                        placeholder={__(
-                                          "Reason for exclusion"
-                                        )}
-                                        autogrow
-                                      />
-                                    </Field>
-                                  )}
-                                </div>
-                              )}
-                            </div>
-                          );
-                        })}
-                      </div>
+                        <IconChevronDown
+                            size={16}
+                            className="text-txt-tertiary"
+                        />
                     )}
-                  </div>
+                    <span className="font-medium text-txt-primary">
+                        {displayName}
+                    </span>
+                    <span className="text-sm text-txt-tertiary">
+                        ({displayControls.length} {__("controls")})
+                    </span>
+                </button>
+                <Button
+                    type="button"
+                    variant="secondary"
+                    icon={IconTrashCan}
+                    onClick={onRemove}
+                    className="ml-2"
+                >
+                    {__("Remove")}
+                </Button>
+            </div>
+
+            {isExpanded && (
+                <div className="border-t border-border-low">
+                    <Controller
+                        control={control}
+                        name={name as Path<T>}
+                        render={({ field }) => {
+                            const selectedControls: ControlSelection[] = (
+                                Array.isArray(field.value) ? field.value : []
+                            ) as ControlSelection[];
+                            const selectedControlIds = new Set(
+                                selectedControls.map(
+                                    (c: ControlSelection) => c.controlId,
+                                ),
+                            );
+
+                            const toggleControl = (controlId: string) => {
+                                const isSelected =
+                                    selectedControlIds.has(controlId);
+                                if (isSelected) {
+                                    field.onChange(
+                                        selectedControls.filter(
+                                            (c: ControlSelection) =>
+                                                c.controlId !== controlId,
+                                        ),
+                                    );
+                                } else {
+                                    field.onChange([
+                                        ...selectedControls,
+                                        {
+                                            controlId,
+                                            state: "IMPLEMENTED" as const,
+                                            exclusionJustification: undefined,
+                                        },
+                                    ]);
+                                }
+                            };
+
+                            const updateControlState = (
+                                controlId: string,
+                                state:
+                                    | "EXCLUDED"
+                                    | "IMPLEMENTED"
+                                    | "NOT_IMPLEMENTED",
+                            ) => {
+                                field.onChange(
+                                    selectedControls.map(
+                                        (c: ControlSelection) =>
+                                            c.controlId === controlId
+                                                ? { ...c, state }
+                                                : c,
+                                    ),
+                                );
+                            };
+
+                            const updateJustification = (
+                                controlId: string,
+                                exclusionJustification: string,
+                            ) => {
+                                field.onChange(
+                                    selectedControls.map(
+                                        (c: ControlSelection) =>
+                                            c.controlId === controlId
+                                                ? {
+                                                      ...c,
+                                                      exclusionJustification,
+                                                  }
+                                                : c,
+                                    ),
+                                );
+                            };
+
+                            const getControlState = (controlId: string) => {
+                                const selected = selectedControls.find(
+                                    (c: ControlSelection) =>
+                                        c.controlId === controlId,
+                                );
+                                return selected?.state || "IMPLEMENTED";
+                            };
+
+                            const getExclusionJustification = (
+                                controlId: string,
+                            ) => {
+                                const selected = selectedControls.find(
+                                    (c: ControlSelection) =>
+                                        c.controlId === controlId,
+                                );
+                                return selected?.exclusionJustification || "";
+                            };
+
+                            const selectAll = () => {
+                                const newSelectedControls: ControlSelection[] =
+                                    [...selectedControls];
+                                displayControls.forEach((ctrl) => {
+                                    if (!selectedControlIds.has(ctrl.id)) {
+                                        newSelectedControls.push({
+                                            controlId: ctrl.id,
+                                            state: "IMPLEMENTED" as const,
+                                            exclusionJustification: undefined,
+                                        });
+                                    }
+                                });
+                                field.onChange(newSelectedControls);
+                            };
+
+                            const deselectAll = () => {
+                                const controlIdsToRemove = new Set(
+                                    displayControls.map((ctrl) => ctrl.id),
+                                );
+                                const newSelectedControls =
+                                    selectedControls.filter(
+                                        (c: ControlSelection) =>
+                                            !controlIdsToRemove.has(
+                                                c.controlId,
+                                            ),
+                                    );
+                                field.onChange(newSelectedControls);
+                            };
+
+                            const allSelected =
+                                displayControls.length > 0 &&
+                                displayControls.every((ctrl) =>
+                                    selectedControlIds.has(ctrl.id),
+                                );
+
+                            return (
+                                <div className="p-4 space-y-4">
+                                    {displayControls.length > 0 && (
+                                        <div className="flex justify-end">
+                                            <Button
+                                                type="button"
+                                                variant="quaternary"
+                                                onClick={
+                                                    allSelected
+                                                        ? deselectAll
+                                                        : selectAll
+                                                }
+                                                className="text-xs h-7 min-h-7"
+                                            >
+                                                {allSelected
+                                                    ? __("Deselect All")
+                                                    : __("Select All")}
+                                            </Button>
+                                        </div>
+                                    )}
+                                    <div className="border border-border-low rounded-lg max-h-96 overflow-y-auto">
+                                        {displayControls.length === 0 ? (
+                                            <div className="p-4 text-center text-txt-tertiary">
+                                                {__(
+                                                    "No controls found in this framework",
+                                                )}
+                                            </div>
+                                        ) : (
+                                            <div className="divide-y divide-border-low">
+                                                {displayControls.map((ctrl) => {
+                                                    const isSelected =
+                                                        selectedControlIds.has(
+                                                            ctrl.id,
+                                                        );
+                                                    const state =
+                                                        getControlState(
+                                                            ctrl.id,
+                                                        );
+                                                    const exclusionJustification =
+                                                        getExclusionJustification(
+                                                            ctrl.id,
+                                                        );
+
+                                                    return (
+                                                        <div
+                                                            key={ctrl.id}
+                                                            className="p-4 space-y-3"
+                                                        >
+                                                            <div className="flex items-start gap-3">
+                                                                <Checkbox
+                                                                    checked={
+                                                                        isSelected
+                                                                    }
+                                                                    onChange={() =>
+                                                                        toggleControl(
+                                                                            ctrl.id,
+                                                                        )
+                                                                    }
+                                                                />
+                                                                <div className="flex-1 min-w-0">
+                                                                    <div className="font-medium">
+                                                                        {
+                                                                            ctrl.sectionTitle
+                                                                        }
+                                                                        :{" "}
+                                                                        {
+                                                                            ctrl.name
+                                                                        }
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+
+                                                            {isSelected && (
+                                                                <div className="ml-7 space-y-2">
+                                                                    <Field
+                                                                        label={__(
+                                                                            "State",
+                                                                        )}
+                                                                    >
+                                                                        <Select
+                                                                            variant="editor"
+                                                                            value={
+                                                                                state
+                                                                            }
+                                                                            onValueChange={(
+                                                                                value,
+                                                                            ) =>
+                                                                                updateControlState(
+                                                                                    ctrl.id,
+                                                                                    value as
+                                                                                        | "EXCLUDED"
+                                                                                        | "IMPLEMENTED"
+                                                                                        | "NOT_IMPLEMENTED",
+                                                                                )
+                                                                            }
+                                                                            className="w-full"
+                                                                        >
+                                                                            <Option value="IMPLEMENTED">
+                                                                                {__(
+                                                                                    "Implemented",
+                                                                                )}
+                                                                            </Option>
+                                                                            <Option value="NOT_IMPLEMENTED">
+                                                                                {__(
+                                                                                    "Not Implemented",
+                                                                                )}
+                                                                            </Option>
+                                                                            <Option value="EXCLUDED">
+                                                                                {__(
+                                                                                    "Excluded",
+                                                                                )}
+                                                                            </Option>
+                                                                        </Select>
+                                                                    </Field>
+
+                                                                    {state ===
+                                                                        "EXCLUDED" ||
+                                                                        (state ===
+                                                                            "NOT_IMPLEMENTED" && (
+                                                                            <Field
+                                                                                label={__(
+                                                                                    "Justification",
+                                                                                )}
+                                                                            >
+                                                                                <Textarea
+                                                                                    value={
+                                                                                        exclusionJustification
+                                                                                    }
+                                                                                    onChange={(
+                                                                                        e,
+                                                                                    ) =>
+                                                                                        updateJustification(
+                                                                                            ctrl.id,
+                                                                                            e
+                                                                                                .target
+                                                                                                .value,
+                                                                                        )
+                                                                                    }
+                                                                                    placeholder={__(
+                                                                                        "Reason for exclusion",
+                                                                                    )}
+                                                                                    autogrow
+                                                                                />
+                                                                            </Field>
+                                                                        ))}
+                                                                </div>
+                                                            )}
+                                                        </div>
+                                                    );
+                                                })}
+                                            </div>
+                                        )}
+                                    </div>
+                                </div>
+                            );
+                        }}
+                    />
                 </div>
-              );
-            }}
-          />
+            )}
         </div>
-      )}
-    </div>
-  );
+    );
 }
diff --git a/apps/console/src/components/measures/LinkedMeasuresCard.tsx b/apps/console/src/components/measures/LinkedMeasuresCard.tsx
index d9c74dddb..1b2a27ed9 100644
--- a/apps/console/src/components/measures/LinkedMeasuresCard.tsx
+++ b/apps/console/src/components/measures/LinkedMeasuresCard.tsx
@@ -10,13 +10,12 @@ import {
   Tbody,
   Th,
   IconChevronDown,
-
   IconTrashCan,
   TrButton,
 } from "@probo/ui";
 import { MeasureBadge } from "@probo/ui/src/Molecules/Badge/MeasureBadge";
 import { useTranslate } from "@probo/i18n";
-import type { LinkedMeasuresCardFragment$key } from "./__generated__/LinkedMeasuresCardFragment.graphql";
+import type { LinkedMeasuresCardFragment$key } from "/__generated__/core/LinkedMeasuresCardFragment.graphql";
 import { useFragment } from "react-relay";
 import { useMemo, useState } from "react";
 import { sprintf } from "@probo/helpers";
@@ -64,7 +63,7 @@ type Props<Params> = {
 export function LinkedMeasuresCard<Params>(props: Props<Params>) {
   const { __ } = useTranslate();
   const [limit, setLimit] = useState<number | null>(
-    props.variant === "card" ? 4 : null
+    props.variant === "card" ? 4 : null,
   );
   const measures = useMemo(() => {
     return limit ? props.measures.slice(0, limit) : props.measures;
@@ -129,13 +128,21 @@ export function LinkedMeasuresCard<Params>(props: Props<Params>) {
         <Tbody>
           {measures.length === 0 && (
             <Tr>
-              <Td colSpan={props.readOnly ? 2 : 3} className="text-center text-txt-secondary">
+              <Td
+                colSpan={props.readOnly ? 2 : 3}
+                className="text-center text-txt-secondary"
+              >
                 {__("No measures linked")}
               </Td>
             </Tr>
           )}
           {measures.map((measure) => (
-            <MeasureRow key={measure.id} measure={measure} onClick={onDetach} readOnly={props.readOnly} />
+            <MeasureRow
+              key={measure.id}
+              measure={measure}
+              onClick={onDetach}
+              readOnly={props.readOnly}
+            />
           ))}
           {variant === "table" && !props.readOnly && (
             <LinkedMeasureDialog
diff --git a/apps/console/src/components/obligations/LinkedObligationsCard.tsx b/apps/console/src/components/obligations/LinkedObligationsCard.tsx
index fc0da525f..ad7badba8 100644
--- a/apps/console/src/components/obligations/LinkedObligationsCard.tsx
+++ b/apps/console/src/components/obligations/LinkedObligationsCard.tsx
@@ -15,10 +15,14 @@ import {
   Badge,
 } from "@probo/ui";
 import { useTranslate } from "@probo/i18n";
-import type { LinkedObligationsCardFragment$key } from "./__generated__/LinkedObligationsCardFragment.graphql";
+import type { LinkedObligationsCardFragment$key } from "/__generated__/core/LinkedObligationsCardFragment.graphql";
 import { useFragment } from "react-relay";
 import { useMemo, useState } from "react";
-import { sprintf, getObligationStatusVariant, getObligationStatusLabel } from "@probo/helpers";
+import {
+  sprintf,
+  getObligationStatusVariant,
+  getObligationStatusLabel,
+} from "@probo/helpers";
 import { LinkedObligationDialog } from "./LinkedObligationsDialog";
 import clsx from "clsx";
 import { useParams } from "react-router";
@@ -62,7 +66,7 @@ type Props<Params> = {
 export function LinkedObligationsCard<Params>(props: Props<Params>) {
   const { __ } = useTranslate();
   const [limit, setLimit] = useState<number | null>(
-    props.variant === "card" ? 4 : null
+    props.variant === "card" ? 4 : null,
   );
 
   const onAttach = (obligationId: string) => {
@@ -131,13 +135,21 @@ export function LinkedObligationsCard<Params>(props: Props<Params>) {
         <Tbody>
           {obligations.length === 0 && (
             <Tr>
-              <Td colSpan={props.readOnly ? 4 : 5} className="text-center text-txt-secondary">
+              <Td
+                colSpan={props.readOnly ? 4 : 5}
+                className="text-center text-txt-secondary"
+              >
                 {__("No obligations linked")}
               </Td>
             </Tr>
           )}
           {obligations.map((obligation) => (
-            <ObligationRow key={obligation.id} obligation={obligation} onClick={onDetach} readOnly={props.readOnly} />
+            <ObligationRow
+              key={obligation.id}
+              obligation={obligation}
+              onClick={onDetach}
+              readOnly={props.readOnly}
+            />
           ))}
           {variant === "table" && !props.readOnly && (
             <LinkedObligationDialog
@@ -189,27 +201,17 @@ function ObligationRow(props: {
 
   return (
     <Tr to={detailsUrl}>
-      <Td>
-        {obligation.area || __("No area specified")}
-      </Td>
-      <Td>
-        {obligation.source || __("No source specified")}
-      </Td>
+      <Td>{obligation.area || __("No area specified")}</Td>
+      <Td>{obligation.source || __("No source specified")}</Td>
       <Td>
         <Badge variant={getObligationStatusVariant(obligation.status)}>
           {getObligationStatusLabel(obligation.status)}
         </Badge>
       </Td>
-      <Td>
-        {obligation.owner?.fullName || __("Unassigned")}
-      </Td>
+      <Td>{obligation.owner?.fullName || __("Unassigned")}</Td>
       {!props.readOnly && (
         <Td noLink width={50} className="text-end">
-          <Button
-            variant="secondary"
-            icon={IconTrashCan}
-            onClick={onDetach}
-          >
+          <Button variant="secondary" icon={IconTrashCan} onClick={onDetach}>
             {__("Unlink")}
           </Button>
         </Td>
diff --git a/apps/console/src/components/obligations/LinkedObligationsDialog.tsx b/apps/console/src/components/obligations/LinkedObligationsDialog.tsx
index 75f216807..84588df98 100644
--- a/apps/console/src/components/obligations/LinkedObligationsDialog.tsx
+++ b/apps/console/src/components/obligations/LinkedObligationsDialog.tsx
@@ -12,17 +12,20 @@ import {
   Badge,
 } from "@probo/ui";
 import { useTranslate } from "@probo/i18n";
-import { getObligationStatusVariant, getObligationStatusLabel } from "@probo/helpers";
+import {
+  getObligationStatusVariant,
+  getObligationStatusLabel,
+} from "@probo/helpers";
 import { Suspense, useMemo, useState, type ReactNode } from "react";
 import { graphql } from "relay-runtime";
 import { useLazyLoadQuery, usePaginationFragment } from "react-relay";
-import type { LinkedObligationsDialogQuery } from "./__generated__/LinkedObligationsDialogQuery.graphql";
+import type { LinkedObligationsDialogQuery } from "/__generated__/core/LinkedObligationsDialogQuery.graphql";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import type { NodeOf } from "/types";
 import type {
   LinkedObligationsDialogFragment$data,
   LinkedObligationsDialogFragment$key,
-} from "./__generated__/LinkedObligationsDialogFragment.graphql";
+} from "/__generated__/core/LinkedObligationsDialogFragment.graphql";
 
 const obligationsQuery = graphql`
   query LinkedObligationsDialogQuery($organizationId: ID!) {
@@ -94,25 +97,35 @@ export function LinkedObligationDialog({ children, ...props }: Props) {
 
 function LinkedObligationsDialogContent(props: Omit<Props, "children">) {
   const organizationId = useOrganizationId();
-  const query = useLazyLoadQuery<LinkedObligationsDialogQuery>(obligationsQuery, {
-    organizationId,
-  }, { fetchPolicy: "network-only" });
+  const query = useLazyLoadQuery<LinkedObligationsDialogQuery>(
+    obligationsQuery,
+    {
+      organizationId,
+    },
+    { fetchPolicy: "network-only" },
+  );
   const { data, loadNext, hasNext, isLoadingNext } = usePaginationFragment(
     obligationsFragment,
-    query.organization as LinkedObligationsDialogFragment$key
+    query.organization as LinkedObligationsDialogFragment$key,
   );
   const { __ } = useTranslate();
   const [search, setSearch] = useState("");
-  const obligations = useMemo(() => data.obligations?.edges?.map((edge) => edge.node) ?? [], [data.obligations]);
+  const obligations = useMemo(
+    () => data.obligations?.edges?.map((edge) => edge.node) ?? [],
+    [data.obligations],
+  );
   const linkedIds = useMemo(() => {
     return new Set(props.linkedObligations?.map((o) => o.id) ?? []);
   }, [props.linkedObligations]);
 
   const filteredObligations = useMemo(() => {
-    return obligations.filter((obligation) =>
-      obligation.area?.toLowerCase().includes(search.toLowerCase()) ||
-      obligation.source?.toLowerCase().includes(search.toLowerCase()) ||
-      obligation.owner?.fullName?.toLowerCase().includes(search.toLowerCase())
+    return obligations.filter(
+      (obligation) =>
+        obligation.area?.toLowerCase().includes(search.toLowerCase()) ||
+        obligation.source?.toLowerCase().includes(search.toLowerCase()) ||
+        obligation.owner?.fullName
+          ?.toLowerCase()
+          .includes(search.toLowerCase()),
     );
   }, [obligations, search]);
 
diff --git a/apps/console/src/components/organizations/SlackConnection.tsx b/apps/console/src/components/organizations/SlackConnection.tsx
index 912ebf1e3..a572714b0 100644
--- a/apps/console/src/components/organizations/SlackConnection.tsx
+++ b/apps/console/src/components/organizations/SlackConnection.tsx
@@ -1,16 +1,21 @@
 import { Badge, Button, Card } from "@probo/ui";
 import { useTranslate } from "@probo/i18n";
 import { sprintf } from "@probo/helpers";
-import type { TrustCenterGraphQuery$data } from "/hooks/graph/__generated__/TrustCenterGraphQuery.graphql";
+import type { TrustCenterGraphQuery$data } from "/__generated__/core/TrustCenterGraphQuery.graphql";
 import { use } from "react";
 import { PermissionsContext } from "/providers/PermissionsContext";
 
 type Props = {
   organizationId: string;
-  slackConnections: NonNullable<TrustCenterGraphQuery$data["organization"]["slackConnections"]>["edges"][number]["node"][];
+  slackConnections: NonNullable<
+    TrustCenterGraphQuery$data["organization"]["slackConnections"]
+  >["edges"][number]["node"][];
 };
 
-export function SlackConnections({ organizationId, slackConnections: connectedSlackConnections }: Props) {
+export function SlackConnections({
+  organizationId,
+  slackConnections: connectedSlackConnections,
+}: Props) {
   const { __, dateTimeFormat } = useTranslate();
   const { isAuthorized } = use(PermissionsContext);
   const slackConnectionDefinitions = [
@@ -46,7 +51,11 @@ export function SlackConnections({ organizationId, slackConnections: connectedSl
   return (
     <div className="space-y-2">
       {slackConnections.map((slackConnection) => (
-        <Card key={slackConnection.id} padded className="flex items-center gap-3">
+        <Card
+          key={slackConnection.id}
+          padded
+          className="flex items-center gap-3"
+        >
           <div>
             <img src={`/${slackConnection.id.toLowerCase()}.png`} alt="" />
           </div>
@@ -57,7 +66,7 @@ export function SlackConnections({ organizationId, slackConnections: connectedSl
                 <>
                   {sprintf(
                     __("Connected on %s"),
-                    dateTimeFormat(slackConnection.createdAt)
+                    dateTimeFormat(slackConnection.createdAt),
                   )}
                   {slackConnection.channel && (
                     <>
diff --git a/apps/console/src/components/risks/LinkedRisksCard.tsx b/apps/console/src/components/risks/LinkedRisksCard.tsx
index d2c3a76a5..a4b1dfd8f 100644
--- a/apps/console/src/components/risks/LinkedRisksCard.tsx
+++ b/apps/console/src/components/risks/LinkedRisksCard.tsx
@@ -12,7 +12,7 @@ import {
   TrButton,
 } from "@probo/ui";
 import { useTranslate } from "@probo/i18n";
-import type { LinkedRisksCardFragment$key } from "./__generated__/LinkedRisksCardFragment.graphql";
+import type { LinkedRisksCardFragment$key } from "/__generated__/core/LinkedRisksCardFragment.graphql";
 import { useFragment } from "react-relay";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import { LinkedRisksDialog } from "./LinkedRisksDialog.tsx";
@@ -95,13 +95,21 @@ export function LinkedRisksCard<Params>(props: Props<Params>) {
         <Tbody>
           {props.risks.length === 0 && (
             <Tr>
-              <Td colSpan={props.readOnly ? 3 : 4} className="text-center text-txt-secondary">
+              <Td
+                colSpan={props.readOnly ? 3 : 4}
+                className="text-center text-txt-secondary"
+              >
                 {__("No risks linked")}
               </Td>
             </Tr>
           )}
           {props.risks.map((risk) => (
-            <RiskRow key={risk.id} risk={risk} onClick={onDetach} readOnly={props.readOnly} />
+            <RiskRow
+              key={risk.id}
+              risk={risk}
+              onClick={onDetach}
+              readOnly={props.readOnly}
+            />
           ))}
           {!props.readOnly && (
             <LinkedRisksDialog
diff --git a/apps/console/src/components/risks/LinkedRisksDialog.tsx b/apps/console/src/components/risks/LinkedRisksDialog.tsx
index 93c90dae3..a9a299a78 100644
--- a/apps/console/src/components/risks/LinkedRisksDialog.tsx
+++ b/apps/console/src/components/risks/LinkedRisksDialog.tsx
@@ -16,7 +16,7 @@ import { useTranslate } from "@probo/i18n";
 import { Suspense, useMemo, useState, type ReactNode } from "react";
 import { graphql } from "relay-runtime";
 import { useLazyLoadQuery } from "react-relay";
-import type { LinkedRisksDialogQuery } from "./__generated__/LinkedRisksDialogQuery.graphql";
+import type { LinkedRisksDialogQuery } from "/__generated__/core/LinkedRisksDialogQuery.graphql";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 
 const risksQuery = graphql`
@@ -73,7 +73,10 @@ function LinkedRisksDialogContent(props: Omit<Props, "children">) {
   const { __ } = useTranslate();
   const [search, setSearch] = useState("");
   const [category, setCategory] = useState<string | null>(null);
-  const risks = useMemo(() => data.organization?.risks?.edges?.map((edge) => edge.node) ?? [], [data.organization?.risks]);
+  const risks = useMemo(
+    () => data.organization?.risks?.edges?.map((edge) => edge.node) ?? [],
+    [data.organization?.risks],
+  );
   const linkedIds = useMemo(() => {
     return new Set(props.linkedRisks?.map((r) => r.id) ?? []);
   }, [props.linkedRisks]);
@@ -83,13 +86,13 @@ function LinkedRisksDialogContent(props: Omit<Props, "children">) {
       (risk) =>
         (category === null || risk.category === category) &&
         (risk.name.toLowerCase().includes(search.toLowerCase()) ||
-          risk.description?.toLowerCase().includes(search.toLowerCase()))
+          risk.description?.toLowerCase().includes(search.toLowerCase())),
     );
   }, [risks, search, category]);
 
   const categories = useMemo(
     () => Array.from(new Set(risks.map((r) => r.category))),
-    [risks]
+    [risks],
   );
 
   return (
diff --git a/apps/console/src/components/snapshots/LinkedSnapshotsCard.tsx b/apps/console/src/components/snapshots/LinkedSnapshotsCard.tsx
index 55f7f0b57..a795031ba 100644
--- a/apps/console/src/components/snapshots/LinkedSnapshotsCard.tsx
+++ b/apps/console/src/components/snapshots/LinkedSnapshotsCard.tsx
@@ -15,10 +15,15 @@ import {
   TrButton,
 } from "@probo/ui";
 import { useTranslate } from "@probo/i18n";
-import type { LinkedSnapshotsCardFragment$key } from "./__generated__/LinkedSnapshotsCardFragment.graphql";
+import type { LinkedSnapshotsCardFragment$key } from "/__generated__/core/LinkedSnapshotsCardFragment.graphql";
 import { useFragment } from "react-relay";
 import { useMemo, useState } from "react";
-import { sprintf, getSnapshotTypeLabel, getSnapshotTypeUrlPath, formatDate } from "@probo/helpers";
+import {
+  sprintf,
+  getSnapshotTypeLabel,
+  getSnapshotTypeUrlPath,
+  formatDate,
+} from "@probo/helpers";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import { LinkedSnapshotsDialog } from "./LinkedSnapshotsDialog";
 import clsx from "clsx";
@@ -123,7 +128,10 @@ export function LinkedSnapshotsCard<Params>(props: Props<Params>) {
         <Tbody>
           {snapshots.length === 0 && (
             <Tr>
-              <Td colSpan={variant === "table" ? colSpanTable : colSpanCard} className="text-center text-txt-secondary">
+              <Td
+                colSpan={variant === "table" ? colSpanTable : colSpanCard}
+                className="text-center text-txt-secondary"
+              >
                 {__("No snapshots linked")}
               </Td>
             </Tr>
@@ -191,9 +199,7 @@ function SnapshotRow(props: {
           {snapshot.description || __("No description")}
         </Td>
       )}
-      <Td className="text-txt-tertiary">
-        {formatDate(snapshot.createdAt)}
-      </Td>
+      <Td className="text-txt-tertiary">{formatDate(snapshot.createdAt)}</Td>
       {!props.readOnly && (
         <Td noLink width={50} className="text-end">
           <Button
diff --git a/apps/console/src/components/snapshots/LinkedSnapshotsDialog.tsx b/apps/console/src/components/snapshots/LinkedSnapshotsDialog.tsx
index 66d8bf89d..68e266e29 100644
--- a/apps/console/src/components/snapshots/LinkedSnapshotsDialog.tsx
+++ b/apps/console/src/components/snapshots/LinkedSnapshotsDialog.tsx
@@ -16,13 +16,13 @@ import { getSnapshotTypeLabel, formatDate } from "@probo/helpers";
 import { Suspense, useMemo, useState, type ReactNode } from "react";
 import { graphql } from "relay-runtime";
 import { useLazyLoadQuery, usePaginationFragment } from "react-relay";
-import type { LinkedSnapshotsDialogQuery } from "./__generated__/LinkedSnapshotsDialogQuery.graphql";
+import type { LinkedSnapshotsDialogQuery } from "/__generated__/core/LinkedSnapshotsDialogQuery.graphql";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import type { NodeOf } from "/types";
 import type {
   LinkedSnapshotsDialogFragment$data,
   LinkedSnapshotsDialogFragment$key,
-} from "./__generated__/LinkedSnapshotsDialogFragment.graphql";
+} from "/__generated__/core/LinkedSnapshotsDialogFragment.graphql";
 
 const snapshotsQuery = graphql`
   query LinkedSnapshotsDialogQuery($organizationId: ID!) {
@@ -95,21 +95,22 @@ function LinkedSnapshotsDialogContent(props: Omit<Props, "children">) {
   });
   const { data, loadNext, hasNext, isLoadingNext } = usePaginationFragment<
     LinkedSnapshotsDialogQuery,
-    LinkedSnapshotsDialogFragment$key>(
-    snapshotsFragment,
-    query.organization
-  );
+    LinkedSnapshotsDialogFragment$key
+  >(snapshotsFragment, query.organization);
 
   const { __ } = useTranslate();
   const [search, setSearch] = useState("");
-  const snapshots = useMemo(() => data.snapshots?.edges?.map((edge) => edge.node) ?? [], [data.snapshots]);
+  const snapshots = useMemo(
+    () => data.snapshots?.edges?.map((edge) => edge.node) ?? [],
+    [data.snapshots],
+  );
   const linkedIds = useMemo(() => {
     return new Set(props.linkedSnapshots?.map((s) => s.id) ?? []);
   }, [props.linkedSnapshots]);
 
   const filteredSnapshots = useMemo(() => {
     return snapshots.filter((snapshot) =>
-      snapshot.name.toLowerCase().includes(search.toLowerCase())
+      snapshot.name.toLowerCase().includes(search.toLowerCase()),
     );
   }, [snapshots, search]);
 
diff --git a/apps/console/src/components/states-of-applicability/LinkedStatesOfApplicabilityCard.tsx b/apps/console/src/components/states-of-applicability/LinkedStatesOfApplicabilityCard.tsx
index e4cf6f14d..e40042fe9 100644
--- a/apps/console/src/components/states-of-applicability/LinkedStatesOfApplicabilityCard.tsx
+++ b/apps/console/src/components/states-of-applicability/LinkedStatesOfApplicabilityCard.tsx
@@ -1,21 +1,21 @@
 import { graphql } from "relay-runtime";
 import {
-  Card,
-  IconPlusLarge,
-  Button,
-  Tr,
-  Td,
-  Table,
-  Thead,
-  Tbody,
-  Th,
-  IconChevronDown,
-  IconTrashCan,
-  TrButton,
-  Badge,
+    Card,
+    IconPlusLarge,
+    Button,
+    Tr,
+    Td,
+    Table,
+    Thead,
+    Tbody,
+    Th,
+    IconChevronDown,
+    IconTrashCan,
+    TrButton,
+    Badge,
 } from "@probo/ui";
 import { useTranslate } from "@probo/i18n";
-import type { LinkedStatesOfApplicabilityCardFragment$key } from "./__generated__/LinkedStatesOfApplicabilityCardFragment.graphql";
+import type { LinkedStatesOfApplicabilityCardFragment$key } from "/__generated__/core/LinkedStatesOfApplicabilityCardFragment.graphql";
 import { useFragment } from "react-relay";
 import { useMemo, useState, useEffect } from "react";
 import { sprintf } from "@probo/helpers";
@@ -24,225 +24,271 @@ import { LinkedStatesOfApplicabilityDialog } from "./LinkedStatesOfApplicability
 import clsx from "clsx";
 
 const linkedStateOfApplicabilityFragment = graphql`
-  fragment LinkedStatesOfApplicabilityCardFragment on StateOfApplicabilityControl {
-    id
-    stateOfApplicabilityId
-    controlId
-    stateOfApplicability {
-      id
-      name
+    fragment LinkedStatesOfApplicabilityCardFragment on StateOfApplicabilityControl {
+        id
+        stateOfApplicabilityId
+        controlId
+        stateOfApplicability {
+            id
+            name
+        }
+        applicability
+        justification
     }
-    applicability
-    justification
-  }
 `;
 
 type AttachMutation<Params> = (p: {
-  variables: {
-    input: {
-      stateOfApplicabilityId: string;
-      applicability: boolean;
-      justification: string | null;
-    } & Params;
-    connections: string[];
-  };
+    variables: {
+        input: {
+            stateOfApplicabilityId: string;
+            applicability: boolean;
+            justification: string | null;
+        } & Params;
+        connections: string[];
+    };
 }) => void;
 
 type DetachMutation = (p: {
-  variables: {
-    input: {
-      stateOfApplicabilityId: string;
-      controlId: string;
+    variables: {
+        input: {
+            stateOfApplicabilityId: string;
+            controlId: string;
+        };
+        connections: string[];
     };
-    connections: string[];
-  };
 }) => void;
 
 type Props<Params> = {
-  statesOfApplicability: readonly (LinkedStatesOfApplicabilityCardFragment$key & { id: string })[];
-  params: Params;
-  disabled?: boolean;
-  connectionId: string;
-  onAttach: AttachMutation<Params>;
-  onDetach: DetachMutation;
-  variant?: "card" | "table";
-  readOnly?: boolean;
+    statesOfApplicability: readonly (LinkedStatesOfApplicabilityCardFragment$key & {
+        id: string;
+    })[];
+    params: Params;
+    disabled?: boolean;
+    connectionId: string;
+    onAttach: AttachMutation<Params>;
+    onDetach: DetachMutation;
+    variant?: "card" | "table";
+    readOnly?: boolean;
 };
 
 export function LinkedStatesOfApplicabilityCard<Params>(props: Props<Params>) {
-  const { __ } = useTranslate();
+    const { __ } = useTranslate();
 
-  const [limit, setLimit] = useState<number | null>(
-    props.variant === "card" ? 4 : null
-  );
+    const [limit, setLimit] = useState<number | null>(
+        props.variant === "card" ? 4 : null,
+    );
 
-  const [linkedInfo, setLinkedInfo] = useState<{ stateOfApplicabilityId: string; controlId: string }[]>([]);
+    const [linkedInfo, setLinkedInfo] = useState<
+        { stateOfApplicabilityId: string; controlId: string }[]
+    >([]);
 
-  const statesOfApplicability = useMemo(() => {
-    return limit ? props.statesOfApplicability.slice(0, limit) : props.statesOfApplicability;
-  }, [props.statesOfApplicability, limit]);
+    const statesOfApplicability = useMemo(() => {
+        return limit
+            ? props.statesOfApplicability.slice(0, limit)
+            : props.statesOfApplicability;
+    }, [props.statesOfApplicability, limit]);
 
-  const showMoreButton = limit !== null && props.statesOfApplicability.length > limit;
-  const variant = props.variant ?? "table";
+    const showMoreButton =
+        limit !== null && props.statesOfApplicability.length > limit;
+    const variant = props.variant ?? "table";
 
-  const linkedData = linkedInfo;
+    const linkedData = linkedInfo;
 
-  const onAttach = (stateOfApplicabilityId: string, applicability: boolean, justification: string | null) => {
-    props.onAttach({
-      variables: {
-        input: {
-          stateOfApplicabilityId,
-          applicability,
-          justification,
-          ...props.params,
-        },
-        connections: [props.connectionId],
-      },
-    });
-  };
+    const onAttach = (
+        stateOfApplicabilityId: string,
+        applicability: boolean,
+        justification: string | null,
+    ) => {
+        props.onAttach({
+            variables: {
+                input: {
+                    stateOfApplicabilityId,
+                    applicability,
+                    justification,
+                    ...props.params,
+                },
+                connections: [props.connectionId],
+            },
+        });
+    };
 
-  const onDetach = (stateOfApplicabilityId: string, controlId: string) => {
-    props.onDetach({
-      variables: {
-        input: {
-          stateOfApplicabilityId,
-          controlId,
-        },
-        connections: [props.connectionId],
-      },
-    });
-  };
+    const onDetach = (stateOfApplicabilityId: string, controlId: string) => {
+        props.onDetach({
+            variables: {
+                input: {
+                    stateOfApplicabilityId,
+                    controlId,
+                },
+                connections: [props.connectionId],
+            },
+        });
+    };
 
-  const Wrapper = variant === "card" ? Card : "div";
+    const Wrapper = variant === "card" ? Card : "div";
 
-  return (
-    <Wrapper padded className="space-y-[10px]">
-      {props.statesOfApplicability.map((soa, idx) => (
-        <LinkedInfoExtractor
-          key={idx}
-          fragment={soa}
-          onExtracted={(info) => {
-            setLinkedInfo(prev => {
-              const exists = prev.some(p =>
-                p.stateOfApplicabilityId === info.stateOfApplicabilityId &&
-                p.controlId === info.controlId
-              );
-              return exists ? prev : [...prev, info];
-            });
-          }}
-        />
-      ))}
-      {variant === "card" && (
-        <div className="flex justify-between">
-          <div className="text-lg font-semibold">{__("States of Applicability")}</div>
-          {!props.readOnly && (
-            <LinkedStatesOfApplicabilityDialog
-              connectionId={props.connectionId}
-              disabled={props.disabled}
-              linkedStatesOfApplicability={linkedData}
-              onLink={onAttach}
-              onUnlink={onDetach}
-            >
-              <Button variant="tertiary" icon={IconPlusLarge}>
-                {__("Link state of applicability")}
-              </Button>
-            </LinkedStatesOfApplicabilityDialog>
-          )}
-        </div>
-      )}
-      <Table className={clsx(variant === "card" && "bg-invert")}>
-        <Thead>
-          <Tr>
-            <Th>{__("Name")}</Th>
-            <Th>{__("Applicability")}</Th>
-            <Th>{__("Justification")}</Th>
-            {!props.readOnly && <Th></Th>}
-          </Tr>
-        </Thead>
-        <Tbody>
-          {statesOfApplicability.length === 0 && (
-            <Tr>
-              <Td colSpan={props.readOnly ? 3 : 4} className="text-center text-txt-secondary">
-                {__("No states of applicability linked")}
-              </Td>
-            </Tr>
-          )}
-          {statesOfApplicability.map((soa) => (
-            <StateOfApplicabilityRow key={soa.id} stateOfApplicability={soa} onClick={onDetach} readOnly={props.readOnly} />
-          ))}
-          {variant === "table" && !props.readOnly && (
-            <LinkedStatesOfApplicabilityDialog
-              connectionId={props.connectionId}
-              disabled={props.disabled}
-              linkedStatesOfApplicability={linkedData}
-              onLink={onAttach}
-              onUnlink={onDetach}
-            >
-              <TrButton colspan={4} icon={IconPlusLarge}>
-                {__("Link state of applicability")}
-              </TrButton>
-            </LinkedStatesOfApplicabilityDialog>
-          )}
-        </Tbody>
-      </Table>
-      {showMoreButton && (
-        <Button
-          variant="tertiary"
-          icon={IconChevronDown}
-          onClick={() => setLimit(null)}
-        >
-          {sprintf(__("Show %d more"), props.statesOfApplicability.length - limit!)}
-        </Button>
-      )}
-    </Wrapper>
-  );
+    return (
+        <Wrapper padded className="space-y-[10px]">
+            {props.statesOfApplicability.map((soa, idx) => (
+                <LinkedInfoExtractor
+                    key={idx}
+                    fragment={soa}
+                    onExtracted={(info) => {
+                        setLinkedInfo((prev) => {
+                            const exists = prev.some(
+                                (p) =>
+                                    p.stateOfApplicabilityId ===
+                                        info.stateOfApplicabilityId &&
+                                    p.controlId === info.controlId,
+                            );
+                            return exists ? prev : [...prev, info];
+                        });
+                    }}
+                />
+            ))}
+            {variant === "card" && (
+                <div className="flex justify-between">
+                    <div className="text-lg font-semibold">
+                        {__("States of Applicability")}
+                    </div>
+                    {!props.readOnly && (
+                        <LinkedStatesOfApplicabilityDialog
+                            connectionId={props.connectionId}
+                            disabled={props.disabled}
+                            linkedStatesOfApplicability={linkedData}
+                            onLink={onAttach}
+                            onUnlink={onDetach}
+                        >
+                            <Button variant="tertiary" icon={IconPlusLarge}>
+                                {__("Link state of applicability")}
+                            </Button>
+                        </LinkedStatesOfApplicabilityDialog>
+                    )}
+                </div>
+            )}
+            <Table className={clsx(variant === "card" && "bg-invert")}>
+                <Thead>
+                    <Tr>
+                        <Th>{__("Name")}</Th>
+                        <Th>{__("Applicability")}</Th>
+                        <Th>{__("Justification")}</Th>
+                        {!props.readOnly && <Th></Th>}
+                    </Tr>
+                </Thead>
+                <Tbody>
+                    {statesOfApplicability.length === 0 && (
+                        <Tr>
+                            <Td
+                                colSpan={props.readOnly ? 3 : 4}
+                                className="text-center text-txt-secondary"
+                            >
+                                {__("No states of applicability linked")}
+                            </Td>
+                        </Tr>
+                    )}
+                    {statesOfApplicability.map((soa) => (
+                        <StateOfApplicabilityRow
+                            key={soa.id}
+                            stateOfApplicability={soa}
+                            onClick={onDetach}
+                            readOnly={props.readOnly}
+                        />
+                    ))}
+                    {variant === "table" && !props.readOnly && (
+                        <LinkedStatesOfApplicabilityDialog
+                            connectionId={props.connectionId}
+                            disabled={props.disabled}
+                            linkedStatesOfApplicability={linkedData}
+                            onLink={onAttach}
+                            onUnlink={onDetach}
+                        >
+                            <TrButton colspan={4} icon={IconPlusLarge}>
+                                {__("Link state of applicability")}
+                            </TrButton>
+                        </LinkedStatesOfApplicabilityDialog>
+                    )}
+                </Tbody>
+            </Table>
+            {showMoreButton && (
+                <Button
+                    variant="tertiary"
+                    icon={IconChevronDown}
+                    onClick={() => setLimit(null)}
+                >
+                    {sprintf(
+                        __("Show %d more"),
+                        props.statesOfApplicability.length - limit!,
+                    )}
+                </Button>
+            )}
+        </Wrapper>
+    );
 }
 
 function LinkedInfoExtractor(props: {
-  fragment: LinkedStatesOfApplicabilityCardFragment$key;
-  onExtracted: (info: { stateOfApplicabilityId: string; controlId: string }) => void;
+    fragment: LinkedStatesOfApplicabilityCardFragment$key;
+    onExtracted: (info: {
+        stateOfApplicabilityId: string;
+        controlId: string;
+    }) => void;
 }) {
-  const data = useFragment(linkedStateOfApplicabilityFragment, props.fragment);
+    const data = useFragment(
+        linkedStateOfApplicabilityFragment,
+        props.fragment,
+    );
 
-  useEffect(() => {
-    props.onExtracted({
-      stateOfApplicabilityId: data.stateOfApplicabilityId,
-      controlId: data.controlId,
-    });
-  }, [data.stateOfApplicabilityId, data.controlId, props.onExtracted]);
+    useEffect(() => {
+        props.onExtracted({
+            stateOfApplicabilityId: data.stateOfApplicabilityId,
+            controlId: data.controlId,
+        });
+    }, [data.stateOfApplicabilityId, data.controlId, props.onExtracted]);
 
-  return null;
+    return null;
 }
 
 function StateOfApplicabilityRow(props: {
-  stateOfApplicability: LinkedStatesOfApplicabilityCardFragment$key & { id: string };
-  onClick: (stateOfApplicabilityId: string, controlId: string) => void;
-  readOnly?: boolean;
+    stateOfApplicability: LinkedStatesOfApplicabilityCardFragment$key & {
+        id: string;
+    };
+    onClick: (stateOfApplicabilityId: string, controlId: string) => void;
+    readOnly?: boolean;
 }) {
-  const soa = useFragment(linkedStateOfApplicabilityFragment, props.stateOfApplicability);
-  const organizationId = useOrganizationId();
-  const { __ } = useTranslate();
+    const soa = useFragment(
+        linkedStateOfApplicabilityFragment,
+        props.stateOfApplicability,
+    );
+    const organizationId = useOrganizationId();
+    const { __ } = useTranslate();
 
-  return (
-    <Tr to={`/organizations/${organizationId}/states-of-applicability/${soa.stateOfApplicabilityId}`}>
-      <Td>{soa.stateOfApplicability.name}</Td>
-      <Td>
-        <Badge variant={soa.applicability ? "success" : "danger"}>
-          {soa.applicability ? __("Applicable") : __("Not Applicable")}
-        </Badge>
-      </Td>
-      <Td>{soa.justification || "-"}</Td>
-      {!props.readOnly && (
-        <Td noLink width={50} className="text-end">
-          <Button
-            variant="secondary"
-            onClick={() => props.onClick(soa.stateOfApplicabilityId, soa.controlId)}
-            icon={IconTrashCan}
-          >
-            {__("Unlink")}
-          </Button>
-        </Td>
-      )}
-    </Tr>
-  );
+    return (
+        <Tr
+            to={`/organizations/${organizationId}/states-of-applicability/${soa.stateOfApplicabilityId}`}
+        >
+            <Td>{soa.stateOfApplicability.name}</Td>
+            <Td>
+                <Badge variant={soa.applicability ? "success" : "danger"}>
+                    {soa.applicability
+                        ? __("Applicable")
+                        : __("Not Applicable")}
+                </Badge>
+            </Td>
+            <Td>{soa.justification || "-"}</Td>
+            {!props.readOnly && (
+                <Td noLink width={50} className="text-end">
+                    <Button
+                        variant="secondary"
+                        onClick={() =>
+                            props.onClick(
+                                soa.stateOfApplicabilityId,
+                                soa.controlId,
+                            )
+                        }
+                        icon={IconTrashCan}
+                    >
+                        {__("Unlink")}
+                    </Button>
+                </Td>
+            )}
+        </Tr>
+    );
 }
diff --git a/apps/console/src/components/states-of-applicability/LinkedStatesOfApplicabilityDialog.tsx b/apps/console/src/components/states-of-applicability/LinkedStatesOfApplicabilityDialog.tsx
index be15b9004..1aa12a3b4 100644
--- a/apps/console/src/components/states-of-applicability/LinkedStatesOfApplicabilityDialog.tsx
+++ b/apps/console/src/components/states-of-applicability/LinkedStatesOfApplicabilityDialog.tsx
@@ -1,180 +1,265 @@
 import { useTranslate } from "@probo/i18n";
-import { Dialog, DialogContent, DialogFooter, Button, Checkbox, Textarea, Badge } from "@probo/ui";
+import {
+    Dialog,
+    DialogContent,
+    DialogFooter,
+    Button,
+    Checkbox,
+    Textarea,
+    Badge,
+} from "@probo/ui";
 import { Suspense, useState, useRef } from "react";
 import type { ReactNode } from "react";
 import { useLazyLoadQuery } from "react-relay";
 import { graphql } from "relay-runtime";
 import { useOrganizationId } from "/hooks/useOrganizationId";
-import type { LinkedStatesOfApplicabilityDialogQuery } from "./__generated__/LinkedStatesOfApplicabilityDialogQuery.graphql";
+import type { LinkedStatesOfApplicabilityDialogQuery } from "/__generated__/core/LinkedStatesOfApplicabilityDialogQuery.graphql";
 
 const query = graphql`
-  query LinkedStatesOfApplicabilityDialogQuery($organizationId: ID!) {
-    organization: node(id: $organizationId) {
-      ... on Organization {
-        statesOfApplicability(first: 100) {
-          edges {
-            node {
-              id
-              name
+    query LinkedStatesOfApplicabilityDialogQuery($organizationId: ID!) {
+        organization: node(id: $organizationId) {
+            ... on Organization {
+                statesOfApplicability(first: 100) {
+                    edges {
+                        node {
+                            id
+                            name
+                        }
+                    }
+                }
             }
-          }
         }
-      }
     }
-  }
 `;
 
 type LinkedSOAInfo = {
-  stateOfApplicabilityId: string;
-  controlId: string;
+    stateOfApplicabilityId: string;
+    controlId: string;
 };
 
 type Props = {
-  children: ReactNode;
-  connectionId: string;
-  disabled?: boolean;
-  linkedStatesOfApplicability: readonly LinkedSOAInfo[];
-  onLink: (stateOfApplicabilityId: string, applicability: boolean, justification: string | null) => void;
-  onUnlink: (stateOfApplicabilityId: string, controlId: string) => void;
+    children: ReactNode;
+    connectionId: string;
+    disabled?: boolean;
+    linkedStatesOfApplicability: readonly LinkedSOAInfo[];
+    onLink: (
+        stateOfApplicabilityId: string,
+        applicability: boolean,
+        justification: string | null,
+    ) => void;
+    onUnlink: (stateOfApplicabilityId: string, controlId: string) => void;
 };
 
-export function LinkedStatesOfApplicabilityDialog({ children, ...props }: Props) {
-  const dialogRef = useRef<{ open: () => void; close: () => void }>(null);
+export function LinkedStatesOfApplicabilityDialog({
+    children,
+    ...props
+}: Props) {
+    const dialogRef = useRef<{ open: () => void; close: () => void }>(null);
 
-  return (
-    <Dialog ref={dialogRef} trigger={children} title="Link State of Applicability">
-      <Suspense fallback={<div>Loading...</div>}>
-        <LinkedStatesOfApplicabilityDialogContent {...props} onClose={() => dialogRef.current?.close()} />
-      </Suspense>
-    </Dialog>
-  );
+    return (
+        <Dialog
+            ref={dialogRef}
+            trigger={children}
+            title="Link State of Applicability"
+        >
+            <Suspense fallback={<div>Loading...</div>}>
+                <LinkedStatesOfApplicabilityDialogContent
+                    {...props}
+                    onClose={() => dialogRef.current?.close()}
+                />
+            </Suspense>
+        </Dialog>
+    );
 }
 
-function LinkedStatesOfApplicabilityDialogContent(props: Omit<Props, "children"> & { onClose: () => void }) {
-  const { __ } = useTranslate();
-  const organizationId = useOrganizationId();
-  const [selectedSOA, setSelectedSOA] = useState<{ id: string; name: string } | null>(null);
-  const [applicability, setApplicability] = useState(true);
-  const [justification, setJustification] = useState("");
+function LinkedStatesOfApplicabilityDialogContent(
+    props: Omit<Props, "children"> & { onClose: () => void },
+) {
+    const { __ } = useTranslate();
+    const organizationId = useOrganizationId();
+    const [selectedSOA, setSelectedSOA] = useState<{
+        id: string;
+        name: string;
+    } | null>(null);
+    const [applicability, setApplicability] = useState(true);
+    const [justification, setJustification] = useState("");
 
-  const data = useLazyLoadQuery<LinkedStatesOfApplicabilityDialogQuery>(query, {
-    organizationId,
-  }, { fetchPolicy: "network-only" });
+    const data = useLazyLoadQuery<LinkedStatesOfApplicabilityDialogQuery>(
+        query,
+        {
+            organizationId,
+        },
+        { fetchPolicy: "network-only" },
+    );
 
-  const linkedSOAIds = new Set(props.linkedStatesOfApplicability.map((soa) => soa.stateOfApplicabilityId));
-  const linkedSOAMap = new Map(props.linkedStatesOfApplicability.map((soa) => [soa.stateOfApplicabilityId, soa]));
-  const statesOfApplicability = data.organization?.statesOfApplicability?.edges.map((edge) => edge.node) ?? [];
+    const linkedSOAIds = new Set(
+        props.linkedStatesOfApplicability.map(
+            (soa) => soa.stateOfApplicabilityId,
+        ),
+    );
+    const linkedSOAMap = new Map(
+        props.linkedStatesOfApplicability.map((soa) => [
+            soa.stateOfApplicabilityId,
+            soa,
+        ]),
+    );
+    const statesOfApplicability =
+        data.organization?.statesOfApplicability?.edges.map(
+            (edge) => edge.node,
+        ) ?? [];
 
-  const handleSelectSOA = (soa: { id: string; name: string }) => {
-    setSelectedSOA(soa);
-    setApplicability(true);
-    setJustification("");
-  };
+    const handleSelectSOA = (soa: { id: string; name: string }) => {
+        setSelectedSOA(soa);
+        setApplicability(true);
+        setJustification("");
+    };
 
-  const handleLink = () => {
-    if (selectedSOA) {
-      props.onLink(selectedSOA.id, applicability, justification.trim() || null);
-      props.onClose();
-    }
-  };
+    const handleLink = () => {
+        if (selectedSOA) {
+            props.onLink(
+                selectedSOA.id,
+                applicability,
+                justification.trim() || null,
+            );
+            props.onClose();
+        }
+    };
 
-  const handleUnlink = (stateOfApplicabilityId: string) => {
-    const linkedSOA = linkedSOAMap.get(stateOfApplicabilityId);
-    if (linkedSOA) {
-      props.onUnlink(linkedSOA.stateOfApplicabilityId, linkedSOA.controlId);
-    }
-  };
+    const handleUnlink = (stateOfApplicabilityId: string) => {
+        const linkedSOA = linkedSOAMap.get(stateOfApplicabilityId);
+        if (linkedSOA) {
+            props.onUnlink(
+                linkedSOA.stateOfApplicabilityId,
+                linkedSOA.controlId,
+            );
+        }
+    };
 
-  return (
-    <>
-      <DialogContent padded className="space-y-4">
-        {statesOfApplicability.length === 0 ? (
-          <div className="flex flex-col items-center justify-center py-12 text-center">
-            <div className="text-txt-secondary text-base mb-2">
-              {__("No states of applicability available")}
-            </div>
-            <div className="text-txt-tertiary text-sm">
-              {__("Create a state of applicability first to link it to this control")}
-            </div>
-          </div>
-        ) : !selectedSOA ? (
-          <div className="space-y-2">
-            <div className="text-sm font-medium mb-2">{__("Select a state of applicability:")}</div>
-            {statesOfApplicability.map((soa) => {
-              const isLinked = linkedSOAIds.has(soa.id);
-              return (
-                <div
-                  key={soa.id}
-                  className={`border border-border-low rounded-lg p-3 flex items-center justify-between ${!isLinked ? 'hover:bg-hover cursor-pointer' : ''}`}
-                  onClick={() => !isLinked && handleSelectSOA(soa)}
-                >
-                  <div className="font-medium">{soa.name}</div>
-                  {isLinked ? (
-                    <div className="flex items-center gap-2" onClick={(e) => e.stopPropagation()}>
-                      <Badge variant="success">{__("Linked")}</Badge>
-                      <Button
-                        variant="danger"
-                        onClick={() => handleUnlink(soa.id)}
-                        disabled={props.disabled}
-                      >
-                        {__("Unlink")}
-                      </Button>
+    return (
+        <>
+            <DialogContent padded className="space-y-4">
+                {statesOfApplicability.length === 0 ? (
+                    <div className="flex flex-col items-center justify-center py-12 text-center">
+                        <div className="text-txt-secondary text-base mb-2">
+                            {__("No states of applicability available")}
+                        </div>
+                        <div className="text-txt-tertiary text-sm">
+                            {__(
+                                "Create a state of applicability first to link it to this control",
+                            )}
+                        </div>
                     </div>
-                  ) : null}
-                </div>
-              );
-            })}
-          </div>
-        ) : (
-          <div className="space-y-4">
-            <div className="flex items-center justify-between">
-              <div>
-                <div className="text-sm text-txt-secondary mb-1">{__("Selected:")}</div>
-                <div className="text-lg font-medium">{selectedSOA.name}</div>
-              </div>
-              <Button variant="tertiary" onClick={() => setSelectedSOA(null)}>
-                {__("Change")}
-              </Button>
-            </div>
+                ) : !selectedSOA ? (
+                    <div className="space-y-2">
+                        <div className="text-sm font-medium mb-2">
+                            {__("Select a state of applicability:")}
+                        </div>
+                        {statesOfApplicability.map((soa) => {
+                            const isLinked = linkedSOAIds.has(soa.id);
+                            return (
+                                <div
+                                    key={soa.id}
+                                    className={`border border-border-low rounded-lg p-3 flex items-center justify-between ${!isLinked ? "hover:bg-hover cursor-pointer" : ""}`}
+                                    onClick={() =>
+                                        !isLinked && handleSelectSOA(soa)
+                                    }
+                                >
+                                    <div className="font-medium">
+                                        {soa.name}
+                                    </div>
+                                    {isLinked ? (
+                                        <div
+                                            className="flex items-center gap-2"
+                                            onClick={(e) => e.stopPropagation()}
+                                        >
+                                            <Badge variant="success">
+                                                {__("Linked")}
+                                            </Badge>
+                                            <Button
+                                                variant="danger"
+                                                onClick={() =>
+                                                    handleUnlink(soa.id)
+                                                }
+                                                disabled={props.disabled}
+                                            >
+                                                {__("Unlink")}
+                                            </Button>
+                                        </div>
+                                    ) : null}
+                                </div>
+                            );
+                        })}
+                    </div>
+                ) : (
+                    <div className="space-y-4">
+                        <div className="flex items-center justify-between">
+                            <div>
+                                <div className="text-sm text-txt-secondary mb-1">
+                                    {__("Selected:")}
+                                </div>
+                                <div className="text-lg font-medium">
+                                    {selectedSOA.name}
+                                </div>
+                            </div>
+                            <Button
+                                variant="tertiary"
+                                onClick={() => setSelectedSOA(null)}
+                            >
+                                {__("Change")}
+                            </Button>
+                        </div>
 
-            <div className="border-t border-border-low pt-4 space-y-3">
-              <label className="flex items-center gap-2 cursor-pointer">
-                <Checkbox
-                  checked={applicability}
-                  onChange={(checked) => setApplicability(checked)}
-                />
-                <span className="font-medium">{__("Applicable")}</span>
-              </label>
+                        <div className="border-t border-border-low pt-4 space-y-3">
+                            <label className="flex items-center gap-2 cursor-pointer">
+                                <Checkbox
+                                    checked={applicability}
+                                    onChange={(checked) =>
+                                        setApplicability(checked)
+                                    }
+                                />
+                                <span className="font-medium">
+                                    {__("Applicable")}
+                                </span>
+                            </label>
 
-              <div>
-                <label className="text-sm font-medium mb-1 block">
-                  {__("Justification (optional)")}
-                </label>
-                <Textarea
-                  placeholder={__("Add a justification...")}
-                  value={justification}
-                  onChange={(e) => setJustification(e.target.value)}
-                  rows={3}
-                />
-              </div>
-            </div>
-          </div>
-        )}
-      </DialogContent>
-      <DialogFooter exitLabel={__("Close")}>
-        {selectedSOA ? (
-          <>
-            <Button variant="secondary" onClick={() => setSelectedSOA(null)}>
-              {__("Back")}
-            </Button>
-            <Button variant="primary" onClick={handleLink} disabled={props.disabled}>
-              {__("Link")}
-            </Button>
-          </>
-        ) : (
-          <></>
-        )}
-      </DialogFooter>
-    </>
-  );
+                            <div>
+                                <label className="text-sm font-medium mb-1 block">
+                                    {__("Justification (optional)")}
+                                </label>
+                                <Textarea
+                                    placeholder={__("Add a justification...")}
+                                    value={justification}
+                                    onChange={(e) =>
+                                        setJustification(e.target.value)
+                                    }
+                                    rows={3}
+                                />
+                            </div>
+                        </div>
+                    </div>
+                )}
+            </DialogContent>
+            <DialogFooter exitLabel={__("Close")}>
+                {selectedSOA ? (
+                    <>
+                        <Button
+                            variant="secondary"
+                            onClick={() => setSelectedSOA(null)}
+                        >
+                            {__("Back")}
+                        </Button>
+                        <Button
+                            variant="primary"
+                            onClick={handleLink}
+                            disabled={props.disabled}
+                        >
+                            {__("Link")}
+                        </Button>
+                    </>
+                ) : (
+                    <></>
+                )}
+            </DialogFooter>
+        </>
+    );
 }
diff --git a/apps/console/src/components/table/PeopleCell.tsx b/apps/console/src/components/table/PeopleCell.tsx
index ef2f6fb41..7de5dd55d 100644
--- a/apps/console/src/components/table/PeopleCell.tsx
+++ b/apps/console/src/components/table/PeopleCell.tsx
@@ -1,5 +1,5 @@
 import { GraphQLCell } from "/components/table/GraphQLCell.tsx";
-import type { PeopleGraphQuery } from "/hooks/graph/__generated__/PeopleGraphQuery.graphql.ts";
+import type { PeopleGraphQuery } from "/__generated__/core/PeopleGraphQuery.graphql.ts";
 import { peopleQuery } from "/hooks/graph/PeopleGraph.ts";
 import { Avatar } from "@probo/ui";
 
diff --git a/apps/console/src/components/table/VendorsCell.tsx b/apps/console/src/components/table/VendorsCell.tsx
index 6987becf8..3ead1aa03 100644
--- a/apps/console/src/components/table/VendorsCell.tsx
+++ b/apps/console/src/components/table/VendorsCell.tsx
@@ -7,7 +7,7 @@ type Vendor = {
   name: string;
   websiteUrl: string | null | undefined;
 };
-import type { VendorGraphSelectQuery } from "/hooks/graph/__generated__/VendorGraphSelectQuery.graphql.ts";
+import type { VendorGraphSelectQuery } from "/__generated__/core/VendorGraphSelectQuery.graphql.ts";
 
 type Props = {
   name: string;
diff --git a/apps/console/src/components/tasks/TaskFormDialog.tsx b/apps/console/src/components/tasks/TaskFormDialog.tsx
index d0750bff9..33a2eda36 100644
--- a/apps/console/src/components/tasks/TaskFormDialog.tsx
+++ b/apps/console/src/components/tasks/TaskFormDialog.tsx
@@ -21,7 +21,7 @@ import { useFormWithSchema } from "/hooks/useFormWithSchema";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import { PeopleSelectField } from "/components/form/PeopleSelectField";
-import type { TaskFormDialogFragment$key } from "./__generated__/TaskFormDialogFragment.graphql";
+import type { TaskFormDialogFragment$key } from "/__generated__/core/TaskFormDialogFragment.graphql";
 import { MeasureSelectField } from "/components/form/MeasureSelectField";
 import { Controller } from "react-hook-form";
 import { updateStoreCounter } from "/hooks/useMutationWithIncrement";
@@ -76,7 +76,7 @@ const createTaskSchema = z.object({
   assignedToId: z.string().optional().nullable(),
   measureId: z.preprocess(
     (val) => (val === "" || val == null ? null : val),
-    z.string().nullable().optional()
+    z.string().nullable().optional(),
   ),
   deadline: z.string().optional().nullable(),
 });
@@ -87,11 +87,11 @@ const updateTaskSchema = z.object({
   timeEstimate: z.string().optional().nullable(),
   assignedToId: z.preprocess(
     (val) => (val === "" || val == null ? null : val),
-    z.string().nullable().optional()
+    z.string().nullable().optional(),
   ),
   measureId: z.preprocess(
     (val) => (val === "" || val == null ? null : val),
-    z.string().nullable().optional()
+    z.string().nullable().optional(),
   ),
   deadline: z.string().optional().nullable(),
 });
@@ -111,10 +111,13 @@ export default function TaskFormDialog(props: Props) {
   const organizationId = useOrganizationId();
   const task = useFragment(taskFragment, props.task);
   const relayEnv = useRelayEnvironment();
-  const [mutate] = useMutationWithToasts(task? taskUpdateMutation : taskCreateMutation, {
-    successMessage: __(`Task ${task ? "updated" : "created"} successfully.`),
-    errorMessage: __(`Failed to ${task ? "update" : "create"} task`),
-  })
+  const [mutate] = useMutationWithToasts(
+    task ? taskUpdateMutation : taskCreateMutation,
+    {
+      successMessage: __(`Task ${task ? "updated" : "created"} successfully.`),
+      errorMessage: __(`Failed to ${task ? "update" : "create"} task`),
+    },
+  );
 
   const isUpdating = !!task;
 
diff --git a/apps/console/src/components/tasks/TasksCard.tsx b/apps/console/src/components/tasks/TasksCard.tsx
index b93f6149f..f42a7a6e8 100644
--- a/apps/console/src/components/tasks/TasksCard.tsx
+++ b/apps/console/src/components/tasks/TasksCard.tsx
@@ -20,7 +20,7 @@ import {
 import { Fragment, use } from "react";
 import { graphql, useMutation, useRelayEnvironment } from "react-relay";
 import { Link, useLocation, useParams } from "react-router";
-import type { TaskFormDialogFragment$key } from "./__generated__/TaskFormDialogFragment.graphql";
+import type { TaskFormDialogFragment$key } from "/__generated__/core/TaskFormDialogFragment.graphql";
 import TaskFormDialog, {
   taskUpdateMutation,
 } from "/components/tasks/TaskFormDialog";
@@ -71,8 +71,8 @@ export default function TasksCard({ tasks, connectionId }: Props) {
 
   const { isAuthorized } = use(PermissionsContext);
 
-  const hasAnyAction = isAuthorized("Task", "updateTask") ||
-    isAuthorized("Task", "deleteTask");
+  const hasAnyAction =
+    isAuthorized("Task", "updateTask") || isAuthorized("Task", "deleteTask");
 
   return (
     <div className="space-y-6">
@@ -182,14 +182,14 @@ function TaskRow(props: TaskRowProps) {
                 relayEnv,
                 params.measureId,
                 "tasks(first:0)",
-                -1
+                -1,
               );
             }
           },
         }),
       {
         message: "Are you sure you want to delete this task?",
-      }
+      },
     );
   };
 
diff --git a/apps/console/src/components/trustCenter/TrustCenterAuditsCard.tsx b/apps/console/src/components/trustCenter/TrustCenterAuditsCard.tsx
index 709b5984f..d626c38b4 100644
--- a/apps/console/src/components/trustCenter/TrustCenterAuditsCard.tsx
+++ b/apps/console/src/components/trustCenter/TrustCenterAuditsCard.tsx
@@ -15,9 +15,15 @@ import {
 import { useTranslate } from "@probo/i18n";
 import { useFragment } from "react-relay";
 import { useMemo, useState, useCallback, useEffect, use } from "react";
-import { sprintf, getAuditStateVariant, getAuditStateLabel, formatDate, getTrustCenterVisibilityOptions } from "@probo/helpers";
+import {
+  sprintf,
+  getAuditStateVariant,
+  getAuditStateLabel,
+  formatDate,
+  getTrustCenterVisibilityOptions,
+} from "@probo/helpers";
 import { useOrganizationId } from "/hooks/useOrganizationId";
-import type { TrustCenterAuditsCardFragment$key } from "./__generated__/TrustCenterAuditsCardFragment.graphql";
+import type { TrustCenterAuditsCardFragment$key } from "/__generated__/core/TrustCenterAuditsCardFragment.graphql";
 import { PermissionsContext } from "/providers/PermissionsContext";
 
 const trustCenterAuditFragment = graphql`
@@ -59,7 +65,10 @@ export function TrustCenterAuditsCard<Params>(props: Props<Params>) {
   }, [props.audits, limit]);
   const showMoreButton = limit !== null && props.audits.length > limit;
 
-  const onChangeVisibility = (auditId: string, trustCenterVisibility: "NONE" | "PRIVATE" | "PUBLIC") => {
+  const onChangeVisibility = (
+    auditId: string,
+    trustCenterVisibility: "NONE" | "PRIVATE" | "PUBLIC",
+  ) => {
     props.onChangeVisibility({
       variables: {
         input: {
@@ -117,7 +126,10 @@ export function TrustCenterAuditsCard<Params>(props: Props<Params>) {
 
 function AuditRow(props: {
   auditFragmentRef: TrustCenterAuditsCardFragment$key;
-  onChangeVisibility: (auditId: string, trustCenterVisibility: "NONE" | "PRIVATE" | "PUBLIC") => void;
+  onChangeVisibility: (
+    auditId: string,
+    trustCenterVisibility: "NONE" | "PRIVATE" | "PUBLIC",
+  ) => void;
   disabled?: boolean;
 }) {
   const { auditFragmentRef, onChangeVisibility, disabled } = props;
@@ -126,14 +138,19 @@ function AuditRow(props: {
   const { __ } = useTranslate();
   const [optimisticValue, setOptimisticValue] = useState<string | null>(null);
   const { isAuthorized } = use(PermissionsContext);
-  const canUpdate = organizationId ? isAuthorized("TrustCenter", "updateTrustCenter") : false;
+  const canUpdate = organizationId
+    ? isAuthorized("TrustCenter", "updateTrustCenter")
+    : false;
 
-  const handleValueChange = useCallback((value: string) => {
-    const stringValue = typeof value === 'string' ? value : '';
-    const typedValue = stringValue as "NONE" | "PRIVATE" | "PUBLIC";
-    setOptimisticValue(typedValue);
-    onChangeVisibility(audit.id, typedValue);
-  }, [audit.id, onChangeVisibility]);
+  const handleValueChange = useCallback(
+    (value: string) => {
+      const stringValue = typeof value === "string" ? value : "";
+      const typedValue = stringValue as "NONE" | "PRIVATE" | "PUBLIC";
+      setOptimisticValue(typedValue);
+      onChangeVisibility(audit.id, typedValue);
+    },
+    [audit.id, onChangeVisibility],
+  );
 
   useEffect(() => {
     if (optimisticValue && audit.trustCenterVisibility === optimisticValue) {
@@ -152,9 +169,7 @@ function AuditRow(props: {
   return (
     <Tr to={`/organizations/${organizationId}/audits/${audit.id}`}>
       <Td>
-        <div className="flex gap-4 items-center">
-          {audit.framework.name}
-        </div>
+        <div className="flex gap-4 items-center">{audit.framework.name}</div>
       </Td>
       <Td>{audit.name || __("Untitled")}</Td>
       <Td>{validUntilFormatted}</Td>
@@ -174,9 +189,7 @@ function AuditRow(props: {
           {visibilityOptions.map((option) => (
             <Option key={option.value} value={option.value}>
               <div className="flex items-center justify-between w-full">
-                <Badge variant={option.variant}>
-                  {option.label}
-                </Badge>
+                <Badge variant={option.variant}>{option.label}</Badge>
               </div>
             </Option>
           ))}
diff --git a/apps/console/src/components/trustCenter/TrustCenterDocumentsCard.tsx b/apps/console/src/components/trustCenter/TrustCenterDocumentsCard.tsx
index ea3a0b73a..8f21e0e33 100644
--- a/apps/console/src/components/trustCenter/TrustCenterDocumentsCard.tsx
+++ b/apps/console/src/components/trustCenter/TrustCenterDocumentsCard.tsx
@@ -15,7 +15,7 @@ import {
   Badge,
 } from "@probo/ui";
 import { useTranslate } from "@probo/i18n";
-import type { TrustCenterDocumentsCardFragment$key } from "./__generated__/TrustCenterDocumentsCardFragment.graphql";
+import type { TrustCenterDocumentsCardFragment$key } from "/__generated__/core/TrustCenterDocumentsCardFragment.graphql";
 import { useFragment } from "react-relay";
 import { useMemo, useState, useCallback, useEffect, use } from "react";
 import { sprintf, getTrustCenterVisibilityOptions } from "@probo/helpers";
@@ -64,7 +64,10 @@ export function TrustCenterDocumentsCard<Params>(props: Props<Params>) {
   }, [props.documents, limit]);
   const showMoreButton = limit !== null && props.documents.length > limit;
 
-  const onChangeVisibility = (documentId: string, trustCenterVisibility: "NONE" | "PRIVATE" | "PUBLIC") => {
+  const onChangeVisibility = (
+    documentId: string,
+    trustCenterVisibility: "NONE" | "PRIVATE" | "PUBLIC",
+  ) => {
     props.onChangeVisibility({
       variables: {
         input: {
@@ -103,7 +106,6 @@ export function TrustCenterDocumentsCard<Params>(props: Props<Params>) {
               disabled={props.disabled}
             />
           ))}
-
         </Tbody>
       </Table>
       {showMoreButton && (
@@ -122,23 +124,32 @@ export function TrustCenterDocumentsCard<Params>(props: Props<Params>) {
 
 function DocumentRow(props: {
   documentFragmentRef: TrustCenterDocumentsCardFragment$key;
-  onChangeVisibility: (documentId: string, trustCenterVisibility: "NONE" | "PRIVATE" | "PUBLIC") => void;
+  onChangeVisibility: (
+    documentId: string,
+    trustCenterVisibility: "NONE" | "PRIVATE" | "PUBLIC",
+  ) => void;
   disabled?: boolean;
 }) {
   const { documentFragmentRef, onChangeVisibility, disabled } = props;
-  const document = useFragment(trustCenterDocumentFragment, documentFragmentRef);
+  const document = useFragment(
+    trustCenterDocumentFragment,
+    documentFragmentRef,
+  );
   const organizationId = useOrganizationId();
   const { __ } = useTranslate();
   const [optimisticValue, setOptimisticValue] = useState<string | null>(null);
   const { isAuthorized } = use(PermissionsContext);
   const canUpdate = isAuthorized("TrustCenter", "updateTrustCenter");
 
-  const handleValueChange = useCallback((value: string) => {
-    const stringValue = typeof value === 'string' ? value : '';
-    const typedValue = stringValue as "NONE" | "PRIVATE" | "PUBLIC";
-    setOptimisticValue(typedValue);
-    onChangeVisibility(document.id, typedValue);
-  }, [document.id, onChangeVisibility]);
+  const handleValueChange = useCallback(
+    (value: string) => {
+      const stringValue = typeof value === "string" ? value : "";
+      const typedValue = stringValue as "NONE" | "PRIVATE" | "PUBLIC";
+      setOptimisticValue(typedValue);
+      onChangeVisibility(document.id, typedValue);
+    },
+    [document.id, onChangeVisibility],
+  );
 
   useEffect(() => {
     if (optimisticValue && document.trustCenterVisibility === optimisticValue) {
@@ -153,15 +164,15 @@ function DocumentRow(props: {
   return (
     <Tr to={`/organizations/${organizationId}/documents/${document.id}`}>
       <Td>
-        <div className="flex gap-4 items-center">
-          {document.title}
-        </div>
+        <div className="flex gap-4 items-center">{document.title}</div>
       </Td>
       <Td>
         <DocumentTypeBadge type={document.documentType} />
       </Td>
       <Td>
-        <DocumentVersionBadge state={document.versions?.edges?.[0]?.node?.status} />
+        <DocumentVersionBadge
+          state={document.versions?.edges?.[0]?.node?.status}
+        />
       </Td>
       <Td noLink width={130} className="pr-0">
         <Field
@@ -174,9 +185,7 @@ function DocumentRow(props: {
           {visibilityOptions.map((option) => (
             <Option key={option.value} value={option.value}>
               <div className="flex items-center justify-between w-full">
-                <Badge variant={option.variant}>
-                  {option.label}
-                </Badge>
+                <Badge variant={option.variant}>{option.label}</Badge>
               </div>
             </Option>
           ))}
diff --git a/apps/console/src/components/trustCenter/TrustCenterFilesCard.tsx b/apps/console/src/components/trustCenter/TrustCenterFilesCard.tsx
index a04b614ff..75bad7426 100644
--- a/apps/console/src/components/trustCenter/TrustCenterFilesCard.tsx
+++ b/apps/console/src/components/trustCenter/TrustCenterFilesCard.tsx
@@ -16,7 +16,10 @@ import {
   IconArrowLink,
 } from "@probo/ui";
 import { useTranslate } from "@probo/i18n";
-import type { TrustCenterFilesCardFragment$key, TrustCenterFilesCardFragment$data } from "./__generated__/TrustCenterFilesCardFragment.graphql";
+import type {
+  TrustCenterFilesCardFragment$key,
+  TrustCenterFilesCardFragment$data,
+} from "/__generated__/core/TrustCenterFilesCardFragment.graphql";
 import { useFragment } from "react-relay";
 import { useMemo, useState, useCallback, useEffect, use } from "react";
 import { sprintf, getTrustCenterVisibilityOptions } from "@probo/helpers";
@@ -61,7 +64,10 @@ export function TrustCenterFilesCard<Params>(props: Props<Params>) {
   }, [props.files, limit]);
   const showMoreButton = limit !== null && props.files.length > limit;
 
-  const onChangeVisibility = (fileId: string, trustCenterVisibility: "NONE" | "PRIVATE" | "PUBLIC") => {
+  const onChangeVisibility = (
+    fileId: string,
+    trustCenterVisibility: "NONE" | "PRIVATE" | "PUBLIC",
+  ) => {
     props.onChangeVisibility({
       variables: {
         input: {
@@ -121,7 +127,10 @@ export function TrustCenterFilesCard<Params>(props: Props<Params>) {
 
 function FileRowWrapper(props: {
   fileFragmentRef: TrustCenterFilesCardFragment$key;
-  onChangeVisibility: (fileId: string, trustCenterVisibility: "NONE" | "PRIVATE" | "PUBLIC") => void;
+  onChangeVisibility: (
+    fileId: string,
+    trustCenterVisibility: "NONE" | "PRIVATE" | "PUBLIC",
+  ) => void;
   onEdit: (file: { id: string; name: string; category: string }) => void;
   onDelete: (id: string) => void;
   disabled?: boolean;
@@ -140,7 +149,10 @@ function FileRowWrapper(props: {
 
 function FileRow(props: {
   file: TrustCenterFilesCardFragment$data;
-  onChangeVisibility: (fileId: string, trustCenterVisibility: "NONE" | "PRIVATE" | "PUBLIC") => void;
+  onChangeVisibility: (
+    fileId: string,
+    trustCenterVisibility: "NONE" | "PRIVATE" | "PUBLIC",
+  ) => void;
   onEdit: (file: { id: string; name: string; category: string }) => void;
   onDelete: (id: string) => void;
   disabled?: boolean;
@@ -151,12 +163,15 @@ function FileRow(props: {
   const { isAuthorized } = use(PermissionsContext);
   const canUpdate = isAuthorized("TrustCenter", "updateTrustCenter");
 
-  const handleValueChange = useCallback((value: string) => {
-    const stringValue = typeof value === 'string' ? value : '';
-    const typedValue = stringValue as "NONE" | "PRIVATE" | "PUBLIC";
-    setOptimisticValue(typedValue);
-    onChangeVisibility(file.id, typedValue);
-  }, [file.id, onChangeVisibility]);
+  const handleValueChange = useCallback(
+    (value: string) => {
+      const stringValue = typeof value === "string" ? value : "";
+      const typedValue = stringValue as "NONE" | "PRIVATE" | "PUBLIC";
+      setOptimisticValue(typedValue);
+      onChangeVisibility(file.id, typedValue);
+    },
+    [file.id, onChangeVisibility],
+  );
 
   useEffect(() => {
     if (optimisticValue && file.trustCenterVisibility === optimisticValue) {
@@ -171,9 +186,7 @@ function FileRow(props: {
   return (
     <Tr>
       <Td>
-        <div className="flex gap-4 items-center">
-          {file.name}
-        </div>
+        <div className="flex gap-4 items-center">{file.name}</div>
       </Td>
       <Td>{file.category}</Td>
       <Td>{formatDate(file.createdAt)}</Td>
@@ -188,9 +201,7 @@ function FileRow(props: {
           {visibilityOptions.map((option) => (
             <Option key={option.value} value={option.value}>
               <div className="flex items-center justify-between w-full">
-                <Badge variant={option.variant}>
-                  {option.label}
-                </Badge>
+                <Badge variant={option.variant}>{option.label}</Badge>
               </div>
             </Option>
           ))}
@@ -201,14 +212,22 @@ function FileRow(props: {
           <Button
             variant="secondary"
             icon={IconArrowLink}
-            onClick={() => window.open(file.fileUrl, '_blank', 'noopener,noreferrer')}
+            onClick={() =>
+              window.open(file.fileUrl, "_blank", "noopener,noreferrer")
+            }
             title={__("Download")}
           />
           {isAuthorized("TrustCenterFile", "updateTrustCenterFile") && (
             <Button
               variant="secondary"
               icon={IconPencil}
-              onClick={() => onEdit({ id: file.id, name: file.name, category: file.category })}
+              onClick={() =>
+                onEdit({
+                  id: file.id,
+                  name: file.name,
+                  category: file.category,
+                })
+              }
               disabled={disabled}
               title={__("Edit")}
             />
diff --git a/apps/console/src/components/trustCenter/TrustCenterVendorsCard.tsx b/apps/console/src/components/trustCenter/TrustCenterVendorsCard.tsx
index 33c6ad2c9..57915895c 100644
--- a/apps/console/src/components/trustCenter/TrustCenterVendorsCard.tsx
+++ b/apps/console/src/components/trustCenter/TrustCenterVendorsCard.tsx
@@ -17,7 +17,7 @@ import { useFragment } from "react-relay";
 import { useMemo, useState, use } from "react";
 import { sprintf } from "@probo/helpers";
 import { useOrganizationId } from "/hooks/useOrganizationId";
-import type { TrustCenterVendorsCardFragment$key } from "./__generated__/TrustCenterVendorsCardFragment.graphql";
+import type { TrustCenterVendorsCardFragment$key } from "/__generated__/core/TrustCenterVendorsCardFragment.graphql";
 import { PermissionsContext } from "/providers/PermissionsContext";
 
 const trustCenterVendorFragment = graphql`
@@ -83,7 +83,10 @@ export function TrustCenterVendorsCard<Params>(props: Props<Params>) {
         <Tbody>
           {vendors.length === 0 && (
             <Tr>
-              <Td colSpan={canUpdate ? 4 : 3} className="text-center text-txt-secondary">
+              <Td
+                colSpan={canUpdate ? 4 : 3}
+                className="text-center text-txt-secondary"
+              >
                 {__("No vendors available")}
               </Td>
             </Tr>
@@ -126,14 +129,10 @@ function VendorRow(props: {
   return (
     <Tr to={`/organizations/${organizationId}/vendors/${vendor.id}/overview`}>
       <Td>
-        <div className="flex gap-4 items-center">
-          {vendor.name}
-        </div>
+        <div className="flex gap-4 items-center">{vendor.name}</div>
       </Td>
       <Td>
-        <Badge variant="neutral">
-          {vendor.category}
-        </Badge>
+        <Badge variant="neutral">{vendor.category}</Badge>
       </Td>
       <Td>
         <Badge variant={vendor.showOnTrustCenter ? "success" : "danger"}>
@@ -144,7 +143,9 @@ function VendorRow(props: {
         <Td noLink width={100} className="text-end">
           <Button
             variant="secondary"
-            onClick={() => props.onToggleVisibility(vendor.id, !vendor.showOnTrustCenter)}
+            onClick={() =>
+              props.onToggleVisibility(vendor.id, !vendor.showOnTrustCenter)
+            }
             icon={vendor.showOnTrustCenter ? IconCrossLargeX : IconCheckmark1}
             disabled={props.disabled}
           >
diff --git a/apps/console/src/hooks/forms/useRiskForm.tsx b/apps/console/src/hooks/forms/useRiskForm.tsx
index 0516ffbf7..19d05618e 100644
--- a/apps/console/src/hooks/forms/useRiskForm.tsx
+++ b/apps/console/src/hooks/forms/useRiskForm.tsx
@@ -4,7 +4,7 @@ import { graphql } from "relay-runtime";
 import type {
   useRiskFormFragment$data,
   useRiskFormFragment$key,
-} from "./__generated__/useRiskFormFragment.graphql";
+} from "/__generated__/core/useRiskFormFragment.graphql";
 import { useFragment } from "react-relay";
 
 const RiskFragment = graphql`
diff --git a/apps/console/src/hooks/forms/useVendorForm.tsx b/apps/console/src/hooks/forms/useVendorForm.tsx
index e22a3658e..027af5154 100644
--- a/apps/console/src/hooks/forms/useVendorForm.tsx
+++ b/apps/console/src/hooks/forms/useVendorForm.tsx
@@ -2,7 +2,7 @@ import { z } from "zod";
 import { useFormWithSchema } from "../useFormWithSchema";
 import { graphql } from "relay-runtime";
 import { useFragment } from "react-relay";
-import type { useVendorFormFragment$key } from "./__generated__/useVendorFormFragment.graphql";
+import type { useVendorFormFragment$key } from "/__generated__/core/useVendorFormFragment.graphql";
 import { useMutationWithToasts } from "../useMutationWithToasts";
 import { useTranslate } from "@probo/i18n";
 import { useEffect, useMemo } from "react";
diff --git a/apps/console/src/hooks/graph/DocumentGraph.ts b/apps/console/src/hooks/graph/DocumentGraph.ts
index 49b180cf8..1ad05d38c 100644
--- a/apps/console/src/hooks/graph/DocumentGraph.ts
+++ b/apps/console/src/hooks/graph/DocumentGraph.ts
@@ -1,10 +1,10 @@
 import { useTranslate } from "@probo/i18n";
 import { graphql } from "relay-runtime";
 import { useMutationWithToasts } from "../useMutationWithToasts";
-import type { DocumentGraphDeleteMutation } from "./__generated__/DocumentGraphDeleteMutation.graphql";
-import type { DocumentGraphSendSigningNotificationsMutation } from "./__generated__/DocumentGraphSendSigningNotificationsMutation.graphql";
-import type { DocumentGraphDeleteDraftMutation } from "./__generated__/DocumentGraphDeleteDraftMutation.graphql";
-import type { DocumentGraphBulkExportDocumentsMutation } from "./__generated__/DocumentGraphBulkExportDocumentsMutation.graphql";
+import type { DocumentGraphDeleteMutation } from "/__generated__/core/DocumentGraphDeleteMutation.graphql";
+import type { DocumentGraphSendSigningNotificationsMutation } from "/__generated__/core/DocumentGraphSendSigningNotificationsMutation.graphql";
+import type { DocumentGraphDeleteDraftMutation } from "/__generated__/core/DocumentGraphDeleteDraftMutation.graphql";
+import type { DocumentGraphBulkExportDocumentsMutation } from "/__generated__/core/DocumentGraphBulkExportDocumentsMutation.graphql";
 
 export const documentsQuery = graphql`
   query DocumentGraphListQuery($organizationId: ID!) {
@@ -18,9 +18,7 @@ export const documentsQuery = graphql`
 export const DocumentsConnectionKey = "DocumentsListQuery_documents";
 
 const deleteDocumentMutation = graphql`
-  mutation DocumentGraphDeleteMutation(
-    $input: DeleteDocumentInput!
-  ) {
+  mutation DocumentGraphDeleteMutation($input: DeleteDocumentInput!) {
     deleteDocument(input: $input) {
       deletedDocumentId @deleteRecord
     }
@@ -35,7 +33,7 @@ export function useDeleteDocumentMutation() {
     {
       successMessage: __("Document deleted successfully."),
       errorMessage: __("Failed to delete document"),
-    }
+    },
   );
 }
 
@@ -58,7 +56,7 @@ export function useDeleteDraftDocumentVersionMutation() {
     {
       successMessage: __("Draft deleted successfully."),
       errorMessage: __("Failed to delete draft"),
-    }
+    },
   );
 }
 
@@ -75,13 +73,10 @@ const bulkDeleteDocumentsMutation = graphql`
 export function useBulkDeleteDocumentsMutation() {
   const { __ } = useTranslate();
 
-  return useMutationWithToasts(
-    bulkDeleteDocumentsMutation,
-    {
-      successMessage: __("Documents deleted successfully."),
-      errorMessage: __("Failed to delete documents"),
-    }
-  );
+  return useMutationWithToasts(bulkDeleteDocumentsMutation, {
+    successMessage: __("Documents deleted successfully."),
+    errorMessage: __("Failed to delete documents"),
+  });
 }
 
 const sendSigningNotificationsMutation = graphql`
@@ -102,7 +97,7 @@ export function useSendSigningNotificationsMutation() {
     {
       successMessage: __("Signing notifications sent successfully."),
       errorMessage: __("Failed to send signing notifications"),
-    }
+    },
   );
 }
 
@@ -122,9 +117,11 @@ export function useBulkExportDocumentsMutation() {
   return useMutationWithToasts<DocumentGraphBulkExportDocumentsMutation>(
     bulkExportDocumentsMutation,
     {
-      successMessage: __("Document export started successfully. You will receive an email when the export is ready."),
+      successMessage: __(
+        "Document export started successfully. You will receive an email when the export is ready.",
+      ),
       errorMessage: __("Failed to start document export"),
-    }
+    },
   );
 }
 
diff --git a/apps/console/src/hooks/graph/MeasureGraph.ts b/apps/console/src/hooks/graph/MeasureGraph.ts
index c6195c1ec..b84121ab2 100644
--- a/apps/console/src/hooks/graph/MeasureGraph.ts
+++ b/apps/console/src/hooks/graph/MeasureGraph.ts
@@ -1,7 +1,7 @@
 import { useTranslate } from "@probo/i18n";
 import { graphql } from "relay-runtime";
 import { useMutationWithToasts } from "../useMutationWithToasts";
-import type { MeasureGraphDeleteMutation } from "./__generated__/MeasureGraphDeleteMutation.graphql";
+import type { MeasureGraphDeleteMutation } from "/__generated__/core/MeasureGraphDeleteMutation.graphql";
 
 export const measuresQuery = graphql`
   query MeasureGraphListQuery($organizationId: ID!) {
@@ -33,7 +33,7 @@ export function useDeleteMeasureMutation() {
     {
       successMessage: __("Measure deleted successfully."),
       errorMessage: __("Failed to delete measure"),
-    }
+    },
   );
 }
 
diff --git a/apps/console/src/hooks/graph/MeetingGraph.ts b/apps/console/src/hooks/graph/MeetingGraph.ts
index af3c72bf6..6c92bf1dc 100644
--- a/apps/console/src/hooks/graph/MeetingGraph.ts
+++ b/apps/console/src/hooks/graph/MeetingGraph.ts
@@ -1,8 +1,8 @@
 import { useTranslate } from "@probo/i18n";
 import { graphql } from "relay-runtime";
 import { useMutationWithToasts } from "../useMutationWithToasts";
-import type { MeetingGraphDeleteMutation } from "./__generated__/MeetingGraphDeleteMutation.graphql";
-import type { MeetingGraphUpdateMutation } from "./__generated__/MeetingGraphUpdateMutation.graphql";
+import type { MeetingGraphDeleteMutation } from "/__generated__/core/MeetingGraphDeleteMutation.graphql";
+import type { MeetingGraphUpdateMutation } from "/__generated__/core/MeetingGraphUpdateMutation.graphql";
 
 export const meetingsQuery = graphql`
   query MeetingGraphListQuery($organizationId: ID!) {
@@ -39,7 +39,7 @@ export function useDeleteMeetingMutation() {
     {
       successMessage: __("Meeting deleted successfully."),
       errorMessage: __("Failed to delete meeting"),
-    }
+    },
   );
 }
 
@@ -68,12 +68,15 @@ export function useUpdateMeetingMutation() {
     {
       successMessage: __("Meeting updated successfully."),
       errorMessage: __("Failed to update meeting"),
-    }
+    },
   );
 }
 
 const createMeetingMutation = graphql`
-  mutation MeetingGraphCreateMutation($input: CreateMeetingInput!, $connections: [ID!]!) {
+  mutation MeetingGraphCreateMutation(
+    $input: CreateMeetingInput!
+    $connections: [ID!]!
+  ) {
     createMeeting(input: $input) {
       meetingEdge @prependEdge(connections: $connections) {
         node {
@@ -94,12 +97,8 @@ const createMeetingMutation = graphql`
 export function useCreateMeetingMutation() {
   const { __ } = useTranslate();
 
-  return useMutationWithToasts(
-    createMeetingMutation,
-    {
-      successMessage: __("Meeting created successfully."),
-      errorMessage: __("Failed to create meeting"),
-    }
-  );
+  return useMutationWithToasts(createMeetingMutation, {
+    successMessage: __("Meeting created successfully."),
+    errorMessage: __("Failed to create meeting"),
+  });
 }
-
diff --git a/apps/console/src/hooks/graph/PeopleGraph.ts b/apps/console/src/hooks/graph/PeopleGraph.ts
index 3f49c2033..29a9fb0d7 100644
--- a/apps/console/src/hooks/graph/PeopleGraph.ts
+++ b/apps/console/src/hooks/graph/PeopleGraph.ts
@@ -1,5 +1,5 @@
 import { graphql } from "relay-runtime";
-import type { PeopleGraphQuery } from "./__generated__/PeopleGraphQuery.graphql";
+import type { PeopleGraphQuery } from "/__generated__/core/PeopleGraphQuery.graphql";
 import {
   useLazyLoadQuery,
   useMutation,
@@ -8,10 +8,10 @@ import {
   type PreloadedQuery,
 } from "react-relay";
 import { useMemo } from "react";
-import type { PeopleGraphPaginatedQuery } from "./__generated__/PeopleGraphPaginatedQuery.graphql";
-import type { PeopleGraphPaginatedFragment$key } from "./__generated__/PeopleGraphPaginatedFragment.graphql";
+import type { PeopleGraphPaginatedQuery } from "/__generated__/core/PeopleGraphPaginatedQuery.graphql";
+import type { PeopleGraphPaginatedFragment$key } from "/__generated__/core/PeopleGraphPaginatedFragment.graphql";
 import { useConfirm, useToast } from "@probo/ui";
-import type { PeopleGraphDeleteMutation } from "./__generated__/PeopleGraphDeleteMutation.graphql";
+import type { PeopleGraphDeleteMutation } from "/__generated__/core/PeopleGraphDeleteMutation.graphql";
 import {
   promisifyMutation,
   sprintf,
diff --git a/apps/console/src/hooks/graph/RiskGraph.ts b/apps/console/src/hooks/graph/RiskGraph.ts
index 8dc288c25..c7d64aa3f 100644
--- a/apps/console/src/hooks/graph/RiskGraph.ts
+++ b/apps/console/src/hooks/graph/RiskGraph.ts
@@ -1,14 +1,14 @@
 import { graphql } from "relay-runtime";
 import { useTranslate } from "@probo/i18n";
 import { useMutationWithToasts } from "../useMutationWithToasts.ts";
-import type { RiskGraphDeleteMutation } from "./__generated__/RiskGraphDeleteMutation.graphql.ts";
+import type { RiskGraphDeleteMutation } from "/__generated__/core/RiskGraphDeleteMutation.graphql.ts";
 import {
   usePreloadedQuery,
   usePaginationFragment,
   type PreloadedQuery,
 } from "react-relay";
-import type { RiskGraphListQuery } from "./__generated__/RiskGraphListQuery.graphql.ts";
-import type { RiskGraphFragment$key } from "./__generated__/RiskGraphFragment.graphql.ts";
+import type { RiskGraphListQuery } from "/__generated__/core/RiskGraphListQuery.graphql.ts";
+import type { RiskGraphFragment$key } from "/__generated__/core/RiskGraphFragment.graphql.ts";
 
 const deleteRiskMutation = graphql`
   mutation RiskGraphDeleteMutation(
@@ -44,7 +44,10 @@ const risksFragment = graphql`
   @refetchable(queryName: "RisksListQuery")
   @argumentDefinitions(
     first: { type: "Int", defaultValue: 50 }
-    order: { type: "RiskOrder", defaultValue: { direction: DESC, field: CREATED_AT } }
+    order: {
+      type: "RiskOrder"
+      defaultValue: { direction: DESC, field: CREATED_AT }
+    }
     after: { type: "CursorKey", defaultValue: null }
     before: { type: "CursorKey", defaultValue: null }
     last: { type: "Int", defaultValue: null }
diff --git a/apps/console/src/hooks/graph/StateOfApplicabilityGraph.ts b/apps/console/src/hooks/graph/StateOfApplicabilityGraph.ts
index ffcf30b49..cac1e012e 100644
--- a/apps/console/src/hooks/graph/StateOfApplicabilityGraph.ts
+++ b/apps/console/src/hooks/graph/StateOfApplicabilityGraph.ts
@@ -1,6 +1,6 @@
 import { graphql } from "relay-runtime";
-import type { StateOfApplicabilityGraphPaginatedQuery } from "./__generated__/StateOfApplicabilityGraphPaginatedQuery.graphql";
-import type { StateOfApplicabilityGraphPaginatedFragment$key } from "./__generated__/StateOfApplicabilityGraphPaginatedFragment.graphql";
+import type { StateOfApplicabilityGraphPaginatedQuery } from "/__generated__/core/StateOfApplicabilityGraphPaginatedQuery.graphql";
+import type { StateOfApplicabilityGraphPaginatedFragment$key } from "/__generated__/core/StateOfApplicabilityGraphPaginatedFragment.graphql";
 import {
   useMutation,
   usePaginationFragment,
@@ -8,7 +8,7 @@ import {
   type PreloadedQuery,
 } from "react-relay";
 import { useConfirm, useToast } from "@probo/ui";
-import type { StateOfApplicabilityGraphDeleteMutation } from "./__generated__/StateOfApplicabilityGraphDeleteMutation.graphql";
+import type { StateOfApplicabilityGraphDeleteMutation } from "/__generated__/core/StateOfApplicabilityGraphDeleteMutation.graphql";
 import {
   promisifyMutation,
   sprintf,
diff --git a/apps/console/src/hooks/graph/TrustCenterAccessGraph.ts b/apps/console/src/hooks/graph/TrustCenterAccessGraph.ts
index 639152f42..f9981503d 100644
--- a/apps/console/src/hooks/graph/TrustCenterAccessGraph.ts
+++ b/apps/console/src/hooks/graph/TrustCenterAccessGraph.ts
@@ -1,15 +1,19 @@
-import { graphql } from 'react-relay';
-import { useLazyLoadQuery, usePaginationFragment } from 'react-relay';
+import { graphql } from "react-relay";
+import { useLazyLoadQuery, usePaginationFragment } from "react-relay";
+import type { TrustCenterAccessGraphQuery } from "/__generated__/core/TrustCenterAccessGraphQuery.graphql";
 import type {
-  TrustCenterAccessGraphQuery,
-} from "./__generated__/TrustCenterAccessGraphQuery.graphql";
-import type { TrustCenterAccessGraph_accesses$data, TrustCenterAccessGraph_accesses$key } from './__generated__/TrustCenterAccessGraph_accesses.graphql';
+  TrustCenterAccessGraph_accesses$data,
+  TrustCenterAccessGraph_accesses$key,
+} from "/__generated__/core/TrustCenterAccessGraph_accesses.graphql";
 
 export const trustCenterAccessesPaginationFragment = graphql`
   fragment TrustCenterAccessGraph_accesses on TrustCenter
   @refetchable(queryName: "TrustCenterAccessGraphPaginationQuery") {
-    accesses(first: $count, after: $cursor, orderBy: { field: CREATED_AT, direction: DESC })
-      @connection(key: "TrustCenterAccessGraph_accesses") {
+    accesses(
+      first: $count
+      after: $cursor
+      orderBy: { field: CREATED_AT, direction: DESC }
+    ) @connection(key: "TrustCenterAccessGraph_accesses") {
       __id
       pageInfo {
         hasNextPage
@@ -36,7 +40,11 @@ export const trustCenterAccessesPaginationFragment = graphql`
 `;
 
 export const trustCenterAccessesQuery = graphql`
-  query TrustCenterAccessGraphQuery($trustCenterId: ID!, $count: Int!, $cursor: CursorKey) {
+  query TrustCenterAccessGraphQuery(
+    $trustCenterId: ID!
+    $count: Int!
+    $cursor: CursorKey
+  ) {
     node(id: $trustCenterId) {
       ... on TrustCenter {
         id
@@ -107,7 +115,10 @@ export const loadTrustCenterAccessDocumentAccessesQuery = graphql`
     node(id: $accessId) {
       ... on TrustCenterAccess {
         id
-        availableDocumentAccesses(first: 100, orderBy: { field: CREATED_AT, direction: DESC }) {
+        availableDocumentAccesses(
+          first: 100
+          orderBy: { field: CREATED_AT, direction: DESC }
+        ) {
           edges {
             node {
               id
@@ -153,9 +164,9 @@ export function useTrustCenterAccesses(trustCenterId: string): PaginatedData {
     {
       trustCenterId: trustCenterId || "",
       count: 10,
-      cursor: null
+      cursor: null,
     },
-    { fetchPolicy: 'store-and-network' }
+    { fetchPolicy: "store-and-network" },
   );
 
   const trustCenter = data?.node;
@@ -165,10 +176,10 @@ export function useTrustCenterAccesses(trustCenterId: string): PaginatedData {
     loadNext,
     hasNext,
     isLoadingNext,
-  } = usePaginationFragment<TrustCenterAccessGraphQuery, TrustCenterAccessGraph_accesses$key>(
-    trustCenterAccessesPaginationFragment,
-    trustCenter
-  );
+  } = usePaginationFragment<
+    TrustCenterAccessGraphQuery,
+    TrustCenterAccessGraph_accesses$key
+  >(trustCenterAccessesPaginationFragment, trustCenter);
 
   if (!trustCenterId) {
     return {
diff --git a/apps/console/src/hooks/graph/TrustCenterAuditGraph.ts b/apps/console/src/hooks/graph/TrustCenterAuditGraph.ts
index 324f711d6..1ed8909f6 100644
--- a/apps/console/src/hooks/graph/TrustCenterAuditGraph.ts
+++ b/apps/console/src/hooks/graph/TrustCenterAuditGraph.ts
@@ -1,7 +1,7 @@
 import { graphql } from "relay-runtime";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
 import { useTranslate } from "@probo/i18n";
-import type { TrustCenterAuditGraphUpdateMutation } from "./__generated__/TrustCenterAuditGraphUpdateMutation.graphql";
+import type { TrustCenterAuditGraphUpdateMutation } from "/__generated__/core/TrustCenterAuditGraphUpdateMutation.graphql";
 
 export const trustCenterAuditUpdateMutation = graphql`
   mutation TrustCenterAuditGraphUpdateMutation($input: UpdateAuditInput!) {
@@ -23,6 +23,6 @@ export function useTrustCenterAuditUpdate() {
     {
       successMessage: __("Audit visibility updated successfully."),
       errorMessage: __("Failed to update audit visibility"),
-    }
+    },
   );
 }
diff --git a/apps/console/src/hooks/graph/TrustCenterDocumentGraph.ts b/apps/console/src/hooks/graph/TrustCenterDocumentGraph.ts
index 5bead06e9..2b734c5f5 100644
--- a/apps/console/src/hooks/graph/TrustCenterDocumentGraph.ts
+++ b/apps/console/src/hooks/graph/TrustCenterDocumentGraph.ts
@@ -1,7 +1,7 @@
 import { graphql } from "relay-runtime";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
 import { useTranslate } from "@probo/i18n";
-import type { TrustCenterDocumentGraphUpdateMutation } from "./__generated__/TrustCenterDocumentGraphUpdateMutation.graphql";
+import type { TrustCenterDocumentGraphUpdateMutation } from "/__generated__/core/TrustCenterDocumentGraphUpdateMutation.graphql";
 
 export const trustCenterDocumentsQuery = graphql`
   query TrustCenterDocumentGraphQuery($organizationId: ID!) {
@@ -22,7 +22,9 @@ export const trustCenterDocumentsQuery = graphql`
 `;
 
 export const updateDocumentVisibilityMutation = graphql`
-  mutation TrustCenterDocumentGraphUpdateMutation($input: UpdateDocumentInput!) {
+  mutation TrustCenterDocumentGraphUpdateMutation(
+    $input: UpdateDocumentInput!
+  ) {
     updateDocument(input: $input) {
       document {
         id
@@ -41,6 +43,6 @@ export function useUpdateDocumentVisibilityMutation() {
     {
       successMessage: __("Document visibility updated successfully."),
       errorMessage: __("Failed to update document visibility"),
-    }
+    },
   );
 }
diff --git a/apps/console/src/hooks/graph/TrustCenterGraph.ts b/apps/console/src/hooks/graph/TrustCenterGraph.ts
index 2c9ce859e..abb0d5a8c 100644
--- a/apps/console/src/hooks/graph/TrustCenterGraph.ts
+++ b/apps/console/src/hooks/graph/TrustCenterGraph.ts
@@ -1,6 +1,6 @@
 import { graphql } from "relay-runtime";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
-import type { TrustCenterGraphUpdateMutation } from "./__generated__/TrustCenterGraphUpdateMutation.graphql";
+import type { TrustCenterGraphUpdateMutation } from "/__generated__/core/TrustCenterGraphUpdateMutation.graphql";
 
 export const trustCenterQuery = graphql`
   query TrustCenterGraphQuery($organizationId: ID!) {
@@ -19,7 +19,10 @@ export const trustCenterQuery = graphql`
           ndaFileUrl
           createdAt
           updatedAt
-          references(first: 100, orderBy: { field: CREATED_AT, direction: DESC }) {
+          references(
+            first: 100
+            orderBy: { field: CREATED_AT, direction: DESC }
+          ) {
             edges {
               node {
                 id
@@ -57,7 +60,8 @@ export const trustCenterQuery = graphql`
             }
           }
         }
-        trustCenterFiles(first: 100) @connection(key: "TrustCenterPage_trustCenterFiles") {
+        trustCenterFiles(first: 100)
+          @connection(key: "TrustCenterPage_trustCenterFiles") {
           __id
           edges {
             node {
@@ -100,12 +104,14 @@ export function useUpdateTrustCenterMutation() {
     {
       successMessage: "Trust center updated successfully",
       errorMessage: "Failed to update trust center",
-    }
+    },
   );
 }
 
 export const uploadTrustCenterNDAMutation = graphql`
-  mutation TrustCenterGraphUploadNDAMutation($input: UploadTrustCenterNDAInput!) {
+  mutation TrustCenterGraphUploadNDAMutation(
+    $input: UploadTrustCenterNDAInput!
+  ) {
     uploadTrustCenterNDA(input: $input) {
       trustCenter {
         id
@@ -117,17 +123,16 @@ export const uploadTrustCenterNDAMutation = graphql`
 `;
 
 export function useUploadTrustCenterNDAMutation() {
-  return useMutationWithToasts(
-    uploadTrustCenterNDAMutation,
-    {
-      successMessage: "NDA uploaded successfully",
-      errorMessage: "Failed to upload NDA",
-    }
-  );
+  return useMutationWithToasts(uploadTrustCenterNDAMutation, {
+    successMessage: "NDA uploaded successfully",
+    errorMessage: "Failed to upload NDA",
+  });
 }
 
 export const deleteTrustCenterNDAMutation = graphql`
-  mutation TrustCenterGraphDeleteNDAMutation($input: DeleteTrustCenterNDAInput!) {
+  mutation TrustCenterGraphDeleteNDAMutation(
+    $input: DeleteTrustCenterNDAInput!
+  ) {
     deleteTrustCenterNDA(input: $input) {
       trustCenter {
         id
@@ -139,11 +144,8 @@ export const deleteTrustCenterNDAMutation = graphql`
 `;
 
 export function useDeleteTrustCenterNDAMutation() {
-  return useMutationWithToasts(
-    deleteTrustCenterNDAMutation,
-    {
-      successMessage: "NDA deleted successfully",
-      errorMessage: "Failed to delete NDA",
-    }
-  );
+  return useMutationWithToasts(deleteTrustCenterNDAMutation, {
+    successMessage: "NDA deleted successfully",
+    errorMessage: "Failed to delete NDA",
+  });
 }
diff --git a/apps/console/src/hooks/graph/TrustCenterReferenceGraph.ts b/apps/console/src/hooks/graph/TrustCenterReferenceGraph.ts
index f09a53d88..9667dfa31 100644
--- a/apps/console/src/hooks/graph/TrustCenterReferenceGraph.ts
+++ b/apps/console/src/hooks/graph/TrustCenterReferenceGraph.ts
@@ -1,14 +1,14 @@
-import { graphql } from 'react-relay';
-import { useLazyLoadQuery } from 'react-relay';
+import { graphql } from "react-relay";
+import { useLazyLoadQuery } from "react-relay";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
 import type {
   TrustCenterReferenceGraphQuery,
-  TrustCenterReferenceGraphQuery$data
-} from "./__generated__/TrustCenterReferenceGraphQuery.graphql";
-import type { TrustCenterReferenceGraphCreateMutation } from "./__generated__/TrustCenterReferenceGraphCreateMutation.graphql";
-import type { TrustCenterReferenceGraphUpdateMutation } from "./__generated__/TrustCenterReferenceGraphUpdateMutation.graphql";
-import type { TrustCenterReferenceGraphUpdateRankMutation } from "./__generated__/TrustCenterReferenceGraphUpdateRankMutation.graphql";
-import type { TrustCenterReferenceGraphDeleteMutation } from "./__generated__/TrustCenterReferenceGraphDeleteMutation.graphql";
+  TrustCenterReferenceGraphQuery$data,
+} from "/__generated__/core/TrustCenterReferenceGraphQuery.graphql";
+import type { TrustCenterReferenceGraphCreateMutation } from "/__generated__/core/TrustCenterReferenceGraphCreateMutation.graphql";
+import type { TrustCenterReferenceGraphUpdateMutation } from "/__generated__/core/TrustCenterReferenceGraphUpdateMutation.graphql";
+import type { TrustCenterReferenceGraphUpdateRankMutation } from "/__generated__/core/TrustCenterReferenceGraphUpdateRankMutation.graphql";
+import type { TrustCenterReferenceGraphDeleteMutation } from "/__generated__/core/TrustCenterReferenceGraphDeleteMutation.graphql";
 
 export const trustCenterReferencesQuery = graphql`
   query TrustCenterReferenceGraphQuery($trustCenterId: ID!) {
@@ -96,11 +96,14 @@ export const deleteTrustCenterReferenceMutation = graphql`
   }
 `;
 
-export function useTrustCenterReferences(trustCenterId: string, refetchKey = 0): TrustCenterReferenceGraphQuery$data | null {
+export function useTrustCenterReferences(
+  trustCenterId: string,
+  refetchKey = 0,
+): TrustCenterReferenceGraphQuery$data | null {
   const data = useLazyLoadQuery<TrustCenterReferenceGraphQuery>(
     trustCenterReferencesQuery,
     { trustCenterId: trustCenterId || "" },
-    { fetchPolicy: 'network-only', fetchKey: refetchKey }
+    { fetchPolicy: "network-only", fetchKey: refetchKey },
   );
 
   return trustCenterId ? data : null;
@@ -112,7 +115,7 @@ export function useCreateTrustCenterReferenceMutation() {
     {
       successMessage: "Reference created successfully",
       errorMessage: "Failed to create reference",
-    }
+    },
   );
 }
 
@@ -122,7 +125,7 @@ export function useUpdateTrustCenterReferenceMutation() {
     {
       successMessage: "Reference updated successfully",
       errorMessage: "Failed to update reference",
-    }
+    },
   );
 }
 
@@ -145,7 +148,7 @@ export function useUpdateTrustCenterReferenceRankMutation() {
     {
       successMessage: "Order updated successfully",
       errorMessage: "Failed to update order",
-    }
+    },
   );
 }
 
@@ -155,6 +158,6 @@ export function useDeleteTrustCenterReferenceMutation() {
     {
       successMessage: "Reference deleted successfully",
       errorMessage: "Failed to delete reference",
-    }
+    },
   );
 }
diff --git a/apps/console/src/hooks/graph/TrustCenterVendorGraph.ts b/apps/console/src/hooks/graph/TrustCenterVendorGraph.ts
index b94e94308..c58bc8480 100644
--- a/apps/console/src/hooks/graph/TrustCenterVendorGraph.ts
+++ b/apps/console/src/hooks/graph/TrustCenterVendorGraph.ts
@@ -1,7 +1,7 @@
 import { graphql } from "relay-runtime";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
 import { useTranslate } from "@probo/i18n";
-import type { TrustCenterVendorGraphUpdateMutation } from "./__generated__/TrustCenterVendorGraphUpdateMutation.graphql";
+import type { TrustCenterVendorGraphUpdateMutation } from "/__generated__/core/TrustCenterVendorGraphUpdateMutation.graphql";
 
 export const trustCenterVendorUpdateMutation = graphql`
   mutation TrustCenterVendorGraphUpdateMutation($input: UpdateVendorInput!) {
@@ -23,6 +23,6 @@ export function useTrustCenterVendorUpdate() {
     {
       successMessage: __("Vendor visibility updated successfully."),
       errorMessage: __("Failed to update vendor visibility"),
-    }
+    },
   );
 }
diff --git a/apps/console/src/hooks/graph/VendorGraph.ts b/apps/console/src/hooks/graph/VendorGraph.ts
index 28324f8e2..9a2590f44 100644
--- a/apps/console/src/hooks/graph/VendorGraph.ts
+++ b/apps/console/src/hooks/graph/VendorGraph.ts
@@ -1,9 +1,9 @@
 import { useTranslate } from "@probo/i18n";
 import { graphql } from "relay-runtime";
 import { useMutationWithToasts } from "../useMutationWithToasts.ts";
-import type { VendorGraphCreateMutation } from "./__generated__/VendorGraphCreateMutation.graphql.ts";
-import type { VendorGraphDeleteMutation } from "./__generated__/VendorGraphDeleteMutation.graphql.ts";
-import type { VendorGraphSelectQuery } from "./__generated__/VendorGraphSelectQuery.graphql.ts";
+import type { VendorGraphCreateMutation } from "/__generated__/core/VendorGraphCreateMutation.graphql.ts";
+import type { VendorGraphDeleteMutation } from "/__generated__/core/VendorGraphDeleteMutation.graphql.ts";
+import type { VendorGraphSelectQuery } from "/__generated__/core/VendorGraphSelectQuery.graphql.ts";
 import { useMutation, useLazyLoadQuery } from "react-relay";
 import { useConfirm } from "@probo/ui";
 import { promisifyMutation, sprintf } from "@probo/helpers";
@@ -37,7 +37,7 @@ export function useCreateVendorMutation() {
     {
       successMessage: __("Vendor created successfully."),
       errorMessage: __("Failed to create vendor"),
-    }
+    },
   );
 }
 
@@ -54,7 +54,7 @@ const deleteVendorMutation = graphql`
 
 export const useDeleteVendor = (
   vendor: { id?: string; name?: string },
-  connectionId: string
+  connectionId: string,
 ) => {
   const [mutate] = useMutation<VendorGraphDeleteMutation>(deleteVendorMutation);
   const confirm = useConfirm();
@@ -77,11 +77,11 @@ export const useDeleteVendor = (
       {
         message: sprintf(
           __(
-            'This will permanently delete vendor "%s". This action cannot be undone.'
+            'This will permanently delete vendor "%s". This action cannot be undone.',
           ),
-          vendor.name
+          vendor.name,
         ),
-      }
+      },
     );
   };
 };
@@ -193,7 +193,7 @@ export function useVendors(organizationId: string) {
     {
       organizationId: organizationId,
     },
-    { fetchPolicy: "network-only" }
+    { fetchPolicy: "network-only" },
   );
   return useMemo(() => {
     return data.organization?.vendors?.edges.map((edge) => edge.node) ?? [];
diff --git a/apps/console/src/hooks/graph/usePaginatedMeasures.ts b/apps/console/src/hooks/graph/usePaginatedMeasures.ts
index 7f39907c6..d00fe9682 100644
--- a/apps/console/src/hooks/graph/usePaginatedMeasures.ts
+++ b/apps/console/src/hooks/graph/usePaginatedMeasures.ts
@@ -1,6 +1,6 @@
 import { graphql, useLazyLoadQuery, usePaginationFragment } from "react-relay";
-import type { usePaginatedMeasuresQuery } from "./__generated__/usePaginatedMeasuresQuery.graphql";
-import type { usePaginatedMeasuresFragment$key } from "./__generated__/usePaginatedMeasuresFragment.graphql";
+import type { usePaginatedMeasuresQuery } from "/__generated__/core/usePaginatedMeasuresQuery.graphql";
+import type { usePaginatedMeasuresFragment$key } from "/__generated__/core/usePaginatedMeasuresFragment.graphql";
 
 const measuresQuery = graphql`
   query usePaginatedMeasuresQuery($organizationId: ID!) {
@@ -47,11 +47,15 @@ const measuresFragment = graphql`
  * Hook to retrieve measured paginated (used for link dialog and measure selectors)
  */
 export function usePaginatedMeasures(organizationId: string) {
-  const query = useLazyLoadQuery<usePaginatedMeasuresQuery>(measuresQuery, {
-    organizationId,
-  }, { fetchPolicy: "network-only" });
+  const query = useLazyLoadQuery<usePaginatedMeasuresQuery>(
+    measuresQuery,
+    {
+      organizationId,
+    },
+    { fetchPolicy: "network-only" },
+  );
   return usePaginationFragment(
     measuresFragment,
-    query.organization as usePaginatedMeasuresFragment$key
+    query.organization as usePaginatedMeasuresFragment$key,
   );
 }
diff --git a/apps/console/src/layouts/MainLayout.tsx b/apps/console/src/layouts/MainLayout.tsx
new file mode 100644
index 000000000..4e3395c61
--- /dev/null
+++ b/apps/console/src/layouts/MainLayout.tsx
@@ -0,0 +1,556 @@
+import { useTranslate } from "@probo/i18n";
+import {
+  Avatar,
+  Badge,
+  Button,
+  Dropdown,
+  DropdownItem,
+  DropdownSeparator,
+  IconArrowBoxLeft,
+  IconBank,
+  IconBook,
+  IconBox,
+  IconCalendar2,
+  IconCheckmark1,
+  IconChevronGrabberVertical,
+  IconCircleProgress,
+  IconCircleQuestionmark,
+  IconClock,
+  IconCrossLargeX,
+  IconFire3,
+  IconGroup1,
+  IconInboxEmpty,
+  IconKey,
+  IconListStack,
+  IconLock,
+  IconMagnifyingGlass,
+  IconMedal,
+  IconPageTextLine,
+  IconPeopleAdd,
+  IconPlusLarge,
+  IconRotateCw,
+  IconSettingsGear2,
+  IconShield,
+  IconStore,
+  IconTodo,
+  Input,
+  Layout,
+  SidebarItem,
+  Skeleton,
+  UserDropdownItem,
+  UserDropdown as UserDropdownRoot,
+  useToast,
+} from "@probo/ui";
+import { Suspense, use, useEffect, useMemo, useState } from "react";
+import { ErrorBoundary } from "react-error-boundary";
+import { useLazyLoadQuery } from "react-relay";
+import { Link, Navigate, Outlet, useParams } from "react-router";
+import { graphql } from "relay-runtime";
+import type { MainLayoutQuery as MainLayoutQueryType } from "/__generated__/core/MainLayoutQuery.graphql";
+import { PageError } from "/components/PageError";
+import { PermissionsProvider } from "/providers/PermissionsProvider";
+import { PermissionsContext } from "/providers/PermissionsContext";
+
+const MainLayoutQuery = graphql`
+  query MainLayoutQuery($organizationId: ID!) {
+    viewer {
+      id
+    }
+    organization: node(id: $organizationId) {
+      ... on Organization {
+        id
+        name
+        logoUrl
+      }
+    }
+  }
+`;
+
+/**
+ * Site layout with a header and a sidebar
+ */
+export function MainLayout() {
+  const { organizationId } = useParams();
+
+  const prefix = `/organizations/${organizationId}`;
+
+  if (!organizationId) {
+    return <Navigate to="/" />;
+  }
+
+  return (
+    <Suspense fallback={<Skeleton className="w-full h-screen" />}>
+      <PermissionsProvider>
+        <MainLayoutContent organizationId={organizationId} prefix={prefix} />
+      </PermissionsProvider>
+    </Suspense>
+  );
+}
+
+function MainLayoutContent({
+  organizationId,
+  prefix,
+}: {
+  organizationId: string;
+  prefix: string;
+}) {
+  const { __ } = useTranslate();
+  const { isAuthorized } = use(PermissionsContext);
+  const data = useLazyLoadQuery<MainLayoutQueryType>(MainLayoutQuery, {
+    organizationId,
+  });
+
+  return (
+    <Layout
+      header={
+        <>
+          <div className="mr-auto">
+            <OrganizationSelector currentOrganization={data.organization} />
+          </div>
+          <Suspense fallback={<Skeleton className="w-32 h-8" />}>
+            <UserDropdown organizationId={organizationId} />
+          </Suspense>
+        </>
+      }
+      sidebar={
+        <ul className="space-y-[2px]">
+          {isAuthorized("Organization", "listMeetings") && (
+            <SidebarItem
+              label={__("Meetings")}
+              icon={IconCalendar2}
+              to={`${prefix}/meetings`}
+            />
+          )}
+          {isAuthorized("Organization", "listTasks") && (
+            <SidebarItem
+              label={__("Tasks")}
+              icon={IconInboxEmpty}
+              to={`${prefix}/tasks`}
+            />
+          )}
+          {isAuthorized("Organization", "listMeasures") && (
+            <SidebarItem
+              label={__("Measures")}
+              icon={IconTodo}
+              to={`${prefix}/measures`}
+            />
+          )}
+          {isAuthorized("Organization", "listRisks") && (
+            <SidebarItem
+              label={__("Risks")}
+              icon={IconFire3}
+              to={`${prefix}/risks`}
+            />
+          )}
+          {isAuthorized("Organization", "listFrameworks") && (
+            <SidebarItem
+              label={__("Frameworks")}
+              icon={IconBank}
+              to={`${prefix}/frameworks`}
+            />
+          )}
+          {isAuthorized("Organization", "listPeople") && (
+            <SidebarItem
+              label={__("People")}
+              icon={IconGroup1}
+              to={`${prefix}/people`}
+            />
+          )}
+          {isAuthorized("Organization", "listVendors") && (
+            <SidebarItem
+              label={__("Vendors")}
+              icon={IconStore}
+              to={`${prefix}/vendors`}
+            />
+          )}
+          {isAuthorized("Organization", "listDocuments") && (
+            <SidebarItem
+              label={__("Documents")}
+              icon={IconPageTextLine}
+              to={`${prefix}/documents`}
+            />
+          )}
+          {isAuthorized("Organization", "listAssets") && (
+            <SidebarItem
+              label={__("Assets")}
+              icon={IconBox}
+              to={`${prefix}/assets`}
+            />
+          )}
+          {isAuthorized("Organization", "listData") && (
+            <SidebarItem
+              label={__("Data")}
+              icon={IconListStack}
+              to={`${prefix}/data`}
+            />
+          )}
+          {isAuthorized("Organization", "listAudits") && (
+            <SidebarItem
+              label={__("Audits")}
+              icon={IconMedal}
+              to={`${prefix}/audits`}
+            />
+          )}
+          {isAuthorized("Organization", "listNonconformities") && (
+            <SidebarItem
+              label={__("Nonconformities")}
+              icon={IconCrossLargeX}
+              to={`${prefix}/nonconformities`}
+            />
+          )}
+          {isAuthorized("Organization", "listObligations") && (
+            <SidebarItem
+              label={__("Obligations")}
+              icon={IconBook}
+              to={`${prefix}/obligations`}
+            />
+          )}
+          {isAuthorized("Organization", "listContinualImprovements") && (
+            <SidebarItem
+              label={__("Continual Improvements")}
+              icon={IconRotateCw}
+              to={`${prefix}/continual-improvements`}
+            />
+          )}
+          {isAuthorized("Organization", "listProcessingActivities") && (
+            <SidebarItem
+              label={__("Processing Activities")}
+              icon={IconCircleProgress}
+              to={`${prefix}/processing-activities`}
+            />
+          )}
+          {isAuthorized("Organization", "listRightsRequests") && (
+            <SidebarItem
+              label={__("Rights Requests")}
+              icon={IconLock}
+              to={`${prefix}/rights-requests`}
+            />
+          )}
+          {isAuthorized("Organization", "listSnapshots") && (
+            <SidebarItem
+              label={__("Snapshots")}
+              icon={IconClock}
+              to={`${prefix}/snapshots`}
+            />
+          )}
+          {isAuthorized("Organization", "getTrustCenter") && (
+            <SidebarItem
+              label={__("Trust Center")}
+              icon={IconShield}
+              to={`${prefix}/trust-center`}
+            />
+          )}
+          {isAuthorized("Organization", "listMembers") && (
+            <SidebarItem
+              label={__("Settings")}
+              icon={IconSettingsGear2}
+              to={`${prefix}/settings`}
+            />
+          )}
+        </ul>
+      }
+    >
+      <ErrorBoundary FallbackComponent={PageError}>
+        <Outlet />
+      </ErrorBoundary>
+    </Layout>
+  );
+}
+
+function UserDropdown({ organizationId }: { organizationId: string }) {
+  const { __ } = useTranslate();
+  const { toast } = useToast();
+  const { isAuthorized } = use(PermissionsContext);
+  // const user = useLazyLoadQuery<MainLayoutQueryType>(MainLayoutQuery, {
+  //   organizationId,
+  // }).viewer.user;
+  const user = {
+    fullName: "",
+    email: "",
+  };
+
+  const handleLogout: React.MouseEventHandler<HTMLAnchorElement> = async (
+    e,
+  ) => {
+    e.preventDefault();
+
+    fetch("/connect/logout", {
+      method: "DELETE",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify({}),
+    })
+      .then(async (res) => {
+        if (!res.ok) {
+          const error = await res.json();
+          throw new Error(error.message || __("Failed to login"));
+        }
+
+        window.location.reload();
+      })
+      .catch((e) => {
+        toast({
+          title: __("Error"),
+          description: e.message as string,
+          variant: "error",
+        });
+      });
+  };
+
+  return (
+    <UserDropdownRoot fullName={user.fullName} email={user.email}>
+      {isAuthorized("Organization", "deleteOrganization") && (
+        <UserDropdownItem
+          to="/api-keys"
+          icon={IconKey}
+          label={__("API Keys")}
+        />
+      )}
+      {isAuthorized("Organization", "listSignableDocuments") && (
+        <UserDropdownItem
+          to={`/organizations/${organizationId}/employee`}
+          icon={IconPageTextLine}
+          label={__("My Signatures")}
+        />
+      )}
+      <UserDropdownItem
+        to="mailto:support@getprobo.com"
+        icon={IconCircleQuestionmark}
+        label={__("Help")}
+      />
+      <DropdownSeparator />
+      <UserDropdownItem
+        variant="danger"
+        to="/logout"
+        icon={IconArrowBoxLeft}
+        label="Logout"
+        onClick={handleLogout}
+      />
+    </UserDropdownRoot>
+  );
+}
+
+interface Organization {
+  id: string;
+  name: string;
+  logoUrl?: string | null;
+  authenticationMethod: string;
+  authStatus: "authenticated" | "unauthenticated" | "expired";
+  loginUrl: string;
+}
+
+interface OrganizationsResponse {
+  organizations: Organization[];
+}
+
+interface Invitation {
+  id: string;
+  email: string;
+  fullName: string;
+  role: string;
+  expiresAt: string;
+  acceptedAt?: string | null;
+  createdAt: string;
+  organization: {
+    id: string;
+    name: string;
+  };
+}
+
+interface InvitationsResponse {
+  invitations: Invitation[];
+}
+
+function OrganizationSelector({
+  currentOrganization,
+}: {
+  currentOrganization: MainLayoutQueryType["response"]["organization"];
+}) {
+  const [organizations, setOrganizations] = useState<Organization[]>([]);
+  const [pendingInvitationsCount, setPendingInvitationsCount] = useState(0);
+  const [isLoading, setIsLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
+  const [search, setSearch] = useState("");
+  const { __ } = useTranslate();
+
+  const filteredOrganizations = useMemo(() => {
+    if (!search.trim()) {
+      return organizations;
+    }
+    return organizations.filter((org) =>
+      org.name.toLowerCase().includes(search.toLowerCase()),
+    );
+  }, [organizations, search]);
+
+  useEffect(() => {
+    const fetchData = async () => {
+      try {
+        setIsLoading(true);
+
+        const [orgsResponse, invitationsResponse] = await Promise.all([
+          fetch("/connect/organizations", { credentials: "include" }),
+          fetch("/connect/invitations", { credentials: "include" }),
+        ]);
+
+        if (!orgsResponse.ok) {
+          throw new Error("Failed to fetch organizations");
+        }
+
+        if (!invitationsResponse.ok) {
+          throw new Error("Failed to fetch invitations");
+        }
+
+        const orgsData: OrganizationsResponse = await orgsResponse.json();
+        const invitationsData: InvitationsResponse =
+          await invitationsResponse.json();
+
+        const pendingCount = invitationsData.invitations.filter(
+          (inv) => !inv.acceptedAt,
+        ).length;
+
+        setOrganizations(orgsData.organizations);
+        setPendingInvitationsCount(pendingCount);
+        setError(null);
+      } catch (err) {
+        setError(err instanceof Error ? err.message : "Unknown error");
+        console.error("Failed to fetch data:", err);
+      } finally {
+        setIsLoading(false);
+      }
+    };
+
+    fetchData();
+  }, []);
+
+  if (error) {
+    return (
+      <div className="flex items-center gap-1">
+        <Button className="-ml-3" variant="tertiary" disabled>
+          {__("Error loading organizations")}
+        </Button>
+      </div>
+    );
+  }
+
+  return (
+    <div className="flex items-center gap-1">
+      <Dropdown
+        toggle={
+          <Button
+            className="-ml-3"
+            variant="tertiary"
+            iconAfter={IconChevronGrabberVertical}
+            disabled={isLoading}
+          >
+            {isLoading ? __("Loading...") : currentOrganization?.name || ""}
+          </Button>
+        }
+      >
+        <div className="px-3 py-2">
+          <Input
+            icon={IconMagnifyingGlass}
+            placeholder={__("Search organizations...")}
+            value={search}
+            onValueChange={setSearch}
+            onKeyDown={(e) => {
+              e.stopPropagation();
+            }}
+            autoFocus
+          />
+        </div>
+        <div className="max-h-150 overflow-y-auto scrollbar-thin scrollbar-thumb-gray-300 scrollbar-track-transparent hover:scrollbar-thumb-gray-400">
+          {isLoading ? (
+            <div className="px-3 py-2 text-gray-500">
+              {__("Loading organizations...")}
+            </div>
+          ) : filteredOrganizations.length === 0 ? (
+            <div className="px-3 py-2 text-txt-secondary">
+              {__("No organizations found")}
+            </div>
+          ) : (
+            filteredOrganizations.map((organization) => {
+              const isAuthenticated =
+                organization.authStatus === "authenticated";
+              const isExpired = organization.authStatus === "expired";
+              const needsAuth = organization.authStatus === "unauthenticated";
+
+              const targetUrl = isAuthenticated
+                ? `/organizations/${organization.id}`
+                : organization.loginUrl;
+
+              const isSAMLUrl = targetUrl.includes("/connect/saml/");
+
+              // Use organization endpoint for all logos for consistency
+              const logoUrl = organization.logoUrl;
+
+              return (
+                <DropdownItem asChild key={organization.id}>
+                  {isSAMLUrl ? (
+                    <a href={targetUrl} className="flex items-center gap-2">
+                      <Avatar name={organization.name} src={logoUrl} />
+                      <span className="flex-1">{organization.name}</span>
+                      {isAuthenticated && (
+                        <IconCheckmark1 size={16} className="text-green-600" />
+                      )}
+                      {isExpired && (
+                        <IconClock size={16} className="text-orange-600" />
+                      )}
+                      {needsAuth && (
+                        <IconLock size={16} className="text-gray-400" />
+                      )}
+                    </a>
+                  ) : (
+                    <Link to={targetUrl} className="flex items-center gap-2">
+                      <Avatar name={organization.name} src={logoUrl} />
+                      <span className="flex-1">{organization.name}</span>
+                      {isAuthenticated && (
+                        <IconCheckmark1 size={16} className="text-green-600" />
+                      )}
+                      {isExpired && (
+                        <IconClock size={16} className="text-orange-600" />
+                      )}
+                      {needsAuth && (
+                        <IconLock size={16} className="text-gray-400" />
+                      )}
+                    </Link>
+                  )}
+                </DropdownItem>
+              );
+            })
+          )}
+        </div>
+        <DropdownSeparator />
+        {pendingInvitationsCount > 0 && (
+          <DropdownItem asChild>
+            <Link to="/">
+              <IconPeopleAdd size={16} />
+              <span className="flex-1">{__("Invitations")}</span>
+              <Badge variant="info" size="sm">
+                {pendingInvitationsCount}
+              </Badge>
+            </Link>
+          </DropdownItem>
+        )}
+        <DropdownItem asChild>
+          <Link to="/organizations/new">
+            <IconPlusLarge size={16} />
+            {__("Add organization")}
+          </Link>
+        </DropdownItem>
+      </Dropdown>
+      {pendingInvitationsCount > 0 && (
+        <Link to="/" className="relative" title={__("Invitations")}>
+          <Button variant="tertiary" icon={IconPeopleAdd} />
+          <Badge
+            variant="info"
+            size="sm"
+            className="absolute -top-1 -right-1 min-w-[20px] h-5 flex items-center justify-center"
+          >
+            {pendingInvitationsCount}
+          </Badge>
+        </Link>
+      )}
+    </div>
+  );
+}
diff --git a/apps/console/src/pages/iam/apiKeys/APIKeysPage.tsx b/apps/console/src/pages/iam/apiKeys/APIKeysPage.tsx
index 733e167a6..7c1cdf26c 100644
--- a/apps/console/src/pages/iam/apiKeys/APIKeysPage.tsx
+++ b/apps/console/src/pages/iam/apiKeys/APIKeysPage.tsx
@@ -1,6 +1,6 @@
 import { graphql, usePreloadedQuery, type PreloadedQuery } from "react-relay";
 import { useTranslate } from "@probo/i18n";
-import type { APIKeysPageQuery } from "./__generated__/APIKeysPageQuery.graphql";
+import type { APIKeysPageQuery } from "/__generated__/iam/APIKeysPageQuery.graphql";
 import { PersonalAPIKeyList } from "./_components/PersonalAPIKeyList";
 
 export const apiKeysPageQuery = graphql`
diff --git a/apps/console/src/pages/iam/apiKeys/APIKeysPageLoader.tsx b/apps/console/src/pages/iam/apiKeys/APIKeysPageLoader.tsx
index 853f9cef1..48c6c476b 100644
--- a/apps/console/src/pages/iam/apiKeys/APIKeysPageLoader.tsx
+++ b/apps/console/src/pages/iam/apiKeys/APIKeysPageLoader.tsx
@@ -2,7 +2,7 @@ import { Suspense, useEffect } from "react";
 import { useQueryLoader } from "react-relay";
 import { CenteredLayoutSkeleton } from "@probo/ui";
 import { APIKeysPage, apiKeysPageQuery } from "./APIKeysPage";
-import type { APIKeysPageQuery } from "./__generated__/APIKeysPageQuery.graphql";
+import type { APIKeysPageQuery } from "/__generated__/iam/APIKeysPageQuery.graphql";
 import { IAMRelayProvider } from "/providers/IAMRelayProvider";
 
 function APIKeysPageLoaderInner() {
diff --git a/apps/console/src/pages/iam/apiKeys/_components/PersonalAPIKeyList.tsx b/apps/console/src/pages/iam/apiKeys/_components/PersonalAPIKeyList.tsx
index 6e0e08566..512b08590 100644
--- a/apps/console/src/pages/iam/apiKeys/_components/PersonalAPIKeyList.tsx
+++ b/apps/console/src/pages/iam/apiKeys/_components/PersonalAPIKeyList.tsx
@@ -27,10 +27,10 @@ import {
   useToast,
 } from "@probo/ui";
 import { useFormWithSchema } from "/hooks/useFormWithSchema";
-import type { PersonalAPIKeyListFragment$key } from "./__generated__/PersonalAPIKeyListFragment.graphql";
-import type { PersonalAPIKeyListCreateMutation } from "./__generated__/PersonalAPIKeyListCreateMutation.graphql";
-import type { PersonalAPIKeyListRevokeMutation } from "./__generated__/PersonalAPIKeyListRevokeMutation.graphql";
-import type { PersonalAPIKeyListRevealTokenMutation } from "./__generated__/PersonalAPIKeyListRevealTokenMutation.graphql";
+import type { PersonalAPIKeyListFragment$key } from "/__generated__/iam/PersonalAPIKeyListFragment.graphql";
+import type { PersonalAPIKeyListCreateMutation } from "/__generated__/iam/PersonalAPIKeyListCreateMutation.graphql";
+import type { PersonalAPIKeyListRevokeMutation } from "/__generated__/iam/PersonalAPIKeyListRevokeMutation.graphql";
+import type { PersonalAPIKeyListRevealTokenMutation } from "/__generated__/iam/PersonalAPIKeyListRevealTokenMutation.graphql";
 import { PersonalAPIKeysTable } from "./PersonalAPIKeysTable";
 import { PersonalAPIKeyTokenDialog } from "./PersonalAPIKeyTokenDialog";
 
@@ -157,7 +157,7 @@ export function PersonalAPIKeyList(props: {
     const expiresAt = computeExpiresAt(data.expiresIn);
     const connectionID = ConnectionHandler.getConnectionID(
       viewer.id,
-      "PersonalAPIKeyListFragment_personalAPIKeys"
+      "PersonalAPIKeyListFragment_personalAPIKeys",
     );
 
     createCommit({
@@ -207,7 +207,7 @@ export function PersonalAPIKeyList(props: {
               if (!viewerRecord) return;
               const connection = ConnectionHandler.getConnection(
                 viewerRecord,
-                "PersonalAPIKeyListFragment_personalAPIKeys"
+                "PersonalAPIKeyListFragment_personalAPIKeys",
               );
               if (connection) {
                 ConnectionHandler.deleteNode(connection, key.id);
@@ -219,7 +219,7 @@ export function PersonalAPIKeyList(props: {
                   title: __("Error"),
                   description: formatError(
                     __("Failed to revoke API key."),
-                    errors as GraphQLError[]
+                    errors as GraphQLError[],
                   ),
                   variant: "error",
                 });
@@ -238,7 +238,7 @@ export function PersonalAPIKeyList(props: {
                 title: __("Error"),
                 description: formatError(
                   __("Failed to revoke API key."),
-                  error
+                  error,
                 ),
                 variant: "error",
               });
@@ -250,11 +250,11 @@ export function PersonalAPIKeyList(props: {
       {
         title: __("Revoke API Key"),
         message: __(
-          `Are you sure you want to revoke the API key "${key.name}"? This action cannot be undone.`
+          `Are you sure you want to revoke the API key "${key.name}"? This action cannot be undone.`,
         ),
         label: __("Revoke"),
         variant: "danger",
-      }
+      },
     );
   };
 
@@ -271,7 +271,7 @@ export function PersonalAPIKeyList(props: {
             title: __("Error"),
             description: formatError(
               __("Failed to reveal API key token."),
-              errors as any
+              errors as any,
             ),
             variant: "error",
           });
@@ -296,7 +296,7 @@ export function PersonalAPIKeyList(props: {
           title: __("Error"),
           description: formatError(
             __("Failed to reveal API key token."),
-            error
+            error,
           ),
           variant: "error",
         });
diff --git a/apps/console/src/pages/iam/auth/SignInPage.tsx b/apps/console/src/pages/iam/auth/SignInPage.tsx
index e48df1fa2..5a97d1c4a 100644
--- a/apps/console/src/pages/iam/auth/SignInPage.tsx
+++ b/apps/console/src/pages/iam/auth/SignInPage.tsx
@@ -4,7 +4,7 @@ import type { FormEventHandler } from "react";
 import { useMutation } from "react-relay";
 import { Link } from "react-router";
 import { graphql } from "relay-runtime";
-import type { SignInPageMutation } from "./__generated__/SignInPageMutation.graphql";
+import type { SignInPageMutation } from "/__generated__/iam/SignInPageMutation.graphql";
 
 const signInMutation = graphql`
   mutation SignInPageMutation($input: SignInInput!) {
diff --git a/apps/console/src/pages/iam/memberships/MembershipLayout.tsx b/apps/console/src/pages/iam/memberships/MembershipLayout.tsx
index 27e15d615..08a4a2c16 100644
--- a/apps/console/src/pages/iam/memberships/MembershipLayout.tsx
+++ b/apps/console/src/pages/iam/memberships/MembershipLayout.tsx
@@ -3,7 +3,7 @@ import { Link, Outlet } from "react-router";
 import { Badge, Button, IconPeopleAdd, Layout, Skeleton } from "@probo/ui";
 import { Sidebar } from "./_components/Sidebar";
 import { MembershipsDropdown } from "./MembershipsDropdown";
-import type { MembershipLayoutQuery } from "./__generated__/MembershipLayoutQuery.graphql";
+import type { MembershipLayoutQuery } from "/__generated__/iam/MembershipLayoutQuery.graphql";
 import { PermissionsProvider } from "/providers/PermissionsProvider";
 import { SessionDropdown } from "./_components/SessionDropdown";
 import { Suspense } from "react";
diff --git a/apps/console/src/pages/iam/memberships/MembershipLayoutLoader.tsx b/apps/console/src/pages/iam/memberships/MembershipLayoutLoader.tsx
index 4e7433964..ce083fb9f 100644
--- a/apps/console/src/pages/iam/memberships/MembershipLayoutLoader.tsx
+++ b/apps/console/src/pages/iam/memberships/MembershipLayoutLoader.tsx
@@ -2,7 +2,7 @@ import { useQueryLoader } from "react-relay";
 import { Suspense, useEffect } from "react";
 import { Skeleton } from "@probo/ui";
 import { useOrganizationId } from "/hooks/useOrganizationId";
-import type { MembershipLayoutQuery } from "./__generated__/MembershipLayoutQuery.graphql";
+import type { MembershipLayoutQuery } from "/__generated__/iam/MembershipLayoutQuery.graphql";
 import { MembershipLayout, membershipLayoutQuery } from "./MembershipLayout";
 import { IAMRelayProvider } from "/providers/IAMRelayProvider";
 
diff --git a/apps/console/src/pages/iam/memberships/MembershipsDropdown.tsx b/apps/console/src/pages/iam/memberships/MembershipsDropdown.tsx
index e3bfe1c8a..9aef91c08 100644
--- a/apps/console/src/pages/iam/memberships/MembershipsDropdown.tsx
+++ b/apps/console/src/pages/iam/memberships/MembershipsDropdown.tsx
@@ -18,10 +18,10 @@ import {
   MembershipsDropdownMenu,
   membershipsDropdownMenuQuery,
 } from "./MembershipsDropdownMenu";
-import type { MembershipsDropdownMenuQuery } from "./__generated__/MembershipsDropdownMenuQuery.graphql";
+import type { MembershipsDropdownMenuQuery } from "/__generated__/iam/MembershipsDropdownMenuQuery.graphql";
 import { Link } from "react-router";
-import type { MembershipsDropdown_organizationFragment$key } from "./__generated__/MembershipsDropdown_organizationFragment.graphql";
-import type { MembershipsDropdown_viewerFragment$key } from "./__generated__/MembershipsDropdown_viewerFragment.graphql";
+import type { MembershipsDropdown_organizationFragment$key } from "/__generated__/iam/MembershipsDropdown_organizationFragment.graphql";
+import type { MembershipsDropdown_viewerFragment$key } from "/__generated__/iam/MembershipsDropdown_viewerFragment.graphql";
 
 const organizationFragment = graphql`
   fragment MembershipsDropdown_organizationFragment on Organization {
diff --git a/apps/console/src/pages/iam/memberships/MembershipsDropdownMenu.tsx b/apps/console/src/pages/iam/memberships/MembershipsDropdownMenu.tsx
index e1c773839..f23c54bb4 100644
--- a/apps/console/src/pages/iam/memberships/MembershipsDropdownMenu.tsx
+++ b/apps/console/src/pages/iam/memberships/MembershipsDropdownMenu.tsx
@@ -1,5 +1,5 @@
 import { graphql, usePreloadedQuery, type PreloadedQuery } from "react-relay";
-import type { MembershipsDropdownMenuQuery } from "./__generated__/MembershipsDropdownMenuQuery.graphql";
+import type { MembershipsDropdownMenuQuery } from "/__generated__/iam/MembershipsDropdownMenuQuery.graphql";
 import { useMemo } from "react";
 import { MembershipsDropdownMenuItem } from "./MembershipsDropdownMenuItem";
 
diff --git a/apps/console/src/pages/iam/memberships/MembershipsDropdownMenuItem.tsx b/apps/console/src/pages/iam/memberships/MembershipsDropdownMenuItem.tsx
index 3c11fceb9..80c156279 100644
--- a/apps/console/src/pages/iam/memberships/MembershipsDropdownMenuItem.tsx
+++ b/apps/console/src/pages/iam/memberships/MembershipsDropdownMenuItem.tsx
@@ -6,12 +6,12 @@ import {
   IconLock,
 } from "@probo/ui";
 import { graphql } from "relay-runtime";
-import type { MembershipsDropdownMenuItemFragment$key } from "./__generated__/MembershipsDropdownMenuItemFragment.graphql";
+import type { MembershipsDropdownMenuItemFragment$key } from "/__generated__/iam/MembershipsDropdownMenuItemFragment.graphql";
 import { useFragment, useMutation } from "react-relay";
 import { parseDate } from "@probo/helpers";
 import { useCallback } from "react";
 import { useNavigate } from "react-router";
-import type { MembershipsDropdownMenuItem_assumeMutation } from "./__generated__/MembershipsDropdownMenuItem_assumeMutation.graphql";
+import type { MembershipsDropdownMenuItem_assumeMutation } from "/__generated__/iam/MembershipsDropdownMenuItem_assumeMutation.graphql";
 
 const fragment = graphql`
   fragment MembershipsDropdownMenuItemFragment on Membership {
diff --git a/apps/console/src/pages/iam/memberships/MembershipsPage.tsx b/apps/console/src/pages/iam/memberships/MembershipsPage.tsx
index 0fba51228..d37af6a38 100644
--- a/apps/console/src/pages/iam/memberships/MembershipsPage.tsx
+++ b/apps/console/src/pages/iam/memberships/MembershipsPage.tsx
@@ -10,7 +10,7 @@ import {
 import { useMemo, useState } from "react";
 import { InvitationCard } from "./_components/InvitationCard";
 import { MembershipCard } from "./_components/MembershipCard";
-import type { MembershipsPageQuery } from "./__generated__/MembershipsPageQuery.graphql";
+import type { MembershipsPageQuery } from "/__generated__/iam/MembershipsPageQuery.graphql";
 
 export const membershipsPageQuery = graphql`
   query MembershipsPageQuery {
diff --git a/apps/console/src/pages/iam/memberships/MembershipsPageLoader.tsx b/apps/console/src/pages/iam/memberships/MembershipsPageLoader.tsx
index 66695c4e3..6822ef3b3 100644
--- a/apps/console/src/pages/iam/memberships/MembershipsPageLoader.tsx
+++ b/apps/console/src/pages/iam/memberships/MembershipsPageLoader.tsx
@@ -1,7 +1,7 @@
 import { useQueryLoader } from "react-relay";
 import { Suspense, useEffect } from "react";
 import { CenteredLayoutSkeleton } from "@probo/ui";
-import type { MembershipsPageQuery } from "./__generated__/MembershipsPageQuery.graphql";
+import type { MembershipsPageQuery } from "/__generated__/iam/MembershipsPageQuery.graphql";
 import { MembershipsPage, membershipsPageQuery } from "./MembershipsPage";
 import { IAMRelayProvider } from "/providers/IAMRelayProvider";
 
diff --git a/apps/console/src/pages/iam/memberships/_components/InvitationCard.tsx b/apps/console/src/pages/iam/memberships/_components/InvitationCard.tsx
index 627616931..e0b131f55 100644
--- a/apps/console/src/pages/iam/memberships/_components/InvitationCard.tsx
+++ b/apps/console/src/pages/iam/memberships/_components/InvitationCard.tsx
@@ -3,7 +3,7 @@ import { useTranslate } from "@probo/i18n";
 import { Card } from "@probo/ui";
 import { graphql } from "relay-runtime";
 import { useFragment } from "react-relay";
-import type { InvitationCardFragment$key } from "./__generated__/InvitationCardFragment.graphql";
+import type { InvitationCardFragment$key } from "/__generated__/iam/InvitationCardFragment.graphql";
 
 const fragment = graphql`
   fragment InvitationCardFragment on Invitation {
diff --git a/apps/console/src/pages/iam/memberships/_components/MembershipCard.tsx b/apps/console/src/pages/iam/memberships/_components/MembershipCard.tsx
index 068f0cb28..55f47effd 100644
--- a/apps/console/src/pages/iam/memberships/_components/MembershipCard.tsx
+++ b/apps/console/src/pages/iam/memberships/_components/MembershipCard.tsx
@@ -11,10 +11,10 @@ import {
 import { Link, useNavigate } from "react-router";
 import { graphql } from "relay-runtime";
 import { useFragment, useMutation } from "react-relay";
-import type { MembershipCardFragment$key } from "./__generated__/MembershipCardFragment.graphql";
+import type { MembershipCardFragment$key } from "/__generated__/iam/MembershipCardFragment.graphql";
 import { parseDate } from "@probo/helpers";
 import { useCallback } from "react";
-import type { MembershipCard_assumeMutation } from "./__generated__/MembershipCard_assumeMutation.graphql";
+import type { MembershipCard_assumeMutation } from "/__generated__/iam/MembershipCard_assumeMutation.graphql";
 
 const fragment = graphql`
   fragment MembershipCardFragment on Membership {
@@ -60,7 +60,7 @@ export function MembershipCard(props: MembershipCardProps) {
 
   const { lastSession, organization } = useFragment<MembershipCardFragment$key>(
     fragment,
-    fKey
+    fKey,
   );
   const isAuthenticated = !!lastSession;
   const isExpired =
@@ -68,7 +68,7 @@ export function MembershipCard(props: MembershipCardProps) {
 
   const [assumeOrganizationSession] =
     useMutation<MembershipCard_assumeMutation>(
-      assumeOrganizationSessionMutation
+      assumeOrganizationSessionMutation,
     );
 
   const handleAssumeOrganizationSession = useCallback(() => {
diff --git a/apps/console/src/pages/iam/memberships/_components/SessionDropdown.tsx b/apps/console/src/pages/iam/memberships/_components/SessionDropdown.tsx
index fa52fcc18..cfaf5fe4e 100644
--- a/apps/console/src/pages/iam/memberships/_components/SessionDropdown.tsx
+++ b/apps/console/src/pages/iam/memberships/_components/SessionDropdown.tsx
@@ -14,7 +14,7 @@ import { graphql } from "relay-runtime";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import { useFragment, useMutation } from "react-relay";
 import { useTranslate } from "@probo/i18n";
-import type { SessionDropdownFragment$key } from "./__generated__/SessionDropdownFragment.graphql";
+import type { SessionDropdownFragment$key } from "/__generated__/iam/SessionDropdownFragment.graphql";
 
 export const fragment = graphql`
   fragment SessionDropdownFragment on Organization {
diff --git a/apps/console/src/pages/iam/memberships/_components/Sidebar.tsx b/apps/console/src/pages/iam/memberships/_components/Sidebar.tsx
index 965c14b2f..27ae304d7 100644
--- a/apps/console/src/pages/iam/memberships/_components/Sidebar.tsx
+++ b/apps/console/src/pages/iam/memberships/_components/Sidebar.tsx
@@ -24,7 +24,7 @@ import { useTranslate } from "@probo/i18n";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import { graphql } from "relay-runtime";
 import { useFragment } from "react-relay";
-import type { SidebarFragment$key } from "./__generated__/SidebarFragment.graphql";
+import type { SidebarFragment$key } from "/__generated__/iam/SidebarFragment.graphql";
 
 const fragment = graphql`
   fragment SidebarFragment on Identity
diff --git a/apps/console/src/pages/iam/organizations/NewOrganizationPage.tsx b/apps/console/src/pages/iam/organizations/NewOrganizationPage.tsx
index 9f15e9ef8..eee7fba7e 100644
--- a/apps/console/src/pages/iam/organizations/NewOrganizationPage.tsx
+++ b/apps/console/src/pages/iam/organizations/NewOrganizationPage.tsx
@@ -4,7 +4,7 @@ import { graphql, useMutation } from "react-relay";
 import type { FormEventHandler } from "react";
 import { useNavigate } from "react-router";
 import { formatError, type GraphQLError } from "@probo/helpers";
-import type { NewOrganizationPageMutation } from "./__generated__/NewOrganizationPageMutation.graphql";
+import type { NewOrganizationPageMutation } from "/__generated__/iam/NewOrganizationPageMutation.graphql";
 import { IAMRelayProvider } from "/providers/IAMRelayProvider";
 
 const createOrganizationMutation = graphql`
diff --git a/apps/console/src/pages/iam/organizations/settings/GeneralSettingsPage.tsx b/apps/console/src/pages/iam/organizations/settings/GeneralSettingsPage.tsx
index 05f0191ec..a0c803dba 100644
--- a/apps/console/src/pages/iam/organizations/settings/GeneralSettingsPage.tsx
+++ b/apps/console/src/pages/iam/organizations/settings/GeneralSettingsPage.tsx
@@ -6,8 +6,8 @@ import { useNavigate } from "react-router";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
 import { graphql } from "relay-runtime";
 import { usePreloadedQuery, type PreloadedQuery } from "react-relay";
-import type { GeneralSettingsPageQuery } from "./__generated__/GeneralSettingsPageQuery.graphql";
-import type { GeneralSettingsPage_deleteMutation } from "./__generated__/GeneralSettingsPage_deleteMutation.graphql";
+import type { GeneralSettingsPageQuery } from "/__generated__/iam/GeneralSettingsPageQuery.graphql";
+import type { GeneralSettingsPage_deleteMutation } from "/__generated__/iam/GeneralSettingsPage_deleteMutation.graphql";
 import { DeleteOrganizationDialog } from "/components/organizations/DeleteOrganizationDialog";
 import { OrganizationForm } from "./_components/OrganizationForm";
 
diff --git a/apps/console/src/pages/iam/organizations/settings/GeneralSettingsPageLoader.tsx b/apps/console/src/pages/iam/organizations/settings/GeneralSettingsPageLoader.tsx
index 1c09b9157..55a502d20 100644
--- a/apps/console/src/pages/iam/organizations/settings/GeneralSettingsPageLoader.tsx
+++ b/apps/console/src/pages/iam/organizations/settings/GeneralSettingsPageLoader.tsx
@@ -5,7 +5,7 @@ import {
   GeneralSettingsPage,
   generalSettingsPageQuery,
 } from "./GeneralSettingsPage";
-import type { GeneralSettingsPageQuery } from "./__generated__/GeneralSettingsPageQuery.graphql";
+import type { GeneralSettingsPageQuery } from "/__generated__/iam/GeneralSettingsPageQuery.graphql";
 import { IAMRelayProvider } from "/providers/IAMRelayProvider";
 
 function GeneralSettingsPageLoader() {
diff --git a/apps/console/src/pages/iam/organizations/settings/MembersPage.tsx b/apps/console/src/pages/iam/organizations/settings/MembersPage.tsx
index cc6efde04..186792228 100644
--- a/apps/console/src/pages/iam/organizations/settings/MembersPage.tsx
+++ b/apps/console/src/pages/iam/organizations/settings/MembersPage.tsx
@@ -1,7 +1,7 @@
 import { usePreloadedQuery, type PreloadedQuery } from "react-relay";
 import { graphql } from "relay-runtime";
 import { MemberList } from "./_components/MemberList";
-import type { MembersPageQuery } from "./__generated__/MembersPageQuery.graphql";
+import type { MembersPageQuery } from "/__generated__/iam/MembersPageQuery.graphql";
 import { useTranslate } from "@probo/i18n";
 import { Button, Card, TabBadge, TabItem, Tabs } from "@probo/ui";
 import { useState } from "react";
diff --git a/apps/console/src/pages/iam/organizations/settings/MembersPageLoader.tsx b/apps/console/src/pages/iam/organizations/settings/MembersPageLoader.tsx
index aac0ab0fc..f8be175f6 100644
--- a/apps/console/src/pages/iam/organizations/settings/MembersPageLoader.tsx
+++ b/apps/console/src/pages/iam/organizations/settings/MembersPageLoader.tsx
@@ -3,7 +3,7 @@ import { MembersPage, membersPageQuery } from "./MembersPage";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import { IAMRelayProvider } from "/providers/IAMRelayProvider";
 import { useEffect } from "react";
-import type { MembersPageQuery } from "./__generated__/MembersPageQuery.graphql";
+import type { MembersPageQuery } from "/__generated__/iam/MembersPageQuery.graphql";
 
 function MembersPageLoader() {
   const organizationId = useOrganizationId();
diff --git a/apps/console/src/pages/iam/organizations/settings/SAMLSettingsPage.tsx b/apps/console/src/pages/iam/organizations/settings/SAMLSettingsPage.tsx
index dca324d55..15325f80f 100644
--- a/apps/console/src/pages/iam/organizations/settings/SAMLSettingsPage.tsx
+++ b/apps/console/src/pages/iam/organizations/settings/SAMLSettingsPage.tsx
@@ -4,7 +4,7 @@ import {
   useQueryLoader,
   type PreloadedQuery,
 } from "react-relay";
-import type { SAMLSettingsPageQuery } from "./__generated__/SAMLSettingsPageQuery.graphql";
+import type { SAMLSettingsPageQuery } from "/__generated__/iam/SAMLSettingsPageQuery.graphql";
 import { Suspense, use, useState } from "react";
 import { PermissionsContext } from "/providers/PermissionsContext";
 import { Breadcrumb, Button, Dialog, useDialogRef } from "@probo/ui";
@@ -15,7 +15,7 @@ import {
   EditSAMLConfigurationForm,
   samlConfigurationFormQuery,
 } from "./_components/EditSAMLConfigurationForm";
-import type { EditSAMLConfigurationFormQuery } from "./_components/__generated__/EditSAMLConfigurationFormQuery.graphql";
+import type { EditSAMLConfigurationFormQuery } from "/__generated__/iam/EditSAMLConfigurationFormQuery.graphql";
 import { SAMLDomainVerifyDialog } from "./_components/SAMLDomainVerifyDialog";
 
 export const samlSettingsPageQuery = graphql`
diff --git a/apps/console/src/pages/iam/organizations/settings/SAMLSettingsPageLoader.tsx b/apps/console/src/pages/iam/organizations/settings/SAMLSettingsPageLoader.tsx
index 282dae6de..6ba3d6342 100644
--- a/apps/console/src/pages/iam/organizations/settings/SAMLSettingsPageLoader.tsx
+++ b/apps/console/src/pages/iam/organizations/settings/SAMLSettingsPageLoader.tsx
@@ -3,7 +3,7 @@ import { SAMLSettingsPage, samlSettingsPageQuery } from "./SAMLSettingsPage";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import { IAMRelayProvider } from "/providers/IAMRelayProvider";
 import { useEffect } from "react";
-import type { SAMLSettingsPageQuery } from "./__generated__/SAMLSettingsPageQuery.graphql";
+import type { SAMLSettingsPageQuery } from "/__generated__/iam/SAMLSettingsPageQuery.graphql";
 
 function SAMLSettingsPageLoader() {
   const organizationId = useOrganizationId();
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/EditMemberDialog.tsx b/apps/console/src/pages/iam/organizations/settings/_components/EditMemberDialog.tsx
index f9cf1cd35..0e9a093ef 100644
--- a/apps/console/src/pages/iam/organizations/settings/_components/EditMemberDialog.tsx
+++ b/apps/console/src/pages/iam/organizations/settings/_components/EditMemberDialog.tsx
@@ -14,7 +14,7 @@ import { useState } from "react";
 import { graphql } from "relay-runtime";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
 import { useOrganizationId } from "/hooks/useOrganizationId";
-import type { MemberListItemFragment$data } from "./__generated__/MemberListItemFragment.graphql";
+import type { MemberListItemFragment$data } from "/__generated__/iam/MemberListItemFragment.graphql";
 
 const updateMembershipMutation = graphql`
   mutation EditMemberDialog_updateMutation($input: UpdateMembershipInput!) {
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/EditSAMLConfigurationForm.tsx b/apps/console/src/pages/iam/organizations/settings/_components/EditSAMLConfigurationForm.tsx
index f5e3615a4..0ec1970a3 100644
--- a/apps/console/src/pages/iam/organizations/settings/_components/EditSAMLConfigurationForm.tsx
+++ b/apps/console/src/pages/iam/organizations/settings/_components/EditSAMLConfigurationForm.tsx
@@ -1,8 +1,8 @@
 import { usePreloadedQuery, type PreloadedQuery } from "react-relay";
 import { graphql } from "relay-runtime";
-import type { EditSAMLConfigurationForm_updateMutation } from "./__generated__/EditSAMLConfigurationForm_updateMutation.graphql";
+import type { EditSAMLConfigurationForm_updateMutation } from "/__generated__/iam/EditSAMLConfigurationForm_updateMutation.graphql";
 import { useCallback } from "react";
-import type { EditSAMLConfigurationFormQuery } from "./__generated__/EditSAMLConfigurationFormQuery.graphql";
+import type { EditSAMLConfigurationFormQuery } from "/__generated__/iam/EditSAMLConfigurationFormQuery.graphql";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import {
   SAMLConfigurationForm,
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/InvitationList.tsx b/apps/console/src/pages/iam/organizations/settings/_components/InvitationList.tsx
index 5da504d58..90c2c12ec 100644
--- a/apps/console/src/pages/iam/organizations/settings/_components/InvitationList.tsx
+++ b/apps/console/src/pages/iam/organizations/settings/_components/InvitationList.tsx
@@ -3,9 +3,9 @@ import { SortableTable, SortableTh } from "/components/SortableTable";
 import { useTranslate } from "@probo/i18n";
 import { graphql, usePaginationFragment } from "react-relay";
 import { InvitationListItem } from "./InvitationListItem";
-import type { InvitationListFragment$key } from "./__generated__/InvitationListFragment.graphql";
-import type { InvitationListItem_permissionsFragment$key } from "./__generated__/InvitationListItem_permissionsFragment.graphql";
-import type { InvitationListFragment_RefetchQuery } from "./__generated__/InvitationListFragment_RefetchQuery.graphql";
+import type { InvitationListFragment$key } from "/__generated__/iam/InvitationListFragment.graphql";
+import type { InvitationListItem_permissionsFragment$key } from "/__generated__/iam/InvitationListItem_permissionsFragment.graphql";
+import type { InvitationListFragment_RefetchQuery } from "/__generated__/iam/InvitationListFragment_RefetchQuery.graphql";
 
 const fragment = graphql`
   fragment InvitationListFragment on Organization
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/InvitationListItem.tsx b/apps/console/src/pages/iam/organizations/settings/_components/InvitationListItem.tsx
index c5e73fe28..f83a03d03 100644
--- a/apps/console/src/pages/iam/organizations/settings/_components/InvitationListItem.tsx
+++ b/apps/console/src/pages/iam/organizations/settings/_components/InvitationListItem.tsx
@@ -14,8 +14,8 @@ import { graphql } from "relay-runtime";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
 import { sprintf } from "@probo/helpers";
 import { useOrganizationId } from "/hooks/useOrganizationId";
-import type { InvitationListItemFragment$key } from "./__generated__/InvitationListItemFragment.graphql";
-import type { InvitationListItem_permissionsFragment$key } from "./__generated__/InvitationListItem_permissionsFragment.graphql";
+import type { InvitationListItemFragment$key } from "/__generated__/iam/InvitationListItemFragment.graphql";
+import type { InvitationListItem_permissionsFragment$key } from "/__generated__/iam/InvitationListItem_permissionsFragment.graphql";
 
 const fragment = graphql`
   fragment InvitationListItemFragment on Invitation {
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/InviteUserDialog.tsx b/apps/console/src/pages/iam/organizations/settings/_components/InviteUserDialog.tsx
index c39a094d9..95680d264 100644
--- a/apps/console/src/pages/iam/organizations/settings/_components/InviteUserDialog.tsx
+++ b/apps/console/src/pages/iam/organizations/settings/_components/InviteUserDialog.tsx
@@ -19,7 +19,7 @@ import { useFormWithSchema } from "/hooks/useFormWithSchema";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import type { PropsWithChildren } from "react";
-import type { InviteUserDialog_currentRoleFragment$key } from "./__generated__/InviteUserDialog_currentRoleFragment.graphql";
+import type { InviteUserDialog_currentRoleFragment$key } from "/__generated__/iam/InviteUserDialog_currentRoleFragment.graphql";
 
 const currentRoleFragment = graphql`
   fragment InviteUserDialog_currentRoleFragment on Organization {
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/MemberList.tsx b/apps/console/src/pages/iam/organizations/settings/_components/MemberList.tsx
index 720f9630d..2cdde5306 100644
--- a/apps/console/src/pages/iam/organizations/settings/_components/MemberList.tsx
+++ b/apps/console/src/pages/iam/organizations/settings/_components/MemberList.tsx
@@ -2,10 +2,10 @@ import { graphql, usePaginationFragment } from "react-relay";
 import { Tbody, Td, Th, Thead, Tr } from "@probo/ui";
 import { useTranslate } from "@probo/i18n";
 import { SortableTable, SortableTh } from "/components/SortableTable";
-import type { MemberListFragment_RefetchQuery } from "./__generated__/MemberListFragment_RefetchQuery.graphql";
+import type { MemberListFragment_RefetchQuery } from "/__generated__/iam/MemberListFragment_RefetchQuery.graphql";
 import { MemberListItem } from "./MemberListItem";
-import type { MemberListFragment$key } from "./__generated__/MemberListFragment.graphql";
-import type { MemberListItem_permissionsFragment$key } from "./__generated__/MemberListItem_permissionsFragment.graphql";
+import type { MemberListFragment$key } from "/__generated__/iam/MemberListFragment.graphql";
+import type { MemberListItem_permissionsFragment$key } from "/__generated__/iam/MemberListItem_permissionsFragment.graphql";
 
 const fragment = graphql`
   fragment MemberListFragment on Organization
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/MemberListItem.tsx b/apps/console/src/pages/iam/organizations/settings/_components/MemberListItem.tsx
index 53cbbc05f..d30aac978 100644
--- a/apps/console/src/pages/iam/organizations/settings/_components/MemberListItem.tsx
+++ b/apps/console/src/pages/iam/organizations/settings/_components/MemberListItem.tsx
@@ -13,9 +13,9 @@ import clsx from "clsx";
 import { useState } from "react";
 import { useFragment } from "react-relay";
 import { graphql } from "relay-runtime";
-import type { MemberListItemFragment$key } from "./__generated__/MemberListItemFragment.graphql";
-import type { MemberListItem_permissionsFragment$key } from "./__generated__/MemberListItem_permissionsFragment.graphql";
-import type { MemberListItem_currentRoleFragment$key } from "./__generated__/MemberListItem_currentRoleFragment.graphql";
+import type { MemberListItemFragment$key } from "/__generated__/iam/MemberListItemFragment.graphql";
+import type { MemberListItem_permissionsFragment$key } from "/__generated__/iam/MemberListItem_permissionsFragment.graphql";
+import type { MemberListItem_currentRoleFragment$key } from "/__generated__/iam/MemberListItem_currentRoleFragment.graphql";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import { sprintf } from "@probo/helpers";
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/NewSAMLConfigurationForm.tsx b/apps/console/src/pages/iam/organizations/settings/_components/NewSAMLConfigurationForm.tsx
index 24637ea56..3f8710dec 100644
--- a/apps/console/src/pages/iam/organizations/settings/_components/NewSAMLConfigurationForm.tsx
+++ b/apps/console/src/pages/iam/organizations/settings/_components/NewSAMLConfigurationForm.tsx
@@ -1,5 +1,5 @@
 import { ConnectionHandler, graphql } from "react-relay";
-import type { NewSAMLConfigurationForm_createMutation } from "./__generated__/NewSAMLConfigurationForm_createMutation.graphql";
+import type { NewSAMLConfigurationForm_createMutation } from "/__generated__/iam/NewSAMLConfigurationForm_createMutation.graphql";
 import {
   SAMLConfigurationForm,
   type SAMLConfigurationFormData,
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/OrganizationForm.tsx b/apps/console/src/pages/iam/organizations/settings/_components/OrganizationForm.tsx
index f4a53150a..07fd26cc7 100644
--- a/apps/console/src/pages/iam/organizations/settings/_components/OrganizationForm.tsx
+++ b/apps/console/src/pages/iam/organizations/settings/_components/OrganizationForm.tsx
@@ -21,7 +21,7 @@ import { graphql } from "relay-runtime";
 import z from "zod";
 import { useTranslate } from "@probo/i18n";
 import { useFragment } from "react-relay";
-import type { OrganizationFormFragment$key } from "./__generated__/OrganizationFormFragment.graphql";
+import type { OrganizationFormFragment$key } from "/__generated__/iam/OrganizationFormFragment.graphql";
 
 const fragment = graphql`
   fragment OrganizationFormFragment on Organization {
diff --git a/apps/console/src/pages/iam/organizations/settings/_components/SAMLConfigurationList.tsx b/apps/console/src/pages/iam/organizations/settings/_components/SAMLConfigurationList.tsx
index 421b814af..72ff8947d 100644
--- a/apps/console/src/pages/iam/organizations/settings/_components/SAMLConfigurationList.tsx
+++ b/apps/console/src/pages/iam/organizations/settings/_components/SAMLConfigurationList.tsx
@@ -17,9 +17,9 @@ import { useFragment } from "react-relay";
 import type {
   SAMLConfigurationListFragment$data,
   SAMLConfigurationListFragment$key,
-} from "./__generated__/SAMLConfigurationListFragment.graphql";
+} from "/__generated__/iam/SAMLConfigurationListFragment.graphql";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
-import type { SAMLConfigurationList_deleteMutation } from "./__generated__/SAMLConfigurationList_deleteMutation.graphql";
+import type { SAMLConfigurationList_deleteMutation } from "/__generated__/iam/SAMLConfigurationList_deleteMutation.graphql";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import type { NodeOf } from "/types";
 import { useCopy } from "@probo/hooks";
@@ -78,11 +78,11 @@ export function SAMLConfigurationList(props: {
       {
         successMessage: "SAML configuration deleted successfully.",
         errorMessage: "Failed to delete SAML configuration. Please try again.",
-      }
+      },
     );
 
   const handleDelete = (
-    config: NodeOf<SAMLConfigurationListFragment$data["samlConfigurations"]>
+    config: NodeOf<SAMLConfigurationListFragment$data["samlConfigurations"]>,
   ) => {
     confirm(
       async () => {
@@ -95,7 +95,7 @@ export function SAMLConfigurationList(props: {
             connections: [
               ConnectionHandler.getConnectionID(
                 organizationId,
-                "SAMLConfigurationListFragment_samlConfigurations"
+                "SAMLConfigurationListFragment_samlConfigurations",
               ),
             ],
           },
@@ -106,11 +106,11 @@ export function SAMLConfigurationList(props: {
         message: __(
           "Are you sure you want to delete the SAML configuration for " +
             config.emailDomain +
-            "? This action cannot be undone."
+            "? This action cannot be undone.",
         ),
         label: __("Delete"),
         variant: "danger",
-      }
+      },
     );
   };
 
@@ -123,7 +123,7 @@ export function SAMLConfigurationList(props: {
           </h3>
           <p className="text-gray-600 mb-6">
             {__(
-              "Set up SAML 2.0 single sign-on for your organization by adding a configuration for each email domain."
+              "Set up SAML 2.0 single sign-on for your organization by adding a configuration for each email domain.",
             )}
           </p>
         </div>
@@ -199,7 +199,7 @@ export function SAMLConfigurationList(props: {
                   <>
                     {isAuthorized(
                       "SAMLConfiguration",
-                      "updateSAMLConfiguration"
+                      "updateSAMLConfiguration",
                     ) && (
                       <Button
                         variant="secondary"
diff --git a/apps/console/src/pages/organizations/assets/AssetDetailsPage.tsx b/apps/console/src/pages/organizations/assets/AssetDetailsPage.tsx
index 83e4f430a..ee4011206 100644
--- a/apps/console/src/pages/organizations/assets/AssetDetailsPage.tsx
+++ b/apps/console/src/pages/organizations/assets/AssetDetailsPage.tsx
@@ -1,4 +1,7 @@
-import { getAssetTypeVariant, validateSnapshotConsistency } from "@probo/helpers";
+import {
+  getAssetTypeVariant,
+  validateSnapshotConsistency,
+} from "@probo/helpers";
 import { useTranslate } from "@probo/i18n";
 import {
   ActionDropdown,
@@ -26,7 +29,7 @@ import { SnapshotBanner } from "/components/SnapshotBanner";
 import { ControlledField } from "/components/form/ControlledField";
 import { PeopleSelectField } from "/components/form/PeopleSelectField";
 import { VendorsMultiSelectField } from "/components/form/VendorsMultiSelectField";
-import type { AssetGraphNodeQuery } from "/hooks/graph/__generated__/AssetGraphNodeQuery.graphql";
+import type { AssetGraphNodeQuery } from "/__generated__/core/AssetGraphNodeQuery.graphql";
 import { useFormWithSchema } from "/hooks/useFormWithSchema";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import { use } from "react";
@@ -46,7 +49,10 @@ type Props = {
 };
 
 export default function AssetDetailsPage(props: Props) {
-  const asset = usePreloadedQuery<AssetGraphNodeQuery>(assetNodeQuery, props.queryRef);
+  const asset = usePreloadedQuery<AssetGraphNodeQuery>(
+    assetNodeQuery,
+    props.queryRef,
+  );
   const assetEntry = asset.node;
   const { __ } = useTranslate();
   const organizationId = useOrganizationId();
@@ -59,23 +65,24 @@ export default function AssetDetailsPage(props: Props) {
   const connectionId = ConnectionHandler.getConnectionID(
     organizationId,
     "AssetsPage_assets",
-    { filter: { snapshotId: snapshotId || null } }
+    { filter: { snapshotId: snapshotId || null } },
   );
   const deleteAsset = useDeleteAsset(assetEntry, connectionId);
 
   const vendors = assetEntry.vendors?.edges.map((edge) => edge.node) ?? [];
   const vendorIds = vendors.map((vendor) => vendor.id);
 
-  const { control, formState, handleSubmit, register, reset } = useFormWithSchema(updateAssetSchema, {
-    defaultValues: {
-      name: assetEntry.name || "",
-      amount: assetEntry.amount || 0,
-      assetType: assetEntry.assetType || "VIRTUAL",
-      dataTypesStored: assetEntry.dataTypesStored || "",
-      ownerId: assetEntry.owner?.id || "",
-      vendorIds: vendorIds,
-    },
-  });
+  const { control, formState, handleSubmit, register, reset } =
+    useFormWithSchema(updateAssetSchema, {
+      defaultValues: {
+        name: assetEntry.name || "",
+        amount: assetEntry.amount || 0,
+        assetType: assetEntry.assetType || "VIRTUAL",
+        dataTypesStored: assetEntry.dataTypesStored || "",
+        ownerId: assetEntry.owner?.id || "",
+        vendorIds: vendorIds,
+      },
+    });
 
   const updateAsset = useUpdateAsset();
 
@@ -87,9 +94,10 @@ export default function AssetDetailsPage(props: Props) {
     reset(formData);
   });
 
-  const breadcrumbAssetsUrl = isSnapshotMode && snapshotId
-    ? `/organizations/${organizationId}/snapshots/${snapshotId}/assets`
-    : `/organizations/${organizationId}/assets`;
+  const breadcrumbAssetsUrl =
+    isSnapshotMode && snapshotId
+      ? `/organizations/${organizationId}/snapshots/${snapshotId}/assets`
+      : `/organizations/${organizationId}/assets`;
 
   return (
     <div className="space-y-6">
@@ -109,22 +117,24 @@ export default function AssetDetailsPage(props: Props) {
       <div className="flex justify-between items-start">
         <div className="flex items-center gap-4">
           <div className="text-2xl">{assetEntry?.name}</div>
-          <Badge variant={getAssetTypeVariant(assetEntry?.assetType ?? "VIRTUAL")}>
-            {assetEntry?.assetType === "PHYSICAL" ? __("Physical") : __("Virtual")}
+          <Badge
+            variant={getAssetTypeVariant(assetEntry?.assetType ?? "VIRTUAL")}
+          >
+            {assetEntry?.assetType === "PHYSICAL"
+              ? __("Physical")
+              : __("Virtual")}
           </Badge>
         </div>
-        {!isSnapshotMode && (
-          isAuthorized("Asset", "deleteAsset") && (
-            <ActionDropdown variant="secondary">
-              <DropdownItem
-                variant="danger"
-                icon={IconTrashCan}
-                onClick={deleteAsset}
-              >
-                {__("Delete")}
-              </DropdownItem>
-            </ActionDropdown>
-          )
+        {!isSnapshotMode && isAuthorized("Asset", "deleteAsset") && (
+          <ActionDropdown variant="secondary">
+            <DropdownItem
+              variant="danger"
+              icon={IconTrashCan}
+              onClick={deleteAsset}
+            >
+              {__("Delete")}
+            </DropdownItem>
+          </ActionDropdown>
         )}
       </div>
 
@@ -179,13 +189,13 @@ export default function AssetDetailsPage(props: Props) {
         />
 
         <div className="flex justify-end">
-          {formState.isDirty && !isSnapshotMode && (
+          {formState.isDirty &&
+            !isSnapshotMode &&
             isAuthorized("Asset", "updateAsset") && (
               <Button type="submit" disabled={formState.isSubmitting}>
                 {formState.isSubmitting ? __("Updating...") : __("Update")}
               </Button>
-            )
-          )}
+            )}
         </div>
       </form>
     </div>
diff --git a/apps/console/src/pages/organizations/assets/AssetsPage.tsx b/apps/console/src/pages/organizations/assets/AssetsPage.tsx
index 5b255d722..937d8c466 100644
--- a/apps/console/src/pages/organizations/assets/AssetsPage.tsx
+++ b/apps/console/src/pages/organizations/assets/AssetsPage.tsx
@@ -1,10 +1,6 @@
 import { usePageTitle } from "@probo/hooks";
 import { useTranslate } from "@probo/i18n";
-import {
-  Button,
-  IconPlusLarge,
-  PageHeader,
-} from "@probo/ui";
+import { Button, IconPlusLarge, PageHeader } from "@probo/ui";
 import { use } from "react";
 import {
   graphql,
@@ -15,13 +11,11 @@ import {
 import { useParams } from "react-router";
 import { AssetsTable } from "../../../components/assets/AssetsTable";
 import { ReadOnlyAssetsTable } from "../../../components/assets/ReadOnlyAssetsTable";
-import type { AssetsPageFragment$key } from "./__generated__/AssetsPageFragment.graphql";
+import type { AssetsPageFragment$key } from "/__generated__/core/AssetsPageFragment.graphql";
 import { CreateAssetDialog } from "./dialogs/CreateAssetDialog";
 import { SnapshotBanner } from "/components/SnapshotBanner";
-import {
-  assetsQuery,
-} from "/hooks/graph/AssetGraph";
-import type { AssetGraphListQuery } from "/hooks/graph/__generated__/AssetGraphListQuery.graphql";
+import { assetsQuery } from "/hooks/graph/AssetGraph";
+import type { AssetGraphListQuery } from "/__generated__/core/AssetGraphListQuery.graphql";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import { PermissionsContext } from "/providers/PermissionsContext";
 
@@ -83,7 +77,10 @@ export default function AssetsPage(props: Props) {
   const { snapshotId } = useParams<{ snapshotId?: string }>();
   const isSnapshotMode = Boolean(snapshotId);
 
-  const data = usePreloadedQuery<AssetGraphListQuery>(assetsQuery, props.queryRef);
+  const data = usePreloadedQuery<AssetGraphListQuery>(
+    assetsQuery,
+    props.queryRef,
+  );
   const pagination = usePaginationFragment(
     paginatedAssetsFragment,
     data.node as AssetsPageFragment$key,
@@ -92,10 +89,9 @@ export default function AssetsPage(props: Props) {
   const connectionId = pagination.data.assets.__id;
 
   const { isAuthorized } = use(PermissionsContext);
-  const canWrite = (
+  const canWrite =
     isAuthorized("Asset", "updateAsset") ||
-    isAuthorized("Asset", "deleteAsset")
-  );
+    isAuthorized("Asset", "deleteAsset");
   usePageTitle(__("Assets"));
 
   return (
@@ -116,15 +112,15 @@ export default function AssetsPage(props: Props) {
           </CreateAssetDialog>
         )}
       </PageHeader>
-      {isSnapshotMode || !canWrite ?
+      {isSnapshotMode || !canWrite ? (
         <ReadOnlyAssetsTable pagination={pagination} assets={assets} />
-        :
+      ) : (
         <AssetsTable
           connectionId={connectionId}
           pagination={pagination}
           assets={assets}
         />
-      }
+      )}
     </div>
   );
 }
diff --git a/apps/console/src/pages/organizations/audits/AuditDetailsPage.tsx b/apps/console/src/pages/organizations/audits/AuditDetailsPage.tsx
index cbf47ed52..3eea78c59 100644
--- a/apps/console/src/pages/organizations/audits/AuditDetailsPage.tsx
+++ b/apps/console/src/pages/organizations/audits/AuditDetailsPage.tsx
@@ -43,7 +43,7 @@ import {
   formatDate,
   type GraphQLError,
 } from "@probo/helpers";
-import type { AuditGraphNodeQuery } from "/hooks/graph/__generated__/AuditGraphNodeQuery.graphql";
+import type { AuditGraphNodeQuery } from "/__generated__/core/AuditGraphNodeQuery.graphql";
 import { use } from "react";
 import { PermissionsContext } from "/providers/PermissionsContext";
 import { useNavigate } from "react-router";
@@ -68,7 +68,7 @@ type Props = {
 export default function AuditDetailsPage(props: Props) {
   const audit = usePreloadedQuery<AuditGraphNodeQuery>(
     auditNodeQuery,
-    props.queryRef
+    props.queryRef,
   );
   const auditEntry = audit.node;
   const { __ } = useTranslate();
@@ -79,7 +79,7 @@ export default function AuditDetailsPage(props: Props) {
   const deleteAudit = useDeleteAudit(
     { id: auditEntry.id!, framework: { name: auditEntry.framework!.name } },
     ConnectionHandler.getConnectionID(organizationId, "AuditsPage_audits"),
-    () => navigate(`/organizations/${organizationId}/audits`)
+    () => navigate(`/organizations/${organizationId}/audits`),
   );
 
   const { control, formState, handleSubmit, register, reset } =
@@ -120,7 +120,7 @@ export default function AuditDetailsPage(props: Props) {
         title: __("Error"),
         description: formatError(
           __("Failed to update audit"),
-          error as GraphQLError
+          error as GraphQLError,
         ),
         variant: "error",
       });
@@ -137,11 +137,11 @@ export default function AuditDetailsPage(props: Props) {
       {
         message: sprintf(
           __(
-            'This will permanently delete the audit report "%s". This action cannot be undone.'
+            'This will permanently delete the audit report "%s". This action cannot be undone.',
           ),
-          auditEntry.report.filename
+          auditEntry.report.filename,
         ),
-      }
+      },
     );
   };
 
@@ -273,12 +273,12 @@ export default function AuditDetailsPage(props: Props) {
               <div className="space-y-4">
                 <p className="text-neutral-600">
                   {__(
-                    "Upload the final audit report document (PDF recommended)"
+                    "Upload the final audit report document (PDF recommended)",
                   )}
                 </p>
                 <Dropzone
                   description={__(
-                    "Only PDF, DOCX files up to 25MB are allowed"
+                    "Only PDF, DOCX files up to 25MB are allowed",
                   )}
                   isUploading={isUploading}
                   onDrop={async (files) => {
diff --git a/apps/console/src/pages/organizations/audits/AuditsPage.tsx b/apps/console/src/pages/organizations/audits/AuditsPage.tsx
index cf2aeb81a..13fb855b8 100644
--- a/apps/console/src/pages/organizations/audits/AuditsPage.tsx
+++ b/apps/console/src/pages/organizations/audits/AuditsPage.tsx
@@ -23,13 +23,17 @@ import {
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import { CreateAuditDialog } from "./dialogs/CreateAuditDialog";
 import { useDeleteAudit, auditsQuery } from "../../../hooks/graph/AuditGraph";
-import type { AuditGraphListQuery } from "/hooks/graph/__generated__/AuditGraphListQuery.graphql";
+import type { AuditGraphListQuery } from "/__generated__/core/AuditGraphListQuery.graphql";
 import type { NodeOf } from "/types";
-import { getAuditStateLabel, getAuditStateVariant, formatDate } from "@probo/helpers";
+import {
+  getAuditStateLabel,
+  getAuditStateVariant,
+  formatDate,
+} from "@probo/helpers";
 import type {
   AuditsPageFragment$data,
   AuditsPageFragment$key,
-} from "./__generated__/AuditsPageFragment.graphql";
+} from "/__generated__/core/AuditsPageFragment.graphql";
 import { SortableTable } from "/components/SortableTable";
 import { PermissionsContext } from "/providers/PermissionsContext";
 import { use } from "react";
@@ -88,14 +92,15 @@ export default function AuditsPage(props: Props) {
   const data = usePreloadedQuery(auditsQuery, props.queryRef);
   const pagination = usePaginationFragment(
     paginatedAuditsFragment,
-    data.node as AuditsPageFragment$key
+    data.node as AuditsPageFragment$key,
   );
   const audits = pagination.data.audits?.edges?.map((edge) => edge.node) ?? [];
   const connectionId = pagination.data.audits.__id;
 
   usePageTitle(__("Audits"));
 
-  const hasAnyAction = isAuthorized("Audit", "updateAudit") ||
+  const hasAnyAction =
+    isAuthorized("Audit", "updateAudit") ||
     isAuthorized("Audit", "deleteAudit");
 
   return (
@@ -103,7 +108,7 @@ export default function AuditsPage(props: Props) {
       <PageHeader
         title={__("Audits")}
         description={__(
-          "Manage your organization's compliance audits and their progress."
+          "Manage your organization's compliance audits and their progress.",
         )}
       >
         {isAuthorized("Organization", "createAudit") && (
@@ -111,7 +116,7 @@ export default function AuditsPage(props: Props) {
             connection={connectionId}
             organizationId={organizationId}
           >
-          <Button icon={IconPlusLarge}>{__("Add audit")}</Button>
+            <Button icon={IconPlusLarge}>{__("Add audit")}</Button>
           </CreateAuditDialog>
         )}
       </PageHeader>
diff --git a/apps/console/src/pages/organizations/audits/dialogs/CreateAuditDialog.tsx b/apps/console/src/pages/organizations/audits/dialogs/CreateAuditDialog.tsx
index 9c09222b7..26dd72feb 100644
--- a/apps/console/src/pages/organizations/audits/dialogs/CreateAuditDialog.tsx
+++ b/apps/console/src/pages/organizations/audits/dialogs/CreateAuditDialog.tsx
@@ -16,12 +16,18 @@ import z from "zod";
 import { useFormWithSchema } from "/hooks/useFormWithSchema";
 import { ControlledField } from "/components/form/ControlledField";
 import { useCreateAudit } from "/hooks/graph/AuditGraph";
-import { auditStates, getAuditStateLabel, formatDatetime, formatError, type GraphQLError } from "@probo/helpers";
+import {
+  auditStates,
+  getAuditStateLabel,
+  formatDatetime,
+  formatError,
+  type GraphQLError,
+} from "@probo/helpers";
 import { useLazyLoadQuery } from "react-relay";
 import { graphql } from "relay-runtime";
 import { Suspense } from "react";
 import { Controller, type Control } from "react-hook-form";
-import type { CreateAuditDialogFrameworksQuery } from "./__generated__/CreateAuditDialogFrameworksQuery.graphql";
+import type { CreateAuditDialogFrameworksQuery } from "/__generated__/core/CreateAuditDialogFrameworksQuery.graphql";
 
 const frameworksQuery = graphql`
   query CreateAuditDialogFrameworksQuery($organizationId: ID!) {
@@ -45,7 +51,13 @@ const schema = z.object({
   name: z.string().optional(),
   validFrom: z.string().optional(),
   validUntil: z.string().optional(),
-  state: z.enum(["NOT_STARTED", "IN_PROGRESS", "COMPLETED", "REJECTED", "OUTDATED"]),
+  state: z.enum([
+    "NOT_STARTED",
+    "IN_PROGRESS",
+    "COMPLETED",
+    "REJECTED",
+    "OUTDATED",
+  ]),
 });
 
 type Props = {
@@ -94,7 +106,10 @@ export function CreateAuditDialog({
     } catch (error) {
       toast({
         title: __("Error"),
-        description: formatError(__("Failed to create audit"), error as GraphQLError),
+        description: formatError(
+          __("Failed to create audit"),
+          error as GraphQLError,
+        ),
         variant: "error",
       });
     }
@@ -109,7 +124,11 @@ export function CreateAuditDialog({
       <form onSubmit={onSubmit} className="space-y-4">
         <DialogContent padded className="space-y-4">
           <Field label={__("Framework")}>
-            <Suspense fallback={<Select variant="editor" disabled placeholder="Loading..." />}>
+            <Suspense
+              fallback={
+                <Select variant="editor" disabled placeholder="Loading..." />
+              }
+            >
               <FrameworkSelect
                 organizationId={organizationId}
                 control={control}
@@ -157,15 +176,22 @@ type FormSchema = z.infer<typeof schema>;
 function FrameworkSelect({
   organizationId,
   control,
-  name
+  name,
 }: {
   organizationId: string;
   control: Control<FormSchema>;
   name: keyof FormSchema;
 }) {
   const { __ } = useTranslate();
-  const data = useLazyLoadQuery<CreateAuditDialogFrameworksQuery>(frameworksQuery, { organizationId }, { fetchPolicy: "network-only" });
-  const frameworks = data?.organization?.frameworks?.edges?.map((edge) => edge.node).filter((node): node is NonNullable<typeof node> => node !== null) ?? [];
+  const data = useLazyLoadQuery<CreateAuditDialogFrameworksQuery>(
+    frameworksQuery,
+    { organizationId },
+    { fetchPolicy: "network-only" },
+  );
+  const frameworks =
+    data?.organization?.frameworks?.edges
+      ?.map((edge) => edge.node)
+      .filter((node): node is NonNullable<typeof node> => node !== null) ?? [];
 
   return (
     <Controller
diff --git a/apps/console/src/pages/organizations/continualImprovements/ContinualImprovementDetailsPage.tsx b/apps/console/src/pages/organizations/continualImprovements/ContinualImprovementDetailsPage.tsx
index 3e5b96b1b..ea6d1bd73 100644
--- a/apps/console/src/pages/organizations/continualImprovements/ContinualImprovementDetailsPage.tsx
+++ b/apps/console/src/pages/organizations/continualImprovements/ContinualImprovementDetailsPage.tsx
@@ -32,9 +32,14 @@ import { useFormWithSchema } from "/hooks/useFormWithSchema";
 import { Controller } from "react-hook-form";
 import { formatError, type GraphQLError } from "@probo/helpers";
 import z from "zod";
-import { getStatusVariant, getStatusLabel, formatDatetime, validateSnapshotConsistency } from "@probo/helpers";
+import {
+  getStatusVariant,
+  getStatusLabel,
+  formatDatetime,
+  validateSnapshotConsistency,
+} from "@probo/helpers";
 import { SnapshotBanner } from "/components/SnapshotBanner";
-import type { ContinualImprovementGraphNodeQuery } from "/hooks/graph/__generated__/ContinualImprovementGraphNodeQuery.graphql";
+import type { ContinualImprovementGraphNodeQuery } from "/__generated__/core/ContinualImprovementGraphNodeQuery.graphql";
 import { use } from "react";
 import { PermissionsContext } from "/providers/PermissionsContext";
 
@@ -53,7 +58,10 @@ type Props = {
 };
 
 export default function ContinualImprovementDetailsPage(props: Props) {
-  const data = usePreloadedQuery<ContinualImprovementGraphNodeQuery>(continualImprovementNodeQuery, props.queryRef);
+  const data = usePreloadedQuery<ContinualImprovementGraphNodeQuery>(
+    continualImprovementNodeQuery,
+    props.queryRef,
+  );
   const improvement = data.node;
   const { __ } = useTranslate();
   const { toast } = useToast();
@@ -69,10 +77,13 @@ export default function ContinualImprovementDetailsPage(props: Props) {
   const connectionId = ConnectionHandler.getConnectionID(
     organizationId,
     ContinualImprovementsConnectionKey,
-    { filter: { snapshotId: snapshotId || null } }
+    { filter: { snapshotId: snapshotId || null } },
   );
 
-  const deleteImprovement = useDeleteContinualImprovement({ id: improvement.id!, referenceId: improvement.referenceId! }, connectionId);
+  const deleteImprovement = useDeleteContinualImprovement(
+    { id: improvement.id!, referenceId: improvement.referenceId! },
+    connectionId,
+  );
 
   const { register, handleSubmit, formState, control } = useFormWithSchema(
     updateImprovementSchema,
@@ -88,7 +99,7 @@ export default function ContinualImprovementDetailsPage(props: Props) {
         priority: improvement.priority || "MEDIUM",
         ownerId: improvement.owner?.id || "",
       },
-    }
+    },
   );
 
   const onSubmit = handleSubmit(async (formData) => {
@@ -102,7 +113,6 @@ export default function ContinualImprovementDetailsPage(props: Props) {
         status: formData.status,
         priority: formData.priority,
         ownerId: formData.ownerId,
-
       });
 
       toast({
@@ -113,7 +123,10 @@ export default function ContinualImprovementDetailsPage(props: Props) {
     } catch (error) {
       toast({
         title: __("Error"),
-        description: formatError(__("Failed to update continual improvement"), error as GraphQLError),
+        description: formatError(
+          __("Failed to update continual improvement"),
+          error as GraphQLError,
+        ),
         variant: "error",
       });
     }
@@ -143,19 +156,24 @@ export default function ContinualImprovementDetailsPage(props: Props) {
       <div className="flex items-center justify-between">
         <Breadcrumb
           items={[
-            { label: __("Continual Improvements"), to: breadcrumbImprovementsUrl },
+            {
+              label: __("Continual Improvements"),
+              to: breadcrumbImprovementsUrl,
+            },
             { label: improvement.referenceId! },
           ]}
         />
-        {!isSnapshotMode && (
-          isAuthorized("ContinualImprovement", "deleteContinualImprovement") && (
+        {!isSnapshotMode &&
+          isAuthorized(
+            "ContinualImprovement",
+            "deleteContinualImprovement",
+          ) && (
             <ActionDropdown>
               <DropdownItem onClick={deleteImprovement} variant="danger">
                 {__("Delete")}
               </DropdownItem>
             </ActionDropdown>
-          )
-        )}
+          )}
       </div>
 
       <Card>
@@ -166,8 +184,20 @@ export default function ContinualImprovementDetailsPage(props: Props) {
               <Badge variant={getStatusVariant(improvement.status || "OPEN")}>
                 {getStatusLabel(improvement.status || "OPEN")}
               </Badge>
-              <Badge variant={improvement.priority === "HIGH" ? "danger" : improvement.priority === "MEDIUM" ? "warning" : "success"}>
-                {improvement.priority === "HIGH" ? __("High") : improvement.priority === "MEDIUM" ? __("Medium") : __("Low")}
+              <Badge
+                variant={
+                  improvement.priority === "HIGH"
+                    ? "danger"
+                    : improvement.priority === "MEDIUM"
+                      ? "warning"
+                      : "success"
+                }
+              >
+                {improvement.priority === "HIGH"
+                  ? __("High")
+                  : improvement.priority === "MEDIUM"
+                    ? __("Medium")
+                    : __("Low")}
               </Badge>
             </div>
           </div>
@@ -181,8 +211,6 @@ export default function ContinualImprovementDetailsPage(props: Props) {
               required
             />
 
-
-
             <div>
               <Label>{__("Description")}</Label>
               <Textarea
@@ -287,13 +315,18 @@ export default function ContinualImprovementDetailsPage(props: Props) {
 
             {!isSnapshotMode && (
               <div className="flex justify-end pt-4">
-                {isAuthorized("ContinualImprovement", "updateContinualImprovement") && (
+                {isAuthorized(
+                  "ContinualImprovement",
+                  "updateContinualImprovement",
+                ) && (
                   <Button
                     type="submit"
                     variant="primary"
                     disabled={formState.isSubmitting}
                   >
-                    {formState.isSubmitting ? __("Saving...") : __("Save Changes")}
+                    {formState.isSubmitting
+                      ? __("Saving...")
+                      : __("Save Changes")}
                   </Button>
                 )}
               </div>
diff --git a/apps/console/src/pages/organizations/continualImprovements/ContinualImprovementsPage.tsx b/apps/console/src/pages/organizations/continualImprovements/ContinualImprovementsPage.tsx
index 272d3a8c8..c07e90224 100644
--- a/apps/console/src/pages/organizations/continualImprovements/ContinualImprovementsPage.tsx
+++ b/apps/console/src/pages/organizations/continualImprovements/ContinualImprovementsPage.tsx
@@ -28,17 +28,27 @@ import {
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import { useParams } from "react-router";
 import { CreateContinualImprovementDialog } from "./dialogs/CreateContinualImprovementDialog";
-import { deleteContinualImprovementMutation, ContinualImprovementsConnectionKey, continualImprovementsQuery } from "../../../hooks/graph/ContinualImprovementGraph";
-import { sprintf, promisifyMutation, getStatusVariant, getStatusLabel, formatDate } from "@probo/helpers";
+import {
+  deleteContinualImprovementMutation,
+  ContinualImprovementsConnectionKey,
+  continualImprovementsQuery,
+} from "../../../hooks/graph/ContinualImprovementGraph";
+import {
+  sprintf,
+  promisifyMutation,
+  getStatusVariant,
+  getStatusLabel,
+  formatDate,
+} from "@probo/helpers";
 import { SnapshotBanner } from "/components/SnapshotBanner";
 import type { NodeOf } from "/types";
 import type {
   ContinualImprovementsPageFragment$key,
   ContinualImprovementsPageFragment$data,
-} from "./__generated__/ContinualImprovementsPageFragment.graphql";
+} from "/__generated__/core/ContinualImprovementsPageFragment.graphql";
 import { use } from "react";
 import { PermissionsContext } from "/providers/PermissionsContext";
-import type { ContinualImprovementGraphListQuery } from "/hooks/graph/__generated__/ContinualImprovementGraphListQuery.graphql";
+import type { ContinualImprovementGraphListQuery } from "/__generated__/core/ContinualImprovementGraphListQuery.graphql";
 
 interface ContinualImprovementsPageProps {
   queryRef: PreloadedQuery<ContinualImprovementGraphListQuery>;
@@ -58,7 +68,10 @@ const continualImprovementsPageFragment = graphql`
       after: $after
       filter: { snapshotId: $snapshotId }
     )
-      @connection(key: "ContinualImprovementsPage_continualImprovements", filters: ["filter"]) {
+      @connection(
+        key: "ContinualImprovementsPage_continualImprovements"
+        filters: ["filter"]
+      ) {
       __id
       totalCount
       edges {
@@ -88,7 +101,9 @@ const continualImprovementsPageFragment = graphql`
   }
 `;
 
-export default function ContinualImprovementsPage({ queryRef }: ContinualImprovementsPageProps) {
+export default function ContinualImprovementsPage({
+  queryRef,
+}: ContinualImprovementsPageProps) {
   const { __ } = useTranslate();
   const organizationId = useOrganizationId();
   const { snapshotId } = useParams<{ snapshotId?: string }>();
@@ -97,17 +112,9 @@ export default function ContinualImprovementsPage({ queryRef }: ContinualImprove
 
   usePageTitle(__("Continual Improvements"));
 
-  const organization = usePreloadedQuery(
-    continualImprovementsQuery,
-    queryRef
-  );
+  const organization = usePreloadedQuery(continualImprovementsQuery, queryRef);
 
-  const {
-    data,
-    loadNext,
-    hasNext,
-    isLoadingNext,
-  } = usePaginationFragment<
+  const { data, loadNext, hasNext, isLoadingNext } = usePaginationFragment<
     ContinualImprovementGraphListQuery,
     ContinualImprovementsPageFragment$key
   >(continualImprovementsPageFragment, organization.node);
@@ -115,22 +122,26 @@ export default function ContinualImprovementsPage({ queryRef }: ContinualImprove
   const connectionId = ConnectionHandler.getConnectionID(
     organizationId,
     ContinualImprovementsConnectionKey,
-    { filter: { snapshotId: snapshotId || null } }
+    { filter: { snapshotId: snapshotId || null } },
   );
-  const improvements = data?.continualImprovements?.edges?.map((edge) => edge.node) ?? [];
+  const improvements =
+    data?.continualImprovements?.edges?.map((edge) => edge.node) ?? [];
 
-  const hasAnyAction = !isSnapshotMode && (
-    isAuthorized("ContinualImprovement", "updateContinualImprovement") ||
-    isAuthorized("ContinualImprovement", "deleteContinualImprovement")
-  );
+  const hasAnyAction =
+    !isSnapshotMode &&
+    (isAuthorized("ContinualImprovement", "updateContinualImprovement") ||
+      isAuthorized("ContinualImprovement", "deleteContinualImprovement"));
 
   return (
     <div className="space-y-6">
       {isSnapshotMode && snapshotId && (
         <SnapshotBanner snapshotId={snapshotId} />
       )}
-      <PageHeader title={__("Continual Improvements")} description={__("Manage your continual improvements.")}>
-        {!isSnapshotMode && (
+      <PageHeader
+        title={__("Continual Improvements")}
+        description={__("Manage your continual improvements.")}
+      >
+        {!isSnapshotMode &&
           isAuthorized("Organization", "createContinualImprovement") && (
             <CreateContinualImprovementDialog
               organizationId={organizationId}
@@ -140,8 +151,7 @@ export default function ContinualImprovementsPage({ queryRef }: ContinualImprove
                 {__("Add continual improvement")}
               </Button>
             </CreateContinualImprovementDialog>
-          )
-        )}
+          )}
       </PageHeader>
 
       {improvements.length > 0 ? (
@@ -205,7 +215,9 @@ function ImprovementRow({
   snapshotId,
   hasAnyAction,
 }: {
-  improvement: NodeOf<NonNullable<ContinualImprovementsPageFragment$data['continualImprovements']>>;
+  improvement: NodeOf<
+    NonNullable<ContinualImprovementsPageFragment$data["continualImprovements"]>
+  >;
   connectionId: string;
   snapshotId?: string;
   hasAnyAction: boolean;
@@ -217,7 +229,6 @@ function ImprovementRow({
   const isSnapshotMode = Boolean(snapshotId);
   const { isAuthorized } = use(PermissionsContext);
 
-
   const handleDelete = () => {
     confirm(
       () =>
@@ -232,11 +243,11 @@ function ImprovementRow({
       {
         message: sprintf(
           __(
-            "This will permanently delete the continual improvement entry %s. This action cannot be undone."
+            "This will permanently delete the continual improvement entry %s. This action cannot be undone.",
           ),
-          improvement.referenceId
+          improvement.referenceId,
         ),
-      }
+      },
     );
   };
 
@@ -256,8 +267,20 @@ function ImprovementRow({
         </Badge>
       </Td>
       <Td>
-        <Badge variant={improvement.priority === "HIGH" ? "danger" : improvement.priority === "MEDIUM" ? "warning" : "success"}>
-          {improvement.priority === "HIGH" ? __("High") : improvement.priority === "MEDIUM" ? __("Medium") : __("Low")}
+        <Badge
+          variant={
+            improvement.priority === "HIGH"
+              ? "danger"
+              : improvement.priority === "MEDIUM"
+                ? "warning"
+                : "success"
+          }
+        >
+          {improvement.priority === "HIGH"
+            ? __("High")
+            : improvement.priority === "MEDIUM"
+              ? __("Medium")
+              : __("Low")}
         </Badge>
       </Td>
       <Td>{improvement.owner?.fullName || "-"}</Td>
@@ -273,7 +296,10 @@ function ImprovementRow({
       {hasAnyAction && (
         <Td noLink width={50} className="text-end">
           <ActionDropdown>
-            {isAuthorized("ContinualImprovement", "deleteContinualImprovement") && (
+            {isAuthorized(
+              "ContinualImprovement",
+              "deleteContinualImprovement",
+            ) && (
               <DropdownItem
                 icon={IconTrashCan}
                 variant="danger"
diff --git a/apps/console/src/pages/organizations/data/DataPage.tsx b/apps/console/src/pages/organizations/data/DataPage.tsx
index 8383f0ef5..8cf856466 100644
--- a/apps/console/src/pages/organizations/data/DataPage.tsx
+++ b/apps/console/src/pages/organizations/data/DataPage.tsx
@@ -25,14 +25,14 @@ import { useParams } from "react-router";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import { CreateDatumDialog } from "./dialogs/CreateDatumDialog";
 import { useDeleteDatum, dataQuery } from "../../../hooks/graph/DatumGraph";
-import type { DatumGraphListQuery } from "/hooks/graph/__generated__/DatumGraphListQuery.graphql";
+import type { DatumGraphListQuery } from "/__generated__/core/DatumGraphListQuery.graphql";
 import { faviconUrl } from "@probo/helpers";
 import type { NodeOf } from "/types";
 import type {
   DataPageFragment$key,
-  DataPageFragment$data
-} from "./__generated__/DataPageFragment.graphql";
-import type { DataListQuery } from "./__generated__/DataListQuery.graphql";
+  DataPageFragment$data,
+} from "/__generated__/core/DataPageFragment.graphql";
+import type { DataListQuery } from "/__generated__/core/DataListQuery.graphql";
 import { SortableTable } from "/components/SortableTable";
 import { SnapshotBanner } from "/components/SnapshotBanner";
 import { use } from "react";
@@ -97,35 +97,39 @@ export default function DataPage(props: Props) {
 
   const queryData = usePreloadedQuery<DatumGraphListQuery>(
     dataQuery,
-    props.queryRef
+    props.queryRef,
   );
 
   const data = queryData.node;
 
   const pagination = usePaginationFragment<DataListQuery, DataPageFragment$key>(
     paginatedDataFragment,
-    data
+    data,
   );
 
   const dataEntries = pagination.data.data.edges.map((edge) => edge.node);
   const connectionId = pagination.data.data.__id;
 
-  const refetch = ({ order }: { order: { direction: string; field: string } }) => {
+  const refetch = ({
+    order,
+  }: {
+    order: { direction: string; field: string };
+  }) => {
     pagination.refetch({
       snapshotId,
       order: {
         direction: order.direction as "ASC" | "DESC",
-        field: order.field as "CREATED_AT" | "DATA_CLASSIFICATION" | "NAME"
-      }
+        field: order.field as "CREATED_AT" | "DATA_CLASSIFICATION" | "NAME",
+      },
     });
   };
 
   usePageTitle(__("Data"));
 
-  const hasAnyAction = !isSnapshotMode && (
-    isAuthorized("Datum", "updateDatum") ||
-    isAuthorized("Datum", "deleteDatum")
-  );
+  const hasAnyAction =
+    !isSnapshotMode &&
+    (isAuthorized("Datum", "updateDatum") ||
+      isAuthorized("Datum", "deleteDatum"));
 
   return (
     <div className="space-y-6">
@@ -135,26 +139,20 @@ export default function DataPage(props: Props) {
       <PageHeader
         title={__("Data")}
         description={__(
-          "Manage your organization's data assets and their classifications."
+          "Manage your organization's data assets and their classifications.",
         )}
       >
-        {!snapshotId && (
-          isAuthorized("Organization", "createDatum") && (
-            <CreateDatumDialog
-              connection={connectionId}
-              organizationId={organizationId}
-              onCreated={() => pagination.refetch({ snapshotId })}
-            >
-              <Button icon={IconPlusLarge}>{__("Add data")}</Button>
-            </CreateDatumDialog>
-          )
+        {!snapshotId && isAuthorized("Organization", "createDatum") && (
+          <CreateDatumDialog
+            connection={connectionId}
+            organizationId={organizationId}
+            onCreated={() => pagination.refetch({ snapshotId })}
+          >
+            <Button icon={IconPlusLarge}>{__("Add data")}</Button>
+          </CreateDatumDialog>
         )}
       </PageHeader>
-      <SortableTable
-        {...pagination}
-        refetch={refetch}
-        pageSize={10}
-      >
+      <SortableTable {...pagination} refetch={refetch} pageSize={10}>
         <Thead>
           <Tr>
             <Th>{__("Name")}</Th>
@@ -166,7 +164,13 @@ export default function DataPage(props: Props) {
         </Thead>
         <Tbody>
           {dataEntries.map((entry) => (
-            <DataRow key={entry.id} entry={entry} connectionId={connectionId} snapshotId={snapshotId} hasAnyAction={hasAnyAction} />
+            <DataRow
+              key={entry.id}
+              entry={entry}
+              connectionId={connectionId}
+              snapshotId={snapshotId}
+              hasAnyAction={hasAnyAction}
+            />
           ))}
         </Tbody>
       </SortableTable>
diff --git a/apps/console/src/pages/organizations/data/DatumDetailsPage.tsx b/apps/console/src/pages/organizations/data/DatumDetailsPage.tsx
index 83743a177..5e238eeeb 100644
--- a/apps/console/src/pages/organizations/data/DatumDetailsPage.tsx
+++ b/apps/console/src/pages/organizations/data/DatumDetailsPage.tsx
@@ -28,7 +28,7 @@ import { useFormWithSchema } from "/hooks/useFormWithSchema";
 import z from "zod";
 import { SnapshotBanner } from "/components/SnapshotBanner";
 import { validateSnapshotConsistency } from "@probo/helpers";
-import type { DatumGraphNodeQuery } from "/hooks/graph/__generated__/DatumGraphNodeQuery.graphql";
+import type { DatumGraphNodeQuery } from "/__generated__/core/DatumGraphNodeQuery.graphql";
 import { use } from "react";
 import { PermissionsContext } from "/providers/PermissionsContext";
 
@@ -49,7 +49,7 @@ export default function DatumDetailsPage(props: Props) {
 
   const queryData = usePreloadedQuery<DatumGraphNodeQuery>(
     datumNodeQuery,
-    props.queryRef
+    props.queryRef,
   );
 
   const datumEntry = queryData.node;
@@ -62,15 +62,13 @@ export default function DatumDetailsPage(props: Props) {
 
   const deleteDatum = useDeleteDatum(
     datumEntry,
-    ConnectionHandler.getConnectionID(
-      organizationId,
-      "DataPage_data",
-      { filter: { snapshotId: snapshotId || null } }
-    ),
+    ConnectionHandler.getConnectionID(organizationId, "DataPage_data", {
+      filter: { snapshotId: snapshotId || null },
+    }),
   );
 
-  const vendors = datumEntry?.vendors?.edges.map(edge => edge.node) ?? [];
-  const vendorIds = vendors.map(vendor => vendor.id);
+  const vendors = datumEntry?.vendors?.edges.map((edge) => edge.node) ?? [];
+  const vendorIds = vendors.map((vendor) => vendor.id);
 
   const { control, formState, handleSubmit, register, reset } =
     useFormWithSchema(updateDatumSchema, {
@@ -126,18 +124,16 @@ export default function DatumDetailsPage(props: Props) {
           <div className="text-2xl">{datumEntry?.name}</div>
           <Badge variant="info">{datumEntry?.dataClassification}</Badge>
         </div>
-        {!isSnapshotMode && (
-          isAuthorized("Datum", "deleteDatum") && (
-            <ActionDropdown variant="secondary">
-              <DropdownItem
-                variant="danger"
-                icon={IconTrashCan}
-                onClick={deleteDatum}
-              >
-                {__("Delete")}
-              </DropdownItem>
-            </ActionDropdown>
-          )
+        {!isSnapshotMode && isAuthorized("Datum", "deleteDatum") && (
+          <ActionDropdown variant="secondary">
+            <DropdownItem
+              variant="danger"
+              icon={IconTrashCan}
+              onClick={deleteDatum}
+            >
+              {__("Delete")}
+            </DropdownItem>
+          </ActionDropdown>
         )}
       </div>
 
@@ -181,12 +177,10 @@ export default function DatumDetailsPage(props: Props) {
 
         {!isSnapshotMode && (
           <div className="flex justify-end">
-            {formState.isDirty && (
-              isAuthorized("Datum", "updateDatum") && (
-                <Button type="submit" disabled={formState.isSubmitting}>
-                  {formState.isSubmitting ? __("Updating...") : __("Update")}
-                </Button>
-              )
+            {formState.isDirty && isAuthorized("Datum", "updateDatum") && (
+              <Button type="submit" disabled={formState.isSubmitting}>
+                {formState.isSubmitting ? __("Updating...") : __("Update")}
+              </Button>
             )}
           </div>
         )}
diff --git a/apps/console/src/pages/organizations/documents/DocumentDetailPage.tsx b/apps/console/src/pages/organizations/documents/DocumentDetailPage.tsx
index 906e21a67..ef3e3a7dc 100644
--- a/apps/console/src/pages/organizations/documents/DocumentDetailPage.tsx
+++ b/apps/console/src/pages/organizations/documents/DocumentDetailPage.tsx
@@ -5,7 +5,7 @@ import {
   useFragment,
   usePreloadedQuery,
 } from "react-relay";
-import type { DocumentGraphNodeQuery } from "/hooks/graph/__generated__/DocumentGraphNodeQuery.graphql";
+import type { DocumentGraphNodeQuery } from "/__generated__/core/DocumentGraphNodeQuery.graphql";
 import {
   documentNodeQuery,
   useDeleteDocumentMutation,
@@ -15,9 +15,9 @@ import { usePageTitle } from "@probo/hooks";
 import type {
   DocumentDetailPageDocumentFragment$data,
   DocumentDetailPageDocumentFragment$key,
-} from "./__generated__/DocumentDetailPageDocumentFragment.graphql";
-import type { DocumentDetailPageExportPDFMutation } from "./__generated__/DocumentDetailPageExportPDFMutation.graphql";
-import type { DocumentDetailPageUpdateMutation } from "./__generated__/DocumentDetailPageUpdateMutation.graphql";
+} from "/__generated__/core/DocumentDetailPageDocumentFragment.graphql";
+import type { DocumentDetailPageExportPDFMutation } from "/__generated__/core/DocumentDetailPageExportPDFMutation.graphql";
+import type { DocumentDetailPageUpdateMutation } from "/__generated__/core/DocumentDetailPageUpdateMutation.graphql";
 import { useTranslate } from "@probo/i18n";
 import {
   ActionDropdown,
@@ -189,7 +189,7 @@ export default function DocumentDetailPage(props: Props) {
   const node = usePreloadedQuery(documentNodeQuery, props.queryRef).node;
   const document = useFragment<DocumentDetailPageDocumentFragment$key>(
     documentFragment,
-    node
+    node,
   );
   const { __ } = useTranslate();
   const organizationId = useOrganizationId();
@@ -212,7 +212,7 @@ export default function DocumentDetailPage(props: Props) {
     {
       successMessage: __("Document published successfully."),
       errorMessage: __("Failed to publish document"),
-    }
+    },
   );
   const [deleteDocument, isDeleting] = useDeleteDocumentMutation();
   const [deleteDraftDocumentVersion, isDeletingDraft] =
@@ -223,7 +223,7 @@ export default function DocumentDetailPage(props: Props) {
       {
         successMessage: __("PDF download started."),
         errorMessage: __("Failed to generate PDF"),
-      }
+      },
     );
 
   // const userEmailData = useLazyLoadQuery<DocumentDetailPageUserEmailQuery>(
@@ -237,7 +237,7 @@ export default function DocumentDetailPage(props: Props) {
       {
         successMessage: __("Document updated successfully."),
         errorMessage: __("Failed to update document"),
-      }
+      },
     );
   const versionConnectionId = document.versions.__id;
 
@@ -250,7 +250,7 @@ export default function DocumentDetailPage(props: Props) {
         documentType: document.documentType,
         classification: currentVersion.classification,
       },
-    }
+    },
   );
 
   usePageTitle(document.title);
@@ -299,7 +299,7 @@ export default function DocumentDetailPage(props: Props) {
           props.queryRef.environment,
           documentNodeQuery,
           props.queryRef.variables,
-          { fetchPolicy: "network-only" }
+          { fetchPolicy: "network-only" },
         );
       },
     });
@@ -321,7 +321,7 @@ export default function DocumentDetailPage(props: Props) {
           props.queryRef.environment,
           documentNodeQuery,
           props.queryRef.variables,
-          { fetchPolicy: "network-only" }
+          { fetchPolicy: "network-only" },
         );
       },
     });
@@ -355,11 +355,11 @@ export default function DocumentDetailPage(props: Props) {
       {
         message: sprintf(
           __(
-            'This will permanently delete the document "%s". This action cannot be undone.'
+            'This will permanently delete the document "%s". This action cannot be undone.',
           ),
-          document.title
+          document.title,
         ),
-      }
+      },
     );
   };
 
@@ -377,7 +377,7 @@ export default function DocumentDetailPage(props: Props) {
                 props.queryRef.environment,
                 documentNodeQuery,
                 props.queryRef.variables,
-                { fetchPolicy: "network-only" }
+                { fetchPolicy: "network-only" },
               );
 
               resolve();
@@ -388,12 +388,12 @@ export default function DocumentDetailPage(props: Props) {
       {
         message: sprintf(
           __(
-            'This will permanently delete the draft version %s of "%s". This action cannot be undone.'
+            'This will permanently delete the draft version %s of "%s". This action cannot be undone.',
           ),
           currentVersion.version,
-          document.title
+          document.title,
         ),
-      }
+      },
     );
   };
 
@@ -684,7 +684,7 @@ export default function DocumentDetailPage(props: Props) {
               <div className="text-sm text-txt-secondary">
                 {getDocumentClassificationLabel(
                   __,
-                  currentVersion.classification
+                  currentVersion.classification,
                 )}
               </div>
             </ReadOnlyPropertyContent>
@@ -793,7 +793,7 @@ function VersionItem({
         <div
           className={clsx(
             "flex-shrink-0 flex items-center justify-center size-10",
-            active && "bg-active rounded"
+            active && "bg-active rounded",
           )}
         >
           <div className="text-base text-txt-primary whitespace-nowrap font-bold text-center">
diff --git a/apps/console/src/pages/organizations/documents/DocumentsPage.tsx b/apps/console/src/pages/organizations/documents/DocumentsPage.tsx
index e1f2917ac..ffd5b247b 100644
--- a/apps/console/src/pages/organizations/documents/DocumentsPage.tsx
+++ b/apps/console/src/pages/organizations/documents/DocumentsPage.tsx
@@ -30,7 +30,7 @@ import {
 } from "react-relay";
 import { use, useRef } from "react";
 import { graphql } from "relay-runtime";
-import type { DocumentGraphListQuery } from "/hooks/graph/__generated__/DocumentGraphListQuery.graphql";
+import type { DocumentGraphListQuery } from "/__generated__/core/DocumentGraphListQuery.graphql";
 import {
   documentsQuery,
   useDeleteDocumentMutation,
@@ -38,7 +38,7 @@ import {
   useBulkDeleteDocumentsMutation,
   useBulkExportDocumentsMutation,
 } from "/hooks/graph/DocumentGraph";
-import type { DocumentsPageListFragment$key } from "./__generated__/DocumentsPageListFragment.graphql";
+import type { DocumentsPageListFragment$key } from "/__generated__/core/DocumentsPageListFragment.graphql";
 import { useList, usePageTitle } from "@probo/hooks";
 import {
   sprintf,
@@ -47,7 +47,7 @@ import {
   formatDate,
 } from "@probo/helpers";
 import { CreateDocumentDialog } from "./dialogs/CreateDocumentDialog";
-import type { DocumentsPageRowFragment$key } from "./__generated__/DocumentsPageRowFragment.graphql";
+import type { DocumentsPageRowFragment$key } from "/__generated__/core/DocumentsPageRowFragment.graphql";
 import { SortableTable, SortableTh } from "/components/SortableTable";
 import { PublishDocumentsDialog } from "./dialogs/PublishDocumentsDialog.tsx";
 import { SignatureDocumentsDialog } from "./dialogs/SignatureDocumentsDialog.tsx";
@@ -108,7 +108,7 @@ export default function DocumentsPage(props: Props) {
 
   const organization = usePreloadedQuery(
     documentsQuery,
-    props.queryRef
+    props.queryRef,
   ).organization;
 
   // const userEmailData = useLazyLoadQuery<DocumentsPageUserEmailQuery>(
@@ -118,7 +118,7 @@ export default function DocumentsPage(props: Props) {
   // const defaultEmail = userEmailData.viewer.user.email;
   const pagination = usePaginationFragment(
     documentsFragment,
-    organization as DocumentsPageListFragment$key
+    organization as DocumentsPageListFragment$key,
   );
 
   const documents = pagination.data.documents.edges
@@ -161,12 +161,12 @@ export default function DocumentsPage(props: Props) {
       {
         message: sprintf(
           __(
-            "This will permanently delete %s document%s. This action cannot be undone."
+            "This will permanently delete %s document%s. This action cannot be undone.",
           ),
           documentCount,
-          documentCount > 1 ? "s" : ""
+          documentCount > 1 ? "s" : "",
         ),
-      }
+      },
     );
   };
 
@@ -396,7 +396,7 @@ function DocumentRow({
   const { isAuthorized } = use(PermissionsContext);
   const document = useFragment<DocumentsPageRowFragment$key>(
     rowFragment,
-    documentKey
+    documentKey,
   );
   const lastVersion = document.versions.edges?.[0]?.node;
 
@@ -414,7 +414,7 @@ function DocumentRow({
     lastVersion.signatures?.edges?.map((edge) => edge?.node)?.filter(Boolean) ??
     [];
   const signedCount = signatures.filter(
-    (signature) => signature.state === "SIGNED"
+    (signature) => signature.state === "SIGNED",
   ).length;
 
   const handleDelete = () => {
@@ -428,11 +428,11 @@ function DocumentRow({
       {
         message: sprintf(
           __(
-            'This will permanently delete the document "%s". This action cannot be undone.'
+            'This will permanently delete the document "%s". This action cannot be undone.',
           ),
-          document.title
+          document.title,
         ),
-      }
+      },
     );
   };
 
diff --git a/apps/console/src/pages/organizations/documents/dialogs/CreateDocumentDialog.tsx b/apps/console/src/pages/organizations/documents/dialogs/CreateDocumentDialog.tsx
index 532731845..c54d7bfd6 100644
--- a/apps/console/src/pages/organizations/documents/dialogs/CreateDocumentDialog.tsx
+++ b/apps/console/src/pages/organizations/documents/dialogs/CreateDocumentDialog.tsx
@@ -18,7 +18,7 @@ import { useOrganizationId } from "/hooks/useOrganizationId";
 import { useDocumentForm } from "/hooks/forms/useDocumentForm";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
 import { PeopleSelectField } from "/components/form/PeopleSelectField";
-import type { CreateDocumentDialogMutation } from "./__generated__/CreateDocumentDialogMutation.graphql";
+import type { CreateDocumentDialogMutation } from "/__generated__/core/CreateDocumentDialogMutation.graphql";
 import { ControlledField } from "/components/form/ControlledField";
 import { DocumentTypeOptions } from "/components/form/DocumentTypeOptions";
 import { DocumentClassificationOptions } from "/components/form/DocumentClassificationOptions";
diff --git a/apps/console/src/pages/organizations/documents/dialogs/PublishDocumentsDialog.tsx b/apps/console/src/pages/organizations/documents/dialogs/PublishDocumentsDialog.tsx
index 0fe518b59..e24f3ea44 100644
--- a/apps/console/src/pages/organizations/documents/dialogs/PublishDocumentsDialog.tsx
+++ b/apps/console/src/pages/organizations/documents/dialogs/PublishDocumentsDialog.tsx
@@ -14,7 +14,7 @@ import { useFormWithSchema } from "/hooks/useFormWithSchema.ts";
 import { graphql } from "relay-runtime";
 import { sprintf } from "@probo/helpers";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts.ts";
-import type { PublishDocumentsDialogMutation } from "./__generated__/PublishDocumentsDialogMutation.graphql.ts";
+import type { PublishDocumentsDialogMutation } from "/__generated__/core/PublishDocumentsDialogMutation.graphql.ts";
 
 type Props = {
   documentIds: string[];
@@ -49,16 +49,21 @@ export function PublishDocumentsDialog({
     changelog: z.string().min(1, __("Changelog is required")),
   });
 
-  const [publishMutation] = useMutationWithToasts<PublishDocumentsDialogMutation>(documentsPublishMutation, {
-    successMessage: (response) => {
-      const actualPublishedCount = response.bulkPublishDocumentVersions.documentEdges.length;
-      return sprintf(__("%s documents published"), actualPublishedCount);
-    },
-    errorMessage: sprintf(
-      __("Failed to publish %s documents"),
-      documentIds.length
-    ),
-  });
+  const [publishMutation] =
+    useMutationWithToasts<PublishDocumentsDialogMutation>(
+      documentsPublishMutation,
+      {
+        successMessage: (response) => {
+          const actualPublishedCount =
+            response.bulkPublishDocumentVersions.documentEdges.length;
+          return sprintf(__("%s documents published"), actualPublishedCount);
+        },
+        errorMessage: sprintf(
+          __("Failed to publish %s documents"),
+          documentIds.length,
+        ),
+      },
+    );
 
   const {
     handleSubmit,
diff --git a/apps/console/src/pages/organizations/documents/dialogs/SignatureDocumentsDialog.tsx b/apps/console/src/pages/organizations/documents/dialogs/SignatureDocumentsDialog.tsx
index a32c05bf1..f321c7999 100644
--- a/apps/console/src/pages/organizations/documents/dialogs/SignatureDocumentsDialog.tsx
+++ b/apps/console/src/pages/organizations/documents/dialogs/SignatureDocumentsDialog.tsx
@@ -20,7 +20,7 @@ import { graphql } from "relay-runtime";
 import { sprintf } from "@probo/helpers";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts.ts";
 import { useOrganizationId } from "/hooks/useOrganizationId.ts";
-import type { SignatureDocumentsDialogMutation } from "./__generated__/SignatureDocumentsDialogMutation.graphql.ts";
+import type { SignatureDocumentsDialogMutation } from "/__generated__/core/SignatureDocumentsDialogMutation.graphql.ts";
 import { useFormWithSchema } from "/hooks/useFormWithSchema.ts";
 import z from "zod";
 import {
@@ -29,8 +29,8 @@ import {
 } from "/hooks/graph/PeopleGraph.ts";
 import { useList } from "@probo/hooks";
 import { useLazyLoadQuery, usePaginationFragment } from "react-relay";
-import type { PeopleGraphPaginatedFragment$key } from "/hooks/graph/__generated__/PeopleGraphPaginatedFragment.graphql.ts";
-import type { PeopleGraphPaginatedQuery } from "/hooks/graph/__generated__/PeopleGraphPaginatedQuery.graphql.ts";
+import type { PeopleGraphPaginatedFragment$key } from "/__generated__/core/PeopleGraphPaginatedFragment.graphql.ts";
+import type { PeopleGraphPaginatedQuery } from "/__generated__/core/PeopleGraphPaginatedQuery.graphql.ts";
 
 type Props = {
   documentIds: string[];
@@ -64,13 +64,18 @@ export function SignatureDocumentsDialog({
 
   const schema = z.object({});
 
-  const [publishMutation] = useMutationWithToasts<SignatureDocumentsDialogMutation>(documentsSignatureMutation, {
-    successMessage: (response) => {
-      const actualRequestsCount = response.bulkRequestSignatures.documentVersionSignatureEdges.length;
-      return sprintf(__("%s signature requests sent"), actualRequestsCount);
-    },
-    errorMessage: __("Failed to send signature requests"),
-  });
+  const [publishMutation] =
+    useMutationWithToasts<SignatureDocumentsDialogMutation>(
+      documentsSignatureMutation,
+      {
+        successMessage: (response) => {
+          const actualRequestsCount =
+            response.bulkRequestSignatures.documentVersionSignatureEdges.length;
+          return sprintf(__("%s signature requests sent"), actualRequestsCount);
+        },
+        errorMessage: __("Failed to send signature requests"),
+      },
+    );
 
   const {
     handleSubmit,
@@ -106,7 +111,10 @@ export function SignatureDocumentsDialog({
           </Suspense>
         </DialogContent>
         <DialogFooter>
-          <Button type="submit" disabled={selectedPeople.length === 0 || isSubmitting}>
+          <Button
+            type="submit"
+            disabled={selectedPeople.length === 0 || isSubmitting}
+          >
             {__("Send signature requests")}
           </Button>
         </DialogFooter>
@@ -128,7 +136,7 @@ function PeopleList({
     paginatedPeopleQuery,
     {
       organizationId,
-    }
+    },
   );
   const {
     data: page,
@@ -137,7 +145,7 @@ function PeopleList({
     isLoadingNext,
   } = usePaginationFragment(
     paginatedPeopleFragment,
-    data.organization as PeopleGraphPaginatedFragment$key
+    data.organization as PeopleGraphPaginatedFragment$key,
   );
   const people = page.peoples.edges.map((edge) => edge.node);
   return (
diff --git a/apps/console/src/pages/organizations/documents/dialogs/UpdateVersionDialog.tsx b/apps/console/src/pages/organizations/documents/dialogs/UpdateVersionDialog.tsx
index 92e05197b..01b777ecc 100644
--- a/apps/console/src/pages/organizations/documents/dialogs/UpdateVersionDialog.tsx
+++ b/apps/console/src/pages/organizations/documents/dialogs/UpdateVersionDialog.tsx
@@ -13,12 +13,12 @@ import {
 import { type RefObject } from "react";
 import { graphql } from "relay-runtime";
 import { useMutation } from "react-relay";
-import type { UpdateVersionDialogCreateMutation } from "./__generated__/UpdateVersionDialogCreateMutation.graphql";
-import type { UpdateVersionDialogUpdateMutation } from "./__generated__/UpdateVersionDialogUpdateMutation.graphql";
+import type { UpdateVersionDialogCreateMutation } from "/__generated__/core/UpdateVersionDialogCreateMutation.graphql";
+import type { UpdateVersionDialogUpdateMutation } from "/__generated__/core/UpdateVersionDialogUpdateMutation.graphql";
 import { z } from "zod";
 import { useFormWithSchema } from "/hooks/useFormWithSchema";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
-import type { DocumentDetailPageDocumentFragment$data } from "../__generated__/DocumentDetailPageDocumentFragment.graphql";
+import type { DocumentDetailPageDocumentFragment$data } from "/__generated__/core/DocumentDetailPageDocumentFragment.graphql";
 
 const createDraftDocument = graphql`
   mutation UpdateVersionDialogCreateMutation(
@@ -90,7 +90,7 @@ export default function UpdateVersionDialog({
       {
         successMessage: __("Document updated successfully."),
         errorMessage: __("Failed to update document"),
-      }
+      },
     );
   const { handleSubmit, register } = useFormWithSchema(versionSchema, {
     defaultValues: {
@@ -140,7 +140,9 @@ export default function UpdateVersionDialog({
             return;
           }
 
-          const newVersionId = createResponse?.createDraftDocumentVersion?.documentVersionEdge?.node?.id;
+          const newVersionId =
+            createResponse?.createDraftDocumentVersion?.documentVersionEdge
+              ?.node?.id;
           if (newVersionId && data.content !== version.content) {
             updateDocumentVersion({
               variables: {
diff --git a/apps/console/src/pages/organizations/documents/tabs/DocumentControlsTab.tsx b/apps/console/src/pages/organizations/documents/tabs/DocumentControlsTab.tsx
index 007d0fe28..18c0400ed 100644
--- a/apps/console/src/pages/organizations/documents/tabs/DocumentControlsTab.tsx
+++ b/apps/console/src/pages/organizations/documents/tabs/DocumentControlsTab.tsx
@@ -2,7 +2,7 @@ import { LinkedControlsCard } from "/components/controls/LinkedControlsCard";
 import { useOutletContext } from "react-router";
 import { graphql } from "relay-runtime";
 import { useRefetchableFragment } from "react-relay";
-import type { DocumentControlsTabFragment$key } from "./__generated__/DocumentControlsTabFragment.graphql";
+import type { DocumentControlsTabFragment$key } from "/__generated__/core/DocumentControlsTabFragment.graphql";
 import { useMutationWithIncrement } from "/hooks/useMutationWithIncrement";
 
 export const controlsFragment = graphql`
diff --git a/apps/console/src/pages/organizations/documents/tabs/DocumentDescriptionTab.tsx b/apps/console/src/pages/organizations/documents/tabs/DocumentDescriptionTab.tsx
index c94b993cd..afca04f66 100644
--- a/apps/console/src/pages/organizations/documents/tabs/DocumentDescriptionTab.tsx
+++ b/apps/console/src/pages/organizations/documents/tabs/DocumentDescriptionTab.tsx
@@ -1,5 +1,5 @@
 import { useOutletContext } from "react-router";
-import type { DocumentDetailPageDocumentFragment$data } from "../__generated__/DocumentDetailPageDocumentFragment.graphql";
+import type { DocumentDetailPageDocumentFragment$data } from "/__generated__/core/DocumentDetailPageDocumentFragment.graphql";
 import type { NodeOf } from "/types";
 import { Markdown } from "@probo/ui";
 
diff --git a/apps/console/src/pages/organizations/documents/tabs/DocumentSignaturesTab.tsx b/apps/console/src/pages/organizations/documents/tabs/DocumentSignaturesTab.tsx
index 049b3ba07..78f2b4a4e 100644
--- a/apps/console/src/pages/organizations/documents/tabs/DocumentSignaturesTab.tsx
+++ b/apps/console/src/pages/organizations/documents/tabs/DocumentSignaturesTab.tsx
@@ -15,11 +15,11 @@ import { usePeople } from "/hooks/graph/PeopleGraph.ts";
 import { useOrganizationId } from "/hooks/useOrganizationId.ts";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts.ts";
 import { sprintf } from "@probo/helpers";
-import type { DocumentDetailPageDocumentFragment$data } from "../__generated__/DocumentDetailPageDocumentFragment.graphql";
+import type { DocumentDetailPageDocumentFragment$data } from "/__generated__/core/DocumentDetailPageDocumentFragment.graphql";
 import { useOutletContext } from "react-router";
-import type { DocumentSignaturesTab_signature$key } from "/pages/organizations/documents/tabs/__generated__/DocumentSignaturesTab_signature.graphql.ts";
-import type { DocumentSignaturesTab_version$key } from "/pages/organizations/documents/tabs/__generated__/DocumentSignaturesTab_version.graphql.ts";
-import type { DocumentSignaturesTabRefetchQuery } from "./__generated__/DocumentSignaturesTabRefetchQuery.graphql";
+import type { DocumentSignaturesTab_signature$key } from "/__generated__/core/DocumentSignaturesTab_signature.graphql.ts";
+import type { DocumentSignaturesTab_version$key } from "/__generated__/core/DocumentSignaturesTab_version.graphql.ts";
+import type { DocumentSignaturesTabRefetchQuery } from "/__generated__/core/DocumentSignaturesTabRefetchQuery.graphql";
 import { PermissionsContext } from "/providers/PermissionsContext";
 
 type Version = NodeOf<DocumentDetailPageDocumentFragment$data["versions"]>;
@@ -71,7 +71,7 @@ export default function DocumentSignaturesTab() {
 
   const toggleState = (state: SignatureState) => {
     setSelectedStates((prev) =>
-      prev.includes(state) ? prev.filter((s) => s !== state) : [...prev, state]
+      prev.includes(state) ? prev.filter((s) => s !== state) : [...prev, state],
     );
   };
 
@@ -253,14 +253,14 @@ function SignatureItem(props: {
     {
       successMessage: __("Signature request sent successfully"),
       errorMessage: __("Failed to send signature request"),
-    }
+    },
   );
   const [cancelSignature, isCancellingSignature] = useMutationWithToasts(
     cancelSignatureMutation,
     {
       successMessage: __("Request cancelled successfully"),
       errorMessage: __("Failed to cancel signature request"),
-    }
+    },
   );
 
   // No signature request for this user
@@ -276,27 +276,25 @@ function SignatureItem(props: {
             {props.people.primaryEmailAddress}
           </div>
         </div>
-        {props.signable && (
-          isAuthorized("Document", "requestSignature") && (
-            <Button
-              variant="secondary"
-              className="ml-auto"
-              disabled={isSendingRequest}
-              onClick={() => {
-                requestSignature({
-                  variables: {
-                    input: {
-                      documentVersionId: props.versionId,
-                      signatoryId: props.people.id,
-                    },
-                    connections: [props.connectionId],
+        {props.signable && isAuthorized("Document", "requestSignature") && (
+          <Button
+            variant="secondary"
+            className="ml-auto"
+            disabled={isSendingRequest}
+            onClick={() => {
+              requestSignature({
+                variables: {
+                  input: {
+                    documentVersionId: props.versionId,
+                    signatoryId: props.people.id,
                   },
-                });
-              }}
-            >
-              {__("Request signature")}
-            </Button>
-          )
+                  connections: [props.connectionId],
+                },
+              });
+            }}
+          >
+            {__("Request signature")}
+          </Button>
         )}
       </div>
     );
@@ -322,8 +320,8 @@ function SignatureItem(props: {
             {sprintf(
               label,
               dateTimeFormat(
-                isSigned ? signature.signedAt : signature.requestedAt
-              )
+                isSigned ? signature.signedAt : signature.requestedAt,
+              ),
             )}
           </span>
         </div>
diff --git a/apps/console/src/pages/organizations/employee/EmployeeDocumentSignaturePage.tsx b/apps/console/src/pages/organizations/employee/EmployeeDocumentSignaturePage.tsx
index b50a7df4f..1a2bdb6cd 100644
--- a/apps/console/src/pages/organizations/employee/EmployeeDocumentSignaturePage.tsx
+++ b/apps/console/src/pages/organizations/employee/EmployeeDocumentSignaturePage.tsx
@@ -7,16 +7,16 @@ import {
   type PreloadedQuery,
 } from "react-relay";
 import { graphql } from "react-relay";
-import type { EmployeeDocumentSignaturePageQuery } from "./__generated__/EmployeeDocumentSignaturePageQuery.graphql";
+import type { EmployeeDocumentSignaturePageQuery } from "/__generated__/core/EmployeeDocumentSignaturePageQuery.graphql";
 import { usePageTitle } from "@probo/hooks";
-import type { EmployeeDocumentSignaturePageSignMutation } from "./__generated__/EmployeeDocumentSignaturePageSignMutation.graphql";
-import type { EmployeeDocumentSignaturePageExportSignablePDFMutation } from "./__generated__/EmployeeDocumentSignaturePageExportSignablePDFMutation.graphql";
+import type { EmployeeDocumentSignaturePageSignMutation } from "/__generated__/core/EmployeeDocumentSignaturePageSignMutation.graphql";
+import type { EmployeeDocumentSignaturePageExportSignablePDFMutation } from "/__generated__/core/EmployeeDocumentSignaturePageExportSignablePDFMutation.graphql";
 import { useNavigate } from "react-router";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import { PDFPreview } from "/components/documents/PDFPreview";
 import { useWindowSize } from "usehooks-ts";
 import { useState, useEffect, useRef } from "react";
-import type { EmployeeDocumentSignaturePageDocumentFragment$key } from "./__generated__/EmployeeDocumentSignaturePageDocumentFragment.graphql";
+import type { EmployeeDocumentSignaturePageDocumentFragment$key } from "/__generated__/core/EmployeeDocumentSignaturePageDocumentFragment.graphql";
 import { useToast } from "@probo/ui";
 import { formatError, type GraphQLError } from "@probo/helpers";
 import { VersionActions } from "./_components/VersionActions";
@@ -80,7 +80,7 @@ export function EmployeeDocumentSignaturePage(props: {
   const { queryRef } = props;
   const { viewer } = usePreloadedQuery<EmployeeDocumentSignaturePageQuery>(
     employeeDocumentSignaturePageQuery,
-    queryRef
+    queryRef,
   );
   const document = viewer.signableDocument;
 
@@ -110,7 +110,7 @@ function DocumentSignatureContent({
   const documentData =
     useFragment<EmployeeDocumentSignaturePageDocumentFragment$key>(
       documentFragment,
-      fKey
+      fKey,
     );
 
   const versions = documentData.versions.edges.map(({ node }) => node);
@@ -126,12 +126,12 @@ function DocumentSignatureContent({
 
   const [signDocument, isSigning] =
     useMutation<EmployeeDocumentSignaturePageSignMutation>(
-      signDocumentMutation
+      signDocumentMutation,
     );
 
   const [exportSignableVersionDocumentPDF] =
     useMutation<EmployeeDocumentSignaturePageExportSignablePDFMutation>(
-      exportSignableVersionDocumentPDFMutation
+      exportSignableVersionDocumentPDFMutation,
     );
 
   const [pdfUrl, setPdfUrl] = useState<string | null>(null);
@@ -164,7 +164,7 @@ function DocumentSignatureContent({
           title: __("Error"),
           description: formatError(
             __("Failed to sign document"),
-            error as GraphQLError
+            error as GraphQLError,
           ),
           variant: "error",
         });
@@ -187,7 +187,7 @@ function DocumentSignatureContent({
             title: __("Error"),
             description: formatError(
               __("Failed to load PDF"),
-              errors as GraphQLError[]
+              errors as GraphQLError[],
             ),
             variant: "error",
           });
@@ -204,7 +204,7 @@ function DocumentSignatureContent({
           title: __("Error"),
           description: formatError(
             __("Failed to load PDF"),
-            error as GraphQLError
+            error as GraphQLError,
           ),
           variant: "error",
         });
diff --git a/apps/console/src/pages/organizations/employee/EmployeeDocumentSignaturePageLoader.tsx b/apps/console/src/pages/organizations/employee/EmployeeDocumentSignaturePageLoader.tsx
index 2d505ab2d..081ef431d 100644
--- a/apps/console/src/pages/organizations/employee/EmployeeDocumentSignaturePageLoader.tsx
+++ b/apps/console/src/pages/organizations/employee/EmployeeDocumentSignaturePageLoader.tsx
@@ -2,7 +2,7 @@ import { useQueryLoader } from "react-relay";
 import { Suspense, useEffect } from "react";
 import { PageSkeleton } from "/components/skeletons/PageSkeleton";
 import { useParams } from "react-router";
-import type { EmployeeDocumentSignaturePageQuery } from "./__generated__/EmployeeDocumentSignaturePageQuery.graphql";
+import type { EmployeeDocumentSignaturePageQuery } from "/__generated__/core/EmployeeDocumentSignaturePageQuery.graphql";
 import {
   EmployeeDocumentSignaturePage,
   employeeDocumentSignaturePageQuery,
@@ -13,7 +13,7 @@ function EmployeeDocumentSignaturePageLoader() {
   const { documentId } = useParams();
   const [queryRef, loadQuery] =
     useQueryLoader<EmployeeDocumentSignaturePageQuery>(
-      employeeDocumentSignaturePageQuery
+      employeeDocumentSignaturePageQuery,
     );
 
   useEffect(() => {
diff --git a/apps/console/src/pages/organizations/employee/EmployeeDocumentsPage.tsx b/apps/console/src/pages/organizations/employee/EmployeeDocumentsPage.tsx
index 88c4e4b14..78ede0a9f 100644
--- a/apps/console/src/pages/organizations/employee/EmployeeDocumentsPage.tsx
+++ b/apps/console/src/pages/organizations/employee/EmployeeDocumentsPage.tsx
@@ -1,7 +1,7 @@
 import { graphql, usePreloadedQuery, type PreloadedQuery } from "react-relay";
 import { useTranslate } from "@probo/i18n";
 import { PageHeader, Tbody, Thead, Tr, Th, Card } from "@probo/ui";
-import type { EmployeeDocumentsPageQuery } from "./__generated__/EmployeeDocumentsPageQuery.graphql";
+import type { EmployeeDocumentsPageQuery } from "/__generated__/core/EmployeeDocumentsPageQuery.graphql";
 import { usePageTitle } from "@probo/hooks";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import { DocumentRow } from "./_components/DocumentRow";
@@ -36,7 +36,7 @@ export function EmployeeDocumentsPage(props: {
     viewer: { signableDocuments },
   } = usePreloadedQuery<EmployeeDocumentsPageQuery>(
     employeeDocumentsPageQuery,
-    queryRef
+    queryRef,
   );
 
   const documents = signableDocuments.edges.map((edge) => edge.node);
diff --git a/apps/console/src/pages/organizations/employee/EmployeeDocumentsPageLoader.tsx b/apps/console/src/pages/organizations/employee/EmployeeDocumentsPageLoader.tsx
index 4eef2980b..753f1dfcd 100644
--- a/apps/console/src/pages/organizations/employee/EmployeeDocumentsPageLoader.tsx
+++ b/apps/console/src/pages/organizations/employee/EmployeeDocumentsPageLoader.tsx
@@ -2,7 +2,7 @@ import { useQueryLoader } from "react-relay";
 import { Suspense, useEffect } from "react";
 import { PageSkeleton } from "/components/skeletons/PageSkeleton";
 import { useOrganizationId } from "/hooks/useOrganizationId";
-import type { EmployeeDocumentsPageQuery } from "./__generated__/EmployeeDocumentsPageQuery.graphql";
+import type { EmployeeDocumentsPageQuery } from "/__generated__/core/EmployeeDocumentsPageQuery.graphql";
 import {
   EmployeeDocumentsPage,
   employeeDocumentsPageQuery,
@@ -12,7 +12,7 @@ import { CoreRelayProvider } from "/providers/CoreRelayProvider";
 function EmployeeDocumentsPageLoader() {
   const organizationId = useOrganizationId();
   const [queryRef, loadQuery] = useQueryLoader<EmployeeDocumentsPageQuery>(
-    employeeDocumentsPageQuery
+    employeeDocumentsPageQuery,
   );
 
   useEffect(() => {
diff --git a/apps/console/src/pages/organizations/employee/_components/DocumentRow.tsx b/apps/console/src/pages/organizations/employee/_components/DocumentRow.tsx
index e0cbcdb88..4e6ad7192 100644
--- a/apps/console/src/pages/organizations/employee/_components/DocumentRow.tsx
+++ b/apps/console/src/pages/organizations/employee/_components/DocumentRow.tsx
@@ -7,7 +7,7 @@ import {
   getDocumentTypeLabel,
   formatDate,
 } from "@probo/helpers";
-import type { DocumentRowFragment$key } from "./__generated__/DocumentRowFragment.graphql";
+import type { DocumentRowFragment$key } from "/__generated__/core/DocumentRowFragment.graphql";
 
 const fragment = graphql`
   fragment DocumentRowFragment on SignableDocument {
diff --git a/apps/console/src/pages/organizations/employee/_components/VersionActions.tsx b/apps/console/src/pages/organizations/employee/_components/VersionActions.tsx
index aee46fb9a..c6e118990 100644
--- a/apps/console/src/pages/organizations/employee/_components/VersionActions.tsx
+++ b/apps/console/src/pages/organizations/employee/_components/VersionActions.tsx
@@ -2,7 +2,7 @@ import { useTranslate } from "@probo/i18n";
 import { Button, Spinner } from "@probo/ui";
 import { useFragment } from "react-relay";
 import { graphql } from "react-relay";
-import type { VersionActionsFragment$key } from "./__generated__/VersionActionsFragment.graphql";
+import type { VersionActionsFragment$key } from "/__generated__/core/VersionActionsFragment.graphql";
 
 const fragment = graphql`
   fragment VersionActionsFragment on DocumentVersion {
@@ -49,7 +49,7 @@ export function VersionActions({
       </Button>
       <p className="text-xs text-txt-tertiary mt-2 h-5">
         {__(
-          "By clicking 'I acknowledge and agree', your digital signature will be recorded."
+          "By clicking 'I acknowledge and agree', your digital signature will be recorded.",
         )}
       </p>
     </>
diff --git a/apps/console/src/pages/organizations/employee/_components/VersionRow.tsx b/apps/console/src/pages/organizations/employee/_components/VersionRow.tsx
index ad31e783e..2f3df5173 100644
--- a/apps/console/src/pages/organizations/employee/_components/VersionRow.tsx
+++ b/apps/console/src/pages/organizations/employee/_components/VersionRow.tsx
@@ -3,7 +3,7 @@ import { IconCircleCheck, IconRadioUnchecked } from "@probo/ui";
 import clsx from "clsx";
 import { useFragment } from "react-relay";
 import { graphql } from "react-relay";
-import type { VersionRowFragment$key } from "./__generated__/VersionRowFragment.graphql";
+import type { VersionRowFragment$key } from "/__generated__/core/VersionRowFragment.graphql";
 
 const fragment = graphql`
   fragment VersionRowFragment on DocumentVersion {
@@ -34,7 +34,7 @@ export function VersionRow({
         "flex items-center gap-3 py-3 px-4 transition-colors cursor-pointer",
         isSelected
           ? "bg-blue-50 border-l-4 border-blue-500"
-          : "bg-transparent hover:bg-level-1"
+          : "bg-transparent hover:bg-level-1",
       )}
     >
       <div className="flex items-center justify-center w-8 h-8 rounded-full bg-level-2 flex-shrink-0">
@@ -48,7 +48,7 @@ export function VersionRow({
         <p
           className={clsx(
             "text-sm font-medium truncate",
-            isVersionSigned ? "text-txt-tertiary" : "text-txt-primary"
+            isVersionSigned ? "text-txt-tertiary" : "text-txt-primary",
           )}
         >
           {versionData.publishedAt
@@ -70,7 +70,7 @@ export function VersionRow({
               ? "bg-green-100 text-green-800"
               : isSelected
                 ? "bg-blue-100 text-blue-800"
-                : "bg-gray-100 text-gray-700"
+                : "bg-gray-100 text-gray-700",
           )}
         >
           {isVersionSigned
diff --git a/apps/console/src/pages/organizations/frameworks/FrameworkControlPage.tsx b/apps/console/src/pages/organizations/frameworks/FrameworkControlPage.tsx
index 90cf22346..bf980744e 100644
--- a/apps/console/src/pages/organizations/frameworks/FrameworkControlPage.tsx
+++ b/apps/console/src/pages/organizations/frameworks/FrameworkControlPage.tsx
@@ -1,18 +1,18 @@
 import {
-  useMutation,
-  usePreloadedQuery,
-  type PreloadedQuery,
-  type UseMutationConfig,
+    useMutation,
+    usePreloadedQuery,
+    type PreloadedQuery,
+    type UseMutationConfig,
 } from "react-relay";
 import { graphql, type MutationParameters } from "relay-runtime";
 import {
-  ActionDropdown,
-  Button,
-  DropdownItem,
-  IconPencil,
-  IconTrashCan,
-  useConfirm,
-  useToast,
+    ActionDropdown,
+    Button,
+    DropdownItem,
+    IconPencil,
+    IconTrashCan,
+    useConfirm,
+    useToast,
 } from "@probo/ui";
 import { useTranslate } from "@probo/i18n";
 import { formatError, type GraphQLError } from "@probo/helpers";
@@ -26,403 +26,538 @@ import { LinkedSnapshotsCard } from "/components/snapshots/LinkedSnapshotsCard";
 import { LinkedStatesOfApplicabilityCard } from "/components/states-of-applicability/LinkedStatesOfApplicabilityCard";
 import { FrameworkControlDialog } from "./dialogs/FrameworkControlDialog";
 import { promisifyMutation } from "@probo/helpers";
-import type { FrameworkGraphControlNodeQuery } from "/hooks/graph/__generated__/FrameworkGraphControlNodeQuery.graphql";
+import type { FrameworkGraphControlNodeQuery } from "/__generated__/core/FrameworkGraphControlNodeQuery.graphql";
 import { frameworkControlNodeQuery } from "/hooks/graph/FrameworkGraph";
-import type { FrameworkDetailPageFragment$data } from "./__generated__/FrameworkDetailPageFragment.graphql";
+import type { FrameworkDetailPageFragment$data } from "/__generated__/core/FrameworkDetailPageFragment.graphql";
 import { use } from "react";
 import { PermissionsContext } from "/providers/PermissionsContext";
 
 const attachStateOfApplicabilityMutation = graphql`
-  mutation FrameworkControlPageAttachStateOfApplicabilityMutation(
-    $input: CreateStateOfApplicabilityControlMappingInput!
-    $connections: [ID!]!
-  ) {
-    createStateOfApplicabilityControlMapping(input: $input) {
-      stateOfApplicabilityControlEdge @prependEdge(connections: $connections) {
-        node {
-          id
-          ...LinkedStatesOfApplicabilityCardFragment
+    mutation FrameworkControlPageAttachStateOfApplicabilityMutation(
+        $input: CreateStateOfApplicabilityControlMappingInput!
+        $connections: [ID!]!
+    ) {
+        createStateOfApplicabilityControlMapping(input: $input) {
+            stateOfApplicabilityControlEdge
+                @prependEdge(connections: $connections) {
+                node {
+                    id
+                    ...LinkedStatesOfApplicabilityCardFragment
+                }
+            }
         }
-      }
     }
-  }
 `;
 
 const detachStateOfApplicabilityMutation = graphql`
-  mutation FrameworkControlPageDetachStateOfApplicabilityMutation(
-    $input: DeleteStateOfApplicabilityControlMappingInput!
-    $connections: [ID!]!
-  ) {
-    deleteStateOfApplicabilityControlMapping(input: $input) {
-      deletedStateOfApplicabilityId
-      deletedControlId
-      deletedStateOfApplicabilityControlId @deleteEdge(connections: $connections)
+    mutation FrameworkControlPageDetachStateOfApplicabilityMutation(
+        $input: DeleteStateOfApplicabilityControlMappingInput!
+        $connections: [ID!]!
+    ) {
+        deleteStateOfApplicabilityControlMapping(input: $input) {
+            deletedStateOfApplicabilityId
+            deletedControlId
+            deletedStateOfApplicabilityControlId
+                @deleteEdge(connections: $connections)
+        }
     }
-  }
 `;
 
 const attachMeasureMutation = graphql`
-  mutation FrameworkControlPageAttachMutation(
-    $input: CreateControlMeasureMappingInput!
-    $connections: [ID!]!
-  ) {
-    createControlMeasureMapping(input: $input) {
-      measureEdge @prependEdge(connections: $connections) {
-        node {
-          id
-          ...LinkedMeasuresCardFragment
+    mutation FrameworkControlPageAttachMutation(
+        $input: CreateControlMeasureMappingInput!
+        $connections: [ID!]!
+    ) {
+        createControlMeasureMapping(input: $input) {
+            measureEdge @prependEdge(connections: $connections) {
+                node {
+                    id
+                    ...LinkedMeasuresCardFragment
+                }
+            }
         }
-      }
     }
-  }
 `;
 
 const detachMeasureMutation = graphql`
-  mutation FrameworkControlPageDetachMutation(
-    $input: DeleteControlMeasureMappingInput!
-    $connections: [ID!]!
-  ) {
-    deleteControlMeasureMapping(input: $input) {
-      deletedMeasureId @deleteEdge(connections: $connections)
+    mutation FrameworkControlPageDetachMutation(
+        $input: DeleteControlMeasureMappingInput!
+        $connections: [ID!]!
+    ) {
+        deleteControlMeasureMapping(input: $input) {
+            deletedMeasureId @deleteEdge(connections: $connections)
+        }
     }
-  }
 `;
 
 const attachDocumentMutation = graphql`
-  mutation FrameworkControlPageAttachDocumentMutation(
-    $input: CreateControlDocumentMappingInput!
-    $connections: [ID!]!
-  ) {
-    createControlDocumentMapping(input: $input) {
-      documentEdge @prependEdge(connections: $connections) {
-        node {
-          id
-          ...LinkedDocumentsCardFragment
+    mutation FrameworkControlPageAttachDocumentMutation(
+        $input: CreateControlDocumentMappingInput!
+        $connections: [ID!]!
+    ) {
+        createControlDocumentMapping(input: $input) {
+            documentEdge @prependEdge(connections: $connections) {
+                node {
+                    id
+                    ...LinkedDocumentsCardFragment
+                }
+            }
         }
-      }
     }
-  }
 `;
 
 const detachDocumentMutation = graphql`
-  mutation FrameworkControlPageDetachDocumentMutation(
-    $input: DeleteControlDocumentMappingInput!
-    $connections: [ID!]!
-  ) {
-    deleteControlDocumentMapping(input: $input) {
-      deletedDocumentId @deleteEdge(connections: $connections)
+    mutation FrameworkControlPageDetachDocumentMutation(
+        $input: DeleteControlDocumentMappingInput!
+        $connections: [ID!]!
+    ) {
+        deleteControlDocumentMapping(input: $input) {
+            deletedDocumentId @deleteEdge(connections: $connections)
+        }
     }
-  }
 `;
 
 const attachAuditMutation = graphql`
-  mutation FrameworkControlPageAttachAuditMutation(
-    $input: CreateControlAuditMappingInput!
-    $connections: [ID!]!
-  ) {
-    createControlAuditMapping(input: $input) {
-      auditEdge @prependEdge(connections: $connections) {
-        node {
-          id
-          ...LinkedAuditsCardFragment
+    mutation FrameworkControlPageAttachAuditMutation(
+        $input: CreateControlAuditMappingInput!
+        $connections: [ID!]!
+    ) {
+        createControlAuditMapping(input: $input) {
+            auditEdge @prependEdge(connections: $connections) {
+                node {
+                    id
+                    ...LinkedAuditsCardFragment
+                }
+            }
         }
-      }
     }
-  }
 `;
 
 const detachAuditMutation = graphql`
-  mutation FrameworkControlPageDetachAuditMutation(
-    $input: DeleteControlAuditMappingInput!
-    $connections: [ID!]!
-  ) {
-    deleteControlAuditMapping(input: $input) {
-      deletedAuditId @deleteEdge(connections: $connections)
+    mutation FrameworkControlPageDetachAuditMutation(
+        $input: DeleteControlAuditMappingInput!
+        $connections: [ID!]!
+    ) {
+        deleteControlAuditMapping(input: $input) {
+            deletedAuditId @deleteEdge(connections: $connections)
+        }
     }
-  }
 `;
 
 const attachObligationMutation = graphql`
-  mutation FrameworkControlPageAttachObligationMutation(
-    $input: CreateControlObligationMappingInput!
-    $connections: [ID!]!
-  ) {
-    createControlObligationMapping(input: $input) {
-      obligationEdge @prependEdge(connections: $connections) {
-        node {
-          id
-          ...LinkedObligationsCardFragment
+    mutation FrameworkControlPageAttachObligationMutation(
+        $input: CreateControlObligationMappingInput!
+        $connections: [ID!]!
+    ) {
+        createControlObligationMapping(input: $input) {
+            obligationEdge @prependEdge(connections: $connections) {
+                node {
+                    id
+                    ...LinkedObligationsCardFragment
+                }
+            }
         }
-      }
     }
-  }
 `;
 
 const detachObligationMutation = graphql`
-  mutation FrameworkControlPageDetachObligationMutation(
-    $input: DeleteControlObligationMappingInput!
-    $connections: [ID!]!
-  ) {
-    deleteControlObligationMapping(input: $input) {
-      deletedObligationId @deleteEdge(connections: $connections)
+    mutation FrameworkControlPageDetachObligationMutation(
+        $input: DeleteControlObligationMappingInput!
+        $connections: [ID!]!
+    ) {
+        deleteControlObligationMapping(input: $input) {
+            deletedObligationId @deleteEdge(connections: $connections)
+        }
     }
-  }
 `;
 
 const attachSnapshotMutation = graphql`
-  mutation FrameworkControlPageAttachSnapshotMutation(
-    $input: CreateControlSnapshotMappingInput!
-    $connections: [ID!]!
-  ) {
-    createControlSnapshotMapping(input: $input) {
-      snapshotEdge @prependEdge(connections: $connections) {
-        node {
-          id
-          ...LinkedSnapshotsCardFragment
+    mutation FrameworkControlPageAttachSnapshotMutation(
+        $input: CreateControlSnapshotMappingInput!
+        $connections: [ID!]!
+    ) {
+        createControlSnapshotMapping(input: $input) {
+            snapshotEdge @prependEdge(connections: $connections) {
+                node {
+                    id
+                    ...LinkedSnapshotsCardFragment
+                }
+            }
         }
-      }
     }
-  }
 `;
 
 const detachSnapshotMutation = graphql`
-  mutation FrameworkControlPageDetachSnapshotMutation(
-    $input: DeleteControlSnapshotMappingInput!
-    $connections: [ID!]!
-  ) {
-    deleteControlSnapshotMapping(input: $input) {
-      deletedSnapshotId @deleteEdge(connections: $connections)
+    mutation FrameworkControlPageDetachSnapshotMutation(
+        $input: DeleteControlSnapshotMappingInput!
+        $connections: [ID!]!
+    ) {
+        deleteControlSnapshotMapping(input: $input) {
+            deletedSnapshotId @deleteEdge(connections: $connections)
+        }
     }
-  }
 `;
 
 const deleteControlMutation = graphql`
-  mutation FrameworkControlPageDeleteControlMutation(
-    $input: DeleteControlInput!
-    $connections: [ID!]!
-  ) {
-    deleteControl(input: $input) {
-      deletedControlId @deleteEdge(connections: $connections)
+    mutation FrameworkControlPageDeleteControlMutation(
+        $input: DeleteControlInput!
+        $connections: [ID!]!
+    ) {
+        deleteControl(input: $input) {
+            deletedControlId @deleteEdge(connections: $connections)
+        }
     }
-  }
 `;
 
 type Props = {
-  queryRef: PreloadedQuery<FrameworkGraphControlNodeQuery>;
+    queryRef: PreloadedQuery<FrameworkGraphControlNodeQuery>;
 };
 
 /**
  * Display the control detail on the right panel
  */
 export default function FrameworkControlPage({ queryRef }: Props) {
-  const { __ } = useTranslate();
-  const { toast } = useToast();
-  const { framework } = useOutletContext<{
-    framework: FrameworkDetailPageFragment$data;
-  }>();
-  const connectionId = framework.controls.__id;
-  const control = usePreloadedQuery(frameworkControlNodeQuery, queryRef).node;
-  const organizationId = useOrganizationId();
-  const confirm = useConfirm();
-  const navigate = useNavigate();
-  const { isAuthorized } = use(PermissionsContext);
-  const [detachStateOfApplicability, isDetachingStateOfApplicability] = useMutation(detachStateOfApplicabilityMutation);
-  const [attachStateOfApplicability, isAttachingStateOfApplicability] = useMutation(attachStateOfApplicabilityMutation);
-  const [detachMeasure, isDetachingMeasure] = useMutation(detachMeasureMutation);
-  const [attachMeasure, isAttachingMeasure] = useMutation(attachMeasureMutation);
-  const [detachDocument, isDetachingDocument] = useMutation(detachDocumentMutation);
-  const [attachDocument, isAttachingDocument] = useMutation(attachDocumentMutation);
-  const [detachAudit, isDetachingAudit] = useMutation(detachAuditMutation);
-  const [attachAudit, isAttachingAudit] = useMutation(attachAuditMutation);
-  const [detachObligation, isDetachingObligation] = useMutation(detachObligationMutation);
-  const [attachObligation, isAttachingObligation] = useMutation(attachObligationMutation);
-  const [detachSnapshot, isDetachingSnapshot] = useMutation(detachSnapshotMutation);
-  const [attachSnapshot, isAttachingSnapshot] = useMutation(attachSnapshotMutation);
-  const [deleteControl] = useMutation(deleteControlMutation);
-
-  const canLinkStateOfApplicability = isAuthorized("Control", "createStateOfApplicabilityControlMapping");
-  const canUnlinkStateOfApplicability = isAuthorized("Control", "deleteStateOfApplicabilityControlMapping");
-  const statesOfApplicabilityReadOnly = !canLinkStateOfApplicability && !canUnlinkStateOfApplicability;
-
-  const canLinkMeasure = isAuthorized("Control", "createControlMeasureMapping");
-  const canUnlinkMeasure = isAuthorized("Control", "deleteControlMeasureMapping");
-  const measuresReadOnly = !canLinkMeasure && !canUnlinkMeasure;
-
-  const canLinkDocument = isAuthorized("Control", "createControlDocumentMapping");
-  const canUnlinkDocument = isAuthorized("Control", "deleteControlDocumentMapping");
-  const documentsReadOnly = !canLinkDocument && !canUnlinkDocument;
-
-  const canLinkAudit = isAuthorized("Control", "createControlAuditMapping");
-  const canUnlinkAudit = isAuthorized("Control", "deleteControlAuditMapping");
-  const auditsReadOnly = !canLinkAudit && !canUnlinkAudit;
-
-  const canLinkObligation = isAuthorized("Control", "createControlObligationMapping");
-  const canUnlinkObligation = isAuthorized("Control", "deleteControlObligationMapping");
-  const obligationsReadOnly = !canLinkObligation && !canUnlinkObligation;
-
-  const canLinkSnapshot = isAuthorized("Control", "createControlSnapshotMapping");
-  const canUnlinkSnapshot = isAuthorized("Control", "deleteControlSnapshotMapping");
-  const snapshotsReadOnly = !canLinkSnapshot && !canUnlinkSnapshot;
-
-  const withErrorHandling = <T extends MutationParameters>(
-    mutationFn: (config: UseMutationConfig<T>) => void,
-    errorMessage: string
-  ) => (options: UseMutationConfig<T>) => {
-    mutationFn({
-      ...options,
-      onCompleted: (response, error) => {
-        if (error) {
-          toast({
-            title: __("Error"),
-            description: formatError(errorMessage, error as GraphQLError),
-            variant: "error",
-          });
-        }
-        options.onCompleted?.(response, error);
-      },
-      onError: (error) => {
-        toast({
-          title: __("Error"),
-          description: formatError(errorMessage, error as GraphQLError),
-          variant: "error",
-        });
-        options.onError?.(error);
-      },
-    });
-  };
-
-  const onDelete = () => {
-    confirm(
-      () => {
-        return promisifyMutation(deleteControl)({
-          variables: {
-            input: {
-              controlId: control.id,
-            },
-            connections: [connectionId],
-          },
-          onCompleted: () => {
-            navigate(
-              `/organizations/${organizationId}/frameworks/${framework.id}`
-            );
-          },
-        });
-      },
-      {
-        message: __("Are you sure you want to delete this control?"),
-      }
+    const { __ } = useTranslate();
+    const { toast } = useToast();
+    const { framework } = useOutletContext<{
+        framework: FrameworkDetailPageFragment$data;
+    }>();
+    const connectionId = framework.controls.__id;
+    const control = usePreloadedQuery(frameworkControlNodeQuery, queryRef).node;
+    const organizationId = useOrganizationId();
+    const confirm = useConfirm();
+    const navigate = useNavigate();
+    const { isAuthorized } = use(PermissionsContext);
+    const [detachStateOfApplicability, isDetachingStateOfApplicability] =
+        useMutation(detachStateOfApplicabilityMutation);
+    const [attachStateOfApplicability, isAttachingStateOfApplicability] =
+        useMutation(attachStateOfApplicabilityMutation);
+    const [detachMeasure, isDetachingMeasure] = useMutation(
+        detachMeasureMutation,
+    );
+    const [attachMeasure, isAttachingMeasure] = useMutation(
+        attachMeasureMutation,
+    );
+    const [detachDocument, isDetachingDocument] = useMutation(
+        detachDocumentMutation,
+    );
+    const [attachDocument, isAttachingDocument] = useMutation(
+        attachDocumentMutation,
+    );
+    const [detachAudit, isDetachingAudit] = useMutation(detachAuditMutation);
+    const [attachAudit, isAttachingAudit] = useMutation(attachAuditMutation);
+    const [detachSnapshot, isDetachingSnapshot] = useMutation(
+        detachSnapshotMutation,
+    );
+    const [attachSnapshot, isAttachingSnapshot] = useMutation(
+        attachSnapshotMutation,
+    );
+    const [deleteControl] = useMutation(deleteControlMutation);
+    const [attachObligation, isAttachingObligation] = useMutation(
+        attachObligationMutation,
+    );
+    const [detachObligation, isDetachingObligation] = useMutation(
+        detachObligationMutation,
     );
-  };
 
-  return (
-    <div className="space-y-6">
-      <div className="flex justify-between">
-        <div className="flex items-center gap-3">
-          <div className="text-xl font-medium px-[6px] py-[2px] border border-border-low rounded-lg w-max bg-active mb-3">
-            {control.sectionTitle}
-          </div>
-        </div>
-        <div className="flex gap-2">
-          {isAuthorized("Control", "updateControl") && (
-            <FrameworkControlDialog
-              frameworkId={framework.id}
-              connectionId={connectionId}
-              control={control}
-            >
-              <Button icon={IconPencil} variant="secondary">
-                {__("Edit control")}
-              </Button>
-            </FrameworkControlDialog>
-          )}
-          {isAuthorized("Control", "deleteControl") && (
-            <ActionDropdown variant="secondary">
-              <DropdownItem
-                icon={IconTrashCan}
-                variant="danger"
-                onClick={onDelete}
-              >
-                {__("Delete")}
-              </DropdownItem>
-            </ActionDropdown>
-          )}
-        </div>
-      </div>
+    const canLinkStateOfApplicability = isAuthorized(
+        "Control",
+        "createStateOfApplicabilityControlMapping",
+    );
+    const canUnlinkStateOfApplicability = isAuthorized(
+        "Control",
+        "deleteStateOfApplicabilityControlMapping",
+    );
+    const statesOfApplicabilityReadOnly =
+        !canLinkStateOfApplicability && !canUnlinkStateOfApplicability;
 
-      <div className={control.status === "EXCLUDED" ? "opacity-60" : ""}>
-        <div className="text-base mb-4">{control.name}</div>
-        <div className="mb-4">
-          <LinkedStatesOfApplicabilityCard
-            variant="card"
-            statesOfApplicability={control.stateOfApplicabilityControls?.edges.map((edge) => edge.node) ?? []}
-            params={{ controlId: control.id }}
-            connectionId={control.stateOfApplicabilityControls?.__id ?? ""}
-            onAttach={withErrorHandling(attachStateOfApplicability, __("Failed to link state of applicability"))}
-            onDetach={withErrorHandling(detachStateOfApplicability, __("Failed to unlink state of applicability"))}
-            disabled={isAttachingStateOfApplicability || isDetachingStateOfApplicability}
-            readOnly={statesOfApplicabilityReadOnly}
-          />
+    const canLinkMeasure = isAuthorized(
+        "Control",
+        "createControlMeasureMapping",
+    );
+    const canUnlinkMeasure = isAuthorized(
+        "Control",
+        "deleteControlMeasureMapping",
+    );
+    const measuresReadOnly = !canLinkMeasure && !canUnlinkMeasure;
+
+    const canLinkDocument = isAuthorized(
+        "Control",
+        "createControlDocumentMapping",
+    );
+    const canUnlinkDocument = isAuthorized(
+        "Control",
+        "deleteControlDocumentMapping",
+    );
+    const documentsReadOnly = !canLinkDocument && !canUnlinkDocument;
+
+    const canLinkAudit = isAuthorized("Control", "createControlAuditMapping");
+    const canUnlinkAudit = isAuthorized("Control", "deleteControlAuditMapping");
+    const auditsReadOnly = !canLinkAudit && !canUnlinkAudit;
+
+    const canLinkObligation = isAuthorized(
+        "Control",
+        "createControlObligationMapping",
+    );
+    const canUnlinkObligation = isAuthorized(
+        "Control",
+        "deleteControlObligationMapping",
+    );
+    const obligationsReadOnly = !canLinkObligation && !canUnlinkObligation;
+
+    const canLinkSnapshot = isAuthorized(
+        "Control",
+        "createControlSnapshotMapping",
+    );
+    const canUnlinkSnapshot = isAuthorized(
+        "Control",
+        "deleteControlSnapshotMapping",
+    );
+    const snapshotsReadOnly = !canLinkSnapshot && !canUnlinkSnapshot;
+
+    const withErrorHandling =
+        <T extends MutationParameters>(
+            mutationFn: (config: UseMutationConfig<T>) => void,
+            errorMessage: string,
+        ) =>
+        (options: UseMutationConfig<T>) => {
+            mutationFn({
+                ...options,
+                onCompleted: (response, error) => {
+                    if (error) {
+                        toast({
+                            title: __("Error"),
+                            description: formatError(
+                                errorMessage,
+                                error as GraphQLError,
+                            ),
+                            variant: "error",
+                        });
+                    }
+                    options.onCompleted?.(response, error);
+                },
+                onError: (error) => {
+                    toast({
+                        title: __("Error"),
+                        description: formatError(
+                            errorMessage,
+                            error as GraphQLError,
+                        ),
+                        variant: "error",
+                    });
+                    options.onError?.(error);
+                },
+            });
+        };
+
+    const onDelete = () => {
+        confirm(
+            () => {
+                return promisifyMutation(deleteControl)({
+                    variables: {
+                        input: {
+                            controlId: control.id,
+                        },
+                        connections: [connectionId],
+                    },
+                    onCompleted: () => {
+                        navigate(
+                            `/organizations/${organizationId}/frameworks/${framework.id}`,
+                        );
+                    },
+                });
+            },
+            {
+                message: __("Are you sure you want to delete this control?"),
+            },
+        );
+    };
+
+    return (
+        <div className="space-y-6">
+            <div className="flex justify-between">
+                <div className="flex items-center gap-3">
+                    <div className="text-xl font-medium px-[6px] py-[2px] border border-border-low rounded-lg w-max bg-active mb-3">
+                        {control.sectionTitle}
+                    </div>
+                </div>
+                <div className="flex gap-2">
+                    {isAuthorized("Control", "updateControl") && (
+                        <FrameworkControlDialog
+                            frameworkId={framework.id}
+                            connectionId={connectionId}
+                            control={control}
+                        >
+                            <Button icon={IconPencil} variant="secondary">
+                                {__("Edit control")}
+                            </Button>
+                        </FrameworkControlDialog>
+                    )}
+                    {isAuthorized("Control", "deleteControl") && (
+                        <ActionDropdown variant="secondary">
+                            <DropdownItem
+                                icon={IconTrashCan}
+                                variant="danger"
+                                onClick={onDelete}
+                            >
+                                {__("Delete")}
+                            </DropdownItem>
+                        </ActionDropdown>
+                    )}
+                </div>
+            </div>
+
+            {control.status === "EXCLUDED" && (
+                <div className="bg-danger border border-border-danger rounded-lg p-4">
+                    <div className="flex items-center gap-2 mb-2">
+                        <div className="font-medium text-txt-danger">
+                            {__("This control is excluded")}
+                        </div>
+                    </div>
+                    <div className="text-sm">
+                        <strong>{__("Justification:")}</strong>{" "}
+                        {control.exclusionJustification ||
+                            __("No justification provided")}
+                    </div>
+                </div>
+            )}
+            <div className={control.status === "EXCLUDED" ? "opacity-60" : ""}>
+                <div className="text-base mb-4">{control.name}</div>
+                <div className="mb-4">
+                    <LinkedStatesOfApplicabilityCard
+                        variant="card"
+                        statesOfApplicability={
+                            control.stateOfApplicabilityControls?.edges.map(
+                                (edge) => edge.node,
+                            ) ?? []
+                        }
+                        params={{ controlId: control.id }}
+                        connectionId={
+                            control.stateOfApplicabilityControls?.__id ?? ""
+                        }
+                        onAttach={withErrorHandling(
+                            attachStateOfApplicability,
+                            __("Failed to link state of applicability"),
+                        )}
+                        onDetach={withErrorHandling(
+                            detachStateOfApplicability,
+                            __("Failed to unlink state of applicability"),
+                        )}
+                        disabled={
+                            isAttachingStateOfApplicability ||
+                            isDetachingStateOfApplicability
+                        }
+                        readOnly={statesOfApplicabilityReadOnly}
+                    />
+                </div>
+                <div className="mb-4">
+                    <LinkedMeasuresCard
+                        variant="card"
+                        measures={
+                            control.measures?.edges.map((edge) => edge.node) ??
+                            []
+                        }
+                        params={{ controlId: control.id }}
+                        connectionId={control.measures?.__id ?? ""}
+                        onAttach={withErrorHandling(
+                            attachMeasure,
+                            __("Failed to link measure"),
+                        )}
+                        onDetach={withErrorHandling(
+                            detachMeasure,
+                            __("Failed to unlink measure"),
+                        )}
+                        disabled={isAttachingMeasure || isDetachingMeasure}
+                        readOnly={measuresReadOnly}
+                    />
+                </div>
+                <div className="mb-4">
+                    <LinkedDocumentsCard
+                        variant="card"
+                        documents={
+                            control.documents?.edges.map((edge) => edge.node) ??
+                            []
+                        }
+                        params={{ controlId: control.id }}
+                        connectionId={control.documents?.__id ?? ""}
+                        onAttach={withErrorHandling(
+                            attachDocument,
+                            __("Failed to link document"),
+                        )}
+                        onDetach={withErrorHandling(
+                            detachDocument,
+                            __("Failed to unlink document"),
+                        )}
+                        disabled={isAttachingDocument || isDetachingDocument}
+                        readOnly={documentsReadOnly}
+                    />
+                </div>
+                <div className="mb-4">
+                    <LinkedAuditsCard
+                        variant="card"
+                        audits={
+                            control.audits?.edges.map((edge) => edge.node) ?? []
+                        }
+                        params={{ controlId: control.id }}
+                        connectionId={control.audits?.__id ?? ""}
+                        onAttach={withErrorHandling(
+                            attachAudit,
+                            __("Failed to link audit"),
+                        )}
+                        onDetach={withErrorHandling(
+                            detachAudit,
+                            __("Failed to unlink audit"),
+                        )}
+                        disabled={isAttachingAudit || isDetachingAudit}
+                        readOnly={auditsReadOnly}
+                    />
+                </div>
+                <div className="mb-4">
+                    <LinkedObligationsCard
+                        variant="card"
+                        obligations={
+                            control.obligations?.edges.map(
+                                (edge) => edge.node,
+                            ) ?? []
+                        }
+                        params={{ controlId: control.id }}
+                        connectionId={control.obligations?.__id ?? ""}
+                        onAttach={withErrorHandling(
+                            attachObligation,
+                            __("Failed to link obligation"),
+                        )}
+                        onDetach={withErrorHandling(
+                            detachObligation,
+                            __("Failed to unlink obligation"),
+                        )}
+                        disabled={
+                            isAttachingObligation || isDetachingObligation
+                        }
+                        readOnly={obligationsReadOnly}
+                    />
+                </div>
+                <div className="mb-4">
+                    <LinkedSnapshotsCard
+                        variant="card"
+                        snapshots={
+                            control.snapshots?.edges.map((edge) => edge.node) ??
+                            []
+                        }
+                        params={{ controlId: control.id }}
+                        connectionId={control.snapshots?.__id ?? ""}
+                        onAttach={withErrorHandling(
+                            attachSnapshot,
+                            __("Failed to link snapshot"),
+                        )}
+                        onDetach={withErrorHandling(
+                            detachSnapshot,
+                            __("Failed to unlink snapshot"),
+                        )}
+                        disabled={isAttachingSnapshot || isDetachingSnapshot}
+                        readOnly={snapshotsReadOnly}
+                    />
+                </div>
+            </div>
         </div>
-        <div className="mb-4">
-          <LinkedMeasuresCard
-            variant="card"
-            measures={control.measures?.edges.map((edge) => edge.node) ?? []}
-            params={{ controlId: control.id }}
-            connectionId={control.measures?.__id ?? ""}
-            onAttach={withErrorHandling(attachMeasure, __("Failed to link measure"))}
-            onDetach={withErrorHandling(detachMeasure, __("Failed to unlink measure"))}
-            disabled={isAttachingMeasure || isDetachingMeasure}
-            readOnly={measuresReadOnly}
-          />
-        </div>
-        <div className="mb-4">
-          <LinkedDocumentsCard
-            variant="card"
-            documents={control.documents?.edges.map((edge) => edge.node) ?? []}
-            params={{ controlId: control.id }}
-            connectionId={control.documents?.__id ?? ""}
-            onAttach={withErrorHandling(attachDocument, __("Failed to link document"))}
-            onDetach={withErrorHandling(detachDocument, __("Failed to unlink document"))}
-            disabled={isAttachingDocument || isDetachingDocument}
-            readOnly={documentsReadOnly}
-          />
-        </div>
-        <div className="mb-4">
-          <LinkedAuditsCard
-            variant="card"
-            audits={control.audits?.edges.map((edge) => edge.node) ?? []}
-            params={{ controlId: control.id }}
-            connectionId={control.audits?.__id ?? ""}
-            onAttach={withErrorHandling(attachAudit, __("Failed to link audit"))}
-            onDetach={withErrorHandling(detachAudit, __("Failed to unlink audit"))}
-            disabled={isAttachingAudit || isDetachingAudit}
-            readOnly={auditsReadOnly}
-          />
-        </div>
-        <div className="mb-4">
-          <LinkedObligationsCard
-            variant="card"
-            obligations={control.obligations?.edges.map((edge) => edge.node) ?? []}
-            params={{ controlId: control.id }}
-            connectionId={control.obligations?.__id ?? ""}
-            onAttach={withErrorHandling(attachObligation, __("Failed to link obligation"))}
-            onDetach={withErrorHandling(detachObligation, __("Failed to unlink obligation"))}
-            disabled={isAttachingObligation || isDetachingObligation}
-            readOnly={obligationsReadOnly}
-          />
-        </div>
-        <div className="mb-4">
-          <LinkedSnapshotsCard
-            variant="card"
-            snapshots={control.snapshots?.edges.map((edge) => edge.node) ?? []}
-            params={{ controlId: control.id }}
-            connectionId={control.snapshots?.__id ?? ""}
-            onAttach={withErrorHandling(attachSnapshot, __("Failed to link snapshot"))}
-            onDetach={withErrorHandling(detachSnapshot, __("Failed to unlink snapshot"))}
-            disabled={isAttachingSnapshot || isDetachingSnapshot}
-            readOnly={snapshotsReadOnly}
-          />
-        </div>
-      </div>
-    </div>
-  );
+    );
 }
diff --git a/apps/console/src/pages/organizations/frameworks/FrameworkDetailPage.tsx b/apps/console/src/pages/organizations/frameworks/FrameworkDetailPage.tsx
index ed2306dfd..2e4f3d0d7 100644
--- a/apps/console/src/pages/organizations/frameworks/FrameworkDetailPage.tsx
+++ b/apps/console/src/pages/organizations/frameworks/FrameworkDetailPage.tsx
@@ -1,33 +1,33 @@
 import {
-  useFragment,
-  usePreloadedQuery,
-  type PreloadedQuery,
+    useFragment,
+    usePreloadedQuery,
+    type PreloadedQuery,
 } from "react-relay";
 import { usePageTitle } from "@probo/hooks";
 import { ConnectionHandler, graphql } from "relay-runtime";
 import {
-  ActionDropdown,
-  Button,
-  ControlItem,
-  DropdownItem,
-  FrameworkLogo,
-  IconPencil,
-  IconPlusLarge,
-  IconTrashCan,
-  PageHeader,
+    ActionDropdown,
+    Button,
+    ControlItem,
+    DropdownItem,
+    FrameworkLogo,
+    IconPencil,
+    IconPlusLarge,
+    IconTrashCan,
+    PageHeader,
 } from "@probo/ui";
 import {
-  connectionListKey,
-  frameworkNodeQuery,
-  useDeleteFrameworkMutation,
+    connectionListKey,
+    frameworkNodeQuery,
+    useDeleteFrameworkMutation,
 } from "/hooks/graph/FrameworkGraph";
 import { useTranslate } from "@probo/i18n";
 import { Navigate, Outlet, useNavigate, useParams } from "react-router";
 import { useOrganizationId } from "/hooks/useOrganizationId";
-import type { FrameworkGraphNodeQuery } from "/hooks/graph/__generated__/FrameworkGraphNodeQuery.graphql";
-import type { FrameworkDetailPageFragment$key } from "./__generated__/FrameworkDetailPageFragment.graphql";
-import type { FrameworkDetailPageGenerateFrameworkStateOfApplicabilityMutation } from "./__generated__/FrameworkDetailPageGenerateFrameworkStateOfApplicabilityMutation.graphql";
-import type { FrameworkDetailPageExportFrameworkMutation } from "./__generated__/FrameworkDetailPageExportFrameworkMutation.graphql";
+import type { FrameworkGraphNodeQuery } from "/__generated__/core/FrameworkGraphNodeQuery.graphql";
+import type { FrameworkDetailPageFragment$key } from "/__generated__/core/FrameworkDetailPageFragment.graphql";
+import type { FrameworkDetailPageGenerateFrameworkStateOfApplicabilityMutation } from "/__generated__/core/FrameworkDetailPageGenerateFrameworkStateOfApplicabilityMutation.graphql";
+import type { FrameworkDetailPageExportFrameworkMutation } from "/__generated__/core/FrameworkDetailPageExportFrameworkMutation.graphql";
 import { FrameworkFormDialog } from "./dialogs/FrameworkFormDialog";
 import { FrameworkControlDialog } from "./dialogs/FrameworkControlDialog";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
@@ -35,206 +35,219 @@ import { use } from "react";
 import { PermissionsContext } from "/providers/PermissionsContext";
 
 const frameworkDetailFragment = graphql`
-  fragment FrameworkDetailPageFragment on Framework {
-    id
-    name
-    description
-    lightLogoURL
-    darkLogoURL
-    organization {
-      name
-    }
-    controls(first: 250, orderBy: { field: SECTION_TITLE, direction: ASC }) {
-      __id
-      edges {
-        node {
-          id
-          sectionTitle
-          name
-          status
-          exclusionJustification
-          bestPractice
+    fragment FrameworkDetailPageFragment on Framework {
+        id
+        name
+        description
+        lightLogoURL
+        darkLogoURL
+        organization {
+            name
+        }
+        controls(
+            first: 250
+            orderBy: { field: SECTION_TITLE, direction: ASC }
+        ) {
+            __id
+            edges {
+                node {
+                    id
+                    sectionTitle
+                    name
+                    status
+                    exclusionJustification
+                    bestPractice
+                }
+            }
         }
-      }
     }
-  }
 `;
 
 const generateFrameworkStateOfApplicabilityMutation = graphql`
-  mutation FrameworkDetailPageGenerateFrameworkStateOfApplicabilityMutation(
-    $frameworkId: ID!
-  ) {
-    generateFrameworkStateOfApplicability(
-      input: { frameworkId: $frameworkId }
+    mutation FrameworkDetailPageGenerateFrameworkStateOfApplicabilityMutation(
+        $frameworkId: ID!
     ) {
-      data
+        generateFrameworkStateOfApplicability(
+            input: { frameworkId: $frameworkId }
+        ) {
+            data
+        }
     }
-  }
 `;
 
 const exportFrameworkMutation = graphql`
-  mutation FrameworkDetailPageExportFrameworkMutation($frameworkId: ID!) {
-    exportFramework(input: { frameworkId: $frameworkId }) {
-      exportJobId
+    mutation FrameworkDetailPageExportFrameworkMutation($frameworkId: ID!) {
+        exportFramework(input: { frameworkId: $frameworkId }) {
+            exportJobId
+        }
     }
-  }
 `;
 
 type Props = {
-  queryRef: PreloadedQuery<FrameworkGraphNodeQuery>;
+    queryRef: PreloadedQuery<FrameworkGraphNodeQuery>;
 };
 
 export default function FrameworkDetailPage(props: Props) {
-  const { __ } = useTranslate();
-  const { controlId } = useParams<{ controlId?: string }>();
-  const organizationId = useOrganizationId();
-  const data = usePreloadedQuery(frameworkNodeQuery, props.queryRef);
-  const framework = useFragment<FrameworkDetailPageFragment$key>(
-    frameworkDetailFragment,
-    data.node
-  );
-  const navigate = useNavigate();
-  const controls = framework.controls.edges.map((edge) => edge.node);
-  const selectedControl = controlId
-    ? controls.find((control) => control.id === controlId)
-    : controls[0] || null;
-  const connectionId = framework.controls.__id;
-  const deleteFramework = useDeleteFrameworkMutation(
-    framework,
-    ConnectionHandler.getConnectionID(organizationId, connectionListKey)!
-  );
-  const { isAuthorized } = use(PermissionsContext);
-  const [generateFrameworkStateOfApplicability] =
-    useMutationWithToasts<FrameworkDetailPageGenerateFrameworkStateOfApplicabilityMutation>(
-      generateFrameworkStateOfApplicabilityMutation,
-      {
-        errorMessage: "Failed to generate framework state of applicability",
-        successMessage:
-          "Framework state of applicability generated successfully",
-      }
+    const { __ } = useTranslate();
+    const { controlId } = useParams<{ controlId?: string }>();
+    const organizationId = useOrganizationId();
+    const data = usePreloadedQuery(frameworkNodeQuery, props.queryRef);
+    const framework = useFragment<FrameworkDetailPageFragment$key>(
+        frameworkDetailFragment,
+        data.node,
     );
-
-  const [exportFramework] =
-    useMutationWithToasts<FrameworkDetailPageExportFrameworkMutation>(
-      exportFrameworkMutation,
-      {
-        errorMessage: "Failed to export framework",
-        successMessage:
-          "Framework export started successfully. You will receive an email when the export is ready.",
-      }
+    const navigate = useNavigate();
+    const controls = framework.controls.edges.map((edge) => edge.node);
+    const selectedControl = controlId
+        ? controls.find((control) => control.id === controlId)
+        : controls[0] || null;
+    const connectionId = framework.controls.__id;
+    const deleteFramework = useDeleteFrameworkMutation(
+        framework,
+        ConnectionHandler.getConnectionID(organizationId, connectionListKey)!,
     );
+    const { isAuthorized } = use(PermissionsContext);
+    const [generateFrameworkStateOfApplicability] =
+        useMutationWithToasts<FrameworkDetailPageGenerateFrameworkStateOfApplicabilityMutation>(
+            generateFrameworkStateOfApplicabilityMutation,
+            {
+                errorMessage:
+                    "Failed to generate framework state of applicability",
+                successMessage:
+                    "Framework state of applicability generated successfully",
+            },
+        );
 
-  usePageTitle(`${framework.name} | ${selectedControl?.sectionTitle}`);
-  const onDelete = () => {
-    deleteFramework({
-      onSuccess: () => {
-        navigate(`/organizations/${organizationId}/frameworks`);
-      },
-    });
-  };
+    const [exportFramework] =
+        useMutationWithToasts<FrameworkDetailPageExportFrameworkMutation>(
+            exportFrameworkMutation,
+            {
+                errorMessage: "Failed to export framework",
+                successMessage:
+                    "Framework export started successfully. You will receive an email when the export is ready.",
+            },
+        );
 
-  if (!controlId && controls.length > 0) {
-    return (
-      <Navigate
-        to={`/organizations/${organizationId}/frameworks/${framework.id}/controls/${controls[0].id}`}
-      />
-    );
-  }
+    usePageTitle(`${framework.name} | ${selectedControl?.sectionTitle}`);
+    const onDelete = () => {
+        deleteFramework({
+            onSuccess: () => {
+                navigate(`/organizations/${organizationId}/frameworks`);
+            },
+        });
+    };
 
-  return (
-    <div className="space-y-6">
-      <PageHeader
-        title={
-          <>
-            <FrameworkLogo {...framework} />
-            {framework.name}
-          </>
-        }
-      >
-        {isAuthorized("Framework", "updateFramework") && (
-          <FrameworkFormDialog
-            organizationId={organizationId}
-            framework={framework}
-          >
-            <Button icon={IconPencil} variant="secondary">
-              {__("Edit")}
-            </Button>
-          </FrameworkFormDialog>
-        )}
-        <ActionDropdown variant="secondary">
-          <DropdownItem
-            variant="primary"
-            onClick={() => {
-              generateFrameworkStateOfApplicability({
-                variables: { frameworkId: framework.id },
-                onCompleted: (data) => {
-                  if (data.generateFrameworkStateOfApplicability?.data) {
-                    const link = window.document.createElement("a");
-                    link.href = data.generateFrameworkStateOfApplicability.data;
-                    link.download = `${framework.organization.name}-${framework.name}-SOA.xlsx`;
-                    window.document.body.appendChild(link);
-                    link.click();
-                    window.document.body.removeChild(link);
-                  }
-                },
-              });
-            }}
-          >
-            {__("Download SOA")}
-          </DropdownItem>
-          <DropdownItem
-            variant="primary"
-            onClick={() => {
-              exportFramework({
-                variables: { frameworkId: framework.id },
-              });
-            }}
-          >
-            {__("Export Framework")}
-          </DropdownItem>
-          {isAuthorized("Framework", "deleteFramework") && (
-            <DropdownItem
-              icon={IconTrashCan}
-              variant="danger"
-              onClick={onDelete}
-            >
-              {__("Delete")}
-            </DropdownItem>
-          )}
-        </ActionDropdown>
-      </PageHeader>
-      <div className="text-lg font-semibold">
-        {__("Requirement categories")}
-      </div>
-      <div className="divide-x divide-border-low grid grid-cols-[264px_1fr]">
-        <div
-          className="space-y-1 overflow-y-auto pr-6 mr-6 sticky top-0"
-          style={{ maxHeight: "calc(100vh - 48px)" }}
-        >
-          {controls.map((control) => (
-            <ControlItem
-              key={control.id}
-              id={control.sectionTitle}
-              description={control.name}
-              excluded={control.status === "EXCLUDED"}
-              to={`/organizations/${organizationId}/frameworks/${framework.id}/controls/${control.id}`}
-              active={selectedControl?.id === control.id}
+    if (!controlId && controls.length > 0) {
+        return (
+            <Navigate
+                to={`/organizations/${organizationId}/frameworks/${framework.id}/controls/${controls[0].id}`}
             />
-          ))}
-          {isAuthorized("Organization", "createControl") && (
-            <FrameworkControlDialog
-              frameworkId={framework.id}
-              connectionId={connectionId}
+        );
+    }
+
+    return (
+        <div className="space-y-6">
+            <PageHeader
+                title={
+                    <>
+                        <FrameworkLogo {...framework} />
+                        {framework.name}
+                    </>
+                }
             >
-              <button className="flex gap-[6px] flex-col w-full p-4 space-y-[6px] rounded-xl cursor-pointer text-start text-sm text-txt-tertiary hover:bg-tertiary-hover">
-                <IconPlusLarge size={20} className="text-txt-primary" />
-                {__("Add new control")}
-              </button>
-            </FrameworkControlDialog>
-          )}
+                {isAuthorized("Framework", "updateFramework") && (
+                    <FrameworkFormDialog
+                        organizationId={organizationId}
+                        framework={framework}
+                    >
+                        <Button icon={IconPencil} variant="secondary">
+                            {__("Edit")}
+                        </Button>
+                    </FrameworkFormDialog>
+                )}
+                <ActionDropdown variant="secondary">
+                    <DropdownItem
+                        variant="primary"
+                        onClick={() => {
+                            generateFrameworkStateOfApplicability({
+                                variables: { frameworkId: framework.id },
+                                onCompleted: (data) => {
+                                    if (
+                                        data
+                                            .generateFrameworkStateOfApplicability
+                                            ?.data
+                                    ) {
+                                        const link =
+                                            window.document.createElement("a");
+                                        link.href =
+                                            data.generateFrameworkStateOfApplicability.data;
+                                        link.download = `${framework.organization.name}-${framework.name}-SOA.xlsx`;
+                                        window.document.body.appendChild(link);
+                                        link.click();
+                                        window.document.body.removeChild(link);
+                                    }
+                                },
+                            });
+                        }}
+                    >
+                        {__("Download SOA")}
+                    </DropdownItem>
+                    <DropdownItem
+                        variant="primary"
+                        onClick={() => {
+                            exportFramework({
+                                variables: { frameworkId: framework.id },
+                            });
+                        }}
+                    >
+                        {__("Export Framework")}
+                    </DropdownItem>
+                    {isAuthorized("Framework", "deleteFramework") && (
+                        <DropdownItem
+                            icon={IconTrashCan}
+                            variant="danger"
+                            onClick={onDelete}
+                        >
+                            {__("Delete")}
+                        </DropdownItem>
+                    )}
+                </ActionDropdown>
+            </PageHeader>
+            <div className="text-lg font-semibold">
+                {__("Requirement categories")}
+            </div>
+            <div className="divide-x divide-border-low grid grid-cols-[264px_1fr]">
+                <div
+                    className="space-y-1 overflow-y-auto pr-6 mr-6 sticky top-0"
+                    style={{ maxHeight: "calc(100vh - 48px)" }}
+                >
+                    {controls.map((control) => (
+                        <ControlItem
+                            key={control.id}
+                            id={control.sectionTitle}
+                            description={control.name}
+                            excluded={control.status === "EXCLUDED"}
+                            to={`/organizations/${organizationId}/frameworks/${framework.id}/controls/${control.id}`}
+                            active={selectedControl?.id === control.id}
+                        />
+                    ))}
+                    {isAuthorized("Organization", "createControl") && (
+                        <FrameworkControlDialog
+                            frameworkId={framework.id}
+                            connectionId={connectionId}
+                        >
+                            <button className="flex gap-[6px] flex-col w-full p-4 space-y-[6px] rounded-xl cursor-pointer text-start text-sm text-txt-tertiary hover:bg-tertiary-hover">
+                                <IconPlusLarge
+                                    size={20}
+                                    className="text-txt-primary"
+                                />
+                                {__("Add new control")}
+                            </button>
+                        </FrameworkControlDialog>
+                    )}
+                </div>
+                <Outlet context={{ framework }} />
+            </div>
         </div>
-        <Outlet context={{ framework }} />
-      </div>
-    </div>
-  );
+    );
 }
diff --git a/apps/console/src/pages/organizations/frameworks/FrameworksPage.tsx b/apps/console/src/pages/organizations/frameworks/FrameworksPage.tsx
index 3a4292939..cbd7ae7b0 100644
--- a/apps/console/src/pages/organizations/frameworks/FrameworksPage.tsx
+++ b/apps/console/src/pages/organizations/frameworks/FrameworksPage.tsx
@@ -19,13 +19,13 @@ import {
   usePreloadedQuery,
   type PreloadedQuery,
 } from "react-relay";
-import type { FrameworkGraphListQuery } from "/hooks/graph/__generated__/FrameworkGraphListQuery.graphql";
+import type { FrameworkGraphListQuery } from "/__generated__/core/FrameworkGraphListQuery.graphql";
 import {
   frameworksQuery,
   useDeleteFrameworkMutation,
 } from "/hooks/graph/FrameworkGraph";
 import { Link } from "react-router";
-import type { FrameworksPageCardFragment$key } from "./__generated__/FrameworksPageCardFragment.graphql";
+import type { FrameworksPageCardFragment$key } from "/__generated__/core/FrameworksPageCardFragment.graphql";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
 import { useState, type ChangeEventHandler, use } from "react";
 import { FrameworkFormDialog } from "./dialogs/FrameworkFormDialog";
@@ -64,7 +64,7 @@ export default function FrameworksPage(props: Props) {
     {
       successMessage: __("Framework imported successfully"),
       errorMessage: __("Failed to import framework"),
-    }
+    },
   );
   const [isUploading, setUploading] = useState(false);
   const dialogRef = useDialogRef();
@@ -81,7 +81,7 @@ export default function FrameworksPage(props: Props) {
       setUploading(true);
       const fileName = `${name}.json`;
       const json = await fetch(`/data/frameworks/${fileName}`).then((res) =>
-        res.text()
+        res.text(),
       );
       const file = new File([json], fileName, {
         type: "application/json",
@@ -190,7 +190,7 @@ function FrameworkCard(props: FrameworkCardProps) {
   const { isAuthorized } = use(PermissionsContext);
   const deleteFramework = useDeleteFrameworkMutation(
     framework,
-    props.connectionId
+    props.connectionId,
   );
   const { __ } = useTranslate();
   const dialogRef = useDialogRef();
diff --git a/apps/console/src/pages/organizations/frameworks/dialogs/FrameworkControlDialog.tsx b/apps/console/src/pages/organizations/frameworks/dialogs/FrameworkControlDialog.tsx
index e3ee92eb0..9a01ee82e 100644
--- a/apps/console/src/pages/organizations/frameworks/dialogs/FrameworkControlDialog.tsx
+++ b/apps/console/src/pages/organizations/frameworks/dialogs/FrameworkControlDialog.tsx
@@ -1,184 +1,233 @@
 import {
-  Breadcrumb,
-  Button,
-  Dialog,
-  DialogContent,
-  DialogFooter,
-  Input,
-  Textarea,
-  useDialogRef,
-  Checkbox,
+    Breadcrumb,
+    Button,
+    Dialog,
+    DialogContent,
+    DialogFooter,
+    Input,
+    Textarea,
+    useDialogRef,
+    Checkbox,
 } from "@probo/ui";
 import type { ReactNode } from "react";
 import { useTranslate } from "@probo/i18n";
 import { graphql } from "relay-runtime";
 import { useFragment } from "react-relay";
-import type { FrameworkControlDialogFragment$key } from "./__generated__/FrameworkControlDialogFragment.graphql";
+import type { FrameworkControlDialogFragment$key } from "/__generated__/core/FrameworkControlDialogFragment.graphql";
 import { useFormWithSchema } from "/hooks/useFormWithSchema";
 import { z } from "zod";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
 import { useEffect, useMemo } from "react";
 
 type Props = {
-  children: ReactNode;
-  control?: FrameworkControlDialogFragment$key;
-  frameworkId: string;
-  connectionId?: string;
+    children: ReactNode;
+    control?: FrameworkControlDialogFragment$key;
+    frameworkId: string;
+    connectionId?: string;
 };
 
 const controlFragment = graphql`
-  fragment FrameworkControlDialogFragment on Control {
-    id
-    name
-    description
-    sectionTitle
-    status
-    exclusionJustification
-    bestPractice
-  }
+    fragment FrameworkControlDialogFragment on Control {
+        id
+        name
+        description
+        sectionTitle
+        status
+        exclusionJustification
+        bestPractice
+    }
 `;
 
 const createMutation = graphql`
-  mutation FrameworkControlDialogCreateMutation(
-    $input: CreateControlInput!
-    $connections: [ID!]!
-  ) {
-    createControl(input: $input) {
-      controlEdge @prependEdge(connections: $connections) {
-        node {
-          ...FrameworkControlDialogFragment
+    mutation FrameworkControlDialogCreateMutation(
+        $input: CreateControlInput!
+        $connections: [ID!]!
+    ) {
+        createControl(input: $input) {
+            controlEdge @prependEdge(connections: $connections) {
+                node {
+                    ...FrameworkControlDialogFragment
+                }
+            }
         }
-      }
     }
-  }
 `;
 
 const updateMutation = graphql`
-  mutation FrameworkControlDialogUpdateMutation($input: UpdateControlInput!) {
-    updateControl(input: $input) {
-      control {
-        ...FrameworkControlDialogFragment
-      }
+    mutation FrameworkControlDialogUpdateMutation($input: UpdateControlInput!) {
+        updateControl(input: $input) {
+            control {
+                ...FrameworkControlDialogFragment
+            }
+        }
     }
-  }
 `;
 
-const schema = z.object({
-  name: z.string(),
-  description: z.string().optional().nullable(),
-  sectionTitle: z.string(),
-  bestPractice: z.boolean(),
-});
+const schema = z
+    .object({
+        name: z.string(),
+        description: z.string().optional().nullable(),
+        sectionTitle: z.string(),
+        status: z.enum(["INCLUDED", "EXCLUDED"]),
+        exclusionJustification: z.string().optional(),
+        bestPractice: z.boolean(),
+    })
+    .refine(
+        (data) => {
+            if (data.status === "EXCLUDED") {
+                return (
+                    data.exclusionJustification &&
+                    data.exclusionJustification.trim().length > 0
+                );
+            }
+            return true;
+        },
+        {
+            message:
+                "Exclusion justification is required when status is excluded",
+            path: ["exclusionJustification"],
+        },
+    );
 
 export function FrameworkControlDialog(props: Props) {
-  const { __ } = useTranslate();
-  const frameworkControl = useFragment(controlFragment, props.control);
-  const dialogRef = useDialogRef();
-  const [mutate, isMutating] = useMutationWithToasts(props.control ? updateMutation : createMutation, {
-    successMessage: __(`Control ${props.control ? "updated" : "created"} successfully.`),
-    errorMessage: __(`Failed to ${props.control ? "update" : "create"} control`),
-  });
-
-  const defaultValues = useMemo(() => ({
-    name: frameworkControl?.name ?? "",
-    description: frameworkControl?.description ?? "",
-    sectionTitle: frameworkControl?.sectionTitle ?? "",
-    bestPractice: frameworkControl?.bestPractice ?? true,
-  }), [frameworkControl]);
-
-  const { handleSubmit, register, reset, watch, setValue } = useFormWithSchema(schema, {
-    defaultValues,
-  });
-
-  useEffect(() => {
-    reset(defaultValues);
-  }, [defaultValues, reset]);
-
-  const bestPracticeValue = watch("bestPractice");
-
-  const onSubmit = handleSubmit(async (data) => {
-    if (frameworkControl) {
-      // Update the control
-      await mutate({
-        variables: {
-          input: {
-            id: frameworkControl.id,
-            name: data.name,
-            description: data.description || null,
-            sectionTitle: data.sectionTitle,
-            bestPractice: data.bestPractice,
-          },
+    const { __ } = useTranslate();
+    const frameworkControl = useFragment(controlFragment, props.control);
+    const dialogRef = useDialogRef();
+    const [mutate, isMutating] = useMutationWithToasts(
+        props.control ? updateMutation : createMutation,
+        {
+            successMessage: __(
+                `Control ${props.control ? "updated" : "created"} successfully.`,
+            ),
+            errorMessage: __(
+                `Failed to ${props.control ? "update" : "create"} control`,
+            ),
         },
-      });
-    } else {
-      // Create a new control
-      await mutate({
-        variables: {
-          input: {
-            frameworkId: props.frameworkId,
-            name: data.name,
-            description: data.description || null,
-            sectionTitle: data.sectionTitle,
-            bestPractice: data.bestPractice ?? true,
-          },
-          connections: [props.connectionId!],
-        },
-      });
-      reset();
-    }
-    dialogRef.current?.close();
-  });
+    );
 
-  return (
-    <Dialog
-      trigger={props.children}
-      ref={dialogRef}
-      title={
-        <Breadcrumb
-          items={[
-            __("Controls"),
-            frameworkControl ? __("Edit Control") : __("New Control"),
-          ]}
-        />
-      }
-    >
-      <form onSubmit={onSubmit}>
-        <DialogContent padded className="space-y-2">
-          <Input
-            id="sectionTitle"
-            required
-            variant="ghost"
-            placeholder={__("Section title")}
-            {...register("sectionTitle")}
-          />
-          <Input
-            id="title"
-            required
-            variant="title"
-            placeholder={__("Document title")}
-            {...register("name")}
-          />
-          <Textarea
-            id="content"
-            variant="ghost"
-            autogrow
-            placeholder={__("Add description")}
-            {...register("description")}
-          />
-          <label className="flex items-center gap-2 cursor-pointer">
-            <Checkbox
-              checked={bestPracticeValue}
-              onChange={(checked) => setValue("bestPractice", checked)}
-            />
-            <span className="text-sm">{__("Best Practice")}</span>
-          </label>
-        </DialogContent>
-        <DialogFooter>
-          <Button type="submit" disabled={isMutating}>
-            {props.control ? __("Update control") : __("Create control")}
-          </Button>
-        </DialogFooter>
-      </form>
-    </Dialog>
-  );
+    const defaultValues = useMemo(
+        () => ({
+            name: frameworkControl?.name ?? "",
+            description: frameworkControl?.description ?? "",
+            sectionTitle: frameworkControl?.sectionTitle ?? "",
+            status: frameworkControl?.status ?? "INCLUDED",
+            exclusionJustification:
+                frameworkControl?.exclusionJustification ?? "",
+            bestPractice: frameworkControl?.bestPractice ?? true,
+        }),
+        [frameworkControl],
+    );
+
+    const { handleSubmit, register, reset, watch, setValue } =
+        useFormWithSchema(schema, {
+            defaultValues,
+        });
+
+    useEffect(() => {
+        reset(defaultValues);
+    }, [defaultValues, reset]);
+
+    const bestPracticeValue = watch("bestPractice");
+
+    const onSubmit = handleSubmit(async (data) => {
+        if (frameworkControl) {
+            // Update the control
+            await mutate({
+                variables: {
+                    input: {
+                        id: frameworkControl.id,
+                        name: data.name,
+                        description: data.description || null,
+                        sectionTitle: data.sectionTitle,
+                        bestPractice: data.bestPractice,
+                        status: data.status,
+                        exclusionJustification:
+                            data.status === "EXCLUDED"
+                                ? data.exclusionJustification
+                                : null,
+                    },
+                },
+            });
+        } else {
+            // Create a new control
+            await mutate({
+                variables: {
+                    input: {
+                        frameworkId: props.frameworkId,
+                        name: data.name,
+                        description: data.description || null,
+                        sectionTitle: data.sectionTitle,
+                        bestPractice: data.bestPractice ?? true,
+                        status: data.status,
+                        exclusionJustification:
+                            data.status === "EXCLUDED"
+                                ? data.exclusionJustification
+                                : null,
+                    },
+                    connections: [props.connectionId!],
+                },
+            });
+            reset();
+        }
+        dialogRef.current?.close();
+    });
+
+    return (
+        <Dialog
+            trigger={props.children}
+            ref={dialogRef}
+            title={
+                <Breadcrumb
+                    items={[
+                        __("Controls"),
+                        frameworkControl
+                            ? __("Edit Control")
+                            : __("New Control"),
+                    ]}
+                />
+            }
+        >
+            <form onSubmit={onSubmit}>
+                <DialogContent padded className="space-y-2">
+                    <Input
+                        id="sectionTitle"
+                        required
+                        variant="ghost"
+                        placeholder={__("Section title")}
+                        {...register("sectionTitle")}
+                    />
+                    <Input
+                        id="title"
+                        required
+                        variant="title"
+                        placeholder={__("Document title")}
+                        {...register("name")}
+                    />
+                    <Textarea
+                        id="content"
+                        variant="ghost"
+                        autogrow
+                        placeholder={__("Add description")}
+                        {...register("description")}
+                    />
+                    <label className="flex items-center gap-2 cursor-pointer">
+                        <Checkbox
+                            checked={bestPracticeValue}
+                            onChange={(checked) =>
+                                setValue("bestPractice", checked)
+                            }
+                        />
+                        <span className="text-sm">{__("Best Practice")}</span>
+                    </label>
+                </DialogContent>
+                <DialogFooter>
+                    <Button type="submit" disabled={isMutating}>
+                        {props.control
+                            ? __("Update control")
+                            : __("Create control")}
+                    </Button>
+                </DialogFooter>
+            </form>
+        </Dialog>
+    );
 }
diff --git a/apps/console/src/pages/organizations/measures/MeasureDetailPage.tsx b/apps/console/src/pages/organizations/measures/MeasureDetailPage.tsx
index e58270ee6..ea5117c75 100644
--- a/apps/console/src/pages/organizations/measures/MeasureDetailPage.tsx
+++ b/apps/console/src/pages/organizations/measures/MeasureDetailPage.tsx
@@ -12,7 +12,6 @@ import {
   IconPencil,
   IconTrashCan,
   IconWarning,
-
   Option,
   PageHeader,
   PropertyRow,
@@ -31,8 +30,8 @@ import {
   useLazyLoadQuery,
   usePreloadedQuery,
 } from "react-relay";
-import type { MeasureGraphNodeQuery } from "/hooks/graph/__generated__/MeasureGraphNodeQuery.graphql";
-import type { MeasureDetailPageTasksCountQuery } from "./__generated__/MeasureDetailPageTasksCountQuery.graphql";
+import type { MeasureGraphNodeQuery } from "/__generated__/core/MeasureGraphNodeQuery.graphql";
+import type { MeasureDetailPageTasksCountQuery } from "/__generated__/core/MeasureDetailPageTasksCountQuery.graphql";
 import {
   MeasureConnectionKey,
   measureNodeQuery,
@@ -64,7 +63,7 @@ const tasksCountQuery = graphql`
 function TasksCountBadge({ measureId }: { measureId: string }) {
   const data = useLazyLoadQuery<MeasureDetailPageTasksCountQuery>(
     tasksCountQuery,
-    { measureId }
+    { measureId },
   );
   const count = data.node?.tasks?.totalCount ?? 0;
   return <TabBadge>{count}</TabBadge>;
@@ -186,7 +185,11 @@ export default function MeasureDetailPage(props: Props) {
         )}
         {isAuthorized("Measure", "deleteMeasure") && (
           <ActionDropdown variant="secondary">
-            <DropdownItem variant="danger" icon={IconTrashCan} onClick={onDelete}>
+            <DropdownItem
+              variant="danger"
+              icon={IconTrashCan}
+              onClick={onDelete}
+            >
               {__("Delete")}
             </DropdownItem>
           </ActionDropdown>
diff --git a/apps/console/src/pages/organizations/measures/MeasuresPage.tsx b/apps/console/src/pages/organizations/measures/MeasuresPage.tsx
index 1932f76e9..3ab966e2f 100644
--- a/apps/console/src/pages/organizations/measures/MeasuresPage.tsx
+++ b/apps/console/src/pages/organizations/measures/MeasuresPage.tsx
@@ -1,4 +1,4 @@
-import type { MeasureGraphListQuery } from "/hooks/graph/__generated__/MeasureGraphListQuery.graphql";
+import type { MeasureGraphListQuery } from "/__generated__/core/MeasureGraphListQuery.graphql";
 import {
   useFragment,
   usePreloadedQuery,
@@ -17,7 +17,6 @@ import {
   IconPencil,
   IconPlusLarge,
   IconTrashCan,
-
   MeasureImplementation,
   PageHeader,
   Table,
@@ -38,11 +37,11 @@ import { graphql } from "relay-runtime";
 import type {
   MeasuresPageFragment$data,
   MeasuresPageFragment$key,
-} from "./__generated__/MeasuresPageFragment.graphql";
+} from "/__generated__/core/MeasuresPageFragment.graphql";
 import { groupBy, objectKeys, slugify, sprintf } from "@probo/helpers";
 import { useMemo, useRef, useState, type ChangeEventHandler, use } from "react";
 import type { NodeOf } from "/types";
-import type { MeasuresPageImportMutation } from "./__generated__/MeasuresPageImportMutation.graphql";
+import type { MeasuresPageImportMutation } from "/__generated__/core/MeasuresPageImportMutation.graphql";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import { Link, useParams } from "react-router";
@@ -94,11 +93,11 @@ export default function MeasuresPage(props: Props) {
   const { isAuthorized } = use(PermissionsContext);
   const organization = usePreloadedQuery(
     measuresQuery,
-    props.queryRef
+    props.queryRef,
   ).organization;
   const data = useFragment<MeasuresPageFragment$key>(
     measuresFragment,
-    organization
+    organization,
   );
   const connectionId = data.measures.__id;
   const measures = data.measures.edges.map((edge) => edge.node);
@@ -110,12 +109,13 @@ export default function MeasuresPage(props: Props) {
     {
       successMessage: __("Measures imported successfully."),
       errorMessage: __("Failed to import measures"),
-    }
+    },
   );
   const importFileRef = useRef<HTMLInputElement>(null);
   usePageTitle(__("Measures"));
 
-  const hasAnyAction = isAuthorized("Measure", "updateMeasure") ||
+  const hasAnyAction =
+    isAuthorized("Measure", "updateMeasure") ||
     isAuthorized("Measure", "deleteMeasure");
 
   const handleImport: ChangeEventHandler<HTMLInputElement> = (event) => {
@@ -145,7 +145,7 @@ export default function MeasuresPage(props: Props) {
       <PageHeader
         title={__("Measures")}
         description={__(
-          "Measures are actions taken to reduce the risk. Add them to track their implementation status."
+          "Measures are actions taken to reduce the risk. Add them to track their implementation status.",
         )}
       >
         {isAuthorized("Organization", "createMeasure") && (
@@ -202,7 +202,7 @@ function Category(props: CategoryProps) {
   const isExpanded = categoryId === params.categoryId;
   const ExpandComponent = isExpanded ? IconChevronUp : IconChevronDown;
   const completedMeasures = props.measures.filter(
-    (m) => m.state === "IMPLEMENTED"
+    (m) => m.state === "IMPLEMENTED",
   );
 
   return (
@@ -288,11 +288,11 @@ function MeasureRow(props: MeasureRowProps) {
       {
         message: sprintf(
           __(
-            'This will permanently delete the measure "%s". This action cannot be undone.'
+            'This will permanently delete the measure "%s". This action cannot be undone.',
           ),
-          props.measure.name
+          props.measure.name,
         ),
-      }
+      },
     );
   };
 
diff --git a/apps/console/src/pages/organizations/measures/dialog/EvidenceDownloadDialog.tsx b/apps/console/src/pages/organizations/measures/dialog/EvidenceDownloadDialog.tsx
index 483ab6b00..b17ec8a11 100644
--- a/apps/console/src/pages/organizations/measures/dialog/EvidenceDownloadDialog.tsx
+++ b/apps/console/src/pages/organizations/measures/dialog/EvidenceDownloadDialog.tsx
@@ -2,7 +2,7 @@ import { Breadcrumb, Dialog, DialogContent, Spinner } from "@probo/ui";
 import { useTranslate } from "@probo/i18n";
 import { Suspense, useEffect } from "react";
 import { useLazyLoadQuery } from "react-relay";
-import type { EvidenceGraphFileQuery } from "/hooks/graph/__generated__/EvidenceGraphFileQuery.graphql";
+import type { EvidenceGraphFileQuery } from "/__generated__/core/EvidenceGraphFileQuery.graphql";
 import { evidenceFileQuery } from "/hooks/graph/EvidenceGraph";
 import { downloadFile } from "@probo/helpers";
 
@@ -50,7 +50,10 @@ function DownloadLink({ evidenceId, onClose }: Props) {
   const evidence = data.node;
 
   useEffect(() => {
-    downloadFile(evidence.file?.downloadUrl, evidence.file?.fileName ?? "evidence");
+    downloadFile(
+      evidence.file?.downloadUrl,
+      evidence.file?.fileName ?? "evidence",
+    );
     onClose();
   }, [evidence.file?.downloadUrl, evidence.file?.fileName, onClose]);
 
diff --git a/apps/console/src/pages/organizations/measures/dialog/EvidencePreviewDialog.tsx b/apps/console/src/pages/organizations/measures/dialog/EvidencePreviewDialog.tsx
index 817a36255..d45fd46a0 100644
--- a/apps/console/src/pages/organizations/measures/dialog/EvidencePreviewDialog.tsx
+++ b/apps/console/src/pages/organizations/measures/dialog/EvidencePreviewDialog.tsx
@@ -13,7 +13,7 @@ import { useTranslate } from "@probo/i18n";
 import { Suspense, useEffect } from "react";
 import { useLazyLoadQuery } from "react-relay";
 import { evidenceFileQuery } from "/hooks/graph/EvidenceGraph.ts";
-import type { EvidenceGraphFileQuery } from "/hooks/graph/__generated__/EvidenceGraphFileQuery.graphql.ts";
+import type { EvidenceGraphFileQuery } from "/__generated__/core/EvidenceGraphFileQuery.graphql.ts";
 
 type Props = {
   evidenceId: string;
@@ -75,7 +75,8 @@ function EvidencePreviewContent({
   const { __ } = useTranslate();
   const { toast } = useToast();
   const isUriFile =
-    evidence.file?.mimeType === "text/uri-list" || evidence.file?.mimeType === "text/uri";
+    evidence.file?.mimeType === "text/uri-list" ||
+    evidence.file?.mimeType === "text/uri";
   useEffect(() => {
     if (!isUriFile) {
       return;
diff --git a/apps/console/src/pages/organizations/measures/dialog/MeasureFormDialog.tsx b/apps/console/src/pages/organizations/measures/dialog/MeasureFormDialog.tsx
index 6e94a43af..c14bb329f 100644
--- a/apps/console/src/pages/organizations/measures/dialog/MeasureFormDialog.tsx
+++ b/apps/console/src/pages/organizations/measures/dialog/MeasureFormDialog.tsx
@@ -15,7 +15,7 @@ import type { ReactNode } from "react";
 import { useTranslate } from "@probo/i18n";
 import { Breadcrumb } from "@probo/ui";
 import { graphql } from "relay-runtime";
-import type { MeasureFormDialogMeasureFragment$key } from "./__generated__/MeasureFormDialogMeasureFragment.graphql";
+import type { MeasureFormDialogMeasureFragment$key } from "/__generated__/core/MeasureFormDialogMeasureFragment.graphql";
 import { useFragment } from "react-relay";
 import { z } from "zod";
 import { useFormWithSchema } from "/hooks/useFormWithSchema";
diff --git a/apps/console/src/pages/organizations/measures/tabs/MeasureControlsTab.tsx b/apps/console/src/pages/organizations/measures/tabs/MeasureControlsTab.tsx
index ecab24d7d..f7a0284bf 100644
--- a/apps/console/src/pages/organizations/measures/tabs/MeasureControlsTab.tsx
+++ b/apps/console/src/pages/organizations/measures/tabs/MeasureControlsTab.tsx
@@ -1,7 +1,7 @@
 import { graphql, useRefetchableFragment } from "react-relay";
 import { useOutletContext } from "react-router";
 import { LinkedControlsCard } from "/components/controls/LinkedControlsCard";
-import type { MeasureControlsTabFragment$key } from "./__generated__/MeasureControlsTabFragment.graphql";
+import type { MeasureControlsTabFragment$key } from "/__generated__/core/MeasureControlsTabFragment.graphql";
 import { useMutationWithIncrement } from "/hooks/useMutationWithIncrement";
 import { use } from "react";
 import { PermissionsContext } from "/providers/PermissionsContext";
@@ -74,7 +74,10 @@ export default function MeasureControlsTab() {
   const { isAuthorized } = use(PermissionsContext);
 
   const canLinkControl = isAuthorized("Control", "createControlMeasureMapping");
-  const canUnlinkControl = isAuthorized("Control", "deleteControlMeasureMapping");
+  const canUnlinkControl = isAuthorized(
+    "Control",
+    "deleteControlMeasureMapping",
+  );
   const readOnly = !canLinkControl && !canUnlinkControl;
 
   const incrementOptions = {
diff --git a/apps/console/src/pages/organizations/measures/tabs/MeasureEvidencesTab.tsx b/apps/console/src/pages/organizations/measures/tabs/MeasureEvidencesTab.tsx
index 8001803af..eb8769c05 100644
--- a/apps/console/src/pages/organizations/measures/tabs/MeasureEvidencesTab.tsx
+++ b/apps/console/src/pages/organizations/measures/tabs/MeasureEvidencesTab.tsx
@@ -1,5 +1,5 @@
 import { useNavigate, useOutletContext, useParams } from "react-router";
-import type { MeasureEvidencesTabFragment$key } from "./__generated__/MeasureEvidencesTabFragment.graphql";
+import type { MeasureEvidencesTabFragment$key } from "/__generated__/core/MeasureEvidencesTabFragment.graphql";
 import { useTranslate } from "@probo/i18n";
 import { usePageTitle } from "@probo/hooks";
 import {
@@ -24,7 +24,7 @@ import {
   useRelayEnvironment,
 } from "react-relay";
 import { SortableTable } from "/components/SortableTable";
-import type { MeasureEvidencesTabFragment_evidence$key } from "./__generated__/MeasureEvidencesTabFragment_evidence.graphql";
+import type { MeasureEvidencesTabFragment_evidence$key } from "/__generated__/core/MeasureEvidencesTabFragment_evidence.graphql";
 import { fileSize, fileType, sprintf, formatDate } from "@probo/helpers";
 import { EvidencePreviewDialog } from "../dialog/EvidencePreviewDialog";
 import { useOrganizationId } from "/hooks/useOrganizationId";
@@ -58,9 +58,9 @@ export const evidencesFragment = graphql`
         node {
           id
           file {
-              fileName
-              mimeType
-              size
+            fileName
+            mimeType
+            size
           }
           ...MeasureEvidencesTabFragment_evidence
         }
@@ -73,9 +73,9 @@ export const evidenceFragment = graphql`
   fragment MeasureEvidencesTabFragment_evidence on Evidence {
     id
     file {
-        fileName
-        mimeType
-        size
+      fileName
+      mimeType
+      size
     }
     type
     createdAt
@@ -97,7 +97,10 @@ export default function MeasureEvidencesTab() {
   const { measure } = useOutletContext<{
     measure: MeasureEvidencesTabFragment$key & { id: string; name: string };
   }>();
-  const { evidenceId, snapshotId } = useParams<{ evidenceId: string; snapshotId?: string }>();
+  const { evidenceId, snapshotId } = useParams<{
+    evidenceId: string;
+    snapshotId?: string;
+  }>();
   const pagination = usePaginationFragment(evidencesFragment, measure);
   const connectionId = pagination.data.evidences.__id;
   const evidences =
@@ -187,13 +190,16 @@ function EvidenceRow(props: {
   const evidence = useFragment(evidenceFragment, props.evidenceKey);
   const { __ } = useTranslate();
 
-  const [mutateWithToasts, isDeleting] = useMutationWithToasts(deleteEvidenceMutation, {
-    successMessage: sprintf(
-      __('Evidence "%s" has been deleted successfully'),
-      evidence.file?.fileName || __("Link evidence")
-    ),
-    errorMessage: __("Failed to delete evidence"),
-  });
+  const [mutateWithToasts, isDeleting] = useMutationWithToasts(
+    deleteEvidenceMutation,
+    {
+      successMessage: sprintf(
+        __('Evidence "%s" has been deleted successfully'),
+        evidence.file?.fileName || __("Link evidence"),
+      ),
+      errorMessage: __("Failed to delete evidence"),
+    },
+  );
   const confirm = useConfirm();
   const [isDownloading, setIsDownloading] = useState(false);
   const relayEnv = useRelayEnvironment();
@@ -214,7 +220,7 @@ function EvidenceRow(props: {
                 relayEnv,
                 props.measureId,
                 "evidences(first:0)",
-                -1
+                -1,
               );
             }
           },
@@ -223,11 +229,11 @@ function EvidenceRow(props: {
       {
         message: sprintf(
           __(
-            'This will permanently delete the evidence "%s". This action cannot be undone.'
+            'This will permanently delete the evidence "%s". This action cannot be undone.',
           ),
-          evidence.file?.fileName || __("Link evidence")
+          evidence.file?.fileName || __("Link evidence"),
         ),
-      }
+      },
     );
   };
 
@@ -245,7 +251,12 @@ function EvidenceRow(props: {
       )}
       <Tr to={evidenceUrl}>
         <Td>{evidence.file?.fileName}</Td>
-        <Td>{fileType(__, {type: evidence.type, mimeType: evidence.file?.mimeType || ''})}</Td>
+        <Td>
+          {fileType(__, {
+            type: evidence.type,
+            mimeType: evidence.file?.mimeType || "",
+          })}
+        </Td>
         <Td>{fileSize(__, evidence.file?.size || 0)}</Td>
         <Td>{formatDate(evidence.createdAt)}</Td>
         <Td noLink>
diff --git a/apps/console/src/pages/organizations/measures/tabs/MeasureRisksTab.tsx b/apps/console/src/pages/organizations/measures/tabs/MeasureRisksTab.tsx
index 66215c846..4102972ea 100644
--- a/apps/console/src/pages/organizations/measures/tabs/MeasureRisksTab.tsx
+++ b/apps/console/src/pages/organizations/measures/tabs/MeasureRisksTab.tsx
@@ -1,5 +1,5 @@
 import { graphql, useFragment } from "react-relay";
-import type { MeasureRisksTabFragment$key } from "./__generated__/MeasureRisksTabFragment.graphql";
+import type { MeasureRisksTabFragment$key } from "/__generated__/core/MeasureRisksTabFragment.graphql";
 import { useOutletContext } from "react-router";
 import { LinkedRisksCard } from "/components/risks/LinkedRisksCard";
 import { useMutationWithIncrement } from "/hooks/useMutationWithIncrement";
diff --git a/apps/console/src/pages/organizations/measures/tabs/MeasureTasksTab.tsx b/apps/console/src/pages/organizations/measures/tabs/MeasureTasksTab.tsx
index 36b50d09c..32f6cc854 100644
--- a/apps/console/src/pages/organizations/measures/tabs/MeasureTasksTab.tsx
+++ b/apps/console/src/pages/organizations/measures/tabs/MeasureTasksTab.tsx
@@ -1,5 +1,5 @@
 import { graphql } from "relay-runtime";
-import type { MeasureTasksTabQuery } from "./__generated__/MeasureTasksTabQuery.graphql";
+import type { MeasureTasksTabQuery } from "/__generated__/core/MeasureTasksTabQuery.graphql";
 import { useOutletContext } from "react-router";
 import { useLazyLoadQuery } from "react-relay";
 import TasksCard from "/components/tasks/TasksCard";
diff --git a/apps/console/src/pages/organizations/meetings/MeetingDetailPage.tsx b/apps/console/src/pages/organizations/meetings/MeetingDetailPage.tsx
index 5d0c8df3f..49cda50ce 100644
--- a/apps/console/src/pages/organizations/meetings/MeetingDetailPage.tsx
+++ b/apps/console/src/pages/organizations/meetings/MeetingDetailPage.tsx
@@ -1,8 +1,8 @@
 import type { PreloadedQuery } from "react-relay";
 import { graphql, useFragment, usePreloadedQuery } from "react-relay";
-import type { MeetingGraphNodeQuery } from "/hooks/graph/__generated__/MeetingGraphNodeQuery.graphql";
+import type { MeetingGraphNodeQuery } from "/__generated__/core/MeetingGraphNodeQuery.graphql";
 import { usePageTitle } from "@probo/hooks";
-import type { MeetingDetailPageMeetingFragment$key } from "./__generated__/MeetingDetailPageMeetingFragment.graphql";
+import type { MeetingDetailPageMeetingFragment$key } from "/__generated__/core/MeetingDetailPageMeetingFragment.graphql";
 import { useTranslate } from "@probo/i18n";
 import {
   ActionDropdown,
@@ -49,7 +49,7 @@ export default function MeetingDetailPage(props: Props) {
   const node = usePreloadedQuery(meetingNodeQuery, props.queryRef).node;
   const meeting = useFragment<MeetingDetailPageMeetingFragment$key>(
     meetingFragment,
-    node
+    node,
   );
   const { __ } = useTranslate();
   const organizationId = useOrganizationId();
@@ -133,11 +133,11 @@ export default function MeetingDetailPage(props: Props) {
       {
         message: sprintf(
           __(
-            'This will permanently delete the meeting "%s". This action cannot be undone.'
+            'This will permanently delete the meeting "%s". This action cannot be undone.',
           ),
-          meeting.name
+          meeting.name,
         ),
-      }
+      },
     );
   };
 
diff --git a/apps/console/src/pages/organizations/meetings/MeetingsPage.tsx b/apps/console/src/pages/organizations/meetings/MeetingsPage.tsx
index abfef2c4e..6956fda65 100644
--- a/apps/console/src/pages/organizations/meetings/MeetingsPage.tsx
+++ b/apps/console/src/pages/organizations/meetings/MeetingsPage.tsx
@@ -27,21 +27,21 @@ import {
   type PreloadedQuery,
 } from "react-relay";
 import { graphql } from "relay-runtime";
-import type { MeetingGraphListQuery } from "/hooks/graph/__generated__/MeetingGraphListQuery.graphql";
+import type { MeetingGraphListQuery } from "/__generated__/core/MeetingGraphListQuery.graphql";
 import {
   meetingsQuery,
   useDeleteMeetingMutation,
 } from "/hooks/graph/MeetingGraph";
-import type { MeetingsPageListFragment$key } from "./__generated__/MeetingsPageListFragment.graphql";
+import type { MeetingsPageListFragment$key } from "/__generated__/core/MeetingsPageListFragment.graphql";
 import { usePageTitle } from "@probo/hooks";
 import { formatDate, sprintf } from "@probo/helpers";
 import { CreateMeetingDialog } from "./dialogs/CreateMeetingDialog";
-import type { MeetingsPageRowFragment$key } from "./__generated__/MeetingsPageRowFragment.graphql";
+import type { MeetingsPageRowFragment$key } from "/__generated__/core/MeetingsPageRowFragment.graphql";
 import { SortableTable, SortableTh } from "/components/SortableTable";
 import { Link } from "react-router";
 import { useState, useEffect, useRef } from "react";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
-import type { MeetingsPage_UpdateSummaryMutation } from "./__generated__/MeetingsPage_UpdateSummaryMutation.graphql";
+import type { MeetingsPage_UpdateSummaryMutation } from "/__generated__/core/MeetingsPage_UpdateSummaryMutation.graphql";
 import { use } from "react";
 import { PermissionsContext } from "/providers/PermissionsContext";
 
@@ -89,12 +89,12 @@ export default function MeetingsPage(props: Props) {
   const { isAuthorized } = use(PermissionsContext);
   const organization = usePreloadedQuery(
     meetingsQuery,
-    props.queryRef
+    props.queryRef,
   ).organization;
 
   const pagination = usePaginationFragment(
     meetingsFragment,
-    organization as MeetingsPageListFragment$key
+    organization as MeetingsPageListFragment$key,
   );
 
   const meetingNodes = pagination.data.meetings.edges
@@ -144,7 +144,7 @@ export default function MeetingsPage(props: Props) {
       {
         successMessage: __("Summary updated successfully"),
         errorMessage: __("Failed to update summary"),
-      }
+      },
     );
 
   const handleSave = () => {
@@ -246,7 +246,7 @@ export default function MeetingsPage(props: Props) {
       <PageHeader
         title={__("Meetings")}
         description={__(
-          "Track and manage your organization's meetings and their minutes."
+          "Track and manage your organization's meetings and their minutes.",
         )}
       >
         {isAuthorized("Organization", "createMeeting") && (
@@ -316,7 +316,7 @@ function MeetingRow({
 }) {
   const meeting = useFragment<MeetingsPageRowFragment$key>(
     rowFragment,
-    meetingKey
+    meetingKey,
   );
   const { __ } = useTranslate();
   const [deleteMeeting] = useDeleteMeetingMutation();
@@ -333,11 +333,11 @@ function MeetingRow({
       {
         message: sprintf(
           __(
-            'This will permanently delete the meeting "%s". This action cannot be undone.'
+            'This will permanently delete the meeting "%s". This action cannot be undone.',
           ),
-          meeting.name
+          meeting.name,
         ),
-      }
+      },
     );
   };
 
diff --git a/apps/console/src/pages/organizations/meetings/dialogs/CreateMeetingDialog.tsx b/apps/console/src/pages/organizations/meetings/dialogs/CreateMeetingDialog.tsx
index 4f9846496..cfe4d1847 100644
--- a/apps/console/src/pages/organizations/meetings/dialogs/CreateMeetingDialog.tsx
+++ b/apps/console/src/pages/organizations/meetings/dialogs/CreateMeetingDialog.tsx
@@ -13,7 +13,7 @@ import { graphql } from "relay-runtime";
 import { useMutation } from "react-relay";
 import { z } from "zod";
 import { useFormWithSchema } from "/hooks/useFormWithSchema";
-import type { CreateMeetingDialogCreateMutation } from "./__generated__/CreateMeetingDialogCreateMutation.graphql";
+import type { CreateMeetingDialogCreateMutation } from "/__generated__/core/CreateMeetingDialogCreateMutation.graphql";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import { PeopleMultiSelectField } from "/components/form/PeopleMultiSelectField";
 import { formatDatetime } from "@probo/helpers";
@@ -59,7 +59,7 @@ export function CreateMeetingDialog({ children, connectionId }: Props) {
     useMutation<CreateMeetingDialogCreateMutation>(createMeetingMutation);
   const { handleSubmit, register, control } = useFormWithSchema(
     meetingSchema,
-    {}
+    {},
   );
 
   const onSubmit = handleSubmit((data) => {
diff --git a/apps/console/src/pages/organizations/meetings/dialogs/UpdateMeetingMinutesDialog.tsx b/apps/console/src/pages/organizations/meetings/dialogs/UpdateMeetingMinutesDialog.tsx
index 917e8a288..df12634c4 100644
--- a/apps/console/src/pages/organizations/meetings/dialogs/UpdateMeetingMinutesDialog.tsx
+++ b/apps/console/src/pages/organizations/meetings/dialogs/UpdateMeetingMinutesDialog.tsx
@@ -13,7 +13,7 @@ import { forwardRef, useImperativeHandle } from "react";
 import { z } from "zod";
 import { useFormWithSchema } from "/hooks/useFormWithSchema";
 import { useUpdateMeetingMutation } from "/hooks/graph/MeetingGraph";
-import type { MeetingDetailPageMeetingFragment$data } from "../__generated__/MeetingDetailPageMeetingFragment.graphql";
+import type { MeetingDetailPageMeetingFragment$data } from "/__generated__/core/MeetingDetailPageMeetingFragment.graphql";
 
 type Props = {
   meeting: MeetingDetailPageMeetingFragment$data;
@@ -90,4 +90,3 @@ export const UpdateMeetingMinutesDialog = forwardRef<
     </Dialog>
   );
 });
-
diff --git a/apps/console/src/pages/organizations/meetings/tabs/MeetingMinutesTab.tsx b/apps/console/src/pages/organizations/meetings/tabs/MeetingMinutesTab.tsx
index 02e7e9bbc..e1cdaa9be 100644
--- a/apps/console/src/pages/organizations/meetings/tabs/MeetingMinutesTab.tsx
+++ b/apps/console/src/pages/organizations/meetings/tabs/MeetingMinutesTab.tsx
@@ -1,12 +1,12 @@
 import { useOutletContext } from "react-router";
-import type { MeetingDetailPageMeetingFragment$data } from "../__generated__/MeetingDetailPageMeetingFragment.graphql";
+import type { MeetingDetailPageMeetingFragment$data } from "/__generated__/core/MeetingDetailPageMeetingFragment.graphql";
 import { Markdown } from "@probo/ui";
 
 export default function MeetingMinutesTab() {
   const { meeting } = useOutletContext<{
     meeting: MeetingDetailPageMeetingFragment$data;
   }>();
-  
+
   return (
     <div>
       {meeting.minutes ? (
@@ -19,4 +19,3 @@ export default function MeetingMinutesTab() {
     </div>
   );
 }
-
diff --git a/apps/console/src/pages/organizations/nonconformities/NonconformitiesPage.tsx b/apps/console/src/pages/organizations/nonconformities/NonconformitiesPage.tsx
index a1b687e68..08525f229 100644
--- a/apps/console/src/pages/organizations/nonconformities/NonconformitiesPage.tsx
+++ b/apps/console/src/pages/organizations/nonconformities/NonconformitiesPage.tsx
@@ -27,19 +27,30 @@ import {
 } from "react-relay";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import { CreateNonconformityDialog } from "./dialogs/CreateNonconformityDialog";
-import { deleteNonconformityMutation, NonconformitiesConnectionKey, nonconformitiesQuery } from "../../../hooks/graph/NonconformityGraph";
-import { sprintf, promisifyMutation, getStatusVariant, getStatusLabel, formatDate } from "@probo/helpers";
+import {
+  deleteNonconformityMutation,
+  NonconformitiesConnectionKey,
+  nonconformitiesQuery,
+} from "../../../hooks/graph/NonconformityGraph";
+import {
+  sprintf,
+  promisifyMutation,
+  getStatusVariant,
+  getStatusLabel,
+  formatDate,
+} from "@probo/helpers";
 import { SnapshotBanner } from "/components/SnapshotBanner";
 import { useParams } from "react-router";
 import type {
   NonconformitiesPageFragment$key,
   NonconformitiesPageFragment$data,
-} from "./__generated__/NonconformitiesPageFragment.graphql";
+} from "/__generated__/core/NonconformitiesPageFragment.graphql";
 import { use } from "react";
 import { PermissionsContext } from "/providers/PermissionsContext";
-import type { NonconformityGraphListQuery } from "/hooks/graph/__generated__/NonconformityGraphListQuery.graphql";
+import type { NonconformityGraphListQuery } from "/__generated__/core/NonconformityGraphListQuery.graphql";
 
-type Nonconformity = NonconformitiesPageFragment$data['nonconformities']['edges'][number]['node'];
+type Nonconformity =
+  NonconformitiesPageFragment$data["nonconformities"]["edges"][number]["node"];
 
 interface NonconformitiesPageProps {
   queryRef: PreloadedQuery<NonconformityGraphListQuery>;
@@ -59,7 +70,10 @@ const nonconformitiesPageFragment = graphql`
       after: $after
       filter: { snapshotId: $snapshotId }
     )
-      @connection(key: "NonconformitiesPage_nonconformities", filters: ["filter"]) {
+      @connection(
+        key: "NonconformitiesPage_nonconformities"
+        filters: ["filter"]
+      ) {
       __id
       totalCount
       edges {
@@ -98,7 +112,9 @@ const nonconformitiesPageFragment = graphql`
   }
 `;
 
-export default function NonconformitiesPage({ queryRef }: NonconformitiesPageProps) {
+export default function NonconformitiesPage({
+  queryRef,
+}: NonconformitiesPageProps) {
   const { __ } = useTranslate();
   const organizationId = useOrganizationId();
   const { snapshotId } = useParams<{ snapshotId?: string }>();
@@ -107,46 +123,46 @@ export default function NonconformitiesPage({ queryRef }: NonconformitiesPagePro
 
   usePageTitle(__("Nonconformities"));
 
-  const organization = usePreloadedQuery(
-    nonconformitiesQuery,
-    queryRef
-  );
+  const organization = usePreloadedQuery(nonconformitiesQuery, queryRef);
 
-  const { data: nonconformitiesData, loadNext, hasNext } = usePaginationFragment(
+  const {
+    data: nonconformitiesData,
+    loadNext,
+    hasNext,
+  } = usePaginationFragment(
     nonconformitiesPageFragment,
-    organization.node as NonconformitiesPageFragment$key
+    organization.node as NonconformitiesPageFragment$key,
   );
 
   const connectionId = ConnectionHandler.getConnectionID(
     organizationId,
     NonconformitiesConnectionKey,
-    { filter: { snapshotId: snapshotId || null } }
+    { filter: { snapshotId: snapshotId || null } },
   );
-  const nonconformities: Nonconformity[] = nonconformitiesData?.nonconformities?.edges?.map((edge) => edge.node) ?? [];
+  const nonconformities: Nonconformity[] =
+    nonconformitiesData?.nonconformities?.edges?.map((edge) => edge.node) ?? [];
 
-  const hasAnyAction = !isSnapshotMode && (
-    isAuthorized("Nonconformity", "updateNonconformity") ||
-    isAuthorized("Nonconformity", "deleteNonconformity")
-  );
+  const hasAnyAction =
+    !isSnapshotMode &&
+    (isAuthorized("Nonconformity", "updateNonconformity") ||
+      isAuthorized("Nonconformity", "deleteNonconformity"));
 
   return (
     <div className="space-y-6">
-      {isSnapshotMode && (
-        <SnapshotBanner snapshotId={snapshotId!} />
-      )}
+      {isSnapshotMode && <SnapshotBanner snapshotId={snapshotId!} />}
       <PageHeader
         title={__("Nonconformities")}
-        description={__(
-          "Manage your organization's non conformities."
-        )}
+        description={__("Manage your organization's non conformities.")}
       >
-        {!isSnapshotMode && (
+        {!isSnapshotMode &&
           isAuthorized("Organization", "createNonconformity") && (
-            <CreateNonconformityDialog organizationId={organizationId} connection={connectionId}>
+            <CreateNonconformityDialog
+              organizationId={organizationId}
+              connection={connectionId}
+            >
               <Button icon={IconPlusLarge}>{__("Add nonconformity")}</Button>
             </CreateNonconformityDialog>
-          )
-        )}
+          )}
       </PageHeader>
 
       {nonconformities.length === 0 ? (
@@ -201,8 +217,6 @@ export default function NonconformitiesPage({ queryRef }: NonconformitiesPagePro
           )}
         </Card>
       )}
-
-
     </div>
   );
 }
@@ -247,11 +261,11 @@ function NonconformityRow({
       {
         message: sprintf(
           __(
-            "This will permanently delete the nonconformity %s. This action cannot be undone."
+            "This will permanently delete the nonconformity %s. This action cannot be undone.",
           ),
-          nonconformity.referenceId
+          nonconformity.referenceId,
         ),
-      }
+      },
     );
   };
 
@@ -273,12 +287,15 @@ function NonconformityRow({
         </Badge>
       </Td>
       <Td>
-        {nonconformity.audit
-          ? nonconformity.audit.name
-            ? `${nonconformity.audit.framework?.name} - ${nonconformity.audit.name}`
-            : nonconformity.audit.framework?.name
-          : <span className="text-txt-tertiary">{__("No audit")}</span>
-        }
+        {nonconformity.audit ? (
+          nonconformity.audit.name ? (
+            `${nonconformity.audit.framework?.name} - ${nonconformity.audit.name}`
+          ) : (
+            nonconformity.audit.framework?.name
+          )
+        ) : (
+          <span className="text-txt-tertiary">{__("No audit")}</span>
+        )}
       </Td>
       <Td>{nonconformity.owner.fullName}</Td>
       <Td>
diff --git a/apps/console/src/pages/organizations/nonconformities/NonconformityDetailsPage.tsx b/apps/console/src/pages/organizations/nonconformities/NonconformityDetailsPage.tsx
index 3b4f0a0f7..275a6fe5e 100644
--- a/apps/console/src/pages/organizations/nonconformities/NonconformityDetailsPage.tsx
+++ b/apps/console/src/pages/organizations/nonconformities/NonconformityDetailsPage.tsx
@@ -32,8 +32,16 @@ import { PeopleSelectField } from "/components/form/PeopleSelectField";
 import { AuditSelectField } from "/components/form/AuditSelectField";
 import { useFormWithSchema } from "/hooks/useFormWithSchema";
 import z from "zod";
-import { getStatusVariant, getStatusLabel, formatDatetime, validateSnapshotConsistency, getStatusOptions, formatError, type GraphQLError } from "@probo/helpers";
-import type { NonconformityGraphNodeQuery } from "/hooks/graph/__generated__/NonconformityGraphNodeQuery.graphql";
+import {
+  getStatusVariant,
+  getStatusLabel,
+  formatDatetime,
+  validateSnapshotConsistency,
+  getStatusOptions,
+  formatError,
+  type GraphQLError,
+} from "@probo/helpers";
+import type { NonconformityGraphNodeQuery } from "/__generated__/core/NonconformityGraphNodeQuery.graphql";
 import { PermissionsContext } from "/providers/PermissionsContext";
 import { use } from "react";
 
@@ -57,7 +65,7 @@ type Props = {
 export default function NonconformityDetailsPage(props: Props) {
   const data = usePreloadedQuery<NonconformityGraphNodeQuery>(
     nonconformityNodeQuery,
-    props.queryRef
+    props.queryRef,
   );
   const nonconformity = data.node;
   const { __ } = useTranslate();
@@ -73,18 +81,17 @@ export default function NonconformityDetailsPage(props: Props) {
     ConnectionHandler.getConnectionID(
       organizationId,
       NonconformitiesConnectionKey,
-      { filter: { snapshotId: snapshotId || null } }
-    )
+      { filter: { snapshotId: snapshotId || null } },
+    ),
   );
 
-  const { control, formState, handleSubmit, register, reset } = useFormWithSchema(
-    updateNonconformitySchema,
-    {
+  const { control, formState, handleSubmit, register, reset } =
+    useFormWithSchema(updateNonconformitySchema, {
       defaultValues: {
         referenceId: nonconformity.referenceId || "",
         description: nonconformity.description || "",
-        dateIdentified: nonconformity.dateIdentified?.split('T')[0] || "",
-        dueDate: nonconformity.dueDate?.split('T')[0] || "",
+        dateIdentified: nonconformity.dateIdentified?.split("T")[0] || "",
+        dueDate: nonconformity.dueDate?.split("T")[0] || "",
         rootCause: nonconformity.rootCause || "",
         correctiveAction: nonconformity.correctiveAction || "",
         effectivenessCheck: nonconformity.effectivenessCheck || "",
@@ -92,8 +99,7 @@ export default function NonconformityDetailsPage(props: Props) {
         ownerId: nonconformity.owner?.id || "",
         auditId: nonconformity.audit?.id || "",
       },
-    }
-  );
+    });
 
   const updateNonconformity = useUpdateNonconformity();
   const { toast } = useToast();
@@ -124,7 +130,10 @@ export default function NonconformityDetailsPage(props: Props) {
     } catch (error) {
       toast({
         title: __("Error"),
-        description: formatError(__("Failed to update nonconformity"), error as GraphQLError),
+        description: formatError(
+          __("Failed to update nonconformity"),
+          error as GraphQLError,
+        ),
         variant: "error",
       });
     }
@@ -138,9 +147,7 @@ export default function NonconformityDetailsPage(props: Props) {
 
   return (
     <div className="space-y-6">
-      {isSnapshotMode && (
-        <SnapshotBanner snapshotId={snapshotId!} />
-      )}
+      {isSnapshotMode && <SnapshotBanner snapshotId={snapshotId!} />}
       <Breadcrumb
         items={[
           {
@@ -239,11 +246,19 @@ export default function NonconformityDetailsPage(props: Props) {
 
             <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
               <Field label={__("Date Identified")}>
-                <Input {...register("dateIdentified")} type="date" disabled={isSnapshotMode} />
+                <Input
+                  {...register("dateIdentified")}
+                  type="date"
+                  disabled={isSnapshotMode}
+                />
               </Field>
 
               <Field label={__("Due Date")}>
-                <Input {...register("dueDate")} type="date" disabled={isSnapshotMode} />
+                <Input
+                  {...register("dueDate")}
+                  type="date"
+                  disabled={isSnapshotMode}
+                />
               </Field>
             </div>
 
@@ -279,13 +294,13 @@ export default function NonconformityDetailsPage(props: Props) {
             </Field>
 
             <div className="flex justify-end">
-              {formState.isDirty && !isSnapshotMode && (
+              {formState.isDirty &&
+                !isSnapshotMode &&
                 isAuthorized("Nonconformity", "updateNonconformity") && (
                   <Button type="submit" disabled={formState.isSubmitting}>
                     {formState.isSubmitting ? __("Updating...") : __("Update")}
                   </Button>
-                )
-              )}
+                )}
             </div>
           </form>
         </Card>
diff --git a/apps/console/src/pages/organizations/obligations/ObligationDetailsPage.tsx b/apps/console/src/pages/organizations/obligations/ObligationDetailsPage.tsx
index 3735b7f02..8278b5859 100644
--- a/apps/console/src/pages/organizations/obligations/ObligationDetailsPage.tsx
+++ b/apps/console/src/pages/organizations/obligations/ObligationDetailsPage.tsx
@@ -1,28 +1,28 @@
 import {
-  ConnectionHandler,
-  usePreloadedQuery,
-  type PreloadedQuery,
+    ConnectionHandler,
+    usePreloadedQuery,
+    type PreloadedQuery,
 } from "react-relay";
 import {
-  obligationNodeQuery,
-  useDeleteObligation,
-  useUpdateObligation,
-  ObligationsConnectionKey,
+    obligationNodeQuery,
+    useDeleteObligation,
+    useUpdateObligation,
+    ObligationsConnectionKey,
 } from "../../../hooks/graph/ObligationGraph";
 import {
-  ActionDropdown,
-  Badge,
-  Breadcrumb,
-  Button,
-  DropdownItem,
-  Field,
-  IconTrashCan,
-  Option,
-  Input,
-  Card,
-  Textarea,
-  useToast,
-  Select,
+    ActionDropdown,
+    Badge,
+    Breadcrumb,
+    Button,
+    DropdownItem,
+    Field,
+    IconTrashCan,
+    Option,
+    Input,
+    Card,
+    Textarea,
+    useToast,
+    Select,
 } from "@probo/ui";
 import { useTranslate } from "@probo/i18n";
 import { useParams } from "react-router";
@@ -32,312 +32,354 @@ import { useFormWithSchema } from "/hooks/useFormWithSchema";
 import { Controller } from "react-hook-form";
 import { formatError, type GraphQLError } from "@probo/helpers";
 import z from "zod";
-import { getObligationStatusVariant, getObligationStatusLabel, formatDatetime, getObligationStatusOptions, getObligationTypeOptions, validateSnapshotConsistency } from "@probo/helpers";
+import {
+    getObligationStatusVariant,
+    getObligationStatusLabel,
+    formatDatetime,
+    getObligationStatusOptions,
+    validateSnapshotConsistency,
+    getObligationTypeOptions,
+} from "@probo/helpers";
 import { SnapshotBanner } from "/components/SnapshotBanner";
-import type { ObligationGraphNodeQuery } from "/hooks/graph/__generated__/ObligationGraphNodeQuery.graphql";
+import type { ObligationGraphNodeQuery } from "/__generated__/core/ObligationGraphNodeQuery.graphql";
 import { use } from "react";
 import { PermissionsContext } from "/providers/PermissionsContext";
 
 const updateObligationSchema = z.object({
-  area: z.string().optional(),
-  source: z.string().optional(),
-  requirement: z.string().optional(),
-  actionsToBeImplemented: z.string().optional(),
-  regulator: z.string().optional(),
-  type: z.enum(["LEGAL", "CONTRACTUAL"]),
-  lastReviewDate: z.string().optional(),
-  dueDate: z.string().optional(),
-  status: z.enum(["NON_COMPLIANT", "PARTIALLY_COMPLIANT", "COMPLIANT"]),
-  ownerId: z.string().min(1, "Owner is required"),
+    area: z.string().optional(),
+    source: z.string().optional(),
+    requirement: z.string().optional(),
+    actionsToBeImplemented: z.string().optional(),
+    regulator: z.string().optional(),
+    type: z.enum(["LEGAL", "CONTRACTUAL"]),
+    lastReviewDate: z.string().optional(),
+    dueDate: z.string().optional(),
+    status: z.enum(["NON_COMPLIANT", "PARTIALLY_COMPLIANT", "COMPLIANT"]),
+    ownerId: z.string().min(1, "Owner is required"),
 });
 
 type Props = {
-  queryRef: PreloadedQuery<ObligationGraphNodeQuery>;
+    queryRef: PreloadedQuery<ObligationGraphNodeQuery>;
 };
 
 export default function ObligationDetailsPage(props: Props) {
-  const data = usePreloadedQuery<ObligationGraphNodeQuery>(obligationNodeQuery, props.queryRef);
-  const obligation = data.node;
-  const { __ } = useTranslate();
-  const { toast } = useToast();
-  const organizationId = useOrganizationId();
-  const { snapshotId } = useParams<{ snapshotId?: string }>();
-  const isSnapshotMode = Boolean(snapshotId);
-  const { isAuthorized } = use(PermissionsContext);
+    const data = usePreloadedQuery<ObligationGraphNodeQuery>(
+        obligationNodeQuery,
+        props.queryRef,
+    );
+    const obligation = data.node;
+    const { __ } = useTranslate();
+    const { toast } = useToast();
+    const organizationId = useOrganizationId();
+    const { snapshotId } = useParams<{ snapshotId?: string }>();
+    const isSnapshotMode = Boolean(snapshotId);
+    const { isAuthorized } = use(PermissionsContext);
 
-  validateSnapshotConsistency(obligation, snapshotId);
+    validateSnapshotConsistency(obligation, snapshotId);
 
-  const updateObligation = useUpdateObligation();
-  const statusOptions = getObligationStatusOptions(__);
-  const typeOptions = getObligationTypeOptions(__);
+    const updateObligation = useUpdateObligation();
+    const statusOptions = getObligationStatusOptions(__);
+    const typeOptions = getObligationTypeOptions(__);
 
-  const connectionId = ConnectionHandler.getConnectionID(
-    organizationId,
-    ObligationsConnectionKey
-  );
+    const connectionId = ConnectionHandler.getConnectionID(
+        organizationId,
+        ObligationsConnectionKey,
+    );
 
-  const deleteObligation = useDeleteObligation(
-    { id: obligation?.id ?? "" },
-    connectionId
-  );
+    const deleteObligation = useDeleteObligation(
+        { id: obligation?.id ?? "" },
+        connectionId,
+    );
 
-  const { register, handleSubmit, formState, control } = useFormWithSchema(
-    updateObligationSchema,
-    {
-      defaultValues: {
-        area: obligation?.area || "",
-        source: obligation?.source || "",
-        requirement: obligation?.requirement || "",
-        actionsToBeImplemented: obligation?.actionsToBeImplemented || "",
-        regulator: obligation?.regulator || "",
-        type: obligation?.type ?? "LEGAL",
-        lastReviewDate: obligation?.lastReviewDate
-          ? new Date(obligation.lastReviewDate).toISOString().split("T")[0]
-          : "",
-        dueDate: obligation?.dueDate
-          ? new Date(obligation.dueDate).toISOString().split("T")[0]
-          : "",
-        status: obligation?.status ?? "NON_COMPLIANT",
-        ownerId: obligation?.owner?.id || "",
-      },
-    }
-  );
+    const { register, handleSubmit, formState, control } = useFormWithSchema(
+        updateObligationSchema,
+        {
+            defaultValues: {
+                area: obligation?.area || "",
+                source: obligation?.source || "",
+                requirement: obligation?.requirement || "",
+                actionsToBeImplemented:
+                    obligation?.actionsToBeImplemented || "",
+                regulator: obligation?.regulator || "",
+                type: obligation?.type ?? "LEGAL",
+                lastReviewDate: obligation?.lastReviewDate
+                    ? new Date(obligation.lastReviewDate)
+                          .toISOString()
+                          .split("T")[0]
+                    : "",
+                dueDate: obligation?.dueDate
+                    ? new Date(obligation.dueDate).toISOString().split("T")[0]
+                    : "",
+                status: obligation?.status ?? "NON_COMPLIANT",
+                ownerId: obligation?.owner?.id || "",
+            },
+        },
+    );
 
-  const onSubmit = handleSubmit(async (formData) => {
-    try {
-      await updateObligation({
-        id: obligation.id!,
-        area: formData.area || undefined,
-        source: formData.source || undefined,
-        requirement: formData.requirement || undefined,
-        actionsToBeImplemented: formData.actionsToBeImplemented || undefined,
-        regulator: formData.regulator || undefined,
-        type: formData.type,
-        lastReviewDate: formatDatetime(formData.lastReviewDate) ?? null,
-        dueDate: formatDatetime(formData.dueDate) ?? null,
-        status: formData.status,
-        ownerId: formData.ownerId,
-      });
+    const onSubmit = handleSubmit(async (formData) => {
+        try {
+            await updateObligation({
+                id: obligation.id!,
+                area: formData.area || undefined,
+                source: formData.source || undefined,
+                requirement: formData.requirement || undefined,
+                actionsToBeImplemented:
+                    formData.actionsToBeImplemented || undefined,
+                regulator: formData.regulator || undefined,
+                type: formData.type,
+                lastReviewDate: formatDatetime(formData.lastReviewDate) ?? null,
+                dueDate: formatDatetime(formData.dueDate) ?? null,
+                status: formData.status,
+                ownerId: formData.ownerId,
+            });
 
-      toast({
-        title: __("Success"),
-        description: __("Obligation updated successfully"),
-        variant: "success",
-      });
-    } catch (error) {
-      toast({
-        title: __("Error"),
-        description: formatError(__("Failed to update obligation"), error as GraphQLError),
-        variant: "error",
-      });
-    }
-  });
+            toast({
+                title: __("Success"),
+                description: __("Obligation updated successfully"),
+                variant: "success",
+            });
+        } catch (error) {
+            toast({
+                title: __("Error"),
+                description: formatError(
+                    __("Failed to update obligation"),
+                    error as GraphQLError,
+                ),
+                variant: "error",
+            });
+        }
+    });
 
     const breadcrumbObligationsUrl = isSnapshotMode
-    ? `/organizations/${organizationId}/snapshots/${snapshotId}/obligations`
-    : `/organizations/${organizationId}/obligations`;
+        ? `/organizations/${organizationId}/snapshots/${snapshotId}/obligations`
+        : `/organizations/${organizationId}/obligations`;
 
-  return (
-    <div className="space-y-6">
-      {isSnapshotMode && snapshotId && (
-        <SnapshotBanner snapshotId={snapshotId} />
-      )}
-      <div className="flex justify-between items-start">
-        <div>
-                   <Breadcrumb
-           items={[
-             { label: __("Obligations"), to: breadcrumbObligationsUrl },
-             { label: __("Obligation Details") },
-           ]}
-         />
-        <div className="flex items-center gap-3 mt-2">
-          <h1 className="text-2xl font-bold">{__("Obligation")}</h1>
-          <Badge variant={getObligationStatusVariant(obligation.status ?? "NON_COMPLIANT")}>
-            {getObligationStatusLabel(obligation.status ?? "NON_COMPLIANT")}
-          </Badge>
-        </div>
-      </div>
+    return (
+        <div className="space-y-6">
+            {isSnapshotMode && snapshotId && (
+                <SnapshotBanner snapshotId={snapshotId} />
+            )}
+            <div className="flex justify-between items-start">
+                <div>
+                    <Breadcrumb
+                        items={[
+                            {
+                                label: __("Obligations"),
+                                to: breadcrumbObligationsUrl,
+                            },
+                            { label: __("Obligation Details") },
+                        ]}
+                    />
+                    <div className="flex items-center gap-3 mt-2">
+                        <h1 className="text-2xl font-bold">
+                            {__("Obligation")}
+                        </h1>
+                        <Badge
+                            variant={getObligationStatusVariant(
+                                obligation.status ?? "NON_COMPLIANT",
+                            )}
+                        >
+                            {getObligationStatusLabel(
+                                obligation.status ?? "NON_COMPLIANT",
+                            )}
+                        </Badge>
+                    </div>
+                </div>
 
-        {!isSnapshotMode && (
-          isAuthorized("Obligation", "deleteObligation") && (
-            <ActionDropdown>
-              <DropdownItem icon={IconTrashCan} onClick={deleteObligation}>
-                {__("Delete")}
-              </DropdownItem>
-            </ActionDropdown>
-          )
-        )}
-      </div>
-
-      <Card padded>
-        <form onSubmit={onSubmit} className="space-y-6">
-
-          <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-            <Field
-              label={__("Area")}
-              error={formState.errors.area?.message}
-            >
-              <Input
-                {...register("area")}
-                placeholder={__("Enter area")}
-                disabled={isSnapshotMode}
-              />
-            </Field>
-
-            <Field
-              label={__("Source")}
-              error={formState.errors.source?.message}
-            >
-              <Input
-                {...register("source")}
-                placeholder={__("Enter source")}
-                disabled={isSnapshotMode}
-              />
-            </Field>
-          </div>
-
-          <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-            <Field label={__("Status")}>
-              <Controller
-                control={control}
-                name="status"
-                render={({ field }) => (
-                  <Select
-                    variant="editor"
-                    placeholder={__("Select status")}
-                    onValueChange={field.onChange}
-                    value={field.value}
-                    className="w-full"
-                    disabled={isSnapshotMode}
-                  >
-                    {statusOptions.map((option) => (
-                      <Option key={option.value} value={option.value}>
-                        {option.label}
-                      </Option>
-                    ))}
-                  </Select>
-                )}
-              />
-              {formState.errors.status && (
-                <p className="text-sm text-red-500 mt-1">{formState.errors.status.message}</p>
-              )}
-            </Field>
-
-            <Controller
-              name="ownerId"
-              control={control}
-              render={() => (
-                <PeopleSelectField
-                  organizationId={organizationId}
-                  control={control}
-                  name="ownerId"
-                  label={__("Owner")}
-                  error={formState.errors.ownerId?.message}
-                  required
-                  disabled={isSnapshotMode}
-                />
-              )}
-            />
-          </div>
-
-          <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-            <Field
-              label={__("Regulator")}
-              error={formState.errors.regulator?.message}
-            >
-              <Input
-                {...register("regulator")}
-                placeholder={__("Enter regulator")}
-                disabled={isSnapshotMode}
-              />
-            </Field>
-
-            <Field label={__("Type")} error={formState.errors.type?.message}>
-              <Controller
-                control={control}
-                name="type"
-                render={({ field }) => (
-                  <Select
-                    variant="editor"
-                    placeholder={__("Select type")}
-                    onValueChange={field.onChange}
-                    value={field.value}
-                    className="w-full"
-                    disabled={isSnapshotMode}
-                  >
-                    {typeOptions.map((option) => (
-                      <Option key={option.value} value={option.value}>
-                        {option.label}
-                      </Option>
-                    ))}
-                  </Select>
-                )}
-              />
-            </Field>
-          </div>
-
-          <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-            <Field
-              label={__("Last Review Date")}
-              error={formState.errors.lastReviewDate?.message}
-            >
-              <Input
-                {...register("lastReviewDate")}
-                type="date"
-                disabled={isSnapshotMode}
-              />
-            </Field>
-
-            <Field
-              label={__("Due Date")}
-              error={formState.errors.dueDate?.message}
-            >
-              <Input
-                {...register("dueDate")}
-                type="date"
-                disabled={isSnapshotMode}
-              />
-            </Field>
-          </div>
-
-          <Field
-            label={__("Requirement")}
-            error={formState.errors.requirement?.message}
-          >
-            <Textarea
-              {...register("requirement")}
-              placeholder={__("Enter requirement")}
-              rows={4}
-              disabled={isSnapshotMode}
-            />
-          </Field>
-
-          <Field
-            label={__("Actions to be Implemented")}
-            error={formState.errors.actionsToBeImplemented?.message}
-          >
-            <Textarea
-              {...register("actionsToBeImplemented")}
-              placeholder={__("Enter actions to be implemented")}
-              rows={4}
-              disabled={isSnapshotMode}
-            />
-          </Field>
-
-          {!isSnapshotMode && (
-            <div className="flex justify-end">
-              {isAuthorized("Obligation", "updateObligation") && (
-                <Button
-                  type="submit"
-                  disabled={formState.isSubmitting}
-                >
-                  {formState.isSubmitting ? __("Saving...") : __("Save Changes")}
-                </Button>
-              )}
+                {!isSnapshotMode &&
+                    isAuthorized("Obligation", "deleteObligation") && (
+                        <ActionDropdown>
+                            <DropdownItem
+                                icon={IconTrashCan}
+                                onClick={deleteObligation}
+                            >
+                                {__("Delete")}
+                            </DropdownItem>
+                        </ActionDropdown>
+                    )}
             </div>
-          )}
-        </form>
-      </Card>
-    </div>
-  );
+
+            <Card padded>
+                <form onSubmit={onSubmit} className="space-y-6">
+                    <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+                        <Field
+                            label={__("Area")}
+                            error={formState.errors.area?.message}
+                        >
+                            <Input
+                                {...register("area")}
+                                placeholder={__("Enter area")}
+                                disabled={isSnapshotMode}
+                            />
+                        </Field>
+
+                        <Field
+                            label={__("Source")}
+                            error={formState.errors.source?.message}
+                        >
+                            <Input
+                                {...register("source")}
+                                placeholder={__("Enter source")}
+                                disabled={isSnapshotMode}
+                            />
+                        </Field>
+                    </div>
+
+                    <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+                        <Field label={__("Status")}>
+                            <Controller
+                                control={control}
+                                name="status"
+                                render={({ field }) => (
+                                    <Select
+                                        variant="editor"
+                                        placeholder={__("Select status")}
+                                        onValueChange={field.onChange}
+                                        value={field.value}
+                                        className="w-full"
+                                        disabled={isSnapshotMode}
+                                    >
+                                        {statusOptions.map((option) => (
+                                            <Option
+                                                key={option.value}
+                                                value={option.value}
+                                            >
+                                                {option.label}
+                                            </Option>
+                                        ))}
+                                    </Select>
+                                )}
+                            />
+                            {formState.errors.status && (
+                                <p className="text-sm text-red-500 mt-1">
+                                    {formState.errors.status.message}
+                                </p>
+                            )}
+                        </Field>
+
+                        <Controller
+                            name="ownerId"
+                            control={control}
+                            render={() => (
+                                <PeopleSelectField
+                                    organizationId={organizationId}
+                                    control={control}
+                                    name="ownerId"
+                                    label={__("Owner")}
+                                    error={formState.errors.ownerId?.message}
+                                    required
+                                    disabled={isSnapshotMode}
+                                />
+                            )}
+                        />
+                    </div>
+
+                    <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+                        <Field
+                            label={__("Regulator")}
+                            error={formState.errors.regulator?.message}
+                        >
+                            <Input
+                                {...register("regulator")}
+                                placeholder={__("Enter regulator")}
+                                disabled={isSnapshotMode}
+                            />
+                        </Field>
+
+                        <Field
+                            label={__("Type")}
+                            error={formState.errors.type?.message}
+                        >
+                            <Controller
+                                control={control}
+                                name="type"
+                                render={({ field }) => (
+                                    <Select
+                                        variant="editor"
+                                        placeholder={__("Select type")}
+                                        onValueChange={field.onChange}
+                                        value={field.value}
+                                        className="w-full"
+                                        disabled={isSnapshotMode}
+                                    >
+                                        {typeOptions.map((option) => (
+                                            <Option
+                                                key={option.value}
+                                                value={option.value}
+                                            >
+                                                {option.label}
+                                            </Option>
+                                        ))}
+                                    </Select>
+                                )}
+                            />
+                        </Field>
+                    </div>
+
+                    <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+                        <Field
+                            label={__("Last Review Date")}
+                            error={formState.errors.lastReviewDate?.message}
+                        >
+                            <Input
+                                {...register("lastReviewDate")}
+                                type="date"
+                                disabled={isSnapshotMode}
+                            />
+                        </Field>
+
+                        <Field
+                            label={__("Due Date")}
+                            error={formState.errors.dueDate?.message}
+                        >
+                            <Input
+                                {...register("dueDate")}
+                                type="date"
+                                disabled={isSnapshotMode}
+                            />
+                        </Field>
+                    </div>
+
+                    <Field
+                        label={__("Requirement")}
+                        error={formState.errors.requirement?.message}
+                    >
+                        <Textarea
+                            {...register("requirement")}
+                            placeholder={__("Enter requirement")}
+                            rows={4}
+                            disabled={isSnapshotMode}
+                        />
+                    </Field>
+
+                    <Field
+                        label={__("Actions to be Implemented")}
+                        error={formState.errors.actionsToBeImplemented?.message}
+                    >
+                        <Textarea
+                            {...register("actionsToBeImplemented")}
+                            placeholder={__("Enter actions to be implemented")}
+                            rows={4}
+                            disabled={isSnapshotMode}
+                        />
+                    </Field>
+
+                    {!isSnapshotMode && (
+                        <div className="flex justify-end">
+                            {isAuthorized("Obligation", "updateObligation") && (
+                                <Button
+                                    type="submit"
+                                    disabled={formState.isSubmitting}
+                                >
+                                    {formState.isSubmitting
+                                        ? __("Saving...")
+                                        : __("Save Changes")}
+                                </Button>
+                            )}
+                        </div>
+                    )}
+                </form>
+            </Card>
+        </div>
+    );
 }
diff --git a/apps/console/src/pages/organizations/obligations/ObligationsPage.tsx b/apps/console/src/pages/organizations/obligations/ObligationsPage.tsx
index 03eee5b8a..89ffe5514 100644
--- a/apps/console/src/pages/organizations/obligations/ObligationsPage.tsx
+++ b/apps/console/src/pages/organizations/obligations/ObligationsPage.tsx
@@ -27,18 +27,27 @@ import {
 import { useParams } from "react-router";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import { CreateObligationDialog } from "./dialogs/CreateObligationDialog";
-import { deleteObligationMutation, obligationsQuery } from "../../../hooks/graph/ObligationGraph";
-import { promisifyMutation, getObligationStatusVariant, getObligationStatusLabel, formatDate } from "@probo/helpers";
+import {
+  deleteObligationMutation,
+  obligationsQuery,
+} from "../../../hooks/graph/ObligationGraph";
+import {
+  promisifyMutation,
+  getObligationStatusVariant,
+  getObligationStatusLabel,
+  formatDate,
+} from "@probo/helpers";
 import { SnapshotBanner } from "/components/SnapshotBanner";
 import type {
   ObligationsPageFragment$key,
   ObligationsPageFragment$data,
-} from "./__generated__/ObligationsPageFragment.graphql";
+} from "/__generated__/core/ObligationsPageFragment.graphql";
 import { use } from "react";
 import { PermissionsContext } from "/providers/PermissionsContext";
-import type { ObligationGraphListQuery } from "/hooks/graph/__generated__/ObligationGraphListQuery.graphql";
+import type { ObligationGraphListQuery } from "/__generated__/core/ObligationGraphListQuery.graphql";
 
-type Obligation = ObligationsPageFragment$data['obligations']['edges'][number]['node'];
+type Obligation =
+  ObligationsPageFragment$data["obligations"]["edges"][number]["node"];
 
 interface ObligationsPageProps {
   queryRef: PreloadedQuery<ObligationGraphListQuery>;
@@ -57,8 +66,7 @@ const obligationsPageFragment = graphql`
       first: $first
       after: $after
       filter: { snapshotId: $snapshotId }
-    )
-      @connection(key: "ObligationsPage_obligations", filters: ["filter"]) {
+    ) @connection(key: "ObligationsPage_obligations", filters: ["filter"]) {
       __id
       totalCount
       edges {
@@ -99,23 +107,25 @@ export default function ObligationsPage({ queryRef }: ObligationsPageProps) {
 
   usePageTitle(__("Obligations"));
 
-  const organization = usePreloadedQuery(
-    obligationsQuery,
-    queryRef
-  );
+  const organization = usePreloadedQuery(obligationsQuery, queryRef);
 
-  const { data: obligationsData, loadNext, hasNext } = usePaginationFragment(
+  const {
+    data: obligationsData,
+    loadNext,
+    hasNext,
+  } = usePaginationFragment(
     obligationsPageFragment,
-    organization.node as ObligationsPageFragment$key
+    organization.node as ObligationsPageFragment$key,
   );
 
   const connectionId = obligationsData?.obligations?.__id || "";
-  const obligations: Obligation[] = obligationsData?.obligations?.edges?.map((edge) => edge.node) ?? [];
+  const obligations: Obligation[] =
+    obligationsData?.obligations?.edges?.map((edge) => edge.node) ?? [];
 
-  const hasAnyAction = !isSnapshotMode && (
-    isAuthorized("Obligation", "updateObligation") ||
-    isAuthorized("Obligation", "deleteObligation")
-  );
+  const hasAnyAction =
+    !isSnapshotMode &&
+    (isAuthorized("Obligation", "updateObligation") ||
+      isAuthorized("Obligation", "deleteObligation"));
 
   return (
     <div className="space-y-6">
@@ -124,16 +134,15 @@ export default function ObligationsPage({ queryRef }: ObligationsPageProps) {
       )}
       <PageHeader
         title={__("Obligations")}
-        description={__(
-          "Manage your organization's obligations."
-        )}
+        description={__("Manage your organization's obligations.")}
       >
-        {!snapshotId && (
-          isAuthorized("Organization", "createObligation") && (
-            <CreateObligationDialog organizationId={organizationId} connection={connectionId}>
-              <Button icon={IconPlusLarge}>{__("Add obligation")}</Button>
-            </CreateObligationDialog>
-          )
+        {!snapshotId && isAuthorized("Organization", "createObligation") && (
+          <CreateObligationDialog
+            organizationId={organizationId}
+            connection={connectionId}
+          >
+            <Button icon={IconPlusLarge}>{__("Add obligation")}</Button>
+          </CreateObligationDialog>
         )}
       </PageHeader>
 
@@ -222,9 +231,9 @@ function ObligationRow({
         }),
       {
         message: __(
-          "This will permanently delete this obligation. This action cannot be undone."
+          "This will permanently delete this obligation. This action cannot be undone.",
         ),
-      }
+      },
     );
   };
 
@@ -237,7 +246,11 @@ function ObligationRow({
       <Td>{obligation.area || "-"}</Td>
       <Td>{obligation.source || "-"}</Td>
       <Td>
-        <Badge variant={getObligationStatusVariant(obligation.status || "NON_COMPLIANT")}>
+        <Badge
+          variant={getObligationStatusVariant(
+            obligation.status || "NON_COMPLIANT",
+          )}
+        >
           {getObligationStatusLabel(obligation.status || "NON_COMPLIANT")}
         </Badge>
       </Td>
diff --git a/apps/console/src/pages/organizations/people/PeopleDetailPage.tsx b/apps/console/src/pages/organizations/people/PeopleDetailPage.tsx
index 6f8a9a601..834b280da 100644
--- a/apps/console/src/pages/organizations/people/PeopleDetailPage.tsx
+++ b/apps/console/src/pages/organizations/people/PeopleDetailPage.tsx
@@ -3,7 +3,7 @@ import {
   usePreloadedQuery,
   type PreloadedQuery,
 } from "react-relay";
-import type { PeopleGraphNodeQuery } from "/hooks/graph/__generated__/PeopleGraphNodeQuery.graphql";
+import type { PeopleGraphNodeQuery } from "/__generated__/core/PeopleGraphNodeQuery.graphql";
 import {
   PeopleConnectionKey,
   peopleNodeQuery,
@@ -36,7 +36,7 @@ export default function PeopleDetailPage(props: Props) {
   const { isAuthorized } = use(PermissionsContext);
   const deletePeople = useDeletePeople(
     people,
-    ConnectionHandler.getConnectionID(organizationId, PeopleConnectionKey)
+    ConnectionHandler.getConnectionID(organizationId, PeopleConnectionKey),
   );
 
   return (
diff --git a/apps/console/src/pages/organizations/people/PeopleListPage.tsx b/apps/console/src/pages/organizations/people/PeopleListPage.tsx
index 32a38b795..b83993235 100644
--- a/apps/console/src/pages/organizations/people/PeopleListPage.tsx
+++ b/apps/console/src/pages/organizations/people/PeopleListPage.tsx
@@ -14,11 +14,11 @@ import {
   IconCalendar2,
 } from "@probo/ui";
 import { useTranslate } from "@probo/i18n";
-import type { PeopleGraphPaginatedQuery } from "/hooks/graph/__generated__/PeopleGraphPaginatedQuery.graphql";
+import type { PeopleGraphPaginatedQuery } from "/__generated__/core/PeopleGraphPaginatedQuery.graphql";
 import { type PreloadedQuery } from "react-relay";
 import { useDeletePeople, usePeopleQuery } from "/hooks/graph/PeopleGraph";
 import { SortableTable, SortableTh } from "/components/SortableTable";
-import type { PeopleGraphPaginatedFragment$data } from "/hooks/graph/__generated__/PeopleGraphPaginatedFragment.graphql";
+import type { PeopleGraphPaginatedFragment$data } from "/__generated__/core/PeopleGraphPaginatedFragment.graphql";
 import type { NodeOf } from "/types";
 import { usePageTitle } from "@probo/hooks";
 import { getRole } from "@probo/helpers";
@@ -50,7 +50,8 @@ export default function PeopleListPage({
 
   usePageTitle(__("Members"));
 
-  const hasAnyAction = isAuthorized("People", "updatePeople") ||
+  const hasAnyAction =
+    isAuthorized("People", "updatePeople") ||
     isAuthorized("People", "deletePeople");
 
   return (
@@ -58,7 +59,7 @@ export default function PeopleListPage({
       <PageHeader
         title={__("Members")}
         description={__(
-          "Keep track of your company's workforce and their progress towards completing tasks assigned to them."
+          "Keep track of your company's workforce and their progress towards completing tasks assigned to them.",
         )}
       >
         {isAuthorized("Organization", "createPeople") && (
diff --git a/apps/console/src/pages/organizations/people/tabs/PeopleProfileTab.tsx b/apps/console/src/pages/organizations/people/tabs/PeopleProfileTab.tsx
index bff86930f..50d7a0af8 100644
--- a/apps/console/src/pages/organizations/people/tabs/PeopleProfileTab.tsx
+++ b/apps/console/src/pages/organizations/people/tabs/PeopleProfileTab.tsx
@@ -1,11 +1,11 @@
 import z from "zod";
 import { peopleRoles, formatDatetime } from "@probo/helpers";
 import { useOutletContext } from "react-router";
-import type { PeopleGraphNodeQuery$data } from "/hooks/graph/__generated__/PeopleGraphNodeQuery.graphql";
+import type { PeopleGraphNodeQuery$data } from "/__generated__/core/PeopleGraphNodeQuery.graphql";
 import { useTranslate } from "@probo/i18n";
 import { useFormWithSchema } from "/hooks/useFormWithSchema";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
-import type { PeopleGraphUpdateMutation } from "/hooks/graph/__generated__/PeopleGraphUpdateMutation.graphql";
+import type { PeopleGraphUpdateMutation } from "/__generated__/core/PeopleGraphUpdateMutation.graphql";
 import { updatePeopleMutation } from "/hooks/graph/PeopleGraph";
 import { Button, Card, Field, Input } from "@probo/ui";
 import { EmailsField } from "/components/form/EmailsField";
@@ -19,7 +19,7 @@ const schema = z.object({
   additionalEmailAddresses: z.preprocess(
     // Empty additional emails are skipped
     (v) => (v as string[]).filter((v) => !!v),
-    z.array(z.string().email())
+    z.array(z.string().email()),
   ),
   kind: z.enum(peopleRoles),
   contractStartDate: z.string().optional().nullable(),
@@ -39,8 +39,8 @@ export default function PeopleProfileTab() {
         primaryEmailAddress: people.primaryEmailAddress,
         position: people.position,
         additionalEmailAddresses: [...(people.additionalEmailAddresses ?? [])],
-        contractStartDate: people.contractStartDate?.split('T')[0] || "",
-        contractEndDate: people.contractEndDate?.split('T')[0] || "",
+        contractStartDate: people.contractStartDate?.split("T")[0] || "",
+        contractEndDate: people.contractEndDate?.split("T")[0] || "",
       },
     });
   const [mutate, isMutating] = useMutationWithToasts<PeopleGraphUpdateMutation>(
@@ -48,7 +48,7 @@ export default function PeopleProfileTab() {
     {
       successMessage: __("Member updated successfully."),
       errorMessage: __("Failed to update member"),
-    }
+    },
   );
   const { isAuthorized } = use(PermissionsContext);
   const onSubmit = handleSubmit((data) => {
@@ -95,12 +95,10 @@ export default function PeopleProfileTab() {
         </Field>
       </Card>
       <div className="flex justify-end">
-        {formState.isDirty && (
-          isAuthorized("People", "updatePeople") && (
-            <Button type="submit" disabled={isMutating}>
-              {__("Update")}
-            </Button>
-          )
+        {formState.isDirty && isAuthorized("People", "updatePeople") && (
+          <Button type="submit" disabled={isMutating}>
+            {__("Update")}
+          </Button>
         )}
       </div>
     </form>
diff --git a/apps/console/src/pages/organizations/people/tabs/PeopleRoleTab.tsx b/apps/console/src/pages/organizations/people/tabs/PeopleRoleTab.tsx
index cda2f53af..28afb89c9 100644
--- a/apps/console/src/pages/organizations/people/tabs/PeopleRoleTab.tsx
+++ b/apps/console/src/pages/organizations/people/tabs/PeopleRoleTab.tsx
@@ -6,11 +6,11 @@ import { useFormWithSchema } from "/hooks/useFormWithSchema";
 import { ControlledField } from "/components/form/ControlledField";
 import { Option } from "@probo/ui";
 import { getRoles, peopleRoles } from "@probo/helpers";
-import type { PeopleGraphNodeQuery$data } from "/hooks/graph/__generated__/PeopleGraphNodeQuery.graphql";
+import type { PeopleGraphNodeQuery$data } from "/__generated__/core/PeopleGraphNodeQuery.graphql";
 import { useOutletContext } from "react-router";
 import { updatePeopleMutation } from "/hooks/graph/PeopleGraph";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
-import type { PeopleGraphUpdateMutation } from "/hooks/graph/__generated__/PeopleGraphUpdateMutation.graphql";
+import type { PeopleGraphUpdateMutation } from "/__generated__/core/PeopleGraphUpdateMutation.graphql";
 import { PermissionsContext } from "/providers/PermissionsContext";
 
 const schema = z.object({
@@ -30,14 +30,14 @@ export default function PeopleRoleTab() {
       defaultValues: {
         kind: people.kind,
       },
-    }
+    },
   );
   const [mutate, isMutating] = useMutationWithToasts<PeopleGraphUpdateMutation>(
     updatePeopleMutation,
     {
       successMessage: __("Member updated successfully."),
       errorMessage: __("Failed to update member"),
-    }
+    },
   );
 
   const onSubmit = handleSubmit((data) => {
diff --git a/apps/console/src/pages/organizations/processingActivities/ProcessingActivitiesPage.tsx b/apps/console/src/pages/organizations/processingActivities/ProcessingActivitiesPage.tsx
index e04dc1f42..122bf2d7d 100644
--- a/apps/console/src/pages/organizations/processingActivities/ProcessingActivitiesPage.tsx
+++ b/apps/console/src/pages/organizations/processingActivities/ProcessingActivitiesPage.tsx
@@ -23,7 +23,10 @@ import {
 } from "@probo/ui";
 import { useTranslate } from "@probo/i18n";
 import { usePageTitle } from "@probo/hooks";
-import { getLawfulBasisLabel, getResidualRiskLabel } from "../../../components/form/ProcessingActivityEnumOptions";
+import {
+  getLawfulBasisLabel,
+  getResidualRiskLabel,
+} from "../../../components/form/ProcessingActivityEnumOptions";
 import {
   ConnectionHandler,
   graphql,
@@ -35,26 +38,35 @@ import {
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import { useParams } from "react-router";
 import { CreateProcessingActivityDialog } from "./dialogs/CreateProcessingActivityDialog";
-import { deleteProcessingActivityMutation, ProcessingActivitiesConnectionKey, processingActivitiesQuery } from "../../../hooks/graph/ProcessingActivityGraph";
-import { sprintf, promisifyMutation, downloadFile, toDateInput } from "@probo/helpers";
+import {
+  deleteProcessingActivityMutation,
+  ProcessingActivitiesConnectionKey,
+  processingActivitiesQuery,
+} from "../../../hooks/graph/ProcessingActivityGraph";
+import {
+  sprintf,
+  promisifyMutation,
+  downloadFile,
+  toDateInput,
+} from "@probo/helpers";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
 import { SnapshotBanner } from "/components/SnapshotBanner";
 import type { NodeOf } from "/types";
 import type {
   ProcessingActivitiesPageFragment$key,
   ProcessingActivitiesPageFragment$data,
-} from "./__generated__/ProcessingActivitiesPageFragment.graphql";
+} from "/__generated__/core/ProcessingActivitiesPageFragment.graphql";
 import type {
   ProcessingActivitiesPageDPIAFragment$key,
   ProcessingActivitiesPageDPIAFragment$data,
-} from "./__generated__/ProcessingActivitiesPageDPIAFragment.graphql";
+} from "/__generated__/core/ProcessingActivitiesPageDPIAFragment.graphql";
 import type {
   ProcessingActivitiesPageTIAFragment$key,
   ProcessingActivitiesPageTIAFragment$data,
-} from "./__generated__/ProcessingActivitiesPageTIAFragment.graphql";
+} from "/__generated__/core/ProcessingActivitiesPageTIAFragment.graphql";
 import { PermissionsContext } from "/providers/PermissionsContext";
 import { use, useState } from "react";
-import type { ProcessingActivityGraphListQuery } from "/hooks/graph/__generated__/ProcessingActivityGraphListQuery.graphql";
+import type { ProcessingActivityGraphListQuery } from "/__generated__/core/ProcessingActivityGraphListQuery.graphql";
 
 interface ProcessingActivitiesPageProps {
   queryRef: PreloadedQuery<ProcessingActivityGraphListQuery>;
@@ -74,7 +86,10 @@ const processingActivitiesPageFragment = graphql`
       after: $after
       filter: { snapshotId: $snapshotId }
     )
-      @connection(key: "ProcessingActivitiesPage_processingActivities", filters: ["filter"]) {
+      @connection(
+        key: "ProcessingActivitiesPage_processingActivities"
+        filters: ["filter"]
+      ) {
       __id
       totalCount
       edges {
@@ -115,7 +130,10 @@ const dpiaListPageFragment = graphql`
       after: $after
       filter: { snapshotId: $snapshotId }
     )
-      @connection(key: "ProcessingActivitiesPage_dataProtectionImpactAssessments", filters: ["filter"]) {
+      @connection(
+        key: "ProcessingActivitiesPage_dataProtectionImpactAssessments"
+        filters: ["filter"]
+      ) {
       __id
       totalCount
       edges {
@@ -154,7 +172,10 @@ const tiaListPageFragment = graphql`
       after: $after
       filter: { snapshotId: $snapshotId }
     )
-      @connection(key: "ProcessingActivitiesPage_transferImpactAssessments", filters: ["filter"]) {
+      @connection(
+        key: "ProcessingActivitiesPage_transferImpactAssessments"
+        filters: ["filter"]
+      ) {
       __id
       totalCount
       edges {
@@ -209,20 +230,21 @@ const exportTransferImpactAssessmentsPDFMutation = graphql`
   }
 `;
 
-export default function ProcessingActivitiesPage({ queryRef }: ProcessingActivitiesPageProps) {
+export default function ProcessingActivitiesPage({
+  queryRef,
+}: ProcessingActivitiesPageProps) {
   const { __ } = useTranslate();
   const organizationId = useOrganizationId();
   const { snapshotId } = useParams<{ snapshotId?: string }>();
   const isSnapshotMode = Boolean(snapshotId);
   const { isAuthorized } = use(PermissionsContext);
-  const [activeTab, setActiveTab] = useState<"activities" | "dpia" | "tia">("activities");
+  const [activeTab, setActiveTab] = useState<"activities" | "dpia" | "tia">(
+    "activities",
+  );
 
   usePageTitle(__("Processing Activities"));
 
-  const organization = usePreloadedQuery(
-    processingActivitiesQuery,
-    queryRef
-  );
+  const organization = usePreloadedQuery(processingActivitiesQuery, queryRef);
 
   const {
     data: activitiesData,
@@ -257,18 +279,26 @@ export default function ProcessingActivitiesPage({ queryRef }: ProcessingActivit
   const connectionId = ConnectionHandler.getConnectionID(
     organizationId,
     ProcessingActivitiesConnectionKey,
-    { filter: { snapshotId: snapshotId || null } }
+    { filter: { snapshotId: snapshotId || null } },
   );
-  const activities = activitiesData?.processingActivities?.edges?.map((edge) => edge.node) ?? [];
-  const dpias = dpiaData?.dataProtectionImpactAssessments?.edges?.map((edge) => edge.node) ?? [];
-  const tias = tiaData?.transferImpactAssessments?.edges?.map((edge) => edge.node) ?? [];
+  const activities =
+    activitiesData?.processingActivities?.edges?.map((edge) => edge.node) ?? [];
+  const dpias =
+    dpiaData?.dataProtectionImpactAssessments?.edges?.map(
+      (edge) => edge.node,
+    ) ?? [];
+  const tias =
+    tiaData?.transferImpactAssessments?.edges?.map((edge) => edge.node) ?? [];
 
-  const hasAnyAction = !isSnapshotMode && (
-    isAuthorized("ProcessingActivity", "updateProcessingActivity") ||
-    isAuthorized("ProcessingActivity", "deleteProcessingActivity")
+  const hasAnyAction =
+    !isSnapshotMode &&
+    (isAuthorized("ProcessingActivity", "updateProcessingActivity") ||
+      isAuthorized("ProcessingActivity", "deleteProcessingActivity"));
+
+  const canExportPDF = isAuthorized(
+    "ProcessingActivity",
+    "exportProcessingActivitiesPDF",
   );
-
-  const canExportPDF = isAuthorized("ProcessingActivity", "exportProcessingActivitiesPDF");
   const [exportPDF, isExportingPDF] = useMutationWithToasts<{
     response: {
       exportProcessingActivitiesPDF?: {
@@ -281,13 +311,10 @@ export default function ProcessingActivitiesPage({ queryRef }: ProcessingActivit
         filter: { snapshotId: string } | null;
       };
     };
-  }>(
-    exportProcessingActivitiesPDFMutation,
-    {
-      successMessage: __("PDF download started."),
-      errorMessage: __("Failed to generate PDF"),
-    }
-  );
+  }>(exportProcessingActivitiesPDFMutation, {
+    successMessage: __("PDF download started."),
+    errorMessage: __("Failed to generate PDF"),
+  });
 
   const handleExportPDF = () => {
     exportPDF({
@@ -301,14 +328,17 @@ export default function ProcessingActivitiesPage({ queryRef }: ProcessingActivit
         if (data.exportProcessingActivitiesPDF?.data) {
           downloadFile(
             data.exportProcessingActivitiesPDF.data,
-            `processing-activities-${toDateInput(new Date().toISOString())}.pdf`
+            `processing-activities-${toDateInput(new Date().toISOString())}.pdf`,
           );
         }
       },
     });
   };
 
-  const canExportDPIAPDF = isAuthorized("Organization", "exportDataProtectionImpactAssessmentsPDF");
+  const canExportDPIAPDF = isAuthorized(
+    "Organization",
+    "exportDataProtectionImpactAssessmentsPDF",
+  );
   const [exportDPIAPDF, isExportingDPIAPDF] = useMutationWithToasts<{
     response: {
       exportDataProtectionImpactAssessmentsPDF?: {
@@ -321,13 +351,10 @@ export default function ProcessingActivitiesPage({ queryRef }: ProcessingActivit
         filter: { snapshotId: string } | null;
       };
     };
-  }>(
-    exportDataProtectionImpactAssessmentsPDFMutation,
-    {
-      successMessage: __("PDF download started."),
-      errorMessage: __("Failed to generate PDF"),
-    }
-  );
+  }>(exportDataProtectionImpactAssessmentsPDFMutation, {
+    successMessage: __("PDF download started."),
+    errorMessage: __("Failed to generate PDF"),
+  });
 
   const handleExportDPIAPDF = () => {
     exportDPIAPDF({
@@ -341,14 +368,17 @@ export default function ProcessingActivitiesPage({ queryRef }: ProcessingActivit
         if (data.exportDataProtectionImpactAssessmentsPDF?.data) {
           downloadFile(
             data.exportDataProtectionImpactAssessmentsPDF.data,
-            `data-protection-impact-assessments-${toDateInput(new Date().toISOString())}.pdf`
+            `data-protection-impact-assessments-${toDateInput(new Date().toISOString())}.pdf`,
           );
         }
       },
     });
   };
 
-  const canExportTIAPDF = isAuthorized("Organization", "exportTransferImpactAssessmentsPDF");
+  const canExportTIAPDF = isAuthorized(
+    "Organization",
+    "exportTransferImpactAssessmentsPDF",
+  );
   const [exportTIAPDF, isExportingTIAPDF] = useMutationWithToasts<{
     response: {
       exportTransferImpactAssessmentsPDF?: {
@@ -361,13 +391,10 @@ export default function ProcessingActivitiesPage({ queryRef }: ProcessingActivit
         filter: { snapshotId: string } | null;
       };
     };
-  }>(
-    exportTransferImpactAssessmentsPDFMutation,
-    {
-      successMessage: __("PDF download started."),
-      errorMessage: __("Failed to generate PDF"),
-    }
-  );
+  }>(exportTransferImpactAssessmentsPDFMutation, {
+    successMessage: __("PDF download started."),
+    errorMessage: __("Failed to generate PDF"),
+  });
 
   const handleExportTIAPDF = () => {
     exportTIAPDF({
@@ -381,7 +408,7 @@ export default function ProcessingActivitiesPage({ queryRef }: ProcessingActivit
         if (data.exportTransferImpactAssessmentsPDF?.data) {
           downloadFile(
             data.exportTransferImpactAssessmentsPDF.data,
-            `transfer-impact-assessments-${toDateInput(new Date().toISOString())}.pdf`
+            `transfer-impact-assessments-${toDateInput(new Date().toISOString())}.pdf`,
           );
         }
       },
@@ -393,11 +420,18 @@ export default function ProcessingActivitiesPage({ queryRef }: ProcessingActivit
       {isSnapshotMode && snapshotId && (
         <SnapshotBanner snapshotId={snapshotId} />
       )}
-      <PageHeader title={__("Processing Activities")} description={__("Manage your processing activities under GDPR")}>
+      <PageHeader
+        title={__("Processing Activities")}
+        description={__("Manage your processing activities under GDPR")}
+      >
         {(canExportPDF || canExportDPIAPDF || canExportTIAPDF) && (
           <Dropdown
             toggle={
-              <Button variant="secondary" icon={IconArrowDown} iconAfter={IconChevronDown}>
+              <Button
+                variant="secondary"
+                icon={IconArrowDown}
+                iconAfter={IconChevronDown}
+              >
                 {__("Export")}
               </Button>
             }
@@ -431,7 +465,8 @@ export default function ProcessingActivitiesPage({ queryRef }: ProcessingActivit
             )}
           </Dropdown>
         )}
-        {!isSnapshotMode && activeTab === "activities" && (
+        {!isSnapshotMode &&
+          activeTab === "activities" &&
           isAuthorized("Organization", "createProcessingActivity") && (
             <CreateProcessingActivityDialog
               organizationId={organizationId}
@@ -441,18 +476,26 @@ export default function ProcessingActivitiesPage({ queryRef }: ProcessingActivit
                 {__("Add processing activity")}
               </Button>
             </CreateProcessingActivityDialog>
-          )
-        )}
+          )}
       </PageHeader>
 
       <Tabs>
-        <TabItem active={activeTab === "activities"} onClick={() => setActiveTab("activities")}>
+        <TabItem
+          active={activeTab === "activities"}
+          onClick={() => setActiveTab("activities")}
+        >
           {__("Processing Activities")}
         </TabItem>
-        <TabItem active={activeTab === "dpia"} onClick={() => setActiveTab("dpia")}>
+        <TabItem
+          active={activeTab === "dpia"}
+          onClick={() => setActiveTab("dpia")}
+        >
           {__("Data Protection Impact Assessments")}
         </TabItem>
-        <TabItem active={activeTab === "tia"} onClick={() => setActiveTab("tia")}>
+        <TabItem
+          active={activeTab === "tia"}
+          onClick={() => setActiveTab("tia")}
+        >
           {__("Transfer Impact Assessments")}
         </TabItem>
       </Tabs>
@@ -492,7 +535,9 @@ export default function ProcessingActivitiesPage({ queryRef }: ProcessingActivit
                     onClick={() => loadNextActivities(10)}
                     disabled={isLoadingNextActivities}
                   >
-                    {isLoadingNextActivities ? __("Loading...") : __("Load more")}
+                    {isLoadingNextActivities
+                      ? __("Loading...")
+                      : __("Load more")}
                   </Button>
                 </div>
               )}
@@ -504,7 +549,9 @@ export default function ProcessingActivitiesPage({ queryRef }: ProcessingActivit
                   {__("No processing activities yet")}
                 </h3>
                 <p className="text-txt-tertiary mb-4">
-                  {__("Create your first processing activity to get started with GDPR compliance.")}
+                  {__(
+                    "Create your first processing activity to get started with GDPR compliance.",
+                  )}
                 </p>
               </div>
             </Card>
@@ -551,7 +598,9 @@ export default function ProcessingActivitiesPage({ queryRef }: ProcessingActivit
                   {__("No Data Protection Impact Assessments yet")}
                 </h3>
                 <p className="text-txt-tertiary mb-4">
-                  {__("DPIAs are created from within individual processing activities.")}
+                  {__(
+                    "DPIAs are created from within individual processing activities.",
+                  )}
                 </p>
               </div>
             </Card>
@@ -598,7 +647,9 @@ export default function ProcessingActivitiesPage({ queryRef }: ProcessingActivit
                   {__("No Transfer Impact Assessments yet")}
                 </h3>
                 <p className="text-txt-tertiary mb-4">
-                  {__("TIAs are created from within individual processing activities.")}
+                  {__(
+                    "TIAs are created from within individual processing activities.",
+                  )}
                 </p>
               </div>
             </Card>
@@ -614,7 +665,9 @@ function ActivityRow({
   connectionId,
   hasAnyAction,
 }: {
-  activity: NodeOf<NonNullable<ProcessingActivitiesPageFragment$data['processingActivities']>>;
+  activity: NodeOf<
+    NonNullable<ProcessingActivitiesPageFragment$data["processingActivities"]>
+  >;
   connectionId: string;
   hasAnyAction: boolean;
 }) {
@@ -640,17 +693,18 @@ function ActivityRow({
       {
         message: sprintf(
           __(
-            "This will permanently delete the processing activity %s. This action cannot be undone."
+            "This will permanently delete the processing activity %s. This action cannot be undone.",
           ),
-          activity.name
+          activity.name,
         ),
-      }
+      },
     );
   };
 
-  const activityUrl = isSnapshotMode && snapshotId
-    ? `/organizations/${organizationId}/snapshots/${snapshotId}/processing-activities/${activity.id}`
-    : `/organizations/${organizationId}/processing-activities/${activity.id}`;
+  const activityUrl =
+    isSnapshotMode && snapshotId
+      ? `/organizations/${organizationId}/snapshots/${snapshotId}/processing-activities/${activity.id}`
+      : `/organizations/${organizationId}/processing-activities/${activity.id}`;
 
   return (
     <Tr to={activityUrl}>
@@ -666,7 +720,9 @@ function ActivityRow({
       <Td>{getLawfulBasisLabel(activity.lawfulBasis, __)}</Td>
       <Td>{activity.location || "-"}</Td>
       <Td>
-        <Badge variant={activity.internationalTransfers ? "warning" : "success"}>
+        <Badge
+          variant={activity.internationalTransfers ? "warning" : "success"}
+        >
           {activity.internationalTransfers ? __("Yes") : __("No")}
         </Badge>
       </Td>
@@ -692,16 +748,21 @@ function ActivityRow({
 function DPIARow({
   dpia,
 }: {
-  dpia: NodeOf<NonNullable<ProcessingActivitiesPageDPIAFragment$data['dataProtectionImpactAssessments']>>;
+  dpia: NodeOf<
+    NonNullable<
+      ProcessingActivitiesPageDPIAFragment$data["dataProtectionImpactAssessments"]
+    >
+  >;
 }) {
   const organizationId = useOrganizationId();
   const { __ } = useTranslate();
   const { snapshotId } = useParams<{ snapshotId?: string }>();
   const isSnapshotMode = Boolean(snapshotId);
 
-  const activityUrl = isSnapshotMode && snapshotId
-    ? `/organizations/${organizationId}/snapshots/${snapshotId}/processing-activities/${dpia.processingActivity.id}#dpia`
-    : `/organizations/${organizationId}/processing-activities/${dpia.processingActivity.id}#dpia`;
+  const activityUrl =
+    isSnapshotMode && snapshotId
+      ? `/organizations/${organizationId}/snapshots/${snapshotId}/processing-activities/${dpia.processingActivity.id}#dpia`
+      : `/organizations/${organizationId}/processing-activities/${dpia.processingActivity.id}#dpia`;
 
   return (
     <Tr to={activityUrl}>
@@ -720,10 +781,20 @@ function DPIARow({
       </Td>
       <Td>
         {dpia.residualRisk ? (
-          <Badge variant={dpia.residualRisk === "LOW" ? "success" : dpia.residualRisk === "MEDIUM" ? "warning" : "danger"}>
+          <Badge
+            variant={
+              dpia.residualRisk === "LOW"
+                ? "success"
+                : dpia.residualRisk === "MEDIUM"
+                  ? "warning"
+                  : "danger"
+            }
+          >
             {getResidualRiskLabel(dpia.residualRisk, __)}
           </Badge>
-        ) : "-"}
+        ) : (
+          "-"
+        )}
       </Td>
     </Tr>
   );
@@ -732,15 +803,20 @@ function DPIARow({
 function TIARow({
   tia,
 }: {
-  tia: NodeOf<NonNullable<ProcessingActivitiesPageTIAFragment$data['transferImpactAssessments']>>;
+  tia: NodeOf<
+    NonNullable<
+      ProcessingActivitiesPageTIAFragment$data["transferImpactAssessments"]
+    >
+  >;
 }) {
   const organizationId = useOrganizationId();
   const { snapshotId } = useParams<{ snapshotId?: string }>();
   const isSnapshotMode = Boolean(snapshotId);
 
-  const activityUrl = isSnapshotMode && snapshotId
-    ? `/organizations/${organizationId}/snapshots/${snapshotId}/processing-activities/${tia.processingActivity.id}#tia`
-    : `/organizations/${organizationId}/processing-activities/${tia.processingActivity.id}#tia`;
+  const activityUrl =
+    isSnapshotMode && snapshotId
+      ? `/organizations/${organizationId}/snapshots/${snapshotId}/processing-activities/${tia.processingActivity.id}#tia`
+      : `/organizations/${organizationId}/processing-activities/${tia.processingActivity.id}#tia`;
 
   return (
     <Tr to={activityUrl}>
diff --git a/apps/console/src/pages/organizations/processingActivities/ProcessingActivityDetailsPage.tsx b/apps/console/src/pages/organizations/processingActivities/ProcessingActivityDetailsPage.tsx
index d2182a2b4..d24b34001 100644
--- a/apps/console/src/pages/organizations/processingActivities/ProcessingActivityDetailsPage.tsx
+++ b/apps/console/src/pages/organizations/processingActivities/ProcessingActivityDetailsPage.tsx
@@ -40,7 +40,11 @@ import { useFormWithSchema } from "/hooks/useFormWithSchema";
 import { Controller, useForm } from "react-hook-form";
 import { formatError, type GraphQLError } from "@probo/helpers";
 import z from "zod";
-import { validateSnapshotConsistency, formatDatetime, toDateInput } from "@probo/helpers";
+import {
+  validateSnapshotConsistency,
+  formatDatetime,
+  toDateInput,
+} from "@probo/helpers";
 import { SnapshotBanner } from "/components/SnapshotBanner";
 import { VendorsMultiSelectField } from "/components/form/VendorsMultiSelectField";
 import { PeopleSelectField } from "/components/form/PeopleSelectField";
@@ -53,7 +57,7 @@ import {
   RoleOptions,
 } from "../../../components/form/ProcessingActivityEnumOptions";
 
-import type { ProcessingActivityGraphNodeQuery } from "/hooks/graph/__generated__/ProcessingActivityGraphNodeQuery.graphql";
+import type { ProcessingActivityGraphNodeQuery } from "/__generated__/core/ProcessingActivityGraphNodeQuery.graphql";
 import { use, useState, useEffect } from "react";
 import { PermissionsContext } from "/providers/PermissionsContext";
 
@@ -64,14 +68,24 @@ const updateProcessingActivitySchema = z.object({
   personalDataCategory: z.string().optional(),
   specialOrCriminalData: z.enum(["YES", "NO", "POSSIBLE"] as const),
   consentEvidenceLink: z.string().optional(),
-  lawfulBasis: z.enum(["CONSENT", "CONTRACTUAL_NECESSITY", "LEGAL_OBLIGATION", "LEGITIMATE_INTEREST", "PUBLIC_TASK", "VITAL_INTERESTS"] as const),
+  lawfulBasis: z.enum([
+    "CONSENT",
+    "CONTRACTUAL_NECESSITY",
+    "LEGAL_OBLIGATION",
+    "LEGITIMATE_INTEREST",
+    "PUBLIC_TASK",
+    "VITAL_INTERESTS",
+  ] as const),
   recipients: z.string().optional(),
   location: z.string().optional(),
   internationalTransfers: z.boolean(),
   transferSafeguards: z.string(),
   retentionPeriod: z.string().optional(),
   securityMeasures: z.string().optional(),
-  dataProtectionImpactAssessmentNeeded: z.enum(["NEEDED", "NOT_NEEDED"] as const),
+  dataProtectionImpactAssessmentNeeded: z.enum([
+    "NEEDED",
+    "NOT_NEEDED",
+  ] as const),
   transferImpactAssessmentNeeded: z.enum(["NEEDED", "NOT_NEEDED"] as const),
   lastReviewDate: z.string().optional(),
   nextReviewDate: z.string().optional(),
@@ -85,7 +99,10 @@ type Props = {
 };
 
 export default function ProcessingActivityDetailsPage(props: Props) {
-  const data = usePreloadedQuery<ProcessingActivityGraphNodeQuery>(processingActivityNodeQuery, props.queryRef);
+  const data = usePreloadedQuery<ProcessingActivityGraphNodeQuery>(
+    processingActivityNodeQuery,
+    props.queryRef,
+  );
   const activity = data.node;
   const { __ } = useTranslate();
   const { toast } = useToast();
@@ -101,11 +118,17 @@ export default function ProcessingActivityDetailsPage(props: Props) {
     return "overview";
   };
 
-  const [activeTab, setActiveTab] = useState<"overview" | "dpia" | "tia">(getInitialTab);
+  const [activeTab, setActiveTab] = useState<"overview" | "dpia" | "tia">(
+    getInitialTab,
+  );
   const [dpiaSubmitting, setDpiaSubmitting] = useState(false);
   const [tiaSubmitting, setTiaSubmitting] = useState(false);
-  const [showDpiaForm, setShowDpiaForm] = useState(Boolean(activity?.dataProtectionImpactAssessment?.id));
-  const [showTiaForm, setShowTiaForm] = useState(Boolean(activity?.transferImpactAssessment?.id));
+  const [showDpiaForm, setShowDpiaForm] = useState(
+    Boolean(activity?.dataProtectionImpactAssessment?.id),
+  );
+  const [showTiaForm, setShowTiaForm] = useState(
+    Boolean(activity?.transferImpactAssessment?.id),
+  );
   const [dpiaDeleted, setDpiaDeleted] = useState(false);
   const [tiaDeleted, setTiaDeleted] = useState(false);
 
@@ -132,7 +155,7 @@ export default function ProcessingActivityDetailsPage(props: Props) {
           residualRisk: "",
         });
       },
-    }
+    },
   );
   const createTIA = useCreateTransferImpactAssessment();
   const updateTIA = useUpdateTransferImpactAssessment();
@@ -150,16 +173,19 @@ export default function ProcessingActivityDetailsPage(props: Props) {
           supplementaryMeasures: "",
         });
       },
-    }
+    },
   );
 
   const connectionId = ConnectionHandler.getConnectionID(
     organizationId,
     ProcessingActivitiesConnectionKey,
-    { filter: { snapshotId: snapshotId || null } }
+    { filter: { snapshotId: snapshotId || null } },
   );
 
-  const deleteActivity = useDeleteProcessingActivity({ id: activity.id!, name: activity.name! }, connectionId);
+  const deleteActivity = useDeleteProcessingActivity(
+    { id: activity.id!, name: activity.name! },
+    connectionId,
+  );
 
   const vendors = activity?.vendors?.edges.map((edge) => edge.node) ?? [];
   const vendorIds = vendors.map((vendor) => vendor.id);
@@ -172,33 +198,41 @@ export default function ProcessingActivityDetailsPage(props: Props) {
         purpose: activity.purpose || "",
         dataSubjectCategory: activity.dataSubjectCategory || "",
         personalDataCategory: activity.personalDataCategory || "",
-        specialOrCriminalData: activity.specialOrCriminalData || "NO" as const,
+        specialOrCriminalData:
+          activity.specialOrCriminalData || ("NO" as const),
         consentEvidenceLink: activity.consentEvidenceLink || "",
-        lawfulBasis: activity.lawfulBasis || "LEGITIMATE_INTEREST" as const,
+        lawfulBasis: activity.lawfulBasis || ("LEGITIMATE_INTEREST" as const),
         recipients: activity.recipients || "",
         location: activity.location || "",
         internationalTransfers: activity.internationalTransfers || false,
         transferSafeguards: activity.transferSafeguards || "__NONE__",
         retentionPeriod: activity.retentionPeriod || "",
         securityMeasures: activity.securityMeasures || "",
-        dataProtectionImpactAssessmentNeeded: activity.dataProtectionImpactAssessmentNeeded || "NOT_NEEDED" as const,
-        transferImpactAssessmentNeeded: activity.transferImpactAssessmentNeeded || "NOT_NEEDED" as const,
+        dataProtectionImpactAssessmentNeeded:
+          activity.dataProtectionImpactAssessmentNeeded ||
+          ("NOT_NEEDED" as const),
+        transferImpactAssessmentNeeded:
+          activity.transferImpactAssessmentNeeded || ("NOT_NEEDED" as const),
         lastReviewDate: toDateInput(activity.lastReviewDate),
         nextReviewDate: toDateInput(activity.nextReviewDate),
-        role: activity.role || "CONTROLLER" as const,
+        role: activity.role || ("CONTROLLER" as const),
         dataProtectionOfficerId: activity.dataProtectionOfficer?.id || "",
         vendorIds: vendorIds,
       },
-    }
+    },
   );
 
   const dpiaForm = useForm({
     defaultValues: {
       description: activity?.dataProtectionImpactAssessment?.description || "",
-      necessityAndProportionality: activity?.dataProtectionImpactAssessment?.necessityAndProportionality || "",
-      potentialRisk: activity?.dataProtectionImpactAssessment?.potentialRisk || "",
+      necessityAndProportionality:
+        activity?.dataProtectionImpactAssessment?.necessityAndProportionality ||
+        "",
+      potentialRisk:
+        activity?.dataProtectionImpactAssessment?.potentialRisk || "",
       mitigations: activity?.dataProtectionImpactAssessment?.mitigations || "",
-      residualRisk: (activity?.dataProtectionImpactAssessment?.residualRisk || "") as ProcessingActivityDPIAResidualRisk | "",
+      residualRisk: (activity?.dataProtectionImpactAssessment?.residualRisk ||
+        "") as ProcessingActivityDPIAResidualRisk | "",
     },
   });
 
@@ -208,7 +242,8 @@ export default function ProcessingActivityDetailsPage(props: Props) {
       legalMechanism: activity?.transferImpactAssessment?.legalMechanism || "",
       transfer: activity?.transferImpactAssessment?.transfer || "",
       localLawRisk: activity?.transferImpactAssessment?.localLawRisk || "",
-      supplementaryMeasures: activity?.transferImpactAssessment?.supplementaryMeasures || "",
+      supplementaryMeasures:
+        activity?.transferImpactAssessment?.supplementaryMeasures || "",
     },
   });
 
@@ -226,11 +261,16 @@ export default function ProcessingActivityDetailsPage(props: Props) {
         recipients: formData.recipients || undefined,
         location: formData.location || undefined,
         internationalTransfers: formData.internationalTransfers,
-        transferSafeguards: formData.transferSafeguards === "__NONE__" ? undefined : formData.transferSafeguards || undefined,
+        transferSafeguards:
+          formData.transferSafeguards === "__NONE__"
+            ? undefined
+            : formData.transferSafeguards || undefined,
         retentionPeriod: formData.retentionPeriod || undefined,
         securityMeasures: formData.securityMeasures || undefined,
-        dataProtectionImpactAssessmentNeeded: formData.dataProtectionImpactAssessmentNeeded || undefined,
-        transferImpactAssessmentNeeded: formData.transferImpactAssessmentNeeded || undefined,
+        dataProtectionImpactAssessmentNeeded:
+          formData.dataProtectionImpactAssessmentNeeded || undefined,
+        transferImpactAssessmentNeeded:
+          formData.transferImpactAssessmentNeeded || undefined,
         lastReviewDate: formatDatetime(formData.lastReviewDate) ?? null,
         nextReviewDate: formatDatetime(formData.nextReviewDate) ?? null,
         role: formData.role,
@@ -246,7 +286,10 @@ export default function ProcessingActivityDetailsPage(props: Props) {
     } catch (error) {
       toast({
         title: __("Error"),
-        description: formatError(__("Failed to update processing activity"), error as GraphQLError),
+        description: formatError(
+          __("Failed to update processing activity"),
+          error as GraphQLError,
+        ),
         variant: "error",
       });
     }
@@ -255,16 +298,20 @@ export default function ProcessingActivityDetailsPage(props: Props) {
   const onDPIASubmit = dpiaForm.handleSubmit(async (formData) => {
     setDpiaSubmitting(true);
     try {
-      const isCreating = !activity?.dataProtectionImpactAssessment?.id || dpiaDeleted;
+      const isCreating =
+        !activity?.dataProtectionImpactAssessment?.id || dpiaDeleted;
       if (!isCreating) {
         // Update existing DPIA
         await updateDPIA({
           id: activity.dataProtectionImpactAssessment!.id,
           description: formData.description || undefined,
-          necessityAndProportionality: formData.necessityAndProportionality || undefined,
+          necessityAndProportionality:
+            formData.necessityAndProportionality || undefined,
           potentialRisk: formData.potentialRisk || undefined,
           mitigations: formData.mitigations || undefined,
-          residualRisk: formData.residualRisk as ProcessingActivityDPIAResidualRisk || undefined,
+          residualRisk:
+            (formData.residualRisk as ProcessingActivityDPIAResidualRisk) ||
+            undefined,
         });
         toast({
           title: __("Success"),
@@ -276,10 +323,13 @@ export default function ProcessingActivityDetailsPage(props: Props) {
         await createDPIA({
           processingActivityId: activity.id!,
           description: formData.description || undefined,
-          necessityAndProportionality: formData.necessityAndProportionality || undefined,
+          necessityAndProportionality:
+            formData.necessityAndProportionality || undefined,
           potentialRisk: formData.potentialRisk || undefined,
           mitigations: formData.mitigations || undefined,
-          residualRisk: formData.residualRisk as ProcessingActivityDPIAResidualRisk || undefined,
+          residualRisk:
+            (formData.residualRisk as ProcessingActivityDPIAResidualRisk) ||
+            undefined,
         });
         setDpiaDeleted(false);
         toast({
@@ -291,7 +341,10 @@ export default function ProcessingActivityDetailsPage(props: Props) {
     } catch (error) {
       toast({
         title: __("Error"),
-        description: formatError(__("Failed to save DPIA"), error as GraphQLError),
+        description: formatError(
+          __("Failed to save DPIA"),
+          error as GraphQLError,
+        ),
         variant: "error",
       });
     } finally {
@@ -338,7 +391,10 @@ export default function ProcessingActivityDetailsPage(props: Props) {
     } catch (error) {
       toast({
         title: __("Error"),
-        description: formatError(__("Failed to save TIA"), error as GraphQLError),
+        description: formatError(
+          __("Failed to save TIA"),
+          error as GraphQLError,
+        ),
         variant: "error",
       });
     } finally {
@@ -346,9 +402,10 @@ export default function ProcessingActivityDetailsPage(props: Props) {
     }
   });
 
-  const breadcrumbProcessingActivitiesUrl = isSnapshotMode && snapshotId
-    ? `/organizations/${organizationId}/snapshots/${snapshotId}/processing-activities`
-    : `/organizations/${organizationId}/processing-activities`;
+  const breadcrumbProcessingActivitiesUrl =
+    isSnapshotMode && snapshotId
+      ? `/organizations/${organizationId}/snapshots/${snapshotId}/processing-activities`
+      : `/organizations/${organizationId}/processing-activities`;
 
   return (
     <div className="space-y-6">
@@ -358,19 +415,21 @@ export default function ProcessingActivityDetailsPage(props: Props) {
       <div className="flex items-center justify-between">
         <Breadcrumb
           items={[
-            { label: __("Processing Activities"), to: breadcrumbProcessingActivitiesUrl },
+            {
+              label: __("Processing Activities"),
+              to: breadcrumbProcessingActivitiesUrl,
+            },
             { label: activity.name! },
           ]}
         />
-        {!isSnapshotMode && (
+        {!isSnapshotMode &&
           isAuthorized("ProcessingActivity", "deleteProcessingActivity") && (
             <ActionDropdown>
               <DropdownItem onClick={deleteActivity} variant="danger">
                 {__("Delete")}
               </DropdownItem>
             </ActionDropdown>
-          )
-        )}
+          )}
       </div>
 
       <div className="mb-6">
@@ -378,13 +437,22 @@ export default function ProcessingActivityDetailsPage(props: Props) {
       </div>
 
       <Tabs>
-        <TabItem active={activeTab === "overview"} onClick={() => setActiveTab("overview")}>
+        <TabItem
+          active={activeTab === "overview"}
+          onClick={() => setActiveTab("overview")}
+        >
           {__("Overview")}
         </TabItem>
-        <TabItem active={activeTab === "dpia"} onClick={() => setActiveTab("dpia")}>
+        <TabItem
+          active={activeTab === "dpia"}
+          onClick={() => setActiveTab("dpia")}
+        >
           {__("Data Protection Impact Assessment")}
         </TabItem>
-        <TabItem active={activeTab === "tia"} onClick={() => setActiveTab("tia")}>
+        <TabItem
+          active={activeTab === "tia"}
+          onClick={() => setActiveTab("tia")}
+        >
           {__("Transfer Impact Assessment")}
         </TabItem>
       </Tabs>
@@ -422,7 +490,9 @@ export default function ProcessingActivityDetailsPage(props: Props) {
                       )}
                     />
                     {formState.errors.role && (
-                      <p className="text-sm text-txt-danger mt-1">{formState.errors.role.message}</p>
+                      <p className="text-sm text-txt-danger mt-1">
+                        {formState.errors.role.message}
+                      </p>
                     )}
                   </div>
 
@@ -451,14 +521,18 @@ export default function ProcessingActivityDetailsPage(props: Props) {
                   />
 
                   <div>
-                    <Label htmlFor="specialOrCriminalData">{__("Special or Criminal Data")} *</Label>
+                    <Label htmlFor="specialOrCriminalData">
+                      {__("Special or Criminal Data")} *
+                    </Label>
                     <Controller
                       control={control}
                       name="specialOrCriminalData"
                       render={({ field }) => (
                         <Select
                           id="specialOrCriminalData"
-                          placeholder={__("Select special or criminal data status")}
+                          placeholder={__(
+                            "Select special or criminal data status",
+                          )}
                           onValueChange={field.onChange}
                           value={field.value}
                           className="w-full"
@@ -469,7 +543,9 @@ export default function ProcessingActivityDetailsPage(props: Props) {
                       )}
                     />
                     {formState.errors.specialOrCriminalData && (
-                      <p className="text-sm text-txt-danger mt-1">{formState.errors.specialOrCriminalData.message}</p>
+                      <p className="text-sm text-txt-danger mt-1">
+                        {formState.errors.specialOrCriminalData.message}
+                      </p>
                     )}
                   </div>
 
@@ -499,12 +575,16 @@ export default function ProcessingActivityDetailsPage(props: Props) {
                       )}
                     />
                     {formState.errors.lawfulBasis && (
-                      <p className="text-sm text-txt-danger mt-1">{formState.errors.lawfulBasis.message}</p>
+                      <p className="text-sm text-txt-danger mt-1">
+                        {formState.errors.lawfulBasis.message}
+                      </p>
                     )}
                   </div>
 
                   <div className="space-y-2">
-                    <Label htmlFor="lastReviewDate">{__("Last Review Date")}</Label>
+                    <Label htmlFor="lastReviewDate">
+                      {__("Last Review Date")}
+                    </Label>
                     <Input
                       id="lastReviewDate"
                       type="date"
@@ -514,7 +594,9 @@ export default function ProcessingActivityDetailsPage(props: Props) {
                   </div>
 
                   <div className="space-y-2">
-                    <Label htmlFor="nextReviewDate">{__("Next Review Date")}</Label>
+                    <Label htmlFor="nextReviewDate">
+                      {__("Next Review Date")}
+                    </Label>
                     <Input
                       id="nextReviewDate"
                       type="date"
@@ -559,14 +641,18 @@ export default function ProcessingActivityDetailsPage(props: Props) {
                             onChange={field.onChange}
                             disabled={isSnapshotMode}
                           />
-                          <span>{__("Data is transferred internationally")}</span>
+                          <span>
+                            {__("Data is transferred internationally")}
+                          </span>
                         </div>
                       </div>
                     )}
                   />
 
                   <div>
-                    <Label htmlFor="transferSafeguards">{__("Transfer Safeguards")}</Label>
+                    <Label htmlFor="transferSafeguards">
+                      {__("Transfer Safeguards")}
+                    </Label>
                     <Controller
                       control={control}
                       name="transferSafeguards"
@@ -584,7 +670,9 @@ export default function ProcessingActivityDetailsPage(props: Props) {
                       )}
                     />
                     {formState.errors.transferSafeguards && (
-                      <p className="text-sm text-txt-danger mt-1">{formState.errors.transferSafeguards.message}</p>
+                      <p className="text-sm text-txt-danger mt-1">
+                        {formState.errors.transferSafeguards.message}
+                      </p>
                     )}
                   </div>
 
@@ -606,7 +694,9 @@ export default function ProcessingActivityDetailsPage(props: Props) {
                   </div>
 
                   <div>
-                    <Label htmlFor="dataProtectionImpactAssessmentNeeded">{__("Data Protection Impact Assessment")} *</Label>
+                    <Label htmlFor="dataProtectionImpactAssessmentNeeded">
+                      {__("Data Protection Impact Assessment")} *
+                    </Label>
                     <Controller
                       control={control}
                       name="dataProtectionImpactAssessmentNeeded"
@@ -624,12 +714,19 @@ export default function ProcessingActivityDetailsPage(props: Props) {
                       )}
                     />
                     {formState.errors.dataProtectionImpactAssessmentNeeded && (
-                      <p className="text-sm text-txt-danger mt-1">{formState.errors.dataProtectionImpactAssessmentNeeded.message}</p>
+                      <p className="text-sm text-txt-danger mt-1">
+                        {
+                          formState.errors.dataProtectionImpactAssessmentNeeded
+                            .message
+                        }
+                      </p>
                     )}
                   </div>
 
                   <div>
-                    <Label htmlFor="transferImpactAssessmentNeeded">{__("Transfer Impact Assessment")} *</Label>
+                    <Label htmlFor="transferImpactAssessmentNeeded">
+                      {__("Transfer Impact Assessment")} *
+                    </Label>
                     <Controller
                       control={control}
                       name="transferImpactAssessmentNeeded"
@@ -647,7 +744,12 @@ export default function ProcessingActivityDetailsPage(props: Props) {
                       )}
                     />
                     {formState.errors.transferImpactAssessmentNeeded && (
-                      <p className="text-sm text-txt-danger mt-1">{formState.errors.transferImpactAssessmentNeeded.message}</p>
+                      <p className="text-sm text-txt-danger mt-1">
+                        {
+                          formState.errors.transferImpactAssessmentNeeded
+                            .message
+                        }
+                      </p>
                     )}
                   </div>
                 </div>
@@ -664,13 +766,18 @@ export default function ProcessingActivityDetailsPage(props: Props) {
 
               {!isSnapshotMode && (
                 <div className="flex justify-end pt-4">
-                  {isAuthorized("ProcessingActivity", "updateProcessingActivity") && (
+                  {isAuthorized(
+                    "ProcessingActivity",
+                    "updateProcessingActivity",
+                  ) && (
                     <Button
                       type="submit"
                       variant="primary"
                       disabled={formState.isSubmitting}
                     >
-                      {formState.isSubmitting ? __("Saving...") : __("Save Changes")}
+                      {formState.isSubmitting
+                        ? __("Saving...")
+                        : __("Save Changes")}
                     </Button>
                   )}
                 </div>
@@ -683,79 +790,109 @@ export default function ProcessingActivityDetailsPage(props: Props) {
       {activeTab === "dpia" && (
         <Card>
           <div className="p-6">
-            {!showDpiaForm && (!activity?.dataProtectionImpactAssessment?.id || dpiaDeleted) ? (
+            {!showDpiaForm &&
+            (!activity?.dataProtectionImpactAssessment?.id || dpiaDeleted) ? (
               <div className="flex flex-col items-center justify-center py-16 w-full">
-                <h2 className="text-xl font-semibold mb-6 text-center">{__("Data Protection Impact Assessment")}</h2>
-                {!isSnapshotMode && isAuthorized("ProcessingActivity", "createDataProtectionImpactAssessment") && (
-                  <Button
-                    variant="primary"
-                    onClick={() => setShowDpiaForm(true)}
-                  >
-                    {__("Create DPIA")}
-                  </Button>
-                )}
+                <h2 className="text-xl font-semibold mb-6 text-center">
+                  {__("Data Protection Impact Assessment")}
+                </h2>
+                {!isSnapshotMode &&
+                  isAuthorized(
+                    "ProcessingActivity",
+                    "createDataProtectionImpactAssessment",
+                  ) && (
+                    <Button
+                      variant="primary"
+                      onClick={() => setShowDpiaForm(true)}
+                    >
+                      {__("Create DPIA")}
+                    </Button>
+                  )}
               </div>
             ) : (
               <>
                 <div className="flex items-center justify-between mb-6">
-                  <h2 className="text-xl font-semibold">{__("Data Protection Impact Assessment")}</h2>
-                  {!isSnapshotMode && activity?.dataProtectionImpactAssessment?.id && !dpiaDeleted && isAuthorized("DataProtectionImpactAssessment", "deleteDataProtectionImpactAssessment") && (
-                    <Button
-                      variant="danger"
-                      onClick={deleteDPIA}
-                    >
-                      {__("Delete DPIA")}
-                    </Button>
-                  )}
+                  <h2 className="text-xl font-semibold">
+                    {__("Data Protection Impact Assessment")}
+                  </h2>
+                  {!isSnapshotMode &&
+                    activity?.dataProtectionImpactAssessment?.id &&
+                    !dpiaDeleted &&
+                    isAuthorized(
+                      "DataProtectionImpactAssessment",
+                      "deleteDataProtectionImpactAssessment",
+                    ) && (
+                      <Button variant="danger" onClick={deleteDPIA}>
+                        {__("Delete DPIA")}
+                      </Button>
+                    )}
                 </div>
 
                 <form onSubmit={onDPIASubmit} className="space-y-6">
                   <div>
-                    <Label htmlFor="dpia-description">{__("Description")}</Label>
+                    <Label htmlFor="dpia-description">
+                      {__("Description")}
+                    </Label>
                     <Textarea
                       id="dpia-description"
                       {...dpiaForm.register("description")}
-                      placeholder={__("Describe the processing activity and its purpose")}
+                      placeholder={__(
+                        "Describe the processing activity and its purpose",
+                      )}
                       rows={4}
                       disabled={isSnapshotMode}
                     />
                   </div>
 
                   <div>
-                    <Label htmlFor="dpia-necessity">{__("Necessity and Proportionality")}</Label>
+                    <Label htmlFor="dpia-necessity">
+                      {__("Necessity and Proportionality")}
+                    </Label>
                     <Textarea
                       id="dpia-necessity"
                       {...dpiaForm.register("necessityAndProportionality")}
-                      placeholder={__("Explain why the processing is necessary and proportionate")}
+                      placeholder={__(
+                        "Explain why the processing is necessary and proportionate",
+                      )}
                       rows={4}
                       disabled={isSnapshotMode}
                     />
                   </div>
 
                   <div>
-                    <Label htmlFor="dpia-potential-risk">{__("Potential Risk")}</Label>
+                    <Label htmlFor="dpia-potential-risk">
+                      {__("Potential Risk")}
+                    </Label>
                     <Textarea
                       id="dpia-potential-risk"
                       {...dpiaForm.register("potentialRisk")}
-                      placeholder={__("Describe the potential risks to data subjects")}
+                      placeholder={__(
+                        "Describe the potential risks to data subjects",
+                      )}
                       rows={4}
                       disabled={isSnapshotMode}
                     />
                   </div>
 
                   <div>
-                    <Label htmlFor="dpia-mitigations">{__("Mitigations")}</Label>
+                    <Label htmlFor="dpia-mitigations">
+                      {__("Mitigations")}
+                    </Label>
                     <Textarea
                       id="dpia-mitigations"
                       {...dpiaForm.register("mitigations")}
-                      placeholder={__("Describe measures to mitigate the identified risks")}
+                      placeholder={__(
+                        "Describe measures to mitigate the identified risks",
+                      )}
                       rows={4}
                       disabled={isSnapshotMode}
                     />
                   </div>
 
                   <div>
-                    <Label htmlFor="dpia-residual-risk">{__("Residual Risk")}</Label>
+                    <Label htmlFor="dpia-residual-risk">
+                      {__("Residual Risk")}
+                    </Label>
                     <Controller
                       control={dpiaForm.control}
                       name="residualRisk"
@@ -778,7 +915,8 @@ export default function ProcessingActivityDetailsPage(props: Props) {
 
                   {!isSnapshotMode && (
                     <div className="flex justify-end gap-3 pt-4">
-                      {(!activity?.dataProtectionImpactAssessment?.id || dpiaDeleted) && (
+                      {(!activity?.dataProtectionImpactAssessment?.id ||
+                        dpiaDeleted) && (
                         <Button
                           type="button"
                           variant="secondary"
@@ -787,9 +925,16 @@ export default function ProcessingActivityDetailsPage(props: Props) {
                           {__("Cancel")}
                         </Button>
                       )}
-                      {(activity?.dataProtectionImpactAssessment?.id && !dpiaDeleted
-                        ? isAuthorized("DataProtectionImpactAssessment", "updateDataProtectionImpactAssessment")
-                        : isAuthorized("ProcessingActivity", "createDataProtectionImpactAssessment")) && (
+                      {(activity?.dataProtectionImpactAssessment?.id &&
+                      !dpiaDeleted
+                        ? isAuthorized(
+                            "DataProtectionImpactAssessment",
+                            "updateDataProtectionImpactAssessment",
+                          )
+                        : isAuthorized(
+                            "ProcessingActivity",
+                            "createDataProtectionImpactAssessment",
+                          )) && (
                         <Button
                           type="submit"
                           variant="primary"
@@ -797,9 +942,10 @@ export default function ProcessingActivityDetailsPage(props: Props) {
                         >
                           {dpiaSubmitting
                             ? __("Saving...")
-                            : activity?.dataProtectionImpactAssessment?.id && !dpiaDeleted
-                            ? __("Update DPIA")
-                            : __("Create DPIA")}
+                            : activity?.dataProtectionImpactAssessment?.id &&
+                                !dpiaDeleted
+                              ? __("Update DPIA")
+                              : __("Create DPIA")}
                         </Button>
                       )}
                     </div>
@@ -814,50 +960,70 @@ export default function ProcessingActivityDetailsPage(props: Props) {
       {activeTab === "tia" && (
         <Card>
           <div className="p-6">
-            {!showTiaForm && (!activity?.transferImpactAssessment?.id || tiaDeleted) ? (
+            {!showTiaForm &&
+            (!activity?.transferImpactAssessment?.id || tiaDeleted) ? (
               <div className="flex flex-col items-center justify-center py-16 w-full">
-                <h2 className="text-xl font-semibold mb-6 text-center">{__("Transfer Impact Assessment")}</h2>
-                {!isSnapshotMode && isAuthorized("ProcessingActivity", "createTransferImpactAssessment") && (
-                  <Button
-                    variant="primary"
-                    onClick={() => setShowTiaForm(true)}
-                  >
-                    {__("Create TIA")}
-                  </Button>
-                )}
+                <h2 className="text-xl font-semibold mb-6 text-center">
+                  {__("Transfer Impact Assessment")}
+                </h2>
+                {!isSnapshotMode &&
+                  isAuthorized(
+                    "ProcessingActivity",
+                    "createTransferImpactAssessment",
+                  ) && (
+                    <Button
+                      variant="primary"
+                      onClick={() => setShowTiaForm(true)}
+                    >
+                      {__("Create TIA")}
+                    </Button>
+                  )}
               </div>
             ) : (
               <>
                 <div className="flex items-center justify-between mb-6">
-                  <h2 className="text-xl font-semibold">{__("Transfer Impact Assessment")}</h2>
-                  {!isSnapshotMode && activity?.transferImpactAssessment?.id && !tiaDeleted && isAuthorized("TransferImpactAssessment", "deleteTransferImpactAssessment") && (
-                    <Button
-                      variant="danger"
-                      onClick={deleteTIA}
-                    >
-                      {__("Delete TIA")}
-                    </Button>
-                  )}
+                  <h2 className="text-xl font-semibold">
+                    {__("Transfer Impact Assessment")}
+                  </h2>
+                  {!isSnapshotMode &&
+                    activity?.transferImpactAssessment?.id &&
+                    !tiaDeleted &&
+                    isAuthorized(
+                      "TransferImpactAssessment",
+                      "deleteTransferImpactAssessment",
+                    ) && (
+                      <Button variant="danger" onClick={deleteTIA}>
+                        {__("Delete TIA")}
+                      </Button>
+                    )}
                 </div>
 
                 <form onSubmit={onTIASubmit} className="space-y-6">
                   <div>
-                    <Label htmlFor="tia-data-subjects">{__("Data Subjects")}</Label>
+                    <Label htmlFor="tia-data-subjects">
+                      {__("Data Subjects")}
+                    </Label>
                     <Textarea
                       id="tia-data-subjects"
                       {...tiaForm.register("dataSubjects")}
-                      placeholder={__("Describe the data subjects involved in the transfer")}
+                      placeholder={__(
+                        "Describe the data subjects involved in the transfer",
+                      )}
                       rows={4}
                       disabled={isSnapshotMode}
                     />
                   </div>
 
                   <div>
-                    <Label htmlFor="tia-legal-mechanism">{__("Legal Mechanism")}</Label>
+                    <Label htmlFor="tia-legal-mechanism">
+                      {__("Legal Mechanism")}
+                    </Label>
                     <Textarea
                       id="tia-legal-mechanism"
                       {...tiaForm.register("legalMechanism")}
-                      placeholder={__("Describe the legal mechanism for the transfer (e.g., SCCs, BCRs, adequacy decision)")}
+                      placeholder={__(
+                        "Describe the legal mechanism for the transfer (e.g., SCCs, BCRs, adequacy decision)",
+                      )}
                       rows={4}
                       disabled={isSnapshotMode}
                     />
@@ -868,29 +1034,39 @@ export default function ProcessingActivityDetailsPage(props: Props) {
                     <Textarea
                       id="tia-transfer"
                       {...tiaForm.register("transfer")}
-                      placeholder={__("Describe the nature and details of the data transfer")}
+                      placeholder={__(
+                        "Describe the nature and details of the data transfer",
+                      )}
                       rows={4}
                       disabled={isSnapshotMode}
                     />
                   </div>
 
                   <div>
-                    <Label htmlFor="tia-local-law-risk">{__("Local Law Risk")}</Label>
+                    <Label htmlFor="tia-local-law-risk">
+                      {__("Local Law Risk")}
+                    </Label>
                     <Textarea
                       id="tia-local-law-risk"
                       {...tiaForm.register("localLawRisk")}
-                      placeholder={__("Assess the risks related to the local laws of the destination country")}
+                      placeholder={__(
+                        "Assess the risks related to the local laws of the destination country",
+                      )}
                       rows={4}
                       disabled={isSnapshotMode}
                     />
                   </div>
 
                   <div>
-                    <Label htmlFor="tia-supplementary-measures">{__("Supplementary Measures")}</Label>
+                    <Label htmlFor="tia-supplementary-measures">
+                      {__("Supplementary Measures")}
+                    </Label>
                     <Textarea
                       id="tia-supplementary-measures"
                       {...tiaForm.register("supplementaryMeasures")}
-                      placeholder={__("Describe any supplementary measures taken to ensure adequate protection")}
+                      placeholder={__(
+                        "Describe any supplementary measures taken to ensure adequate protection",
+                      )}
                       rows={4}
                       disabled={isSnapshotMode}
                     />
@@ -898,7 +1074,8 @@ export default function ProcessingActivityDetailsPage(props: Props) {
 
                   {!isSnapshotMode && (
                     <div className="flex justify-end gap-3 pt-4">
-                      {(!activity?.transferImpactAssessment?.id || tiaDeleted) && (
+                      {(!activity?.transferImpactAssessment?.id ||
+                        tiaDeleted) && (
                         <Button
                           type="button"
                           variant="secondary"
@@ -908,8 +1085,14 @@ export default function ProcessingActivityDetailsPage(props: Props) {
                         </Button>
                       )}
                       {(activity?.transferImpactAssessment?.id && !tiaDeleted
-                        ? isAuthorized("TransferImpactAssessment", "updateTransferImpactAssessment")
-                        : isAuthorized("ProcessingActivity", "createTransferImpactAssessment")) && (
+                        ? isAuthorized(
+                            "TransferImpactAssessment",
+                            "updateTransferImpactAssessment",
+                          )
+                        : isAuthorized(
+                            "ProcessingActivity",
+                            "createTransferImpactAssessment",
+                          )) && (
                         <Button
                           type="submit"
                           variant="primary"
@@ -917,9 +1100,10 @@ export default function ProcessingActivityDetailsPage(props: Props) {
                         >
                           {tiaSubmitting
                             ? __("Saving...")
-                            : activity?.transferImpactAssessment?.id && !tiaDeleted
-                            ? __("Update TIA")
-                            : __("Create TIA")}
+                            : activity?.transferImpactAssessment?.id &&
+                                !tiaDeleted
+                              ? __("Update TIA")
+                              : __("Create TIA")}
                         </Button>
                       )}
                     </div>
diff --git a/apps/console/src/pages/organizations/rightsRequests/RightsRequestDetailsPage.tsx b/apps/console/src/pages/organizations/rightsRequests/RightsRequestDetailsPage.tsx
index 7b3124b2f..3af532f0a 100644
--- a/apps/console/src/pages/organizations/rightsRequests/RightsRequestDetailsPage.tsx
+++ b/apps/console/src/pages/organizations/rightsRequests/RightsRequestDetailsPage.tsx
@@ -40,7 +40,7 @@ import {
   getRightsRequestStateOptions,
 } from "@probo/helpers";
 import z from "zod";
-import type { RightsRequestGraphNodeQuery } from "/hooks/graph/__generated__/RightsRequestGraphNodeQuery.graphql";
+import type { RightsRequestGraphNodeQuery } from "/__generated__/core/RightsRequestGraphNodeQuery.graphql";
 import { use } from "react";
 import { PermissionsContext } from "/providers/PermissionsContext";
 
@@ -59,7 +59,10 @@ type Props = {
 };
 
 export default function RightsRequestDetailsPage(props: Props) {
-  const data = usePreloadedQuery<RightsRequestGraphNodeQuery>(rightsRequestNodeQuery, props.queryRef);
+  const data = usePreloadedQuery<RightsRequestGraphNodeQuery>(
+    rightsRequestNodeQuery,
+    props.queryRef,
+  );
   const request = data.node;
   const { __ } = useTranslate();
   const { toast } = useToast();
@@ -70,10 +73,13 @@ export default function RightsRequestDetailsPage(props: Props) {
 
   const connectionId = ConnectionHandler.getConnectionID(
     organizationId,
-    RightsRequestsConnectionKey
+    RightsRequestsConnectionKey,
   );
 
-  const deleteRequest = useDeleteRightsRequest({ id: request.id! }, connectionId);
+  const deleteRequest = useDeleteRightsRequest(
+    { id: request.id! },
+    connectionId,
+  );
 
   const { register, handleSubmit, formState, control } = useFormWithSchema(
     updateRequestSchema,
@@ -87,7 +93,7 @@ export default function RightsRequestDetailsPage(props: Props) {
         deadline: toDateInput(request.deadline),
         actionTaken: request.actionTaken || "",
       },
-    }
+    },
   );
 
   const onSubmit = handleSubmit(async (formData) => {
@@ -111,7 +117,10 @@ export default function RightsRequestDetailsPage(props: Props) {
     } catch (error) {
       toast({
         title: __("Error"),
-        description: formatError(__("Failed to update rights request"), error as GraphQLError),
+        description: formatError(
+          __("Failed to update rights request"),
+          error as GraphQLError,
+        ),
         variant: "error",
       });
     }
@@ -144,9 +153,17 @@ export default function RightsRequestDetailsPage(props: Props) {
         <div className="p-6">
           <div className="mb-6">
             <div className="flex items-center gap-4">
-              <h1 className="text-2xl font-bold">{getRightsRequestTypeLabel(__, request.requestType || "ACCESS")}</h1>
-              <Badge variant="neutral">{getRightsRequestTypeLabel(__, request.requestType || "ACCESS")}</Badge>
-              <Badge variant={getRightsRequestStateVariant(request.requestState || "TODO")}>
+              <h1 className="text-2xl font-bold">
+                {getRightsRequestTypeLabel(__, request.requestType || "ACCESS")}
+              </h1>
+              <Badge variant="neutral">
+                {getRightsRequestTypeLabel(__, request.requestType || "ACCESS")}
+              </Badge>
+              <Badge
+                variant={getRightsRequestStateVariant(
+                  request.requestState || "TODO",
+                )}
+              >
                 {getRightsRequestStateLabel(__, request.requestState || "TODO")}
               </Badge>
             </div>
@@ -160,10 +177,7 @@ export default function RightsRequestDetailsPage(props: Props) {
                 render={({ field }) => (
                   <div>
                     <Label>{__("Request Type")} *</Label>
-                    <Select
-                      value={field.value}
-                      onValueChange={field.onChange}
-                    >
+                    <Select value={field.value} onValueChange={field.onChange}>
                       {typeOptions.map((option) => (
                         <Option key={option.value} value={option.value}>
                           {option.label}
@@ -185,10 +199,7 @@ export default function RightsRequestDetailsPage(props: Props) {
                 render={({ field }) => (
                   <div>
                     <Label>{__("State")} *</Label>
-                    <Select
-                      value={field.value}
-                      onValueChange={field.onChange}
-                    >
+                    <Select value={field.value} onValueChange={field.onChange}>
                       {stateOptions.map((option) => (
                         <Option key={option.value} value={option.value}>
                           {option.label}
@@ -234,10 +245,7 @@ export default function RightsRequestDetailsPage(props: Props) {
             <div className="grid grid-cols-2 gap-4">
               <div>
                 <Label>{__("Deadline")}</Label>
-                <Input
-                  type="date"
-                  {...register("deadline")}
-                />
+                <Input type="date" {...register("deadline")} />
                 {formState.errors.deadline?.message && (
                   <div className="text-red-500 text-sm mt-1">
                     {formState.errors.deadline.message}
@@ -267,7 +275,9 @@ export default function RightsRequestDetailsPage(props: Props) {
                   variant="primary"
                   disabled={formState.isSubmitting}
                 >
-                  {formState.isSubmitting ? __("Saving...") : __("Save Changes")}
+                  {formState.isSubmitting
+                    ? __("Saving...")
+                    : __("Save Changes")}
                 </Button>
               )}
             </div>
diff --git a/apps/console/src/pages/organizations/rightsRequests/RightsRequestsPage.tsx b/apps/console/src/pages/organizations/rightsRequests/RightsRequestsPage.tsx
index c59ea48b7..29dea3cee 100644
--- a/apps/console/src/pages/organizations/rightsRequests/RightsRequestsPage.tsx
+++ b/apps/console/src/pages/organizations/rightsRequests/RightsRequestsPage.tsx
@@ -27,7 +27,11 @@ import {
 } from "react-relay";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import { CreateRightsRequestDialog } from "./dialogs/CreateRightsRequestDialog";
-import { deleteRightsRequestMutation, RightsRequestsConnectionKey, rightsRequestsQuery } from "../../../hooks/graph/RightsRequestGraph";
+import {
+  deleteRightsRequestMutation,
+  RightsRequestsConnectionKey,
+  rightsRequestsQuery,
+} from "../../../hooks/graph/RightsRequestGraph";
 import {
   sprintf,
   promisifyMutation,
@@ -40,10 +44,10 @@ import type { NodeOf } from "/types";
 import type {
   RightsRequestsPageFragment$key,
   RightsRequestsPageFragment$data,
-} from "./__generated__/RightsRequestsPageFragment.graphql";
+} from "/__generated__/core/RightsRequestsPageFragment.graphql";
 import { use } from "react";
 import { PermissionsContext } from "/providers/PermissionsContext";
-import type { RightsRequestGraphListQuery } from "/hooks/graph/__generated__/RightsRequestGraphListQuery.graphql";
+import type { RightsRequestGraphListQuery } from "/__generated__/core/RightsRequestGraphListQuery.graphql";
 
 interface RightsRequestsPageProps {
   queryRef: PreloadedQuery<RightsRequestGraphListQuery>;
@@ -57,10 +61,7 @@ const rightsRequestsPageFragment = graphql`
     after: { type: "CursorKey" }
   ) {
     id
-    rightsRequests(
-      first: $first
-      after: $after
-    )
+    rightsRequests(first: $first, after: $after)
       @connection(key: "RightsRequestsPage_rightsRequests") {
       __id
       totalCount
@@ -86,50 +87,44 @@ const rightsRequestsPageFragment = graphql`
   }
 `;
 
-export default function RightsRequestsPage({ queryRef }: RightsRequestsPageProps) {
+export default function RightsRequestsPage({
+  queryRef,
+}: RightsRequestsPageProps) {
   const { __ } = useTranslate();
   const organizationId = useOrganizationId();
   const { isAuthorized } = use(PermissionsContext);
 
   usePageTitle(__("Rights Requests"));
 
-  const organization = usePreloadedQuery(
-    rightsRequestsQuery,
-    queryRef
-  );
+  const organization = usePreloadedQuery(rightsRequestsQuery, queryRef);
 
-  const {
-    data,
-    loadNext,
-    hasNext,
-    isLoadingNext,
-  } = usePaginationFragment<
+  const { data, loadNext, hasNext, isLoadingNext } = usePaginationFragment<
     RightsRequestGraphListQuery,
     RightsRequestsPageFragment$key
   >(rightsRequestsPageFragment, organization.node);
 
   const connectionId = ConnectionHandler.getConnectionID(
     organizationId,
-    RightsRequestsConnectionKey
+    RightsRequestsConnectionKey,
   );
   const requests = data?.rightsRequests?.edges?.map((edge) => edge.node) ?? [];
 
-  const hasAnyAction = (
+  const hasAnyAction =
     isAuthorized("RightsRequest", "updateRightsRequest") ||
-    isAuthorized("RightsRequest", "deleteRightsRequest")
-  );
+    isAuthorized("RightsRequest", "deleteRightsRequest");
 
   return (
     <div className="space-y-6">
-      <PageHeader title={__("Rights Requests")} description={__("Manage data subject rights requests.")}>
+      <PageHeader
+        title={__("Rights Requests")}
+        description={__("Manage data subject rights requests.")}
+      >
         {isAuthorized("Organization", "createRightsRequest") && (
           <CreateRightsRequestDialog
             organizationId={organizationId}
             connectionId={connectionId}
           >
-            <Button icon={IconPlusLarge}>
-              {__("Add rights request")}
-            </Button>
+            <Button icon={IconPlusLarge}>{__("Add rights request")}</Button>
           </CreateRightsRequestDialog>
         )}
       </PageHeader>
@@ -192,7 +187,9 @@ function RequestRow({
   connectionId,
   hasAnyAction,
 }: {
-  request: NodeOf<NonNullable<RightsRequestsPageFragment$data['rightsRequests']>>;
+  request: NodeOf<
+    NonNullable<RightsRequestsPageFragment$data["rightsRequests"]>
+  >;
   connectionId: string;
   hasAnyAction: boolean;
 }) {
@@ -216,20 +213,21 @@ function RequestRow({
       {
         message: sprintf(
           __(
-            "This will permanently delete the rights request. This action cannot be undone."
-          )
+            "This will permanently delete the rights request. This action cannot be undone.",
+          ),
         ),
-      }
+      },
     );
   };
 
-
   const detailsUrl = `/organizations/${organizationId}/rights-requests/${request.id}`;
 
   return (
     <Tr to={detailsUrl}>
       <Td>
-        <Badge variant="neutral">{getRightsRequestTypeLabel(__, request.requestType)}</Badge>
+        <Badge variant="neutral">
+          {getRightsRequestTypeLabel(__, request.requestType)}
+        </Badge>
       </Td>
       <Td>
         <Badge variant={getRightsRequestStateVariant(request.requestState)}>
diff --git a/apps/console/src/pages/organizations/risks/FormRiskDialog.tsx b/apps/console/src/pages/organizations/risks/FormRiskDialog.tsx
index e9be80ca9..bd94a03dc 100644
--- a/apps/console/src/pages/organizations/risks/FormRiskDialog.tsx
+++ b/apps/console/src/pages/organizations/risks/FormRiskDialog.tsx
@@ -32,8 +32,8 @@ import {
 } from "/hooks/forms/useRiskForm";
 import type { FieldErrors } from "react-hook-form";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
-import type { FormRiskDialogMutation } from "./__generated__/FormRiskDialogMutation.graphql";
-import type { FormRiskDialogUpdateRiskMutation } from "./__generated__/FormRiskDialogUpdateRiskMutation.graphql";
+import type { FormRiskDialogMutation } from "/__generated__/core/FormRiskDialogMutation.graphql";
+import type { FormRiskDialogUpdateRiskMutation } from "/__generated__/core/FormRiskDialogUpdateRiskMutation.graphql";
 import { getRiskImpacts, getRiskLikelihoods } from "@probo/helpers";
 
 type Props = {
@@ -326,19 +326,19 @@ function TemplateSelector({
     "/data/risks/risks.json",
     {
       staleTime: 100_000,
-    }
+    },
   );
 
   const categories = useMemo(
     () => Array.from(new Set(risks?.map((t) => t.category))),
-    [risks]
+    [risks],
   );
 
   const selectedCategory = watch("category");
 
   const templates = useMemo(
     () => risks?.filter((r) => r.category === selectedCategory) ?? [],
-    [risks, selectedCategory]
+    [risks, selectedCategory],
   );
 
   const onTemplateChange = (template: string) => {
diff --git a/apps/console/src/pages/organizations/risks/RiskDetailPage.tsx b/apps/console/src/pages/organizations/risks/RiskDetailPage.tsx
index 7b01e24d8..ed14bad6c 100644
--- a/apps/console/src/pages/organizations/risks/RiskDetailPage.tsx
+++ b/apps/console/src/pages/organizations/risks/RiskDetailPage.tsx
@@ -17,7 +17,11 @@ import {
 } from "@probo/ui";
 import { Outlet, useNavigate, useParams } from "react-router";
 import { useTranslate } from "@probo/i18n";
-import { getTreatment, sprintf, validateSnapshotConsistency } from "@probo/helpers";
+import {
+  getTreatment,
+  sprintf,
+  validateSnapshotConsistency,
+} from "@probo/helpers";
 import { ConnectionHandler } from "relay-runtime";
 import { usePreloadedQuery, type PreloadedQuery } from "react-relay";
 import FormRiskDialog from "./FormRiskDialog";
@@ -28,7 +32,7 @@ import {
   RisksConnectionKey,
   useDeleteRiskMutation,
 } from "/hooks/graph/RiskGraph";
-import type { RiskGraphNodeQuery } from "/hooks/graph/__generated__/RiskGraphNodeQuery.graphql";
+import type { RiskGraphNodeQuery } from "/__generated__/core/RiskGraphNodeQuery.graphql";
 import { SnapshotBanner } from "/components/SnapshotBanner";
 import { use } from "react";
 import { PermissionsContext } from "/providers/PermissionsContext";
@@ -38,7 +42,10 @@ type Props = {
 };
 
 export default function RiskDetailPage(props: Props) {
-  const { riskId, snapshotId } = useParams<{ riskId: string; snapshotId?: string }>();
+  const { riskId, snapshotId } = useParams<{
+    riskId: string;
+    snapshotId?: string;
+  }>();
   const organizationId = useOrganizationId();
   const navigate = useNavigate();
   const isSnapshotMode = Boolean(snapshotId);
@@ -49,7 +56,10 @@ export default function RiskDetailPage(props: Props) {
   }
 
   const { __ } = useTranslate();
-  const data = usePreloadedQuery<RiskGraphNodeQuery>(riskNodeQuery, props.queryRef);
+  const data = usePreloadedQuery<RiskGraphNodeQuery>(
+    riskNodeQuery,
+    props.queryRef,
+  );
   const risk = data.node;
 
   validateSnapshotConsistency(risk, snapshotId);
@@ -62,7 +72,7 @@ export default function RiskDetailPage(props: Props) {
     const connectionId = ConnectionHandler.getConnectionID(
       organizationId,
       RisksConnectionKey,
-      { filter: { snapshotId: snapshotId || null } }
+      { filter: { snapshotId: snapshotId || null } },
     );
     confirm(
       () =>
@@ -73,9 +83,10 @@ export default function RiskDetailPage(props: Props) {
               connections: [connectionId],
             },
             onSuccess() {
-              const risksUrl = isSnapshotMode && snapshotId
-                ? `/organizations/${organizationId}/snapshots/${snapshotId}/risks`
-                : `/organizations/${organizationId}/risks`;
+              const risksUrl =
+                isSnapshotMode && snapshotId
+                  ? `/organizations/${organizationId}/snapshots/${snapshotId}/risks`
+                  : `/organizations/${organizationId}/risks`;
               navigate(risksUrl);
               resolve();
             },
@@ -84,11 +95,11 @@ export default function RiskDetailPage(props: Props) {
       {
         message: sprintf(
           __(
-            'This will permanently delete the risk "%s". This action cannot be undone.'
+            'This will permanently delete the risk "%s". This action cannot be undone.',
           ),
-          risk.name
+          risk.name,
         ),
-      }
+      },
     );
   };
 
@@ -97,13 +108,15 @@ export default function RiskDetailPage(props: Props) {
   const controlsCount = risk.controlsInfo?.totalCount ?? 0;
   const obligationsCount = risk.obligationsInfo?.totalCount ?? 0;
 
-  const risksUrl = isSnapshotMode && snapshotId
-    ? `/organizations/${organizationId}/snapshots/${snapshotId}/risks`
-    : `/organizations/${organizationId}/risks`;
+  const risksUrl =
+    isSnapshotMode && snapshotId
+      ? `/organizations/${organizationId}/snapshots/${snapshotId}/risks`
+      : `/organizations/${organizationId}/risks`;
 
-  const baseTabUrl = isSnapshotMode && snapshotId
-    ? `/organizations/${organizationId}/snapshots/${snapshotId}/risks/${riskId}`
-    : `/organizations/${organizationId}/risks/${riskId}`;
+  const baseTabUrl =
+    isSnapshotMode && snapshotId
+      ? `/organizations/${organizationId}/snapshots/${snapshotId}/risks/${riskId}`
+      : `/organizations/${organizationId}/risks/${riskId}`;
 
   return (
     <div className="space-y-6">
@@ -150,9 +163,7 @@ export default function RiskDetailPage(props: Props) {
 
       <PageHeader title={risk.name} description={risk.description} />
       <Tabs>
-        <TabLink to={`${baseTabUrl}/overview`}>
-          {__("Overview")}
-        </TabLink>
+        <TabLink to={`${baseTabUrl}/overview`}>{__("Overview")}</TabLink>
         {!isSnapshotMode && (
           <>
             <TabLink to={`${baseTabUrl}/measures`}>
diff --git a/apps/console/src/pages/organizations/risks/RisksPage.tsx b/apps/console/src/pages/organizations/risks/RisksPage.tsx
index f28fa9287..bf08863b6 100644
--- a/apps/console/src/pages/organizations/risks/RisksPage.tsx
+++ b/apps/console/src/pages/organizations/risks/RisksPage.tsx
@@ -25,8 +25,8 @@ import type { NodeOf } from "/types";
 import { useDeleteRiskMutation, useRisksQuery } from "/hooks/graph/RiskGraph";
 import { SortableTable, SortableTh } from "/components/SortableTable";
 import type { PreloadedQuery } from "react-relay";
-import type { RiskGraphListQuery } from "/hooks/graph/__generated__/RiskGraphListQuery.graphql";
-import type { RiskGraphFragment$data } from "/hooks/graph/__generated__/RiskGraphFragment.graphql";
+import type { RiskGraphListQuery } from "/__generated__/core/RiskGraphListQuery.graphql";
+import type { RiskGraphFragment$data } from "/__generated__/core/RiskGraphFragment.graphql";
 import { useParams } from "react-router";
 import { SnapshotBanner } from "/components/SnapshotBanner";
 import { use } from "react";
@@ -45,22 +45,35 @@ export default function RisksPage(props: Props) {
 
   const { connectionId, risks, ...pagination } = useRisksQuery(props.queryRef);
 
-  const refetch = ({ order }: { order: { direction: string; field: string } }) => {
-    pagination.refetch({
-      snapshotId,
-      order: {
-        direction: order.direction as "ASC" | "DESC",
-        field: order.field as "NAME" | "CATEGORY" | "TREATMENT" | "INHERENT_RISK_SCORE" | "RESIDUAL_RISK_SCORE" | "OWNER_FULL_NAME" | "CREATED_AT"
-      }
-    }, { fetchPolicy: 'network-only' });
+  const refetch = ({
+    order,
+  }: {
+    order: { direction: string; field: string };
+  }) => {
+    pagination.refetch(
+      {
+        snapshotId,
+        order: {
+          direction: order.direction as "ASC" | "DESC",
+          field: order.field as
+            | "NAME"
+            | "CATEGORY"
+            | "TREATMENT"
+            | "INHERENT_RISK_SCORE"
+            | "RESIDUAL_RISK_SCORE"
+            | "OWNER_FULL_NAME"
+            | "CREATED_AT",
+        },
+      },
+      { fetchPolicy: "network-only" },
+    );
   };
 
   usePageTitle(__("Risks"));
 
-  const hasAnyAction = !isSnapshotMode && (
-    isAuthorized("Risk", "updateRisk") ||
-    isAuthorized("Risk", "deleteRisk")
-  );
+  const hasAnyAction =
+    !isSnapshotMode &&
+    (isAuthorized("Risk", "updateRisk") || isAuthorized("Risk", "deleteRisk"));
 
   return (
     <div className="space-y-6">
@@ -68,19 +81,17 @@ export default function RisksPage(props: Props) {
       <PageHeader
         title={__("Risks")}
         description={__(
-          "Risks are potential threats to your organization. Manage them by identifying, assessing, and implementing mitigation measures."
+          "Risks are potential threats to your organization. Manage them by identifying, assessing, and implementing mitigation measures.",
         )}
       >
-        {!isSnapshotMode && (
-          isAuthorized("Organization", "createRisk") && (
-            <FormRiskDialog
-              connection={connectionId}
-              onSuccess={() => {
-                pagination.refetch({ snapshotId });
-              }}
-              trigger={<Button icon={IconPlusLarge}>{__("New Risk")}</Button>}
-            />
-          )
+        {!isSnapshotMode && isAuthorized("Organization", "createRisk") && (
+          <FormRiskDialog
+            connection={connectionId}
+            onSuccess={() => {
+              pagination.refetch({ snapshotId });
+            }}
+            trigger={<Button icon={IconPlusLarge}>{__("New Risk")}</Button>}
+          />
         )}
       </PageHeader>
 
@@ -108,9 +119,7 @@ export default function RisksPage(props: Props) {
             <SortableTh field="RESIDUAL_RISK_SCORE">
               {__("Residual Risk")}
             </SortableTh>
-            <SortableTh field="OWNER_FULL_NAME">
-              {__("Owner")}
-            </SortableTh>
+            <SortableTh field="OWNER_FULL_NAME">{__("Owner")}</SortableTh>
             {hasAnyAction && <Th></Th>}
           </Tr>
         </Thead>
@@ -160,18 +169,19 @@ function RiskRow(props: RowProps) {
       {
         message: sprintf(
           __(
-            'This will permanently delete the risk "%s". This action cannot be undone.'
+            'This will permanently delete the risk "%s". This action cannot be undone.',
           ),
-          risk.name
+          risk.name,
         ),
-      }
+      },
     );
   };
   const formDialogRef = useDialogRef();
 
-  const riskUrl = isSnapshotMode && snapshotId
-    ? `/organizations/${organizationId}/snapshots/${snapshotId}/risks/${risk.id}/overview`
-    : `/organizations/${organizationId}/risks/${risk.id}/overview`;
+  const riskUrl =
+    isSnapshotMode && snapshotId
+      ? `/organizations/${organizationId}/snapshots/${snapshotId}/risks/${risk.id}/overview`
+      : `/organizations/${organizationId}/risks/${risk.id}/overview`;
 
   return (
     <>
diff --git a/apps/console/src/pages/organizations/risks/tabs/RiskControlsTab.tsx b/apps/console/src/pages/organizations/risks/tabs/RiskControlsTab.tsx
index da043b1ea..d448cf168 100644
--- a/apps/console/src/pages/organizations/risks/tabs/RiskControlsTab.tsx
+++ b/apps/console/src/pages/organizations/risks/tabs/RiskControlsTab.tsx
@@ -3,7 +3,7 @@ import { useOutletContext } from "react-router";
 import { Badge, Tbody, Td, Th, Thead, Tr } from "@probo/ui";
 import { useTranslate } from "@probo/i18n";
 import { useOrganizationId } from "/hooks/useOrganizationId";
-import type { RiskControlsTabFragment$key } from "./__generated__/RiskControlsTabFragment.graphql";
+import type { RiskControlsTabFragment$key } from "/__generated__/core/RiskControlsTabFragment.graphql";
 import { SortableTable, SortableTh } from "/components/SortableTable";
 
 export const controlsFragment = graphql`
diff --git a/apps/console/src/pages/organizations/risks/tabs/RiskDocumentsTab.tsx b/apps/console/src/pages/organizations/risks/tabs/RiskDocumentsTab.tsx
index 1579f3593..6a828091d 100644
--- a/apps/console/src/pages/organizations/risks/tabs/RiskDocumentsTab.tsx
+++ b/apps/console/src/pages/organizations/risks/tabs/RiskDocumentsTab.tsx
@@ -1,7 +1,7 @@
 import { graphql, useFragment } from "react-relay";
 import { useOutletContext } from "react-router";
 import { LinkedDocumentsCard } from "/components/documents/LinkedDocumentsCard";
-import type { RiskDocumentsTabFragment$key } from "./__generated__/RiskDocumentsTabFragment.graphql";
+import type { RiskDocumentsTabFragment$key } from "/__generated__/core/RiskDocumentsTabFragment.graphql";
 import { useMutationWithIncrement } from "/hooks/useMutationWithIncrement";
 import { use } from "react";
 import { PermissionsContext } from "/providers/PermissionsContext";
diff --git a/apps/console/src/pages/organizations/risks/tabs/RiskMeasuresTab.tsx b/apps/console/src/pages/organizations/risks/tabs/RiskMeasuresTab.tsx
index c8d59d08e..e793e0b0e 100644
--- a/apps/console/src/pages/organizations/risks/tabs/RiskMeasuresTab.tsx
+++ b/apps/console/src/pages/organizations/risks/tabs/RiskMeasuresTab.tsx
@@ -1,5 +1,5 @@
 import { graphql, useFragment } from "react-relay";
-import type { RiskMeasuresTabFragment$key } from "./__generated__/RiskMeasuresTabFragment.graphql";
+import type { RiskMeasuresTabFragment$key } from "/__generated__/core/RiskMeasuresTabFragment.graphql";
 import { useOutletContext } from "react-router";
 import { LinkedMeasuresCard } from "/components/measures/LinkedMeasuresCard";
 import { useMutationWithIncrement } from "/hooks/useMutationWithIncrement";
diff --git a/apps/console/src/pages/organizations/risks/tabs/RiskObligationsTab.tsx b/apps/console/src/pages/organizations/risks/tabs/RiskObligationsTab.tsx
index 5164ae377..663f0c6a7 100644
--- a/apps/console/src/pages/organizations/risks/tabs/RiskObligationsTab.tsx
+++ b/apps/console/src/pages/organizations/risks/tabs/RiskObligationsTab.tsx
@@ -1,5 +1,5 @@
 import { graphql, useFragment } from "react-relay";
-import type { RiskObligationsTabFragment$key } from "./__generated__/RiskObligationsTabFragment.graphql";
+import type { RiskObligationsTabFragment$key } from "/__generated__/core/RiskObligationsTabFragment.graphql";
 import { useOutletContext } from "react-router";
 import { LinkedObligationsCard } from "/components/obligations/LinkedObligationsCard";
 import { useMutationWithIncrement } from "/hooks/useMutationWithIncrement";
@@ -58,7 +58,10 @@ export default function RiskObligationsTab() {
   const { isAuthorized } = use(PermissionsContext);
 
   const canLinkObligation = isAuthorized("Risk", "createRiskObligationMapping");
-  const canUnlinkObligation = isAuthorized("Risk", "deleteRiskObligationMapping");
+  const canUnlinkObligation = isAuthorized(
+    "Risk",
+    "deleteRiskObligationMapping",
+  );
   const readOnly = !canLinkObligation && !canUnlinkObligation;
 
   const incrementOptions = {
diff --git a/apps/console/src/pages/organizations/risks/tabs/RiskOverviewTab.tsx b/apps/console/src/pages/organizations/risks/tabs/RiskOverviewTab.tsx
index 19d67c750..4d21db8d2 100644
--- a/apps/console/src/pages/organizations/risks/tabs/RiskOverviewTab.tsx
+++ b/apps/console/src/pages/organizations/risks/tabs/RiskOverviewTab.tsx
@@ -1,7 +1,7 @@
 import { useFragment } from "react-relay";
 import { useOutletContext } from "react-router";
 import { graphql } from "relay-runtime";
-import type { RiskOverviewTabFragment$key } from "./__generated__/RiskOverviewTabFragment.graphql";
+import type { RiskOverviewTabFragment$key } from "/__generated__/core/RiskOverviewTabFragment.graphql";
 import { RiskOverview } from "@probo/ui";
 
 const overviewFragment = graphql`
diff --git a/apps/console/src/pages/organizations/settings/DomainSettingsPage.tsx b/apps/console/src/pages/organizations/settings/DomainSettingsPage.tsx
index adeabd1aa..83dd24260 100644
--- a/apps/console/src/pages/organizations/settings/DomainSettingsPage.tsx
+++ b/apps/console/src/pages/organizations/settings/DomainSettingsPage.tsx
@@ -1,6 +1,6 @@
 import { usePreloadedQuery, type PreloadedQuery } from "react-relay";
 import { graphql } from "relay-runtime";
-import type { DomainSettingsPageQuery } from "./__generated__/DomainSettingsPageQuery.graphql";
+import type { DomainSettingsPageQuery } from "/__generated__/core/DomainSettingsPageQuery.graphql";
 import { useTranslate } from "@probo/i18n";
 import { DomainCard } from "./_components/DomainCard";
 import { NewDomainDialog } from "./_components/NewDomainDialog";
@@ -30,7 +30,7 @@ export function DomainSettingsPage(props: {
 
   const { organization } = usePreloadedQuery<DomainSettingsPageQuery>(
     domainSettingsPageQuery,
-    queryRef
+    queryRef,
   );
   if (organization.__typename !== "Organization") {
     throw new Error("invalid type for node");
@@ -49,7 +49,7 @@ export function DomainSettingsPage(props: {
             </h3>
             <p className="text-txt-tertiary mb-4">
               {__(
-                "Add your own domain to make your trust center more professional"
+                "Add your own domain to make your trust center more professional",
               )}
             </p>
             <div className="flex justify-center">
diff --git a/apps/console/src/pages/organizations/settings/DomainSettingsPageLoader.tsx b/apps/console/src/pages/organizations/settings/DomainSettingsPageLoader.tsx
index 6850d139c..2237ff4ef 100644
--- a/apps/console/src/pages/organizations/settings/DomainSettingsPageLoader.tsx
+++ b/apps/console/src/pages/organizations/settings/DomainSettingsPageLoader.tsx
@@ -6,7 +6,7 @@ import {
 } from "./DomainSettingsPage";
 import { useQueryLoader } from "react-relay";
 import { CoreRelayProvider } from "/providers/CoreRelayProvider";
-import type { DomainSettingsPageQuery } from "./__generated__/DomainSettingsPageQuery.graphql";
+import type { DomainSettingsPageQuery } from "/__generated__/core/DomainSettingsPageQuery.graphql";
 
 function DomainSettingsPageLoader() {
   const organizationId = useOrganizationId();
diff --git a/apps/console/src/pages/organizations/settings/_components/DeleteDomainDialog.tsx b/apps/console/src/pages/organizations/settings/_components/DeleteDomainDialog.tsx
index 00b168050..844c4bd13 100644
--- a/apps/console/src/pages/organizations/settings/_components/DeleteDomainDialog.tsx
+++ b/apps/console/src/pages/organizations/settings/_components/DeleteDomainDialog.tsx
@@ -13,7 +13,7 @@ import { useState, type PropsWithChildren } from "react";
 import { graphql } from "relay-runtime";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
 import { useOrganizationId } from "/hooks/useOrganizationId";
-import type { DeleteDomainDialogMutation } from "./__generated__/DeleteDomainDialogMutation.graphql";
+import type { DeleteDomainDialogMutation } from "/__generated__/core/DeleteDomainDialogMutation.graphql";
 
 const deleteCustomDomainMutation = graphql`
   mutation DeleteDomainDialogMutation($input: DeleteCustomDomainInput!) {
diff --git a/apps/console/src/pages/organizations/settings/_components/DomainCard.tsx b/apps/console/src/pages/organizations/settings/_components/DomainCard.tsx
index 5e422b303..c8a695f09 100644
--- a/apps/console/src/pages/organizations/settings/_components/DomainCard.tsx
+++ b/apps/console/src/pages/organizations/settings/_components/DomainCard.tsx
@@ -7,7 +7,7 @@ import {
 import { useTranslate } from "@probo/i18n";
 import { graphql } from "relay-runtime";
 import { useFragment } from "react-relay";
-import type { DomainCardFragment$key } from "./__generated__/DomainCardFragment.graphql";
+import type { DomainCardFragment$key } from "/__generated__/core/DomainCardFragment.graphql";
 import { DeleteDomainDialog } from "./DeleteDomainDialog";
 
 const fragment = graphql`
diff --git a/apps/console/src/pages/organizations/settings/_components/DomainDialog.tsx b/apps/console/src/pages/organizations/settings/_components/DomainDialog.tsx
index a5abc0672..69cd33545 100644
--- a/apps/console/src/pages/organizations/settings/_components/DomainDialog.tsx
+++ b/apps/console/src/pages/organizations/settings/_components/DomainDialog.tsx
@@ -14,7 +14,7 @@ import {
 import type { PropsWithChildren } from "react";
 import { useFragment } from "react-relay";
 import { graphql } from "relay-runtime";
-import type { DomainDialogFragment$key } from "./__generated__/DomainDialogFragment.graphql";
+import type { DomainDialogFragment$key } from "/__generated__/core/DomainDialogFragment.graphql";
 
 const fragment = graphql`
   fragment DomainDialogFragment on CustomDomain {
diff --git a/apps/console/src/pages/organizations/settings/_components/NewDomainDialog.tsx b/apps/console/src/pages/organizations/settings/_components/NewDomainDialog.tsx
index cd91a4f82..bc93d67e6 100644
--- a/apps/console/src/pages/organizations/settings/_components/NewDomainDialog.tsx
+++ b/apps/console/src/pages/organizations/settings/_components/NewDomainDialog.tsx
@@ -14,7 +14,7 @@ import { useFormWithSchema } from "/hooks/useFormWithSchema";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import type { PropsWithChildren } from "react";
-import type { NewDomainDialogMutation } from "./__generated__/NewDomainDialogMutation.graphql";
+import type { NewDomainDialogMutation } from "/__generated__/core/NewDomainDialogMutation.graphql";
 
 const createCustomDomainMutation = graphql`
   mutation NewDomainDialogMutation($input: CreateCustomDomainInput!) {
diff --git a/apps/console/src/pages/organizations/snapshots/SnapshotDetailPage.tsx b/apps/console/src/pages/organizations/snapshots/SnapshotDetailPage.tsx
index 5faf7705d..94e703ae1 100644
--- a/apps/console/src/pages/organizations/snapshots/SnapshotDetailPage.tsx
+++ b/apps/console/src/pages/organizations/snapshots/SnapshotDetailPage.tsx
@@ -2,7 +2,7 @@ import { useEffect } from "react";
 import { useNavigate, useParams } from "react-router";
 import { usePreloadedQuery, type PreloadedQuery } from "react-relay";
 import { snapshotNodeQuery } from "/hooks/graph/SnapshotGraph";
-import type { SnapshotGraphNodeQuery } from "/hooks/graph/__generated__/SnapshotGraphNodeQuery.graphql";
+import type { SnapshotGraphNodeQuery } from "/__generated__/core/SnapshotGraphNodeQuery.graphql";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import { PageError } from "/components/PageError";
 import { getSnapshotTypeUrlPath } from "@probo/helpers";
@@ -17,7 +17,7 @@ export default function SnapshotDetailPage({ queryRef }: Props) {
   const { snapshotId } = useParams();
   const data = usePreloadedQuery(snapshotNodeQuery, queryRef);
 
-    useEffect(() => {
+  useEffect(() => {
     if (!data.node || !data.node.type) {
       return;
     }
@@ -26,9 +26,12 @@ export default function SnapshotDetailPage({ queryRef }: Props) {
     const snapshotType = snapshot.type;
     const urlPath = getSnapshotTypeUrlPath(snapshotType);
 
-    navigate(`/organizations/${organizationId}/snapshots/${snapshotId}${urlPath}`, {
-      replace: true,
-    });
+    navigate(
+      `/organizations/${organizationId}/snapshots/${snapshotId}${urlPath}`,
+      {
+        replace: true,
+      },
+    );
   }, [data.node, navigate, organizationId, snapshotId]);
 
   if (!data.node || !data.node.type) {
diff --git a/apps/console/src/pages/organizations/snapshots/SnapshotsPage.tsx b/apps/console/src/pages/organizations/snapshots/SnapshotsPage.tsx
index f16f2ffe1..6e11300e0 100644
--- a/apps/console/src/pages/organizations/snapshots/SnapshotsPage.tsx
+++ b/apps/console/src/pages/organizations/snapshots/SnapshotsPage.tsx
@@ -1,11 +1,15 @@
-import type { SnapshotGraphListQuery } from "/hooks/graph/__generated__/SnapshotGraphListQuery.graphql";
+import type { SnapshotGraphListQuery } from "/__generated__/core/SnapshotGraphListQuery.graphql";
 import {
   useFragment,
   usePreloadedQuery,
   type PreloadedQuery,
 } from "react-relay";
 import { useTranslate } from "@probo/i18n";
-import { getSnapshotTypeLabel, getSnapshotTypeUrlPath, formatDate } from "@probo/helpers";
+import {
+  getSnapshotTypeLabel,
+  getSnapshotTypeUrlPath,
+  formatDate,
+} from "@probo/helpers";
 import {
   ActionDropdown,
   Badge,
@@ -21,15 +25,12 @@ import {
   Thead,
   Tr,
 } from "@probo/ui";
-import {
-  snapshotsQuery,
-  useDeleteSnapshot,
-} from "/hooks/graph/SnapshotGraph";
+import { snapshotsQuery, useDeleteSnapshot } from "/hooks/graph/SnapshotGraph";
 import { graphql } from "relay-runtime";
 import type {
   SnapshotsPageFragment$data,
   SnapshotsPageFragment$key,
-} from "./__generated__/SnapshotsPageFragment.graphql";
+} from "/__generated__/core/SnapshotsPageFragment.graphql";
 import type { NodeOf } from "/types";
 import SnapshotFormDialog from "./dialog/SnapshotFormDialog";
 import { usePageTitle } from "@probo/hooks";
@@ -43,7 +44,8 @@ type Props = {
 
 const snapshotsFragment = graphql`
   fragment SnapshotsPageFragment on Organization {
-    snapshots(first: 100) @connection(key: "SnapshotsGraphListQuery__snapshots") {
+    snapshots(first: 100)
+      @connection(key: "SnapshotsGraphListQuery__snapshots") {
       __id
       edges {
         node {
@@ -63,11 +65,11 @@ export default function SnapshotsPage(props: Props) {
   const organizationId = useOrganizationId();
   const organization = usePreloadedQuery(
     snapshotsQuery,
-    props.queryRef
+    props.queryRef,
   ).organization;
   const data = useFragment<SnapshotsPageFragment$key>(
     snapshotsFragment,
-    organization
+    organization,
   );
   const connectionId = data.snapshots.__id;
   const snapshots = data.snapshots.edges.map((edge) => edge.node);
@@ -81,7 +83,7 @@ export default function SnapshotsPage(props: Props) {
       <PageHeader
         title={__("Snapshots")}
         description={__(
-          "Snapshots capture point-in-time views of your organization's compliance state. Create snapshots to track progress over time."
+          "Snapshots capture point-in-time views of your organization's compliance state. Create snapshots to track progress over time.",
         )}
       >
         {isAuthorized("Organization", "createSnapshot") && (
@@ -144,7 +146,9 @@ function SnapshotRow(props: SnapshotRowProps) {
   const typePath = getSnapshotTypeUrlPath(props.snapshot.type);
 
   return (
-    <Tr to={`/organizations/${props.organizationId}/snapshots/${props.snapshot.id}${typePath}`}>
+    <Tr
+      to={`/organizations/${props.organizationId}/snapshots/${props.snapshot.id}${typePath}`}
+    >
       <Td className="font-medium">{props.snapshot.name}</Td>
       <Td>
         <Badge variant="neutral">
diff --git a/apps/console/src/pages/organizations/states-of-applicability/StateOfApplicabilityDetailPage.tsx b/apps/console/src/pages/organizations/states-of-applicability/StateOfApplicabilityDetailPage.tsx
index d3661fa33..ad9f22d13 100644
--- a/apps/console/src/pages/organizations/states-of-applicability/StateOfApplicabilityDetailPage.tsx
+++ b/apps/console/src/pages/organizations/states-of-applicability/StateOfApplicabilityDetailPage.tsx
@@ -1,35 +1,33 @@
 import { useNavigate, useParams } from "react-router";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import {
-  ActionDropdown,
-  Breadcrumb,
-  DropdownItem,
-  IconTrashCan,
-  IconArrowDown,
-  PageHeader,
-  Card,
-  Button,
-  IconPencil,
-  IconCheckmark1,
-  IconCrossLargeX,
-  Input,
+    ActionDropdown,
+    Breadcrumb,
+    DropdownItem,
+    IconTrashCan,
+    IconArrowDown,
+    PageHeader,
+    Card,
+    Button,
+    IconPencil,
+    IconCheckmark1,
+    IconCrossLargeX,
+    Input,
 } from "@probo/ui";
 import { useTranslate } from "@probo/i18n";
 import {
-  ConnectionHandler,
-  graphql,
-  type PreloadedQuery,
-  usePreloadedQuery,
+    ConnectionHandler,
+    graphql,
+    type PreloadedQuery,
+    usePreloadedQuery,
 } from "react-relay";
-import type {
-  StateOfApplicabilityGraphNodeQuery,
-} from "/hooks/graph/__generated__/StateOfApplicabilityGraphNodeQuery.graphql";
-import type { StateOfApplicabilityDetailPageExportMutation } from "./__generated__/StateOfApplicabilityDetailPageExportMutation.graphql";
+import type { StateOfApplicabilityGraphNodeQuery } from "/__generated__/core/StateOfApplicabilityGraphNodeQuery.graphql";
+import type { StateOfApplicabilityDetailPageExportMutation } from "/__generated__/core/StateOfApplicabilityDetailPageExportMutation.graphql";
 import {
-  StateOfApplicabilityConnectionKey,
-  stateOfApplicabilityNodeQuery,
-  useDeleteStateOfApplicability,
-  updateStateOfApplicabilityMutation,
+    StateOfApplicabilityConnectionKey,
+    stateOfApplicabilityNodeQuery,
+    useDeleteStateOfApplicability,
+    updateStateOfApplicabilityMutation,
 } from "/hooks/graph/StateOfApplicabilityGraph";
 import { use, useState, Suspense } from "react";
 import { PermissionsContext } from "/providers/PermissionsContext";
@@ -43,322 +41,361 @@ import { SnapshotBanner } from "/components/SnapshotBanner";
 import { PeopleSelectField } from "/components/form/PeopleSelectField";
 
 const exportStateOfApplicabilityPDFMutation = graphql`
-  mutation StateOfApplicabilityDetailPageExportMutation($input: ExportStateOfApplicabilityPDFInput!) {
-    exportStateOfApplicabilityPDF(input: $input) {
-      data
+    mutation StateOfApplicabilityDetailPageExportMutation(
+        $input: ExportStateOfApplicabilityPDFInput!
+    ) {
+        exportStateOfApplicabilityPDF(input: $input) {
+            data
+        }
     }
-  }
 `;
 
 type Props = {
-  queryRef: PreloadedQuery<StateOfApplicabilityGraphNodeQuery>;
+    queryRef: PreloadedQuery<StateOfApplicabilityGraphNodeQuery>;
 };
 
 export default function StateOfApplicabilityDetailPage(props: Props) {
-  const { stateOfApplicabilityId, snapshotId } = useParams<{ stateOfApplicabilityId: string; snapshotId?: string }>();
-  const organizationId = useOrganizationId();
-  const data = usePreloadedQuery(stateOfApplicabilityNodeQuery, props.queryRef);
-  const stateOfApplicability = data.node;
-  const { __ } = useTranslate();
-  const navigate = useNavigate();
-  const { isAuthorized } = use(PermissionsContext);
-  const isSnapshotMode = Boolean(snapshotId);
-
-  if (!stateOfApplicabilityId || !stateOfApplicability) {
-    throw new Error(
-      "Cannot load state of applicability detail page without stateOfApplicabilityId parameter",
+    const { stateOfApplicabilityId, snapshotId } = useParams<{
+        stateOfApplicabilityId: string;
+        snapshotId?: string;
+    }>();
+    const organizationId = useOrganizationId();
+    const data = usePreloadedQuery(
+        stateOfApplicabilityNodeQuery,
+        props.queryRef,
     );
-  }
+    const stateOfApplicability = data.node;
+    const { __ } = useTranslate();
+    const navigate = useNavigate();
+    const { isAuthorized } = use(PermissionsContext);
+    const isSnapshotMode = Boolean(snapshotId);
 
-  validateSnapshotConsistency(stateOfApplicability, snapshotId);
-
-  const connectionId = ConnectionHandler.getConnectionID(
-    organizationId,
-    StateOfApplicabilityConnectionKey,
-  );
-
-  const deleteStateOfApplicability = useDeleteStateOfApplicability(
-    stateOfApplicability,
-    connectionId,
-    () => navigate(`/organizations/${organizationId}/states-of-applicability`),
-  );
-
-  usePageTitle(stateOfApplicability.name || __("State of Applicability"));
-
-  const [isEditingName, setIsEditingName] = useState(false);
-  const [isEditingOwner, setIsEditingOwner] = useState(false);
-  const [updateStateOfApplicability, isUpdating] = useMutationWithToasts(
-    updateStateOfApplicabilityMutation,
-    {
-      successMessage: __("State of Applicability updated successfully."),
-      errorMessage: __("Failed to update State of Applicability"),
+    if (!stateOfApplicabilityId || !stateOfApplicability) {
+        throw new Error(
+            "Cannot load state of applicability detail page without stateOfApplicabilityId parameter",
+        );
     }
-  );
 
-  const canUpdate = !isSnapshotMode && isAuthorized("StateOfApplicability", "updateStateOfApplicability");
-  const canDelete = !isSnapshotMode && isAuthorized("StateOfApplicability", "deleteStateOfApplicability");
+    validateSnapshotConsistency(stateOfApplicability, snapshotId);
 
-  const [exportStateOfApplicabilityPDF, isExporting] = useMutationWithToasts<StateOfApplicabilityDetailPageExportMutation>(
-    exportStateOfApplicabilityPDFMutation,
-    {
-      successMessage: __("State of Applicability exported successfully."),
-      errorMessage: __("Failed to export State of Applicability"),
-    }
-  );
+    const connectionId = ConnectionHandler.getConnectionID(
+        organizationId,
+        StateOfApplicabilityConnectionKey,
+    );
 
-  const handleExport = () => {
-    if (!stateOfApplicability.id) return;
+    const deleteStateOfApplicability = useDeleteStateOfApplicability(
+        stateOfApplicability,
+        connectionId,
+        () =>
+            navigate(
+                `/organizations/${organizationId}/states-of-applicability`,
+            ),
+    );
 
-    exportStateOfApplicabilityPDF({
-      variables: {
-        input: {
-          stateOfApplicabilityId: stateOfApplicability.id,
+    usePageTitle(stateOfApplicability.name || __("State of Applicability"));
+
+    const [isEditingName, setIsEditingName] = useState(false);
+    const [isEditingOwner, setIsEditingOwner] = useState(false);
+    const [updateStateOfApplicability, isUpdating] = useMutationWithToasts(
+        updateStateOfApplicabilityMutation,
+        {
+            successMessage: __("State of Applicability updated successfully."),
+            errorMessage: __("Failed to update State of Applicability"),
         },
-      },
-      onCompleted: (data) => {
-        if (data.exportStateOfApplicabilityPDF?.data) {
-          const link = window.document.createElement("a");
-          link.href = data.exportStateOfApplicabilityPDF.data;
-          link.download = `${stateOfApplicability.name || "state-of-applicability"}.pdf`;
-          window.document.body.appendChild(link);
-          link.click();
-          window.document.body.removeChild(link);
-        }
-      },
+    );
+
+    const canUpdate =
+        !isSnapshotMode &&
+        isAuthorized("StateOfApplicability", "updateStateOfApplicability");
+    const canDelete =
+        !isSnapshotMode &&
+        isAuthorized("StateOfApplicability", "deleteStateOfApplicability");
+
+    const [exportStateOfApplicabilityPDF, isExporting] =
+        useMutationWithToasts<StateOfApplicabilityDetailPageExportMutation>(
+            exportStateOfApplicabilityPDFMutation,
+            {
+                successMessage: __(
+                    "State of Applicability exported successfully.",
+                ),
+                errorMessage: __("Failed to export State of Applicability"),
+            },
+        );
+
+    const handleExport = () => {
+        if (!stateOfApplicability.id) return;
+
+        exportStateOfApplicabilityPDF({
+            variables: {
+                input: {
+                    stateOfApplicabilityId: stateOfApplicability.id,
+                },
+            },
+            onCompleted: (data) => {
+                if (data.exportStateOfApplicabilityPDF?.data) {
+                    const link = window.document.createElement("a");
+                    link.href = data.exportStateOfApplicabilityPDF.data;
+                    link.download = `${stateOfApplicability.name || "state-of-applicability"}.pdf`;
+                    window.document.body.appendChild(link);
+                    link.click();
+                    window.document.body.removeChild(link);
+                }
+            },
+        });
+    };
+
+    const nameSchema = z.object({
+        name: z.string().min(1, __("Name is required")),
     });
-  };
 
-  const nameSchema = z.object({
-    name: z.string().min(1, __("Name is required")),
-  });
+    const ownerSchema = z.object({
+        ownerId: z.string().min(1, __("Owner is required")),
+    });
 
-  const ownerSchema = z.object({
-    ownerId: z.string().min(1, __("Owner is required")),
-  });
-
-  const { register: registerName, handleSubmit: handleSubmitName, reset: resetName } = useFormWithSchema(
-    nameSchema,
-    {
-      defaultValues: {
-        name: stateOfApplicability.name || "",
-      },
-    }
-  );
-
-  const { control: controlOwner, handleSubmit: handleSubmitOwner, reset: resetOwner } = useFormWithSchema(
-    ownerSchema,
-    {
-      defaultValues: {
-        ownerId: stateOfApplicability.owner?.id || "",
-      },
-    }
-  );
-
-  const handleUpdateName = handleSubmitName((data) => {
-    if (!stateOfApplicability.id) return;
-
-    updateStateOfApplicability({
-      variables: {
-        input: {
-          id: stateOfApplicability.id,
-          name: data.name,
+    const {
+        register: registerName,
+        handleSubmit: handleSubmitName,
+        reset: resetName,
+    } = useFormWithSchema(nameSchema, {
+        defaultValues: {
+            name: stateOfApplicability.name || "",
         },
-      },
-      onSuccess: () => {
+    });
+
+    const {
+        control: controlOwner,
+        handleSubmit: handleSubmitOwner,
+        reset: resetOwner,
+    } = useFormWithSchema(ownerSchema, {
+        defaultValues: {
+            ownerId: stateOfApplicability.owner?.id || "",
+        },
+    });
+
+    const handleUpdateName = handleSubmitName((data) => {
+        if (!stateOfApplicability.id) return;
+
+        updateStateOfApplicability({
+            variables: {
+                input: {
+                    id: stateOfApplicability.id,
+                    name: data.name,
+                },
+            },
+            onSuccess: () => {
+                setIsEditingName(false);
+                resetName({ name: data.name });
+            },
+        });
+    });
+
+    const handleUpdateOwner = handleSubmitOwner((data) => {
+        if (!stateOfApplicability.id) return;
+
+        updateStateOfApplicability({
+            variables: {
+                input: {
+                    id: stateOfApplicability.id,
+                    ownerId: data.ownerId,
+                },
+            },
+            onSuccess: () => {
+                setIsEditingOwner(false);
+                resetOwner({ ownerId: data.ownerId });
+            },
+        });
+    });
+
+    const handleCancelNameEdit = () => {
         setIsEditingName(false);
-        resetName({ name: data.name });
-      },
-    });
-  });
+        resetName({
+            name: stateOfApplicability.name || "",
+        });
+    };
 
-  const handleUpdateOwner = handleSubmitOwner((data) => {
-    if (!stateOfApplicability.id) return;
-
-    updateStateOfApplicability({
-      variables: {
-        input: {
-          id: stateOfApplicability.id,
-          ownerId: data.ownerId,
-        },
-      },
-      onSuccess: () => {
+    const handleCancelOwnerEdit = () => {
         setIsEditingOwner(false);
-        resetOwner({ ownerId: data.ownerId });
-      },
-    });
-  });
+        resetOwner({
+            ownerId: stateOfApplicability.owner?.id || "",
+        });
+    };
 
-  const handleCancelNameEdit = () => {
-    setIsEditingName(false);
-    resetName({
-      name: stateOfApplicability.name || "",
-    });
-  };
+    const listUrl = snapshotId
+        ? `/organizations/${organizationId}/snapshots/${snapshotId}/states-of-applicability`
+        : `/organizations/${organizationId}/states-of-applicability`;
 
-  const handleCancelOwnerEdit = () => {
-    setIsEditingOwner(false);
-    resetOwner({
-      ownerId: stateOfApplicability.owner?.id || "",
-    });
-  };
-
-  const listUrl = snapshotId
-    ? `/organizations/${organizationId}/snapshots/${snapshotId}/states-of-applicability`
-    : `/organizations/${organizationId}/states-of-applicability`;
-
-  return (
-    <div className="space-y-6">
-      {snapshotId && <SnapshotBanner snapshotId={snapshotId} />}
-      <Breadcrumb
-        items={[
-          {
-            label: __("States of Applicability"),
-            to: listUrl,
-          },
-          {
-            label: stateOfApplicability.name || __("State of Applicability detail"),
-          },
-        ]}
-      />
-
-      <PageHeader
-        title={
-          isEditingName && canUpdate ? (
-            <div className="flex items-center gap-2">
-              <Input
-                {...registerName("name")}
-                variant="title"
-                className="flex-1"
-                autoFocus
-                onKeyDown={(e) => {
-                  if (e.key === "Escape") {
-                    handleCancelNameEdit();
-                  }
-                  if (e.key === "Enter" && e.ctrlKey) {
-                    handleUpdateName();
-                  }
-                }}
-              />
-              <Button
-                variant="quaternary"
-                icon={IconCheckmark1}
-                onClick={handleUpdateName}
-                disabled={isUpdating}
-              />
-              <Button
-                variant="quaternary"
-                icon={IconCrossLargeX}
-                onClick={handleCancelNameEdit}
-              />
-            </div>
-          ) : (
-            <div className="flex items-center gap-2">
-              <span>{stateOfApplicability.name || ""}</span>
-              {canUpdate && (
-                <Button
-                  variant="quaternary"
-                  icon={IconPencil}
-                  onClick={() => setIsEditingName(true)}
-                />
-              )}
-            </div>
-          )
-        }
-      >
-        <Button
-          variant="secondary"
-          icon={IconArrowDown}
-          onClick={handleExport}
-          disabled={isExporting}
-        >
-          {__("Export")}
-        </Button>
-        {canDelete && (
-          <ActionDropdown variant="secondary">
-            <DropdownItem variant="danger" icon={IconTrashCan} onClick={deleteStateOfApplicability}>
-              {__("Delete")}
-            </DropdownItem>
-          </ActionDropdown>
-        )}
-      </PageHeader>
-
-      <div className="space-y-6">
-        <div className="space-y-4">
-          <h2 className="text-base font-medium">{__("Details")}</h2>
-          <Card className="space-y-4" padded>
-            <div className="grid grid-cols-2 gap-4">
-              <div>
-                <div className="text-xs text-txt-tertiary font-semibold mb-1">
-                  {__("Owner")}
-                </div>
-                {isEditingOwner && canUpdate ? (
-                  <div className="flex items-center gap-2">
-                    <Suspense fallback={<div>{__("Loading...")}</div>}>
-                      <PeopleSelectField
-                        organizationId={organizationId}
-                        control={controlOwner}
-                        name="ownerId"
-                      />
-                    </Suspense>
-                    <Button
-                      variant="quaternary"
-                      icon={IconCheckmark1}
-                      onClick={handleUpdateOwner}
-                      disabled={isUpdating}
-                    />
-                    <Button
-                      variant="quaternary"
-                      icon={IconCrossLargeX}
-                      onClick={handleCancelOwnerEdit}
-                    />
-                  </div>
-                ) : (
-                  <div className="flex items-center gap-2">
-                    <div className="text-sm text-txt-primary">
-                      {stateOfApplicability.owner?.fullName || "-"}
-                    </div>
-                    {canUpdate && (
-                      <Button
-                        variant="quaternary"
-                        icon={IconPencil}
-                        onClick={() => setIsEditingOwner(true)}
-                      />
-                    )}
-                  </div>
-                )}
-              </div>
-            </div>
-            <div className="grid grid-cols-2 gap-4">
-              <div>
-                <div className="text-xs text-txt-tertiary font-semibold mb-1">
-                  {__("Created at")}
-                </div>
-                <div className="text-sm text-txt-primary">
-                  {formatDate(stateOfApplicability.createdAt)}
-                </div>
-              </div>
-              <div>
-                <div className="text-xs text-txt-tertiary font-semibold mb-1">
-                  {__("Updated at")}
-                </div>
-                <div className="text-sm text-txt-primary">
-                  {formatDate(stateOfApplicability.updatedAt)}
-                </div>
-              </div>
-            </div>
-          </Card>
-        </div>
-
-        {stateOfApplicability.id && (
-          <div className="space-y-4">
-            <h2 className="text-base font-medium">{__("Controls")}</h2>
-            <StateOfApplicabilityControlsTab
-              stateOfApplicability={stateOfApplicability as typeof stateOfApplicability & { id: string }}
-              isSnapshotMode={isSnapshotMode}
+    return (
+        <div className="space-y-6">
+            {snapshotId && <SnapshotBanner snapshotId={snapshotId} />}
+            <Breadcrumb
+                items={[
+                    {
+                        label: __("States of Applicability"),
+                        to: listUrl,
+                    },
+                    {
+                        label:
+                            stateOfApplicability.name ||
+                            __("State of Applicability detail"),
+                    },
+                ]}
             />
-          </div>
-        )}
-      </div>
-    </div>
-  );
+
+            <PageHeader
+                title={
+                    isEditingName && canUpdate ? (
+                        <div className="flex items-center gap-2">
+                            <Input
+                                {...registerName("name")}
+                                variant="title"
+                                className="flex-1"
+                                autoFocus
+                                onKeyDown={(e) => {
+                                    if (e.key === "Escape") {
+                                        handleCancelNameEdit();
+                                    }
+                                    if (e.key === "Enter" && e.ctrlKey) {
+                                        handleUpdateName();
+                                    }
+                                }}
+                            />
+                            <Button
+                                variant="quaternary"
+                                icon={IconCheckmark1}
+                                onClick={handleUpdateName}
+                                disabled={isUpdating}
+                            />
+                            <Button
+                                variant="quaternary"
+                                icon={IconCrossLargeX}
+                                onClick={handleCancelNameEdit}
+                            />
+                        </div>
+                    ) : (
+                        <div className="flex items-center gap-2">
+                            <span>{stateOfApplicability.name || ""}</span>
+                            {canUpdate && (
+                                <Button
+                                    variant="quaternary"
+                                    icon={IconPencil}
+                                    onClick={() => setIsEditingName(true)}
+                                />
+                            )}
+                        </div>
+                    )
+                }
+            >
+                <Button
+                    variant="secondary"
+                    icon={IconArrowDown}
+                    onClick={handleExport}
+                    disabled={isExporting}
+                >
+                    {__("Export")}
+                </Button>
+                {canDelete && (
+                    <ActionDropdown variant="secondary">
+                        <DropdownItem
+                            variant="danger"
+                            icon={IconTrashCan}
+                            onClick={deleteStateOfApplicability}
+                        >
+                            {__("Delete")}
+                        </DropdownItem>
+                    </ActionDropdown>
+                )}
+            </PageHeader>
+
+            <div className="space-y-6">
+                <div className="space-y-4">
+                    <h2 className="text-base font-medium">{__("Details")}</h2>
+                    <Card className="space-y-4" padded>
+                        <div className="grid grid-cols-2 gap-4">
+                            <div>
+                                <div className="text-xs text-txt-tertiary font-semibold mb-1">
+                                    {__("Owner")}
+                                </div>
+                                {isEditingOwner && canUpdate ? (
+                                    <div className="flex items-center gap-2">
+                                        <Suspense
+                                            fallback={
+                                                <div>{__("Loading...")}</div>
+                                            }
+                                        >
+                                            <PeopleSelectField
+                                                organizationId={organizationId}
+                                                control={controlOwner}
+                                                name="ownerId"
+                                            />
+                                        </Suspense>
+                                        <Button
+                                            variant="quaternary"
+                                            icon={IconCheckmark1}
+                                            onClick={handleUpdateOwner}
+                                            disabled={isUpdating}
+                                        />
+                                        <Button
+                                            variant="quaternary"
+                                            icon={IconCrossLargeX}
+                                            onClick={handleCancelOwnerEdit}
+                                        />
+                                    </div>
+                                ) : (
+                                    <div className="flex items-center gap-2">
+                                        <div className="text-sm text-txt-primary">
+                                            {stateOfApplicability.owner
+                                                ?.fullName || "-"}
+                                        </div>
+                                        {canUpdate && (
+                                            <Button
+                                                variant="quaternary"
+                                                icon={IconPencil}
+                                                onClick={() =>
+                                                    setIsEditingOwner(true)
+                                                }
+                                            />
+                                        )}
+                                    </div>
+                                )}
+                            </div>
+                        </div>
+                        <div className="grid grid-cols-2 gap-4">
+                            <div>
+                                <div className="text-xs text-txt-tertiary font-semibold mb-1">
+                                    {__("Created at")}
+                                </div>
+                                <div className="text-sm text-txt-primary">
+                                    {formatDate(stateOfApplicability.createdAt)}
+                                </div>
+                            </div>
+                            <div>
+                                <div className="text-xs text-txt-tertiary font-semibold mb-1">
+                                    {__("Updated at")}
+                                </div>
+                                <div className="text-sm text-txt-primary">
+                                    {formatDate(stateOfApplicability.updatedAt)}
+                                </div>
+                            </div>
+                        </div>
+                    </Card>
+                </div>
+
+                {stateOfApplicability.id && (
+                    <div className="space-y-4">
+                        <h2 className="text-base font-medium">
+                            {__("Controls")}
+                        </h2>
+                        <StateOfApplicabilityControlsTab
+                            stateOfApplicability={
+                                stateOfApplicability as typeof stateOfApplicability & {
+                                    id: string;
+                                }
+                            }
+                            isSnapshotMode={isSnapshotMode}
+                        />
+                    </div>
+                )}
+            </div>
+        </div>
+    );
 }
diff --git a/apps/console/src/pages/organizations/states-of-applicability/StatesOfApplicabilityPage.tsx b/apps/console/src/pages/organizations/states-of-applicability/StatesOfApplicabilityPage.tsx
index 00261dc04..ba617caac 100644
--- a/apps/console/src/pages/organizations/states-of-applicability/StatesOfApplicabilityPage.tsx
+++ b/apps/console/src/pages/organizations/states-of-applicability/StatesOfApplicabilityPage.tsx
@@ -1,26 +1,26 @@
 import {
-  Button,
-  IconPlusLarge,
-  PageHeader,
-  Card,
-  Thead,
-  Tbody,
-  Tr,
-  Th,
-  Td,
-  ActionDropdown,
-  DropdownItem,
-  IconTrashCan,
-  Table,
+    Button,
+    IconPlusLarge,
+    PageHeader,
+    Card,
+    Thead,
+    Tbody,
+    Tr,
+    Th,
+    Td,
+    ActionDropdown,
+    DropdownItem,
+    IconTrashCan,
+    Table,
 } from "@probo/ui";
 import { useTranslate } from "@probo/i18n";
-import type { StateOfApplicabilityGraphPaginatedQuery } from "/hooks/graph/__generated__/StateOfApplicabilityGraphPaginatedQuery.graphql";
+import type { StateOfApplicabilityGraphPaginatedQuery } from "/__generated__/core/StateOfApplicabilityGraphPaginatedQuery.graphql";
 import { type PreloadedQuery } from "react-relay";
 import {
-  useStateOfApplicabilityQuery,
-  useDeleteStateOfApplicability,
+    useStateOfApplicabilityQuery,
+    useDeleteStateOfApplicability,
 } from "/hooks/graph/StateOfApplicabilityGraph";
-import type { StateOfApplicabilityGraphPaginatedFragment$data } from "/hooks/graph/__generated__/StateOfApplicabilityGraphPaginatedFragment.graphql";
+import type { StateOfApplicabilityGraphPaginatedFragment$data } from "/__generated__/core/StateOfApplicabilityGraphPaginatedFragment.graphql";
 import type { NodeOf } from "/types";
 import { usePageTitle } from "@probo/hooks";
 import { CreateStateOfApplicabilityDialog } from "./dialogs/CreateStateOfApplicabilityDialog";
@@ -32,161 +32,175 @@ import { useParams } from "react-router";
 import { SnapshotBanner } from "/components/SnapshotBanner";
 
 type StateOfApplicability = NodeOf<
-  StateOfApplicabilityGraphPaginatedFragment$data["statesOfApplicability"]
+    StateOfApplicabilityGraphPaginatedFragment$data["statesOfApplicability"]
 >;
 
 export default function StatesOfApplicabilityPage({
-  queryRef,
+    queryRef,
 }: {
-  queryRef: PreloadedQuery<StateOfApplicabilityGraphPaginatedQuery>;
+    queryRef: PreloadedQuery<StateOfApplicabilityGraphPaginatedQuery>;
 }) {
-  const { __ } = useTranslate();
-  const { isAuthorized } = use(PermissionsContext);
-  const { snapshotId } = useParams<{ snapshotId?: string }>();
-  const isSnapshotMode = Boolean(snapshotId);
-  const {
-    statesOfApplicability,
-    connectionId,
-    hasNext,
-    loadNext,
-    isLoadingNext,
-    refetch,
-  } = useStateOfApplicabilityQuery(queryRef);
+    const { __ } = useTranslate();
+    const { isAuthorized } = use(PermissionsContext);
+    const { snapshotId } = useParams<{ snapshotId?: string }>();
+    const isSnapshotMode = Boolean(snapshotId);
+    const {
+        statesOfApplicability,
+        connectionId,
+        hasNext,
+        loadNext,
+        isLoadingNext,
+        refetch,
+    } = useStateOfApplicabilityQuery(queryRef);
 
-  usePageTitle(__("States of Applicability"));
+    usePageTitle(__("States of Applicability"));
 
-  // Refetch with snapshot filter when in snapshot mode
-  useEffect(() => {
-    if (snapshotId) {
-      refetch({ filter: { snapshotId } }, { fetchPolicy: 'store-or-network' });
-    }
-  }, [snapshotId, refetch]);
+    // Refetch with snapshot filter when in snapshot mode
+    useEffect(() => {
+        if (snapshotId) {
+            refetch(
+                { filter: { snapshotId } },
+                { fetchPolicy: "store-or-network" },
+            );
+        }
+    }, [snapshotId, refetch]);
 
-  const hasAnyAction = !isSnapshotMode &&
-    isAuthorized("StateOfApplicability", "deleteStateOfApplicability");
+    const hasAnyAction =
+        !isSnapshotMode &&
+        isAuthorized("StateOfApplicability", "deleteStateOfApplicability");
 
-  return (
-    <div className="space-y-6">
-      {snapshotId && <SnapshotBanner snapshotId={snapshotId} />}
-      <PageHeader
-        title={__("States of Applicability")}
-        description={__(
-          "Manage states of applicability for your organization's frameworks.",
-        )}
-      >
-        {!isSnapshotMode && isAuthorized("Organization", "createStateOfApplicability") && (
-          <CreateStateOfApplicabilityDialog connectionId={connectionId}>
-            <Button icon={IconPlusLarge}>
-              {__("Add state of applicability")}
-            </Button>
-          </CreateStateOfApplicabilityDialog>
-        )}
-      </PageHeader>
+    return (
+        <div className="space-y-6">
+            {snapshotId && <SnapshotBanner snapshotId={snapshotId} />}
+            <PageHeader
+                title={__("States of Applicability")}
+                description={__(
+                    "Manage states of applicability for your organization's frameworks.",
+                )}
+            >
+                {!isSnapshotMode &&
+                    isAuthorized(
+                        "Organization",
+                        "createStateOfApplicability",
+                    ) && (
+                        <CreateStateOfApplicabilityDialog
+                            connectionId={connectionId}
+                        >
+                            <Button icon={IconPlusLarge}>
+                                {__("Add state of applicability")}
+                            </Button>
+                        </CreateStateOfApplicabilityDialog>
+                    )}
+            </PageHeader>
 
-      {statesOfApplicability && statesOfApplicability.length > 0 ? (
-        <Card>
-          <Table>
-            <Thead>
-              <Tr>
-                <Th>{__("Name")}</Th>
-                <Th>{__("Created at")}</Th>
-                <Th>{__("Controls")}</Th>
-                {hasAnyAction && <Th>{__("Actions")}</Th>}
-              </Tr>
-            </Thead>
-            <Tbody>
-              {statesOfApplicability.map((soa) => (
-                <StateOfApplicabilityRow
-                  key={soa.id}
-                  stateOfApplicability={soa}
-                  connectionId={connectionId}
-                  hasAnyAction={hasAnyAction}
-                />
-              ))}
-            </Tbody>
-          </Table>
+            {statesOfApplicability && statesOfApplicability.length > 0 ? (
+                <Card>
+                    <Table>
+                        <Thead>
+                            <Tr>
+                                <Th>{__("Name")}</Th>
+                                <Th>{__("Created at")}</Th>
+                                <Th>{__("Controls")}</Th>
+                                {hasAnyAction && <Th>{__("Actions")}</Th>}
+                            </Tr>
+                        </Thead>
+                        <Tbody>
+                            {statesOfApplicability.map((soa) => (
+                                <StateOfApplicabilityRow
+                                    key={soa.id}
+                                    stateOfApplicability={soa}
+                                    connectionId={connectionId}
+                                    hasAnyAction={hasAnyAction}
+                                />
+                            ))}
+                        </Tbody>
+                    </Table>
 
-          {hasNext && (
-            <div className="p-4 border-t">
-              <Button
-                variant="secondary"
-                onClick={() => loadNext(50)}
-                disabled={isLoadingNext}
-              >
-                {isLoadingNext ? __("Loading...") : __("Load more")}
-              </Button>
-            </div>
-          )}
-        </Card>
-      ) : (
-        <Card padded>
-          <div className="text-center py-12">
-            <h3 className="text-lg font-semibold mb-2">
-              {__("No states of applicability yet")}
-            </h3>
-            <p className="text-txt-tertiary mb-4">
-              {__("Create your first state of applicability to get started.")}
-            </p>
-          </div>
-        </Card>
-      )}
-    </div>
-  );
+                    {hasNext && (
+                        <div className="p-4 border-t">
+                            <Button
+                                variant="secondary"
+                                onClick={() => loadNext(50)}
+                                disabled={isLoadingNext}
+                            >
+                                {isLoadingNext
+                                    ? __("Loading...")
+                                    : __("Load more")}
+                            </Button>
+                        </div>
+                    )}
+                </Card>
+            ) : (
+                <Card padded>
+                    <div className="text-center py-12">
+                        <h3 className="text-lg font-semibold mb-2">
+                            {__("No states of applicability yet")}
+                        </h3>
+                        <p className="text-txt-tertiary mb-4">
+                            {__(
+                                "Create your first state of applicability to get started.",
+                            )}
+                        </p>
+                    </div>
+                </Card>
+            )}
+        </div>
+    );
 }
 
 function StateOfApplicabilityRow({
-  stateOfApplicability,
-  connectionId,
-  hasAnyAction,
-}: {
-  stateOfApplicability: StateOfApplicability;
-  connectionId: string;
-  hasAnyAction: boolean;
-}) {
-  const { __ } = useTranslate();
-  const organizationId = useOrganizationId();
-  const { snapshotId } = useParams<{ snapshotId?: string }>();
-  const deleteStateOfApplicability = useDeleteStateOfApplicability(
     stateOfApplicability,
     connectionId,
-  );
-  const { isAuthorized } = use(PermissionsContext);
+    hasAnyAction,
+}: {
+    stateOfApplicability: StateOfApplicability;
+    connectionId: string;
+    hasAnyAction: boolean;
+}) {
+    const { __ } = useTranslate();
+    const organizationId = useOrganizationId();
+    const { snapshotId } = useParams<{ snapshotId?: string }>();
+    const deleteStateOfApplicability = useDeleteStateOfApplicability(
+        stateOfApplicability,
+        connectionId,
+    );
+    const { isAuthorized } = use(PermissionsContext);
 
-  const detailUrl = snapshotId
-    ? `/organizations/${organizationId}/snapshots/${snapshotId}/states-of-applicability/${stateOfApplicability.id}`
-    : `/organizations/${organizationId}/states-of-applicability/${stateOfApplicability.id}`;
+    const detailUrl = snapshotId
+        ? `/organizations/${organizationId}/snapshots/${snapshotId}/states-of-applicability/${stateOfApplicability.id}`
+        : `/organizations/${organizationId}/states-of-applicability/${stateOfApplicability.id}`;
 
-  return (
-    <Tr to={detailUrl}>
-      <Td>{stateOfApplicability.name}</Td>
-      <Td>
-        <time dateTime={stateOfApplicability.createdAt}>
-          {formatDate(stateOfApplicability.createdAt)}
-        </time>
-      </Td>
-      <Td>{stateOfApplicability.controlsInfo?.totalCount ?? 0}</Td>
-      {hasAnyAction && (
-        <Td noLink width={50} className="text-end">
-          <ActionDropdown>
-            {isAuthorized(
-              "StateOfApplicability",
-              "deleteStateOfApplicability",
-            ) && (
-              <DropdownItem
-                icon={IconTrashCan}
-                variant="danger"
-                onSelect={(e) => {
-                  e.preventDefault();
-                  e.stopPropagation();
-                  deleteStateOfApplicability();
-                }}
-              >
-                {__("Delete")}
-              </DropdownItem>
+    return (
+        <Tr to={detailUrl}>
+            <Td>{stateOfApplicability.name}</Td>
+            <Td>
+                <time dateTime={stateOfApplicability.createdAt}>
+                    {formatDate(stateOfApplicability.createdAt)}
+                </time>
+            </Td>
+            <Td>{stateOfApplicability.controlsInfo?.totalCount ?? 0}</Td>
+            {hasAnyAction && (
+                <Td noLink width={50} className="text-end">
+                    <ActionDropdown>
+                        {isAuthorized(
+                            "StateOfApplicability",
+                            "deleteStateOfApplicability",
+                        ) && (
+                            <DropdownItem
+                                icon={IconTrashCan}
+                                variant="danger"
+                                onSelect={(e) => {
+                                    e.preventDefault();
+                                    e.stopPropagation();
+                                    deleteStateOfApplicability();
+                                }}
+                            >
+                                {__("Delete")}
+                            </DropdownItem>
+                        )}
+                    </ActionDropdown>
+                </Td>
             )}
-          </ActionDropdown>
-        </Td>
-      )}
-    </Tr>
-  );
+        </Tr>
+    );
 }
diff --git a/apps/console/src/pages/organizations/states-of-applicability/dialogs/CreateStateOfApplicabilityDialog.tsx b/apps/console/src/pages/organizations/states-of-applicability/dialogs/CreateStateOfApplicabilityDialog.tsx
index d898c99e3..cefc19d37 100644
--- a/apps/console/src/pages/organizations/states-of-applicability/dialogs/CreateStateOfApplicabilityDialog.tsx
+++ b/apps/console/src/pages/organizations/states-of-applicability/dialogs/CreateStateOfApplicabilityDialog.tsx
@@ -1,12 +1,12 @@
 import { useTranslate } from "@probo/i18n";
 import {
-  Breadcrumb,
-  Button,
-  Dialog,
-  DialogContent,
-  DialogFooter,
-  Field,
-  useDialogRef,
+    Breadcrumb,
+    Button,
+    Dialog,
+    DialogContent,
+    DialogFooter,
+    Field,
+    useDialogRef,
 } from "@probo/ui";
 import type { ReactNode } from "react";
 import { useNavigate } from "react-router";
@@ -15,96 +15,109 @@ import z from "zod";
 import { useFormWithSchema } from "/hooks/useFormWithSchema";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
 import { createStateOfApplicabilityMutation } from "/hooks/graph/StateOfApplicabilityGraph";
-import type { StateOfApplicabilityGraphCreateMutation } from "/hooks/graph/__generated__/StateOfApplicabilityGraphCreateMutation.graphql";
+import type { StateOfApplicabilityGraphCreateMutation } from "/__generated__/core/StateOfApplicabilityGraphCreateMutation.graphql";
 import { PeopleSelectField } from "/components/form/PeopleSelectField";
 import { Suspense } from "react";
 
 type Props = {
-  children: ReactNode;
-  connectionId: string;
+    children: ReactNode;
+    connectionId: string;
 };
 
 const schema = z.object({
-  name: z.string().min(1),
-  ownerId: z.string().min(1),
+    name: z.string().min(1),
+    ownerId: z.string().min(1),
 });
 
 export function CreateStateOfApplicabilityDialog({
-  children,
-  connectionId,
+    children,
+    connectionId,
 }: Props) {
-  const { __ } = useTranslate();
-  const organizationId = useOrganizationId();
-  const navigate = useNavigate();
-  const { control, register, handleSubmit, reset } = useFormWithSchema(schema, {
-    defaultValues: {
-      name: "",
-      ownerId: "",
-    },
-  });
-  const ref = useDialogRef();
-
-  const [mutate, isMutating] = useMutationWithToasts<StateOfApplicabilityGraphCreateMutation>(
-    createStateOfApplicabilityMutation,
-    {
-      successMessage: __("State of applicability created successfully."),
-      errorMessage: __("Failed to create state of applicability"),
-    },
-  );
-
-  const onSubmit = handleSubmit((data) => {
-    mutate({
-      variables: {
-        input: {
-          name: data.name,
-          organizationId,
-          ownerId: data.ownerId,
+    const { __ } = useTranslate();
+    const organizationId = useOrganizationId();
+    const navigate = useNavigate();
+    const { control, register, handleSubmit, reset } = useFormWithSchema(
+        schema,
+        {
+            defaultValues: {
+                name: "",
+                ownerId: "",
+            },
         },
-        connections: [connectionId],
-      },
-      onCompleted: (response) => {
-        reset();
-        ref.current?.close();
-        const stateOfApplicabilityId = response.createStateOfApplicability.stateOfApplicabilityEdge.node.id;
-        navigate(`/organizations/${organizationId}/states-of-applicability/${stateOfApplicabilityId}`);
-      },
-    });
-  });
+    );
+    const ref = useDialogRef();
 
-  return (
-    <Dialog
-      ref={ref}
-      trigger={children}
-      title={
-        <Breadcrumb
-          items={[__("States of Applicability"), __("New State of Applicability")]}
-        />
-      }
-    >
-      <form onSubmit={onSubmit}>
-        <DialogContent padded className="space-y-4">
-          <Field
-            label={__("Name")}
-            {...register("name")}
-            type="text"
-            required
-          />
-          <Field label={__("Owner")}>
-            <Suspense fallback={<div>{__("Loading...")}</div>}>
-              <PeopleSelectField
-                organizationId={organizationId}
-                control={control}
-                name="ownerId"
-              />
-            </Suspense>
-          </Field>
-        </DialogContent>
-        <DialogFooter>
-          <Button disabled={isMutating} type="submit">
-            {__("Create")}
-          </Button>
-        </DialogFooter>
-      </form>
-    </Dialog>
-  );
+    const [mutate, isMutating] =
+        useMutationWithToasts<StateOfApplicabilityGraphCreateMutation>(
+            createStateOfApplicabilityMutation,
+            {
+                successMessage: __(
+                    "State of applicability created successfully.",
+                ),
+                errorMessage: __("Failed to create state of applicability"),
+            },
+        );
+
+    const onSubmit = handleSubmit((data) => {
+        mutate({
+            variables: {
+                input: {
+                    name: data.name,
+                    organizationId,
+                    ownerId: data.ownerId,
+                },
+                connections: [connectionId],
+            },
+            onCompleted: (response) => {
+                reset();
+                ref.current?.close();
+                const stateOfApplicabilityId =
+                    response.createStateOfApplicability.stateOfApplicabilityEdge
+                        .node.id;
+                navigate(
+                    `/organizations/${organizationId}/states-of-applicability/${stateOfApplicabilityId}`,
+                );
+            },
+        });
+    });
+
+    return (
+        <Dialog
+            ref={ref}
+            trigger={children}
+            title={
+                <Breadcrumb
+                    items={[
+                        __("States of Applicability"),
+                        __("New State of Applicability"),
+                    ]}
+                />
+            }
+        >
+            <form onSubmit={onSubmit}>
+                <DialogContent padded className="space-y-4">
+                    <Field
+                        label={__("Name")}
+                        {...register("name")}
+                        type="text"
+                        required
+                    />
+                    <Field label={__("Owner")}>
+                        <Suspense fallback={<div>{__("Loading...")}</div>}>
+                            <PeopleSelectField
+                                organizationId={organizationId}
+                                control={control}
+                                name="ownerId"
+                            />
+                        </Suspense>
+                    </Field>
+                </DialogContent>
+                <DialogFooter>
+                    <Button disabled={isMutating} type="submit">
+                        {__("Create")}
+                    </Button>
+                </DialogFooter>
+            </form>
+        </Dialog>
+    );
 }
diff --git a/apps/console/src/pages/organizations/states-of-applicability/tabs/StateOfApplicabilityControlsTab.tsx b/apps/console/src/pages/organizations/states-of-applicability/tabs/StateOfApplicabilityControlsTab.tsx
index 27f3a0d71..281398465 100644
--- a/apps/console/src/pages/organizations/states-of-applicability/tabs/StateOfApplicabilityControlsTab.tsx
+++ b/apps/console/src/pages/organizations/states-of-applicability/tabs/StateOfApplicabilityControlsTab.tsx
@@ -1,267 +1,386 @@
 import { graphql, useRefetchableFragment } from "react-relay";
-import { Badge, Table, Tbody, Td, Th, Thead, Tr, Button, IconPlusLarge, IconPencil, IconTrashCan, ActionDropdown, DropdownItem } from "@probo/ui";
+import {
+    Badge,
+    Table,
+    Tbody,
+    Td,
+    Th,
+    Thead,
+    Tr,
+    Button,
+    IconPlusLarge,
+    IconPencil,
+    IconTrashCan,
+    ActionDropdown,
+    DropdownItem,
+} from "@probo/ui";
 import { useTranslate } from "@probo/i18n";
 import { useOrganizationId } from "/hooks/useOrganizationId";
-import type { StateOfApplicabilityControlsTabFragment$key } from "./__generated__/StateOfApplicabilityControlsTabFragment.graphql";
+import type { StateOfApplicabilityControlsTabFragment$key } from "/__generated__/core/StateOfApplicabilityControlsTabFragment.graphql";
 import { Suspense, useMemo, useRef } from "react";
-import { LinkControlDialog, type LinkControlDialogRef } from "../dialogs/LinkControlDialog";
-import { EditControlDialog, type EditControlDialogRef } from "../dialogs/EditControlDialog";
+import {
+    LinkControlDialog,
+    type LinkControlDialogRef,
+} from "../dialogs/LinkControlDialog";
+import {
+    EditControlDialog,
+    type EditControlDialogRef,
+} from "../dialogs/EditControlDialog";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
 import { use } from "react";
 import { PermissionsContext } from "/providers/PermissionsContext";
 
 export const controlsFragment = graphql`
-  fragment StateOfApplicabilityControlsTabFragment on StateOfApplicability
-  @refetchable(queryName: "StateOfApplicabilityControlsTabRefetchQuery") {
-    id
-    controlsInfo: controls(first: 0) {
-      totalCount
+    fragment StateOfApplicabilityControlsTabFragment on StateOfApplicability
+    @refetchable(queryName: "StateOfApplicabilityControlsTabRefetchQuery") {
+        id
+        controlsInfo: controls(first: 0) {
+            totalCount
+        }
+        availableControls {
+            controlId
+            sectionTitle
+            name
+            frameworkId
+            frameworkName
+            organizationId
+            stateOfApplicabilityId
+            applicability
+            justification
+            bestPractice
+            regulatory
+            contractual
+            riskAssessment
+        }
     }
-    availableControls {
-      controlId
-      sectionTitle
-      name
-      frameworkId
-      frameworkName
-      organizationId
-      stateOfApplicabilityId
-      applicability
-      justification
-      bestPractice
-      regulatory
-      contractual
-      riskAssessment
-    }
-  }
 `;
 
 const unlinkControlMutation = graphql`
-  mutation StateOfApplicabilityControlsTabUnlinkMutation($input: DeleteStateOfApplicabilityControlMappingInput!) {
-    deleteStateOfApplicabilityControlMapping(input: $input) {
-      deletedStateOfApplicabilityId
-      deletedControlId
-      deletedStateOfApplicabilityControlId
+    mutation StateOfApplicabilityControlsTabUnlinkMutation(
+        $input: DeleteStateOfApplicabilityControlMappingInput!
+    ) {
+        deleteStateOfApplicabilityControlMapping(input: $input) {
+            deletedStateOfApplicabilityId
+            deletedControlId
+            deletedStateOfApplicabilityControlId
+        }
     }
-  }
 `;
 
 export default function StateOfApplicabilityControlsTab({
-  stateOfApplicability,
-  isSnapshotMode = false,
+    stateOfApplicability,
+    isSnapshotMode = false,
 }: {
-  stateOfApplicability: StateOfApplicabilityControlsTabFragment$key & { id: string };
-  isSnapshotMode?: boolean;
+    stateOfApplicability: StateOfApplicabilityControlsTabFragment$key & {
+        id: string;
+    };
+    isSnapshotMode?: boolean;
 }) {
-  const { __ } = useTranslate();
-  const [data, refetch] = useRefetchableFragment(controlsFragment, stateOfApplicability);
-  const organizationId = useOrganizationId();
-  const manageDialogRef = useRef<LinkControlDialogRef>(null);
-  const editDialogRef = useRef<EditControlDialogRef>(null);
-  const { isAuthorized } = use(PermissionsContext);
+    const { __ } = useTranslate();
+    const [data, refetch] = useRefetchableFragment(
+        controlsFragment,
+        stateOfApplicability,
+    );
+    const organizationId = useOrganizationId();
+    const manageDialogRef = useRef<LinkControlDialogRef>(null);
+    const editDialogRef = useRef<EditControlDialogRef>(null);
+    const { isAuthorized } = use(PermissionsContext);
 
-  const linkedControls = useMemo(
-    () => (data.availableControls || []).filter((c) => c.stateOfApplicabilityId !== null),
-    [data.availableControls]
-  );
+    const linkedControls = useMemo(
+        () =>
+            (data.availableControls || []).filter(
+                (c) => c.stateOfApplicabilityId !== null,
+            ),
+        [data.availableControls],
+    );
 
-  const [unlinkControl, isUnlinking] = useMutationWithToasts(
-    unlinkControlMutation,
-    {
-      successMessage: __("Control removed successfully."),
-      errorMessage: __("Failed to remove control"),
-    },
-  );
-
-  const canLink = !isSnapshotMode && isAuthorized("StateOfApplicability", "updateStateOfApplicability");
-  const canUnlink = !isSnapshotMode && isAuthorized("StateOfApplicability", "updateStateOfApplicability");
-
-  const handleOpenManageDialog = () => {
-    manageDialogRef.current?.open(data.id, () => {
-      refetch({}, { fetchPolicy: "store-and-network" });
-    });
-  };
-
-  const handleOpenEditDialog = (control: {
-    controlId: string;
-    sectionTitle: string;
-    name: string;
-    frameworkName: string;
-    applicability: boolean;
-    justification: string | null;
-  }) => {
-    editDialogRef.current?.open({
-      stateOfApplicabilityId: data.id,
-      controlId: control.controlId,
-      sectionTitle: control.sectionTitle,
-      name: control.name,
-      frameworkName: control.frameworkName,
-      applicability: control.applicability,
-      justification: control.justification,
-    });
-  };
-
-  const handleUnlink = (controlId: string) => {
-    unlinkControl({
-      variables: {
-        input: {
-          stateOfApplicabilityId: data.id,
-          controlId,
+    const [unlinkControl, isUnlinking] = useMutationWithToasts(
+        unlinkControlMutation,
+        {
+            successMessage: __("Control removed successfully."),
+            errorMessage: __("Failed to remove control"),
         },
-      },
-      onSuccess: () => {
-        refetch({}, { fetchPolicy: "network-only" });
-      },
-    });
-  };
+    );
 
-  return (
-    <>
-      <div className="space-y-4">
-        {canLink && (
-          <div className="flex justify-end">
-            <Button
-              icon={IconPlusLarge}
-              onClick={handleOpenManageDialog}
-            >
-              {__("Add Controls")}
-            </Button>
-          </div>
-        )}
+    const canLink =
+        !isSnapshotMode &&
+        isAuthorized("StateOfApplicability", "updateStateOfApplicability");
+    const canUnlink =
+        !isSnapshotMode &&
+        isAuthorized("StateOfApplicability", "updateStateOfApplicability");
 
-        <Table>
-          <Thead>
-            <Tr>
-              <Th className="w-32">{__("Framework")}</Th>
-              <Th>{__("Control")}</Th>
-              <Th className="w-28 text-center">{__("Applicability")}</Th>
-              <Th className="min-w-48">{__("Justification")}</Th>
-              <Th className="w-24 text-center">{__("Regulatory")}</Th>
-              <Th className="w-24 text-center">{__("Contractual")}</Th>
-              <Th className="w-32 text-center">{__("Best Practice")}</Th>
-              <Th className="w-36 text-center">{__("Risk Assessment")}</Th>
-              {(canLink || canUnlink) && <Th className="w-12"></Th>}
-            </Tr>
-          </Thead>
-          <Tbody>
-            {linkedControls.length === 0 && (
-              <Tr>
-                <Td colSpan={canLink || canUnlink ? 9 : 8} className="text-center text-txt-secondary py-12">
-                  {__("No controls linked")}
-                </Td>
-              </Tr>
-            )}
-            {linkedControls.map((control) => (
-              <Tr
-                key={control.controlId}
-                to={`/organizations/${organizationId}/frameworks/${control.frameworkId}/controls/${control.controlId}`}
-              >
-                <Td className="font-medium text-txt-secondary">{control.frameworkName}</Td>
-                <Td>
-                  <div className="space-y-1">
-                    <div className="text-xs font-medium text-txt-tertiary">{control.sectionTitle}</div>
-                    <div className="text-sm">{control.name}</div>
-                  </div>
-                </Td>
-                <Td>
-                  <div className="flex justify-center">
-                    {control.applicability !== null ? (
-                      <Badge variant={control.applicability ? "success" : "danger"} size="sm">
-                        {control.applicability ? __("Yes") : __("No")}
-                      </Badge>
-                    ) : (
-                      <span className="text-txt-tertiary">-</span>
-                    )}
-                  </div>
-                </Td>
-                <Td>
-                  <div className="text-sm text-txt-secondary line-clamp-2">
-                    {control.justification || <span className="text-txt-tertiary italic">-</span>}
-                  </div>
-                </Td>
-                <Td>
-                  <div className="flex justify-center">
-                    <Badge variant={control.regulatory ? "success" : "danger"} size="sm">
-                      {control.regulatory ? __("Yes") : __("No")}
-                    </Badge>
-                  </div>
-                </Td>
-                <Td>
-                  <div className="flex justify-center">
-                    <Badge variant={control.contractual ? "success" : "danger"} size="sm">
-                      {control.contractual ? __("Yes") : __("No")}
-                    </Badge>
-                  </div>
-                </Td>
-                <Td>
-                  <div className="flex justify-center">
-                    <Badge variant={control.bestPractice ? "success" : "danger"} size="sm">
-                      {control.bestPractice ? __("Yes") : __("No")}
-                    </Badge>
-                  </div>
-                </Td>
-                <Td>
-                  <div className="flex justify-center">
-                    <Badge variant={control.riskAssessment ? "success" : "danger"} size="sm">
-                      {control.riskAssessment ? __("Yes") : __("No")}
-                    </Badge>
-                  </div>
-                </Td>
-                {(canLink || canUnlink) && (
-                  <Td noLink className="text-end">
-                    <ActionDropdown>
-                      {canLink && (
-                        <DropdownItem
-                          icon={IconPencil}
-                          onClick={(e) => {
-                            e.preventDefault();
-                            e.stopPropagation();
-                            if (typeof control.applicability === 'boolean') {
-                              handleOpenEditDialog({
-                                controlId: control.controlId,
-                                sectionTitle: control.sectionTitle,
-                                name: control.name,
-                                frameworkName: control.frameworkName,
-                                applicability: control.applicability,
-                                justification: control.justification ?? null,
-                              });
-                            }
-                          }}
+    const handleOpenManageDialog = () => {
+        manageDialogRef.current?.open(data.id, () => {
+            refetch({}, { fetchPolicy: "store-and-network" });
+        });
+    };
+
+    const handleOpenEditDialog = (control: {
+        controlId: string;
+        sectionTitle: string;
+        name: string;
+        frameworkName: string;
+        applicability: boolean;
+        justification: string | null;
+    }) => {
+        editDialogRef.current?.open({
+            stateOfApplicabilityId: data.id,
+            controlId: control.controlId,
+            sectionTitle: control.sectionTitle,
+            name: control.name,
+            frameworkName: control.frameworkName,
+            applicability: control.applicability,
+            justification: control.justification,
+        });
+    };
+
+    const handleUnlink = (controlId: string) => {
+        unlinkControl({
+            variables: {
+                input: {
+                    stateOfApplicabilityId: data.id,
+                    controlId,
+                },
+            },
+            onSuccess: () => {
+                refetch({}, { fetchPolicy: "network-only" });
+            },
+        });
+    };
+
+    return (
+        <>
+            <div className="space-y-4">
+                {canLink && (
+                    <div className="flex justify-end">
+                        <Button
+                            icon={IconPlusLarge}
+                            onClick={handleOpenManageDialog}
                         >
-                          {__("Edit")}
-                        </DropdownItem>
-                      )}
-                      {canUnlink && (
-                        <DropdownItem
-                          icon={IconTrashCan}
-                          variant="danger"
-                          onClick={(e) => {
-                            e.preventDefault();
-                            e.stopPropagation();
-                            handleUnlink(control.controlId);
-                          }}
-                          disabled={isUnlinking}
-                        >
-                          {__("Remove")}
-                        </DropdownItem>
-                      )}
-                    </ActionDropdown>
-                  </Td>
+                            {__("Add Controls")}
+                        </Button>
+                    </div>
                 )}
-              </Tr>
-            ))}
-          </Tbody>
-        </Table>
-      </div>
 
-      <Suspense fallback={null}>
-        <LinkControlDialog ref={manageDialogRef} />
-        <EditControlDialog
-          ref={editDialogRef}
-          onSuccess={() => {
-            refetch({}, { fetchPolicy: "network-only" });
-          }}
-        />
-      </Suspense>
-    </>
-  );
+                <Table>
+                    <Thead>
+                        <Tr>
+                            <Th className="w-32">{__("Framework")}</Th>
+                            <Th>{__("Control")}</Th>
+                            <Th className="w-28 text-center">
+                                {__("Applicability")}
+                            </Th>
+                            <Th className="min-w-48">{__("Justification")}</Th>
+                            <Th className="w-24 text-center">
+                                {__("Regulatory")}
+                            </Th>
+                            <Th className="w-24 text-center">
+                                {__("Contractual")}
+                            </Th>
+                            <Th className="w-32 text-center">
+                                {__("Best Practice")}
+                            </Th>
+                            <Th className="w-36 text-center">
+                                {__("Risk Assessment")}
+                            </Th>
+                            {(canLink || canUnlink) && (
+                                <Th className="w-12"></Th>
+                            )}
+                        </Tr>
+                    </Thead>
+                    <Tbody>
+                        {linkedControls.length === 0 && (
+                            <Tr>
+                                <Td
+                                    colSpan={canLink || canUnlink ? 9 : 8}
+                                    className="text-center text-txt-secondary py-12"
+                                >
+                                    {__("No controls linked")}
+                                </Td>
+                            </Tr>
+                        )}
+                        {linkedControls.map((control) => (
+                            <Tr
+                                key={control.controlId}
+                                to={`/organizations/${organizationId}/frameworks/${control.frameworkId}/controls/${control.controlId}`}
+                            >
+                                <Td className="font-medium text-txt-secondary">
+                                    {control.frameworkName}
+                                </Td>
+                                <Td>
+                                    <div className="space-y-1">
+                                        <div className="text-xs font-medium text-txt-tertiary">
+                                            {control.sectionTitle}
+                                        </div>
+                                        <div className="text-sm">
+                                            {control.name}
+                                        </div>
+                                    </div>
+                                </Td>
+                                <Td>
+                                    <div className="flex justify-center">
+                                        {control.applicability !== null ? (
+                                            <Badge
+                                                variant={
+                                                    control.applicability
+                                                        ? "success"
+                                                        : "danger"
+                                                }
+                                                size="sm"
+                                            >
+                                                {control.applicability
+                                                    ? __("Yes")
+                                                    : __("No")}
+                                            </Badge>
+                                        ) : (
+                                            <span className="text-txt-tertiary">
+                                                -
+                                            </span>
+                                        )}
+                                    </div>
+                                </Td>
+                                <Td>
+                                    <div className="text-sm text-txt-secondary line-clamp-2">
+                                        {control.justification || (
+                                            <span className="text-txt-tertiary italic">
+                                                -
+                                            </span>
+                                        )}
+                                    </div>
+                                </Td>
+                                <Td>
+                                    <div className="flex justify-center">
+                                        <Badge
+                                            variant={
+                                                control.regulatory
+                                                    ? "success"
+                                                    : "danger"
+                                            }
+                                            size="sm"
+                                        >
+                                            {control.regulatory
+                                                ? __("Yes")
+                                                : __("No")}
+                                        </Badge>
+                                    </div>
+                                </Td>
+                                <Td>
+                                    <div className="flex justify-center">
+                                        <Badge
+                                            variant={
+                                                control.contractual
+                                                    ? "success"
+                                                    : "danger"
+                                            }
+                                            size="sm"
+                                        >
+                                            {control.contractual
+                                                ? __("Yes")
+                                                : __("No")}
+                                        </Badge>
+                                    </div>
+                                </Td>
+                                <Td>
+                                    <div className="flex justify-center">
+                                        <Badge
+                                            variant={
+                                                control.bestPractice
+                                                    ? "success"
+                                                    : "danger"
+                                            }
+                                            size="sm"
+                                        >
+                                            {control.bestPractice
+                                                ? __("Yes")
+                                                : __("No")}
+                                        </Badge>
+                                    </div>
+                                </Td>
+                                <Td>
+                                    <div className="flex justify-center">
+                                        <Badge
+                                            variant={
+                                                control.riskAssessment
+                                                    ? "success"
+                                                    : "danger"
+                                            }
+                                            size="sm"
+                                        >
+                                            {control.riskAssessment
+                                                ? __("Yes")
+                                                : __("No")}
+                                        </Badge>
+                                    </div>
+                                </Td>
+                                {(canLink || canUnlink) && (
+                                    <Td noLink className="text-end">
+                                        <ActionDropdown>
+                                            {canLink && (
+                                                <DropdownItem
+                                                    icon={IconPencil}
+                                                    onClick={(e) => {
+                                                        e.preventDefault();
+                                                        e.stopPropagation();
+                                                        if (
+                                                            typeof control.applicability ===
+                                                            "boolean"
+                                                        ) {
+                                                            handleOpenEditDialog(
+                                                                {
+                                                                    controlId:
+                                                                        control.controlId,
+                                                                    sectionTitle:
+                                                                        control.sectionTitle,
+                                                                    name: control.name,
+                                                                    frameworkName:
+                                                                        control.frameworkName,
+                                                                    applicability:
+                                                                        control.applicability,
+                                                                    justification:
+                                                                        control.justification ??
+                                                                        null,
+                                                                },
+                                                            );
+                                                        }
+                                                    }}
+                                                >
+                                                    {__("Edit")}
+                                                </DropdownItem>
+                                            )}
+                                            {canUnlink && (
+                                                <DropdownItem
+                                                    icon={IconTrashCan}
+                                                    variant="danger"
+                                                    onClick={(e) => {
+                                                        e.preventDefault();
+                                                        e.stopPropagation();
+                                                        handleUnlink(
+                                                            control.controlId,
+                                                        );
+                                                    }}
+                                                    disabled={isUnlinking}
+                                                >
+                                                    {__("Remove")}
+                                                </DropdownItem>
+                                            )}
+                                        </ActionDropdown>
+                                    </Td>
+                                )}
+                            </Tr>
+                        ))}
+                    </Tbody>
+                </Table>
+            </div>
+
+            <Suspense fallback={null}>
+                <LinkControlDialog ref={manageDialogRef} />
+                <EditControlDialog
+                    ref={editDialogRef}
+                    onSuccess={() => {
+                        refetch({}, { fetchPolicy: "network-only" });
+                    }}
+                />
+            </Suspense>
+        </>
+    );
 }
diff --git a/apps/console/src/pages/organizations/states-of-applicability/tabs/StateOfApplicabilityOverviewTab.tsx b/apps/console/src/pages/organizations/states-of-applicability/tabs/StateOfApplicabilityOverviewTab.tsx
index dc3a846f7..7c8e90210 100644
--- a/apps/console/src/pages/organizations/states-of-applicability/tabs/StateOfApplicabilityOverviewTab.tsx
+++ b/apps/console/src/pages/organizations/states-of-applicability/tabs/StateOfApplicabilityOverviewTab.tsx
@@ -2,50 +2,54 @@ import { useOutletContext } from "react-router";
 import { Card, Field } from "@probo/ui";
 import { useTranslate } from "@probo/i18n";
 import { formatDate } from "@probo/helpers";
-import type { StateOfApplicabilityGraphNodeQuery$data } from "/hooks/graph/__generated__/StateOfApplicabilityGraphNodeQuery.graphql";
+import type { StateOfApplicabilityGraphNodeQuery$data } from "/__generated__/core/StateOfApplicabilityGraphNodeQuery.graphql";
 
-type StateOfApplicabilityNode = NonNullable<StateOfApplicabilityGraphNodeQuery$data["node"]>;
+type StateOfApplicabilityNode = NonNullable<
+    StateOfApplicabilityGraphNodeQuery$data["node"]
+>;
 
 export default function StateOfApplicabilityOverviewTab() {
-  const { stateOfApplicability } = useOutletContext<{
-    stateOfApplicability: StateOfApplicabilityNode;
-  }>();
-  const { __ } = useTranslate();
+    const { stateOfApplicability } = useOutletContext<{
+        stateOfApplicability: StateOfApplicabilityNode;
+    }>();
+    const { __ } = useTranslate();
 
-  return (
-    <div className="space-y-4">
-      <h2 className="text-base font-medium">{__("State of Applicability details")}</h2>
-      <Card className="space-y-4" padded>
-        <Field
-          label={__("Name")}
-          value={stateOfApplicability.name}
-          disabled
-        />
-        {stateOfApplicability.sourceId && (
-          <Field
-            label={__("Source")}
-            value={stateOfApplicability.sourceId}
-            disabled
-          />
-        )}
-        {stateOfApplicability.snapshotId && (
-          <Field
-            label={__("Snapshot")}
-            value={stateOfApplicability.snapshotId}
-            disabled
-          />
-        )}
-        <Field
-          label={__("Created at")}
-          value={formatDate(stateOfApplicability.createdAt)}
-          disabled
-        />
-        <Field
-          label={__("Updated at")}
-          value={formatDate(stateOfApplicability.updatedAt)}
-          disabled
-        />
-      </Card>
-    </div>
-  );
+    return (
+        <div className="space-y-4">
+            <h2 className="text-base font-medium">
+                {__("State of Applicability details")}
+            </h2>
+            <Card className="space-y-4" padded>
+                <Field
+                    label={__("Name")}
+                    value={stateOfApplicability.name}
+                    disabled
+                />
+                {stateOfApplicability.sourceId && (
+                    <Field
+                        label={__("Source")}
+                        value={stateOfApplicability.sourceId}
+                        disabled
+                    />
+                )}
+                {stateOfApplicability.snapshotId && (
+                    <Field
+                        label={__("Snapshot")}
+                        value={stateOfApplicability.snapshotId}
+                        disabled
+                    />
+                )}
+                <Field
+                    label={__("Created at")}
+                    value={formatDate(stateOfApplicability.createdAt)}
+                    disabled
+                />
+                <Field
+                    label={__("Updated at")}
+                    value={formatDate(stateOfApplicability.updatedAt)}
+                    disabled
+                />
+            </Card>
+        </div>
+    );
 }
diff --git a/apps/console/src/pages/organizations/tasks/TasksPage.tsx b/apps/console/src/pages/organizations/tasks/TasksPage.tsx
index 84dcb1a4a..658fae98e 100644
--- a/apps/console/src/pages/organizations/tasks/TasksPage.tsx
+++ b/apps/console/src/pages/organizations/tasks/TasksPage.tsx
@@ -5,9 +5,9 @@ import {
   type PreloadedQuery,
 } from "react-relay";
 import { graphql } from "relay-runtime";
-import type { TaskGraphQuery } from "/hooks/graph/__generated__/TaskGraphQuery.graphql";
+import type { TaskGraphQuery } from "/__generated__/core/TaskGraphQuery.graphql";
 import { useTranslate } from "@probo/i18n";
-import type { TasksPageFragment$key } from "./__generated__/TasksPageFragment.graphql";
+import type { TasksPageFragment$key } from "/__generated__/core/TasksPageFragment.graphql";
 import { tasksQuery } from "/hooks/graph/TaskGraph";
 import { usePageTitle } from "@probo/hooks";
 import TasksCard from "/components/tasks/TasksCard";
@@ -65,7 +65,7 @@ export default function TasksPage({ queryRef }: Props) {
   const query = usePreloadedQuery(tasksQuery, queryRef);
   const [data] = useRefetchableFragment(
     tasksFragment,
-    query.organization as TasksPageFragment$key
+    query.organization as TasksPageFragment$key,
   );
   const tasks = data.tasks?.edges.map((edge) => edge.node);
   const connectionId = data.tasks.__id;
@@ -77,7 +77,7 @@ export default function TasksPage({ queryRef }: Props) {
       <PageHeader
         title={__("Tasks")}
         description={__(
-          "Track your assigned compliance tasks and keep progress on track."
+          "Track your assigned compliance tasks and keep progress on track.",
         )}
       >
         {isAuthorized("Organization", "createTask") && (
diff --git a/apps/console/src/pages/organizations/trustCenter/TrustCenterAccessTab/TrustCenterAccessEditDialog.tsx b/apps/console/src/pages/organizations/trustCenter/TrustCenterAccessTab/TrustCenterAccessEditDialog.tsx
index cafbcf214..09f24bf4d 100644
--- a/apps/console/src/pages/organizations/trustCenter/TrustCenterAccessTab/TrustCenterAccessEditDialog.tsx
+++ b/apps/console/src/pages/organizations/trustCenter/TrustCenterAccessTab/TrustCenterAccessEditDialog.tsx
@@ -1,9 +1,30 @@
-import type { TrustCenterAccess, TrustCenterDocumentAccessStatus } from "@probo/coredata";
-import { getTrustCenterDocumentAccessInfo, type TrustCenterDocumentAccessInfo } from "@probo/helpers";
-import { Button, Checkbox, Dialog, DialogContent, DialogFooter, Field, Spinner } from "@probo/ui";
-import { usePreloadedQuery, type PreloadedQuery, useQueryLoader } from "react-relay";
-import type { TrustCenterAccessGraphLoadDocumentAccessesQuery } from "/hooks/graph/__generated__/TrustCenterAccessGraphLoadDocumentAccessesQuery.graphql";
-import { loadTrustCenterAccessDocumentAccessesQuery, updateTrustCenterAccessMutation } from "/hooks/graph/TrustCenterAccessGraph";
+import type {
+  TrustCenterAccess,
+  TrustCenterDocumentAccessStatus,
+} from "@probo/coredata";
+import {
+  getTrustCenterDocumentAccessInfo,
+  type TrustCenterDocumentAccessInfo,
+} from "@probo/helpers";
+import {
+  Button,
+  Checkbox,
+  Dialog,
+  DialogContent,
+  DialogFooter,
+  Field,
+  Spinner,
+} from "@probo/ui";
+import {
+  usePreloadedQuery,
+  type PreloadedQuery,
+  useQueryLoader,
+} from "react-relay";
+import type { TrustCenterAccessGraphLoadDocumentAccessesQuery } from "/__generated__/core/TrustCenterAccessGraphLoadDocumentAccessesQuery.graphql";
+import {
+  loadTrustCenterAccessDocumentAccessesQuery,
+  updateTrustCenterAccessMutation,
+} from "/hooks/graph/TrustCenterAccessGraph";
 import { useTranslate } from "@probo/i18n";
 import z from "zod";
 import { useFormWithSchema } from "/hooks/useFormWithSchema";
@@ -16,29 +37,32 @@ interface TrustCenterAccessEditDialogProps {
   onClose: () => void;
 }
 
-export function TrustCenterAccessEditDialog(props: TrustCenterAccessEditDialogProps) {
+export function TrustCenterAccessEditDialog(
+  props: TrustCenterAccessEditDialogProps,
+) {
   const { access, onClose } = props;
 
   const { __ } = useTranslate();
 
   const [queryRef, loadDocumentAccessesQuery] =
-    useQueryLoader<TrustCenterAccessGraphLoadDocumentAccessesQuery>(loadTrustCenterAccessDocumentAccessesQuery);
+    useQueryLoader<TrustCenterAccessGraphLoadDocumentAccessesQuery>(
+      loadTrustCenterAccessDocumentAccessesQuery,
+    );
 
   useEffect(() => {
-    loadDocumentAccessesQuery({
-      accessId: access.id
-    }, {
-      fetchPolicy: "network-only",
-    });
-  }, [access.id, loadDocumentAccessesQuery])
+    loadDocumentAccessesQuery(
+      {
+        accessId: access.id,
+      },
+      {
+        fetchPolicy: "network-only",
+      },
+    );
+  }, [access.id, loadDocumentAccessesQuery]);
 
   return (
-    <Dialog
-      defaultOpen={true}
-      title={__("Edit Access")}
-      onClose={onClose}
-    >
-      {queryRef &&
+    <Dialog defaultOpen={true} title={__("Edit Access")} onClose={onClose}>
+      {queryRef && (
         <Suspense>
           <TrustCenterAccessEditForm
             access={access}
@@ -46,7 +70,7 @@ export function TrustCenterAccessEditDialog(props: TrustCenterAccessEditDialogPr
             onSubmit={onClose}
           />
         </Suspense>
-      }
+      )}
     </Dialog>
   );
 }
@@ -57,70 +81,111 @@ interface TrustCenterAccessEditFormProps {
   queryRef: PreloadedQuery<TrustCenterAccessGraphLoadDocumentAccessesQuery>;
 }
 
-export function TrustCenterAccessEditForm(props: TrustCenterAccessEditFormProps) {
+export function TrustCenterAccessEditForm(
+  props: TrustCenterAccessEditFormProps,
+) {
   const { access, onSubmit, queryRef } = props;
 
   const { __ } = useTranslate();
-  const data = usePreloadedQuery<TrustCenterAccessGraphLoadDocumentAccessesQuery>(
-    loadTrustCenterAccessDocumentAccessesQuery,
-    queryRef,
-  )
+  const data =
+    usePreloadedQuery<TrustCenterAccessGraphLoadDocumentAccessesQuery>(
+      loadTrustCenterAccessDocumentAccessesQuery,
+      queryRef,
+    );
 
-  const initialDocumentAccesses = data.node.availableDocumentAccesses?.edges.map(edge => getTrustCenterDocumentAccessInfo(edge.node, __)) ?? []
-  const initialStatusByID = initialDocumentAccesses.reduce<Record<string, TrustCenterDocumentAccessStatus>>((acc, docAccess) => {
+  const initialDocumentAccesses =
+    data.node.availableDocumentAccesses?.edges.map((edge) =>
+      getTrustCenterDocumentAccessInfo(edge.node, __),
+    ) ?? [];
+  const initialStatusByID = initialDocumentAccesses.reduce<
+    Record<string, TrustCenterDocumentAccessStatus>
+  >((acc, docAccess) => {
     acc[docAccess.id] = docAccess.status;
-    return acc
-  }, {})
-  const [documentAccesses, setDocumentAccesses] = useState<TrustCenterDocumentAccessInfo[]>(initialDocumentAccesses);
+    return acc;
+  }, {});
+  const [documentAccesses, setDocumentAccesses] = useState<
+    TrustCenterDocumentAccessInfo[]
+  >(initialDocumentAccesses);
 
-  const handleUpdateDocumentAccessStatus = useCallback((documentAccess: TrustCenterDocumentAccessInfo, status: TrustCenterDocumentAccessStatus) => {
-    setDocumentAccesses((prev) => {
-      const nextDocumentAccesses = [...prev];
-      const docAccessIndex = nextDocumentAccesses.findIndex(element => element.id === documentAccess.id)
-      const previousDocAccess = nextDocumentAccesses[docAccessIndex];
-      nextDocumentAccesses.splice(docAccessIndex, 1, { ...previousDocAccess, status });
+  const handleUpdateDocumentAccessStatus = useCallback(
+    (
+      documentAccess: TrustCenterDocumentAccessInfo,
+      status: TrustCenterDocumentAccessStatus,
+    ) => {
+      setDocumentAccesses((prev) => {
+        const nextDocumentAccesses = [...prev];
+        const docAccessIndex = nextDocumentAccesses.findIndex(
+          (element) => element.id === documentAccess.id,
+        );
+        const previousDocAccess = nextDocumentAccesses[docAccessIndex];
+        nextDocumentAccesses.splice(docAccessIndex, 1, {
+          ...previousDocAccess,
+          status,
+        });
 
-      return nextDocumentAccesses;
-    })
-  }, [])
+        return nextDocumentAccesses;
+      });
+    },
+    [],
+  );
   const handleGrantAllDocumentAccess = useCallback(() => {
-    setDocumentAccesses((prev) => prev.map(element => ({...element, status: "GRANTED"})))
-  }, [])
+    setDocumentAccesses((prev) =>
+      prev.map((element) => ({ ...element, status: "GRANTED" })),
+    );
+  }, []);
   const handleRejectOrRevokeAllDocumentAccess = useCallback(() => {
-    setDocumentAccesses((prev) => prev
-      .map(element => ({...element, status: initialStatusByID[element.id] === "GRANTED" ? "REVOKED" : "REJECTED"}))
-    )
-  }, [initialStatusByID])
+    setDocumentAccesses((prev) =>
+      prev.map((element) => ({
+        ...element,
+        status:
+          initialStatusByID[element.id] === "GRANTED" ? "REVOKED" : "REJECTED",
+      })),
+    );
+  }, [initialStatusByID]);
 
   const editSchema = z.object({
-    name: z.string().min(1, __("Name is required")).min(2, __("Name must be at least 2 characters long")),
+    name: z
+      .string()
+      .min(1, __("Name is required"))
+      .min(2, __("Name must be at least 2 characters long")),
     active: z.boolean(),
   });
   const editForm = useFormWithSchema(editSchema, {
     defaultValues: { name: access.name, active: access.active },
   });
 
-  const [updateTrustCenterAccess, isUpdating] = useMutationWithToasts(updateTrustCenterAccessMutation, {
-    successMessage: __("Access updated successfully"),
-    errorMessage: __("Failed to update access"),
-  });
+  const [updateTrustCenterAccess, isUpdating] = useMutationWithToasts(
+    updateTrustCenterAccessMutation,
+    {
+      successMessage: __("Access updated successfully"),
+      errorMessage: __("Failed to update access"),
+    },
+  );
 
   const handleSubmit = editForm.handleSubmit(async (data) => {
-    const documents: { id: string, status: TrustCenterDocumentAccessStatus }[] = []
-    const reports: { id: string, status: TrustCenterDocumentAccessStatus }[] = []
-    const trustCenterFiles: { id: string, status: TrustCenterDocumentAccessStatus }[] = []
+    const documents: { id: string; status: TrustCenterDocumentAccessStatus }[] =
+      [];
+    const reports: { id: string; status: TrustCenterDocumentAccessStatus }[] =
+      [];
+    const trustCenterFiles: {
+      id: string;
+      status: TrustCenterDocumentAccessStatus;
+    }[] = [];
 
     for (const docAccess of documentAccesses) {
       if (docAccess.persisted || docAccess.status !== "REQUESTED") {
         switch (docAccess.type) {
           case "document":
-            documents.push({id: docAccess.id, status: docAccess.status});
+            documents.push({ id: docAccess.id, status: docAccess.status });
             break;
           case "report":
-            reports.push({id: docAccess.id, status: docAccess.status});
+            reports.push({ id: docAccess.id, status: docAccess.status });
             break;
           case "file":
-            trustCenterFiles.push({id: docAccess.id, status: docAccess.status});
+            trustCenterFiles.push({
+              id: docAccess.id,
+              status: docAccess.status,
+            });
             break;
         }
       }
diff --git a/apps/console/src/pages/organizations/trustCenter/TrustCenterAuditsTab.tsx b/apps/console/src/pages/organizations/trustCenter/TrustCenterAuditsTab.tsx
index 068fd9bd6..94290f9f9 100644
--- a/apps/console/src/pages/organizations/trustCenter/TrustCenterAuditsTab.tsx
+++ b/apps/console/src/pages/organizations/trustCenter/TrustCenterAuditsTab.tsx
@@ -3,7 +3,7 @@ import { useTranslate } from "@probo/i18n";
 import { useOutletContext } from "react-router";
 import { TrustCenterAuditsCard } from "/components/trustCenter/TrustCenterAuditsCard";
 import { useTrustCenterAuditUpdate } from "/hooks/graph/TrustCenterAuditGraph";
-import type { TrustCenterAuditsCardFragment$key } from "/components/trustCenter/__generated__/TrustCenterAuditsCardFragment.graphql";
+import type { TrustCenterAuditsCardFragment$key } from "/__generated__/core/TrustCenterAuditsCardFragment.graphql";
 
 type ContextType = {
   organization: {
diff --git a/apps/console/src/pages/organizations/trustCenter/TrustCenterDocumentsTab.tsx b/apps/console/src/pages/organizations/trustCenter/TrustCenterDocumentsTab.tsx
index 241d4fa8a..141f74354 100644
--- a/apps/console/src/pages/organizations/trustCenter/TrustCenterDocumentsTab.tsx
+++ b/apps/console/src/pages/organizations/trustCenter/TrustCenterDocumentsTab.tsx
@@ -3,7 +3,7 @@ import { useTranslate } from "@probo/i18n";
 import { useOutletContext } from "react-router";
 import { TrustCenterDocumentsCard } from "/components/trustCenter/TrustCenterDocumentsCard";
 import { useUpdateDocumentVisibilityMutation } from "/hooks/graph/TrustCenterDocumentGraph";
-import type { TrustCenterDocumentsCardFragment$key } from "/components/trustCenter/__generated__/TrustCenterDocumentsCardFragment.graphql";
+import type { TrustCenterDocumentsCardFragment$key } from "/__generated__/core/TrustCenterDocumentsCardFragment.graphql";
 
 type ContextType = {
   organization: {
@@ -18,9 +18,11 @@ type ContextType = {
 export default function TrustCenterDocumentsTab() {
   const { __ } = useTranslate();
   const { organization } = useOutletContext<ContextType>();
-  const [updateDocumentVisibility, isUpdatingDocuments] = useUpdateDocumentVisibilityMutation();
+  const [updateDocumentVisibility, isUpdatingDocuments] =
+    useUpdateDocumentVisibilityMutation();
 
-  const documents = organization.documents?.edges?.map((edge) => edge.node) || [];
+  const documents =
+    organization.documents?.edges?.map((edge) => edge.node) || [];
 
   return (
     <div className="space-y-4">
diff --git a/apps/console/src/pages/organizations/trustCenter/TrustCenterFilesTab.tsx b/apps/console/src/pages/organizations/trustCenter/TrustCenterFilesTab.tsx
index 1c0234ff4..cf1d48ca8 100644
--- a/apps/console/src/pages/organizations/trustCenter/TrustCenterFilesTab.tsx
+++ b/apps/console/src/pages/organizations/trustCenter/TrustCenterFilesTab.tsx
@@ -23,7 +23,7 @@ import {
 } from "/hooks/graph/TrustCenterFileGraph";
 import { useFormWithSchema } from "/hooks/useFormWithSchema";
 import { TrustCenterFilesCard } from "/components/trustCenter/TrustCenterFilesCard";
-import type { TrustCenterFilesCardFragment$key } from "/components/trustCenter/__generated__/TrustCenterFilesCardFragment.graphql";
+import type { TrustCenterFilesCardFragment$key } from "/__generated__/core/TrustCenterFilesCardFragment.graphql";
 import { PermissionsContext } from "/providers/PermissionsContext";
 
 type ContextType = {
@@ -48,9 +48,15 @@ const acceptedFileTypes = {
   "application/vnd.oasis.opendocument.presentation": [".odp"],
   "application/vnd.oasis.opendocument.spreadsheet": [".ods"],
   "application/vnd.oasis.opendocument.text": [".odt"],
-  "application/vnd.openxmlformats-officedocument.presentationml.presentation": [".pptx"],
-  "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": [".xlsx"],
-  "application/vnd.openxmlformats-officedocument.wordprocessingml.document": [".docx"],
+  "application/vnd.openxmlformats-officedocument.presentationml.presentation": [
+    ".pptx",
+  ],
+  "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": [
+    ".xlsx",
+  ],
+  "application/vnd.openxmlformats-officedocument.wordprocessingml.document": [
+    ".docx",
+  ],
   "application/yaml": [".yaml", ".yml"],
   "image/gif": [".gif"],
   "image/jpeg": [".jpeg", ".jpg"],
@@ -65,7 +71,7 @@ const acceptedFileTypes = {
   "text/uri-list": [".uri"],
   "text/x-log": [".log"],
   "text/yaml": [".yaml", ".yml"],
-}
+};
 
 export default function TrustCenterFilesTab() {
   const { __ } = useTranslate();
@@ -90,7 +96,11 @@ export default function TrustCenterFilesTab() {
   const editDialogRef = useDialogRef();
   const deleteDialogRef = useDialogRef();
 
-  const [editingFile, setEditingFile] = useState<{ id: string; name: string; category: string } | null>(null);
+  const [editingFile, setEditingFile] = useState<{
+    id: string;
+    name: string;
+    category: string;
+  } | null>(null);
   const [deletingFileId, setDeletingFileId] = useState<string | null>(null);
   const [uploadedFile, setUploadedFile] = useState<File | null>(null);
   const [isUploading, setIsUploading] = useState(false);
@@ -103,27 +113,31 @@ export default function TrustCenterFilesTab() {
     defaultValues: { name: "", category: "" },
   });
 
-  const files = organization.trustCenterFiles?.edges?.map((edge) => edge.node) || [];
+  const files =
+    organization.trustCenterFiles?.edges?.map((edge) => edge.node) || [];
 
-  const handleFileUpload = useCallback((acceptedFiles: File[]) => {
-    if (acceptedFiles.length > 0) {
-      const file = acceptedFiles[0];
+  const handleFileUpload = useCallback(
+    (acceptedFiles: File[]) => {
+      if (acceptedFiles.length > 0) {
+        const file = acceptedFiles[0];
 
-      if (!Object.keys(acceptedFileTypes).includes(file.type)) {
-        createForm.setError("root", {
-          type: "manual",
-          message: __("File type is not allowed"),
-        });
-        return;
+        if (!Object.keys(acceptedFileTypes).includes(file.type)) {
+          createForm.setError("root", {
+            type: "manual",
+            message: __("File type is not allowed"),
+          });
+          return;
+        }
+
+        setUploadedFile(file);
+        createForm.clearErrors("root");
+        if (!createForm.getValues().name) {
+          createForm.setValue("name", file.name.replace(/\.[^/.]+$/, ""));
+        }
       }
-
-      setUploadedFile(file);
-      createForm.clearErrors("root");
-      if (!createForm.getValues().name) {
-        createForm.setValue("name", file.name.replace(/\.[^/.]+$/, ""));
-      }
-    }
-  }, [createForm, __]);
+    },
+    [createForm, __],
+  );
 
   const handleCreate = createForm.handleSubmit(async (data) => {
     if (!uploadedFile) {
@@ -160,11 +174,14 @@ export default function TrustCenterFilesTab() {
     }
   });
 
-  const handleEdit = useCallback((file: { id: string; name: string; category: string }) => {
-    setEditingFile(file);
-    editForm.reset({ name: file.name, category: file.category });
-    editDialogRef.current?.open();
-  }, [editDialogRef, editForm]);
+  const handleEdit = useCallback(
+    (file: { id: string; name: string; category: string }) => {
+      setEditingFile(file);
+      editForm.reset({ name: file.name, category: file.category });
+      editDialogRef.current?.open();
+    },
+    [editDialogRef, editForm],
+  );
 
   const handleUpdate = editForm.handleSubmit(async (data) => {
     if (!editingFile) {
@@ -186,10 +203,13 @@ export default function TrustCenterFilesTab() {
     });
   });
 
-  const handleDeleteClick = useCallback((id: string) => {
-    setDeletingFileId(id);
-    deleteDialogRef.current?.open();
-  }, [deleteDialogRef]);
+  const handleDeleteClick = useCallback(
+    (id: string) => {
+      setDeletingFileId(id);
+      deleteDialogRef.current?.open();
+    },
+    [deleteDialogRef],
+  );
 
   const handleDeleteConfirm = useCallback(async () => {
     if (!deletingFileId) {
@@ -208,18 +228,26 @@ export default function TrustCenterFilesTab() {
         setDeletingFileId(null);
       },
     });
-  }, [deletingFileId, deleteFile, deleteDialogRef, organization.trustCenterFiles?.__id]);
+  }, [
+    deletingFileId,
+    deleteFile,
+    deleteDialogRef,
+    organization.trustCenterFiles?.__id,
+  ]);
 
-  const handleChangeVisibility = useCallback((params: {
-    variables: {
-      input: {
-        id: string;
-        trustCenterVisibility: "NONE" | "PRIVATE" | "PUBLIC";
+  const handleChangeVisibility = useCallback(
+    (params: {
+      variables: {
+        input: {
+          id: string;
+          trustCenterVisibility: "NONE" | "PRIVATE" | "PUBLIC";
+        };
       };
-    };
-  }) => {
-    updateFile(params);
-  }, [updateFile]);
+    }) => {
+      updateFile(params);
+    },
+    [updateFile],
+  );
 
   return (
     <div className="space-y-4">
@@ -231,7 +259,10 @@ export default function TrustCenterFilesTab() {
           </p>
         </div>
         {isAuthorized("Organization", "createTrustCenterFile") && (
-          <Button icon={IconPlusLarge} onClick={() => createDialogRef.current?.open()}>
+          <Button
+            icon={IconPlusLarge}
+            onClick={() => createDialogRef.current?.open()}
+          >
             {__("Add File")}
           </Button>
         )}
@@ -286,15 +317,18 @@ export default function TrustCenterFilesTab() {
               label={__("Visibility")}
               type="select"
               value={createForm.watch("trustCenterVisibility")}
-              onValueChange={(value) => createForm.setValue("trustCenterVisibility", value as "NONE" | "PRIVATE" | "PUBLIC")}
+              onValueChange={(value) =>
+                createForm.setValue(
+                  "trustCenterVisibility",
+                  value as "NONE" | "PRIVATE" | "PUBLIC",
+                )
+              }
               error={createForm.formState.errors.trustCenterVisibility?.message}
             >
               {getTrustCenterVisibilityOptions(__).map((option) => (
                 <Option key={option.value} value={option.value}>
                   <div className="flex items-center justify-between w-full">
-                    <Badge variant={option.variant}>
-                      {option.label}
-                    </Badge>
+                    <Badge variant={option.variant}>{option.label}</Badge>
                   </div>
                 </Option>
               ))}
@@ -329,10 +363,7 @@ export default function TrustCenterFilesTab() {
             />
           </DialogContent>
           <DialogFooter>
-            <Button
-              type="submit"
-              disabled={isUpdating}
-            >
+            <Button type="submit" disabled={isUpdating}>
               {isUpdating && <Spinner />}
               {__("Save")}
             </Button>
@@ -342,7 +373,11 @@ export default function TrustCenterFilesTab() {
 
       <Dialog ref={deleteDialogRef} title={__("Delete File")}>
         <DialogContent padded>
-          <p>{__("Are you sure you want to delete this file? This action cannot be undone.")}</p>
+          <p>
+            {__(
+              "Are you sure you want to delete this file? This action cannot be undone.",
+            )}
+          </p>
         </DialogContent>
         <DialogFooter>
           <Button
diff --git a/apps/console/src/pages/organizations/trustCenter/TrustCenterOverviewTab.tsx b/apps/console/src/pages/organizations/trustCenter/TrustCenterOverviewTab.tsx
index e452aa334..6a55705c6 100644
--- a/apps/console/src/pages/organizations/trustCenter/TrustCenterOverviewTab.tsx
+++ b/apps/console/src/pages/organizations/trustCenter/TrustCenterOverviewTab.tsx
@@ -9,8 +9,12 @@ import {
   IconTrashCan,
 } from "@probo/ui";
 import { useOutletContext } from "react-router";
-import { useUpdateTrustCenterMutation, useUploadTrustCenterNDAMutation, useDeleteTrustCenterNDAMutation } from "/hooks/graph/TrustCenterGraph";
-import type { TrustCenterGraphQuery$data } from "/hooks/graph/__generated__/TrustCenterGraphQuery.graphql";
+import {
+  useUpdateTrustCenterMutation,
+  useUploadTrustCenterNDAMutation,
+  useDeleteTrustCenterNDAMutation,
+} from "/hooks/graph/TrustCenterGraph";
+import type { TrustCenterGraphQuery$data } from "/__generated__/core/TrustCenterGraphQuery.graphql";
 import { use, useState } from "react";
 import { SlackConnections } from "../../../components/organizations/SlackConnection";
 import { PermissionsContext } from "/providers/PermissionsContext";
@@ -28,7 +32,9 @@ export default function TrustCenterOverviewTab() {
   const [updateTrustCenter, isUpdating] = useUpdateTrustCenterMutation();
   const [uploadNDA, isUploadingNDA] = useUploadTrustCenterNDAMutation();
   const [deleteNDA, isDeletingNDA] = useDeleteTrustCenterNDAMutation();
-  const [isActive, setIsActive] = useState(organization.trustCenter?.active || false);
+  const [isActive, setIsActive] = useState(
+    organization.trustCenter?.active || false,
+  );
 
   const canUpdateTrustCenter = isAuthorized("TrustCenter", "updateTrustCenter");
 
@@ -126,7 +132,9 @@ export default function TrustCenterOverviewTab() {
             <div className="space-y-1">
               <h3 className="font-medium">{__("Activate Trust Center")}</h3>
               <p className="text-sm text-txt-tertiary">
-                {__("Make your trust center publicly accessible to build customer confidence")}
+                {__(
+                  "Make your trust center publicly accessible to build customer confidence",
+                )}
               </p>
             </div>
             <Checkbox
@@ -157,7 +165,9 @@ export default function TrustCenterOverviewTab() {
                 </div>
                 <Button
                   variant="secondary"
-                  onClick={() => window.open(trustCenterUrl, '_blank', 'noopener,noreferrer')}
+                  onClick={() =>
+                    window.open(trustCenterUrl, "_blank", "noopener,noreferrer")
+                  }
                 >
                   {__("View")}
                 </Button>
@@ -171,7 +181,9 @@ export default function TrustCenterOverviewTab() {
                 {__("Trust Center is Inactive")}
               </h4>
               <p className="text-sm text-txt-tertiary mt-1">
-                {__("Your trust center is currently not accessible to the public. Enable it to start sharing your compliance status.")}
+                {__(
+                  "Your trust center is currently not accessible to the public. Enable it to start sharing your compliance status.",
+                )}
               </p>
             </div>
           )}
@@ -180,27 +192,36 @@ export default function TrustCenterOverviewTab() {
 
       <div className="space-y-4">
         <div className="flex items-center justify-between">
-          <h2 className="text-base font-medium">{__("Non-Disclosure Agreement")}</h2>
+          <h2 className="text-base font-medium">
+            {__("Non-Disclosure Agreement")}
+          </h2>
           {(isUploadingNDA || isDeletingNDA) && <Spinner />}
         </div>
         <Card padded className="space-y-4">
           <div className="space-y-2">
-            {!organization.trustCenter?.ndaFileName ?  (
+            {!organization.trustCenter?.ndaFileName ? (
               <p className="text-sm text-txt-tertiary">
-                {__("Upload a Non-Disclosure Agreement that visitors must accept before accessing your trust center")}
+                {__(
+                  "Upload a Non-Disclosure Agreement that visitors must accept before accessing your trust center",
+                )}
               </p>
-            ) : (<></>)}
+            ) : (
+              <></>
+            )}
             {organization.trustCenter?.ndaFileName ? (
               <div className="space-y-3">
                 <div className="flex items-center justify-between">
                   <div className="space-y-1">
                     <div className="flex items-center gap-2">
                       <p className="text-sm font-medium">
-                        {organization.trustCenter.ndaFileName || __("Non-Disclosure Agreement")}
+                        {organization.trustCenter.ndaFileName ||
+                          __("Non-Disclosure Agreement")}
                       </p>
                     </div>
                     <p className="text-xs text-txt-tertiary">
-                      {__("Visitors will need to accept this NDA before accessing your trust center")}
+                      {__(
+                        "Visitors will need to accept this NDA before accessing your trust center",
+                      )}
                     </p>
                   </div>
                   <div className="flex items-center gap-2">
@@ -209,7 +230,10 @@ export default function TrustCenterOverviewTab() {
                       variant="secondary"
                       onClick={() => {
                         if (organization.trustCenter?.ndaFileUrl) {
-                          window.open(organization.trustCenter.ndaFileUrl, '_blank');
+                          window.open(
+                            organization.trustCenter.ndaFileUrl,
+                            "_blank",
+                          );
                         }
                       }}
                     >
@@ -254,7 +278,10 @@ export default function TrustCenterOverviewTab() {
         <Card padded>
           <SlackConnections
             organizationId={organization.id!}
-            slackConnections={organization.slackConnections?.edges?.map((edge) => edge.node) ?? []}
+            slackConnections={
+              organization.slackConnections?.edges?.map((edge) => edge.node) ??
+              []
+            }
           />
         </Card>
       </div>
diff --git a/apps/console/src/pages/organizations/trustCenter/TrustCenterPage.tsx b/apps/console/src/pages/organizations/trustCenter/TrustCenterPage.tsx
index a30063067..4ccdefeb3 100644
--- a/apps/console/src/pages/organizations/trustCenter/TrustCenterPage.tsx
+++ b/apps/console/src/pages/organizations/trustCenter/TrustCenterPage.tsx
@@ -15,7 +15,7 @@ import {
 } from "@probo/ui";
 import { usePreloadedQuery, type PreloadedQuery } from "react-relay";
 import { trustCenterQuery } from "/hooks/graph/TrustCenterGraph";
-import type { TrustCenterGraphQuery } from "/hooks/graph/__generated__/TrustCenterGraphQuery.graphql";
+import type { TrustCenterGraphQuery } from "/__generated__/core/TrustCenterGraphQuery.graphql";
 import { useOrganizationId } from "/hooks/useOrganizationId";
 import { Outlet } from "react-router";
 
@@ -37,7 +37,7 @@ export default function TrustCenterPage({ queryRef }: Props) {
       <PageHeader
         title={__("Trust Center")}
         description={__(
-          "Configure your public trust center to showcase your security and compliance posture."
+          "Configure your public trust center to showcase your security and compliance posture.",
         )}
       >
         <Badge variant={isActive ? "success" : "danger"}>
diff --git a/apps/console/src/pages/organizations/trustCenter/TrustCenterVendorsTab.tsx b/apps/console/src/pages/organizations/trustCenter/TrustCenterVendorsTab.tsx
index 6a57fad76..2853d5485 100644
--- a/apps/console/src/pages/organizations/trustCenter/TrustCenterVendorsTab.tsx
+++ b/apps/console/src/pages/organizations/trustCenter/TrustCenterVendorsTab.tsx
@@ -3,7 +3,7 @@ import { useTranslate } from "@probo/i18n";
 import { useOutletContext } from "react-router";
 import { TrustCenterVendorsCard } from "/components/trustCenter/TrustCenterVendorsCard";
 import { useTrustCenterVendorUpdate } from "/hooks/graph/TrustCenterVendorGraph";
-import type { TrustCenterVendorsCardFragment$key } from "/components/trustCenter/__generated__/TrustCenterVendorsCardFragment.graphql";
+import type { TrustCenterVendorsCardFragment$key } from "/__generated__/core/TrustCenterVendorsCardFragment.graphql";
 
 type ContextType = {
   organization: {
@@ -18,7 +18,8 @@ type ContextType = {
 export default function TrustCenterVendorsTab() {
   const { __ } = useTranslate();
   const { organization } = useOutletContext<ContextType>();
-  const [updateVendorVisibility, isUpdatingVendors] = useTrustCenterVendorUpdate();
+  const [updateVendorVisibility, isUpdatingVendors] =
+    useTrustCenterVendorUpdate();
 
   const vendors = organization.vendors?.edges?.map((edge) => edge.node) || [];
 
diff --git a/apps/console/src/pages/organizations/vendors/VendorDetailPage.tsx b/apps/console/src/pages/organizations/vendors/VendorDetailPage.tsx
index 3ee7a7305..d70c8e9e3 100644
--- a/apps/console/src/pages/organizations/vendors/VendorDetailPage.tsx
+++ b/apps/console/src/pages/organizations/vendors/VendorDetailPage.tsx
@@ -4,7 +4,7 @@ import {
   usePreloadedQuery,
   type PreloadedQuery,
 } from "react-relay";
-import type { VendorGraphNodeQuery } from "/hooks/graph/__generated__/VendorGraphNodeQuery.graphql";
+import type { VendorGraphNodeQuery } from "/__generated__/core/VendorGraphNodeQuery.graphql";
 import {
   useDeleteVendor,
   vendorConnectionKey,
@@ -27,7 +27,7 @@ import { Outlet, useParams } from "react-router";
 import { faviconUrl, validateSnapshotConsistency } from "@probo/helpers";
 import { ImportAssessmentDialog } from "./dialogs/ImportAssessmentDialog";
 import { complianceReportsFragment } from "./tabs/VendorComplianceTab";
-import type { VendorComplianceTabFragment$key } from "./tabs/__generated__/VendorComplianceTabFragment.graphql";
+import type { VendorComplianceTabFragment$key } from "/__generated__/core/VendorComplianceTabFragment.graphql";
 import { SnapshotBanner } from "/components/SnapshotBanner";
 import { use } from "react";
 import { PermissionsContext } from "/providers/PermissionsContext";
@@ -48,21 +48,23 @@ export default function VendorDetailPage(props: Props) {
   validateSnapshotConsistency(vendor, snapshotId);
   const deleteVendor = useDeleteVendor(
     vendor,
-    ConnectionHandler.getConnectionID(organizationId, vendorConnectionKey)
+    ConnectionHandler.getConnectionID(organizationId, vendorConnectionKey),
   );
   const logo = faviconUrl(vendor.websiteUrl);
   const reportsCount = useFragment(
     complianceReportsFragment,
-    vendor as VendorComplianceTabFragment$key
+    vendor as VendorComplianceTabFragment$key,
   ).complianceReports.edges.length;
 
-  const vendorsUrl = isSnapshotMode && snapshotId
-    ? `/organizations/${organizationId}/snapshots/${snapshotId}/vendors`
-    : `/organizations/${organizationId}/vendors`;
+  const vendorsUrl =
+    isSnapshotMode && snapshotId
+      ? `/organizations/${organizationId}/snapshots/${snapshotId}/vendors`
+      : `/organizations/${organizationId}/vendors`;
 
-  const baseVendorUrl = isSnapshotMode && snapshotId
-    ? `/organizations/${organizationId}/snapshots/${snapshotId}/vendors/${vendor.id}`
-    : `/organizations/${organizationId}/vendors/${vendor.id}`;
+  const baseVendorUrl =
+    isSnapshotMode && snapshotId
+      ? `/organizations/${organizationId}/snapshots/${snapshotId}/vendors/${vendor.id}`
+      : `/organizations/${organizationId}/vendors/${vendor.id}`;
 
   return (
     <div className="space-y-6">
@@ -114,9 +116,7 @@ export default function VendorDetailPage(props: Props) {
       </div>
 
       <Tabs>
-        <TabLink to={`${baseVendorUrl}/overview`}>
-          {__("Overview")}
-        </TabLink>
+        <TabLink to={`${baseVendorUrl}/overview`}>{__("Overview")}</TabLink>
         <TabLink to={`${baseVendorUrl}/certifications`}>
           {__("Certifications")}
         </TabLink>
@@ -124,15 +124,9 @@ export default function VendorDetailPage(props: Props) {
           {__("Compliance reports")}
           {reportsCount > 0 && <TabBadge>{reportsCount}</TabBadge>}
         </TabLink>
-        <TabLink to={`${baseVendorUrl}/risks`}>
-          {__("Risk Assessment")}
-        </TabLink>
-        <TabLink to={`${baseVendorUrl}/contacts`}>
-          {__("Contacts")}
-        </TabLink>
-        <TabLink to={`${baseVendorUrl}/services`}>
-          {__("Services")}
-        </TabLink>
+        <TabLink to={`${baseVendorUrl}/risks`}>{__("Risk Assessment")}</TabLink>
+        <TabLink to={`${baseVendorUrl}/contacts`}>{__("Contacts")}</TabLink>
+        <TabLink to={`${baseVendorUrl}/services`}>{__("Services")}</TabLink>
       </Tabs>
 
       <Outlet context={{ vendor }} />
diff --git a/apps/console/src/pages/organizations/vendors/VendorsPage.tsx b/apps/console/src/pages/organizations/vendors/VendorsPage.tsx
index ece1dec7c..97e99d2a3 100644
--- a/apps/console/src/pages/organizations/vendors/VendorsPage.tsx
+++ b/apps/console/src/pages/organizations/vendors/VendorsPage.tsx
@@ -30,11 +30,11 @@ import {
   useDeleteVendor,
   vendorsQuery,
 } from "/hooks/graph/VendorGraph";
-import type { VendorGraphListQuery } from "/hooks/graph/__generated__/VendorGraphListQuery.graphql";
+import type { VendorGraphListQuery } from "/__generated__/core/VendorGraphListQuery.graphql";
 import type {
   VendorGraphPaginatedFragment$data,
   VendorGraphPaginatedFragment$key,
-} from "/hooks/graph/__generated__/VendorGraphPaginatedFragment.graphql";
+} from "/__generated__/core/VendorGraphPaginatedFragment.graphql";
 import { SortableTable, SortableTh } from "/components/SortableTable";
 import { SnapshotBanner } from "/components/SnapshotBanner";
 import { use } from "react";
@@ -56,7 +56,7 @@ export default function VendorsPage(props: Props) {
   const data = usePreloadedQuery(vendorsQuery, props.queryRef);
   const pagination = usePaginationFragment(
     paginatedVendorsFragment,
-    data.node as VendorGraphPaginatedFragment$key
+    data.node as VendorGraphPaginatedFragment$key,
   );
 
   const vendors = pagination.data.vendors?.edges.map((edge) => edge.node);
@@ -64,10 +64,10 @@ export default function VendorsPage(props: Props) {
 
   usePageTitle(__("Vendors"));
 
-  const hasAnyAction = !isSnapshotMode && (
-    isAuthorized("Vendor", "updateVendor") ||
-    isAuthorized("Vendor", "deleteVendor")
-  );
+  const hasAnyAction =
+    !isSnapshotMode &&
+    (isAuthorized("Vendor", "updateVendor") ||
+      isAuthorized("Vendor", "deleteVendor"));
 
   return (
     <div className="space-y-6">
@@ -75,18 +75,16 @@ export default function VendorsPage(props: Props) {
       <PageHeader
         title={__("Vendors")}
         description={__(
-          "Vendors are third-party services that your company uses. Add them to keep track of their risk and compliance status."
+          "Vendors are third-party services that your company uses. Add them to keep track of their risk and compliance status.",
         )}
       >
-        {!isSnapshotMode && (
-          isAuthorized("Organization", "createVendor") && (
-            <CreateVendorDialog
-              connection={connectionId}
-              organizationId={organizationId}
-            >
-              <Button icon={IconPlusLarge}>{__("Add vendor")}</Button>
-            </CreateVendorDialog>
-          )
+        {!isSnapshotMode && isAuthorized("Organization", "createVendor") && (
+          <CreateVendorDialog
+            connection={connectionId}
+            organizationId={organizationId}
+          >
+            <Button icon={IconPlusLarge}>{__("Add vendor")}</Button>
+          </CreateVendorDialog>
         )}
       </PageHeader>
       <SortableTable {...pagination}>
@@ -133,9 +131,10 @@ function VendorRow({
   const { isAuthorized } = use(PermissionsContext);
   const deleteVendor = useDeleteVendor(vendor, connectionId);
 
-  const vendorUrl = isSnapshotMode && snapshotId
-    ? `/organizations/${organizationId}/snapshots/${snapshotId}/vendors/${vendor.id}/overview`
-    : `/organizations/${organizationId}/vendors/${vendor.id}/overview`;
+  const vendorUrl =
+    isSnapshotMode && snapshotId
+      ? `/organizations/${organizationId}/snapshots/${snapshotId}/vendors/${vendor.id}/overview`
+      : `/organizations/${organizationId}/vendors/${vendor.id}/overview`;
 
   return (
     <>
diff --git a/apps/console/src/pages/organizations/vendors/tabs/VendorCertificationsTab.tsx b/apps/console/src/pages/organizations/vendors/tabs/VendorCertificationsTab.tsx
index 41abc1f78..89d98dbbb 100644
--- a/apps/console/src/pages/organizations/vendors/tabs/VendorCertificationsTab.tsx
+++ b/apps/console/src/pages/organizations/vendors/tabs/VendorCertificationsTab.tsx
@@ -10,7 +10,7 @@ import {
 } from "@probo/ui";
 import { Controller } from "react-hook-form";
 import { useVendorForm } from "/hooks/forms/useVendorForm";
-import type { useVendorFormFragment$key } from "/hooks/forms/__generated__/useVendorFormFragment.graphql";
+import type { useVendorFormFragment$key } from "/__generated__/core/useVendorFormFragment.graphql";
 import { useOutletContext, useParams } from "react-router";
 import {
   certificationCategoryLabel,
@@ -36,7 +36,10 @@ export default function VendorCertificationsTab() {
   const canUpdateVendor = isAuthorized("Vendor", "updateVendor");
 
   return (
-    <form className="space-y-4" onSubmit={!isSnapshotMode && canUpdateVendor ? handleSubmit : undefined}>
+    <form
+      className="space-y-4"
+      onSubmit={!isSnapshotMode && canUpdateVendor ? handleSubmit : undefined}
+    >
       <Card padded>
         <Controller
           control={control}
@@ -75,7 +78,7 @@ function Certifications(props: CertificationsProps) {
   const categories = objectEntries(certifications)
     .map(
       ([key, value]) =>
-        [key, value.filter((c) => props.value.includes(c))] as const
+        [key, value.filter((c) => props.value.includes(c))] as const,
     )
     .filter(([, certifications]) => certifications.length > 0);
   categories.push([
@@ -112,7 +115,7 @@ function Certifications(props: CertificationsProps) {
                     className={clsx(
                       "hover:bg-subtle-hover cursor-pointer",
                       animateBadge.current &&
-                        "starting:opacity-0 starting:w-0 w-max transition-all duration-500 starting:bg-accent"
+                        "starting:opacity-0 starting:w-0 w-max transition-all duration-500 starting:bg-accent",
                     )}
                   >
                     {certification}
@@ -129,7 +132,7 @@ function Certifications(props: CertificationsProps) {
       {!props.readOnly && (
         <CertificationInput
           certifications={categorizedCertifications.filter(
-            (c) => !props.value.includes(c)
+            (c) => !props.value.includes(c),
           )}
           onAdd={addCertificate}
         />
@@ -152,7 +155,7 @@ function CertificationInput({
   const [search, setSearch] = useState("");
   const isCustom = !certifications.includes(search.trim());
   const filteredCertifications = certifications.filter((c) =>
-    c.toLowerCase().includes(search.toLowerCase())
+    c.toLowerCase().includes(search.toLowerCase()),
   );
 
   return (
diff --git a/apps/console/src/pages/organizations/vendors/tabs/VendorComplianceTab.tsx b/apps/console/src/pages/organizations/vendors/tabs/VendorComplianceTab.tsx
index a8ac014ef..8cd5a0169 100644
--- a/apps/console/src/pages/organizations/vendors/tabs/VendorComplianceTab.tsx
+++ b/apps/console/src/pages/organizations/vendors/tabs/VendorComplianceTab.tsx
@@ -1,6 +1,6 @@
 import { useOutletContext, useParams } from "react-router";
 import { graphql } from "relay-runtime";
-import type { VendorComplianceTabFragment$key } from "./__generated__/VendorComplianceTabFragment.graphql";
+import type { VendorComplianceTabFragment$key } from "/__generated__/core/VendorComplianceTabFragment.graphql";
 import { useTranslate } from "@probo/i18n";
 import { usePageTitle } from "@probo/hooks";
 import {
@@ -16,7 +16,7 @@ import {
   useConfirm,
 } from "@probo/ui";
 import { useFragment, useMutation, useRefetchableFragment } from "react-relay";
-import type { VendorComplianceTabFragment_report$key } from "./__generated__/VendorComplianceTabFragment_report.graphql";
+import type { VendorComplianceTabFragment_report$key } from "/__generated__/core/VendorComplianceTabFragment_report.graphql";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
 import { sprintf, fileSize, formatDate } from "@probo/helpers";
 import { SortableTable, SortableTh } from "/components/SortableTable";
@@ -58,9 +58,9 @@ const complianceReportFragment = graphql`
     validUntil
     reportName
     file {
-          fileName
-          mimeType
-          size
+      fileName
+      mimeType
+      size
     }
   }
 `;
@@ -98,7 +98,7 @@ export default function VendorComplianceTab() {
   }>();
   const [data, refetch] = useRefetchableFragment(
     complianceReportsFragment,
-    vendor
+    vendor,
   );
   const connectionId = data.complianceReports.__id;
   const reports = data.complianceReports.edges.map((edge) => edge.node);
@@ -106,8 +106,14 @@ export default function VendorComplianceTab() {
   const { snapshotId } = useParams<{ snapshotId?: string }>();
   const isSnapshotMode = Boolean(snapshotId);
   const { isAuthorized } = use(PermissionsContext);
-  const canUploadReport = isAuthorized("Vendor", "uploadVendorComplianceReport");
-  const canDeleteReport = isAuthorized("VendorComplianceReport", "deleteVendorComplianceReport");
+  const canUploadReport = isAuthorized(
+    "Vendor",
+    "uploadVendorComplianceReport",
+  );
+  const canDeleteReport = isAuthorized(
+    "VendorComplianceReport",
+    "deleteVendorComplianceReport",
+  );
 
   usePageTitle(vendor.name + " - " + __("Compliance reports"));
 
@@ -183,7 +189,7 @@ function ReportRow(props: ReportRowProps) {
   const { __ } = useTranslate();
   const report = useFragment<VendorComplianceTabFragment_report$key>(
     complianceReportFragment,
-    props.reportKey
+    props.reportKey,
   );
   const confirm = useConfirm();
   const [deleteReport] = useMutationWithToasts(deleteReportMutation, {
@@ -205,11 +211,11 @@ function ReportRow(props: ReportRowProps) {
       {
         message: sprintf(
           __(
-            'This will permanently delete the report "%s". This action cannot be undone.'
+            'This will permanently delete the report "%s". This action cannot be undone.',
           ),
-          report.reportName
+          report.reportName,
         ),
-      }
+      },
     );
   };
 
diff --git a/apps/console/src/pages/organizations/vendors/tabs/VendorContactsTab.tsx b/apps/console/src/pages/organizations/vendors/tabs/VendorContactsTab.tsx
index 91bc6bd97..1d264ea1a 100644
--- a/apps/console/src/pages/organizations/vendors/tabs/VendorContactsTab.tsx
+++ b/apps/console/src/pages/organizations/vendors/tabs/VendorContactsTab.tsx
@@ -1,6 +1,6 @@
 import { useOutletContext, useParams } from "react-router";
 import { graphql } from "relay-runtime";
-import type { VendorContactsTabFragment$key } from "./__generated__/VendorContactsTabFragment.graphql";
+import type { VendorContactsTabFragment$key } from "/__generated__/core/VendorContactsTabFragment.graphql";
 import { useTranslate } from "@probo/i18n";
 import { usePageTitle } from "@probo/hooks";
 import {
@@ -19,7 +19,7 @@ import {
   useConfirm,
 } from "@probo/ui";
 import { useFragment, useRefetchableFragment } from "react-relay";
-import type { VendorContactsTabFragment_contact$key } from "./__generated__/VendorContactsTabFragment_contact.graphql";
+import type { VendorContactsTabFragment_contact$key } from "/__generated__/core/VendorContactsTabFragment_contact.graphql";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
 import { sprintf } from "@probo/helpers";
 import { SortableTable, SortableTh } from "/components/SortableTable";
@@ -85,7 +85,7 @@ export default function VendorContactsTab() {
   }>();
   const [data, refetch] = useRefetchableFragment(
     vendorContactsFragment,
-    vendor
+    vendor,
   );
   const connectionId = data.contacts.__id;
   const contacts = data.contacts.edges.map((edge) => edge.node);
@@ -114,10 +114,7 @@ export default function VendorContactsTab() {
         description={__("Manage vendor contacts and their information.")}
       >
         {!isSnapshotMode && canCreateContact && (
-          <CreateContactDialog
-            vendorId={vendor.id}
-            connectionId={connectionId}
-          >
+          <CreateContactDialog vendorId={vendor.id} connectionId={connectionId}>
             <Button icon={IconPlusLarge}>{__("Add contact")}</Button>
           </CreateContactDialog>
         )}
@@ -178,7 +175,7 @@ function ContactRow(props: ContactRowProps) {
   const { __ } = useTranslate();
   const contact = useFragment<VendorContactsTabFragment_contact$key>(
     contactFragment,
-    props.contactKey
+    props.contactKey,
   );
   const confirm = useConfirm();
   const [deleteContact] = useMutationWithToasts(deleteContactMutation, {
@@ -201,11 +198,11 @@ function ContactRow(props: ContactRowProps) {
       {
         message: sprintf(
           __(
-            'This will permanently delete the contact "%s". This action cannot be undone.'
+            'This will permanently delete the contact "%s". This action cannot be undone.',
           ),
-          contact.fullName || contact.email || __("Unnamed contact")
+          contact.fullName || contact.email || __("Unnamed contact"),
         ),
-      }
+      },
     );
   };
 
@@ -243,13 +240,15 @@ function ContactRow(props: ContactRowProps) {
             {props.canUpdate && (
               <DropdownItem
                 icon={IconPencil}
-                onClick={() => props.onEdit({
-                  id: contact.id,
-                  fullName: contact.fullName,
-                  email: contact.email,
-                  phone: contact.phone,
-                  role: contact.role,
-                })}
+                onClick={() =>
+                  props.onEdit({
+                    id: contact.id,
+                    fullName: contact.fullName,
+                    email: contact.email,
+                    phone: contact.phone,
+                    role: contact.role,
+                  })
+                }
               >
                 {__("Edit")}
               </DropdownItem>
diff --git a/apps/console/src/pages/organizations/vendors/tabs/VendorOverviewTab.tsx b/apps/console/src/pages/organizations/vendors/tabs/VendorOverviewTab.tsx
index b09bfca7a..1dbfcf407 100644
--- a/apps/console/src/pages/organizations/vendors/tabs/VendorOverviewTab.tsx
+++ b/apps/console/src/pages/organizations/vendors/tabs/VendorOverviewTab.tsx
@@ -1,7 +1,16 @@
 import { useTranslate } from "@probo/i18n";
 import { useVendorForm } from "/hooks/forms/useVendorForm";
 import { useOutletContext, useParams } from "react-router";
-import { Button, Card, Field, Input, IconPlusLarge, IconTrashCan, IconPencil, Option } from "@probo/ui";
+import {
+  Button,
+  Card,
+  Field,
+  Input,
+  IconPlusLarge,
+  IconTrashCan,
+  IconPencil,
+  Option,
+} from "@probo/ui";
 import { PeopleSelectField } from "/components/form/PeopleSelectField";
 import { ControlledField } from "/components/form/ControlledField";
 import { CountriesField } from "/components/form/CountriesField";
@@ -16,9 +25,9 @@ import { EditBusinessAssociateAgreementDialog } from "../dialogs/EditBusinessAss
 import { UploadDataPrivacyAgreementDialog } from "../dialogs/UploadDataPrivacyAgreementDialog";
 import { DeleteDataPrivacyAgreementDialog } from "../dialogs/DeleteDataPrivacyAgreementDialog";
 import { EditDataPrivacyAgreementDialog } from "../dialogs/EditDataPrivacyAgreementDialog";
-import type { useVendorFormFragment$key } from "/hooks/forms/__generated__/useVendorFormFragment.graphql";
-import type { VendorOverviewTabBusinessAssociateAgreementFragment$key } from "./__generated__/VendorOverviewTabBusinessAssociateAgreementFragment.graphql";
-import type { VendorOverviewTabDataPrivacyAgreementFragment$key } from "./__generated__/VendorOverviewTabDataPrivacyAgreementFragment.graphql";
+import type { useVendorFormFragment$key } from "/__generated__/core/useVendorFormFragment.graphql";
+import type { VendorOverviewTabBusinessAssociateAgreementFragment$key } from "/__generated__/core/VendorOverviewTabBusinessAssociateAgreementFragment.graphql";
+import type { VendorOverviewTabDataPrivacyAgreementFragment$key } from "/__generated__/core/VendorOverviewTabDataPrivacyAgreementFragment.graphql";
 import type { VendorCategory } from "@probo/vendors";
 import { PermissionsContext } from "/providers/PermissionsContext";
 
@@ -54,25 +63,47 @@ export default function VendorOverviewTab() {
   }>();
 
   const { vendor: vendorForBAA } = useOutletContext<{
-    vendor: VendorOverviewTabBusinessAssociateAgreementFragment$key & VendorOverviewTabDataPrivacyAgreementFragment$key;
+    vendor: VendorOverviewTabBusinessAssociateAgreementFragment$key &
+      VendorOverviewTabDataPrivacyAgreementFragment$key;
   }>();
 
   const { __ } = useTranslate();
   const { isAuthorized } = use(PermissionsContext);
   const canUpdateVendor = isAuthorized("Vendor", "updateVendor");
-  const canUploadBAA = isAuthorized("Vendor", "uploadVendorBusinessAssociateAgreement");
-  const canUpdateBAA = isAuthorized("Vendor", "updateVendorBusinessAssociateAgreement");
-  const canDeleteBAA = isAuthorized("Vendor", "deleteVendorBusinessAssociateAgreement");
-  const canUploadDPA = isAuthorized("Vendor", "uploadVendorDataPrivacyAgreement");
-  const canUpdateDPA = isAuthorized("Vendor", "updateVendorDataPrivacyAgreement");
-  const canDeleteDPA = isAuthorized("Vendor", "deleteVendorDataPrivacyAgreement");
+  const canUploadBAA = isAuthorized(
+    "Vendor",
+    "uploadVendorBusinessAssociateAgreement",
+  );
+  const canUpdateBAA = isAuthorized(
+    "Vendor",
+    "updateVendorBusinessAssociateAgreement",
+  );
+  const canDeleteBAA = isAuthorized(
+    "Vendor",
+    "deleteVendorBusinessAssociateAgreement",
+  );
+  const canUploadDPA = isAuthorized(
+    "Vendor",
+    "uploadVendorDataPrivacyAgreement",
+  );
+  const canUpdateDPA = isAuthorized(
+    "Vendor",
+    "updateVendorDataPrivacyAgreement",
+  );
+  const canDeleteDPA = isAuthorized(
+    "Vendor",
+    "deleteVendorDataPrivacyAgreement",
+  );
   const vendorCategories: { value: VendorCategory; label: string }[] = [
     { value: "ANALYTICS", label: __("Analytics") },
     { value: "CLOUD_MONITORING", label: __("Cloud Monitoring") },
     { value: "CLOUD_PROVIDER", label: __("Cloud Provider") },
     { value: "COLLABORATION", label: __("Collaboration") },
     { value: "CUSTOMER_SUPPORT", label: __("Customer Support") },
-    { value: "DATA_STORAGE_AND_PROCESSING", label: __("Data Storage and Processing") },
+    {
+      value: "DATA_STORAGE_AND_PROCESSING",
+      label: __("Data Storage and Processing"),
+    },
     { value: "DOCUMENT_MANAGEMENT", label: __("Document Management") },
     { value: "EMPLOYEE_MANAGEMENT", label: __("Employee Management") },
     { value: "ENGINEERING", label: __("Engineering") },
@@ -101,16 +132,18 @@ export default function VendorOverviewTab() {
     formState: { errors, isSubmitting },
   } = useVendorForm(vendor);
 
-  const vendorWithBAA = useFragment<VendorOverviewTabBusinessAssociateAgreementFragment$key>(
-    vendorBusinessAssociateAgreementFragment,
-    vendorForBAA
-  );
+  const vendorWithBAA =
+    useFragment<VendorOverviewTabBusinessAssociateAgreementFragment$key>(
+      vendorBusinessAssociateAgreementFragment,
+      vendorForBAA,
+    );
   const businessAssociateAgreement = vendorWithBAA.businessAssociateAgreement;
 
-  const vendorWithDPA = useFragment<VendorOverviewTabDataPrivacyAgreementFragment$key>(
-    vendorDataPrivacyAgreementFragment,
-    vendorForBAA
-  );
+  const vendorWithDPA =
+    useFragment<VendorOverviewTabDataPrivacyAgreementFragment$key>(
+      vendorDataPrivacyAgreementFragment,
+      vendorForBAA,
+    );
   const dataPrivacyAgreement = vendorWithDPA.dataPrivacyAgreement;
 
   const urls = useMemo(
@@ -138,7 +171,10 @@ export default function VendorOverviewTab() {
   const isFormDisabled = isSubmitting || isSnapshotMode || !canUpdateVendor;
 
   return (
-    <form onSubmit={isSnapshotMode || !canUpdateVendor ? undefined : handleSubmit} className="space-y-12">
+    <form
+      onSubmit={isSnapshotMode || !canUpdateVendor ? undefined : handleSubmit}
+      className="space-y-12"
+    >
       {/* Vendor Details */}
       <div className="space-y-4">
         <h2 className="text-base font-medium">{__("Vendor details")}</h2>
@@ -272,17 +308,18 @@ export default function VendorOverviewTab() {
                 {__("Business Associate Agreement")}
               </h3>
               <p className="text-sm text-txt-secondary mt-1">
-                {businessAssociateAgreement ? businessAssociateAgreement.fileName : __("No business associate agreement available")}
+                {businessAssociateAgreement
+                  ? businessAssociateAgreement.fileName
+                  : __("No business associate agreement available")}
               </p>
-              {(businessAssociateAgreement?.validFrom || businessAssociateAgreement?.validUntil) && (
+              {(businessAssociateAgreement?.validFrom ||
+                businessAssociateAgreement?.validUntil) && (
                 <p className="text-xs text-txt-secondary mt-1">
                   {__("Valid")}
                   {businessAssociateAgreement.validFrom &&
-                    ` ${__("from")} ${formatDate(businessAssociateAgreement.validFrom)}`
-                  }
+                    ` ${__("from")} ${formatDate(businessAssociateAgreement.validFrom)}`}
                   {businessAssociateAgreement.validUntil &&
-                    ` ${__("until")} ${formatDate(businessAssociateAgreement.validUntil)}`
-                  }
+                    ` ${__("until")} ${formatDate(businessAssociateAgreement.validUntil)}`}
                 </p>
               )}
             </div>
@@ -292,7 +329,12 @@ export default function VendorOverviewTab() {
                   <Button
                     type="button"
                     variant="secondary"
-                    onClick={() => downloadFile(businessAssociateAgreement.fileUrl, businessAssociateAgreement.fileName)}
+                    onClick={() =>
+                      downloadFile(
+                        businessAssociateAgreement.fileUrl,
+                        businessAssociateAgreement.fileName,
+                      )
+                    }
                   >
                     {__("Download PDF")}
                   </Button>
@@ -319,7 +361,8 @@ export default function VendorOverviewTab() {
                   )}
                 </>
               ) : (
-                !isSnapshotMode && canUploadBAA && (
+                !isSnapshotMode &&
+                canUploadBAA && (
                   <UploadBusinessAssociateAgreementDialog
                     vendorId={vendor.id}
                     onSuccess={() => window.location.reload()}
@@ -339,17 +382,18 @@ export default function VendorOverviewTab() {
                 {__("Data Privacy Agreement")}
               </h3>
               <p className="text-sm text-txt-secondary mt-1">
-                {dataPrivacyAgreement ? dataPrivacyAgreement.fileName : __("No data privacy agreement available")}
+                {dataPrivacyAgreement
+                  ? dataPrivacyAgreement.fileName
+                  : __("No data privacy agreement available")}
               </p>
-              {(dataPrivacyAgreement?.validFrom || dataPrivacyAgreement?.validUntil) && (
+              {(dataPrivacyAgreement?.validFrom ||
+                dataPrivacyAgreement?.validUntil) && (
                 <p className="text-xs text-txt-secondary mt-1">
                   {__("Valid")}
                   {dataPrivacyAgreement.validFrom &&
-                    ` ${__("from")} ${formatDate(dataPrivacyAgreement.validFrom)}`
-                  }
+                    ` ${__("from")} ${formatDate(dataPrivacyAgreement.validFrom)}`}
                   {dataPrivacyAgreement.validUntil &&
-                    ` ${__("until")} ${formatDate(dataPrivacyAgreement.validUntil)}`
-                  }
+                    ` ${__("until")} ${formatDate(dataPrivacyAgreement.validUntil)}`}
                 </p>
               )}
             </div>
@@ -359,7 +403,12 @@ export default function VendorOverviewTab() {
                   <Button
                     type="button"
                     variant="secondary"
-                    onClick={() => downloadFile(dataPrivacyAgreement.fileUrl, dataPrivacyAgreement.fileName)}
+                    onClick={() =>
+                      downloadFile(
+                        dataPrivacyAgreement.fileUrl,
+                        dataPrivacyAgreement.fileName,
+                      )
+                    }
                   >
                     {__("Download PDF")}
                   </Button>
@@ -386,7 +435,8 @@ export default function VendorOverviewTab() {
                   )}
                 </>
               ) : (
-                !isSnapshotMode && canUploadDPA && (
+                !isSnapshotMode &&
+                canUploadDPA && (
                   <UploadDataPrivacyAgreementDialog
                     vendorId={vendor.id}
                     onSuccess={() => window.location.reload()}
diff --git a/apps/console/src/pages/organizations/vendors/tabs/VendorRiskAssessmentTab.tsx b/apps/console/src/pages/organizations/vendors/tabs/VendorRiskAssessmentTab.tsx
index c77c2867d..64da5bc3f 100644
--- a/apps/console/src/pages/organizations/vendors/tabs/VendorRiskAssessmentTab.tsx
+++ b/apps/console/src/pages/organizations/vendors/tabs/VendorRiskAssessmentTab.tsx
@@ -1,6 +1,6 @@
 import { useOutletContext, useParams } from "react-router";
 import { graphql } from "relay-runtime";
-import type { VendorRiskAssessmentTabFragment$key } from "./__generated__/VendorRiskAssessmentTabFragment.graphql";
+import type { VendorRiskAssessmentTabFragment$key } from "/__generated__/core/VendorRiskAssessmentTabFragment.graphql";
 import { useTranslate } from "@probo/i18n";
 import { usePageTitle } from "@probo/hooks";
 import {
@@ -17,7 +17,7 @@ import {
 } from "@probo/ui";
 import { formatDate } from "@probo/helpers";
 import { useFragment, useRefetchableFragment } from "react-relay";
-import type { VendorRiskAssessmentTabFragment_assessment$key } from "./__generated__/VendorRiskAssessmentTabFragment_assessment.graphql";
+import type { VendorRiskAssessmentTabFragment_assessment$key } from "/__generated__/core/VendorRiskAssessmentTabFragment_assessment.graphql";
 import { SortableTable, SortableTh } from "/components/SortableTable";
 import { CreateRiskAssessmentDialog } from "../dialogs/CreateRiskAssessmentDialog";
 import clsx from "clsx";
@@ -75,7 +75,7 @@ export default function VendorRiskAssessmentTab() {
   }>();
   const [data, refetch] = useRefetchableFragment(
     riskAssessmentsFragment,
-    vendor
+    vendor,
   );
   const assessments = data.riskAssessments.edges.map((edge) => edge.node);
   const { __ } = useTranslate();
@@ -83,7 +83,10 @@ export default function VendorRiskAssessmentTab() {
   const isSnapshotMode = Boolean(snapshotId);
   const [expanded, setExpanded] = useState<string | null>(null);
   const { isAuthorized } = use(PermissionsContext);
-  const canCreateRiskAssessment = isAuthorized("Vendor", "createVendorRiskAssessment");
+  const canCreateRiskAssessment = isAuthorized(
+    "Vendor",
+    "createVendorRiskAssessment",
+  );
 
   usePageTitle(vendor.name + " - " + __("Risk Assessments"));
 
@@ -136,7 +139,7 @@ export default function VendorRiskAssessmentTab() {
                 isExpanded={expanded === assessment.id}
                 onClick={() =>
                   setExpanded((prev) =>
-                    prev === assessment.id ? null : assessment.id
+                    prev === assessment.id ? null : assessment.id,
                   )
                 }
               />
@@ -159,7 +162,7 @@ function AssessmentRow(props: AssessmentRowProps) {
   const assessment =
     useFragment<VendorRiskAssessmentTabFragment_assessment$key>(
       riskAssessmentFragment,
-      props.assessmentKey
+      props.assessmentKey,
     );
   const { relativeDateFormat } = useTranslate();
   const isExpired = new Date(assessment.expiresAt) < new Date();
@@ -170,7 +173,7 @@ function AssessmentRow(props: AssessmentRowProps) {
         className={clsx(
           isExpired && "opacity-50",
           "cursor-pointer",
-          props.isExpanded && "border-none"
+          props.isExpanded && "border-none",
         )}
         onClick={() => props.onClick(assessment.id)}
       >
diff --git a/apps/console/src/pages/organizations/vendors/tabs/VendorServicesTab.tsx b/apps/console/src/pages/organizations/vendors/tabs/VendorServicesTab.tsx
index ccc6f0590..df60bb963 100644
--- a/apps/console/src/pages/organizations/vendors/tabs/VendorServicesTab.tsx
+++ b/apps/console/src/pages/organizations/vendors/tabs/VendorServicesTab.tsx
@@ -1,6 +1,6 @@
 import { useOutletContext, useParams } from "react-router";
 import { graphql } from "relay-runtime";
-import type { VendorServicesTabFragment$key } from "./__generated__/VendorServicesTabFragment.graphql";
+import type { VendorServicesTabFragment$key } from "/__generated__/core/VendorServicesTabFragment.graphql";
 import { useTranslate } from "@probo/i18n";
 import { usePageTitle } from "@probo/hooks";
 import {
@@ -19,7 +19,7 @@ import {
   useConfirm,
 } from "@probo/ui";
 import { useFragment, useRefetchableFragment } from "react-relay";
-import type { VendorServicesTabFragment_service$key } from "./__generated__/VendorServicesTabFragment_service.graphql";
+import type { VendorServicesTabFragment_service$key } from "/__generated__/core/VendorServicesTabFragment_service.graphql";
 import { useMutationWithToasts } from "/hooks/useMutationWithToasts";
 import { sprintf } from "@probo/helpers";
 import { SortableTable, SortableTh } from "/components/SortableTable";
@@ -83,7 +83,7 @@ export default function VendorServicesTab() {
   }>();
   const [data, refetch] = useRefetchableFragment(
     vendorServicesFragment,
-    vendor
+    vendor,
   );
   const connectionId = data.services.__id;
   const services = data.services.edges.map((edge) => edge.node);
@@ -110,10 +110,7 @@ export default function VendorServicesTab() {
         description={__("Manage services provided by this vendor.")}
       >
         {!isSnapshotMode && canCreateService && (
-          <CreateServiceDialog
-            vendorId={vendor.id}
-            connectionId={connectionId}
-          >
+          <CreateServiceDialog vendorId={vendor.id} connectionId={connectionId}>
             <Button icon={IconPlusLarge}>{__("Add service")}</Button>
           </CreateServiceDialog>
         )}
@@ -170,7 +167,7 @@ function ServiceRow(props: ServiceRowProps) {
   const { __ } = useTranslate();
   const service = useFragment<VendorServicesTabFragment_service$key>(
     serviceFragment,
-    props.serviceKey
+    props.serviceKey,
   );
   const confirm = useConfirm();
   const [deleteService] = useMutationWithToasts(deleteServiceMutation, {
@@ -193,11 +190,11 @@ function ServiceRow(props: ServiceRowProps) {
       {
         message: sprintf(
           __(
-            'This will permanently delete the service "%s". This action cannot be undone.'
+            'This will permanently delete the service "%s". This action cannot be undone.',
           ),
-          service.name
+          service.name,
         ),
-      }
+      },
     );
   };
 
@@ -211,11 +208,13 @@ function ServiceRow(props: ServiceRowProps) {
             {props.canUpdate && (
               <DropdownItem
                 icon={IconPencil}
-                onClick={() => props.onEdit({
-                  id: service.id,
-                  name: service.name,
-                  description: service.description,
-                })}
+                onClick={() =>
+                  props.onEdit({
+                    id: service.id,
+                    name: service.name,
+                    description: service.description,
+                  })
+                }
               >
                 {__("Edit")}
               </DropdownItem>
diff --git a/apps/console/src/routes/assetRoutes.ts b/apps/console/src/routes/assetRoutes.ts
index 75ed36fb7..47c18121d 100644
--- a/apps/console/src/routes/assetRoutes.ts
+++ b/apps/console/src/routes/assetRoutes.ts
@@ -3,8 +3,8 @@ import { coreEnvironment } from "/environments";
 import { PageSkeleton } from "/components/skeletons/PageSkeleton";
 import { lazy } from "@probo/react-lazy";
 import { assetsQuery, assetNodeQuery } from "../hooks/graph/AssetGraph";
-import type { AssetGraphListQuery } from "/hooks/graph/__generated__/AssetGraphListQuery.graphql";
-import type { AssetGraphNodeQuery } from "/hooks/graph/__generated__/AssetGraphNodeQuery.graphql";
+import type { AssetGraphListQuery } from "/__generated__/core/AssetGraphListQuery.graphql";
+import type { AssetGraphNodeQuery } from "/__generated__/core/AssetGraphNodeQuery.graphql";
 import {
   loaderFromQueryLoader,
   withQueryRef,
diff --git a/apps/console/src/routes/auditRoutes.ts b/apps/console/src/routes/auditRoutes.ts
index 02f55bb61..67e91ded6 100644
--- a/apps/console/src/routes/auditRoutes.ts
+++ b/apps/console/src/routes/auditRoutes.ts
@@ -3,8 +3,8 @@ import { coreEnvironment } from "/environments";
 import { PageSkeleton } from "/components/skeletons/PageSkeleton";
 import { lazy } from "@probo/react-lazy";
 import { auditsQuery, auditNodeQuery } from "../hooks/graph/AuditGraph";
-import type { AuditGraphListQuery } from "/hooks/graph/__generated__/AuditGraphListQuery.graphql";
-import type { AuditGraphNodeQuery } from "/hooks/graph/__generated__/AuditGraphNodeQuery.graphql";
+import type { AuditGraphListQuery } from "/__generated__/core/AuditGraphListQuery.graphql";
+import type { AuditGraphNodeQuery } from "/__generated__/core/AuditGraphNodeQuery.graphql";
 import {
   loaderFromQueryLoader,
   withQueryRef,
diff --git a/apps/console/src/routes/continualImprovementRoutes.ts b/apps/console/src/routes/continualImprovementRoutes.ts
index a5c2a1137..6764dc0ff 100644
--- a/apps/console/src/routes/continualImprovementRoutes.ts
+++ b/apps/console/src/routes/continualImprovementRoutes.ts
@@ -6,8 +6,8 @@ import {
   continualImprovementsQuery,
   continualImprovementNodeQuery,
 } from "/hooks/graph/ContinualImprovementGraph";
-import type { ContinualImprovementGraphListQuery } from "/hooks/graph/__generated__/ContinualImprovementGraphListQuery.graphql";
-import type { ContinualImprovementGraphNodeQuery } from "/hooks/graph/__generated__/ContinualImprovementGraphNodeQuery.graphql";
+import type { ContinualImprovementGraphListQuery } from "/__generated__/core/ContinualImprovementGraphListQuery.graphql";
+import type { ContinualImprovementGraphNodeQuery } from "/__generated__/core/ContinualImprovementGraphNodeQuery.graphql";
 import {
   loaderFromQueryLoader,
   withQueryRef,
diff --git a/apps/console/src/routes/dataRoutes.ts b/apps/console/src/routes/dataRoutes.ts
index fd62155e5..b15ca79ec 100644
--- a/apps/console/src/routes/dataRoutes.ts
+++ b/apps/console/src/routes/dataRoutes.ts
@@ -3,8 +3,8 @@ import { coreEnvironment } from "/environments";
 import { PageSkeleton } from "/components/skeletons/PageSkeleton";
 import { lazy } from "@probo/react-lazy";
 import { dataQuery, datumNodeQuery } from "../hooks/graph/DatumGraph";
-import type { DatumGraphListQuery } from "/hooks/graph/__generated__/DatumGraphListQuery.graphql";
-import type { DatumGraphNodeQuery } from "/hooks/graph/__generated__/DatumGraphNodeQuery.graphql";
+import type { DatumGraphListQuery } from "/__generated__/core/DatumGraphListQuery.graphql";
+import type { DatumGraphNodeQuery } from "/__generated__/core/DatumGraphNodeQuery.graphql";
 import {
   loaderFromQueryLoader,
   withQueryRef,
diff --git a/apps/console/src/routes/documentsRoutes.ts b/apps/console/src/routes/documentsRoutes.ts
index ccb75da95..77bcee5b6 100644
--- a/apps/console/src/routes/documentsRoutes.ts
+++ b/apps/console/src/routes/documentsRoutes.ts
@@ -12,8 +12,8 @@ import {
   withQueryRef,
   type AppRoute,
 } from "@probo/routes";
-import type { DocumentGraphListQuery } from "/hooks/graph/__generated__/DocumentGraphListQuery.graphql";
-import type { DocumentGraphNodeQuery } from "/hooks/graph/__generated__/DocumentGraphNodeQuery.graphql";
+import type { DocumentGraphListQuery } from "/__generated__/core/DocumentGraphListQuery.graphql";
+import type { DocumentGraphNodeQuery } from "/__generated__/core/DocumentGraphNodeQuery.graphql";
 
 const documentTabs = (prefix: string) => {
   return [
diff --git a/apps/console/src/routes/frameworkRoutes.ts b/apps/console/src/routes/frameworkRoutes.ts
index a52b7252e..fc479aa93 100644
--- a/apps/console/src/routes/frameworkRoutes.ts
+++ b/apps/console/src/routes/frameworkRoutes.ts
@@ -14,9 +14,9 @@ import {
   withQueryRef,
   type AppRoute,
 } from "@probo/routes";
-import type { FrameworkGraphListQuery } from "/hooks/graph/__generated__/FrameworkGraphListQuery.graphql";
-import type { FrameworkGraphNodeQuery } from "/hooks/graph/__generated__/FrameworkGraphNodeQuery.graphql";
-import type { FrameworkGraphControlNodeQuery } from "/hooks/graph/__generated__/FrameworkGraphControlNodeQuery.graphql";
+import type { FrameworkGraphListQuery } from "/__generated__/core/FrameworkGraphListQuery.graphql";
+import type { FrameworkGraphNodeQuery } from "/__generated__/core/FrameworkGraphNodeQuery.graphql";
+import type { FrameworkGraphControlNodeQuery } from "/__generated__/core/FrameworkGraphControlNodeQuery.graphql";
 
 export const frameworkRoutes = [
   {
diff --git a/apps/console/src/routes/measureRoutes.ts b/apps/console/src/routes/measureRoutes.ts
index 328185b2c..283ede5eb 100644
--- a/apps/console/src/routes/measureRoutes.ts
+++ b/apps/console/src/routes/measureRoutes.ts
@@ -11,8 +11,8 @@ import {
   withQueryRef,
   type AppRoute,
 } from "@probo/routes";
-import type { MeasureGraphListQuery } from "/hooks/graph/__generated__/MeasureGraphListQuery.graphql";
-import type { MeasureGraphNodeQuery } from "/hooks/graph/__generated__/MeasureGraphNodeQuery.graphql";
+import type { MeasureGraphListQuery } from "/__generated__/core/MeasureGraphListQuery.graphql";
+import type { MeasureGraphNodeQuery } from "/__generated__/core/MeasureGraphNodeQuery.graphql";
 
 export const measureRoutes = [
   {
diff --git a/apps/console/src/routes/meetingsRoutes.ts b/apps/console/src/routes/meetingsRoutes.ts
index fd1872412..4f25b978c 100644
--- a/apps/console/src/routes/meetingsRoutes.ts
+++ b/apps/console/src/routes/meetingsRoutes.ts
@@ -7,8 +7,8 @@ import { PageSkeleton } from "/components/skeletons/PageSkeleton";
 import { redirect, type LoaderFunctionArgs } from "react-router";
 import { lazy } from "@probo/react-lazy";
 import { LinkCardSkeleton } from "/components/skeletons/LinkCardSkeleton";
-import type { MeetingGraphListQuery } from "/hooks/graph/__generated__/MeetingGraphListQuery.graphql";
-import type { MeetingGraphNodeQuery } from "/hooks/graph/__generated__/MeetingGraphNodeQuery.graphql";
+import type { MeetingGraphListQuery } from "/__generated__/core/MeetingGraphListQuery.graphql";
+import type { MeetingGraphNodeQuery } from "/__generated__/core/MeetingGraphNodeQuery.graphql";
 import {
   loaderFromQueryLoader,
   withQueryRef,
diff --git a/apps/console/src/routes/nonconformityRoutes.ts b/apps/console/src/routes/nonconformityRoutes.ts
index b7f1def2b..e4d6cac84 100644
--- a/apps/console/src/routes/nonconformityRoutes.ts
+++ b/apps/console/src/routes/nonconformityRoutes.ts
@@ -6,8 +6,8 @@ import {
   nonconformitiesQuery,
   nonconformityNodeQuery,
 } from "../hooks/graph/NonconformityGraph";
-import type { NonconformityGraphListQuery } from "/hooks/graph/__generated__/NonconformityGraphListQuery.graphql";
-import type { NonconformityGraphNodeQuery } from "/hooks/graph/__generated__/NonconformityGraphNodeQuery.graphql";
+import type { NonconformityGraphListQuery } from "/__generated__/core/NonconformityGraphListQuery.graphql";
+import type { NonconformityGraphNodeQuery } from "/__generated__/core/NonconformityGraphNodeQuery.graphql";
 import {
   loaderFromQueryLoader,
   withQueryRef,
diff --git a/apps/console/src/routes/obligationRoutes.ts b/apps/console/src/routes/obligationRoutes.ts
index c3bccd7b9..c12841742 100644
--- a/apps/console/src/routes/obligationRoutes.ts
+++ b/apps/console/src/routes/obligationRoutes.ts
@@ -6,8 +6,8 @@ import {
   obligationsQuery,
   obligationNodeQuery,
 } from "/hooks/graph/ObligationGraph";
-import type { ObligationGraphListQuery } from "/hooks/graph/__generated__/ObligationGraphListQuery.graphql";
-import type { ObligationGraphNodeQuery } from "/hooks/graph/__generated__/ObligationGraphNodeQuery.graphql";
+import type { ObligationGraphListQuery } from "/__generated__/core/ObligationGraphListQuery.graphql";
+import type { ObligationGraphNodeQuery } from "/__generated__/core/ObligationGraphNodeQuery.graphql";
 import {
   loaderFromQueryLoader,
   withQueryRef,
diff --git a/apps/console/src/routes/peopleRoutes.ts b/apps/console/src/routes/peopleRoutes.ts
index 214735115..eaf2456ef 100644
--- a/apps/console/src/routes/peopleRoutes.ts
+++ b/apps/console/src/routes/peopleRoutes.ts
@@ -12,8 +12,8 @@ import {
   withQueryRef,
   type AppRoute,
 } from "@probo/routes";
-import type { PeopleGraphPaginatedQuery } from "/hooks/graph/__generated__/PeopleGraphPaginatedQuery.graphql";
-import type { PeopleGraphNodeQuery } from "/hooks/graph/__generated__/PeopleGraphNodeQuery.graphql";
+import type { PeopleGraphPaginatedQuery } from "/__generated__/core/PeopleGraphPaginatedQuery.graphql";
+import type { PeopleGraphNodeQuery } from "/__generated__/core/PeopleGraphNodeQuery.graphql";
 
 export const peopleRoutes = [
   {
diff --git a/apps/console/src/routes/processingActivityRoutes.ts b/apps/console/src/routes/processingActivityRoutes.ts
index fcf3f979e..045aa4c1e 100644
--- a/apps/console/src/routes/processingActivityRoutes.ts
+++ b/apps/console/src/routes/processingActivityRoutes.ts
@@ -11,8 +11,8 @@ import {
   withQueryRef,
   type AppRoute,
 } from "@probo/routes";
-import type { ProcessingActivityGraphListQuery } from "/hooks/graph/__generated__/ProcessingActivityGraphListQuery.graphql";
-import type { ProcessingActivityGraphNodeQuery } from "/hooks/graph/__generated__/ProcessingActivityGraphNodeQuery.graphql";
+import type { ProcessingActivityGraphListQuery } from "/__generated__/core/ProcessingActivityGraphListQuery.graphql";
+import type { ProcessingActivityGraphNodeQuery } from "/__generated__/core/ProcessingActivityGraphNodeQuery.graphql";
 
 export const processingActivityRoutes = [
   {
diff --git a/apps/console/src/routes/rightsRequestRoutes.ts b/apps/console/src/routes/rightsRequestRoutes.ts
index 436fa798f..f801da0f7 100644
--- a/apps/console/src/routes/rightsRequestRoutes.ts
+++ b/apps/console/src/routes/rightsRequestRoutes.ts
@@ -2,34 +2,54 @@ import { loadQuery } from "react-relay";
 import { coreEnvironment } from "/environments";
 import { PageSkeleton } from "/components/skeletons/PageSkeleton";
 import { lazy } from "@probo/react-lazy";
-import { rightsRequestsQuery, rightsRequestNodeQuery } from "/hooks/graph/RightsRequestGraph";
-import type { RightsRequestGraphListQuery } from "/hooks/graph/__generated__/RightsRequestGraphListQuery.graphql";
-import type { RightsRequestGraphNodeQuery } from "/hooks/graph/__generated__/RightsRequestGraphNodeQuery.graphql";
-import { loaderFromQueryLoader, withQueryRef, type AppRoute } from "@probo/routes";
+import {
+  rightsRequestsQuery,
+  rightsRequestNodeQuery,
+} from "/hooks/graph/RightsRequestGraph";
+import type { RightsRequestGraphListQuery } from "/__generated__/core/RightsRequestGraphListQuery.graphql";
+import type { RightsRequestGraphNodeQuery } from "/__generated__/core/RightsRequestGraphNodeQuery.graphql";
+import {
+  loaderFromQueryLoader,
+  withQueryRef,
+  type AppRoute,
+} from "@probo/routes";
 
 export const rightsRequestRoutes = [
   {
     path: "rights-requests",
     Fallback: PageSkeleton,
     loader: loaderFromQueryLoader(({ organizationId }) =>
-      loadQuery<RightsRequestGraphListQuery>(coreEnvironment, rightsRequestsQuery, {
-        organizationId,
-      }),
+      loadQuery<RightsRequestGraphListQuery>(
+        coreEnvironment,
+        rightsRequestsQuery,
+        {
+          organizationId,
+        },
+      ),
+    ),
+    Component: withQueryRef(
+      lazy(
+        () => import("/pages/organizations/rightsRequests/RightsRequestsPage"),
+      ),
     ),
-    Component: withQueryRef(lazy(
-      () => import("/pages/organizations/rightsRequests/RightsRequestsPage")
-    )),
   },
   {
     path: "rights-requests/:requestId",
     Fallback: PageSkeleton,
     loader: loaderFromQueryLoader(({ requestId }) =>
-      loadQuery<RightsRequestGraphNodeQuery>(coreEnvironment, rightsRequestNodeQuery, {
-        rightsRequestId: requestId!,
-      }),
+      loadQuery<RightsRequestGraphNodeQuery>(
+        coreEnvironment,
+        rightsRequestNodeQuery,
+        {
+          rightsRequestId: requestId!,
+        },
+      ),
+    ),
+    Component: withQueryRef(
+      lazy(
+        () =>
+          import("/pages/organizations/rightsRequests/RightsRequestDetailsPage"),
+      ),
     ),
-    Component: withQueryRef(lazy(
-      () => import("/pages/organizations/rightsRequests/RightsRequestDetailsPage")
-    )),
   },
 ] satisfies AppRoute[];
diff --git a/apps/console/src/routes/riskRoutes.ts b/apps/console/src/routes/riskRoutes.ts
index 6379a6559..12b4f1613 100644
--- a/apps/console/src/routes/riskRoutes.ts
+++ b/apps/console/src/routes/riskRoutes.ts
@@ -7,13 +7,13 @@ import { PageSkeleton } from "/components/skeletons/PageSkeleton";
 import { redirect } from "react-router";
 import { lazy } from "@probo/react-lazy";
 import { LinkCardSkeleton } from "/components/skeletons/LinkCardSkeleton";
-import type { RiskGraphNodeQuery } from "/hooks/graph/__generated__/RiskGraphNodeQuery.graphql";
+import type { RiskGraphNodeQuery } from "/__generated__/core/RiskGraphNodeQuery.graphql";
 import {
   loaderFromQueryLoader,
   withQueryRef,
   type AppRoute,
 } from "@probo/routes";
-import type { RiskGraphListQuery } from "/hooks/graph/__generated__/RiskGraphListQuery.graphql";
+import type { RiskGraphListQuery } from "/__generated__/core/RiskGraphListQuery.graphql";
 
 export const riskRoutes = [
   {
diff --git a/apps/console/src/routes/snapshotsRoutes.ts b/apps/console/src/routes/snapshotsRoutes.ts
index 46b490b76..bdbd536ca 100644
--- a/apps/console/src/routes/snapshotsRoutes.ts
+++ b/apps/console/src/routes/snapshotsRoutes.ts
@@ -3,8 +3,8 @@ import { PageSkeleton } from "/components/skeletons/PageSkeleton";
 import { coreEnvironment } from "/environments";
 import { snapshotsQuery, snapshotNodeQuery } from "/hooks/graph/SnapshotGraph";
 import { lazy } from "@probo/react-lazy";
-import type { SnapshotGraphListQuery } from "/hooks/graph/__generated__/SnapshotGraphListQuery.graphql";
-import type { SnapshotGraphNodeQuery } from "/hooks/graph/__generated__/SnapshotGraphNodeQuery.graphql";
+import type { SnapshotGraphListQuery } from "/__generated__/core/SnapshotGraphListQuery.graphql";
+import type { SnapshotGraphNodeQuery } from "/__generated__/core/SnapshotGraphNodeQuery.graphql";
 import {
   loaderFromQueryLoader,
   withQueryRef,
diff --git a/apps/console/src/routes/statesOfApplicabilityRoutes.ts b/apps/console/src/routes/statesOfApplicabilityRoutes.ts
index 09978fc95..333ed5b09 100644
--- a/apps/console/src/routes/statesOfApplicabilityRoutes.ts
+++ b/apps/console/src/routes/statesOfApplicabilityRoutes.ts
@@ -6,8 +6,8 @@ import {
   paginatedStateOfApplicabilityQuery,
   stateOfApplicabilityNodeQuery,
 } from "/hooks/graph/StateOfApplicabilityGraph";
-import type { StateOfApplicabilityGraphPaginatedQuery } from "/hooks/graph/__generated__/StateOfApplicabilityGraphPaginatedQuery.graphql";
-import type { StateOfApplicabilityGraphNodeQuery } from "/hooks/graph/__generated__/StateOfApplicabilityGraphNodeQuery.graphql";
+import type { StateOfApplicabilityGraphPaginatedQuery } from "/__generated__/core/StateOfApplicabilityGraphPaginatedQuery.graphql";
+import type { StateOfApplicabilityGraphNodeQuery } from "/__generated__/core/StateOfApplicabilityGraphNodeQuery.graphql";
 import { loaderFromQueryLoader, withQueryRef, type AppRoute } from "@probo/routes";
 
 export const statesOfApplicabilityRoutes = [
diff --git a/apps/console/src/routes/taskRoutes.ts b/apps/console/src/routes/taskRoutes.ts
index bf93c3677..d8d176b87 100644
--- a/apps/console/src/routes/taskRoutes.ts
+++ b/apps/console/src/routes/taskRoutes.ts
@@ -8,7 +8,7 @@ import {
   withQueryRef,
   type AppRoute,
 } from "@probo/routes";
-import type { TaskGraphQuery } from "/hooks/graph/__generated__/TaskGraphQuery.graphql";
+import type { TaskGraphQuery } from "/__generated__/core/TaskGraphQuery.graphql";
 export const taskRoutes = [
   {
     path: "tasks",
diff --git a/apps/console/src/routes/trustCenterRoutes.ts b/apps/console/src/routes/trustCenterRoutes.ts
index 4ba69ea3a..b218a8fed 100644
--- a/apps/console/src/routes/trustCenterRoutes.ts
+++ b/apps/console/src/routes/trustCenterRoutes.ts
@@ -4,7 +4,7 @@ import { PageSkeleton } from "/components/skeletons/PageSkeleton";
 import { LinkCardSkeleton } from "/components/skeletons/LinkCardSkeleton";
 import { lazy } from "@probo/react-lazy";
 import { trustCenterQuery } from "../hooks/graph/TrustCenterGraph";
-import type { TrustCenterGraphQuery } from "/hooks/graph/__generated__/TrustCenterGraphQuery.graphql";
+import type { TrustCenterGraphQuery } from "/__generated__/core/TrustCenterGraphQuery.graphql";
 import {
   loaderFromQueryLoader,
   withQueryRef,
diff --git a/apps/console/src/routes/vendorRoutes.ts b/apps/console/src/routes/vendorRoutes.ts
index 025c2b0c5..606ec7d62 100644
--- a/apps/console/src/routes/vendorRoutes.ts
+++ b/apps/console/src/routes/vendorRoutes.ts
@@ -9,8 +9,8 @@ import {
   withQueryRef,
   type AppRoute,
 } from "@probo/routes";
-import type { VendorGraphListQuery } from "/hooks/graph/__generated__/VendorGraphListQuery.graphql";
-import type { VendorGraphNodeQuery } from "/hooks/graph/__generated__/VendorGraphNodeQuery.graphql";
+import type { VendorGraphListQuery } from "/__generated__/core/VendorGraphListQuery.graphql";
+import type { VendorGraphNodeQuery } from "/__generated__/core/VendorGraphNodeQuery.graphql";
 
 export const vendorRoutes = [
   {
diff --git a/apps/console/vite.config.ts b/apps/console/vite.config.ts
index 1103e26fe..444a3c4c9 100644
--- a/apps/console/vite.config.ts
+++ b/apps/console/vite.config.ts
@@ -7,12 +7,28 @@ import { fileURLToPath, URL } from "node:url";
 export default defineConfig({
   plugins: [
     react({
+      exclude: "src/pages/iam/**/*",
       babel: {
         plugins: [
           [
             "relay",
             {
               eagerEsModules: true,
+              artifactDirectory: "src/__generated__/core",
+            },
+          ],
+        ],
+      },
+    }),
+    react({
+      include: "src/pages/iam/**/*",
+      babel: {
+        plugins: [
+          [
+            "relay",
+            {
+              eagerEsModules: true,
+              artifactDirectory: "src/__generated__/iam",
             },
           ],
         ],
@@ -31,11 +47,11 @@ export default defineConfig({
   resolve: {
     alias: {
       "/environments": fileURLToPath(
-        new URL("./src/environments", import.meta.url)
+        new URL("./src/environments", import.meta.url),
       ),
       "/type": fileURLToPath(new URL("./src/type.ts", import.meta.url)),
       "/components": fileURLToPath(
-        new URL("./src/components", import.meta.url)
+        new URL("./src/components", import.meta.url),
       ),
       "/coredata": fileURLToPath(new URL("./src/coredata", import.meta.url)),
       "/hooks": fileURLToPath(new URL("./src/hooks", import.meta.url)),
@@ -44,7 +60,7 @@ export default defineConfig({
       "/routes": fileURLToPath(new URL("./src/routes", import.meta.url)),
       "/providers": fileURLToPath(new URL("./src/providers", import.meta.url)),
       "/permissions": fileURLToPath(
-        new URL("./src/permissions", import.meta.url)
+        new URL("./src/permissions", import.meta.url),
       ),
     },
   },