diff --git a/packages/emails/src/templates/VerifyEmailChangeEmail.tsx b/packages/emails/src/templates/VerifyEmailChangeEmail.tsx
index bc5fe0d0232e50..79ecc7d86bd1dd 100644
--- a/packages/emails/src/templates/VerifyEmailChangeEmail.tsx
+++ b/packages/emails/src/templates/VerifyEmailChangeEmail.tsx
@@ -2,7 +2,8 @@ import type { TFunction } from "i18next";
 
 import { APP_NAME, SENDER_NAME, SUPPORT_MAIL_ADDRESS } from "@calcom/lib/constants";
 
-import { BaseEmailHtml, CallToAction } from "../components";
+import { BaseEmailHtml } from "../components/BaseEmailHtml";
+import { CallToAction } from "../components/CallToAction";
 
 export type EmailVerifyLink = {
   language: TFunction;
diff --git a/packages/emails/src/templates/index.ts b/packages/emails/src/templates/index.barrel.bak.ts
similarity index 100%
rename from packages/emails/src/templates/index.ts
rename to packages/emails/src/templates/index.barrel.bak.ts
diff --git a/packages/embeds/embed-react/inline.tsx b/packages/embeds/embed-react/inline.tsx
index 183f8f91a42061..29f61c11987f06 100644
--- a/packages/embeds/embed-react/inline.tsx
+++ b/packages/embeds/embed-react/inline.tsx
@@ -8,7 +8,8 @@ import ReactDom from "react-dom";
 
 // Because we don't import from @calcom/embed-react, this file isn't able to test if the build is successful or not and thus npm package would work or not correctly.
 // There are tests in test/built which verify that the types from built package are correctly generated and exported correctly.
-import Cal, { getCalApi, type EmbedEvent } from "./src/index";
+import { getCalApi, type EmbedEvent } from "./src/index";
+import { Cal } from "./src/Cal";
 
 const api = getCalApi({
   namespace: "inline",
diff --git a/packages/features/bookings/Booker/index.ts b/packages/features/bookings/Booker/index.barrel.bak.ts
similarity index 100%
rename from packages/features/bookings/Booker/index.ts
rename to packages/features/bookings/Booker/index.barrel.bak.ts
diff --git a/packages/features/bookings/hooks/index.ts b/packages/features/bookings/hooks/index.barrel.bak.ts
similarity index 100%
rename from packages/features/bookings/hooks/index.ts
rename to packages/features/bookings/hooks/index.barrel.bak.ts
diff --git a/packages/features/bookings/lib/index.ts b/packages/features/bookings/lib/index.barrel.bak.ts
similarity index 100%
rename from packages/features/bookings/lib/index.ts
rename to packages/features/bookings/lib/index.barrel.bak.ts
diff --git a/packages/features/bot-detection/index.ts b/packages/features/bot-detection/index.barrel.bak.ts
similarity index 100%
rename from packages/features/bot-detection/index.ts
rename to packages/features/bot-detection/index.barrel.bak.ts
diff --git a/packages/features/cache/index.ts b/packages/features/cache/index.barrel.bak.ts
similarity index 100%
rename from packages/features/cache/index.ts
rename to packages/features/cache/index.barrel.bak.ts
diff --git a/packages/features/watchlist/lib/telemetry/index.ts b/packages/features/watchlist/lib/telemetry/index.barrel.bak.ts
similarity index 100%
rename from packages/features/watchlist/lib/telemetry/index.ts
rename to packages/features/watchlist/lib/telemetry/index.barrel.bak.ts
diff --git a/packages/features/watchlist/operations/check-if-email-in-watchlist.controller.test.ts b/packages/features/watchlist/operations/check-if-email-in-watchlist.controller.test.ts
index 8d6337fedb88df..c30b70475eb634 100644
--- a/packages/features/watchlist/operations/check-if-email-in-watchlist.controller.test.ts
+++ b/packages/features/watchlist/operations/check-if-email-in-watchlist.controller.test.ts
@@ -3,7 +3,7 @@ import { describe, test, expect, vi, beforeEach } from "vitest";
 import { WatchlistType } from "@calcom/prisma/enums";
 
 import { WatchlistFeature } from "../lib/facade/WatchlistFeature";
-import type { SpanFn } from "../lib/telemetry";
+import type { SpanFn } from "../lib/telemetry/types";
 import { checkIfEmailIsBlockedInWatchlistController } from "./check-if-email-in-watchlist.controller";
 
 // Mock the DI container
diff --git a/packages/features/watchlist/operations/check-if-email-in-watchlist.controller.ts b/packages/features/watchlist/operations/check-if-email-in-watchlist.controller.ts
index 2b9ee6ef2321ad..a07af6f6c97b6c 100644
--- a/packages/features/watchlist/operations/check-if-email-in-watchlist.controller.ts
+++ b/packages/features/watchlist/operations/check-if-email-in-watchlist.controller.ts
@@ -1,6 +1,6 @@
 import { getWatchlistFeature } from "@calcom/features/di/watchlist/containers/watchlist";
 
-import type { SpanFn } from "../lib/telemetry";
+import type { SpanFn } from "../lib/telemetry/types";
 import { normalizeEmail } from "../lib/utils/normalization";
 
 interface CheckEmailBlockedParams {
diff --git a/packages/features/watchlist/operations/check-if-users-are-blocked.controller.test.ts b/packages/features/watchlist/operations/check-if-users-are-blocked.controller.test.ts
index c4a9c86d4d8be8..05187e58feade4 100644
--- a/packages/features/watchlist/operations/check-if-users-are-blocked.controller.test.ts
+++ b/packages/features/watchlist/operations/check-if-users-are-blocked.controller.test.ts
@@ -2,7 +2,7 @@ import { describe, test, expect, vi, beforeEach } from "vitest";
 
 import { WatchlistType } from "@calcom/prisma/enums";
 
-import type { SpanFn } from "../lib/telemetry";
+import type { SpanFn } from "../lib/telemetry/types";
 import { checkIfUsersAreBlocked } from "./check-if-users-are-blocked.controller";
 
 // Mock the DI container
diff --git a/packages/features/watchlist/operations/list-all-system-entries.controller.test.ts b/packages/features/watchlist/operations/list-all-system-entries.controller.test.ts
index 7e67c33c7757db..8fc2008b869a50 100644
--- a/packages/features/watchlist/operations/list-all-system-entries.controller.test.ts
+++ b/packages/features/watchlist/operations/list-all-system-entries.controller.test.ts
@@ -2,7 +2,7 @@ import { describe, test, expect, vi, beforeEach } from "vitest";
 
 import { WatchlistType, WatchlistAction, WatchlistSource } from "@calcom/prisma/enums";
 
-import type { SpanFn } from "../lib/telemetry";
+import type { SpanFn } from "../lib/telemetry/types";
 import { listAllSystemEntriesController } from "./list-all-system-entries.controller";
 
 // Mock the DI container
diff --git a/packages/features/watchlist/operations/list-all-system-entries.controller.ts b/packages/features/watchlist/operations/list-all-system-entries.controller.ts
index 43bd224019e5a1..caee058088e940 100644
--- a/packages/features/watchlist/operations/list-all-system-entries.controller.ts
+++ b/packages/features/watchlist/operations/list-all-system-entries.controller.ts
@@ -1,6 +1,6 @@
 import { getWatchlistFeature } from "@calcom/features/di/watchlist/containers/watchlist";
 
-import type { SpanFn } from "../lib/telemetry";
+import type { SpanFn } from "../lib/telemetry/types";
 import type { WatchlistEntry } from "../lib/types";
 
 interface ListAllSystemEntriesParams {
diff --git a/packages/lib/holidays/index.ts b/packages/lib/holidays/index.barrel.bak.ts
similarity index 100%
rename from packages/lib/holidays/index.ts
rename to packages/lib/holidays/index.barrel.bak.ts
diff --git a/packages/lib/tracking/index.ts b/packages/lib/tracking/index.barrel.bak.ts
similarity index 100%
rename from packages/lib/tracking/index.ts
rename to packages/lib/tracking/index.barrel.bak.ts
diff --git a/packages/lib/unstable_cache/index.ts b/packages/lib/unstable_cache/index.barrel.bak.ts
similarity index 100%
rename from packages/lib/unstable_cache/index.ts
rename to packages/lib/unstable_cache/index.barrel.bak.ts
diff --git a/packages/platform/atoms/booker-embed/index.ts b/packages/platform/atoms/booker-embed/index.barrel.bak.ts
similarity index 100%
rename from packages/platform/atoms/booker-embed/index.ts
rename to packages/platform/atoms/booker-embed/index.barrel.bak.ts
diff --git a/packages/platform/atoms/cal-provider/index.ts b/packages/platform/atoms/cal-provider/index.barrel.bak.ts
similarity index 100%
rename from packages/platform/atoms/cal-provider/index.ts
rename to packages/platform/atoms/cal-provider/index.barrel.bak.ts
diff --git a/packages/platform/atoms/calendar-settings/index.ts b/packages/platform/atoms/calendar-settings/index.barrel.bak.ts
similarity index 100%
rename from packages/platform/atoms/calendar-settings/index.ts
rename to packages/platform/atoms/calendar-settings/index.barrel.bak.ts
diff --git a/packages/platform/atoms/calendar-settings/wrappers/CalendarSettingsPlatformWrapper.tsx b/packages/platform/atoms/calendar-settings/wrappers/CalendarSettingsPlatformWrapper.tsx
index 67008cc99c8d6c..496602512d3029 100644
--- a/packages/platform/atoms/calendar-settings/wrappers/CalendarSettingsPlatformWrapper.tsx
+++ b/packages/platform/atoms/calendar-settings/wrappers/CalendarSettingsPlatformWrapper.tsx
@@ -1,6 +1,6 @@
 import type { DestinationCalendarClassNames } from "../../destination-calendar/DestinationCalendar";
-import { DestinationCalendarSettingsPlatformWrapper } from "../../destination-calendar/index";
-import { SelectedCalendarsSettingsPlatformWrapper } from "../../selected-calendars/index";
+import { DestinationCalendarSettingsPlatformWrapper } from "../../destination-calendar/wrappers/DestinationCalendarSettingsPlatformWrapper";
+import { SelectedCalendarsSettingsPlatformWrapper } from "../../selected-calendars/wrappers/SelectedCalendarsSettingsPlatformWrapper";
 import type {
   CalendarRedirectUrls,
   SelectedCalendarsClassNames,
diff --git a/packages/platform/atoms/calendar-view/index.ts b/packages/platform/atoms/calendar-view/index.barrel.bak.ts
similarity index 100%
rename from packages/platform/atoms/calendar-view/index.ts
rename to packages/platform/atoms/calendar-view/index.barrel.bak.ts
diff --git a/packages/platform/atoms/connect/index.ts b/packages/platform/atoms/connect/index.barrel.bak.ts
similarity index 100%
rename from packages/platform/atoms/connect/index.ts
rename to packages/platform/atoms/connect/index.barrel.bak.ts
diff --git a/packages/platform/atoms/create-schedule/index.tsx b/packages/platform/atoms/create-schedule/index.barrel.bak.tsx
similarity index 100%
rename from packages/platform/atoms/create-schedule/index.tsx
rename to packages/platform/atoms/create-schedule/index.barrel.bak.tsx
diff --git a/packages/platform/atoms/destination-calendar/index.ts b/packages/platform/atoms/destination-calendar/index.barrel.bak.ts
similarity index 100%
rename from packages/platform/atoms/destination-calendar/index.ts
rename to packages/platform/atoms/destination-calendar/index.barrel.bak.ts
diff --git a/packages/platform/atoms/event-types/index.ts b/packages/platform/atoms/event-types/index.barrel.bak.ts
similarity index 100%
rename from packages/platform/atoms/event-types/index.ts
rename to packages/platform/atoms/event-types/index.barrel.bak.ts
diff --git a/packages/platform/atoms/list-schedules/index.ts b/packages/platform/atoms/list-schedules/index.barrel.bak.ts
similarity index 100%
rename from packages/platform/atoms/list-schedules/index.ts
rename to packages/platform/atoms/list-schedules/index.barrel.bak.ts
diff --git a/packages/platform/atoms/selected-calendars/index.ts b/packages/platform/atoms/selected-calendars/index.barrel.bak.ts
similarity index 100%
rename from packages/platform/atoms/selected-calendars/index.ts
rename to packages/platform/atoms/selected-calendars/index.barrel.bak.ts
diff --git a/packages/platform/atoms/troubleshooter/index.ts b/packages/platform/atoms/troubleshooter/index.barrel.bak.ts
similarity index 100%
rename from packages/platform/atoms/troubleshooter/index.ts
rename to packages/platform/atoms/troubleshooter/index.barrel.bak.ts
diff --git a/packages/platform/types/event-types/event-types_2024_06_14/outputs/booking-fields.output.ts b/packages/platform/types/event-types/event-types_2024_06_14/outputs/booking-fields.output.ts
index 752ecedfa8747f..cee5a552fb8776 100644
--- a/packages/platform/types/event-types/event-types_2024_06_14/outputs/booking-fields.output.ts
+++ b/packages/platform/types/event-types/event-types_2024_06_14/outputs/booking-fields.output.ts
@@ -5,27 +5,7 @@ import { IsBoolean, IsOptional, IsString } from "class-validator";
 import type { ValidationOptions, ValidatorConstraintInterface } from "class-validator";
 import { registerDecorator, validate, ValidatorConstraint } from "class-validator";
 
-import {
-  PhoneFieldInput_2024_06_14,
-  AddressFieldInput_2024_06_14,
-  TextFieldInput_2024_06_14,
-  NumberFieldInput_2024_06_14,
-  TextAreaFieldInput_2024_06_14,
-  SelectFieldInput_2024_06_14,
-  MultiSelectFieldInput_2024_06_14,
-  MultiEmailFieldInput_2024_06_14,
-  CheckboxGroupFieldInput_2024_06_14,
-  RadioGroupFieldInput_2024_06_14,
-  BooleanFieldInput_2024_06_14,
-  NameDefaultFieldInput_2024_06_14,
-  EmailDefaultFieldInput_2024_06_14,
-  GuestsDefaultFieldInput_2024_06_14,
-  NotesDefaultFieldInput_2024_06_14,
-  RescheduleReasonDefaultFieldInput_2024_06_14,
-  TitleDefaultFieldInput_2024_06_14,
-  SplitNameDefaultFieldInput_2024_06_14,
-  UrlFieldInput_2024_06_14,
-} from "../inputs";
+import { PhoneFieldInput_2024_06_14, AddressFieldInput_2024_06_14, TextFieldInput_2024_06_14, NumberFieldInput_2024_06_14, TextAreaFieldInput_2024_06_14, SelectFieldInput_2024_06_14, MultiSelectFieldInput_2024_06_14, MultiEmailFieldInput_2024_06_14, CheckboxGroupFieldInput_2024_06_14, RadioGroupFieldInput_2024_06_14, BooleanFieldInput_2024_06_14, NameDefaultFieldInput_2024_06_14, EmailDefaultFieldInput_2024_06_14, GuestsDefaultFieldInput_2024_06_14, NotesDefaultFieldInput_2024_06_14, RescheduleReasonDefaultFieldInput_2024_06_14, TitleDefaultFieldInput_2024_06_14, SplitNameDefaultFieldInput_2024_06_14, UrlFieldInput_2024_06_14 } from "../inputs/booking-fields.input";
 
 export class NameDefaultFieldOutput_2024_06_14 extends NameDefaultFieldInput_2024_06_14 {
   @IsBoolean()