diff --git a/packages/bits-ui/package.json b/packages/bits-ui/package.json
index 87592709b..75dc2a587 100644
--- a/packages/bits-ui/package.json
+++ b/packages/bits-ui/package.json
@@ -20,6 +20,11 @@
 			"types": "./dist/index.d.ts",
 			"svelte": "./dist/index.js",
 			"default": "./dist/index.js"
+		},
+		"./*": {
+			"types": "./dist/bits/*/index.d.ts",
+			"svelte": "./dist/bits/*/index.js",
+			"default": "./dist/bits/*/index.js"
 		}
 	},
 	"files": [
diff --git a/packages/bits-ui/src/lib/bits/calendar/types.ts b/packages/bits-ui/src/lib/bits/calendar/types.ts
index 504c324c7..39cda3903 100644
--- a/packages/bits-ui/src/lib/bits/calendar/types.ts
+++ b/packages/bits-ui/src/lib/bits/calendar/types.ts
@@ -228,13 +228,13 @@ export type CalendarMultipleRootPropsWithoutHTML = {
 	onValueChange?: OnChangeFn<DateValue[]>;
 };
 
-export type _CalendarSingleRootPropsWithoutHTML = CalendarBaseRootPropsWithoutHTML &
+type _CalendarSingleRootPropsWithoutHTML = CalendarBaseRootPropsWithoutHTML &
 	CalendarSingleRootPropsWithoutHTML;
 
 export type CalendarSingleRootProps = _CalendarSingleRootPropsWithoutHTML &
 	Without<BitsPrimitiveDivAttributes, _CalendarSingleRootPropsWithoutHTML>;
 
-export type _CalendarMultipleRootPropsWithoutHTML = CalendarBaseRootPropsWithoutHTML &
+type _CalendarMultipleRootPropsWithoutHTML = CalendarBaseRootPropsWithoutHTML &
 	CalendarMultipleRootPropsWithoutHTML;
 
 export type CalendarMultipleRootProps = _CalendarMultipleRootPropsWithoutHTML &
diff --git a/packages/bits-ui/src/lib/bits/checkbox/components/checkbox-input.svelte b/packages/bits-ui/src/lib/bits/checkbox/components/checkbox-input.svelte
index c9b306263..169049f90 100644
--- a/packages/bits-ui/src/lib/bits/checkbox/components/checkbox-input.svelte
+++ b/packages/bits-ui/src/lib/bits/checkbox/components/checkbox-input.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { useCheckboxInput } from "../checkbox.svelte.js";
-	import HiddenInput from "$lib/bits/utilities/hidden-input.svelte";
+	import { HiddenInput } from "$lib/bits/utilities/hidden-input/index.js";
 
 	const inputState = useCheckboxInput();
 </script>
diff --git a/packages/bits-ui/src/lib/bits/date-field/components/date-field-hidden-input.svelte b/packages/bits-ui/src/lib/bits/date-field/components/date-field-hidden-input.svelte
index a958579c5..396a588c0 100644
--- a/packages/bits-ui/src/lib/bits/date-field/components/date-field-hidden-input.svelte
+++ b/packages/bits-ui/src/lib/bits/date-field/components/date-field-hidden-input.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { useDateFieldHiddenInput } from "../date-field.svelte.js";
-	import HiddenInput from "$lib/bits/utilities/hidden-input.svelte";
+	import { HiddenInput } from "$lib/bits/utilities/hidden-input/index.js";
 
 	const hiddenInputState = useDateFieldHiddenInput();
 </script>
diff --git a/packages/bits-ui/src/lib/bits/index.ts b/packages/bits-ui/src/lib/bits/exports.ts
similarity index 95%
rename from packages/bits-ui/src/lib/bits/index.ts
rename to packages/bits-ui/src/lib/bits/exports.ts
index 271068d15..62ac054cd 100644
--- a/packages/bits-ui/src/lib/bits/index.ts
+++ b/packages/bits-ui/src/lib/bits/exports.ts
@@ -38,5 +38,5 @@ export { Toggle } from "./toggle/index.js";
 export { ToggleGroup } from "./toggle-group/index.js";
 export { Toolbar } from "./toolbar/index.js";
 export { Tooltip } from "./tooltip/index.js";
-export { IsUsingKeyboard } from "./utilities/is-using-keyboard/is-using-keyboard.svelte.js";
-export { default as Portal } from "./utilities/portal/portal.svelte";
+export { IsUsingKeyboard } from "./utilities/is-using-keyboard/index.js";
+export { Portal } from "./utilities/portal/index.js";
diff --git a/packages/bits-ui/src/lib/bits/link-preview/components/link-preview-content.svelte b/packages/bits-ui/src/lib/bits/link-preview/components/link-preview-content.svelte
index ef326e4fd..0f43083eb 100644
--- a/packages/bits-ui/src/lib/bits/link-preview/components/link-preview-content.svelte
+++ b/packages/bits-ui/src/lib/bits/link-preview/components/link-preview-content.svelte
@@ -5,7 +5,7 @@
 	import PopperLayer from "$lib/bits/utilities/popper-layer/popper-layer.svelte";
 	import { getFloatingContentCSSVars } from "$lib/internal/floating-svelte/floating-utils.svelte.js";
 	import PopperLayerForceMount from "$lib/bits/utilities/popper-layer/popper-layer-force-mount.svelte";
-	import Mounted from "$lib/bits/utilities/mounted.svelte";
+	import { Mounted } from "$lib/bits/utilities/mounted/index.js";
 	import { noop } from "$lib/internal/noop.js";
 	import { createId } from "$lib/internal/create-id.js";
 
diff --git a/packages/bits-ui/src/lib/bits/menu/menu.svelte.ts b/packages/bits-ui/src/lib/bits/menu/menu.svelte.ts
index 52996bccc..d136a7602 100644
--- a/packages/bits-ui/src/lib/bits/menu/menu.svelte.ts
+++ b/packages/bits-ui/src/lib/bits/menu/menu.svelte.ts
@@ -40,9 +40,9 @@ import {
 	getDataOpenClosed,
 } from "$lib/internal/attrs.js";
 import type { Direction } from "$lib/shared/index.js";
-import { IsUsingKeyboard } from "$lib/index.js";
 import { useGraceArea } from "$lib/internal/use-grace-area.svelte.js";
 import { getTabbableFrom } from "$lib/internal/tabbable.js";
+import { IsUsingKeyboard } from "$lib/bits/utilities/is-using-keyboard/index.js";
 import { FocusScopeContext } from "../utilities/focus-scope/use-focus-scope.svelte.js";
 import { isTabbable } from "tabbable";
 import { untrack } from "svelte";
diff --git a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-content.svelte b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-content.svelte
index 556399c13..8b7c381d8 100644
--- a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-content.svelte
+++ b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-content.svelte
@@ -6,7 +6,7 @@
 	import type { NavigationMenuContentProps } from "$lib/types.js";
 	import Portal from "$lib/bits/utilities/portal/portal.svelte";
 	import PresenceLayer from "$lib/bits/utilities/presence-layer/presence-layer.svelte";
-	import Mounted from "$lib/bits/utilities/mounted.svelte";
+	import { Mounted } from "$lib/bits/utilities/mounted/index.js";
 
 	const uid = $props.id();
 
diff --git a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-list.svelte b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-list.svelte
index 19f0db698..cca1eb0f6 100644
--- a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-list.svelte
+++ b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-list.svelte
@@ -3,7 +3,7 @@
 	import type { NavigationMenuListProps } from "../types.js";
 	import { useNavigationMenuList } from "../navigation-menu.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
-	import Mounted from "$lib/bits/utilities/mounted.svelte";
+	import { Mounted } from "$lib/bits/utilities/mounted/index.js";
 
 	const uid = $props.id();
 
diff --git a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-trigger.svelte b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-trigger.svelte
index 1ca3d3e69..efe322e38 100644
--- a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-trigger.svelte
+++ b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-trigger.svelte
@@ -4,7 +4,7 @@
 	import { useNavigationMenuTrigger } from "../navigation-menu.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
 	import VisuallyHidden from "$lib/bits/utilities/visually-hidden/visually-hidden.svelte";
-	import Mounted from "$lib/bits/utilities/mounted.svelte";
+	import { Mounted } from "$lib/bits/utilities/mounted/index.js";
 
 	const uid = $props.id();
 
diff --git a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-viewport.svelte b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-viewport.svelte
index dd272e727..53be9aa59 100644
--- a/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-viewport.svelte
+++ b/packages/bits-ui/src/lib/bits/navigation-menu/components/navigation-menu-viewport.svelte
@@ -4,7 +4,7 @@
 	import { createId } from "$lib/internal/create-id.js";
 	import PresenceLayer from "$lib/bits/utilities/presence-layer/presence-layer.svelte";
 	import { box, mergeProps } from "svelte-toolbelt";
-	import { Mounted } from "$lib/bits/utilities/index.js";
+	import { Mounted } from "$lib/bits/utilities/mounted/index.js";
 
 	const uid = $props.id();
 
diff --git a/packages/bits-ui/src/lib/bits/radio-group/components/radio-group-input.svelte b/packages/bits-ui/src/lib/bits/radio-group/components/radio-group-input.svelte
index 182de03ef..bffaf036f 100644
--- a/packages/bits-ui/src/lib/bits/radio-group/components/radio-group-input.svelte
+++ b/packages/bits-ui/src/lib/bits/radio-group/components/radio-group-input.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import HiddenInput from "$lib/bits/utilities/hidden-input.svelte";
+	import { HiddenInput } from "$lib/bits/utilities/hidden-input/index.js";
 	import { useRadioGroupInput } from "../radio-group.svelte.js";
 
 	const inputState = useRadioGroupInput();
diff --git a/packages/bits-ui/src/lib/bits/radio-group/types.ts b/packages/bits-ui/src/lib/bits/radio-group/types.ts
index 7575005f1..0b847a5c5 100644
--- a/packages/bits-ui/src/lib/bits/radio-group/types.ts
+++ b/packages/bits-ui/src/lib/bits/radio-group/types.ts
@@ -1,9 +1,9 @@
 import type { OnChangeFn, WithChild, Without } from "$lib/internal/types.js";
-import type { Orientation } from "$lib/index.js";
 import type {
 	BitsPrimitiveButtonAttributes,
 	BitsPrimitiveDivAttributes,
 } from "$lib/shared/attributes.js";
+import type { Orientation } from "$lib/shared/index.js";
 
 export type RadioGroupRootPropsWithoutHTML = WithChild<{
 	/**
diff --git a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-auto.svelte b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-auto.svelte
index 4aac4a830..db05609cc 100644
--- a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-auto.svelte
+++ b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-auto.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
 	import { mergeProps } from "svelte-toolbelt";
 	import { useScrollAreaScrollbarAuto } from "../scroll-area.svelte.js";
-	import type { _ScrollbarStubProps } from "../types.js";
+	import type { ScrollbarStubProps } from "../types.js";
 	import ScrollAreaScrollbarVisible from "./scroll-area-scrollbar-visible.svelte";
 	import PresenceLayer from "$lib/bits/utilities/presence-layer/presence-layer.svelte";
 
-	let { forceMount = false, ...restProps }: _ScrollbarStubProps = $props();
+	let { forceMount = false, ...restProps }: ScrollbarStubProps = $props();
 
 	const scrollbarAutoState = useScrollAreaScrollbarAuto();
 	const mergedProps = $derived(mergeProps(restProps, scrollbarAutoState.props));
diff --git a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-hover.svelte b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-hover.svelte
index f703185b6..f3f365dc2 100644
--- a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-hover.svelte
+++ b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-hover.svelte
@@ -4,11 +4,11 @@
 		useScrollAreaScrollbarAuto,
 		useScrollAreaScrollbarHover,
 	} from "../scroll-area.svelte.js";
-	import type { _ScrollbarStubProps } from "../types.js";
+	import type { ScrollbarStubProps } from "../types.js";
 	import ScrollAreaScrollbarVisible from "./scroll-area-scrollbar-visible.svelte";
 	import PresenceLayer from "$lib/bits/utilities/presence-layer/presence-layer.svelte";
 
-	let { forceMount = false, ...restProps }: _ScrollbarStubProps = $props();
+	let { forceMount = false, ...restProps }: ScrollbarStubProps = $props();
 
 	const scrollbarHoverState = useScrollAreaScrollbarHover();
 	const scrollbarAutoState = useScrollAreaScrollbarAuto();
diff --git a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-scroll.svelte b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-scroll.svelte
index 63d718b4b..2e8de800b 100644
--- a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-scroll.svelte
+++ b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-scroll.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
 	import { mergeProps } from "svelte-toolbelt";
 	import { useScrollAreaScrollbarScroll } from "../scroll-area.svelte.js";
-	import type { _ScrollbarStubProps } from "../types.js";
+	import type { ScrollbarStubProps } from "../types.js";
 	import ScrollAreaScrollbarVisible from "./scroll-area-scrollbar-visible.svelte";
 	import PresenceLayer from "$lib/bits/utilities/presence-layer/presence-layer.svelte";
 
-	let { forceMount = false, ...restProps }: _ScrollbarStubProps = $props();
+	let { forceMount = false, ...restProps }: ScrollbarStubProps = $props();
 
 	const scrollbarScrollState = useScrollAreaScrollbarScroll();
 
diff --git a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-shared.svelte b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-shared.svelte
index b3e45e1a8..a740b834a 100644
--- a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-shared.svelte
+++ b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-shared.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 	import { mergeProps } from "svelte-toolbelt";
 	import { useScrollAreaScrollbarShared } from "../scroll-area.svelte.js";
-	import type { _ScrollbarStubProps } from "../types.js";
+	import type { ScrollbarStubProps } from "../types.js";
 
-	let { child, children, ...restProps }: _ScrollbarStubProps = $props();
+	let { child, children, ...restProps }: ScrollbarStubProps = $props();
 
 	const scrollbarSharedState = useScrollAreaScrollbarShared();
 
diff --git a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-visible.svelte b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-visible.svelte
index f22da21bc..89370b961 100644
--- a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-visible.svelte
+++ b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-visible.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
 	import { useScrollAreaScrollbarVisible } from "../scroll-area.svelte.js";
-	import type { _ScrollbarStubProps } from "../types.js";
+	import type { ScrollbarStubProps } from "../types.js";
 	import ScrollAreaScrollbarX from "./scroll-area-scrollbar-x.svelte";
 	import ScrollAreaScrollbarY from "./scroll-area-scrollbar-y.svelte";
 
-	let { ...restProps }: Omit<_ScrollbarStubProps, "forceMount"> = $props();
+	let { ...restProps }: Omit<ScrollbarStubProps, "forceMount"> = $props();
 
 	const scrollbarVisibleState = useScrollAreaScrollbarVisible();
 </script>
diff --git a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-x.svelte b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-x.svelte
index 1573a84c5..34fa5a1ee 100644
--- a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-x.svelte
+++ b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-x.svelte
@@ -2,10 +2,10 @@
 	import { IsMounted } from "runed";
 	import { box, mergeProps } from "svelte-toolbelt";
 	import { useScrollAreaScrollbarX } from "../scroll-area.svelte.js";
-	import type { _ScrollbarStubProps } from "../types.js";
+	import type { ScrollbarStubProps } from "../types.js";
 	import ScrollAreaScrollbarShared from "./scroll-area-scrollbar-shared.svelte";
 
-	let { ...restProps }: _ScrollbarStubProps = $props();
+	let { ...restProps }: ScrollbarStubProps = $props();
 
 	const isMounted = new IsMounted();
 
diff --git a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-y.svelte b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-y.svelte
index 6535812f4..59ffc460a 100644
--- a/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-y.svelte
+++ b/packages/bits-ui/src/lib/bits/scroll-area/components/scroll-area-scrollbar-y.svelte
@@ -2,10 +2,10 @@
 	import { IsMounted } from "runed";
 	import { box, mergeProps } from "svelte-toolbelt";
 	import { useScrollAreaScrollbarY } from "../scroll-area.svelte.js";
-	import type { _ScrollbarStubProps } from "../types.js";
+	import type { ScrollbarStubProps } from "../types.js";
 	import ScrollAreaScrollbarShared from "./scroll-area-scrollbar-shared.svelte";
 
-	let { ...restProps }: _ScrollbarStubProps = $props();
+	let { ...restProps }: ScrollbarStubProps = $props();
 
 	const isMounted = new IsMounted();
 
diff --git a/packages/bits-ui/src/lib/bits/scroll-area/types.ts b/packages/bits-ui/src/lib/bits/scroll-area/types.ts
index dc5bc7514..464761205 100644
--- a/packages/bits-ui/src/lib/bits/scroll-area/types.ts
+++ b/packages/bits-ui/src/lib/bits/scroll-area/types.ts
@@ -62,6 +62,6 @@ export type ScrollAreaCornerPropsWithoutHTML = WithChild;
 export type ScrollAreaCornerProps = ScrollAreaCornerPropsWithoutHTML &
 	Without<BitsPrimitiveDivAttributes, ScrollAreaCornerPropsWithoutHTML>;
 
-export type _ScrollbarStubProps = Omit<ScrollAreaScrollbarProps, "orientation" | "ref" | "id"> & {
+export type ScrollbarStubProps = Omit<ScrollAreaScrollbarProps, "orientation" | "ref" | "id"> & {
 	id: string;
 };
diff --git a/packages/bits-ui/src/lib/bits/select/components/select-hidden-input.svelte b/packages/bits-ui/src/lib/bits/select/components/select-hidden-input.svelte
index e34ef8c7a..4e8496677 100644
--- a/packages/bits-ui/src/lib/bits/select/components/select-hidden-input.svelte
+++ b/packages/bits-ui/src/lib/bits/select/components/select-hidden-input.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { box } from "svelte-toolbelt";
 	import { useSelectHiddenInput } from "../select.svelte.js";
-	import HiddenInput from "$lib/bits/utilities/hidden-input.svelte";
+	import { HiddenInput } from "$lib/bits/utilities/hidden-input/index.js";
 
 	let { value = $bindable("") }: { value?: string } = $props();
 
diff --git a/packages/bits-ui/src/lib/bits/select/components/select-item.svelte b/packages/bits-ui/src/lib/bits/select/components/select-item.svelte
index a82f12876..d17147113 100644
--- a/packages/bits-ui/src/lib/bits/select/components/select-item.svelte
+++ b/packages/bits-ui/src/lib/bits/select/components/select-item.svelte
@@ -4,7 +4,7 @@
 	import type { SelectItemProps } from "../types.js";
 	import { createId } from "$lib/internal/create-id.js";
 	import { noop } from "$lib/internal/noop.js";
-	import Mounted from "$lib/bits/utilities/mounted.svelte";
+	import { Mounted } from "$lib/bits/utilities/mounted/index.js";
 
 	const uid = $props.id();
 
diff --git a/packages/bits-ui/src/lib/bits/select/components/select-scroll-down-button.svelte b/packages/bits-ui/src/lib/bits/select/components/select-scroll-down-button.svelte
index fea8d587b..13c740226 100644
--- a/packages/bits-ui/src/lib/bits/select/components/select-scroll-down-button.svelte
+++ b/packages/bits-ui/src/lib/bits/select/components/select-scroll-down-button.svelte
@@ -3,7 +3,7 @@
 	import type { SelectScrollDownButtonProps } from "../types.js";
 	import { useSelectScrollDownButton } from "../select.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
-	import { Mounted } from "$lib/bits/utilities/index.js";
+	import { Mounted } from "$lib/bits/utilities/mounted/index.js";
 
 	const uid = $props.id();
 
diff --git a/packages/bits-ui/src/lib/bits/select/components/select-scroll-up-button.svelte b/packages/bits-ui/src/lib/bits/select/components/select-scroll-up-button.svelte
index d618df1e2..dbffcfebe 100644
--- a/packages/bits-ui/src/lib/bits/select/components/select-scroll-up-button.svelte
+++ b/packages/bits-ui/src/lib/bits/select/components/select-scroll-up-button.svelte
@@ -3,7 +3,7 @@
 	import type { SelectScrollUpButtonProps } from "../types.js";
 	import { useSelectScrollUpButton } from "../select.svelte.js";
 	import { createId } from "$lib/internal/create-id.js";
-	import { Mounted } from "$lib/bits/utilities/index.js";
+	import { Mounted } from "$lib/bits/utilities/mounted/index.js";
 
 	const uid = $props.id();
 
diff --git a/packages/bits-ui/src/lib/bits/select/types.ts b/packages/bits-ui/src/lib/bits/select/types.ts
index da1de8962..b97437b54 100644
--- a/packages/bits-ui/src/lib/bits/select/types.ts
+++ b/packages/bits-ui/src/lib/bits/select/types.ts
@@ -151,7 +151,7 @@ export type SelectRootPropsWithoutHTML = SelectBaseRootPropsWithoutHTML &
 
 export type SelectRootProps = SelectRootPropsWithoutHTML;
 
-export type _SharedSelectContentProps = {
+type _SharedSelectContentProps = {
 	/**
 	 * Whether or not to loop through the items when navigating with the keyboard.
 	 *
diff --git a/packages/bits-ui/src/lib/bits/switch/components/switch-input.svelte b/packages/bits-ui/src/lib/bits/switch/components/switch-input.svelte
index 7fd3ed4f7..e6166f1d3 100644
--- a/packages/bits-ui/src/lib/bits/switch/components/switch-input.svelte
+++ b/packages/bits-ui/src/lib/bits/switch/components/switch-input.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import HiddenInput from "$lib/bits/utilities/hidden-input.svelte";
+	import { HiddenInput } from "$lib/bits/utilities/hidden-input/index.js";
 	import { useSwitchInput } from "../switch.svelte.js";
 
 	const inputState = useSwitchInput();
diff --git a/packages/bits-ui/src/lib/bits/tabs/types.ts b/packages/bits-ui/src/lib/bits/tabs/types.ts
index 03ced990f..f0f6e4c7b 100644
--- a/packages/bits-ui/src/lib/bits/tabs/types.ts
+++ b/packages/bits-ui/src/lib/bits/tabs/types.ts
@@ -1,9 +1,9 @@
 import type { OnChangeFn, WithChild, Without } from "$lib/internal/types.js";
-import type { Orientation } from "$lib/index.js";
 import type {
 	BitsPrimitiveButtonAttributes,
 	BitsPrimitiveDivAttributes,
 } from "$lib/shared/attributes.js";
+import type { Orientation } from "$lib/shared/index.js";
 
 export type TabsActivationMode = "manual" | "automatic";
 
diff --git a/packages/bits-ui/src/lib/bits/time-field/components/time-field-hidden-input.svelte b/packages/bits-ui/src/lib/bits/time-field/components/time-field-hidden-input.svelte
index bb7a93830..8c66572d4 100644
--- a/packages/bits-ui/src/lib/bits/time-field/components/time-field-hidden-input.svelte
+++ b/packages/bits-ui/src/lib/bits/time-field/components/time-field-hidden-input.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { useTimeFieldHiddenInput } from "../time-field.svelte.js";
-	import HiddenInput from "$lib/bits/utilities/hidden-input.svelte";
+	import HiddenInput from "$lib/bits/utilities/hidden-input/hidden-input.svelte";
 
 	const hiddenInputState = useTimeFieldHiddenInput();
 </script>
diff --git a/packages/bits-ui/src/lib/bits/toggle-group/types.ts b/packages/bits-ui/src/lib/bits/toggle-group/types.ts
index c6d2390bb..5b4655dee 100644
--- a/packages/bits-ui/src/lib/bits/toggle-group/types.ts
+++ b/packages/bits-ui/src/lib/bits/toggle-group/types.ts
@@ -3,7 +3,7 @@ import type {
 	BitsPrimitiveButtonAttributes,
 	BitsPrimitiveDivAttributes,
 } from "$lib/shared/attributes.js";
-import type { Orientation } from "$lib/index.js";
+import type { Orientation } from "$lib/shared/index.js";
 
 export type BaseToggleGroupRootProps = {
 	/**
diff --git a/packages/bits-ui/src/lib/bits/utilities/hidden-input.svelte b/packages/bits-ui/src/lib/bits/utilities/hidden-input/hidden-input.svelte
similarity index 100%
rename from packages/bits-ui/src/lib/bits/utilities/hidden-input.svelte
rename to packages/bits-ui/src/lib/bits/utilities/hidden-input/hidden-input.svelte
diff --git a/packages/bits-ui/src/lib/bits/utilities/hidden-input/index.ts b/packages/bits-ui/src/lib/bits/utilities/hidden-input/index.ts
new file mode 100644
index 000000000..1074c7d74
--- /dev/null
+++ b/packages/bits-ui/src/lib/bits/utilities/hidden-input/index.ts
@@ -0,0 +1 @@
+export { default as HiddenInput } from "./hidden-input.svelte";
diff --git a/packages/bits-ui/src/lib/bits/utilities/index.ts b/packages/bits-ui/src/lib/bits/utilities/index.ts
index 78c5e5972..bcb42ba01 100644
--- a/packages/bits-ui/src/lib/bits/utilities/index.ts
+++ b/packages/bits-ui/src/lib/bits/utilities/index.ts
@@ -1 +1,2 @@
-export { default as Mounted } from "./mounted.svelte";
+export { IsUsingKeyboard } from "./is-using-keyboard/index.js";
+export { Portal } from "./portal/index.js";
diff --git a/packages/bits-ui/src/lib/bits/utilities/is-using-keyboard/index.ts b/packages/bits-ui/src/lib/bits/utilities/is-using-keyboard/index.ts
new file mode 100644
index 000000000..517d44f91
--- /dev/null
+++ b/packages/bits-ui/src/lib/bits/utilities/is-using-keyboard/index.ts
@@ -0,0 +1 @@
+export { IsUsingKeyboard } from "./is-using-keyboard.svelte.js";
diff --git a/packages/bits-ui/src/lib/bits/utilities/mounted/index.ts b/packages/bits-ui/src/lib/bits/utilities/mounted/index.ts
new file mode 100644
index 000000000..78c5e5972
--- /dev/null
+++ b/packages/bits-ui/src/lib/bits/utilities/mounted/index.ts
@@ -0,0 +1 @@
+export { default as Mounted } from "./mounted.svelte";
diff --git a/packages/bits-ui/src/lib/bits/utilities/mounted.svelte b/packages/bits-ui/src/lib/bits/utilities/mounted/mounted.svelte
similarity index 100%
rename from packages/bits-ui/src/lib/bits/utilities/mounted.svelte
rename to packages/bits-ui/src/lib/bits/utilities/mounted/mounted.svelte
diff --git a/packages/bits-ui/src/lib/index.ts b/packages/bits-ui/src/lib/index.ts
index 46c502d08..14206c9ff 100644
--- a/packages/bits-ui/src/lib/index.ts
+++ b/packages/bits-ui/src/lib/index.ts
@@ -42,8 +42,7 @@ export {
 	Portal,
 	IsUsingKeyboard,
 	computeCommandScore,
-} from "./bits/index.js";
+} from "./bits/exports.js";
 
 export * from "./shared/index.js";
-export type * from "./shared/index.js";
 export * from "./types.js";