From e6f79cd68a904490663bcf3100e0efe7b7066c90 Mon Sep 17 00:00:00 2001
From: Daniel Kirby <dkirby24.10@gmail.com>
Date: Sat, 27 Jun 2026 10:13:51 +0100
Subject: [PATCH] refactor: organize shared utilities

---
 src/lib/components/first-admin-form.svelte    |  4 +--
 src/lib/components/form-combobox.svelte       |  2 +-
 src/lib/components/form-select.svelte         |  2 +-
 src/lib/components/login-form.svelte          |  2 +-
 src/lib/components/search-form.svelte         |  2 +-
 .../ui/accordion/accordion-content.svelte     |  2 +-
 .../ui/accordion/accordion-item.svelte        |  2 +-
 .../ui/accordion/accordion-trigger.svelte     |  2 +-
 .../components/ui/accordion/accordion.svelte  |  2 +-
 .../alert-dialog/alert-dialog-action.svelte   |  2 +-
 .../alert-dialog/alert-dialog-cancel.svelte   |  2 +-
 .../alert-dialog/alert-dialog-content.svelte  |  2 +-
 .../alert-dialog-description.svelte           |  2 +-
 .../alert-dialog/alert-dialog-footer.svelte   |  2 +-
 .../alert-dialog/alert-dialog-header.svelte   |  2 +-
 .../ui/alert-dialog/alert-dialog-media.svelte |  2 +-
 .../alert-dialog/alert-dialog-overlay.svelte  |  2 +-
 .../ui/alert-dialog/alert-dialog-title.svelte |  2 +-
 .../components/ui/alert/alert-action.svelte   |  2 +-
 .../ui/alert/alert-description.svelte         |  2 +-
 .../components/ui/alert/alert-title.svelte    |  2 +-
 src/lib/components/ui/alert/alert.svelte      |  2 +-
 .../components/ui/avatar/avatar-badge.svelte  |  2 +-
 .../ui/avatar/avatar-fallback.svelte          |  2 +-
 .../ui/avatar/avatar-group-count.svelte       |  2 +-
 .../components/ui/avatar/avatar-group.svelte  |  2 +-
 .../components/ui/avatar/avatar-image.svelte  |  2 +-
 src/lib/components/ui/avatar/avatar.svelte    |  2 +-
 src/lib/components/ui/badge/badge.svelte      |  2 +-
 .../ui/breadcrumb/breadcrumb-ellipsis.svelte  |  2 +-
 .../ui/breadcrumb/breadcrumb-item.svelte      |  2 +-
 .../ui/breadcrumb/breadcrumb-link.svelte      |  2 +-
 .../ui/breadcrumb/breadcrumb-list.svelte      |  2 +-
 .../ui/breadcrumb/breadcrumb-page.svelte      |  2 +-
 .../ui/breadcrumb/breadcrumb-separator.svelte |  2 +-
 .../ui/breadcrumb/breadcrumb.svelte           |  4 +--
 .../button-group-separator.svelte             |  2 +-
 .../ui/button-group/button-group-text.svelte  |  2 +-
 .../ui/button-group/button-group.svelte       |  2 +-
 src/lib/components/ui/button/button.svelte    |  2 +-
 .../ui/calendar/calendar-cell.svelte          |  2 +-
 .../ui/calendar/calendar-day.svelte           |  2 +-
 .../ui/calendar/calendar-grid-body.svelte     |  2 +-
 .../ui/calendar/calendar-grid-head.svelte     |  2 +-
 .../ui/calendar/calendar-grid-row.svelte      |  2 +-
 .../ui/calendar/calendar-grid.svelte          |  2 +-
 .../ui/calendar/calendar-head-cell.svelte     |  2 +-
 .../ui/calendar/calendar-header.svelte        |  2 +-
 .../ui/calendar/calendar-heading.svelte       |  2 +-
 .../ui/calendar/calendar-month-select.svelte  |  2 +-
 .../ui/calendar/calendar-month.svelte         |  2 +-
 .../ui/calendar/calendar-months.svelte        |  2 +-
 .../ui/calendar/calendar-nav.svelte           |  2 +-
 .../ui/calendar/calendar-next-button.svelte   |  2 +-
 .../ui/calendar/calendar-prev-button.svelte   |  2 +-
 .../ui/calendar/calendar-year-select.svelte   |  2 +-
 .../components/ui/calendar/calendar.svelte    |  2 +-
 src/lib/components/ui/card/card-action.svelte |  2 +-
 .../components/ui/card/card-content.svelte    |  2 +-
 .../ui/card/card-description.svelte           |  2 +-
 src/lib/components/ui/card/card-footer.svelte |  2 +-
 src/lib/components/ui/card/card-header.svelte |  2 +-
 src/lib/components/ui/card/card-title.svelte  |  2 +-
 src/lib/components/ui/card/card.svelte        |  2 +-
 .../ui/carousel/carousel-content.svelte       |  2 +-
 .../ui/carousel/carousel-item.svelte          |  2 +-
 .../ui/carousel/carousel-next.svelte          |  2 +-
 .../ui/carousel/carousel-previous.svelte      |  2 +-
 .../components/ui/carousel/carousel.svelte    |  2 +-
 src/lib/components/ui/carousel/context.ts     |  2 +-
 .../ui/chart/chart-container.svelte           |  2 +-
 .../components/ui/chart/chart-tooltip.svelte  |  2 +-
 .../components/ui/checkbox/checkbox.svelte    |  2 +-
 .../ui/command/command-dialog.svelte          |  2 +-
 .../ui/command/command-empty.svelte           |  2 +-
 .../ui/command/command-group.svelte           |  2 +-
 .../ui/command/command-input.svelte           |  2 +-
 .../components/ui/command/command-item.svelte |  2 +-
 .../ui/command/command-link-item.svelte       |  2 +-
 .../components/ui/command/command-list.svelte |  2 +-
 .../ui/command/command-separator.svelte       |  2 +-
 .../ui/command/command-shortcut.svelte        |  2 +-
 src/lib/components/ui/command/command.svelte  |  2 +-
 .../context-menu-checkbox-item.svelte         |  2 +-
 .../context-menu/context-menu-content.svelte  |  4 +--
 .../context-menu-group-heading.svelte         |  2 +-
 .../ui/context-menu/context-menu-item.svelte  |  2 +-
 .../ui/context-menu/context-menu-label.svelte |  2 +-
 .../context-menu-radio-item.svelte            |  2 +-
 .../context-menu-separator.svelte             |  2 +-
 .../context-menu/context-menu-shortcut.svelte |  2 +-
 .../context-menu-sub-content.svelte           |  2 +-
 .../context-menu-sub-trigger.svelte           |  2 +-
 .../context-menu/context-menu-trigger.svelte  |  2 +-
 .../ui/dialog/dialog-content.svelte           |  2 +-
 .../ui/dialog/dialog-description.svelte       |  2 +-
 .../components/ui/dialog/dialog-footer.svelte |  2 +-
 .../components/ui/dialog/dialog-header.svelte |  2 +-
 .../ui/dialog/dialog-overlay.svelte           |  2 +-
 .../components/ui/dialog/dialog-title.svelte  |  2 +-
 .../ui/drawer/drawer-content.svelte           |  4 +--
 .../ui/drawer/drawer-description.svelte       |  2 +-
 .../components/ui/drawer/drawer-footer.svelte |  2 +-
 .../components/ui/drawer/drawer-header.svelte |  2 +-
 .../ui/drawer/drawer-overlay.svelte           |  2 +-
 .../components/ui/drawer/drawer-title.svelte  |  2 +-
 .../dropdown-menu-checkbox-item.svelte        |  2 +-
 .../dropdown-menu-content.svelte              |  2 +-
 .../dropdown-menu-group-heading.svelte        |  2 +-
 .../dropdown-menu/dropdown-menu-item.svelte   |  2 +-
 .../dropdown-menu/dropdown-menu-label.svelte  |  2 +-
 .../dropdown-menu-radio-item.svelte           |  2 +-
 .../dropdown-menu-separator.svelte            |  2 +-
 .../dropdown-menu-shortcut.svelte             |  2 +-
 .../dropdown-menu-sub-content.svelte          |  2 +-
 .../dropdown-menu-sub-trigger.svelte          |  2 +-
 .../components/ui/empty/empty-content.svelte  |  2 +-
 .../ui/empty/empty-description.svelte         |  2 +-
 .../components/ui/empty/empty-header.svelte   |  2 +-
 .../components/ui/empty/empty-media.svelte    |  2 +-
 .../components/ui/empty/empty-title.svelte    |  2 +-
 src/lib/components/ui/empty/empty.svelte      |  2 +-
 .../components/ui/field/field-content.svelte  |  2 +-
 .../ui/field/field-description.svelte         |  2 +-
 .../components/ui/field/field-error.svelte    |  2 +-
 .../components/ui/field/field-group.svelte    |  2 +-
 .../components/ui/field/field-label.svelte    |  2 +-
 .../components/ui/field/field-legend.svelte   |  2 +-
 .../ui/field/field-separator.svelte           |  2 +-
 src/lib/components/ui/field/field-set.svelte  |  2 +-
 .../components/ui/field/field-title.svelte    |  2 +-
 src/lib/components/ui/field/field.svelte      |  2 +-
 .../ui/form/form-description.svelte           |  2 +-
 .../ui/form/form-element-field.svelte         |  2 +-
 .../ui/form/form-field-errors.svelte          |  2 +-
 src/lib/components/ui/form/form-field.svelte  |  2 +-
 .../components/ui/form/form-fieldset.svelte   |  2 +-
 src/lib/components/ui/form/form-label.svelte  |  2 +-
 src/lib/components/ui/form/form-legend.svelte |  2 +-
 .../ui/hover-card/hover-card-content.svelte   |  2 +-
 .../ui/input-group/input-group-addon.svelte   |  2 +-
 .../ui/input-group/input-group-button.svelte  |  2 +-
 .../ui/input-group/input-group-input.svelte   |  2 +-
 .../ui/input-group/input-group-text.svelte    |  2 +-
 .../input-group/input-group-textarea.svelte   |  2 +-
 .../ui/input-group/input-group.svelte         |  2 +-
 .../ui/input-otp/input-otp-group.svelte       |  2 +-
 .../ui/input-otp/input-otp-separator.svelte   |  4 +--
 .../ui/input-otp/input-otp-slot.svelte        |  2 +-
 .../components/ui/input-otp/input-otp.svelte  |  2 +-
 src/lib/components/ui/input/input.svelte      |  2 +-
 .../components/ui/item/item-actions.svelte    |  2 +-
 .../components/ui/item/item-content.svelte    |  2 +-
 .../ui/item/item-description.svelte           |  2 +-
 src/lib/components/ui/item/item-footer.svelte |  2 +-
 src/lib/components/ui/item/item-group.svelte  |  2 +-
 src/lib/components/ui/item/item-header.svelte |  2 +-
 src/lib/components/ui/item/item-media.svelte  |  2 +-
 .../components/ui/item/item-separator.svelte  |  2 +-
 src/lib/components/ui/item/item-title.svelte  |  2 +-
 src/lib/components/ui/item/item.svelte        |  2 +-
 src/lib/components/ui/kbd/kbd-group.svelte    |  2 +-
 src/lib/components/ui/kbd/kbd.svelte          |  2 +-
 src/lib/components/ui/label/label.svelte      |  2 +-
 .../ui/menubar/menubar-checkbox-item.svelte   |  2 +-
 .../ui/menubar/menubar-content.svelte         |  2 +-
 .../ui/menubar/menubar-group-heading.svelte   |  2 +-
 .../components/ui/menubar/menubar-item.svelte |  2 +-
 .../ui/menubar/menubar-label.svelte           |  2 +-
 .../ui/menubar/menubar-radio-item.svelte      |  2 +-
 .../ui/menubar/menubar-separator.svelte       |  2 +-
 .../ui/menubar/menubar-shortcut.svelte        |  2 +-
 .../ui/menubar/menubar-sub-content.svelte     |  2 +-
 .../ui/menubar/menubar-sub-trigger.svelte     |  2 +-
 .../ui/menubar/menubar-trigger.svelte         |  2 +-
 src/lib/components/ui/menubar/menubar.svelte  |  2 +-
 .../native-select-opt-group.svelte            |  2 +-
 .../native-select/native-select-option.svelte |  2 +-
 .../ui/native-select/native-select.svelte     |  2 +-
 .../navigation-menu-content.svelte            |  2 +-
 .../navigation-menu-indicator.svelte          |  2 +-
 .../navigation-menu-item.svelte               |  2 +-
 .../navigation-menu-link.svelte               |  2 +-
 .../navigation-menu-list.svelte               |  2 +-
 .../navigation-menu-trigger.svelte            |  2 +-
 .../navigation-menu-viewport.svelte           |  2 +-
 .../ui/navigation-menu/navigation-menu.svelte |  2 +-
 .../ui/pagination/pagination-content.svelte   |  2 +-
 .../ui/pagination/pagination-ellipsis.svelte  |  2 +-
 .../ui/pagination/pagination-item.svelte      |  2 +-
 .../ui/pagination/pagination-link.svelte      |  2 +-
 .../pagination/pagination-next-button.svelte  |  2 +-
 .../ui/pagination/pagination-next.svelte      |  2 +-
 .../pagination/pagination-prev-button.svelte  |  2 +-
 .../ui/pagination/pagination-previous.svelte  |  2 +-
 .../ui/pagination/pagination.svelte           |  2 +-
 .../ui/popover/popover-content.svelte         |  2 +-
 .../ui/popover/popover-description.svelte     |  2 +-
 .../ui/popover/popover-header.svelte          |  2 +-
 .../ui/popover/popover-title.svelte           |  2 +-
 .../ui/popover/popover-trigger.svelte         |  2 +-
 .../components/ui/progress/progress.svelte    |  2 +-
 .../ui/radio-group/radio-group-item.svelte    |  2 +-
 .../ui/radio-group/radio-group.svelte         |  2 +-
 .../range-calendar/range-calendar-cell.svelte |  2 +-
 .../range-calendar/range-calendar-day.svelte  |  2 +-
 .../range-calendar-grid-row.svelte            |  2 +-
 .../range-calendar/range-calendar-grid.svelte |  2 +-
 .../range-calendar-head-cell.svelte           |  2 +-
 .../range-calendar-header.svelte              |  2 +-
 .../range-calendar-heading.svelte             |  2 +-
 .../range-calendar-month-select.svelte        |  2 +-
 .../range-calendar-month.svelte               |  2 +-
 .../range-calendar-months.svelte              |  2 +-
 .../range-calendar/range-calendar-nav.svelte  |  2 +-
 .../range-calendar-next-button.svelte         |  2 +-
 .../range-calendar-prev-button.svelte         |  2 +-
 .../range-calendar-year-select.svelte         |  2 +-
 .../ui/range-calendar/range-calendar.svelte   |  2 +-
 .../ui/resizable/resizable-handle.svelte      |  2 +-
 .../ui/resizable/resizable-pane-group.svelte  |  2 +-
 .../scroll-area/scroll-area-scrollbar.svelte  |  2 +-
 .../ui/scroll-area/scroll-area.svelte         |  2 +-
 .../ui/select/select-content.svelte           |  4 +--
 .../ui/select/select-group-heading.svelte     |  2 +-
 .../components/ui/select/select-group.svelte  |  2 +-
 .../components/ui/select/select-item.svelte   |  2 +-
 .../components/ui/select/select-label.svelte  |  2 +-
 .../select/select-scroll-down-button.svelte   |  2 +-
 .../ui/select/select-scroll-up-button.svelte  |  2 +-
 .../ui/select/select-separator.svelte         |  2 +-
 .../ui/select/select-trigger.svelte           |  2 +-
 .../components/ui/separator/separator.svelte  |  2 +-
 .../components/ui/sheet/sheet-content.svelte  |  2 +-
 .../ui/sheet/sheet-description.svelte         |  2 +-
 .../components/ui/sheet/sheet-footer.svelte   |  2 +-
 .../components/ui/sheet/sheet-header.svelte   |  2 +-
 .../components/ui/sheet/sheet-overlay.svelte  |  2 +-
 .../components/ui/sheet/sheet-title.svelte    |  2 +-
 .../ui/sidebar/sidebar-content.svelte         |  2 +-
 .../ui/sidebar/sidebar-footer.svelte          |  2 +-
 .../ui/sidebar/sidebar-group-action.svelte    |  2 +-
 .../ui/sidebar/sidebar-group-content.svelte   |  2 +-
 .../ui/sidebar/sidebar-group-label.svelte     |  2 +-
 .../ui/sidebar/sidebar-group.svelte           |  2 +-
 .../ui/sidebar/sidebar-header.svelte          |  2 +-
 .../ui/sidebar/sidebar-input.svelte           |  2 +-
 .../ui/sidebar/sidebar-inset.svelte           |  2 +-
 .../ui/sidebar/sidebar-menu-action.svelte     |  2 +-
 .../ui/sidebar/sidebar-menu-badge.svelte      |  2 +-
 .../ui/sidebar/sidebar-menu-button.svelte     |  2 +-
 .../ui/sidebar/sidebar-menu-item.svelte       |  2 +-
 .../ui/sidebar/sidebar-menu-skeleton.svelte   |  2 +-
 .../ui/sidebar/sidebar-menu-sub-button.svelte |  2 +-
 .../ui/sidebar/sidebar-menu-sub-item.svelte   |  2 +-
 .../ui/sidebar/sidebar-menu-sub.svelte        |  2 +-
 .../components/ui/sidebar/sidebar-menu.svelte |  2 +-
 .../ui/sidebar/sidebar-provider.svelte        |  2 +-
 .../components/ui/sidebar/sidebar-rail.svelte |  2 +-
 .../ui/sidebar/sidebar-separator.svelte       |  2 +-
 .../ui/sidebar/sidebar-trigger.svelte         |  2 +-
 src/lib/components/ui/sidebar/sidebar.svelte  |  2 +-
 .../components/ui/skeleton/skeleton.svelte    |  2 +-
 src/lib/components/ui/slider/slider.svelte    |  2 +-
 src/lib/components/ui/spinner/spinner.svelte  |  2 +-
 .../ui/stepper/stepper-description.svelte     |  2 +-
 .../ui/stepper/stepper-indicator.svelte       |  2 +-
 .../components/ui/stepper/stepper-item.svelte |  2 +-
 .../ui/stepper/stepper-separator.svelte       |  2 +-
 .../ui/stepper/stepper-title.svelte           |  2 +-
 .../ui/stepper/stepper-trigger.svelte         |  2 +-
 src/lib/components/ui/stepper/stepper.svelte  |  2 +-
 src/lib/components/ui/switch/switch.svelte    |  2 +-
 src/lib/components/ui/table/table-body.svelte |  2 +-
 .../components/ui/table/table-caption.svelte  |  2 +-
 src/lib/components/ui/table/table-cell.svelte |  2 +-
 .../components/ui/table/table-footer.svelte   |  2 +-
 src/lib/components/ui/table/table-head.svelte |  2 +-
 .../components/ui/table/table-header.svelte   |  2 +-
 src/lib/components/ui/table/table-row.svelte  |  2 +-
 src/lib/components/ui/table/table.svelte      |  2 +-
 .../components/ui/tabs/tabs-content.svelte    |  2 +-
 src/lib/components/ui/tabs/tabs-list.svelte   |  2 +-
 .../components/ui/tabs/tabs-trigger.svelte    |  2 +-
 src/lib/components/ui/tabs/tabs.svelte        |  2 +-
 .../components/ui/textarea/textarea.svelte    |  2 +-
 .../ui/toggle-group/toggle-group-item.svelte  |  2 +-
 .../ui/toggle-group/toggle-group.svelte       |  2 +-
 src/lib/components/ui/toggle/toggle.svelte    |  2 +-
 .../ui/tooltip/tooltip-content.svelte         |  4 +--
 src/lib/list-search.svelte.ts                 |  2 +-
 src/lib/utils.ts                              | 13 ---------
 .../{form-feedback.ts => utils/feedback.ts}   |  0
 src/lib/utils/filter.ts                       | 15 ++++++++++
 src/lib/{record-utils.ts => utils/format.ts}  | 28 +++++++++----------
 src/routes/dashboard/+page.svelte             |  2 +-
 src/routes/dashboard/addresses/+page.svelte   |  4 +--
 src/routes/dashboard/bookings/+page.svelte    |  4 +--
 src/routes/dashboard/clients/+page.svelte     |  4 +--
 .../[id]/addresses/addresses-table.svelte     |  2 +-
 .../[id]/contacts/contacts-table.svelte       |  2 +-
 .../contracts/contract-form-fields.svelte     |  2 +-
 .../[id]/contracts/room-multi-combobox.svelte |  2 +-
 src/routes/dashboard/contacts/+page.svelte    |  4 +--
 src/routes/dashboard/rooms/+page.svelte       |  4 +--
 src/routes/dashboard/services/+page.svelte    |  4 +--
 306 files changed, 343 insertions(+), 343 deletions(-)
 delete mode 100644 src/lib/utils.ts
 rename src/lib/{form-feedback.ts => utils/feedback.ts} (100%)
 create mode 100644 src/lib/utils/filter.ts
 rename src/lib/{record-utils.ts => utils/format.ts} (74%)

