From 1ce1393bff6db892a79ec0b37b96f0c33062bcaf Mon Sep 17 00:00:00 2001
From: rajrdk <rajrdk@gmail.com>
Date: Fri, 16 May 2025 17:26:34 +0530
Subject: [PATCH 1/4] refactor(organization): group organization related models

---
 standalone/src/models/organization/index.ts         | 13 -------------
 .../organization-extension/builder.spec.ts          |  2 +-
 .../organization-extension/builder.ts               |  2 +-
 .../contact-information/builder.spec.ts             |  2 +-
 .../contact-information/builder.ts                  |  2 +-
 .../contact-information/generator.ts                |  4 ++--
 .../contact-information/index.ts                    |  0
 .../contact-information/presets/index.ts            |  0
 .../contact-information/transformers.ts             |  2 +-
 .../contact-information/types.ts                    |  4 ++--
 .../organization-extension/generator.ts             |  8 ++++----
 .../organization-extension/index.ts                 |  0
 .../oidc-sso-config/builder.spec.ts                 |  2 +-
 .../oidc-sso-config/builder.ts                      |  2 +-
 .../oidc-sso-config/generator.ts                    |  4 ++--
 .../organization-extension/oidc-sso-config/index.ts |  0
 .../oidc-sso-config-draft/builder.spec.ts           |  0
 .../oidc-sso-config-draft/builder.ts                |  0
 .../oidc-sso-config-draft/generator.ts              |  0
 .../oidc-sso-config/oidc-sso-config-draft/index.ts  |  0
 .../oidc-sso-config-draft/presets/index.ts          |  0
 .../oidc-sso-config-draft/transformers.ts           |  0
 .../oidc-sso-config/oidc-sso-config-draft/types.ts  |  0
 .../oidc-sso-config/presets/index.ts                |  0
 .../oidc-sso-config/transformers.ts                 |  2 +-
 .../organization-extension/oidc-sso-config/types.ts |  4 ++--
 .../organization-extension/presets/index.ts         |  0
 .../organization-extension/transformers.ts          |  2 +-
 .../organization-extension/types.ts                 |  4 ++--
 .../src/models/organization/organization/index.ts   |  6 +++---
 .../mc-organization/builder.spec.ts                 |  2 +-
 .../{ => organization}/mc-organization/builder.ts   |  2 +-
 .../{ => organization}/mc-organization/generator.ts |  4 ++--
 .../{ => organization}/mc-organization/index.ts     |  0
 .../organization/mc-organization/presets/index.ts   |  3 +++
 .../mc-organization/transformers.ts                 |  2 +-
 .../{ => organization}/mc-organization/types.ts     |  4 ++--
 .../organization/{ => organization}/builder.spec.ts |  2 +-
 .../organization/{ => organization}/builder.ts      |  2 +-
 .../organization/{ => organization}/generator.ts    |  4 ++--
 .../{team => organization/organization}/index.ts    |  0
 .../organization}/presets/index.ts                  |  0
 .../organization/{ => organization}/transformers.ts |  2 +-
 .../organization/{ => organization}/types.ts        |  4 ++--
 .../{ => organization}/team/builder.spec.ts         |  2 +-
 .../organization/{ => organization}/team/builder.ts |  2 +-
 .../{ => organization}/team/generator.ts            |  4 ++--
 .../models/organization/organization/team/index.ts  |  3 +++
 .../organization/{ => team}/presets/index.ts        |  0
 .../{ => organization}/team/transformers.ts         |  6 +++---
 .../organization/{ => organization}/team/types.ts   |  6 +++---
 .../src/models/organization/team/presets/index.ts   |  1 -
 standalone/src/organization-extension.ts            |  2 +-
 standalone/src/organization.ts                      |  2 +-
 54 files changed, 58 insertions(+), 66 deletions(-)
 delete mode 100644 standalone/src/models/organization/index.ts
 rename standalone/src/models/{ => organization}/organization-extension/builder.spec.ts (99%)
 rename standalone/src/models/{ => organization}/organization-extension/builder.ts (88%)
 rename standalone/src/models/{ => organization}/organization-extension/contact-information/builder.spec.ts (93%)
 rename standalone/src/models/{ => organization}/organization-extension/contact-information/builder.ts (87%)
 rename standalone/src/models/{ => organization}/organization-extension/contact-information/generator.ts (79%)
 rename standalone/src/models/{ => organization}/organization-extension/contact-information/index.ts (100%)
 rename standalone/src/models/{ => organization}/organization-extension/contact-information/presets/index.ts (100%)
 rename standalone/src/models/{ => organization}/organization-extension/contact-information/transformers.ts (91%)
 rename standalone/src/models/{ => organization}/organization-extension/contact-information/types.ts (71%)
 rename standalone/src/models/{ => organization}/organization-extension/generator.ts (83%)
 rename standalone/src/models/{ => organization}/organization-extension/index.ts (100%)
 rename standalone/src/models/{ => organization}/organization-extension/oidc-sso-config/builder.spec.ts (95%)
 rename standalone/src/models/{ => organization}/organization-extension/oidc-sso-config/builder.ts (87%)
 rename standalone/src/models/{ => organization}/organization-extension/oidc-sso-config/generator.ts (87%)
 rename standalone/src/models/{ => organization}/organization-extension/oidc-sso-config/index.ts (100%)
 rename standalone/src/models/{ => organization}/organization-extension/oidc-sso-config/oidc-sso-config-draft/builder.spec.ts (100%)
 rename standalone/src/models/{ => organization}/organization-extension/oidc-sso-config/oidc-sso-config-draft/builder.ts (100%)
 rename standalone/src/models/{ => organization}/organization-extension/oidc-sso-config/oidc-sso-config-draft/generator.ts (100%)
 rename standalone/src/models/{ => organization}/organization-extension/oidc-sso-config/oidc-sso-config-draft/index.ts (100%)
 rename standalone/src/models/{ => organization}/organization-extension/oidc-sso-config/oidc-sso-config-draft/presets/index.ts (100%)
 rename standalone/src/models/{ => organization}/organization-extension/oidc-sso-config/oidc-sso-config-draft/transformers.ts (100%)
 rename standalone/src/models/{ => organization}/organization-extension/oidc-sso-config/oidc-sso-config-draft/types.ts (100%)
 rename standalone/src/models/{ => organization}/organization-extension/oidc-sso-config/presets/index.ts (100%)
 rename standalone/src/models/{ => organization}/organization-extension/oidc-sso-config/transformers.ts (90%)
 rename standalone/src/models/{ => organization}/organization-extension/oidc-sso-config/types.ts (69%)
 rename standalone/src/models/{ => organization}/organization-extension/presets/index.ts (100%)
 rename standalone/src/models/{ => organization}/organization-extension/transformers.ts (93%)
 rename standalone/src/models/{ => organization}/organization-extension/types.ts (72%)
 rename standalone/src/models/organization/{ => organization}/mc-organization/builder.spec.ts (92%)
 rename standalone/src/models/organization/{ => organization}/mc-organization/builder.ts (87%)
 rename standalone/src/models/organization/{ => organization}/mc-organization/generator.ts (73%)
 rename standalone/src/models/organization/{ => organization}/mc-organization/index.ts (100%)
 create mode 100644 standalone/src/models/organization/organization/mc-organization/presets/index.ts
 rename standalone/src/models/organization/{ => organization}/mc-organization/transformers.ts (87%)
 rename standalone/src/models/organization/{ => organization}/mc-organization/types.ts (65%)
 rename standalone/src/models/organization/organization/{ => organization}/builder.spec.ts (97%)
 rename standalone/src/models/organization/organization/{ => organization}/builder.ts (86%)
 rename standalone/src/models/organization/organization/{ => organization}/generator.ts (80%)
 rename standalone/src/models/organization/{team => organization/organization}/index.ts (100%)
 rename standalone/src/models/organization/{mc-organization => organization/organization}/presets/index.ts (100%)
 rename standalone/src/models/organization/organization/{ => organization}/transformers.ts (89%)
 rename standalone/src/models/organization/organization/{ => organization}/types.ts (87%)
 rename standalone/src/models/organization/{ => organization}/team/builder.spec.ts (96%)
 rename standalone/src/models/organization/{ => organization}/team/builder.ts (85%)
 rename standalone/src/models/organization/{ => organization}/team/generator.ts (73%)
 create mode 100644 standalone/src/models/organization/organization/team/index.ts
 rename standalone/src/models/organization/organization/{ => team}/presets/index.ts (100%)
 rename standalone/src/models/organization/{ => organization}/team/transformers.ts (81%)
 rename standalone/src/models/organization/{ => organization}/team/types.ts (58%)
 delete mode 100644 standalone/src/models/organization/team/presets/index.ts

