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.
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 100%
rename from standalone/src/models/organization-extension/builder.spec.ts
rename to standalone/src/models/organization/organization-extension/builder.spec.ts
diff --git a/standalone/src/models/organization-extension/builder.ts b/standalone/src/models/organization/organization-extension/builder.ts
similarity index 100%
rename from standalone/src/models/organization-extension/builder.ts
rename to standalone/src/models/organization/organization-extension/builder.ts
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 100%
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
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 100%
rename from standalone/src/models/organization-extension/contact-information/builder.ts
rename to standalone/src/models/organization/organization-extension/contact-information/builder.ts
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 100%
rename from standalone/src/models/organization-extension/contact-information/generator.ts
rename to standalone/src/models/organization/organization-extension/contact-information/generator.ts
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 100%
rename from standalone/src/models/organization-extension/contact-information/transformers.ts
rename to standalone/src/models/organization/organization-extension/contact-information/transformers.ts
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 100%
rename from standalone/src/models/organization-extension/contact-information/types.ts
rename to standalone/src/models/organization/organization-extension/contact-information/types.ts
diff --git a/standalone/src/models/organization-extension/generator.ts b/standalone/src/models/organization/organization-extension/generator.ts
similarity index 100%
rename from standalone/src/models/organization-extension/generator.ts
rename to standalone/src/models/organization/organization-extension/generator.ts
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
rename from standalone/src/models/organization-extension/transformers.ts
rename to standalone/src/models/organization/organization-extension/transformers.ts
diff --git a/standalone/src/models/organization-extension/types.ts b/standalone/src/models/organization/organization-extension/types.ts
similarity index 100%
rename from standalone/src/models/organization-extension/types.ts
rename to standalone/src/models/organization/organization-extension/types.ts
diff --git a/standalone/src/models/organization/organization/index.ts b/standalone/src/models/organization/organization/index.ts
index 0121666177..a658ad86c7 100644
--- a/standalone/src/models/organization/organization/index.ts
+++ b/standalone/src/models/organization/organization/index.ts
@@ -1,3 +1,13 @@
-export { default as random } from './builder';
-export { default as presets } from './presets';
-export * from './types';
+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/mc-organization/builder.spec.ts b/standalone/src/models/organization/organization/mc-organization/builder.spec.ts
similarity index 100%
rename from standalone/src/models/organization/mc-organization/builder.spec.ts
rename to standalone/src/models/organization/organization/mc-organization/builder.spec.ts
diff --git a/standalone/src/models/organization/mc-organization/builder.ts b/standalone/src/models/organization/organization/mc-organization/builder.ts
similarity index 100%
rename from standalone/src/models/organization/mc-organization/builder.ts
rename to standalone/src/models/organization/organization/mc-organization/builder.ts
diff --git a/standalone/src/models/organization/mc-organization/generator.ts b/standalone/src/models/organization/organization/mc-organization/generator.ts
similarity index 100%
rename from standalone/src/models/organization/mc-organization/generator.ts
rename to standalone/src/models/organization/organization/mc-organization/generator.ts
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 100%
rename from standalone/src/models/organization/mc-organization/transformers.ts
rename to standalone/src/models/organization/organization/mc-organization/transformers.ts
diff --git a/standalone/src/models/organization/mc-organization/types.ts b/standalone/src/models/organization/organization/mc-organization/types.ts
similarity index 100%
rename from standalone/src/models/organization/mc-organization/types.ts
rename to standalone/src/models/organization/organization/mc-organization/types.ts
diff --git a/standalone/src/models/organization/organization/builder.spec.ts b/standalone/src/models/organization/organization/organization/builder.spec.ts
similarity index 100%
rename from standalone/src/models/organization/organization/builder.spec.ts
rename to standalone/src/models/organization/organization/organization/builder.spec.ts
diff --git a/standalone/src/models/organization/organization/builder.ts b/standalone/src/models/organization/organization/organization/builder.ts
similarity index 100%
rename from standalone/src/models/organization/organization/builder.ts
rename to standalone/src/models/organization/organization/organization/builder.ts
diff --git a/standalone/src/models/organization/organization/generator.ts b/standalone/src/models/organization/organization/organization/generator.ts
similarity index 100%
rename from standalone/src/models/organization/organization/generator.ts
rename to standalone/src/models/organization/organization/organization/generator.ts
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 100%
rename from standalone/src/models/organization/organization/transformers.ts
rename to standalone/src/models/organization/organization/organization/transformers.ts
diff --git a/standalone/src/models/organization/organization/types.ts b/standalone/src/models/organization/organization/organization/types.ts
similarity index 100%
rename from standalone/src/models/organization/organization/types.ts
rename to standalone/src/models/organization/organization/organization/types.ts
diff --git a/standalone/src/models/organization/team/builder.spec.ts b/standalone/src/models/organization/organization/team/builder.spec.ts
similarity index 100%
rename from standalone/src/models/organization/team/builder.spec.ts
rename to standalone/src/models/organization/organization/team/builder.spec.ts
diff --git a/standalone/src/models/organization/team/builder.ts b/standalone/src/models/organization/organization/team/builder.ts
similarity index 100%
rename from standalone/src/models/organization/team/builder.ts
rename to standalone/src/models/organization/organization/team/builder.ts
diff --git a/standalone/src/models/organization/team/generator.ts b/standalone/src/models/organization/organization/team/generator.ts
similarity index 100%
rename from standalone/src/models/organization/team/generator.ts
rename to standalone/src/models/organization/organization/team/generator.ts
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 100%
rename from standalone/src/models/organization/team/transformers.ts
rename to standalone/src/models/organization/organization/team/transformers.ts
diff --git a/standalone/src/models/organization/team/types.ts b/standalone/src/models/organization/organization/team/types.ts
similarity index 100%
rename from standalone/src/models/organization/team/types.ts
rename to standalone/src/models/organization/organization/team/types.ts
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';