diff --git a/src/lib/components/first-admin-form.svelte b/src/lib/components/first-admin-form.svelte
index 98e9caa..51f116f 100644
--- a/src/lib/components/first-admin-form.svelte
+++ b/src/lib/components/first-admin-form.svelte
@@ -11,8 +11,8 @@
 	import type { HTMLAttributes } from 'svelte/elements';
 	import { Button } from '$lib/components/ui/button/index.js';
 	import { Input } from '$lib/components/ui/input/index.js';
-	import { cn, type WithElementRef } from '$lib/utils.js';
-	import { firstFormError } from '$lib/form-feedback';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
+	import { firstFormError } from '$lib/utils/feedback';
 	import { firstAdminSchema, type FirstAdminSchema } from '$lib/schemas/auth';
 
 	let {
diff --git a/src/lib/components/form-combobox.svelte b/src/lib/components/form-combobox.svelte
index 4602bd9..499ed03 100644
--- a/src/lib/components/form-combobox.svelte
+++ b/src/lib/components/form-combobox.svelte
@@ -5,7 +5,7 @@
 	import { Button } from '$lib/components/ui/button/index.js';
 	import * as Command from '$lib/components/ui/command/index.js';
 	import * as Popover from '$lib/components/ui/popover/index.js';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	type Option = {
 		value: string;
diff --git a/src/lib/components/form-select.svelte b/src/lib/components/form-select.svelte
index 3833117..786f721 100644
--- a/src/lib/components/form-select.svelte
+++ b/src/lib/components/form-select.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { ComponentProps } from 'svelte';
 	import * as Select from '$lib/components/ui/select/index.js';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	type Option = {
 		value: string;
diff --git a/src/lib/components/login-form.svelte b/src/lib/components/login-form.svelte
index a64fe4d..2d07733 100644
--- a/src/lib/components/login-form.svelte
+++ b/src/lib/components/login-form.svelte
@@ -8,7 +8,7 @@
 	import type { HTMLAttributes } from 'svelte/elements';
 	import { Input } from '$lib/components/ui/input/index.js';
 	import { Button } from '$lib/components/ui/button/index.js';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import { loginSchema, type LoginSchema } from '$lib/schemas/auth';
 
 	let {
diff --git a/src/lib/components/search-form.svelte b/src/lib/components/search-form.svelte
index cbf2a87..19f6152 100644
--- a/src/lib/components/search-form.svelte
+++ b/src/lib/components/search-form.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { Label } from '$lib/components/ui/label/index.js';
 	import * as Sidebar from '$lib/components/ui/sidebar/index.js';
-	import type { WithElementRef } from '$lib/utils.js';
+	import type { WithElementRef } from '$lib/utils/format.js';
 	import SearchIcon from '@lucide/svelte/icons/search';
 	import type { HTMLFormAttributes } from 'svelte/elements';
 
diff --git a/src/lib/components/ui/accordion/accordion-content.svelte b/src/lib/components/ui/accordion/accordion-content.svelte
index 845c28c..df57c0d 100644
--- a/src/lib/components/ui/accordion/accordion-content.svelte
+++ b/src/lib/components/ui/accordion/accordion-content.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Accordion as AccordionPrimitive } from 'bits-ui';
-	import { cn, type WithoutChild } from '$lib/utils.js';
+	import { cn, type WithoutChild } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/accordion/accordion-item.svelte b/src/lib/components/ui/accordion/accordion-item.svelte
index 2f49799..c10721e 100644
--- a/src/lib/components/ui/accordion/accordion-item.svelte
+++ b/src/lib/components/ui/accordion/accordion-item.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Accordion as AccordionPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/accordion/accordion-trigger.svelte b/src/lib/components/ui/accordion/accordion-trigger.svelte
index 8bdc9a7..59ad5bc 100644
--- a/src/lib/components/ui/accordion/accordion-trigger.svelte
+++ b/src/lib/components/ui/accordion/accordion-trigger.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Accordion as AccordionPrimitive } from 'bits-ui';
-	import { cn, type WithoutChild } from '$lib/utils.js';
+	import { cn, type WithoutChild } from '$lib/utils/format.js';
 	import ChevronDownIcon from '@lucide/svelte/icons/chevron-down';
 	import ChevronUpIcon from '@lucide/svelte/icons/chevron-up';
 
diff --git a/src/lib/components/ui/accordion/accordion.svelte b/src/lib/components/ui/accordion/accordion.svelte
index bce68c4..0820834 100644
--- a/src/lib/components/ui/accordion/accordion.svelte
+++ b/src/lib/components/ui/accordion/accordion.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Accordion as AccordionPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/alert-dialog/alert-dialog-action.svelte b/src/lib/components/ui/alert-dialog/alert-dialog-action.svelte
index 5240bda..b3ec08e 100644
--- a/src/lib/components/ui/alert-dialog/alert-dialog-action.svelte
+++ b/src/lib/components/ui/alert-dialog/alert-dialog-action.svelte
@@ -5,7 +5,7 @@
 		type ButtonVariant,
 		type ButtonSize
 	} from '$lib/components/ui/button/index.js';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/alert-dialog/alert-dialog-cancel.svelte b/src/lib/components/ui/alert-dialog/alert-dialog-cancel.svelte
index ff2aac4..0aa03b7 100644
--- a/src/lib/components/ui/alert-dialog/alert-dialog-cancel.svelte
+++ b/src/lib/components/ui/alert-dialog/alert-dialog-cancel.svelte
@@ -5,7 +5,7 @@
 		type ButtonVariant,
 		type ButtonSize
 	} from '$lib/components/ui/button/index.js';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/alert-dialog/alert-dialog-content.svelte b/src/lib/components/ui/alert-dialog/alert-dialog-content.svelte
index 801763c..4802e83 100644
--- a/src/lib/components/ui/alert-dialog/alert-dialog-content.svelte
+++ b/src/lib/components/ui/alert-dialog/alert-dialog-content.svelte
@@ -2,7 +2,7 @@
 	import { AlertDialog as AlertDialogPrimitive } from 'bits-ui';
 	import AlertDialogPortal from './alert-dialog-portal.svelte';
 	import AlertDialogOverlay from './alert-dialog-overlay.svelte';
