feat: v2 managed organizations (#19341)

* refactor: allow non unique PlatformBilling customerId * feat: add PlatformBilling managed organizations fields * feat: ManagedOrganization table * refactor: bill overdue based on teamId * refactor: restructure organizations module * wip: organizations endpoints * Revert "wip: organizations endpoints" This reverts commit 0e9e66fc74f31da436f12930c1b6597c650ed621. * refactor: unique index for managed organizations * wip: organizations endpoints * wip: create managed organization * remove unecessary membership check because we have guard * feat: create managed org * feat: get managed org and orgs * feat: update and delete managed orgs * wip: api key logic * feat: allow variable api key length * feat: refresh managed org api key * feat: create managed org OAuth clients using api key * finish merge main * chore: bump platform libraries * tests: fix and add more tests to api-auth.strategy.e2e * refactor: dont request managed org slug and handle metadata as object * revert: billing service and repository update overdue based on sub and customer ids * refactor: v2 OAuth client permissions (#19501) * refactor: v2 permissions as string array * refactor: frontend work with permissions as string * tests: test '*' permissions * fix:managed org creator have profile & test can fetch oauth client * fix: tests * fix: OAuthClientCard on frontend * fix: tests
2025-02-25 18:10:46 -07:00
1 parent e4ab8d87c4
commit a44bcafcf2
@@ -1,7 +1,7 @@
 import { bootstrap } from "@/app";
 import { AppModule } from "@/app.module";
-import { CreateOrganizationAttributeInput } from "@/modules/organizations/inputs/attributes/create-organization-attribute.input";
-import { UpdateOrganizationAttributeInput } from "@/modules/organizations/inputs/attributes/update-organization-attribute.input";
+import { CreateOrganizationAttributeInput } from "@/modules/organizations/attributes/index/inputs/create-organization-attribute.input";
+import { UpdateOrganizationAttributeInput } from "@/modules/organizations/attributes/index/inputs/update-organization-attribute.input";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
 import { TokensModule } from "@/modules/tokens/tokens.module";
 import { UsersModule } from "@/modules/users/users.module";
@@ -6,16 +6,16 @@ import { PlatformPlanGuard } from "@/modules/auth/guards/billing/platform-plan.g
 import { IsAdminAPIEnabledGuard } from "@/modules/auth/guards/organizations/is-admin-api-enabled.guard";
 import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
 import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
-import { CreateOrganizationAttributeInput } from "@/modules/organizations/inputs/attributes/create-organization-attribute.input";
-import { UpdateOrganizationAttributeInput } from "@/modules/organizations/inputs/attributes/update-organization-attribute.input";
-import { CreateOrganizationAttributesOutput } from "@/modules/organizations/outputs/attributes/create-organization-attributes.output";
-import { DeleteOrganizationAttributesOutput } from "@/modules/organizations/outputs/attributes/delete-organization-attributes.output";
+import { CreateOrganizationAttributeInput } from "@/modules/organizations/attributes/index/inputs/create-organization-attribute.input";
+import { UpdateOrganizationAttributeInput } from "@/modules/organizations/attributes/index/inputs/update-organization-attribute.input";
+import { CreateOrganizationAttributesOutput } from "@/modules/organizations/attributes/index/outputs/create-organization-attributes.output";
+import { DeleteOrganizationAttributesOutput } from "@/modules/organizations/attributes/index/outputs/delete-organization-attributes.output";
 import {
  GetOrganizationAttributesOutput,
  GetSingleAttributeOutput,
-} from "@/modules/organizations/outputs/attributes/get-organization-attributes.output";
-import { UpdateOrganizationAttributesOutput } from "@/modules/organizations/outputs/attributes/update-organization-attributes.output";
-import { OrganizationAttributesService } from "@/modules/organizations/services/attributes/organization-attributes.service";
+} from "@/modules/organizations/attributes/index/outputs/get-organization-attributes.output";
+import { UpdateOrganizationAttributesOutput } from "@/modules/organizations/attributes/index/outputs/update-organization-attributes.output";
+import { OrganizationAttributesService } from "@/modules/organizations/attributes/index/services/organization-attributes.service";
 import {
  Body,
  Controller,
@@ -1,4 +1,4 @@
-import { CreateOrganizationAttributeOptionInput } from "@/modules/organizations/inputs/attributes/options/create-organization-attribute-option.input";
+import { CreateOrganizationAttributeOptionInput } from "@/modules/organizations/attributes/options/inputs/create-organization-attribute-option.input";
 import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
 import { AttributeType } from "@prisma/client";
 import { Type } from "class-transformer";
@@ -1,5 +1,5 @@
-import { CreateOrganizationAttributeInput } from "@/modules/organizations/inputs/attributes/create-organization-attribute.input";
-import { UpdateOrganizationAttributeInput } from "@/modules/organizations/inputs/attributes/update-organization-attribute.input";
+import { CreateOrganizationAttributeInput } from "@/modules/organizations/attributes/index/inputs/create-organization-attribute.input";
+import { UpdateOrganizationAttributeInput } from "@/modules/organizations/attributes/index/inputs/update-organization-attribute.input";
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { Injectable } from "@nestjs/common";
@@ -1,5 +1,5 @@
-import { Attribute } from "@/modules/organizations/outputs/attributes/attribute.output";
-import { BaseOutputDTO } from "@/modules/organizations/outputs/attributes/base.output";
+import { Attribute } from "@/modules/organizations/attributes/index/outputs/attribute.output";
+import { BaseOutputDTO } from "@/modules/organizations/attributes/index/outputs/base.output";
 import { Expose, Type } from "class-transformer";
 import { ValidateNested } from "class-validator";

@@ -1,5 +1,5 @@
-import { Attribute } from "@/modules/organizations/outputs/attributes/attribute.output";
-import { BaseOutputDTO } from "@/modules/organizations/outputs/attributes/base.output";
+import { Attribute } from "@/modules/organizations/attributes/index/outputs/attribute.output";
+import { BaseOutputDTO } from "@/modules/organizations/attributes/index/outputs/base.output";
 import { Expose, Type } from "class-transformer";
 import { ValidateNested } from "class-validator";

@@ -1,5 +1,5 @@
-import { Attribute } from "@/modules/organizations/outputs/attributes/attribute.output";
-import { BaseOutputDTO } from "@/modules/organizations/outputs/attributes/base.output";
+import { Attribute } from "@/modules/organizations/attributes/index/outputs/attribute.output";
+import { BaseOutputDTO } from "@/modules/organizations/attributes/index/outputs/base.output";
 import { ApiProperty } from "@nestjs/swagger";
 import { Expose, Type } from "class-transformer";
 import { IsOptional, ValidateNested } from "class-validator";
@@ -1,5 +1,5 @@
-import { Attribute } from "@/modules/organizations/outputs/attributes/attribute.output";
-import { BaseOutputDTO } from "@/modules/organizations/outputs/attributes/base.output";
+import { Attribute } from "@/modules/organizations/attributes/index/outputs/attribute.output";
+import { BaseOutputDTO } from "@/modules/organizations/attributes/index/outputs/base.output";
 import { Expose, Type } from "class-transformer";
 import { ValidateNested } from "class-validator";

@@ -1,6 +1,6 @@
-import { CreateOrganizationAttributeInput } from "@/modules/organizations/inputs/attributes/create-organization-attribute.input";
-import { UpdateOrganizationAttributeInput } from "@/modules/organizations/inputs/attributes/update-organization-attribute.input";
-import { OrganizationAttributesRepository } from "@/modules/organizations/repositories/attributes/organization-attribute.repository";
+import { CreateOrganizationAttributeInput } from "@/modules/organizations/attributes/index/inputs/create-organization-attribute.input";
+import { UpdateOrganizationAttributeInput } from "@/modules/organizations/attributes/index/inputs/update-organization-attribute.input";
+import { OrganizationAttributesRepository } from "@/modules/organizations/attributes/index/organization-attributes.repository";
 import { Injectable } from "@nestjs/common";

@Injectable()
@@ -1,6 +1,6 @@
-import { CreateOrganizationAttributeOptionInput } from "@/modules/organizations/inputs/attributes/options/create-organization-attribute-option.input";
-import { UpdateOrganizationAttributeOptionInput } from "@/modules/organizations/inputs/attributes/options/update-organizaiton-attribute-option.input.ts";
-import { OrganizationsMembershipService } from "@/modules/organizations/services/organizations-membership.service";
+import { CreateOrganizationAttributeOptionInput } from "@/modules/organizations/attributes/options/inputs/create-organization-attribute-option.input";
+import { UpdateOrganizationAttributeOptionInput } from "@/modules/organizations/attributes/options/inputs/update-organizaiton-attribute-option.input.ts";
+import { OrganizationsMembershipService } from "@/modules/organizations/memberships/services/organizations-membership.service";
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { Injectable, Logger, NotFoundException } from "@nestjs/common";
@@ -1,8 +1,8 @@
 import { bootstrap } from "@/app";
 import { AppModule } from "@/app.module";
-import { AssignOrganizationAttributeOptionToUserInput } from "@/modules/organizations/inputs/attributes/assign/organizations-attributes-options-assign.input";
-import { CreateOrganizationAttributeOptionInput } from "@/modules/organizations/inputs/attributes/options/create-organization-attribute-option.input";
-import { UpdateOrganizationAttributeOptionInput } from "@/modules/organizations/inputs/attributes/options/update-organizaiton-attribute-option.input.ts";
+import { CreateOrganizationAttributeOptionInput } from "@/modules/organizations/attributes/options/inputs/create-organization-attribute-option.input";
+import { AssignOrganizationAttributeOptionToUserInput } from "@/modules/organizations/attributes/options/inputs/organizations-attributes-options-assign.input";
+import { UpdateOrganizationAttributeOptionInput } from "@/modules/organizations/attributes/options/inputs/update-organizaiton-attribute-option.input.ts";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
 import { TokensModule } from "@/modules/tokens/tokens.module";
 import { UsersModule } from "@/modules/users/users.module";
@@ -6,19 +6,19 @@ import { PlatformPlanGuard } from "@/modules/auth/guards/billing/platform-plan.g
 import { IsAdminAPIEnabledGuard } from "@/modules/auth/guards/organizations/is-admin-api-enabled.guard";
 import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
 import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
-import { AssignOrganizationAttributeOptionToUserInput } from "@/modules/organizations/inputs/attributes/assign/organizations-attributes-options-assign.input";
-import { CreateOrganizationAttributeOptionInput } from "@/modules/organizations/inputs/attributes/options/create-organization-attribute-option.input";
-import { UpdateOrganizationAttributeOptionInput } from "@/modules/organizations/inputs/attributes/options/update-organizaiton-attribute-option.input.ts";
+import { CreateOrganizationAttributeOptionInput } from "@/modules/organizations/attributes/options/inputs/create-organization-attribute-option.input";
+import { AssignOrganizationAttributeOptionToUserInput } from "@/modules/organizations/attributes/options/inputs/organizations-attributes-options-assign.input";
+import { UpdateOrganizationAttributeOptionInput } from "@/modules/organizations/attributes/options/inputs/update-organizaiton-attribute-option.input.ts";
 import {
  AssignOptionUserOutput,
  UnassignOptionUserOutput,
-} from "@/modules/organizations/outputs/attributes/options/assign-option-user.output";
-import { CreateAttributeOptionOutput } from "@/modules/organizations/outputs/attributes/options/create-option.output";
-import { DeleteAttributeOptionOutput } from "@/modules/organizations/outputs/attributes/options/delete-option.output";
-import { GetOptionUserOutput } from "@/modules/organizations/outputs/attributes/options/get-option-user.output";
-import { GetAllAttributeOptionOutput } from "@/modules/organizations/outputs/attributes/options/get-option.output";
-import { UpdateAttributeOptionOutput } from "@/modules/organizations/outputs/attributes/options/update-option.output";
-import { OrganizationAttributeOptionService } from "@/modules/organizations/services/attributes/organization-attributes-option.service";
+} from "@/modules/organizations/attributes/options/outputs/assign-option-user.output";
+import { CreateAttributeOptionOutput } from "@/modules/organizations/attributes/options/outputs/create-option.output";
+import { DeleteAttributeOptionOutput } from "@/modules/organizations/attributes/options/outputs/delete-option.output";
+import { GetOptionUserOutput } from "@/modules/organizations/attributes/options/outputs/get-option-user.output";
+import { GetAllAttributeOptionOutput } from "@/modules/organizations/attributes/options/outputs/get-option.output";
+import { UpdateAttributeOptionOutput } from "@/modules/organizations/attributes/options/outputs/update-option.output";
+import { OrganizationAttributeOptionService } from "@/modules/organizations/attributes/options/services/organization-attributes-option.service";
 import { Body, Controller, Delete, Get, Param, ParseIntPipe, Patch, Post, UseGuards } from "@nestjs/common";
 import { ApiOperation, ApiTags as DocsTags } from "@nestjs/swagger";

@@ -30,7 +30,7 @@ import { SUCCESS_STATUS } from "@calcom/platform-constants";
 })