diff --git a/standalone/src/models/organization/index.ts b/standalone/src/models/organization/index.ts
deleted file mode 100644
index a658ad86c7..0000000000
--- a/standalone/src/models/organization/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export * as Organization from './organization';
-export { default as presets } from './organization/presets';
-export * from './organization/types';
-
-// MC Organization
-export * as McOrganization from './mc-organization';
-export { default as presetsMc } from './mc-organization/presets';
-export * from './mc-organization/types';
-
-// Team
-export * as Team from './team';
-export { default as teamPresets } from './team/presets';
-export * from './team/types';
diff --git a/standalone/src/models/organization-extension/builder.spec.ts b/standalone/src/models/organization/organization-extension/builder.spec.ts
similarity index 99%
rename from standalone/src/models/organization-extension/builder.spec.ts
rename to standalone/src/models/organization/organization-extension/builder.spec.ts
index 9623433f02..22ec8fef87 100644
--- a/standalone/src/models/organization-extension/builder.spec.ts
+++ b/standalone/src/models/organization/organization-extension/builder.spec.ts
@@ -1,6 +1,6 @@
 /* eslint-disable jest/no-disabled-tests */
 /* eslint-disable jest/valid-title */
-import { createBuilderSpec } from '@/core/test-utils';
+import { createBuilderSpec } from '../../../../core/test-utils';
 import type { TOrganizationExtension } from './types';
 import * as OrganizationExtension from './index';
 