-	import { cn, type WithoutChild, type WithoutChildrenOrChild } from '$lib/utils.js';
+	import { cn, type WithoutChild, type WithoutChildrenOrChild } from '$lib/utils/format.js';
 	import type { ComponentProps } from 'svelte';
 
 	let {
diff --git a/src/lib/components/ui/alert-dialog/alert-dialog-description.svelte b/src/lib/components/ui/alert-dialog/alert-dialog-description.svelte
index 9b2dd92..8c38a12 100644
--- a/src/lib/components/ui/alert-dialog/alert-dialog-description.svelte
+++ b/src/lib/components/ui/alert-dialog/alert-dialog-description.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { AlertDialog as AlertDialogPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/alert-dialog/alert-dialog-footer.svelte b/src/lib/components/ui/alert-dialog/alert-dialog-footer.svelte
index 3ea1bf5..816b967 100644
--- a/src/lib/components/ui/alert-dialog/alert-dialog-footer.svelte
+++ b/src/lib/components/ui/alert-dialog/alert-dialog-footer.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/alert-dialog/alert-dialog-header.svelte b/src/lib/components/ui/alert-dialog/alert-dialog-header.svelte
index a73465c..2802615 100644
--- a/src/lib/components/ui/alert-dialog/alert-dialog-header.svelte
+++ b/src/lib/components/ui/alert-dialog/alert-dialog-header.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/alert-dialog/alert-dialog-media.svelte b/src/lib/components/ui/alert-dialog/alert-dialog-media.svelte
index 95daf61..b32543a 100644
--- a/src/lib/components/ui/alert-dialog/alert-dialog-media.svelte
+++ b/src/lib/components/ui/alert-dialog/alert-dialog-media.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/alert-dialog/alert-dialog-overlay.svelte b/src/lib/components/ui/alert-dialog/alert-dialog-overlay.svelte
index e1360f0..de118e6 100644
--- a/src/lib/components/ui/alert-dialog/alert-dialog-overlay.svelte
+++ b/src/lib/components/ui/alert-dialog/alert-dialog-overlay.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { AlertDialog as AlertDialogPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/alert-dialog/alert-dialog-title.svelte b/src/lib/components/ui/alert-dialog/alert-dialog-title.svelte
index 21e20e5..ecd7b5e 100644
--- a/src/lib/components/ui/alert-dialog/alert-dialog-title.svelte
+++ b/src/lib/components/ui/alert-dialog/alert-dialog-title.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { AlertDialog as AlertDialogPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/alert/alert-action.svelte b/src/lib/components/ui/alert/alert-action.svelte
index 3df2083..8673155 100644
--- a/src/lib/components/ui/alert/alert-action.svelte
+++ b/src/lib/components/ui/alert/alert-action.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/alert/alert-description.svelte b/src/lib/components/ui/alert/alert-description.svelte
index 52775e3..5b26b3e 100644
--- a/src/lib/components/ui/alert/alert-description.svelte
+++ b/src/lib/components/ui/alert/alert-description.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/alert/alert-title.svelte b/src/lib/components/ui/alert/alert-title.svelte
index 36e2355..a148944 100644
--- a/src/lib/components/ui/alert/alert-title.svelte
+++ b/src/lib/components/ui/alert/alert-title.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/alert/alert.svelte b/src/lib/components/ui/alert/alert.svelte
index 71ef768..2eb9ca3 100644
--- a/src/lib/components/ui/alert/alert.svelte
+++ b/src/lib/components/ui/alert/alert.svelte
@@ -20,7 +20,7 @@
 
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/avatar/avatar-badge.svelte b/src/lib/components/ui/avatar/avatar-badge.svelte
index c083da9..02f71f5 100644
--- a/src/lib/components/ui/avatar/avatar-badge.svelte
+++ b/src/lib/components/ui/avatar/avatar-badge.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/avatar/avatar-fallback.svelte b/src/lib/components/ui/avatar/avatar-fallback.svelte
index e5d87f6..ffd27ca 100644
--- a/src/lib/components/ui/avatar/avatar-fallback.svelte
+++ b/src/lib/components/ui/avatar/avatar-fallback.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Avatar as AvatarPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/avatar/avatar-group-count.svelte b/src/lib/components/ui/avatar/avatar-group-count.svelte
index e7061cd..4474a68 100644
--- a/src/lib/components/ui/avatar/avatar-group-count.svelte
+++ b/src/lib/components/ui/avatar/avatar-group-count.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/avatar/avatar-group.svelte b/src/lib/components/ui/avatar/avatar-group.svelte
index 862ff9e..285fa59 100644
--- a/src/lib/components/ui/avatar/avatar-group.svelte
+++ b/src/lib/components/ui/avatar/avatar-group.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/avatar/avatar-image.svelte b/src/lib/components/ui/avatar/avatar-image.svelte
index eda9335..a65d6b1 100644
--- a/src/lib/components/ui/avatar/avatar-image.svelte
+++ b/src/lib/components/ui/avatar/avatar-image.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Avatar as AvatarPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/avatar/avatar.svelte b/src/lib/components/ui/avatar/avatar.svelte
index 805159d..183ce74 100644
--- a/src/lib/components/ui/avatar/avatar.svelte
+++ b/src/lib/components/ui/avatar/avatar.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Avatar as AvatarPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/badge/badge.svelte b/src/lib/components/ui/badge/badge.svelte
index 919f10b..240105d 100644
--- a/src/lib/components/ui/badge/badge.svelte
+++ b/src/lib/components/ui/badge/badge.svelte
@@ -24,7 +24,7 @@
 
 <script lang="ts">
 	import type { HTMLAnchorAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/breadcrumb/breadcrumb-ellipsis.svelte b/src/lib/components/ui/breadcrumb/breadcrumb-ellipsis.svelte
index ef3510e..0e9ca6b 100644
--- a/src/lib/components/ui/breadcrumb/breadcrumb-ellipsis.svelte
+++ b/src/lib/components/ui/breadcrumb/breadcrumb-ellipsis.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef, type WithoutChildren } from '$lib/utils.js';
+	import { cn, type WithElementRef, type WithoutChildren } from '$lib/utils/format.js';
 	import MoreHorizontalIcon from '@lucide/svelte/icons/more-horizontal';
 
 	let {
diff --git a/src/lib/components/ui/breadcrumb/breadcrumb-item.svelte b/src/lib/components/ui/breadcrumb/breadcrumb-item.svelte
index da834ca..8015209 100644
--- a/src/lib/components/ui/breadcrumb/breadcrumb-item.svelte
+++ b/src/lib/components/ui/breadcrumb/breadcrumb-item.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLLiAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/breadcrumb/breadcrumb-link.svelte b/src/lib/components/ui/breadcrumb/breadcrumb-link.svelte
index c56ab6d..562d7dd 100644
--- a/src/lib/components/ui/breadcrumb/breadcrumb-link.svelte
+++ b/src/lib/components/ui/breadcrumb/breadcrumb-link.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { HTMLAnchorAttributes } from 'svelte/elements';
 	import type { Snippet } from 'svelte';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/breadcrumb/breadcrumb-list.svelte b/src/lib/components/ui/breadcrumb/breadcrumb-list.svelte
index af70b63..25bd4a8 100644
--- a/src/lib/components/ui/breadcrumb/breadcrumb-list.svelte
+++ b/src/lib/components/ui/breadcrumb/breadcrumb-list.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLOlAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/breadcrumb/breadcrumb-page.svelte b/src/lib/components/ui/breadcrumb/breadcrumb-page.svelte
index 3c6be01..a79cea3 100644
--- a/src/lib/components/ui/breadcrumb/breadcrumb-page.svelte
+++ b/src/lib/components/ui/breadcrumb/breadcrumb-page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/breadcrumb/breadcrumb-separator.svelte b/src/lib/components/ui/breadcrumb/breadcrumb-separator.svelte
index 2d7ed99..a7901ae 100644
--- a/src/lib/components/ui/breadcrumb/breadcrumb-separator.svelte
+++ b/src/lib/components/ui/breadcrumb/breadcrumb-separator.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLLiAttributes } from 'svelte/elements';
 	import ChevronRightIcon from '@lucide/svelte/icons/chevron-right';
 
diff --git a/src/lib/components/ui/breadcrumb/breadcrumb.svelte b/src/lib/components/ui/breadcrumb/breadcrumb.svelte
index 2a7eb01..1cfcb5a 100644
--- a/src/lib/components/ui/breadcrumb/breadcrumb.svelte
+++ b/src/lib/components/ui/breadcrumb/breadcrumb.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-	import type { WithElementRef } from '$lib/utils.js';
+	import type { WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/button-group/button-group-separator.svelte b/src/lib/components/ui/button-group/button-group-separator.svelte
index 7f37181..4bc3b58 100644
--- a/src/lib/components/ui/button-group/button-group-separator.svelte
+++ b/src/lib/components/ui/button-group/button-group-separator.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import type { ComponentProps } from 'svelte';
 	import { Separator } from '$lib/components/ui/separator/index.js';
 
diff --git a/src/lib/components/ui/button-group/button-group-text.svelte b/src/lib/components/ui/button-group/button-group-text.svelte
index 001959a..6844306 100644
--- a/src/lib/components/ui/button-group/button-group-text.svelte
+++ b/src/lib/components/ui/button-group/button-group-text.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 	import type { Snippet } from 'svelte';
 
diff --git a/src/lib/components/ui/button-group/button-group.svelte b/src/lib/components/ui/button-group/button-group.svelte
index 1142547..b1280d1 100644
--- a/src/lib/components/ui/button-group/button-group.svelte
+++ b/src/lib/components/ui/button-group/button-group.svelte
@@ -20,7 +20,7 @@
 </script>
 
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/button/button.svelte b/src/lib/components/ui/button/button.svelte
index 776f924..cf8fa7c 100644
--- a/src/lib/components/ui/button/button.svelte
+++ b/src/lib/components/ui/button/button.svelte
@@ -1,7 +1,7 @@
 <script lang="ts" module>
 	import { resolve } from '$app/paths';
 	import type { PathnameWithSearchOrHash } from '$app/types';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAnchorAttributes, HTMLButtonAttributes } from 'svelte/elements';
 	import { type VariantProps, tv } from 'tailwind-variants';
 
diff --git a/src/lib/components/ui/calendar/calendar-cell.svelte b/src/lib/components/ui/calendar/calendar-cell.svelte
index 9d31f0b..b200466 100644
--- a/src/lib/components/ui/calendar/calendar-cell.svelte
+++ b/src/lib/components/ui/calendar/calendar-cell.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Calendar as CalendarPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/calendar/calendar-day.svelte b/src/lib/components/ui/calendar/calendar-day.svelte
index 466a97f..7d31616 100644
--- a/src/lib/components/ui/calendar/calendar-day.svelte
+++ b/src/lib/components/ui/calendar/calendar-day.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import { Calendar as CalendarPrimitive } from 'bits-ui';
 
 	let {
diff --git a/src/lib/components/ui/calendar/calendar-grid-body.svelte b/src/lib/components/ui/calendar/calendar-grid-body.svelte
index fb1d89b..a1a2ce3 100644
--- a/src/lib/components/ui/calendar/calendar-grid-body.svelte
+++ b/src/lib/components/ui/calendar/calendar-grid-body.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Calendar as CalendarPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/calendar/calendar-grid-head.svelte b/src/lib/components/ui/calendar/calendar-grid-head.svelte
index b5b6845..a60d63a 100644
--- a/src/lib/components/ui/calendar/calendar-grid-head.svelte
+++ b/src/lib/components/ui/calendar/calendar-grid-head.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Calendar as CalendarPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/calendar/calendar-grid-row.svelte b/src/lib/components/ui/calendar/calendar-grid-row.svelte
index 2e7d9d8..b41ce7e 100644
--- a/src/lib/components/ui/calendar/calendar-grid-row.svelte
+++ b/src/lib/components/ui/calendar/calendar-grid-row.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Calendar as CalendarPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/calendar/calendar-grid.svelte b/src/lib/components/ui/calendar/calendar-grid.svelte
index 8c7f112..42eabfb 100644
--- a/src/lib/components/ui/calendar/calendar-grid.svelte
+++ b/src/lib/components/ui/calendar/calendar-grid.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Calendar as CalendarPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/calendar/calendar-head-cell.svelte b/src/lib/components/ui/calendar/calendar-head-cell.svelte
index 7a1dea0..1992397 100644
--- a/src/lib/components/ui/calendar/calendar-head-cell.svelte
+++ b/src/lib/components/ui/calendar/calendar-head-cell.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Calendar as CalendarPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/calendar/calendar-header.svelte b/src/lib/components/ui/calendar/calendar-header.svelte
index 8ca9618..dee4af1 100644
--- a/src/lib/components/ui/calendar/calendar-header.svelte
+++ b/src/lib/components/ui/calendar/calendar-header.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Calendar as CalendarPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/calendar/calendar-heading.svelte b/src/lib/components/ui/calendar/calendar-heading.svelte
index 7a85b55..60f570a 100644
--- a/src/lib/components/ui/calendar/calendar-heading.svelte
+++ b/src/lib/components/ui/calendar/calendar-heading.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Calendar as CalendarPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/calendar/calendar-month-select.svelte b/src/lib/components/ui/calendar/calendar-month-select.svelte
index 5e60b58..428054b 100644
--- a/src/lib/components/ui/calendar/calendar-month-select.svelte
+++ b/src/lib/components/ui/calendar/calendar-month-select.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Calendar as CalendarPrimitive } from 'bits-ui';
-	import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
+	import { cn, type WithoutChildrenOrChild } from '$lib/utils/format.js';
 	import ChevronDownIcon from '@lucide/svelte/icons/chevron-down';
 
 	let {
diff --git a/src/lib/components/ui/calendar/calendar-month.svelte b/src/lib/components/ui/calendar/calendar-month.svelte
index 316bc5f..8c564ef 100644
--- a/src/lib/components/ui/calendar/calendar-month.svelte
+++ b/src/lib/components/ui/calendar/calendar-month.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { type WithElementRef, cn } from '$lib/utils.js';
+	import { type WithElementRef, cn } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/calendar/calendar-months.svelte b/src/lib/components/ui/calendar/calendar-months.svelte
index 023cad3..db0d341 100644
--- a/src/lib/components/ui/calendar/calendar-months.svelte
+++ b/src/lib/components/ui/calendar/calendar-months.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/calendar/calendar-nav.svelte b/src/lib/components/ui/calendar/calendar-nav.svelte
index 2fea3e9..5ce494d 100644
--- a/src/lib/components/ui/calendar/calendar-nav.svelte
+++ b/src/lib/components/ui/calendar/calendar-nav.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/calendar/calendar-next-button.svelte b/src/lib/components/ui/calendar/calendar-next-button.svelte
index dd25bdf..04590dc 100644
--- a/src/lib/components/ui/calendar/calendar-next-button.svelte
+++ b/src/lib/components/ui/calendar/calendar-next-button.svelte
@@ -2,7 +2,7 @@
 	import { Calendar as CalendarPrimitive } from 'bits-ui';
 	import ChevronRightIcon from '@lucide/svelte/icons/chevron-right';
 	import { buttonVariants, type ButtonVariant } from '$lib/components/ui/button/index.js';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/calendar/calendar-prev-button.svelte b/src/lib/components/ui/calendar/calendar-prev-button.svelte
index 9b6d45a..e0102b8 100644
--- a/src/lib/components/ui/calendar/calendar-prev-button.svelte
+++ b/src/lib/components/ui/calendar/calendar-prev-button.svelte
@@ -2,7 +2,7 @@
 	import { Calendar as CalendarPrimitive } from 'bits-ui';
 	import ChevronLeftIcon from '@lucide/svelte/icons/chevron-left';
 	import { buttonVariants, type ButtonVariant } from '$lib/components/ui/button/index.js';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/calendar/calendar-year-select.svelte b/src/lib/components/ui/calendar/calendar-year-select.svelte
index a26a84b..8647acb 100644
--- a/src/lib/components/ui/calendar/calendar-year-select.svelte
+++ b/src/lib/components/ui/calendar/calendar-year-select.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Calendar as CalendarPrimitive } from 'bits-ui';
-	import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
+	import { cn, type WithoutChildrenOrChild } from '$lib/utils/format.js';
 	import ChevronDownIcon from '@lucide/svelte/icons/chevron-down';
 
 	let {
diff --git a/src/lib/components/ui/calendar/calendar.svelte b/src/lib/components/ui/calendar/calendar.svelte
index 4da66ea..ef7bfec 100644
--- a/src/lib/components/ui/calendar/calendar.svelte
+++ b/src/lib/components/ui/calendar/calendar.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { Calendar as CalendarPrimitive } from 'bits-ui';
 	import * as Calendar from './index.js';
-	import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
+	import { cn, type WithoutChildrenOrChild } from '$lib/utils/format.js';
 	import type { ButtonVariant } from '../button/button.svelte';
 	import { isEqualMonth, type DateValue } from '@internationalized/date';
 	import type { Snippet } from 'svelte';
diff --git a/src/lib/components/ui/card/card-action.svelte b/src/lib/components/ui/card/card-action.svelte
index bc79c73..56f455e 100644
--- a/src/lib/components/ui/card/card-action.svelte
+++ b/src/lib/components/ui/card/card-action.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/card/card-content.svelte b/src/lib/components/ui/card/card-content.svelte
index bfc43f7..814b10e 100644
--- a/src/lib/components/ui/card/card-content.svelte
+++ b/src/lib/components/ui/card/card-content.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/card/card-description.svelte b/src/lib/components/ui/card/card-description.svelte
index b46a1ad..6004eb8 100644
--- a/src/lib/components/ui/card/card-description.svelte
+++ b/src/lib/components/ui/card/card-description.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/card/card-footer.svelte b/src/lib/components/ui/card/card-footer.svelte
index 73ec4b3..38c3d03 100644
--- a/src/lib/components/ui/card/card-footer.svelte
+++ b/src/lib/components/ui/card/card-footer.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/card/card-header.svelte b/src/lib/components/ui/card/card-header.svelte
index 2a2a8bd..68ad8ff 100644
--- a/src/lib/components/ui/card/card-header.svelte
+++ b/src/lib/components/ui/card/card-header.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/card/card-title.svelte b/src/lib/components/ui/card/card-title.svelte
index d494479..da77384 100644
--- a/src/lib/components/ui/card/card-title.svelte
+++ b/src/lib/components/ui/card/card-title.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/card/card.svelte b/src/lib/components/ui/card/card.svelte
index 8f19be1..554417f 100644
--- a/src/lib/components/ui/card/card.svelte
+++ b/src/lib/components/ui/card/card.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/carousel/carousel-content.svelte b/src/lib/components/ui/carousel/carousel-content.svelte
index 72570b6..7e65a4a 100644
--- a/src/lib/components/ui/carousel/carousel-content.svelte
+++ b/src/lib/components/ui/carousel/carousel-content.svelte
@@ -2,7 +2,7 @@
 	import emblaCarouselSvelte from 'embla-carousel-svelte';
 	import type { HTMLAttributes } from 'svelte/elements';
 	import { getEmblaContext } from './context.js';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/carousel/carousel-item.svelte b/src/lib/components/ui/carousel/carousel-item.svelte
index 1cf361e..847249c 100644
--- a/src/lib/components/ui/carousel/carousel-item.svelte
+++ b/src/lib/components/ui/carousel/carousel-item.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
 	import { getEmblaContext } from './context.js';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/carousel/carousel-next.svelte b/src/lib/components/ui/carousel/carousel-next.svelte
index 8c4a7ec..081e787 100644
--- a/src/lib/components/ui/carousel/carousel-next.svelte
+++ b/src/lib/components/ui/carousel/carousel-next.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { WithoutChildren } from 'bits-ui';
 	import { getEmblaContext } from './context.js';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import { Button, type Props } from '$lib/components/ui/button/index.js';
 	import ChevronRightIcon from '@lucide/svelte/icons/chevron-right';
 
diff --git a/src/lib/components/ui/carousel/carousel-previous.svelte b/src/lib/components/ui/carousel/carousel-previous.svelte
index ba1720b..fd2c2dc 100644
--- a/src/lib/components/ui/carousel/carousel-previous.svelte
+++ b/src/lib/components/ui/carousel/carousel-previous.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { WithoutChildren } from 'bits-ui';
 	import { getEmblaContext } from './context.js';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import { Button, type Props } from '$lib/components/ui/button/index.js';
 	import ChevronLeftIcon from '@lucide/svelte/icons/chevron-left';
 
diff --git a/src/lib/components/ui/carousel/carousel.svelte b/src/lib/components/ui/carousel/carousel.svelte
index df79dd2..6f7c828 100644
--- a/src/lib/components/ui/carousel/carousel.svelte
+++ b/src/lib/components/ui/carousel/carousel.svelte
@@ -5,7 +5,7 @@
 		type EmblaContext,
 		setEmblaContext
 	} from './context.js';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/carousel/context.ts b/src/lib/components/ui/carousel/context.ts
index fe68bd9..93babe1 100644
--- a/src/lib/components/ui/carousel/context.ts
+++ b/src/lib/components/ui/carousel/context.ts
@@ -1,4 +1,4 @@
-import type { WithElementRef } from '$lib/utils.js';
+import type { WithElementRef } from '$lib/utils/format.js';
 import type {
 	EmblaCarouselSvelteType,
 	default as emblaCarouselSvelte
diff --git a/src/lib/components/ui/chart/chart-container.svelte b/src/lib/components/ui/chart/chart-container.svelte
index adc31e2..9aa967e 100644
--- a/src/lib/components/ui/chart/chart-container.svelte
+++ b/src/lib/components/ui/chart/chart-container.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 	import ChartStyle from './chart-style.svelte';
 	import { setChartContext, type ChartConfig } from './chart-utils.js';
diff --git a/src/lib/components/ui/chart/chart-tooltip.svelte b/src/lib/components/ui/chart/chart-tooltip.svelte
index 1f9ca5f..e5bf3fb 100644
--- a/src/lib/components/ui/chart/chart-tooltip.svelte
+++ b/src/lib/components/ui/chart/chart-tooltip.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef, type WithoutChildren } from '$lib/utils.js';
+	import { cn, type WithElementRef, type WithoutChildren } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 	import { getPayloadConfigFromPayload, useChart, type TooltipPayload } from './chart-utils.js';
 	import { getChartContext, Tooltip as TooltipPrimitive } from 'layerchart';
diff --git a/src/lib/components/ui/checkbox/checkbox.svelte b/src/lib/components/ui/checkbox/checkbox.svelte
index f54721f..43e2b38 100644
--- a/src/lib/components/ui/checkbox/checkbox.svelte
+++ b/src/lib/components/ui/checkbox/checkbox.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Checkbox as CheckboxPrimitive } from 'bits-ui';
-	import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
+	import { cn, type WithoutChildrenOrChild } from '$lib/utils/format.js';
 	import CheckIcon from '@lucide/svelte/icons/check';
 	import MinusIcon from '@lucide/svelte/icons/minus';
 
diff --git a/src/lib/components/ui/command/command-dialog.svelte b/src/lib/components/ui/command/command-dialog.svelte
index add0679..6783e0f 100644
--- a/src/lib/components/ui/command/command-dialog.svelte
+++ b/src/lib/components/ui/command/command-dialog.svelte
@@ -3,7 +3,7 @@
 	import type { Snippet } from 'svelte';
 	import Command from './command.svelte';
 	import * as Dialog from '$lib/components/ui/dialog/index.js';
-	import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
+	import { cn, type WithoutChildrenOrChild } from '$lib/utils/format.js';
 
 	let {
 		open = $bindable(false),
diff --git a/src/lib/components/ui/command/command-empty.svelte b/src/lib/components/ui/command/command-empty.svelte
index c2ce165..dd2c522 100644
--- a/src/lib/components/ui/command/command-empty.svelte
+++ b/src/lib/components/ui/command/command-empty.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Command as CommandPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/command/command-group.svelte b/src/lib/components/ui/command/command-group.svelte
index ffa4000..b51fd8a 100644
--- a/src/lib/components/ui/command/command-group.svelte
+++ b/src/lib/components/ui/command/command-group.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Command as CommandPrimitive, useId } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/command/command-input.svelte b/src/lib/components/ui/command/command-input.svelte
index 2092ba7..b6bfcec 100644
--- a/src/lib/components/ui/command/command-input.svelte
+++ b/src/lib/components/ui/command/command-input.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Command as CommandPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import * as InputGroup from '$lib/components/ui/input-group/index.js';
 	import SearchIcon from '@lucide/svelte/icons/search';
 
diff --git a/src/lib/components/ui/command/command-item.svelte b/src/lib/components/ui/command/command-item.svelte
index aa3f50b..64981de 100644
--- a/src/lib/components/ui/command/command-item.svelte
+++ b/src/lib/components/ui/command/command-item.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Command as CommandPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import CheckIcon from '@lucide/svelte/icons/check';
 
 	let {
diff --git a/src/lib/components/ui/command/command-link-item.svelte b/src/lib/components/ui/command/command-link-item.svelte
index d3f63c8..39dc0c8 100644
--- a/src/lib/components/ui/command/command-link-item.svelte
+++ b/src/lib/components/ui/command/command-link-item.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Command as CommandPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/command/command-list.svelte b/src/lib/components/ui/command/command-list.svelte
index c50999d..eda2aa9 100644
--- a/src/lib/components/ui/command/command-list.svelte
+++ b/src/lib/components/ui/command/command-list.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Command as CommandPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/command/command-separator.svelte b/src/lib/components/ui/command/command-separator.svelte
index c21856b..d864a10 100644
--- a/src/lib/components/ui/command/command-separator.svelte
+++ b/src/lib/components/ui/command/command-separator.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Command as CommandPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/command/command-shortcut.svelte b/src/lib/components/ui/command/command-shortcut.svelte
index 4398d1f..aee8ed8 100644
--- a/src/lib/components/ui/command/command-shortcut.svelte
+++ b/src/lib/components/ui/command/command-shortcut.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/command/command.svelte b/src/lib/components/ui/command/command.svelte
index 4e21c6a..a0ef092 100644
--- a/src/lib/components/ui/command/command.svelte
+++ b/src/lib/components/ui/command/command.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import { Command as CommandPrimitive } from 'bits-ui';
 
 	export type CommandRootApi = CommandPrimitive.Root;
diff --git a/src/lib/components/ui/context-menu/context-menu-checkbox-item.svelte b/src/lib/components/ui/context-menu/context-menu-checkbox-item.svelte
index 61d2147..0a762d5 100644
--- a/src/lib/components/ui/context-menu/context-menu-checkbox-item.svelte
+++ b/src/lib/components/ui/context-menu/context-menu-checkbox-item.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { ContextMenu as ContextMenuPrimitive } from 'bits-ui';
-	import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
+	import { cn, type WithoutChildrenOrChild } from '$lib/utils/format.js';
 	import type { Snippet } from 'svelte';
 	import CheckIcon from '@lucide/svelte/icons/check';
 
diff --git a/src/lib/components/ui/context-menu/context-menu-content.svelte b/src/lib/components/ui/context-menu/context-menu-content.svelte
index f2a0a38..0b948f7 100644
--- a/src/lib/components/ui/context-menu/context-menu-content.svelte
+++ b/src/lib/components/ui/context-menu/context-menu-content.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 	import { ContextMenu as ContextMenuPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import ContextMenuPortal from './context-menu-portal.svelte';
 	import type { ComponentProps } from 'svelte';
-	import type { WithoutChildrenOrChild } from '$lib/utils.js';
+	import type { WithoutChildrenOrChild } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/context-menu/context-menu-group-heading.svelte b/src/lib/components/ui/context-menu/context-menu-group-heading.svelte
index 86ade78..b793991 100644
--- a/src/lib/components/ui/context-menu/context-menu-group-heading.svelte
+++ b/src/lib/components/ui/context-menu/context-menu-group-heading.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { ContextMenu as ContextMenuPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/context-menu/context-menu-item.svelte b/src/lib/components/ui/context-menu/context-menu-item.svelte
index e670f04..56d87ba 100644
--- a/src/lib/components/ui/context-menu/context-menu-item.svelte
+++ b/src/lib/components/ui/context-menu/context-menu-item.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { ContextMenu as ContextMenuPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/context-menu/context-menu-label.svelte b/src/lib/components/ui/context-menu/context-menu-label.svelte
index 1b56502..215ef12 100644
--- a/src/lib/components/ui/context-menu/context-menu-label.svelte
+++ b/src/lib/components/ui/context-menu/context-menu-label.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/context-menu/context-menu-radio-item.svelte b/src/lib/components/ui/context-menu/context-menu-radio-item.svelte
index 8213837..3b477f7 100644
--- a/src/lib/components/ui/context-menu/context-menu-radio-item.svelte
+++ b/src/lib/components/ui/context-menu/context-menu-radio-item.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { ContextMenu as ContextMenuPrimitive } from 'bits-ui';
-	import { cn, type WithoutChild } from '$lib/utils.js';
+	import { cn, type WithoutChild } from '$lib/utils/format.js';
 	import CheckIcon from '@lucide/svelte/icons/check';
 
 	let {
diff --git a/src/lib/components/ui/context-menu/context-menu-separator.svelte b/src/lib/components/ui/context-menu/context-menu-separator.svelte
index 8f5642a..1c8d587 100644
--- a/src/lib/components/ui/context-menu/context-menu-separator.svelte
+++ b/src/lib/components/ui/context-menu/context-menu-separator.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { ContextMenu as ContextMenuPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/context-menu/context-menu-shortcut.svelte b/src/lib/components/ui/context-menu/context-menu-shortcut.svelte
index 56c266e..972881c 100644
--- a/src/lib/components/ui/context-menu/context-menu-shortcut.svelte
+++ b/src/lib/components/ui/context-menu/context-menu-shortcut.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/context-menu/context-menu-sub-content.svelte b/src/lib/components/ui/context-menu/context-menu-sub-content.svelte
index 08ff26a..5ff4372 100644
--- a/src/lib/components/ui/context-menu/context-menu-sub-content.svelte
+++ b/src/lib/components/ui/context-menu/context-menu-sub-content.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { ContextMenu as ContextMenuPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/context-menu/context-menu-sub-trigger.svelte b/src/lib/components/ui/context-menu/context-menu-sub-trigger.svelte
index a2accaf..8007cd1 100644
--- a/src/lib/components/ui/context-menu/context-menu-sub-trigger.svelte
+++ b/src/lib/components/ui/context-menu/context-menu-sub-trigger.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { ContextMenu as ContextMenuPrimitive } from 'bits-ui';
-	import { cn, type WithoutChild } from '$lib/utils.js';
+	import { cn, type WithoutChild } from '$lib/utils/format.js';
 	import ChevronRightIcon from '@lucide/svelte/icons/chevron-right';
 
 	let {
diff --git a/src/lib/components/ui/context-menu/context-menu-trigger.svelte b/src/lib/components/ui/context-menu/context-menu-trigger.svelte
index 0697542..f4b58f6 100644
--- a/src/lib/components/ui/context-menu/context-menu-trigger.svelte
+++ b/src/lib/components/ui/context-menu/context-menu-trigger.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { ContextMenu as ContextMenuPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/dialog/dialog-content.svelte b/src/lib/components/ui/dialog/dialog-content.svelte
index f25561b..77723c9 100644
--- a/src/lib/components/ui/dialog/dialog-content.svelte
+++ b/src/lib/components/ui/dialog/dialog-content.svelte
@@ -3,7 +3,7 @@
 	import DialogPortal from './dialog-portal.svelte';
 	import type { Snippet } from 'svelte';
 	import * as Dialog from './index.js';
-	import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
+	import { cn, type WithoutChildrenOrChild } from '$lib/utils/format.js';
 	import type { ComponentProps } from 'svelte';
 	import { Button } from '$lib/components/ui/button/index.js';
 	import XIcon from '@lucide/svelte/icons/x';
diff --git a/src/lib/components/ui/dialog/dialog-description.svelte b/src/lib/components/ui/dialog/dialog-description.svelte
index a461273..af9cf2f 100644
--- a/src/lib/components/ui/dialog/dialog-description.svelte
+++ b/src/lib/components/ui/dialog/dialog-description.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Dialog as DialogPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/dialog/dialog-footer.svelte b/src/lib/components/ui/dialog/dialog-footer.svelte
index 28882b2..90dc9f0 100644
--- a/src/lib/components/ui/dialog/dialog-footer.svelte
+++ b/src/lib/components/ui/dialog/dialog-footer.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 	import { Dialog as DialogPrimitive } from 'bits-ui';
 	import { Button } from '$lib/components/ui/button/index.js';
diff --git a/src/lib/components/ui/dialog/dialog-header.svelte b/src/lib/components/ui/dialog/dialog-header.svelte
index 3e2a2b2..6de3bd8 100644
--- a/src/lib/components/ui/dialog/dialog-header.svelte
+++ b/src/lib/components/ui/dialog/dialog-header.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/dialog/dialog-overlay.svelte b/src/lib/components/ui/dialog/dialog-overlay.svelte
index 60743df..c9198f2 100644
--- a/src/lib/components/ui/dialog/dialog-overlay.svelte
+++ b/src/lib/components/ui/dialog/dialog-overlay.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Dialog as DialogPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/dialog/dialog-title.svelte b/src/lib/components/ui/dialog/dialog-title.svelte
index f3aa721..7647c74 100644
--- a/src/lib/components/ui/dialog/dialog-title.svelte
+++ b/src/lib/components/ui/dialog/dialog-title.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Dialog as DialogPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/drawer/drawer-content.svelte b/src/lib/components/ui/drawer/drawer-content.svelte
index 86059d2..bca6bd9 100644
--- a/src/lib/components/ui/drawer/drawer-content.svelte
+++ b/src/lib/components/ui/drawer/drawer-content.svelte
@@ -2,9 +2,9 @@
 	import { Drawer as DrawerPrimitive } from 'vaul-svelte';
 	import DrawerPortal from './drawer-portal.svelte';
 	import DrawerOverlay from './drawer-overlay.svelte';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import type { ComponentProps } from 'svelte';
-	import type { WithoutChildrenOrChild } from '$lib/utils.js';
+	import type { WithoutChildrenOrChild } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/drawer/drawer-description.svelte b/src/lib/components/ui/drawer/drawer-description.svelte
index 0d83f74..1aa52bb 100644
--- a/src/lib/components/ui/drawer/drawer-description.svelte
+++ b/src/lib/components/ui/drawer/drawer-description.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Drawer as DrawerPrimitive } from 'vaul-svelte';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/drawer/drawer-footer.svelte b/src/lib/components/ui/drawer/drawer-footer.svelte
index c436cc2..967b486 100644
--- a/src/lib/components/ui/drawer/drawer-footer.svelte
+++ b/src/lib/components/ui/drawer/drawer-footer.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/drawer/drawer-header.svelte b/src/lib/components/ui/drawer/drawer-header.svelte
index 53c6eb7..8deabd2 100644
--- a/src/lib/components/ui/drawer/drawer-header.svelte
+++ b/src/lib/components/ui/drawer/drawer-header.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/drawer/drawer-overlay.svelte b/src/lib/components/ui/drawer/drawer-overlay.svelte
index 2014262..5611d17 100644
--- a/src/lib/components/ui/drawer/drawer-overlay.svelte
+++ b/src/lib/components/ui/drawer/drawer-overlay.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Drawer as DrawerPrimitive } from 'vaul-svelte';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/drawer/drawer-title.svelte b/src/lib/components/ui/drawer/drawer-title.svelte
index b925853..bf9624c 100644
--- a/src/lib/components/ui/drawer/drawer-title.svelte
+++ b/src/lib/components/ui/drawer/drawer-title.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Drawer as DrawerPrimitive } from 'vaul-svelte';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/dropdown-menu/dropdown-menu-checkbox-item.svelte b/src/lib/components/ui/dropdown-menu/dropdown-menu-checkbox-item.svelte
index 8c03824..b5a7ee9 100644
--- a/src/lib/components/ui/dropdown-menu/dropdown-menu-checkbox-item.svelte
+++ b/src/lib/components/ui/dropdown-menu/dropdown-menu-checkbox-item.svelte
@@ -2,7 +2,7 @@
 	import { DropdownMenu as DropdownMenuPrimitive } from 'bits-ui';
 	import MinusIcon from '@lucide/svelte/icons/minus';
 	import CheckIcon from '@lucide/svelte/icons/check';
-	import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
+	import { cn, type WithoutChildrenOrChild } from '$lib/utils/format.js';
 	import type { Snippet } from 'svelte';
 
 	let {
diff --git a/src/lib/components/ui/dropdown-menu/dropdown-menu-content.svelte b/src/lib/components/ui/dropdown-menu/dropdown-menu-content.svelte
index 193a371..c101c75 100644
--- a/src/lib/components/ui/dropdown-menu/dropdown-menu-content.svelte
+++ b/src/lib/components/ui/dropdown-menu/dropdown-menu-content.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
+	import { cn, type WithoutChildrenOrChild } from '$lib/utils/format.js';
 	import DropdownMenuPortal from './dropdown-menu-portal.svelte';
 	import { DropdownMenu as DropdownMenuPrimitive } from 'bits-ui';
 	import type { ComponentProps } from 'svelte';
diff --git a/src/lib/components/ui/dropdown-menu/dropdown-menu-group-heading.svelte b/src/lib/components/ui/dropdown-menu/dropdown-menu-group-heading.svelte
index 92b35d2..54d3566 100644
--- a/src/lib/components/ui/dropdown-menu/dropdown-menu-group-heading.svelte
+++ b/src/lib/components/ui/dropdown-menu/dropdown-menu-group-heading.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { DropdownMenu as DropdownMenuPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import type { ComponentProps } from 'svelte';
 
 	let {
diff --git a/src/lib/components/ui/dropdown-menu/dropdown-menu-item.svelte b/src/lib/components/ui/dropdown-menu/dropdown-menu-item.svelte
index 028bb04..13a1c2e 100644
--- a/src/lib/components/ui/dropdown-menu/dropdown-menu-item.svelte
+++ b/src/lib/components/ui/dropdown-menu/dropdown-menu-item.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import { DropdownMenu as DropdownMenuPrimitive } from 'bits-ui';
 
 	let {
diff --git a/src/lib/components/ui/dropdown-menu/dropdown-menu-label.svelte b/src/lib/components/ui/dropdown-menu/dropdown-menu-label.svelte
index e45f53a..66e8802 100644
--- a/src/lib/components/ui/dropdown-menu/dropdown-menu-label.svelte
+++ b/src/lib/components/ui/dropdown-menu/dropdown-menu-label.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/dropdown-menu/dropdown-menu-radio-item.svelte b/src/lib/components/ui/dropdown-menu/dropdown-menu-radio-item.svelte
index 2fd82ef..c051f85 100644
--- a/src/lib/components/ui/dropdown-menu/dropdown-menu-radio-item.svelte
+++ b/src/lib/components/ui/dropdown-menu/dropdown-menu-radio-item.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { DropdownMenu as DropdownMenuPrimitive } from 'bits-ui';
 	import CheckIcon from '@lucide/svelte/icons/check';
-	import { cn, type WithoutChild } from '$lib/utils.js';
+	import { cn, type WithoutChild } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/dropdown-menu/dropdown-menu-separator.svelte b/src/lib/components/ui/dropdown-menu/dropdown-menu-separator.svelte
index a076e43..7c941f1 100644
--- a/src/lib/components/ui/dropdown-menu/dropdown-menu-separator.svelte
+++ b/src/lib/components/ui/dropdown-menu/dropdown-menu-separator.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { DropdownMenu as DropdownMenuPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/dropdown-menu/dropdown-menu-shortcut.svelte b/src/lib/components/ui/dropdown-menu/dropdown-menu-shortcut.svelte
index 501ea79..a2bfc6c 100644
--- a/src/lib/components/ui/dropdown-menu/dropdown-menu-shortcut.svelte
+++ b/src/lib/components/ui/dropdown-menu/dropdown-menu-shortcut.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/dropdown-menu/dropdown-menu-sub-content.svelte b/src/lib/components/ui/dropdown-menu/dropdown-menu-sub-content.svelte
index 7089496..7710ddd 100644
--- a/src/lib/components/ui/dropdown-menu/dropdown-menu-sub-content.svelte
+++ b/src/lib/components/ui/dropdown-menu/dropdown-menu-sub-content.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { DropdownMenu as DropdownMenuPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/dropdown-menu/dropdown-menu-sub-trigger.svelte b/src/lib/components/ui/dropdown-menu/dropdown-menu-sub-trigger.svelte
index 6784576..ec660b7 100644
--- a/src/lib/components/ui/dropdown-menu/dropdown-menu-sub-trigger.svelte
+++ b/src/lib/components/ui/dropdown-menu/dropdown-menu-sub-trigger.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { DropdownMenu as DropdownMenuPrimitive } from 'bits-ui';
 	import ChevronRightIcon from '@lucide/svelte/icons/chevron-right';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/empty/empty-content.svelte b/src/lib/components/ui/empty/empty-content.svelte
index f98fef1..ca19822 100644
--- a/src/lib/components/ui/empty/empty-content.svelte
+++ b/src/lib/components/ui/empty/empty-content.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/empty/empty-description.svelte b/src/lib/components/ui/empty/empty-description.svelte
index 29f8fe4..5e35c46 100644
--- a/src/lib/components/ui/empty/empty-description.svelte
+++ b/src/lib/components/ui/empty/empty-description.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/empty/empty-header.svelte b/src/lib/components/ui/empty/empty-header.svelte
index 1bfef38..cdda172 100644
--- a/src/lib/components/ui/empty/empty-header.svelte
+++ b/src/lib/components/ui/empty/empty-header.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/empty/empty-media.svelte b/src/lib/components/ui/empty/empty-media.svelte
index bd42547..fb192d5 100644
--- a/src/lib/components/ui/empty/empty-media.svelte
+++ b/src/lib/components/ui/empty/empty-media.svelte
@@ -18,7 +18,7 @@
 </script>
 
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/empty/empty-title.svelte b/src/lib/components/ui/empty/empty-title.svelte
index c9c345c..cc6fd8f 100644
--- a/src/lib/components/ui/empty/empty-title.svelte
+++ b/src/lib/components/ui/empty/empty-title.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/empty/empty.svelte b/src/lib/components/ui/empty/empty.svelte
index 16843e5..6cfcb3b 100644
--- a/src/lib/components/ui/empty/empty.svelte
+++ b/src/lib/components/ui/empty/empty.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/field/field-content.svelte b/src/lib/components/ui/field/field-content.svelte
index 19a8728..7a3789d 100644
--- a/src/lib/components/ui/field/field-content.svelte
+++ b/src/lib/components/ui/field/field-content.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/field/field-description.svelte b/src/lib/components/ui/field/field-description.svelte
index 84e864c..2fb1688 100644
--- a/src/lib/components/ui/field/field-description.svelte
+++ b/src/lib/components/ui/field/field-description.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/field/field-error.svelte b/src/lib/components/ui/field/field-error.svelte
index 36fb75c..a5feb8f 100644
--- a/src/lib/components/ui/field/field-error.svelte
+++ b/src/lib/components/ui/field/field-error.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 	import type { Snippet } from 'svelte';
 
diff --git a/src/lib/components/ui/field/field-group.svelte b/src/lib/components/ui/field/field-group.svelte
index cc35fb2..a0635e4 100644
--- a/src/lib/components/ui/field/field-group.svelte
+++ b/src/lib/components/ui/field/field-group.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/field/field-label.svelte b/src/lib/components/ui/field/field-label.svelte
index 075a61a..430af92 100644
--- a/src/lib/components/ui/field/field-label.svelte
+++ b/src/lib/components/ui/field/field-label.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Label } from '$lib/components/ui/label/index.js';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import type { ComponentProps } from 'svelte';
 
 	let {
diff --git a/src/lib/components/ui/field/field-legend.svelte b/src/lib/components/ui/field/field-legend.svelte
index de6cd6e..f6c51fc 100644
--- a/src/lib/components/ui/field/field-legend.svelte
+++ b/src/lib/components/ui/field/field-legend.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/field/field-separator.svelte b/src/lib/components/ui/field/field-separator.svelte
index 5847eb9..f74bb1f 100644
--- a/src/lib/components/ui/field/field-separator.svelte
+++ b/src/lib/components/ui/field/field-separator.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Separator } from '$lib/components/ui/separator/index.js';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 	import type { Snippet } from 'svelte';
 
diff --git a/src/lib/components/ui/field/field-set.svelte b/src/lib/components/ui/field/field-set.svelte
index fcf7135..11be4b4 100644
--- a/src/lib/components/ui/field/field-set.svelte
+++ b/src/lib/components/ui/field/field-set.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLFieldsetAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/field/field-title.svelte b/src/lib/components/ui/field/field-title.svelte
index 0ec420c..d405ff0 100644
--- a/src/lib/components/ui/field/field-title.svelte
+++ b/src/lib/components/ui/field/field-title.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/field/field.svelte b/src/lib/components/ui/field/field.svelte
index 3f3d79d..8366ba1 100644
--- a/src/lib/components/ui/field/field.svelte
+++ b/src/lib/components/ui/field/field.svelte
@@ -21,7 +21,7 @@
 </script>
 
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/form/form-description.svelte b/src/lib/components/ui/form/form-description.svelte
index 034270a..200c54d 100644
--- a/src/lib/components/ui/form/form-description.svelte
+++ b/src/lib/components/ui/form/form-description.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import * as FormPrimitive from 'formsnap';
-	import { cn, type WithoutChild } from '$lib/utils.js';
+	import { cn, type WithoutChild } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/form/form-element-field.svelte b/src/lib/components/ui/form/form-element-field.svelte
index 0300c8f..a17368b 100644
--- a/src/lib/components/ui/form/form-element-field.svelte
+++ b/src/lib/components/ui/form/form-element-field.svelte
@@ -2,7 +2,7 @@
 	import * as FormPrimitive from 'formsnap';
 	import type { FormPathLeaves } from 'sveltekit-superforms';
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef, type WithoutChildren } from '$lib/utils.js';
+	import { cn, type WithElementRef, type WithoutChildren } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/form/form-field-errors.svelte b/src/lib/components/ui/form/form-field-errors.svelte
index 1baddf9..d786ac3 100644
--- a/src/lib/components/ui/form/form-field-errors.svelte
+++ b/src/lib/components/ui/form/form-field-errors.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import * as FormPrimitive from 'formsnap';
-	import { cn, type WithoutChild } from '$lib/utils.js';
+	import { cn, type WithoutChild } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/form/form-field.svelte b/src/lib/components/ui/form/form-field.svelte
index 6f061ca..0b93466 100644
--- a/src/lib/components/ui/form/form-field.svelte
+++ b/src/lib/components/ui/form/form-field.svelte
@@ -1,7 +1,7 @@
 <script lang="ts" generics="T extends Record<string, unknown>, U extends FormPath<T>">
 	import * as FormPrimitive from 'formsnap';
 	import type { FormPath } from 'sveltekit-superforms';
-	import { cn, type WithElementRef, type WithoutChildren } from '$lib/utils.js';
+	import { cn, type WithElementRef, type WithoutChildren } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/form/form-fieldset.svelte b/src/lib/components/ui/form/form-fieldset.svelte
index 1ee7463..638fa77 100644
--- a/src/lib/components/ui/form/form-fieldset.svelte
+++ b/src/lib/components/ui/form/form-fieldset.svelte
@@ -1,7 +1,7 @@
 <script lang="ts" generics="T extends Record<string, unknown>, U extends FormPath<T>">
 	import * as FormPrimitive from 'formsnap';
 	import type { FormPath } from 'sveltekit-superforms';
-	import { cn, type WithoutChild } from '$lib/utils.js';
+	import { cn, type WithoutChild } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/form/form-label.svelte b/src/lib/components/ui/form/form-label.svelte
index 6d92ce7..280d1e2 100644
--- a/src/lib/components/ui/form/form-label.svelte
+++ b/src/lib/components/ui/form/form-label.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import * as FormPrimitive from 'formsnap';
 	import { Label } from '$lib/components/ui/label/index.js';
-	import { cn, type WithoutChild } from '$lib/utils.js';
+	import { cn, type WithoutChild } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/form/form-legend.svelte b/src/lib/components/ui/form/form-legend.svelte
index 2778f9c..476d37f 100644
--- a/src/lib/components/ui/form/form-legend.svelte
+++ b/src/lib/components/ui/form/form-legend.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import * as FormPrimitive from 'formsnap';
-	import { cn, type WithoutChild } from '$lib/utils.js';
+	import { cn, type WithoutChild } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/hover-card/hover-card-content.svelte b/src/lib/components/ui/hover-card/hover-card-content.svelte
index 5a27afd..7c28c1f 100644
--- a/src/lib/components/ui/hover-card/hover-card-content.svelte
+++ b/src/lib/components/ui/hover-card/hover-card-content.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { LinkPreview as HoverCardPrimitive } from 'bits-ui';
-	import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
+	import { cn, type WithoutChildrenOrChild } from '$lib/utils/format.js';
 	import HoverCardPortal from './hover-card-portal.svelte';
 	import type { ComponentProps } from 'svelte';
 
diff --git a/src/lib/components/ui/input-group/input-group-addon.svelte b/src/lib/components/ui/input-group/input-group-addon.svelte
index 39d59e5..72d255d 100644
--- a/src/lib/components/ui/input-group/input-group-addon.svelte
+++ b/src/lib/components/ui/input-group/input-group-addon.svelte
@@ -21,7 +21,7 @@
 </script>
 
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/input-group/input-group-button.svelte b/src/lib/components/ui/input-group/input-group-button.svelte
index bd4be14..1e7b7a1 100644
--- a/src/lib/components/ui/input-group/input-group-button.svelte
+++ b/src/lib/components/ui/input-group/input-group-button.svelte
@@ -20,7 +20,7 @@
 </script>
 
 <script lang="ts">
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import type { ComponentProps } from 'svelte';
 	import { Button } from '$lib/components/ui/button/index.js';
 
diff --git a/src/lib/components/ui/input-group/input-group-input.svelte b/src/lib/components/ui/input-group/input-group-input.svelte
index 736f468..7e60d27 100644
--- a/src/lib/components/ui/input-group/input-group-input.svelte
+++ b/src/lib/components/ui/input-group/input-group-input.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import type { ComponentProps } from 'svelte';
 	import { Input } from '$lib/components/ui/input/index.js';
 
diff --git a/src/lib/components/ui/input-group/input-group-text.svelte b/src/lib/components/ui/input-group/input-group-text.svelte
index a97c00f..281904c 100644
--- a/src/lib/components/ui/input-group/input-group-text.svelte
+++ b/src/lib/components/ui/input-group/input-group-text.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/input-group/input-group-textarea.svelte b/src/lib/components/ui/input-group/input-group-textarea.svelte
index 8af6c45..4bab2c7 100644
--- a/src/lib/components/ui/input-group/input-group-textarea.svelte
+++ b/src/lib/components/ui/input-group/input-group-textarea.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import { Textarea } from '$lib/components/ui/textarea/index.js';
 	import type { ComponentProps } from 'svelte';
 
diff --git a/src/lib/components/ui/input-group/input-group.svelte b/src/lib/components/ui/input-group/input-group.svelte
index c5ab373..369dbdf 100644
--- a/src/lib/components/ui/input-group/input-group.svelte
+++ b/src/lib/components/ui/input-group/input-group.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/input-otp/input-otp-group.svelte b/src/lib/components/ui/input-otp/input-otp-group.svelte
index 68c0913..1708597 100644
--- a/src/lib/components/ui/input-otp/input-otp-group.svelte
+++ b/src/lib/components/ui/input-otp/input-otp-group.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/input-otp/input-otp-separator.svelte b/src/lib/components/ui/input-otp/input-otp-separator.svelte
index 8431d6d..2e2d974 100644
--- a/src/lib/components/ui/input-otp/input-otp-separator.svelte
+++ b/src/lib/components/ui/input-otp/input-otp-separator.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import type { WithElementRef } from '$lib/utils.js';
-	import { cn } from '$lib/utils.js';
+	import type { WithElementRef } from '$lib/utils/format.js';
+	import { cn } from '$lib/utils/format.js';
 	import MinusIcon from '@lucide/svelte/icons/minus';
 
 	let {
diff --git a/src/lib/components/ui/input-otp/input-otp-slot.svelte b/src/lib/components/ui/input-otp/input-otp-slot.svelte
index 2abe908..dc50249 100644
--- a/src/lib/components/ui/input-otp/input-otp-slot.svelte
+++ b/src/lib/components/ui/input-otp/input-otp-slot.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { PinInput as InputOTPPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/input-otp/input-otp.svelte b/src/lib/components/ui/input-otp/input-otp.svelte
index ad3b54f..bd34f71 100644
--- a/src/lib/components/ui/input-otp/input-otp.svelte
+++ b/src/lib/components/ui/input-otp/input-otp.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { PinInput as InputOTPPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/input/input.svelte b/src/lib/components/ui/input/input.svelte
index dc87661..58f6dd0 100644
--- a/src/lib/components/ui/input/input.svelte
+++ b/src/lib/components/ui/input/input.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLInputAttributes, HTMLInputTypeAttribute } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	type InputType = Exclude<HTMLInputTypeAttribute, 'file'>;
 
diff --git a/src/lib/components/ui/item/item-actions.svelte b/src/lib/components/ui/item/item-actions.svelte
index 699023b..a116b09 100644
--- a/src/lib/components/ui/item/item-actions.svelte
+++ b/src/lib/components/ui/item/item-actions.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/item/item-content.svelte b/src/lib/components/ui/item/item-content.svelte
index bf4f41e..03158a5 100644
--- a/src/lib/components/ui/item/item-content.svelte
+++ b/src/lib/components/ui/item/item-content.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/item/item-description.svelte b/src/lib/components/ui/item/item-description.svelte
index 2f53bcf..f604c26 100644
--- a/src/lib/components/ui/item/item-description.svelte
+++ b/src/lib/components/ui/item/item-description.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/item/item-footer.svelte b/src/lib/components/ui/item/item-footer.svelte
index 5be2f85..fa0047e 100644
--- a/src/lib/components/ui/item/item-footer.svelte
+++ b/src/lib/components/ui/item/item-footer.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/item/item-group.svelte b/src/lib/components/ui/item/item-group.svelte
index fa61aa0..ad2b608 100644
--- a/src/lib/components/ui/item/item-group.svelte
+++ b/src/lib/components/ui/item/item-group.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/item/item-header.svelte b/src/lib/components/ui/item/item-header.svelte
index 3665578..cce9d9e 100644
--- a/src/lib/components/ui/item/item-header.svelte
+++ b/src/lib/components/ui/item/item-header.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/item/item-media.svelte b/src/lib/components/ui/item/item-media.svelte
index 8072698..d25bbec 100644
--- a/src/lib/components/ui/item/item-media.svelte
+++ b/src/lib/components/ui/item/item-media.svelte
@@ -20,7 +20,7 @@
 </script>
 
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/item/item-separator.svelte b/src/lib/components/ui/item/item-separator.svelte
index 5c66dd6..1fa0856 100644
--- a/src/lib/components/ui/item/item-separator.svelte
+++ b/src/lib/components/ui/item/item-separator.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Separator } from '$lib/components/ui/separator/index.js';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import type { ComponentProps } from 'svelte';
 
 	let {
diff --git a/src/lib/components/ui/item/item-title.svelte b/src/lib/components/ui/item/item-title.svelte
index ff215fc..5ca5adc 100644
--- a/src/lib/components/ui/item/item-title.svelte
+++ b/src/lib/components/ui/item/item-title.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/item/item.svelte b/src/lib/components/ui/item/item.svelte
index f448eff..5d7cbfb 100644
--- a/src/lib/components/ui/item/item.svelte
+++ b/src/lib/components/ui/item/item.svelte
@@ -26,7 +26,7 @@
 </script>
 
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 	import type { Snippet } from 'svelte';
 
diff --git a/src/lib/components/ui/kbd/kbd-group.svelte b/src/lib/components/ui/kbd/kbd-group.svelte
index c161ccf..e7e8201 100644
--- a/src/lib/components/ui/kbd/kbd-group.svelte
+++ b/src/lib/components/ui/kbd/kbd-group.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/kbd/kbd.svelte b/src/lib/components/ui/kbd/kbd.svelte
index 7fdcdd2..ed2ba90 100644
--- a/src/lib/components/ui/kbd/kbd.svelte
+++ b/src/lib/components/ui/kbd/kbd.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/label/label.svelte b/src/lib/components/ui/label/label.svelte
index 7fef72e..9866a6a 100644
--- a/src/lib/components/ui/label/label.svelte
+++ b/src/lib/components/ui/label/label.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Label as LabelPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/menubar/menubar-checkbox-item.svelte b/src/lib/components/ui/menubar/menubar-checkbox-item.svelte
index 1cae3da..1e9668e 100644
--- a/src/lib/components/ui/menubar/menubar-checkbox-item.svelte
+++ b/src/lib/components/ui/menubar/menubar-checkbox-item.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Menubar as MenubarPrimitive } from 'bits-ui';
-	import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
+	import { cn, type WithoutChildrenOrChild } from '$lib/utils/format.js';
 	import type { Snippet } from 'svelte';
 	import MinusIcon from '@lucide/svelte/icons/minus';
 	import CheckIcon from '@lucide/svelte/icons/check';
diff --git a/src/lib/components/ui/menubar/menubar-content.svelte b/src/lib/components/ui/menubar/menubar-content.svelte
index 2976b17..cc6ac5f 100644
--- a/src/lib/components/ui/menubar/menubar-content.svelte
+++ b/src/lib/components/ui/menubar/menubar-content.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { Menubar as MenubarPrimitive } from 'bits-ui';
 	import MenubarPortal from './menubar-portal.svelte';
-	import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
+	import { cn, type WithoutChildrenOrChild } from '$lib/utils/format.js';
 	import type { ComponentProps } from 'svelte';
 
 	let {
diff --git a/src/lib/components/ui/menubar/menubar-group-heading.svelte b/src/lib/components/ui/menubar/menubar-group-heading.svelte
index e842010..661a7fd 100644
--- a/src/lib/components/ui/menubar/menubar-group-heading.svelte
+++ b/src/lib/components/ui/menubar/menubar-group-heading.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import { Menubar as MenubarPrimitive } from 'bits-ui';
 	import type { ComponentProps } from 'svelte';
 
diff --git a/src/lib/components/ui/menubar/menubar-item.svelte b/src/lib/components/ui/menubar/menubar-item.svelte
index 2c6fa40..8fc2289 100644
--- a/src/lib/components/ui/menubar/menubar-item.svelte
+++ b/src/lib/components/ui/menubar/menubar-item.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Menubar as MenubarPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/menubar/menubar-label.svelte b/src/lib/components/ui/menubar/menubar-label.svelte
index b7aeb89..611cbf5 100644
--- a/src/lib/components/ui/menubar/menubar-label.svelte
+++ b/src/lib/components/ui/menubar/menubar-label.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import { type WithElementRef } from 'bits-ui';
 	import type { HTMLAttributes } from 'svelte/elements';
 
diff --git a/src/lib/components/ui/menubar/menubar-radio-item.svelte b/src/lib/components/ui/menubar/menubar-radio-item.svelte
index 7352bf1..0d53231 100644
--- a/src/lib/components/ui/menubar/menubar-radio-item.svelte
+++ b/src/lib/components/ui/menubar/menubar-radio-item.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Menubar as MenubarPrimitive } from 'bits-ui';
-	import { cn, type WithoutChild } from '$lib/utils.js';
+	import { cn, type WithoutChild } from '$lib/utils/format.js';
 	import CheckIcon from '@lucide/svelte/icons/check';
 
 	let {
diff --git a/src/lib/components/ui/menubar/menubar-separator.svelte b/src/lib/components/ui/menubar/menubar-separator.svelte
index 7902431..bc7659d 100644
--- a/src/lib/components/ui/menubar/menubar-separator.svelte
+++ b/src/lib/components/ui/menubar/menubar-separator.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Menubar as MenubarPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/menubar/menubar-shortcut.svelte b/src/lib/components/ui/menubar/menubar-shortcut.svelte
index f52ee9d..bb12f15 100644
--- a/src/lib/components/ui/menubar/menubar-shortcut.svelte
+++ b/src/lib/components/ui/menubar/menubar-shortcut.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/menubar/menubar-sub-content.svelte b/src/lib/components/ui/menubar/menubar-sub-content.svelte
index 37e918c..ad0b523 100644
--- a/src/lib/components/ui/menubar/menubar-sub-content.svelte
+++ b/src/lib/components/ui/menubar/menubar-sub-content.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Menubar as MenubarPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/menubar/menubar-sub-trigger.svelte b/src/lib/components/ui/menubar/menubar-sub-trigger.svelte
index abacb69..5e7c904 100644
--- a/src/lib/components/ui/menubar/menubar-sub-trigger.svelte
+++ b/src/lib/components/ui/menubar/menubar-sub-trigger.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Menubar as MenubarPrimitive } from 'bits-ui';
-	import { cn, type WithoutChild } from '$lib/utils.js';
+	import { cn, type WithoutChild } from '$lib/utils/format.js';
 	import ChevronRightIcon from '@lucide/svelte/icons/chevron-right';
 
 	let {
diff --git a/src/lib/components/ui/menubar/menubar-trigger.svelte b/src/lib/components/ui/menubar/menubar-trigger.svelte
index 8a3d80c..f7069cd 100644
--- a/src/lib/components/ui/menubar/menubar-trigger.svelte
+++ b/src/lib/components/ui/menubar/menubar-trigger.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Menubar as MenubarPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/menubar/menubar.svelte b/src/lib/components/ui/menubar/menubar.svelte
index 774ce26..b623518 100644
--- a/src/lib/components/ui/menubar/menubar.svelte
+++ b/src/lib/components/ui/menubar/menubar.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Menubar as MenubarPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/native-select/native-select-opt-group.svelte b/src/lib/components/ui/native-select/native-select-opt-group.svelte
index 7eb0860..fc315ac 100644
--- a/src/lib/components/ui/native-select/native-select-opt-group.svelte
+++ b/src/lib/components/ui/native-select/native-select-opt-group.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLOptgroupAttributes } from 'svelte/elements';
-	import type { WithElementRef } from '$lib/utils.js';
+	import type { WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/native-select/native-select-option.svelte b/src/lib/components/ui/native-select/native-select-option.svelte
index 347c9cc..f9a316e 100644
--- a/src/lib/components/ui/native-select/native-select-option.svelte
+++ b/src/lib/components/ui/native-select/native-select-option.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLOptionAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/native-select/native-select.svelte b/src/lib/components/ui/native-select/native-select.svelte
index c4bff9b..499a7da 100644
--- a/src/lib/components/ui/native-select/native-select.svelte
+++ b/src/lib/components/ui/native-select/native-select.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import type { HTMLSelectAttributes } from 'svelte/elements';
 	import ChevronDownIcon from '@lucide/svelte/icons/chevron-down';
 
diff --git a/src/lib/components/ui/navigation-menu/navigation-menu-content.svelte b/src/lib/components/ui/navigation-menu/navigation-menu-content.svelte
index 1c31827..2068879 100644
--- a/src/lib/components/ui/navigation-menu/navigation-menu-content.svelte
+++ b/src/lib/components/ui/navigation-menu/navigation-menu-content.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { NavigationMenu as NavigationMenuPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/navigation-menu/navigation-menu-indicator.svelte b/src/lib/components/ui/navigation-menu/navigation-menu-indicator.svelte
index 4eb104d..40766fe 100644
--- a/src/lib/components/ui/navigation-menu/navigation-menu-indicator.svelte
+++ b/src/lib/components/ui/navigation-menu/navigation-menu-indicator.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { NavigationMenu as NavigationMenuPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/navigation-menu/navigation-menu-item.svelte b/src/lib/components/ui/navigation-menu/navigation-menu-item.svelte
index 438645c..1ead4bc 100644
--- a/src/lib/components/ui/navigation-menu/navigation-menu-item.svelte
+++ b/src/lib/components/ui/navigation-menu/navigation-menu-item.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { NavigationMenu as NavigationMenuPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/navigation-menu/navigation-menu-link.svelte b/src/lib/components/ui/navigation-menu/navigation-menu-link.svelte
index 602368c..018ecc8 100644
--- a/src/lib/components/ui/navigation-menu/navigation-menu-link.svelte
+++ b/src/lib/components/ui/navigation-menu/navigation-menu-link.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { NavigationMenu as NavigationMenuPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/navigation-menu/navigation-menu-list.svelte b/src/lib/components/ui/navigation-menu/navigation-menu-list.svelte
index e915a40..ea542a6 100644
--- a/src/lib/components/ui/navigation-menu/navigation-menu-list.svelte
+++ b/src/lib/components/ui/navigation-menu/navigation-menu-list.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { NavigationMenu as NavigationMenuPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/navigation-menu/navigation-menu-trigger.svelte b/src/lib/components/ui/navigation-menu/navigation-menu-trigger.svelte
index 56b0b00..43d40b7 100644
--- a/src/lib/components/ui/navigation-menu/navigation-menu-trigger.svelte
+++ b/src/lib/components/ui/navigation-menu/navigation-menu-trigger.svelte
@@ -1,5 +1,5 @@
 <script lang="ts" module>
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import { tv } from 'tailwind-variants';
 
 	export const navigationMenuTriggerStyle = tv({
diff --git a/src/lib/components/ui/navigation-menu/navigation-menu-viewport.svelte b/src/lib/components/ui/navigation-menu/navigation-menu-viewport.svelte
index 786f093..c216626 100644
--- a/src/lib/components/ui/navigation-menu/navigation-menu-viewport.svelte
+++ b/src/lib/components/ui/navigation-menu/navigation-menu-viewport.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { NavigationMenu as NavigationMenuPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/navigation-menu/navigation-menu.svelte b/src/lib/components/ui/navigation-menu/navigation-menu.svelte
index a941fbe..965d823 100644
--- a/src/lib/components/ui/navigation-menu/navigation-menu.svelte
+++ b/src/lib/components/ui/navigation-menu/navigation-menu.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { NavigationMenu as NavigationMenuPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import NavigationMenuViewport from './navigation-menu-viewport.svelte';
 
 	let {
diff --git a/src/lib/components/ui/pagination/pagination-content.svelte b/src/lib/components/ui/pagination/pagination-content.svelte
index 77ed6c4..76f9617 100644
--- a/src/lib/components/ui/pagination/pagination-content.svelte
+++ b/src/lib/components/ui/pagination/pagination-content.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/pagination/pagination-ellipsis.svelte b/src/lib/components/ui/pagination/pagination-ellipsis.svelte
index f28ec30..61e8e01 100644
--- a/src/lib/components/ui/pagination/pagination-ellipsis.svelte
+++ b/src/lib/components/ui/pagination/pagination-ellipsis.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef, type WithoutChildren } from '$lib/utils.js';
+	import { cn, type WithElementRef, type WithoutChildren } from '$lib/utils/format.js';
 	import MoreHorizontalIcon from '@lucide/svelte/icons/more-horizontal';
 
 	let {
diff --git a/src/lib/components/ui/pagination/pagination-item.svelte b/src/lib/components/ui/pagination/pagination-item.svelte
index f185bf5..a5c9601 100644
--- a/src/lib/components/ui/pagination/pagination-item.svelte
+++ b/src/lib/components/ui/pagination/pagination-item.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLLiAttributes } from 'svelte/elements';
-	import type { WithElementRef } from '$lib/utils.js';
+	import type { WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/pagination/pagination-link.svelte b/src/lib/components/ui/pagination/pagination-link.svelte
index 79a7de4..7d177c2 100644
--- a/src/lib/components/ui/pagination/pagination-link.svelte
+++ b/src/lib/components/ui/pagination/pagination-link.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Pagination as PaginationPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import { buttonVariants, type ButtonSize } from '$lib/components/ui/button/index.js';
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/pagination/pagination-next-button.svelte b/src/lib/components/ui/pagination/pagination-next-button.svelte
index c8cf3ec..aa6a1a5 100644
--- a/src/lib/components/ui/pagination/pagination-next-button.svelte
+++ b/src/lib/components/ui/pagination/pagination-next-button.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { Pagination as PaginationPrimitive } from 'bits-ui';
 	import ChevronRightIcon from '@lucide/svelte/icons/chevron-right';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import { buttonVariants } from '../button/index.js';
 
 	let {
diff --git a/src/lib/components/ui/pagination/pagination-next.svelte b/src/lib/components/ui/pagination/pagination-next.svelte
index 8587599..6023c28 100644
--- a/src/lib/components/ui/pagination/pagination-next.svelte
+++ b/src/lib/components/ui/pagination/pagination-next.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Pagination as PaginationPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import { buttonVariants } from '$lib/components/ui/button/index.js';
 	import ChevronRightIcon from '@lucide/svelte/icons/chevron-right';
 
diff --git a/src/lib/components/ui/pagination/pagination-prev-button.svelte b/src/lib/components/ui/pagination/pagination-prev-button.svelte
index 00f3a07..c399bad 100644
--- a/src/lib/components/ui/pagination/pagination-prev-button.svelte
+++ b/src/lib/components/ui/pagination/pagination-prev-button.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { Pagination as PaginationPrimitive } from 'bits-ui';
 	import ChevronLeftIcon from '@lucide/svelte/icons/chevron-left';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import { buttonVariants } from '../button/index.js';
 
 	let {
diff --git a/src/lib/components/ui/pagination/pagination-previous.svelte b/src/lib/components/ui/pagination/pagination-previous.svelte
index ade7b52..efa4419 100644
--- a/src/lib/components/ui/pagination/pagination-previous.svelte
+++ b/src/lib/components/ui/pagination/pagination-previous.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Pagination as PaginationPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import { buttonVariants } from '$lib/components/ui/button/index.js';
 	import ChevronLeftIcon from '@lucide/svelte/icons/chevron-left';
 
diff --git a/src/lib/components/ui/pagination/pagination.svelte b/src/lib/components/ui/pagination/pagination.svelte
index fd3943d..0dcc6cd 100644
--- a/src/lib/components/ui/pagination/pagination.svelte
+++ b/src/lib/components/ui/pagination/pagination.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { Pagination as PaginationPrimitive } from 'bits-ui';
 
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/popover/popover-content.svelte b/src/lib/components/ui/popover/popover-content.svelte
index 6d42154..b433678 100644
--- a/src/lib/components/ui/popover/popover-content.svelte
+++ b/src/lib/components/ui/popover/popover-content.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { Popover as PopoverPrimitive } from 'bits-ui';
 	import PopoverPortal from './popover-portal.svelte';
-	import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
+	import { cn, type WithoutChildrenOrChild } from '$lib/utils/format.js';
 	import type { ComponentProps } from 'svelte';
 
 	let {
diff --git a/src/lib/components/ui/popover/popover-description.svelte b/src/lib/components/ui/popover/popover-description.svelte
index 0491a14..3fae95b 100644
--- a/src/lib/components/ui/popover/popover-description.svelte
+++ b/src/lib/components/ui/popover/popover-description.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/popover/popover-header.svelte b/src/lib/components/ui/popover/popover-header.svelte
index 0c7bbd1..77b388b 100644
--- a/src/lib/components/ui/popover/popover-header.svelte
+++ b/src/lib/components/ui/popover/popover-header.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/popover/popover-title.svelte b/src/lib/components/ui/popover/popover-title.svelte
index cf7a141..5d7bab7 100644
--- a/src/lib/components/ui/popover/popover-title.svelte
+++ b/src/lib/components/ui/popover/popover-title.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/popover/popover-trigger.svelte b/src/lib/components/ui/popover/popover-trigger.svelte
index f21b1b3..875a2a9 100644
--- a/src/lib/components/ui/popover/popover-trigger.svelte
+++ b/src/lib/components/ui/popover/popover-trigger.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import { Popover as PopoverPrimitive } from 'bits-ui';
 
 	let {
diff --git a/src/lib/components/ui/progress/progress.svelte b/src/lib/components/ui/progress/progress.svelte
index 0add3c9..9657a29 100644
--- a/src/lib/components/ui/progress/progress.svelte
+++ b/src/lib/components/ui/progress/progress.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Progress as ProgressPrimitive } from 'bits-ui';
-	import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
+	import { cn, type WithoutChildrenOrChild } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/radio-group/radio-group-item.svelte b/src/lib/components/ui/radio-group/radio-group-item.svelte
index 750712d..5d1b5bd 100644
--- a/src/lib/components/ui/radio-group/radio-group-item.svelte
+++ b/src/lib/components/ui/radio-group/radio-group-item.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { RadioGroup as RadioGroupPrimitive } from 'bits-ui';
 	import CircleIcon from '@lucide/svelte/icons/circle';
-	import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
+	import { cn, type WithoutChildrenOrChild } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/radio-group/radio-group.svelte b/src/lib/components/ui/radio-group/radio-group.svelte
index a757c3f..6f3e07c 100644
--- a/src/lib/components/ui/radio-group/radio-group.svelte
+++ b/src/lib/components/ui/radio-group/radio-group.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { RadioGroup as RadioGroupPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/range-calendar/range-calendar-cell.svelte b/src/lib/components/ui/range-calendar/range-calendar-cell.svelte
index f3cf355..c73c9a7 100644
--- a/src/lib/components/ui/range-calendar/range-calendar-cell.svelte
+++ b/src/lib/components/ui/range-calendar/range-calendar-cell.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { RangeCalendar as RangeCalendarPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/range-calendar/range-calendar-day.svelte b/src/lib/components/ui/range-calendar/range-calendar-day.svelte
index eb6fc44..56428b5 100644
--- a/src/lib/components/ui/range-calendar/range-calendar-day.svelte
+++ b/src/lib/components/ui/range-calendar/range-calendar-day.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { RangeCalendar as RangeCalendarPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/range-calendar/range-calendar-grid-row.svelte b/src/lib/components/ui/range-calendar/range-calendar-grid-row.svelte
index af534f1..b5828c3 100644
--- a/src/lib/components/ui/range-calendar/range-calendar-grid-row.svelte
+++ b/src/lib/components/ui/range-calendar/range-calendar-grid-row.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { RangeCalendar as RangeCalendarPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/range-calendar/range-calendar-grid.svelte b/src/lib/components/ui/range-calendar/range-calendar-grid.svelte
index 3065e1a..093449d 100644
--- a/src/lib/components/ui/range-calendar/range-calendar-grid.svelte
+++ b/src/lib/components/ui/range-calendar/range-calendar-grid.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { RangeCalendar as RangeCalendarPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/range-calendar/range-calendar-head-cell.svelte b/src/lib/components/ui/range-calendar/range-calendar-head-cell.svelte
index 75048a2..524ee9c 100644
--- a/src/lib/components/ui/range-calendar/range-calendar-head-cell.svelte
+++ b/src/lib/components/ui/range-calendar/range-calendar-head-cell.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { RangeCalendar as RangeCalendarPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/range-calendar/range-calendar-header.svelte b/src/lib/components/ui/range-calendar/range-calendar-header.svelte
index 1e50164..a20418c 100644
--- a/src/lib/components/ui/range-calendar/range-calendar-header.svelte
+++ b/src/lib/components/ui/range-calendar/range-calendar-header.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { RangeCalendar as RangeCalendarPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/range-calendar/range-calendar-heading.svelte b/src/lib/components/ui/range-calendar/range-calendar-heading.svelte
index 11773e2..6566c82 100644
--- a/src/lib/components/ui/range-calendar/range-calendar-heading.svelte
+++ b/src/lib/components/ui/range-calendar/range-calendar-heading.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { RangeCalendar as RangeCalendarPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/range-calendar/range-calendar-month-select.svelte b/src/lib/components/ui/range-calendar/range-calendar-month-select.svelte
index b916005..e5a3b06 100644
--- a/src/lib/components/ui/range-calendar/range-calendar-month-select.svelte
+++ b/src/lib/components/ui/range-calendar/range-calendar-month-select.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { RangeCalendar as RangeCalendarPrimitive } from 'bits-ui';
-	import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
+	import { cn, type WithoutChildrenOrChild } from '$lib/utils/format.js';
 	import ChevronDownIcon from '@lucide/svelte/icons/chevron-down';
 
 	let {
diff --git a/src/lib/components/ui/range-calendar/range-calendar-month.svelte b/src/lib/components/ui/range-calendar/range-calendar-month.svelte
index 799d2c5..56b9251 100644
--- a/src/lib/components/ui/range-calendar/range-calendar-month.svelte
+++ b/src/lib/components/ui/range-calendar/range-calendar-month.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { type WithElementRef, cn } from '$lib/utils.js';
+	import { type WithElementRef, cn } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/range-calendar/range-calendar-months.svelte b/src/lib/components/ui/range-calendar/range-calendar-months.svelte
index 023cad3..db0d341 100644
--- a/src/lib/components/ui/range-calendar/range-calendar-months.svelte
+++ b/src/lib/components/ui/range-calendar/range-calendar-months.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/range-calendar/range-calendar-nav.svelte b/src/lib/components/ui/range-calendar/range-calendar-nav.svelte
index 2fea3e9..5ce494d 100644
--- a/src/lib/components/ui/range-calendar/range-calendar-nav.svelte
+++ b/src/lib/components/ui/range-calendar/range-calendar-nav.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/range-calendar/range-calendar-next-button.svelte b/src/lib/components/ui/range-calendar/range-calendar-next-button.svelte
index 0219ee9..ddf2095 100644
--- a/src/lib/components/ui/range-calendar/range-calendar-next-button.svelte
+++ b/src/lib/components/ui/range-calendar/range-calendar-next-button.svelte
@@ -2,7 +2,7 @@
 	import { RangeCalendar as RangeCalendarPrimitive } from 'bits-ui';
 	import ChevronRightIcon from '@lucide/svelte/icons/chevron-right';
 	import { buttonVariants, type ButtonVariant } from '$lib/components/ui/button/index.js';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/range-calendar/range-calendar-prev-button.svelte b/src/lib/components/ui/range-calendar/range-calendar-prev-button.svelte
index 7aa2b1f..c5de30b 100644
--- a/src/lib/components/ui/range-calendar/range-calendar-prev-button.svelte
+++ b/src/lib/components/ui/range-calendar/range-calendar-prev-button.svelte
@@ -2,7 +2,7 @@
 	import { RangeCalendar as RangeCalendarPrimitive } from 'bits-ui';
 	import ChevronLeftIcon from '@lucide/svelte/icons/chevron-left';
 	import { buttonVariants, type ButtonVariant } from '$lib/components/ui/button/index.js';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/range-calendar/range-calendar-year-select.svelte b/src/lib/components/ui/range-calendar/range-calendar-year-select.svelte
index 6f6db58..1751489 100644
--- a/src/lib/components/ui/range-calendar/range-calendar-year-select.svelte
+++ b/src/lib/components/ui/range-calendar/range-calendar-year-select.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { RangeCalendar as RangeCalendarPrimitive } from 'bits-ui';
-	import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
+	import { cn, type WithoutChildrenOrChild } from '$lib/utils/format.js';
 	import ChevronDownIcon from '@lucide/svelte/icons/chevron-down';
 
 	let {
diff --git a/src/lib/components/ui/range-calendar/range-calendar.svelte b/src/lib/components/ui/range-calendar/range-calendar.svelte
index d939862..f004fec 100644
--- a/src/lib/components/ui/range-calendar/range-calendar.svelte
+++ b/src/lib/components/ui/range-calendar/range-calendar.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { RangeCalendar as RangeCalendarPrimitive } from 'bits-ui';
 	import * as RangeCalendar from './index.js';
-	import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
+	import { cn, type WithoutChildrenOrChild } from '$lib/utils/format.js';
 	import type { ButtonVariant } from '$lib/components/ui/button/index.js';
 	import type { Snippet } from 'svelte';
 	import { isEqualMonth, type DateValue } from '@internationalized/date';
diff --git a/src/lib/components/ui/resizable/resizable-handle.svelte b/src/lib/components/ui/resizable/resizable-handle.svelte
index 1d5f15f..cd73f1e 100644
--- a/src/lib/components/ui/resizable/resizable-handle.svelte
+++ b/src/lib/components/ui/resizable/resizable-handle.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import * as ResizablePrimitive from 'paneforge';
-	import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
+	import { cn, type WithoutChildrenOrChild } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/resizable/resizable-pane-group.svelte b/src/lib/components/ui/resizable/resizable-pane-group.svelte
index edb896f..0693822 100644
--- a/src/lib/components/ui/resizable/resizable-pane-group.svelte
+++ b/src/lib/components/ui/resizable/resizable-pane-group.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import * as ResizablePrimitive from 'paneforge';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/scroll-area/scroll-area-scrollbar.svelte b/src/lib/components/ui/scroll-area/scroll-area-scrollbar.svelte
index b77de20..54f23a6 100644
--- a/src/lib/components/ui/scroll-area/scroll-area-scrollbar.svelte
+++ b/src/lib/components/ui/scroll-area/scroll-area-scrollbar.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { ScrollArea as ScrollAreaPrimitive } from 'bits-ui';
-	import { cn, type WithoutChild } from '$lib/utils.js';
+	import { cn, type WithoutChild } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/scroll-area/scroll-area.svelte b/src/lib/components/ui/scroll-area/scroll-area.svelte
index 2424396..81d5fc1 100644
--- a/src/lib/components/ui/scroll-area/scroll-area.svelte
+++ b/src/lib/components/ui/scroll-area/scroll-area.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { ScrollArea as ScrollAreaPrimitive } from 'bits-ui';
 	import { Scrollbar } from './index.js';
-	import { cn, type WithoutChild } from '$lib/utils.js';
+	import { cn, type WithoutChild } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/select/select-content.svelte b/src/lib/components/ui/select/select-content.svelte
index 8461688..7cc80f8 100644
--- a/src/lib/components/ui/select/select-content.svelte
+++ b/src/lib/components/ui/select/select-content.svelte
@@ -3,9 +3,9 @@
 	import SelectPortal from './select-portal.svelte';
 	import SelectScrollUpButton from './select-scroll-up-button.svelte';
 	import SelectScrollDownButton from './select-scroll-down-button.svelte';
-	import { cn, type WithoutChild } from '$lib/utils.js';
+	import { cn, type WithoutChild } from '$lib/utils/format.js';
 	import type { ComponentProps } from 'svelte';
-	import type { WithoutChildrenOrChild } from '$lib/utils.js';
+	import type { WithoutChildrenOrChild } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/select/select-group-heading.svelte b/src/lib/components/ui/select/select-group-heading.svelte
index 3dc0282..56b93a6 100644
--- a/src/lib/components/ui/select/select-group-heading.svelte
+++ b/src/lib/components/ui/select/select-group-heading.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Select as SelectPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import type { ComponentProps } from 'svelte';
 
 	let {
diff --git a/src/lib/components/ui/select/select-group.svelte b/src/lib/components/ui/select/select-group.svelte
index 553f7e7..0069813 100644
--- a/src/lib/components/ui/select/select-group.svelte
+++ b/src/lib/components/ui/select/select-group.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Select as SelectPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/select/select-item.svelte b/src/lib/components/ui/select/select-item.svelte
index 79af45b..c8016a8 100644
--- a/src/lib/components/ui/select/select-item.svelte
+++ b/src/lib/components/ui/select/select-item.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Select as SelectPrimitive } from 'bits-ui';
-	import { cn, type WithoutChild } from '$lib/utils.js';
+	import { cn, type WithoutChild } from '$lib/utils/format.js';
 	import CheckIcon from '@lucide/svelte/icons/check';
 
 	let {
diff --git a/src/lib/components/ui/select/select-label.svelte b/src/lib/components/ui/select/select-label.svelte
index 1b8fba5..d3e595c 100644
--- a/src/lib/components/ui/select/select-label.svelte
+++ b/src/lib/components/ui/select/select-label.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/select/select-scroll-down-button.svelte b/src/lib/components/ui/select/select-scroll-down-button.svelte
index cba5a02..e0e5e0e 100644
--- a/src/lib/components/ui/select/select-scroll-down-button.svelte
+++ b/src/lib/components/ui/select/select-scroll-down-button.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Select as SelectPrimitive } from 'bits-ui';
-	import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
+	import { cn, type WithoutChildrenOrChild } from '$lib/utils/format.js';
 	import ChevronDownIcon from '@lucide/svelte/icons/chevron-down';
 
 	let {
diff --git a/src/lib/components/ui/select/select-scroll-up-button.svelte b/src/lib/components/ui/select/select-scroll-up-button.svelte
index 3f5fa51..010ec1c 100644
--- a/src/lib/components/ui/select/select-scroll-up-button.svelte
+++ b/src/lib/components/ui/select/select-scroll-up-button.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Select as SelectPrimitive } from 'bits-ui';
-	import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
+	import { cn, type WithoutChildrenOrChild } from '$lib/utils/format.js';
 	import ChevronUpIcon from '@lucide/svelte/icons/chevron-up';
 
 	let {
diff --git a/src/lib/components/ui/select/select-separator.svelte b/src/lib/components/ui/select/select-separator.svelte
index bfd1eb7..c8f7368 100644
--- a/src/lib/components/ui/select/select-separator.svelte
+++ b/src/lib/components/ui/select/select-separator.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { Separator as SeparatorPrimitive } from 'bits-ui';
 	import { Separator } from '$lib/components/ui/separator/index.js';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/select/select-trigger.svelte b/src/lib/components/ui/select/select-trigger.svelte
index 1c4c3d8..87715cf 100644
--- a/src/lib/components/ui/select/select-trigger.svelte
+++ b/src/lib/components/ui/select/select-trigger.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Select as SelectPrimitive } from 'bits-ui';
-	import { cn, type WithoutChild } from '$lib/utils.js';
+	import { cn, type WithoutChild } from '$lib/utils/format.js';
 	import ChevronDownIcon from '@lucide/svelte/icons/chevron-down';
 
 	let {
diff --git a/src/lib/components/ui/separator/separator.svelte b/src/lib/components/ui/separator/separator.svelte
index 40dcb92..8f46632 100644
--- a/src/lib/components/ui/separator/separator.svelte
+++ b/src/lib/components/ui/separator/separator.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Separator as SeparatorPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/sheet/sheet-content.svelte b/src/lib/components/ui/sheet/sheet-content.svelte
index 30c7697..9fe3512 100644
--- a/src/lib/components/ui/sheet/sheet-content.svelte
+++ b/src/lib/components/ui/sheet/sheet-content.svelte
@@ -9,7 +9,7 @@
 	import SheetOverlay from './sheet-overlay.svelte';
 	import { Button } from '$lib/components/ui/button/index.js';
 	import XIcon from '@lucide/svelte/icons/x';
-	import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
+	import { cn, type WithoutChildrenOrChild } from '$lib/utils/format.js';
 	import type { ComponentProps } from 'svelte';
 
 	let {
diff --git a/src/lib/components/ui/sheet/sheet-description.svelte b/src/lib/components/ui/sheet/sheet-description.svelte
index b6aae8e..c932501 100644
--- a/src/lib/components/ui/sheet/sheet-description.svelte
+++ b/src/lib/components/ui/sheet/sheet-description.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Dialog as SheetPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/sheet/sheet-footer.svelte b/src/lib/components/ui/sheet/sheet-footer.svelte
index aea83f7..2903421 100644
--- a/src/lib/components/ui/sheet/sheet-footer.svelte
+++ b/src/lib/components/ui/sheet/sheet-footer.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/sheet/sheet-header.svelte b/src/lib/components/ui/sheet/sheet-header.svelte
index 233892b..e551c8f 100644
--- a/src/lib/components/ui/sheet/sheet-header.svelte
+++ b/src/lib/components/ui/sheet/sheet-header.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/sheet/sheet-overlay.svelte b/src/lib/components/ui/sheet/sheet-overlay.svelte
index f7eb4d8..2d84a38 100644
--- a/src/lib/components/ui/sheet/sheet-overlay.svelte
+++ b/src/lib/components/ui/sheet/sheet-overlay.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Dialog as SheetPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/sheet/sheet-title.svelte b/src/lib/components/ui/sheet/sheet-title.svelte
index b140d19..fa81724 100644
--- a/src/lib/components/ui/sheet/sheet-title.svelte
+++ b/src/lib/components/ui/sheet/sheet-title.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Dialog as SheetPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/sidebar/sidebar-content.svelte b/src/lib/components/ui/sidebar/sidebar-content.svelte
index 052ebd3..2e92065 100644
--- a/src/lib/components/ui/sidebar/sidebar-content.svelte
+++ b/src/lib/components/ui/sidebar/sidebar-content.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/sidebar/sidebar-footer.svelte b/src/lib/components/ui/sidebar/sidebar-footer.svelte
index 24d67f6..edfb5ab 100644
--- a/src/lib/components/ui/sidebar/sidebar-footer.svelte
+++ b/src/lib/components/ui/sidebar/sidebar-footer.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/sidebar/sidebar-group-action.svelte b/src/lib/components/ui/sidebar/sidebar-group-action.svelte
index f621a3e..ff00b7f 100644
--- a/src/lib/components/ui/sidebar/sidebar-group-action.svelte
+++ b/src/lib/components/ui/sidebar/sidebar-group-action.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { Snippet } from 'svelte';
 	import type { HTMLButtonAttributes } from 'svelte/elements';
 
diff --git a/src/lib/components/ui/sidebar/sidebar-group-content.svelte b/src/lib/components/ui/sidebar/sidebar-group-content.svelte
index fafacee..ad98b6f 100644
--- a/src/lib/components/ui/sidebar/sidebar-group-content.svelte
+++ b/src/lib/components/ui/sidebar/sidebar-group-content.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/sidebar/sidebar-group-label.svelte b/src/lib/components/ui/sidebar/sidebar-group-label.svelte
index 4d99dd4..eca4f47 100644
--- a/src/lib/components/ui/sidebar/sidebar-group-label.svelte
+++ b/src/lib/components/ui/sidebar/sidebar-group-label.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { Snippet } from 'svelte';
 	import type { HTMLAttributes } from 'svelte/elements';
 
diff --git a/src/lib/components/ui/sidebar/sidebar-group.svelte b/src/lib/components/ui/sidebar/sidebar-group.svelte
index 897445d..194f1d1 100644
--- a/src/lib/components/ui/sidebar/sidebar-group.svelte
+++ b/src/lib/components/ui/sidebar/sidebar-group.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/sidebar/sidebar-header.svelte b/src/lib/components/ui/sidebar/sidebar-header.svelte
index a546474..21cbab0 100644
--- a/src/lib/components/ui/sidebar/sidebar-header.svelte
+++ b/src/lib/components/ui/sidebar/sidebar-header.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/sidebar/sidebar-input.svelte b/src/lib/components/ui/sidebar/sidebar-input.svelte
index 1a3610b..f9fd7d9 100644
--- a/src/lib/components/ui/sidebar/sidebar-input.svelte
+++ b/src/lib/components/ui/sidebar/sidebar-input.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { ComponentProps } from 'svelte';
 	import { Input } from '$lib/components/ui/input/index.js';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/sidebar/sidebar-inset.svelte b/src/lib/components/ui/sidebar/sidebar-inset.svelte
index c6de9f4..09090a8 100644
--- a/src/lib/components/ui/sidebar/sidebar-inset.svelte
+++ b/src/lib/components/ui/sidebar/sidebar-inset.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/sidebar/sidebar-menu-action.svelte b/src/lib/components/ui/sidebar/sidebar-menu-action.svelte
index ba4e5b9..0af0177 100644
--- a/src/lib/components/ui/sidebar/sidebar-menu-action.svelte
+++ b/src/lib/components/ui/sidebar/sidebar-menu-action.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { Snippet } from 'svelte';
 	import type { HTMLButtonAttributes } from 'svelte/elements';
 
diff --git a/src/lib/components/ui/sidebar/sidebar-menu-badge.svelte b/src/lib/components/ui/sidebar/sidebar-menu-badge.svelte
index a8f1d48..3c84a22 100644
--- a/src/lib/components/ui/sidebar/sidebar-menu-badge.svelte
+++ b/src/lib/components/ui/sidebar/sidebar-menu-badge.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/sidebar/sidebar-menu-button.svelte b/src/lib/components/ui/sidebar/sidebar-menu-button.svelte
index c5ce440..9d5536b 100644
--- a/src/lib/components/ui/sidebar/sidebar-menu-button.svelte
+++ b/src/lib/components/ui/sidebar/sidebar-menu-button.svelte
@@ -27,7 +27,7 @@
 
 <script lang="ts">
 	import * as Tooltip from '$lib/components/ui/tooltip/index.js';
-	import { cn, type WithElementRef, type WithoutChildrenOrChild } from '$lib/utils.js';
+	import { cn, type WithElementRef, type WithoutChildrenOrChild } from '$lib/utils/format.js';
 	import { mergeProps } from 'bits-ui';
 	import type { ComponentProps, Snippet } from 'svelte';
 	import type { HTMLAttributes } from 'svelte/elements';
diff --git a/src/lib/components/ui/sidebar/sidebar-menu-item.svelte b/src/lib/components/ui/sidebar/sidebar-menu-item.svelte
index acd2860..edcced8 100644
--- a/src/lib/components/ui/sidebar/sidebar-menu-item.svelte
+++ b/src/lib/components/ui/sidebar/sidebar-menu-item.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/sidebar/sidebar-menu-skeleton.svelte b/src/lib/components/ui/sidebar/sidebar-menu-skeleton.svelte
index 49a18f1..2c5e71b 100644
--- a/src/lib/components/ui/sidebar/sidebar-menu-skeleton.svelte
+++ b/src/lib/components/ui/sidebar/sidebar-menu-skeleton.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import { Skeleton } from '$lib/components/ui/skeleton/index.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
diff --git a/src/lib/components/ui/sidebar/sidebar-menu-sub-button.svelte b/src/lib/components/ui/sidebar/sidebar-menu-sub-button.svelte
index 78a3074..3fc9093 100644
--- a/src/lib/components/ui/sidebar/sidebar-menu-sub-button.svelte
+++ b/src/lib/components/ui/sidebar/sidebar-menu-sub-button.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { Snippet } from 'svelte';
 	import type { HTMLAnchorAttributes } from 'svelte/elements';
 
diff --git a/src/lib/components/ui/sidebar/sidebar-menu-sub-item.svelte b/src/lib/components/ui/sidebar/sidebar-menu-sub-item.svelte
index 4274f0e..b0495d6 100644
--- a/src/lib/components/ui/sidebar/sidebar-menu-sub-item.svelte
+++ b/src/lib/components/ui/sidebar/sidebar-menu-sub-item.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/sidebar/sidebar-menu-sub.svelte b/src/lib/components/ui/sidebar/sidebar-menu-sub.svelte
index d5e0654..5eacb37 100644
--- a/src/lib/components/ui/sidebar/sidebar-menu-sub.svelte
+++ b/src/lib/components/ui/sidebar/sidebar-menu-sub.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/sidebar/sidebar-menu.svelte b/src/lib/components/ui/sidebar/sidebar-menu.svelte
index e1c5b60..8b9046b 100644
--- a/src/lib/components/ui/sidebar/sidebar-menu.svelte
+++ b/src/lib/components/ui/sidebar/sidebar-menu.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/sidebar/sidebar-provider.svelte b/src/lib/components/ui/sidebar/sidebar-provider.svelte
index 2e615f4..1322703 100644
--- a/src/lib/components/ui/sidebar/sidebar-provider.svelte
+++ b/src/lib/components/ui/sidebar/sidebar-provider.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import * as Tooltip from '$lib/components/ui/tooltip/index.js';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 	import {
 		SIDEBAR_COOKIE_MAX_AGE,
diff --git a/src/lib/components/ui/sidebar/sidebar-rail.svelte b/src/lib/components/ui/sidebar/sidebar-rail.svelte
index c17e013..7134dd4 100644
--- a/src/lib/components/ui/sidebar/sidebar-rail.svelte
+++ b/src/lib/components/ui/sidebar/sidebar-rail.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 	import { useSidebar } from './context.svelte.js';
 
diff --git a/src/lib/components/ui/sidebar/sidebar-separator.svelte b/src/lib/components/ui/sidebar/sidebar-separator.svelte
index 3af5728..afa11f8 100644
--- a/src/lib/components/ui/sidebar/sidebar-separator.svelte
+++ b/src/lib/components/ui/sidebar/sidebar-separator.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Separator } from '$lib/components/ui/separator/index.js';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import type { ComponentProps } from 'svelte';
 
 	let {
diff --git a/src/lib/components/ui/sidebar/sidebar-trigger.svelte b/src/lib/components/ui/sidebar/sidebar-trigger.svelte
index 58fce6b..39fa198 100644
--- a/src/lib/components/ui/sidebar/sidebar-trigger.svelte
+++ b/src/lib/components/ui/sidebar/sidebar-trigger.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { Button } from '$lib/components/ui/button/index.js';
 	import PanelLeftIcon from '@lucide/svelte/icons/panel-left';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import type { ComponentProps } from 'svelte';
 	import { useSidebar } from './context.svelte.js';
 
diff --git a/src/lib/components/ui/sidebar/sidebar.svelte b/src/lib/components/ui/sidebar/sidebar.svelte
index 90d02b7..eb568ab 100644
--- a/src/lib/components/ui/sidebar/sidebar.svelte
+++ b/src/lib/components/ui/sidebar/sidebar.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import * as Sheet from '$lib/components/ui/sheet/index.js';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 	import { SIDEBAR_WIDTH_MOBILE } from './constants.js';
 	import { useSidebar } from './context.svelte.js';
diff --git a/src/lib/components/ui/skeleton/skeleton.svelte b/src/lib/components/ui/skeleton/skeleton.svelte
index e2b514b..1a52aa1 100644
--- a/src/lib/components/ui/skeleton/skeleton.svelte
+++ b/src/lib/components/ui/skeleton/skeleton.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef, type WithoutChildren } from '$lib/utils.js';
+	import { cn, type WithElementRef, type WithoutChildren } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/slider/slider.svelte b/src/lib/components/ui/slider/slider.svelte
index 7c073a5..79204f8 100644
--- a/src/lib/components/ui/slider/slider.svelte
+++ b/src/lib/components/ui/slider/slider.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Slider as SliderPrimitive } from 'bits-ui';
-	import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
+	import { cn, type WithoutChildrenOrChild } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/spinner/spinner.svelte b/src/lib/components/ui/spinner/spinner.svelte
index 487e6a4..4bb8eca 100644
--- a/src/lib/components/ui/spinner/spinner.svelte
+++ b/src/lib/components/ui/spinner/spinner.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import Loader2Icon from '@lucide/svelte/icons/loader-2';
 	import type { SVGAttributes } from 'svelte/elements';
 
diff --git a/src/lib/components/ui/stepper/stepper-description.svelte b/src/lib/components/ui/stepper/stepper-description.svelte
index b7ccfea..a6dfdb9 100644
--- a/src/lib/components/ui/stepper/stepper-description.svelte
+++ b/src/lib/components/ui/stepper/stepper-description.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn } from '$lib/utils';
+	import { cn } from '$lib/utils/format';
 	import type { Snippet } from 'svelte';
 
 	let { class: className, children }: { class?: string; children: Snippet } = $props();
diff --git a/src/lib/components/ui/stepper/stepper-indicator.svelte b/src/lib/components/ui/stepper/stepper-indicator.svelte
index f272e63..baba902 100644
--- a/src/lib/components/ui/stepper/stepper-indicator.svelte
+++ b/src/lib/components/ui/stepper/stepper-indicator.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import CheckIcon from '@lucide/svelte/icons/check';
-	import { cn } from '$lib/utils';
+	import { cn } from '$lib/utils/format';
 	import { getStepperContext } from './ctx';
 	import type { Snippet } from 'svelte';
 
diff --git a/src/lib/components/ui/stepper/stepper-item.svelte b/src/lib/components/ui/stepper/stepper-item.svelte
index 9b726d7..a2a9f88 100644
--- a/src/lib/components/ui/stepper/stepper-item.svelte
+++ b/src/lib/components/ui/stepper/stepper-item.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn } from '$lib/utils';
+	import { cn } from '$lib/utils/format';
 	import { getStepperContext } from './ctx';
 	import type { Snippet } from 'svelte';
 
diff --git a/src/lib/components/ui/stepper/stepper-separator.svelte b/src/lib/components/ui/stepper/stepper-separator.svelte
index 376598f..95ab0d9 100644
--- a/src/lib/components/ui/stepper/stepper-separator.svelte
+++ b/src/lib/components/ui/stepper/stepper-separator.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn } from '$lib/utils';
+	import { cn } from '$lib/utils/format';
 	import { getStepperContext } from './ctx';
 
 	let { class: className }: { class?: string } = $props();
diff --git a/src/lib/components/ui/stepper/stepper-title.svelte b/src/lib/components/ui/stepper/stepper-title.svelte
index ff30188..632ef04 100644
--- a/src/lib/components/ui/stepper/stepper-title.svelte
+++ b/src/lib/components/ui/stepper/stepper-title.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn } from '$lib/utils';
+	import { cn } from '$lib/utils/format';
 	import type { Snippet } from 'svelte';
 
 	let { class: className, children }: { class?: string; children: Snippet } = $props();
diff --git a/src/lib/components/ui/stepper/stepper-trigger.svelte b/src/lib/components/ui/stepper/stepper-trigger.svelte
index 1ec30a6..2229e27 100644
--- a/src/lib/components/ui/stepper/stepper-trigger.svelte
+++ b/src/lib/components/ui/stepper/stepper-trigger.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn } from '$lib/utils';
+	import { cn } from '$lib/utils/format';
 	import { Button } from '$lib/components/ui/button/index.js';
 	import { getStepperContext } from './ctx';
 	import type { Snippet } from 'svelte';
diff --git a/src/lib/components/ui/stepper/stepper.svelte b/src/lib/components/ui/stepper/stepper.svelte
index dac15b3..b505a5f 100644
--- a/src/lib/components/ui/stepper/stepper.svelte
+++ b/src/lib/components/ui/stepper/stepper.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn } from '$lib/utils';
+	import { cn } from '$lib/utils/format';
 	import { setStepperContext } from './ctx';
 	import type { Snippet } from 'svelte';
 
diff --git a/src/lib/components/ui/switch/switch.svelte b/src/lib/components/ui/switch/switch.svelte
index 332ee53..6ce0976 100644
--- a/src/lib/components/ui/switch/switch.svelte
+++ b/src/lib/components/ui/switch/switch.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Switch as SwitchPrimitive } from 'bits-ui';
-	import { cn, type WithoutChildrenOrChild } from '$lib/utils.js';
+	import { cn, type WithoutChildrenOrChild } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/table/table-body.svelte b/src/lib/components/ui/table/table-body.svelte
index cf720f4..c7b3e45 100644
--- a/src/lib/components/ui/table/table-body.svelte
+++ b/src/lib/components/ui/table/table-body.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/table/table-caption.svelte b/src/lib/components/ui/table/table-caption.svelte
index 7ad3aee..d00fb22 100644
--- a/src/lib/components/ui/table/table-caption.svelte
+++ b/src/lib/components/ui/table/table-caption.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/table/table-cell.svelte b/src/lib/components/ui/table/table-cell.svelte
index 1fb325b..bdc9ada 100644
--- a/src/lib/components/ui/table/table-cell.svelte
+++ b/src/lib/components/ui/table/table-cell.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLTdAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/table/table-footer.svelte b/src/lib/components/ui/table/table-footer.svelte
index 565b244..baac170 100644
--- a/src/lib/components/ui/table/table-footer.svelte
+++ b/src/lib/components/ui/table/table-footer.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/table/table-head.svelte b/src/lib/components/ui/table/table-head.svelte
index 4d41f0b..e1fa0d6 100644
--- a/src/lib/components/ui/table/table-head.svelte
+++ b/src/lib/components/ui/table/table-head.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLThAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/table/table-header.svelte b/src/lib/components/ui/table/table-header.svelte
index 615b5d8..05547de 100644
--- a/src/lib/components/ui/table/table-header.svelte
+++ b/src/lib/components/ui/table/table-header.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/table/table-row.svelte b/src/lib/components/ui/table/table-row.svelte
index 9270b1d..2e464f3 100644
--- a/src/lib/components/ui/table/table-row.svelte
+++ b/src/lib/components/ui/table/table-row.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/table/table.svelte b/src/lib/components/ui/table/table.svelte
index 38b0176..6d50bd2 100644
--- a/src/lib/components/ui/table/table.svelte
+++ b/src/lib/components/ui/table/table.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLTableAttributes } from 'svelte/elements';
-	import { cn, type WithElementRef } from '$lib/utils.js';
+	import { cn, type WithElementRef } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/tabs/tabs-content.svelte b/src/lib/components/ui/tabs/tabs-content.svelte
index 2f30880..868bbcc 100644
--- a/src/lib/components/ui/tabs/tabs-content.svelte
+++ b/src/lib/components/ui/tabs/tabs-content.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Tabs as TabsPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/tabs/tabs-list.svelte b/src/lib/components/ui/tabs/tabs-list.svelte
index e9e262a..8b656eb 100644
--- a/src/lib/components/ui/tabs/tabs-list.svelte
+++ b/src/lib/components/ui/tabs/tabs-list.svelte
@@ -19,7 +19,7 @@
 
 <script lang="ts">
 	import { Tabs as TabsPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/tabs/tabs-trigger.svelte b/src/lib/components/ui/tabs/tabs-trigger.svelte
index 30d1ce6..22c2bb5 100644
--- a/src/lib/components/ui/tabs/tabs-trigger.svelte
+++ b/src/lib/components/ui/tabs/tabs-trigger.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Tabs as TabsPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/tabs/tabs.svelte b/src/lib/components/ui/tabs/tabs.svelte
index 9a9b0ce..3abb3ee 100644
--- a/src/lib/components/ui/tabs/tabs.svelte
+++ b/src/lib/components/ui/tabs/tabs.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Tabs as TabsPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/textarea/textarea.svelte b/src/lib/components/ui/textarea/textarea.svelte
index 05f2815..11a4aad 100644
--- a/src/lib/components/ui/textarea/textarea.svelte
+++ b/src/lib/components/ui/textarea/textarea.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn, type WithElementRef, type WithoutChildren } from '$lib/utils.js';
+	import { cn, type WithElementRef, type WithoutChildren } from '$lib/utils/format.js';
 	import type { HTMLTextareaAttributes } from 'svelte/elements';
 
 	let {
diff --git a/src/lib/components/ui/toggle-group/toggle-group-item.svelte b/src/lib/components/ui/toggle-group/toggle-group-item.svelte
index 64db5eb..6916f1b 100644
--- a/src/lib/components/ui/toggle-group/toggle-group-item.svelte
+++ b/src/lib/components/ui/toggle-group/toggle-group-item.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { ToggleGroup as ToggleGroupPrimitive } from 'bits-ui';
 	import { getToggleGroupCtx } from './toggle-group.svelte';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import { type ToggleVariants, toggleVariants } from '$lib/components/ui/toggle/index.js';
 
 	let {
diff --git a/src/lib/components/ui/toggle-group/toggle-group.svelte b/src/lib/components/ui/toggle-group/toggle-group.svelte
index 015ea9e..4c7bcab 100644
--- a/src/lib/components/ui/toggle-group/toggle-group.svelte
+++ b/src/lib/components/ui/toggle-group/toggle-group.svelte
@@ -21,7 +21,7 @@
 
 <script lang="ts">
 	import { ToggleGroup as ToggleGroupPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/toggle/toggle.svelte b/src/lib/components/ui/toggle/toggle.svelte
index 850151b..a5c224a 100644
--- a/src/lib/components/ui/toggle/toggle.svelte
+++ b/src/lib/components/ui/toggle/toggle.svelte
@@ -28,7 +28,7 @@
 
 <script lang="ts">
 	import { Toggle as TogglePrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/components/ui/tooltip/tooltip-content.svelte b/src/lib/components/ui/tooltip/tooltip-content.svelte
index a525653..ef6e6d5 100644
--- a/src/lib/components/ui/tooltip/tooltip-content.svelte
+++ b/src/lib/components/ui/tooltip/tooltip-content.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 	import { Tooltip as TooltipPrimitive } from 'bits-ui';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import TooltipPortal from './tooltip-portal.svelte';
 	import type { ComponentProps } from 'svelte';
-	import type { WithoutChildrenOrChild } from '$lib/utils.js';
+	import type { WithoutChildrenOrChild } from '$lib/utils/format.js';
 
 	let {
 		ref = $bindable(null),
diff --git a/src/lib/list-search.svelte.ts b/src/lib/list-search.svelte.ts
index 991f0a7..b4aade0 100644
--- a/src/lib/list-search.svelte.ts
+++ b/src/lib/list-search.svelte.ts
@@ -1,6 +1,6 @@
 import { useSearchParams } from 'runed/kit';
 import { z } from 'zod';
-import { filterRecords } from '$lib/record-utils';
+import { filterRecords } from '$lib/utils/filter';
 
 export const listSearchParamsSchema = z.object({
 	q: z.string().default('')
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
deleted file mode 100644
index f92bfcb..0000000
--- a/src/lib/utils.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { clsx, type ClassValue } from 'clsx';
-import { twMerge } from 'tailwind-merge';
-
-export function cn(...inputs: ClassValue[]) {
-	return twMerge(clsx(inputs));
-}
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type WithoutChild<T> = T extends { child?: any } ? Omit<T, 'child'> : T;
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type WithoutChildren<T> = T extends { children?: any } ? Omit<T, 'children'> : T;
-export type WithoutChildrenOrChild<T> = WithoutChildren<WithoutChild<T>>;
-export type WithElementRef<T, U extends HTMLElement = HTMLElement> = T & { ref?: U | null };
diff --git a/src/lib/form-feedback.ts b/src/lib/utils/feedback.ts
similarity index 100%
rename from src/lib/form-feedback.ts
rename to src/lib/utils/feedback.ts
diff --git a/src/lib/utils/filter.ts b/src/lib/utils/filter.ts
new file mode 100644
index 0000000..a6cb6c5
--- /dev/null
+++ b/src/lib/utils/filter.ts
@@ -0,0 +1,15 @@
+export function filterRecords<T>(records: readonly T[], query: string) {
+	const normalizedQuery = query.trim().toLowerCase();
+	if (!normalizedQuery) return [...records];
+
+	return records.filter((record) => searchableText(record).includes(normalizedQuery));
+}
+
+function searchableText(value: unknown): string {
+	if (value === null || value === undefined) return '';
+	if (value instanceof Date) return value.toISOString().toLowerCase();
+	if (typeof value !== 'object') return String(value).toLowerCase();
+	if (Array.isArray(value)) return value.map(searchableText).join(' ');
+
+	return Object.values(value).map(searchableText).join(' ');
+}
diff --git a/src/lib/record-utils.ts b/src/lib/utils/format.ts
similarity index 74%
rename from src/lib/record-utils.ts
rename to src/lib/utils/format.ts
index f1b5513..59f7a66 100644
--- a/src/lib/record-utils.ts
+++ b/src/lib/utils/format.ts
@@ -1,3 +1,6 @@
+import { clsx, type ClassValue } from 'clsx';
+import { twMerge } from 'tailwind-merge';
+
 type NamedRecord = Partial<Record<'name' | 'title' | 'invoiceNumber' | 'label', unknown>>;
 
 type RelationOption = {
@@ -24,6 +27,10 @@ const dateTimeFormatter = new Intl.DateTimeFormat('en-GB', {
 	minute: '2-digit'
 });
 
+export function cn(...inputs: ClassValue[]) {
+	return twMerge(clsx(inputs));
+}
+
 export function formatValue(value: unknown) {
 	if (value === null || value === undefined || value === '') return 'Not set';
 	return String(value);
@@ -62,18 +69,9 @@ export function relationLabel<Options extends object, Key extends keyof Options
 	return optionList?.find((option) => option.value === value)?.label ?? value;
 }
 
-export function filterRecords<T>(records: readonly T[], query: string) {
-	const normalizedQuery = query.trim().toLowerCase();
-	if (!normalizedQuery) return [...records];
-
-	return records.filter((record) => searchableText(record).includes(normalizedQuery));
-}
-
-function searchableText(value: unknown): string {
-	if (value === null || value === undefined) return '';
-	if (value instanceof Date) return value.toISOString().toLowerCase();
-	if (typeof value !== 'object') return String(value).toLowerCase();
-	if (Array.isArray(value)) return value.map(searchableText).join(' ');
-
-	return Object.values(value).map(searchableText).join(' ');
-}
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export type WithoutChild<T> = T extends { child?: any } ? Omit<T, 'child'> : T;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export type WithoutChildren<T> = T extends { children?: any } ? Omit<T, 'children'> : T;
+export type WithoutChildrenOrChild<T> = WithoutChildren<WithoutChild<T>>;
+export type WithElementRef<T, U extends HTMLElement = HTMLElement> = T & { ref?: U | null };
diff --git a/src/routes/dashboard/+page.svelte b/src/routes/dashboard/+page.svelte
index b4f0826..bc5402a 100644
--- a/src/routes/dashboard/+page.svelte
+++ b/src/routes/dashboard/+page.svelte
@@ -3,7 +3,7 @@
 	import BillingTrend from './billing-trend.svelte';
 	import MetricCards from './metric-cards.svelte';
 	import RoomSummary from './room-summary.svelte';
-	import { formatDate, formatMoney, formatValue } from '$lib/record-utils';
+	import { formatDate, formatMoney, formatValue } from '$lib/utils/format';
 	import type { PageData } from './$types';
 
 	let { data }: { data: PageData } = $props();
diff --git a/src/routes/dashboard/addresses/+page.svelte b/src/routes/dashboard/addresses/+page.svelte
index 3e464ef..766d53c 100644
--- a/src/routes/dashboard/addresses/+page.svelte
+++ b/src/routes/dashboard/addresses/+page.svelte
@@ -11,8 +11,8 @@
 		formatValue,
 		recordName as getRecordName,
 		relationLabel as getRelationLabel
-	} from '$lib/record-utils';
-	import { handleFormToast } from '$lib/form-feedback';
+	} from '$lib/utils/format';
+	import { handleFormToast } from '$lib/utils/feedback';
 	import type { PageData } from './$types';
 	type RecordRow = PageData['records'][number];
 	let { data }: { data: PageData } = $props();
diff --git a/src/routes/dashboard/bookings/+page.svelte b/src/routes/dashboard/bookings/+page.svelte
index d104a27..a031af8 100644
--- a/src/routes/dashboard/bookings/+page.svelte
+++ b/src/routes/dashboard/bookings/+page.svelte
@@ -12,8 +12,8 @@
 		formatDate,
 		recordName as getRecordName,
 		relationLabel as getRelationLabel
-	} from '$lib/record-utils';
-	import { handleFormToast } from '$lib/form-feedback';
+	} from '$lib/utils/format';
+	import { handleFormToast } from '$lib/utils/feedback';
 	import type { PageData } from './$types';
 	type RecordRow = PageData['records'][number];
 	let { data }: { data: PageData } = $props();
diff --git a/src/routes/dashboard/clients/+page.svelte b/src/routes/dashboard/clients/+page.svelte
index 63d37ab..f6a5d3f 100644
--- a/src/routes/dashboard/clients/+page.svelte
+++ b/src/routes/dashboard/clients/+page.svelte
@@ -9,8 +9,8 @@
 	import { superForm } from 'sveltekit-superforms';
 	import { zod4Client } from 'sveltekit-superforms/adapters';
 	import { archiveSchema } from '$lib/schemas/shared.schema';
-	import { formatValue, recordName as getRecordName } from '$lib/record-utils';
-	import { handleFormToast } from '$lib/form-feedback';
+	import { formatValue, recordName as getRecordName } from '$lib/utils/format';
+	import { handleFormToast } from '$lib/utils/feedback';
 	import { clientEditSchema, clientOnboardingCreateSchema } from '$lib/schemas/clients.schema';
 	import type { PageData } from './$types';
 	type RecordRow = PageData['records'][number];
diff --git a/src/routes/dashboard/clients/[id]/addresses/addresses-table.svelte b/src/routes/dashboard/clients/[id]/addresses/addresses-table.svelte
index 6cc5d50..7784e61 100644
--- a/src/routes/dashboard/clients/[id]/addresses/addresses-table.svelte
+++ b/src/routes/dashboard/clients/[id]/addresses/addresses-table.svelte
@@ -4,7 +4,7 @@
 	import { Button } from '$lib/components/ui/button/index.js';
 	import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
 	import * as Table from '$lib/components/ui/table/index.js';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	let {
 		data,
 		openEdit,
diff --git a/src/routes/dashboard/clients/[id]/contacts/contacts-table.svelte b/src/routes/dashboard/clients/[id]/contacts/contacts-table.svelte
index 3d1a9d7..b2cbb9e 100644
--- a/src/routes/dashboard/clients/[id]/contacts/contacts-table.svelte
+++ b/src/routes/dashboard/clients/[id]/contacts/contacts-table.svelte
@@ -4,7 +4,7 @@
 	import { Button } from '$lib/components/ui/button/index.js';
 	import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
 	import * as Table from '$lib/components/ui/table/index.js';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	let {
 		data,
 		openEdit,
diff --git a/src/routes/dashboard/clients/[id]/contracts/contract-form-fields.svelte b/src/routes/dashboard/clients/[id]/contracts/contract-form-fields.svelte
index 45d73d2..528df11 100644
--- a/src/routes/dashboard/clients/[id]/contracts/contract-form-fields.svelte
+++ b/src/routes/dashboard/clients/[id]/contracts/contract-form-fields.svelte
@@ -9,7 +9,7 @@
 	import * as Calendar from '$lib/components/ui/calendar/index.js';
 	import * as Field from '$lib/components/ui/field/index.js';
 	import * as Popover from '$lib/components/ui/popover/index.js';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 	import RoomMultiCombobox from './room-multi-combobox.svelte';
 
 	let {
diff --git a/src/routes/dashboard/clients/[id]/contracts/room-multi-combobox.svelte b/src/routes/dashboard/clients/[id]/contracts/room-multi-combobox.svelte
index 1bbfbd4..a0558ad 100644
--- a/src/routes/dashboard/clients/[id]/contracts/room-multi-combobox.svelte
+++ b/src/routes/dashboard/clients/[id]/contracts/room-multi-combobox.svelte
@@ -4,7 +4,7 @@
 	import { Button } from '$lib/components/ui/button/index.js';
 	import * as Command from '$lib/components/ui/command/index.js';
 	import * as Popover from '$lib/components/ui/popover/index.js';
-	import { cn } from '$lib/utils.js';
+	import { cn } from '$lib/utils/format.js';
 
 	type Option = {
 		value: string;
diff --git a/src/routes/dashboard/contacts/+page.svelte b/src/routes/dashboard/contacts/+page.svelte
index 5622baf..831d051 100644
--- a/src/routes/dashboard/contacts/+page.svelte
+++ b/src/routes/dashboard/contacts/+page.svelte
@@ -11,8 +11,8 @@
 		formatValue,
 		recordName as getRecordName,
 		relationLabel as getRelationLabel
-	} from '$lib/record-utils';
-	import { handleFormToast } from '$lib/form-feedback';
+	} from '$lib/utils/format';
+	import { handleFormToast } from '$lib/utils/feedback';
 	import type { PageData } from './$types';
 	type RecordRow = PageData['records'][number];
 	let { data }: { data: PageData } = $props();
diff --git a/src/routes/dashboard/rooms/+page.svelte b/src/routes/dashboard/rooms/+page.svelte
index bd9d344..9c58774 100644
--- a/src/routes/dashboard/rooms/+page.svelte
+++ b/src/routes/dashboard/rooms/+page.svelte
@@ -9,8 +9,8 @@
 	import { superForm } from 'sveltekit-superforms';
 	import { zod4Client } from 'sveltekit-superforms/adapters';
 	import { archiveSchema } from '$lib/schemas/shared.schema';
-	import { formatValue, formatMoney, recordName as getRecordName } from '$lib/record-utils';
-	import { handleFormToast } from '$lib/form-feedback';
+	import { formatValue, formatMoney, recordName as getRecordName } from '$lib/utils/format';
+	import { handleFormToast } from '$lib/utils/feedback';
 	import { roomCreateSchema, roomEditSchema } from '$lib/schemas/rooms.schema';
 	import type { PageData } from './$types';
 	type RecordRow = PageData['records'][number];
diff --git a/src/routes/dashboard/services/+page.svelte b/src/routes/dashboard/services/+page.svelte
index 4b7ddcc..0fdd631 100644
--- a/src/routes/dashboard/services/+page.svelte
+++ b/src/routes/dashboard/services/+page.svelte
@@ -9,8 +9,8 @@
 	import { superForm } from 'sveltekit-superforms';
 	import { zod4Client } from 'sveltekit-superforms/adapters';
 	import { archiveSchema } from '$lib/schemas/shared.schema';
-	import { formatValue, formatMoney, recordName as getRecordName } from '$lib/record-utils';
-	import { handleFormToast } from '$lib/form-feedback';
+	import { formatValue, formatMoney, recordName as getRecordName } from '$lib/utils/format';
+	import { handleFormToast } from '$lib/utils/feedback';
 	import { serviceCreateSchema, serviceEditSchema } from '$lib/schemas/services.schema';
 	import type { PageData } from './$types';
 	type RecordRow = PageData['records'][number];