Skip to content

Scheduling infrastructure for absolutely everyone.

perf: do not import from @calcom/ui barrel file (#20184)

Benny Joo853f9bc4366f
diff --git a/apps/web/app/(use-page-wrapper)/(main-nav)/ShellMainAppDirBackButton.tsx b/apps/web/app/(use-page-wrapper)/(main-nav)/ShellMainAppDirBackButton.tsx
index 2be728fbd93..c1c78baa916 100644
--- a/apps/web/app/(use-page-wrapper)/(main-nav)/ShellMainAppDirBackButton.tsx
+++ b/apps/web/app/(use-page-wrapper)/(main-nav)/ShellMainAppDirBackButton.tsx
@@ -3,7 +3,7 @@
import { useRouter } from "next/navigation";
import type { LayoutProps } from "@calcom/features/shell/Shell";
-import { Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
export const ShellMainAppDirBackButton = ({ backPath }: { backPath: LayoutProps["backPath"] }) => {
const router = useRouter();
diff --git a/apps/web/app/(use-page-wrapper)/403/page.tsx b/apps/web/app/(use-page-wrapper)/403/page.tsx
index f7aed69ca64..abc571b1eca 100644
--- a/apps/web/app/(use-page-wrapper)/403/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/403/page.tsx
@@ -1,7 +1,7 @@
import { _generateMetadata, getTranslate } from "app/_utils";
import { APP_NAME, WEBAPP_URL } from "@calcom/lib/constants";
-import { Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
export const generateMetadata = () =>
_generateMetadata(
diff --git a/apps/web/app/(use-page-wrapper)/500/copy-button.tsx b/apps/web/app/(use-page-wrapper)/500/copy-button.tsx
index b99d30bd941..a436edb2fe1 100644
--- a/apps/web/app/(use-page-wrapper)/500/copy-button.tsx
+++ b/apps/web/app/(use-page-wrapper)/500/copy-button.tsx
@@ -1,7 +1,8 @@
"use client";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, showToast } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { showToast } from "@calcom/ui/components/toast";
export default function CopyButton({ error }: { error: string }) {
const { t } = useLocale();
diff --git a/apps/web/app/(use-page-wrapper)/500/page.tsx b/apps/web/app/(use-page-wrapper)/500/page.tsx
index 32239cd1663..0d3e30f5678 100644
--- a/apps/web/app/(use-page-wrapper)/500/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/500/page.tsx
@@ -1,7 +1,7 @@
import { _generateMetadata, getTranslate } from "app/_utils";
import { APP_NAME } from "@calcom/lib/constants";
-import { Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
import CopyButton from "./copy-button";
diff --git a/apps/web/app/(use-page-wrapper)/auth/error/page.tsx b/apps/web/app/(use-page-wrapper)/auth/error/page.tsx
index e7777b8cedf..da2f209e9f9 100644
--- a/apps/web/app/(use-page-wrapper)/auth/error/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/auth/error/page.tsx
@@ -3,7 +3,8 @@ import { _generateMetadata, getTranslate } from "app/_utils";
import Link from "next/link";
import { z } from "zod";
-import { Button, Icon } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Icon } from "@calcom/ui/components/icon";
import AuthContainer from "@components/ui/AuthContainer";
diff --git a/apps/web/app/(use-page-wrapper)/availability/troubleshoot/layout.tsx b/apps/web/app/(use-page-wrapper)/availability/troubleshoot/layout.tsx
index 1d9fe958788..fd658aa5047 100644
--- a/apps/web/app/(use-page-wrapper)/availability/troubleshoot/layout.tsx
+++ b/apps/web/app/(use-page-wrapper)/availability/troubleshoot/layout.tsx
@@ -2,7 +2,8 @@
import React, { Suspense } from "react";
-import { ErrorBoundary, Icon } from "@calcom/ui";
+import { ErrorBoundary } from "@calcom/ui/components/errorBoundary";
+import { Icon } from "@calcom/ui/components/icon";
export default function TroubleshooterLayout({ children }: { children: React.ReactNode }) {
return (
diff --git a/apps/web/app/(use-page-wrapper)/insights/UpgradeTipWrapper.tsx b/apps/web/app/(use-page-wrapper)/insights/UpgradeTipWrapper.tsx
index 7ad886fee1c..b5925809927 100644
--- a/apps/web/app/(use-page-wrapper)/insights/UpgradeTipWrapper.tsx
+++ b/apps/web/app/(use-page-wrapper)/insights/UpgradeTipWrapper.tsx
@@ -5,7 +5,9 @@ import { useSession } from "next-auth/react";
import { UpgradeTip } from "@calcom/features/tips";
import { WEBAPP_URL } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Icon, Button, ButtonGroup } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
+import { Icon } from "@calcom/ui/components/icon";
export default function UpgradeTipWrapper({ children }: { children: React.ReactNode }) {
const { t } = useLocale();
diff --git a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/AdminLayoutAppDirClient.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/AdminLayoutAppDirClient.tsx
index 380604fee89..b4733515e4e 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/AdminLayoutAppDirClient.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/AdminLayoutAppDirClient.tsx
@@ -6,7 +6,7 @@ import React, { useEffect } from "react";
import type Shell from "@calcom/features/shell/Shell";
import { UserPermissionRole } from "@calcom/prisma/enums";
-import { ErrorBoundary } from "@calcom/ui";
+import { ErrorBoundary } from "@calcom/ui/components/errorBoundary";
export type AdminLayoutProps = {
children: React.ReactNode;
diff --git a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/users/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/users/page.tsx
index 178b22b6cc5..229e88d712e 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/users/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/users/page.tsx
@@ -2,7 +2,7 @@ import { _generateMetadata, getTranslate } from "app/_utils";
import UsersListingView from "@calcom/features/ee/users/pages/users-listing-view";
import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
-import { Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
export const generateMetadata = async () =>
await _generateMetadata(
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx
index 404928dc8fc..b4a62ff4a75 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx
@@ -18,9 +18,14 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { OrganizationRepository } from "@calcom/lib/server/repository/organization";
import { IdentityProvider, MembershipRole, UserPermissionRole } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
-import type { VerticalTabItemProps } from "@calcom/ui";
-import { Badge, Button, ErrorBoundary, Icon, Skeleton, VerticalTabItem } from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import { ErrorBoundary } from "@calcom/ui/components/errorBoundary";
+import { Icon } from "@calcom/ui/components/icon";
+import type { VerticalTabItemProps } from "@calcom/ui/components/navigation";
+import { VerticalTabItem } from "@calcom/ui/components/navigation";
+import { Skeleton } from "@calcom/ui/components/skeleton";
const getTabs = (orgBranding: OrganizationBranding | null) => {
const tabs: VerticalTabItemProps[] = [
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/new/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/new/page.tsx
index a69041bb2cc..713ed4c6e6e 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/new/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/new/page.tsx
@@ -4,7 +4,7 @@ import { Suspense } from "react";
import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
import { NewWebhookView } from "@calcom/features/webhooks/pages/webhook-new-view";
import { APP_NAME } from "@calcom/lib/constants";
-import { SkeletonContainer, SkeletonText } from "@calcom/ui";
+import { SkeletonText, SkeletonContainer } from "@calcom/ui/components/skeleton";
export const generateMetadata = async () =>
await _generateMetadata(
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/my-account/calendars/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/my-account/calendars/page.tsx
index 9ad2d08f153..c50c77a43aa 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/my-account/calendars/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/my-account/calendars/page.tsx
@@ -2,7 +2,7 @@ import { _generateMetadata } from "app/_utils";
import { getTranslate } from "app/_utils";
import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
-import { Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
import { CalendarListContainer } from "@components/apps/CalendarListContainer";
diff --git a/apps/web/app/icons/IconGrid.tsx b/apps/web/app/icons/IconGrid.tsx
index da6ea588058..7a3f8d896c6 100644
--- a/apps/web/app/icons/IconGrid.tsx
+++ b/apps/web/app/icons/IconGrid.tsx
@@ -1,7 +1,7 @@
"use client";
-import { Icon } from "@calcom/ui";
-import type { IconName } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import type { IconName } from "@calcom/ui/components/icon";
export const IconGrid = (props: {
title: string;
diff --git a/apps/web/app/icons/page.tsx b/apps/web/app/icons/page.tsx
index decbbac82ea..e8203e3aa4d 100644
--- a/apps/web/app/icons/page.tsx
+++ b/apps/web/app/icons/page.tsx
@@ -2,7 +2,8 @@ import { _generateMetadata, getTranslate } from "app/_utils";
import { Inter } from "next/font/google";
import localFont from "next/font/local";
-import { type IconName, IconSprites } from "@calcom/ui";
+import { IconSprites } from "@calcom/ui/components/icon";
+import type { IconName } from "@calcom/ui/components/icon";
import { lucideIconList } from "../../../../packages/ui/components/icon/icon-list.mjs";
import { IconGrid } from "./IconGrid";
diff --git a/apps/web/app/layout.tsx b/apps/web/app/layout.tsx
index 75fa7f38892..e903ed22c60 100644
--- a/apps/web/app/layout.tsx
+++ b/apps/web/app/layout.tsx
@@ -5,7 +5,7 @@ import { headers, cookies } from "next/headers";
import React from "react";
import { getLocale } from "@calcom/features/auth/lib/getLocale";
-import { IconSprites } from "@calcom/ui";
+import { IconSprites } from "@calcom/ui/components/icon";
import { NotificationSoundHandler } from "@calcom/web/components/notification-sound-handler";
import { buildLegacyCtx } from "@lib/buildLegacyCtx";
diff --git a/apps/web/app/not-found.tsx b/apps/web/app/not-found.tsx
index 402526898b4..0783028036a 100644
--- a/apps/web/app/not-found.tsx
+++ b/apps/web/app/not-found.tsx
@@ -8,7 +8,7 @@ import {
subdomainSuffix,
} from "@calcom/features/ee/organizations/lib/orgDomains";
import { DOCS_URL, IS_CALCOM, WEBSITE_URL } from "@calcom/lib/constants";
-import { Icon } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
import PageWrapper from "@components/PageWrapperAppDir";
diff --git a/apps/web/components/AddToHomescreen.tsx b/apps/web/components/AddToHomescreen.tsx
index 7fad3766776..6a525821906 100644
--- a/apps/web/components/AddToHomescreen.tsx
+++ b/apps/web/components/AddToHomescreen.tsx
@@ -1,7 +1,7 @@
import { useState } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Icon } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
export default function AddToHomescreen() {
const { t } = useLocale();
diff --git a/apps/web/components/EnterprisePage.tsx b/apps/web/components/EnterprisePage.tsx
index b5e9538f82a..8aef837cc27 100644
--- a/apps/web/components/EnterprisePage.tsx
+++ b/apps/web/components/EnterprisePage.tsx
@@ -3,7 +3,9 @@
import Shell from "@calcom/features/shell/Shell";
import { UpgradeTip } from "@calcom/features/tips";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, ButtonGroup, Icon } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
+import { Icon } from "@calcom/ui/components/icon";
export default function EnterprisePage() {
const { t } = useLocale();
diff --git a/apps/web/components/Loader.tsx b/apps/web/components/Loader.tsx
index 5ee2d909758..19d992dd52f 100644
--- a/apps/web/components/Loader.tsx
+++ b/apps/web/components/Loader.tsx
@@ -1,4 +1,4 @@
/**
* @deprecated Use custom Skeletons instead
**/
-export { Loader as default } from "@calcom/ui";
+export { Loader as default } from "@calcom/ui/components/skeleton";
diff --git a/apps/web/components/PageWrapper.tsx b/apps/web/components/PageWrapper.tsx
index fb1308290e7..b97bd6b86c7 100644
--- a/apps/web/components/PageWrapper.tsx
+++ b/apps/web/components/PageWrapper.tsx
@@ -10,7 +10,7 @@ import "@calcom/embed-core/src/embed-iframe";
import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
import { IS_CALCOM, WEBAPP_URL } from "@calcom/lib/constants";
import { buildCanonical } from "@calcom/lib/next-seo.config";
-import { IconSprites } from "@calcom/ui";
+import { IconSprites } from "@calcom/ui/components/icon";
import type { AppProps } from "@lib/app-providers";
import AppProviders from "@lib/app-providers";
diff --git a/apps/web/components/apps/AdditionalCalendarSelector.tsx b/apps/web/components/apps/AdditionalCalendarSelector.tsx
index 75d5cbb6fe8..ab7b17c6584 100644
--- a/apps/web/components/apps/AdditionalCalendarSelector.tsx
+++ b/apps/web/components/apps/AdditionalCalendarSelector.tsx
@@ -4,13 +4,13 @@ import { InstallAppButton } from "@calcom/app-store/components";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
import {
- Button,
Dropdown,
DropdownItem,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
-} from "@calcom/ui";
+} from "@calcom/ui/components/dropdown";
+import { Button } from "@calcom/ui/components/button";
interface AdditionalCalendarSelectorProps {
isPending?: boolean;
diff --git a/apps/web/components/apps/AppPage.tsx b/apps/web/components/apps/AppPage.tsx
index 01b3bf41c31..b88d2dd738d 100644
--- a/apps/web/components/apps/AppPage.tsx
+++ b/apps/web/components/apps/AppPage.tsx
@@ -14,8 +14,12 @@ import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
import type { App as AppType } from "@calcom/types/App";
-import { Badge, Button, Icon, SkeletonButton, SkeletonText, showToast } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { showToast } from "@calcom/ui/components/toast";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
+import { SkeletonButton, SkeletonText } from "@calcom/ui/components/skeleton";
import { InstallAppButtonChild } from "./InstallAppButtonChild";
import { MultiDisconnectIntegration } from "./MultiDisconnectIntegration";
diff --git a/apps/web/components/apps/InstallAppButtonChild.tsx b/apps/web/components/apps/InstallAppButtonChild.tsx
index 4cf0a3b0409..7b5a4ff36d3 100644
--- a/apps/web/components/apps/InstallAppButtonChild.tsx
+++ b/apps/web/components/apps/InstallAppButtonChild.tsx
@@ -1,8 +1,8 @@
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterOutputs } from "@calcom/trpc/react";
import type { AppFrontendPayload } from "@calcom/types/App";
-import type { ButtonProps } from "@calcom/ui";
-import { Button } from "@calcom/ui";
+import type { ButtonProps } from "@calcom/ui/components/button";
+import { Button } from "@calcom/ui/components/button";
export const InstallAppButtonChild = ({
multiInstall,
diff --git a/apps/web/components/apps/MultiDisconnectIntegration.tsx b/apps/web/components/apps/MultiDisconnectIntegration.tsx
index b57f3d5b287..b29d002b168 100644
--- a/apps/web/components/apps/MultiDisconnectIntegration.tsx
+++ b/apps/web/components/apps/MultiDisconnectIntegration.tsx
@@ -3,18 +3,18 @@ import { useState } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
import type { AppRouter } from "@calcom/trpc/types/server/routers/_app";
+import { Button } from "@calcom/ui/components/button";
+import { ConfirmationDialogContent } from "@calcom/ui/components/dialog";
+import { Dialog } from "@calcom/ui/components/dialog";
import {
- Button,
Dropdown,
- DropdownMenuTrigger,
+ DropdownItem,
DropdownMenuContent,
DropdownMenuLabel,
DropdownMenuItem,
- DropdownItem,
- Dialog,
- ConfirmationDialogContent,
- showToast,
-} from "@calcom/ui";
+ DropdownMenuTrigger,
+} from "@calcom/ui/components/dropdown";
+import { showToast } from "@calcom/ui/components/toast";
import type { inferRouterOutputs } from "@trpc/server";
diff --git a/apps/web/components/apps/installation/AccountsStepCard.tsx b/apps/web/components/apps/installation/AccountsStepCard.tsx
index bbcc4622a07..59eeddb1a61 100644
--- a/apps/web/components/apps/installation/AccountsStepCard.tsx
+++ b/apps/web/components/apps/installation/AccountsStepCard.tsx
@@ -4,9 +4,9 @@ import React, { useState } from "react";
import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { User } from "@calcom/prisma/client";
-import { StepCard } from "@calcom/ui";
-import { Avatar } from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { StepCard } from "@calcom/ui/components/card";
import type { TTeams } from "~/apps/installation/[[...step]]/step-view";
diff --git a/apps/web/components/apps/installation/ConfigureStepCard.tsx b/apps/web/components/apps/installation/ConfigureStepCard.tsx
index 11b690eb928..d4dcb787fd2 100644
--- a/apps/web/components/apps/installation/ConfigureStepCard.tsx
+++ b/apps/web/components/apps/installation/ConfigureStepCard.tsx
@@ -12,7 +12,10 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { LocationObject } from "@calcom/lib/location";
import type { AppCategories } from "@calcom/prisma/enums";
import type { EventTypeMetaDataSchema, eventTypeBookingFields } from "@calcom/prisma/zod-utils";
-import { Button, Form, Icon, Avatar } from "@calcom/ui";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Button } from "@calcom/ui/components/button";
+import { Form } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
import EventTypeAppSettingsWrapper from "@components/apps/installation/EventTypeAppSettingsWrapper";
import EventTypeConferencingAppSettings from "@components/apps/installation/EventTypeConferencingAppSettings";
diff --git a/apps/web/components/apps/installation/EventTypeConferencingAppSettings.tsx b/apps/web/components/apps/installation/EventTypeConferencingAppSettings.tsx
index 092f077e211..e023380cae4 100644
--- a/apps/web/components/apps/installation/EventTypeConferencingAppSettings.tsx
+++ b/apps/web/components/apps/installation/EventTypeConferencingAppSettings.tsx
@@ -10,8 +10,8 @@ import type { SingleValueLocationOption } from "@calcom/features/form/components
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { SchedulingType } from "@calcom/prisma/client";
import { trpc } from "@calcom/trpc/react";
-import { SkeletonContainer, SkeletonText } from "@calcom/ui";
-import { Skeleton, Label } from "@calcom/ui";
+import { Label } from "@calcom/ui/components/form";
+import { Skeleton, SkeletonText, SkeletonContainer } from "@calcom/ui/components/skeleton";
import { QueryCell } from "@lib/QueryCell";
diff --git a/apps/web/components/apps/installation/EventTypesStepCard.tsx b/apps/web/components/apps/installation/EventTypesStepCard.tsx
index 123e3104c25..39824a47c7a 100644
--- a/apps/web/components/apps/installation/EventTypesStepCard.tsx
+++ b/apps/web/components/apps/installation/EventTypesStepCard.tsx
@@ -6,7 +6,10 @@ import { useFieldArray, useFormContext } from "react-hook-form";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
import { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
-import { ScrollableArea, Badge, Button, Avatar } from "@calcom/ui";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import { ScrollableArea } from "@calcom/ui/components/scrollable";
import type { TEventType, TEventTypesForm, TEventTypeGroup } from "~/apps/installation/[[...step]]/step-view";
diff --git a/apps/web/components/apps/layouts/AppsLayout.tsx b/apps/web/components/apps/layouts/AppsLayout.tsx
index 26ace3353ef..d7e95db8ec4 100644
--- a/apps/web/components/apps/layouts/AppsLayout.tsx
+++ b/apps/web/components/apps/layouts/AppsLayout.tsx
@@ -5,7 +5,7 @@ import React from "react";
import Shell from "@calcom/features/shell/Shell";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { EmptyScreen } from "@calcom/ui";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
type AppsLayoutProps = {
children: React.ReactNode;
diff --git a/apps/web/components/auth/BackupCode.tsx b/apps/web/components/auth/BackupCode.tsx
index a9121d815eb..ad51a9d9ad3 100644
--- a/apps/web/components/auth/BackupCode.tsx
+++ b/apps/web/components/auth/BackupCode.tsx
@@ -2,7 +2,7 @@ import React from "react";
import { useFormContext } from "react-hook-form";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Label, TextField } from "@calcom/ui";
+import { Label, TextField } from "@calcom/ui/components/form";
export default function TwoFactor({ center = true }) {
const { t } = useLocale();
diff --git a/apps/web/components/auth/TwoFactor.tsx b/apps/web/components/auth/TwoFactor.tsx
index f46aa3b7e34..a6570739a51 100644
--- a/apps/web/components/auth/TwoFactor.tsx
+++ b/apps/web/components/auth/TwoFactor.tsx
@@ -3,7 +3,7 @@ import useDigitInput from "react-digit-input";
import { useFormContext } from "react-hook-form";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Label, Input } from "@calcom/ui";
+import { Input, Label } from "@calcom/ui/components/form";
export default function TwoFactor({ center = true, autoFocus = true }) {
const [value, onChange] = useState("");
diff --git a/apps/web/components/booking/BookingListItem.tsx b/apps/web/components/booking/BookingListItem.tsx
index bff94754c66..cb43683ffb8 100644
--- a/apps/web/components/booking/BookingListItem.tsx
+++ b/apps/web/components/booking/BookingListItem.tsx
@@ -21,14 +21,11 @@ import { bookingMetadataSchema } from "@calcom/prisma/zod-utils";
import type { RouterInputs, RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
import type { Ensure } from "@calcom/types/utils";
-import type { ActionType } from "@calcom/ui";
+import classNames from "@calcom/ui/classNames";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogClose } from "@calcom/ui/components/dialog";
import {
- Badge,
- Button,
- Dialog,
- DialogClose,
- DialogContent,
- DialogFooter,
Dropdown,
DropdownItem,
DropdownMenuCheckboxItem,
@@ -38,14 +35,14 @@ import {
DropdownMenuSeparator,
DropdownMenuTrigger,
DropdownMenuPortal,
- Icon,
- MeetingTimeInTimezones,
- showToast,
- TableActions,
- TextAreaField,
- Tooltip,
-} from "@calcom/ui";
-import classNames from "@calcom/ui/classNames";
+} from "@calcom/ui/components/dropdown";
+import { TextAreaField } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { MeetingTimeInTimezones } from "@calcom/ui/components/popover";
+import type { ActionType } from "@calcom/ui/components/table";
+import { TableActions } from "@calcom/ui/components/table";
+import { showToast } from "@calcom/ui/components/toast";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import assignmentReasonBadgeTitleMap from "@lib/booking/assignmentReasonBadgeTitleMap";
diff --git a/apps/web/components/booking/CancelBooking.tsx b/apps/web/components/booking/CancelBooking.tsx
index 42275c6699a..50ab22eaaaf 100644
--- a/apps/web/components/booking/CancelBooking.tsx
+++ b/apps/web/components/booking/CancelBooking.tsx
@@ -5,7 +5,9 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { useRefreshData } from "@calcom/lib/hooks/useRefreshData";
import { collectPageParameters, telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
import type { RecurringEvent } from "@calcom/types/Calendar";
-import { Button, Icon, Label, TextArea, Select } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Label, Select, TextArea } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
interface InternalNotePresetsSelectProps {
internalNotePresets: { id: number; name: string }[];
diff --git a/apps/web/components/booking/SkeletonLoader.tsx b/apps/web/components/booking/SkeletonLoader.tsx
index 7693469b990..419a0ecf030 100644
--- a/apps/web/components/booking/SkeletonLoader.tsx
+++ b/apps/web/components/booking/SkeletonLoader.tsx
@@ -1,6 +1,6 @@
import React from "react";
-import { SkeletonText } from "@calcom/ui";
+import { SkeletonText } from "@calcom/ui/components/skeleton";
function SkeletonLoader() {
return (
diff --git a/apps/web/components/dialog/AddGuestsDialog.tsx b/apps/web/components/dialog/AddGuestsDialog.tsx
index c8077f9aa6e..f7471cadebc 100644
--- a/apps/web/components/dialog/AddGuestsDialog.tsx
+++ b/apps/web/components/dialog/AddGuestsDialog.tsx
@@ -4,16 +4,11 @@ import { z } from "zod";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import {
- Button,
- Dialog,
- DialogContent,
- DialogFooter,
- DialogHeader,
- MultiEmail,
- Icon,
- showToast,
-} from "@calcom/ui";
+import { MultiEmail } from "@calcom/ui/components/address";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogHeader } from "@calcom/ui/components/dialog";
+import { Icon } from "@calcom/ui/components/icon";
+import { showToast } from "@calcom/ui/components/toast";
interface IAddGuestsDialog {
isOpenDialog: boolean;
diff --git a/apps/web/components/dialog/ChargeCardDialog.tsx b/apps/web/components/dialog/ChargeCardDialog.tsx
index 982b3d225bc..fa67463ad14 100644
--- a/apps/web/components/dialog/ChargeCardDialog.tsx
+++ b/apps/web/components/dialog/ChargeCardDialog.tsx
@@ -3,16 +3,10 @@ import { useState } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import {
- Button,
- Dialog,
- DialogClose,
- DialogContent,
- DialogFooter,
- DialogHeader,
- Icon,
- showToast,
-} from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogClose } from "@calcom/ui/components/dialog";
+import { Icon } from "@calcom/ui/components/icon";
+import { showToast } from "@calcom/ui/components/toast";
interface IRescheduleDialog {
isOpenDialog: boolean;
diff --git a/apps/web/components/dialog/EditLocationDialog.tsx b/apps/web/components/dialog/EditLocationDialog.tsx
index b15d087c4f8..c97ec7cab35 100644
--- a/apps/web/components/dialog/EditLocationDialog.tsx
+++ b/apps/web/components/dialog/EditLocationDialog.tsx
@@ -19,7 +19,10 @@ import type { LocationOption } from "@calcom/features/form/components/LocationSe
import LocationSelect from "@calcom/features/form/components/LocationSelect";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Button, Icon, Input, Dialog, DialogContent, DialogFooter, Form } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter } from "@calcom/ui/components/dialog";
+import { Form, Input } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
import { QueryCell } from "../../lib/QueryCell";
diff --git a/apps/web/components/dialog/ReassignDialog.tsx b/apps/web/components/dialog/ReassignDialog.tsx
index 8de68ab3eb0..2a7380f2e2f 100644
--- a/apps/web/components/dialog/ReassignDialog.tsx
+++ b/apps/web/components/dialog/ReassignDialog.tsx
@@ -10,22 +10,19 @@ import { useDebounce } from "@calcom/lib/hooks/useDebounce";
import { useInViewObserver } from "@calcom/lib/hooks/useInViewObserver";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
+import classNames from "@calcom/ui/classNames";
+import { Button } from "@calcom/ui/components/button";
import {
- Button,
- Form,
- Label,
Dialog,
- DialogClose,
DialogContent,
DialogFooter,
+ DialogClose,
ConfirmationDialogContent,
- showToast,
- Input,
- Icon,
- RadioGroup as RadioArea,
- TextAreaField,
-} from "@calcom/ui";
-import classNames from "@calcom/ui/classNames";
+} from "@calcom/ui/components/dialog";
+import { TextAreaField, Form, Label, Input } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { RadioAreaGroup as RadioArea } from "@calcom/ui/components/radio";
+import { showToast } from "@calcom/ui/components/toast";
enum ReassignType {
ROUND_ROBIN = "round_robin",
diff --git a/apps/web/components/dialog/RerouteDialog.tsx b/apps/web/components/dialog/RerouteDialog.tsx
index ca72e40dc83..dc2abb41bbb 100644
--- a/apps/web/components/dialog/RerouteDialog.tsx
+++ b/apps/web/components/dialog/RerouteDialog.tsx
@@ -24,9 +24,10 @@ import type { bookingMetadataSchema } from "@calcom/prisma/zod-utils";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
import type { Ensure } from "@calcom/types/utils";
-import { Dialog, DialogContent, DialogFooter, DialogHeader } from "@calcom/ui";
-import { Button, Tooltip } from "@calcom/ui";
-import { showToast } from "@calcom/ui";
+import { Tooltip } from "@calcom/ui/components/tooltip";
+import { showToast } from "@calcom/ui/components/toast";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogHeader } from "@calcom/ui/components/dialog";
const enum ReroutingStatusEnum {
REROUTING_NOT_INITIATED = "not_initiated",
diff --git a/apps/web/components/dialog/RescheduleDialog.tsx b/apps/web/components/dialog/RescheduleDialog.tsx
index 8e8d93d0a7f..912e3787a86 100644
--- a/apps/web/components/dialog/RescheduleDialog.tsx
+++ b/apps/web/components/dialog/RescheduleDialog.tsx
@@ -3,16 +3,11 @@ import { useState } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import {
- Button,
- Dialog,
- DialogContent,
- DialogFooter,
- DialogHeader,
- Icon,
- showToast,
- TextArea,
-} from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { TextArea } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogHeader } from "@calcom/ui/components/dialog";
+import { showToast } from "@calcom/ui/components/toast";
interface IRescheduleDialog {
isOpenDialog: boolean;
diff --git a/apps/web/components/dialog/__tests__/RerouteDialog.test.tsx b/apps/web/components/dialog/__tests__/RerouteDialog.test.tsx
index e5c68d786e9..38e5bf0fa0f 100644
--- a/apps/web/components/dialog/__tests__/RerouteDialog.test.tsx
+++ b/apps/web/components/dialog/__tests__/RerouteDialog.test.tsx
@@ -1,3 +1,4 @@
+import { TooltipProvider } from "@radix-ui/react-tooltip";
import { act, fireEvent, render, screen } from "@testing-library/react";
import { vi } from "vitest";
@@ -321,7 +322,11 @@ describe("RerouteDialog", () => {
});
test("renders the dialog when open", () => {
- render(<RerouteDialog isOpenDialog={true} setIsOpenDialog={mockSetIsOpenDialog} booking={mockBooking} />);
+ render(
+ <TooltipProvider>
+ <RerouteDialog isOpenDialog={true} setIsOpenDialog={mockSetIsOpenDialog} booking={mockBooking} />
+ </TooltipProvider>
+ );
expect(screen.getByText("reroute_booking")).toBeInTheDocument();
expect(screen.getByText("reroute_booking_description")).toBeInTheDocument();
@@ -329,14 +334,20 @@ describe("RerouteDialog", () => {
test("doesn't render the dialog when closed", () => {
render(
- <RerouteDialog isOpenDialog={false} setIsOpenDialog={mockSetIsOpenDialog} booking={mockBooking} />
+ <TooltipProvider>
+ <RerouteDialog isOpenDialog={false} setIsOpenDialog={mockSetIsOpenDialog} booking={mockBooking} />
+ </TooltipProvider>
);
expect(screen.queryByText("reroute_booking")).not.toBeInTheDocument();
});
test("displays current routing status", async () => {
- render(<RerouteDialog isOpenDialog={true} setIsOpenDialog={mockSetIsOpenDialog} booking={mockBooking} />);
+ render(
+ <TooltipProvider>
+ <RerouteDialog isOpenDialog={true} setIsOpenDialog={mockSetIsOpenDialog} booking={mockBooking} />
+ </TooltipProvider>
+ );
expect(screen.getByText("current_routing_status")).toBeInTheDocument();
expectEventTypeInfoInCurrentRouting({
@@ -353,17 +364,29 @@ describe("RerouteDialog", () => {
});
test("verify_new_route button is enabled even when form fields are not filled", async () => {
- render(<RerouteDialog isOpenDialog={true} setIsOpenDialog={mockSetIsOpenDialog} booking={mockBooking} />);
+ render(
+ <TooltipProvider>
+ <RerouteDialog isOpenDialog={true} setIsOpenDialog={mockSetIsOpenDialog} booking={mockBooking} />
+ </TooltipProvider>
+ );
await expect(screen.getByText("verify_new_route")).toBeEnabled();
});
test("disabledFields are passed to FormInputFields with value ['email'] - email field is disabled", async () => {
- render(<RerouteDialog isOpenDialog={true} setIsOpenDialog={mockSetIsOpenDialog} booking={mockBooking} />);
+ render(
+ <TooltipProvider>
+ <RerouteDialog isOpenDialog={true} setIsOpenDialog={mockSetIsOpenDialog} booking={mockBooking} />
+ </TooltipProvider>
+ );
expect(screen.getByTestId("mock-form-field-disabled-fields-identifiers")).toHaveTextContent(/^email$/);
});
test("Expect form fields and name to be rendered", async () => {
- render(<RerouteDialog isOpenDialog={true} setIsOpenDialog={mockSetIsOpenDialog} booking={mockBooking} />);
+ render(
+ <TooltipProvider>
+ <RerouteDialog isOpenDialog={true} setIsOpenDialog={mockSetIsOpenDialog} booking={mockBooking} />
+ </TooltipProvider>
+ );
expect(screen.getByText("Test Form")).toBeInTheDocument();
expect(screen.getByTestId("mock-form-field-company-size-label")).toHaveTextContent("Company Size");
expect(screen.getByTestId("mock-form-field-company-size-value")).toHaveTextContent("small");
@@ -372,7 +395,11 @@ describe("RerouteDialog", () => {
});
test("cancel button closes the dialog", async () => {
- render(<RerouteDialog isOpenDialog={true} setIsOpenDialog={mockSetIsOpenDialog} booking={mockBooking} />);
+ render(
+ <TooltipProvider>
+ <RerouteDialog isOpenDialog={true} setIsOpenDialog={mockSetIsOpenDialog} booking={mockBooking} />
+ </TooltipProvider>
+ );
expect(screen.getByText("cancel")).toBeInTheDocument();
@@ -383,7 +410,9 @@ describe("RerouteDialog", () => {
describe("New Routing tests", () => {
test("when verify_new_route is clicked, the form is submitted", async () => {
render(
- <RerouteDialog isOpenDialog={true} setIsOpenDialog={mockSetIsOpenDialog} booking={mockBooking} />
+ <TooltipProvider>
+ <RerouteDialog isOpenDialog={true} setIsOpenDialog={mockSetIsOpenDialog} booking={mockBooking} />
+ </TooltipProvider>
);
fireEvent.click(screen.getByText("verify_new_route"));
@@ -402,7 +431,9 @@ describe("RerouteDialog", () => {
describe("New tab rescheduling", () => {
test("new tab is closed when new booking is rerouted", async () => {
render(
- <RerouteDialog isOpenDialog={true} setIsOpenDialog={mockSetIsOpenDialog} booking={mockBooking} />
+ <TooltipProvider>
+ <RerouteDialog isOpenDialog={true} setIsOpenDialog={mockSetIsOpenDialog} booking={mockBooking} />
+ </TooltipProvider>
);
clickVerifyNewRouteButton();
clickRescheduleToTheNewEventWithDifferentTimeslotButton();
@@ -441,7 +472,9 @@ describe("RerouteDialog", () => {
test("Rescheduling with same timeslot works", async () => {
render(
- <RerouteDialog isOpenDialog={true} setIsOpenDialog={mockSetIsOpenDialog} booking={mockBooking} />
+ <TooltipProvider>
+ <RerouteDialog isOpenDialog={true} setIsOpenDialog={mockSetIsOpenDialog} booking={mockBooking} />
+ </TooltipProvider>
);
clickVerifyNewRouteButton();
clickRescheduleWithSameTimeslotOfChosenEventButton();
diff --git a/apps/web/components/error/error-page.tsx b/apps/web/components/error/error-page.tsx
index 891e4cb815b..4cb2aa786c6 100644
--- a/apps/web/components/error/error-page.tsx
+++ b/apps/web/components/error/error-page.tsx
@@ -3,7 +3,7 @@
import React from "react";
import { HttpError } from "@calcom/lib/http-error";
-import { Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
type Props = {
statusCode?: number | null;
diff --git a/apps/web/components/getting-started/components/AppConnectionItem.tsx b/apps/web/components/getting-started/components/AppConnectionItem.tsx
index bcdf0513163..52ec496029a 100644
--- a/apps/web/components/getting-started/components/AppConnectionItem.tsx
+++ b/apps/web/components/getting-started/components/AppConnectionItem.tsx
@@ -7,7 +7,10 @@ import { WEBAPP_URL } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
import type { App } from "@calcom/types/App";
-import { Badge, Button, Icon, showToast } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { showToast } from "@calcom/ui/components/toast";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
interface IAppConnectionItem {
title: string;
diff --git a/apps/web/components/getting-started/components/StepConnectionLoader.tsx b/apps/web/components/getting-started/components/StepConnectionLoader.tsx
index 64dae1e62ab..893d5b2eeb5 100644
--- a/apps/web/components/getting-started/components/StepConnectionLoader.tsx
+++ b/apps/web/components/getting-started/components/StepConnectionLoader.tsx
@@ -1,4 +1,4 @@
-import { SkeletonAvatar, SkeletonText, SkeletonButton } from "@calcom/ui";
+import { SkeletonAvatar, SkeletonText, SkeletonButton } from "@calcom/ui/components/skeleton";
export function StepConnectionLoader() {
return (
diff --git a/apps/web/components/getting-started/steps-views/ConnectCalendars.tsx b/apps/web/components/getting-started/steps-views/ConnectCalendars.tsx
index c465e4437a4..cbe5a943a8d 100644
--- a/apps/web/components/getting-started/steps-views/ConnectCalendars.tsx
+++ b/apps/web/components/getting-started/steps-views/ConnectCalendars.tsx
@@ -1,6 +1,7 @@
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Icon, List } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { List } from "@calcom/ui/components/list";
import classNames from "@calcom/ui/classNames";
import { AppConnectionItem } from "../components/AppConnectionItem";
diff --git a/apps/web/components/getting-started/steps-views/ConnectedVideoStep.tsx b/apps/web/components/getting-started/steps-views/ConnectedVideoStep.tsx
index a52e9725f01..0840a796973 100644
--- a/apps/web/components/getting-started/steps-views/ConnectedVideoStep.tsx
+++ b/apps/web/components/getting-started/steps-views/ConnectedVideoStep.tsx
@@ -2,7 +2,8 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { userMetadata } from "@calcom/prisma/zod-utils";
import { trpc } from "@calcom/trpc/react";
import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery";
-import { Icon, List } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { List } from "@calcom/ui/components/list";
import classNames from "@calcom/ui/classNames";
import { AppConnectionItem } from "../components/AppConnectionItem";
diff --git a/apps/web/components/getting-started/steps-views/SetupAvailability.tsx b/apps/web/components/getting-started/steps-views/SetupAvailability.tsx
index e077aa06de0..49c71e86e36 100644
--- a/apps/web/components/getting-started/steps-views/SetupAvailability.tsx
+++ b/apps/web/components/getting-started/steps-views/SetupAvailability.tsx
@@ -5,7 +5,8 @@ import { DEFAULT_SCHEDULE } from "@calcom/lib/availability";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
import type { AppRouter } from "@calcom/trpc/types/server/routers/_app";
-import { Button, Form } from "@calcom/ui";
+import { Form } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
import type { TRPCClientErrorLike } from "@trpc/client";
diff --git a/apps/web/components/getting-started/steps-views/UserProfile.tsx b/apps/web/components/getting-started/steps-views/UserProfile.tsx
index d09d929d617..edfa63946ff 100644
--- a/apps/web/components/getting-started/steps-views/UserProfile.tsx
+++ b/apps/web/components/getting-started/steps-views/UserProfile.tsx
@@ -7,8 +7,12 @@ import { md } from "@calcom/lib/markdownIt";
import { telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
import turndown from "@calcom/lib/turndownService";
import { trpc } from "@calcom/trpc/react";
-import { Button, Editor, ImageUploader, Label, showToast } from "@calcom/ui";
-import { UserAvatar } from "@calcom/ui";
+import { UserAvatar } from "@calcom/ui/components/avatar";
+import { Button } from "@calcom/ui/components/button";
+import { Editor } from "@calcom/ui/components/editor";
+import { Label } from "@calcom/ui/components/form";
+import { ImageUploader } from "@calcom/ui/components/image-uploader";
+import { showToast } from "@calcom/ui/components/toast";
type FormData = {
bio: string;
diff --git a/apps/web/components/getting-started/steps-views/UserSettings.tsx b/apps/web/components/getting-started/steps-views/UserSettings.tsx
index 9b02fe75e74..a016ab7dc77 100644
--- a/apps/web/components/getting-started/steps-views/UserSettings.tsx
+++ b/apps/web/components/getting-started/steps-views/UserSettings.tsx
@@ -10,7 +10,8 @@ import { FULL_NAME_LENGTH_MAX_LIMIT } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
import { trpc } from "@calcom/trpc/react";
-import { Button, Input } from "@calcom/ui";
+import { Input } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
import { UsernameAvailabilityField } from "@components/ui/UsernameAvailability";
diff --git a/apps/web/components/integrations/SubHeadingTitleWithConnections.tsx b/apps/web/components/integrations/SubHeadingTitleWithConnections.tsx
index bc9e4d5a6a1..68a8067d391 100644
--- a/apps/web/components/integrations/SubHeadingTitleWithConnections.tsx
+++ b/apps/web/components/integrations/SubHeadingTitleWithConnections.tsx
@@ -1,6 +1,6 @@
import type { ReactNode } from "react";
-import { Badge } from "@calcom/ui";
+import { Badge } from "@calcom/ui/components/badge";
function pluralize(opts: { num: number; plural: string; singular: string }) {
if (opts.num === 0) {
diff --git a/apps/web/components/security/DisableTwoFactorModal.tsx b/apps/web/components/security/DisableTwoFactorModal.tsx
index 187185b3ed7..76debcfbb2c 100644
--- a/apps/web/components/security/DisableTwoFactorModal.tsx
+++ b/apps/web/components/security/DisableTwoFactorModal.tsx
@@ -3,7 +3,9 @@ import { useForm } from "react-hook-form";
import { ErrorCode } from "@calcom/features/auth/lib/ErrorCode";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, Dialog, DialogContent, Form, PasswordField } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent } from "@calcom/ui/components/dialog";
+import { Form, PasswordField } from "@calcom/ui/components/form";
import TwoFactor from "@components/auth/TwoFactor";
diff --git a/apps/web/components/security/DisableUserImpersonation.tsx b/apps/web/components/security/DisableUserImpersonation.tsx
index e33e1571362..10e856bed15 100644
--- a/apps/web/components/security/DisableUserImpersonation.tsx
+++ b/apps/web/components/security/DisableUserImpersonation.tsx
@@ -1,6 +1,8 @@
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Badge, Button, showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
const DisableUserImpersonation = ({ disableImpersonation }: { disableImpersonation: boolean }) => {
const utils = trpc.useUtils();
diff --git a/apps/web/components/security/EnableTwoFactorModal.tsx b/apps/web/components/security/EnableTwoFactorModal.tsx
index 20b9a89026f..5217021a4f5 100644
--- a/apps/web/components/security/EnableTwoFactorModal.tsx
+++ b/apps/web/components/security/EnableTwoFactorModal.tsx
@@ -5,7 +5,9 @@ import { useForm } from "react-hook-form";
import { ErrorCode } from "@calcom/features/auth/lib/ErrorCode";
import { useCallbackRef } from "@calcom/lib/hooks/useCallbackRef";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, Dialog, DialogContent, Form } from "@calcom/ui";
+import { Form } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent } from "@calcom/ui/components/dialog";
import TwoFactor from "@components/auth/TwoFactor";
diff --git a/apps/web/components/security/TwoFactorAuthSection.tsx b/apps/web/components/security/TwoFactorAuthSection.tsx
index ff9bb4bbee9..59928e33be2 100644
--- a/apps/web/components/security/TwoFactorAuthSection.tsx
+++ b/apps/web/components/security/TwoFactorAuthSection.tsx
@@ -1,7 +1,8 @@
import { useState } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Badge, Button } from "@calcom/ui";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
import DisableTwoFactorModal from "./DisableTwoFactorModal";
import EnableTwoFactorModal from "./EnableTwoFactorModal";
diff --git a/apps/web/components/security/TwoFactorModalHeader.tsx b/apps/web/components/security/TwoFactorModalHeader.tsx
index f1eb8f5a913..60ed8e1241d 100644
--- a/apps/web/components/security/TwoFactorModalHeader.tsx
+++ b/apps/web/components/security/TwoFactorModalHeader.tsx
@@ -1,4 +1,4 @@
-import { Icon } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
const TwoFactorModalHeader = ({ title, description }: { title: string; description: string }) => {
return (
diff --git a/apps/web/components/settings/CustomEmailTextField.tsx b/apps/web/components/settings/CustomEmailTextField.tsx
index 80b72ae1274..9aeb4bb5344 100644
--- a/apps/web/components/settings/CustomEmailTextField.tsx
+++ b/apps/web/components/settings/CustomEmailTextField.tsx
@@ -2,16 +2,16 @@ import { useState } from "react";
import type { UseFormReturn } from "react-hook-form";
import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
import {
- Badge,
Dropdown,
DropdownItem,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
- Button,
- InputError,
-} from "@calcom/ui";
+} from "@calcom/ui/components/dropdown";
+import { InputError } from "@calcom/ui/components/form";
import type { FormValues } from "~/settings/my-account/profile-view";
diff --git a/apps/web/components/settings/DisableTwoFactorModal.tsx b/apps/web/components/settings/DisableTwoFactorModal.tsx
index 46d49ce62aa..b10808e2add 100644
--- a/apps/web/components/settings/DisableTwoFactorModal.tsx
+++ b/apps/web/components/settings/DisableTwoFactorModal.tsx
@@ -3,7 +3,9 @@ import { useForm } from "react-hook-form";
import { ErrorCode } from "@calcom/features/auth/lib/ErrorCode";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, Dialog, DialogContent, DialogFooter, Form, PasswordField } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter } from "@calcom/ui/components/dialog";
+import { Form, PasswordField } from "@calcom/ui/components/form";
import BackupCode from "@components/auth/BackupCode";
import TwoFactor from "@components/auth/TwoFactor";
diff --git a/apps/web/components/settings/EnableTwoFactorModal.tsx b/apps/web/components/settings/EnableTwoFactorModal.tsx
index ea169c2b2de..290f4287047 100644
--- a/apps/web/components/settings/EnableTwoFactorModal.tsx
+++ b/apps/web/components/settings/EnableTwoFactorModal.tsx
@@ -5,7 +5,10 @@ import { useForm } from "react-hook-form";
import { ErrorCode } from "@calcom/features/auth/lib/ErrorCode";
import { useCallbackRef } from "@calcom/lib/hooks/useCallbackRef";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, Dialog, DialogContent, DialogFooter, Form, PasswordField, showToast } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter } from "@calcom/ui/components/dialog";
+import { Form, PasswordField } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
import TwoFactor from "@components/auth/TwoFactor";
diff --git a/apps/web/components/settings/SecondaryEmailConfirmModal.tsx b/apps/web/components/settings/SecondaryEmailConfirmModal.tsx
index 6ba0dcd955d..38e40c94953 100644
--- a/apps/web/components/settings/SecondaryEmailConfirmModal.tsx
+++ b/apps/web/components/settings/SecondaryEmailConfirmModal.tsx
@@ -1,7 +1,7 @@
import { Trans } from "react-i18next";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Dialog, DialogClose, DialogContent, DialogFooter } from "@calcom/ui";
+import { Dialog, DialogContent, DialogFooter, DialogClose } from "@calcom/ui/components/dialog";
interface SecondaryEmailConfirmModalProps {
email: string;
diff --git a/apps/web/components/settings/SecondaryEmailModal.tsx b/apps/web/components/settings/SecondaryEmailModal.tsx
index 698d70cd8e4..8f9ac3354ae 100644
--- a/apps/web/components/settings/SecondaryEmailModal.tsx
+++ b/apps/web/components/settings/SecondaryEmailModal.tsx
@@ -5,16 +5,9 @@ import { z } from "zod";
import { emailSchema } from "@calcom/lib/emailSchema";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import {
- Dialog,
- DialogContent,
- DialogFooter,
- DialogClose,
- Button,
- TextField,
- Form,
- InputError,
-} from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogClose } from "@calcom/ui/components/dialog";
+import { Form, TextField, InputError } from "@calcom/ui/components/form";
interface SecondaryEmailModalProps {
isLoading: boolean;
diff --git a/apps/web/components/settings/TravelScheduleModal.tsx b/apps/web/components/settings/TravelScheduleModal.tsx
index 527ac9db43b..ee54655f5eb 100644
--- a/apps/web/components/settings/TravelScheduleModal.tsx
+++ b/apps/web/components/settings/TravelScheduleModal.tsx
@@ -5,17 +5,9 @@ import dayjs from "@calcom/dayjs";
import { useTimePreferences } from "@calcom/features/bookings/lib/timePreferences";
import { TimezoneSelect } from "@calcom/features/components/timezone-select";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import {
- Dialog,
- DialogContent,
- DialogFooter,
- DialogClose,
- Button,
- Label,
- DateRangePicker,
- SettingsToggle,
- DatePicker,
-} from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogClose } from "@calcom/ui/components/dialog";
+import { Label, SettingsToggle, DateRangePicker, DatePicker } from "@calcom/ui/components/form";
import type { FormValues } from "~/settings/my-account/general-view";
diff --git a/apps/web/components/settings/platform/dashboard/HelpCards.tsx b/apps/web/components/settings/platform/dashboard/HelpCards.tsx
index e5b8db6cad3..2e9aaad2f15 100644
--- a/apps/web/components/settings/platform/dashboard/HelpCards.tsx
+++ b/apps/web/components/settings/platform/dashboard/HelpCards.tsx
@@ -1,4 +1,5 @@
-import { Card, Icon } from "@calcom/ui";
+import { Card } from "@calcom/ui/components/card";
+import { Icon } from "@calcom/ui/components/icon";
import { helpCards } from "@lib/settings/platform/utils";
diff --git a/apps/web/components/settings/platform/dashboard/NoPlatformPlan.tsx b/apps/web/components/settings/platform/dashboard/NoPlatformPlan.tsx
index 8daa38447d9..2cb50519e9f 100644
--- a/apps/web/components/settings/platform/dashboard/NoPlatformPlan.tsx
+++ b/apps/web/components/settings/platform/dashboard/NoPlatformPlan.tsx
@@ -1,5 +1,6 @@
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { EmptyScreen, Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
export default function NoPlatformPlan() {
const { t } = useLocale();
diff --git a/apps/web/components/settings/platform/dashboard/oauth-clients-list/index.tsx b/apps/web/components/settings/platform/dashboard/oauth-clients-list/index.tsx
index f5a84d89cde..6dae578f6fe 100644
--- a/apps/web/components/settings/platform/dashboard/oauth-clients-list/index.tsx
+++ b/apps/web/components/settings/platform/dashboard/oauth-clients-list/index.tsx
@@ -1,7 +1,8 @@
import { useRouter } from "next/navigation";
import type { PlatformOAuthClientDto } from "@calcom/platform-types";
-import { EmptyScreen, Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
import { OAuthClientCard } from "@components/settings/platform/oauth-clients/OAuthClientCard";
diff --git a/apps/web/components/settings/platform/oauth-clients/OAuthClientCard.tsx b/apps/web/components/settings/platform/oauth-clients/OAuthClientCard.tsx
index 3ec156d9df4..8bf330d6584 100644
--- a/apps/web/components/settings/platform/oauth-clients/OAuthClientCard.tsx
+++ b/apps/web/components/settings/platform/oauth-clients/OAuthClientCard.tsx
@@ -4,7 +4,9 @@ import React from "react";
import type { PERMISSION_MAP } from "@calcom/platform-constants";
import { PERMISSIONS_GROUPED_MAP } from "@calcom/platform-constants";
import type { Avatar } from "@calcom/prisma/client";
-import { Button, Icon, showToast } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { showToast } from "@calcom/ui/components/toast";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
type OAuthClientCardProps = {
diff --git a/apps/web/components/settings/platform/oauth-clients/oauth-client-form/index.tsx b/apps/web/components/settings/platform/oauth-clients/oauth-client-form/index.tsx
index af01faefa85..7eda3671e8f 100644
--- a/apps/web/components/settings/platform/oauth-clients/oauth-client-form/index.tsx
+++ b/apps/web/components/settings/platform/oauth-clients/oauth-client-form/index.tsx
@@ -3,7 +3,10 @@ import { useForm, useFieldArray } from "react-hook-form";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { PERMISSIONS_GROUPED_MAP } from "@calcom/platform-constants/permissions";
-import { TextField, Tooltip, Button, Label, Icon } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Label, TextField } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { Tooltip } from "@calcom/ui/components/tooltip";
type OAuthClientFormProps = {
defaultValues?: Partial<FormValues>;
diff --git a/apps/web/components/settings/platform/pricing/billing-card/index.tsx b/apps/web/components/settings/platform/pricing/billing-card/index.tsx
index b3dff623c87..34e77738388 100644
--- a/apps/web/components/settings/platform/pricing/billing-card/index.tsx
+++ b/apps/web/components/settings/platform/pricing/billing-card/index.tsx
@@ -1,4 +1,4 @@
-import { Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
type PlatformBillingCardProps = {
plan: string;
diff --git a/apps/web/components/settings/platform/pricing/platform-pricing/index.tsx b/apps/web/components/settings/platform/pricing/platform-pricing/index.tsx
index e0a58206081..0c76cef1303 100644
--- a/apps/web/components/settings/platform/pricing/platform-pricing/index.tsx
+++ b/apps/web/components/settings/platform/pricing/platform-pricing/index.tsx
@@ -3,7 +3,7 @@ import { usePathname } from "next/navigation";
import type { ReactNode } from "react";
import { ErrorCode } from "@calcom/lib/errorCodes";
-import { showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
import { useSubscribeTeamToStripe } from "@lib/hooks/settings/platform/billing/useSubscribeTeamToStripe";
import { useUpgradeTeamSubscriptionInStripe } from "@lib/hooks/settings/platform/billing/useUpgradeTeamSubscriptionInStripe";
diff --git a/apps/web/components/setup/AdminUser.tsx b/apps/web/components/setup/AdminUser.tsx
index 4ee17246989..299aa855da0 100644
--- a/apps/web/components/setup/AdminUser.tsx
+++ b/apps/web/components/setup/AdminUser.tsx
@@ -9,7 +9,8 @@ import { isPasswordValid } from "@calcom/features/auth/lib/isPasswordValid";
import { WEBSITE_URL } from "@calcom/lib/constants";
import { emailRegex } from "@calcom/lib/emailSchema";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { EmailField, EmptyScreen, Label, PasswordField, TextField } from "@calcom/ui";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+import { EmailField, Label, TextField, PasswordField } from "@calcom/ui/components/form";
export const AdminUserContainer = (props: React.ComponentProps<typeof AdminUser> & { userCount: number }) => {
const { t } = useLocale();
diff --git a/apps/web/components/setup/EnterpriseLicense.tsx b/apps/web/components/setup/EnterpriseLicense.tsx
index 24ba9eeb9b9..98c6f0a96c7 100644
--- a/apps/web/components/setup/EnterpriseLicense.tsx
+++ b/apps/web/components/setup/EnterpriseLicense.tsx
@@ -9,9 +9,10 @@ import { CONSOLE_URL } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterInputs, RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
-import { Button, TextField } from "@calcom/ui";
-import { Icon } from "@calcom/ui";
+import { TextField } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
+import { Icon } from "@calcom/ui/components/icon";
type EnterpriseLicenseFormValues = {
licenseKey: string;
diff --git a/apps/web/components/setup/StepDone.tsx b/apps/web/components/setup/StepDone.tsx
index 2e93ca77829..068c6d5714e 100644
--- a/apps/web/components/setup/StepDone.tsx
+++ b/apps/web/components/setup/StepDone.tsx
@@ -2,7 +2,7 @@ import { useRouter } from "next/navigation";
import type { Dispatch, SetStateAction } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Icon } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
const StepDone = (props: {
currentStep: number;
diff --git a/apps/web/components/team/screens/Team.tsx b/apps/web/components/team/screens/Team.tsx
index f7743e8a6f1..78b00ffc728 100644
--- a/apps/web/components/team/screens/Team.tsx
+++ b/apps/web/components/team/screens/Team.tsx
@@ -5,7 +5,7 @@ import { useRouterQuery } from "@calcom/lib/hooks/useRouterQuery";
import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
import type { TeamWithMembers } from "@calcom/lib/server/queries/teams";
import type { UserProfile } from "@calcom/types/UserProfile";
-import { UserAvatar } from "@calcom/ui";
+import { UserAvatar } from "@calcom/ui/components/avatar";
type TeamType = Omit<NonNullable<TeamWithMembers>, "inviteToken">;
type MembersType = TeamType["members"];
diff --git a/apps/web/components/ui/AuthContainer.tsx b/apps/web/components/ui/AuthContainer.tsx
index d1714c63a99..0fd2f6f5be6 100644
--- a/apps/web/components/ui/AuthContainer.tsx
+++ b/apps/web/components/ui/AuthContainer.tsx
@@ -1,6 +1,6 @@
import classNames from "classnames";
-import { Logo } from "@calcom/ui";
+import { Logo } from "@calcom/ui/components/logo";
import Loader from "@components/Loader";
diff --git a/apps/web/components/ui/LinkIconButton.tsx b/apps/web/components/ui/LinkIconButton.tsx
index a4eab725100..f4fc12324de 100644
--- a/apps/web/components/ui/LinkIconButton.tsx
+++ b/apps/web/components/ui/LinkIconButton.tsx
@@ -1,6 +1,6 @@
import React from "react";
-import { Icon } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
interface LinkIconButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
Icon: React.ComponentProps<typeof Icon>["name"];
diff --git a/apps/web/components/ui/ModalContainer.tsx b/apps/web/components/ui/ModalContainer.tsx
index 09fe96db6d0..6110003f8d4 100644
--- a/apps/web/components/ui/ModalContainer.tsx
+++ b/apps/web/components/ui/ModalContainer.tsx
@@ -2,7 +2,7 @@ import classNames from "classnames";
import type { PropsWithChildren } from "react";
import React from "react";
-import { Dialog, DialogContent } from "@calcom/ui";
+import { Dialog, DialogContent } from "@calcom/ui/components/dialog";
export default function ModalContainer(
props: PropsWithChildren<{
diff --git a/apps/web/components/ui/UsernameAvailability/PremiumTextfield.tsx b/apps/web/components/ui/UsernameAvailability/PremiumTextfield.tsx
index 63ac64022b2..f9c86cef679 100644
--- a/apps/web/components/ui/UsernameAvailability/PremiumTextfield.tsx
+++ b/apps/web/components/ui/UsernameAvailability/PremiumTextfield.tsx
@@ -15,8 +15,10 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
import type { AppRouter } from "@calcom/trpc/types/server/routers/_app";
-import { Button, Dialog, DialogClose, DialogContent, DialogFooter, Input, Label } from "@calcom/ui";
-import { Icon } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogClose } from "@calcom/ui/components/dialog";
+import { Label, Input } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
import type { TRPCClientErrorLike } from "@trpc/client";
diff --git a/apps/web/components/ui/UsernameAvailability/UsernameTextfield.tsx b/apps/web/components/ui/UsernameAvailability/UsernameTextfield.tsx
index 47502be4b8d..9a63b6edeee 100644
--- a/apps/web/components/ui/UsernameAvailability/UsernameTextfield.tsx
+++ b/apps/web/components/ui/UsernameAvailability/UsernameTextfield.tsx
@@ -10,8 +10,11 @@ import { useDebounce } from "@calcom/lib/hooks/useDebounce";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
import type { AppRouter } from "@calcom/trpc/types/server/routers/_app";
-import { Button, Dialog, DialogClose, DialogContent, TextField, DialogFooter, Tooltip } from "@calcom/ui";
-import { Icon } from "@calcom/ui";
+import { Tooltip } from "@calcom/ui/components/tooltip";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogClose } from "@calcom/ui/components/dialog";
+import { TextField } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
import type { TRPCClientErrorLike } from "@trpc/client";
diff --git a/apps/web/components/ui/form/CheckedSelect.tsx b/apps/web/components/ui/form/CheckedSelect.tsx
index fc47b79c571..a8ed41ddc20 100644
--- a/apps/web/components/ui/form/CheckedSelect.tsx
+++ b/apps/web/components/ui/form/CheckedSelect.tsx
@@ -3,8 +3,8 @@ import type { Props } from "react-select";
import Select from "@calcom/features/form/components/Select";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Avatar } from "@calcom/ui";
-import { Icon } from "@calcom/ui";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Icon } from "@calcom/ui/components/icon";
type CheckedSelectOption = {
avatar: string;
diff --git a/apps/web/components/ui/form/DatePicker.tsx b/apps/web/components/ui/form/DatePicker.tsx
index ece13861a48..b7c68de4b83 100644
--- a/apps/web/components/ui/form/DatePicker.tsx
+++ b/apps/web/components/ui/form/DatePicker.tsx
@@ -3,7 +3,7 @@ import "react-calendar/dist/Calendar.css";
import "react-date-picker/dist/DatePicker.css";
import PrimitiveDatePicker from "react-date-picker/dist/entry.nostyle";
-import { Icon } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
import classNames from "@calcom/ui/classNames";
type Props = {
diff --git a/apps/web/lib/QueryCell.tsx b/apps/web/lib/QueryCell.tsx
index cfc2fbbb5f2..26af5b95118 100644
--- a/apps/web/lib/QueryCell.tsx
+++ b/apps/web/lib/QueryCell.tsx
@@ -8,7 +8,8 @@ import type {
import type { ReactNode } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Alert, Loader } from "@calcom/ui";
+import { Alert } from "@calcom/ui/components/alert";
+import { Loader } from "@calcom/ui/components/skeleton";
type ErrorLike = {
message: string;
diff --git a/apps/web/lib/settings/platform/utils.ts b/apps/web/lib/settings/platform/utils.ts
index f3093835e2c..f91b67ec60b 100644
--- a/apps/web/lib/settings/platform/utils.ts
+++ b/apps/web/lib/settings/platform/utils.ts
@@ -1,4 +1,4 @@
-import type { IconName } from "@calcom/ui";
+import type { IconName } from "@calcom/ui/components/icon";
type IndividualPlatformPlan = {
plan: string;
diff --git a/apps/web/modules/apps/[slug]/slug-view.tsx b/apps/web/modules/apps/[slug]/slug-view.tsx
index b0faacc283b..3de5c44d333 100644
--- a/apps/web/modules/apps/[slug]/slug-view.tsx
+++ b/apps/web/modules/apps/[slug]/slug-view.tsx
@@ -5,7 +5,7 @@ import Link from "next/link";
import { IS_PRODUCTION } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
-import { showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
import type { AppDataProps } from "@lib/apps/[slug]/getStaticProps";
import useRouterQuery from "@lib/hooks/useRouterQuery";
diff --git a/apps/web/modules/apps/apps-view.tsx b/apps/web/modules/apps/apps-view.tsx
index 962507014d3..aa1293f2e90 100644
--- a/apps/web/modules/apps/apps-view.tsx
+++ b/apps/web/modules/apps/apps-view.tsx
@@ -9,10 +9,11 @@ import { PopularAppsSlider } from "@calcom/features/apps/components/PopularAppsS
import { RecentAppsSlider } from "@calcom/features/apps/components/RecentAppsSlider";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { inferSSRProps } from "@calcom/types/inferSSRProps";
-import type { HorizontalTabItemProps } from "@calcom/ui";
-import { HorizontalTabs, TextField } from "@calcom/ui";
-import { Icon } from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { TextField } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import type { HorizontalTabItemProps } from "@calcom/ui/components/navigation";
+import { HorizontalTabs } from "@calcom/ui/components/navigation";
import { type getServerSideProps } from "@lib/apps/getServerSideProps";
diff --git a/apps/web/modules/apps/categories/[category]/category-view.tsx b/apps/web/modules/apps/categories/[category]/category-view.tsx
index 8bbab69f244..88dcdb7763d 100644
--- a/apps/web/modules/apps/categories/[category]/category-view.tsx
+++ b/apps/web/modules/apps/categories/[category]/category-view.tsx
@@ -5,7 +5,7 @@ import Link from "next/link";
import { AppCard } from "@calcom/features/apps/components/AppCard";
import Shell from "@calcom/features/shell/Shell";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { SkeletonText } from "@calcom/ui";
+import { SkeletonText } from "@calcom/ui/components/skeleton";
import type { CategoryDataProps } from "@lib/apps/categories/[category]/getStaticProps";
diff --git a/apps/web/modules/apps/categories/categories-view.tsx b/apps/web/modules/apps/categories/categories-view.tsx
index 88ab7b9c18b..6ec6caad56a 100644
--- a/apps/web/modules/apps/categories/categories-view.tsx
+++ b/apps/web/modules/apps/categories/categories-view.tsx
@@ -5,7 +5,8 @@ import Link from "next/link";
import Shell from "@calcom/features/shell/Shell";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { inferSSRProps } from "@calcom/types/inferSSRProps";
-import { Icon, SkeletonText } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { SkeletonText } from "@calcom/ui/components/skeleton";
import type { getServerSideProps } from "@lib/apps/categories/getServerSideProps";
diff --git a/apps/web/modules/apps/installation/[[...step]]/step-view.tsx b/apps/web/modules/apps/installation/[[...step]]/step-view.tsx
index a00d8bb5060..0e5cd1f9338 100644
--- a/apps/web/modules/apps/installation/[[...step]]/step-view.tsx
+++ b/apps/web/modules/apps/installation/[[...step]]/step-view.tsx
@@ -21,7 +21,8 @@ import { eventTypeMetaDataSchemaWithTypedApps } from "@calcom/prisma/zod-utils";
import type { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
import { trpc } from "@calcom/trpc/react";
import type { AppMeta } from "@calcom/types/App";
-import { Form, Steps, showToast } from "@calcom/ui";
+import { Form, Steps } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
import { HttpError } from "@lib/core/http/error";
diff --git a/apps/web/modules/apps/installed/[category]/installed-category-view.tsx b/apps/web/modules/apps/installed/[category]/installed-category-view.tsx
index 479ada66703..a2a83b6879c 100644
--- a/apps/web/modules/apps/installed/[category]/installed-category-view.tsx
+++ b/apps/web/modules/apps/installed/[category]/installed-category-view.tsx
@@ -12,8 +12,11 @@ import type { BulkUpdatParams } from "@calcom/features/eventtypes/components/Bul
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { AppCategories } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
-import type { Icon } from "@calcom/ui";
-import { Button, EmptyScreen, ShellSubHeading, showToast } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+import type { Icon } from "@calcom/ui/components/icon";
+import { ShellSubHeading } from "@calcom/ui/components/layout";
+import { showToast } from "@calcom/ui/components/toast";
import { QueryCell } from "@lib/QueryCell";
diff --git a/apps/web/modules/auth/forgot-password/[id]/forgot-password-single-view.tsx b/apps/web/modules/auth/forgot-password/[id]/forgot-password-single-view.tsx
index df3e37d7ec1..0fb70af953c 100644
--- a/apps/web/modules/auth/forgot-password/[id]/forgot-password-single-view.tsx
+++ b/apps/web/modules/auth/forgot-password/[id]/forgot-password-single-view.tsx
@@ -6,7 +6,9 @@ import { useForm } from "react-hook-form";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { inferSSRProps } from "@calcom/types/inferSSRProps";
-import { Button, PasswordField, Form } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Form } from "@calcom/ui/components/form";
+import { PasswordField } from "@calcom/ui/components/form";
import AuthContainer from "@components/ui/AuthContainer";
diff --git a/apps/web/modules/auth/forgot-password/forgot-password-view.tsx b/apps/web/modules/auth/forgot-password/forgot-password-view.tsx
index 7ab3e5c7bac..e58b4d1b7f2 100644
--- a/apps/web/modules/auth/forgot-password/forgot-password-view.tsx
+++ b/apps/web/modules/auth/forgot-password/forgot-password-view.tsx
@@ -7,7 +7,8 @@ import type { CSSProperties, SyntheticEvent } from "react";
import React from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, EmailField } from "@calcom/ui";
+import { EmailField } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
import AuthContainer from "@components/ui/AuthContainer";
diff --git a/apps/web/modules/auth/login-view.tsx b/apps/web/modules/auth/login-view.tsx
index 23e6640081f..22c754219d2 100644
--- a/apps/web/modules/auth/login-view.tsx
+++ b/apps/web/modules/auth/login-view.tsx
@@ -19,7 +19,10 @@ import { useLastUsed, LastUsed } from "@calcom/lib/hooks/useLastUsed";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { collectPageParameters, telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
import { trpc } from "@calcom/trpc/react";
-import { Alert, Button, EmailField, PasswordField } from "@calcom/ui";
+import { EmailField } from "@calcom/ui/components/form";
+import { Alert } from "@calcom/ui/components/alert";
+import { Button } from "@calcom/ui/components/button";
+import { PasswordField } from "@calcom/ui/components/form";
import type { inferSSRProps } from "@lib/types/inferSSRProps";
import type { WithNonceProps } from "@lib/withNonce";
@@ -180,7 +183,7 @@ PageProps & WithNonceProps<{}>) {
: isSAMLLoginEnabled && !isPending && data?.connectionExists;
return (
- <div className="dark:bg-brand dark:text-brand-contrast text-emphasis min-h-screen [--cal-brand-emphasis:#101010] [--cal-brand-subtle:#9CA3AF] [--cal-brand-text:white] [--cal-brand:#111827] dark:[--cal-brand-emphasis:#e1e1e1] dark:[--cal-brand-text:black] dark:[--cal-brand:white]">
+ <div className="dark:bg-brand dark:text-brand-contrast text-emphasis min-h-screen [--cal-brand:#111827] [--cal-brand-subtle:#9CA3AF] [--cal-brand-emphasis:#101010] [--cal-brand-text:white] dark:[--cal-brand-emphasis:#e1e1e1] dark:[--cal-brand-text:black] dark:[--cal-brand:white]">
<AuthContainer
showLogo
heading={twoFactorRequired ? t("2fa_code") : t("welcome_back")}
diff --git a/apps/web/modules/auth/logout-view.tsx b/apps/web/modules/auth/logout-view.tsx
index feee4777e0a..7664ffdf3c9 100644
--- a/apps/web/modules/auth/logout-view.tsx
+++ b/apps/web/modules/auth/logout-view.tsx
@@ -7,8 +7,8 @@ import { useEffect, useState } from "react";
import { WEBSITE_URL } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button } from "@calcom/ui";
-import { Icon } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Icon } from "@calcom/ui/components/icon";
import AuthContainer from "@components/ui/AuthContainer";
diff --git a/apps/web/modules/auth/oauth2/authorize-view.tsx b/apps/web/modules/auth/oauth2/authorize-view.tsx
index 61efe7eec78..945fac9f23f 100644
--- a/apps/web/modules/auth/oauth2/authorize-view.tsx
+++ b/apps/web/modules/auth/oauth2/authorize-view.tsx
@@ -9,7 +9,10 @@ import { APP_NAME } from "@calcom/lib/constants";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Avatar, Button, Icon, Select } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { Select } from "@calcom/ui/components/form";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Button } from "@calcom/ui/components/button";
export default function Authorize() {
const { t } = useLocale();
diff --git a/apps/web/modules/auth/platform/authorize-view.tsx b/apps/web/modules/auth/platform/authorize-view.tsx
index 6a5739d2a70..35128b05151 100644
--- a/apps/web/modules/auth/platform/authorize-view.tsx
+++ b/apps/web/modules/auth/platform/authorize-view.tsx
@@ -6,7 +6,9 @@ import { APP_NAME } from "@calcom/lib/constants";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { PERMISSIONS_GROUPED_MAP } from "@calcom/platform-constants/permissions";
-import { Avatar, Button, Icon } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Button } from "@calcom/ui/components/button";
import { hasPermission } from "../../../../../packages/platform/utils/permissions";
diff --git a/apps/web/modules/auth/setup-view.tsx b/apps/web/modules/auth/setup-view.tsx
index 7eed32f2248..7943640321d 100644
--- a/apps/web/modules/auth/setup-view.tsx
+++ b/apps/web/modules/auth/setup-view.tsx
@@ -8,7 +8,7 @@ import { APP_NAME } from "@calcom/lib/constants";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { inferSSRProps } from "@calcom/types/inferSSRProps";
-import { WizardForm } from "@calcom/ui";
+import { WizardForm } from "@calcom/ui/components/form";
import { AdminUserContainer as AdminUser } from "@components/setup/AdminUser";
import ChooseLicense from "@components/setup/ChooseLicense";
diff --git a/apps/web/modules/auth/signin-view.tsx b/apps/web/modules/auth/signin-view.tsx
index eb516937903..dd16087a8c1 100644
--- a/apps/web/modules/auth/signin-view.tsx
+++ b/apps/web/modules/auth/signin-view.tsx
@@ -3,7 +3,7 @@
import { signIn } from "next-auth/react";
import type { inferSSRProps } from "@calcom/types/inferSSRProps";
-import { Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
import type { getServerSideProps } from "@server/lib/auth/signin/getServerSideProps";
diff --git a/apps/web/modules/auth/verify-email-change-view.tsx b/apps/web/modules/auth/verify-email-change-view.tsx
index 2559eae346a..e05296b2e17 100644
--- a/apps/web/modules/auth/verify-email-change-view.tsx
+++ b/apps/web/modules/auth/verify-email-change-view.tsx
@@ -8,7 +8,7 @@ import { Toaster } from "sonner";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { inferSSRProps } from "@calcom/types/inferSSRProps";
-import { showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
import type { getServerSideProps } from "@server/lib/auth/verify-email-change/getServerSideProps";
diff --git a/apps/web/modules/auth/verify-email-view.tsx b/apps/web/modules/auth/verify-email-view.tsx
index 69ffd27750b..5ce1474139c 100644
--- a/apps/web/modules/auth/verify-email-view.tsx
+++ b/apps/web/modules/auth/verify-email-view.tsx
@@ -8,7 +8,9 @@ import { APP_NAME } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc";
import useEmailVerifyCheck from "@calcom/trpc/react/hooks/useEmailVerifyCheck";
-import { Button, EmptyScreen, showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
+import { Button } from "@calcom/ui/components/button";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
function VerifyEmailPage() {
const { data } = useEmailVerifyCheck();
diff --git a/apps/web/modules/auth/verify-view.tsx b/apps/web/modules/auth/verify-view.tsx
index e29e1e2359c..bf3f5fc95d0 100644
--- a/apps/web/modules/auth/verify-view.tsx
+++ b/apps/web/modules/auth/verify-view.tsx
@@ -10,9 +10,10 @@ import { WEBAPP_URL } from "@calcom/lib/constants";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useRouterQuery } from "@calcom/lib/hooks/useRouterQuery";
import { trpc } from "@calcom/trpc/react";
-import { Button, showToast } from "@calcom/ui";
-import { Icon } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
+import { Icon } from "@calcom/ui/components/icon";
import Loader from "@components/Loader";
diff --git a/apps/web/modules/availability/[schedule]/schedule-view.tsx b/apps/web/modules/availability/[schedule]/schedule-view.tsx
index 5a54637897b..4d91fce7776 100644
--- a/apps/web/modules/availability/[schedule]/schedule-view.tsx
+++ b/apps/web/modules/availability/[schedule]/schedule-view.tsx
@@ -13,7 +13,7 @@ import type { ScheduleRepository } from "@calcom/lib/server/repository/schedule"
import type { TravelScheduleRepository } from "@calcom/lib/server/repository/travelSchedule";
import { trpc } from "@calcom/trpc/react";
import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery";
-import { showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
type PageProps = {
scheduleFetched?: Awaited<ReturnType<typeof ScheduleRepository.findDetailedScheduleById>>;
diff --git a/apps/web/modules/availability/availability-view.tsx b/apps/web/modules/availability/availability-view.tsx
index 300b2ec8e1e..e5f212d7fdf 100644
--- a/apps/web/modules/availability/availability-view.tsx
+++ b/apps/web/modules/availability/availability-view.tsx
@@ -17,7 +17,9 @@ import type { OrganizationRepository } from "@calcom/lib/server/repository/organ
import { MembershipRole } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery";
-import { EmptyScreen, showToast, ToggleGroup } from "@calcom/ui";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+import { ToggleGroup } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
export function AvailabilityList() {
const { t } = useLocale();
diff --git a/apps/web/modules/availability/troubleshoot/troubleshoot-view.tsx b/apps/web/modules/availability/troubleshoot/troubleshoot-view.tsx
index 9d4971d3258..c1207f22620 100644
--- a/apps/web/modules/availability/troubleshoot/troubleshoot-view.tsx
+++ b/apps/web/modules/availability/troubleshoot/troubleshoot-view.tsx
@@ -3,7 +3,7 @@
import dynamic from "next/dynamic";
import { Suspense } from "react";
-import { Loader } from "@calcom/ui";
+import { Loader } from "@calcom/ui/components/skeleton";
const TroubleshooterClientOnly = dynamic(
() => import("@calcom/features/troubleshooter/Troubleshooter").then((mod) => mod.Troubleshooter),
diff --git a/apps/web/modules/bookings/views/booking-dry-run-success-view.tsx b/apps/web/modules/bookings/views/booking-dry-run-success-view.tsx
index 3e319b52509..bdc83e922ea 100644
--- a/apps/web/modules/bookings/views/booking-dry-run-success-view.tsx
+++ b/apps/web/modules/bookings/views/booking-dry-run-success-view.tsx
@@ -1,7 +1,7 @@
"use client";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Icon } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
export default function DryRunSuccessful() {
const { t } = useLocale();
diff --git a/apps/web/modules/bookings/views/bookings-listing-view.tsx b/apps/web/modules/bookings/views/bookings-listing-view.tsx
index 6fe13a20dcb..f5992b5cb4d 100644
--- a/apps/web/modules/bookings/views/bookings-listing-view.tsx
+++ b/apps/web/modules/bookings/views/bookings-listing-view.tsx
@@ -19,8 +19,11 @@ import {
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
-import type { HorizontalTabItemProps, VerticalTabItemProps } from "@calcom/ui";
-import { Alert, EmptyScreen, HorizontalTabs } from "@calcom/ui";
+import { Alert } from "@calcom/ui/components/alert";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+import type { HorizontalTabItemProps } from "@calcom/ui/components/navigation";
+import { HorizontalTabs } from "@calcom/ui/components/navigation";
+import type { VerticalTabItemProps } from "@calcom/ui/components/navigation";
import useMeQuery from "@lib/hooks/useMeQuery";
diff --git a/apps/web/modules/bookings/views/bookings-single-view.tsx b/apps/web/modules/bookings/views/bookings-single-view.tsx
index 5845211c0a7..b09c6005926 100644
--- a/apps/web/modules/bookings/views/bookings-single-view.tsx
+++ b/apps/web/modules/bookings/views/bookings-single-view.tsx
@@ -49,18 +49,15 @@ import { localStorage } from "@calcom/lib/webstorage";
import { BookingStatus, SchedulingType } from "@calcom/prisma/enums";
import { bookingMetadataSchema, eventTypeMetaDataSchemaWithTypedApps } from "@calcom/prisma/zod-utils";
import { trpc } from "@calcom/trpc/react";
-import {
- Alert,
- Avatar,
- Badge,
- Button,
- EmailInput,
- useCalcomTheme,
- TextArea,
- showToast,
- EmptyScreen,
- Icon,
-} from "@calcom/ui";
+import { Alert } from "@calcom/ui/components/alert";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+import { EmailInput, TextArea } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { showToast } from "@calcom/ui/components/toast";
+import { useCalcomTheme } from "@calcom/ui/styles";
import CancelBooking from "@calcom/web/components/booking/CancelBooking";
import EventReservationSchema from "@calcom/web/components/schemas/EventReservationSchema";
import { timeZone } from "@calcom/web/lib/clock";
diff --git a/apps/web/modules/connect-and-join/connect-and-join-view.tsx b/apps/web/modules/connect-and-join/connect-and-join-view.tsx
index 16a55dde920..afaf9773afd 100644
--- a/apps/web/modules/connect-and-join/connect-and-join-view.tsx
+++ b/apps/web/modules/connect-and-join/connect-and-join-view.tsx
@@ -10,7 +10,9 @@ import { getQueryParam } from "@calcom/features/bookings/Booker/utils/query-para
import { WEBAPP_URL } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc";
-import { Button, EmptyScreen, Alert } from "@calcom/ui";
+import { Alert } from "@calcom/ui/components/alert";
+import { Button } from "@calcom/ui/components/button";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
import { TRPCClientError } from "@trpc/client";
diff --git a/apps/web/modules/event-types/views/event-types-listing-view.tsx b/apps/web/modules/event-types/views/event-types-listing-view.tsx
index 314c7f1e601..b9df28b7a7f 100644
--- a/apps/web/modules/event-types/views/event-types-listing-view.tsx
+++ b/apps/web/modules/event-types/views/event-types-listing-view.tsx
@@ -33,13 +33,15 @@ import type { MembershipRole } from "@calcom/prisma/enums";
import { SchedulingType } from "@calcom/prisma/enums";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
+import classNames from "@calcom/ui/classNames";
+import { Alert } from "@calcom/ui/components/alert";
+import { ArrowButton } from "@calcom/ui/components/arrow-button";
+import { UserAvatarGroup } from "@calcom/ui/components/avatar";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
+import { Dialog, ConfirmationDialogContent } from "@calcom/ui/components/dialog";
import {
- Alert,
- Badge,
- Button,
- ButtonGroup,
- ConfirmationDialogContent,
- Dialog,
Dropdown,
DropdownItem,
DropdownMenuContent,
@@ -47,19 +49,16 @@ import {
DropdownMenuPortal,
DropdownMenuSeparator,
DropdownMenuTrigger,
- EmptyScreen,
- HorizontalTabs,
- Icon,
- Label,
- showToast,
- Skeleton,
- Switch,
- TextField,
- Tooltip,
- ArrowButton,
- UserAvatarGroup,
-} from "@calcom/ui";
-import classNames from "@calcom/ui/classNames";
+} from "@calcom/ui/components/dropdown";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+import { Label } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { Switch } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { HorizontalTabs } from "@calcom/ui/components/navigation";
+import { Skeleton } from "@calcom/ui/components/skeleton";
+import { showToast } from "@calcom/ui/components/toast";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import useMeQuery from "@lib/hooks/useMeQuery";
diff --git a/apps/web/modules/getting-started/[[...step]]/onboarding-view.tsx b/apps/web/modules/getting-started/[[...step]]/onboarding-view.tsx
index 0ed64388dc9..56c4874a902 100644
--- a/apps/web/modules/getting-started/[[...step]]/onboarding-view.tsx
+++ b/apps/web/modules/getting-started/[[...step]]/onboarding-view.tsx
@@ -12,9 +12,11 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { useParamsWithFallback } from "@calcom/lib/hooks/useParamsWithFallback";
import { trpc } from "@calcom/trpc";
import type { inferSSRProps } from "@calcom/types/inferSSRProps";
-import { Button, StepCard, Steps } from "@calcom/ui";
-import { Icon } from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Button } from "@calcom/ui/components/button";
+import { StepCard } from "@calcom/ui/components/card";
+import { Steps } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
import type { getServerSideProps } from "@lib/getting-started/[[...step]]/getServerSideProps";
diff --git a/apps/web/modules/insights/insights-virtual-queues-view.tsx b/apps/web/modules/insights/insights-virtual-queues-view.tsx
index 14e3bdab55e..07c97366942 100644
--- a/apps/web/modules/insights/insights-virtual-queues-view.tsx
+++ b/apps/web/modules/insights/insights-virtual-queues-view.tsx
@@ -6,7 +6,8 @@ import { TestForm } from "@calcom/app-store/routing-forms/components/SingleForm"
import type { RoutingForm } from "@calcom/app-store/routing-forms/types/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc";
-import { Label, Select } from "@calcom/ui";
+import { Label } from "@calcom/ui/components/form";
+import { Select } from "@calcom/ui/components/form";
export default function InsightsVirtualQueuesPage() {
const { t } = useLocale();
diff --git a/apps/web/modules/maintenance/maintenance-view.tsx b/apps/web/modules/maintenance/maintenance-view.tsx
index 129e8b4460a..e1a71161234 100644
--- a/apps/web/modules/maintenance/maintenance-view.tsx
+++ b/apps/web/modules/maintenance/maintenance-view.tsx
@@ -1,7 +1,7 @@
"use client";
import { WEBSITE_URL } from "@calcom/lib/constants";
-import { Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
export default function MaintenancePage() {
return (
diff --git a/apps/web/modules/settings/admin/components/UsersTable.tsx b/apps/web/modules/settings/admin/components/UsersTable.tsx
index e0a639ac7d7..aa3cf71a3cc 100644
--- a/apps/web/modules/settings/admin/components/UsersTable.tsx
+++ b/apps/web/modules/settings/admin/components/UsersTable.tsx
@@ -2,8 +2,9 @@ import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
import { SMSLockState } from "@calcom/prisma/client";
import { trpc } from "@calcom/trpc/react";
-import type { IconName } from "@calcom/ui";
-import { Avatar, DropdownActions, Table } from "@calcom/ui";
+import { Avatar } from "@calcom/ui/components/avatar";
+import type { IconName } from "@calcom/ui/components/icon";
+import { Table, DropdownActions } from "@calcom/ui/components/table";
const { Cell, ColumnTitle, Header, Row } = Table;
diff --git a/apps/web/modules/settings/admin/impersonation-view.tsx b/apps/web/modules/settings/admin/impersonation-view.tsx
index 68bfe32b0fd..780b011ba72 100644
--- a/apps/web/modules/settings/admin/impersonation-view.tsx
+++ b/apps/web/modules/settings/admin/impersonation-view.tsx
@@ -6,7 +6,8 @@ import { useRef, useEffect } from "react";
import { WEBAPP_URL } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, TextField } from "@calcom/ui";
+import { TextField } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
const ImpersonationView = () => {
const { t } = useLocale();
diff --git a/apps/web/modules/settings/admin/locked-sms-view.tsx b/apps/web/modules/settings/admin/locked-sms-view.tsx
index eb6364942b1..5daf5858c2d 100644
--- a/apps/web/modules/settings/admin/locked-sms-view.tsx
+++ b/apps/web/modules/settings/admin/locked-sms-view.tsx
@@ -3,7 +3,9 @@
import { useState } from "react";
import { trpc } from "@calcom/trpc";
-import { Button, TextField, showToast } from "@calcom/ui";
+import { TextField } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
+import { showToast } from "@calcom/ui/components/toast";
import UsersTable from "./components/UsersTable";
diff --git a/apps/web/modules/settings/admin/oauth-view.tsx b/apps/web/modules/settings/admin/oauth-view.tsx
index 711897ecd63..1ebae2efe38 100644
--- a/apps/web/modules/settings/admin/oauth-view.tsx
+++ b/apps/web/modules/settings/admin/oauth-view.tsx
@@ -5,7 +5,14 @@ import { useForm } from "react-hook-form";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc";
-import { Form, Button, Icon, TextField, showToast, Tooltip, ImageUploader, Avatar } from "@calcom/ui";
+import { ImageUploader } from "@calcom/ui/components/image-uploader";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Button } from "@calcom/ui/components/button";
+import { Form } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { showToast } from "@calcom/ui/components/toast";
+import { Tooltip } from "@calcom/ui/components/tooltip";
type FormValues = {
name: string;
diff --git a/apps/web/modules/settings/billing/billing-view.tsx b/apps/web/modules/settings/billing/billing-view.tsx
index f8d4325ef9b..25e0bbf4352 100644
--- a/apps/web/modules/settings/billing/billing-view.tsx
+++ b/apps/web/modules/settings/billing/billing-view.tsx
@@ -4,7 +4,7 @@ import { usePathname } from "next/navigation";
import { WEBAPP_URL } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
interface CtaRowProps {
diff --git a/apps/web/modules/settings/developer/api-keys-view.tsx b/apps/web/modules/settings/developer/api-keys-view.tsx
index 0a25ffd23cf..c41fefcbbd3 100644
--- a/apps/web/modules/settings/developer/api-keys-view.tsx
+++ b/apps/web/modules/settings/developer/api-keys-view.tsx
@@ -9,7 +9,10 @@ import ApiKeyListItem from "@calcom/features/ee/api-keys/components/ApiKeyListIt
import { APP_NAME } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Button, Dialog, DialogContent, EmptyScreen, SkeletonContainer, SkeletonText } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent } from "@calcom/ui/components/dialog";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+import { SkeletonText, SkeletonContainer } from "@calcom/ui/components/skeleton";
const SkeletonLoader = () => {
return (
diff --git a/apps/web/modules/settings/license-key/new/new-view.tsx b/apps/web/modules/settings/license-key/new/new-view.tsx
index 8f1c2b46bab..8af08ea415d 100644
--- a/apps/web/modules/settings/license-key/new/new-view.tsx
+++ b/apps/web/modules/settings/license-key/new/new-view.tsx
@@ -1,7 +1,7 @@
"use client";
import { CreateANewLicenseKeyForm } from "@calcom/features/ee/deployment/licensekey/CreateLicenseKeyForm";
-import { WizardLayout } from "@calcom/ui";
+import { WizardLayout } from "@calcom/ui/components/layout";
export const LayoutWrapper = ({ children }: { children: React.ReactNode }) => {
return (
diff --git a/apps/web/modules/settings/my-account/appearance-view.tsx b/apps/web/modules/settings/my-account/appearance-view.tsx
index 94b416405f9..66ec05a1799 100644
--- a/apps/web/modules/settings/my-account/appearance-view.tsx
+++ b/apps/web/modules/settings/my-account/appearance-view.tsx
@@ -19,19 +19,13 @@ import { validateBookerLayouts } from "@calcom/lib/validateBookerLayouts";
import type { userMetadata } from "@calcom/prisma/zod-utils";
import { trpc } from "@calcom/trpc/react";
import type { RouterOutputs } from "@calcom/trpc/react";
-import {
- Alert,
- Button,
- ColorPicker,
- Form,
- showToast,
- SkeletonButton,
- SkeletonContainer,
- SkeletonText,
- SettingsToggle,
- UpgradeTeamsBadge,
- useCalcomTheme,
-} from "@calcom/ui";
+import { Alert } from "@calcom/ui/components/alert";
+import { UpgradeTeamsBadge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import { SettingsToggle, ColorPicker, Form } from "@calcom/ui/components/form";
+import { SkeletonButton, SkeletonContainer, SkeletonText } from "@calcom/ui/components/skeleton";
+import { showToast } from "@calcom/ui/components/toast";
+import { useCalcomTheme } from "@calcom/ui/styles";
const SkeletonLoader = () => {
return (
diff --git a/apps/web/modules/settings/my-account/components/AddCalendarButton.tsx b/apps/web/modules/settings/my-account/components/AddCalendarButton.tsx
index 5634683ef4a..ef06874d0ce 100644
--- a/apps/web/modules/settings/my-account/components/AddCalendarButton.tsx
+++ b/apps/web/modules/settings/my-account/components/AddCalendarButton.tsx
@@ -1,7 +1,7 @@
"use client";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
const AddCalendarButton = () => {
const { t } = useLocale();
diff --git a/apps/web/modules/settings/my-account/general-view.tsx b/apps/web/modules/settings/my-account/general-view.tsx
index fe74d8eaca1..024accadcb1 100644
--- a/apps/web/modules/settings/my-account/general-view.tsx
+++ b/apps/web/modules/settings/my-account/general-view.tsx
@@ -12,18 +12,14 @@ import { localeOptions } from "@calcom/lib/i18n";
import { nameOfDay } from "@calcom/lib/weekday";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
-import {
- Button,
- Form,
- Label,
- Select,
- showToast,
- SkeletonButton,
- SkeletonContainer,
- SkeletonText,
- SettingsToggle,
-} from "@calcom/ui";
+import { Form } from "@calcom/ui/components/form";
+import { Label } from "@calcom/ui/components/form";
+import { Select } from "@calcom/ui/components/form";
+import { SettingsToggle } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
+import { SkeletonButton, SkeletonContainer, SkeletonText } from "@calcom/ui/components/skeleton";
+import { showToast } from "@calcom/ui/components/toast";
import TravelScheduleModal from "@components/settings/TravelScheduleModal";
diff --git a/apps/web/modules/settings/my-account/profile-view.tsx b/apps/web/modules/settings/my-account/profile-view.tsx
index c4e6461281c..6a35bef890b 100644
--- a/apps/web/modules/settings/my-account/profile-view.tsx
+++ b/apps/web/modules/settings/my-account/profile-view.tsx
@@ -22,28 +22,24 @@ import { IdentityProvider } from "@calcom/prisma/enums";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
import type { AppRouter } from "@calcom/trpc/types/server/routers/_app";
+import { ImageUploader } from "@calcom/ui/components/image-uploader";
+import { Alert } from "@calcom/ui/components/alert";
+import { UserAvatar } from "@calcom/ui/components/avatar";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogTrigger, DialogClose } from "@calcom/ui/components/dialog";
+import { Editor } from "@calcom/ui/components/editor";
+import { Form } from "@calcom/ui/components/form";
+import { PasswordField } from "@calcom/ui/components/form";
+import { Label } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
import {
- Alert,
- Button,
- Dialog,
- DialogClose,
- DialogContent,
- DialogFooter,
- DialogTrigger,
- Editor,
- Form,
- Icon,
- ImageUploader,
- Label,
- PasswordField,
- showToast,
- SkeletonAvatar,
SkeletonButton,
SkeletonContainer,
SkeletonText,
- TextField,
- UserAvatar,
-} from "@calcom/ui";
+ SkeletonAvatar,
+} from "@calcom/ui/components/skeleton";
+import { showToast } from "@calcom/ui/components/toast";
import TwoFactor from "@components/auth/TwoFactor";
import CustomEmailTextField from "@components/settings/CustomEmailTextField";
diff --git a/apps/web/modules/settings/my-account/push-notifications-view.tsx b/apps/web/modules/settings/my-account/push-notifications-view.tsx
index bdd7a192327..281b00109c6 100644
--- a/apps/web/modules/settings/my-account/push-notifications-view.tsx
+++ b/apps/web/modules/settings/my-account/push-notifications-view.tsx
@@ -2,7 +2,7 @@
import { useWebPush } from "@calcom/features/notifications/WebPushContext";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
const PushNotificationsView = () => {
const { t } = useLocale();
diff --git a/apps/web/modules/settings/organizations/new/_components/AddNewTeamsForm.tsx b/apps/web/modules/settings/organizations/new/_components/AddNewTeamsForm.tsx
index 42033e7f6ce..d8af2916039 100644
--- a/apps/web/modules/settings/organizations/new/_components/AddNewTeamsForm.tsx
+++ b/apps/web/modules/settings/organizations/new/_components/AddNewTeamsForm.tsx
@@ -8,17 +8,13 @@ import { z } from "zod";
import { useOnboarding } from "@calcom/features/ee/organizations/lib/onboardingStore";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import {
- Button,
- CheckboxField,
- Form,
- Icon,
- TextField,
- SkeletonText,
- SkeletonContainer,
- SkeletonButton,
-} from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
+import { CheckboxField } from "@calcom/ui/components/form";
+import { Form } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { SkeletonText, SkeletonContainer, SkeletonButton } from "@calcom/ui/components/skeleton";
const schema = z.object({
teams: z.array(
diff --git a/apps/web/modules/settings/organizations/new/_components/OnboardMembersView.tsx b/apps/web/modules/settings/organizations/new/_components/OnboardMembersView.tsx
index c51b1b13654..e2486c80718 100644
--- a/apps/web/modules/settings/organizations/new/_components/OnboardMembersView.tsx
+++ b/apps/web/modules/settings/organizations/new/_components/OnboardMembersView.tsx
@@ -9,18 +9,14 @@ import { useOnboarding } from "@calcom/features/ee/organizations/lib/onboardingS
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterOutputs } from "@calcom/trpc";
import { trpc } from "@calcom/trpc";
-import {
- Avatar,
- Badge,
- Button,
- SkeletonContainer,
- SkeletonText,
- SkeletonButton,
- Tooltip,
- TextField,
- showToast,
- Alert,
-} from "@calcom/ui";
+import { Badge } from "@calcom/ui/components/badge";
+import { Tooltip } from "@calcom/ui/components/tooltip";
+import { TextField } from "@calcom/ui/components/form";
+import { Alert } from "@calcom/ui/components/alert";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Button } from "@calcom/ui/components/button";
+import { SkeletonButton, SkeletonContainer, SkeletonText } from "@calcom/ui/components/skeleton";
+import { showToast } from "@calcom/ui/components/toast";
type TeamMember = RouterOutputs["viewer"]["teams"]["listMembers"]["members"][number];
diff --git a/apps/web/modules/settings/organizations/new/_components/PaymentStatusView.tsx b/apps/web/modules/settings/organizations/new/_components/PaymentStatusView.tsx
index 506b0670ad2..e5854338494 100644
--- a/apps/web/modules/settings/organizations/new/_components/PaymentStatusView.tsx
+++ b/apps/web/modules/settings/organizations/new/_components/PaymentStatusView.tsx
@@ -6,7 +6,8 @@ import { useEffect, useState } from "react";
import { useOnboarding } from "@calcom/features/ee/organizations/lib/onboardingStore";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc";
-import { Button, Icon } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { Button } from "@calcom/ui/components/button";
const PaymentStatusView = () => {
const { t } = useLocale();
diff --git a/apps/web/modules/settings/organizations/new/about-view.tsx b/apps/web/modules/settings/organizations/new/about-view.tsx
index 356936f2528..c1d58b30814 100644
--- a/apps/web/modules/settings/organizations/new/about-view.tsx
+++ b/apps/web/modules/settings/organizations/new/about-view.tsx
@@ -1,7 +1,7 @@
"use client";
import { AboutOrganizationForm } from "@calcom/features/ee/organizations/components";
-import { WizardLayout } from "@calcom/ui";
+import { WizardLayout } from "@calcom/ui/components/layout";
export const LayoutWrapper = ({ children }: { children: React.ReactNode }) => {
return (
diff --git a/apps/web/modules/settings/organizations/new/add-teams-view.tsx b/apps/web/modules/settings/organizations/new/add-teams-view.tsx
index ea0e11142b7..5c471bef9dc 100644
--- a/apps/web/modules/settings/organizations/new/add-teams-view.tsx
+++ b/apps/web/modules/settings/organizations/new/add-teams-view.tsx
@@ -1,6 +1,6 @@
"use client";
-import { WizardLayout } from "@calcom/ui";
+import { WizardLayout } from "@calcom/ui/components/layout";
import { AddNewTeamsForm } from "./_components/AddNewTeamsForm";
diff --git a/apps/web/modules/settings/organizations/new/create-new-view.tsx b/apps/web/modules/settings/organizations/new/create-new-view.tsx
index eb18990e42a..218717f3b46 100644
--- a/apps/web/modules/settings/organizations/new/create-new-view.tsx
+++ b/apps/web/modules/settings/organizations/new/create-new-view.tsx
@@ -1,7 +1,7 @@
"use client";
import { CreateANewOrganizationForm } from "@calcom/features/ee/organizations/components";
-import { WizardLayout } from "@calcom/ui";
+import { WizardLayout } from "@calcom/ui/components/layout";
export const LayoutWrapper = ({ children }: { children: React.ReactNode }) => {
return (
diff --git a/apps/web/modules/settings/organizations/new/onboard-members-view.tsx b/apps/web/modules/settings/organizations/new/onboard-members-view.tsx
index c90e8709e72..cfb7417609f 100644
--- a/apps/web/modules/settings/organizations/new/onboard-members-view.tsx
+++ b/apps/web/modules/settings/organizations/new/onboard-members-view.tsx
@@ -1,6 +1,6 @@
"use client";
-import { WizardLayout } from "@calcom/ui";
+import { WizardLayout } from "@calcom/ui/components/layout";
import AddNewTeamMembers from "./_components/OnboardMembersView";
diff --git a/apps/web/modules/settings/organizations/new/onboarding-handover.tsx b/apps/web/modules/settings/organizations/new/onboarding-handover.tsx
index 58dd9067a94..30d28ad75f7 100644
--- a/apps/web/modules/settings/organizations/new/onboarding-handover.tsx
+++ b/apps/web/modules/settings/organizations/new/onboarding-handover.tsx
@@ -1,7 +1,7 @@
"use client";
import { AdminOnboardingHandover } from "@calcom/features/ee/organizations/components";
-import { WizardLayout } from "@calcom/ui";
+import { WizardLayout } from "@calcom/ui/components/layout";
export const LayoutWrapper = ({ children }: { children: React.ReactNode }) => {
return (
diff --git a/apps/web/modules/settings/organizations/new/payment-status-view.tsx b/apps/web/modules/settings/organizations/new/payment-status-view.tsx
index d4f130d5253..47f9ebd0bb0 100644
--- a/apps/web/modules/settings/organizations/new/payment-status-view.tsx
+++ b/apps/web/modules/settings/organizations/new/payment-status-view.tsx
@@ -1,6 +1,6 @@
"use client";
-import { WizardLayout } from "@calcom/ui";
+import { WizardLayout } from "@calcom/ui/components/layout";
import PaymentStatusView from "~/settings/organizations/new/_components/PaymentStatusView";
diff --git a/apps/web/modules/settings/platform/billing/billing-view.tsx b/apps/web/modules/settings/platform/billing/billing-view.tsx
index 1b4596f6b92..a0414b6e2f9 100644
--- a/apps/web/modules/settings/platform/billing/billing-view.tsx
+++ b/apps/web/modules/settings/platform/billing/billing-view.tsx
@@ -5,7 +5,7 @@ import { usePathname } from "next/navigation";
import Shell from "@calcom/features/shell/Shell";
import { WEBAPP_URL } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
import { PlatformPricing } from "@calcom/web/components/settings/platform/pricing/platform-pricing/index";
import NoPlatformPlan from "@components/settings/platform/dashboard/NoPlatformPlan";
diff --git a/apps/web/modules/settings/platform/managed-users/managed-users-view.tsx b/apps/web/modules/settings/platform/managed-users/managed-users-view.tsx
index 71a53293cac..fe2ae6757d4 100644
--- a/apps/web/modules/settings/platform/managed-users/managed-users-view.tsx
+++ b/apps/web/modules/settings/platform/managed-users/managed-users-view.tsx
@@ -5,7 +5,9 @@ import { useMemo, useState } from "react";
import Shell from "@calcom/features/shell/Shell";
import { PlatformManagedUsersTable } from "@calcom/features/users/components/UserTable/PlatformManagedUsersTable";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Select, Skeleton, SkeletonContainer, SkeletonText, Label } from "@calcom/ui";
+import { Label } from "@calcom/ui/components/form";
+import { Select } from "@calcom/ui/components/form";
+import { Skeleton, SkeletonContainer, SkeletonText } from "@calcom/ui/components/skeleton";
import { useOAuthClients } from "@lib/hooks/settings/platform/oauth-clients/useOAuthClients";
diff --git a/apps/web/modules/settings/platform/new/create-new-view.tsx b/apps/web/modules/settings/platform/new/create-new-view.tsx
index f530e0fa6c7..d997ea45a3c 100644
--- a/apps/web/modules/settings/platform/new/create-new-view.tsx
+++ b/apps/web/modules/settings/platform/new/create-new-view.tsx
@@ -1,7 +1,7 @@
"use client";
import { CreateANewPlatformForm } from "@calcom/features/ee/platform/components/index";
-import { WizardLayout } from "@calcom/ui";
+import { WizardLayout } from "@calcom/ui/components/layout";
export const LayoutWrapper = ({ children }: { children: React.ReactNode }) => {
return (
diff --git a/apps/web/modules/settings/platform/oauth-clients/[clientId]/edit/edit-view.tsx b/apps/web/modules/settings/platform/oauth-clients/[clientId]/edit/edit-view.tsx
index 4e47722d1ca..451d36f6218 100644
--- a/apps/web/modules/settings/platform/oauth-clients/[clientId]/edit/edit-view.tsx
+++ b/apps/web/modules/settings/platform/oauth-clients/[clientId]/edit/edit-view.tsx
@@ -7,7 +7,7 @@ import Shell from "@calcom/features/shell/Shell";
import { ErrorCode } from "@calcom/lib/errorCodes";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { PERMISSIONS_GROUPED_MAP } from "@calcom/platform-constants";
-import { showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
import { useOAuthClient } from "@lib/hooks/settings/platform/oauth-clients/useOAuthClient";
import { useUpdateOAuthClient } from "@lib/hooks/settings/platform/oauth-clients/useUpdateOAuthClient";
diff --git a/apps/web/modules/settings/platform/oauth-clients/[clientId]/edit/edit-webhooks-view.tsx b/apps/web/modules/settings/platform/oauth-clients/[clientId]/edit/edit-webhooks-view.tsx
index ebaf1236986..914107396c1 100644
--- a/apps/web/modules/settings/platform/oauth-clients/[clientId]/edit/edit-webhooks-view.tsx
+++ b/apps/web/modules/settings/platform/oauth-clients/[clientId]/edit/edit-webhooks-view.tsx
@@ -7,7 +7,7 @@ import Shell from "@calcom/features/shell/Shell";
import { WebhookForm } from "@calcom/features/webhooks/components";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { WebhookTriggerEvents } from "@calcom/prisma/enums";
-import { showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
import {
useOAuthClientWebhooks,
diff --git a/apps/web/modules/settings/platform/oauth-clients/create-new-view.tsx b/apps/web/modules/settings/platform/oauth-clients/create-new-view.tsx
index 27cb4a0c575..a292030d5d8 100644
--- a/apps/web/modules/settings/platform/oauth-clients/create-new-view.tsx
+++ b/apps/web/modules/settings/platform/oauth-clients/create-new-view.tsx
@@ -8,7 +8,7 @@ import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { PERMISSION_MAP } from "@calcom/platform-constants";
import { PERMISSIONS_GROUPED_MAP } from "@calcom/platform-constants/permissions";
-import { showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
import { useCreateOAuthClient } from "@lib/hooks/settings/platform/oauth-clients/useCreateOAuthClient";
diff --git a/apps/web/modules/settings/platform/platform-view.tsx b/apps/web/modules/settings/platform/platform-view.tsx
index 4d46ae10e29..b853715f2ff 100644
--- a/apps/web/modules/settings/platform/platform-view.tsx
+++ b/apps/web/modules/settings/platform/platform-view.tsx
@@ -5,7 +5,7 @@ import { useState, useEffect } from "react";
import Shell from "@calcom/features/shell/Shell";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
import { useDeleteOAuthClient } from "@lib/hooks/settings/platform/oauth-clients/useDeleteOAuthClient";
import { useOAuthClients } from "@lib/hooks/settings/platform/oauth-clients/useOAuthClients";
diff --git a/apps/web/modules/settings/security/impersonation-view.tsx b/apps/web/modules/settings/security/impersonation-view.tsx
index 90dcb49cbc1..c8529757775 100644
--- a/apps/web/modules/settings/security/impersonation-view.tsx
+++ b/apps/web/modules/settings/security/impersonation-view.tsx
@@ -5,7 +5,9 @@ import { useState } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
import type { RouterOutputs } from "@calcom/trpc/react";
-import { showToast, SettingsToggle, SkeletonContainer, SkeletonText } from "@calcom/ui";
+import { SettingsToggle } from "@calcom/ui/components/form";
+import { SkeletonText, SkeletonContainer } from "@calcom/ui/components/skeleton";
+import { showToast } from "@calcom/ui/components/toast";
const SkeletonLoader = () => {
return (
diff --git a/apps/web/modules/settings/security/password-view.tsx b/apps/web/modules/settings/security/password-view.tsx
index 078dea5e05d..eadeb9abeaf 100644
--- a/apps/web/modules/settings/security/password-view.tsx
+++ b/apps/web/modules/settings/security/password-view.tsx
@@ -11,19 +11,20 @@ import { IdentityProvider } from "@calcom/prisma/enums";
import { userMetadata as userMetadataSchema } from "@calcom/prisma/zod-utils";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
+import { Form } from "@calcom/ui/components/form";
+import { PasswordField } from "@calcom/ui/components/form";
+import { Select } from "@calcom/ui/components/form";
+import { SettingsToggle } from "@calcom/ui/components/form";
+import { Alert } from "@calcom/ui/components/alert";
+import { Button } from "@calcom/ui/components/button";
+import classNames from "@calcom/ui/classNames";
import {
- Alert,
- Button,
- Form,
- PasswordField,
- Select,
- SettingsToggle,
- showToast,
SkeletonButton,
SkeletonContainer,
SkeletonText,
-} from "@calcom/ui";
-import classNames from "@calcom/ui/classNames";
+ SkeletonAvatar,
+} from "@calcom/ui/components/skeleton";
+import { showToast } from "@calcom/ui/components/toast";
type ChangePasswordSessionFormValues = {
oldPassword: string;
diff --git a/apps/web/modules/settings/security/two-factor-auth-view.tsx b/apps/web/modules/settings/security/two-factor-auth-view.tsx
index a294f2d9450..b579a6408f4 100644
--- a/apps/web/modules/settings/security/two-factor-auth-view.tsx
+++ b/apps/web/modules/settings/security/two-factor-auth-view.tsx
@@ -4,7 +4,10 @@ import { useState } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Badge, SkeletonButton, SkeletonContainer, SkeletonText, Alert, SettingsToggle } from "@calcom/ui";
+import { Badge } from "@calcom/ui/components/badge";
+import { SettingsToggle } from "@calcom/ui/components/form";
+import { Alert } from "@calcom/ui/components/alert";
+import { SkeletonButton, SkeletonContainer, SkeletonText } from "@calcom/ui/components/skeleton";
import DisableTwoFactorModal from "@components/settings/DisableTwoFactorModal";
import EnableTwoFactorModal from "@components/settings/EnableTwoFactorModal";
diff --git a/apps/web/modules/settings/teams/[id]/event-types-view.tsx b/apps/web/modules/settings/teams/[id]/event-types-view.tsx
index 502266bc8dc..4050f5d5d8e 100644
--- a/apps/web/modules/settings/teams/[id]/event-types-view.tsx
+++ b/apps/web/modules/settings/teams/[id]/event-types-view.tsx
@@ -8,8 +8,9 @@ import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useCreateEventType } from "@calcom/lib/hooks/useCreateEventType";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { WizardLayout } from "@calcom/ui";
-import { Button, showToast } from "@calcom/ui";
+import { WizardLayout } from "@calcom/ui/components/layout";
+import { showToast } from "@calcom/ui/components/toast";
+import { Button } from "@calcom/ui/components/button";
export const CreateTeamEventType = () => {
const searchParams = useCompatSearchParams();
diff --git a/apps/web/modules/settings/teams/[id]/onboard-members-view.tsx b/apps/web/modules/settings/teams/[id]/onboard-members-view.tsx
index 40dc2b863da..b06e6bf9c22 100644
--- a/apps/web/modules/settings/teams/[id]/onboard-members-view.tsx
+++ b/apps/web/modules/settings/teams/[id]/onboard-members-view.tsx
@@ -1,7 +1,7 @@
"use client";
import AddNewTeamMembers from "@calcom/features/ee/teams/components/AddNewTeamMembers";
-import { WizardLayout } from "@calcom/ui";
+import { WizardLayout } from "@calcom/ui/components/layout";
export const LayoutWrapper = ({ children }: { children: React.ReactNode }) => (
<WizardLayout currentStep={2} maxSteps={3}>
diff --git a/apps/web/modules/settings/teams/new/create-new-team-view.tsx b/apps/web/modules/settings/teams/new/create-new-team-view.tsx
index 0855836781f..2650e67d45e 100644
--- a/apps/web/modules/settings/teams/new/create-new-team-view.tsx
+++ b/apps/web/modules/settings/teams/new/create-new-team-view.tsx
@@ -10,7 +10,7 @@ import { getSafeRedirectUrl } from "@calcom/lib/getSafeRedirectUrl";
import { useParamsWithFallback } from "@calcom/lib/hooks/useParamsWithFallback";
import { telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
import type { RouterOutputs } from "@calcom/trpc/react";
-import { WizardLayout } from "@calcom/ui";
+import { WizardLayout } from "@calcom/ui/components/layout";
const querySchema = z.object({
returnTo: z.string().optional(),
diff --git a/apps/web/modules/signup-view.tsx b/apps/web/modules/signup-view.tsx
index effba7c8ee9..bae04e8dbbe 100644
--- a/apps/web/modules/signup-view.tsx
+++ b/apps/web/modules/signup-view.tsx
@@ -38,8 +38,12 @@ import { collectPageParameters, telemetryEventTypes, useTelemetry } from "@calco
import { IS_EUROPE } from "@calcom/lib/timezoneConstants";
import { signupSchema as apiSignupSchema } from "@calcom/prisma/zod-utils";
import type { inferSSRProps } from "@calcom/types/inferSSRProps";
-import { Button, PasswordField, TextField, Form, Alert, CheckboxField, Icon, showToast } from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Alert } from "@calcom/ui/components/alert";
+import { Button } from "@calcom/ui/components/button";
+import { PasswordField, CheckboxField, TextField, Form } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { showToast } from "@calcom/ui/components/toast";
import type { getServerSideProps } from "@lib/signup/getServerSideProps";
diff --git a/apps/web/modules/team/team-view.tsx b/apps/web/modules/team/team-view.tsx
index 5f6ff3501f0..8292d7013f2 100644
--- a/apps/web/modules/team/team-view.tsx
+++ b/apps/web/modules/team/team-view.tsx
@@ -19,7 +19,10 @@ import { useRouterQuery } from "@calcom/lib/hooks/useRouterQuery";
import useTheme from "@calcom/lib/hooks/useTheme";
import { collectPageParameters, telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
-import { Avatar, Button, UnpublishedEntity, UserAvatarGroup } from "@calcom/ui";
+import { UserAvatarGroup } from "@calcom/ui/components/avatar";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Button } from "@calcom/ui/components/button";
+import { UnpublishedEntity } from "@calcom/ui/components/unpublished-entity";
import { useToggleQuery } from "@lib/hooks/useToggleQuery";
import type { getServerSideProps } from "@lib/team/[slug]/getServerSideProps";
diff --git a/apps/web/modules/teams/teams-view.tsx b/apps/web/modules/teams/teams-view.tsx
index 4d08d97eaa3..96e9255fd35 100644
--- a/apps/web/modules/teams/teams-view.tsx
+++ b/apps/web/modules/teams/teams-view.tsx
@@ -4,7 +4,7 @@ import { TeamsListing } from "@calcom/features/ee/teams/components";
import { WEBAPP_URL } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
export const TeamsCTA = () => {
const { t } = useLocale();
diff --git a/apps/web/modules/upgrade/upgrade-view.tsx b/apps/web/modules/upgrade/upgrade-view.tsx
index d21ebe0282a..f2f85c8f3b1 100644
--- a/apps/web/modules/upgrade/upgrade-view.tsx
+++ b/apps/web/modules/upgrade/upgrade-view.tsx
@@ -6,8 +6,9 @@ import Shell from "@calcom/features/shell/Shell";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
-import { Button, EmptyScreen } from "@calcom/ui";
-import { showToast } from "@calcom/ui";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+import { showToast } from "@calcom/ui/components/toast";
+import { Button } from "@calcom/ui/components/button";
export type OrgUpgradeBannerProps = {
data: RouterOutputs["viewer"]["me"]["getUserTopBanners"]["orgUpgradeBanner"];
diff --git a/apps/web/modules/users/views/users-public-view.test.tsx b/apps/web/modules/users/views/users-public-view.test.tsx
index 7cc1c71e7f7..338d2fe2006 100644
--- a/apps/web/modules/users/views/users-public-view.test.tsx
+++ b/apps/web/modules/users/views/users-public-view.test.tsx
@@ -7,6 +7,10 @@ import { HeadSeo } from "@calcom/ui";
import UserPage from "./users-public-view";
+vi.mock("@calcom/lib/constants", async () => {
+ return await vi.importActual("@calcom/lib/constants");
+});
+
function mockedUserPageComponentProps(props: Partial<React.ComponentProps<typeof UserPage>>) {
return {
trpcState: {
diff --git a/apps/web/modules/users/views/users-public-view.tsx b/apps/web/modules/users/views/users-public-view.tsx
index 12a78ae2ee8..0b9602eaee5 100644
--- a/apps/web/modules/users/views/users-public-view.tsx
+++ b/apps/web/modules/users/views/users-public-view.tsx
@@ -15,7 +15,9 @@ import { EventTypeDescriptionLazy as EventTypeDescription } from "@calcom/featur
import EmptyPage from "@calcom/features/eventtypes/components/EmptyPage";
import { useRouterQuery } from "@calcom/lib/hooks/useRouterQuery";
import useTheme from "@calcom/lib/hooks/useTheme";
-import { Icon, UnpublishedEntity, UserAvatar } from "@calcom/ui";
+import { UserAvatar } from "@calcom/ui/components/avatar";
+import { Icon } from "@calcom/ui/components/icon";
+import { UnpublishedEntity } from "@calcom/ui/components/unpublished-entity";
import type { getServerSideProps } from "@server/lib/[user]/getServerSideProps";
diff --git a/apps/web/modules/videos/views/videos-meeting-ended-single-view.tsx b/apps/web/modules/videos/views/videos-meeting-ended-single-view.tsx
index f920c4c2267..4fef528f17c 100644
--- a/apps/web/modules/videos/views/videos-meeting-ended-single-view.tsx
+++ b/apps/web/modules/videos/views/videos-meeting-ended-single-view.tsx
@@ -4,7 +4,8 @@ import dayjs from "@calcom/dayjs";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { detectBrowserTimeFormat } from "@calcom/lib/timeFormat";
import type { inferSSRProps } from "@calcom/types/inferSSRProps";
-import { Button, Icon } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { Button } from "@calcom/ui/components/button";
import type { getServerSideProps } from "@lib/video/meeting-ended/[uid]/getServerSideProps";
diff --git a/apps/web/modules/videos/views/videos-meeting-not-started-single-view.tsx b/apps/web/modules/videos/views/videos-meeting-not-started-single-view.tsx
index 28603b71b7d..4bd07adc860 100644
--- a/apps/web/modules/videos/views/videos-meeting-not-started-single-view.tsx
+++ b/apps/web/modules/videos/views/videos-meeting-not-started-single-view.tsx
@@ -4,7 +4,9 @@ import dayjs from "@calcom/dayjs";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { detectBrowserTimeFormat } from "@calcom/lib/timeFormat";
import type { inferSSRProps } from "@calcom/types/inferSSRProps";
-import { Button, Icon, EmptyScreen } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { Button } from "@calcom/ui/components/button";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
import type { getServerSideProps } from "@lib/video/meeting-not-started/[uid]/getServerSideProps";
diff --git a/apps/web/modules/videos/views/videos-no-meeting-found-single-view.tsx b/apps/web/modules/videos/views/videos-no-meeting-found-single-view.tsx
index 37c3f4ac2ac..3969b37cf0f 100644
--- a/apps/web/modules/videos/views/videos-no-meeting-found-single-view.tsx
+++ b/apps/web/modules/videos/views/videos-no-meeting-found-single-view.tsx
@@ -1,7 +1,8 @@
"use client";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, EmptyScreen } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
export default function NoMeetingFound() {
const { t } = useLocale();
diff --git a/apps/web/modules/videos/views/videos-single-view.tsx b/apps/web/modules/videos/views/videos-single-view.tsx
index f145ffd93fe..2c323e3ed00 100644
--- a/apps/web/modules/videos/views/videos-single-view.tsx
+++ b/apps/web/modules/videos/views/videos-single-view.tsx
@@ -12,7 +12,7 @@ import { formatToLocalizedDate, formatToLocalizedTime } from "@calcom/lib/date-f
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
import type { inferSSRProps } from "@calcom/types/inferSSRProps";
-import { Icon } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
import classNames from "@calcom/ui/classNames";
import type { getServerSideProps } from "@lib/video/[uid]/getServerSideProps";
diff --git a/apps/web/pages/404.tsx b/apps/web/pages/404.tsx
index f809a11f10b..5bfa86fb5e7 100644
--- a/apps/web/pages/404.tsx
+++ b/apps/web/pages/404.tsx
@@ -11,8 +11,8 @@ import {
} from "@calcom/features/ee/organizations/lib/orgDomains";
import { DOCS_URL, IS_CALCOM, WEBSITE_URL } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { HeadSeo } from "@calcom/ui";
-import { Icon } from "@calcom/ui";
+import { HeadSeo } from "@calcom/ui/components/head-seo";
+import { Icon } from "@calcom/ui/components/icon";
import PageWrapper from "@components/PageWrapper";
diff --git a/docs/developing/guides/appstore-and-integration/build-a-greeter-app.mdx b/docs/developing/guides/appstore-and-integration/build-a-greeter-app.mdx
index 079c55b1854..49b3e98014c 100644
--- a/docs/developing/guides/appstore-and-integration/build-a-greeter-app.mdx
+++ b/docs/developing/guides/appstore-and-integration/build-a-greeter-app.mdx
@@ -40,7 +40,7 @@ title: "Build a greeter app"
*/
import useApp from "@calcom/lib/hooks/useApp";
import showToast from "@calcom/lib/notification";
- import { Button } from "@calcom/ui";
+ import { Button } from "@calcom/ui/button/Button";
import useMeQuery from "@lib/hooks/useMeQuery";
diff --git a/packages/app-store/_components/AppCard.tsx b/packages/app-store/_components/AppCard.tsx
index c3ba3dcd0d1..1aebf7f5fc6 100644
--- a/packages/app-store/_components/AppCard.tsx
+++ b/packages/app-store/_components/AppCard.tsx
@@ -5,7 +5,11 @@ import { useTranslation } from "react-i18next";
import { useAppContextWithSchema } from "@calcom/app-store/EventTypeAppContext";
import { useIsPlatform } from "@calcom/atoms/hooks/useIsPlatform";
import type { RouterOutputs } from "@calcom/trpc/react";
-import { Switch, Badge, Avatar, Button, Icon } from "@calcom/ui";
+import { Switch } from "@calcom/ui/components/form";
+import { Badge } from "@calcom/ui/components/badge";
+import { Icon } from "@calcom/ui/components/icon";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
import type { CredentialOwner } from "../types";
diff --git a/packages/app-store/_components/AppCategoryNavigation.tsx b/packages/app-store/_components/AppCategoryNavigation.tsx
index c03034dd012..6b4260de7cc 100644
--- a/packages/app-store/_components/AppCategoryNavigation.tsx
+++ b/packages/app-store/_components/AppCategoryNavigation.tsx
@@ -1,8 +1,8 @@
import { useAutoAnimate } from "@formkit/auto-animate/react";
import { useMemo } from "react";
-import { HorizontalTabs, VerticalTabs } from "@calcom/ui";
import cs from "@calcom/ui/classNames";
+import { HorizontalTabs, VerticalTabs } from "@calcom/ui/components/navigation";
import getAppCategories from "../_utils/getAppCategories";
diff --git a/packages/app-store/_components/AppNotInstalledMessage.tsx b/packages/app-store/_components/AppNotInstalledMessage.tsx
index 050a92a4931..5a9ce94d3b1 100644
--- a/packages/app-store/_components/AppNotInstalledMessage.tsx
+++ b/packages/app-store/_components/AppNotInstalledMessage.tsx
@@ -1,7 +1,8 @@
import Link from "next/link";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, Icon } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Icon } from "@calcom/ui/components/icon";
export default function AppNotInstalledMessage({ appName }: { appName: string }) {
const { t } = useLocale();
diff --git a/packages/app-store/_components/EventTypeAppCardInterface.tsx b/packages/app-store/_components/EventTypeAppCardInterface.tsx
index 7728aef220d..06bcc79ade6 100644
--- a/packages/app-store/_components/EventTypeAppCardInterface.tsx
+++ b/packages/app-store/_components/EventTypeAppCardInterface.tsx
@@ -5,7 +5,7 @@ import EventTypeAppContext from "@calcom/app-store/EventTypeAppContext";
import { EventTypeAddonMap } from "@calcom/app-store/apps.browser.generated";
import type { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
import type { RouterOutputs } from "@calcom/trpc/react";
-import { ErrorBoundary } from "@calcom/ui";
+import { ErrorBoundary } from "@calcom/ui/components/errorBoundary";
import type { EventTypeAppCardComponentProps, CredentialOwner } from "../types";
import { DynamicComponent } from "./DynamicComponent";
diff --git a/packages/app-store/_components/OmniInstallAppButton.tsx b/packages/app-store/_components/OmniInstallAppButton.tsx
index f9aa70b2942..e05c045ee50 100644
--- a/packages/app-store/_components/OmniInstallAppButton.tsx
+++ b/packages/app-store/_components/OmniInstallAppButton.tsx
@@ -1,7 +1,8 @@
import useApp from "@calcom/lib/hooks/useApp";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Button, showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
import useAddAppMutation from "../_utils/useAddAppMutation";
diff --git a/packages/app-store/_utils/getAppCategories.ts b/packages/app-store/_utils/getAppCategories.ts
index 3833d82a6b2..496386decdf 100644
--- a/packages/app-store/_utils/getAppCategories.ts
+++ b/packages/app-store/_utils/getAppCategories.ts
@@ -1,6 +1,6 @@
import { WEBAPP_URL } from "@calcom/lib/constants";
import type { AppCategories } from "@calcom/prisma/enums";
-import type { IconName } from "@calcom/ui";
+import type { IconName } from "@calcom/ui/components/icon";
function getHref(baseURL: string, category: string, useQueryParam: boolean) {
const baseUrlParsed = new URL(baseURL, WEBAPP_URL);
diff --git a/packages/app-store/alby/components/AlbyPaymentComponent.tsx b/packages/app-store/alby/components/AlbyPaymentComponent.tsx
index b7da73ad317..dd90b445674 100644
--- a/packages/app-store/alby/components/AlbyPaymentComponent.tsx
+++ b/packages/app-store/alby/components/AlbyPaymentComponent.tsx
@@ -9,8 +9,9 @@ import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useCopy } from "@calcom/lib/hooks/useCopy";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc";
-import { Button, showToast } from "@calcom/ui";
-import { Spinner } from "@calcom/ui/components/icon/Spinner";
+import { Button } from "@calcom/ui/components/button";
+import { Spinner } from "@calcom/ui/components/icon";
+import { showToast } from "@calcom/ui/components/toast";
interface IAlbyPaymentComponentProps {
payment: {
diff --git a/packages/app-store/alby/components/AlbyPriceComponent.tsx b/packages/app-store/alby/components/AlbyPriceComponent.tsx
index d9e1d1081c2..496b975db52 100644
--- a/packages/app-store/alby/components/AlbyPriceComponent.tsx
+++ b/packages/app-store/alby/components/AlbyPriceComponent.tsx
@@ -1,8 +1,8 @@
import { fiat } from "@getalby/lightning-tools";
import React from "react";
-import { Tooltip } from "@calcom/ui";
-import { SatSymbol } from "@calcom/ui/components/icon/SatSymbol";
+import { SatSymbol } from "@calcom/ui/components/icon";
+import { Tooltip } from "@calcom/ui/components/tooltip";
type AlbyPriceComponentProps = {
displaySymbol: boolean;
diff --git a/packages/app-store/alby/components/EventTypeAppSettingsInterface.tsx b/packages/app-store/alby/components/EventTypeAppSettingsInterface.tsx
index 86d34465189..1bcdcbf44a1 100644
--- a/packages/app-store/alby/components/EventTypeAppSettingsInterface.tsx
+++ b/packages/app-store/alby/components/EventTypeAppSettingsInterface.tsx
@@ -3,8 +3,10 @@ import { useState, useEffect } from "react";
import { currencyOptions } from "@calcom/app-store/alby/lib/currencyOptions";
import type { EventTypeAppSettingsComponent } from "@calcom/app-store/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Alert, Select, TextField } from "@calcom/ui";
-import { SatSymbol } from "@calcom/ui/components/icon/SatSymbol";
+import { Alert } from "@calcom/ui/components/alert";
+import { Select } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { SatSymbol } from "@calcom/ui/components/icon";
import { PaypalPaymentOptions as paymentOptions } from "../zod";
diff --git a/packages/app-store/alby/pages/setup/index.tsx b/packages/app-store/alby/pages/setup/index.tsx
index 3a9635f91fd..97242b0b77f 100644
--- a/packages/app-store/alby/pages/setup/index.tsx
+++ b/packages/app-store/alby/pages/setup/index.tsx
@@ -8,8 +8,10 @@ import AppNotInstalledMessage from "@calcom/app-store/_components/AppNotInstalle
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc";
-import { Badge, Button, showToast } from "@calcom/ui";
-import { Icon } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import { Icon } from "@calcom/ui/components/icon";
import { albyCredentialKeysSchema } from "../../lib/albyCredentialKeysSchema";
diff --git a/packages/app-store/applecalendar/pages/setup/index.tsx b/packages/app-store/applecalendar/pages/setup/index.tsx
index 9c79fc434af..909216afff1 100644
--- a/packages/app-store/applecalendar/pages/setup/index.tsx
+++ b/packages/app-store/applecalendar/pages/setup/index.tsx
@@ -5,7 +5,11 @@ import { Toaster } from "sonner";
import { APP_NAME } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Alert, Button, Form, PasswordField, TextField } from "@calcom/ui";
+import { PasswordField } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { Alert } from "@calcom/ui/components/alert";
+import { Button } from "@calcom/ui/components/button";
+import { Form } from "@calcom/ui/components/form";
export default function AppleCalendarSetup() {
const { t } = useLocale();
diff --git a/packages/app-store/basecamp3/components/EventTypeAppSettingsInterface.tsx b/packages/app-store/basecamp3/components/EventTypeAppSettingsInterface.tsx
index 4197c87ebb1..3447e835bee 100644
--- a/packages/app-store/basecamp3/components/EventTypeAppSettingsInterface.tsx
+++ b/packages/app-store/basecamp3/components/EventTypeAppSettingsInterface.tsx
@@ -2,7 +2,7 @@ import { useState, useEffect } from "react";
import type { EventTypeAppSettingsComponent } from "@calcom/app-store/types";
import { trpc } from "@calcom/trpc/react";
-import { Select } from "@calcom/ui";
+import { Select } from "@calcom/ui/components/form";
const EventTypeAppSettingsInterface: EventTypeAppSettingsComponent = ({}) => {
const [projects, setProjects] = useState();
diff --git a/packages/app-store/caldavcalendar/pages/setup/index.tsx b/packages/app-store/caldavcalendar/pages/setup/index.tsx
index ab3fe42b60b..b1f855ffe4f 100644
--- a/packages/app-store/caldavcalendar/pages/setup/index.tsx
+++ b/packages/app-store/caldavcalendar/pages/setup/index.tsx
@@ -4,7 +4,10 @@ import { useForm } from "react-hook-form";
import { Toaster } from "sonner";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Alert, Button, Form, TextField } from "@calcom/ui";
+import { Alert } from "@calcom/ui/components/alert";
+import { Button } from "@calcom/ui/components/button";
+import { Form } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
export default function CalDavCalendarSetup() {
const { t } = useLocale();
diff --git a/packages/app-store/components.tsx b/packages/app-store/components.tsx
index 1109cfc170b..79187279cf6 100644
--- a/packages/app-store/components.tsx
+++ b/packages/app-store/components.tsx
@@ -13,7 +13,7 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
import type { RouterOutputs } from "@calcom/trpc/react";
import type { App } from "@calcom/types/App";
-import { Icon } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
import classNames from "@calcom/ui/classNames";
import { InstallAppButtonMap } from "./apps.browser.generated";
diff --git a/packages/app-store/exchange2013calendar/pages/setup/index.tsx b/packages/app-store/exchange2013calendar/pages/setup/index.tsx
index 329da7739a8..ae5a24f67ea 100644
--- a/packages/app-store/exchange2013calendar/pages/setup/index.tsx
+++ b/packages/app-store/exchange2013calendar/pages/setup/index.tsx
@@ -4,7 +4,10 @@ import { useForm } from "react-hook-form";
import { Toaster } from "sonner";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Alert, Button, Form, TextField } from "@calcom/ui";
+import { Alert } from "@calcom/ui/components/alert";
+import { Button } from "@calcom/ui/components/button";
+import { Form } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
export default function Exchange2013CalendarSetup() {
const { t } = useLocale();
diff --git a/packages/app-store/exchange2016calendar/pages/setup/index.tsx b/packages/app-store/exchange2016calendar/pages/setup/index.tsx
index bf26540361b..4b37e067672 100644
--- a/packages/app-store/exchange2016calendar/pages/setup/index.tsx
+++ b/packages/app-store/exchange2016calendar/pages/setup/index.tsx
@@ -4,7 +4,10 @@ import { useForm } from "react-hook-form";
import { Toaster } from "sonner";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Alert, Button, Form, TextField } from "@calcom/ui";
+import { Alert } from "@calcom/ui/components/alert";
+import { Button } from "@calcom/ui/components/button";
+import { Form } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
export default function Exchange2016CalendarSetup() {
const { t } = useLocale();
diff --git a/packages/app-store/exchangecalendar/pages/setup/index.tsx b/packages/app-store/exchangecalendar/pages/setup/index.tsx
index f3926cd7fea..e352df5a9cd 100644
--- a/packages/app-store/exchangecalendar/pages/setup/index.tsx
+++ b/packages/app-store/exchangecalendar/pages/setup/index.tsx
@@ -7,7 +7,13 @@ import z from "zod";
import { emailSchema } from "@calcom/lib/emailSchema";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Alert, Button, EmailField, Form, PasswordField, SelectField, TextField } from "@calcom/ui";
+import { EmailField } from "@calcom/ui/components/form";
+import { Alert } from "@calcom/ui/components/alert";
+import { Button } from "@calcom/ui/components/button";
+import { Form } from "@calcom/ui/components/form";
+import { PasswordField } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { SelectField } from "@calcom/ui/components/form";
import { ExchangeAuthentication, ExchangeVersion } from "../../enums";
diff --git a/packages/app-store/fathom/components/EventTypeAppSettingsInterface.tsx b/packages/app-store/fathom/components/EventTypeAppSettingsInterface.tsx
index ea2a79002cd..9267155d6af 100644
--- a/packages/app-store/fathom/components/EventTypeAppSettingsInterface.tsx
+++ b/packages/app-store/fathom/components/EventTypeAppSettingsInterface.tsx
@@ -1,5 +1,5 @@
import type { EventTypeAppSettingsComponent } from "@calcom/app-store/types";
-import { TextField } from "@calcom/ui";
+import { TextField } from "@calcom/ui/components/form";
const EventTypeAppSettingsInterface: EventTypeAppSettingsComponent = ({
getAppData,
diff --git a/packages/app-store/ga4/components/EventTypeAppSettingsInterface.tsx b/packages/app-store/ga4/components/EventTypeAppSettingsInterface.tsx
index 0ad1148d49a..51faf276708 100644
--- a/packages/app-store/ga4/components/EventTypeAppSettingsInterface.tsx
+++ b/packages/app-store/ga4/components/EventTypeAppSettingsInterface.tsx
@@ -1,5 +1,5 @@
import type { EventTypeAppSettingsComponent } from "@calcom/app-store/types";
-import { TextField } from "@calcom/ui";
+import { TextField } from "@calcom/ui/components/form";
const EventTypeAppSettingsInterface: EventTypeAppSettingsComponent = ({
getAppData,
diff --git a/packages/app-store/giphy/components/SearchDialog.tsx b/packages/app-store/giphy/components/SearchDialog.tsx
index 950e137ee3c..b68f28ed429 100644
--- a/packages/app-store/giphy/components/SearchDialog.tsx
+++ b/packages/app-store/giphy/components/SearchDialog.tsx
@@ -2,9 +2,13 @@ import type { Dispatch, SetStateAction } from "react";
import { useState } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import type { IconName } from "@calcom/ui";
-import { Alert, Button, Dialog, DialogClose, DialogContent, DialogFooter, Icon, Input } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { Input } from "@calcom/ui/components/form";
+import { Alert } from "@calcom/ui/components/alert";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
+import { Dialog, DialogContent, DialogFooter, DialogClose } from "@calcom/ui/components/dialog";
+import type { IconName } from "@calcom/ui/components/icon";
interface ISearchDialog {
isOpenDialog: boolean;
diff --git a/packages/app-store/giphy/components/SelectGifInput.tsx b/packages/app-store/giphy/components/SelectGifInput.tsx
index 717f08a8786..0290c746cee 100644
--- a/packages/app-store/giphy/components/SelectGifInput.tsx
+++ b/packages/app-store/giphy/components/SelectGifInput.tsx
@@ -1,7 +1,7 @@
import { useState } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
import { SearchDialog } from "./SearchDialog";
diff --git a/packages/app-store/gtm/components/EventTypeAppSettingsInterface.tsx b/packages/app-store/gtm/components/EventTypeAppSettingsInterface.tsx
index ace8121c1f9..291b01fc24b 100644
--- a/packages/app-store/gtm/components/EventTypeAppSettingsInterface.tsx
+++ b/packages/app-store/gtm/components/EventTypeAppSettingsInterface.tsx
@@ -1,5 +1,5 @@
import type { EventTypeAppSettingsComponent } from "@calcom/app-store/types";
-import { TextField } from "@calcom/ui";
+import { TextField } from "@calcom/ui/components/form";
const EventTypeAppSettingsInterface: EventTypeAppSettingsComponent = ({
getAppData,
diff --git a/packages/app-store/hitpay/components/EventTypeAppSettingsInterface.tsx b/packages/app-store/hitpay/components/EventTypeAppSettingsInterface.tsx
index 1fb1fc00912..daceb2899d2 100644
--- a/packages/app-store/hitpay/components/EventTypeAppSettingsInterface.tsx
+++ b/packages/app-store/hitpay/components/EventTypeAppSettingsInterface.tsx
@@ -2,7 +2,9 @@ import { useState, useEffect } from "react";
import type { EventTypeAppSettingsComponent } from "@calcom/app-store/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Alert, Select, TextField } from "@calcom/ui";
+import { Select } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { Alert } from "@calcom/ui/components/alert";
import {
convertToSmallestCurrencyUnit,
diff --git a/packages/app-store/hitpay/components/KeyInput.tsx b/packages/app-store/hitpay/components/KeyInput.tsx
index 8e560b49083..eb732ccfdd0 100644
--- a/packages/app-store/hitpay/components/KeyInput.tsx
+++ b/packages/app-store/hitpay/components/KeyInput.tsx
@@ -5,8 +5,11 @@ import type { FormEvent } from "react";
import React, { forwardRef, useState, useEffect, useId, useCallback } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Input, Skeleton, Icon, Label } from "@calcom/ui";
-import type { InputFieldProps } from "@calcom/ui/components/form/inputs/types";
+import { Label } from "@calcom/ui/components/form";
+import { Input } from "@calcom/ui/components/form";
+import type { InputFieldProps } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { Skeleton } from "@calcom/ui/components/skeleton";
type AddonProps = {
children: React.ReactNode;
diff --git a/packages/app-store/hitpay/pages/setup/index.tsx b/packages/app-store/hitpay/pages/setup/index.tsx
index b8346a5dc01..30be43c6c15 100644
--- a/packages/app-store/hitpay/pages/setup/index.tsx
+++ b/packages/app-store/hitpay/pages/setup/index.tsx
@@ -11,8 +11,11 @@ import AppNotInstalledMessage from "@calcom/app-store/_components/AppNotInstalle
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc";
-import { Button, showToast, Icon, Switch } from "@calcom/ui";
-import { HeadSeo } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Switch } from "@calcom/ui/components/form";
+import { HeadSeo } from "@calcom/ui/components/head-seo";
+import { Icon } from "@calcom/ui/components/icon";
+import { showToast } from "@calcom/ui/components/toast";
import KeyField from "../../components/KeyInput";
import { hitpayCredentialKeysSchema } from "../../lib/hitpayCredentialKeysSchema";
diff --git a/packages/app-store/ics-feedcalendar/pages/setup/index.tsx b/packages/app-store/ics-feedcalendar/pages/setup/index.tsx
index 4d49d4c2df4..7bc692df5c1 100644
--- a/packages/app-store/ics-feedcalendar/pages/setup/index.tsx
+++ b/packages/app-store/ics-feedcalendar/pages/setup/index.tsx
@@ -4,8 +4,12 @@ import { useForm } from "react-hook-form";
import { Toaster } from "sonner";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Alert, Button, Form, TextField, CheckboxField } from "@calcom/ui";
-import { Icon } from "@calcom/ui";
+import { Alert } from "@calcom/ui/components/alert";
+import { Button } from "@calcom/ui/components/button";
+import { CheckboxField } from "@calcom/ui/components/form";
+import { Form } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
export default function ICSFeedSetup() {
const { t } = useLocale();
diff --git a/packages/app-store/insihts/components/EventTypeAppCardInterface.tsx b/packages/app-store/insihts/components/EventTypeAppCardInterface.tsx
index 7fa7a7048e8..15419672579 100644
--- a/packages/app-store/insihts/components/EventTypeAppCardInterface.tsx
+++ b/packages/app-store/insihts/components/EventTypeAppCardInterface.tsx
@@ -2,7 +2,7 @@ import { useAppContextWithSchema } from "@calcom/app-store/EventTypeAppContext";
import AppCard from "@calcom/app-store/_components/AppCard";
import useIsAppEnabled from "@calcom/app-store/_utils/useIsAppEnabled";
import type { EventTypeAppCardComponent } from "@calcom/app-store/types";
-import { TextField } from "@calcom/ui";
+import { TextField } from "@calcom/ui/components/form";
import type { appDataSchema } from "../zod";
diff --git a/packages/app-store/make/pages/setup/index.tsx b/packages/app-store/make/pages/setup/index.tsx
index 36419549c41..e3589bd5fa7 100644
--- a/packages/app-store/make/pages/setup/index.tsx
+++ b/packages/app-store/make/pages/setup/index.tsx
@@ -7,7 +7,10 @@ import { Toaster } from "sonner";
import AppNotInstalledMessage from "@calcom/app-store/_components/AppNotInstalledMessage";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Button, Icon, showToast, Tooltip } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Icon } from "@calcom/ui/components/icon";
+import { showToast } from "@calcom/ui/components/toast";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import type { getServerSideProps } from "./_getServerSideProps";
diff --git a/packages/app-store/matomo/components/EventTypeAppCardInterface.tsx b/packages/app-store/matomo/components/EventTypeAppCardInterface.tsx
index 22d6836d1b4..ff6803d9b49 100644
--- a/packages/app-store/matomo/components/EventTypeAppCardInterface.tsx
+++ b/packages/app-store/matomo/components/EventTypeAppCardInterface.tsx
@@ -2,7 +2,7 @@ import { useAppContextWithSchema } from "@calcom/app-store/EventTypeAppContext";
import AppCard from "@calcom/app-store/_components/AppCard";
import useIsAppEnabled from "@calcom/app-store/_utils/useIsAppEnabled";
import type { EventTypeAppCardComponent } from "@calcom/app-store/types";
-import { TextField } from "@calcom/ui";
+import { TextField } from "@calcom/ui/components/form";
import type { appDataSchema } from "../zod";
diff --git a/packages/app-store/metapixel/components/EventTypeAppSettingsInterface.tsx b/packages/app-store/metapixel/components/EventTypeAppSettingsInterface.tsx
index 14b31036734..3ac94fcc9c9 100644
--- a/packages/app-store/metapixel/components/EventTypeAppSettingsInterface.tsx
+++ b/packages/app-store/metapixel/components/EventTypeAppSettingsInterface.tsx
@@ -1,5 +1,5 @@
import type { EventTypeAppSettingsComponent } from "@calcom/app-store/types";
-import { TextField } from "@calcom/ui";
+import { TextField } from "@calcom/ui/components/form";
const EventTypeAppSettingsInterface: EventTypeAppSettingsComponent = ({
getAppData,
diff --git a/packages/app-store/mock-payment-app/components/EventTypeAppCardInterface.tsx b/packages/app-store/mock-payment-app/components/EventTypeAppCardInterface.tsx
index 677575cc0cc..a90ca6770de 100644
--- a/packages/app-store/mock-payment-app/components/EventTypeAppCardInterface.tsx
+++ b/packages/app-store/mock-payment-app/components/EventTypeAppCardInterface.tsx
@@ -11,7 +11,9 @@ import {
import type { EventTypeAppCardComponent } from "@calcom/app-store/types";
import { WEBAPP_URL } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Alert, Select, TextField } from "@calcom/ui";
+import { Select } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { Alert } from "@calcom/ui/components/alert";
import type { appDataSchema } from "../zod";
import { paymentOptions } from "../zod";
diff --git a/packages/app-store/office365video/components/AccountDialog.tsx b/packages/app-store/office365video/components/AccountDialog.tsx
index ddc2a6a2667..a633d36ae05 100644
--- a/packages/app-store/office365video/components/AccountDialog.tsx
+++ b/packages/app-store/office365video/components/AccountDialog.tsx
@@ -1,6 +1,6 @@
-import type { DialogProps } from "@calcom/ui";
-import { Button } from "@calcom/ui";
-import { Dialog, DialogClose, DialogContent, DialogFooter } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import type { DialogProps } from "@calcom/ui/components/dialog";
+import { Dialog, DialogContent, DialogFooter, DialogClose } from "@calcom/ui/components/dialog";
export function AccountDialog(
props: DialogProps & {
diff --git a/packages/app-store/paypal/components/EventTypeAppSettingsInterface.tsx b/packages/app-store/paypal/components/EventTypeAppSettingsInterface.tsx
index 7ff408aeb99..dbcbc476e5a 100644
--- a/packages/app-store/paypal/components/EventTypeAppSettingsInterface.tsx
+++ b/packages/app-store/paypal/components/EventTypeAppSettingsInterface.tsx
@@ -7,7 +7,9 @@ import {
} from "@calcom/app-store/paypal/lib/currencyOptions";
import type { EventTypeAppSettingsComponent } from "@calcom/app-store/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Alert, Select, TextField } from "@calcom/ui";
+import { Select } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { Alert } from "@calcom/ui/components/alert";
import {
convertToSmallestCurrencyUnit,
diff --git a/packages/app-store/paypal/pages/setup/index.tsx b/packages/app-store/paypal/pages/setup/index.tsx
index b23fbc020da..5717ab385c6 100644
--- a/packages/app-store/paypal/pages/setup/index.tsx
+++ b/packages/app-store/paypal/pages/setup/index.tsx
@@ -5,8 +5,10 @@ import { Toaster } from "sonner";
import AppNotInstalledMessage from "@calcom/app-store/_components/AppNotInstalledMessage";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc";
-import { Button, showToast, TextField } from "@calcom/ui";
-import { Icon } from "@calcom/ui";
+import { TextField } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
+import { Icon } from "@calcom/ui/components/icon";
+import { showToast } from "@calcom/ui/components/toast";
export default function PayPalSetup() {
const [newClientId, setNewClientId] = useState("");
diff --git a/packages/app-store/plausible/components/EventTypeAppSettingsInterface.tsx b/packages/app-store/plausible/components/EventTypeAppSettingsInterface.tsx
index bafa35679ff..3a841520f75 100644
--- a/packages/app-store/plausible/components/EventTypeAppSettingsInterface.tsx
+++ b/packages/app-store/plausible/components/EventTypeAppSettingsInterface.tsx
@@ -1,5 +1,5 @@
import type { EventTypeAppSettingsComponent } from "@calcom/app-store/types";
-import { TextField } from "@calcom/ui";
+import { TextField } from "@calcom/ui/components/form";
const EventTypeAppSettingsInterface: EventTypeAppSettingsComponent = ({
getAppData,
diff --git a/packages/app-store/posthog/components/EventTypeAppCardInterface.tsx b/packages/app-store/posthog/components/EventTypeAppCardInterface.tsx
index d0bc7fef24a..442079f27c0 100644
--- a/packages/app-store/posthog/components/EventTypeAppCardInterface.tsx
+++ b/packages/app-store/posthog/components/EventTypeAppCardInterface.tsx
@@ -2,7 +2,7 @@ import { useAppContextWithSchema } from "@calcom/app-store/EventTypeAppContext";
import AppCard from "@calcom/app-store/_components/AppCard";
import useIsAppEnabled from "@calcom/app-store/_utils/useIsAppEnabled";
import type { EventTypeAppCardComponent } from "@calcom/app-store/types";
-import { TextField } from "@calcom/ui";
+import { TextField } from "@calcom/ui/components/form";
import type { appDataSchema } from "../zod";
diff --git a/packages/app-store/qr_code/components/EventTypeAppSettingsInterface.tsx b/packages/app-store/qr_code/components/EventTypeAppSettingsInterface.tsx
index 6813bc0a6d7..c01bf3182d7 100644
--- a/packages/app-store/qr_code/components/EventTypeAppSettingsInterface.tsx
+++ b/packages/app-store/qr_code/components/EventTypeAppSettingsInterface.tsx
@@ -2,8 +2,9 @@ import { useState } from "react";
import type { EventTypeAppSettingsComponent } from "@calcom/app-store/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { TextField, Tooltip } from "@calcom/ui";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import classNames from "@calcom/ui/classNames";
+import { TextField } from "@calcom/ui/components/form";
const EventTypeAppSettingsInterface: EventTypeAppSettingsComponent = ({ eventType, disabled }) => {
const { t } = useLocale();
diff --git a/packages/app-store/routing-forms/components/FormActions.tsx b/packages/app-store/routing-forms/components/FormActions.tsx
index 4bbdf8ddf26..70980fa2ab7 100644
--- a/packages/app-store/routing-forms/components/FormActions.tsx
+++ b/packages/app-store/routing-forms/components/FormActions.tsx
@@ -10,25 +10,27 @@ import { WEBSITE_URL } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import slugify from "@calcom/lib/slugify";
import { trpc } from "@calcom/trpc/react";
-import type { ButtonProps } from "@calcom/ui";
+import classNames from "@calcom/ui/classNames";
+import type { ButtonProps } from "@calcom/ui/components/button";
+import { Button } from "@calcom/ui/components/button";
import {
- Button,
- ConfirmationDialogContent,
Dialog,
- DialogClose,
DialogContent,
DialogFooter,
+ DialogClose,
+ ConfirmationDialogContent,
+} from "@calcom/ui/components/dialog";
+import {
Dropdown,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
- Form,
- showToast,
- Switch,
- TextAreaField,
- TextField,
-} from "@calcom/ui";
-import classNames from "@calcom/ui/classNames";
+} from "@calcom/ui/components/dropdown";
+import { TextAreaField } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { Form } from "@calcom/ui/components/form";
+import { Switch } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
import getFieldIdentifier from "../lib/getFieldIdentifier";
diff --git a/packages/app-store/routing-forms/components/FormInputFields.tsx b/packages/app-store/routing-forms/components/FormInputFields.tsx
index e579c965119..7a3263ffc3a 100644
--- a/packages/app-store/routing-forms/components/FormInputFields.tsx
+++ b/packages/app-store/routing-forms/components/FormInputFields.tsx
@@ -1,7 +1,7 @@
import type { App_RoutingForms_Form } from "@prisma/client";
import type { Dispatch, SetStateAction } from "react";
-import { SkeletonText } from "@calcom/ui";
+import { SkeletonText } from "@calcom/ui/components/skeleton";
import getFieldIdentifier from "../lib/getFieldIdentifier";
import { getQueryBuilderConfigForFormFields } from "../lib/getQueryBuilderConfig";
diff --git a/packages/app-store/routing-forms/components/InfoLostWarningDialog.tsx b/packages/app-store/routing-forms/components/InfoLostWarningDialog.tsx
index 1f5ca032d16..cbef49a56d1 100644
--- a/packages/app-store/routing-forms/components/InfoLostWarningDialog.tsx
+++ b/packages/app-store/routing-forms/components/InfoLostWarningDialog.tsx
@@ -2,7 +2,8 @@ import { useRouter } from "next/navigation";
import type { Dispatch, SetStateAction } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Dialog, DialogContent, Button, DialogFooter } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter } from "@calcom/ui/components/dialog";
interface InfoLostWarningDialog {
isOpenInfoLostDialog: boolean;
diff --git a/packages/app-store/routing-forms/components/RoutingNavBar.tsx b/packages/app-store/routing-forms/components/RoutingNavBar.tsx
index fdba6a992ba..c1e1a891137 100644
--- a/packages/app-store/routing-forms/components/RoutingNavBar.tsx
+++ b/packages/app-store/routing-forms/components/RoutingNavBar.tsx
@@ -2,7 +2,7 @@ import type { Dispatch, SetStateAction } from "react";
import type { UseFormReturn } from "react-hook-form";
import { trpc } from "@calcom/trpc";
-import { HorizontalTabs } from "@calcom/ui";
+import { HorizontalTabs } from "@calcom/ui/components/navigation";
import { enabledIncompleteBookingApps } from "../lib/enabledIncompleteBookingApps";
import type { getSerializableForm } from "../lib/getSerializableForm";
diff --git a/packages/app-store/routing-forms/components/SingleForm.tsx b/packages/app-store/routing-forms/components/SingleForm.tsx
index 3b230fae1e8..b8349c4d0d0 100644
--- a/packages/app-store/routing-forms/components/SingleForm.tsx
+++ b/packages/app-store/routing-forms/components/SingleForm.tsx
@@ -14,26 +14,20 @@ import { trpc } from "@calcom/trpc/react";
import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery";
import type { inferSSRProps } from "@calcom/types/inferSSRProps";
import type { Brand } from "@calcom/types/utils";
-import {
- Alert,
- Badge,
- Button,
- ButtonGroup,
- Dialog,
- DialogClose,
- DialogContent,
- DialogFooter,
- DialogHeader,
- DropdownMenuSeparator,
- Form,
- SettingsToggle,
- showToast,
- TextAreaField,
- TextField,
- Tooltip,
- VerticalDivider,
-} from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Alert } from "@calcom/ui/components/alert";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogClose } from "@calcom/ui/components/dialog";
+import { VerticalDivider } from "@calcom/ui/components/divider";
+import { DropdownMenuSeparator } from "@calcom/ui/components/dropdown";
+import { Form } from "@calcom/ui/components/form";
+import { TextAreaField } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { SettingsToggle } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import { TRPCClientError } from "@trpc/react-query";
diff --git a/packages/app-store/routing-forms/components/react-awesome-query-builder/config/uiConfig.tsx b/packages/app-store/routing-forms/components/react-awesome-query-builder/config/uiConfig.tsx
index 47aedb75358..0dfcf2477bc 100644
--- a/packages/app-store/routing-forms/components/react-awesome-query-builder/config/uiConfig.tsx
+++ b/packages/app-store/routing-forms/components/react-awesome-query-builder/config/uiConfig.tsx
@@ -6,7 +6,7 @@ import type {
WidgetProps,
} from "react-awesome-query-builder";
-import { EmailField as EmailWidget } from "@calcom/ui";
+import { EmailField as EmailWidget } from "@calcom/ui/components/form";
import widgetsComponents from "../widgets";
import type { Widgets, WidgetsWithoutFactory } from "./types";
diff --git a/packages/app-store/routing-forms/components/react-awesome-query-builder/widgets.tsx b/packages/app-store/routing-forms/components/react-awesome-query-builder/widgets.tsx
index dbbd1e985f0..203d372754c 100644
--- a/packages/app-store/routing-forms/components/react-awesome-query-builder/widgets.tsx
+++ b/packages/app-store/routing-forms/components/react-awesome-query-builder/widgets.tsx
@@ -9,12 +9,14 @@ import type {
} from "react-awesome-query-builder";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button as CalButton, TextField, TextArea } from "@calcom/ui";
-import { Icon } from "@calcom/ui";
+import { Button as CalButton } from "@calcom/ui/components/button";
+import { TextArea } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
const Select = dynamic(
- async () => (await import("@calcom/ui")).SelectWithValidation
-) as unknown as typeof import("@calcom/ui").SelectWithValidation;
+ async () => (await import("@calcom/ui/components/form")).SelectWithValidation
+) as unknown as typeof import("@calcom/ui/components/form").SelectWithValidation;
export type CommonProps<
TVal extends
diff --git a/packages/app-store/routing-forms/pages/form-edit/[...appPages].tsx b/packages/app-store/routing-forms/pages/form-edit/[...appPages].tsx
index 10f515f599e..0c9c879d7e2 100644
--- a/packages/app-store/routing-forms/pages/form-edit/[...appPages].tsx
+++ b/packages/app-store/routing-forms/pages/form-edit/[...appPages].tsx
@@ -7,18 +7,13 @@ import { Controller, useFieldArray, useWatch } from "react-hook-form";
import { v4 as uuidv4 } from "uuid";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import {
- BooleanToggleGroupField,
- Button,
- EmptyScreen,
- FormCard,
- Icon,
- Label,
- SelectField,
- Skeleton,
- TextField,
-} from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Button } from "@calcom/ui/components/button";
+import { FormCard } from "@calcom/ui/components/card";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+import { Label, BooleanToggleGroupField, SelectField, TextField } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { Skeleton } from "@calcom/ui/components/skeleton";
import type { inferSSRProps } from "@lib/types/inferSSRProps";
diff --git a/packages/app-store/routing-forms/pages/forms/[...appPages].tsx b/packages/app-store/routing-forms/pages/forms/[...appPages].tsx
index f746b06e6b9..97a9bc9053d 100644
--- a/packages/app-store/routing-forms/pages/forms/[...appPages].tsx
+++ b/packages/app-store/routing-forms/pages/forms/[...appPages].tsx
@@ -17,17 +17,14 @@ import { useHasPaidPlan } from "@calcom/lib/hooks/useHasPaidPlan";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { useRouterQuery } from "@calcom/lib/hooks/useRouterQuery";
import { trpc } from "@calcom/trpc/react";
-import {
- ArrowButton,
- Badge,
- Button,
- ButtonGroup,
- EmptyScreen,
- Icon,
- List,
- ListLinkItem,
- Tooltip,
-} from "@calcom/ui";
+import { ArrowButton } from "@calcom/ui/components/arrow-button";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+import { Icon } from "@calcom/ui/components/icon";
+import { List, ListLinkItem } from "@calcom/ui/components/list";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import type { inferSSRProps } from "@lib/types/inferSSRProps";
diff --git a/packages/app-store/routing-forms/pages/incomplete-booking/[...appPages].tsx b/packages/app-store/routing-forms/pages/incomplete-booking/[...appPages].tsx
index 7ade5b3582f..a11e2eb6ded 100644
--- a/packages/app-store/routing-forms/pages/incomplete-booking/[...appPages].tsx
+++ b/packages/app-store/routing-forms/pages/incomplete-booking/[...appPages].tsx
@@ -10,7 +10,11 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { IncompleteBookingActionType } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
import type { inferSSRProps } from "@calcom/types/inferSSRProps";
-import { Switch, InputField, Button, Select, showToast } from "@calcom/ui";
+import { Switch } from "@calcom/ui/components/form";
+import { InputField } from "@calcom/ui/components/form";
+import { Select } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
+import { showToast } from "@calcom/ui/components/toast";
import SingleForm, {
getServerSidePropsForSingleFormView as getServerSideProps,
diff --git a/packages/app-store/routing-forms/pages/reporting/[...appPages].tsx b/packages/app-store/routing-forms/pages/reporting/[...appPages].tsx
index 71761616562..930b697b148 100644
--- a/packages/app-store/routing-forms/pages/reporting/[...appPages].tsx
+++ b/packages/app-store/routing-forms/pages/reporting/[...appPages].tsx
@@ -15,7 +15,8 @@ import { useInViewObserver } from "@calcom/lib/hooks/useInViewObserver";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
import type { inferSSRProps } from "@calcom/types/inferSSRProps";
-import { Button, showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
import SingleForm, {
diff --git a/packages/app-store/routing-forms/pages/route-builder/[...appPages].tsx b/packages/app-store/routing-forms/pages/route-builder/[...appPages].tsx
index d6b5ffb2b2e..a6c8a4bbba8 100644
--- a/packages/app-store/routing-forms/pages/route-builder/[...appPages].tsx
+++ b/packages/app-store/routing-forms/pages/route-builder/[...appPages].tsx
@@ -17,16 +17,13 @@ import { SchedulingType } from "@calcom/prisma/client";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
import type { inferSSRProps } from "@calcom/types/inferSSRProps";
-import {
- SelectField,
- FormCard,
- SelectWithValidation as Select,
- TextArea,
- TextField,
- Badge,
- Divider,
- SettingsToggle,
-} from "@calcom/ui";
+import { Badge } from "@calcom/ui/components/badge";
+import { FormCard } from "@calcom/ui/components/card";
+import { Divider } from "@calcom/ui/components/divider";
+import { SelectWithValidation as Select, TextArea } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { SelectField } from "@calcom/ui/components/form";
+import { SettingsToggle } from "@calcom/ui/components/form";
import { routingFormAppComponents } from "../../appComponents";
import DynamicAppComponent from "../../components/DynamicAppComponent";
diff --git a/packages/app-store/routing-forms/pages/routing-link/[...appPages].tsx b/packages/app-store/routing-forms/pages/routing-link/[...appPages].tsx
index 9c4ff63f115..7ea9002152c 100644
--- a/packages/app-store/routing-forms/pages/routing-link/[...appPages].tsx
+++ b/packages/app-store/routing-forms/pages/routing-link/[...appPages].tsx
@@ -14,8 +14,10 @@ import useTheme from "@calcom/lib/hooks/useTheme";
import { navigateInTopWindow } from "@calcom/lib/navigateInTopWindow";
import { trpc } from "@calcom/trpc/react";
import type { inferSSRProps } from "@calcom/types/inferSSRProps";
-import { Button, showToast, useCalcomTheme } from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Button } from "@calcom/ui/components/button";
+import { showToast } from "@calcom/ui/components/toast";
+import { useCalcomTheme } from "@calcom/ui/styles";
import FormInputFields from "../../components/FormInputFields";
import { getAbsoluteEventTypeRedirectUrlWithEmbedSupport } from "../../getEventTypeRedirectUrl";
diff --git a/packages/app-store/salesforce/components/EventTypeAppCardInterface.tsx b/packages/app-store/salesforce/components/EventTypeAppCardInterface.tsx
index 126e0a6f8de..0085a4d12fd 100644
--- a/packages/app-store/salesforce/components/EventTypeAppCardInterface.tsx
+++ b/packages/app-store/salesforce/components/EventTypeAppCardInterface.tsx
@@ -8,7 +8,12 @@ import type { EventTypeAppCardComponent } from "@calcom/app-store/types";
import { WEBAPP_URL } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { SchedulingType } from "@calcom/prisma/enums";
-import { Switch, Alert, Select, Button, InputField, showToast } from "@calcom/ui";
+import { InputField } from "@calcom/ui/components/form";
+import { Alert } from "@calcom/ui/components/alert";
+import { Button } from "@calcom/ui/components/button";
+import { Select } from "@calcom/ui/components/form";
+import { Switch } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
import {
SalesforceRecordEnum,
diff --git a/packages/app-store/salesforce/components/RoutingFormOptions.tsx b/packages/app-store/salesforce/components/RoutingFormOptions.tsx
index 36760f07cbf..6df2964e9fc 100644
--- a/packages/app-store/salesforce/components/RoutingFormOptions.tsx
+++ b/packages/app-store/salesforce/components/RoutingFormOptions.tsx
@@ -1,7 +1,9 @@
import { useState, useEffect } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Select, Input, Label } from "@calcom/ui";
+import { Input } from "@calcom/ui/components/form";
+import { Label } from "@calcom/ui/components/form";
+import { Select } from "@calcom/ui/components/form";
import type { LocalRouteWithRaqbStates, AttributeRoutingConfig } from "../../routing-forms/types/types";
import { appDataSchema } from "../zod";
diff --git a/packages/app-store/sendgrid/pages/setup/index.tsx b/packages/app-store/sendgrid/pages/setup/index.tsx
index 9f92171698c..4496af75d26 100644
--- a/packages/app-store/sendgrid/pages/setup/index.tsx
+++ b/packages/app-store/sendgrid/pages/setup/index.tsx
@@ -6,7 +6,10 @@ import { Toaster } from "sonner";
import z from "zod";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, Form, showToast, TextField } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Form } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
const formSchema = z.object({
api_key: z.string(),
diff --git a/packages/app-store/stripepayment/components/EventTypeAppSettingsInterface.tsx b/packages/app-store/stripepayment/components/EventTypeAppSettingsInterface.tsx
index 98ad17c20fb..fa2ac657fa0 100644
--- a/packages/app-store/stripepayment/components/EventTypeAppSettingsInterface.tsx
+++ b/packages/app-store/stripepayment/components/EventTypeAppSettingsInterface.tsx
@@ -4,8 +4,11 @@ import { useState, useEffect } from "react";
import type { EventTypeAppSettingsComponent } from "@calcom/app-store/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { RefundPolicy } from "@calcom/lib/payment/types";
-import { Alert, RadioField, Select, TextField } from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Alert } from "@calcom/ui/components/alert";
+import { Select } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { RadioField } from "@calcom/ui/components/radio";
import {
convertToSmallestCurrencyUnit,
diff --git a/packages/app-store/templates/booking-pages-tag/components/EventTypeAppCardInterface.tsx b/packages/app-store/templates/booking-pages-tag/components/EventTypeAppCardInterface.tsx
index d8e07f94074..9659a5c14d8 100644
--- a/packages/app-store/templates/booking-pages-tag/components/EventTypeAppCardInterface.tsx
+++ b/packages/app-store/templates/booking-pages-tag/components/EventTypeAppCardInterface.tsx
@@ -3,7 +3,7 @@ import { useState } from "react";
import { useAppContextWithSchema } from "@calcom/app-store/EventTypeAppContext";
import AppCard from "@calcom/app-store/_components/AppCard";
import type { EventTypeAppCardComponent } from "@calcom/app-store/types";
-import { TextField } from "@calcom/ui";
+import { TextField } from "@calcom/ui/components/form";
import type { appDataSchema } from "../zod";
diff --git a/packages/app-store/templates/event-type-app-card/components/EventTypeAppCardInterface.tsx b/packages/app-store/templates/event-type-app-card/components/EventTypeAppCardInterface.tsx
index 92b9a9533d2..afb0c1ecb59 100644
--- a/packages/app-store/templates/event-type-app-card/components/EventTypeAppCardInterface.tsx
+++ b/packages/app-store/templates/event-type-app-card/components/EventTypeAppCardInterface.tsx
@@ -2,7 +2,7 @@ import { useAppContextWithSchema } from "@calcom/app-store/EventTypeAppContext";
import AppCard from "@calcom/app-store/_components/AppCard";
import useIsAppEnabled from "@calcom/app-store/_utils/useIsAppEnabled";
import type { EventTypeAppCardComponent } from "@calcom/app-store/types";
-import { Icon } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
import type { appDataSchema } from "../zod";
diff --git a/packages/app-store/templates/general-app-settings/components/AppSettingsInterface.tsx b/packages/app-store/templates/general-app-settings/components/AppSettingsInterface.tsx
index b92ebb55a3e..6a3361aa5b3 100644
--- a/packages/app-store/templates/general-app-settings/components/AppSettingsInterface.tsx
+++ b/packages/app-store/templates/general-app-settings/components/AppSettingsInterface.tsx
@@ -1,7 +1,8 @@
import { useState } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, TextField } from "@calcom/ui";
+import { TextField } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
export default function AppSettings() {
const { t } = useLocale();
diff --git a/packages/app-store/twipla/components/EventTypeAppCardInterface.tsx b/packages/app-store/twipla/components/EventTypeAppCardInterface.tsx
index 286cf1e2f20..9844d03577f 100644
--- a/packages/app-store/twipla/components/EventTypeAppCardInterface.tsx
+++ b/packages/app-store/twipla/components/EventTypeAppCardInterface.tsx
@@ -2,7 +2,7 @@ import { useAppContextWithSchema } from "@calcom/app-store/EventTypeAppContext";
import AppCard from "@calcom/app-store/_components/AppCard";
import useIsAppEnabled from "@calcom/app-store/_utils/useIsAppEnabled";
import type { EventTypeAppCardComponent } from "@calcom/app-store/types";
-import { TextField } from "@calcom/ui";
+import { TextField } from "@calcom/ui/components/form";
import type { appDataSchema } from "../zod";
diff --git a/packages/app-store/types.d.ts b/packages/app-store/types.d.ts
index 0bd26d57e3c..c333aeac0ce 100644
--- a/packages/app-store/types.d.ts
+++ b/packages/app-store/types.d.ts
@@ -3,7 +3,7 @@ import type { z } from "zod";
import type { EventTypeFormMetadataSchema } from "@calcom/prisma/zod-utils";
import type { RouterOutputs } from "@calcom/trpc/react";
-import type { ButtonProps } from "@calcom/ui";
+import type { ButtonProps } from "@calcom/ui/components/button";
export type IntegrationOAuthCallbackState = {
returnTo?: string;
diff --git a/packages/app-store/umami/components/EventTypeAppCardInterface.tsx b/packages/app-store/umami/components/EventTypeAppCardInterface.tsx
index da5c2506ebd..1c241339950 100644
--- a/packages/app-store/umami/components/EventTypeAppCardInterface.tsx
+++ b/packages/app-store/umami/components/EventTypeAppCardInterface.tsx
@@ -2,7 +2,7 @@ import { useAppContextWithSchema } from "@calcom/app-store/EventTypeAppContext";
import AppCard from "@calcom/app-store/_components/AppCard";
import useIsAppEnabled from "@calcom/app-store/_utils/useIsAppEnabled";
import type { EventTypeAppCardComponent } from "@calcom/app-store/types";
-import { TextField } from "@calcom/ui";
+import { TextField } from "@calcom/ui/components/form";
import type { appDataSchema } from "../zod";
diff --git a/packages/app-store/vital/components/AppConfiguration.tsx b/packages/app-store/vital/components/AppConfiguration.tsx
index cedfc9df569..424697d6ab4 100644
--- a/packages/app-store/vital/components/AppConfiguration.tsx
+++ b/packages/app-store/vital/components/AppConfiguration.tsx
@@ -1,6 +1,8 @@
import { useEffect, useState, useMemo } from "react";
-import { Button, Select, showToast } from "@calcom/ui";
+import { Select } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
+import { showToast } from "@calcom/ui/components/toast";
export interface IAppConfigurationProps {
credentialIds: number[];
diff --git a/packages/app-store/weather_in_your_calendar/components/AppSettingsInterface.tsx b/packages/app-store/weather_in_your_calendar/components/AppSettingsInterface.tsx
index 6f8e1353c53..83632675363 100644
--- a/packages/app-store/weather_in_your_calendar/components/AppSettingsInterface.tsx
+++ b/packages/app-store/weather_in_your_calendar/components/AppSettingsInterface.tsx
@@ -1,16 +1,11 @@
import { useState } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, TextField } from "@calcom/ui";
-
-/*
-import * as Radio from "@calcom/ui";
-import { RadioField } from "@calcom/ui";
-*/
+import { Button } from "@calcom/ui/components/button";
+import { TextField } from "@calcom/ui/components/form";
export default function AppSettings() {
const { t } = useLocale();
- //const [units, setUnits] = useState<"metric" | "imperial">("metric");
const unit = "metric";
const [location, setLocation] = useState("");
@@ -24,10 +19,6 @@ export default function AppSettings() {
setLocation(e.target.value);
}}
/>
- {/* <Radio.Group onChange={(val) => alert(val)} aria-label="Set unit" defaultValue="metric">
- <RadioField label="°C Celsius" id="metric" value="metric" />
- <RadioField label="°F Fahrenheit" id="imperial" value="imperial" />
- </Radio.Group> */}
<Button
href={`webcal://weather-in-calendar.com/cal/weather-cal.php?city=${location}&units=${unit}&temperature=day`}>
{t("add_to_calendar")}
diff --git a/packages/app-store/wipemycalother/components/confirmDialog.tsx b/packages/app-store/wipemycalother/components/confirmDialog.tsx
index 724ccc57a73..cb982f785a7 100644
--- a/packages/app-store/wipemycalother/components/confirmDialog.tsx
+++ b/packages/app-store/wipemycalother/components/confirmDialog.tsx
@@ -6,7 +6,10 @@ import dayjs from "@calcom/dayjs";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import logger from "@calcom/lib/logger";
import { trpc } from "@calcom/trpc/react";
-import { Button, Dialog, DialogContent, DialogFooter, DialogHeader, Icon, showToast } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { showToast } from "@calcom/ui/components/toast";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogHeader } from "@calcom/ui/components/dialog";
interface IConfirmDialogWipe {
isOpenDialog: boolean;
diff --git a/packages/app-store/wipemycalother/components/wipeMyCalActionButton.tsx b/packages/app-store/wipemycalother/components/wipeMyCalActionButton.tsx
index 6fcc6490f09..90b22a427c3 100644
--- a/packages/app-store/wipemycalother/components/wipeMyCalActionButton.tsx
+++ b/packages/app-store/wipemycalother/components/wipeMyCalActionButton.tsx
@@ -1,7 +1,7 @@
import { useState } from "react";
import { trpc } from "@calcom/trpc/react";
-import { Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
import { ConfirmDialog } from "./confirmDialog";
diff --git a/packages/app-store/zapier/components/TemplateCard.tsx b/packages/app-store/zapier/components/TemplateCard.tsx
index a049c6d2769..3f6d1678717 100644
--- a/packages/app-store/zapier/components/TemplateCard.tsx
+++ b/packages/app-store/zapier/components/TemplateCard.tsx
@@ -1,4 +1,4 @@
-import { Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
import type { Template } from "./AppSettingsInterface";
diff --git a/packages/app-store/zapier/pages/setup/index.tsx b/packages/app-store/zapier/pages/setup/index.tsx
index 5e2b6a06741..c900b3c07ec 100644
--- a/packages/app-store/zapier/pages/setup/index.tsx
+++ b/packages/app-store/zapier/pages/setup/index.tsx
@@ -6,7 +6,10 @@ import { Toaster } from "sonner";
import AppNotInstalledMessage from "@calcom/app-store/_components/AppNotInstalledMessage";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Button, Icon, showToast, Tooltip } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { Tooltip } from "@calcom/ui/components/tooltip";
+import { Button } from "@calcom/ui/components/button";
+import { showToast } from "@calcom/ui/components/toast";
export interface IZapierSetupProps {
inviteLink?: string;
diff --git a/packages/features/apps/AdminAppsList.tsx b/packages/features/apps/AdminAppsList.tsx
index 80627302fd9..8d4ab75f122 100644
--- a/packages/features/apps/AdminAppsList.tsx
+++ b/packages/features/apps/AdminAppsList.tsx
@@ -16,25 +16,23 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { AppCategories } from "@calcom/prisma/enums";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
+import cs from "@calcom/ui/classNames";
+import { Button } from "@calcom/ui/components/button";
import {
- Button,
- ConfirmationDialogContent,
Dialog,
- DialogClose,
DialogContent,
DialogFooter,
- EmptyScreen,
- Form,
- Icon,
- List,
- showToast,
- SkeletonButton,
- SkeletonContainer,
- SkeletonText,
- Switch,
- TextField,
-} from "@calcom/ui";
-import cs from "@calcom/ui/classNames";
+ DialogClose,
+ ConfirmationDialogContent,
+} from "@calcom/ui/components/dialog";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+import { Form } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { Switch } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { List } from "@calcom/ui/components/list";
+import { SkeletonButton, SkeletonContainer, SkeletonText } from "@calcom/ui/components/skeleton";
+import { showToast } from "@calcom/ui/components/toast";
type App = RouterOutputs["viewer"]["apps"]["listLocal"][number];
diff --git a/packages/features/apps/components/AppList.tsx b/packages/features/apps/components/AppList.tsx
index 0d00af0545a..64e6de43b85 100644
--- a/packages/features/apps/components/AppList.tsx
+++ b/packages/features/apps/components/AppList.tsx
@@ -17,17 +17,17 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { AppCategories } from "@calcom/prisma/enums";
import { type RouterOutputs } from "@calcom/trpc";
import type { App } from "@calcom/types/App";
+import { List } from "@calcom/ui/components/list";
+import { Alert } from "@calcom/ui/components/alert";
+import { Button } from "@calcom/ui/components/button";
import {
- Alert,
- Button,
Dropdown,
DropdownItem,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
- List,
- showToast,
-} from "@calcom/ui";
+} from "@calcom/ui/components/dropdown";
+import { showToast } from "@calcom/ui/components/toast";
export type HandleDisconnect = (credentialId: number, app: App["slug"], teamId?: number) => void;
diff --git a/packages/features/apps/components/AppListCard.tsx b/packages/features/apps/components/AppListCard.tsx
index 4f6286290dc..96deda8909a 100644
--- a/packages/features/apps/components/AppListCard.tsx
+++ b/packages/features/apps/components/AppListCard.tsx
@@ -4,7 +4,7 @@ import dynamic from "next/dynamic";
import { useMemo } from "react";
import { useIsPlatform } from "@calcom/atoms/hooks/useIsPlatform";
-import type { AppListCardProps } from "@calcom/ui/components/app-list-card/AppListCard";
+import type { AppListCardProps } from "@calcom/ui/components/app-list-card";
export default function AppListCard(props: AppListCardProps) {
const isPlatform = useIsPlatform();
diff --git a/packages/features/apps/components/AppListCardPlatformWrapper.tsx b/packages/features/apps/components/AppListCardPlatformWrapper.tsx
index 72a74b07f6a..531e64fae47 100644
--- a/packages/features/apps/components/AppListCardPlatformWrapper.tsx
+++ b/packages/features/apps/components/AppListCardPlatformWrapper.tsx
@@ -1,5 +1,5 @@
-import { AppListCard } from "@calcom/ui/components/app-list-card/AppListCard";
-import type { AppListCardProps } from "@calcom/ui/components/app-list-card/AppListCard";
+import { AppListCard } from "@calcom/ui/components/app-list-card";
+import type { AppListCardProps } from "@calcom/ui/components/app-list-card";
export default function AppListCardPlatformWrapper(props: AppListCardProps) {
const logo = `https://app.cal.com${props.logo}`;
diff --git a/packages/features/apps/components/AppListCardWebWrapper.tsx b/packages/features/apps/components/AppListCardWebWrapper.tsx
index ad04acd976f..ebc4932474b 100644
--- a/packages/features/apps/components/AppListCardWebWrapper.tsx
+++ b/packages/features/apps/components/AppListCardWebWrapper.tsx
@@ -6,8 +6,8 @@ import { z } from "zod";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useTypedQuery } from "@calcom/lib/hooks/useTypedQuery";
-import { AppListCard } from "@calcom/ui/components/app-list-card/AppListCard";
-import type { AppListCardProps } from "@calcom/ui/components/app-list-card/AppListCard";
+import { AppListCard } from "@calcom/ui/components/app-list-card";
+import type { AppListCardProps } from "@calcom/ui/components/app-list-card";
const schema = z.object({ hl: z.string().optional() });
diff --git a/packages/features/apps/components/AppSetDefaultLinkDialog.tsx b/packages/features/apps/components/AppSetDefaultLinkDialog.tsx
index a01e50f086f..191742d0034 100644
--- a/packages/features/apps/components/AppSetDefaultLinkDialog.tsx
+++ b/packages/features/apps/components/AppSetDefaultLinkDialog.tsx
@@ -6,16 +6,11 @@ import { z } from "zod";
import type { EventLocationType } from "@calcom/app-store/locations";
import { getEventLocationType } from "@calcom/app-store/locations";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import {
- Button,
- Dialog,
- DialogClose,
- DialogContent,
- DialogFooter,
- Form,
- showToast,
- TextField,
-} from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogClose } from "@calcom/ui/components/dialog";
+import { Form } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
export type UpdateUsersDefaultConferencingAppParams = {
appSlug: string;
diff --git a/packages/features/apps/components/DisconnectIntegration.tsx b/packages/features/apps/components/DisconnectIntegration.tsx
index fbe5a8d2bb9..e4d7611c354 100644
--- a/packages/features/apps/components/DisconnectIntegration.tsx
+++ b/packages/features/apps/components/DisconnectIntegration.tsx
@@ -5,8 +5,9 @@ import { useState } from "react";
import { isDelegationCredential } from "@calcom/lib/delegationCredential/clientAndServer";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import type { ButtonProps } from "@calcom/ui";
-import { DisconnectIntegrationComponent, showToast } from "@calcom/ui";
+import type { ButtonProps } from "@calcom/ui/components/button";
+import { DisconnectIntegrationComponent } from "@calcom/ui/components/disconnect-calendar-integration";
+import { showToast } from "@calcom/ui/components/toast";
export default function DisconnectIntegration(props: {
credentialId: number;
diff --git a/packages/features/apps/components/DisconnectIntegrationModal.tsx b/packages/features/apps/components/DisconnectIntegrationModal.tsx
index 2b5fc268055..90188ceb1c3 100644
--- a/packages/features/apps/components/DisconnectIntegrationModal.tsx
+++ b/packages/features/apps/components/DisconnectIntegrationModal.tsx
@@ -1,7 +1,7 @@
import { useIsPlatform } from "@calcom/atoms/hooks/useIsPlatform";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { App } from "@calcom/types/App";
-import { Dialog, ConfirmationDialogContent } from "@calcom/ui";
+import { Dialog, ConfirmationDialogContent } from "@calcom/ui/components/dialog";
export type RemoveAppParams = {
credentialId: number;
diff --git a/packages/features/auth/SAMLLogin.tsx b/packages/features/auth/SAMLLogin.tsx
index ba410c6543c..0ea0a265919 100644
--- a/packages/features/auth/SAMLLogin.tsx
+++ b/packages/features/auth/SAMLLogin.tsx
@@ -8,8 +8,8 @@ import { emailRegex } from "@calcom/lib/emailSchema";
import { LastUsed, useLastUsed } from "@calcom/lib/hooks/useLastUsed";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import type { ButtonProps } from "@calcom/ui";
-import { Button } from "@calcom/ui";
+import type { ButtonProps } from "@calcom/ui/components/button";
+import { Button } from "@calcom/ui/components/button";
interface Props {
samlTenantID: string;
diff --git a/packages/features/availability/components/SkeletonLoader.tsx b/packages/features/availability/components/SkeletonLoader.tsx
index a2660e166ee..263ecc6b939 100644
--- a/packages/features/availability/components/SkeletonLoader.tsx
+++ b/packages/features/availability/components/SkeletonLoader.tsx
@@ -1,4 +1,5 @@
-import { Button, SkeletonText } from "@calcom/ui";
+import { SkeletonText } from "@calcom/ui/components/skeleton";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
function SkeletonLoader() {
diff --git a/packages/features/bookings/Booker/Booker.tsx b/packages/features/bookings/Booker/Booker.tsx
index cd5223826a2..4b0b8908293 100644
--- a/packages/features/bookings/Booker/Booker.tsx
+++ b/packages/features/bookings/Booker/Booker.tsx
@@ -43,7 +43,7 @@ const TurnstileCaptcha = dynamic(() => import("@calcom/features/auth/Turnstile")
const loadFramerFeatures = () => import("./framer-features").then((res) => res.default);
const PoweredBy = dynamic(() => import("@calcom/ee/components/PoweredBy").then((mod) => mod.default));
const UnpublishedEntity = dynamic(() =>
- import("@calcom/ui/components/unpublished-entity/UnpublishedEntity").then((mod) => mod.UnpublishedEntity)
+ import("@calcom/ui/components/unpublished-entity").then((mod) => mod.UnpublishedEntity)
);
const DatePicker = dynamic(() => import("./components/DatePicker").then((mod) => mod.DatePicker), {
ssr: false,
diff --git a/packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx b/packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx
index bf727818d76..29e94f6e998 100644
--- a/packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx
+++ b/packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx
@@ -9,7 +9,10 @@ import type { BookerEvent } from "@calcom/features/bookings/types";
import { WEBSITE_PRIVACY_POLICY_URL, WEBSITE_TERMS_URL } from "@calcom/lib/constants";
import { getPaymentAppData } from "@calcom/lib/getPaymentAppData";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Alert, Button, EmptyScreen, Form } from "@calcom/ui";
+import { Form } from "@calcom/ui/components/form";
+import { Alert } from "@calcom/ui/components/alert";
+import { Button } from "@calcom/ui/components/button";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
import { useBookerStore } from "../../store";
import type { UseBookingFormReturnType } from "../hooks/useBookingForm";
diff --git a/packages/features/bookings/Booker/components/BookEventForm/BookFormAsModal.tsx b/packages/features/bookings/Booker/components/BookEventForm/BookFormAsModal.tsx
index a36071c641a..99df679bb5a 100644
--- a/packages/features/bookings/Booker/components/BookEventForm/BookFormAsModal.tsx
+++ b/packages/features/bookings/Booker/components/BookEventForm/BookFormAsModal.tsx
@@ -4,7 +4,8 @@ import React from "react";
import { useEventTypeById } from "@calcom/atoms/hooks/event-types/private/useEventTypeById";
import { useIsPlatform } from "@calcom/atoms/hooks/useIsPlatform";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Badge, Dialog, DialogContent } from "@calcom/ui";
+import { Badge } from "@calcom/ui/components/badge";
+import { Dialog, DialogContent } from "@calcom/ui/components/dialog";
import { getDurationFormatted } from "../../../components/event-meta/Duration";
import { useBookerStore } from "../../store";
diff --git a/packages/features/bookings/Booker/components/BookEventForm/Skeleton.tsx b/packages/features/bookings/Booker/components/BookEventForm/Skeleton.tsx
index 5da8cbabd5c..cfe973f54a1 100644
--- a/packages/features/bookings/Booker/components/BookEventForm/Skeleton.tsx
+++ b/packages/features/bookings/Booker/components/BookEventForm/Skeleton.tsx
@@ -1,4 +1,4 @@
-import { SkeletonText } from "@calcom/ui";
+import { SkeletonText } from "@calcom/ui/components/skeleton";
export const FormSkeleton = () => (
<div className="flex flex-col">
diff --git a/packages/features/bookings/Booker/components/DryRunMessage.tsx b/packages/features/bookings/Booker/components/DryRunMessage.tsx
index ebaf51d89e5..c0ec6b6378b 100644
--- a/packages/features/bookings/Booker/components/DryRunMessage.tsx
+++ b/packages/features/bookings/Booker/components/DryRunMessage.tsx
@@ -1,7 +1,7 @@
import { useState } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Icon } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
export const DryRunMessage = ({ isEmbed }: { isEmbed?: boolean }) => {
const { t } = useLocale();
diff --git a/packages/features/bookings/Booker/components/HavingTroubleFindingTime.tsx b/packages/features/bookings/Booker/components/HavingTroubleFindingTime.tsx
index a72dcf33e63..8280c2255ca 100644
--- a/packages/features/bookings/Booker/components/HavingTroubleFindingTime.tsx
+++ b/packages/features/bookings/Booker/components/HavingTroubleFindingTime.tsx
@@ -2,7 +2,7 @@ import { useState } from "react";
import { BOOKER_NUMBER_OF_DAYS_TO_LOAD } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Icon } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
type Props = {
onButtonClick: () => void;
diff --git a/packages/features/bookings/Booker/components/Header.tsx b/packages/features/bookings/Booker/components/Header.tsx
index 421a2f87028..7ca86d6e009 100644
--- a/packages/features/bookings/Booker/components/Header.tsx
+++ b/packages/features/bookings/Booker/components/Header.tsx
@@ -7,7 +7,11 @@ import { useIsEmbed } from "@calcom/embed-core/embed-iframe";
import { WEBAPP_URL } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { BookerLayouts } from "@calcom/prisma/zod-utils";
-import { Button, ButtonGroup, Icon, ToggleGroup, Tooltip } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
+import { ToggleGroup } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import { TimeFormatToggle } from "../../components/TimeFormatToggle";
import { useBookerStore } from "../store";
diff --git a/packages/features/bookings/Booker/components/InstantBooking.tsx b/packages/features/bookings/Booker/components/InstantBooking.tsx
index 08b84b0bce0..2f4b6355c38 100644
--- a/packages/features/bookings/Booker/components/InstantBooking.tsx
+++ b/packages/features/bookings/Booker/components/InstantBooking.tsx
@@ -1,7 +1,8 @@
import type { BookerEvent } from "@calcom/features/bookings/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { User } from "@calcom/prisma/client";
-import { Button, UserAvatarGroupWithOrg } from "@calcom/ui";
+import { UserAvatarGroupWithOrg } from "@calcom/ui/components/avatar";
+import { Button } from "@calcom/ui/components/button";
interface IInstantBookingProps {
onConnectNow: () => void;
diff --git a/packages/features/bookings/Booker/components/OutOfOfficeInSlots.tsx b/packages/features/bookings/Booker/components/OutOfOfficeInSlots.tsx
index dc4d6ccd8b9..93afe34bc5a 100644
--- a/packages/features/bookings/Booker/components/OutOfOfficeInSlots.tsx
+++ b/packages/features/bookings/Booker/components/OutOfOfficeInSlots.tsx
@@ -4,7 +4,7 @@ import { useRouter } from "next/navigation";
import type { IOutOfOfficeData } from "@calcom/lib/getUserAvailability";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
interface IOutOfOfficeInSlotsProps {
diff --git a/packages/features/bookings/Booker/components/OverlayCalendar/OverlayCalendarContinueModal.tsx b/packages/features/bookings/Booker/components/OverlayCalendar/OverlayCalendarContinueModal.tsx
index 9c8ba5d4db5..330a57ce8f9 100644
--- a/packages/features/bookings/Booker/components/OverlayCalendar/OverlayCalendarContinueModal.tsx
+++ b/packages/features/bookings/Booker/components/OverlayCalendar/OverlayCalendarContinueModal.tsx
@@ -1,6 +1,7 @@
import { APP_NAME } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, Dialog, DialogContent, DialogFooter } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter } from "@calcom/ui/components/dialog";
interface IOverlayCalendarContinueModalProps {
open?: boolean;
diff --git a/packages/features/bookings/Booker/components/OverlayCalendar/OverlayCalendarSettingsModal.tsx b/packages/features/bookings/Booker/components/OverlayCalendar/OverlayCalendarSettingsModal.tsx
index 0667e2a0520..576d47fd964 100644
--- a/packages/features/bookings/Booker/components/OverlayCalendar/OverlayCalendarSettingsModal.tsx
+++ b/packages/features/bookings/Booker/components/OverlayCalendar/OverlayCalendarSettingsModal.tsx
@@ -3,20 +3,14 @@ import { Fragment } from "react";
import { useIsPlatform } from "@calcom/atoms/hooks/useIsPlatform";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import {
- Alert,
- Dialog,
- DialogClose,
- DialogContent,
- EmptyScreen,
- ListItem,
- ListItemText,
- ListItemTitle,
- SkeletonContainer,
- SkeletonText,
- Switch,
-} from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Alert } from "@calcom/ui/components/alert";
+import { Dialog, DialogContent, DialogClose } from "@calcom/ui/components/dialog";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+import { Switch } from "@calcom/ui/components/form";
+import { ListItem, ListItemText, ListItemTitle } from "@calcom/ui/components/list";
+import { SkeletonContainer } from "@calcom/ui/components/skeleton";
+import { SkeletonText } from "@calcom/ui/components/skeleton";
import type { UseCalendarsReturnType } from "../hooks/useCalendars";
diff --git a/packages/features/bookings/Booker/components/OverlayCalendar/OverlayCalendarSwitch.tsx b/packages/features/bookings/Booker/components/OverlayCalendar/OverlayCalendarSwitch.tsx
index c98600473c0..f449e97c8dd 100644
--- a/packages/features/bookings/Booker/components/OverlayCalendar/OverlayCalendarSwitch.tsx
+++ b/packages/features/bookings/Booker/components/OverlayCalendar/OverlayCalendarSwitch.tsx
@@ -1,7 +1,8 @@
import { useEffect } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, Switch } from "@calcom/ui";
+import { Switch } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
import { useBookerStore } from "../../store";
diff --git a/packages/features/bookings/Booker/components/RedirectToInstantMeetingModal.tsx b/packages/features/bookings/Booker/components/RedirectToInstantMeetingModal.tsx
index 264e359c3bd..16b8929a662 100644
--- a/packages/features/bookings/Booker/components/RedirectToInstantMeetingModal.tsx
+++ b/packages/features/bookings/Booker/components/RedirectToInstantMeetingModal.tsx
@@ -3,8 +3,8 @@ import { useState, useEffect } from "react";
import dayjs from "@calcom/dayjs";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Dialog, DialogContent } from "@calcom/ui";
-import { Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent } from "@calcom/ui/components/dialog";
const handleBeforeUnload = (event: BeforeUnloadEvent) => {
const message = "/o";
diff --git a/packages/features/bookings/Booker/components/hooks/useBookings.ts b/packages/features/bookings/Booker/components/hooks/useBookings.ts
index a3b89eaa228..a8bc894570a 100644
--- a/packages/features/bookings/Booker/components/hooks/useBookings.ts
+++ b/packages/features/bookings/Booker/components/hooks/useBookings.ts
@@ -17,7 +17,7 @@ import { localStorage } from "@calcom/lib/webstorage";
import { BookingStatus } from "@calcom/prisma/enums";
import { bookingMetadataSchema } from "@calcom/prisma/zod-utils";
import { trpc } from "@calcom/trpc";
-import { showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
import type { UseBookingFormReturnType } from "./useBookingForm";
diff --git a/packages/features/bookings/Booker/components/hooks/useVerifyEmail.ts b/packages/features/bookings/Booker/components/hooks/useVerifyEmail.ts
index 5358d45d962..83353909ad3 100644
--- a/packages/features/bookings/Booker/components/hooks/useVerifyEmail.ts
+++ b/packages/features/bookings/Booker/components/hooks/useVerifyEmail.ts
@@ -5,7 +5,7 @@ import { useBookerStore } from "@calcom/features/bookings/Booker/store";
import { useDebounce } from "@calcom/lib/hooks/useDebounce";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc";
-import { showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
export interface IUseVerifyEmailProps {
email: string;
diff --git a/packages/features/bookings/Booker/utils/use-brand-colors.tsx b/packages/features/bookings/Booker/utils/use-brand-colors.tsx
index 7d97b9b7e22..d422a2b1f2d 100644
--- a/packages/features/bookings/Booker/utils/use-brand-colors.tsx
+++ b/packages/features/bookings/Booker/utils/use-brand-colors.tsx
@@ -1,6 +1,6 @@
import useGetBrandingColours from "@calcom/lib/getBrandColours";
import useTheme from "@calcom/lib/hooks/useTheme";
-import { useCalcomTheme } from "@calcom/ui";
+import { useCalcomTheme } from "@calcom/ui/styles";
export const useBrandColors = ({
brandColor,
diff --git a/packages/features/bookings/UnconfirmedBookingBadge.tsx b/packages/features/bookings/UnconfirmedBookingBadge.tsx
index af693847c04..c55320e8169 100644
--- a/packages/features/bookings/UnconfirmedBookingBadge.tsx
+++ b/packages/features/bookings/UnconfirmedBookingBadge.tsx
@@ -2,7 +2,7 @@ import Link from "next/link";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Badge } from "@calcom/ui";
+import { Badge } from "@calcom/ui/components/badge";
export default function UnconfirmedBookingBadge() {
const { t } = useLocale();
diff --git a/packages/features/bookings/components/AvailableTimes.tsx b/packages/features/bookings/components/AvailableTimes.tsx
index ae3dbddcb04..df800b5753e 100644
--- a/packages/features/bookings/components/AvailableTimes.tsx
+++ b/packages/features/bookings/components/AvailableTimes.tsx
@@ -14,7 +14,9 @@ import type { IOutOfOfficeData } from "@calcom/lib/getUserAvailability";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { localStorage } from "@calcom/lib/webstorage";
import type { IGetAvailableSlots } from "@calcom/trpc/server/routers/viewer/slots/util";
-import { Button, Icon, SkeletonText } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { SkeletonText } from "@calcom/ui/components/skeleton";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
import { useBookerTime } from "../Booker/components/hooks/useBookerTime";
diff --git a/packages/features/bookings/components/TimeFormatToggle.tsx b/packages/features/bookings/components/TimeFormatToggle.tsx
index 59d29cfce3c..44e0e883e8b 100644
--- a/packages/features/bookings/components/TimeFormatToggle.tsx
+++ b/packages/features/bookings/components/TimeFormatToggle.tsx
@@ -1,6 +1,6 @@
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { TimeFormat } from "@calcom/lib/timeFormat";
-import { ToggleGroup } from "@calcom/ui";
+import { ToggleGroup } from "@calcom/ui/components/form";
import { useTimePreferences } from "../lib";
diff --git a/packages/features/bookings/components/VerifyCodeDialog.tsx b/packages/features/bookings/components/VerifyCodeDialog.tsx
index 0307d9a6c24..62d6c4d1bc2 100644
--- a/packages/features/bookings/components/VerifyCodeDialog.tsx
+++ b/packages/features/bookings/components/VerifyCodeDialog.tsx
@@ -3,17 +3,11 @@ import { useCallback, useEffect, useState } from "react";
import useDigitInput from "react-digit-input";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import {
- Button,
- Dialog,
- DialogClose,
- DialogContent,
- DialogFooter,
- DialogHeader,
- Icon,
- Input,
- Label,
-} from "@calcom/ui";
+import { Input } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogClose } from "@calcom/ui/components/dialog";
+import { Label } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
export const VerifyCodeDialog = ({
isOpenDialog,
diff --git a/packages/features/bookings/components/event-meta/AvailableEventLocations.tsx b/packages/features/bookings/components/event-meta/AvailableEventLocations.tsx
index 7ff8f5dbc51..0b00ced5678 100644
--- a/packages/features/bookings/components/event-meta/AvailableEventLocations.tsx
+++ b/packages/features/bookings/components/event-meta/AvailableEventLocations.tsx
@@ -7,7 +7,8 @@ import { getEventLocationType, getTranslatedLocation } from "@calcom/app-store/l
import { useIsPlatform } from "@calcom/atoms/hooks/useIsPlatform";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import invertLogoOnDark from "@calcom/lib/invertLogoOnDark";
-import { Icon, Tooltip } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import classNames from "@calcom/ui/classNames";
const excludeNullValues = (value: unknown) => !!value;
diff --git a/packages/features/bookings/components/event-meta/Details.tsx b/packages/features/bookings/components/event-meta/Details.tsx
index cfe742e8023..c0e65b3cc79 100644
--- a/packages/features/bookings/components/event-meta/Details.tsx
+++ b/packages/features/bookings/components/event-meta/Details.tsx
@@ -5,8 +5,9 @@ import { PriceIcon } from "@calcom/features/bookings/components/event-meta/Price
import type { BookerEvent } from "@calcom/features/bookings/types";
import { getPaymentAppData } from "@calcom/lib/getPaymentAppData";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Icon, type IconName } from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Icon } from "@calcom/ui/components/icon";
+import { type IconName } from "@calcom/ui/components/icon";
import { EventDetailBlocks } from "../../types";
import { AvailableEventLocations } from "./AvailableEventLocations";
diff --git a/packages/features/bookings/components/event-meta/Locations.tsx b/packages/features/bookings/components/event-meta/Locations.tsx
index 72fe72960e7..aa4c8b44ee7 100644
--- a/packages/features/bookings/components/event-meta/Locations.tsx
+++ b/packages/features/bookings/components/event-meta/Locations.tsx
@@ -1,7 +1,7 @@
import { getEventLocationType, getTranslatedLocation } from "@calcom/app-store/locations";
import type { BookerEvent } from "@calcom/features/bookings/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Tooltip } from "@calcom/ui";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import classNames from "@calcom/ui/classNames";
import { EventMetaBlock } from "./Details";
diff --git a/packages/features/bookings/components/event-meta/Members.tsx b/packages/features/bookings/components/event-meta/Members.tsx
index 63f5c90731a..e9dbc6a9472 100644
--- a/packages/features/bookings/components/event-meta/Members.tsx
+++ b/packages/features/bookings/components/event-meta/Members.tsx
@@ -6,7 +6,7 @@ import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
import { getBookerBaseUrlSync } from "@calcom/lib/getBookerUrl/client";
import { getTeamUrlSync } from "@calcom/lib/getBookerUrl/client";
import { SchedulingType } from "@calcom/prisma/enums";
-import { AvatarGroup } from "@calcom/ui";
+import { AvatarGroup } from "@calcom/ui/components/avatar";
export interface EventMembersProps {
/**
diff --git a/packages/features/bookings/components/event-meta/Occurences.tsx b/packages/features/bookings/components/event-meta/Occurences.tsx
index 5fec9cb5e46..adc42f97432 100644
--- a/packages/features/bookings/components/event-meta/Occurences.tsx
+++ b/packages/features/bookings/components/event-meta/Occurences.tsx
@@ -5,8 +5,9 @@ import type { BookerEvent } from "@calcom/features/bookings/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { parseRecurringDates } from "@calcom/lib/parse-dates";
import { getRecurringFreq } from "@calcom/lib/recurringStrings";
-import { Tooltip, Alert } from "@calcom/ui";
-import { Input } from "@calcom/ui";
+import { Alert } from "@calcom/ui/components/alert";
+import { Input } from "@calcom/ui/components/form";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import { useBookerTime } from "../../Booker/components/hooks/useBookerTime";
diff --git a/packages/features/bookings/components/event-meta/PayIcon.tsx b/packages/features/bookings/components/event-meta/PayIcon.tsx
index b723c04ea07..a5ba9eab056 100644
--- a/packages/features/bookings/components/event-meta/PayIcon.tsx
+++ b/packages/features/bookings/components/event-meta/PayIcon.tsx
@@ -1,4 +1,4 @@
-import { Icon } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
export function PayIcon(props: { currency: string; className?: string }) {
const { className, currency } = props;
diff --git a/packages/features/bookings/components/event-meta/PriceIcon.tsx b/packages/features/bookings/components/event-meta/PriceIcon.tsx
index dd48d792050..2b31bceee7f 100644
--- a/packages/features/bookings/components/event-meta/PriceIcon.tsx
+++ b/packages/features/bookings/components/event-meta/PriceIcon.tsx
@@ -1,5 +1,5 @@
-import { Icon } from "@calcom/ui";
-import { SatSymbol } from "@calcom/ui/components/icon/SatSymbol";
+import { Icon } from "@calcom/ui/components/icon";
+import { SatSymbol } from "@calcom/ui/components/icon";
export function PriceIcon(props: { currency: string; className?: string }) {
const { className, currency } = props;
diff --git a/packages/features/bookings/components/event-meta/Skeleton.tsx b/packages/features/bookings/components/event-meta/Skeleton.tsx
index 9740c76069a..2536947c599 100644
--- a/packages/features/bookings/components/event-meta/Skeleton.tsx
+++ b/packages/features/bookings/components/event-meta/Skeleton.tsx
@@ -1,4 +1,4 @@
-import { SkeletonText } from "@calcom/ui";
+import { SkeletonText } from "@calcom/ui/components/skeleton";
import classNames from "@calcom/ui/classNames";
export const EventMetaSkeleton = () => (
diff --git a/packages/features/calendars/CalendarSwitch.tsx b/packages/features/calendars/CalendarSwitch.tsx
index aee99191315..8871f77f0d9 100644
--- a/packages/features/calendars/CalendarSwitch.tsx
+++ b/packages/features/calendars/CalendarSwitch.tsx
@@ -5,8 +5,10 @@ import { useState } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Icon, showToast, Switch } from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Switch } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { showToast } from "@calcom/ui/components/toast";
export type ICalendarSwitchProps = {
title: string;
diff --git a/packages/features/calendars/DatePicker.tsx b/packages/features/calendars/DatePicker.tsx
index 1b450557ff4..31280168416 100644
--- a/packages/features/calendars/DatePicker.tsx
+++ b/packages/features/calendars/DatePicker.tsx
@@ -10,7 +10,8 @@ import { daysInMonth, yyyymmdd } from "@calcom/lib/date-fns";
import type { IFromUser, IToUser } from "@calcom/lib/getUserAvailability";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { weekdayNames } from "@calcom/lib/weekday";
-import { Button, SkeletonText } from "@calcom/ui";
+import { SkeletonText } from "@calcom/ui/components/skeleton";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
export type DatePickerProps = {
diff --git a/packages/features/calendars/DestinationCalendarSelector.tsx b/packages/features/calendars/DestinationCalendarSelector.tsx
index a619dd3d47e..31829004f7e 100644
--- a/packages/features/calendars/DestinationCalendarSelector.tsx
+++ b/packages/features/calendars/DestinationCalendarSelector.tsx
@@ -6,7 +6,9 @@ import { components } from "react-select";
import type { SelectClassNames } from "@calcom/features/eventtypes/lib/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterOutputs } from "@calcom/trpc/react";
-import { Badge, Icon, Select } from "@calcom/ui";
+import { Badge } from "@calcom/ui/components/badge";
+import { Select } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
interface Props {
onChange: (value: { externalId: string; integration: string }) => void;
diff --git a/packages/features/calendars/weeklyview/components/event/Event.tsx b/packages/features/calendars/weeklyview/components/event/Event.tsx
index 8213bc3ec7c..9b71d282208 100644
--- a/packages/features/calendars/weeklyview/components/event/Event.tsx
+++ b/packages/features/calendars/weeklyview/components/event/Event.tsx
@@ -1,7 +1,7 @@
import { cva } from "class-variance-authority";
import dayjs from "@calcom/dayjs";
-import { Tooltip } from "@calcom/ui";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import classNames from "@calcom/ui/classNames";
import type { CalendarEvent } from "../../types/events";
diff --git a/packages/features/calendars/weeklyview/components/heading/SchedulerHeading.tsx b/packages/features/calendars/weeklyview/components/heading/SchedulerHeading.tsx
index 17832275cc5..6c78992c3f3 100644
--- a/packages/features/calendars/weeklyview/components/heading/SchedulerHeading.tsx
+++ b/packages/features/calendars/weeklyview/components/heading/SchedulerHeading.tsx
@@ -1,5 +1,6 @@
import dayjs from "@calcom/dayjs";
-import { Button, ButtonGroup } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
import { useCalendarStore } from "../../state/store";
diff --git a/packages/features/components/timezone-select/TimezoneSelect.tsx b/packages/features/components/timezone-select/TimezoneSelect.tsx
index d5276852da6..0bd1d7f9177 100644
--- a/packages/features/components/timezone-select/TimezoneSelect.tsx
+++ b/packages/features/components/timezone-select/TimezoneSelect.tsx
@@ -8,8 +8,8 @@ import { CALCOM_VERSION } from "@calcom/lib/constants";
import { filterBySearchText, addTimezonesToDropdown, handleOptionLabel } from "@calcom/lib/timezone";
import type { Timezones } from "@calcom/lib/timezone";
import { trpc } from "@calcom/trpc/react";
-import { getReactSelectProps, inputStyles } from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { getReactSelectProps, inputStyles } from "@calcom/ui/components/form";
const SELECT_SEARCH_DATA: Timezones = [
{ label: "San Francisco", timezone: "America/Los_Angeles" },
diff --git a/packages/features/data-table/components/DataTable.tsx b/packages/features/data-table/components/DataTable.tsx
index 5bc623431df..34361c589ea 100644
--- a/packages/features/data-table/components/DataTable.tsx
+++ b/packages/features/data-table/components/DataTable.tsx
@@ -10,6 +10,10 @@ import { usePathname } from "next/navigation";
import { useEffect, useState, memo, useMemo } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
+import classNames from "@calcom/ui/classNames";
+import { Command, CommandList, CommandItem } from "@calcom/ui/components/command";
+import { Icon } from "@calcom/ui/components/icon";
+import { Popover, PopoverTrigger, PopoverContent } from "@calcom/ui/components/popover";
import {
TableNew,
TableBody,
@@ -17,15 +21,7 @@ import {
TableHead,
TableHeader,
TableRow,
- Popover,
- PopoverTrigger,
- PopoverContent,
- Command,
- CommandList,
- CommandItem,
- Icon,
-} from "@calcom/ui";
-import classNames from "@calcom/ui/classNames";
+} from "@calcom/ui/components/table";
import { useColumnSizingVars } from "../hooks";
import { usePersistentColumnResizing } from "../lib/resizing";
diff --git a/packages/features/data-table/components/DataTablePagination.tsx b/packages/features/data-table/components/DataTablePagination.tsx
index b3c7df98370..13d11f50aa6 100644
--- a/packages/features/data-table/components/DataTablePagination.tsx
+++ b/packages/features/data-table/components/DataTablePagination.tsx
@@ -2,7 +2,7 @@
import { type Table } from "@tanstack/react-table";
-import { Pagination } from "@calcom/ui";
+import { Pagination } from "@calcom/ui/components/pagination";
import { useDataTable } from "../hooks";
diff --git a/packages/features/data-table/components/DataTableSelectionBar.tsx b/packages/features/data-table/components/DataTableSelectionBar.tsx
index abe557aa3aa..54c4c93a202 100644
--- a/packages/features/data-table/components/DataTableSelectionBar.tsx
+++ b/packages/features/data-table/components/DataTableSelectionBar.tsx
@@ -4,9 +4,11 @@ import type { Table } from "@tanstack/react-table";
import { forwardRef } from "react";
import { createPortal } from "react-dom";
-import { Button, Icon } from "@calcom/ui";
-import type { IconName, ButtonProps } from "@calcom/ui";
+import type { ButtonProps } from "@calcom/ui/components/button";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
+import { Icon } from "@calcom/ui/components/icon";
+import type { IconName } from "@calcom/ui/components/icon";
export type ActionItem<TData> =
| {
diff --git a/packages/features/data-table/components/DataTableSkeleton.tsx b/packages/features/data-table/components/DataTableSkeleton.tsx
index 7a148d392b5..a5a3eacb668 100644
--- a/packages/features/data-table/components/DataTableSkeleton.tsx
+++ b/packages/features/data-table/components/DataTableSkeleton.tsx
@@ -1,4 +1,11 @@
-import { TableNew, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@calcom/ui";
+import {
+ TableNew,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow,
+} from "@calcom/ui/components/table";
interface DataTableSkeletonProps {
columns: number;
diff --git a/packages/features/data-table/components/DataTableToolbar.tsx b/packages/features/data-table/components/DataTableToolbar.tsx
index 523df0ed57c..8ccb6db72d2 100644
--- a/packages/features/data-table/components/DataTableToolbar.tsx
+++ b/packages/features/data-table/components/DataTableToolbar.tsx
@@ -6,8 +6,9 @@ import type { ComponentPropsWithoutRef } from "react";
import { useDebounce } from "@calcom/lib/hooks/useDebounce";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import type { ButtonProps } from "@calcom/ui";
-import { Button, Input } from "@calcom/ui";
+import type { ButtonProps } from "@calcom/ui/components/button";
+import { Input } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
import { useColumnFilters } from "../hooks";
diff --git a/packages/features/data-table/components/filters/AddFilterButton.tsx b/packages/features/data-table/components/filters/AddFilterButton.tsx
index 9c2dbf6babf..d45c34c2fb5 100644
--- a/packages/features/data-table/components/filters/AddFilterButton.tsx
+++ b/packages/features/data-table/components/filters/AddFilterButton.tsx
@@ -6,19 +6,11 @@ import startCase from "lodash/startCase";
import { forwardRef } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import {
- Button,
- Popover,
- PopoverTrigger,
- PopoverContent,
- Command,
- CommandInput,
- CommandList,
- CommandEmpty,
- CommandItem,
- Icon,
- Tooltip,
-} from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Command, CommandInput, CommandList, CommandEmpty, CommandItem } from "@calcom/ui/components/command";
+import { Icon } from "@calcom/ui/components/icon";
+import { Popover, PopoverTrigger, PopoverContent } from "@calcom/ui/components/popover";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import { useDataTable, useFilterableColumns } from "../../hooks";
diff --git a/packages/features/data-table/components/filters/BaseSelectFilterOptions.tsx b/packages/features/data-table/components/filters/BaseSelectFilterOptions.tsx
index 212ea9fee24..fb9f80da6ea 100644
--- a/packages/features/data-table/components/filters/BaseSelectFilterOptions.tsx
+++ b/packages/features/data-table/components/filters/BaseSelectFilterOptions.tsx
@@ -3,6 +3,8 @@
import { useMemo } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
+import classNames from "@calcom/ui/classNames";
+import { buttonClasses } from "@calcom/ui/components/button";
import {
Command,
CommandInput,
@@ -11,10 +13,8 @@ import {
CommandItem,
CommandSeparator,
CommandGroup,
- buttonClasses,
- Icon,
-} from "@calcom/ui";
-import classNames from "@calcom/ui/classNames";
+} from "@calcom/ui/components/command";
+import { Icon } from "@calcom/ui/components/icon";
import { useDataTable, useFilterValue } from "../../hooks";
import type {
diff --git a/packages/features/data-table/components/filters/ClearFiltersButton.tsx b/packages/features/data-table/components/filters/ClearFiltersButton.tsx
index 6f4f3f042b8..288702a2351 100644
--- a/packages/features/data-table/components/filters/ClearFiltersButton.tsx
+++ b/packages/features/data-table/components/filters/ClearFiltersButton.tsx
@@ -1,5 +1,6 @@
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, Tooltip } from "@calcom/ui";
+import { Tooltip } from "@calcom/ui/components/tooltip";
+import { Button } from "@calcom/ui/components/button";
import { useDataTable } from "../../hooks/useDataTable";
diff --git a/packages/features/data-table/components/filters/ColumnVisibilityButton.tsx b/packages/features/data-table/components/filters/ColumnVisibilityButton.tsx
index de5976a148b..3361203c770 100644
--- a/packages/features/data-table/components/filters/ColumnVisibilityButton.tsx
+++ b/packages/features/data-table/components/filters/ColumnVisibilityButton.tsx
@@ -5,13 +5,10 @@ import { type Table } from "@tanstack/react-table";
import { forwardRef, useState } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import type { ButtonProps } from "@calcom/ui";
+import classNames from "@calcom/ui/classNames";
+import type { ButtonProps } from "@calcom/ui/components/button";
+import { Button, buttonClasses } from "@calcom/ui/components/button";
import {
- Button,
- buttonClasses,
- Popover,
- PopoverTrigger,
- PopoverContent,
Command,
CommandInput,
CommandList,
@@ -19,9 +16,9 @@ import {
CommandGroup,
CommandItem,
CommandSeparator,
- Icon,
-} from "@calcom/ui";
-import classNames from "@calcom/ui/classNames";
+} from "@calcom/ui/components/command";
+import { Icon } from "@calcom/ui/components/icon";
+import { Popover, PopoverTrigger, PopoverContent } from "@calcom/ui/components/popover";
export interface ColumnVisiblityProps<TData> {
table: Table<TData>;
diff --git a/packages/features/data-table/components/filters/DateRangeFilter.tsx b/packages/features/data-table/components/filters/DateRangeFilter.tsx
index edb31579651..230fc55f133 100644
--- a/packages/features/data-table/components/filters/DateRangeFilter.tsx
+++ b/packages/features/data-table/components/filters/DateRangeFilter.tsx
@@ -4,21 +4,18 @@ import { useState, useEffect, useCallback } from "react";
import dayjs from "@calcom/dayjs";
import { useLocale } from "@calcom/lib/hooks/useLocale";
+import classNames from "@calcom/ui/classNames";
+import { Button, buttonClasses } from "@calcom/ui/components/button";
import {
- DateRangePicker,
- Button,
- Icon,
- Popover,
- PopoverContent,
- PopoverTrigger,
Command,
CommandList,
CommandItem,
CommandGroup,
CommandSeparator,
- buttonClasses,
-} from "@calcom/ui";
-import classNames from "@calcom/ui/classNames";
+} from "@calcom/ui/components/command";
+import { DateRangePicker } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { Popover, PopoverContent, PopoverTrigger } from "@calcom/ui/components/popover";
import { useDataTable, useFilterValue } from "../../hooks";
import {
diff --git a/packages/features/data-table/components/filters/FilterPopover.tsx b/packages/features/data-table/components/filters/FilterPopover.tsx
index b6cdaef7141..fffdf6c6dc8 100644
--- a/packages/features/data-table/components/filters/FilterPopover.tsx
+++ b/packages/features/data-table/components/filters/FilterPopover.tsx
@@ -1,8 +1,10 @@
// eslint-disable-next-line no-restricted-imports
import startCase from "lodash/startCase";
-import type { IconName } from "@calcom/ui";
-import { Button, Popover, PopoverContent, PopoverTrigger, Badge } from "@calcom/ui";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import type { IconName } from "@calcom/ui/components/icon";
+import { Popover, PopoverContent, PopoverTrigger } from "@calcom/ui/components/popover";
import { useFilterValue } from "../../hooks";
import { type FilterableColumn, type FilterValue, ZFilterValue, ColumnFilterType } from "../../lib/types";
diff --git a/packages/features/data-table/components/filters/NumberFilterOptions.tsx b/packages/features/data-table/components/filters/NumberFilterOptions.tsx
index 32753e8890f..3fd7c9c1aa6 100644
--- a/packages/features/data-table/components/filters/NumberFilterOptions.tsx
+++ b/packages/features/data-table/components/filters/NumberFilterOptions.tsx
@@ -3,7 +3,8 @@
import { useForm, Controller } from "react-hook-form";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Form, NumberInput, Select, Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Select, Form, NumberInput } from "@calcom/ui/components/form";
import { useFilterValue, useDataTable } from "../../hooks";
import type { FilterableColumn } from "../../lib/types";
diff --git a/packages/features/data-table/components/filters/TextFilterOptions.tsx b/packages/features/data-table/components/filters/TextFilterOptions.tsx
index cfe25f9c222..9a0bc5140d9 100644
--- a/packages/features/data-table/components/filters/TextFilterOptions.tsx
+++ b/packages/features/data-table/components/filters/TextFilterOptions.tsx
@@ -3,7 +3,10 @@
import { useForm, Controller } from "react-hook-form";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Form, Input, Select, Button } from "@calcom/ui";
+import { Select } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
+import { Form } from "@calcom/ui/components/form";
+import { Input } from "@calcom/ui/components/form";
import { useFilterValue, useDataTable } from "../../hooks";
import type { FilterableColumn } from "../../lib/types";
diff --git a/packages/features/ee/api-keys/components/ApiKeyDialogForm.tsx b/packages/features/ee/api-keys/components/ApiKeyDialogForm.tsx
index 7f6727ce3eb..4340034b6e0 100644
--- a/packages/features/ee/api-keys/components/ApiKeyDialogForm.tsx
+++ b/packages/features/ee/api-keys/components/ApiKeyDialogForm.tsx
@@ -6,7 +6,14 @@ import type { TApiKeys } from "@calcom/ee/api-keys/components/ApiKeyListItem";
import LicenseRequired from "@calcom/ee/common/components/LicenseRequired";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Button, DialogFooter, Form, SelectField, showToast, Switch, TextField, Tooltip } from "@calcom/ui";
+import { DialogFooter } from "@calcom/ui/components/dialog";
+import { Button } from "@calcom/ui/components/button";
+import { Form } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { SelectField } from "@calcom/ui/components/form";
+import { Switch } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
+import { Tooltip } from "@calcom/ui/components/tooltip";
export default function ApiKeyDialogForm({
defaultValues,
diff --git a/packages/features/ee/api-keys/components/ApiKeyListItem.tsx b/packages/features/ee/api-keys/components/ApiKeyListItem.tsx
index 3a0fd9cabfc..6449ca946d9 100644
--- a/packages/features/ee/api-keys/components/ApiKeyListItem.tsx
+++ b/packages/features/ee/api-keys/components/ApiKeyListItem.tsx
@@ -3,16 +3,16 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
import {
- Badge,
- Button,
Dropdown,
DropdownItem,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
- showToast,
-} from "@calcom/ui";
+} from "@calcom/ui/components/dropdown";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
+import { showToast } from "@calcom/ui/components/toast";
export type TApiKeys = RouterOutputs["viewer"]["apiKeys"]["list"][number];
diff --git a/packages/features/ee/common/components/LicenseRequired.tsx b/packages/features/ee/common/components/LicenseRequired.tsx
index c19d4c321de..0219aea609c 100644
--- a/packages/features/ee/common/components/LicenseRequired.tsx
+++ b/packages/features/ee/common/components/LicenseRequired.tsx
@@ -6,7 +6,9 @@ import React, { Fragment, useEffect } from "react";
import { WEBAPP_URL } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { EmptyScreen, Alert, Button } from "@calcom/ui";
+import { Alert } from "@calcom/ui/components/alert";
+import { Button } from "@calcom/ui/components/button";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
type LicenseRequiredProps = {
as?: keyof JSX.IntrinsicElements | "";
diff --git a/packages/features/ee/components/BrandColorsForm.tsx b/packages/features/ee/components/BrandColorsForm.tsx
index 613ce31e3f1..91e5dbfc9d2 100644
--- a/packages/features/ee/components/BrandColorsForm.tsx
+++ b/packages/features/ee/components/BrandColorsForm.tsx
@@ -5,8 +5,11 @@ import SectionBottomActions from "@calcom/features/settings/SectionBottomActions
import { DEFAULT_LIGHT_BRAND_COLOR, DEFAULT_DARK_BRAND_COLOR } from "@calcom/lib/constants";
import { checkWCAGContrastColor } from "@calcom/lib/getBrandColours";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, ColorPicker, SettingsToggle, Alert } from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Alert } from "@calcom/ui/components/alert";
+import { Button } from "@calcom/ui/components/button";
+import { ColorPicker } from "@calcom/ui/components/form";
+import { SettingsToggle } from "@calcom/ui/components/form";
type BrandColorsFormValues = {
brandColor: string;
diff --git a/packages/features/ee/components/CommonSkeletonLoaders.tsx b/packages/features/ee/components/CommonSkeletonLoaders.tsx
index 1280a71f67f..0899b7cdf5b 100644
--- a/packages/features/ee/components/CommonSkeletonLoaders.tsx
+++ b/packages/features/ee/components/CommonSkeletonLoaders.tsx
@@ -1,5 +1,5 @@
import SectionBottomActions from "@calcom/features/settings/SectionBottomActions";
-import { SkeletonButton, SkeletonContainer, SkeletonText } from "@calcom/ui";
+import { SkeletonButton, SkeletonContainer, SkeletonText } from "@calcom/ui/components/skeleton";
export const AppearanceSkeletonLoader = () => {
return (
diff --git a/packages/features/ee/deployment/licensekey/CreateLicenseKeyForm.tsx b/packages/features/ee/deployment/licensekey/CreateLicenseKeyForm.tsx
index f0dd0ea77cf..4d88123934c 100644
--- a/packages/features/ee/deployment/licensekey/CreateLicenseKeyForm.tsx
+++ b/packages/features/ee/deployment/licensekey/CreateLicenseKeyForm.tsx
@@ -8,8 +8,10 @@ import { Controller, useForm } from "react-hook-form";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc";
import type { Ensure } from "@calcom/types/utils";
-import { showToast } from "@calcom/ui";
-import { Alert, Button, Form, Label, TextField, ToggleGroup } from "@calcom/ui";
+import { Alert } from "@calcom/ui/components/alert";
+import { Button } from "@calcom/ui/components/button";
+import { Label, TextField, ToggleGroup, Form } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
import { UserPermissionRole } from "../../../../prisma/enums";
diff --git a/packages/features/ee/dsync/components/ConfigureDirectorySync.tsx b/packages/features/ee/dsync/components/ConfigureDirectorySync.tsx
index cac90f49890..a7cbd427990 100644
--- a/packages/features/ee/dsync/components/ConfigureDirectorySync.tsx
+++ b/packages/features/ee/dsync/components/ConfigureDirectorySync.tsx
@@ -3,17 +3,17 @@ import { useState } from "react";
import { SkeletonLoader } from "@calcom/features/apps/components/SkeletonLoader";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
+import { Button } from "@calcom/ui/components/button";
import {
- Button,
Dialog,
- DialogClose,
DialogContent,
DialogFooter,
DialogTrigger,
- Label,
- showToast,
- EmptyScreen,
-} from "@calcom/ui";
+ DialogClose,
+} from "@calcom/ui/components/dialog";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+import { Label } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
import CreateDirectory from "./CreateDirectory";
import DirectoryInfo from "./DirectoryInfo";
diff --git a/packages/features/ee/dsync/components/CreateDirectory.tsx b/packages/features/ee/dsync/components/CreateDirectory.tsx
index 7ddce4218ea..ccc6d2aaf10 100644
--- a/packages/features/ee/dsync/components/CreateDirectory.tsx
+++ b/packages/features/ee/dsync/components/CreateDirectory.tsx
@@ -3,16 +3,10 @@ import { Controller, useForm } from "react-hook-form";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import {
- Button,
- Dialog,
- DialogContent,
- SelectField,
- Form,
- TextField,
- DialogFooter,
- showToast,
-} from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter } from "@calcom/ui/components/dialog";
+import { Form, TextField, SelectField } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
import { directoryProviders } from "../lib/directoryProviders";
diff --git a/packages/features/ee/dsync/components/CreateTeamDialog.tsx b/packages/features/ee/dsync/components/CreateTeamDialog.tsx
index d90d231886c..70879d5390b 100644
--- a/packages/features/ee/dsync/components/CreateTeamDialog.tsx
+++ b/packages/features/ee/dsync/components/CreateTeamDialog.tsx
@@ -1,7 +1,7 @@
import { CreateANewTeamForm } from "@calcom/features/ee/teams/components";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Dialog, DialogContent } from "@calcom/ui";
+import { Dialog, DialogContent } from "@calcom/ui/components/dialog";
interface CreateTeamDialogProps {
open: boolean;
diff --git a/packages/features/ee/dsync/components/DirectoryInfo.tsx b/packages/features/ee/dsync/components/DirectoryInfo.tsx
index 005cbc412b6..a4b05b1a695 100644
--- a/packages/features/ee/dsync/components/DirectoryInfo.tsx
+++ b/packages/features/ee/dsync/components/DirectoryInfo.tsx
@@ -1,7 +1,10 @@
import type { Directory } from "@boxyhq/saml-jackson";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, showToast, Label, Tooltip } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
+import { Label } from "@calcom/ui/components/form";
+import { Tooltip } from "@calcom/ui/components/tooltip";
+import { Button } from "@calcom/ui/components/button";
const DirectoryInfo = ({ directory }: { directory: Directory }) => {
const { t } = useLocale();
diff --git a/packages/features/ee/dsync/components/GroupNameCell.tsx b/packages/features/ee/dsync/components/GroupNameCell.tsx
index 6802a9b5d7f..ada92fa03d6 100644
--- a/packages/features/ee/dsync/components/GroupNameCell.tsx
+++ b/packages/features/ee/dsync/components/GroupNameCell.tsx
@@ -2,8 +2,11 @@ import { useState } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Badge, Icon, showToast, TextField } from "@calcom/ui";
+import { Badge } from "@calcom/ui/components/badge";
+import { Icon } from "@calcom/ui/components/icon";
+import { TextField } from "@calcom/ui/components/form";
import classNames from "@calcom/ui/classNames";
+import { showToast } from "@calcom/ui/components/toast";
interface GroupNameCellProps {
groupNames: string[];
diff --git a/packages/features/ee/impersonation/components/ImpersonatingBanner.tsx b/packages/features/ee/impersonation/components/ImpersonatingBanner.tsx
index 78a4124452d..0cd39ddcf6c 100644
--- a/packages/features/ee/impersonation/components/ImpersonatingBanner.tsx
+++ b/packages/features/ee/impersonation/components/ImpersonatingBanner.tsx
@@ -2,7 +2,7 @@ import type { SessionContextValue } from "next-auth/react";
import { signIn } from "next-auth/react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { TopBanner } from "@calcom/ui";
+import { TopBanner } from "@calcom/ui/components/top-banner";
export type ImpersonatingBannerProps = { data: SessionContextValue["data"] };
diff --git a/packages/features/ee/managed-event-types/hooks/useLockedFieldsManager.tsx b/packages/features/ee/managed-event-types/hooks/useLockedFieldsManager.tsx
index f47bc84c8e5..ba4eb344f34 100644
--- a/packages/features/ee/managed-event-types/hooks/useLockedFieldsManager.tsx
+++ b/packages/features/ee/managed-event-types/hooks/useLockedFieldsManager.tsx
@@ -10,8 +10,11 @@ import type { FormValues } from "@calcom/features/eventtypes/lib/types";
import type { Prisma } from "@calcom/prisma/client";
import { SchedulingType } from "@calcom/prisma/enums";
import type { _EventTypeModel } from "@calcom/prisma/zod/eventtype";
-import { Badge, Icon, Switch, Tooltip } from "@calcom/ui";
+import { Badge } from "@calcom/ui/components/badge";
+import { Icon } from "@calcom/ui/components/icon";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import classNames from "@calcom/ui/classNames";
+import { Switch } from "@calcom/ui/components/form";
export const LockedSwitch = (
isManagedEventType: boolean,
diff --git a/packages/features/ee/organizations/components/AboutOrganizationForm.tsx b/packages/features/ee/organizations/components/AboutOrganizationForm.tsx
index d355189118e..f3caa77a445 100644
--- a/packages/features/ee/organizations/components/AboutOrganizationForm.tsx
+++ b/packages/features/ee/organizations/components/AboutOrganizationForm.tsx
@@ -5,7 +5,13 @@ import { Controller, useForm } from "react-hook-form";
import { useOnboarding } from "@calcom/features/ee/organizations/lib/onboardingStore";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Avatar, Button, Form, Icon, ImageUploader, Label, TextAreaField } from "@calcom/ui";
+import { ImageUploader } from "@calcom/ui/components/image-uploader";
+import { TextAreaField } from "@calcom/ui/components/form";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Button } from "@calcom/ui/components/button";
+import { Form } from "@calcom/ui/components/form";
+import { Label } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
export const AboutOrganizationForm = () => {
const { t } = useLocale();
diff --git a/packages/features/ee/organizations/components/AdminOnboardingHandover.tsx b/packages/features/ee/organizations/components/AdminOnboardingHandover.tsx
index 77371a14597..964eeffbed0 100644
--- a/packages/features/ee/organizations/components/AdminOnboardingHandover.tsx
+++ b/packages/features/ee/organizations/components/AdminOnboardingHandover.tsx
@@ -4,7 +4,8 @@ import { useSession } from "next-auth/react";
import { WEBAPP_URL } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
+import { Button } from "@calcom/ui/components/button";
export const AdminOnboardingHandover = () => {
const { t } = useLocale();
diff --git a/packages/features/ee/organizations/components/CreateANewOrganizationForm.tsx b/packages/features/ee/organizations/components/CreateANewOrganizationForm.tsx
index 05bd69c380d..2e4135b0a5d 100644
--- a/packages/features/ee/organizations/components/CreateANewOrganizationForm.tsx
+++ b/packages/features/ee/organizations/components/CreateANewOrganizationForm.tsx
@@ -14,8 +14,14 @@ import { CreationSource } from "@calcom/prisma/enums";
import { UserPermissionRole } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
import type { Ensure } from "@calcom/types/utils";
-import { Alert, Button, Form, Label, RadioGroup as RadioArea, TextField, ToggleGroup } from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Alert } from "@calcom/ui/components/alert";
+import { Button } from "@calcom/ui/components/button";
+import { ToggleGroup } from "@calcom/ui/components/form";
+import { Form } from "@calcom/ui/components/form";
+import { Label } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { RadioAreaGroup as RadioArea } from "@calcom/ui/components/radio";
import { useOnboarding } from "../lib/onboardingStore";
diff --git a/packages/features/ee/organizations/components/OrgUpgradeBanner.tsx b/packages/features/ee/organizations/components/OrgUpgradeBanner.tsx
index f65cbba5a8f..6e40a28f346 100644
--- a/packages/features/ee/organizations/components/OrgUpgradeBanner.tsx
+++ b/packages/features/ee/organizations/components/OrgUpgradeBanner.tsx
@@ -4,7 +4,8 @@ import { useIsPlatform } from "@calcom/atoms/hooks/useIsPlatform";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
-import { showToast, TopBanner } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
+import { TopBanner } from "@calcom/ui/components/top-banner";
export type OrgUpgradeBannerProps = {
data: RouterOutputs["viewer"]["me"]["getUserTopBanners"]["orgUpgradeBanner"];
diff --git a/packages/features/ee/organizations/components/TeamInviteFromOrg.tsx b/packages/features/ee/organizations/components/TeamInviteFromOrg.tsx
index a9274ca0e23..48ee050c498 100644
--- a/packages/features/ee/organizations/components/TeamInviteFromOrg.tsx
+++ b/packages/features/ee/organizations/components/TeamInviteFromOrg.tsx
@@ -2,7 +2,8 @@ import type { PropsWithChildren } from "react";
import { useState } from "react";
import type { RouterOutputs } from "@calcom/trpc";
-import { Avatar, TextField } from "@calcom/ui";
+import { TextField } from "@calcom/ui/components/form";
+import { Avatar } from "@calcom/ui/components/avatar";
import classNames from "@calcom/ui/classNames";
type TeamInviteFromOrgProps = PropsWithChildren<{
diff --git a/packages/features/ee/organizations/pages/components/LockEventTypeSwitch.tsx b/packages/features/ee/organizations/pages/components/LockEventTypeSwitch.tsx
index e2ff4df716f..918fde50b1f 100644
--- a/packages/features/ee/organizations/pages/components/LockEventTypeSwitch.tsx
+++ b/packages/features/ee/organizations/pages/components/LockEventTypeSwitch.tsx
@@ -4,19 +4,13 @@ import { useForm } from "react-hook-form";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterOutputs } from "@calcom/trpc";
import { trpc } from "@calcom/trpc";
-import {
- showToast,
- Form,
- SettingsToggle,
- Dialog,
- DialogContent,
- DialogHeader,
- DialogFooter,
- DialogClose,
- Button,
- RadioGroup as RadioArea,
-} from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogClose } from "@calcom/ui/components/dialog";
+import { Form } from "@calcom/ui/components/form";
+import { SettingsToggle } from "@calcom/ui/components/form";
+import { RadioAreaGroup as RadioArea } from "@calcom/ui/components/radio";
+import { showToast } from "@calcom/ui/components/toast";
enum CurrentEventTypeOptions {
DELETE = "DELETE",
diff --git a/packages/features/ee/organizations/pages/components/MemberListItem.tsx b/packages/features/ee/organizations/pages/components/MemberListItem.tsx
index c41b3c9161a..d2770d301e1 100644
--- a/packages/features/ee/organizations/pages/components/MemberListItem.tsx
+++ b/packages/features/ee/organizations/pages/components/MemberListItem.tsx
@@ -3,17 +3,17 @@ import classNames from "classnames";
import TeamPill, { TeamRole } from "@calcom/ee/teams/components/TeamPill";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterOutputs } from "@calcom/trpc/react";
+import { UserAvatar } from "@calcom/ui/components/avatar";
+import { Button } from "@calcom/ui/components/button";
+import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
import {
- Button,
- ButtonGroup,
Dropdown,
DropdownItem,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
- Tooltip,
- UserAvatar,
-} from "@calcom/ui";
+} from "@calcom/ui/components/dropdown";
+import { Tooltip } from "@calcom/ui/components/tooltip";
interface Props {
member: RouterOutputs["viewer"]["organizations"]["listOtherTeamMembers"]["rows"][number];
diff --git a/packages/features/ee/organizations/pages/components/NoSlotsNotificationSwitch.tsx b/packages/features/ee/organizations/pages/components/NoSlotsNotificationSwitch.tsx
index 086367a3fff..44942514901 100644
--- a/packages/features/ee/organizations/pages/components/NoSlotsNotificationSwitch.tsx
+++ b/packages/features/ee/organizations/pages/components/NoSlotsNotificationSwitch.tsx
@@ -3,7 +3,8 @@ import { useState } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterOutputs } from "@calcom/trpc";
import { trpc } from "@calcom/trpc";
-import { SettingsToggle, showToast } from "@calcom/ui";
+import { SettingsToggle } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
interface GeneralViewProps {
currentOrg: RouterOutputs["viewer"]["organizations"]["listCurrent"];
diff --git a/packages/features/ee/organizations/pages/components/OtherTeamList.tsx b/packages/features/ee/organizations/pages/components/OtherTeamList.tsx
index 56795540370..b8be1d884a1 100644
--- a/packages/features/ee/organizations/pages/components/OtherTeamList.tsx
+++ b/packages/features/ee/organizations/pages/components/OtherTeamList.tsx
@@ -3,7 +3,7 @@ import { useState } from "react";
import { trackFormbricksAction } from "@calcom/lib/formbricks-client";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
-import { showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
import OtherTeamListItem from "./OtherTeamListItem";
diff --git a/packages/features/ee/organizations/pages/components/OtherTeamListItem.tsx b/packages/features/ee/organizations/pages/components/OtherTeamListItem.tsx
index fadeec0b90d..3bbba17835f 100644
--- a/packages/features/ee/organizations/pages/components/OtherTeamListItem.tsx
+++ b/packages/features/ee/organizations/pages/components/OtherTeamListItem.tsx
@@ -1,21 +1,19 @@
import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterOutputs } from "@calcom/trpc/react";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Button } from "@calcom/ui/components/button";
+import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
+import { Dialog, DialogTrigger, ConfirmationDialogContent } from "@calcom/ui/components/dialog";
import {
- Avatar,
- Button,
- ButtonGroup,
- ConfirmationDialogContent,
- Dialog,
- DialogTrigger,
Dropdown,
DropdownItem,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
- showToast,
- Tooltip,
-} from "@calcom/ui";
+} from "@calcom/ui/components/dropdown";
+import { showToast } from "@calcom/ui/components/toast";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import { useOrgBranding } from "../../../organizations/context/provider";
diff --git a/packages/features/ee/organizations/pages/components/OtherTeamsListing.tsx b/packages/features/ee/organizations/pages/components/OtherTeamsListing.tsx
index aa19f40d51f..476b9019b7c 100644
--- a/packages/features/ee/organizations/pages/components/OtherTeamsListing.tsx
+++ b/packages/features/ee/organizations/pages/components/OtherTeamsListing.tsx
@@ -1,7 +1,8 @@
import SkeletonLoaderTeamList from "@calcom/ee/teams/components/SkeletonloaderTeamList";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Alert, EmptyScreen } from "@calcom/ui";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+import { Alert } from "@calcom/ui/components/alert";
import OtherTeamList from "./OtherTeamList";
diff --git a/packages/features/ee/organizations/pages/settings/admin-api.tsx b/packages/features/ee/organizations/pages/settings/admin-api.tsx
index 9c776bb06da..6da5ea437f3 100644
--- a/packages/features/ee/organizations/pages/settings/admin-api.tsx
+++ b/packages/features/ee/organizations/pages/settings/admin-api.tsx
@@ -3,7 +3,9 @@
import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
import { UpgradeTip } from "@calcom/features/tips";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, Icon, ButtonGroup } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
+import { Icon } from "@calcom/ui/components/icon";
export const AdminAPIView = () => {
const { t } = useLocale();
diff --git a/packages/features/ee/organizations/pages/settings/admin/AdminOrgEditPage.tsx b/packages/features/ee/organizations/pages/settings/admin/AdminOrgEditPage.tsx
index 6ead4803aea..68f3b8a3738 100644
--- a/packages/features/ee/organizations/pages/settings/admin/AdminOrgEditPage.tsx
+++ b/packages/features/ee/organizations/pages/settings/admin/AdminOrgEditPage.tsx
@@ -8,7 +8,10 @@ import type { z } from "zod";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { orgSettingsSchema } from "@calcom/prisma/zod-utils";
import { trpc } from "@calcom/trpc/react";
-import { Button, Form, TextField, showToast } from "@calcom/ui";
+import { Form } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
+import { showToast } from "@calcom/ui/components/toast";
type FormValues = {
name: Team["name"];
diff --git a/packages/features/ee/organizations/pages/settings/admin/AdminOrgPage.tsx b/packages/features/ee/organizations/pages/settings/admin/AdminOrgPage.tsx
index d931de362a8..df14aa3e8a5 100644
--- a/packages/features/ee/organizations/pages/settings/admin/AdminOrgPage.tsx
+++ b/packages/features/ee/organizations/pages/settings/admin/AdminOrgPage.tsx
@@ -5,7 +5,10 @@ import { useState } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Badge, ConfirmationDialogContent, Dialog, DropdownActions, showToast, Table } from "@calcom/ui";
+import { Badge } from "@calcom/ui/components/badge";
+import { Dialog, ConfirmationDialogContent } from "@calcom/ui/components/dialog";
+import { DropdownActions, Table } from "@calcom/ui/components/table";
+import { showToast } from "@calcom/ui/components/toast";
import { subdomainSuffix } from "../../../../organizations/lib/orgDomains";
diff --git a/packages/features/ee/organizations/pages/settings/admin/WorkspacePlatformPage.tsx b/packages/features/ee/organizations/pages/settings/admin/WorkspacePlatformPage.tsx
index b9211232366..2bad2f9558a 100644
--- a/packages/features/ee/organizations/pages/settings/admin/WorkspacePlatformPage.tsx
+++ b/packages/features/ee/organizations/pages/settings/admin/WorkspacePlatformPage.tsx
@@ -9,20 +9,14 @@ import { z } from "zod";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { serviceAccountKeySchema } from "@calcom/prisma/zod-utils";
import { trpc, type RouterOutputs } from "@calcom/trpc";
-import {
- Button,
- Form,
- Switch,
- showToast,
- Dialog,
- DialogContent,
- DialogFooter,
- DialogClose,
- TextField,
- TextAreaField,
- Table,
- DropdownActions,
-} from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogClose } from "@calcom/ui/components/dialog";
+import { Form } from "@calcom/ui/components/form";
+import { TextAreaField } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { Switch } from "@calcom/ui/components/form";
+import { DropdownActions, Table } from "@calcom/ui/components/table";
+import { showToast } from "@calcom/ui/components/toast";
const { Body, Cell, ColumnTitle, Header, Row } = Table;
diff --git a/packages/features/ee/organizations/pages/settings/appearance.tsx b/packages/features/ee/organizations/pages/settings/appearance.tsx
index 142af7446fe..cf14706e4a4 100644
--- a/packages/features/ee/organizations/pages/settings/appearance.tsx
+++ b/packages/features/ee/organizations/pages/settings/appearance.tsx
@@ -15,7 +15,10 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { MembershipRole } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
import type { RouterOutputs } from "@calcom/trpc/react";
-import { Button, Form, showToast, SettingsToggle } from "@calcom/ui";
+import { Form } from "@calcom/ui/components/form";
+import { SettingsToggle } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
+import { showToast } from "@calcom/ui/components/toast";
type BrandColorsFormValues = {
brandColor: string;
diff --git a/packages/features/ee/organizations/pages/settings/attributes/AttributesForm.tsx b/packages/features/ee/organizations/pages/settings/attributes/AttributesForm.tsx
index f4332c50c0e..8399d351c6b 100644
--- a/packages/features/ee/organizations/pages/settings/attributes/AttributesForm.tsx
+++ b/packages/features/ee/organizations/pages/settings/attributes/AttributesForm.tsx
@@ -5,17 +5,9 @@ import { Controller, useForm, useFieldArray } from "react-hook-form";
import { z } from "zod";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import {
- Button,
- Form,
- SelectField,
- InputField,
- Label,
- Input,
- Dialog,
- ConfirmationDialogContent,
- SettingsToggle,
-} from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, ConfirmationDialogContent } from "@calcom/ui/components/dialog";
+import { SettingsToggle, SelectField, Input, InputField, Form, Label } from "@calcom/ui/components/form";
const attributeFormSchema = z.object({
attrName: z.string().min(1),
diff --git a/packages/features/ee/organizations/pages/settings/attributes/DeleteAttributeModal.tsx b/packages/features/ee/organizations/pages/settings/attributes/DeleteAttributeModal.tsx
index 086b2ce01a5..ab3111381ee 100644
--- a/packages/features/ee/organizations/pages/settings/attributes/DeleteAttributeModal.tsx
+++ b/packages/features/ee/organizations/pages/settings/attributes/DeleteAttributeModal.tsx
@@ -3,7 +3,8 @@ import type { Dispatch, SetStateAction } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
-import { Dialog, ConfirmationDialogContent, showToast } from "@calcom/ui";
+import { Dialog, ConfirmationDialogContent } from "@calcom/ui/components/dialog";
+import { showToast } from "@calcom/ui/components/toast";
type AttributeItemProps = RouterOutputs["viewer"]["attributes"]["list"][number];
diff --git a/packages/features/ee/organizations/pages/settings/attributes/ListSkeleton.tsx b/packages/features/ee/organizations/pages/settings/attributes/ListSkeleton.tsx
index 117c0bb43bc..9b11a628508 100644
--- a/packages/features/ee/organizations/pages/settings/attributes/ListSkeleton.tsx
+++ b/packages/features/ee/organizations/pages/settings/attributes/ListSkeleton.tsx
@@ -1,4 +1,4 @@
-import { SkeletonText } from "@calcom/ui";
+import { SkeletonText } from "@calcom/ui/components/skeleton";
export function ListSkeleton() {
return (
diff --git a/packages/features/ee/organizations/pages/settings/attributes/__tests__/AttributeForm.test.tsx b/packages/features/ee/organizations/pages/settings/attributes/__tests__/AttributeForm.test.tsx
index 48d655641dd..41da58b3dd5 100644
--- a/packages/features/ee/organizations/pages/settings/attributes/__tests__/AttributeForm.test.tsx
+++ b/packages/features/ee/organizations/pages/settings/attributes/__tests__/AttributeForm.test.tsx
@@ -4,7 +4,7 @@ import React from "react";
import type { Mock } from "vitest";
import { vi } from "vitest";
-import { Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
import { AttributeForm } from "../AttributesForm";
diff --git a/packages/features/ee/organizations/pages/settings/attributes/attributes-create-view.tsx b/packages/features/ee/organizations/pages/settings/attributes/attributes-create-view.tsx
index b43649c0201..9a233a53628 100644
--- a/packages/features/ee/organizations/pages/settings/attributes/attributes-create-view.tsx
+++ b/packages/features/ee/organizations/pages/settings/attributes/attributes-create-view.tsx
@@ -7,7 +7,8 @@ import { z } from "zod";
import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Button, showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
+import { Button } from "@calcom/ui/components/button";
import { AttributeForm } from "./AttributesForm";
diff --git a/packages/features/ee/organizations/pages/settings/attributes/attributes-edit-view.tsx b/packages/features/ee/organizations/pages/settings/attributes/attributes-edit-view.tsx
index 12aa4cca0d1..40caad1b0f5 100644
--- a/packages/features/ee/organizations/pages/settings/attributes/attributes-edit-view.tsx
+++ b/packages/features/ee/organizations/pages/settings/attributes/attributes-edit-view.tsx
@@ -7,7 +7,8 @@ import { z } from "zod";
import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Button, showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
+import { Button } from "@calcom/ui/components/button";
import { AttributeForm } from "./AttributesForm";
diff --git a/packages/features/ee/organizations/pages/settings/attributes/attributes-list-view.tsx b/packages/features/ee/organizations/pages/settings/attributes/attributes-list-view.tsx
index 6db2c34c674..80ebe2f92c3 100644
--- a/packages/features/ee/organizations/pages/settings/attributes/attributes-list-view.tsx
+++ b/packages/features/ee/organizations/pages/settings/attributes/attributes-list-view.tsx
@@ -7,18 +7,18 @@ import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequir
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
import {
- Switch,
Dropdown,
- Button,
DropdownMenuTrigger,
DropdownMenuContent,
DropdownItem,
DropdownMenuItem,
- Icon,
- showToast,
- Badge,
-} from "@calcom/ui";
+} from "@calcom/ui/components/dropdown";
+import { Switch } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { showToast } from "@calcom/ui/components/toast";
import { DeleteAttributeModal } from "./DeleteAttributeModal";
import { ListSkeleton } from "./ListSkeleton";
diff --git a/packages/features/ee/organizations/pages/settings/delegationCredential.tsx b/packages/features/ee/organizations/pages/settings/delegationCredential.tsx
index 62ac3b3fdb5..b69a9528d3e 100644
--- a/packages/features/ee/organizations/pages/settings/delegationCredential.tsx
+++ b/packages/features/ee/organizations/pages/settings/delegationCredential.tsx
@@ -7,24 +7,19 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { ServiceAccountKey } from "@calcom/lib/server/serviceAccountKey";
import { serviceAccountKeySchema } from "@calcom/prisma/zod-utils";
import { trpc } from "@calcom/trpc/react";
-import {
- DropdownActions,
- Button,
- Dialog,
- DialogContent,
- DialogFooter,
- Form,
- TextField,
- TextAreaField,
- SelectField,
- showToast,
- Badge,
- Switch,
- InfoBadge,
- EmptyScreen,
- SkeletonContainer,
- SkeletonText,
-} from "@calcom/ui";
+import { Badge } from "@calcom/ui/components/badge";
+import { InfoBadge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter } from "@calcom/ui/components/dialog";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+import { Form } from "@calcom/ui/components/form";
+import { TextAreaField } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { SelectField } from "@calcom/ui/components/form";
+import { Switch } from "@calcom/ui/components/form";
+import { SkeletonContainer, SkeletonText } from "@calcom/ui/components/skeleton";
+import { DropdownActions } from "@calcom/ui/components/table";
+import { showToast } from "@calcom/ui/components/toast";
interface DelegationItemProps {
delegation: {
diff --git a/packages/features/ee/organizations/pages/settings/general.tsx b/packages/features/ee/organizations/pages/settings/general.tsx
index 2733032665d..5f7ae53a5ef 100644
--- a/packages/features/ee/organizations/pages/settings/general.tsx
+++ b/packages/features/ee/organizations/pages/settings/general.tsx
@@ -13,17 +13,18 @@ import { nameOfDay } from "@calcom/lib/weekday";
import { MembershipRole } from "@calcom/prisma/enums";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
+import { Form } from "@calcom/ui/components/form";
+import { Label } from "@calcom/ui/components/form";
+import { Select } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
+import classNames from "@calcom/ui/classNames";
import {
- Button,
- Form,
- Label,
- Select,
- showToast,
SkeletonButton,
SkeletonContainer,
SkeletonText,
-} from "@calcom/ui";
-import classNames from "@calcom/ui/classNames";
+ SkeletonAvatar,
+} from "@calcom/ui/components/skeleton";
+import { showToast } from "@calcom/ui/components/toast";
import { LockEventTypeSwitch } from "../components/LockEventTypeSwitch";
import { NoSlotsNotificationSwitch } from "../components/NoSlotsNotificationSwitch";
diff --git a/packages/features/ee/organizations/pages/settings/other-team-members-view.tsx b/packages/features/ee/organizations/pages/settings/other-team-members-view.tsx
index f8e027579d2..47f1d1c10e3 100644
--- a/packages/features/ee/organizations/pages/settings/other-team-members-view.tsx
+++ b/packages/features/ee/organizations/pages/settings/other-team-members-view.tsx
@@ -13,7 +13,8 @@ import { CreationSource } from "@calcom/prisma/enums";
import { MembershipRole } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
import type { RouterOutputs } from "@calcom/trpc/react";
-import { showToast, Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { showToast } from "@calcom/ui/components/toast";
import MakeTeamPrivateSwitch from "../../../teams/components/MakeTeamPrivateSwitch";
import MemberListItem from "../components/MemberListItem";
diff --git a/packages/features/ee/organizations/pages/settings/other-team-profile-view.tsx b/packages/features/ee/organizations/pages/settings/other-team-profile-view.tsx
index b516f4f731d..b4b5c4f1c1d 100644
--- a/packages/features/ee/organizations/pages/settings/other-team-profile-view.tsx
+++ b/packages/features/ee/organizations/pages/settings/other-team-profile-view.tsx
@@ -20,22 +20,16 @@ import objectKeys from "@calcom/lib/objectKeys";
import slugify from "@calcom/lib/slugify";
import turndown from "@calcom/lib/turndownService";
import { trpc } from "@calcom/trpc/react";
-import {
- Avatar,
- Button,
- ConfirmationDialogContent,
- Dialog,
- DialogTrigger,
- Editor,
- Form,
- ImageUploader,
- Label,
- LinkIconButton,
- showToast,
- SkeletonContainer,
- SkeletonText,
- TextField,
-} from "@calcom/ui";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Button, LinkIconButton } from "@calcom/ui/components/button";
+import { Dialog, DialogTrigger, ConfirmationDialogContent } from "@calcom/ui/components/dialog";
+import { Editor } from "@calcom/ui/components/editor";
+import { Form } from "@calcom/ui/components/form";
+import { Label } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { ImageUploader } from "@calcom/ui/components/image-uploader";
+import { SkeletonContainer, SkeletonText } from "@calcom/ui/components/skeleton";
+import { showToast } from "@calcom/ui/components/toast";
import { subdomainSuffix } from "../../../organizations/lib/orgDomains";
diff --git a/packages/features/ee/organizations/pages/settings/profile.tsx b/packages/features/ee/organizations/pages/settings/profile.tsx
index 440997d8a5f..ce1abd0a30a 100644
--- a/packages/features/ee/organizations/pages/settings/profile.tsx
+++ b/packages/features/ee/organizations/pages/settings/profile.tsx
@@ -18,25 +18,24 @@ import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
import turndown from "@calcom/lib/turndownService";
import { MembershipRole } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
-import { Icon } from "@calcom/ui";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Button } from "@calcom/ui/components/button";
+import { LinkIconButton } from "@calcom/ui/components/button";
+import { Editor } from "@calcom/ui/components/editor";
+import { Form } from "@calcom/ui/components/form";
+import { Label } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { BannerUploader, ImageUploader } from "@calcom/ui/components/image-uploader";
+// if I include this in the above barrel import, I get a runtime error that the component is not exported.
+import { OrgBanner } from "@calcom/ui/components/organization-banner";
import {
- Avatar,
- BannerUploader,
- Button,
- Editor,
- Form,
- ImageUploader,
- Label,
- LinkIconButton,
- showToast,
- SkeletonAvatar,
SkeletonButton,
SkeletonContainer,
SkeletonText,
- TextField,
-} from "@calcom/ui";
-// if I include this in the above barrel import, I get a runtime error that the component is not exported.
-import { OrgBanner } from "@calcom/ui";
+ SkeletonAvatar,
+} from "@calcom/ui/components/skeleton";
+import { showToast } from "@calcom/ui/components/toast";
import { useOrgBranding } from "../../../organizations/context/provider";
diff --git a/packages/features/ee/payments/components/Payment.tsx b/packages/features/ee/payments/components/Payment.tsx
index cae28b4554b..92c4b30694c 100644
--- a/packages/features/ee/payments/components/Payment.tsx
+++ b/packages/features/ee/payments/components/Payment.tsx
@@ -11,7 +11,8 @@ import { WEBAPP_URL } from "@calcom/lib/constants";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { PaymentOption } from "@calcom/prisma/enums";
-import { Button, CheckboxField } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { CheckboxField } from "@calcom/ui/components/form";
import type { PaymentPageProps } from "../pages/payment";
diff --git a/packages/features/ee/platform/components/CreateANewPlatformForm.tsx b/packages/features/ee/platform/components/CreateANewPlatformForm.tsx
index 6f4b4365b67..b25b868c043 100644
--- a/packages/features/ee/platform/components/CreateANewPlatformForm.tsx
+++ b/packages/features/ee/platform/components/CreateANewPlatformForm.tsx
@@ -16,7 +16,10 @@ import { UserPermissionRole } from "@calcom/prisma/enums";
import { CreationSource } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
import type { Ensure } from "@calcom/types/utils";
-import { Alert, Form, TextField, Button } from "@calcom/ui";
+import { TextField } from "@calcom/ui/components/form";
+import { Alert } from "@calcom/ui/components/alert";
+import { Button } from "@calcom/ui/components/button";
+import { Form } from "@calcom/ui/components/form";
export const CreateANewPlatformForm = () => {
const session = useSession();
diff --git a/packages/features/ee/platform/pages/settings/members.tsx b/packages/features/ee/platform/pages/settings/members.tsx
index e9fa67fda15..a70c57ebd4d 100644
--- a/packages/features/ee/platform/pages/settings/members.tsx
+++ b/packages/features/ee/platform/pages/settings/members.tsx
@@ -5,7 +5,7 @@ import { UserListTable } from "@calcom/features/users/components/UserTable/UserL
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { MembershipRole } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
-import { Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
import NoPlatformPlan from "@calcom/web/components/settings/platform/dashboard/NoPlatformPlan";
import { useGetUserAttributes } from "@calcom/web/components/settings/platform/hooks/useGetUserAttributes";
import { PlatformPricing } from "@calcom/web/components/settings/platform/pricing/platform-pricing/index";
diff --git a/packages/features/ee/sso/components/ConnectionInfo.tsx b/packages/features/ee/sso/components/ConnectionInfo.tsx
index 7b250546e9c..c7367717924 100644
--- a/packages/features/ee/sso/components/ConnectionInfo.tsx
+++ b/packages/features/ee/sso/components/ConnectionInfo.tsx
@@ -2,16 +2,12 @@ import type { SSOConnection } from "@calcom/ee/sso/lib/saml";
import { APP_NAME } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import {
- Button,
- ConfirmationDialogContent,
- Dialog,
- DialogTrigger,
- Icon,
- Label,
- showToast,
- Tooltip,
-} from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogTrigger, ConfirmationDialogContent } from "@calcom/ui/components/dialog";
+import { Label } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { showToast } from "@calcom/ui/components/toast";
+import { Tooltip } from "@calcom/ui/components/tooltip";
export default function ConnectionInfo({
teamId,
diff --git a/packages/features/ee/sso/components/OIDCConnection.tsx b/packages/features/ee/sso/components/OIDCConnection.tsx
index 98b03b8c542..f670b3ab475 100644
--- a/packages/features/ee/sso/components/OIDCConnection.tsx
+++ b/packages/features/ee/sso/components/OIDCConnection.tsx
@@ -4,7 +4,11 @@ import { Controller, useForm } from "react-hook-form";
import type { SSOConnection } from "@calcom/ee/sso/lib/saml";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Button, DialogFooter, Form, showToast, TextField, Dialog, DialogContent } from "@calcom/ui";
+import { Form } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter } from "@calcom/ui/components/dialog";
type FormValues = {
clientId: string;
diff --git a/packages/features/ee/sso/components/SAMLConnection.tsx b/packages/features/ee/sso/components/SAMLConnection.tsx
index 946f3a862a7..54e17af01bd 100644
--- a/packages/features/ee/sso/components/SAMLConnection.tsx
+++ b/packages/features/ee/sso/components/SAMLConnection.tsx
@@ -4,7 +4,11 @@ import { Controller, useForm } from "react-hook-form";
import type { SSOConnection } from "@calcom/ee/sso/lib/saml";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Button, DialogFooter, Form, showToast, TextArea, Dialog, DialogContent } from "@calcom/ui";
+import { Form } from "@calcom/ui/components/form";
+import { TextArea } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter } from "@calcom/ui/components/dialog";
+import { showToast } from "@calcom/ui/components/toast";
interface FormValues {
metadata: string;
diff --git a/packages/features/ee/sso/components/SSOConfiguration.tsx b/packages/features/ee/sso/components/SSOConfiguration.tsx
index 5b12d018806..0835b54cec7 100644
--- a/packages/features/ee/sso/components/SSOConfiguration.tsx
+++ b/packages/features/ee/sso/components/SSOConfiguration.tsx
@@ -4,7 +4,8 @@ import OIDCConnection from "@calcom/features/ee/sso/components/OIDCConnection";
import SAMLConnection from "@calcom/features/ee/sso/components/SAMLConnection";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Alert, SkeletonContainer, SkeletonText } from "@calcom/ui";
+import { Alert } from "@calcom/ui/components/alert";
+import { SkeletonText, SkeletonContainer } from "@calcom/ui/components/skeleton";
const SkeletonLoader = () => {
return (
diff --git a/packages/features/ee/support/components/ContactMenuItem.tsx b/packages/features/ee/support/components/ContactMenuItem.tsx
index b70cff1df45..8da71058239 100644
--- a/packages/features/ee/support/components/ContactMenuItem.tsx
+++ b/packages/features/ee/support/components/ContactMenuItem.tsx
@@ -1,7 +1,8 @@
import { JOIN_COMMUNITY } from "@calcom/lib/constants";
import { useHasPaidPlan } from "@calcom/lib/hooks/useHasPaidPlan";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Icon, UpgradeTeamsBadge } from "@calcom/ui";
+import { UpgradeTeamsBadge } from "@calcom/ui/components/badge";
+import { Icon } from "@calcom/ui/components/icon";
import FreshChatMenuItem from "../lib/freshchat/FreshChatMenuItem";
import HelpscoutMenuItem from "../lib/helpscout/HelpscoutMenuItem";
diff --git a/packages/features/ee/teams/components/AddNewTeamMembers.tsx b/packages/features/ee/teams/components/AddNewTeamMembers.tsx
index 24a92af3506..07103e0c023 100644
--- a/packages/features/ee/teams/components/AddNewTeamMembers.tsx
+++ b/packages/features/ee/teams/components/AddNewTeamMembers.tsx
@@ -13,16 +13,12 @@ import { telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
import { MembershipRole } from "@calcom/prisma/enums";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
-import {
- Badge,
- Button,
- showToast,
- SkeletonButton,
- SkeletonContainer,
- SkeletonText,
- UserAvatar,
-} from "@calcom/ui";
+import { Badge } from "@calcom/ui/components/badge";
+import { UserAvatar } from "@calcom/ui/components/avatar";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
+import { SkeletonButton, SkeletonContainer, SkeletonText } from "@calcom/ui/components/skeleton";
+import { showToast } from "@calcom/ui/components/toast";
type TeamMember = RouterOutputs["viewer"]["teams"]["listMembers"]["members"][number];
diff --git a/packages/features/ee/teams/components/CreateANewTeamForm.tsx b/packages/features/ee/teams/components/CreateANewTeamForm.tsx
index 0f02a8aa549..73f75938380 100644
--- a/packages/features/ee/teams/components/CreateANewTeamForm.tsx
+++ b/packages/features/ee/teams/components/CreateANewTeamForm.tsx
@@ -5,7 +5,11 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import slugify from "@calcom/lib/slugify";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
-import { Alert, Button, DialogFooter, Form, TextField } from "@calcom/ui";
+import { Alert } from "@calcom/ui/components/alert";
+import { Button } from "@calcom/ui/components/button";
+import { DialogFooter } from "@calcom/ui/components/dialog";
+import { Form } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
import { useOrgBranding } from "../../organizations/context/provider";
import { subdomainSuffix } from "../../organizations/lib/orgDomains";
diff --git a/packages/features/ee/teams/components/DeleteBulkTeamMembers.tsx b/packages/features/ee/teams/components/DeleteBulkTeamMembers.tsx
index fdd5f9aadd7..ae284448b9d 100644
--- a/packages/features/ee/teams/components/DeleteBulkTeamMembers.tsx
+++ b/packages/features/ee/teams/components/DeleteBulkTeamMembers.tsx
@@ -1,7 +1,8 @@
import { DataTableSelectionBar } from "@calcom/features/data-table";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { ConfirmationDialogContent, Dialog, DialogTrigger, showToast } from "@calcom/ui";
+import { Dialog, DialogTrigger, ConfirmationDialogContent } from "@calcom/ui/components/dialog";
+import { showToast } from "@calcom/ui/components/toast";
import type { User } from "./MemberList";
diff --git a/packages/features/ee/teams/components/DisableTeamImpersonation.tsx b/packages/features/ee/teams/components/DisableTeamImpersonation.tsx
index d87c84aebec..c93873f883c 100644
--- a/packages/features/ee/teams/components/DisableTeamImpersonation.tsx
+++ b/packages/features/ee/teams/components/DisableTeamImpersonation.tsx
@@ -2,7 +2,8 @@ import { useState } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { showToast, SettingsToggle } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
+import { SettingsToggle } from "@calcom/ui/components/form";
const DisableTeamImpersonation = ({
teamId,
diff --git a/packages/features/ee/teams/components/EditMemberSheet.tsx b/packages/features/ee/teams/components/EditMemberSheet.tsx
index 0e3afcd9921..7cdddecf570 100644
--- a/packages/features/ee/teams/components/EditMemberSheet.tsx
+++ b/packages/features/ee/teams/components/EditMemberSheet.tsx
@@ -11,21 +11,14 @@ import { useEditMode } from "@calcom/features/users/components/UserTable/EditShe
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { MembershipRole } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
-import {
- Avatar,
- Icon,
- Sheet,
- SheetContent,
- SheetFooter,
- SheetHeader,
- SheetBody,
- Skeleton,
- Tooltip,
- ToggleGroup,
- Form,
- showToast,
- Loader,
-} from "@calcom/ui";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Form } from "@calcom/ui/components/form";
+import { ToggleGroup } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { Sheet, SheetContent, SheetFooter, SheetHeader, SheetBody } from "@calcom/ui/components/sheet";
+import { Skeleton, Loader } from "@calcom/ui/components/skeleton";
+import { showToast } from "@calcom/ui/components/toast";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import { updateRoleInCache } from "./MemberChangeRoleModal";
import type { Action, State, User } from "./MemberList";
diff --git a/packages/features/ee/teams/components/EventTypesList.tsx b/packages/features/ee/teams/components/EventTypesList.tsx
index 2aa63b3b31e..0218094d163 100644
--- a/packages/features/ee/teams/components/EventTypesList.tsx
+++ b/packages/features/ee/teams/components/EventTypesList.tsx
@@ -6,21 +6,19 @@ import { DataTableSelectionBar } from "@calcom/features/data-table";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { SchedulingType } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc";
+import classNames from "@calcom/ui/classNames";
+import { Button } from "@calcom/ui/components/button";
import {
- Button,
Command,
CommandEmpty,
CommandGroup,
CommandInput,
CommandItem,
CommandList,
- Popover,
- showToast,
- PopoverContent,
- PopoverTrigger,
- Icon,
-} from "@calcom/ui";
-import classNames from "@calcom/ui/classNames";
+} from "@calcom/ui/components/command";
+import { Icon } from "@calcom/ui/components/icon";
+import { Popover, PopoverContent, PopoverTrigger } from "@calcom/ui/components/popover";
+import { showToast } from "@calcom/ui/components/toast";
import type { User } from "./MemberList";
diff --git a/packages/features/ee/teams/components/GoogleWorkspaceInviteButton.tsx b/packages/features/ee/teams/components/GoogleWorkspaceInviteButton.tsx
index 68894770c05..3d9131886fc 100644
--- a/packages/features/ee/teams/components/GoogleWorkspaceInviteButton.tsx
+++ b/packages/features/ee/teams/components/GoogleWorkspaceInviteButton.tsx
@@ -5,7 +5,9 @@ import { useFlagMap } from "@calcom/features/flags/context/provider";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { useParamsWithFallback } from "@calcom/lib/hooks/useParamsWithFallback";
import { trpc } from "@calcom/trpc";
-import { Button, showToast, Tooltip } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
+import { Tooltip } from "@calcom/ui/components/tooltip";
+import { Button } from "@calcom/ui/components/button";
const GoogleIcon = () => (
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/packages/features/ee/teams/components/InternalNotePresetsView.tsx b/packages/features/ee/teams/components/InternalNotePresetsView.tsx
index c48740658c5..4b3dedb091e 100644
--- a/packages/features/ee/teams/components/InternalNotePresetsView.tsx
+++ b/packages/features/ee/teams/components/InternalNotePresetsView.tsx
@@ -9,8 +9,11 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { MembershipRole } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
import type { RouterOutputs } from "@calcom/trpc/react";
-import { Button, Form, SettingsToggle, showToast, Icon, Input } from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Button } from "@calcom/ui/components/button";
+import { Form, Input, SettingsToggle } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { showToast } from "@calcom/ui/components/toast";
interface ProfileViewProps {
team: RouterOutputs["viewer"]["teams"]["get"];
diff --git a/packages/features/ee/teams/components/InviteLinkSettingsModal.tsx b/packages/features/ee/teams/components/InviteLinkSettingsModal.tsx
index 13aa1752551..9765b1d7cf8 100644
--- a/packages/features/ee/teams/components/InviteLinkSettingsModal.tsx
+++ b/packages/features/ee/teams/components/InviteLinkSettingsModal.tsx
@@ -3,7 +3,12 @@ import { Controller, useForm } from "react-hook-form";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc";
-import { Button, Dialog, DialogContent, DialogFooter, Form, Label, Select, showToast } from "@calcom/ui";
+import { Form } from "@calcom/ui/components/form";
+import { Label } from "@calcom/ui/components/form";
+import { Select } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter } from "@calcom/ui/components/dialog";
+import { showToast } from "@calcom/ui/components/toast";
type InvitationLinkSettingsModalProps = {
isOpen: boolean;
diff --git a/packages/features/ee/teams/components/MakeTeamPrivateSwitch.tsx b/packages/features/ee/teams/components/MakeTeamPrivateSwitch.tsx
index f11fc2b15ba..d3d79fb3181 100644
--- a/packages/features/ee/teams/components/MakeTeamPrivateSwitch.tsx
+++ b/packages/features/ee/teams/components/MakeTeamPrivateSwitch.tsx
@@ -2,7 +2,8 @@ import { useState } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { showToast, SettingsToggle } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
+import { SettingsToggle } from "@calcom/ui/components/form";
const MakeTeamPrivateSwitch = ({
teamId,
diff --git a/packages/features/ee/teams/components/MemberChangeRoleModal.tsx b/packages/features/ee/teams/components/MemberChangeRoleModal.tsx
index 955e6f1861a..70ea0c8d471 100644
--- a/packages/features/ee/teams/components/MemberChangeRoleModal.tsx
+++ b/packages/features/ee/teams/components/MemberChangeRoleModal.tsx
@@ -4,7 +4,9 @@ import { useMemo, useState } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { MembershipRole } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
-import { Button, Dialog, DialogContent, DialogFooter, Select } from "@calcom/ui";
+import { Select } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter } from "@calcom/ui/components/dialog";
type MembershipRoleOption = {
label: string;
diff --git a/packages/features/ee/teams/components/MemberInvitationModal.tsx b/packages/features/ee/teams/components/MemberInvitationModal.tsx
index 58f9199a699..dcdf77562ac 100644
--- a/packages/features/ee/teams/components/MemberInvitationModal.tsx
+++ b/packages/features/ee/teams/components/MemberInvitationModal.tsx
@@ -13,21 +13,17 @@ import { CreationSource } from "@calcom/prisma/enums";
import type { RouterOutputs } from "@calcom/trpc";
import { trpc } from "@calcom/trpc";
import { isEmail } from "@calcom/trpc/server/routers/viewer/teams/util";
-import {
- Button,
- Dialog,
- DialogContent,
- DialogFooter,
- Form,
- Icon,
- Label,
- Select,
- showToast,
- TextAreaField,
- TextField,
- ToggleGroup,
-} from "@calcom/ui";
+import { TextAreaField } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
+import { Dialog, DialogContent, DialogFooter } from "@calcom/ui/components/dialog";
+import { Form } from "@calcom/ui/components/form";
+import { Label } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { Select } from "@calcom/ui/components/form";
+import { ToggleGroup } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { showToast } from "@calcom/ui/components/toast";
import type { PendingMember } from "../lib/types";
import { GoogleWorkspaceInviteButton } from "./GoogleWorkspaceInviteButton";
diff --git a/packages/features/ee/teams/components/MemberList.tsx b/packages/features/ee/teams/components/MemberList.tsx
index 7da6faeae99..fea4072e52c 100644
--- a/packages/features/ee/teams/components/MemberList.tsx
+++ b/packages/features/ee/teams/components/MemberList.tsx
@@ -33,17 +33,18 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { MembershipRole } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc";
import type { RouterOutputs } from "@calcom/trpc/react";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
import {
- Avatar,
- Badge,
- Button,
- ButtonGroup,
- Checkbox,
- ConfirmationDialogContent,
Dialog,
- DialogClose,
DialogContent,
DialogFooter,
+ DialogClose,
+ ConfirmationDialogContent,
+} from "@calcom/ui/components/dialog";
+import {
Dropdown,
DropdownItem,
DropdownMenuPortal,
@@ -51,9 +52,10 @@ import {
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger,
- showToast,
- Tooltip,
-} from "@calcom/ui";
+} from "@calcom/ui/components/dropdown";
+import { Checkbox } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import DeleteBulkTeamMembers from "./DeleteBulkTeamMembers";
import { EditMemberSheet } from "./EditMemberSheet";
diff --git a/packages/features/ee/teams/components/RoundRobinResetInterval.tsx b/packages/features/ee/teams/components/RoundRobinResetInterval.tsx
index 3683b437043..b3eac1f7224 100644
--- a/packages/features/ee/teams/components/RoundRobinResetInterval.tsx
+++ b/packages/features/ee/teams/components/RoundRobinResetInterval.tsx
@@ -7,7 +7,11 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { MembershipRole, RRResetInterval } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
import type { RouterOutputs } from "@calcom/trpc/react";
-import { Form, showToast, Label, Select, Button } from "@calcom/ui";
+import { Label } from "@calcom/ui/components/form";
+import { Select } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
+import { Form } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
interface ProfileViewProps {
team: RouterOutputs["viewer"]["teams"]["get"];
diff --git a/packages/features/ee/teams/components/SkeletonLoaderAvailabilityTimes.tsx b/packages/features/ee/teams/components/SkeletonLoaderAvailabilityTimes.tsx
index 745da0cf38e..4b28aaf3d5f 100644
--- a/packages/features/ee/teams/components/SkeletonLoaderAvailabilityTimes.tsx
+++ b/packages/features/ee/teams/components/SkeletonLoaderAvailabilityTimes.tsx
@@ -1,4 +1,4 @@
-import { SkeletonContainer, SkeletonText } from "@calcom/ui";
+import { SkeletonText, SkeletonContainer } from "@calcom/ui/components/skeleton";
function SkeletonLoader() {
return (
diff --git a/packages/features/ee/teams/components/SkeletonloaderTeamList.tsx b/packages/features/ee/teams/components/SkeletonloaderTeamList.tsx
index 9c4d97ea7f0..29649071f1e 100644
--- a/packages/features/ee/teams/components/SkeletonloaderTeamList.tsx
+++ b/packages/features/ee/teams/components/SkeletonloaderTeamList.tsx
@@ -1,4 +1,4 @@
-import { SkeletonText } from "@calcom/ui";
+import { SkeletonText } from "@calcom/ui/components/skeleton";
function SkeletonLoaderTeamList() {
return (
diff --git a/packages/features/ee/teams/components/TeamAvailabilityModal.tsx b/packages/features/ee/teams/components/TeamAvailabilityModal.tsx
index 04f01a98dcd..a55721bb66a 100644
--- a/packages/features/ee/teams/components/TeamAvailabilityModal.tsx
+++ b/packages/features/ee/teams/components/TeamAvailabilityModal.tsx
@@ -9,7 +9,9 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { CURRENT_TIMEZONE } from "@calcom/lib/timezoneConstants";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
-import { Avatar, DatePicker, Label, Select } from "@calcom/ui";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Select, DatePicker } from "@calcom/ui/components/form";
+import { Label } from "@calcom/ui/components/form";
import TeamAvailabilityTimes from "./TeamAvailabilityTimes";
diff --git a/packages/features/ee/teams/components/TeamEventTypeForm.tsx b/packages/features/ee/teams/components/TeamEventTypeForm.tsx
index c8fcc089a0b..ce230ed5402 100644
--- a/packages/features/ee/teams/components/TeamEventTypeForm.tsx
+++ b/packages/features/ee/teams/components/TeamEventTypeForm.tsx
@@ -6,9 +6,12 @@ import type { CreateEventTypeFormValues } from "@calcom/lib/hooks/useCreateEvent
import { useLocale } from "@calcom/lib/hooks/useLocale";
import slugify from "@calcom/lib/slugify";
import { SchedulingType } from "@calcom/prisma/enums";
-import { Form, TextField, Tooltip } from "@calcom/ui";
-import { Alert, RadioGroup as RadioArea } from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Alert } from "@calcom/ui/components/alert";
+import { Form } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { RadioAreaGroup as RadioArea } from "@calcom/ui/components/radio";
+import { Tooltip } from "@calcom/ui/components/tooltip";
type props = {
isTeamAdminOrOwner: boolean;
diff --git a/packages/features/ee/teams/components/TeamInviteList.tsx b/packages/features/ee/teams/components/TeamInviteList.tsx
index 82f7fa83c16..265d9cc191e 100644
--- a/packages/features/ee/teams/components/TeamInviteList.tsx
+++ b/packages/features/ee/teams/components/TeamInviteList.tsx
@@ -3,7 +3,7 @@ import { useState } from "react";
import { trackFormbricksAction } from "@calcom/lib/formbricks-client";
import type { MembershipRole } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
-import { showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
import TeamInviteListItem from "./TeamInviteListItem";
diff --git a/packages/features/ee/teams/components/TeamInviteListItem.tsx b/packages/features/ee/teams/components/TeamInviteListItem.tsx
index 2537fe4a828..d5f5cc6f80c 100644
--- a/packages/features/ee/teams/components/TeamInviteListItem.tsx
+++ b/packages/features/ee/teams/components/TeamInviteListItem.tsx
@@ -3,16 +3,16 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { MembershipRole } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
import {
- Avatar,
- Button,
Dropdown,
DropdownItem,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
- showToast,
-} from "@calcom/ui";
+} from "@calcom/ui/components/dropdown";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
+import { showToast } from "@calcom/ui/components/toast";
interface Props {
team: {
diff --git a/packages/features/ee/teams/components/TeamList.tsx b/packages/features/ee/teams/components/TeamList.tsx
index 963712bd1d2..58c4f6928a0 100644
--- a/packages/features/ee/teams/components/TeamList.tsx
+++ b/packages/features/ee/teams/components/TeamList.tsx
@@ -8,7 +8,9 @@ import { trackFormbricksAction } from "@calcom/lib/formbricks-client";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
-import { Card, Icon, showToast } from "@calcom/ui";
+import { Card } from "@calcom/ui/components/card";
+import { Icon } from "@calcom/ui/components/icon";
+import { showToast } from "@calcom/ui/components/toast";
import TeamListItem from "./TeamListItem";
diff --git a/packages/features/ee/teams/components/TeamListItem.tsx b/packages/features/ee/teams/components/TeamListItem.tsx
index 1b27ae6b7f6..ccef60ed73b 100644
--- a/packages/features/ee/teams/components/TeamListItem.tsx
+++ b/packages/features/ee/teams/components/TeamListItem.tsx
@@ -12,24 +12,22 @@ import { useRefreshData } from "@calcom/lib/hooks/useRefreshData";
import { MembershipRole } from "@calcom/prisma/enums";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
+import classNames from "@calcom/ui/classNames";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
+import { Dialog, DialogTrigger, ConfirmationDialogContent } from "@calcom/ui/components/dialog";
import {
- Avatar,
- Badge,
- Button,
- ButtonGroup,
- ConfirmationDialogContent,
- Dialog,
- DialogTrigger,
Dropdown,
DropdownItem,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger,
- showToast,
- Tooltip,
-} from "@calcom/ui";
-import classNames from "@calcom/ui/classNames";
+} from "@calcom/ui/components/dropdown";
+import { showToast } from "@calcom/ui/components/toast";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import { TeamRole } from "./TeamPill";
diff --git a/packages/features/ee/teams/components/TeamsListing.tsx b/packages/features/ee/teams/components/TeamsListing.tsx
index 0651c6c09f3..d1b11a326b7 100644
--- a/packages/features/ee/teams/components/TeamsListing.tsx
+++ b/packages/features/ee/teams/components/TeamsListing.tsx
@@ -6,7 +6,13 @@ import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { CreationSource } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
-import { Alert, Button, ButtonGroup, EmptyScreen, Icon, Label, showToast } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { Label } from "@calcom/ui/components/form";
+import { Alert } from "@calcom/ui/components/alert";
+import { Button } from "@calcom/ui/components/button";
+import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+import { showToast } from "@calcom/ui/components/toast";
import { UpgradeTip } from "../../../tips";
import SkeletonLoaderTeamList from "./SkeletonloaderTeamList";
diff --git a/packages/features/ee/teams/components/TeamsUpgradeBanner.tsx b/packages/features/ee/teams/components/TeamsUpgradeBanner.tsx
index 07cb8db44fe..9a7f9994237 100644
--- a/packages/features/ee/teams/components/TeamsUpgradeBanner.tsx
+++ b/packages/features/ee/teams/components/TeamsUpgradeBanner.tsx
@@ -3,7 +3,8 @@ import { useRouter } from "next/navigation";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
import type { RouterOutputs } from "@calcom/trpc/react";
-import { showToast, TopBanner } from "@calcom/ui";
+import { TopBanner } from "@calcom/ui/components/top-banner";
+import { showToast } from "@calcom/ui/components/toast";
export type TeamsUpgradeBannerProps = {
data: RouterOutputs["viewer"]["me"]["getUserTopBanners"]["teamUpgradeBanner"];
diff --git a/packages/features/ee/teams/components/createButton/CreateButton.tsx b/packages/features/ee/teams/components/createButton/CreateButton.tsx
index 950741e62e9..f1c92a936d0 100644
--- a/packages/features/ee/teams/components/createButton/CreateButton.tsx
+++ b/packages/features/ee/teams/components/createButton/CreateButton.tsx
@@ -4,17 +4,17 @@ import { usePathname, useRouter } from "next/navigation";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import type { ButtonColor } from "@calcom/ui";
+import { Avatar } from "@calcom/ui/components/avatar";
+import type { ButtonColor } from "@calcom/ui/components/button";
+import { Button } from "@calcom/ui/components/button";
import {
- Avatar,
- Button,
Dropdown,
DropdownItem,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuLabel,
DropdownMenuTrigger,
-} from "@calcom/ui";
+} from "@calcom/ui/components/dropdown";
export interface Option {
platform?: boolean;
diff --git a/packages/features/ee/teams/pages/team-appearance-view.tsx b/packages/features/ee/teams/pages/team-appearance-view.tsx
index 5fd55623eeb..423d2178e1f 100644
--- a/packages/features/ee/teams/pages/team-appearance-view.tsx
+++ b/packages/features/ee/teams/pages/team-appearance-view.tsx
@@ -14,7 +14,10 @@ import { useParamsWithFallback } from "@calcom/lib/hooks/useParamsWithFallback";
import { MembershipRole } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
import type { RouterOutputs } from "@calcom/trpc/react";
-import { Button, Form, showToast, SettingsToggle } from "@calcom/ui";
+import { Form } from "@calcom/ui/components/form";
+import { SettingsToggle } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
+import { showToast } from "@calcom/ui/components/toast";
import ThemeLabel from "../../../settings/ThemeLabel";
diff --git a/packages/features/ee/teams/pages/team-profile-view.tsx b/packages/features/ee/teams/pages/team-profile-view.tsx
index b841c033b08..9a068a12c02 100644
--- a/packages/features/ee/teams/pages/team-profile-view.tsx
+++ b/packages/features/ee/teams/pages/team-profile-view.tsx
@@ -24,24 +24,21 @@ import turndown from "@calcom/lib/turndownService";
import { MembershipRole } from "@calcom/prisma/enums";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Button, LinkIconButton } from "@calcom/ui/components/button";
+import { Dialog, DialogTrigger, ConfirmationDialogContent } from "@calcom/ui/components/dialog";
+import { Editor } from "@calcom/ui/components/editor";
+import { Form } from "@calcom/ui/components/form";
+import { Label } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { ImageUploader } from "@calcom/ui/components/image-uploader";
import {
- Avatar,
- Button,
- ConfirmationDialogContent,
- Dialog,
- DialogTrigger,
- Editor,
- Form,
- ImageUploader,
- Label,
- LinkIconButton,
- showToast,
- SkeletonAvatar,
SkeletonButton,
SkeletonContainer,
SkeletonText,
- TextField,
-} from "@calcom/ui";
+ SkeletonAvatar,
+} from "@calcom/ui/components/skeleton";
+import { showToast } from "@calcom/ui/components/toast";
const regex = new RegExp("^[a-zA-Z0-9-]*$");
diff --git a/packages/features/ee/teams/pages/team-settings-view.tsx b/packages/features/ee/teams/pages/team-settings-view.tsx
index d49229b5f41..a025812aa1d 100644
--- a/packages/features/ee/teams/pages/team-settings-view.tsx
+++ b/packages/features/ee/teams/pages/team-settings-view.tsx
@@ -14,8 +14,12 @@ import { validateIntervalLimitOrder } from "@calcom/lib/intervalLimits/validateI
import { MembershipRole } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
import type { RouterOutputs } from "@calcom/trpc/react";
-import { Button, CheckboxField, Form, SettingsToggle, showToast } from "@calcom/ui";
+import { Form } from "@calcom/ui/components/form";
+import { SettingsToggle } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
+import { CheckboxField } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
import { default as InternalNotePresetsView } from "../components/InternalNotePresetsView";
import RoundRobinResetInterval from "../components/RoundRobinResetInterval";
diff --git a/packages/features/ee/users/components/UserForm.tsx b/packages/features/ee/users/components/UserForm.tsx
index ada3102c7a7..7a18ca67272 100644
--- a/packages/features/ee/users/components/UserForm.tsx
+++ b/packages/features/ee/users/components/UserForm.tsx
@@ -7,7 +7,10 @@ import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { defaultLocaleOption, localeOptions } from "@calcom/lib/i18n";
import { nameOfDay } from "@calcom/lib/weekday";
-import { Avatar, Button, EmailField, Form, ImageUploader, Label, Select, TextField } from "@calcom/ui";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Button } from "@calcom/ui/components/button";
+import { Form, EmailField, Select, Label, TextField } from "@calcom/ui/components/form";
+import { ImageUploader } from "@calcom/ui/components/image-uploader";
import type { UserAdminRouterOutputs } from "../server/trpc-router";
diff --git a/packages/features/ee/users/components/UsersTable.tsx b/packages/features/ee/users/components/UsersTable.tsx
index 2587c48661b..0107bd8970d 100644
--- a/packages/features/ee/users/components/UsersTable.tsx
+++ b/packages/features/ee/users/components/UsersTable.tsx
@@ -7,21 +7,20 @@ import { WEBAPP_URL } from "@calcom/lib/constants";
import { useDebounce } from "@calcom/lib/hooks/useDebounce";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
import {
- Avatar,
- Badge,
- Button,
- ConfirmationDialogContent,
Dialog,
- DialogClose,
DialogContent,
DialogFooter,
- DropdownActions,
- Icon,
- showToast,
- Table,
- TextField,
-} from "@calcom/ui";
+ DialogClose,
+ ConfirmationDialogContent,
+} from "@calcom/ui/components/dialog";
+import { TextField } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { DropdownActions, Table } from "@calcom/ui/components/table";
+import { showToast } from "@calcom/ui/components/toast";
import { withLicenseRequired } from "../../common/components/LicenseRequired";
diff --git a/packages/features/ee/users/pages/users-add-view.tsx b/packages/features/ee/users/pages/users-add-view.tsx
index 01d67ad759b..a3ba67045e7 100644
--- a/packages/features/ee/users/pages/users-add-view.tsx
+++ b/packages/features/ee/users/pages/users-add-view.tsx
@@ -4,7 +4,7 @@ import { usePathname, useRouter } from "next/navigation";
import { getParserWithGeneric } from "@calcom/prisma/zod-utils";
import { trpc } from "@calcom/trpc/react";
-import { showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
import LicenseRequired from "../../common/components/LicenseRequired";
import { UserForm } from "../components/UserForm";
diff --git a/packages/features/ee/users/pages/users-edit-view.tsx b/packages/features/ee/users/pages/users-edit-view.tsx
index ab8249ddd83..405ecf0ffb9 100644
--- a/packages/features/ee/users/pages/users-edit-view.tsx
+++ b/packages/features/ee/users/pages/users-edit-view.tsx
@@ -7,7 +7,7 @@ import NoSSR from "@calcom/lib/components/NoSSR";
import { useParamsWithFallback } from "@calcom/lib/hooks/useParamsWithFallback";
import { getParserWithGeneric } from "@calcom/prisma/zod-utils";
import { trpc } from "@calcom/trpc/react";
-import { showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
import LicenseRequired from "../../common/components/LicenseRequired";
import { UserForm } from "../components/UserForm";
diff --git a/packages/features/ee/video/ViewRecordingsDialog.tsx b/packages/features/ee/video/ViewRecordingsDialog.tsx
index 3f4f8e0ed61..159c3eef97d 100644
--- a/packages/features/ee/video/ViewRecordingsDialog.tsx
+++ b/packages/features/ee/video/ViewRecordingsDialog.tsx
@@ -9,7 +9,8 @@ import type { RecordingItemSchema } from "@calcom/prisma/zod-utils";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
import type { PartialReference } from "@calcom/types/EventManager";
-import { Button, Dialog, DialogClose, DialogContent, DialogFooter, DialogHeader } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogClose } from "@calcom/ui/components/dialog";
import RecordingListSkeleton from "./components/RecordingListSkeleton";
diff --git a/packages/features/ee/video/components/RecordingListItemSkeleton.tsx b/packages/features/ee/video/components/RecordingListItemSkeleton.tsx
index 3be37a2c7a3..d2778b0e4ef 100644
--- a/packages/features/ee/video/components/RecordingListItemSkeleton.tsx
+++ b/packages/features/ee/video/components/RecordingListItemSkeleton.tsx
@@ -1,4 +1,4 @@
-import { SkeletonText, SkeletonButton } from "@calcom/ui";
+import { SkeletonText, SkeletonButton } from "@calcom/ui/components/skeleton";
export default function RecordingListItemSkeleton() {
return (
diff --git a/packages/features/ee/video/components/RecordingListSkeleton.tsx b/packages/features/ee/video/components/RecordingListSkeleton.tsx
index 56e938ddae3..63ced8485f9 100644
--- a/packages/features/ee/video/components/RecordingListSkeleton.tsx
+++ b/packages/features/ee/video/components/RecordingListSkeleton.tsx
@@ -1,4 +1,4 @@
-import { SkeletonContainer } from "@calcom/ui";
+import { SkeletonContainer } from "@calcom/ui/components/skeleton";
import RecordingListItemSkeleton from "./RecordingListItemSkeleton";
diff --git a/packages/features/ee/workflows/components/AddActionDialog.tsx b/packages/features/ee/workflows/components/AddActionDialog.tsx
index 417840ba394..623194c6761 100644
--- a/packages/features/ee/workflows/components/AddActionDialog.tsx
+++ b/packages/features/ee/workflows/components/AddActionDialog.tsx
@@ -10,21 +10,16 @@ import { SENDER_ID, SENDER_NAME } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { WorkflowActions } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
-import {
- Button,
- CheckboxField,
- Dialog,
- DialogClose,
- DialogContent,
- DialogFooter,
- EmailField,
- Form,
- Icon,
- Input,
- Label,
- Select,
- Tooltip,
-} from "@calcom/ui";
+import { EmailField } from "@calcom/ui/components/form";
+import { Select } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogClose } from "@calcom/ui/components/dialog";
+import { CheckboxField } from "@calcom/ui/components/form";
+import { Form } from "@calcom/ui/components/form";
+import { Label } from "@calcom/ui/components/form";
+import { Input } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import { WORKFLOW_ACTIONS } from "../lib/constants";
import { onlyLettersNumbersSpaces } from "../lib/schema";
diff --git a/packages/features/ee/workflows/components/DeleteDialog.tsx b/packages/features/ee/workflows/components/DeleteDialog.tsx
index 7e6b68506c3..3cab91bbb47 100644
--- a/packages/features/ee/workflows/components/DeleteDialog.tsx
+++ b/packages/features/ee/workflows/components/DeleteDialog.tsx
@@ -3,7 +3,8 @@ import type { Dispatch, SetStateAction } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { HttpError } from "@calcom/lib/http-error";
import { trpc } from "@calcom/trpc/react";
-import { ConfirmationDialogContent, Dialog, showToast } from "@calcom/ui";
+import { Dialog, ConfirmationDialogContent } from "@calcom/ui/components/dialog";
+import { showToast } from "@calcom/ui/components/toast";
interface IDeleteDialog {
isOpenDialog: boolean;
diff --git a/packages/features/ee/workflows/components/EmptyScreen.tsx b/packages/features/ee/workflows/components/EmptyScreen.tsx
index 1421a73d83d..32f4f9fe381 100644
--- a/packages/features/ee/workflows/components/EmptyScreen.tsx
+++ b/packages/features/ee/workflows/components/EmptyScreen.tsx
@@ -4,8 +4,10 @@ import { CreateButtonWithTeamsList } from "@calcom/features/ee/teams/components/
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { HttpError } from "@calcom/lib/http-error";
import { trpc } from "@calcom/trpc/react";
-import type { IconName } from "@calcom/ui";
-import { EmptyScreen as ClassicEmptyScreen, Icon, showToast } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { showToast } from "@calcom/ui/components/toast";
+import { EmptyScreen as ClassicEmptyScreen } from "@calcom/ui/components/empty-screen";
+import type { IconName } from "@calcom/ui/components/icon";
type WorkflowExampleType = {
Icon: IconName;
diff --git a/packages/features/ee/workflows/components/SkeletonLoaderEdit.tsx b/packages/features/ee/workflows/components/SkeletonLoaderEdit.tsx
index 8442588db43..f14c6c2f358 100644
--- a/packages/features/ee/workflows/components/SkeletonLoaderEdit.tsx
+++ b/packages/features/ee/workflows/components/SkeletonLoaderEdit.tsx
@@ -1,4 +1,4 @@
-import { SkeletonContainer, SkeletonText } from "@calcom/ui";
+import { SkeletonText, SkeletonContainer } from "@calcom/ui/components/skeleton";
function SkeletonLoader() {
return (
diff --git a/packages/features/ee/workflows/components/SkeletonLoaderEventWorkflowsTab.tsx b/packages/features/ee/workflows/components/SkeletonLoaderEventWorkflowsTab.tsx
index 36c3321fb5a..2e594a615a7 100644
--- a/packages/features/ee/workflows/components/SkeletonLoaderEventWorkflowsTab.tsx
+++ b/packages/features/ee/workflows/components/SkeletonLoaderEventWorkflowsTab.tsx
@@ -1,4 +1,4 @@
-import { SkeletonAvatar, SkeletonText } from "@calcom/ui";
+import { SkeletonText, SkeletonAvatar } from "@calcom/ui/components/skeleton";
function SkeletonLoader() {
return (
diff --git a/packages/features/ee/workflows/components/SkeletonLoaderList.tsx b/packages/features/ee/workflows/components/SkeletonLoaderList.tsx
index 9ab46da982c..921bb904b17 100644
--- a/packages/features/ee/workflows/components/SkeletonLoaderList.tsx
+++ b/packages/features/ee/workflows/components/SkeletonLoaderList.tsx
@@ -1,4 +1,5 @@
-import { Icon, SkeletonText } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { SkeletonText } from "@calcom/ui/components/skeleton";
function SkeletonLoader() {
return (
diff --git a/packages/features/ee/workflows/components/TimeTimeUnitInput.tsx b/packages/features/ee/workflows/components/TimeTimeUnitInput.tsx
index 987be7a6bd3..8523ba2a0f3 100644
--- a/packages/features/ee/workflows/components/TimeTimeUnitInput.tsx
+++ b/packages/features/ee/workflows/components/TimeTimeUnitInput.tsx
@@ -3,15 +3,15 @@ import { useFormContext } from "react-hook-form";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { TimeUnit } from "@calcom/prisma/enums";
+import { Icon } from "@calcom/ui/components/icon";
+import { TextField } from "@calcom/ui/components/form";
import {
Dropdown,
DropdownItem,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
- Icon,
- TextField,
-} from "@calcom/ui";
+} from "@calcom/ui/components/dropdown";
const TIME_UNITS = [TimeUnit.DAY, TimeUnit.HOUR, TimeUnit.MINUTE] as const;
diff --git a/packages/features/ee/workflows/components/WorkflowDetailsPage.tsx b/packages/features/ee/workflows/components/WorkflowDetailsPage.tsx
index bdc8b505eb0..d93fd79e3b1 100644
--- a/packages/features/ee/workflows/components/WorkflowDetailsPage.tsx
+++ b/packages/features/ee/workflows/components/WorkflowDetailsPage.tsx
@@ -9,8 +9,11 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { WorkflowActions } from "@calcom/prisma/enums";
import { WorkflowTemplates } from "@calcom/prisma/enums";
import type { RouterOutputs } from "@calcom/trpc/react";
-import type { MultiSelectCheckboxesOptionType as Option } from "@calcom/ui";
-import { Button, Icon, Label, MultiSelectCheckboxes, TextField, CheckboxField, InfoBadge } from "@calcom/ui";
+import { InfoBadge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import type { MultiSelectCheckboxesOptionType as Option } from "@calcom/ui/components/form";
+import { Label, MultiSelectCheckbox, TextField, CheckboxField } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
import { isSMSAction } from "../lib/actionHelperFunctions";
import type { FormValues } from "../pages/workflow";
@@ -122,7 +125,7 @@ export default function WorkflowDetailsPage(props: Props) {
control={form.control}
render={() => {
return (
- <MultiSelectCheckboxes
+ <MultiSelectCheckbox
options={allOptions}
isDisabled={props.readOnly || form.getValues("selectAll")}
className="w-full md:w-64"
diff --git a/packages/features/ee/workflows/components/WorkflowListPage.tsx b/packages/features/ee/workflows/components/WorkflowListPage.tsx
index 1c2fbddb8d5..fda7ed77651 100644
--- a/packages/features/ee/workflows/components/WorkflowListPage.tsx
+++ b/packages/features/ee/workflows/components/WorkflowListPage.tsx
@@ -7,21 +7,21 @@ import { useState } from "react";
import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
+import classNames from "@calcom/ui/classNames";
+import { ArrowButton } from "@calcom/ui/components/arrow-button";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
import {
- ArrowButton,
- Avatar,
- Badge,
- Button,
- ButtonGroup,
Dropdown,
DropdownItem,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
- Icon,
- Tooltip,
-} from "@calcom/ui";
-import classNames from "@calcom/ui/classNames";
+} from "@calcom/ui/components/dropdown";
+import { Icon } from "@calcom/ui/components/icon";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import { getActionIcon } from "../lib/getActionIcon";
import type { WorkflowStep } from "../lib/types";
diff --git a/packages/features/ee/workflows/components/WorkflowStepContainer.tsx b/packages/features/ee/workflows/components/WorkflowStepContainer.tsx
index 53877613d5a..10efb93e85e 100644
--- a/packages/features/ee/workflows/components/WorkflowStepContainer.tsx
+++ b/packages/features/ee/workflows/components/WorkflowStepContainer.tsx
@@ -15,32 +15,29 @@ import { getTimeFormatStringFromUserTimeFormat } from "@calcom/lib/timeFormat";
import { TimeUnit, WorkflowActions, WorkflowTemplates, WorkflowTriggerEvents } from "@calcom/prisma/enums";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
+import classNames from "@calcom/ui/classNames";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogClose } from "@calcom/ui/components/dialog";
import {
- AddVariablesDropdown,
- Badge,
- Button,
- CheckboxField,
- Dialog,
- DialogClose,
- DialogContent,
- DialogFooter,
Dropdown,
DropdownItem,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
- Editor,
- EmailField,
- Icon,
- Input,
- Label,
- Select,
- showToast,
- TextArea,
- TextField,
- Tooltip,
-} from "@calcom/ui";
-import classNames from "@calcom/ui/classNames";
+} from "@calcom/ui/components/dropdown";
+import { AddVariablesDropdown } from "@calcom/ui/components/editor";
+import { Editor } from "@calcom/ui/components/editor";
+import { CheckboxField } from "@calcom/ui/components/form";
+import { EmailField } from "@calcom/ui/components/form";
+import { TextArea } from "@calcom/ui/components/form";
+import { Label } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { Input } from "@calcom/ui/components/form";
+import { Select } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { showToast } from "@calcom/ui/components/toast";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import {
getWhatsappTemplateForAction,
diff --git a/packages/features/ee/workflows/lib/getActionIcon.tsx b/packages/features/ee/workflows/lib/getActionIcon.tsx
index 64a8cda3e6e..81c96c02a4b 100644
--- a/packages/features/ee/workflows/lib/getActionIcon.tsx
+++ b/packages/features/ee/workflows/lib/getActionIcon.tsx
@@ -1,5 +1,5 @@
import { isSMSOrWhatsappAction } from "@calcom/features/ee/workflows/lib/actionHelperFunctions";
-import { Icon } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
import classNames from "@calcom/ui/classNames";
import type { WorkflowStep } from "../lib/types";
diff --git a/packages/features/ee/workflows/pages/index.tsx b/packages/features/ee/workflows/pages/index.tsx
index 76723af5161..0faa71ce38c 100644
--- a/packages/features/ee/workflows/pages/index.tsx
+++ b/packages/features/ee/workflows/pages/index.tsx
@@ -13,8 +13,10 @@ import { useRouterQuery } from "@calcom/lib/hooks/useRouterQuery";
import { HttpError } from "@calcom/lib/http-error";
import type { WorkflowRepository } from "@calcom/lib/server/repository/workflow";
import { trpc } from "@calcom/trpc/react";
-import { AnimatedPopover, Avatar, showToast } from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { AnimatedPopover } from "@calcom/ui/components/popover";
+import { showToast } from "@calcom/ui/components/toast";
import { FilterResults } from "../../../filters/components/FilterResults";
import { TeamsFilter } from "../../../filters/components/TeamsFilter";
diff --git a/packages/features/ee/workflows/pages/workflow.tsx b/packages/features/ee/workflows/pages/workflow.tsx
index cf8e9eb1937..64779a0820a 100644
--- a/packages/features/ee/workflows/pages/workflow.tsx
+++ b/packages/features/ee/workflows/pages/workflow.tsx
@@ -16,9 +16,13 @@ import { MembershipRole, WorkflowActions } from "@calcom/prisma/enums";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery";
-import type { MultiSelectCheckboxesOptionType as Option } from "@calcom/ui";
-import { Alert, Badge, Button, Form, showToast } from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Alert } from "@calcom/ui/components/alert";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import type { MultiSelectCheckboxesOptionType as Option } from "@calcom/ui/components/form";
+import { Form } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
import LicenseRequired from "../../common/components/LicenseRequired";
import SkeletonLoader from "../components/SkeletonLoaderEdit";
diff --git a/packages/features/embed/Embed.tsx b/packages/features/embed/Embed.tsx
index 2d924332cd9..68a1deac8f6 100644
--- a/packages/features/embed/Embed.tsx
+++ b/packages/features/embed/Embed.tsx
@@ -25,21 +25,15 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { BookerLayouts } from "@calcom/prisma/zod-utils";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
-import {
- Button,
- ColorPicker,
- Dialog,
- DialogClose,
- DialogContent,
- DialogFooter,
- HorizontalTabs,
- Icon,
- Label,
- Select,
- showToast,
- Switch,
- TextField,
-} from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogClose } from "@calcom/ui/components/dialog";
+import { Select, ColorPicker } from "@calcom/ui/components/form";
+import { Label } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { Switch } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { HorizontalTabs } from "@calcom/ui/components/navigation";
+import { showToast } from "@calcom/ui/components/toast";
import { useBookerTime } from "../bookings/Booker/components/hooks/useBookerTime";
import { buildCssVarsPerTheme } from "./lib/buildCssVarsPerTheme";
diff --git a/packages/features/embed/lib/EmbedTabs.tsx b/packages/features/embed/lib/EmbedTabs.tsx
index 0915b85f2dc..aaefe129ce1 100644
--- a/packages/features/embed/lib/EmbedTabs.tsx
+++ b/packages/features/embed/lib/EmbedTabs.tsx
@@ -5,7 +5,7 @@ import type { BookerLayout } from "@calcom/features/bookings/Booker/types";
import { APP_NAME } from "@calcom/lib/constants";
import { useBookerUrl } from "@calcom/lib/hooks/useBookerUrl";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { TextArea } from "@calcom/ui";
+import { TextArea } from "@calcom/ui/components/form";
import type { EmbedFramework, EmbedType, PreviewState } from "../types";
import { Codes } from "./EmbedCodes";
diff --git a/packages/features/eventtypes/components/AddMembersWithSwitch.tsx b/packages/features/eventtypes/components/AddMembersWithSwitch.tsx
index 4b7cf823c0a..17b94be01ac 100644
--- a/packages/features/eventtypes/components/AddMembersWithSwitch.tsx
+++ b/packages/features/eventtypes/components/AddMembersWithSwitch.tsx
@@ -15,7 +15,8 @@ import type {
} from "@calcom/features/eventtypes/lib/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { AttributesQueryValue } from "@calcom/lib/raqb/types";
-import { Label, SettingsToggle } from "@calcom/ui";
+import { Label } from "@calcom/ui/components/form";
+import { SettingsToggle } from "@calcom/ui/components/form";
import AssignAllTeamMembers from "./AssignAllTeamMembers";
import CheckedTeamSelect from "./CheckedTeamSelect";
diff --git a/packages/features/eventtypes/components/AssignAllTeamMembers.tsx b/packages/features/eventtypes/components/AssignAllTeamMembers.tsx
index b812cf44d44..de83966a155 100644
--- a/packages/features/eventtypes/components/AssignAllTeamMembers.tsx
+++ b/packages/features/eventtypes/components/AssignAllTeamMembers.tsx
@@ -3,7 +3,7 @@ import { Controller, useFormContext } from "react-hook-form";
import type { FormValues, SettingsToggleClassNames } from "@calcom/features/eventtypes/lib/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { SettingsToggle } from "@calcom/ui";
+import { SettingsToggle } from "@calcom/ui/components/form";
import classNames from "@calcom/ui/classNames";
const AssignAllTeamMembers = ({
diff --git a/packages/features/eventtypes/components/BulkEditDefaultForEventsModal.tsx b/packages/features/eventtypes/components/BulkEditDefaultForEventsModal.tsx
index 39222328a7d..2af2ed8cc29 100644
--- a/packages/features/eventtypes/components/BulkEditDefaultForEventsModal.tsx
+++ b/packages/features/eventtypes/components/BulkEditDefaultForEventsModal.tsx
@@ -3,7 +3,10 @@ import { useForm } from "react-hook-form";
import { z } from "zod";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Dialog, DialogContent, Form, DialogFooter, DialogClose, Button, CheckboxField } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogClose } from "@calcom/ui/components/dialog";
+import { Form } from "@calcom/ui/components/form";
+import { CheckboxField } from "@calcom/ui/components/form";
export const BulkUpdateEventSchema = z.object({
eventTypeIds: z.array(z.number()),
diff --git a/packages/features/eventtypes/components/CheckedTeamSelect.tsx b/packages/features/eventtypes/components/CheckedTeamSelect.tsx
index 675672b15be..a11f790f749 100644
--- a/packages/features/eventtypes/components/CheckedTeamSelect.tsx
+++ b/packages/features/eventtypes/components/CheckedTeamSelect.tsx
@@ -7,7 +7,11 @@ import type { Props } from "react-select";
import { useIsPlatform } from "@calcom/atoms/hooks/useIsPlatform";
import type { SelectClassNames } from "@calcom/features/eventtypes/lib/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Avatar, Button, Icon, Select, Tooltip } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { Select } from "@calcom/ui/components/form";
+import { Tooltip } from "@calcom/ui/components/tooltip";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
import type { PriorityDialogCustomClassNames, WeightDialogCustomClassNames } from "./HostEditDialogs";
diff --git a/packages/features/eventtypes/components/CheckedUserSelect.tsx b/packages/features/eventtypes/components/CheckedUserSelect.tsx
index bca67fc99ee..201d23d4375 100644
--- a/packages/features/eventtypes/components/CheckedUserSelect.tsx
+++ b/packages/features/eventtypes/components/CheckedUserSelect.tsx
@@ -2,7 +2,11 @@ import { useAutoAnimate } from "@formkit/auto-animate/react";
import type { Props } from "react-select";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Avatar, EmptyScreen, Icon, Label, Select } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { Label } from "@calcom/ui/components/form";
+import { Select } from "@calcom/ui/components/form";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
export type CheckedUserSelectOption = {
avatar: string;
diff --git a/packages/features/eventtypes/components/ChildrenEventTypeSelect.tsx b/packages/features/eventtypes/components/ChildrenEventTypeSelect.tsx
index 1b409792aef..60944219b9f 100644
--- a/packages/features/eventtypes/components/ChildrenEventTypeSelect.tsx
+++ b/packages/features/eventtypes/components/ChildrenEventTypeSelect.tsx
@@ -6,8 +6,14 @@ import { getBookerBaseUrlSync } from "@calcom/lib/getBookerUrl/client";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { MembershipRole } from "@calcom/prisma/enums";
import type { UserProfile } from "@calcom/types/UserProfile";
-import { Avatar, Badge, Button, ButtonGroup, Select, Switch, Tooltip } from "@calcom/ui";
+import { Badge } from "@calcom/ui/components/badge";
+import { Select } from "@calcom/ui/components/form";
+import { Tooltip } from "@calcom/ui/components/tooltip";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Button } from "@calcom/ui/components/button";
+import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
import classNames from "@calcom/ui/classNames";
+import { Switch } from "@calcom/ui/components/form";
export type ChildrenEventType = {
value: string;
diff --git a/packages/features/eventtypes/components/CreateEventTypeDialog.tsx b/packages/features/eventtypes/components/CreateEventTypeDialog.tsx
index 50c9f8b6180..926711f1ad3 100644
--- a/packages/features/eventtypes/components/CreateEventTypeDialog.tsx
+++ b/packages/features/eventtypes/components/CreateEventTypeDialog.tsx
@@ -10,7 +10,9 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { useTypedQuery } from "@calcom/lib/hooks/useTypedQuery";
import { MembershipRole, SchedulingType } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
-import { Button, Dialog, DialogClose, DialogContent, DialogFooter, showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogClose } from "@calcom/ui/components/dialog";
import CreateEventTypeForm from "./CreateEventTypeForm";
diff --git a/packages/features/eventtypes/components/CreateEventTypeForm.tsx b/packages/features/eventtypes/components/CreateEventTypeForm.tsx
index 1b9075816c9..86686bc2d6e 100644
--- a/packages/features/eventtypes/components/CreateEventTypeForm.tsx
+++ b/packages/features/eventtypes/components/CreateEventTypeForm.tsx
@@ -8,7 +8,11 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { md } from "@calcom/lib/markdownIt";
import slugify from "@calcom/lib/slugify";
import turndown from "@calcom/lib/turndownService";
-import { Editor, Form, TextAreaField, TextField, Tooltip } from "@calcom/ui";
+import { Editor } from "@calcom/ui/components/editor";
+import { Form } from "@calcom/ui/components/form";
+import { TextAreaField } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { Tooltip } from "@calcom/ui/components/tooltip";
export default function CreateEventTypeForm({
form,
diff --git a/packages/features/eventtypes/components/DuplicateDialog.tsx b/packages/features/eventtypes/components/DuplicateDialog.tsx
index 65958e7e272..5bb2c8462e5 100644
--- a/packages/features/eventtypes/components/DuplicateDialog.tsx
+++ b/packages/features/eventtypes/components/DuplicateDialog.tsx
@@ -14,17 +14,12 @@ import slugify from "@calcom/lib/slugify";
import turndown from "@calcom/lib/turndownService";
import { EventTypeDuplicateInput } from "@calcom/prisma/zod/custom/eventtype";
import { trpc } from "@calcom/trpc/react";
-import {
- Button,
- Dialog,
- DialogClose,
- DialogContent,
- DialogFooter,
- Form,
- showToast,
- TextField,
- Editor,
-} from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogClose } from "@calcom/ui/components/dialog";
+import { Editor } from "@calcom/ui/components/editor";
+import { Form } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
const querySchema = z.object({
title: z.string().min(1),
diff --git a/packages/features/eventtypes/components/EditWeightsForAllTeamMembers.tsx b/packages/features/eventtypes/components/EditWeightsForAllTeamMembers.tsx
index 1c2e05d7948..96fd1aaf5ac 100644
--- a/packages/features/eventtypes/components/EditWeightsForAllTeamMembers.tsx
+++ b/packages/features/eventtypes/components/EditWeightsForAllTeamMembers.tsx
@@ -9,12 +9,12 @@ import { downloadAsCsv } from "@calcom/lib/csvUtils";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { AttributesQueryValue } from "@calcom/lib/raqb/types";
import { trpc } from "@calcom/trpc";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { buttonClasses } from "@calcom/ui/components/button";
+import { Button } from "@calcom/ui/components/button";
+import { TextField } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
import {
- Avatar,
- Button,
- buttonClasses,
- TextField,
- Icon,
Sheet,
SheetBody,
SheetClose,
@@ -22,8 +22,8 @@ import {
SheetFooter,
SheetHeader,
SheetTitle,
- showToast,
-} from "@calcom/ui";
+} from "@calcom/ui/components/sheet";
+import { showToast } from "@calcom/ui/components/toast";
type TeamMemberItemProps = {
member: Omit<TeamMember, "defaultScheduleId"> & { weight?: number };
diff --git a/packages/features/eventtypes/components/EventType.tsx b/packages/features/eventtypes/components/EventType.tsx
index 3ab224895ee..db0fc96495b 100644
--- a/packages/features/eventtypes/components/EventType.tsx
+++ b/packages/features/eventtypes/components/EventType.tsx
@@ -14,8 +14,8 @@ import type {
} from "@calcom/features/eventtypes/lib/types";
import type { customInputSchema } from "@calcom/prisma/zod-utils";
import type { RouterOutputs } from "@calcom/trpc/react";
-import type { VerticalTabItemProps } from "@calcom/ui";
-import { Form } from "@calcom/ui";
+import { Form } from "@calcom/ui/components/form";
+import type { VerticalTabItemProps } from "@calcom/ui/components/navigation";
import { EventTypeSingleLayout } from "./EventTypeLayout";
diff --git a/packages/features/eventtypes/components/EventTypeDescription.tsx b/packages/features/eventtypes/components/EventTypeDescription.tsx
index 2e6ba8c84d0..22b285a90b6 100644
--- a/packages/features/eventtypes/components/EventTypeDescription.tsx
+++ b/packages/features/eventtypes/components/EventTypeDescription.tsx
@@ -12,7 +12,7 @@ import type { baseEventTypeSelect } from "@calcom/prisma";
import { SchedulingType } from "@calcom/prisma/enums";
import type { EventTypeModel } from "@calcom/prisma/zod";
import { eventTypeMetaDataSchemaWithTypedApps } from "@calcom/prisma/zod-utils";
-import { Badge } from "@calcom/ui";
+import { Badge } from "@calcom/ui/components/badge";
import classNames from "@calcom/ui/classNames";
export type EventTypeDescriptionProps = {
diff --git a/packages/features/eventtypes/components/EventTypeLayout.tsx b/packages/features/eventtypes/components/EventTypeLayout.tsx
index 387a98d2ee5..69105c0e473 100644
--- a/packages/features/eventtypes/components/EventTypeLayout.tsx
+++ b/packages/features/eventtypes/components/EventTypeLayout.tsx
@@ -8,27 +8,26 @@ import type { EventTypeSetupProps } from "@calcom/features/eventtypes/lib/types"
import WebShell from "@calcom/features/shell/Shell";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { SchedulingType } from "@calcom/prisma/enums";
-import type { VerticalTabItemProps } from "@calcom/ui";
+import classNames from "@calcom/ui/classNames";
+import { Button } from "@calcom/ui/components/button";
+import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
+import { VerticalDivider } from "@calcom/ui/components/divider";
import {
- Button,
- ButtonGroup,
DropdownMenuSeparator,
Dropdown,
DropdownMenuContent,
DropdownMenuItem,
DropdownItem,
DropdownMenuTrigger,
- HorizontalTabs,
- Label,
- Icon,
- showToast,
- Skeleton,
- Switch,
- Tooltip,
- VerticalDivider,
- VerticalTabs,
-} from "@calcom/ui";
-import classNames from "@calcom/ui/classNames";
+} from "@calcom/ui/components/dropdown";
+import { Label } from "@calcom/ui/components/form";
+import { Switch } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { HorizontalTabs, VerticalTabs } from "@calcom/ui/components/navigation";
+import type { VerticalTabItemProps } from "@calcom/ui/components/navigation";
+import { Skeleton } from "@calcom/ui/components/skeleton";
+import { showToast } from "@calcom/ui/components/toast";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import { Shell as PlatformShell } from "../../../platform/atoms/src/components/ui/shell";
import { DeleteDialog } from "./dialogs/DeleteDialog";
diff --git a/packages/features/eventtypes/components/HostEditDialogs.tsx b/packages/features/eventtypes/components/HostEditDialogs.tsx
index 07fd15b3b53..db068d08da4 100644
--- a/packages/features/eventtypes/components/HostEditDialogs.tsx
+++ b/packages/features/eventtypes/components/HostEditDialogs.tsx
@@ -11,17 +11,12 @@ import type {
SelectClassNames,
} from "@calcom/features/eventtypes/lib/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import {
- Dialog,
- DialogContent,
- DialogFooter,
- DialogClose,
- Button,
- Label,
- Select,
- TextField,
-} from "@calcom/ui";
+import { Label } from "@calcom/ui/components/form";
+import { Select } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
+import { Dialog, DialogContent, DialogFooter, DialogClose } from "@calcom/ui/components/dialog";
import type { CheckedSelectOption } from "./CheckedTeamSelect";
diff --git a/packages/features/eventtypes/components/Locations.tsx b/packages/features/eventtypes/components/Locations.tsx
index c680f0f797b..bde47c7fdb7 100644
--- a/packages/features/eventtypes/components/Locations.tsx
+++ b/packages/features/eventtypes/components/Locations.tsx
@@ -23,8 +23,11 @@ import type {
import LocationSelect from "@calcom/features/form/components/LocationSelect";
import { WEBAPP_URL } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Icon, Input, Button, showToast } from "@calcom/ui";
+import { Input } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
+import { Icon } from "@calcom/ui/components/icon";
+import { showToast } from "@calcom/ui/components/toast";
export type TEventTypeLocation = Pick<EventTypeSetupProps["eventType"], "locations">;
export type TLocationOptions = Pick<EventTypeSetupProps, "locationOptions">["locationOptions"];
diff --git a/packages/features/eventtypes/components/MultiDropdownSelect.tsx b/packages/features/eventtypes/components/MultiDropdownSelect.tsx
index 8dcd5e35537..b360fb7e0f0 100644
--- a/packages/features/eventtypes/components/MultiDropdownSelect.tsx
+++ b/packages/features/eventtypes/components/MultiDropdownSelect.tsx
@@ -1,7 +1,8 @@
import type { GroupBase, Props, ValueContainerProps } from "react-select";
import { components } from "react-select";
-import { Icon, Select } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { Select } from "@calcom/ui/components/form";
const LimitedChipsContainer = <Option, IsMulti extends boolean, Group extends GroupBase<Option>>({
children,
diff --git a/packages/features/eventtypes/components/MultiplePrivateLinksController.tsx b/packages/features/eventtypes/components/MultiplePrivateLinksController.tsx
index e9122440426..87eb5964577 100644
--- a/packages/features/eventtypes/components/MultiplePrivateLinksController.tsx
+++ b/packages/features/eventtypes/components/MultiplePrivateLinksController.tsx
@@ -5,7 +5,11 @@ import type { EventTypeSetupProps } from "@calcom/features/eventtypes/lib/types"
import type { FormValues } from "@calcom/features/eventtypes/lib/types";
import { generateHashedLink } from "@calcom/lib/generateHashedLink";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, Icon, TextField, Tooltip, showToast } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { showToast } from "@calcom/ui/components/toast";
+import { Button } from "@calcom/ui/components/button";
+import { TextField } from "@calcom/ui/components/form";
+import { Tooltip } from "@calcom/ui/components/tooltip";
export const MultiplePrivateLinksController = ({
team,
diff --git a/packages/features/eventtypes/components/SkeletonLoader.tsx b/packages/features/eventtypes/components/SkeletonLoader.tsx
index b50c73130d5..0913a9dc542 100644
--- a/packages/features/eventtypes/components/SkeletonLoader.tsx
+++ b/packages/features/eventtypes/components/SkeletonLoader.tsx
@@ -1,5 +1,5 @@
-import { SkeletonAvatar, SkeletonContainer, SkeletonText } from "@calcom/ui";
-import { Icon } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { SkeletonAvatar, SkeletonContainer, SkeletonText } from "@calcom/ui/components/skeleton";
function SkeletonLoader() {
return (
diff --git a/packages/features/eventtypes/components/dialogs/AssignmentWarningDialog.tsx b/packages/features/eventtypes/components/dialogs/AssignmentWarningDialog.tsx
index 32243b88252..2dde259e8eb 100644
--- a/packages/features/eventtypes/components/dialogs/AssignmentWarningDialog.tsx
+++ b/packages/features/eventtypes/components/dialogs/AssignmentWarningDialog.tsx
@@ -3,7 +3,8 @@ import type { Dispatch, SetStateAction } from "react";
import type { MutableRefObject } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Dialog, DialogContent, Button, DialogFooter } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter } from "@calcom/ui/components/dialog";
interface AssignmentWarningDialogProps {
isOpenAssignmentWarnDialog: boolean;
diff --git a/packages/features/eventtypes/components/dialogs/DeleteDialog.tsx b/packages/features/eventtypes/components/dialogs/DeleteDialog.tsx
index a94f2a051e4..dc7f2eef9e9 100644
--- a/packages/features/eventtypes/components/dialogs/DeleteDialog.tsx
+++ b/packages/features/eventtypes/components/dialogs/DeleteDialog.tsx
@@ -1,8 +1,8 @@
import { Trans } from "next-i18next";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import type { DialogProps } from "@calcom/ui";
-import { ConfirmationDialogContent, Dialog } from "@calcom/ui";
+import type { DialogProps } from "@calcom/ui/components/dialog";
+import { ConfirmationDialogContent, Dialog } from "@calcom/ui/components/dialog";
export function DeleteDialog({
isManagedEvent,
diff --git a/packages/features/eventtypes/components/dialogs/ManagedEventDialog.tsx b/packages/features/eventtypes/components/dialogs/ManagedEventDialog.tsx
index a9057b26bca..81d19e15643 100644
--- a/packages/features/eventtypes/components/dialogs/ManagedEventDialog.tsx
+++ b/packages/features/eventtypes/components/dialogs/ManagedEventDialog.tsx
@@ -2,7 +2,7 @@ import { Trans } from "next-i18next";
import type { ChildrenEventType } from "@calcom/features/eventtypes/components/ChildrenEventTypeSelect";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { ConfirmationDialogContent, Dialog } from "@calcom/ui";
+import { ConfirmationDialogContent, Dialog } from "@calcom/ui/components/dialog";
interface ManagedEventDialogProps {
slugExistsChildrenDialogOpen: ChildrenEventType[];
diff --git a/packages/features/eventtypes/components/tabs/advanced/CustomEventTypeModal.tsx b/packages/features/eventtypes/components/tabs/advanced/CustomEventTypeModal.tsx
index aa67e8f175f..b5f81e5567e 100644
--- a/packages/features/eventtypes/components/tabs/advanced/CustomEventTypeModal.tsx
+++ b/packages/features/eventtypes/components/tabs/advanced/CustomEventTypeModal.tsx
@@ -7,8 +7,10 @@ import type { InputClassNames } from "@calcom/features/eventtypes/lib/types";
import type { EventNameObjectType } from "@calcom/lib/event";
import { getEventName, validateCustomEventName } from "@calcom/lib/event";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, Dialog, DialogClose, DialogFooter, DialogContent, TextField } from "@calcom/ui";
+import { TextField } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
+import { Dialog, DialogContent, DialogFooter, DialogClose } from "@calcom/ui/components/dialog";
interface FormValues {
customEventName: string;
diff --git a/packages/features/eventtypes/components/tabs/advanced/DisableAllEmailsSetting.tsx b/packages/features/eventtypes/components/tabs/advanced/DisableAllEmailsSetting.tsx
index a8504adb652..e2265481f59 100644
--- a/packages/features/eventtypes/components/tabs/advanced/DisableAllEmailsSetting.tsx
+++ b/packages/features/eventtypes/components/tabs/advanced/DisableAllEmailsSetting.tsx
@@ -3,16 +3,11 @@ import { Trans } from "next-i18next";
import { useState } from "react";
import type { InputClassNames, SettingsToggleClassNames } from "@calcom/features/eventtypes/lib/types";
-import {
- SettingsToggle,
- Dialog,
- DialogContent,
- DialogFooter,
- InputField,
- DialogClose,
- Button,
-} from "@calcom/ui";
+import { InputField } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
+import { Dialog, DialogContent, DialogFooter, DialogClose } from "@calcom/ui/components/dialog";
+import { SettingsToggle } from "@calcom/ui/components/form";
export type EmailNotificationToggleCustomClassNames = SettingsToggleClassNames & {
confirmationDialog?: {
diff --git a/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx b/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
index f603752f9b2..c1bf9a39351 100644
--- a/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
+++ b/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
@@ -39,20 +39,20 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { Prisma } from "@calcom/prisma/client";
import { SchedulingType } from "@calcom/prisma/enums";
import type { RouterOutputs } from "@calcom/trpc/react";
+import classNames from "@calcom/ui/classNames";
+import { Alert } from "@calcom/ui/components/alert";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
import {
- Alert,
- Button,
- Badge,
- CheckboxField,
- Icon,
- Label,
SelectField,
- SettingsToggle,
- Switch,
- TextField,
ColorPicker,
-} from "@calcom/ui";
-import classNames from "@calcom/ui/classNames";
+ TextField,
+ Label,
+ CheckboxField,
+ Switch,
+ SettingsToggle,
+} from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
import type { CustomEventTypeModalClassNames } from "./CustomEventTypeModal";
import CustomEventTypeModal from "./CustomEventTypeModal";
diff --git a/packages/features/eventtypes/components/tabs/advanced/RequiresConfirmationController.tsx b/packages/features/eventtypes/components/tabs/advanced/RequiresConfirmationController.tsx
index cff9a1136eb..fe6fd4be725 100644
--- a/packages/features/eventtypes/components/tabs/advanced/RequiresConfirmationController.tsx
+++ b/packages/features/eventtypes/components/tabs/advanced/RequiresConfirmationController.tsx
@@ -11,8 +11,12 @@ import type { EventTypeSetup, SettingsToggleClassNames } from "@calcom/features/
import type { FormValues } from "@calcom/features/eventtypes/lib/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
-import { Input, SettingsToggle, RadioField, Select, CheckboxField } from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Select } from "@calcom/ui/components/form";
+import { CheckboxField } from "@calcom/ui/components/form";
+import { Input } from "@calcom/ui/components/form";
+import { SettingsToggle } from "@calcom/ui/components/form";
+import { RadioField } from "@calcom/ui/components/radio";
export type RequiresConfirmationCustomClassNames = SettingsToggleClassNames & {
radioGroupContainer?: string;
diff --git a/packages/features/eventtypes/components/tabs/ai/AIEventController.tsx b/packages/features/eventtypes/components/tabs/ai/AIEventController.tsx
index 55096a330d6..e03b6de78d5 100644
--- a/packages/features/eventtypes/components/tabs/ai/AIEventController.tsx
+++ b/packages/features/eventtypes/components/tabs/ai/AIEventController.tsx
@@ -13,8 +13,15 @@ import type { EventTypeSetup, FormValues } from "@calcom/features/eventtypes/lib
import { ComponentForField } from "@calcom/features/form-builder/FormBuilderField";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Button, Label, EmptyScreen, SettingsToggle, Divider, TextField, showToast, Icon } from "@calcom/ui";
+import { Label } from "@calcom/ui/components/form";
+import { Divider } from "@calcom/ui/components/divider";
+import { TextField } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+import { SettingsToggle } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { showToast } from "@calcom/ui/components/toast";
type AIEventControllerProps = {
eventType: EventTypeSetup;
diff --git a/packages/features/eventtypes/components/tabs/apps/EventAppsTab.tsx b/packages/features/eventtypes/components/tabs/apps/EventAppsTab.tsx
index 819e16c87d7..6999d840acb 100644
--- a/packages/features/eventtypes/components/tabs/apps/EventAppsTab.tsx
+++ b/packages/features/eventtypes/components/tabs/apps/EventAppsTab.tsx
@@ -10,7 +10,9 @@ import type { FormValues, EventTypeSetupProps } from "@calcom/features/eventtype
import useAppsData from "@calcom/lib/hooks/useAppsData";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Alert, Button, EmptyScreen } from "@calcom/ui";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+import { Alert } from "@calcom/ui/components/alert";
+import { Button } from "@calcom/ui/components/button";
export type EventType = Pick<EventTypeSetupProps, "eventType">["eventType"] &
EventTypeAppCardComponentProps["eventType"];
diff --git a/packages/features/eventtypes/components/tabs/assignment/EventTeamAssignmentTab.tsx b/packages/features/eventtypes/components/tabs/assignment/EventTeamAssignmentTab.tsx
index b2256f8a431..c128ac31bf1 100644
--- a/packages/features/eventtypes/components/tabs/assignment/EventTeamAssignmentTab.tsx
+++ b/packages/features/eventtypes/components/tabs/assignment/EventTeamAssignmentTab.tsx
@@ -23,8 +23,11 @@ import type {
} from "@calcom/features/eventtypes/lib/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { SchedulingType } from "@calcom/prisma/enums";
-import { Label, Select, SettingsToggle, RadioGroup as RadioArea } from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Label } from "@calcom/ui/components/form";
+import { Select } from "@calcom/ui/components/form";
+import { SettingsToggle } from "@calcom/ui/components/form";
+import { RadioAreaGroup as RadioArea } from "@calcom/ui/components/radio";
import { EditWeightsForAllTeamMembers } from "../../EditWeightsForAllTeamMembers";
diff --git a/packages/features/eventtypes/components/tabs/availability/EventAvailabilityTab.tsx b/packages/features/eventtypes/components/tabs/availability/EventAvailabilityTab.tsx
index 2b4064a3233..f8da0fa72d8 100644
--- a/packages/features/eventtypes/components/tabs/availability/EventAvailabilityTab.tsx
+++ b/packages/features/eventtypes/components/tabs/availability/EventAvailabilityTab.tsx
@@ -23,9 +23,16 @@ import { weekdayNames } from "@calcom/lib/weekday";
import { weekStartNum } from "@calcom/lib/weekstart";
import { SchedulingType } from "@calcom/prisma/enums";
import type { RouterOutputs } from "@calcom/trpc/react";
-import { Avatar, Badge, Button, Icon, Label, Select, SettingsToggle, SkeletonText } from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
-import { Spinner } from "@calcom/ui/components/icon/Spinner";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import { Label } from "@calcom/ui/components/form";
+import { Select } from "@calcom/ui/components/form";
+import { SettingsToggle } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { Spinner } from "@calcom/ui/components/icon";
+import { SkeletonText } from "@calcom/ui/components/skeleton";
type ScheduleQueryData = RouterOutputs["viewer"]["availability"]["schedule"]["get"];
diff --git a/packages/features/eventtypes/components/tabs/instant/InstantEventController.tsx b/packages/features/eventtypes/components/tabs/instant/InstantEventController.tsx
index bb5c6022b57..38e001f844d 100644
--- a/packages/features/eventtypes/components/tabs/instant/InstantEventController.tsx
+++ b/packages/features/eventtypes/components/tabs/instant/InstantEventController.tsx
@@ -15,20 +15,17 @@ import { subscriberUrlReserved } from "@calcom/features/webhooks/lib/subscriberU
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { WebhookTriggerEvents } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
-import {
- Alert,
- Button,
- EmptyScreen,
- SettingsToggle,
- Dialog,
- DialogContent,
- showToast,
- TextField,
- Label,
- Select,
- Badge,
-} from "@calcom/ui";
+import { Alert } from "@calcom/ui/components/alert";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
+import { Dialog, DialogContent } from "@calcom/ui/components/dialog";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+import { Label } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { Select } from "@calcom/ui/components/form";
+import { SettingsToggle } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
type InstantEventControllerProps = {
eventType: EventTypeSetup;
diff --git a/packages/features/eventtypes/components/tabs/limits/EventLimitsTab.tsx b/packages/features/eventtypes/components/tabs/limits/EventLimitsTab.tsx
index fae6c4ed88c..9d62f43e711 100644
--- a/packages/features/eventtypes/components/tabs/limits/EventLimitsTab.tsx
+++ b/packages/features/eventtypes/components/tabs/limits/EventLimitsTab.tsx
@@ -19,8 +19,16 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { ascendingLimitKeys, intervalLimitKeyToUnit } from "@calcom/lib/intervalLimits/intervalLimit";
import type { IntervalLimit } from "@calcom/lib/intervalLimits/intervalLimitSchema";
import { PeriodType } from "@calcom/prisma/enums";
-import { Button, DateRangePicker, InputField, Label, Select, SettingsToggle, TextField } from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Button } from "@calcom/ui/components/button";
+import {
+ InputField,
+ DateRangePicker,
+ Label,
+ TextField,
+ Select,
+ SettingsToggle,
+} from "@calcom/ui/components/form";
type IPeriodType = (typeof PeriodType)[keyof typeof PeriodType];
diff --git a/packages/features/eventtypes/components/tabs/recurring/RecurringEventController.tsx b/packages/features/eventtypes/components/tabs/recurring/RecurringEventController.tsx
index 9f301f28080..9aa196fef0c 100644
--- a/packages/features/eventtypes/components/tabs/recurring/RecurringEventController.tsx
+++ b/packages/features/eventtypes/components/tabs/recurring/RecurringEventController.tsx
@@ -12,7 +12,10 @@ import type { FormValues } from "@calcom/features/eventtypes/lib/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { Frequency } from "@calcom/prisma/zod-utils";
import type { RecurringEvent } from "@calcom/types/Calendar";
-import { Alert, Select, SettingsToggle, TextField } from "@calcom/ui";
+import { Select } from "@calcom/ui/components/form";
+import { SettingsToggle } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { Alert } from "@calcom/ui/components/alert";
import classNames from "@calcom/ui/classNames";
export type RecurringEventControllerProps = {
diff --git a/packages/features/eventtypes/components/tabs/setup/EventSetupTab.tsx b/packages/features/eventtypes/components/tabs/setup/EventSetupTab.tsx
index 793de43a3bb..b5ed2900360 100644
--- a/packages/features/eventtypes/components/tabs/setup/EventSetupTab.tsx
+++ b/packages/features/eventtypes/components/tabs/setup/EventSetupTab.tsx
@@ -18,8 +18,14 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { md } from "@calcom/lib/markdownIt";
import { slugify } from "@calcom/lib/slugify";
import turndown from "@calcom/lib/turndownService";
-import { Label, Select, SettingsToggle, Skeleton, TextField, Editor, TextAreaField } from "@calcom/ui";
+import { Skeleton } from "@calcom/ui/components/skeleton";
import classNames from "@calcom/ui/classNames";
+import { Editor } from "@calcom/ui/components/editor";
+import { TextAreaField } from "@calcom/ui/components/form";
+import { Label } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { Select } from "@calcom/ui/components/form";
+import { SettingsToggle } from "@calcom/ui/components/form";
export type EventSetupTabCustomClassNames = {
wrapper?: string;
diff --git a/packages/features/eventtypes/components/tabs/webhooks/EventWebhooksTab.tsx b/packages/features/eventtypes/components/tabs/webhooks/EventWebhooksTab.tsx
index a2e4c1d018d..70d73e9a5bc 100644
--- a/packages/features/eventtypes/components/tabs/webhooks/EventWebhooksTab.tsx
+++ b/packages/features/eventtypes/components/tabs/webhooks/EventWebhooksTab.tsx
@@ -13,7 +13,11 @@ import { subscriberUrlReserved } from "@calcom/features/webhooks/lib/subscriberU
import { APP_NAME } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Alert, Button, Dialog, DialogContent, EmptyScreen, showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
+import { Alert } from "@calcom/ui/components/alert";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent } from "@calcom/ui/components/dialog";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
export const EventWebhooksTab = ({ eventType }: Pick<EventTypeSetupProps, "eventType">) => {
const { t } = useLocale();
diff --git a/packages/features/eventtypes/components/tabs/workflows/EventWorkfowsTab.tsx b/packages/features/eventtypes/components/tabs/workflows/EventWorkfowsTab.tsx
index dd61d95a77a..3780f72223b 100644
--- a/packages/features/eventtypes/components/tabs/workflows/EventWorkfowsTab.tsx
+++ b/packages/features/eventtypes/components/tabs/workflows/EventWorkfowsTab.tsx
@@ -15,8 +15,14 @@ import { HttpError } from "@calcom/lib/http-error";
import { WorkflowActions } from "@calcom/prisma/enums";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
-import { Alert, Button, EmptyScreen, Icon, showToast, Switch, Tooltip } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { Tooltip } from "@calcom/ui/components/tooltip";
+import { Alert } from "@calcom/ui/components/alert";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+import { Switch } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
type PartialWorkflowType = Pick<WorkflowType, "name" | "activeOn" | "isOrg" | "steps" | "id" | "readOnly">;
diff --git a/packages/features/filters/components/TeamsFilter.tsx b/packages/features/filters/components/TeamsFilter.tsx
index 97342b8ef41..7d6311a4476 100644
--- a/packages/features/filters/components/TeamsFilter.tsx
+++ b/packages/features/filters/components/TeamsFilter.tsx
@@ -6,16 +6,14 @@ import { getOrgOrTeamAvatar } from "@calcom/lib/defaultAvatarImage";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { useTypedQuery } from "@calcom/lib/hooks/useTypedQuery";
import { trpc } from "@calcom/trpc/react";
-import {
- FilterSearchField,
- AnimatedPopover,
- Avatar,
- Divider,
- Icon,
- Tooltip,
- VerticalDivider,
-} from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { VerticalDivider } from "@calcom/ui/components/divider";
+import { Divider } from "@calcom/ui/components/divider";
+import { FilterSearchField } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { AnimatedPopover } from "@calcom/ui/components/popover";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import { filterQuerySchema } from "../lib/getTeamsFiltersFromQuery";
diff --git a/packages/features/flags/components/FlagAdminList.tsx b/packages/features/flags/components/FlagAdminList.tsx
index 5554d88218d..ffb90ba32ae 100644
--- a/packages/features/flags/components/FlagAdminList.tsx
+++ b/packages/features/flags/components/FlagAdminList.tsx
@@ -1,6 +1,10 @@
import { trpc } from "@calcom/trpc/react";
import type { RouterOutputs } from "@calcom/trpc/react";
-import { Badge, List, ListItem, ListItemText, ListItemTitle, Switch, showToast } from "@calcom/ui";
+import { Badge } from "@calcom/ui/components/badge";
+import { Switch } from "@calcom/ui/components/form";
+import { ListItem, ListItemText, ListItemTitle } from "@calcom/ui/components/list";
+import { List } from "@calcom/ui/components/list";
+import { showToast } from "@calcom/ui/components/toast";
export const FlagAdminList = () => {
const [data] = trpc.viewer.features.list.useSuspenseQuery();
diff --git a/packages/features/flags/pages/flag-listing-view.tsx b/packages/features/flags/pages/flag-listing-view.tsx
index 69b026fc981..06ffcdb5f45 100644
--- a/packages/features/flags/pages/flag-listing-view.tsx
+++ b/packages/features/flags/pages/flag-listing-view.tsx
@@ -3,7 +3,7 @@
import { Suspense } from "react";
import NoSSR from "@calcom/lib/components/NoSSR";
-import { SkeletonText, SkeletonContainer } from "@calcom/ui";
+import { SkeletonText, SkeletonContainer } from "@calcom/ui/components/skeleton";
import { FlagAdminList } from "../components/FlagAdminList";
diff --git a/packages/features/form-builder/Components.tsx b/packages/features/form-builder/Components.tsx
index 11ad102cfe7..093feeb8506 100644
--- a/packages/features/form-builder/Components.tsx
+++ b/packages/features/form-builder/Components.tsx
@@ -8,19 +8,13 @@ import type {
import Widgets from "@calcom/app-store/routing-forms/components/react-awesome-query-builder/widgets";
import PhoneInput from "@calcom/features/components/phone-input";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import {
- AddressInput,
- Button,
- CheckboxField,
- EmailField,
- Group,
- Icon,
- InfoBadge,
- InputField,
- Label,
- RadioField,
- Tooltip,
-} from "@calcom/ui";
+import { AddressInput } from "@calcom/ui/components/address";
+import { InfoBadge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import { Label, CheckboxField, EmailField, InputField } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { RadioGroup, RadioField } from "@calcom/ui/components/radio";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import { ComponentForField } from "./FormBuilderField";
import { propsTypes } from "./propsTypes";
@@ -366,7 +360,7 @@ export const Components: Record<FieldType, Component> = {
propsType: propsTypes.radio,
factory: ({ setValue, name, value, options, readOnly }) => {
return (
- <Group
+ <RadioGroup
disabled={readOnly}
value={value}
onValueChange={(e) => {
@@ -382,7 +376,7 @@ export const Components: Record<FieldType, Component> = {
/>
))}
</>
- </Group>
+ </RadioGroup>
);
},
},
diff --git a/packages/features/form-builder/FormBuilder.tsx b/packages/features/form-builder/FormBuilder.tsx
index 5dc4b01f13e..9cef0f4fc99 100644
--- a/packages/features/form-builder/FormBuilder.tsx
+++ b/packages/features/form-builder/FormBuilder.tsx
@@ -9,27 +9,23 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { md } from "@calcom/lib/markdownIt";
import { markdownToSafeHTMLClient } from "@calcom/lib/markdownToSafeHTMLClient";
import turndown from "@calcom/lib/turndownService";
+import classNames from "@calcom/ui/classNames";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogClose } from "@calcom/ui/components/dialog";
+import { Editor } from "@calcom/ui/components/editor";
import {
- Badge,
- BooleanToggleGroupField,
- Button,
+ Switch,
CheckboxField,
- Dialog,
- DialogClose,
- DialogContent,
- DialogFooter,
- DialogHeader,
+ SelectField,
Form,
- Icon,
Input,
InputField,
Label,
- SelectField,
- showToast,
- Editor,
- Switch,
-} from "@calcom/ui";
-import classNames from "@calcom/ui/classNames";
+ BooleanToggleGroupField,
+} from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { showToast } from "@calcom/ui/components/toast";
import { fieldTypesConfigMap } from "./fieldTypes";
import { fieldsThatSupportLabelAsSafeHtml } from "./fieldsThatSupportLabelAsSafeHtml";
diff --git a/packages/features/form-builder/FormBuilderField.tsx b/packages/features/form-builder/FormBuilderField.tsx
index 74d256a310b..da5ab3779ac 100644
--- a/packages/features/form-builder/FormBuilderField.tsx
+++ b/packages/features/form-builder/FormBuilderField.tsx
@@ -4,8 +4,10 @@ import { Controller, useFormContext } from "react-hook-form";
import type { z } from "zod";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Icon, InfoBadge, Label } from "@calcom/ui";
+import { InfoBadge } from "@calcom/ui/components/badge";
import classNames from "@calcom/ui/classNames";
+import { Label } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
import { Components, isValidValueProp } from "./Components";
import { fieldTypesConfigMap } from "./fieldTypes";
diff --git a/packages/features/form/components/CheckboxField.tsx b/packages/features/form/components/CheckboxField.tsx
index e06807330cb..1dbcbbc2e44 100644
--- a/packages/features/form/components/CheckboxField.tsx
+++ b/packages/features/form/components/CheckboxField.tsx
@@ -1,7 +1,7 @@
import type { InputHTMLAttributes } from "react";
import React, { forwardRef } from "react";
-import { InfoBadge } from "@calcom/ui";
+import { InfoBadge } from "@calcom/ui/components/badge";
import classNames from "@calcom/ui/classNames";
type Props = InputHTMLAttributes<HTMLInputElement> & {
diff --git a/packages/features/form/components/LocationSelect.tsx b/packages/features/form/components/LocationSelect.tsx
index b4e8b0115fc..f32fe0238fe 100644
--- a/packages/features/form/components/LocationSelect.tsx
+++ b/packages/features/form/components/LocationSelect.tsx
@@ -4,7 +4,8 @@ import { components } from "react-select";
import type { EventLocationType } from "@calcom/app-store/locations";
import { useIsPlatform } from "@calcom/atoms/hooks/useIsPlatform";
import invertLogoOnDark from "@calcom/lib/invertLogoOnDark";
-import { Select, Icon } from "@calcom/ui";
+import { Select } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
import classNames from "@calcom/ui/classNames";
export type LocationSelectCustomClassNames = {
diff --git a/packages/features/insights/components/BookedByCell.tsx b/packages/features/insights/components/BookedByCell.tsx
index 79b624e6921..cec9143164a 100644
--- a/packages/features/insights/components/BookedByCell.tsx
+++ b/packages/features/insights/components/BookedByCell.tsx
@@ -1,6 +1,6 @@
import { useId } from "react";
-import { Badge } from "@calcom/ui";
+import { Badge } from "@calcom/ui/components/badge";
import type { RoutingFormTableRow } from "../lib/types";
import { CellWithOverflowX } from "./CellWithOverflowX";
diff --git a/packages/features/insights/components/BookingAtCell.tsx b/packages/features/insights/components/BookingAtCell.tsx
index a1a6775647c..3dfc7221539 100644
--- a/packages/features/insights/components/BookingAtCell.tsx
+++ b/packages/features/insights/components/BookingAtCell.tsx
@@ -3,15 +3,15 @@ import { useId } from "react";
import dayjs from "@calcom/dayjs";
import { useCopy } from "@calcom/lib/hooks/useCopy";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Badge } from "@calcom/ui/components/badge";
import {
- Badge,
- Avatar,
- Icon,
HoverCard,
HoverCardContent,
HoverCardTrigger,
HoverCardPortal,
-} from "@calcom/ui";
+} from "@calcom/ui/components/hover-card";
+import { Icon } from "@calcom/ui/components/icon";
import type { RoutingFormTableRow } from "../lib/types";
import { BookingStatusBadge } from "./BookingStatusBadge";
diff --git a/packages/features/insights/components/BookingKPICards.tsx b/packages/features/insights/components/BookingKPICards.tsx
index dd3cf10ce8e..fa111acdf70 100644
--- a/packages/features/insights/components/BookingKPICards.tsx
+++ b/packages/features/insights/components/BookingKPICards.tsx
@@ -2,7 +2,7 @@ import { Grid } from "@tremor/react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc";
-import { SkeletonContainer, SkeletonText } from "@calcom/ui";
+import { SkeletonText, SkeletonContainer } from "@calcom/ui/components/skeleton";
import { useInsightsParameters } from "../hooks/useInsightsParameters";
import { CardInsights } from "./Card";
diff --git a/packages/features/insights/components/BookingStatusBadge.tsx b/packages/features/insights/components/BookingStatusBadge.tsx
index 3aab3756ec8..d4149aec185 100644
--- a/packages/features/insights/components/BookingStatusBadge.tsx
+++ b/packages/features/insights/components/BookingStatusBadge.tsx
@@ -1,5 +1,6 @@
import { BookingStatus } from "@calcom/prisma/enums";
-import { Badge, type BadgeProps } from "@calcom/ui";
+import { Badge } from "@calcom/ui/components/badge";
+import { type BadgeProps } from "@calcom/ui/components/badge";
import { bookingStatusToText } from "../lib/bookingStatusToText";
diff --git a/packages/features/insights/components/FailedBookingsByField.tsx b/packages/features/insights/components/FailedBookingsByField.tsx
index 07c4545d944..da774bc616a 100644
--- a/packages/features/insights/components/FailedBookingsByField.tsx
+++ b/packages/features/insights/components/FailedBookingsByField.tsx
@@ -1,7 +1,7 @@
import { useState } from "react";
import { trpc } from "@calcom/trpc";
-import { ToggleGroup } from "@calcom/ui";
+import { ToggleGroup } from "@calcom/ui/components/form";
import classNames from "@calcom/ui/classNames";
import { useInsightsParameters } from "../hooks/useInsightsParameters";
diff --git a/packages/features/insights/components/FeedbackTable.tsx b/packages/features/insights/components/FeedbackTable.tsx
index 0721a0cbdcd..3d325f55ea5 100644
--- a/packages/features/insights/components/FeedbackTable.tsx
+++ b/packages/features/insights/components/FeedbackTable.tsx
@@ -3,7 +3,9 @@ import { Table, TableBody, TableCell, TableRow, Text } from "@tremor/react";
import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { User } from "@calcom/prisma/client";
-import { Avatar, EmptyScreen, Button } from "@calcom/ui";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Button } from "@calcom/ui/components/button";
export const FeedbackTable = ({
data,
diff --git a/packages/features/insights/components/KPICard.tsx b/packages/features/insights/components/KPICard.tsx
index 748f501f38a..246b3512577 100644
--- a/packages/features/insights/components/KPICard.tsx
+++ b/packages/features/insights/components/KPICard.tsx
@@ -1,7 +1,7 @@
import { Flex, Text, Metric, BadgeDelta } from "@tremor/react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Tooltip } from "@calcom/ui";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import { calculateDeltaType, colors, valueFormatter } from "../lib";
import { CardInsights } from "./Card";
diff --git a/packages/features/insights/components/LoadingInsights.tsx b/packages/features/insights/components/LoadingInsights.tsx
index 2e67751128c..4d9605bf38d 100644
--- a/packages/features/insights/components/LoadingInsights.tsx
+++ b/packages/features/insights/components/LoadingInsights.tsx
@@ -1,4 +1,4 @@
-import { SkeletonText } from "@calcom/ui";
+import { SkeletonText } from "@calcom/ui/components/skeleton";
import classNames from "@calcom/ui/classNames";
import { CardInsights } from "./Card";
diff --git a/packages/features/insights/components/ResponseValueCell.tsx b/packages/features/insights/components/ResponseValueCell.tsx
index d111f814ff2..d3369f52079 100644
--- a/packages/features/insights/components/ResponseValueCell.tsx
+++ b/packages/features/insights/components/ResponseValueCell.tsx
@@ -1,6 +1,12 @@
import { useId } from "react";
-import { Badge, HoverCard, HoverCardContent, HoverCardTrigger, HoverCardPortal } from "@calcom/ui";
+import { Badge } from "@calcom/ui/components/badge";
+import {
+ HoverCard,
+ HoverCardContent,
+ HoverCardTrigger,
+ HoverCardPortal,
+} from "@calcom/ui/components/hover-card";
import { CellWithOverflowX } from "./CellWithOverflowX";
diff --git a/packages/features/insights/components/RoutedToPerPeriod.tsx b/packages/features/insights/components/RoutedToPerPeriod.tsx
index 42506b98310..7ccadb47b59 100644
--- a/packages/features/insights/components/RoutedToPerPeriod.tsx
+++ b/packages/features/insights/components/RoutedToPerPeriod.tsx
@@ -7,26 +7,21 @@ import { downloadAsCsv } from "@calcom/lib/csvUtils";
import { useInViewObserver } from "@calcom/lib/hooks/useInViewObserver";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc";
-import {
- Avatar,
- ToggleGroup,
- Badge,
- Tooltip,
- HoverCard,
- HoverCardContent,
- HoverCardTrigger,
- Input,
- Button,
-} from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import { ToggleGroup, Input } from "@calcom/ui/components/form";
+import { HoverCard, HoverCardContent, HoverCardTrigger } from "@calcom/ui/components/hover-card";
import {
- Table,
+ TableNew,
TableBody,
TableCell,
TableHead,
TableHeader,
TableRow,
-} from "@calcom/ui/components/table/TableNew";
+} from "@calcom/ui/components/table";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import { useInsightsParameters } from "../hooks/useInsightsParameters";
@@ -390,7 +385,7 @@ export function RoutedToPerPeriod() {
<div
className="scrollbar-thin border-subtle relaitve relative h-[80dvh] overflow-auto rounded-md border"
ref={tableContainerRef}>
- <Table className="border-0">
+ <TableNew className="border-0">
<TableHeader className="bg-subtle sticky top-0 z-10">
<TableRow>
<TableHead className="bg-subtle sticky left-0 z-30 w-[200px]">{t("user")}</TableHead>
@@ -458,7 +453,7 @@ export function RoutedToPerPeriod() {
);
})}
</TableBody>
- </Table>
+ </TableNew>
</div>
</div>
</FormCard>
diff --git a/packages/features/insights/components/TotalBookingUsersTable.tsx b/packages/features/insights/components/TotalBookingUsersTable.tsx
index 772a63406c8..cae9ceeb81c 100644
--- a/packages/features/insights/components/TotalBookingUsersTable.tsx
+++ b/packages/features/insights/components/TotalBookingUsersTable.tsx
@@ -2,7 +2,7 @@ import { Table, TableBody, TableCell, TableRow, Text } from "@tremor/react";
import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
import type { User } from "@calcom/prisma/client";
-import { Avatar } from "@calcom/ui";
+import { Avatar } from "@calcom/ui/components/avatar";
export const TotalBookingUsersTable = ({
data,
diff --git a/packages/features/insights/components/TotalUserFeedbackTable.tsx b/packages/features/insights/components/TotalUserFeedbackTable.tsx
index 25c8b56c5ae..91cebecceb4 100644
--- a/packages/features/insights/components/TotalUserFeedbackTable.tsx
+++ b/packages/features/insights/components/TotalUserFeedbackTable.tsx
@@ -2,7 +2,7 @@ import { Table, TableBody, TableCell, TableRow, Text } from "@tremor/react";
import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
import type { User } from "@calcom/prisma/client";
-import { Avatar } from "@calcom/ui";
+import { Avatar } from "@calcom/ui/components/avatar";
export const TotalUserFeedbackTable = ({
data,
diff --git a/packages/features/insights/filters/Download/Download.tsx b/packages/features/insights/filters/Download/Download.tsx
index 65a38ecef16..d44dfe26161 100644
--- a/packages/features/insights/filters/Download/Download.tsx
+++ b/packages/features/insights/filters/Download/Download.tsx
@@ -2,7 +2,8 @@ import { downloadAsCsv } from "@calcom/lib/csvUtils";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterOutputs } from "@calcom/trpc";
import { trpc } from "@calcom/trpc";
-import { Button, Dropdown, DropdownItem, DropdownMenuContent, DropdownMenuTrigger } from "@calcom/ui";
+import { Dropdown, DropdownItem, DropdownMenuContent, DropdownMenuTrigger } from "@calcom/ui/components/dropdown";
+import { Button } from "@calcom/ui/components/button";
import { useInsightsParameters } from "../../hooks/useInsightsParameters";
diff --git a/packages/features/insights/filters/Download/RoutingFormResponsesDownload.tsx b/packages/features/insights/filters/Download/RoutingFormResponsesDownload.tsx
index a54199be715..98f3017356d 100644
--- a/packages/features/insights/filters/Download/RoutingFormResponsesDownload.tsx
+++ b/packages/features/insights/filters/Download/RoutingFormResponsesDownload.tsx
@@ -6,8 +6,9 @@ import { downloadAsCsv } from "@calcom/lib/csvUtils";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc";
import type { RouterOutputs } from "@calcom/trpc/react";
-import { Button, Dropdown, DropdownItem, DropdownMenuContent, DropdownMenuTrigger } from "@calcom/ui";
-import { showToast } from "@calcom/ui";
+import { Dropdown, DropdownItem, DropdownMenuContent, DropdownMenuTrigger } from "@calcom/ui/components/dropdown";
+import { showToast } from "@calcom/ui/components/toast";
+import { Button } from "@calcom/ui/components/button";
import { useInsightsParameters } from "../../hooks/useInsightsParameters";
diff --git a/packages/features/insights/filters/OrgTeamsFilter.tsx b/packages/features/insights/filters/OrgTeamsFilter.tsx
index 42f652c5e14..58f566e3e1d 100644
--- a/packages/features/insights/filters/OrgTeamsFilter.tsx
+++ b/packages/features/insights/filters/OrgTeamsFilter.tsx
@@ -8,7 +8,11 @@ import {
import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc";
-import { AnimatedPopover, Avatar, Divider, Icon, FilterSearchField } from "@calcom/ui";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Divider } from "@calcom/ui/components/divider";
+import { FilterSearchField } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { AnimatedPopover } from "@calcom/ui/components/popover";
import { useInsightsOrgTeams } from "../hooks/useInsightsOrgTeams";
diff --git a/packages/features/insights/hooks/useInsightsColumns.tsx b/packages/features/insights/hooks/useInsightsColumns.tsx
index 9985f1e5704..d663eb71534 100644
--- a/packages/features/insights/hooks/useInsightsColumns.tsx
+++ b/packages/features/insights/hooks/useInsightsColumns.tsx
@@ -10,7 +10,8 @@ import { WEBAPP_URL } from "@calcom/lib/constants";
import { useCopy } from "@calcom/lib/hooks/useCopy";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { RoutingFormFieldType } from "@calcom/routing-forms/lib/FieldTypes";
-import { Badge, Icon } from "@calcom/ui";
+import { Badge } from "@calcom/ui/components/badge";
+import { Icon } from "@calcom/ui/components/icon";
import { BookedByCell } from "../components/BookedByCell";
import { BookingAtCell } from "../components/BookingAtCell";
diff --git a/packages/features/kbar/Kbar.tsx b/packages/features/kbar/Kbar.tsx
index 008c2abaa14..be5c647a679 100644
--- a/packages/features/kbar/Kbar.tsx
+++ b/packages/features/kbar/Kbar.tsx
@@ -18,7 +18,8 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { isMac } from "@calcom/lib/isMac";
import { trpc } from "@calcom/trpc/react";
import type { RouterOutputs } from "@calcom/trpc/react";
-import { Icon, Tooltip } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import { MintlifyChat } from "../mintlify-chat/MintlifyChat";
diff --git a/packages/features/mintlify-chat/MintlifyChat.tsx b/packages/features/mintlify-chat/MintlifyChat.tsx
index 6aceea6589e..ff54bff1d95 100644
--- a/packages/features/mintlify-chat/MintlifyChat.tsx
+++ b/packages/features/mintlify-chat/MintlifyChat.tsx
@@ -4,8 +4,9 @@ import { useState } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
-import { Icon, SkeletonContainer, SkeletonText } from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Icon } from "@calcom/ui/components/icon";
+import { SkeletonText, SkeletonContainer } from "@calcom/ui/components/skeleton";
import { getFormattedCitations, handleAiChat, optionallyAddBaseUrl } from "../mintlify-chat/util";
diff --git a/packages/features/notifications/WebPushContext.tsx b/packages/features/notifications/WebPushContext.tsx
index ffd93fd60e0..82f5c9f3f0a 100644
--- a/packages/features/notifications/WebPushContext.tsx
+++ b/packages/features/notifications/WebPushContext.tsx
@@ -3,7 +3,7 @@
import { createContext, useContext, useEffect, useMemo, useState } from "react";
import { trpc } from "@calcom/trpc/react";
-import { showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
interface WebPushContextProps {
permission: NotificationPermission;
diff --git a/packages/features/schedules/components/DateOverrideInputDialog.tsx b/packages/features/schedules/components/DateOverrideInputDialog.tsx
index 1060fde0c49..2e06f270a6c 100644
--- a/packages/features/schedules/components/DateOverrideInputDialog.tsx
+++ b/packages/features/schedules/components/DateOverrideInputDialog.tsx
@@ -6,18 +6,18 @@ import dayjs from "@calcom/dayjs";
import { yyyymmdd } from "@calcom/lib/date-fns";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { WorkingHours } from "@calcom/types/schedule";
+import cs from "@calcom/ui/classNames";
+import { Button } from "@calcom/ui/components/button";
import {
Dialog,
DialogContent,
- DialogTrigger,
DialogHeader,
+ DialogTrigger,
DialogClose,
- Switch,
- showToast,
- Form,
- Button,
-} from "@calcom/ui";
-import cs from "@calcom/ui/classNames";
+} from "@calcom/ui/components/dialog";
+import { Switch } from "@calcom/ui/components/form";
+import { Form } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
import DatePicker from "../../calendars/DatePicker";
import type { TimeRange } from "./Schedule";
diff --git a/packages/features/schedules/components/DateOverrideList.tsx b/packages/features/schedules/components/DateOverrideList.tsx
index 01b71d85206..2b0f83b242f 100644
--- a/packages/features/schedules/components/DateOverrideList.tsx
+++ b/packages/features/schedules/components/DateOverrideList.tsx
@@ -4,7 +4,9 @@ import dayjs from "@calcom/dayjs";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterOutputs } from "@calcom/trpc/react";
import type { TimeRange, WorkingHours } from "@calcom/types/schedule";
-import { Button, DialogTrigger, Tooltip } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { DialogTrigger } from "@calcom/ui/components/dialog";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import DateOverrideInputDialog from "./DateOverrideInputDialog";
diff --git a/packages/features/schedules/components/NewScheduleButton.tsx b/packages/features/schedules/components/NewScheduleButton.tsx
index 3b4c26133f1..b779ac5bee7 100644
--- a/packages/features/schedules/components/NewScheduleButton.tsx
+++ b/packages/features/schedules/components/NewScheduleButton.tsx
@@ -4,17 +4,11 @@ import { useForm } from "react-hook-form";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { HttpError } from "@calcom/lib/http-error";
import { trpc } from "@calcom/trpc/react";
-import {
- Button,
- Dialog,
- DialogClose,
- DialogContent,
- DialogFooter,
- DialogTrigger,
- Form,
- InputField,
- showToast,
-} from "@calcom/ui";
+import { Form } from "@calcom/ui/components/form";
+import { InputField } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogTrigger, DialogClose } from "@calcom/ui/components/dialog";
+import { showToast } from "@calcom/ui/components/toast";
export function NewScheduleButton({
name = "new-schedule",
diff --git a/packages/features/schedules/components/Schedule.tsx b/packages/features/schedules/components/Schedule.tsx
index 942affa582f..0bf477d1914 100644
--- a/packages/features/schedules/components/Schedule.tsx
+++ b/packages/features/schedules/components/Schedule.tsx
@@ -19,17 +19,13 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { weekdayNames } from "@calcom/lib/weekday";
import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery";
import type { TimeRange } from "@calcom/types/schedule";
-import {
- Button,
- CheckboxField,
- Dropdown,
- DropdownMenuContent,
- DropdownMenuTrigger,
- Select,
- SkeletonText,
- Switch,
-} from "@calcom/ui";
+import { Select } from "@calcom/ui/components/form";
+import { SkeletonText } from "@calcom/ui/components/skeleton";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
+import { Dropdown, DropdownMenuContent, DropdownMenuTrigger } from "@calcom/ui/components/dropdown";
+import { CheckboxField } from "@calcom/ui/components/form";
+import { Switch } from "@calcom/ui/components/form";
export type { TimeRange };
diff --git a/packages/features/schedules/components/ScheduleListItem.tsx b/packages/features/schedules/components/ScheduleListItem.tsx
index aa6670153a5..9b5bad0b0e6 100644
--- a/packages/features/schedules/components/ScheduleListItem.tsx
+++ b/packages/features/schedules/components/ScheduleListItem.tsx
@@ -6,16 +6,16 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { sortAvailabilityStrings } from "@calcom/lib/weekstart";
import type { RouterOutputs } from "@calcom/trpc/react";
import {
- Badge,
- Button,
Dropdown,
DropdownItem,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
- Icon,
- showToast,
-} from "@calcom/ui";
+} from "@calcom/ui/components/dropdown";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import { Icon } from "@calcom/ui/components/icon";
+import { showToast } from "@calcom/ui/components/toast";
export function ScheduleListItem({
schedule,
diff --git a/packages/features/settings/BookerLayoutSelector.tsx b/packages/features/settings/BookerLayoutSelector.tsx
index a099cd06ccd..802e3329d63 100644
--- a/packages/features/settings/BookerLayoutSelector.tsx
+++ b/packages/features/settings/BookerLayoutSelector.tsx
@@ -8,8 +8,10 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { BookerLayouts, defaultBookerLayoutSettings } from "@calcom/prisma/zod-utils";
import { bookerLayoutOptions, type BookerLayoutSettings } from "@calcom/prisma/zod-utils";
import type { RouterOutputs } from "@calcom/trpc/react";
-import { Label, CheckboxField, Button } from "@calcom/ui";
+import { Label } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
import classNames from "@calcom/ui/classNames";
+import { CheckboxField } from "@calcom/ui/components/form";
import SectionBottomActions from "./SectionBottomActions";
diff --git a/packages/features/settings/TimezoneChangeDialog.tsx b/packages/features/settings/TimezoneChangeDialog.tsx
index 94f16cbc9c9..09972137226 100644
--- a/packages/features/settings/TimezoneChangeDialog.tsx
+++ b/packages/features/settings/TimezoneChangeDialog.tsx
@@ -8,7 +8,8 @@ import dayjs from "@calcom/dayjs";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { CURRENT_TIMEZONE } from "@calcom/lib/timezoneConstants";
import { trpc } from "@calcom/trpc/react";
-import { showToast, Dialog, DialogClose, DialogContent, DialogFooter, DialogHeader } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogClose } from "@calcom/ui/components/dialog";
function hideDialogFor(hideFor: [number, DayjsManipulateType], toastContent: string) {
document.cookie = `calcom-timezone-dialog=1;max-age=${
diff --git a/packages/features/settings/appDir/SettingsHeader.tsx b/packages/features/settings/appDir/SettingsHeader.tsx
index 6c0195416c1..8a43d09e3e1 100644
--- a/packages/features/settings/appDir/SettingsHeader.tsx
+++ b/packages/features/settings/appDir/SettingsHeader.tsx
@@ -1,6 +1,6 @@
import React, { Suspense } from "react";
-import { Icon } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
import classNames from "@calcom/ui/classNames";
interface HeaderProps {
diff --git a/packages/features/settings/outOfOffice/CreateNewOutOfOfficeEntryButton.tsx b/packages/features/settings/outOfOffice/CreateNewOutOfOfficeEntryButton.tsx
index 30e9ea4d8d3..4f3ac28b1f4 100644
--- a/packages/features/settings/outOfOffice/CreateNewOutOfOfficeEntryButton.tsx
+++ b/packages/features/settings/outOfOffice/CreateNewOutOfOfficeEntryButton.tsx
@@ -7,8 +7,8 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { MembershipRole } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery";
-import type { ButtonProps } from "@calcom/ui";
-import { Button } from "@calcom/ui";
+import type { ButtonProps } from "@calcom/ui/components/button";
+import { Button } from "@calcom/ui/components/button";
import { CreateOrEditOutOfOfficeEntryModal } from "./CreateOrEditOutOfOfficeModal";
import { OutOfOfficeTab } from "./OutOfOfficeToggleGroup";
diff --git a/packages/features/settings/outOfOffice/CreateOrEditOutOfOfficeModal.tsx b/packages/features/settings/outOfOffice/CreateOrEditOutOfOfficeModal.tsx
index c69c1c64741..3592307e5bf 100644
--- a/packages/features/settings/outOfOffice/CreateOrEditOutOfOfficeModal.tsx
+++ b/packages/features/settings/outOfOffice/CreateOrEditOutOfOfficeModal.tsx
@@ -9,22 +9,15 @@ import { useInViewObserver } from "@calcom/lib/hooks/useInViewObserver";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery";
-import {
- Button,
- DateRangePicker,
- Dialog,
- DialogContent,
- DialogFooter,
- DialogHeader,
- Select,
- showToast,
- Switch,
- TextArea,
- UpgradeTeamsBadge,
- Label,
- Input,
-} from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { UpgradeTeamsBadge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogHeader } from "@calcom/ui/components/dialog";
+import { DateRangePicker, TextArea, Input } from "@calcom/ui/components/form";
+import { Label } from "@calcom/ui/components/form";
+import { Select } from "@calcom/ui/components/form";
+import { Switch } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
import { OutOfOfficeTab } from "./OutOfOfficeToggleGroup";
diff --git a/packages/features/settings/outOfOffice/OutOfOfficeEntriesList.tsx b/packages/features/settings/outOfOffice/OutOfOfficeEntriesList.tsx
index 4f575bd42a2..69003e05311 100644
--- a/packages/features/settings/outOfOffice/OutOfOfficeEntriesList.tsx
+++ b/packages/features/settings/outOfOffice/OutOfOfficeEntriesList.tsx
@@ -25,7 +25,13 @@ import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Avatar, Button, EmptyScreen, Icon, showToast, SkeletonText, Tooltip } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { SkeletonText } from "@calcom/ui/components/skeleton";
+import { Tooltip } from "@calcom/ui/components/tooltip";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Button } from "@calcom/ui/components/button";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+import { showToast } from "@calcom/ui/components/toast";
import CreateNewOutOfOfficeEntryButton from "./CreateNewOutOfOfficeEntryButton";
import { CreateOrEditOutOfOfficeEntryModal } from "./CreateOrEditOutOfOfficeModal";
diff --git a/packages/features/settings/outOfOffice/OutOfOfficeToggleGroup.tsx b/packages/features/settings/outOfOffice/OutOfOfficeToggleGroup.tsx
index b6bc0d8091e..6d02535aa81 100644
--- a/packages/features/settings/outOfOffice/OutOfOfficeToggleGroup.tsx
+++ b/packages/features/settings/outOfOffice/OutOfOfficeToggleGroup.tsx
@@ -5,7 +5,7 @@ import { useCallback } from "react";
import { useCompatSearchParams } from "@calcom/embed-core/src/useCompatSearchParams";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { ToggleGroup } from "@calcom/ui";
+import { ToggleGroup } from "@calcom/ui/components/form";
export enum OutOfOfficeTab {
MINE = "mine",
diff --git a/packages/features/shell/Shell.tsx b/packages/features/shell/Shell.tsx
index 7978655b983..38cec03b07a 100644
--- a/packages/features/shell/Shell.tsx
+++ b/packages/features/shell/Shell.tsx
@@ -13,8 +13,11 @@ import TimezoneChangeDialog from "@calcom/features/settings/TimezoneChangeDialog
import { APP_NAME } from "@calcom/lib/constants";
import { useFormbricks } from "@calcom/lib/formbricks-client";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, ErrorBoundary, HeadSeo, SkeletonText } from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Button } from "@calcom/ui/components/button";
+import { ErrorBoundary } from "@calcom/ui/components/errorBoundary";
+import { HeadSeo } from "@calcom/ui/components/head-seo";
+import { SkeletonText } from "@calcom/ui/components/skeleton";
import { SideBarContainer } from "./SideBar";
import { TopNavContainer } from "./TopNav";
diff --git a/packages/features/shell/SideBar.tsx b/packages/features/shell/SideBar.tsx
index f35865f01b3..396dc106067 100644
--- a/packages/features/shell/SideBar.tsx
+++ b/packages/features/shell/SideBar.tsx
@@ -9,8 +9,14 @@ import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
import { getBookerBaseUrlSync } from "@calcom/lib/getBookerUrl/client";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { UserPermissionRole } from "@calcom/prisma/enums";
-import { Avatar, ButtonOrLink, Credits, Icon, SkeletonText, Tooltip, Logo } from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Credits } from "@calcom/ui/components/credits";
+import { ButtonOrLink } from "@calcom/ui/components/dropdown";
+import { Icon } from "@calcom/ui/components/icon";
+import { Logo } from "@calcom/ui/components/logo";
+import { SkeletonText } from "@calcom/ui/components/skeleton";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import { KBarTrigger } from "../kbar/Kbar";
import { Navigation } from "./navigation/Navigation";
diff --git a/packages/features/shell/TeamInviteBadge.tsx b/packages/features/shell/TeamInviteBadge.tsx
index 10eee960b28..1e4348e7d0c 100644
--- a/packages/features/shell/TeamInviteBadge.tsx
+++ b/packages/features/shell/TeamInviteBadge.tsx
@@ -1,6 +1,6 @@
import { useTeamInvites } from "@calcom/lib/hooks/useHasPaidPlan";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Badge } from "@calcom/ui";
+import { Badge } from "@calcom/ui/components/badge";
export function TeamInviteBadge() {
const { isPending, listInvites } = useTeamInvites();
diff --git a/packages/features/shell/TopNav.tsx b/packages/features/shell/TopNav.tsx
index 3cb5756871f..360a41c38a4 100644
--- a/packages/features/shell/TopNav.tsx
+++ b/packages/features/shell/TopNav.tsx
@@ -4,7 +4,8 @@ import Link from "next/link";
import { useIsEmbed } from "@calcom/embed-core/embed-iframe";
import { KBarTrigger } from "@calcom/features/kbar/Kbar";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Icon, Logo } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { Logo } from "@calcom/ui/components/logo";
import { UserDropdown } from "./user-dropdown/UserDropdown";
diff --git a/packages/features/shell/navigation/NavigationItem.tsx b/packages/features/shell/navigation/NavigationItem.tsx
index 5c7ad2a2d4d..535a0f060fc 100644
--- a/packages/features/shell/navigation/NavigationItem.tsx
+++ b/packages/features/shell/navigation/NavigationItem.tsx
@@ -3,9 +3,11 @@ import { usePathname } from "next/navigation";
import React, { Fragment } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Tooltip, Icon, SkeletonText } from "@calcom/ui";
-import type { IconName } from "@calcom/ui";
+import { SkeletonText } from "@calcom/ui/components/skeleton";
import classNames from "@calcom/ui/classNames";
+import { Icon } from "@calcom/ui/components/icon";
+import type { IconName } from "@calcom/ui/components/icon";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import { useShouldDisplayNavigationItem } from "./useShouldDisplayNavigationItem";
diff --git a/packages/features/shell/useAppTheme.ts b/packages/features/shell/useAppTheme.ts
index 661d03d938b..2274edf4c2f 100644
--- a/packages/features/shell/useAppTheme.ts
+++ b/packages/features/shell/useAppTheme.ts
@@ -3,7 +3,7 @@
import getBrandColours from "@calcom/lib/getBrandColours";
import useTheme from "@calcom/lib/hooks/useTheme";
import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery";
-import { useCalcomTheme } from "@calcom/ui";
+import { useCalcomTheme } from "@calcom/ui/styles";
export const useAppTheme = () => {
const { data: user } = useMeQuery();
diff --git a/packages/features/shell/useBottomNavItems.ts b/packages/features/shell/useBottomNavItems.ts
index e367ae635a8..56a690b416e 100644
--- a/packages/features/shell/useBottomNavItems.ts
+++ b/packages/features/shell/useBottomNavItems.ts
@@ -4,7 +4,7 @@ import { useState } from "react";
import { IS_CALCOM } from "@calcom/lib/constants";
import { useCopy } from "@calcom/lib/hooks/useCopy";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
import { type NavigationItemType } from "./navigation/NavigationItem";
diff --git a/packages/features/shell/user-dropdown/ProfileDropdown.tsx b/packages/features/shell/user-dropdown/ProfileDropdown.tsx
index 07724d3644d..f5f2e4de021 100644
--- a/packages/features/shell/user-dropdown/ProfileDropdown.tsx
+++ b/packages/features/shell/user-dropdown/ProfileDropdown.tsx
@@ -4,17 +4,17 @@ import { useState } from "react";
import { ENABLE_PROFILE_SWITCHER } from "@calcom/lib/constants";
import { useRefreshData } from "@calcom/lib/hooks/useRefreshData";
import { trpc } from "@calcom/trpc";
+import { Avatar } from "@calcom/ui/components/avatar";
+import classNames from "@calcom/ui/classNames";
import {
- Avatar,
Dropdown,
DropdownItem,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuPortal,
DropdownMenuTrigger,
- Icon,
-} from "@calcom/ui";
-import classNames from "@calcom/ui/classNames";
+} from "@calcom/ui/components/dropdown";
+import { Icon } from "@calcom/ui/components/icon";
export function ProfileDropdown() {
const { update, data: sessionData } = useSession();
diff --git a/packages/features/shell/user-dropdown/UserDropdown.tsx b/packages/features/shell/user-dropdown/UserDropdown.tsx
index 876682ca218..14307c28450 100644
--- a/packages/features/shell/user-dropdown/UserDropdown.tsx
+++ b/packages/features/shell/user-dropdown/UserDropdown.tsx
@@ -5,8 +5,9 @@ import { useEffect, useState } from "react";
import { ROADMAP, DESKTOP_APP_LINK } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery";
+import classNames from "@calcom/ui/classNames";
+import { Avatar } from "@calcom/ui/components/avatar";
import {
- Avatar,
Dropdown,
DropdownItem,
DropdownMenuContent,
@@ -14,9 +15,8 @@ import {
DropdownMenuPortal,
DropdownMenuSeparator,
DropdownMenuTrigger,
- Icon,
-} from "@calcom/ui";
-import classNames from "@calcom/ui/classNames";
+} from "@calcom/ui/components/dropdown";
+import { Icon } from "@calcom/ui/components/icon";
// TODO (Platform): we shouldnt be importing from web here
import { useGetUserAttributes } from "@calcom/web/components/settings/platform/hooks/useGetUserAttributes";
diff --git a/packages/features/timezone-buddy/components/AvailabilityEditSheet.tsx b/packages/features/timezone-buddy/components/AvailabilityEditSheet.tsx
index 610985b4855..4feabda9eb8 100644
--- a/packages/features/timezone-buddy/components/AvailabilityEditSheet.tsx
+++ b/packages/features/timezone-buddy/components/AvailabilityEditSheet.tsx
@@ -10,11 +10,11 @@ import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery";
import type { Schedule as ScheduleType, TimeRange, WorkingHours } from "@calcom/types/schedule";
+import { Alert } from "@calcom/ui/components/alert";
+import { Button } from "@calcom/ui/components/button";
+import { Form } from "@calcom/ui/components/form";
+import { Label } from "@calcom/ui/components/form";
import {
- Alert,
- Button,
- Form,
- Label,
Sheet,
SheetBody,
SheetClose,
@@ -22,8 +22,8 @@ import {
SheetFooter,
SheetHeader,
SheetTitle,
- showToast,
-} from "@calcom/ui";
+} from "@calcom/ui/components/sheet";
+import { showToast } from "@calcom/ui/components/toast";
import type { SliderUser } from "./AvailabilitySliderTable";
diff --git a/packages/features/timezone-buddy/components/AvailabilitySliderTable.tsx b/packages/features/timezone-buddy/components/AvailabilitySliderTable.tsx
index 9527150a752..7f9990d94dd 100644
--- a/packages/features/timezone-buddy/components/AvailabilitySliderTable.tsx
+++ b/packages/features/timezone-buddy/components/AvailabilitySliderTable.tsx
@@ -15,7 +15,9 @@ import { CURRENT_TIMEZONE } from "@calcom/lib/timezoneConstants";
import type { MembershipRole } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc";
import type { UserProfile } from "@calcom/types/UserProfile";
-import { Button, ButtonGroup, UserAvatar } from "@calcom/ui";
+import { UserAvatar } from "@calcom/ui/components/avatar";
+import { Button } from "@calcom/ui/components/button";
+import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
import { UpgradeTip } from "../../tips/UpgradeTip";
import { createTimezoneBuddyStore, TBContext } from "../store";
diff --git a/packages/features/tips/Tips.tsx b/packages/features/tips/Tips.tsx
index 7961ec2cdf1..f7fc3af7c47 100644
--- a/packages/features/tips/Tips.tsx
+++ b/packages/features/tips/Tips.tsx
@@ -4,7 +4,7 @@ import { useState, memo } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { localStorage } from "@calcom/lib/webstorage";
-import { Card } from "@calcom/ui";
+import { Card } from "@calcom/ui/components/card";
export const tips = [
{
diff --git a/packages/features/troubleshooter/components/AvailabilitySchedulesContainer.tsx b/packages/features/troubleshooter/components/AvailabilitySchedulesContainer.tsx
index ee3196b731b..451ab5b3b6c 100644
--- a/packages/features/troubleshooter/components/AvailabilitySchedulesContainer.tsx
+++ b/packages/features/troubleshooter/components/AvailabilitySchedulesContainer.tsx
@@ -1,5 +1,7 @@
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Badge, Button, Switch } from "@calcom/ui";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import { Switch } from "@calcom/ui/components/form";
import { TroubleshooterListItemContainer } from "./TroubleshooterListItemContainer";
diff --git a/packages/features/troubleshooter/components/CalendarToggleContainer.tsx b/packages/features/troubleshooter/components/CalendarToggleContainer.tsx
index ea24a81f33c..76855d320fe 100644
--- a/packages/features/troubleshooter/components/CalendarToggleContainer.tsx
+++ b/packages/features/troubleshooter/components/CalendarToggleContainer.tsx
@@ -1,6 +1,8 @@
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Badge, Button, Switch } from "@calcom/ui";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
+import { Switch } from "@calcom/ui/components/form";
import { TroubleshooterListItemContainer } from "./TroubleshooterListItemContainer";
diff --git a/packages/features/troubleshooter/components/ConnectedAppsContainer.tsx b/packages/features/troubleshooter/components/ConnectedAppsContainer.tsx
index d25c70ada19..520408924fe 100644
--- a/packages/features/troubleshooter/components/ConnectedAppsContainer.tsx
+++ b/packages/features/troubleshooter/components/ConnectedAppsContainer.tsx
@@ -1,5 +1,5 @@
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Badge } from "@calcom/ui";
+import { Badge } from "@calcom/ui/components/badge";
import { TroubleshooterListItemHeader } from "./TroubleshooterListItemContainer";
diff --git a/packages/features/troubleshooter/components/EventScheduleItem.tsx b/packages/features/troubleshooter/components/EventScheduleItem.tsx
index 5cd47b2ccb1..df124610f5d 100644
--- a/packages/features/troubleshooter/components/EventScheduleItem.tsx
+++ b/packages/features/troubleshooter/components/EventScheduleItem.tsx
@@ -2,7 +2,8 @@ import Link from "next/link";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Badge, Label } from "@calcom/ui";
+import { Badge } from "@calcom/ui/components/badge";
+import { Label } from "@calcom/ui/components/form";
import { useTroubleshooterStore } from "../store";
import { TroubleshooterListItemHeader } from "./TroubleshooterListItemContainer";
diff --git a/packages/features/troubleshooter/components/EventTypeSelect.tsx b/packages/features/troubleshooter/components/EventTypeSelect.tsx
index 0ebf8f719a7..bd29b4d59f3 100644
--- a/packages/features/troubleshooter/components/EventTypeSelect.tsx
+++ b/packages/features/troubleshooter/components/EventTypeSelect.tsx
@@ -1,7 +1,7 @@
import { useMemo, useEffect, startTransition } from "react";
import { trpc } from "@calcom/trpc";
-import { SelectField } from "@calcom/ui";
+import { SelectField } from "@calcom/ui/components/form";
import { getQueryParam } from "../../bookings/Booker/utils/query-param";
import { useTroubleshooterStore } from "../store";
diff --git a/packages/features/troubleshooter/components/TroubleshooterHeader.tsx b/packages/features/troubleshooter/components/TroubleshooterHeader.tsx
index a781f0495e5..4240a5e5933 100644
--- a/packages/features/troubleshooter/components/TroubleshooterHeader.tsx
+++ b/packages/features/troubleshooter/components/TroubleshooterHeader.tsx
@@ -2,7 +2,8 @@ import { useMemo } from "react";
import dayjs from "@calcom/dayjs";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, ButtonGroup } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
import { useTroubleshooterStore } from "../store";
diff --git a/packages/features/troubleshooter/components/TroubleshooterSidebar.tsx b/packages/features/troubleshooter/components/TroubleshooterSidebar.tsx
index 2a6fe4f0d46..f7b5d0716c9 100644
--- a/packages/features/troubleshooter/components/TroubleshooterSidebar.tsx
+++ b/packages/features/troubleshooter/components/TroubleshooterSidebar.tsx
@@ -1,7 +1,8 @@
import Link from "next/link";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Icon, Skeleton } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
+import { Skeleton } from "@calcom/ui/components/skeleton";
import { CalendarToggleContainer } from "./CalendarToggleContainer";
import { EventScheduleItem } from "./EventScheduleItem";
diff --git a/packages/features/users/components/AdminPasswordBanner.tsx b/packages/features/users/components/AdminPasswordBanner.tsx
index 7c01f1d9f45..f6aecfd991b 100644
--- a/packages/features/users/components/AdminPasswordBanner.tsx
+++ b/packages/features/users/components/AdminPasswordBanner.tsx
@@ -2,7 +2,7 @@ import type { SessionContextValue } from "next-auth/react";
import Link from "next/link";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { TopBanner } from "@calcom/ui";
+import { TopBanner } from "@calcom/ui/components/top-banner";
export type AdminPasswordBannerProps = { data: SessionContextValue["data"] };
diff --git a/packages/features/users/components/CalendarCredentialBanner.tsx b/packages/features/users/components/CalendarCredentialBanner.tsx
index 07965c6a934..b1001b1c419 100644
--- a/packages/features/users/components/CalendarCredentialBanner.tsx
+++ b/packages/features/users/components/CalendarCredentialBanner.tsx
@@ -2,7 +2,7 @@ import Link from "next/link";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { type RouterOutputs } from "@calcom/trpc";
-import { TopBanner } from "@calcom/ui";
+import { TopBanner } from "@calcom/ui/components/top-banner";
export type CalendarCredentialBannerProps = {
data: RouterOutputs["viewer"]["me"]["getUserTopBanners"]["calendarCredentialBanner"];
diff --git a/packages/features/users/components/InvalidAppCredentialsBanner.tsx b/packages/features/users/components/InvalidAppCredentialsBanner.tsx
index 05e260374be..8c5ed0f6513 100644
--- a/packages/features/users/components/InvalidAppCredentialsBanner.tsx
+++ b/packages/features/users/components/InvalidAppCredentialsBanner.tsx
@@ -2,7 +2,7 @@ import { useRouter } from "next/navigation";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { type RouterOutputs } from "@calcom/trpc";
-import { TopBanner } from "@calcom/ui";
+import { TopBanner } from "@calcom/ui/components/top-banner";
export type InvalidAppCredentialBannersProps = {
data: RouterOutputs["viewer"]["me"]["getUserTopBanners"]["invalidAppCredentialBanners"];
diff --git a/packages/features/users/components/UserTable/BulkActions/DeleteBulkUsers.tsx b/packages/features/users/components/UserTable/BulkActions/DeleteBulkUsers.tsx
index 379a3b25771..c531aa2c675 100644
--- a/packages/features/users/components/UserTable/BulkActions/DeleteBulkUsers.tsx
+++ b/packages/features/users/components/UserTable/BulkActions/DeleteBulkUsers.tsx
@@ -1,7 +1,8 @@
import { DataTableSelectionBar } from "@calcom/features/data-table";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { ConfirmationDialogContent, Dialog, DialogTrigger, showToast } from "@calcom/ui";
+import { Dialog, DialogTrigger, ConfirmationDialogContent } from "@calcom/ui/components/dialog";
+import { showToast } from "@calcom/ui/components/toast";
import type { UserTableUser } from "../types";
diff --git a/packages/features/users/components/UserTable/BulkActions/DynamicLink.tsx b/packages/features/users/components/UserTable/BulkActions/DynamicLink.tsx
index 780b44e9658..68cf653f0c2 100644
--- a/packages/features/users/components/UserTable/BulkActions/DynamicLink.tsx
+++ b/packages/features/users/components/UserTable/BulkActions/DynamicLink.tsx
@@ -3,7 +3,7 @@ import { useQueryState, parseAsBoolean } from "nuqs";
import { useCopy } from "@calcom/lib/hooks/useCopy";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
export function DynamicLink<T extends { username: string | null }>({
table,
diff --git a/packages/features/users/components/UserTable/BulkActions/EventTypesList.tsx b/packages/features/users/components/UserTable/BulkActions/EventTypesList.tsx
index 95d13270961..b357bd680d1 100644
--- a/packages/features/users/components/UserTable/BulkActions/EventTypesList.tsx
+++ b/packages/features/users/components/UserTable/BulkActions/EventTypesList.tsx
@@ -7,21 +7,19 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { SchedulingType } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc";
import type { RouterOutputs } from "@calcom/trpc/react";
+import classNames from "@calcom/ui/classNames";
+import { Button } from "@calcom/ui/components/button";
import {
- Button,
Command,
CommandEmpty,
CommandGroup,
CommandInput,
CommandItem,
CommandList,
- Popover,
- showToast,
- PopoverContent,
- PopoverTrigger,
- Icon,
-} from "@calcom/ui";
-import classNames from "@calcom/ui/classNames";
+} from "@calcom/ui/components/command";
+import { Icon } from "@calcom/ui/components/icon";
+import { Popover, PopoverContent, PopoverTrigger } from "@calcom/ui/components/popover";
+import { showToast } from "@calcom/ui/components/toast";
import type { UserTableUser } from "../types";
diff --git a/packages/features/users/components/UserTable/BulkActions/MassAssignAttributes.tsx b/packages/features/users/components/UserTable/BulkActions/MassAssignAttributes.tsx
index 6fe9a7a32ae..c467f5b60e2 100644
--- a/packages/features/users/components/UserTable/BulkActions/MassAssignAttributes.tsx
+++ b/packages/features/users/components/UserTable/BulkActions/MassAssignAttributes.tsx
@@ -6,23 +6,21 @@ import { DataTableSelectionBar, type ColumnFilter } from "@calcom/features/data-
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { Attribute as _Attribute, AttributeOption } from "@calcom/prisma/client";
import { trpc } from "@calcom/trpc";
+import classNames from "@calcom/ui/classNames";
+import { Alert } from "@calcom/ui/components/alert";
+import { Button } from "@calcom/ui/components/button";
import {
- Alert,
- Button,
Command,
CommandEmpty,
CommandGroup,
CommandInput,
CommandItem,
CommandList,
- Icon,
- Input,
- Popover,
- PopoverContent,
- PopoverTrigger,
- showToast,
-} from "@calcom/ui";
-import classNames from "@calcom/ui/classNames";
+} from "@calcom/ui/components/command";
+import { Input } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { Popover, PopoverContent, PopoverTrigger } from "@calcom/ui/components/popover";
+import { showToast } from "@calcom/ui/components/toast";
import type { UserTableUser } from "../types";
diff --git a/packages/features/users/components/UserTable/BulkActions/TeamList.tsx b/packages/features/users/components/UserTable/BulkActions/TeamList.tsx
index 2b3553cc21f..67ad1083988 100644
--- a/packages/features/users/components/UserTable/BulkActions/TeamList.tsx
+++ b/packages/features/users/components/UserTable/BulkActions/TeamList.tsx
@@ -5,21 +5,19 @@ import { useState } from "react";
import { DataTableSelectionBar } from "@calcom/features/data-table";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc";
+import classNames from "@calcom/ui/classNames";
+import { Button } from "@calcom/ui/components/button";
import {
- Button,
Command,
CommandEmpty,
CommandGroup,
CommandInput,
CommandItem,
CommandList,
- Icon,
- Popover,
- PopoverContent,
- PopoverTrigger,
- showToast,
-} from "@calcom/ui";
-import classNames from "@calcom/ui/classNames";
+} from "@calcom/ui/components/command";
+import { Icon } from "@calcom/ui/components/icon";
+import { Popover, PopoverContent, PopoverTrigger } from "@calcom/ui/components/popover";
+import { showToast } from "@calcom/ui/components/toast";
import type { UserTableUser } from "../types";
diff --git a/packages/features/users/components/UserTable/DeleteMemberModal.tsx b/packages/features/users/components/UserTable/DeleteMemberModal.tsx
index de78451f70f..da9baacb417 100644
--- a/packages/features/users/components/UserTable/DeleteMemberModal.tsx
+++ b/packages/features/users/components/UserTable/DeleteMemberModal.tsx
@@ -3,7 +3,8 @@ import type { Dispatch } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc";
-import { Dialog, ConfirmationDialogContent, showToast } from "@calcom/ui";
+import { Dialog, ConfirmationDialogContent } from "@calcom/ui/components/dialog";
+import { showToast } from "@calcom/ui/components/toast";
import type { UserTableAction, UserTableState } from "./types";
diff --git a/packages/features/users/components/UserTable/EditSheet/DisplayInfo.tsx b/packages/features/users/components/UserTable/EditSheet/DisplayInfo.tsx
index 9aa63237cb7..2f8f05b7a0b 100644
--- a/packages/features/users/components/UserTable/EditSheet/DisplayInfo.tsx
+++ b/packages/features/users/components/UserTable/EditSheet/DisplayInfo.tsx
@@ -1,5 +1,6 @@
-import type { IconName } from "@calcom/ui";
-import { Badge, Icon } from "@calcom/ui";
+import type { IconName } from "@calcom/ui/components/icon";
+import { Badge } from "@calcom/ui/components/badge";
+import { Icon } from "@calcom/ui/components/icon";
type DisplayInfoType = {
label: string;
diff --git a/packages/features/users/components/UserTable/EditSheet/EditUserForm.tsx b/packages/features/users/components/UserTable/EditSheet/EditUserForm.tsx
index 3c615e8766e..942919ef96a 100644
--- a/packages/features/users/components/UserTable/EditSheet/EditUserForm.tsx
+++ b/packages/features/users/components/UserTable/EditSheet/EditUserForm.tsx
@@ -10,24 +10,21 @@ import { emailSchema } from "@calcom/lib/emailSchema";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { MembershipRole } from "@calcom/prisma/enums";
import { trpc, type RouterOutputs } from "@calcom/trpc/react";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Button } from "@calcom/ui/components/button";
+import { Divider } from "@calcom/ui/components/divider";
import {
- Form,
- TextField,
- ToggleGroup,
InputField,
TextAreaField,
- Label,
- showToast,
- Avatar,
- ImageUploader,
SelectField,
- SheetHeader,
- SheetBody,
- SheetFooter,
- Button,
- SheetTitle,
- Divider,
-} from "@calcom/ui";
+ Form,
+ Label,
+ TextField,
+ ToggleGroup,
+} from "@calcom/ui/components/form";
+import { ImageUploader } from "@calcom/ui/components/image-uploader";
+import { SheetHeader, SheetBody, SheetFooter, SheetTitle } from "@calcom/ui/components/sheet";
+import { showToast } from "@calcom/ui/components/toast";
import type { UserTableAction } from "../types";
import { useEditMode } from "./store";
diff --git a/packages/features/users/components/UserTable/EditSheet/EditUserSheet.tsx b/packages/features/users/components/UserTable/EditSheet/EditUserSheet.tsx
index b5fe1f7de99..647ae724854 100644
--- a/packages/features/users/components/UserTable/EditSheet/EditUserSheet.tsx
+++ b/packages/features/users/components/UserTable/EditSheet/EditUserSheet.tsx
@@ -5,7 +5,9 @@ import { useOrgBranding } from "@calcom/ee/organizations/context/provider";
import { WEBAPP_URL } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Avatar, Loader, Sheet, SheetContent, SheetBody, SheetHeader, SheetFooter } from "@calcom/ui";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Sheet, SheetContent, SheetBody, SheetHeader, SheetFooter } from "@calcom/ui/components/sheet";
+import { Loader } from "@calcom/ui/components/skeleton";
import type { UserTableAction, UserTableState } from "../types";
import { DisplayInfo } from "./DisplayInfo";
diff --git a/packages/features/users/components/UserTable/EditSheet/SheetFooterControls.tsx b/packages/features/users/components/UserTable/EditSheet/SheetFooterControls.tsx
index 9a5973ba0f6..32226066e37 100644
--- a/packages/features/users/components/UserTable/EditSheet/SheetFooterControls.tsx
+++ b/packages/features/users/components/UserTable/EditSheet/SheetFooterControls.tsx
@@ -1,5 +1,6 @@
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { SheetClose, Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { SheetClose } from "@calcom/ui/components/sheet";
import { useEditMode } from "./store";
diff --git a/packages/features/users/components/UserTable/ImpersonationMemberModal.tsx b/packages/features/users/components/UserTable/ImpersonationMemberModal.tsx
index 2cd0d824538..9999af731b9 100644
--- a/packages/features/users/components/UserTable/ImpersonationMemberModal.tsx
+++ b/packages/features/users/components/UserTable/ImpersonationMemberModal.tsx
@@ -2,7 +2,8 @@ import { signIn, useSession } from "next-auth/react";
import type { Dispatch } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, Dialog, DialogClose, DialogContent, DialogFooter } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogClose } from "@calcom/ui/components/dialog";
import type { UserTableAction, UserTableState } from "./types";
diff --git a/packages/features/users/components/UserTable/InviteMemberModal.tsx b/packages/features/users/components/UserTable/InviteMemberModal.tsx
index 5c77b23ca89..ba7cd31e4a1 100644
--- a/packages/features/users/components/UserTable/InviteMemberModal.tsx
+++ b/packages/features/users/components/UserTable/InviteMemberModal.tsx
@@ -5,7 +5,7 @@ import MemberInvitationModal from "@calcom/features/ee/teams/components/MemberIn
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { CreationSource } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc";
-import { showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
import usePlatformMe from "@calcom/web/components/settings/platform/hooks/usePlatformMe";
import type { UserTableAction } from "./types";
diff --git a/packages/features/users/components/UserTable/PlatformManagedUsersTable.tsx b/packages/features/users/components/UserTable/PlatformManagedUsersTable.tsx
index f6e4f2e3a1b..9f7c8539534 100644
--- a/packages/features/users/components/UserTable/PlatformManagedUsersTable.tsx
+++ b/packages/features/users/components/UserTable/PlatformManagedUsersTable.tsx
@@ -16,7 +16,10 @@ import {
import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc";
-import { Avatar, Badge, Checkbox, SkeletonText } from "@calcom/ui";
+import { Badge } from "@calcom/ui/components/badge";
+import { SkeletonText } from "@calcom/ui/components/skeleton";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Checkbox } from "@calcom/ui/components/form";
import { DeleteBulkUsers } from "./BulkActions/DeleteBulkUsers";
import { DeleteMemberModal } from "./DeleteMemberModal";
diff --git a/packages/features/users/components/UserTable/UserListTable.tsx b/packages/features/users/components/UserTable/UserListTable.tsx
index f65fead5571..44c8e1b5901 100644
--- a/packages/features/users/components/UserTable/UserListTable.tsx
+++ b/packages/features/users/components/UserTable/UserListTable.tsx
@@ -27,8 +27,11 @@ import {
import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc";
-import { Avatar, Badge, Checkbox, showToast } from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Avatar } from "@calcom/ui/components/avatar";
+import { Badge } from "@calcom/ui/components/badge";
+import { Checkbox } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
import { useGetUserAttributes } from "@calcom/web/components/settings/platform/hooks/useGetUserAttributes";
import { DeleteBulkUsers } from "./BulkActions/DeleteBulkUsers";
diff --git a/packages/features/users/components/UserTable/UserTableActions.tsx b/packages/features/users/components/UserTable/UserTableActions.tsx
index b60ef235d82..062201a85ca 100644
--- a/packages/features/users/components/UserTable/UserTableActions.tsx
+++ b/packages/features/users/components/UserTable/UserTableActions.tsx
@@ -2,10 +2,10 @@ import { useSession } from "next-auth/react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
+import classNames from "@calcom/ui/classNames";
+import { Button } from "@calcom/ui/components/button";
+import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
import {
- ButtonGroup,
- Tooltip,
- Button,
Dropdown,
DropdownMenuTrigger,
DropdownMenuContent,
@@ -13,9 +13,9 @@ import {
DropdownMenuPortal,
DropdownItem,
DropdownMenuSeparator,
- showToast,
-} from "@calcom/ui";
-import classNames from "@calcom/ui/classNames";
+} from "@calcom/ui/components/dropdown";
+import { showToast } from "@calcom/ui/components/toast";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import type { UserTableUser, UserTableAction } from "./types";
diff --git a/packages/features/users/components/VerifyEmailBanner.tsx b/packages/features/users/components/VerifyEmailBanner.tsx
index b36bae49f21..e39078bfd33 100644
--- a/packages/features/users/components/VerifyEmailBanner.tsx
+++ b/packages/features/users/components/VerifyEmailBanner.tsx
@@ -1,7 +1,8 @@
import { APP_NAME } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc";
-import { TopBanner, showToast } from "@calcom/ui";
+import { TopBanner } from "@calcom/ui/components/top-banner";
+import { showToast } from "@calcom/ui/components/toast";
import { useFlagMap } from "../../flags/context/provider";
diff --git a/packages/features/webhooks/components/EventTypeWebhookListItem.tsx b/packages/features/webhooks/components/EventTypeWebhookListItem.tsx
index b6a85c5c207..297767a293a 100644
--- a/packages/features/webhooks/components/EventTypeWebhookListItem.tsx
+++ b/packages/features/webhooks/components/EventTypeWebhookListItem.tsx
@@ -1,20 +1,20 @@
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { WebhookTriggerEvents } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
+import classNames from "@calcom/ui/classNames";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
import {
- Badge,
- Button,
Dropdown,
DropdownItem,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger,
- showToast,
- Switch,
- Tooltip,
-} from "@calcom/ui";
-import classNames from "@calcom/ui/classNames";
+} from "@calcom/ui/components/dropdown";
+import { Switch } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
+import { Tooltip } from "@calcom/ui/components/tooltip";
type WebhookProps = {
id: string;
diff --git a/packages/features/webhooks/components/WebhookForm.tsx b/packages/features/webhooks/components/WebhookForm.tsx
index c83cfba2ced..4bd079f3bab 100644
--- a/packages/features/webhooks/components/WebhookForm.tsx
+++ b/packages/features/webhooks/components/WebhookForm.tsx
@@ -7,7 +7,14 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { TimeUnit } from "@calcom/prisma/enums";
import { WebhookTriggerEvents } from "@calcom/prisma/enums";
import type { RouterOutputs } from "@calcom/trpc/react";
-import { Button, Form, Label, Select, Switch, TextArea, TextField, ToggleGroup } from "@calcom/ui";
+import { Select } from "@calcom/ui/components/form";
+import { TextArea } from "@calcom/ui/components/form";
+import { ToggleGroup } from "@calcom/ui/components/form";
+import { Button } from "@calcom/ui/components/button";
+import { Form } from "@calcom/ui/components/form";
+import { Label } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
+import { Switch } from "@calcom/ui/components/form";
import SectionBottomActions from "../../settings/SectionBottomActions";
import customTemplate, { hasTemplateIntegration } from "../lib/integrationTemplate";
diff --git a/packages/features/webhooks/components/WebhookListItem.tsx b/packages/features/webhooks/components/WebhookListItem.tsx
index cce2a4d7a8f..82288b7110b 100644
--- a/packages/features/webhooks/components/WebhookListItem.tsx
+++ b/packages/features/webhooks/components/WebhookListItem.tsx
@@ -1,20 +1,20 @@
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { WebhookTriggerEvents } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
+import classNames from "@calcom/ui/classNames";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
import {
- Badge,
- Button,
Dropdown,
DropdownItem,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger,
- showToast,
- Switch,
- Tooltip,
-} from "@calcom/ui";
-import classNames from "@calcom/ui/classNames";
+} from "@calcom/ui/components/dropdown";
+import { Switch } from "@calcom/ui/components/form";
+import { showToast } from "@calcom/ui/components/toast";
+import { Tooltip } from "@calcom/ui/components/tooltip";
type WebhookProps = {
id: string;
diff --git a/packages/features/webhooks/components/WebhookListItemSkeleton.tsx b/packages/features/webhooks/components/WebhookListItemSkeleton.tsx
index b8ab0e73aab..d599eab9ea2 100644
--- a/packages/features/webhooks/components/WebhookListItemSkeleton.tsx
+++ b/packages/features/webhooks/components/WebhookListItemSkeleton.tsx
@@ -1,4 +1,4 @@
-import { SkeletonText } from "@calcom/ui";
+import { SkeletonText } from "@calcom/ui/components/skeleton";
export default function WebhookListItemSkeleton() {
return (
diff --git a/packages/features/webhooks/components/WebhookListSkeleton.tsx b/packages/features/webhooks/components/WebhookListSkeleton.tsx
index c4af5544d49..d946352a4aa 100644
--- a/packages/features/webhooks/components/WebhookListSkeleton.tsx
+++ b/packages/features/webhooks/components/WebhookListSkeleton.tsx
@@ -1,4 +1,4 @@
-import { SkeletonContainer } from "@calcom/ui";
+import { SkeletonContainer } from "@calcom/ui/components/skeleton";
import WebhookListItemSkeleton from "./WebhookListItemSkeleton";
diff --git a/packages/features/webhooks/components/WebhookTestDisclosure.tsx b/packages/features/webhooks/components/WebhookTestDisclosure.tsx
index 5bf6d048d0c..fb284229362 100644
--- a/packages/features/webhooks/components/WebhookTestDisclosure.tsx
+++ b/packages/features/webhooks/components/WebhookTestDisclosure.tsx
@@ -4,7 +4,9 @@ import { ZodError } from "zod";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
import { ZTestTriggerInputSchema } from "@calcom/trpc/server/routers/viewer/webhook/testTrigger.schema";
-import { Badge, Button, showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
export default function WebhookTestDisclosure() {
const [subscriberUrl, webhookSecret]: [string, string] = useWatch({ name: ["subscriberUrl", "secret"] });
diff --git a/packages/features/webhooks/pages/webhook-edit-view.tsx b/packages/features/webhooks/pages/webhook-edit-view.tsx
index 45804df5005..3ec5a70b38e 100644
--- a/packages/features/webhooks/pages/webhook-edit-view.tsx
+++ b/packages/features/webhooks/pages/webhook-edit-view.tsx
@@ -5,7 +5,8 @@ import { useRouter } from "next/navigation";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { WebhookTriggerEvents } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
-import { showToast, SkeletonContainer } from "@calcom/ui";
+import { SkeletonContainer } from "@calcom/ui/components/skeleton";
+import { showToast } from "@calcom/ui/components/toast";
import type { WebhookFormSubmitData } from "../components/WebhookForm";
import WebhookForm from "../components/WebhookForm";
diff --git a/packages/features/webhooks/pages/webhook-new-view.tsx b/packages/features/webhooks/pages/webhook-new-view.tsx
index a7111160fab..6901271d35c 100644
--- a/packages/features/webhooks/pages/webhook-new-view.tsx
+++ b/packages/features/webhooks/pages/webhook-new-view.tsx
@@ -6,7 +6,7 @@ import { useRouter } from "next/navigation";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
import type { WebhookFormSubmitData } from "../components/WebhookForm";
import WebhookForm from "../components/WebhookForm";
diff --git a/packages/features/webhooks/pages/webhooks-view.tsx b/packages/features/webhooks/pages/webhooks-view.tsx
index e2ee9442a93..724e776cdda 100644
--- a/packages/features/webhooks/pages/webhooks-view.tsx
+++ b/packages/features/webhooks/pages/webhooks-view.tsx
@@ -10,8 +10,10 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { UserPermissionRole } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
import type { WebhooksByViewer } from "@calcom/trpc/server/routers/viewer/webhook/getByViewer.handler";
-import { Avatar, EmptyScreen, SkeletonContainer, SkeletonText } from "@calcom/ui";
+import { Avatar } from "@calcom/ui/components/avatar";
import classNames from "@calcom/ui/classNames";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+import { SkeletonText, SkeletonContainer } from "@calcom/ui/components/skeleton";
import { WebhookListItem, CreateNewWebhookButton } from "../components";
diff --git a/packages/lib/raqb/findTeamMembersMatchingAttributeLogic.test.ts b/packages/lib/raqb/findTeamMembersMatchingAttributeLogic.test.ts
index eee677d752c..bdfcf8c8652 100644
--- a/packages/lib/raqb/findTeamMembersMatchingAttributeLogic.test.ts
+++ b/packages/lib/raqb/findTeamMembersMatchingAttributeLogic.test.ts
@@ -7,7 +7,6 @@ import {
findTeamMembersMatchingAttributeLogic,
TroubleshooterCase,
} from "@calcom/lib/raqb/findTeamMembersMatchingAttributeLogic";
-// import { EmailField } from "@calcom/ui";
import * as getAttributesModule from "@calcom/lib/service/attribute/server/getAttributes";
import type { AttributeType } from "@calcom/prisma/enums";
import { RoutingFormFieldType } from "@calcom/routing-forms/lib/FieldTypes";
diff --git a/packages/platform/atoms/availability/AvailabilitySettings.tsx b/packages/platform/atoms/availability/AvailabilitySettings.tsx
index 1b0b7fa0909..773ff88598e 100644
--- a/packages/platform/atoms/availability/AvailabilitySettings.tsx
+++ b/packages/platform/atoms/availability/AvailabilitySettings.tsx
@@ -21,23 +21,17 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { sortAvailabilityStrings } from "@calcom/lib/weekstart";
import type { RouterOutputs } from "@calcom/trpc/react";
import type { TimeRange, WorkingHours } from "@calcom/types/schedule";
-import {
- Button,
- ConfirmationDialogContent,
- EditableHeading,
- Form,
- SkeletonText,
- Dialog,
- DialogTrigger,
- Label,
- SelectSkeletonLoader,
- Skeleton,
- Switch,
- Tooltip,
- VerticalDivider,
-} from "@calcom/ui";
-import { Icon } from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogTrigger, ConfirmationDialogContent } from "@calcom/ui/components/dialog";
+import { VerticalDivider } from "@calcom/ui/components/divider";
+import { EditableHeading } from "@calcom/ui/components/editable-heading";
+import { Form } from "@calcom/ui/components/form";
+import { Label } from "@calcom/ui/components/form";
+import { Switch } from "@calcom/ui/components/form";
+import { Icon } from "@calcom/ui/components/icon";
+import { SkeletonText, SelectSkeletonLoader, Skeleton } from "@calcom/ui/components/skeleton";
+import { Tooltip } from "@calcom/ui/components/tooltip";
import { Shell as PlatformShell } from "../src/components/ui/shell";
import { cn } from "../src/lib/utils";
diff --git a/packages/platform/atoms/cal-provider/BaseCalProvider.tsx b/packages/platform/atoms/cal-provider/BaseCalProvider.tsx
index 01e50da4cd5..e230a4ba29b 100644
--- a/packages/platform/atoms/cal-provider/BaseCalProvider.tsx
+++ b/packages/platform/atoms/cal-provider/BaseCalProvider.tsx
@@ -4,7 +4,7 @@ import { useState } from "react";
import { useCallback } from "react";
import type { API_VERSIONS_ENUM } from "@calcom/platform-constants";
-import { IconSprites } from "@calcom/ui";
+import { IconSprites } from "@calcom/ui/components/icon";
import deTranslations from "@calcom/web/public/static/locales/de/common.json";
import enTranslations from "@calcom/web/public/static/locales/en/common.json";
import esTranslations from "@calcom/web/public/static/locales/es/common.json";
diff --git a/packages/platform/atoms/connect/OAuthConnect.tsx b/packages/platform/atoms/connect/OAuthConnect.tsx
index a20262db45d..55d398c8673 100644
--- a/packages/platform/atoms/connect/OAuthConnect.tsx
+++ b/packages/platform/atoms/connect/OAuthConnect.tsx
@@ -4,7 +4,7 @@ import type { ReactNode } from "react";
import type { FC } from "react";
import type { CALENDARS } from "@calcom/platform-constants";
-import { Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
import type { OnCheckErrorType, UseCheckProps } from "../hooks/connect/useCheck";
import { useCheck } from "../hooks/connect/useCheck";
diff --git a/packages/platform/atoms/connect/apple/AppleConnect.tsx b/packages/platform/atoms/connect/apple/AppleConnect.tsx
index 0dcb6b0680d..8328427f419 100644
--- a/packages/platform/atoms/connect/apple/AppleConnect.tsx
+++ b/packages/platform/atoms/connect/apple/AppleConnect.tsx
@@ -13,7 +13,10 @@ import { useState } from "react";
import { useForm } from "react-hook-form";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button, Form, PasswordField, TextField } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { Form } from "@calcom/ui/components/form";
+import { PasswordField } from "@calcom/ui/components/form";
+import { TextField } from "@calcom/ui/components/form";
import { SUCCESS_STATUS } from "../../../constants/api";
import { useCheck } from "../../hooks/connect/useCheck";
diff --git a/packages/platform/atoms/connect/conferencing-apps/ConferencingAppsViewPlatformWrapper.tsx b/packages/platform/atoms/connect/conferencing-apps/ConferencingAppsViewPlatformWrapper.tsx
index 22b9dac7444..7c268319e47 100644
--- a/packages/platform/atoms/connect/conferencing-apps/ConferencingAppsViewPlatformWrapper.tsx
+++ b/packages/platform/atoms/connect/conferencing-apps/ConferencingAppsViewPlatformWrapper.tsx
@@ -11,17 +11,16 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
import { GOOGLE_MEET, OFFICE_365_VIDEO, ZOOM } from "@calcom/platform-constants";
import { QueryCell } from "@calcom/trpc/components/QueryCell";
import type { App } from "@calcom/types/App";
+import { Button } from "@calcom/ui/components/button";
import {
- Button,
- SkeletonContainer,
- SkeletonText,
Dropdown,
DropdownMenuTrigger,
DropdownMenuContent,
DropdownMenuItem,
DropdownItem,
- EmptyScreen,
-} from "@calcom/ui";
+} from "@calcom/ui/components/dropdown";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+import { SkeletonContainer, SkeletonText } from "@calcom/ui/components/skeleton";
import { AtomsWrapper } from "../../src/components/atoms-wrapper";
import { useToast } from "../../src/components/ui/use-toast";
diff --git a/packages/platform/atoms/connect/conferencing-apps/ConferencingAppsViewWebWrapper.tsx b/packages/platform/atoms/connect/conferencing-apps/ConferencingAppsViewWebWrapper.tsx
index 522415e60b1..fae56cb19df 100644
--- a/packages/platform/atoms/connect/conferencing-apps/ConferencingAppsViewWebWrapper.tsx
+++ b/packages/platform/atoms/connect/conferencing-apps/ConferencingAppsViewWebWrapper.tsx
@@ -7,7 +7,10 @@ import DisconnectIntegrationModal from "@calcom/features/apps/components/Disconn
import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
-import { Button, EmptyScreen, showToast, SkeletonContainer, SkeletonText } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+import { SkeletonText, SkeletonContainer } from "@calcom/ui/components/skeleton";
+import { showToast } from "@calcom/ui/components/toast";
type ConferencingAppsViewWebWrapperProps = {
title: string;
diff --git a/packages/platform/atoms/connect/stripe/StripeConnect.tsx b/packages/platform/atoms/connect/stripe/StripeConnect.tsx
index 06b8a747e97..497c3910f35 100644
--- a/packages/platform/atoms/connect/stripe/StripeConnect.tsx
+++ b/packages/platform/atoms/connect/stripe/StripeConnect.tsx
@@ -1,9 +1,9 @@
import type { FC } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button } from "@calcom/ui";
-import type { IconName } from "@calcom/ui";
-import type { ButtonColor } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
+import type { ButtonColor } from "@calcom/ui/components/button";
+import type { IconName } from "@calcom/ui/components/icon";
import type { OnCheckErrorType, UseCheckProps } from "../../hooks/connect/useCheck";
import { useTeamCheck, useCheck } from "../../hooks/stripe/useCheck";
diff --git a/packages/platform/atoms/destination-calendar/DestinationCalendar.tsx b/packages/platform/atoms/destination-calendar/DestinationCalendar.tsx
index a8d4358d922..a024956e6ca 100644
--- a/packages/platform/atoms/destination-calendar/DestinationCalendar.tsx
+++ b/packages/platform/atoms/destination-calendar/DestinationCalendar.tsx
@@ -1,5 +1,5 @@
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Label } from "@calcom/ui";
+import { Label } from "@calcom/ui/components/form";
import { cn } from "../src/lib/utils";
import type { DestinationCalendarProps } from "./DestinationCalendarSelector";
diff --git a/packages/platform/atoms/destination-calendar/DestinationCalendarSelector.tsx b/packages/platform/atoms/destination-calendar/DestinationCalendarSelector.tsx
index 44ded39b5d6..df626d838e5 100644
--- a/packages/platform/atoms/destination-calendar/DestinationCalendarSelector.tsx
+++ b/packages/platform/atoms/destination-calendar/DestinationCalendarSelector.tsx
@@ -6,7 +6,8 @@ import { SingleValueComponent } from "@calcom/features/calendars/DestinationCale
import { OptionComponent } from "@calcom/features/calendars/DestinationCalendarSelector";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { ConnectedDestinationCalendars } from "@calcom/platform-libraries";
-import { Badge, Select } from "@calcom/ui";
+import { Badge } from "@calcom/ui/components/badge";
+import { Select } from "@calcom/ui/components/form";
import classNames from "@calcom/ui/classNames";
import { getPlaceholderContent } from "../lib/getPlaceholderContent";
diff --git a/packages/platform/atoms/event-types/hooks/usePlatformTabsNavigations.tsx b/packages/platform/atoms/event-types/hooks/usePlatformTabsNavigations.tsx
index e66fbfbd07b..4e28d0c1b0f 100644
--- a/packages/platform/atoms/event-types/hooks/usePlatformTabsNavigations.tsx
+++ b/packages/platform/atoms/event-types/hooks/usePlatformTabsNavigations.tsx
@@ -10,7 +10,7 @@ import useLockedFieldsManager from "@calcom/features/ee/managed-event-types/hook
import type { EventTypeSetupProps, FormValues } from "@calcom/features/eventtypes/lib/types";
import { getPaymentAppData } from "@calcom/lib/getPaymentAppData";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import type { VerticalTabItemProps } from "@calcom/ui";
+import type { VerticalTabItemProps } from "@calcom/ui/components/navigation";
import type { PlatformTabs } from "../../event-types/wrappers/types";
diff --git a/packages/platform/atoms/event-types/hooks/useTabsNavigations.tsx b/packages/platform/atoms/event-types/hooks/useTabsNavigations.tsx
index f96f7255b0d..38c59be3dfa 100644
--- a/packages/platform/atoms/event-types/hooks/useTabsNavigations.tsx
+++ b/packages/platform/atoms/event-types/hooks/useTabsNavigations.tsx
@@ -16,7 +16,7 @@ import type {
import { getPaymentAppData } from "@calcom/lib/getPaymentAppData";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { eventTypeMetaDataSchemaWithTypedApps } from "@calcom/prisma/zod-utils";
-import type { VerticalTabItemProps } from "@calcom/ui";
+import type { VerticalTabItemProps } from "@calcom/ui/components/navigation";
type Props = {
formMethods: UseFormReturn<FormValues>;
diff --git a/packages/platform/atoms/event-types/wrappers/CreateEventTypePlatformWrapper.tsx b/packages/platform/atoms/event-types/wrappers/CreateEventTypePlatformWrapper.tsx
index 9c6d9e8b684..e470e6d431a 100644
--- a/packages/platform/atoms/event-types/wrappers/CreateEventTypePlatformWrapper.tsx
+++ b/packages/platform/atoms/event-types/wrappers/CreateEventTypePlatformWrapper.tsx
@@ -5,7 +5,7 @@ import CreateEventTypeForm from "@calcom/features/eventtypes/components/CreateEv
import { useCreateEventTypeForm } from "@calcom/lib/hooks/useCreateEventType";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { EventType } from "@calcom/prisma/client";
-import { Button } from "@calcom/ui";
+import { Button } from "@calcom/ui/components/button";
import { useCreateEventType } from "../../hooks/event-types/private/useCreateEventType";
import { useCreateTeamEventType } from "../../hooks/event-types/private/useCreateTeamEventType";
diff --git a/packages/platform/atoms/event-types/wrappers/EventPaymentsTabPlatformWrapper.tsx b/packages/platform/atoms/event-types/wrappers/EventPaymentsTabPlatformWrapper.tsx
index 1db2d0accca..365de32511d 100644
--- a/packages/platform/atoms/event-types/wrappers/EventPaymentsTabPlatformWrapper.tsx
+++ b/packages/platform/atoms/event-types/wrappers/EventPaymentsTabPlatformWrapper.tsx
@@ -6,7 +6,7 @@ import type {
import type { EventTypeAppsList } from "@calcom/app-store/utils";
import type { EventTypeSetupProps } from "@calcom/features/eventtypes/lib/types";
import useAppsData from "@calcom/lib/hooks/useAppsData";
-import { EmptyScreen } from "@calcom/ui";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
import { StripeConnect } from "../../connect/stripe/StripeConnect";
import { useCheck, useTeamCheck } from "../../hooks/stripe/useCheck";
diff --git a/packages/platform/atoms/event-types/wrappers/EventTypeWebWrapper.tsx b/packages/platform/atoms/event-types/wrappers/EventTypeWebWrapper.tsx
index abc69d84934..d89549e4dd9 100644
--- a/packages/platform/atoms/event-types/wrappers/EventTypeWebWrapper.tsx
+++ b/packages/platform/atoms/event-types/wrappers/EventTypeWebWrapper.tsx
@@ -17,7 +17,7 @@ import { telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
import { SchedulingType } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery";
-import { showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
import { TRPCClientError } from "@trpc/react-query";
diff --git a/packages/platform/atoms/hooks/bookings/useHandleBookEvent.ts b/packages/platform/atoms/hooks/bookings/useHandleBookEvent.ts
index ad1070201aa..961db371c66 100644
--- a/packages/platform/atoms/hooks/bookings/useHandleBookEvent.ts
+++ b/packages/platform/atoms/hooks/bookings/useHandleBookEvent.ts
@@ -10,7 +10,7 @@ import type { BookerEvent } from "@calcom/features/bookings/types";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RoutingFormSearchParams } from "@calcom/platform-types";
import type { BookingCreateBody } from "@calcom/prisma/zod/custom/booking";
-import { showToast } from "@calcom/ui";
+import { showToast } from "@calcom/ui/components/toast";
import { getUtmTrackingParameters } from "../../lib/getUtmTrackingParameters";
import type { UseCreateBookingInput } from "./useCreateBooking";
diff --git a/packages/platform/atoms/selected-calendars/wrappers/SelectedCalendarsSettingsPlatformWrapper.tsx b/packages/platform/atoms/selected-calendars/wrappers/SelectedCalendarsSettingsPlatformWrapper.tsx
index 0f26e079a39..1dfefd0e789 100644
--- a/packages/platform/atoms/selected-calendars/wrappers/SelectedCalendarsSettingsPlatformWrapper.tsx
+++ b/packages/platform/atoms/selected-calendars/wrappers/SelectedCalendarsSettingsPlatformWrapper.tsx
@@ -4,19 +4,15 @@ import type { ICalendarSwitchProps } from "@calcom/features/calendars/CalendarSw
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { CALENDARS } from "@calcom/platform-constants";
import { QueryCell } from "@calcom/trpc/components/QueryCell";
-import type { ButtonProps } from "@calcom/ui";
-import {
- CalendarSwitchComponent,
- AppListCard,
- List,
- DisconnectIntegrationComponent,
- Alert,
- Button,
- Dropdown,
- DropdownMenuContent,
- DropdownMenuTrigger,
- Switch,
-} from "@calcom/ui";
+import { Alert } from "@calcom/ui/components/alert";
+import { AppListCard } from "@calcom/ui/components/app-list-card";
+import type { ButtonProps } from "@calcom/ui/components/button";
+import { Button } from "@calcom/ui/components/button";
+import { CalendarSwitchComponent } from "@calcom/ui/components/calendar-switch";
+import { DisconnectIntegrationComponent } from "@calcom/ui/components/disconnect-calendar-integration";
+import { Dropdown, DropdownMenuContent, DropdownMenuTrigger } from "@calcom/ui/components/dropdown";
+import { Switch } from "@calcom/ui/components/form";
+import { List } from "@calcom/ui/components/list";
import { AppleConnect } from "../../connect/apple/AppleConnect";
import { useAddSelectedCalendar } from "../../hooks/calendars/useAddSelectedCalendar";
diff --git a/packages/platform/atoms/selected-calendars/wrappers/SelectedCalendarsSettingsWebWrapper.tsx b/packages/platform/atoms/selected-calendars/wrappers/SelectedCalendarsSettingsWebWrapper.tsx
index 267211267ea..8a57e619866 100644
--- a/packages/platform/atoms/selected-calendars/wrappers/SelectedCalendarsSettingsWebWrapper.tsx
+++ b/packages/platform/atoms/selected-calendars/wrappers/SelectedCalendarsSettingsWebWrapper.tsx
@@ -7,7 +7,9 @@ import { CalendarSwitch } from "@calcom/features/calendars/CalendarSwitch";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
-import { Alert, Select, List } from "@calcom/ui";
+import { Alert } from "@calcom/ui/components/alert";
+import { Select } from "@calcom/ui/components/form";
+import { List } from "@calcom/ui/components/list";
import AdditionalCalendarSelector from "@calcom/web/components/apps/AdditionalCalendarSelector";
import { SelectedCalendarsSettings } from "../SelectedCalendarsSettings";
diff --git a/packages/platform/atoms/src/components/ui/toast.tsx b/packages/platform/atoms/src/components/ui/toast.tsx
index 1d0f0f8f170..3e660716cec 100644
--- a/packages/platform/atoms/src/components/ui/toast.tsx
+++ b/packages/platform/atoms/src/components/ui/toast.tsx
@@ -2,7 +2,7 @@ import * as ToastPrimitives from "@radix-ui/react-toast";
import { cva, type VariantProps } from "class-variance-authority";
import * as React from "react";
-import { Icon } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
import { cn } from "../../lib/utils";
diff --git a/packages/platform/examples/base/src/pages/[bookingUid].tsx b/packages/platform/examples/base/src/pages/[bookingUid].tsx
index 80909aebb76..8b2573acc27 100644
--- a/packages/platform/examples/base/src/pages/[bookingUid].tsx
+++ b/packages/platform/examples/base/src/pages/[bookingUid].tsx
@@ -5,7 +5,7 @@ import { useRouter } from "next/router";
import { useBooking, useCancelBooking } from "@calcom/atoms";
import dayjs from "@calcom/dayjs";
-import { Icon } from "@calcom/ui";
+import { Icon } from "@calcom/ui/components/icon";
const inter = Inter({ subsets: ["latin"] });
diff --git a/packages/trpc/components/QueryCell.tsx b/packages/trpc/components/QueryCell.tsx
index cfc2fbbb5f2..26af5b95118 100644
--- a/packages/trpc/components/QueryCell.tsx
+++ b/packages/trpc/components/QueryCell.tsx
@@ -8,7 +8,8 @@ import type {
import type { ReactNode } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Alert, Loader } from "@calcom/ui";
+import { Alert } from "@calcom/ui/components/alert";
+import { Loader } from "@calcom/ui/components/skeleton";
type ErrorLike = {
message: string;
diff --git a/packages/ui/components/__mocks__/UnpublishedEntity.tsx b/packages/ui/components/__mocks__/UnpublishedEntity.tsx
index 417ad57b6c7..3633626b52e 100644
--- a/packages/ui/components/__mocks__/UnpublishedEntity.tsx
+++ b/packages/ui/components/__mocks__/UnpublishedEntity.tsx
@@ -1,5 +1,5 @@
import { vi } from "vitest";
-vi.mock("../unpublished-entity/UnpublishedEntity", () => ({
+vi.mock("../unpublished-entity", () => ({
UnpublishedEntity: () => <div data-testid="unpublished-entity">Mock Unpublished Entity</div>,
}));
diff --git a/packages/ui/form/AddressInput.tsx b/packages/ui/components/address/AddressInput.tsx
similarity index 89%
rename from packages/ui/form/AddressInput.tsx
rename to packages/ui/components/address/AddressInput.tsx
index 35e5bb139fc..6bca4291e61 100644
--- a/packages/ui/form/AddressInput.tsx
+++ b/packages/ui/components/address/AddressInput.tsx
@@ -1,7 +1,7 @@
import cx from "@calcom/ui/classNames";
-import { Input } from "../components/form";
-import { Icon } from "../components/icon";
+import { Input } from "../form";
+import { Icon } from "../icon";
export type AddressInputProps = {
value: string;
diff --git a/packages/ui/form/AddressInputLazy.tsx b/packages/ui/components/address/AddressInputLazy.tsx
similarity index 100%
rename from packages/ui/form/AddressInputLazy.tsx
rename to packages/ui/components/address/AddressInputLazy.tsx
diff --git a/packages/ui/form/MultiEmail.tsx b/packages/ui/components/address/MultiEmail.tsx
similarity index 94%
rename from packages/ui/form/MultiEmail.tsx
rename to packages/ui/components/address/MultiEmail.tsx
index 69c32b23e6a..e1d39d2f5a2 100644
--- a/packages/ui/form/MultiEmail.tsx
+++ b/packages/ui/components/address/MultiEmail.tsx
@@ -1,9 +1,9 @@
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button } from "../components/button";
-import { EmailField } from "../components/form";
-import { Icon } from "../components/icon";
-import { Tooltip } from "../components/tooltip";
+import { Button } from "../button";
+import { EmailField } from "../form";
+import { Icon } from "../icon";
+import { Tooltip } from "../tooltip";
interface MultiEmailProps {
value: string[];
diff --git a/packages/ui/form/MultiEmailLazy.tsx b/packages/ui/components/address/MultiEmailLazy.tsx
similarity index 100%
rename from packages/ui/form/MultiEmailLazy.tsx
rename to packages/ui/components/address/MultiEmailLazy.tsx
diff --git a/packages/ui/form/Select.tsx b/packages/ui/components/address/Select.tsx
similarity index 100%
rename from packages/ui/form/Select.tsx
rename to packages/ui/components/address/Select.tsx
diff --git a/packages/ui/form/fields.tsx b/packages/ui/components/address/fields.tsx
similarity index 98%
rename from packages/ui/form/fields.tsx
rename to packages/ui/components/address/fields.tsx
index 0a2b1811e7d..9082c839b12 100644
--- a/packages/ui/form/fields.tsx
+++ b/packages/ui/components/address/fields.tsx
@@ -8,8 +8,8 @@ import { getErrorFromUnknown } from "@calcom/lib/errors";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import classNames from "@calcom/ui/classNames";
-import { Alert } from "../components/alert";
-import { showToast } from "../components/toast";
+import { Alert } from "../alert";
+import { showToast } from "../toast";
type InputProps = Omit<JSX.IntrinsicElements["input"], "name"> & { name: string };
diff --git a/packages/ui/components/address/index.ts b/packages/ui/components/address/index.ts
new file mode 100644
index 00000000000..03d621d09f2
--- /dev/null
+++ b/packages/ui/components/address/index.ts
@@ -0,0 +1,2 @@
+export { default as AddressInput } from "./AddressInputLazy";
+export { default as MultiEmail } from "./MultiEmailLazy";
diff --git a/packages/ui/components/app-list-card/index.ts b/packages/ui/components/app-list-card/index.ts
index 03dc995e462..f29122f730f 100644
--- a/packages/ui/components/app-list-card/index.ts
+++ b/packages/ui/components/app-list-card/index.ts
@@ -1 +1,2 @@
export { AppListCard } from "./AppListCard";
+export type { AppListCardProps } from "./AppListCard";
diff --git a/packages/ui/components/command/index.ts b/packages/ui/components/command/index.ts
new file mode 100644
index 00000000000..774adc9e438
--- /dev/null
+++ b/packages/ui/components/command/index.ts
@@ -0,0 +1,11 @@
+export {
+ Command,
+ CommandDialog,
+ CommandInput,
+ CommandList,
+ CommandEmpty,
+ CommandGroup,
+ CommandItem,
+ CommandShortcut,
+ CommandSeparator,
+} from "./Command";
diff --git a/packages/ui/components/form/index.ts b/packages/ui/components/form/index.ts
index 99ad07b07c6..180416aafa2 100644
--- a/packages/ui/components/form/index.ts
+++ b/packages/ui/components/form/index.ts
@@ -1,5 +1,5 @@
export { Checkbox, MultiSelectCheckbox, CheckboxField } from "./checkbox";
-export type { Option } from "./checkbox";
+export type { Option as MultiSelectCheckboxesOptionType } from "./checkbox";
export { HintsOrErrors } from "./inputs/HintOrErrors";
export {
EmailField,
@@ -15,7 +15,7 @@ export {
} from "./inputs/Input";
export { InputFieldWithSelect } from "./inputs/InputFieldWithSelect";
-
+export type { InputFieldProps, InputProps } from "./inputs/types";
export { InputField, Input, TextField, inputStyles } from "./inputs/TextField";
export { InputError } from "./inputs/InputError";
export { Form } from "./inputs/Form";
diff --git a/packages/ui/components/form/inputs/InputFieldWithSelect.tsx b/packages/ui/components/form/inputs/InputFieldWithSelect.tsx
index f6703f5884a..14f6d88f550 100644
--- a/packages/ui/components/form/inputs/InputFieldWithSelect.tsx
+++ b/packages/ui/components/form/inputs/InputFieldWithSelect.tsx
@@ -1,6 +1,6 @@
import React, { forwardRef } from "react";
-import { UnstyledSelect } from "../../../form/Select";
+import { UnstyledSelect } from "../../address/Select";
import { InputField } from "./TextField";
import type { InputFieldProps } from "./types";
diff --git a/packages/ui/components/form/inputs/input.test.tsx b/packages/ui/components/form/inputs/input.test.tsx
index 6e83decdc7a..fc0d6e63580 100644
--- a/packages/ui/components/form/inputs/input.test.tsx
+++ b/packages/ui/components/form/inputs/input.test.tsx
@@ -3,7 +3,7 @@ import { TooltipProvider } from "@radix-ui/react-tooltip";
import { render, fireEvent } from "@testing-library/react";
import { vi } from "vitest";
-import type { UnstyledSelect } from "../../../form/Select";
+import type { UnstyledSelect } from "../../address/Select";
import { EmailField, TextAreaField, PasswordField, NumberInput, FilterSearchField } from "./Input";
import { InputFieldWithSelect } from "./InputFieldWithSelect";
import { InputField } from "./TextField";
diff --git a/packages/ui/components/form/switch/SettingsToggle.tsx b/packages/ui/components/form/switch/SettingsToggle.tsx
index a58ec94fe98..1c5a527f41d 100644
--- a/packages/ui/components/form/switch/SettingsToggle.tsx
+++ b/packages/ui/components/form/switch/SettingsToggle.tsx
@@ -4,7 +4,7 @@ import type { ReactNode } from "react";
import classNames from "@calcom/ui/classNames";
import { Label } from "../inputs/Label";
-import Switch from "./Switch";
+import { Switch } from "./Switch";
type Props = {
children?: ReactNode;
@@ -26,7 +26,7 @@ type Props = {
hideSwitch?: boolean;
};
-function SettingsToggle({
+export function SettingsToggle({
checked,
onCheckedChange,
description,
@@ -123,5 +123,3 @@ function SettingsToggle({
</>
);
}
-
-export default SettingsToggle;
diff --git a/packages/ui/components/form/switch/Switch.tsx b/packages/ui/components/form/switch/Switch.tsx
index 2c97b2313b3..a5ce071211d 100644
--- a/packages/ui/components/form/switch/Switch.tsx
+++ b/packages/ui/components/form/switch/Switch.tsx
@@ -14,7 +14,7 @@ const Wrapper = ({ children, tooltip }: { tooltip?: string; children: React.Reac
}
return <Tooltip content={tooltip}>{children}</Tooltip>;
};
-const Switch = (
+export const Switch = (
props: React.ComponentProps<typeof PrimitiveSwitch.Root> & {
label?: string | ReactNode;
fitToHeight?: boolean;
@@ -87,5 +87,3 @@ const Switch = (
</Wrapper>
);
};
-
-export default Switch;
diff --git a/packages/ui/components/form/switch/index.ts b/packages/ui/components/form/switch/index.ts
index 2d209375932..0d21a505f3b 100644
--- a/packages/ui/components/form/switch/index.ts
+++ b/packages/ui/components/form/switch/index.ts
@@ -1,2 +1,2 @@
-export { default as SettingsToggle } from "./SettingsToggle";
-export { default as Switch } from "./Switch";
+export { SettingsToggle } from "./SettingsToggle";
+export { Switch } from "./Switch";
diff --git a/packages/ui/components/icon/index.ts b/packages/ui/components/icon/index.ts
index 9df602e16b4..06fdfe02e72 100644
--- a/packages/ui/components/icon/index.ts
+++ b/packages/ui/components/icon/index.ts
@@ -1,3 +1,5 @@
export { default as Icon } from "./Icon";
export type { IconName } from "./icon-names";
export { IconSprites } from "./IconSprites";
+export { Spinner } from "./Spinner";
+export { SatSymbol } from "./SatSymbol";
diff --git a/packages/ui/layouts/WizardLayout.tsx b/packages/ui/components/layout/WizardLayout.tsx
similarity index 91%
rename from packages/ui/layouts/WizardLayout.tsx
rename to packages/ui/components/layout/WizardLayout.tsx
index b14e669bfd0..e9dfb306886 100644
--- a/packages/ui/layouts/WizardLayout.tsx
+++ b/packages/ui/components/layout/WizardLayout.tsx
@@ -9,10 +9,10 @@ import { Toaster } from "sonner";
import { APP_NAME } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button } from "../components/button/Button";
-import { StepCard } from "../components/card/StepCard";
-import { Steps } from "../components/form/step/Steps";
-import { SkeletonText } from "../components/skeleton/Skeleton";
+import { Button } from "../../components/button/Button";
+import { StepCard } from "../../components/card/StepCard";
+import { Steps } from "../../components/form/step/Steps";
+import { SkeletonText } from "../../components/skeleton/Skeleton";
export function WizardLayout({
children,
diff --git a/packages/ui/components/layout/index.ts b/packages/ui/components/layout/index.ts
index 7b46739be2e..92949798fa5 100644
--- a/packages/ui/components/layout/index.ts
+++ b/packages/ui/components/layout/index.ts
@@ -1 +1,2 @@
export { ShellSubHeading } from "./ShellSubHeading";
+export { WizardLayout } from "./WizardLayout";
diff --git a/packages/ui/components/logo/Logo.tsx b/packages/ui/components/logo/Logo.tsx
index 3abf13e73cd..0fe05ba39a8 100644
--- a/packages/ui/components/logo/Logo.tsx
+++ b/packages/ui/components/logo/Logo.tsx
@@ -1,6 +1,6 @@
import classNames from "@calcom/ui/classNames";
-export default function Logo({
+export function Logo({
small,
icon,
inline = true,
diff --git a/packages/ui/components/logo/index.ts b/packages/ui/components/logo/index.ts
index fb518c1984f..cd9b83375d8 100644
--- a/packages/ui/components/logo/index.ts
+++ b/packages/ui/components/logo/index.ts
@@ -1 +1 @@
-export { default as Logo } from "./Logo";
+export { Logo } from "./Logo";
diff --git a/packages/ui/form/radio-area/Radio.tsx b/packages/ui/components/radio/Radio.tsx
similarity index 100%
rename from packages/ui/form/radio-area/Radio.tsx
rename to packages/ui/components/radio/Radio.tsx
diff --git a/packages/ui/form/radio-area/RadioAreaGroup.tsx b/packages/ui/components/radio/RadioAreaGroup.tsx
similarity index 100%
rename from packages/ui/form/radio-area/RadioAreaGroup.tsx
rename to packages/ui/components/radio/RadioAreaGroup.tsx
diff --git a/packages/ui/components/radio/index.ts b/packages/ui/components/radio/index.ts
new file mode 100644
index 00000000000..fede74aea95
--- /dev/null
+++ b/packages/ui/components/radio/index.ts
@@ -0,0 +1,8 @@
+export * as RadioAreaGroup from "./RadioAreaGroup";
+export {
+ Group as RadioGroup,
+ Indicator as RadioIndicator,
+ Label as RadioLabel,
+ Radio,
+ RadioField,
+} from "./Radio";
diff --git a/packages/ui/components/table/index.ts b/packages/ui/components/table/index.ts
index 4ce6c429ed8..1427ef5fb4d 100644
--- a/packages/ui/components/table/index.ts
+++ b/packages/ui/components/table/index.ts
@@ -1,4 +1,6 @@
export { Table } from "./Table";
+export { TableActions, DropdownActions } from "./TableActions";
+export type { ActionType } from "./TableActions";
export {
Table as TableNew,
TableBody,
diff --git a/packages/ui/form/radio-area/index.ts b/packages/ui/form/radio-area/index.ts
deleted file mode 100644
index 1f2d98b9cf0..00000000000
--- a/packages/ui/form/radio-area/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * as RadioGroup from "./RadioAreaGroup";
-export { Group, Indicator, Label, Radio, RadioField } from "./Radio";
diff --git a/packages/ui/index.ts b/packages/ui/index.ts
index 471b7b11ddf..18883069ce9 100644
--- a/packages/ui/index.ts
+++ b/packages/ui/index.ts
@@ -106,24 +106,24 @@ export { AppListCard } from "./components/app-list-card/AppListCard";
export { DisconnectIntegrationComponent } from "./components/disconnect-calendar-integration";
export { CalendarSwitchComponent } from "./components/calendar-switch";
export { showToast, ErrorToast, SuccessToast, WarningToast } from "./components/toast"; // We don't export the toast components as they are only used in local storybook file
-export { ShellSubHeading } from "./components/layout";
+export { ShellSubHeading, WizardLayout } from "./components/layout";
/** ⬇️ TODO - Move these to components */
-export { default as AddressInput } from "./form/AddressInputLazy";
-export { default as MultiEmail } from "./form/MultiEmailLazy";
-export { default as AddressInputNonLazy } from "./form/AddressInput";
+export { default as AddressInput } from "./components/address/AddressInputLazy";
+export { default as MultiEmail } from "./components/address/MultiEmailLazy";
+export { default as AddressInputNonLazy } from "./components/address/AddressInput";
-export { UnstyledSelect } from "./form/Select";
+export { UnstyledSelect } from "./components/address/Select";
export {
RadioGroup,
- /* TODO: solve this conflict -> Select, */
+ RadioIndicator,
+ RadioLabel,
Radio,
- Group,
RadioField,
-} from "./form/radio-area";
+ RadioAreaGroup,
+} from "./components/radio";
-export { default as MultiSelectCheckboxes } from "./components/form/checkbox/MultiSelectCheckboxes";
export type { Option as MultiSelectCheckboxesOptionType } from "./components/form/checkbox/MultiSelectCheckboxes";
export { default as ImageUploader } from "./components/image-uploader/ImageUploader";
export { default as BannerUploader } from "./components/image-uploader/BannerUploader";
@@ -132,7 +132,6 @@ export type { ButtonColor } from "./components/button/Button";
export { useCalcomTheme } from "./styles/useCalcomTheme";
export { ScrollableArea } from "./components/scrollable";
-export { WizardLayout } from "./layouts/WizardLayout";
export * from "./components/sheet";
export * from "./components/table";
export * from "./components/popover";
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 16d7e012ec9..71c21d44a67 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -7,6 +7,8 @@
"exports": {
".": "./index.ts",
"./classNames": "./classNames.ts",
+ "./styles": "./styles/index.ts",
+ "./components/address": "./components/address/index.ts",
"./components/alert": "./components/alert/index.ts",
"./components/app-list-card": "./components/app-list-card/index.ts",
"./components/apps": "./components/apps/index.ts",
@@ -32,6 +34,7 @@
"./components/form": "./components/form/index.ts",
"./components/form/timezone-select": "./components/form/timezone-select/index.ts",
"./components/head-seo": "./components/head-seo/index.ts",
+ "./components/hover-card": "./components/hover-card/index.tsx",
"./components/image-uploader": "./components/image-uploader/index.ts",
"./components/layout": "./components/layout/index.ts",
"./components/list": "./components/list/index.ts",
@@ -39,7 +42,9 @@
"./components/meta": "./components/meta/index.ts",
"./components/navigation": "./components/navigation/index.ts",
"./components/organization-banner": "./components/organization-banner/index.ts",
+ "./components/pagination": "./components/pagination/index.ts",
"./components/popover": "./components/popover/index.ts",
+ "./components/radio": "./components/radio/index.ts",
"./components/scrollable": "./components/scrollable/index.ts",
"./components/sheet": "./components/sheet/index.ts",
"./components/skeleton": "./components/skeleton/index.ts",
@@ -49,9 +54,7 @@
"./components/top-banner": "./components/top-banner/index.ts",
"./components/filter-select": "./components/filter-select/index.ts",
"./components/icon": "./components/icon/index.ts",
- "./components/icon/SatSymbol": "./components/icon/SatSymbol.tsx",
- "./components/icon/Spinner": "./components/icon/Spinner.tsx",
- "./components/unpublished-entity/UnpublishedEntity": "./components/unpublished-entity/index.ts",
+ "./components/unpublished-entity": "./components/unpublished-entity/index.ts",
"./components/table/TableNew": "./components/table/TableNew.tsx",
"./components/app-list-card/AppListCard": "./components/app-list-card/AppListCard.tsx",
"./__mocks__/ui": "./__mocks__/ui.tsx"
diff --git a/packages/ui/styles/index.ts b/packages/ui/styles/index.ts
new file mode 100644
index 00000000000..4154e976b81
--- /dev/null
+++ b/packages/ui/styles/index.ts
@@ -0,0 +1 @@
+export { useCalcomTheme } from "./useCalcomTheme";