diff --git a/standalone/src/models/organization-extension/builder.ts b/standalone/src/models/organization/organization-extension/builder.ts
similarity index 88%
rename from standalone/src/models/organization-extension/builder.ts
rename to standalone/src/models/organization/organization-extension/builder.ts
index 28bf98ad6c..8740601f0e 100644
--- a/standalone/src/models/organization-extension/builder.ts
+++ b/standalone/src/models/organization/organization-extension/builder.ts
@@ -1,4 +1,4 @@
-import { Builder } from '@/core';
+import { Builder } from '../../../../core';
 import generator from './generator';
 import transformers from './transformers';
 import type {
diff --git a/standalone/src/models/organization-extension/contact-information/builder.spec.ts b/standalone/src/models/organization/organization-extension/contact-information/builder.spec.ts
similarity index 93%
rename from standalone/src/models/organization-extension/contact-information/builder.spec.ts
rename to standalone/src/models/organization/organization-extension/contact-information/builder.spec.ts
index 9351d694b0..63e80a2a5a 100644
--- a/standalone/src/models/organization-extension/contact-information/builder.spec.ts
+++ b/standalone/src/models/organization/organization-extension/contact-information/builder.spec.ts
@@ -1,6 +1,6 @@
 /* eslint-disable jest/no-disabled-tests */
 /* eslint-disable jest/valid-title */
-import { createBuilderSpec } from '@/core/test-utils';
+import { createBuilderSpec } from '../../../../core/test-utils';
 import type { TContactInformation } from './types';
 import * as ContactInformation from './index';
 
diff --git a/standalone/src/models/organization-extension/contact-information/builder.ts b/standalone/src/models/organization/organization-extension/contact-information/builder.ts
similarity index 87%
rename from standalone/src/models/organization-extension/contact-information/builder.ts
rename to standalone/src/models/organization/organization-extension/contact-information/builder.ts
index 9918c801d7..ccb4d2bd75 100644
--- a/standalone/src/models/organization-extension/contact-information/builder.ts
+++ b/standalone/src/models/organization/organization-extension/contact-information/builder.ts
@@ -1,4 +1,4 @@
-import { Builder } from '@/core';
+import { Builder } from '../../../../core';
 import generator from './generator';
 import transformers from './transformers';
 import type {
diff --git a/standalone/src/models/organization-extension/contact-information/generator.ts b/standalone/src/models/organization/organization-extension/contact-information/generator.ts
similarity index 79%
rename from standalone/src/models/organization-extension/contact-information/generator.ts
rename to standalone/src/models/organization/organization-extension/contact-information/generator.ts
index 55f10fb80d..2434247757 100644
--- a/standalone/src/models/organization-extension/contact-information/generator.ts
+++ b/standalone/src/models/organization/organization-extension/contact-information/generator.ts
@@ -1,5 +1,5 @@
-import { fake, Generator } from '@/core';
-import { createRelatedDates } from '@/utils';
+import { fake, Generator } from '../../../../core';
+import { createRelatedDates } from '../../../../utils';
 import type { TContactInformation } from './types';
 
 const [getOlderDate, getNewerDate] = createRelatedDates();
diff --git a/standalone/src/models/organization-extension/contact-information/index.ts b/standalone/src/models/organization/organization-extension/contact-information/index.ts
similarity index 100%
rename from standalone/src/models/organization-extension/contact-information/index.ts
rename to standalone/src/models/organization/organization-extension/contact-information/index.ts
diff --git a/standalone/src/models/organization-extension/contact-information/presets/index.ts b/standalone/src/models/organization/organization-extension/contact-information/presets/index.ts
similarity index 100%
rename from standalone/src/models/organization-extension/contact-information/presets/index.ts
rename to standalone/src/models/organization/organization-extension/contact-information/presets/index.ts
diff --git a/standalone/src/models/organization-extension/contact-information/transformers.ts b/standalone/src/models/organization/organization-extension/contact-information/transformers.ts
similarity index 91%
rename from standalone/src/models/organization-extension/contact-information/transformers.ts
rename to standalone/src/models/organization/organization-extension/contact-information/transformers.ts
index dddc8107e4..eaa20079b3 100644
--- a/standalone/src/models/organization-extension/contact-information/transformers.ts
+++ b/standalone/src/models/organization/organization-extension/contact-information/transformers.ts
@@ -1,4 +1,4 @@
-import { Transformer } from '@/core';
+import { Transformer } from '../../../../core';
 import type { TContactInformation, TContactInformationGraphql } from './types';
 
 const buildFields: (keyof TContactInformation)[] = [];
diff --git a/standalone/src/models/organization-extension/contact-information/types.ts b/standalone/src/models/organization/organization-extension/contact-information/types.ts
similarity index 71%
rename from standalone/src/models/organization-extension/contact-information/types.ts
rename to standalone/src/models/organization/organization-extension/contact-information/types.ts
index 9ac323dd67..88bd52d9f7 100644
--- a/standalone/src/models/organization-extension/contact-information/types.ts
+++ b/standalone/src/models/organization/organization-extension/contact-information/types.ts
@@ -1,5 +1,5 @@
-import { TBuilder } from '@/core';
-import type { TMcSettingsContactInformation } from '@/graphql-types';
+import { TBuilder } from '../../../../core';
+import type { TMcSettingsContactInformation } from '../../../../graphql-types';
 
 export type TContactInformation = Omit<
   TMcSettingsContactInformation,
diff --git a/standalone/src/models/organization-extension/generator.ts b/standalone/src/models/organization/organization-extension/generator.ts
similarity index 83%
rename from standalone/src/models/organization-extension/generator.ts
rename to standalone/src/models/organization/organization-extension/generator.ts
index 797d1c086e..31cabe6ab6 100644
--- a/standalone/src/models/organization-extension/generator.ts
+++ b/standalone/src/models/organization/organization-extension/generator.ts
@@ -1,10 +1,10 @@
-import { fake, Generator } from '@/core';
+import { fake, Generator } from '../../../../core';
+import { createRelatedDates } from '../../../../utils';
 import {
   CustomApplicationInstallation,
   CustomApplication,
-} from '@/models/custom-application';
-import { CustomViewInstallation, CustomView } from '@/models/custom-view';
-import { createRelatedDates } from '@/utils';
+} from '../../custom-application';
+import { CustomViewInstallation, CustomView } from '../../custom-view';
 import * as ContactInformation from './contact-information';
 import * as OidcSSOConfig from './oidc-sso-config';
 import type { TOrganizationExtension } from './types';
diff --git a/standalone/src/models/organization-extension/index.ts b/standalone/src/models/organization/organization-extension/index.ts
similarity index 100%
rename from standalone/src/models/organization-extension/index.ts
rename to standalone/src/models/organization/organization-extension/index.ts
diff --git a/standalone/src/models/organization-extension/oidc-sso-config/builder.spec.ts b/standalone/src/models/organization/organization-extension/oidc-sso-config/builder.spec.ts
similarity index 95%
rename from standalone/src/models/organization-extension/oidc-sso-config/builder.spec.ts
rename to standalone/src/models/organization/organization-extension/oidc-sso-config/builder.spec.ts
index 046596f713..84c838bc6d 100644
--- a/standalone/src/models/organization-extension/oidc-sso-config/builder.spec.ts
+++ b/standalone/src/models/organization/organization-extension/oidc-sso-config/builder.spec.ts
@@ -1,6 +1,6 @@
 /* eslint-disable jest/no-disabled-tests */
 /* eslint-disable jest/valid-title */
-import { createBuilderSpec } from '@/core/test-utils';
+import { createBuilderSpec } from '../../../../core/test-utils';
 import type { TOidcSsoConfig } from './types';
 import * as OidcSSOConfig from './index';
 
diff --git a/standalone/src/models/organization-extension/oidc-sso-config/builder.ts b/standalone/src/models/organization/organization-extension/oidc-sso-config/builder.ts
similarity index 87%
rename from standalone/src/models/organization-extension/oidc-sso-config/builder.ts
rename to standalone/src/models/organization/organization-extension/oidc-sso-config/builder.ts
index 3f24aa8f8e..b0162218e7 100644
--- a/standalone/src/models/organization-extension/oidc-sso-config/builder.ts
+++ b/standalone/src/models/organization/organization-extension/oidc-sso-config/builder.ts
@@ -1,4 +1,4 @@
-import { Builder } from '@/core';
+import { Builder } from '../../../../core';
 import generator from './generator';
 import transformers from './transformers';
 import type { TOidcSsoConfig, TCreateOidcSsoConfigBuilder } from './types';
diff --git a/standalone/src/models/organization-extension/oidc-sso-config/generator.ts b/standalone/src/models/organization/organization-extension/oidc-sso-config/generator.ts
similarity index 87%
rename from standalone/src/models/organization-extension/oidc-sso-config/generator.ts
rename to standalone/src/models/organization/organization-extension/oidc-sso-config/generator.ts
index 8c3f9ba679..45c03f2579 100644
--- a/standalone/src/models/organization-extension/oidc-sso-config/generator.ts
+++ b/standalone/src/models/organization/organization-extension/oidc-sso-config/generator.ts
@@ -1,5 +1,5 @@
-import { fake, Generator } from '@/core';
-import { createRelatedDates } from '@/utils';
+import { fake, Generator } from '../../../../core';
+import { createRelatedDates } from '../../../../utils';
 import type { TOidcSsoConfig } from './types';
 
 const [getOlderDate, getNewerDate] = createRelatedDates();
diff --git a/standalone/src/models/organization-extension/oidc-sso-config/index.ts b/standalone/src/models/organization/organization-extension/oidc-sso-config/index.ts
similarity index 100%
rename from standalone/src/models/organization-extension/oidc-sso-config/index.ts
rename to standalone/src/models/organization/organization-extension/oidc-sso-config/index.ts
diff --git a/standalone/src/models/organization-extension/oidc-sso-config/oidc-sso-config-draft/builder.spec.ts b/standalone/src/models/organization/organization-extension/oidc-sso-config/oidc-sso-config-draft/builder.spec.ts
similarity index 100%
rename from standalone/src/models/organization-extension/oidc-sso-config/oidc-sso-config-draft/builder.spec.ts
rename to standalone/src/models/organization/organization-extension/oidc-sso-config/oidc-sso-config-draft/builder.spec.ts
diff --git a/standalone/src/models/organization-extension/oidc-sso-config/oidc-sso-config-draft/builder.ts b/standalone/src/models/organization/organization-extension/oidc-sso-config/oidc-sso-config-draft/builder.ts
similarity index 100%
rename from standalone/src/models/organization-extension/oidc-sso-config/oidc-sso-config-draft/builder.ts
rename to standalone/src/models/organization/organization-extension/oidc-sso-config/oidc-sso-config-draft/builder.ts
diff --git a/standalone/src/models/organization-extension/oidc-sso-config/oidc-sso-config-draft/generator.ts b/standalone/src/models/organization/organization-extension/oidc-sso-config/oidc-sso-config-draft/generator.ts
similarity index 100%
rename from standalone/src/models/organization-extension/oidc-sso-config/oidc-sso-config-draft/generator.ts
rename to standalone/src/models/organization/organization-extension/oidc-sso-config/oidc-sso-config-draft/generator.ts
diff --git a/standalone/src/models/organization-extension/oidc-sso-config/oidc-sso-config-draft/index.ts b/standalone/src/models/organization/organization-extension/oidc-sso-config/oidc-sso-config-draft/index.ts
similarity index 100%
rename from standalone/src/models/organization-extension/oidc-sso-config/oidc-sso-config-draft/index.ts
rename to standalone/src/models/organization/organization-extension/oidc-sso-config/oidc-sso-config-draft/index.ts
diff --git a/standalone/src/models/organization-extension/oidc-sso-config/oidc-sso-config-draft/presets/index.ts b/standalone/src/models/organization/organization-extension/oidc-sso-config/oidc-sso-config-draft/presets/index.ts
similarity index 100%
rename from standalone/src/models/organization-extension/oidc-sso-config/oidc-sso-config-draft/presets/index.ts
rename to standalone/src/models/organization/organization-extension/oidc-sso-config/oidc-sso-config-draft/presets/index.ts
diff --git a/standalone/src/models/organization-extension/oidc-sso-config/oidc-sso-config-draft/transformers.ts b/standalone/src/models/organization/organization-extension/oidc-sso-config/oidc-sso-config-draft/transformers.ts
similarity index 100%
rename from standalone/src/models/organization-extension/oidc-sso-config/oidc-sso-config-draft/transformers.ts
rename to standalone/src/models/organization/organization-extension/oidc-sso-config/oidc-sso-config-draft/transformers.ts
diff --git a/standalone/src/models/organization-extension/oidc-sso-config/oidc-sso-config-draft/types.ts b/standalone/src/models/organization/organization-extension/oidc-sso-config/oidc-sso-config-draft/types.ts
similarity index 100%
rename from standalone/src/models/organization-extension/oidc-sso-config/oidc-sso-config-draft/types.ts
rename to standalone/src/models/organization/organization-extension/oidc-sso-config/oidc-sso-config-draft/types.ts
diff --git a/standalone/src/models/organization-extension/oidc-sso-config/presets/index.ts b/standalone/src/models/organization/organization-extension/oidc-sso-config/presets/index.ts
similarity index 100%
rename from standalone/src/models/organization-extension/oidc-sso-config/presets/index.ts
rename to standalone/src/models/organization/organization-extension/oidc-sso-config/presets/index.ts
diff --git a/standalone/src/models/organization-extension/oidc-sso-config/transformers.ts b/standalone/src/models/organization/organization-extension/oidc-sso-config/transformers.ts
similarity index 90%
rename from standalone/src/models/organization-extension/oidc-sso-config/transformers.ts
rename to standalone/src/models/organization/organization-extension/oidc-sso-config/transformers.ts
index 260c0aece2..c88d6d5357 100644
--- a/standalone/src/models/organization-extension/oidc-sso-config/transformers.ts
+++ b/standalone/src/models/organization/organization-extension/oidc-sso-config/transformers.ts
@@ -1,4 +1,4 @@
-import { Transformer } from '@/core';
+import { Transformer } from '../../../../core';
 import type { TOidcSsoConfig, TOidcSsoConfigGraphql } from './types';
 
 const buildFields: (keyof TOidcSsoConfig)[] = [];
diff --git a/standalone/src/models/organization-extension/oidc-sso-config/types.ts b/standalone/src/models/organization/organization-extension/oidc-sso-config/types.ts
similarity index 69%
rename from standalone/src/models/organization-extension/oidc-sso-config/types.ts
rename to standalone/src/models/organization/organization-extension/oidc-sso-config/types.ts
index 36b02f4e69..ca867dce07 100644
--- a/standalone/src/models/organization-extension/oidc-sso-config/types.ts
+++ b/standalone/src/models/organization/organization-extension/oidc-sso-config/types.ts
@@ -1,5 +1,5 @@
-import { TBuilder } from '@/core';
-import type { TMcSettingsOidcSsoConfig } from '@/graphql-types';
+import { TBuilder } from '../../../../core';
+import type { TMcSettingsOidcSsoConfig } from '../../../../graphql-types';
 
 export type TOidcSsoConfig = Omit<TMcSettingsOidcSsoConfig, '__typename'>;
 
diff --git a/standalone/src/models/organization-extension/presets/index.ts b/standalone/src/models/organization/organization-extension/presets/index.ts
similarity index 100%
rename from standalone/src/models/organization-extension/presets/index.ts
rename to standalone/src/models/organization/organization-extension/presets/index.ts
diff --git a/standalone/src/models/organization-extension/transformers.ts b/standalone/src/models/organization/organization-extension/transformers.ts
similarity index 93%
rename from standalone/src/models/organization-extension/transformers.ts
rename to standalone/src/models/organization/organization-extension/transformers.ts
index 78ef5adbd8..87b2d0403d 100644
--- a/standalone/src/models/organization-extension/transformers.ts
+++ b/standalone/src/models/organization/organization-extension/transformers.ts
@@ -1,4 +1,4 @@
-import { Transformer } from '@/core';
+import { Transformer } from '../../../../core';
 import type {
   TOrganizationExtension,
   TOrganizationExtensionGraphql,
diff --git a/standalone/src/models/organization-extension/types.ts b/standalone/src/models/organization/organization-extension/types.ts
similarity index 72%
rename from standalone/src/models/organization-extension/types.ts
rename to standalone/src/models/organization/organization-extension/types.ts
index fa22f002c3..15684f8093 100644
--- a/standalone/src/models/organization-extension/types.ts
+++ b/standalone/src/models/organization/organization-extension/types.ts
@@ -1,5 +1,5 @@
-import { TBuilder } from '@/core';
-import type { TMcSettingsOrganizationExtension } from '@/graphql-types';
+import { TBuilder } from '../../../../core';
+import type { TMcSettingsOrganizationExtension } from '../../../../graphql-types';
 
 export type TOrganizationExtension = Omit<
   TMcSettingsOrganizationExtension,
diff --git a/standalone/src/models/organization/organization/index.ts b/standalone/src/models/organization/organization/index.ts
index 0121666177..5b99919b5b 100644
--- a/standalone/src/models/organization/organization/index.ts
+++ b/standalone/src/models/organization/organization/index.ts
@@ -1,3 +1,3 @@
-export { default as random } from './builder';
-export { default as presets } from './presets';
-export * from './types';
+export * as McOrganization from './mc-organization';
+export * as Organization from './organization';
+export * as Team from './team';
diff --git a/standalone/src/models/organization/mc-organization/builder.spec.ts b/standalone/src/models/organization/organization/mc-organization/builder.spec.ts
similarity index 92%
rename from standalone/src/models/organization/mc-organization/builder.spec.ts
rename to standalone/src/models/organization/organization/mc-organization/builder.spec.ts
index 50655f215a..201d2f5647 100644
--- a/standalone/src/models/organization/mc-organization/builder.spec.ts
+++ b/standalone/src/models/organization/organization/mc-organization/builder.spec.ts
@@ -1,6 +1,6 @@
 /* eslint-disable jest/no-disabled-tests */
 /* eslint-disable jest/valid-title */
-import { createBuilderSpec } from '@/core/test-utils';
+import { createBuilderSpec } from '../../../../core/test-utils';
 import type { TMcOrganization, TMcOrganizationGraphql } from './types';
 import * as McOrganization from './index';
 
diff --git a/standalone/src/models/organization/mc-organization/builder.ts b/standalone/src/models/organization/organization/mc-organization/builder.ts
similarity index 87%
rename from standalone/src/models/organization/mc-organization/builder.ts
rename to standalone/src/models/organization/organization/mc-organization/builder.ts
index c0a6bbbea4..7491055eae 100644
--- a/standalone/src/models/organization/mc-organization/builder.ts
+++ b/standalone/src/models/organization/organization/mc-organization/builder.ts
@@ -1,4 +1,4 @@
-import { Builder } from '@/core';
+import { Builder } from '../../../../core';
 import generator from './generator';
 import transformers from './transformers';
 import type { TCreateMcOrganizationBuilder, TMcOrganization } from './types';
diff --git a/standalone/src/models/organization/mc-organization/generator.ts b/standalone/src/models/organization/organization/mc-organization/generator.ts
similarity index 73%
rename from standalone/src/models/organization/mc-organization/generator.ts
rename to standalone/src/models/organization/organization/mc-organization/generator.ts
index 402346cd2a..77f9e4e30d 100644
--- a/standalone/src/models/organization/mc-organization/generator.ts
+++ b/standalone/src/models/organization/organization/mc-organization/generator.ts
@@ -1,5 +1,5 @@
-import { fake, Generator } from '@/core';
-import { createRelatedDates } from '@/utils';
+import { fake, Generator } from '../../../../core';
+import { createRelatedDates } from '../../../../utils';
 import type { TMcOrganization } from './types';
 
 const [, getNewerDate] = createRelatedDates();
diff --git a/standalone/src/models/organization/mc-organization/index.ts b/standalone/src/models/organization/organization/mc-organization/index.ts
similarity index 100%
rename from standalone/src/models/organization/mc-organization/index.ts
rename to standalone/src/models/organization/organization/mc-organization/index.ts
diff --git a/standalone/src/models/organization/organization/mc-organization/presets/index.ts b/standalone/src/models/organization/organization/mc-organization/presets/index.ts
new file mode 100644
index 0000000000..763e57fe0a
--- /dev/null
+++ b/standalone/src/models/organization/organization/mc-organization/presets/index.ts
@@ -0,0 +1,3 @@
+const presets = {};
+
+export default presets;
diff --git a/standalone/src/models/organization/mc-organization/transformers.ts b/standalone/src/models/organization/organization/mc-organization/transformers.ts
similarity index 87%
rename from standalone/src/models/organization/mc-organization/transformers.ts
rename to standalone/src/models/organization/organization/mc-organization/transformers.ts
index ca45b2e8c1..bc9621fee1 100644
--- a/standalone/src/models/organization/mc-organization/transformers.ts
+++ b/standalone/src/models/organization/organization/mc-organization/transformers.ts
@@ -1,4 +1,4 @@
-import { Transformer } from '@/core';
+import { Transformer } from '../../../../core';
 import type { TMcOrganization, TMcOrganizationGraphql } from './types';
 
 const transformers = {
diff --git a/standalone/src/models/organization/mc-organization/types.ts b/standalone/src/models/organization/organization/mc-organization/types.ts
similarity index 65%
rename from standalone/src/models/organization/mc-organization/types.ts
rename to standalone/src/models/organization/organization/mc-organization/types.ts
index d7cc177bdd..bc9be8f30e 100644
--- a/standalone/src/models/organization/mc-organization/types.ts
+++ b/standalone/src/models/organization/organization/mc-organization/types.ts
@@ -1,5 +1,5 @@
-import type { TBuilder } from '@/core';
-import type { TMcOrganization as McOrganizationGraphql } from '@/graphql-types';
+import type { TBuilder } from '../../../../core';
+import type { TMcOrganization as McOrganizationGraphql } from '../../../../graphql-types';
 
 export type TMcOrganization = Omit<McOrganizationGraphql, '__typename'>;
 
diff --git a/standalone/src/models/organization/organization/builder.spec.ts b/standalone/src/models/organization/organization/organization/builder.spec.ts
similarity index 97%
rename from standalone/src/models/organization/organization/builder.spec.ts
rename to standalone/src/models/organization/organization/organization/builder.spec.ts
index e0a2a866c7..9285fee584 100644
--- a/standalone/src/models/organization/organization/builder.spec.ts
+++ b/standalone/src/models/organization/organization/organization/builder.spec.ts
@@ -1,6 +1,6 @@
 /* eslint-disable jest/no-disabled-tests */
 /* eslint-disable jest/valid-title */
-import { createBuilderSpec } from '@/core/test-utils';
+import { createBuilderSpec } from '../../../../core/test-utils';
 import type { TOrganization, TOrganizationGraphql } from './types';
 import * as Organization from './index';
 
diff --git a/standalone/src/models/organization/organization/builder.ts b/standalone/src/models/organization/organization/organization/builder.ts
similarity index 86%
rename from standalone/src/models/organization/organization/builder.ts
rename to standalone/src/models/organization/organization/organization/builder.ts
index 71f3d0cd6c..14dfa5b0da 100644
--- a/standalone/src/models/organization/organization/builder.ts
+++ b/standalone/src/models/organization/organization/organization/builder.ts
@@ -1,4 +1,4 @@
-import { Builder } from '@/core';
+import { Builder } from '../../../../core';
 import generator from './generator';
 import transformers from './transformers';
 import type { TCreateOrganizationBuilder, TOrganization } from './types';
diff --git a/standalone/src/models/organization/organization/generator.ts b/standalone/src/models/organization/organization/organization/generator.ts
similarity index 80%
rename from standalone/src/models/organization/organization/generator.ts
rename to standalone/src/models/organization/organization/organization/generator.ts
index bf5faf3b31..d17fcd31c3 100644
--- a/standalone/src/models/organization/organization/generator.ts
+++ b/standalone/src/models/organization/organization/organization/generator.ts
@@ -1,5 +1,5 @@
-import { fake, Generator, sequence } from '@/core';
-import { createRelatedDates } from '@/utils';
+import { fake, Generator, sequence } from '../../../../core';
+import { createRelatedDates } from '../../../../utils';
 import * as Team from '../team';
 import type { TOrganization } from './types';
 
diff --git a/standalone/src/models/organization/team/index.ts b/standalone/src/models/organization/organization/organization/index.ts
similarity index 100%
rename from standalone/src/models/organization/team/index.ts
rename to standalone/src/models/organization/organization/organization/index.ts
diff --git a/standalone/src/models/organization/mc-organization/presets/index.ts b/standalone/src/models/organization/organization/organization/presets/index.ts
similarity index 100%
rename from standalone/src/models/organization/mc-organization/presets/index.ts
rename to standalone/src/models/organization/organization/organization/presets/index.ts
diff --git a/standalone/src/models/organization/organization/transformers.ts b/standalone/src/models/organization/organization/organization/transformers.ts
similarity index 89%
rename from standalone/src/models/organization/organization/transformers.ts
rename to standalone/src/models/organization/organization/organization/transformers.ts
index 4e801734ca..d1f5e08692 100644
--- a/standalone/src/models/organization/organization/transformers.ts
+++ b/standalone/src/models/organization/organization/organization/transformers.ts
@@ -1,4 +1,4 @@
-import { Transformer } from '@/core';
+import { Transformer } from '../../../../core';
 import type { TOrganization, TOrganizationGraphql } from './types';
 
 const transformers = {
diff --git a/standalone/src/models/organization/organization/types.ts b/standalone/src/models/organization/organization/organization/types.ts
similarity index 87%
rename from standalone/src/models/organization/organization/types.ts
rename to standalone/src/models/organization/organization/organization/types.ts
index 0459b6b81a..8aab371f03 100644
--- a/standalone/src/models/organization/organization/types.ts
+++ b/standalone/src/models/organization/organization/organization/types.ts
@@ -1,8 +1,8 @@
-import type { TBuilder } from '@/core';
+import type { TBuilder } from '../../../../core';
 import type {
   TCoreOrganization,
   TCoreCreateOrganizationCommand,
-} from '@/graphql-types';
+} from '../../../../graphql-types';
 
 export type TOrganization = Omit<TCoreOrganization, '__typename'>;
 
diff --git a/standalone/src/models/organization/team/builder.spec.ts b/standalone/src/models/organization/organization/team/builder.spec.ts
similarity index 96%
rename from standalone/src/models/organization/team/builder.spec.ts
rename to standalone/src/models/organization/organization/team/builder.spec.ts
index 74dc9a1b23..8d9ee6078e 100644
--- a/standalone/src/models/organization/team/builder.spec.ts
+++ b/standalone/src/models/organization/organization/team/builder.spec.ts
@@ -1,6 +1,6 @@
 /* eslint-disable jest/no-disabled-tests */
 /* eslint-disable jest/valid-title */
-import { createBuilderSpec } from '@/core/test-utils';
+import { createBuilderSpec } from '../../../../core/test-utils';
 import type { TTeam, TTeamGraphql } from './types';
 import * as Team from './index';
 
diff --git a/standalone/src/models/organization/team/builder.ts b/standalone/src/models/organization/organization/team/builder.ts
similarity index 85%
rename from standalone/src/models/organization/team/builder.ts
rename to standalone/src/models/organization/organization/team/builder.ts
index 126750d348..8ca256bc79 100644
--- a/standalone/src/models/organization/team/builder.ts
+++ b/standalone/src/models/organization/organization/team/builder.ts
@@ -1,4 +1,4 @@
-import { Builder } from '@/core';
+import { Builder } from '../../../../core';
 import generator from './generator';
 import transformers from './transformers';
 import type { TCreateTeamBuilder, TTeam } from './types';
diff --git a/standalone/src/models/organization/team/generator.ts b/standalone/src/models/organization/organization/team/generator.ts
similarity index 73%
rename from standalone/src/models/organization/team/generator.ts
rename to standalone/src/models/organization/organization/team/generator.ts
index 52882bfbd8..c328c41aea 100644
--- a/standalone/src/models/organization/team/generator.ts
+++ b/standalone/src/models/organization/organization/team/generator.ts
@@ -1,5 +1,5 @@
-import { fake, Generator } from '@/core';
-import { Reference } from '@/models/commons';
+import { fake, Generator } from '../../../../core';
+import { Reference } from '../../../commons';
 import type { TTeam } from './types';
 
 const generator = Generator<TTeam>({
diff --git a/standalone/src/models/organization/organization/team/index.ts b/standalone/src/models/organization/organization/team/index.ts
new file mode 100644
index 0000000000..0121666177
--- /dev/null
+++ b/standalone/src/models/organization/organization/team/index.ts
@@ -0,0 +1,3 @@
+export { default as random } from './builder';
+export { default as presets } from './presets';
+export * from './types';
diff --git a/standalone/src/models/organization/organization/presets/index.ts b/standalone/src/models/organization/organization/team/presets/index.ts
similarity index 100%
rename from standalone/src/models/organization/organization/presets/index.ts
rename to standalone/src/models/organization/organization/team/presets/index.ts
diff --git a/standalone/src/models/organization/team/transformers.ts b/standalone/src/models/organization/organization/team/transformers.ts
similarity index 81%
rename from standalone/src/models/organization/team/transformers.ts
rename to standalone/src/models/organization/organization/team/transformers.ts
index a8322f3f80..9f0cb18e81 100644
--- a/standalone/src/models/organization/team/transformers.ts
+++ b/standalone/src/models/organization/organization/team/transformers.ts
@@ -1,6 +1,6 @@
-import { Transformer } from '@/core';
-import { Reference } from '@/models/commons';
-import { User } from '@/models/user';
+import { Transformer } from '../../../../core';
+import { Reference } from '../../../commons';
+import { User } from '../../../user';
 import type { TTeam, TTeamGraphql } from './types';
 
 const transformers = {
diff --git a/standalone/src/models/organization/team/types.ts b/standalone/src/models/organization/organization/team/types.ts
similarity index 58%
rename from standalone/src/models/organization/team/types.ts
rename to standalone/src/models/organization/organization/team/types.ts
index 9ca7b050c3..42ddbc7852 100644
--- a/standalone/src/models/organization/team/types.ts
+++ b/standalone/src/models/organization/organization/team/types.ts
@@ -1,6 +1,6 @@
-import type { TBuilder } from '@/core';
-import type { TCoreTeam } from '@/graphql-types';
-import type { TReference } from '@/models/commons';
+import type { TReference } from '../../../../commons';
+import type { TBuilder } from '../../../../core';
+import type { TCoreTeam } from '../../../../graphql-types';
 
 export type TTeamGraphql = TCoreTeam;
 
diff --git a/standalone/src/models/organization/team/presets/index.ts b/standalone/src/models/organization/team/presets/index.ts
deleted file mode 100644
index ff8b4c5632..0000000000
--- a/standalone/src/models/organization/team/presets/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/standalone/src/organization-extension.ts b/standalone/src/organization-extension.ts
index 14c1a9d6af..18b37518ae 100644
--- a/standalone/src/organization-extension.ts
+++ b/standalone/src/organization-extension.ts
@@ -1 +1 @@
-export * from './models/organization-extension';
+export * from './models/organization/organization-extension';
diff --git a/standalone/src/organization.ts b/standalone/src/organization.ts
index 4bc84a1636..35b42f7b00 100644
--- a/standalone/src/organization.ts
+++ b/standalone/src/organization.ts
@@ -1 +1 @@
-export * from './models/organization';
+export * from './models/organization/organization';

From 911eaae98cc1be67d38a6e0974cea68d4f43b5d2 Mon Sep 17 00:00:00 2001
From: rajrdk <rajrdk@gmail.com>
Date: Fri, 16 May 2025 17:39:03 +0530
Subject: [PATCH 2/4] feat(): adding exports in index file

---
 .../organization/organization-extension/builder.ts   |  2 +-
 .../src/models/organization/organization/index.ts    | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/standalone/src/models/organization/organization-extension/builder.ts b/standalone/src/models/organization/organization-extension/builder.ts
index 8740601f0e..ebae3f3fc4 100644
--- a/standalone/src/models/organization/organization-extension/builder.ts
+++ b/standalone/src/models/organization/organization-extension/builder.ts
@@ -1,4 +1,4 @@
-import { Builder } from '../../../../core';
+import { Builder } from '../../../core';
 import generator from './generator';
 import transformers from './transformers';
 import type {
diff --git a/standalone/src/models/organization/organization/index.ts b/standalone/src/models/organization/organization/index.ts
index 5b99919b5b..a658ad86c7 100644
--- a/standalone/src/models/organization/organization/index.ts
+++ b/standalone/src/models/organization/organization/index.ts
@@ -1,3 +1,13 @@
-export * as McOrganization from './mc-organization';
 export * as Organization from './organization';
+export { default as presets } from './organization/presets';
+export * from './organization/types';
+
+// MC Organization
+export * as McOrganization from './mc-organization';
+export { default as presetsMc } from './mc-organization/presets';
+export * from './mc-organization/types';
+
+// Team
 export * as Team from './team';
+export { default as teamPresets } from './team/presets';
+export * from './team/types';

From b6643bb011ad8b85627cdfbbef42f9406c8cb024 Mon Sep 17 00:00:00 2001
From: rajrdk <rajrdk@gmail.com>
Date: Fri, 16 May 2025 19:14:11 +0530
Subject: [PATCH 3/4] refactor: use alias with relativepath

---
 .../organization/organization-extension/builder.spec.ts   | 2 +-
 .../models/organization/organization-extension/builder.ts | 2 +-
 .../contact-information/builder.spec.ts                   | 2 +-
 .../organization-extension/contact-information/builder.ts | 2 +-
 .../contact-information/generator.ts                      | 4 ++--
 .../contact-information/transformers.ts                   | 2 +-
 .../organization-extension/contact-information/types.ts   | 4 ++--
 .../organization/organization-extension/generator.ts      | 8 ++++----
 .../oidc-sso-config/builder.spec.ts                       | 2 +-
 .../organization-extension/oidc-sso-config/builder.ts     | 2 +-
 .../organization-extension/oidc-sso-config/generator.ts   | 4 ++--
 .../oidc-sso-config/transformers.ts                       | 2 +-
 .../organization-extension/oidc-sso-config/types.ts       | 4 ++--
 .../organization/organization-extension/transformers.ts   | 2 +-
 .../models/organization/organization-extension/types.ts   | 4 ++--
 .../organization/mc-organization/builder.spec.ts          | 2 +-
 .../organization/organization/mc-organization/builder.ts  | 2 +-
 .../organization/mc-organization/generator.ts             | 4 ++--
 .../organization/mc-organization/transformers.ts          | 2 +-
 .../organization/organization/mc-organization/types.ts    | 4 ++--
 .../organization/organization/builder.spec.ts             | 2 +-
 .../organization/organization/organization/builder.ts     | 2 +-
 .../organization/organization/organization/generator.ts   | 4 ++--
 .../organization/organization/transformers.ts             | 2 +-
 .../organization/organization/organization/types.ts       | 4 ++--
 .../models/organization/organization/team/builder.spec.ts | 2 +-
 .../src/models/organization/organization/team/builder.ts  | 2 +-
 .../models/organization/organization/team/generator.ts    | 4 ++--
 .../models/organization/organization/team/transformers.ts | 6 +++---
 .../src/models/organization/organization/team/types.ts    | 6 +++---
 30 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/standalone/src/models/organization/organization-extension/builder.spec.ts b/standalone/src/models/organization/organization-extension/builder.spec.ts
index 22ec8fef87..9623433f02 100644
--- a/standalone/src/models/organization/organization-extension/builder.spec.ts
+++ b/standalone/src/models/organization/organization-extension/builder.spec.ts
@@ -1,6 +1,6 @@
 /* eslint-disable jest/no-disabled-tests */
 /* eslint-disable jest/valid-title */
-import { createBuilderSpec } from '../../../../core/test-utils';
+import { createBuilderSpec } from '@/core/test-utils';
 import type { TOrganizationExtension } from './types';
 import * as OrganizationExtension from './index';
 
diff --git a/standalone/src/models/organization/organization-extension/builder.ts b/standalone/src/models/organization/organization-extension/builder.ts
index ebae3f3fc4..28bf98ad6c 100644
--- a/standalone/src/models/organization/organization-extension/builder.ts
+++ b/standalone/src/models/organization/organization-extension/builder.ts
@@ -1,4 +1,4 @@
-import { Builder } from '../../../core';
+import { Builder } from '@/core';
 import generator from './generator';
 import transformers from './transformers';
 import type {
diff --git a/standalone/src/models/organization/organization-extension/contact-information/builder.spec.ts b/standalone/src/models/organization/organization-extension/contact-information/builder.spec.ts
index 63e80a2a5a..9351d694b0 100644
--- a/standalone/src/models/organization/organization-extension/contact-information/builder.spec.ts
+++ b/standalone/src/models/organization/organization-extension/contact-information/builder.spec.ts
@@ -1,6 +1,6 @@
 /* eslint-disable jest/no-disabled-tests */
 /* eslint-disable jest/valid-title */
-import { createBuilderSpec } from '../../../../core/test-utils';
+import { createBuilderSpec } from '@/core/test-utils';
 import type { TContactInformation } from './types';
 import * as ContactInformation from './index';
 
diff --git a/standalone/src/models/organization/organization-extension/contact-information/builder.ts b/standalone/src/models/organization/organization-extension/contact-information/builder.ts
index ccb4d2bd75..9918c801d7 100644
--- a/standalone/src/models/organization/organization-extension/contact-information/builder.ts
+++ b/standalone/src/models/organization/organization-extension/contact-information/builder.ts
@@ -1,4 +1,4 @@
-import { Builder } from '../../../../core';
+import { Builder } from '@/core';
 import generator from './generator';
 import transformers from './transformers';
 import type {
diff --git a/standalone/src/models/organization/organization-extension/contact-information/generator.ts b/standalone/src/models/organization/organization-extension/contact-information/generator.ts
index 2434247757..55f10fb80d 100644
--- a/standalone/src/models/organization/organization-extension/contact-information/generator.ts
+++ b/standalone/src/models/organization/organization-extension/contact-information/generator.ts
@@ -1,5 +1,5 @@
-import { fake, Generator } from '../../../../core';
-import { createRelatedDates } from '../../../../utils';
+import { fake, Generator } from '@/core';
+import { createRelatedDates } from '@/utils';
 import type { TContactInformation } from './types';
 
 const [getOlderDate, getNewerDate] = createRelatedDates();
diff --git a/standalone/src/models/organization/organization-extension/contact-information/transformers.ts b/standalone/src/models/organization/organization-extension/contact-information/transformers.ts
index eaa20079b3..dddc8107e4 100644
--- a/standalone/src/models/organization/organization-extension/contact-information/transformers.ts
+++ b/standalone/src/models/organization/organization-extension/contact-information/transformers.ts
@@ -1,4 +1,4 @@
-import { Transformer } from '../../../../core';
+import { Transformer } from '@/core';
 import type { TContactInformation, TContactInformationGraphql } from './types';
 
 const buildFields: (keyof TContactInformation)[] = [];
diff --git a/standalone/src/models/organization/organization-extension/contact-information/types.ts b/standalone/src/models/organization/organization-extension/contact-information/types.ts
index 88bd52d9f7..9ac323dd67 100644
--- a/standalone/src/models/organization/organization-extension/contact-information/types.ts
+++ b/standalone/src/models/organization/organization-extension/contact-information/types.ts
@@ -1,5 +1,5 @@
-import { TBuilder } from '../../../../core';
-import type { TMcSettingsContactInformation } from '../../../../graphql-types';
+import { TBuilder } from '@/core';
+import type { TMcSettingsContactInformation } from '@/graphql-types';
 
 export type TContactInformation = Omit<
   TMcSettingsContactInformation,
diff --git a/standalone/src/models/organization/organization-extension/generator.ts b/standalone/src/models/organization/organization-extension/generator.ts
index 31cabe6ab6..797d1c086e 100644
--- a/standalone/src/models/organization/organization-extension/generator.ts
+++ b/standalone/src/models/organization/organization-extension/generator.ts
@@ -1,10 +1,10 @@
-import { fake, Generator } from '../../../../core';
-import { createRelatedDates } from '../../../../utils';
+import { fake, Generator } from '@/core';
 import {
   CustomApplicationInstallation,
   CustomApplication,
-} from '../../custom-application';
-import { CustomViewInstallation, CustomView } from '../../custom-view';
+} from '@/models/custom-application';
+import { CustomViewInstallation, CustomView } from '@/models/custom-view';
+import { createRelatedDates } from '@/utils';
 import * as ContactInformation from './contact-information';
 import * as OidcSSOConfig from './oidc-sso-config';
 import type { TOrganizationExtension } from './types';
diff --git a/standalone/src/models/organization/organization-extension/oidc-sso-config/builder.spec.ts b/standalone/src/models/organization/organization-extension/oidc-sso-config/builder.spec.ts
index 84c838bc6d..046596f713 100644
--- a/standalone/src/models/organization/organization-extension/oidc-sso-config/builder.spec.ts
+++ b/standalone/src/models/organization/organization-extension/oidc-sso-config/builder.spec.ts
@@ -1,6 +1,6 @@
 /* eslint-disable jest/no-disabled-tests */
 /* eslint-disable jest/valid-title */
-import { createBuilderSpec } from '../../../../core/test-utils';
+import { createBuilderSpec } from '@/core/test-utils';
 import type { TOidcSsoConfig } from './types';
 import * as OidcSSOConfig from './index';
 
diff --git a/standalone/src/models/organization/organization-extension/oidc-sso-config/builder.ts b/standalone/src/models/organization/organization-extension/oidc-sso-config/builder.ts
index b0162218e7..3f24aa8f8e 100644
--- a/standalone/src/models/organization/organization-extension/oidc-sso-config/builder.ts
+++ b/standalone/src/models/organization/organization-extension/oidc-sso-config/builder.ts
@@ -1,4 +1,4 @@
-import { Builder } from '../../../../core';
+import { Builder } from '@/core';
 import generator from './generator';
 import transformers from './transformers';
 import type { TOidcSsoConfig, TCreateOidcSsoConfigBuilder } from './types';
diff --git a/standalone/src/models/organization/organization-extension/oidc-sso-config/generator.ts b/standalone/src/models/organization/organization-extension/oidc-sso-config/generator.ts
index 45c03f2579..8c3f9ba679 100644
--- a/standalone/src/models/organization/organization-extension/oidc-sso-config/generator.ts
+++ b/standalone/src/models/organization/organization-extension/oidc-sso-config/generator.ts
@@ -1,5 +1,5 @@
-import { fake, Generator } from '../../../../core';
-import { createRelatedDates } from '../../../../utils';
+import { fake, Generator } from '@/core';
+import { createRelatedDates } from '@/utils';
 import type { TOidcSsoConfig } from './types';
 
 const [getOlderDate, getNewerDate] = createRelatedDates();
diff --git a/standalone/src/models/organization/organization-extension/oidc-sso-config/transformers.ts b/standalone/src/models/organization/organization-extension/oidc-sso-config/transformers.ts
index c88d6d5357..260c0aece2 100644
--- a/standalone/src/models/organization/organization-extension/oidc-sso-config/transformers.ts
+++ b/standalone/src/models/organization/organization-extension/oidc-sso-config/transformers.ts
@@ -1,4 +1,4 @@
-import { Transformer } from '../../../../core';
+import { Transformer } from '@/core';
 import type { TOidcSsoConfig, TOidcSsoConfigGraphql } from './types';
 
 const buildFields: (keyof TOidcSsoConfig)[] = [];
diff --git a/standalone/src/models/organization/organization-extension/oidc-sso-config/types.ts b/standalone/src/models/organization/organization-extension/oidc-sso-config/types.ts
index ca867dce07..36b02f4e69 100644
--- a/standalone/src/models/organization/organization-extension/oidc-sso-config/types.ts
+++ b/standalone/src/models/organization/organization-extension/oidc-sso-config/types.ts
@@ -1,5 +1,5 @@
-import { TBuilder } from '../../../../core';
-import type { TMcSettingsOidcSsoConfig } from '../../../../graphql-types';
+import { TBuilder } from '@/core';
+import type { TMcSettingsOidcSsoConfig } from '@/graphql-types';
 
 export type TOidcSsoConfig = Omit<TMcSettingsOidcSsoConfig, '__typename'>;
 
diff --git a/standalone/src/models/organization/organization-extension/transformers.ts b/standalone/src/models/organization/organization-extension/transformers.ts
index 87b2d0403d..78ef5adbd8 100644
--- a/standalone/src/models/organization/organization-extension/transformers.ts
+++ b/standalone/src/models/organization/organization-extension/transformers.ts
@@ -1,4 +1,4 @@
-import { Transformer } from '../../../../core';
+import { Transformer } from '@/core';
 import type {
   TOrganizationExtension,
   TOrganizationExtensionGraphql,
diff --git a/standalone/src/models/organization/organization-extension/types.ts b/standalone/src/models/organization/organization-extension/types.ts
index 15684f8093..fa22f002c3 100644
--- a/standalone/src/models/organization/organization-extension/types.ts
+++ b/standalone/src/models/organization/organization-extension/types.ts
@@ -1,5 +1,5 @@
-import { TBuilder } from '../../../../core';
-import type { TMcSettingsOrganizationExtension } from '../../../../graphql-types';
+import { TBuilder } from '@/core';
+import type { TMcSettingsOrganizationExtension } from '@/graphql-types';
 
 export type TOrganizationExtension = Omit<
   TMcSettingsOrganizationExtension,
diff --git a/standalone/src/models/organization/organization/mc-organization/builder.spec.ts b/standalone/src/models/organization/organization/mc-organization/builder.spec.ts
index 201d2f5647..50655f215a 100644
--- a/standalone/src/models/organization/organization/mc-organization/builder.spec.ts
+++ b/standalone/src/models/organization/organization/mc-organization/builder.spec.ts
@@ -1,6 +1,6 @@
 /* eslint-disable jest/no-disabled-tests */
 /* eslint-disable jest/valid-title */
-import { createBuilderSpec } from '../../../../core/test-utils';
+import { createBuilderSpec } from '@/core/test-utils';
 import type { TMcOrganization, TMcOrganizationGraphql } from './types';
 import * as McOrganization from './index';
 
diff --git a/standalone/src/models/organization/organization/mc-organization/builder.ts b/standalone/src/models/organization/organization/mc-organization/builder.ts
index 7491055eae..c0a6bbbea4 100644
--- a/standalone/src/models/organization/organization/mc-organization/builder.ts
+++ b/standalone/src/models/organization/organization/mc-organization/builder.ts
@@ -1,4 +1,4 @@
-import { Builder } from '../../../../core';
+import { Builder } from '@/core';
 import generator from './generator';
 import transformers from './transformers';
 import type { TCreateMcOrganizationBuilder, TMcOrganization } from './types';
diff --git a/standalone/src/models/organization/organization/mc-organization/generator.ts b/standalone/src/models/organization/organization/mc-organization/generator.ts
index 77f9e4e30d..402346cd2a 100644
--- a/standalone/src/models/organization/organization/mc-organization/generator.ts
+++ b/standalone/src/models/organization/organization/mc-organization/generator.ts
@@ -1,5 +1,5 @@
-import { fake, Generator } from '../../../../core';
-import { createRelatedDates } from '../../../../utils';
+import { fake, Generator } from '@/core';
+import { createRelatedDates } from '@/utils';
 import type { TMcOrganization } from './types';
 
 const [, getNewerDate] = createRelatedDates();
diff --git a/standalone/src/models/organization/organization/mc-organization/transformers.ts b/standalone/src/models/organization/organization/mc-organization/transformers.ts
index bc9621fee1..ca45b2e8c1 100644
--- a/standalone/src/models/organization/organization/mc-organization/transformers.ts
+++ b/standalone/src/models/organization/organization/mc-organization/transformers.ts
@@ -1,4 +1,4 @@
-import { Transformer } from '../../../../core';
+import { Transformer } from '@/core';
 import type { TMcOrganization, TMcOrganizationGraphql } from './types';
 
 const transformers = {
diff --git a/standalone/src/models/organization/organization/mc-organization/types.ts b/standalone/src/models/organization/organization/mc-organization/types.ts
index bc9be8f30e..d7cc177bdd 100644
--- a/standalone/src/models/organization/organization/mc-organization/types.ts
+++ b/standalone/src/models/organization/organization/mc-organization/types.ts
@@ -1,5 +1,5 @@
-import type { TBuilder } from '../../../../core';
-import type { TMcOrganization as McOrganizationGraphql } from '../../../../graphql-types';
+import type { TBuilder } from '@/core';
+import type { TMcOrganization as McOrganizationGraphql } from '@/graphql-types';
 
 export type TMcOrganization = Omit<McOrganizationGraphql, '__typename'>;
 
diff --git a/standalone/src/models/organization/organization/organization/builder.spec.ts b/standalone/src/models/organization/organization/organization/builder.spec.ts
index 9285fee584..e0a2a866c7 100644
--- a/standalone/src/models/organization/organization/organization/builder.spec.ts
+++ b/standalone/src/models/organization/organization/organization/builder.spec.ts
@@ -1,6 +1,6 @@
 /* eslint-disable jest/no-disabled-tests */
 /* eslint-disable jest/valid-title */
-import { createBuilderSpec } from '../../../../core/test-utils';
+import { createBuilderSpec } from '@/core/test-utils';
 import type { TOrganization, TOrganizationGraphql } from './types';
 import * as Organization from './index';
 
diff --git a/standalone/src/models/organization/organization/organization/builder.ts b/standalone/src/models/organization/organization/organization/builder.ts
index 14dfa5b0da..71f3d0cd6c 100644
--- a/standalone/src/models/organization/organization/organization/builder.ts
+++ b/standalone/src/models/organization/organization/organization/builder.ts
@@ -1,4 +1,4 @@
-import { Builder } from '../../../../core';
+import { Builder } from '@/core';
 import generator from './generator';
 import transformers from './transformers';
 import type { TCreateOrganizationBuilder, TOrganization } from './types';
diff --git a/standalone/src/models/organization/organization/organization/generator.ts b/standalone/src/models/organization/organization/organization/generator.ts
index d17fcd31c3..bf5faf3b31 100644
--- a/standalone/src/models/organization/organization/organization/generator.ts
+++ b/standalone/src/models/organization/organization/organization/generator.ts
@@ -1,5 +1,5 @@
-import { fake, Generator, sequence } from '../../../../core';
-import { createRelatedDates } from '../../../../utils';
+import { fake, Generator, sequence } from '@/core';
+import { createRelatedDates } from '@/utils';
 import * as Team from '../team';
 import type { TOrganization } from './types';
 
diff --git a/standalone/src/models/organization/organization/organization/transformers.ts b/standalone/src/models/organization/organization/organization/transformers.ts
index d1f5e08692..4e801734ca 100644
--- a/standalone/src/models/organization/organization/organization/transformers.ts
+++ b/standalone/src/models/organization/organization/organization/transformers.ts
@@ -1,4 +1,4 @@
-import { Transformer } from '../../../../core';
+import { Transformer } from '@/core';
 import type { TOrganization, TOrganizationGraphql } from './types';
 
 const transformers = {
diff --git a/standalone/src/models/organization/organization/organization/types.ts b/standalone/src/models/organization/organization/organization/types.ts
index 8aab371f03..0459b6b81a 100644
--- a/standalone/src/models/organization/organization/organization/types.ts
+++ b/standalone/src/models/organization/organization/organization/types.ts
@@ -1,8 +1,8 @@
-import type { TBuilder } from '../../../../core';
+import type { TBuilder } from '@/core';
 import type {
   TCoreOrganization,
   TCoreCreateOrganizationCommand,
-} from '../../../../graphql-types';
+} from '@/graphql-types';
 
 export type TOrganization = Omit<TCoreOrganization, '__typename'>;
 
diff --git a/standalone/src/models/organization/organization/team/builder.spec.ts b/standalone/src/models/organization/organization/team/builder.spec.ts
index 8d9ee6078e..74dc9a1b23 100644
--- a/standalone/src/models/organization/organization/team/builder.spec.ts
+++ b/standalone/src/models/organization/organization/team/builder.spec.ts
@@ -1,6 +1,6 @@
 /* eslint-disable jest/no-disabled-tests */
 /* eslint-disable jest/valid-title */
-import { createBuilderSpec } from '../../../../core/test-utils';
+import { createBuilderSpec } from '@/core/test-utils';
 import type { TTeam, TTeamGraphql } from './types';
 import * as Team from './index';
 
diff --git a/standalone/src/models/organization/organization/team/builder.ts b/standalone/src/models/organization/organization/team/builder.ts
index 8ca256bc79..126750d348 100644
--- a/standalone/src/models/organization/organization/team/builder.ts
+++ b/standalone/src/models/organization/organization/team/builder.ts
@@ -1,4 +1,4 @@
-import { Builder } from '../../../../core';
+import { Builder } from '@/core';
 import generator from './generator';
 import transformers from './transformers';
 import type { TCreateTeamBuilder, TTeam } from './types';
diff --git a/standalone/src/models/organization/organization/team/generator.ts b/standalone/src/models/organization/organization/team/generator.ts
index c328c41aea..52882bfbd8 100644
--- a/standalone/src/models/organization/organization/team/generator.ts
+++ b/standalone/src/models/organization/organization/team/generator.ts
@@ -1,5 +1,5 @@
-import { fake, Generator } from '../../../../core';
-import { Reference } from '../../../commons';
+import { fake, Generator } from '@/core';
+import { Reference } from '@/models/commons';
 import type { TTeam } from './types';
 
 const generator = Generator<TTeam>({
diff --git a/standalone/src/models/organization/organization/team/transformers.ts b/standalone/src/models/organization/organization/team/transformers.ts
index 9f0cb18e81..a8322f3f80 100644
--- a/standalone/src/models/organization/organization/team/transformers.ts
+++ b/standalone/src/models/organization/organization/team/transformers.ts
@@ -1,6 +1,6 @@
-import { Transformer } from '../../../../core';
-import { Reference } from '../../../commons';
-import { User } from '../../../user';
+import { Transformer } from '@/core';
+import { Reference } from '@/models/commons';
+import { User } from '@/models/user';
 import type { TTeam, TTeamGraphql } from './types';
 
 const transformers = {
diff --git a/standalone/src/models/organization/organization/team/types.ts b/standalone/src/models/organization/organization/team/types.ts
index 42ddbc7852..9ca7b050c3 100644
--- a/standalone/src/models/organization/organization/team/types.ts
+++ b/standalone/src/models/organization/organization/team/types.ts
@@ -1,6 +1,6 @@
-import type { TReference } from '../../../../commons';
-import type { TBuilder } from '../../../../core';
-import type { TCoreTeam } from '../../../../graphql-types';
+import type { TBuilder } from '@/core';
+import type { TCoreTeam } from '@/graphql-types';
+import type { TReference } from '@/models/commons';
 
 export type TTeamGraphql = TCoreTeam;
 

From 25b3fd06acbc88afadd9f0f33f5199c2848d5483 Mon Sep 17 00:00:00 2001
From: rajrdk <rajrdk@gmail.com>
Date: Mon, 19 May 2025 16:07:55 +0530
Subject: [PATCH 4/4] chore: add changeset

---
 .changeset/four-onions-admire.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/four-onions-admire.md

diff --git a/.changeset/four-onions-admire.md b/.changeset/four-onions-admire.md
new file mode 100644
index 0000000000..3a81ce9582
--- /dev/null
+++ b/.changeset/four-onions-admire.md
@@ -0,0 +1,5 @@
+---
+'@commercetools/composable-commerce-test-data': patch
+---
+
+Moved `Organization` and `Organization-extention` models directories within the repository structure to improve readability.