@UseGuards(ApiAuthGuard, IsOrgGuard, RolesGuard, PlatformPlanGuard, IsAdminAPIEnabledGuard)
@DocsTags("Orgs / Attributes / Options")
-export class OrganizationsOptionsAttributesController {
+export class OrganizationsAttributesOptionsController {
  constructor(private readonly organizationsAttributesOptionsService: OrganizationAttributeOptionService) {}

  @Roles("ORG_ADMIN")
@@ -1,5 +1,5 @@
-import { BaseOutputDTO } from "@/modules/organizations/outputs/attributes/base.output";
-import { OptionOutput } from "@/modules/organizations/outputs/attributes/options/option.output";
+import { BaseOutputDTO } from "@/modules/organizations/attributes/index/outputs/base.output";
+import { OptionOutput } from "@/modules/organizations/attributes/options/outputs/option.output";
 import { ApiProperty } from "@nestjs/swagger";
 import { Expose, Type } from "class-transformer";
 import { IsString, ValidateNested } from "class-validator";
@@ -1,5 +1,5 @@
-import { BaseOutputDTO } from "@/modules/organizations/outputs/attributes/base.output";
-import { OptionOutput } from "@/modules/organizations/outputs/attributes/options/option.output";
+import { BaseOutputDTO } from "@/modules/organizations/attributes/index/outputs/base.output";
+import { OptionOutput } from "@/modules/organizations/attributes/options/outputs/option.output";
 import { Expose, Type } from "class-transformer";
 import { ValidateNested } from "class-validator";

@@ -1,5 +1,5 @@
-import { BaseOutputDTO } from "@/modules/organizations/outputs/attributes/base.output";
-import { OptionOutput } from "@/modules/organizations/outputs/attributes/options/option.output";
+import { BaseOutputDTO } from "@/modules/organizations/attributes/index/outputs/base.output";
+import { OptionOutput } from "@/modules/organizations/attributes/options/outputs/option.output";
 import { Expose, Type } from "class-transformer";
 import { ValidateNested } from "class-validator";

@@ -1,4 +1,4 @@
-import { BaseOutputDTO } from "@/modules/organizations/outputs/attributes/base.output";
+import { BaseOutputDTO } from "@/modules/organizations/attributes/index/outputs/base.output";
 import { ApiProperty } from "@nestjs/swagger";
 import { Expose, Type } from "class-transformer";
 import { IsString, ValidateNested } from "class-validator";
@@ -1,5 +1,5 @@
-import { BaseOutputDTO } from "@/modules/organizations/outputs/attributes/base.output";
-import { OptionOutput } from "@/modules/organizations/outputs/attributes/options/option.output";
+import { BaseOutputDTO } from "@/modules/organizations/attributes/index/outputs/base.output";
+import { OptionOutput } from "@/modules/organizations/attributes/options/outputs/option.output";
 import { Expose, Type } from "class-transformer";
 import { ValidateNested } from "class-validator";

@@ -1,4 +1,4 @@
-import { BaseOutputDTO } from "@/modules/organizations/outputs/attributes/base.output";
+import { BaseOutputDTO } from "@/modules/organizations/attributes/index/outputs/base.output";
 import { ApiProperty } from "@nestjs/swagger";
 import { IsString, IsInt, IsEnum, IsBoolean } from "class-validator";

@@ -1,5 +1,5 @@
-import { BaseOutputDTO } from "@/modules/organizations/outputs/attributes/base.output";
-import { OptionOutput } from "@/modules/organizations/outputs/attributes/options/option.output";
+import { BaseOutputDTO } from "@/modules/organizations/attributes/index/outputs/base.output";
+import { OptionOutput } from "@/modules/organizations/attributes/options/outputs/option.output";
 import { Expose, Type } from "class-transformer";
 import { ValidateNested } from "class-validator";

@@ -1,9 +1,9 @@
-import { AssignOrganizationAttributeOptionToUserInput } from "@/modules/organizations/inputs/attributes/assign/organizations-attributes-options-assign.input";
-import { CreateOrganizationAttributeOptionInput } from "@/modules/organizations/inputs/attributes/options/create-organization-attribute-option.input";
-import { UpdateOrganizationAttributeOptionInput } from "@/modules/organizations/inputs/attributes/options/update-organizaiton-attribute-option.input.ts";
-import { OrganizationAttributeOptionRepository } from "@/modules/organizations/repositories/attributes/organization-attribute-option.repository";
-import { OrganizationAttributesService } from "@/modules/organizations/services/attributes/organization-attributes.service";
-import { OrganizationsMembershipService } from "@/modules/organizations/services/organizations-membership.service";
+import { OrganizationAttributesService } from "@/modules/organizations/attributes/index/services/organization-attributes.service";
+import { CreateOrganizationAttributeOptionInput } from "@/modules/organizations/attributes/options/inputs/create-organization-attribute-option.input";
+import { AssignOrganizationAttributeOptionToUserInput } from "@/modules/organizations/attributes/options/inputs/organizations-attributes-options-assign.input";
+import { UpdateOrganizationAttributeOptionInput } from "@/modules/organizations/attributes/options/inputs/update-organizaiton-attribute-option.input.ts";
+import { OrganizationAttributeOptionRepository } from "@/modules/organizations/attributes/options/organization-attribute-options.repository";
+import { OrganizationsMembershipService } from "@/modules/organizations/memberships/services/organizations-membership.service";
 import { BadRequestException, Injectable, Logger, NotFoundException } from "@nestjs/common";

 const TYPE_SUPPORTS_VALUE = new Set(["TEXT", "NUMBER"]);
@@ -10,10 +10,10 @@ import { IsAdminAPIEnabledGuard } from "@/modules/auth/guards/organizations/is-a
 import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
 import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
 import { IsTeamInOrg } from "@/modules/auth/guards/teams/is-team-in-org.guard";
-import { OutputTeamEventTypesResponsePipe } from "@/modules/organizations/controllers/pipes/event-types/team-event-types-response.transformer";
-import { InputOrganizationsEventTypesService } from "@/modules/organizations/services/event-types/input.service";
-import { OrganizationsEventTypesService } from "@/modules/organizations/services/event-types/organizations-event-types.service";
-import { DatabaseTeamEventType } from "@/modules/organizations/services/event-types/output.service";
+import { OutputTeamEventTypesResponsePipe } from "@/modules/organizations/event-types/pipes/team-event-types-response.transformer";
+import { InputOrganizationsEventTypesService } from "@/modules/organizations/event-types/services/input.service";
+import { OrganizationsEventTypesService } from "@/modules/organizations/event-types/services/organizations-event-types.service";
+import { DatabaseTeamEventType } from "@/modules/organizations/event-types/services/output.service";
 import { CreateTeamEventTypeOutput } from "@/modules/teams/event-types/outputs/create-team-event-type.output";
 import { DeleteTeamEventTypeOutput } from "@/modules/teams/event-types/outputs/delete-team-event-type.output";
 import { GetTeamEventTypeOutput } from "@/modules/teams/event-types/outputs/get-team-event-type.output";
@@ -1,5 +1,5 @@
-import { OutputOrganizationsEventTypesService } from "@/modules/organizations/services/event-types/output.service";
-import { DatabaseTeamEventType } from "@/modules/organizations/services/event-types/output.service";
+import { OutputOrganizationsEventTypesService } from "@/modules/organizations/event-types/services/output.service";
+import { DatabaseTeamEventType } from "@/modules/organizations/event-types/services/output.service";
 import { Injectable, PipeTransform } from "@nestjs/common";
 import { plainToClass } from "class-transformer";

@@ -1,6 +1,6 @@
 import { MembershipsRepository } from "@/modules/memberships/memberships.repository";
-import { OrganizationsEventTypesRepository } from "@/modules/organizations/repositories/organizations-event-types.repository";
-import { DatabaseTeamEventType } from "@/modules/organizations/services/event-types/output.service";
+import { OrganizationsEventTypesRepository } from "@/modules/organizations/event-types/organizations-event-types.repository";
+import { DatabaseTeamEventType } from "@/modules/organizations/event-types/services/output.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { TeamsEventTypesService } from "@/modules/teams/event-types/services/teams-event-types.service";
 import { UsersService } from "@/modules/users/services/users.service";
@@ -4,6 +4,8 @@ import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { StripeService } from "@/modules/stripe/stripe.service";
 import { Injectable } from "@nestjs/common";

+import { Prisma } from "@calcom/prisma/client";
+
@Injectable()
 export class OrganizationsRepository {
  constructor(
@@ -21,6 +23,17 @@ export class OrganizationsRepository {
    });
  }

+  async findByIds(organizationIds: number[]) {
+    return this.dbRead.prisma.team.findMany({
+      where: {
+        id: {
+          in: organizationIds,
+        },
+        isOrganization: true,
+      },
+    });
+  }
+
  async findByIdIncludeBilling(orgId: number) {
    return this.dbRead.prisma.team.findUnique({
      where: {
@@ -132,6 +145,25 @@ export class OrganizationsRepository {
    });
  }

+  async update(organizationId: number, data: Prisma.TeamUpdateInput) {
+    return this.dbWrite.prisma.team.update({
+      where: {
+        id: organizationId,
+        isOrganization: true,
+      },
+      data,
+    });
+  }
+
+  async delete(organizationId: number) {
+    return this.dbWrite.prisma.team.delete({
+      where: {
+        id: organizationId,
+        isOrganization: true,
+      },
+    });
+  }
+
  async findOrgBySlug(slug: string) {
    return this.dbRead.prisma.team.findFirst({
      where: {
@@ -1,4 +1,4 @@
-import { OrganizationsRepository } from "@/modules/organizations/organizations.repository";
+import { OrganizationsRepository } from "@/modules/organizations/index/organizations.repository";
 import { Injectable } from "@nestjs/common";

@Injectable()
@@ -1,7 +1,7 @@
 import { bootstrap } from "@/app";
 import { AppModule } from "@/app.module";
-import { CreateOrgMembershipDto } from "@/modules/organizations/inputs/create-organization-membership.input";
-import { UpdateOrgMembershipDto } from "@/modules/organizations/inputs/update-organization-membership.input";
+import { CreateOrgMembershipDto } from "@/modules/organizations/memberships/inputs/create-organization-membership.input";
+import { UpdateOrgMembershipDto } from "@/modules/organizations/memberships/inputs/update-organization-membership.input";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
 import { TokensModule } from "@/modules/tokens/tokens.module";
 import { UsersModule } from "@/modules/users/users.module";
@@ -7,15 +7,15 @@ import { IsMembershipInOrg } from "@/modules/auth/guards/memberships/is-membersh
 import { IsAdminAPIEnabledGuard } from "@/modules/auth/guards/organizations/is-admin-api-enabled.guard";
 import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
 import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
-import { CreateOrgMembershipDto } from "@/modules/organizations/inputs/create-organization-membership.input";
-import { UpdateOrgMembershipDto } from "@/modules/organizations/inputs/update-organization-membership.input";
-import { CreateOrgMembershipOutput } from "@/modules/organizations/outputs/organization-membership/create-membership.output";
-import { DeleteOrgMembership } from "@/modules/organizations/outputs/organization-membership/delete-membership.output";
-import { GetAllOrgMemberships } from "@/modules/organizations/outputs/organization-membership/get-all-memberships.output";
-import { GetOrgMembership } from "@/modules/organizations/outputs/organization-membership/get-membership.output";
-import { OrgMembershipOutputDto } from "@/modules/organizations/outputs/organization-membership/membership.output";
-import { UpdateOrgMembership } from "@/modules/organizations/outputs/organization-membership/update-membership.output";
-import { OrganizationsMembershipService } from "@/modules/organizations/services/organizations-membership.service";
+import { CreateOrgMembershipDto } from "@/modules/organizations/memberships/inputs/create-organization-membership.input";
+import { UpdateOrgMembershipDto } from "@/modules/organizations/memberships/inputs/update-organization-membership.input";
+import { CreateOrgMembershipOutput } from "@/modules/organizations/memberships/outputs/create-membership.output";
+import { DeleteOrgMembership } from "@/modules/organizations/memberships/outputs/delete-membership.output";
+import { GetAllOrgMemberships } from "@/modules/organizations/memberships/outputs/get-all-memberships.output";
+import { GetOrgMembership } from "@/modules/organizations/memberships/outputs/get-membership.output";
+import { OrgMembershipOutputDto } from "@/modules/organizations/memberships/outputs/membership.output";
+import { UpdateOrgMembership } from "@/modules/organizations/memberships/outputs/update-membership.output";
+import { OrganizationsMembershipService } from "@/modules/organizations/memberships/services/organizations-membership.service";
 import {
  Controller,
  UseGuards,
@@ -1,9 +1,9 @@
-import { CreateOrgMembershipDto } from "@/modules/organizations/inputs/create-organization-membership.input";
+import { CreateOrgMembershipDto } from "@/modules/organizations/memberships/inputs/create-organization-membership.input";
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { Injectable } from "@nestjs/common";

-import { UpdateOrgMembershipDto } from "../inputs/update-organization-membership.input";
+import { UpdateOrgMembershipDto } from "./inputs/update-organization-membership.input";

@Injectable()
 export class OrganizationsMembershipRepository {
@@ -1,4 +1,4 @@
-import { OrgMembershipOutputDto } from "@/modules/organizations/outputs/organization-membership/membership.output";
+import { OrgMembershipOutputDto } from "@/modules/organizations/memberships/outputs/membership.output";
 import { ApiProperty } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import { IsEnum, IsNotEmptyObject, ValidateNested } from "class-validator";
@@ -1,4 +1,4 @@
-import { OrgMembershipOutputDto } from "@/modules/organizations/outputs/organization-membership/membership.output";
+import { OrgMembershipOutputDto } from "@/modules/organizations/memberships/outputs/membership.output";
 import { ApiProperty } from "@nestjs/swagger";
 import { IsEnum } from "class-validator";

@@ -1,4 +1,4 @@
-import { OrgMembershipOutputDto } from "@/modules/organizations/outputs/organization-membership/membership.output";
+import { OrgMembershipOutputDto } from "@/modules/organizations/memberships/outputs/membership.output";
 import { ApiProperty } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import { IsEnum, IsNotEmptyObject, ValidateNested, IsArray } from "class-validator";
@@ -1,4 +1,4 @@
-import { OrgMembershipOutputDto } from "@/modules/organizations/outputs/organization-membership/membership.output";
+import { OrgMembershipOutputDto } from "@/modules/organizations/memberships/outputs/membership.output";
 import { ApiProperty } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import { IsEnum, IsNotEmptyObject, ValidateNested } from "class-validator";
@@ -1,4 +1,4 @@
-import { OrgMembershipOutputDto } from "@/modules/organizations/outputs/organization-membership/membership.output";
+import { OrgMembershipOutputDto } from "@/modules/organizations/memberships/outputs/membership.output";
 import { ApiProperty } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import { IsEnum, IsNotEmptyObject, ValidateNested } from "class-validator";
@@ -1,5 +1,5 @@
-import { CreateOrgMembershipDto } from "@/modules/organizations/inputs/create-organization-membership.input";
-import { OrganizationsMembershipRepository } from "@/modules/organizations/repositories/organizations-membership.repository";
+import { CreateOrgMembershipDto } from "@/modules/organizations/memberships/inputs/create-organization-membership.input";
+import { OrganizationsMembershipRepository } from "@/modules/organizations/memberships/organizations-membership.repository";
 import { Injectable } from "@nestjs/common";

 import { UpdateOrgMembershipDto } from "../inputs/update-organization-membership.input";
@@ -5,43 +5,44 @@ import { EmailService } from "@/modules/email/email.service";
 import { MembershipsRepository } from "@/modules/memberships/memberships.repository";
 import { UserOOORepository } from "@/modules/ooo/repositories/ooo.repository";
 import { UserOOOService } from "@/modules/ooo/services/ooo.service";
-import { OrganizationsOptionsAttributesController } from "@/modules/organizations/controllers/attributes/organizations-attributes-options.controller";
-import { OrganizationsAttributesController } from "@/modules/organizations/controllers/attributes/organizations-attributes.controller";
-import { OrganizationsEventTypesController } from "@/modules/organizations/controllers/event-types/organizations-event-types.controller";
-import { OrganizationsMembershipsController } from "@/modules/organizations/controllers/memberships/organizations-membership.controller";
-import { OutputTeamEventTypesResponsePipe } from "@/modules/organizations/controllers/pipes/event-types/team-event-types-response.transformer";
-import { OrganizationsSchedulesController } from "@/modules/organizations/controllers/schedules/organizations-schedules.controller";
-import { OrganizationsTeamsMembershipsController } from "@/modules/organizations/controllers/teams/memberships/organizations-teams-memberships.controller";
-import { OrganizationsTeamsController } from "@/modules/organizations/controllers/teams/organizations-teams.controller";
-import { OrganizationsTeamsSchedulesController } from "@/modules/organizations/controllers/teams/schedules/organizations-teams-schedules.controller";
-import { OrganizationsUsersOOOController } from "@/modules/organizations/controllers/users/ooo/organizations-users-ooo-controller";
-import { OrgUsersOOORepository } from "@/modules/organizations/controllers/users/ooo/repositories/organizations-users-ooo.repository";
-import { OrgUsersOOOService } from "@/modules/organizations/controllers/users/ooo/services/organization-users-ooo.service";
-import { OrganizationsUsersController } from "@/modules/organizations/controllers/users/organizations-users.controller";
-import { OrganizationsWebhooksController } from "@/modules/organizations/controllers/webhooks/organizations-webhooks.controller";
-import { OrganizationsRepository } from "@/modules/organizations/organizations.repository";
-import { OrganizationAttributeOptionRepository } from "@/modules/organizations/repositories/attributes/organization-attribute-option.repository";
-import { OrganizationAttributesRepository } from "@/modules/organizations/repositories/attributes/organization-attribute.repository";
-import { OrganizationsEventTypesRepository } from "@/modules/organizations/repositories/organizations-event-types.repository";
-import { OrganizationsMembershipRepository } from "@/modules/organizations/repositories/organizations-membership.repository";
-import { OrganizationSchedulesRepository } from "@/modules/organizations/repositories/organizations-schedules.repository";
-import { OrganizationsTeamsMembershipsRepository } from "@/modules/organizations/repositories/organizations-teams-memberships.repository";
-import { OrganizationsTeamsRepository } from "@/modules/organizations/repositories/organizations-teams.repository";
-import { OrganizationsUsersRepository } from "@/modules/organizations/repositories/organizations-users.repository";
-import { OrganizationsWebhooksRepository } from "@/modules/organizations/repositories/organizations-webhooks.repository";
-import { OrganizationAttributeOptionService } from "@/modules/organizations/services/attributes/organization-attributes-option.service";
-import { OrganizationAttributesService } from "@/modules/organizations/services/attributes/organization-attributes.service";
-import { InputOrganizationsEventTypesService } from "@/modules/organizations/services/event-types/input.service";
-import { OrganizationsEventTypesService } from "@/modules/organizations/services/event-types/organizations-event-types.service";
-import { OutputOrganizationsEventTypesService } from "@/modules/organizations/services/event-types/output.service";
-import { OrganizationsMembershipService } from "@/modules/organizations/services/organizations-membership.service";
-import { OrganizationsSchedulesService } from "@/modules/organizations/services/organizations-schedules.service";
-import { OrganizationsTeamsMembershipsService } from "@/modules/organizations/services/organizations-teams-memberships.service";
-import { OrganizationsTeamsService } from "@/modules/organizations/services/organizations-teams.service";
-import { OrganizationsUsersService } from "@/modules/organizations/services/organizations-users-service";
-import { OrganizationsWebhooksService } from "@/modules/organizations/services/organizations-webhooks.service";
-import { OrganizationsService } from "@/modules/organizations/services/organizations.service";
+import { OrganizationsAttributesController } from "@/modules/organizations/attributes/index/controllers/organizations-attributes.controller";
+import { OrganizationAttributesRepository } from "@/modules/organizations/attributes/index/organization-attributes.repository";
+import { OrganizationAttributesService } from "@/modules/organizations/attributes/index/services/organization-attributes.service";
+import { OrganizationAttributeOptionRepository } from "@/modules/organizations/attributes/options/organization-attribute-options.repository";
+import { OrganizationsAttributesOptionsController } from "@/modules/organizations/attributes/options/organizations-attributes-options.controller";
+import { OrganizationAttributeOptionService } from "@/modules/organizations/attributes/options/services/organization-attributes-option.service";
+import { OrganizationsEventTypesController } from "@/modules/organizations/event-types/organizations-event-types.controller";
+import { OrganizationsEventTypesRepository } from "@/modules/organizations/event-types/organizations-event-types.repository";
+import { OutputTeamEventTypesResponsePipe } from "@/modules/organizations/event-types/pipes/team-event-types-response.transformer";
+import { InputOrganizationsEventTypesService } from "@/modules/organizations/event-types/services/input.service";
+import { OrganizationsEventTypesService } from "@/modules/organizations/event-types/services/organizations-event-types.service";
+import { OutputOrganizationsEventTypesService } from "@/modules/organizations/event-types/services/output.service";
+import { OrganizationsRepository } from "@/modules/organizations/index/organizations.repository";
+import { OrganizationsService } from "@/modules/organizations/index/organizations.service";
+import { OrganizationsMembershipsController } from "@/modules/organizations/memberships/organizations-membership.controller";
+import { OrganizationsMembershipRepository } from "@/modules/organizations/memberships/organizations-membership.repository";
+import { OrganizationsMembershipService } from "@/modules/organizations/memberships/services/organizations-membership.service";
+import { OrganizationsOrganizationsModule } from "@/modules/organizations/organizations/organizations-organizations.module";
+import { OrganizationsSchedulesController } from "@/modules/organizations/schedules/organizations-schedules.controller";
+import { OrganizationSchedulesRepository } from "@/modules/organizations/schedules/organizations-schedules.repository";
+import { OrganizationsSchedulesService } from "@/modules/organizations/schedules/services/organizations-schedules.service";
+import { OrganizationsTeamsController } from "@/modules/organizations/teams/index/organizations-teams.controller";
+import { OrganizationsTeamsRepository } from "@/modules/organizations/teams/index/organizations-teams.repository";
+import { OrganizationsTeamsService } from "@/modules/organizations/teams/index/services/organizations-teams.service";
+import { OrganizationsTeamsMembershipsController } from "@/modules/organizations/teams/memberships/organizations-teams-memberships.controller";
+import { OrganizationsTeamsMembershipsRepository } from "@/modules/organizations/teams/memberships/organizations-teams-memberships.repository";
+import { OrganizationsTeamsMembershipsService } from "@/modules/organizations/teams/memberships/services/organizations-teams-memberships.service";
 import { OrganizationsTeamsRoutingFormsModule } from "@/modules/organizations/teams/routing-forms/organizations-teams-routing-forms-responses.module";
+import { OrganizationsTeamsSchedulesController } from "@/modules/organizations/teams/schedules/organizations-teams-schedules.controller";
+import { OrganizationsUsersController } from "@/modules/organizations/users/index/controllers/organizations-users.controller";
+import { OrganizationsUsersRepository } from "@/modules/organizations/users/index/organizations-users.repository";
+import { OrganizationsUsersService } from "@/modules/organizations/users/index/services/organizations-users-service";
+import { OrganizationsUsersOOOController } from "@/modules/organizations/users/ooo/controllers/organizations-users-ooo-controller";
+import { OrgUsersOOORepository } from "@/modules/organizations/users/ooo/organizations-users-ooo.repository";
+import { OrgUsersOOOService } from "@/modules/organizations/users/ooo/services/organization-users-ooo.service";
+import { OrganizationsWebhooksController } from "@/modules/organizations/webhooks/controllers/organizations-webhooks.controller";
+import { OrganizationsWebhooksRepository } from "@/modules/organizations/webhooks/organizations-webhooks.repository";
+import { OrganizationsWebhooksService } from "@/modules/organizations/webhooks/services/organizations-webhooks.service";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
 import { RedisModule } from "@/modules/redis/redis.module";
 import { StripeModule } from "@/modules/stripe/stripe.module";
@@ -63,6 +64,7 @@ import { Module } from "@nestjs/common";
    EventTypesModule_2024_06_14,
    TeamsEventTypesModule,
    TeamsModule,
+    OrganizationsOrganizationsModule,
    OrganizationsTeamsRoutingFormsModule,
  ],
  providers: [
@@ -126,7 +128,7 @@ import { Module } from "@nestjs/common";
    OrganizationsEventTypesController,
    OrganizationsTeamsMembershipsController,
    OrganizationsAttributesController,
-    OrganizationsOptionsAttributesController,
+    OrganizationsAttributesOptionsController,
    OrganizationsWebhooksController,
    OrganizationsTeamsSchedulesController,
    OrganizationsUsersOOOController,
@@ -0,0 +1,16 @@
+import { RefreshApiKeyInput } from "@/modules/api-keys/inputs/refresh-api-key.input";
+import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
+import { Type } from "class-transformer";
+import { IsObject, IsOptional, IsString, Length } from "class-validator";
+
+export class CreateOrganizationInput extends RefreshApiKeyInput {
+  @IsString()
+  @Length(1)
+  @ApiProperty({ description: "Name of the organization", example: "CalTeam" })
+  readonly name!: string;
+
+  @IsOptional()
+  @IsObject()
+  @ApiPropertyOptional({ type: Object })
+  readonly metadata?: Record<string, unknown>;
+}
@@ -0,0 +1,15 @@
+import { ApiPropertyOptional } from "@nestjs/swagger";
+import { IsOptional, IsString, Length } from "class-validator";
+
+export class UpdateOrganizationInput {
+  @IsString()
+  @IsOptional()
+  @Length(1)
+  @ApiPropertyOptional({ description: "Name of the organization", example: "CalTeam" })
+  readonly name?: string;
+
+  @IsOptional()
+  @IsString()
+  @ApiPropertyOptional()
+  readonly metadata?: string;
+}
@@ -0,0 +1,44 @@
+import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { Injectable } from "@nestjs/common";
+
+import { Prisma } from "@calcom/prisma/client";
+
+@Injectable()
+export class ManagedOrganizationsRepository {
+  constructor(private readonly dbRead: PrismaReadService, private readonly dbWrite: PrismaWriteService) {}
+
+  async createManagedOrganization(managerOrganizationId: number, data: Prisma.TeamCreateInput) {
+    return this.dbWrite.prisma.team.create({
+      data: {
+        ...data,
+        managedOrganization: {
+          create: {
+            managerOrganization: {
+              connect: { id: managerOrganizationId },
+            },
+          },
+        },
+      },
+    });
+  }
+
+  async getByManagerManagedIds(managerOrganizationId: number, managedOrganizationId: number) {
+    return this.dbRead.prisma.managedOrganization.findUnique({
+      where: {
+        managerOrganizationId_managedOrganizationId: {
+          managerOrganizationId,
+          managedOrganizationId,
+        },
+      },
+    });
+  }
+
+  async getByManagerOrganizationId(managerOrganizationId: number) {
+    return this.dbRead.prisma.managedOrganization.findMany({
+      where: {
+        managerOrganizationId,
+      },
+    });
+  }
+}
@@ -0,0 +1,449 @@
+import { bootstrap } from "@/app";
+import { AppModule } from "@/app.module";
+import { getEnv } from "@/env";
+import { hashAPIKey, stripApiKey } from "@/lib/api-key";
+import { RefreshApiKeyOutput } from "@/modules/api-keys/outputs/refresh-api-key.output";
+import { CreateOAuthClientResponseDto } from "@/modules/oauth-clients/controllers/oauth-clients/responses/CreateOAuthClientResponse.dto";
+import { GetOAuthClientResponseDto } from "@/modules/oauth-clients/controllers/oauth-clients/responses/GetOAuthClientResponse.dto";
+import { CreateOrganizationInput } from "@/modules/organizations/organizations/inputs/create-managed-organization.input";
+import { UpdateOrganizationInput } from "@/modules/organizations/organizations/inputs/update-managed-organization.input";
+import {
+  ManagedOrganizationWithApiKeyOutput,
+  ManagedOrganizationOutput,
+} from "@/modules/organizations/organizations/outputs/managed-organization.output";
+import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { TokensModule } from "@/modules/tokens/tokens.module";
+import { UsersModule } from "@/modules/users/users.module";
+import { INestApplication } from "@nestjs/common";
+import { NestExpressApplication } from "@nestjs/platform-express";
+import { Test } from "@nestjs/testing";
+import { PlatformBilling, User } from "@prisma/client";
+import { advanceTo, clear } from "jest-date-mock";
+import { DateTime } from "luxon";
+import * as request from "supertest";
+import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture";
+import { PlatformBillingRepositoryFixture } from "test/fixtures/repository/billing.repository.fixture";
+import { ManagedOrganizationsRepositoryFixture } from "test/fixtures/repository/managed-organizations.repository.fixture";
+import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture";
+import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture";
+import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture";
+import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture";
+import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
+import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
+
+import {
+  APPS_READ,
+  APPS_WRITE,
+  BOOKING_READ,
+  BOOKING_WRITE,
+  EVENT_TYPE_READ,
+  EVENT_TYPE_WRITE,
+  PROFILE_READ,
+  PROFILE_WRITE,
+  SCHEDULE_READ,
+  SCHEDULE_WRITE,
+  X_CAL_SECRET_KEY,
+} from "@calcom/platform-constants";
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+import { ApiSuccessResponse, CreateOAuthClientInput } from "@calcom/platform-types";
+import { Team } from "@calcom/prisma/client";
+
+describe("Organizations Organizations Endpoints", () => {
+  let app: INestApplication;
+
+  let userRepositoryFixture: UserRepositoryFixture;
+  let organizationsRepositoryFixture: OrganizationRepositoryFixture;
+  let teamsRepositoryFixture: TeamRepositoryFixture;
+  let membershipsRepositoryFixture: MembershipRepositoryFixture;
+  let platformBillingRepositoryFixture: PlatformBillingRepositoryFixture;
+  let managedOrganizationsRepositoryFixture: ManagedOrganizationsRepositoryFixture;
+  let apiKeysRepositoryFixture: ApiKeysRepositoryFixture;
+  let oAuthClientsRepositoryFixture: OAuthClientRepositoryFixture;
+  let profilesRepositoryFixture: ProfileRepositoryFixture;
+
+  let managerOrg: Team;
+  let managedOrg: ManagedOrganizationWithApiKeyOutput;
+  const managerOrgAdminEmail = `organizations-organizations-admin-${randomString()}@api.com`;
+  let managerOrgAdmin: User;
+  let managerOrgAdminApiKey: string;
+  let managerOrgBilling: PlatformBilling;
+
+  let managedOrgApiKey: string;
+  let managedOrgOAuthClientId: string;
+  let managedOrgOAuthClientSecret: string;
+  const createOAuthClientBody: CreateOAuthClientInput = {
+    name: "OAuth client for managed organization",
+    redirectUris: ["http://localhost:4321"],
+    permissions: ["*"],
+  };
+
+  const newDate = new Date(2035, 0, 9, 15, 0, 0);
+
+  beforeAll(async () => {
+    const moduleRef = await Test.createTestingModule({
+      imports: [AppModule, PrismaModule, UsersModule, TokensModule],
+    }).compile();
+
+    userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+    organizationsRepositoryFixture = new OrganizationRepositoryFixture(moduleRef);
+    teamsRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+    membershipsRepositoryFixture = new MembershipRepositoryFixture(moduleRef);
+    platformBillingRepositoryFixture = new PlatformBillingRepositoryFixture(moduleRef);
+    managedOrganizationsRepositoryFixture = new ManagedOrganizationsRepositoryFixture(moduleRef);
+    apiKeysRepositoryFixture = new ApiKeysRepositoryFixture(moduleRef);
+    oAuthClientsRepositoryFixture = new OAuthClientRepositoryFixture(moduleRef);
+    profilesRepositoryFixture = new ProfileRepositoryFixture(moduleRef);
+
+    managerOrgAdmin = await userRepositoryFixture.create({
+      email: managerOrgAdminEmail,
+      username: managerOrgAdminEmail,
+    });
+
+    managerOrg = await organizationsRepositoryFixture.create({
+      name: `organizations-organizations-organization-${randomString()}`,
+      isOrganization: true,
+      isPlatform: true,
+    });
+
+    await profilesRepositoryFixture.create({
+      uid: "asd-asd",
+      username: managerOrgAdminEmail,
+      user: { connect: { id: managerOrgAdmin.id } },
+      organization: { connect: { id: managerOrg.id } },
+      movedFromUser: { connect: { id: managerOrgAdmin.id } },
+    });
+
+    managerOrgBilling = await platformBillingRepositoryFixture.create(managerOrg.id, "SCALE");
+
+    await membershipsRepositoryFixture.create({
+      role: "ADMIN",
+      user: { connect: { id: managerOrgAdmin.id } },
+      team: { connect: { id: managerOrg.id } },
+      accepted: true,
+    });
+
+    const { keyString } = await apiKeysRepositoryFixture.createApiKey(
+      managerOrgAdmin.id,
+      null,
+      managerOrg.id
+    );
+    managerOrgAdminApiKey = `cal_test_${keyString}`;
+
+    app = moduleRef.createNestApplication();
+    bootstrap(app as NestExpressApplication);
+
+    advanceTo(newDate);
+
+    await app.init();
+  });
+
+  afterAll(() => {
+    clear();
+  });
+
+  it("should create managed organization", async () => {
+    const suffix = randomString();
+
+    const body: CreateOrganizationInput = {
+      name: `organizations organizations org ${suffix}`,
+      metadata: { key: "value" },
+    };
+
+    return request(app.getHttpServer())
+      .post(`/v2/organizations/${managerOrg.id}/organizations`)
+      .set("Authorization", `Bearer ${managerOrgAdminApiKey}`)
+      .send(body)
+      .expect(201)
+      .then(async (response) => {
+        const responseBody: ApiSuccessResponse<ManagedOrganizationWithApiKeyOutput> = response.body;
+        expect(responseBody.status).toEqual(SUCCESS_STATUS);
+        managedOrg = responseBody.data;
+        expect(managedOrg?.id).toBeDefined();
+        expect(managedOrg?.name).toEqual(body.name);
+        expect(managedOrg?.metadata).toEqual(body.metadata);
+        expect(managedOrg?.apiKey).toBeDefined();
+
+        // note(Lauris): check that managed organization is correctly setup in database
+        const managedOrgInDb =
+          await managedOrganizationsRepositoryFixture.getOrganizationWithManagedOrganizations(managedOrg.id);
+        expect(managedOrgInDb).toBeDefined();
+        expect(managedOrgInDb?.id).toEqual(managedOrg.id);
+        expect(managedOrgInDb?.isPlatform).toEqual(true);
+        expect(managedOrgInDb?.isOrganization).toEqual(true);
+        expect(managedOrgInDb?.managedOrganization?.managedOrganizationId).toEqual(managedOrg.id);
+        expect(managedOrgInDb?.managedOrganization?.managerOrganizationId).toEqual(managerOrg.id);
+        // note(Lauris): check that manager organization is correctly setup in database
+        const managerOrgInDb =
+          await managedOrganizationsRepositoryFixture.getOrganizationWithManagedOrganizations(managerOrg.id);
+        expect(managerOrgInDb).toBeDefined();
+        expect(managerOrgInDb?.id).toEqual(managerOrg.id);
+        expect(managerOrgInDb?.isPlatform).toEqual(true);
+        expect(managerOrgInDb?.isOrganization).toEqual(true);
+        expect(managerOrgInDb?.managedOrganization).toEqual(null);
+        expect(managerOrgInDb?.managedOrganizations?.length).toEqual(1);
+        expect(managerOrgInDb?.managedOrganizations?.[0]?.managedOrganizationId).toEqual(managedOrg.id);
+        expect(managerOrgInDb?.managedOrganizations?.[0]?.managerOrganizationId).toEqual(managerOrg.id);
+
+        // note(Lauris): test that auth user who made request to create managed organization is OWNER of it
+        const membership = await membershipsRepositoryFixture.getUserMembershipByTeamId(
+          managerOrgAdmin.id,
+          managedOrg.id
+        );
+        expect(membership?.role ?? "").toEqual("OWNER");
+        expect(membership?.accepted).toEqual(true);
+        // note(Lauris): test that auth user who made request to create managed organization has profile in it
+        const profile = await profilesRepositoryFixture.findByOrgIdUserId(managedOrg.id, managerOrgAdmin.id);
+        expect(profile).toBeDefined();
+        expect(profile?.id).toBeDefined();
+        expect(profile?.username).toEqual(managerOrgAdmin.username);
+        // note(Lauris): check that platform billing is setup correctly for manager and managed orgs
+        const managerOrgBilling = await platformBillingRepositoryFixture.get(managerOrg.id);
+        expect(managerOrgBilling).toBeDefined();
+        expect(managerOrgBilling?.id).toBeDefined();
+        const customerId = managerOrgBilling?.customerId;
+        expect(customerId).toBeDefined();
+        if (!customerId) {
+          throw new Error(
+            "organizations-organizations.controller.e2e-spec.ts: PlatformBilling customerId is not defined"
+          );
+        }
+        const subscriptionId = managerOrgBilling?.subscriptionId;
+        expect(subscriptionId).toBeDefined();
+        if (!subscriptionId) {
+          throw new Error(
+            "organizations-organizations.controller.e2e-spec.ts: PlatformBilling subscriptionId is not defined"
+          );
+        }
+        const plan = managerOrgBilling?.plan;
+        expect(plan).toEqual("SCALE");
+
+        const managedOrgBilling = await platformBillingRepositoryFixture.get(managedOrg.id);
+        expect(managedOrgBilling).toBeDefined();
+        expect(managedOrgBilling?.customerId).toEqual(customerId);
+        expect(managedOrgBilling?.subscriptionId).toEqual(subscriptionId);
+        expect(managedOrgBilling?.plan).toEqual(plan);
+        expect(managedOrgBilling?.managerBillingId).toEqual(managerOrgBilling?.id);
+
+        expect(managerOrgBilling?.managedBillings?.length).toEqual(1);
+        expect(managerOrgBilling?.managedBillings?.[0]?.id).toEqual(managedOrgBilling?.id);
+
+        const billings = await platformBillingRepositoryFixture.getByCustomerSubscriptionIds(
+          customerId,
+          subscriptionId
+        );
+        expect(billings).toBeDefined();
+        // note(Lauris): manager and manager organizaitons billings because managed organization client and subscription ids are same as manager organization billing row.
+        expect(billings?.length).toEqual(2);
+
+        // note(Lauris): check that in database api key is generated for managed org
+        const managedOrgApiKeys = await apiKeysRepositoryFixture.getTeamApiKeys(managedOrg.id);
+        expect(managedOrgApiKeys?.length).toEqual(1);
+        expect(managedOrgApiKeys?.[0]?.id).toBeDefined();
+        const apiKeyPrefix = getEnv("API_KEY_PREFIX", "cal_");
+        const hashedApiKey = `${hashAPIKey(stripApiKey(managedOrg?.apiKey, apiKeyPrefix))}`;
+        expect(managedOrgApiKeys?.[0]?.hashedKey).toEqual(hashedApiKey);
+        const expectedExpiresAt = DateTime.fromJSDate(newDate).setZone("utc").plus({ days: 30 }).toJSDate();
+        expect(managedOrgApiKeys?.[0]?.expiresAt).toEqual(expectedExpiresAt);
+        expect(managedOrgApiKeys?.[0]?.note).toEqual(
+          `Managed organization API key. ManagerOrgId: ${managerOrg.id}. ManagedOrgId: ${managedOrg.id}`
+        );
+        managedOrgApiKey = managedOrg?.apiKey;
+      });
+  });
+
+  it("should get managed organization", async () => {
+    return request(app.getHttpServer())
+      .get(`/v2/organizations/${managerOrg.id}/organizations/${managedOrg.id}`)
+      .set("Authorization", `Bearer ${managerOrgAdminApiKey}`)
+      .expect(200)
+      .then(async (response) => {
+        const responseBody: ApiSuccessResponse<ManagedOrganizationOutput> = response.body;
+        expect(responseBody.status).toEqual(SUCCESS_STATUS);
+        const responseManagedOrg = responseBody.data;
+        expect(responseManagedOrg?.id).toBeDefined();
+        expect(responseManagedOrg?.name).toEqual(managedOrg.name);
+        expect(responseManagedOrg?.metadata).toEqual(managedOrg.metadata);
+      });
+  });
+
+  it("should get managed organizations", async () => {
+    return request(app.getHttpServer())
+      .get(`/v2/organizations/${managerOrg.id}/organizations`)
+      .set("Authorization", `Bearer ${managerOrgAdminApiKey}`)
+      .expect(200)
+      .then(async (response) => {
+        const responseBody: ApiSuccessResponse<ManagedOrganizationOutput[]> = response.body;
+        expect(responseBody.status).toEqual(SUCCESS_STATUS);
+        const responseManagedOrgs = responseBody.data;
+        expect(responseManagedOrgs?.length).toEqual(1);
+        const responseManagedOrg = responseManagedOrgs[0];
+        expect(responseManagedOrg?.id).toBeDefined();
+        expect(responseManagedOrg?.name).toEqual(managedOrg.name);
+        expect(responseManagedOrg?.metadata).toEqual(managedOrg.metadata);
+      });
+  });
+
+  it("should update managed organization ", async () => {
+    const suffix = randomString();
+
+    const newOrgName = `new organizations organizations org ${suffix}`;
+
+    return request(app.getHttpServer())
+      .patch(`/v2/organizations/${managerOrg.id}/organizations/${managedOrg.id}`)
+      .set("Authorization", `Bearer ${managerOrgAdminApiKey}`)
+      .send({
+        name: newOrgName,
+      } satisfies UpdateOrganizationInput)
+      .expect(200)
+      .then(async (response) => {
+        const responseBody: ApiSuccessResponse<ManagedOrganizationWithApiKeyOutput> = response.body;
+        expect(responseBody.status).toEqual(SUCCESS_STATUS);
+        const responseManagedOrg = responseBody.data;
+        expect(responseManagedOrg?.id).toBeDefined();
+        expect(responseManagedOrg?.name).toEqual(newOrgName);
+
+        const managedOrgInDb =
+          await managedOrganizationsRepositoryFixture.getOrganizationWithManagedOrganizations(managedOrg.id);
+        expect(managedOrgInDb).toBeDefined();
+        expect(managedOrgInDb?.name).toEqual(newOrgName);
+
+        managedOrg = { ...managedOrg, name: newOrgName };
+      });
+  });
+
+  it("should refresh api key for managed organization with a custom duration", async () => {
+    return request(app.getHttpServer())
+      .post(`/v2/api-keys/refresh`)
+      .send({ apiKeyDaysValid: 60 })
+      .set("Authorization", `Bearer ${managedOrgApiKey}`)
+      .expect(200)
+      .then(async (response) => {
+        const responseBody: RefreshApiKeyOutput = response.body;
+        expect(responseBody.status).toEqual(SUCCESS_STATUS);
+        const responseData = responseBody.data;
+        const newApiKey = responseData?.apiKey;
+        expect(newApiKey).toBeDefined();
+        expect(newApiKey).not.toEqual(managedOrgApiKey);
+
+        const managedOrgApiKeys = await apiKeysRepositoryFixture.getTeamApiKeys(managedOrg.id);
+        expect(managedOrgApiKeys?.length).toEqual(1);
+        expect(managedOrgApiKeys?.[0]?.id).toBeDefined();
+        const apiKeyPrefix = getEnv("API_KEY_PREFIX", "cal_");
+        const hashedApiKey = `${hashAPIKey(stripApiKey(newApiKey, apiKeyPrefix))}`;
+        expect(managedOrgApiKeys?.[0]?.hashedKey).toEqual(hashedApiKey);
+        const expectedExpiresAt = DateTime.fromJSDate(newDate).setZone("utc").plus({ days: 60 }).toJSDate();
+        expect(managedOrgApiKeys?.[0]?.expiresAt).toEqual(expectedExpiresAt);
+        expect(managedOrgApiKeys?.[0]?.note).toEqual(
+          `Managed organization API key. ManagerOrgId: ${managerOrg.id}. ManagedOrgId: ${managedOrg.id}`
+        );
+        managedOrgApiKey = newApiKey;
+      });
+  });
+
+  it("should create OAuth client for managed organization", async () => {
+    return request(app.getHttpServer())
+      .post(`/v2/oauth-clients`)
+      .send(createOAuthClientBody)
+      .set("Authorization", `Bearer ${managedOrgApiKey}`)
+      .expect(201)
+      .then(async (response) => {
+        const responseBody: CreateOAuthClientResponseDto = response.body;
+        expect(responseBody.status).toEqual(SUCCESS_STATUS);
+        const responseData = responseBody.data;
+        const clientId = responseData?.clientId;
+        const clientSecret = responseData?.clientSecret;
+        expect(clientId).toBeDefined();
+        expect(clientSecret).toBeDefined();
+
+        const managedOrgOAuthClients = await oAuthClientsRepositoryFixture.getByOrgId(managedOrg.id);
+        expect(managedOrgOAuthClients?.length).toEqual(1);
+        expect(managedOrgOAuthClients?.[0]?.id).toBeDefined();
+        expect(managedOrgOAuthClients?.[0]?.id).toEqual(clientId);
+        expect(managedOrgOAuthClients?.[0]?.secret).toEqual(clientSecret);
+        expect(managedOrgOAuthClients?.[0]?.name).toEqual(createOAuthClientBody.name);
+        expect(managedOrgOAuthClients?.[0]?.redirectUris).toEqual(createOAuthClientBody.redirectUris);
+        expect(managedOrgOAuthClients?.[0]?.permissions).toEqual(
+          EVENT_TYPE_READ +
+            EVENT_TYPE_WRITE +
+            BOOKING_READ +
+            BOOKING_WRITE +
+            SCHEDULE_READ +
+            SCHEDULE_WRITE +
+            APPS_READ +
+            APPS_WRITE +
+            PROFILE_READ +
+            PROFILE_WRITE
+        );
+        managedOrgOAuthClientId = clientId;
+        managedOrgOAuthClientSecret = clientSecret;
+      });
+  });
+
+  it("should fetch OAuth client for managed organization", async () => {
+    return request(app.getHttpServer())
+      .get(`/v2/oauth-clients/${managedOrgOAuthClientId}`)
+      .set(X_CAL_SECRET_KEY, managedOrgOAuthClientSecret)
+      .expect(200)
+      .then(async (response) => {
+        const responseBody: GetOAuthClientResponseDto = response.body;
+        expect(responseBody.status).toEqual(SUCCESS_STATUS);
+        const responseData = responseBody.data;
+        expect(responseData?.id).toEqual(managedOrgOAuthClientId);
+        expect(responseData?.secret).toEqual(managedOrgOAuthClientSecret);
+        expect(responseData?.name).toEqual(createOAuthClientBody.name);
+        expect(responseData?.redirectUris).toEqual(createOAuthClientBody.redirectUris);
+        expect(responseData?.permissions).toEqual([
+          "EVENT_TYPE_READ",
+          "EVENT_TYPE_WRITE",
+          "BOOKING_READ",
+          "BOOKING_WRITE",
+          "SCHEDULE_READ",
+          "SCHEDULE_WRITE",
+          "APPS_READ",
+          "APPS_WRITE",
+          "PROFILE_READ",
+          "PROFILE_WRITE",
+        ]);
+      });
+  });
+
+  it("should delete managed organization ", async () => {
+    return request(app.getHttpServer())
+      .delete(`/v2/organizations/${managerOrg.id}/organizations/${managedOrg.id}`)
+      .set("Authorization", `Bearer ${managerOrgAdminApiKey}`)
+      .expect(200)
+      .then(async (response) => {
+        const responseBody: ApiSuccessResponse<ManagedOrganizationWithApiKeyOutput> = response.body;
+        expect(responseBody.status).toEqual(SUCCESS_STATUS);
+        const responseManagedOrg = responseBody.data;
+        expect(responseManagedOrg?.id).toBeDefined();
+        expect(responseManagedOrg?.id).toEqual(managedOrg.id);
+        expect(responseManagedOrg?.name).toEqual(managedOrg.name);
+
+        const managedOrgInDb =
+          await managedOrganizationsRepositoryFixture.getOrganizationWithManagedOrganizations(managedOrg.id);
+        expect(managedOrgInDb).toEqual(null);
+
+        const billings = await platformBillingRepositoryFixture.getByCustomerSubscriptionIds(
+          managerOrgBilling.customerId,
+          managerOrgBilling.subscriptionId!
+        );
+        expect(billings).toBeDefined();
+        // note(Lauris): only manager billing is left
+        expect(billings?.length).toEqual(1);
+
+        const managerOrgInDb =
+          await managedOrganizationsRepositoryFixture.getOrganizationWithManagedOrganizations(managerOrg.id);
+        expect(managerOrgInDb).toBeDefined();
+        expect(managerOrgInDb?.id).toEqual(managerOrg.id);
+        expect(managerOrgInDb?.managedOrganizations?.length).toEqual(0);
+      });
+  });
+
+  afterAll(async () => {
+    await userRepositoryFixture.deleteByEmail(managerOrgAdmin.email);
+    await organizationsRepositoryFixture.delete(managerOrg.id);
+    await app.close();
+  });
+});
@@ -0,0 +1,135 @@
+import { API_VERSIONS_VALUES } from "@/lib/api-versions";
+import { PlatformPlan } from "@/modules/auth/decorators/billing/platform-plan.decorator";
+import { GetUser } from "@/modules/auth/decorators/get-user/get-user.decorator";
+import { Roles } from "@/modules/auth/decorators/roles/roles.decorator";
+import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
+import { PlatformPlanGuard } from "@/modules/auth/guards/billing/platform-plan.guard";
+import { IsAdminAPIEnabledGuard } from "@/modules/auth/guards/organizations/is-admin-api-enabled.guard";
+import { IsManagedOrgInManagerOrg } from "@/modules/auth/guards/organizations/is-managed-org-in-manager-org.guard";
+import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
+import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
+import { ApiAuthGuardUser } from "@/modules/auth/strategies/api-auth/api-auth.strategy";
+import { CreateOrganizationInput } from "@/modules/organizations/organizations/inputs/create-managed-organization.input";
+import { UpdateOrganizationInput } from "@/modules/organizations/organizations/inputs/update-managed-organization.input";
+import { CreateManagedOrganizationOutput } from "@/modules/organizations/organizations/outputs/create-managed-organization.output";
+import { GetManagedOrganizationOutput } from "@/modules/organizations/organizations/outputs/get-managed-organization.output";
+import { GetManagedOrganizationsOutput } from "@/modules/organizations/organizations/outputs/get-managed-organizations.output";
+import { ManagedOrganizationsService } from "@/modules/organizations/organizations/services/managed-organizations.service";
+import {
+  Controller,
+  UseGuards,
+  Param,
+  ParseIntPipe,
+  Post,
+  Body,
+  Get,
+  Patch,
+  HttpCode,
+  HttpStatus,
+  Delete,
+} from "@nestjs/common";
+import { ApiOperation, ApiTags as DocsTags } from "@nestjs/swagger";
+
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+
+const SCALE = "SCALE";
+
+@Controller({
+  path: "/v2/organizations/:orgId/organizations",
+  version: API_VERSIONS_VALUES,
+})
+@UseGuards(ApiAuthGuard, IsOrgGuard, RolesGuard, PlatformPlanGuard, IsAdminAPIEnabledGuard)
+@DocsTags("Orgs / Orgs")
+export class OrganizationsOrganizationsController {
+  constructor(private readonly managedOrganizationsService: ManagedOrganizationsService) {}
+
+  @Post()
+  @Roles("ORG_ADMIN")
+  @PlatformPlan(SCALE)
+  @ApiOperation({ summary: "Create an organization within an organization" })
+  async createOrganization(
+    @Param("orgId", ParseIntPipe) managerOrganizationId: number,
+    @GetUser() authUser: ApiAuthGuardUser,
+    @Body() body: CreateOrganizationInput
+  ): Promise<CreateManagedOrganizationOutput> {
+    const organization = await this.managedOrganizationsService.createManagedOrganization(
+      authUser,
+      managerOrganizationId,
+      body
+    );
+
+    return {
+      status: SUCCESS_STATUS,
+      data: organization,
+    };
+  }
+
+  @Roles("ORG_ADMIN")
+  @PlatformPlan(SCALE)
+  @Get("/:managedOrganizationId")
+  @ApiOperation({ summary: "Get an organization within an organization" })
+  @UseGuards(IsManagedOrgInManagerOrg)
+  async getOrganization(
+    @Param("managedOrganizationId", ParseIntPipe) managedOrganizationId: number
+  ): Promise<GetManagedOrganizationOutput> {
+    const organization = await this.managedOrganizationsService.getManagedOrganization(managedOrganizationId);
+    return {
+      status: SUCCESS_STATUS,
+      data: organization,
+    };
+  }
+
+  @Roles("ORG_ADMIN")
+  @PlatformPlan(SCALE)
+  @Get("/")
+  @ApiOperation({ summary: "Get all organizations within an organization" })
+  async getOrganizations(
+    @Param("orgId", ParseIntPipe) managerOrganizationId: number
+  ): Promise<GetManagedOrganizationsOutput> {
+    const organizations = await this.managedOrganizationsService.getManagedOrganizations(
+      managerOrganizationId
+    );
+    return {
+      status: SUCCESS_STATUS,
+      data: organizations,
+    };
+  }
+
+  @Roles("ORG_ADMIN")
+  @PlatformPlan(SCALE)
+  @Patch("/:managedOrganizationId")
+  @ApiOperation({ summary: "Update an organization within an organization" })
+  @UseGuards(IsManagedOrgInManagerOrg)
+  @HttpCode(HttpStatus.OK)
+  async updateOrganization(
+    @Param("orgId", ParseIntPipe) managerOrganizationId: number,
+    @Param("managedOrganizationId", ParseIntPipe) managedOrganizationId: number,
+    @Body() body: UpdateOrganizationInput
+  ): Promise<GetManagedOrganizationOutput> {
+    const organization = await this.managedOrganizationsService.updateManagedOrganization(
+      managedOrganizationId,
+      body
+    );
+    return {
+      status: SUCCESS_STATUS,
+      data: organization,
+    };
+  }
+
+  @Roles("ORG_ADMIN")
+  @PlatformPlan(SCALE)
+  @Delete("/:managedOrganizationId")
+  @ApiOperation({ summary: "Delete an organization within an organization" })
+  @UseGuards(IsManagedOrgInManagerOrg)
+  async deleteOrganization(
+    @Param("managedOrganizationId", ParseIntPipe) managedOrganizationId: number
+  ): Promise<GetManagedOrganizationOutput> {
+    const organization = await this.managedOrganizationsService.deleteManagedOrganization(
+      managedOrganizationId
+    );
+    return {
+      status: SUCCESS_STATUS,
+      data: organization,
+    };
+  }
+}
@@ -0,0 +1,31 @@
+import { ApiKeysModule } from "@/modules/api-keys/api-keys.module";
+import { ManagedOrganizationsBillingService } from "@/modules/billing/services/managed-organizations.billing.service";
+import { MembershipsModule } from "@/modules/memberships/memberships.module";
+import { MembershipsRepository } from "@/modules/memberships/memberships.repository";
+import { OrganizationsRepository } from "@/modules/organizations/index/organizations.repository";
+import { OrganizationsMembershipRepository } from "@/modules/organizations/memberships/organizations-membership.repository";
+import { OrganizationsMembershipService } from "@/modules/organizations/memberships/services/organizations-membership.service";
+import { ManagedOrganizationsRepository } from "@/modules/organizations/organizations/managed-organizations.repository";
+import { OrganizationsOrganizationsController } from "@/modules/organizations/organizations/organizations-organizations.controller";
+import { ManagedOrganizationsOutputService } from "@/modules/organizations/organizations/services/managed-organizations-output.service";
+import { ManagedOrganizationsService } from "@/modules/organizations/organizations/services/managed-organizations.service";
+import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { ProfilesModule } from "@/modules/profiles/profiles.module";
+import { RedisModule } from "@/modules/redis/redis.module";
+import { StripeModule } from "@/modules/stripe/stripe.module";
+import { Module } from "@nestjs/common";
+
+@Module({
+  imports: [PrismaModule, RedisModule, StripeModule, MembershipsModule, ApiKeysModule, ProfilesModule],
+  providers: [
+    ManagedOrganizationsService,
+    ManagedOrganizationsRepository,
+    ManagedOrganizationsBillingService,
+    OrganizationsRepository,
+    OrganizationsMembershipService,
+    OrganizationsMembershipRepository,
+    ManagedOrganizationsOutputService,
+  ],
+  controllers: [OrganizationsOrganizationsController],
+})
+export class OrganizationsOrganizationsModule {}
@@ -0,0 +1,18 @@
+import { ManagedOrganizationWithApiKeyOutput } from "@/modules/organizations/organizations/outputs/managed-organization.output";
+import { ApiProperty } from "@nestjs/swagger";
+import { Expose, Type } from "class-transformer";
+import { IsEnum, ValidateNested } from "class-validator";
+
+import { ERROR_STATUS, SUCCESS_STATUS } from "@calcom/platform-constants";
+
+export class CreateManagedOrganizationOutput {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @ApiProperty({ type: ManagedOrganizationWithApiKeyOutput })
+  @Expose()
+  @ValidateNested()
+  @Type(() => ManagedOrganizationWithApiKeyOutput)
+  data!: ManagedOrganizationWithApiKeyOutput;
+}
@@ -0,0 +1,18 @@
+import { ManagedOrganizationOutput } from "@/modules/organizations/organizations/outputs/managed-organization.output";
+import { ApiProperty } from "@nestjs/swagger";
+import { Expose, Type } from "class-transformer";
+import { IsEnum, ValidateNested } from "class-validator";
+
+import { ERROR_STATUS, SUCCESS_STATUS } from "@calcom/platform-constants";
+
+export class GetManagedOrganizationOutput {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @ApiProperty({ type: ManagedOrganizationOutput })
+  @Expose()
+  @ValidateNested()
+  @Type(() => ManagedOrganizationOutput)
+  data!: ManagedOrganizationOutput;
+}
@@ -0,0 +1,20 @@
+import { ManagedOrganizationOutput } from "@/modules/organizations/organizations/outputs/managed-organization.output";
+import { ApiProperty } from "@nestjs/swagger";
+import { Expose, Type } from "class-transformer";
+import { IsEnum, ValidateNested } from "class-validator";
+
+import { ERROR_STATUS, SUCCESS_STATUS } from "@calcom/platform-constants";
+
+export class GetManagedOrganizationsOutput {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @ApiProperty({
+    type: [ManagedOrganizationOutput],
+  })
+  @Expose()
+  @ValidateNested({ each: true })
+  @Type(() => ManagedOrganizationOutput)
+  data!: ManagedOrganizationOutput[];
+}
@@ -0,0 +1,30 @@
+import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
+import { Expose, Type } from "class-transformer";
+import { IsBoolean, IsInt, IsObject, IsOptional, IsString, Length, ValidateNested } from "class-validator";
+
+export class ManagedOrganizationOutput {
+  @IsInt()
+  @Expose()
+  @ApiProperty()
+  readonly id!: number;
+
+  @IsString()
+  @Length(1)
+  @Expose()
+  @ApiProperty()
+  readonly name!: string;
+
+  @IsOptional()
+  @IsObject()
+  @Expose()
+  @ApiPropertyOptional({ type: Object })
+  @Type(() => Object)
+  readonly metadata?: Record<string, unknown>;
+}
+
+export class ManagedOrganizationWithApiKeyOutput extends ManagedOrganizationOutput {
+  @IsString()
+  @Expose()
+  @ApiProperty()
+  readonly apiKey!: string;
+}
@@ -0,0 +1,15 @@
+import { ManagedOrganizationOutput } from "@/modules/organizations/organizations/outputs/managed-organization.output";
+import { Injectable } from "@nestjs/common";
+
+import { Team } from "@calcom/prisma/client";
+
+@Injectable()
+export class ManagedOrganizationsOutputService {
+  getOutputManagedOrganization(managedOrganization: Team): ManagedOrganizationOutput {
+    return {
+      id: managedOrganization.id,
+      name: managedOrganization.name,
+      metadata: managedOrganization.metadata ? JSON.parse(managedOrganization.metadata as string) : {},
+    };
+  }
+}
@@ -0,0 +1,119 @@
+import { ApiKeysService } from "@/modules/api-keys/services/api-keys.service";
+import { ApiAuthGuardUser } from "@/modules/auth/strategies/api-auth/api-auth.strategy";
+import { ManagedOrganizationsBillingService } from "@/modules/billing/services/managed-organizations.billing.service";
+import { OrganizationsRepository } from "@/modules/organizations/index/organizations.repository";
+import { OrganizationsMembershipService } from "@/modules/organizations/memberships/services/organizations-membership.service";
+import { CreateOrganizationInput } from "@/modules/organizations/organizations/inputs/create-managed-organization.input";
+import { UpdateOrganizationInput } from "@/modules/organizations/organizations/inputs/update-managed-organization.input";
+import { ManagedOrganizationsRepository } from "@/modules/organizations/organizations/managed-organizations.repository";
+import { ManagedOrganizationsOutputService } from "@/modules/organizations/organizations/services/managed-organizations-output.service";
+import { ProfilesRepository } from "@/modules/profiles/profiles.repository";
+import { ForbiddenException, Injectable, NotFoundException } from "@nestjs/common";
+
+@Injectable()
+export class ManagedOrganizationsService {
+  constructor(
+    private readonly managedOrganizationsRepository: ManagedOrganizationsRepository,
+    private readonly organizationsRepository: OrganizationsRepository,
+    private readonly managedOrganizationsBillingService: ManagedOrganizationsBillingService,
+    private readonly organizationsMembershipService: OrganizationsMembershipService,
+    private readonly apiKeysService: ApiKeysService,
+    private readonly managedOrganizationsOutputService: ManagedOrganizationsOutputService,
+    private readonly profilesRepository: ProfilesRepository
+  ) {}
+
+  async createManagedOrganization(
+    authUser: ApiAuthGuardUser,
+    managerOrganizationId: number,
+    organizationInput: CreateOrganizationInput
+  ) {
+    const isManagerOrganizationPlatform = await this.isManagerOrganizationPlatform(managerOrganizationId);
+    if (!isManagerOrganizationPlatform) {
+      throw new ForbiddenException(
+        "Manager organization must be a platform organization. Normal organizations can't create managed organizations yet."
+      );
+    }
+
+    const { apiKeyDaysValid, apiKeyNeverExpires, ...organizationData } = organizationInput;
+
+    const organization = await this.managedOrganizationsRepository.createManagedOrganization(
+      managerOrganizationId,
+      {
+        ...organizationData,
+        isOrganization: true,
+        isPlatform: true,
+        metadata: JSON.stringify(organizationData.metadata || {}),
+      }
+    );
+
+    await this.organizationsMembershipService.createOrgMembership(organization.id, {
+      userId: authUser.id,
+      accepted: true,
+      role: "OWNER",
+    });
+
+    const defaultProfileUsername = `${organization.name}-${authUser.id}`;
+    await this.profilesRepository.createProfile(
+      organization.id,
+      authUser.id,
+      authUser.username || defaultProfileUsername
+    );
+
+    await this.managedOrganizationsBillingService.createManagedOrganizationBilling(
+      managerOrganizationId,
+      organization.id
+    );
+
+    const apiKey = await this.apiKeysService.createApiKey(authUser.id, {
+      apiKeyDaysValid,
+      apiKeyNeverExpires,
+      note: `Managed organization API key. ManagerOrgId: ${managerOrganizationId}. ManagedOrgId: ${organization.id}`,
+      teamId: organization.id,
+    });
+
+    const outputOrganization =
+      this.managedOrganizationsOutputService.getOutputManagedOrganization(organization);
+
+    return {
+      ...outputOrganization,
+      apiKey,
+    };
+  }
+
+  private async isManagerOrganizationPlatform(managerOrganizationId: number) {
+    const organization = await this.organizationsRepository.findById(managerOrganizationId);
+    return !!organization?.isPlatform;
+  }
+
+  async getManagedOrganization(managedOrganizationId: number) {
+    const organization = await this.organizationsRepository.findById(managedOrganizationId);
+    if (!organization) {
+      throw new NotFoundException(`Managed organization with id=${managedOrganizationId} does not exist.`);
+    }
+    return this.managedOrganizationsOutputService.getOutputManagedOrganization(organization);
+  }
+
+  async getManagedOrganizations(managerOrganizationId: number) {
+    const managedOrganizations = await this.managedOrganizationsRepository.getByManagerOrganizationId(
+      managerOrganizationId
+    );
+    const managedOrganizationsIds = managedOrganizations.map(
+      (managedOrganization) => managedOrganization.managedOrganizationId
+    );
+
+    const organizations = await this.organizationsRepository.findByIds(managedOrganizationsIds);
+    return organizations.map((organization) =>
+      this.managedOrganizationsOutputService.getOutputManagedOrganization(organization)
+    );
+  }
+
+  async updateManagedOrganization(managedOrganizationId: number, body: UpdateOrganizationInput) {
+    const organization = await this.organizationsRepository.update(managedOrganizationId, body);
+    return this.managedOrganizationsOutputService.getOutputManagedOrganization(organization);
+  }
+
+  async deleteManagedOrganization(managedOrganizationId: number) {
+    const organization = await this.organizationsRepository.delete(managedOrganizationId);
+    return this.managedOrganizationsOutputService.getOutputManagedOrganization(organization);
+  }
+}
@@ -8,7 +8,7 @@ import { IsAdminAPIEnabledGuard } from "@/modules/auth/guards/organizations/is-a
 import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
 import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
 import { IsUserInOrg } from "@/modules/auth/guards/users/is-user-in-org.guard";
-import { OrganizationsSchedulesService } from "@/modules/organizations/services/organizations-schedules.service";
+import { OrganizationsSchedulesService } from "@/modules/organizations/schedules/services/organizations-schedules.service";
 import {
  Controller,
  UseGuards,
@@ -1,5 +1,5 @@
 import { OutputSchedulesService_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/services/output-schedules.service";
-import { OrganizationSchedulesRepository } from "@/modules/organizations/repositories/organizations-schedules.repository";
+import { OrganizationSchedulesRepository } from "@/modules/organizations/schedules/organizations-schedules.repository";
 import { UsersRepository } from "@/modules/users/users.repository";
 import { Injectable } from "@nestjs/common";

@@ -4,7 +4,7 @@ import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs
 import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input";
 import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service";
 import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard";
-import { OrganizationsTeamsBookingsModule } from "@/modules/organizations/controllers/teams/bookings/organizations-teams-bookings.module";
+import { OrganizationsTeamsBookingsModule } from "@/modules/organizations/teams/bookings/organizations-teams-bookings.module";
 import { INestApplication } from "@nestjs/common";
 import { NestExpressApplication } from "@nestjs/platform-express";
 import { Test } from "@nestjs/testing";
@@ -10,7 +10,7 @@ import { IsAdminAPIEnabledGuard } from "@/modules/auth/guards/organizations/is-a
 import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
 import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
 import { IsTeamInOrg } from "@/modules/auth/guards/teams/is-team-in-org.guard";
-import { GetOrganizationsTeamsBookingsInput_2024_08_13 } from "@/modules/organizations/controllers/teams/bookings/inputs/get-organizations-teams-bookings.input";
+import { GetOrganizationsTeamsBookingsInput_2024_08_13 } from "@/modules/organizations/teams/bookings/inputs/get-organizations-teams-bookings.input";
 import { UserWithProfile } from "@/modules/users/users.repository";
 import { Controller, UseGuards, Get, Param, ParseIntPipe, Query, HttpStatus, HttpCode } from "@nestjs/common";
 import { ApiOperation, ApiTags as DocsTags } from "@nestjs/swagger";
@@ -1,8 +1,8 @@
 import { BookingsModule_2024_08_13 } from "@/ee/bookings/2024-08-13/bookings.module";
 import { MembershipsModule } from "@/modules/memberships/memberships.module";
-import { OrganizationsTeamsBookingsController } from "@/modules/organizations/controllers/teams/bookings/organizations-teams-bookings.controller";
-import { OrganizationsRepository } from "@/modules/organizations/organizations.repository";
-import { OrganizationsTeamsRepository } from "@/modules/organizations/repositories/organizations-teams.repository";
+import { OrganizationsRepository } from "@/modules/organizations/index/organizations.repository";
+import { OrganizationsTeamsBookingsController } from "@/modules/organizations/teams/bookings/organizations-teams-bookings.controller";
+import { OrganizationsTeamsRepository } from "@/modules/organizations/teams/index/organizations-teams.repository";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
 import { RedisModule } from "@/modules/redis/redis.module";
 import { StripeModule } from "@/modules/stripe/stripe.module";
@@ -1,3 +1,3 @@
 import { CreateTeamInput } from "@/modules/teams/teams/inputs/create-team.input";

-export class CreateOrgTeamDto extends CreateTeamInput {}
+export class CreateOrgTeamDto extends CreateTeamInput {}
@@ -1,3 +1,3 @@
 import { UpdateTeamDto } from "@/modules/teams/teams/inputs/update-team.input";

-export class UpdateOrgTeamDto extends UpdateTeamDto {}
+export class UpdateOrgTeamDto extends UpdateTeamDto {}
@@ -1,7 +1,7 @@
 import { bootstrap } from "@/app";
 import { AppModule } from "@/app.module";
-import { CreateOrgTeamDto } from "@/modules/organizations/inputs/create-organization-team.input";
-import { OrgMeTeamOutputDto } from "@/modules/organizations/outputs/organization-team.output";
+import { CreateOrgTeamDto } from "@/modules/organizations/teams/index/inputs/create-organization-team.input";
+import { OrgMeTeamOutputDto } from "@/modules/organizations/teams/index/outputs/organization-team.output";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
 import { TokensModule } from "@/modules/tokens/tokens.module";
 import { UsersModule } from "@/modules/users/users.module";
@@ -9,15 +9,15 @@ import { IsAdminAPIEnabledGuard } from "@/modules/auth/guards/organizations/is-a
 import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
 import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
 import { IsTeamInOrg } from "@/modules/auth/guards/teams/is-team-in-org.guard";
-import { CreateOrgTeamDto } from "@/modules/organizations/inputs/create-organization-team.input";
-import { UpdateOrgTeamDto } from "@/modules/organizations/inputs/update-organization-team.input";
+import { CreateOrgTeamDto } from "@/modules/organizations/teams/index/inputs/create-organization-team.input";
+import { UpdateOrgTeamDto } from "@/modules/organizations/teams/index/inputs/update-organization-team.input";
 import {
  OrgMeTeamOutputDto,
  OrgMeTeamsOutputResponseDto,
  OrgTeamOutputResponseDto,
  OrgTeamsOutputResponseDto,
-} from "@/modules/organizations/outputs/organization-team.output";
-import { OrganizationsTeamsService } from "@/modules/organizations/services/organizations-teams.service";
+} from "@/modules/organizations/teams/index/outputs/organization-team.output";
+import { OrganizationsTeamsService } from "@/modules/organizations/teams/index/services/organizations-teams.service";
 import { UserWithProfile } from "@/modules/users/users.repository";
 import {
  Controller,
@@ -1,5 +1,5 @@
-import { CreateOrgTeamDto } from "@/modules/organizations/inputs/create-organization-team.input";
-import { UpdateOrgTeamDto } from "@/modules/organizations/inputs/update-organization-team.input";
+import { CreateOrgTeamDto } from "@/modules/organizations/teams/index/inputs/create-organization-team.input";
+import { UpdateOrgTeamDto } from "@/modules/organizations/teams/index/inputs/update-organization-team.input";
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { Injectable } from "@nestjs/common";
@@ -1,7 +1,7 @@
 import { MembershipsRepository } from "@/modules/memberships/memberships.repository";
-import { CreateOrgTeamDto } from "@/modules/organizations/inputs/create-organization-team.input";
-import { UpdateOrgTeamDto } from "@/modules/organizations/inputs/update-organization-team.input";
-import { OrganizationsTeamsRepository } from "@/modules/organizations/repositories/organizations-teams.repository";
+import { CreateOrgTeamDto } from "@/modules/organizations/teams/index/inputs/create-organization-team.input";
+import { UpdateOrgTeamDto } from "@/modules/organizations/teams/index/inputs/update-organization-team.input";
+import { OrganizationsTeamsRepository } from "@/modules/organizations/teams/index/organizations-teams.repository";
 import { UserWithProfile } from "@/modules/users/users.repository";
 import { Injectable } from "@nestjs/common";

@@ -1,8 +1,8 @@
 import { bootstrap } from "@/app";
 import { AppModule } from "@/app.module";
-import { CreateOrgTeamMembershipDto } from "@/modules/organizations/inputs/create-organization-team-membership.input";
-import { UpdateOrgTeamMembershipDto } from "@/modules/organizations/inputs/update-organization-team-membership.input";
-import { OrgTeamMembershipOutputDto } from "@/modules/organizations/outputs/organization-teams-memberships.output";
+import { CreateOrgTeamMembershipDto } from "@/modules/organizations/teams/memberships/inputs/create-organization-team-membership.input";
+import { UpdateOrgTeamMembershipDto } from "@/modules/organizations/teams/memberships/inputs/update-organization-team-membership.input";
+import { OrgTeamMembershipOutputDto } from "@/modules/organizations/teams/memberships/outputs/organization-teams-memberships.output";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
 import { TokensModule } from "@/modules/tokens/tokens.module";
 import { UsersModule } from "@/modules/users/users.module";
@@ -7,15 +7,15 @@ import { IsAdminAPIEnabledGuard } from "@/modules/auth/guards/organizations/is-a
 import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
 import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
 import { IsTeamInOrg } from "@/modules/auth/guards/teams/is-team-in-org.guard";
-import { CreateOrgTeamMembershipDto } from "@/modules/organizations/inputs/create-organization-team-membership.input";
-import { UpdateOrgTeamMembershipDto } from "@/modules/organizations/inputs/update-organization-team-membership.input";
-import { OrganizationsRepository } from "@/modules/organizations/organizations.repository";
+import { OrganizationsRepository } from "@/modules/organizations/index/organizations.repository";
+import { CreateOrgTeamMembershipDto } from "@/modules/organizations/teams/memberships/inputs/create-organization-team-membership.input";
+import { UpdateOrgTeamMembershipDto } from "@/modules/organizations/teams/memberships/inputs/update-organization-team-membership.input";
 import {
  OrgTeamMembershipOutputDto,
  OrgTeamMembershipsOutputResponseDto,
  OrgTeamMembershipOutputResponseDto,
-} from "@/modules/organizations/outputs/organization-teams-memberships.output";
-import { OrganizationsTeamsMembershipsService } from "@/modules/organizations/services/organizations-teams-memberships.service";
+} from "@/modules/organizations/teams/memberships/outputs/organization-teams-memberships.output";
+import { OrganizationsTeamsMembershipsService } from "@/modules/organizations/teams/memberships/services/organizations-teams-memberships.service";
 import { TeamsEventTypesService } from "@/modules/teams/event-types/services/teams-event-types.service";
 import {
  Controller,
@@ -1,5 +1,5 @@
-import { CreateOrgTeamMembershipDto } from "@/modules/organizations/inputs/create-organization-team-membership.input";
-import { UpdateOrgTeamMembershipDto } from "@/modules/organizations/inputs/update-organization-team-membership.input";
+import { CreateOrgTeamMembershipDto } from "@/modules/organizations/teams/memberships/inputs/create-organization-team-membership.input";
+import { UpdateOrgTeamMembershipDto } from "@/modules/organizations/teams/memberships/inputs/update-organization-team-membership.input";
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { Injectable } from "@nestjs/common";
@@ -1,6 +1,6 @@
-import { CreateOrgTeamMembershipDto } from "@/modules/organizations/inputs/create-organization-team-membership.input";
-import { UpdateOrgTeamMembershipDto } from "@/modules/organizations/inputs/update-organization-team-membership.input";
-import { OrganizationsTeamsMembershipsRepository } from "@/modules/organizations/repositories/organizations-teams-memberships.repository";
+import { CreateOrgTeamMembershipDto } from "@/modules/organizations/teams/memberships/inputs/create-organization-team-membership.input";
+import { UpdateOrgTeamMembershipDto } from "@/modules/organizations/teams/memberships/inputs/update-organization-team-membership.input";
+import { OrganizationsTeamsMembershipsRepository } from "@/modules/organizations/teams/memberships/organizations-teams-memberships.repository";
 import { Injectable, NotFoundException } from "@nestjs/common";

@Injectable()
@@ -1,5 +1,5 @@
-import { OrganizationsRepository } from "@/modules/organizations/organizations.repository";
-import { OrganizationsTeamsRepository } from "@/modules/organizations/repositories/organizations-teams.repository";
+import { OrganizationsRepository } from "@/modules/organizations/index/organizations.repository";
+import { OrganizationsTeamsRepository } from "@/modules/organizations/teams/index/organizations-teams.repository";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
 import { RedisModule } from "@/modules/redis/redis.module";
 import { RoutingFormsResponsesModule } from "@/modules/routing-forms-responses/routing-forms-responses.module";
@@ -9,15 +9,15 @@ import { IsAdminAPIEnabledGuard } from "@/modules/auth/guards/organizations/is-a
 import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
 import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
 import { IsUserInOrg } from "@/modules/auth/guards/users/is-user-in-org.guard";
-import { CreateOrganizationUserInput } from "@/modules/organizations/inputs/create-organization-user.input";
-import { GetOrganizationsUsersInput } from "@/modules/organizations/inputs/get-organization-users.input";
-import { UpdateOrganizationUserInput } from "@/modules/organizations/inputs/update-organization-user.input";
+import { CreateOrganizationUserInput } from "@/modules/organizations/users/index/inputs/create-organization-user.input";
+import { GetOrganizationsUsersInput } from "@/modules/organizations/users/index/inputs/get-organization-users.input";
+import { UpdateOrganizationUserInput } from "@/modules/organizations/users/index/inputs/update-organization-user.input";
 import {
  GetOrganizationUsersResponseDTO,
  GetOrgUsersWithProfileOutput,
-} from "@/modules/organizations/outputs/get-organization-users.output";
-import { GetOrganizationUserOutput } from "@/modules/organizations/outputs/get-organization-users.output";
-import { OrganizationsUsersService } from "@/modules/organizations/services/organizations-users-service";
+} from "@/modules/organizations/users/index/outputs/get-organization-users.output";
+import { GetOrganizationUserOutput } from "@/modules/organizations/users/index/outputs/get-organization-users.output";
+import { OrganizationsUsersService } from "@/modules/organizations/users/index/services/organizations-users-service";
 import { UserWithProfile } from "@/modules/users/users.repository";
 import {
  Controller,
@@ -1,7 +1,7 @@
 import { bootstrap } from "@/app";
 import { AppModule } from "@/app.module";
 import { EmailService } from "@/modules/email/email.service";
-import { GetOrgUsersWithProfileOutput } from "@/modules/organizations/outputs/get-organization-users.output";
+import { GetOrgUsersWithProfileOutput } from "@/modules/organizations/users/index/outputs/get-organization-users.output";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
 import { TokensModule } from "@/modules/tokens/tokens.module";
 import { UsersModule } from "@/modules/users/users.module";
@@ -1,5 +1,5 @@
-import { CreateOrganizationUserInput } from "@/modules/organizations/inputs/create-organization-user.input";
-import { UpdateOrganizationUserInput } from "@/modules/organizations/inputs/update-organization-user.input";
+import { CreateOrganizationUserInput } from "@/modules/organizations/users/index/inputs/create-organization-user.input";
+import { UpdateOrganizationUserInput } from "@/modules/organizations/users/index/inputs/update-organization-user.input";
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { Injectable } from "@nestjs/common";
@@ -1,8 +1,8 @@
 import { EmailService } from "@/modules/email/email.service";
-import { CreateOrganizationUserInput } from "@/modules/organizations/inputs/create-organization-user.input";
-import { UpdateOrganizationUserInput } from "@/modules/organizations/inputs/update-organization-user.input";
-import { OrganizationsUsersRepository } from "@/modules/organizations/repositories/organizations-users.repository";
-import { OrganizationsTeamsService } from "@/modules/organizations/services/organizations-teams.service";
+import { OrganizationsTeamsService } from "@/modules/organizations/teams/index/services/organizations-teams.service";
+import { CreateOrganizationUserInput } from "@/modules/organizations/users/index/inputs/create-organization-user.input";
+import { UpdateOrganizationUserInput } from "@/modules/organizations/users/index/inputs/update-organization-user.input";
+import { OrganizationsUsersRepository } from "@/modules/organizations/users/index/organizations-users.repository";
 import { CreateUserInput } from "@/modules/users/inputs/create-user.input";
 import { Injectable, ConflictException } from "@nestjs/common";
 import { Team, CreationSource } from "@prisma/client";
@@ -20,7 +20,7 @@ import {
  UserOoosOutputResponseDto,
 } from "@/modules/ooo/outputs/ooo.output";
 import { UserOOOService } from "@/modules/ooo/services/ooo.service";
-import { OrgUsersOOOService } from "@/modules/organizations/controllers/users/ooo/services/organization-users-ooo.service";
+import { OrgUsersOOOService } from "@/modules/organizations/users/ooo/services/organization-users-ooo.service";
 import {
  Controller,
  UseGuards,
@@ -1,6 +1,6 @@
 import { UserOOORepository } from "@/modules/ooo/repositories/ooo.repository";
 import { UserOOOService } from "@/modules/ooo/services/ooo.service";
-import { OrgUsersOOORepository } from "@/modules/organizations/controllers/users/ooo/repositories/organizations-users-ooo.repository";
+import { OrgUsersOOORepository } from "@/modules/organizations/users/ooo/organizations-users-ooo.repository";
 import { UsersRepository } from "@/modules/users/users.repository";
 import { Injectable } from "@nestjs/common";

@@ -7,7 +7,7 @@ import { IsAdminAPIEnabledGuard } from "@/modules/auth/guards/organizations/is-a
 import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
 import { IsWebhookInOrg } from "@/modules/auth/guards/organizations/is-webhook-in-org.guard";
 import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
-import { OrganizationsWebhooksService } from "@/modules/organizations/services/organizations-webhooks.service";
+import { OrganizationsWebhooksService } from "@/modules/organizations/webhooks/services/organizations-webhooks.service";
 import { CreateWebhookInputDto } from "@/modules/webhooks/inputs/webhook.input";
 import { UpdateWebhookInputDto } from "@/modules/webhooks/inputs/webhook.input";
 import {