diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
index a120adfee0..86e8879d1a 100644
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -100,16 +100,15 @@ jobs:
       - name: Run typecheck
         run: pnpm typecheck
 
-  # TODO enable after major releases
-  # exports:
-  #   name: Check package exports
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: Checkout branch
-  #       uses: actions/checkout@v4
-
-  #     - name: Install
-  #       uses: ./.github/composite-actions/install
-
-  #     - name: Run exports:check
-  #       run: pnpm exports:check
+  exports:
+    name: Check package exports
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout branch
+        uses: actions/checkout@v4
+
+      - name: Install
+        uses: ./.github/composite-actions/install
+
+      - name: Run exports:check
+        run: pnpm exports:check
diff --git a/packages/frameworks/react/CHANGELOG.md b/packages/frameworks/react/CHANGELOG.md
index f404fa2618..f8a3d81ee0 100644
--- a/packages/frameworks/react/CHANGELOG.md
+++ b/packages/frameworks/react/CHANGELOG.md
@@ -6,6 +6,10 @@ description: All notable changes to this project will be documented in this file
 
 ## [Unreleased]
 
+### Fixed
+
+- Resolved an issue that for some components the types were not being generated correctly.
+
 ## [2.0.0] - 2024-01-30
 
 ### Added
diff --git a/packages/frameworks/react/src/accordion/accordion.tsx b/packages/frameworks/react/src/accordion/accordion.tsx
new file mode 100644
index 0000000000..747d52084f
--- /dev/null
+++ b/packages/frameworks/react/src/accordion/accordion.tsx
@@ -0,0 +1,7 @@
+import { AccordionItem as Item } from './accordion-item'
+import { AccordionItemContent as ItemContent } from './accordion-item-content'
+import { AccordionItemIndicator as ItemIndicator } from './accordion-item-indicator'
+import { AccordionItemTrigger as ItemTrigger } from './accordion-item-trigger'
+import { AccordionRoot as Root } from './accordion-root'
+
+export { Item, ItemContent, ItemIndicator, ItemTrigger, Root }
diff --git a/packages/frameworks/react/src/accordion/index.ts b/packages/frameworks/react/src/accordion/index.ts
index a41171f135..80346584f7 100644
--- a/packages/frameworks/react/src/accordion/index.ts
+++ b/packages/frameworks/react/src/accordion/index.ts
@@ -13,13 +13,7 @@ import {
 import { AccordionItemTrigger, type AccordionItemTriggerProps } from './accordion-item-trigger'
 import { AccordionRoot, type AccordionRootProps } from './accordion-root'
 
-export const Accordion = {
-  Root: AccordionRoot,
-  Item: AccordionItem,
-  ItemContent: AccordionItemContent,
-  ItemIndicator: AccordionItemIndicator,
-  ItemTrigger: AccordionItemTrigger,
-}
+export * as Accordion from './accordion'
 
 export {
   AccordionItem,
@@ -30,6 +24,7 @@ export {
   useAccordionContext,
   useAccordionItemContext,
 }
+
 export type {
   AccordionContext,
   AccordionFocusChangeDetails,
diff --git a/packages/frameworks/react/src/avatar/avatar.tsx b/packages/frameworks/react/src/avatar/avatar.tsx
new file mode 100644
index 0000000000..c8cef7167f
--- /dev/null
+++ b/packages/frameworks/react/src/avatar/avatar.tsx
@@ -0,0 +1,5 @@
+import { AvatarFallback as Fallback } from './avatar-fallback'
+import { AvatarImage as Image } from './avatar-image'
+import { AvatarRoot as Root } from './avatar-root'
+
+export { Fallback, Image, Root }
diff --git a/packages/frameworks/react/src/avatar/index.ts b/packages/frameworks/react/src/avatar/index.ts
index 8fc2167927..efcec63ca1 100644
--- a/packages/frameworks/react/src/avatar/index.ts
+++ b/packages/frameworks/react/src/avatar/index.ts
@@ -4,11 +4,7 @@ import { AvatarFallback, type AvatarFallbackProps } from './avatar-fallback'
 import { AvatarImage, type AvatarImageProps } from './avatar-image'
 import { AvatarRoot, type AvatarRootProps } from './avatar-root'
 
-export const Avatar = {
-  Root: AvatarRoot,
-  Fallback: AvatarFallback,
-  Image: AvatarImage,
-}
+export * as Avatar from './avatar'
 
 export { AvatarFallback, AvatarImage, AvatarRoot, useAvatarContext }
 
diff --git a/packages/frameworks/react/src/carousel/carousel.tsx b/packages/frameworks/react/src/carousel/carousel.tsx
new file mode 100644
index 0000000000..53f1d864cb
--- /dev/null
+++ b/packages/frameworks/react/src/carousel/carousel.tsx
@@ -0,0 +1,21 @@
+import { CarouselControl as Control } from './carousel-control'
+import { CarouselIndicator as Indicator } from './carousel-indicator'
+import { CarouselIndicatorGroup as IndicatorGroup } from './carousel-indicator-group'
+import { CarouselItem as Item } from './carousel-item'
+import { CarouselItemGroup as ItemGroup } from './carousel-item-group'
+import { CarouselNextTrigger as NextTrigger } from './carousel-next-trigger'
+import { CarouselPrevTrigger as PrevTrigger } from './carousel-prev-trigger'
+import { CarouselRoot as Root } from './carousel-root'
+import { CarouselViewport as Viewport } from './carousel-viewport'
+
+export {
+  Control,
+  Indicator,
+  IndicatorGroup,
+  Item,
+  ItemGroup,
+  NextTrigger,
+  PrevTrigger,
+  Root,
+  Viewport,
+}
diff --git a/packages/frameworks/react/src/carousel/index.ts b/packages/frameworks/react/src/carousel/index.ts
index ff0dbaa758..200e01dfd2 100644
--- a/packages/frameworks/react/src/carousel/index.ts
+++ b/packages/frameworks/react/src/carousel/index.ts
@@ -13,17 +13,7 @@ import { CarouselPrevTrigger, type CarouselPrevTriggerProps } from './carousel-p
 import { CarouselRoot, type CarouselRootProps } from './carousel-root'
 import { CarouselViewport, type CarouselViewportProps } from './carousel-viewport'
 
-export const Carousel = {
-  Root: CarouselRoot,
-  Control: CarouselControl,
-  Indicator: CarouselIndicator,
-  IndicatorGroup: CarouselIndicatorGroup,
-  NextTrigger: CarouselNextTrigger,
-  PrevTrigger: CarouselPrevTrigger,
-  Item: CarouselItem,
-  ItemGroup: CarouselItemGroup,
-  Viewport: CarouselViewport,
-}
+export * as Carousel from './carousel'
 
 export {
   CarouselControl,
diff --git a/packages/frameworks/react/src/checkbox/checkbox.tsx b/packages/frameworks/react/src/checkbox/checkbox.tsx
new file mode 100644
index 0000000000..fd6fb1725e
--- /dev/null
+++ b/packages/frameworks/react/src/checkbox/checkbox.tsx
@@ -0,0 +1,6 @@
+import { CheckboxControl as Control } from './checkbox-control'
+import { CheckboxIndicator as Indicator } from './checkbox-indicator'
+import { CheckboxLabel as Label } from './checkbox-label'
+import { CheckboxRoot as Root } from './checkbox-root'
+
+export { Control, Indicator, Label, Root }
diff --git a/packages/frameworks/react/src/checkbox/index.ts b/packages/frameworks/react/src/checkbox/index.ts
index 1e655d7fdc..994f271cb4 100644
--- a/packages/frameworks/react/src/checkbox/index.ts
+++ b/packages/frameworks/react/src/checkbox/index.ts
@@ -8,12 +8,7 @@ import { CheckboxIndicator, type CheckboxIndicatorProps } from './checkbox-indic
 import { CheckboxLabel, type CheckboxLabelProps } from './checkbox-label'
 import { CheckboxRoot, type CheckboxRootProps } from './checkbox-root'
 
-export const Checkbox = {
-  Root: CheckboxRoot,
-  Control: CheckboxControl,
-  Label: CheckboxLabel,
-  Indicator: CheckboxIndicator,
-}
+export * as Checkbox from './checkbox'
 
 export { CheckboxControl, CheckboxIndicator, CheckboxLabel, CheckboxRoot, useCheckboxContext }
 
diff --git a/packages/frameworks/react/src/color-picker/color-picker.tsx b/packages/frameworks/react/src/color-picker/color-picker.tsx
new file mode 100644
index 0000000000..4f8ec479fc
--- /dev/null
+++ b/packages/frameworks/react/src/color-picker/color-picker.tsx
@@ -0,0 +1,49 @@
+import { ColorPickerArea as Area } from './color-picker-area'
+import { ColorPickerAreaBackground as AreaBackground } from './color-picker-area-background'
+import { ColorPickerAreaThumb as AreaThumb } from './color-picker-area-thumb'
+import { ColorPickerChannelInput as ChannelInput } from './color-picker-channel-input'
+import { ColorPickerChannelSlider as ChannelSlider } from './color-picker-channel-slider'
+import { ColorPickerChannelSliderThumb as ChannelSliderThumb } from './color-picker-channel-slider-thumb'
+import { ColorPickerChannelSliderTrack as ChannelSliderTrack } from './color-picker-channel-slider-track'
+import { ColorPickerContent as Content } from './color-picker-content'
+import { ColorPickerControl as Control } from './color-picker-control'
+import { ColorPickerEyeDropperTrigger as EyeDropperTrigger } from './color-picker-eye-dropper-trigger'
+import { ColorPickerFormatSelect as FormatSelect } from './color-picker-format-select'
+import { ColorPickerFormatTrigger as FormatTrigger } from './color-picker-format-trigger'
+import { ColorPickerLabel as Label } from './color-picker-label'
+import { ColorPickerPositioner as Positioner } from './color-picker-positioner'
+import { ColorPickerRoot as Root } from './color-picker-root'
+import { ColorPickerSwatch as Swatch } from './color-picker-swatch'
+import { ColorPickerSwatchGroup as SwatchGroup } from './color-picker-swatch-group'
+import { ColorPickerSwatchIndicator as SwatchIndicator } from './color-picker-swatch-indicator'
+import { ColorPickerSwatchTrigger as SwatchTrigger } from './color-picker-swatch-trigger'
+import { ColorPickerTransparencyGrid as TransparencyGrid } from './color-picker-transparency-grid'
+import { ColorPickerTrigger as Trigger } from './color-picker-trigger'
+import { ColorPickerValueText as ValueText } from './color-picker-value-text'
+import { ColorPickerView as View } from './color-picker-view'
+
+export {
+  Area,
+  AreaBackground,
+  AreaThumb,
+  ChannelInput,
+  ChannelSlider,
+  ChannelSliderThumb,
+  ChannelSliderTrack,
+  Content,
+  Control,
+  EyeDropperTrigger,
+  FormatSelect,
+  FormatTrigger,
+  Label,
+  Positioner,
+  Root,
+  Swatch,
+  SwatchGroup,
+  SwatchIndicator,
+  SwatchTrigger,
+  TransparencyGrid,
+  Trigger,
+  ValueText,
+  View,
+}
diff --git a/packages/frameworks/react/src/color-picker/index.ts b/packages/frameworks/react/src/color-picker/index.ts
index 5fc9fe6581..ab0db29cf1 100644
--- a/packages/frameworks/react/src/color-picker/index.ts
+++ b/packages/frameworks/react/src/color-picker/index.ts
@@ -70,31 +70,7 @@ import { ColorPickerTrigger, type ColorPickerTriggerProps } from './color-picker
 import { ColorPickerValueText, type ColorPickerValueTextProps } from './color-picker-value-text'
 import { ColorPickerView, type ColorPickerViewProps } from './color-picker-view'
 
-export const ColorPicker = {
-  Root: ColorPickerRoot,
-  Area: ColorPickerArea,
-  AreaBackground: ColorPickerAreaBackground,
-  AreaThumb: ColorPickerAreaThumb,
-  ChannelInput: ColorPickerChannelInput,
-  ChannelSlider: ColorPickerChannelSlider,
-  ChannelSliderThumb: ColorPickerChannelSliderThumb,
-  ChannelSliderTrack: ColorPickerChannelSliderTrack,
-  Content: ColorPickerContent,
-  Control: ColorPickerControl,
-  EyeDropperTrigger: ColorPickerEyeDropperTrigger,
-  FormatTrigger: ColorPickerFormatTrigger,
-  FormatSelect: ColorPickerFormatSelect,
-  Label: ColorPickerLabel,
-  Positioner: ColorPickerPositioner,
-  Swatch: ColorPickerSwatch,
-  SwatchGroup: ColorPickerSwatchGroup,
-  SwatchIndicator: ColorPickerSwatchIndicator,
-  SwatchTrigger: ColorPickerSwatchTrigger,
-  TransparencyGrid: ColorPickerTransparencyGrid,
-  Trigger: ColorPickerTrigger,
-  ValueText: ColorPickerValueText,
-  View: ColorPickerView,
-}
+export * as ColorPicker from './color-picker'
 
 export {
   ColorPickerArea,
diff --git a/packages/frameworks/react/src/combobox/combobox.tsx b/packages/frameworks/react/src/combobox/combobox.tsx
new file mode 100644
index 0000000000..c9d29be1d9
--- /dev/null
+++ b/packages/frameworks/react/src/combobox/combobox.tsx
@@ -0,0 +1,29 @@
+import { ComboboxClearTrigger as ClearTrigger } from './combobox-clear-trigger'
+import { ComboboxContent as Content } from './combobox-content'
+import { ComboboxControl as Control } from './combobox-control'
+import { ComboboxInput as Input } from './combobox-input'
+import { ComboboxItem as Item } from './combobox-item'
+import { ComboboxItemGroup as ItemGroup } from './combobox-item-group'
+import { ComboboxItemGroupLabel as ItemGroupLabel } from './combobox-item-group-label'
+import { ComboboxItemIndicator as ItemIndicator } from './combobox-item-indicator'
+import { ComboboxItemText as ItemText } from './combobox-item-text'
+import { ComboboxLabel as Label } from './combobox-label'
+import { ComboboxPositioner as Positioner } from './combobox-positioner'
+import { ComboboxRoot as Root } from './combobox-root'
+import { ComboboxTrigger as Trigger } from './combobox-trigger'
+
+export {
+  ClearTrigger,
+  Content,
+  Control,
+  Input,
+  Item,
+  ItemGroup,
+  ItemGroupLabel,
+  ItemIndicator,
+  ItemText,
+  Label,
+  Positioner,
+  Root,
+  Trigger,
+}
diff --git a/packages/frameworks/react/src/combobox/index.ts b/packages/frameworks/react/src/combobox/index.ts
index 3f495750d8..1793c37921 100644
--- a/packages/frameworks/react/src/combobox/index.ts
+++ b/packages/frameworks/react/src/combobox/index.ts
@@ -23,21 +23,7 @@ import { ComboboxPositioner, type ComboboxPositionerProps } from './combobox-pos
 import { ComboboxRoot, type ComboboxRootProps } from './combobox-root'
 import { ComboboxTrigger, type ComboboxTriggerProps } from './combobox-trigger'
 
-export const Combobox = {
-  Root: ComboboxRoot,
-  ClearTrigger: ComboboxClearTrigger,
-  Content: ComboboxContent,
-  Control: ComboboxControl,
-  Input: ComboboxInput,
-  Item: ComboboxItem,
-  ItemGroup: ComboboxItemGroup,
-  ItemGroupLabel: ComboboxItemGroupLabel,
-  ItemIndicator: ComboboxItemIndicator,
-  ItemText: ComboboxItemText,
-  Label: ComboboxLabel,
-  Positioner: ComboboxPositioner,
-  Trigger: ComboboxTrigger,
-}
+export * as Combobox from './combobox'
 
 export {
   ComboboxClearTrigger,
diff --git a/packages/frameworks/react/src/date-picker/date-picker.tsx b/packages/frameworks/react/src/date-picker/date-picker.tsx
new file mode 100644
index 0000000000..75fa854b3f
--- /dev/null
+++ b/packages/frameworks/react/src/date-picker/date-picker.tsx
@@ -0,0 +1,49 @@
+import { DatePickerClearTrigger as ClearTrigger } from './date-picker-clear-trigger'
+import { DatePickerContent as Content } from './date-picker-content'
+import { DatePickerControl as Control } from './date-picker-control'
+import { DatePickerInput as Input } from './date-picker-input'
+import { DatePickerLabel as Label } from './date-picker-label'
+import { DatePickerMonthSelect as MonthSelect } from './date-picker-month-select'
+import { DatePickerNextTrigger as NextTrigger } from './date-picker-next-trigger'
+import { DatePickerPositioner as Positioner } from './date-picker-positioner'
+import { DatePickerPrevTrigger as PrevTrigger } from './date-picker-prev-trigger'
+import { DatePickerRangeText as RangeText } from './date-picker-range-text'
+import { DatePickerRoot as Root } from './date-picker-root'
+import { DatePickerTable as Table } from './date-picker-table'
+import { DatePickerTableBody as TableBody } from './date-picker-table-body'
+import { DatePickerTableCell as TableCell } from './date-picker-table-cell'
+import { DatePickerTableCellTrigger as TableCellTrigger } from './date-picker-table-cell-trigger'
+import { DatePickerTableHead as TableHead } from './date-picker-table-head'
+import { DatePickerTableHeader as TableHeader } from './date-picker-table-header'
+import { DatePickerTableRow as TableRow } from './date-picker-table-row'
+import { DatePickerTrigger as Trigger } from './date-picker-trigger'
+import { DatePickerView as View } from './date-picker-view'
+import { DatePickerViewControl as ViewControl } from './date-picker-view-control'
+import { DatePickerViewTrigger as ViewTrigger } from './date-picker-view-trigger'
+import { DatePickerYearSelect as YearSelect } from './date-picker-year-select'
+
+export {
+  ClearTrigger,
+  Content,
+  Control,
+  Input,
+  Label,
+  MonthSelect,
+  NextTrigger,
+  Positioner,
+  PrevTrigger,
+  RangeText,
+  Root,
+  Table,
+  TableBody,
+  TableCell,
+  TableCellTrigger,
+  TableHead,
+  TableHeader,
+  TableRow,
+  Trigger,
+  View,
+  ViewControl,
+  ViewTrigger,
+  YearSelect,
+}
diff --git a/packages/frameworks/react/src/date-picker/index.ts b/packages/frameworks/react/src/date-picker/index.ts
index 38cb2eea1c..2c9cbbd3f5 100644
--- a/packages/frameworks/react/src/date-picker/index.ts
+++ b/packages/frameworks/react/src/date-picker/index.ts
@@ -41,31 +41,7 @@ import { DatePickerViewControl, type DatePickerViewControlProps } from './date-p
 import { DatePickerViewTrigger, type DatePickerViewTriggerProps } from './date-picker-view-trigger'
 import { DatePickerYearSelect, type DatePickerYearSelectProps } from './date-picker-year-select'
 
-export const DatePicker = {
-  Root: DatePickerRoot,
-  ClearTrigger: DatePickerClearTrigger,
-  Content: DatePickerContent,
-  Control: DatePickerControl,
-  Input: DatePickerInput,
-  Label: DatePickerLabel,
-  MonthSelect: DatePickerMonthSelect,
-  NextTrigger: DatePickerNextTrigger,
-  Positioner: DatePickerPositioner,
-  PrevTrigger: DatePickerPrevTrigger,
-  RangeText: DatePickerRangeText,
-  Table: DatePickerTable,
-  TableBody: DatePickerTableBody,
-  TableCell: DatePickerTableCell,
-  TableCellTrigger: DatePickerTableCellTrigger,
-  TableHead: DatePickerTableHead,
-  TableHeader: DatePickerTableHeader,
-  TableRow: DatePickerTableRow,
-  Trigger: DatePickerTrigger,
-  View: DatePickerView,
-  ViewControl: DatePickerViewControl,
-  ViewTrigger: DatePickerViewTrigger,
-  YearSelect: DatePickerYearSelect,
-}
+export * as DatePicker from './date-picker'
 
 export {
   DatePickerClearTrigger,
diff --git a/packages/frameworks/react/src/dialog/dialog.tsx b/packages/frameworks/react/src/dialog/dialog.tsx
new file mode 100644
index 0000000000..c206dbf5fa
--- /dev/null
+++ b/packages/frameworks/react/src/dialog/dialog.tsx
@@ -0,0 +1,10 @@
+import { DialogBackdrop as Backdrop } from './dialog-backdrop'
+import { DialogCloseTrigger as CloseTrigger } from './dialog-close-trigger'
+import { DialogContent as Content } from './dialog-content'
+import { DialogDescription as Description } from './dialog-description'
+import { DialogPositioner as Positioner } from './dialog-positioner'
+import { DialogRoot as Root } from './dialog-root'
+import { DialogTitle as Title } from './dialog-title'
+import { DialogTrigger as Trigger } from './dialog-trigger'
+
+export { Backdrop, CloseTrigger, Content, Description, Positioner, Root, Title, Trigger }
diff --git a/packages/frameworks/react/src/dialog/index.ts b/packages/frameworks/react/src/dialog/index.ts
index 4aae1f95e2..93da988526 100644
--- a/packages/frameworks/react/src/dialog/index.ts
+++ b/packages/frameworks/react/src/dialog/index.ts
@@ -9,16 +9,7 @@ import { DialogRoot, type DialogRootProps } from './dialog-root'
 import { DialogTitle, type DialogTitleProps } from './dialog-title'
 import { DialogTrigger, type DialogTriggerProps } from './dialog-trigger'
 
-export const Dialog = {
-  Root: DialogRoot,
-  Backdrop: DialogBackdrop,
-  CloseTrigger: DialogCloseTrigger,
-  Content: DialogContent,
-  Description: DialogDescription,
-  Positioner: DialogPositioner,
-  Title: DialogTitle,
-  Trigger: DialogTrigger,
-}
+export * as Dialog from './dialog'
 
 export {
   DialogBackdrop,
diff --git a/packages/frameworks/react/src/editable/editable.tsx b/packages/frameworks/react/src/editable/editable.tsx
new file mode 100644
index 0000000000..877ab8ad3e
--- /dev/null
+++ b/packages/frameworks/react/src/editable/editable.tsx
@@ -0,0 +1,11 @@
+import { EditableArea as Area } from './editable-area'
+import { EditableCancelTrigger as CancelTrigger } from './editable-cancel-trigger'
+import { EditableControl as Control } from './editable-control'
+import { EditableEditTrigger as EditTrigger } from './editable-edit-trigger'
+import { EditableInput as Input } from './editable-input'
+import { EditableLabel as Label } from './editable-label'
+import { EditablePreview as Preview } from './editable-preview'
+import { EditableRoot as Root } from './editable-root'
+import { EditableSubmitTrigger as SubmitTrigger } from './editable-submit-trigger'
+
+export { Area, CancelTrigger, Control, EditTrigger, Input, Label, Preview, Root, SubmitTrigger }
diff --git a/packages/frameworks/react/src/editable/index.ts b/packages/frameworks/react/src/editable/index.ts
index 6d1e373fb3..94322cd1ee 100644
--- a/packages/frameworks/react/src/editable/index.ts
+++ b/packages/frameworks/react/src/editable/index.ts
@@ -10,17 +10,7 @@ import { EditablePreview, type EditablePreviewProps } from './editable-preview'
 import { EditableRoot, type EditableRootProps } from './editable-root'
 import { EditableSubmitTrigger, type EditableSubmitTriggerProps } from './editable-submit-trigger'
 
-export const Editable = {
-  Root: EditableRoot,
-  Area: EditableArea,
-  CancelTrigger: EditableCancelTrigger,
-  Control: EditableControl,
-  EditTrigger: EditableEditTrigger,
-  Input: EditableInput,
-  Label: EditableLabel,
-  Preview: EditablePreview,
-  SubmitTrigger: EditableSubmitTrigger,
-}
+export * as Editable from './editable'
 
 export {
   EditableArea,
diff --git a/packages/frameworks/react/src/file-upload/file-upload.tsx b/packages/frameworks/react/src/file-upload/file-upload.tsx
new file mode 100644
index 0000000000..9e8d9f907f
--- /dev/null
+++ b/packages/frameworks/react/src/file-upload/file-upload.tsx
@@ -0,0 +1,25 @@
+import { FileUploadDropzone as Dropzone } from './file-upload-dropzone'
+import { FileUploadItem as Item } from './file-upload-item'
+import { FileUploadItemDeleteTrigger as ItemDeleteTrigger } from './file-upload-item-delete-trigger'
+import { FileUploadItemGroup as ItemGroup } from './file-upload-item-group'
+import { FileUploadItemName as ItemName } from './file-upload-item-name'
+import { FileUploadItemPreview as ItemPreview } from './file-upload-item-preview'
+import { FileUploadItemPreviewImage as ItemPreviewImage } from './file-upload-item-preview-image'
+import { FileUploadItemSizeText as ItemSizeText } from './file-upload-item-size-text'
+import { FileUploadLabel as Label } from './file-upload-label'
+import { FileUploadRoot as Root } from './file-upload-root'
+import { FileUploadTrigger as Trigger } from './file-upload-trigger'
+
+export {
+  Dropzone,
+  Item,
+  ItemDeleteTrigger,
+  ItemGroup,
+  ItemName,
+  ItemPreview,
+  ItemPreviewImage,
+  ItemSizeText,
+  Label,
+  Root,
+  Trigger,
+}
diff --git a/packages/frameworks/react/src/file-upload/index.ts b/packages/frameworks/react/src/file-upload/index.ts
index b25528d43a..17331b5410 100644
--- a/packages/frameworks/react/src/file-upload/index.ts
+++ b/packages/frameworks/react/src/file-upload/index.ts
@@ -25,19 +25,7 @@ import { FileUploadLabel, type FileUploadLabelProps } from './file-upload-label'
 import { FileUploadRoot, type FileUploadRootProps } from './file-upload-root'
 import { FileUploadTrigger, type FileUploadTriggerProps } from './file-upload-trigger'
 
-export const FileUpload = {
-  Root: FileUploadRoot,
-  Dropzone: FileUploadDropzone,
-  Item: FileUploadItem,
-  ItemDeleteTrigger: FileUploadItemDeleteTrigger,
-  ItemGroup: FileUploadItemGroup,
-  ItemName: FileUploadItemName,
-  ItemPreview: FileUploadItemPreview,
-  ItemPreviewImage: FileUploadItemPreviewImage,
-  ItemSizeText: FileUploadItemSizeText,
-  Label: FileUploadLabel,
-  Trigger: FileUploadTrigger,
-}
+export * as FileUpload from './file-upload'
 
 export {
   FileUploadDropzone,
@@ -45,6 +33,7 @@ export {
   FileUploadItemDeleteTrigger,
   FileUploadItemGroup,
   FileUploadItemName,
+  FileUploadItemPreview,
   FileUploadItemPreviewImage,
   FileUploadItemSizeText,
   FileUploadLabel,
diff --git a/packages/frameworks/react/src/hover-card/hover-card.tsx b/packages/frameworks/react/src/hover-card/hover-card.tsx
new file mode 100644
index 0000000000..bad637252b
--- /dev/null
+++ b/packages/frameworks/react/src/hover-card/hover-card.tsx
@@ -0,0 +1,8 @@
+import { HoverCardArrow as Arrow } from './hover-card-arrow'
+import { HoverCardArrowTip as ArrowTip } from './hover-card-arrow-tip'
+import { HoverCardContent as Content } from './hover-card-content'
+import { HoverCardPositioner as Positioner } from './hover-card-positioner'
+import { HoverCardRoot as Root } from './hover-card-root'
+import { HoverCardTrigger as Trigger } from './hover-card-trigger'
+
+export { Arrow, ArrowTip, Content, Positioner, Root, Trigger }
diff --git a/packages/frameworks/react/src/hover-card/index.ts b/packages/frameworks/react/src/hover-card/index.ts
index f6b4ae1a7a..031cf43916 100644
--- a/packages/frameworks/react/src/hover-card/index.ts
+++ b/packages/frameworks/react/src/hover-card/index.ts
@@ -7,14 +7,7 @@ import { HoverCardPositioner, type HoverCardPositionerProps } from './hover-card
 import { HoverCardRoot, type HoverCardRootProps } from './hover-card-root'
 import { HoverCardTrigger, type HoverCardTriggerProps } from './hover-card-trigger'
 
-export const HoverCard = {
-  Root: HoverCardRoot,
-  Arrow: HoverCardArrow,
-  ArrowTip: HoverCardArrowTip,
-  Content: HoverCardContent,
-  Positioner: HoverCardPositioner,
-  Trigger: HoverCardTrigger,
-}
+export * as HoverCard from './hover-card'
 
 export {
   HoverCardArrow,
diff --git a/packages/frameworks/react/src/menu/index.ts b/packages/frameworks/react/src/menu/index.ts
index d23b091da1..ac6c819c2c 100644
--- a/packages/frameworks/react/src/menu/index.ts
+++ b/packages/frameworks/react/src/menu/index.ts
@@ -17,21 +17,7 @@ import { MenuSeparator, type MenuSeparatorProps } from './menu-separator'
 import { MenuTrigger, type MenuTriggerProps } from './menu-trigger'
 import { MenuTriggerItem, type MenuTriggerItemProps } from './menu-trigger-item'
 
-export const Menu = {
-  Root: MenuRoot,
-  Arrow: MenuArrow,
-  ArrowTip: MenuArrowTip,
-  Content: MenuContent,
-  ContextTrigger: MenuContextTrigger,
-  Item: MenuItem,
-  ItemGroup: MenuItemGroup,
-  ItemGroupLabel: MenuItemGroupLabel,
-  OptionItem: MenuOptionItem,
-  Positioner: MenuPositioner,
-  Separator: MenuSeparator,
-  Trigger: MenuTrigger,
-  TriggerItem: MenuTriggerItem,
-}
+export * as Menu from './menu'
 
 export {
   MenuArrow,
diff --git a/packages/frameworks/react/src/menu/menu.tsx b/packages/frameworks/react/src/menu/menu.tsx
new file mode 100644
index 0000000000..9b78f748f3
--- /dev/null
+++ b/packages/frameworks/react/src/menu/menu.tsx
@@ -0,0 +1,29 @@
+import { MenuArrow as Arrow } from './menu-arrow'
+import { MenuArrowTip as ArrowTip } from './menu-arrow-tip'
+import { MenuContent as Content } from './menu-content'
+import { MenuContextTrigger as ContextTrigger } from './menu-context-trigger'
+import { MenuItem as Item } from './menu-item'
+import { MenuItemGroup as ItemGroup } from './menu-item-group'
+import { MenuItemGroupLabel as ItemGroupLabel } from './menu-item-group-label'
+import { MenuOptionItem as OptionItem } from './menu-option-item'
+import { MenuPositioner as Positioner } from './menu-positioner'
+import { MenuRoot as Root } from './menu-root'
+import { MenuSeparator as Separator } from './menu-separator'
+import { MenuTrigger as Trigger } from './menu-trigger'
+import { MenuTriggerItem as TriggerItem } from './menu-trigger-item'
+
+export {
+  Arrow,
+  ArrowTip,
+  Content,
+  ContextTrigger,
+  Item,
+  ItemGroup,
+  ItemGroupLabel,
+  OptionItem,
+  Positioner,
+  Root,
+  Separator,
+  Trigger,
+  TriggerItem,
+}
diff --git a/packages/frameworks/react/src/number-input/index.ts b/packages/frameworks/react/src/number-input/index.ts
index db78ef0baa..9a997ca073 100644
--- a/packages/frameworks/react/src/number-input/index.ts
+++ b/packages/frameworks/react/src/number-input/index.ts
@@ -18,15 +18,7 @@ import { NumberInputLabel, type NumberInputLabelProps } from './number-input-lab
 import { NumberInputRoot, type NumberInputRootProps } from './number-input-root'
 import { NumberInputScrubber, type NumberInputScrubberProps } from './number-input-scrubber'
 
-export const NumberInput = {
-  Root: NumberInputRoot,
-  Control: NumberInputControl,
-  DecrementTrigger: NumberInputDecrementTrigger,
-  Input: NumberInputInput,
-  IncrementTrigger: NumberInputIncrementTrigger,
-  Label: NumberInputLabel,
-  Scrubber: NumberInputScrubber,
-}
+export * as NumberInput from './number-input'
 
 export {
   NumberInputControl,
diff --git a/packages/frameworks/react/src/number-input/number-input.tsx b/packages/frameworks/react/src/number-input/number-input.tsx
new file mode 100644
index 0000000000..fd5140ad1d
--- /dev/null
+++ b/packages/frameworks/react/src/number-input/number-input.tsx
@@ -0,0 +1,9 @@
+import { NumberInputControl as Control } from './number-input-control'
+import { NumberInputDecrementTrigger as DecrementTrigger } from './number-input-decrement-trigger'
+import { NumberInputIncrementTrigger as IncrementTrigger } from './number-input-increment-trigger'
+import { NumberInputInput as Input } from './number-input-input'
+import { NumberInputLabel as Label } from './number-input-label'
+import { NumberInputRoot as Root } from './number-input-root'
+import { NumberInputScrubber as Scrubber } from './number-input-scrubber'
+
+export { Control, DecrementTrigger, IncrementTrigger, Input, Label, Root, Scrubber }
diff --git a/packages/frameworks/react/src/pagination/index.ts b/packages/frameworks/react/src/pagination/index.ts
index 1d3941aa02..de5b13174a 100644
--- a/packages/frameworks/react/src/pagination/index.ts
+++ b/packages/frameworks/react/src/pagination/index.ts
@@ -9,13 +9,7 @@ import { PaginationNextTrigger, type PaginationNextTriggerProps } from './pagina
 import { PaginationPrevTrigger, type PaginationPrevTriggerProps } from './pagination-prev-trigger'
 import { PaginationRoot, type PaginationRootProps } from './pagination-root'
 
-export const Pagination = {
-  Root: PaginationRoot,
-  Ellipsis: PaginationEllipsis,
-  Item: PaginationItem,
-  NextTrigger: PaginationNextTrigger,
-  PrevTrigger: PaginationPrevTrigger,
-}
+export * as Pagination from './pagination'
 
 export {
   PaginationEllipsis,
diff --git a/packages/frameworks/react/src/pagination/pagination.tsx b/packages/frameworks/react/src/pagination/pagination.tsx
new file mode 100644
index 0000000000..48575b4c7b
--- /dev/null
+++ b/packages/frameworks/react/src/pagination/pagination.tsx
@@ -0,0 +1,7 @@
+import { PaginationEllipsis as Ellipsis } from './pagination-ellipsis'
+import { PaginationItem as Item } from './pagination-item'
+import { PaginationNextTrigger as NextTrigger } from './pagination-next-trigger'
+import { PaginationPrevTrigger as PrevTrigger } from './pagination-prev-trigger'
+import { PaginationRoot as Root } from './pagination-root'
+
+export { Ellipsis, Item, NextTrigger, PrevTrigger, Root }
diff --git a/packages/frameworks/react/src/pin-input/index.ts b/packages/frameworks/react/src/pin-input/index.ts
index d3f5763313..f5ce11d52d 100644
--- a/packages/frameworks/react/src/pin-input/index.ts
+++ b/packages/frameworks/react/src/pin-input/index.ts
@@ -8,12 +8,7 @@ import { PinInputInput, type PinInputInputProps } from './pin-input-input'
 import { PinInputLabel, type PinInputLabelProps } from './pin-input-label'
 import { PinInputRoot, type PinInputRootProps } from './pin-input-root'
 
-export const PinInput = {
-  Root: PinInputRoot,
-  Control: PinInputControl,
-  Input: PinInputInput,
-  Label: PinInputLabel,
-}
+export * as PinInput from './pin-input'
 
 export { PinInputControl, PinInputInput, PinInputLabel, PinInputRoot, usePinInputContext }
 
diff --git a/packages/frameworks/react/src/pin-input/pin-input.tsx b/packages/frameworks/react/src/pin-input/pin-input.tsx
new file mode 100644
index 0000000000..3dca21afc8
--- /dev/null
+++ b/packages/frameworks/react/src/pin-input/pin-input.tsx
@@ -0,0 +1,6 @@
+import { PinInputControl as Control } from './pin-input-control'
+import { PinInputInput as Input } from './pin-input-input'
+import { PinInputLabel as Label } from './pin-input-label'
+import { PinInputRoot as Root } from './pin-input-root'
+
+export { Control, Input, Label, Root }
diff --git a/packages/frameworks/react/src/popover/index.ts b/packages/frameworks/react/src/popover/index.ts
index 93b331aaff..fc682051d7 100644
--- a/packages/frameworks/react/src/popover/index.ts
+++ b/packages/frameworks/react/src/popover/index.ts
@@ -12,19 +12,7 @@ import { PopoverRoot, type PopoverRootProps } from './popover-root'
 import { PopoverTitle, type PopoverTitleProps } from './popover-title'
 import { PopoverTrigger, type PopoverTriggerProps } from './popover-trigger'
 
-export const Popover = {
-  Root: PopoverRoot,
-  Anchor: PopoverAnchor,
-  Arrow: PopoverArrow,
-  ArrowTip: PopoverArrowTip,
-  CloseTrigger: PopoverCloseTrigger,
-  Content: PopoverContent,
-  Description: PopoverDescription,
-  Indicator: PopoverIndicator,
-  Positioner: PopoverPositioner,
-  Title: PopoverTitle,
-  Trigger: PopoverTrigger,
-}
+export * as Popover from './popover'
 
 export {
   PopoverAnchor,
diff --git a/packages/frameworks/react/src/popover/popover.tsx b/packages/frameworks/react/src/popover/popover.tsx
new file mode 100644
index 0000000000..096de278b2
--- /dev/null
+++ b/packages/frameworks/react/src/popover/popover.tsx
@@ -0,0 +1,25 @@
+import { PopoverAnchor as Anchor } from './popover-anchor'
+import { PopoverArrow as Arrow } from './popover-arrow'
+import { PopoverArrowTip as ArrowTip } from './popover-arrow-tip'
+import { PopoverCloseTrigger as CloseTrigger } from './popover-close-trigger'
+import { PopoverContent as Content } from './popover-content'
+import { PopoverDescription as Description } from './popover-description'
+import { PopoverIndicator as Indicator } from './popover-indicator'
+import { PopoverPositioner as Positioner } from './popover-positioner'
+import { PopoverRoot as Root } from './popover-root'
+import { PopoverTitle as Title } from './popover-title'
+import { PopoverTrigger as Trigger } from './popover-trigger'
+
+export {
+  Anchor,
+  Arrow,
+  ArrowTip,
+  CloseTrigger,
+  Content,
+  Description,
+  Indicator,
+  Positioner,
+  Root,
+  Title,
+  Trigger,
+}
diff --git a/packages/frameworks/react/src/progress/index.ts b/packages/frameworks/react/src/progress/index.ts
index 0ffd55f130..e1bd019759 100644
--- a/packages/frameworks/react/src/progress/index.ts
+++ b/packages/frameworks/react/src/progress/index.ts
@@ -9,17 +9,7 @@ import { ProgressTrack, type ProgressTrackProps } from './progress-track'
 import { ProgressValueText, type ProgressValueTextProps } from './progress-value-text'
 import { ProgressView, type ProgressViewProps } from './progress-view'
 
-export const Progress = {
-  Root: ProgressRoot,
-  Label: ProgressLabel,
-  Track: ProgressTrack,
-  Range: ProgressRange,
-  ValueText: ProgressValueText,
-  View: ProgressView,
-  Circle: ProgressCircle,
-  CircleTrack: ProgressCircleTrack,
-  CircleRange: ProgressCircleRange,
-}
+export * as Progress from './progress'
 
 export {
   ProgressCircle,
diff --git a/packages/frameworks/react/src/progress/progress.tsx b/packages/frameworks/react/src/progress/progress.tsx
new file mode 100644
index 0000000000..15341a0c61
--- /dev/null
+++ b/packages/frameworks/react/src/progress/progress.tsx
@@ -0,0 +1,11 @@
+import { ProgressCircle as Circle } from './progress-circle'
+import { ProgressCircleRange as CircleRange } from './progress-circle-range'
+import { ProgressCircleTrack as CircleTrack } from './progress-circle-track'
+import { ProgressLabel as Label } from './progress-label'
+import { ProgressRange as Range } from './progress-range'
+import { ProgressRoot as Root } from './progress-root'
+import { ProgressTrack as Track } from './progress-track'
+import { ProgressValueText as ValueText } from './progress-value-text'
+import { ProgressView as View } from './progress-view'
+
+export { Circle, CircleRange, CircleTrack, Label, Range, Root, Track, ValueText, View }
diff --git a/packages/frameworks/react/src/radio-group/index.ts b/packages/frameworks/react/src/radio-group/index.ts
index d2e7b147d0..2c1ad1511f 100644
--- a/packages/frameworks/react/src/radio-group/index.ts
+++ b/packages/frameworks/react/src/radio-group/index.ts
@@ -8,16 +8,10 @@ import { RadioGroupItemText, type RadioGroupItemTextProps } from './radio-group-
 import { RadioGroupLabel, type RadioGroupLabelProps } from './radio-group-label'
 import { RadioGroupRoot, type RadioGroupRootProps } from './radio-group-root'
 
-export const RadioGroup = {
-  Root: RadioGroupRoot,
-  Indicator: RadioGroupIndicator,
-  Item: RadioGroupItem,
-  ItemControl: RadioGroupItemControl,
-  ItemText: RadioGroupItemText,
-  Label: RadioGroupLabel,
-}
+export * as RadioGroup from './radio-group'
 
 export {
+  RadioGroupIndicator,
   RadioGroupItem,
   RadioGroupItemControl,
   RadioGroupItemText,
diff --git a/packages/frameworks/react/src/radio-group/radio-group.tsx b/packages/frameworks/react/src/radio-group/radio-group.tsx
new file mode 100644
index 0000000000..a901d9b6e4
--- /dev/null
+++ b/packages/frameworks/react/src/radio-group/radio-group.tsx
@@ -0,0 +1,8 @@
+import { RadioGroupIndicator as Indicator } from './radio-group-indicator'
+import { RadioGroupItem as Item } from './radio-group-item'
+import { RadioGroupItemControl as ItemControl } from './radio-group-item-control'
+import { RadioGroupItemText as ItemText } from './radio-group-item-text'
+import { RadioGroupLabel as Label } from './radio-group-label'
+import { RadioGroupRoot as Root } from './radio-group-root'
+
+export { Indicator, Item, ItemControl, ItemText, Label, Root }
diff --git a/packages/frameworks/react/src/rating-group/index.ts b/packages/frameworks/react/src/rating-group/index.ts
index 25bd04c70c..ec448a1a2a 100644
--- a/packages/frameworks/react/src/rating-group/index.ts
+++ b/packages/frameworks/react/src/rating-group/index.ts
@@ -9,12 +9,7 @@ import { useRatingGroupItemContext, type RatingGroupItemContext } from './rating
 import { RatingGroupLabel, type RatingGroupLabelProps } from './rating-group-label'
 import { RatingGroupRoot, type RatingGroupRootProps } from './rating-group-root'
 
-export const RatingGroup = {
-  Root: RatingGroupRoot,
-  Control: RatingGroupControl,
-  Label: RatingGroupLabel,
-  Item: RatingGroupItem,
-}
+export * as RatingGroup from './rating-group'
 
 export {
   RatingGroupControl,
diff --git a/packages/frameworks/react/src/rating-group/rating-group.tsx b/packages/frameworks/react/src/rating-group/rating-group.tsx
new file mode 100644
index 0000000000..dac5b7e22c
--- /dev/null
+++ b/packages/frameworks/react/src/rating-group/rating-group.tsx
@@ -0,0 +1,6 @@
+import { RatingGroupControl as Control } from './rating-group-control'
+import { RatingGroupItem as Item } from './rating-group-item'
+import { RatingGroupLabel as Label } from './rating-group-label'
+import { RatingGroupRoot as Root } from './rating-group-root'
+
+export { Control, Item, Label, Root }
diff --git a/packages/frameworks/react/src/segment-group/index.ts b/packages/frameworks/react/src/segment-group/index.ts
index 5048c95b67..1c68d2d403 100644
--- a/packages/frameworks/react/src/segment-group/index.ts
+++ b/packages/frameworks/react/src/segment-group/index.ts
@@ -14,14 +14,7 @@ import { SegmentGroupItemText, type SegmentGroupItemTextProps } from './segment-
 import { SegmentGroupLabel, type SegmentGroupLabelProps } from './segment-group-label'
 import { SegmentGroupRoot, type SegmentGroupRootProps } from './segment-group-root'
 
-export const SegmentGroup = {
-  Root: SegmentGroupRoot,
-  Indicator: SegmentGroupIndicator,
-  Item: SegmentGroupItem,
-  ItemControl: SegmentGroupItemControl,
-  ItemText: SegmentGroupItemText,
-  Label: SegmentGroupLabel,
-}
+export * as SegmentGroup from './segment-group'
 
 export {
   SegmentGroupIndicator,
diff --git a/packages/frameworks/react/src/segment-group/segment-group.tsx b/packages/frameworks/react/src/segment-group/segment-group.tsx
new file mode 100644
index 0000000000..c730ebe81a
--- /dev/null
+++ b/packages/frameworks/react/src/segment-group/segment-group.tsx
@@ -0,0 +1,8 @@
+import { SegmentGroupIndicator as Indicator } from './segment-group-indicator'
+import { SegmentGroupItem as Item } from './segment-group-item'
+import { SegmentGroupItemControl as ItemControl } from './segment-group-item-control'
+import { SegmentGroupItemText as ItemText } from './segment-group-item-text'
+import { SegmentGroupLabel as Label } from './segment-group-label'
+import { SegmentGroupRoot as Root } from './segment-group-root'
+
+export { Indicator, Item, ItemControl, ItemText, Label, Root }
diff --git a/packages/frameworks/react/src/select/index.ts b/packages/frameworks/react/src/select/index.ts
index 3dc29192b3..a60123b734 100644
--- a/packages/frameworks/react/src/select/index.ts
+++ b/packages/frameworks/react/src/select/index.ts
@@ -21,22 +21,7 @@ import { SelectRoot, type SelectRootProps } from './select-root'
 import { SelectTrigger, type SelectTriggerProps } from './select-trigger'
 import { SelectValueText, type SelectValueTextProps } from './select-value-text'
 
-export const Select = {
-  Root: SelectRoot,
-  ClearTrigger: SelectClearTrigger,
-  Content: SelectContent,
-  Control: SelectControl,
-  Indicator: SelectIndicator,
-  Item: SelectItem,
-  ItemGroup: SelectItemGroup,
-  ItemGroupLabel: SelectItemGroupLabel,
-  ItemIndicator: SelectItemIndicator,
-  ItemText: SelectItemText,
-  Label: SelectLabel,
-  Positioner: SelectPositioner,
-  Trigger: SelectTrigger,
-  ValueText: SelectValueText,
-}
+export * as Select from './select'
 
 export {
   SelectClearTrigger,
diff --git a/packages/frameworks/react/src/select/select.tsx b/packages/frameworks/react/src/select/select.tsx
new file mode 100644
index 0000000000..f7968cca73
--- /dev/null
+++ b/packages/frameworks/react/src/select/select.tsx
@@ -0,0 +1,31 @@
+import { SelectClearTrigger as ClearTrigger } from './select-clear-trigger'
+import { SelectContent as Content } from './select-content'
+import { SelectControl as Control } from './select-control'
+import { SelectIndicator as Indicator } from './select-indicator'
+import { SelectItem as Item } from './select-item'
+import { SelectItemGroup as ItemGroup } from './select-item-group'
+import { SelectItemGroupLabel as ItemGroupLabel } from './select-item-group-label'
+import { SelectItemIndicator as ItemIndicator } from './select-item-indicator'
+import { SelectItemText as ItemText } from './select-item-text'
+import { SelectLabel as Label } from './select-label'
+import { SelectPositioner as Positioner } from './select-positioner'
+import { SelectRoot as Root } from './select-root'
+import { SelectTrigger as Trigger } from './select-trigger'
+import { SelectValueText as ValueText } from './select-value-text'
+
+export {
+  ClearTrigger,
+  Content,
+  Control,
+  Indicator,
+  Item,
+  ItemGroup,
+  ItemGroupLabel,
+  ItemIndicator,
+  ItemText,
+  Label,
+  Positioner,
+  Root,
+  Trigger,
+  ValueText,
+}
diff --git a/packages/frameworks/react/src/slider/index.ts b/packages/frameworks/react/src/slider/index.ts
index c673b16c9e..13312836f1 100644
--- a/packages/frameworks/react/src/slider/index.ts
+++ b/packages/frameworks/react/src/slider/index.ts
@@ -13,17 +13,7 @@ import { SliderThumb, type SliderThumbProps } from './slider-thumb'
 import { SliderTrack, type SliderTrackProps } from './slider-track'
 import { SliderValueText, type SliderValueTextProps } from './slider-value-text'
 
-export const Slider = {
-  Root: SliderRoot,
-  Control: SliderControl,
-  Label: SliderLabel,
-  Marker: SliderMarker,
-  MarkerGroup: SliderMarkerGroup,
-  Range: SliderRange,
-  Thumb: SliderThumb,
-  Track: SliderTrack,
-  ValueText: SliderValueText,
-}
+export * as Slider from './slider'
 
 export {
   SliderControl,
diff --git a/packages/frameworks/react/src/slider/slider.tsx b/packages/frameworks/react/src/slider/slider.tsx
new file mode 100644
index 0000000000..e21e712c33
--- /dev/null
+++ b/packages/frameworks/react/src/slider/slider.tsx
@@ -0,0 +1,11 @@
+import { SliderControl as Control } from './slider-control'
+import { SliderLabel as Label } from './slider-label'
+import { SliderMarker as Marker } from './slider-marker'
+import { SliderMarkerGroup as MarkerGroup } from './slider-marker-group'
+import { SliderRange as Range } from './slider-range'
+import { SliderRoot as Root } from './slider-root'
+import { SliderThumb as Thumb } from './slider-thumb'
+import { SliderTrack as Track } from './slider-track'
+import { SliderValueText as ValueText } from './slider-value-text'
+
+export { Control, Label, Marker, MarkerGroup, Range, Root, Thumb, Track, ValueText }
diff --git a/packages/frameworks/react/src/splitter/index.ts b/packages/frameworks/react/src/splitter/index.ts
index 793fa2a5d4..00801c21b9 100644
--- a/packages/frameworks/react/src/splitter/index.ts
+++ b/packages/frameworks/react/src/splitter/index.ts
@@ -4,11 +4,7 @@ import { SplitterPanel, type SplitterPanelProps } from './splitter-panel'
 import { SplitterResizeTrigger, type SplitterResizeTriggerProps } from './splitter-resize-trigger'
 import { SplitterRoot, type SplitterRootProps } from './splitter-root'
 
-export const Splitter = {
-  Root: SplitterRoot,
-  Panel: SplitterPanel,
-  ResizeTrigger: SplitterResizeTrigger,
-}
+export * as Splitter from './splitter'
 
 export { SplitterPanel, SplitterResizeTrigger, SplitterRoot, useSplitterContext }
 
diff --git a/packages/frameworks/react/src/splitter/splitter.tsx b/packages/frameworks/react/src/splitter/splitter.tsx
new file mode 100644
index 0000000000..a29f3ec40b
--- /dev/null
+++ b/packages/frameworks/react/src/splitter/splitter.tsx
@@ -0,0 +1,5 @@
+import { SplitterPanel as Panel } from './splitter-panel'
+import { SplitterResizeTrigger as ResizeTrigger } from './splitter-resize-trigger'
+import { SplitterRoot as Root } from './splitter-root'
+
+export { Panel, ResizeTrigger, Root }
diff --git a/packages/frameworks/react/src/switch/index.ts b/packages/frameworks/react/src/switch/index.ts
index c3cf957872..f48727b5b7 100644
--- a/packages/frameworks/react/src/switch/index.ts
+++ b/packages/frameworks/react/src/switch/index.ts
@@ -5,12 +5,7 @@ import { SwitchLabel, type SwitchLabelProps } from './switch-label'
 import { SwitchRoot, type SwitchRootProps } from './switch-root'
 import { SwitchThumb, type SwitchThumbProps } from './switch-thumb'
 
-export const Switch = {
-  Root: SwitchRoot,
-  Control: SwitchControl,
-  Label: SwitchLabel,
-  Thumb: SwitchThumb,
-}
+export * as Switch from './switch'
 
 export { SwitchControl, SwitchLabel, SwitchRoot, SwitchThumb, useSwitchContext }
 
diff --git a/packages/frameworks/react/src/switch/switch.tsx b/packages/frameworks/react/src/switch/switch.tsx
new file mode 100644
index 0000000000..2fb3ee16c2
--- /dev/null
+++ b/packages/frameworks/react/src/switch/switch.tsx
@@ -0,0 +1,6 @@
+import { SwitchControl as Control } from './switch-control'
+import { SwitchLabel as Label } from './switch-label'
+import { SwitchRoot as Root } from './switch-root'
+import { SwitchThumb as Thumb } from './switch-thumb'
+
+export { Control, Label, Root, Thumb }
diff --git a/packages/frameworks/react/src/tabs/index.ts b/packages/frameworks/react/src/tabs/index.ts
index c595b3ec49..120f1051b7 100644
--- a/packages/frameworks/react/src/tabs/index.ts
+++ b/packages/frameworks/react/src/tabs/index.ts
@@ -9,13 +9,7 @@ import { TabTrigger, type TabTriggerProps } from './tab-trigger'
 import { useTabsContext, type TabsContext } from './tabs-context'
 import { TabsRoot, type TabsRootProps } from './tabs-root'
 
-export const Tabs = {
-  Root: TabsRoot,
-  Content: TabContent,
-  Indicator: TabIndicator,
-  List: TabList,
-  Trigger: TabTrigger,
-}
+export * as Tabs from './tabs'
 
 export { TabContent, TabIndicator, TabList, TabTrigger, TabsRoot, useTabsContext }
 
diff --git a/packages/frameworks/react/src/tabs/tabs.tsx b/packages/frameworks/react/src/tabs/tabs.tsx
new file mode 100644
index 0000000000..93a72cbe9c
--- /dev/null
+++ b/packages/frameworks/react/src/tabs/tabs.tsx
@@ -0,0 +1,7 @@
+import { TabContent as Content } from './tab-content'
+import { TabIndicator as Indicator } from './tab-indicator'
+import { TabList as List } from './tab-list'
+import { TabTrigger as Trigger } from './tab-trigger'
+import { TabsRoot as Root } from './tabs-root'
+
+export { Content, Indicator, List, Root, Trigger }
diff --git a/packages/frameworks/react/src/tags-input/index.ts b/packages/frameworks/react/src/tags-input/index.ts
index 2c68252dda..392aeace65 100644
--- a/packages/frameworks/react/src/tags-input/index.ts
+++ b/packages/frameworks/react/src/tags-input/index.ts
@@ -19,18 +19,7 @@ import { TagsInputItemText, type TagsInputItemTextProps } from './tags-input-ite
 import { TagsInputLabel, type TagsInputLabelProps } from './tags-input-label'
 import { TagsInputRoot, type TagsInputRootProps } from './tags-input-root'
 
-export const TagsInput = {
-  Root: TagsInputRoot,
-  ClearTrigger: TagsInputClearTrigger,
-  Control: TagsInputControl,
-  Input: TagsInputInput,
-  Item: TagsInputItem,
-  ItemPreview: TagsInputItemPreview,
-  ItemDeleteTrigger: TagsInputItemDeleteTrigger,
-  ItemInput: TagsInputItemInput,
-  ItemText: TagsInputItemText,
-  Label: TagsInputLabel,
-}
+export * as TagsInput from './tags-input'
 
 export {
   TagsInputClearTrigger,
diff --git a/packages/frameworks/react/src/tags-input/tags-input.tsx b/packages/frameworks/react/src/tags-input/tags-input.tsx
new file mode 100644
index 0000000000..d5c068934c
--- /dev/null
+++ b/packages/frameworks/react/src/tags-input/tags-input.tsx
@@ -0,0 +1,23 @@
+import { TagsInputClearTrigger as ClearTrigger } from './tags-input-clear-trigger'
+import { TagsInputControl as Control } from './tags-input-control'
+import { TagsInputInput as Input } from './tags-input-input'
+import { TagsInputItem as Item } from './tags-input-item'
+import { TagsInputItemDeleteTrigger as ItemDeleteTrigger } from './tags-input-item-delete-trigger'
+import { TagsInputItemInput as ItemInput } from './tags-input-item-input'
+import { TagsInputItemPreview as ItemPreview } from './tags-input-item-preview'
+import { TagsInputItemText as ItemText } from './tags-input-item-text'
+import { TagsInputLabel as Label } from './tags-input-label'
+import { TagsInputRoot as Root } from './tags-input-root'
+
+export {
+  ClearTrigger,
+  Control,
+  Input,
+  Item,
+  ItemDeleteTrigger,
+  ItemInput,
+  ItemPreview,
+  ItemText,
+  Label,
+  Root,
+}
diff --git a/packages/frameworks/react/src/toast/index.ts b/packages/frameworks/react/src/toast/index.ts
index 253443c9e2..1bdde60256 100644
--- a/packages/frameworks/react/src/toast/index.ts
+++ b/packages/frameworks/react/src/toast/index.ts
@@ -5,13 +5,7 @@ import { ToastGroup, type ToastGroupProps } from './toast-group'
 import { ToastRoot, type ToastRootProps } from './toast-root'
 import { ToastTitle, type ToastTitleProps } from './toast-title'
 
-export const Toast = {
-  Root: ToastRoot,
-  CloseTrigger: ToastCloseTrigger,
-  Description: ToastDescription,
-  Group: ToastGroup,
-  Title: ToastTitle,
-}
+export * as Toast from './toast'
 
 export { createToaster, ToastCloseTrigger, ToastDescription, ToastGroup, ToastRoot, ToastTitle }
 
diff --git a/packages/frameworks/react/src/toast/toast.tsx b/packages/frameworks/react/src/toast/toast.tsx
new file mode 100644
index 0000000000..93371ee040
--- /dev/null
+++ b/packages/frameworks/react/src/toast/toast.tsx
@@ -0,0 +1,7 @@
+import { ToastCloseTrigger as CloseTrigger } from './toast-close-trigger'
+import { ToastDescription as Description } from './toast-description'
+import { ToastGroup as Group } from './toast-group'
+import { ToastRoot as Root } from './toast-root'
+import { ToastTitle as Title } from './toast-title'
+
+export { CloseTrigger, Description, Group, Root, Title }
diff --git a/packages/frameworks/react/src/toggle-group/index.ts b/packages/frameworks/react/src/toggle-group/index.ts
index 25a0115e20..a7fcf19ae5 100644
--- a/packages/frameworks/react/src/toggle-group/index.ts
+++ b/packages/frameworks/react/src/toggle-group/index.ts
@@ -3,10 +3,7 @@ import { useToggleGroupContext, type ToggleGroupContext } from './toggle-group-c
 import { ToggleGroupItem, type ToggleGroupItemProps } from './toggle-group-item'
 import { ToggleGroupRoot, type ToggleGroupRootProps } from './toggle-group-root'
 
-export const ToggleGroup = {
-  Root: ToggleGroupRoot,
-  Item: ToggleGroupItem,
-}
+export * as ToggleGroup from './toggle-group'
 
 export { ToggleGroupItem, ToggleGroupRoot, useToggleGroupContext }
 
diff --git a/packages/frameworks/react/src/toggle-group/toggle-group.tsx b/packages/frameworks/react/src/toggle-group/toggle-group.tsx
new file mode 100644
index 0000000000..836365f3d0
--- /dev/null
+++ b/packages/frameworks/react/src/toggle-group/toggle-group.tsx
@@ -0,0 +1,4 @@
+import { ToggleGroupItem as Item } from './toggle-group-item'
+import { ToggleGroupRoot as Root } from './toggle-group-root'
+
+export { Item, Root }
diff --git a/packages/frameworks/react/src/tooltip/index.ts b/packages/frameworks/react/src/tooltip/index.ts
index 586d9f3ddd..0cec176cfb 100644
--- a/packages/frameworks/react/src/tooltip/index.ts
+++ b/packages/frameworks/react/src/tooltip/index.ts
@@ -7,14 +7,7 @@ import { TooltipPositioner, type TooltipPositionerProps } from './tooltip-positi
 import { TooltipRoot, type TooltipRootProps } from './tooltip-root'
 import { TooltipTrigger, type TooltipTriggerProps } from './tooltip-trigger'
 
-export const Tooltip = {
-  Root: TooltipRoot,
-  Arrow: TooltipArrow,
-  ArrowTip: TooltipArrowTip,
-  Content: TooltipContent,
-  Positioner: TooltipPositioner,
-  Trigger: TooltipTrigger,
-}
+export * as Tooltip from './tooltip'
 
 export {
   TooltipArrow,
diff --git a/packages/frameworks/react/src/tooltip/tooltip.tsx b/packages/frameworks/react/src/tooltip/tooltip.tsx
new file mode 100644
index 0000000000..19de9826c2
--- /dev/null
+++ b/packages/frameworks/react/src/tooltip/tooltip.tsx
@@ -0,0 +1,8 @@
+import { TooltipArrow as Arrow } from './tooltip-arrow'
+import { TooltipArrowTip as ArrowTip } from './tooltip-arrow-tip'
+import { TooltipContent as Content } from './tooltip-content'
+import { TooltipPositioner as Positioner } from './tooltip-positioner'
+import { TooltipRoot as Root } from './tooltip-root'
+import { TooltipTrigger as Trigger } from './tooltip-trigger'
+
+export { Arrow, ArrowTip, Content, Positioner, Root, Trigger }
diff --git a/packages/frameworks/react/src/tree-view/index.ts b/packages/frameworks/react/src/tree-view/index.ts
index fc58fbd9e8..46330ac5d4 100644
--- a/packages/frameworks/react/src/tree-view/index.ts
+++ b/packages/frameworks/react/src/tree-view/index.ts
@@ -19,19 +19,7 @@ import { TreeViewLabel, type TreeViewLabelProps } from './tree-view-label'
 import { TreeViewRoot, type TreeViewRootProps } from './tree-view-root'
 import { TreeViewTree, type TreeViewTreeProps } from './tree-view-tree'
 
-export const TreeView = {
-  Root: TreeViewRoot,
-  Label: TreeViewLabel,
-  Tree: TreeViewTree,
-  Branch: TreeViewBranch,
-  Item: TreeViewItem,
-  ItemText: TreeViewItemText,
-  BranchContent: TreeViewBranchContent,
-  BranchControl: TreeViewBranchControl,
-  BranchTrigger: TreeViewBranchTrigger,
-  BranchIndicator: TreeViewBranchIndicator,
-  BranchText: TreeViewBranchText,
-}
+export * as TreeView from './tree-view'
 
 export {
   TreeViewBranch,
diff --git a/packages/frameworks/react/src/tree-view/tree-view.tsx b/packages/frameworks/react/src/tree-view/tree-view.tsx
new file mode 100644
index 0000000000..409f5c79b6
--- /dev/null
+++ b/packages/frameworks/react/src/tree-view/tree-view.tsx
@@ -0,0 +1,25 @@
+import { TreeViewBranch as Branch } from './tree-view-branch'
+import { TreeViewBranchContent as BranchContent } from './tree-view-branch-content'
+import { TreeViewBranchControl as BranchControl } from './tree-view-branch-control'
+import { TreeViewBranchIndicator as BranchIndicator } from './tree-view-branch-indicator'
+import { TreeViewBranchText as BranchText } from './tree-view-branch-text'
+import { TreeViewBranchTrigger as BranchTrigger } from './tree-view-branch-trigger'
+import { TreeViewItem as Item } from './tree-view-item'
+import { TreeViewItemText as ItemText } from './tree-view-item-text'
+import { TreeViewLabel as Label } from './tree-view-label'
+import { TreeViewRoot as Root } from './tree-view-root'
+import { TreeViewTree as Tree } from './tree-view-tree'
+
+export {
+  Branch,
+  BranchContent,
+  BranchControl,
+  BranchIndicator,
+  BranchText,
+  BranchTrigger,
+  Item,
+  ItemText,
+  Label,
+  Root,
+  Tree,
+}
diff --git a/packages/frameworks/react/vite.config.mts b/packages/frameworks/react/vite.config.mts
index ecc06e7454..a5c4ed3450 100644
--- a/packages/frameworks/react/vite.config.mts
+++ b/packages/frameworks/react/vite.config.mts
@@ -3,6 +3,7 @@
 
 import react from '@vitejs/plugin-react'
 import { globbySync } from 'globby'
+import path from 'path'
 import { defineConfig } from 'vite'
 import dts from 'vite-plugin-dts'
 import pkg from './package.json'
@@ -37,10 +38,7 @@ export default defineConfig({
           preserveModulesRoot: 'src',
           exports: 'named',
           entryFileNames: '[name].cjs',
-          banner: (x) =>
-            ['index.cjs', 'factory.cjs', 'compose-refs.cjs'].includes(x.fileName)
-              ? ''
-              : `'use client';`,
+          banner: (x) => renderBanner(x.fileName),
         },
         {
           format: 'es',
@@ -48,10 +46,7 @@ export default defineConfig({
           preserveModulesRoot: 'src',
           exports: 'named',
           entryFileNames: '[name].mjs',
-          banner: (x) =>
-            ['index.mjs', 'factory.mjs', 'compose-refs.mjs'].includes(x.fileName)
-              ? ''
-              : `'use client';`,
+          banner: (x) => renderBanner(x.fileName),
         },
       ],
     },
@@ -71,3 +66,18 @@ export default defineConfig({
     css: false,
   },
 })
+
+const renderBanner = (fileName: string) => {
+  const file = path.parse(fileName)
+  if (isBarrelComponent(file) || isSpecialFile(file)) {
+    return ''
+  }
+  return `'use client';`
+}
+
+// e.g Avatar.tsx, Accordion.tsx
+const isBarrelComponent = (file: path.ParsedPath) =>
+  file.name === file.dir && !['presence', 'environment'].includes(file.dir)
+
+const isSpecialFile = (file: path.ParsedPath) =>
+  ['index', 'factory', 'compose-refs'].includes(file.name)
diff --git a/packages/frameworks/solid/CHANGELOG.md b/packages/frameworks/solid/CHANGELOG.md
index 8993732dca..06d3c9444f 100644
--- a/packages/frameworks/solid/CHANGELOG.md
+++ b/packages/frameworks/solid/CHANGELOG.md
@@ -6,6 +6,10 @@ description: All notable changes to this project will be documented in this file
 
 ## [Unreleased]
 
+### Fixed
+
+- Resolved an issue that for some components the types were not being generated correctly.
+
 ## [2.0.0] - 2024-01-30
 
 ### Added
diff --git a/packages/frameworks/solid/src/accordion/accordion.tsx b/packages/frameworks/solid/src/accordion/accordion.tsx
new file mode 100644
index 0000000000..747d52084f
--- /dev/null
+++ b/packages/frameworks/solid/src/accordion/accordion.tsx
@@ -0,0 +1,7 @@
+import { AccordionItem as Item } from './accordion-item'
+import { AccordionItemContent as ItemContent } from './accordion-item-content'
+import { AccordionItemIndicator as ItemIndicator } from './accordion-item-indicator'
+import { AccordionItemTrigger as ItemTrigger } from './accordion-item-trigger'
+import { AccordionRoot as Root } from './accordion-root'
+
+export { Item, ItemContent, ItemIndicator, ItemTrigger, Root }
diff --git a/packages/frameworks/solid/src/accordion/index.ts b/packages/frameworks/solid/src/accordion/index.ts
index a41171f135..80346584f7 100644
--- a/packages/frameworks/solid/src/accordion/index.ts
+++ b/packages/frameworks/solid/src/accordion/index.ts
@@ -13,13 +13,7 @@ import {
 import { AccordionItemTrigger, type AccordionItemTriggerProps } from './accordion-item-trigger'
 import { AccordionRoot, type AccordionRootProps } from './accordion-root'
 
-export const Accordion = {
-  Root: AccordionRoot,
-  Item: AccordionItem,
-  ItemContent: AccordionItemContent,
-  ItemIndicator: AccordionItemIndicator,
-  ItemTrigger: AccordionItemTrigger,
-}
+export * as Accordion from './accordion'
 
 export {
   AccordionItem,
@@ -30,6 +24,7 @@ export {
   useAccordionContext,
   useAccordionItemContext,
 }
+
 export type {
   AccordionContext,
   AccordionFocusChangeDetails,
diff --git a/packages/frameworks/solid/src/avatar/avatar.tsx b/packages/frameworks/solid/src/avatar/avatar.tsx
new file mode 100644
index 0000000000..c8cef7167f
--- /dev/null
+++ b/packages/frameworks/solid/src/avatar/avatar.tsx
@@ -0,0 +1,5 @@
+import { AvatarFallback as Fallback } from './avatar-fallback'
+import { AvatarImage as Image } from './avatar-image'
+import { AvatarRoot as Root } from './avatar-root'
+
+export { Fallback, Image, Root }
diff --git a/packages/frameworks/solid/src/avatar/index.ts b/packages/frameworks/solid/src/avatar/index.ts
index 8fc2167927..efcec63ca1 100644
--- a/packages/frameworks/solid/src/avatar/index.ts
+++ b/packages/frameworks/solid/src/avatar/index.ts
@@ -4,11 +4,7 @@ import { AvatarFallback, type AvatarFallbackProps } from './avatar-fallback'
 import { AvatarImage, type AvatarImageProps } from './avatar-image'
 import { AvatarRoot, type AvatarRootProps } from './avatar-root'
 
-export const Avatar = {
-  Root: AvatarRoot,
-  Fallback: AvatarFallback,
-  Image: AvatarImage,
-}
+export * as Avatar from './avatar'
 
 export { AvatarFallback, AvatarImage, AvatarRoot, useAvatarContext }
 
diff --git a/packages/frameworks/solid/src/carousel/carousel.tsx b/packages/frameworks/solid/src/carousel/carousel.tsx
new file mode 100644
index 0000000000..53f1d864cb
--- /dev/null
+++ b/packages/frameworks/solid/src/carousel/carousel.tsx
@@ -0,0 +1,21 @@
+import { CarouselControl as Control } from './carousel-control'
+import { CarouselIndicator as Indicator } from './carousel-indicator'
+import { CarouselIndicatorGroup as IndicatorGroup } from './carousel-indicator-group'
+import { CarouselItem as Item } from './carousel-item'
+import { CarouselItemGroup as ItemGroup } from './carousel-item-group'
+import { CarouselNextTrigger as NextTrigger } from './carousel-next-trigger'
+import { CarouselPrevTrigger as PrevTrigger } from './carousel-prev-trigger'
+import { CarouselRoot as Root } from './carousel-root'
+import { CarouselViewport as Viewport } from './carousel-viewport'
+
+export {
+  Control,
+  Indicator,
+  IndicatorGroup,
+  Item,
+  ItemGroup,
+  NextTrigger,
+  PrevTrigger,
+  Root,
+  Viewport,
+}
diff --git a/packages/frameworks/solid/src/carousel/index.ts b/packages/frameworks/solid/src/carousel/index.ts
index ff0dbaa758..200e01dfd2 100644
--- a/packages/frameworks/solid/src/carousel/index.ts
+++ b/packages/frameworks/solid/src/carousel/index.ts
@@ -13,17 +13,7 @@ import { CarouselPrevTrigger, type CarouselPrevTriggerProps } from './carousel-p
 import { CarouselRoot, type CarouselRootProps } from './carousel-root'
 import { CarouselViewport, type CarouselViewportProps } from './carousel-viewport'
 
-export const Carousel = {
-  Root: CarouselRoot,
-  Control: CarouselControl,
-  Indicator: CarouselIndicator,
-  IndicatorGroup: CarouselIndicatorGroup,
-  NextTrigger: CarouselNextTrigger,
-  PrevTrigger: CarouselPrevTrigger,
-  Item: CarouselItem,
-  ItemGroup: CarouselItemGroup,
-  Viewport: CarouselViewport,
-}
+export * as Carousel from './carousel'
 
 export {
   CarouselControl,
diff --git a/packages/frameworks/solid/src/checkbox/checkbox.tsx b/packages/frameworks/solid/src/checkbox/checkbox.tsx
new file mode 100644
index 0000000000..fd6fb1725e
--- /dev/null
+++ b/packages/frameworks/solid/src/checkbox/checkbox.tsx
@@ -0,0 +1,6 @@
+import { CheckboxControl as Control } from './checkbox-control'
+import { CheckboxIndicator as Indicator } from './checkbox-indicator'
+import { CheckboxLabel as Label } from './checkbox-label'
+import { CheckboxRoot as Root } from './checkbox-root'
+
+export { Control, Indicator, Label, Root }
diff --git a/packages/frameworks/solid/src/checkbox/index.ts b/packages/frameworks/solid/src/checkbox/index.ts
index 1e655d7fdc..994f271cb4 100644
--- a/packages/frameworks/solid/src/checkbox/index.ts
+++ b/packages/frameworks/solid/src/checkbox/index.ts
@@ -8,12 +8,7 @@ import { CheckboxIndicator, type CheckboxIndicatorProps } from './checkbox-indic
 import { CheckboxLabel, type CheckboxLabelProps } from './checkbox-label'
 import { CheckboxRoot, type CheckboxRootProps } from './checkbox-root'
 
-export const Checkbox = {
-  Root: CheckboxRoot,
-  Control: CheckboxControl,
-  Label: CheckboxLabel,
-  Indicator: CheckboxIndicator,
-}
+export * as Checkbox from './checkbox'
 
 export { CheckboxControl, CheckboxIndicator, CheckboxLabel, CheckboxRoot, useCheckboxContext }
 
diff --git a/packages/frameworks/solid/src/color-picker/color-picker.tsx b/packages/frameworks/solid/src/color-picker/color-picker.tsx
new file mode 100644
index 0000000000..4f8ec479fc
--- /dev/null
+++ b/packages/frameworks/solid/src/color-picker/color-picker.tsx
@@ -0,0 +1,49 @@
+import { ColorPickerArea as Area } from './color-picker-area'
+import { ColorPickerAreaBackground as AreaBackground } from './color-picker-area-background'
+import { ColorPickerAreaThumb as AreaThumb } from './color-picker-area-thumb'
+import { ColorPickerChannelInput as ChannelInput } from './color-picker-channel-input'
+import { ColorPickerChannelSlider as ChannelSlider } from './color-picker-channel-slider'
+import { ColorPickerChannelSliderThumb as ChannelSliderThumb } from './color-picker-channel-slider-thumb'
+import { ColorPickerChannelSliderTrack as ChannelSliderTrack } from './color-picker-channel-slider-track'
+import { ColorPickerContent as Content } from './color-picker-content'
+import { ColorPickerControl as Control } from './color-picker-control'
+import { ColorPickerEyeDropperTrigger as EyeDropperTrigger } from './color-picker-eye-dropper-trigger'
+import { ColorPickerFormatSelect as FormatSelect } from './color-picker-format-select'
+import { ColorPickerFormatTrigger as FormatTrigger } from './color-picker-format-trigger'
+import { ColorPickerLabel as Label } from './color-picker-label'
+import { ColorPickerPositioner as Positioner } from './color-picker-positioner'
+import { ColorPickerRoot as Root } from './color-picker-root'
+import { ColorPickerSwatch as Swatch } from './color-picker-swatch'
+import { ColorPickerSwatchGroup as SwatchGroup } from './color-picker-swatch-group'
+import { ColorPickerSwatchIndicator as SwatchIndicator } from './color-picker-swatch-indicator'
+import { ColorPickerSwatchTrigger as SwatchTrigger } from './color-picker-swatch-trigger'
+import { ColorPickerTransparencyGrid as TransparencyGrid } from './color-picker-transparency-grid'
+import { ColorPickerTrigger as Trigger } from './color-picker-trigger'
+import { ColorPickerValueText as ValueText } from './color-picker-value-text'
+import { ColorPickerView as View } from './color-picker-view'
+
+export {
+  Area,
+  AreaBackground,
+  AreaThumb,
+  ChannelInput,
+  ChannelSlider,
+  ChannelSliderThumb,
+  ChannelSliderTrack,
+  Content,
+  Control,
+  EyeDropperTrigger,
+  FormatSelect,
+  FormatTrigger,
+  Label,
+  Positioner,
+  Root,
+  Swatch,
+  SwatchGroup,
+  SwatchIndicator,
+  SwatchTrigger,
+  TransparencyGrid,
+  Trigger,
+  ValueText,
+  View,
+}
diff --git a/packages/frameworks/solid/src/color-picker/index.ts b/packages/frameworks/solid/src/color-picker/index.ts
index 5fc9fe6581..ab0db29cf1 100644
--- a/packages/frameworks/solid/src/color-picker/index.ts
+++ b/packages/frameworks/solid/src/color-picker/index.ts
@@ -70,31 +70,7 @@ import { ColorPickerTrigger, type ColorPickerTriggerProps } from './color-picker
 import { ColorPickerValueText, type ColorPickerValueTextProps } from './color-picker-value-text'
 import { ColorPickerView, type ColorPickerViewProps } from './color-picker-view'
 
-export const ColorPicker = {
-  Root: ColorPickerRoot,
-  Area: ColorPickerArea,
-  AreaBackground: ColorPickerAreaBackground,
-  AreaThumb: ColorPickerAreaThumb,
-  ChannelInput: ColorPickerChannelInput,
-  ChannelSlider: ColorPickerChannelSlider,
-  ChannelSliderThumb: ColorPickerChannelSliderThumb,
-  ChannelSliderTrack: ColorPickerChannelSliderTrack,
-  Content: ColorPickerContent,
-  Control: ColorPickerControl,
-  EyeDropperTrigger: ColorPickerEyeDropperTrigger,
-  FormatTrigger: ColorPickerFormatTrigger,
-  FormatSelect: ColorPickerFormatSelect,
-  Label: ColorPickerLabel,
-  Positioner: ColorPickerPositioner,
-  Swatch: ColorPickerSwatch,
-  SwatchGroup: ColorPickerSwatchGroup,
-  SwatchIndicator: ColorPickerSwatchIndicator,
-  SwatchTrigger: ColorPickerSwatchTrigger,
-  TransparencyGrid: ColorPickerTransparencyGrid,
-  Trigger: ColorPickerTrigger,
-  ValueText: ColorPickerValueText,
-  View: ColorPickerView,
-}
+export * as ColorPicker from './color-picker'
 
 export {
   ColorPickerArea,
diff --git a/packages/frameworks/solid/src/combobox/combobox.tsx b/packages/frameworks/solid/src/combobox/combobox.tsx
new file mode 100644
index 0000000000..c9d29be1d9
--- /dev/null
+++ b/packages/frameworks/solid/src/combobox/combobox.tsx
@@ -0,0 +1,29 @@
+import { ComboboxClearTrigger as ClearTrigger } from './combobox-clear-trigger'
+import { ComboboxContent as Content } from './combobox-content'
+import { ComboboxControl as Control } from './combobox-control'
+import { ComboboxInput as Input } from './combobox-input'
+import { ComboboxItem as Item } from './combobox-item'
+import { ComboboxItemGroup as ItemGroup } from './combobox-item-group'
+import { ComboboxItemGroupLabel as ItemGroupLabel } from './combobox-item-group-label'
+import { ComboboxItemIndicator as ItemIndicator } from './combobox-item-indicator'
+import { ComboboxItemText as ItemText } from './combobox-item-text'
+import { ComboboxLabel as Label } from './combobox-label'
+import { ComboboxPositioner as Positioner } from './combobox-positioner'
+import { ComboboxRoot as Root } from './combobox-root'
+import { ComboboxTrigger as Trigger } from './combobox-trigger'
+
+export {
+  ClearTrigger,
+  Content,
+  Control,
+  Input,
+  Item,
+  ItemGroup,
+  ItemGroupLabel,
+  ItemIndicator,
+  ItemText,
+  Label,
+  Positioner,
+  Root,
+  Trigger,
+}
diff --git a/packages/frameworks/solid/src/combobox/index.ts b/packages/frameworks/solid/src/combobox/index.ts
index 3f495750d8..1793c37921 100644
--- a/packages/frameworks/solid/src/combobox/index.ts
+++ b/packages/frameworks/solid/src/combobox/index.ts
@@ -23,21 +23,7 @@ import { ComboboxPositioner, type ComboboxPositionerProps } from './combobox-pos
 import { ComboboxRoot, type ComboboxRootProps } from './combobox-root'
 import { ComboboxTrigger, type ComboboxTriggerProps } from './combobox-trigger'
 
-export const Combobox = {
-  Root: ComboboxRoot,
-  ClearTrigger: ComboboxClearTrigger,
-  Content: ComboboxContent,
-  Control: ComboboxControl,
-  Input: ComboboxInput,
-  Item: ComboboxItem,
-  ItemGroup: ComboboxItemGroup,
-  ItemGroupLabel: ComboboxItemGroupLabel,
-  ItemIndicator: ComboboxItemIndicator,
-  ItemText: ComboboxItemText,
-  Label: ComboboxLabel,
-  Positioner: ComboboxPositioner,
-  Trigger: ComboboxTrigger,
-}
+export * as Combobox from './combobox'
 
 export {
   ComboboxClearTrigger,
diff --git a/packages/frameworks/solid/src/date-picker/date-picker.tsx b/packages/frameworks/solid/src/date-picker/date-picker.tsx
new file mode 100644
index 0000000000..75fa854b3f
--- /dev/null
+++ b/packages/frameworks/solid/src/date-picker/date-picker.tsx
@@ -0,0 +1,49 @@
+import { DatePickerClearTrigger as ClearTrigger } from './date-picker-clear-trigger'
+import { DatePickerContent as Content } from './date-picker-content'
+import { DatePickerControl as Control } from './date-picker-control'
+import { DatePickerInput as Input } from './date-picker-input'
+import { DatePickerLabel as Label } from './date-picker-label'
+import { DatePickerMonthSelect as MonthSelect } from './date-picker-month-select'
+import { DatePickerNextTrigger as NextTrigger } from './date-picker-next-trigger'
+import { DatePickerPositioner as Positioner } from './date-picker-positioner'
+import { DatePickerPrevTrigger as PrevTrigger } from './date-picker-prev-trigger'
+import { DatePickerRangeText as RangeText } from './date-picker-range-text'
+import { DatePickerRoot as Root } from './date-picker-root'
+import { DatePickerTable as Table } from './date-picker-table'
+import { DatePickerTableBody as TableBody } from './date-picker-table-body'
+import { DatePickerTableCell as TableCell } from './date-picker-table-cell'
+import { DatePickerTableCellTrigger as TableCellTrigger } from './date-picker-table-cell-trigger'
+import { DatePickerTableHead as TableHead } from './date-picker-table-head'
+import { DatePickerTableHeader as TableHeader } from './date-picker-table-header'
+import { DatePickerTableRow as TableRow } from './date-picker-table-row'
+import { DatePickerTrigger as Trigger } from './date-picker-trigger'
+import { DatePickerView as View } from './date-picker-view'
+import { DatePickerViewControl as ViewControl } from './date-picker-view-control'
+import { DatePickerViewTrigger as ViewTrigger } from './date-picker-view-trigger'
+import { DatePickerYearSelect as YearSelect } from './date-picker-year-select'
+
+export {
+  ClearTrigger,
+  Content,
+  Control,
+  Input,
+  Label,
+  MonthSelect,
+  NextTrigger,
+  Positioner,
+  PrevTrigger,
+  RangeText,
+  Root,
+  Table,
+  TableBody,
+  TableCell,
+  TableCellTrigger,
+  TableHead,
+  TableHeader,
+  TableRow,
+  Trigger,
+  View,
+  ViewControl,
+  ViewTrigger,
+  YearSelect,
+}
diff --git a/packages/frameworks/solid/src/date-picker/index.ts b/packages/frameworks/solid/src/date-picker/index.ts
index 38cb2eea1c..2c9cbbd3f5 100644
--- a/packages/frameworks/solid/src/date-picker/index.ts
+++ b/packages/frameworks/solid/src/date-picker/index.ts
@@ -41,31 +41,7 @@ import { DatePickerViewControl, type DatePickerViewControlProps } from './date-p
 import { DatePickerViewTrigger, type DatePickerViewTriggerProps } from './date-picker-view-trigger'
 import { DatePickerYearSelect, type DatePickerYearSelectProps } from './date-picker-year-select'
 
-export const DatePicker = {
-  Root: DatePickerRoot,
-  ClearTrigger: DatePickerClearTrigger,
-  Content: DatePickerContent,
-  Control: DatePickerControl,
-  Input: DatePickerInput,
-  Label: DatePickerLabel,
-  MonthSelect: DatePickerMonthSelect,
-  NextTrigger: DatePickerNextTrigger,
-  Positioner: DatePickerPositioner,
-  PrevTrigger: DatePickerPrevTrigger,
-  RangeText: DatePickerRangeText,
-  Table: DatePickerTable,
-  TableBody: DatePickerTableBody,
-  TableCell: DatePickerTableCell,
-  TableCellTrigger: DatePickerTableCellTrigger,
-  TableHead: DatePickerTableHead,
-  TableHeader: DatePickerTableHeader,
-  TableRow: DatePickerTableRow,
-  Trigger: DatePickerTrigger,
-  View: DatePickerView,
-  ViewControl: DatePickerViewControl,
-  ViewTrigger: DatePickerViewTrigger,
-  YearSelect: DatePickerYearSelect,
-}
+export * as DatePicker from './date-picker'
 
 export {
   DatePickerClearTrigger,
diff --git a/packages/frameworks/solid/src/dialog/dialog.tsx b/packages/frameworks/solid/src/dialog/dialog.tsx
new file mode 100644
index 0000000000..c206dbf5fa
--- /dev/null
+++ b/packages/frameworks/solid/src/dialog/dialog.tsx
@@ -0,0 +1,10 @@
+import { DialogBackdrop as Backdrop } from './dialog-backdrop'
+import { DialogCloseTrigger as CloseTrigger } from './dialog-close-trigger'
+import { DialogContent as Content } from './dialog-content'
+import { DialogDescription as Description } from './dialog-description'
+import { DialogPositioner as Positioner } from './dialog-positioner'
+import { DialogRoot as Root } from './dialog-root'
+import { DialogTitle as Title } from './dialog-title'
+import { DialogTrigger as Trigger } from './dialog-trigger'
+
+export { Backdrop, CloseTrigger, Content, Description, Positioner, Root, Title, Trigger }
diff --git a/packages/frameworks/solid/src/dialog/index.ts b/packages/frameworks/solid/src/dialog/index.ts
index 4aae1f95e2..93da988526 100644
--- a/packages/frameworks/solid/src/dialog/index.ts
+++ b/packages/frameworks/solid/src/dialog/index.ts
@@ -9,16 +9,7 @@ import { DialogRoot, type DialogRootProps } from './dialog-root'
 import { DialogTitle, type DialogTitleProps } from './dialog-title'
 import { DialogTrigger, type DialogTriggerProps } from './dialog-trigger'
 
-export const Dialog = {
-  Root: DialogRoot,
-  Backdrop: DialogBackdrop,
-  CloseTrigger: DialogCloseTrigger,
-  Content: DialogContent,
-  Description: DialogDescription,
-  Positioner: DialogPositioner,
-  Title: DialogTitle,
-  Trigger: DialogTrigger,
-}
+export * as Dialog from './dialog'
 
 export {
   DialogBackdrop,
diff --git a/packages/frameworks/solid/src/editable/editable.tsx b/packages/frameworks/solid/src/editable/editable.tsx
new file mode 100644
index 0000000000..877ab8ad3e
--- /dev/null
+++ b/packages/frameworks/solid/src/editable/editable.tsx
@@ -0,0 +1,11 @@
+import { EditableArea as Area } from './editable-area'
+import { EditableCancelTrigger as CancelTrigger } from './editable-cancel-trigger'
+import { EditableControl as Control } from './editable-control'
+import { EditableEditTrigger as EditTrigger } from './editable-edit-trigger'
+import { EditableInput as Input } from './editable-input'
+import { EditableLabel as Label } from './editable-label'
+import { EditablePreview as Preview } from './editable-preview'
+import { EditableRoot as Root } from './editable-root'
+import { EditableSubmitTrigger as SubmitTrigger } from './editable-submit-trigger'
+
+export { Area, CancelTrigger, Control, EditTrigger, Input, Label, Preview, Root, SubmitTrigger }
diff --git a/packages/frameworks/solid/src/editable/index.ts b/packages/frameworks/solid/src/editable/index.ts
index 6d1e373fb3..94322cd1ee 100644
--- a/packages/frameworks/solid/src/editable/index.ts
+++ b/packages/frameworks/solid/src/editable/index.ts
@@ -10,17 +10,7 @@ import { EditablePreview, type EditablePreviewProps } from './editable-preview'
 import { EditableRoot, type EditableRootProps } from './editable-root'
 import { EditableSubmitTrigger, type EditableSubmitTriggerProps } from './editable-submit-trigger'
 
-export const Editable = {
-  Root: EditableRoot,
-  Area: EditableArea,
-  CancelTrigger: EditableCancelTrigger,
-  Control: EditableControl,
-  EditTrigger: EditableEditTrigger,
-  Input: EditableInput,
-  Label: EditableLabel,
-  Preview: EditablePreview,
-  SubmitTrigger: EditableSubmitTrigger,
-}
+export * as Editable from './editable'
 
 export {
   EditableArea,
diff --git a/packages/frameworks/solid/src/file-upload/file-upload.tsx b/packages/frameworks/solid/src/file-upload/file-upload.tsx
new file mode 100644
index 0000000000..9e8d9f907f
--- /dev/null
+++ b/packages/frameworks/solid/src/file-upload/file-upload.tsx
@@ -0,0 +1,25 @@
+import { FileUploadDropzone as Dropzone } from './file-upload-dropzone'
+import { FileUploadItem as Item } from './file-upload-item'
+import { FileUploadItemDeleteTrigger as ItemDeleteTrigger } from './file-upload-item-delete-trigger'
+import { FileUploadItemGroup as ItemGroup } from './file-upload-item-group'
+import { FileUploadItemName as ItemName } from './file-upload-item-name'
+import { FileUploadItemPreview as ItemPreview } from './file-upload-item-preview'
+import { FileUploadItemPreviewImage as ItemPreviewImage } from './file-upload-item-preview-image'
+import { FileUploadItemSizeText as ItemSizeText } from './file-upload-item-size-text'
+import { FileUploadLabel as Label } from './file-upload-label'
+import { FileUploadRoot as Root } from './file-upload-root'
+import { FileUploadTrigger as Trigger } from './file-upload-trigger'
+
+export {
+  Dropzone,
+  Item,
+  ItemDeleteTrigger,
+  ItemGroup,
+  ItemName,
+  ItemPreview,
+  ItemPreviewImage,
+  ItemSizeText,
+  Label,
+  Root,
+  Trigger,
+}
diff --git a/packages/frameworks/solid/src/file-upload/index.ts b/packages/frameworks/solid/src/file-upload/index.ts
index b25528d43a..17331b5410 100644
--- a/packages/frameworks/solid/src/file-upload/index.ts
+++ b/packages/frameworks/solid/src/file-upload/index.ts
@@ -25,19 +25,7 @@ import { FileUploadLabel, type FileUploadLabelProps } from './file-upload-label'
 import { FileUploadRoot, type FileUploadRootProps } from './file-upload-root'
 import { FileUploadTrigger, type FileUploadTriggerProps } from './file-upload-trigger'
 
-export const FileUpload = {
-  Root: FileUploadRoot,
-  Dropzone: FileUploadDropzone,
-  Item: FileUploadItem,
-  ItemDeleteTrigger: FileUploadItemDeleteTrigger,
-  ItemGroup: FileUploadItemGroup,
-  ItemName: FileUploadItemName,
-  ItemPreview: FileUploadItemPreview,
-  ItemPreviewImage: FileUploadItemPreviewImage,
-  ItemSizeText: FileUploadItemSizeText,
-  Label: FileUploadLabel,
-  Trigger: FileUploadTrigger,
-}
+export * as FileUpload from './file-upload'
 
 export {
   FileUploadDropzone,
@@ -45,6 +33,7 @@ export {
   FileUploadItemDeleteTrigger,
   FileUploadItemGroup,
   FileUploadItemName,
+  FileUploadItemPreview,
   FileUploadItemPreviewImage,
   FileUploadItemSizeText,
   FileUploadLabel,
diff --git a/packages/frameworks/solid/src/hover-card/hover-card.tsx b/packages/frameworks/solid/src/hover-card/hover-card.tsx
new file mode 100644
index 0000000000..bad637252b
--- /dev/null
+++ b/packages/frameworks/solid/src/hover-card/hover-card.tsx
@@ -0,0 +1,8 @@
+import { HoverCardArrow as Arrow } from './hover-card-arrow'
+import { HoverCardArrowTip as ArrowTip } from './hover-card-arrow-tip'
+import { HoverCardContent as Content } from './hover-card-content'
+import { HoverCardPositioner as Positioner } from './hover-card-positioner'
+import { HoverCardRoot as Root } from './hover-card-root'
+import { HoverCardTrigger as Trigger } from './hover-card-trigger'
+
+export { Arrow, ArrowTip, Content, Positioner, Root, Trigger }
diff --git a/packages/frameworks/solid/src/hover-card/index.ts b/packages/frameworks/solid/src/hover-card/index.ts
index f6b4ae1a7a..031cf43916 100644
--- a/packages/frameworks/solid/src/hover-card/index.ts
+++ b/packages/frameworks/solid/src/hover-card/index.ts
@@ -7,14 +7,7 @@ import { HoverCardPositioner, type HoverCardPositionerProps } from './hover-card
 import { HoverCardRoot, type HoverCardRootProps } from './hover-card-root'
 import { HoverCardTrigger, type HoverCardTriggerProps } from './hover-card-trigger'
 
-export const HoverCard = {
-  Root: HoverCardRoot,
-  Arrow: HoverCardArrow,
-  ArrowTip: HoverCardArrowTip,
-  Content: HoverCardContent,
-  Positioner: HoverCardPositioner,
-  Trigger: HoverCardTrigger,
-}
+export * as HoverCard from './hover-card'
 
 export {
   HoverCardArrow,
diff --git a/packages/frameworks/solid/src/index.ts b/packages/frameworks/solid/src/index.ts
index 0ecb676b44..8c1d0ef0c1 100644
--- a/packages/frameworks/solid/src/index.ts
+++ b/packages/frameworks/solid/src/index.ts
@@ -30,3 +30,4 @@ export * from './tags-input'
 export * from './toast'
 export * from './toggle-group'
 export * from './tooltip'
+export * from './tree-view'
diff --git a/packages/frameworks/solid/src/menu/index.ts b/packages/frameworks/solid/src/menu/index.ts
index d23b091da1..ac6c819c2c 100644
--- a/packages/frameworks/solid/src/menu/index.ts
+++ b/packages/frameworks/solid/src/menu/index.ts
@@ -17,21 +17,7 @@ import { MenuSeparator, type MenuSeparatorProps } from './menu-separator'
 import { MenuTrigger, type MenuTriggerProps } from './menu-trigger'
 import { MenuTriggerItem, type MenuTriggerItemProps } from './menu-trigger-item'
 
-export const Menu = {
-  Root: MenuRoot,
-  Arrow: MenuArrow,
-  ArrowTip: MenuArrowTip,
-  Content: MenuContent,
-  ContextTrigger: MenuContextTrigger,
-  Item: MenuItem,
-  ItemGroup: MenuItemGroup,
-  ItemGroupLabel: MenuItemGroupLabel,
-  OptionItem: MenuOptionItem,
-  Positioner: MenuPositioner,
-  Separator: MenuSeparator,
-  Trigger: MenuTrigger,
-  TriggerItem: MenuTriggerItem,
-}
+export * as Menu from './menu'
 
 export {
   MenuArrow,
diff --git a/packages/frameworks/solid/src/menu/menu.tsx b/packages/frameworks/solid/src/menu/menu.tsx
new file mode 100644
index 0000000000..9b78f748f3
--- /dev/null
+++ b/packages/frameworks/solid/src/menu/menu.tsx
@@ -0,0 +1,29 @@
+import { MenuArrow as Arrow } from './menu-arrow'
+import { MenuArrowTip as ArrowTip } from './menu-arrow-tip'
+import { MenuContent as Content } from './menu-content'
+import { MenuContextTrigger as ContextTrigger } from './menu-context-trigger'
+import { MenuItem as Item } from './menu-item'
+import { MenuItemGroup as ItemGroup } from './menu-item-group'
+import { MenuItemGroupLabel as ItemGroupLabel } from './menu-item-group-label'
+import { MenuOptionItem as OptionItem } from './menu-option-item'
+import { MenuPositioner as Positioner } from './menu-positioner'
+import { MenuRoot as Root } from './menu-root'
+import { MenuSeparator as Separator } from './menu-separator'
+import { MenuTrigger as Trigger } from './menu-trigger'
+import { MenuTriggerItem as TriggerItem } from './menu-trigger-item'
+
+export {
+  Arrow,
+  ArrowTip,
+  Content,
+  ContextTrigger,
+  Item,
+  ItemGroup,
+  ItemGroupLabel,
+  OptionItem,
+  Positioner,
+  Root,
+  Separator,
+  Trigger,
+  TriggerItem,
+}
diff --git a/packages/frameworks/solid/src/number-input/index.ts b/packages/frameworks/solid/src/number-input/index.ts
index db78ef0baa..9a997ca073 100644
--- a/packages/frameworks/solid/src/number-input/index.ts
+++ b/packages/frameworks/solid/src/number-input/index.ts
@@ -18,15 +18,7 @@ import { NumberInputLabel, type NumberInputLabelProps } from './number-input-lab
 import { NumberInputRoot, type NumberInputRootProps } from './number-input-root'
 import { NumberInputScrubber, type NumberInputScrubberProps } from './number-input-scrubber'
 
-export const NumberInput = {
-  Root: NumberInputRoot,
-  Control: NumberInputControl,
-  DecrementTrigger: NumberInputDecrementTrigger,
-  Input: NumberInputInput,
-  IncrementTrigger: NumberInputIncrementTrigger,
-  Label: NumberInputLabel,
-  Scrubber: NumberInputScrubber,
-}
+export * as NumberInput from './number-input'
 
 export {
   NumberInputControl,
diff --git a/packages/frameworks/solid/src/number-input/number-input.tsx b/packages/frameworks/solid/src/number-input/number-input.tsx
new file mode 100644
index 0000000000..fd5140ad1d
--- /dev/null
+++ b/packages/frameworks/solid/src/number-input/number-input.tsx
@@ -0,0 +1,9 @@
+import { NumberInputControl as Control } from './number-input-control'
+import { NumberInputDecrementTrigger as DecrementTrigger } from './number-input-decrement-trigger'
+import { NumberInputIncrementTrigger as IncrementTrigger } from './number-input-increment-trigger'
+import { NumberInputInput as Input } from './number-input-input'
+import { NumberInputLabel as Label } from './number-input-label'
+import { NumberInputRoot as Root } from './number-input-root'
+import { NumberInputScrubber as Scrubber } from './number-input-scrubber'
+
+export { Control, DecrementTrigger, IncrementTrigger, Input, Label, Root, Scrubber }
diff --git a/packages/frameworks/solid/src/pagination/index.ts b/packages/frameworks/solid/src/pagination/index.ts
index 1d3941aa02..de5b13174a 100644
--- a/packages/frameworks/solid/src/pagination/index.ts
+++ b/packages/frameworks/solid/src/pagination/index.ts
@@ -9,13 +9,7 @@ import { PaginationNextTrigger, type PaginationNextTriggerProps } from './pagina
 import { PaginationPrevTrigger, type PaginationPrevTriggerProps } from './pagination-prev-trigger'
 import { PaginationRoot, type PaginationRootProps } from './pagination-root'
 
-export const Pagination = {
-  Root: PaginationRoot,
-  Ellipsis: PaginationEllipsis,
-  Item: PaginationItem,
-  NextTrigger: PaginationNextTrigger,
-  PrevTrigger: PaginationPrevTrigger,
-}
+export * as Pagination from './pagination'
 
 export {
   PaginationEllipsis,
diff --git a/packages/frameworks/solid/src/pagination/pagination.tsx b/packages/frameworks/solid/src/pagination/pagination.tsx
new file mode 100644
index 0000000000..48575b4c7b
--- /dev/null
+++ b/packages/frameworks/solid/src/pagination/pagination.tsx
@@ -0,0 +1,7 @@
+import { PaginationEllipsis as Ellipsis } from './pagination-ellipsis'
+import { PaginationItem as Item } from './pagination-item'
+import { PaginationNextTrigger as NextTrigger } from './pagination-next-trigger'
+import { PaginationPrevTrigger as PrevTrigger } from './pagination-prev-trigger'
+import { PaginationRoot as Root } from './pagination-root'
+
+export { Ellipsis, Item, NextTrigger, PrevTrigger, Root }
diff --git a/packages/frameworks/solid/src/pin-input/index.ts b/packages/frameworks/solid/src/pin-input/index.ts
index d3f5763313..f5ce11d52d 100644
--- a/packages/frameworks/solid/src/pin-input/index.ts
+++ b/packages/frameworks/solid/src/pin-input/index.ts
@@ -8,12 +8,7 @@ import { PinInputInput, type PinInputInputProps } from './pin-input-input'
 import { PinInputLabel, type PinInputLabelProps } from './pin-input-label'
 import { PinInputRoot, type PinInputRootProps } from './pin-input-root'
 
-export const PinInput = {
-  Root: PinInputRoot,
-  Control: PinInputControl,
-  Input: PinInputInput,
-  Label: PinInputLabel,
-}
+export * as PinInput from './pin-input'
 
 export { PinInputControl, PinInputInput, PinInputLabel, PinInputRoot, usePinInputContext }
 
diff --git a/packages/frameworks/solid/src/pin-input/pin-input.tsx b/packages/frameworks/solid/src/pin-input/pin-input.tsx
new file mode 100644
index 0000000000..3dca21afc8
--- /dev/null
+++ b/packages/frameworks/solid/src/pin-input/pin-input.tsx
@@ -0,0 +1,6 @@
+import { PinInputControl as Control } from './pin-input-control'
+import { PinInputInput as Input } from './pin-input-input'
+import { PinInputLabel as Label } from './pin-input-label'
+import { PinInputRoot as Root } from './pin-input-root'
+
+export { Control, Input, Label, Root }
diff --git a/packages/frameworks/solid/src/popover/index.ts b/packages/frameworks/solid/src/popover/index.ts
index 93b331aaff..fc682051d7 100644
--- a/packages/frameworks/solid/src/popover/index.ts
+++ b/packages/frameworks/solid/src/popover/index.ts
@@ -12,19 +12,7 @@ import { PopoverRoot, type PopoverRootProps } from './popover-root'
 import { PopoverTitle, type PopoverTitleProps } from './popover-title'
 import { PopoverTrigger, type PopoverTriggerProps } from './popover-trigger'
 
-export const Popover = {
-  Root: PopoverRoot,
-  Anchor: PopoverAnchor,
-  Arrow: PopoverArrow,
-  ArrowTip: PopoverArrowTip,
-  CloseTrigger: PopoverCloseTrigger,
-  Content: PopoverContent,
-  Description: PopoverDescription,
-  Indicator: PopoverIndicator,
-  Positioner: PopoverPositioner,
-  Title: PopoverTitle,
-  Trigger: PopoverTrigger,
-}
+export * as Popover from './popover'
 
 export {
   PopoverAnchor,
diff --git a/packages/frameworks/solid/src/popover/popover.tsx b/packages/frameworks/solid/src/popover/popover.tsx
new file mode 100644
index 0000000000..096de278b2
--- /dev/null
+++ b/packages/frameworks/solid/src/popover/popover.tsx
@@ -0,0 +1,25 @@
+import { PopoverAnchor as Anchor } from './popover-anchor'
+import { PopoverArrow as Arrow } from './popover-arrow'
+import { PopoverArrowTip as ArrowTip } from './popover-arrow-tip'
+import { PopoverCloseTrigger as CloseTrigger } from './popover-close-trigger'
+import { PopoverContent as Content } from './popover-content'
+import { PopoverDescription as Description } from './popover-description'
+import { PopoverIndicator as Indicator } from './popover-indicator'
+import { PopoverPositioner as Positioner } from './popover-positioner'
+import { PopoverRoot as Root } from './popover-root'
+import { PopoverTitle as Title } from './popover-title'
+import { PopoverTrigger as Trigger } from './popover-trigger'
+
+export {
+  Anchor,
+  Arrow,
+  ArrowTip,
+  CloseTrigger,
+  Content,
+  Description,
+  Indicator,
+  Positioner,
+  Root,
+  Title,
+  Trigger,
+}
diff --git a/packages/frameworks/solid/src/progress/index.ts b/packages/frameworks/solid/src/progress/index.ts
index 0ffd55f130..e1bd019759 100644
--- a/packages/frameworks/solid/src/progress/index.ts
+++ b/packages/frameworks/solid/src/progress/index.ts
@@ -9,17 +9,7 @@ import { ProgressTrack, type ProgressTrackProps } from './progress-track'
 import { ProgressValueText, type ProgressValueTextProps } from './progress-value-text'
 import { ProgressView, type ProgressViewProps } from './progress-view'
 
-export const Progress = {
-  Root: ProgressRoot,
-  Label: ProgressLabel,
-  Track: ProgressTrack,
-  Range: ProgressRange,
-  ValueText: ProgressValueText,
-  View: ProgressView,
-  Circle: ProgressCircle,
-  CircleTrack: ProgressCircleTrack,
-  CircleRange: ProgressCircleRange,
-}
+export * as Progress from './progress'
 
 export {
   ProgressCircle,
diff --git a/packages/frameworks/solid/src/progress/progress.tsx b/packages/frameworks/solid/src/progress/progress.tsx
new file mode 100644
index 0000000000..15341a0c61
--- /dev/null
+++ b/packages/frameworks/solid/src/progress/progress.tsx
@@ -0,0 +1,11 @@
+import { ProgressCircle as Circle } from './progress-circle'
+import { ProgressCircleRange as CircleRange } from './progress-circle-range'
+import { ProgressCircleTrack as CircleTrack } from './progress-circle-track'
+import { ProgressLabel as Label } from './progress-label'
+import { ProgressRange as Range } from './progress-range'
+import { ProgressRoot as Root } from './progress-root'
+import { ProgressTrack as Track } from './progress-track'
+import { ProgressValueText as ValueText } from './progress-value-text'
+import { ProgressView as View } from './progress-view'
+
+export { Circle, CircleRange, CircleTrack, Label, Range, Root, Track, ValueText, View }
diff --git a/packages/frameworks/solid/src/radio-group/index.ts b/packages/frameworks/solid/src/radio-group/index.ts
index d2e7b147d0..2c1ad1511f 100644
--- a/packages/frameworks/solid/src/radio-group/index.ts
+++ b/packages/frameworks/solid/src/radio-group/index.ts
@@ -8,16 +8,10 @@ import { RadioGroupItemText, type RadioGroupItemTextProps } from './radio-group-
 import { RadioGroupLabel, type RadioGroupLabelProps } from './radio-group-label'
 import { RadioGroupRoot, type RadioGroupRootProps } from './radio-group-root'
 
-export const RadioGroup = {
-  Root: RadioGroupRoot,
-  Indicator: RadioGroupIndicator,
-  Item: RadioGroupItem,
-  ItemControl: RadioGroupItemControl,
-  ItemText: RadioGroupItemText,
-  Label: RadioGroupLabel,
-}
+export * as RadioGroup from './radio-group'
 
 export {
+  RadioGroupIndicator,
   RadioGroupItem,
   RadioGroupItemControl,
   RadioGroupItemText,
diff --git a/packages/frameworks/solid/src/radio-group/radio-group.tsx b/packages/frameworks/solid/src/radio-group/radio-group.tsx
new file mode 100644
index 0000000000..a901d9b6e4
--- /dev/null
+++ b/packages/frameworks/solid/src/radio-group/radio-group.tsx
@@ -0,0 +1,8 @@
+import { RadioGroupIndicator as Indicator } from './radio-group-indicator'
+import { RadioGroupItem as Item } from './radio-group-item'
+import { RadioGroupItemControl as ItemControl } from './radio-group-item-control'
+import { RadioGroupItemText as ItemText } from './radio-group-item-text'
+import { RadioGroupLabel as Label } from './radio-group-label'
+import { RadioGroupRoot as Root } from './radio-group-root'
+
+export { Indicator, Item, ItemControl, ItemText, Label, Root }
diff --git a/packages/frameworks/solid/src/rating-group/index.ts b/packages/frameworks/solid/src/rating-group/index.ts
index 25bd04c70c..ec448a1a2a 100644
--- a/packages/frameworks/solid/src/rating-group/index.ts
+++ b/packages/frameworks/solid/src/rating-group/index.ts
@@ -9,12 +9,7 @@ import { useRatingGroupItemContext, type RatingGroupItemContext } from './rating
 import { RatingGroupLabel, type RatingGroupLabelProps } from './rating-group-label'
 import { RatingGroupRoot, type RatingGroupRootProps } from './rating-group-root'
 
-export const RatingGroup = {
-  Root: RatingGroupRoot,
-  Control: RatingGroupControl,
-  Label: RatingGroupLabel,
-  Item: RatingGroupItem,
-}
+export * as RatingGroup from './rating-group'
 
 export {
   RatingGroupControl,
diff --git a/packages/frameworks/solid/src/rating-group/rating-group.tsx b/packages/frameworks/solid/src/rating-group/rating-group.tsx
new file mode 100644
index 0000000000..dac5b7e22c
--- /dev/null
+++ b/packages/frameworks/solid/src/rating-group/rating-group.tsx
@@ -0,0 +1,6 @@
+import { RatingGroupControl as Control } from './rating-group-control'
+import { RatingGroupItem as Item } from './rating-group-item'
+import { RatingGroupLabel as Label } from './rating-group-label'
+import { RatingGroupRoot as Root } from './rating-group-root'
+
+export { Control, Item, Label, Root }
diff --git a/packages/frameworks/solid/src/segment-group/index.ts b/packages/frameworks/solid/src/segment-group/index.ts
index 5048c95b67..1c68d2d403 100644
--- a/packages/frameworks/solid/src/segment-group/index.ts
+++ b/packages/frameworks/solid/src/segment-group/index.ts
@@ -14,14 +14,7 @@ import { SegmentGroupItemText, type SegmentGroupItemTextProps } from './segment-
 import { SegmentGroupLabel, type SegmentGroupLabelProps } from './segment-group-label'
 import { SegmentGroupRoot, type SegmentGroupRootProps } from './segment-group-root'
 
-export const SegmentGroup = {
-  Root: SegmentGroupRoot,
-  Indicator: SegmentGroupIndicator,
-  Item: SegmentGroupItem,
-  ItemControl: SegmentGroupItemControl,
-  ItemText: SegmentGroupItemText,
-  Label: SegmentGroupLabel,
-}
+export * as SegmentGroup from './segment-group'
 
 export {
   SegmentGroupIndicator,
diff --git a/packages/frameworks/solid/src/segment-group/segment-group.tsx b/packages/frameworks/solid/src/segment-group/segment-group.tsx
new file mode 100644
index 0000000000..c730ebe81a
--- /dev/null
+++ b/packages/frameworks/solid/src/segment-group/segment-group.tsx
@@ -0,0 +1,8 @@
+import { SegmentGroupIndicator as Indicator } from './segment-group-indicator'
+import { SegmentGroupItem as Item } from './segment-group-item'
+import { SegmentGroupItemControl as ItemControl } from './segment-group-item-control'
+import { SegmentGroupItemText as ItemText } from './segment-group-item-text'
+import { SegmentGroupLabel as Label } from './segment-group-label'
+import { SegmentGroupRoot as Root } from './segment-group-root'
+
+export { Indicator, Item, ItemControl, ItemText, Label, Root }
diff --git a/packages/frameworks/solid/src/select/index.ts b/packages/frameworks/solid/src/select/index.ts
index 3dc29192b3..a60123b734 100644
--- a/packages/frameworks/solid/src/select/index.ts
+++ b/packages/frameworks/solid/src/select/index.ts
@@ -21,22 +21,7 @@ import { SelectRoot, type SelectRootProps } from './select-root'
 import { SelectTrigger, type SelectTriggerProps } from './select-trigger'
 import { SelectValueText, type SelectValueTextProps } from './select-value-text'
 
-export const Select = {
-  Root: SelectRoot,
-  ClearTrigger: SelectClearTrigger,
-  Content: SelectContent,
-  Control: SelectControl,
-  Indicator: SelectIndicator,
-  Item: SelectItem,
-  ItemGroup: SelectItemGroup,
-  ItemGroupLabel: SelectItemGroupLabel,
-  ItemIndicator: SelectItemIndicator,
-  ItemText: SelectItemText,
-  Label: SelectLabel,
-  Positioner: SelectPositioner,
-  Trigger: SelectTrigger,
-  ValueText: SelectValueText,
-}
+export * as Select from './select'
 
 export {
   SelectClearTrigger,
diff --git a/packages/frameworks/solid/src/select/select.tsx b/packages/frameworks/solid/src/select/select.tsx
new file mode 100644
index 0000000000..f7968cca73
--- /dev/null
+++ b/packages/frameworks/solid/src/select/select.tsx
@@ -0,0 +1,31 @@
+import { SelectClearTrigger as ClearTrigger } from './select-clear-trigger'
+import { SelectContent as Content } from './select-content'
+import { SelectControl as Control } from './select-control'
+import { SelectIndicator as Indicator } from './select-indicator'
+import { SelectItem as Item } from './select-item'
+import { SelectItemGroup as ItemGroup } from './select-item-group'
+import { SelectItemGroupLabel as ItemGroupLabel } from './select-item-group-label'
+import { SelectItemIndicator as ItemIndicator } from './select-item-indicator'
+import { SelectItemText as ItemText } from './select-item-text'
+import { SelectLabel as Label } from './select-label'
+import { SelectPositioner as Positioner } from './select-positioner'
+import { SelectRoot as Root } from './select-root'
+import { SelectTrigger as Trigger } from './select-trigger'
+import { SelectValueText as ValueText } from './select-value-text'
+
+export {
+  ClearTrigger,
+  Content,
+  Control,
+  Indicator,
+  Item,
+  ItemGroup,
+  ItemGroupLabel,
+  ItemIndicator,
+  ItemText,
+  Label,
+  Positioner,
+  Root,
+  Trigger,
+  ValueText,
+}
diff --git a/packages/frameworks/solid/src/slider/index.ts b/packages/frameworks/solid/src/slider/index.ts
index c673b16c9e..13312836f1 100644
--- a/packages/frameworks/solid/src/slider/index.ts
+++ b/packages/frameworks/solid/src/slider/index.ts
@@ -13,17 +13,7 @@ import { SliderThumb, type SliderThumbProps } from './slider-thumb'
 import { SliderTrack, type SliderTrackProps } from './slider-track'
 import { SliderValueText, type SliderValueTextProps } from './slider-value-text'
 
-export const Slider = {
-  Root: SliderRoot,
-  Control: SliderControl,
-  Label: SliderLabel,
-  Marker: SliderMarker,
-  MarkerGroup: SliderMarkerGroup,
-  Range: SliderRange,
-  Thumb: SliderThumb,
-  Track: SliderTrack,
-  ValueText: SliderValueText,
-}
+export * as Slider from './slider'
 
 export {
   SliderControl,
diff --git a/packages/frameworks/solid/src/slider/slider.tsx b/packages/frameworks/solid/src/slider/slider.tsx
new file mode 100644
index 0000000000..e21e712c33
--- /dev/null
+++ b/packages/frameworks/solid/src/slider/slider.tsx
@@ -0,0 +1,11 @@
+import { SliderControl as Control } from './slider-control'
+import { SliderLabel as Label } from './slider-label'
+import { SliderMarker as Marker } from './slider-marker'
+import { SliderMarkerGroup as MarkerGroup } from './slider-marker-group'
+import { SliderRange as Range } from './slider-range'
+import { SliderRoot as Root } from './slider-root'
+import { SliderThumb as Thumb } from './slider-thumb'
+import { SliderTrack as Track } from './slider-track'
+import { SliderValueText as ValueText } from './slider-value-text'
+
+export { Control, Label, Marker, MarkerGroup, Range, Root, Thumb, Track, ValueText }
diff --git a/packages/frameworks/solid/src/splitter/index.ts b/packages/frameworks/solid/src/splitter/index.ts
index 793fa2a5d4..00801c21b9 100644
--- a/packages/frameworks/solid/src/splitter/index.ts
+++ b/packages/frameworks/solid/src/splitter/index.ts
@@ -4,11 +4,7 @@ import { SplitterPanel, type SplitterPanelProps } from './splitter-panel'
 import { SplitterResizeTrigger, type SplitterResizeTriggerProps } from './splitter-resize-trigger'
 import { SplitterRoot, type SplitterRootProps } from './splitter-root'
 
-export const Splitter = {
-  Root: SplitterRoot,
-  Panel: SplitterPanel,
-  ResizeTrigger: SplitterResizeTrigger,
-}
+export * as Splitter from './splitter'
 
 export { SplitterPanel, SplitterResizeTrigger, SplitterRoot, useSplitterContext }
 
diff --git a/packages/frameworks/solid/src/splitter/splitter.tsx b/packages/frameworks/solid/src/splitter/splitter.tsx
new file mode 100644
index 0000000000..a29f3ec40b
--- /dev/null
+++ b/packages/frameworks/solid/src/splitter/splitter.tsx
@@ -0,0 +1,5 @@
+import { SplitterPanel as Panel } from './splitter-panel'
+import { SplitterResizeTrigger as ResizeTrigger } from './splitter-resize-trigger'
+import { SplitterRoot as Root } from './splitter-root'
+
+export { Panel, ResizeTrigger, Root }
diff --git a/packages/frameworks/solid/src/switch/index.ts b/packages/frameworks/solid/src/switch/index.ts
index c3cf957872..f48727b5b7 100644
--- a/packages/frameworks/solid/src/switch/index.ts
+++ b/packages/frameworks/solid/src/switch/index.ts
@@ -5,12 +5,7 @@ import { SwitchLabel, type SwitchLabelProps } from './switch-label'
 import { SwitchRoot, type SwitchRootProps } from './switch-root'
 import { SwitchThumb, type SwitchThumbProps } from './switch-thumb'
 
-export const Switch = {
-  Root: SwitchRoot,
-  Control: SwitchControl,
-  Label: SwitchLabel,
-  Thumb: SwitchThumb,
-}
+export * as Switch from './switch'
 
 export { SwitchControl, SwitchLabel, SwitchRoot, SwitchThumb, useSwitchContext }
 
diff --git a/packages/frameworks/solid/src/switch/switch.tsx b/packages/frameworks/solid/src/switch/switch.tsx
new file mode 100644
index 0000000000..2fb3ee16c2
--- /dev/null
+++ b/packages/frameworks/solid/src/switch/switch.tsx
@@ -0,0 +1,6 @@
+import { SwitchControl as Control } from './switch-control'
+import { SwitchLabel as Label } from './switch-label'
+import { SwitchRoot as Root } from './switch-root'
+import { SwitchThumb as Thumb } from './switch-thumb'
+
+export { Control, Label, Root, Thumb }
diff --git a/packages/frameworks/solid/src/tabs/index.ts b/packages/frameworks/solid/src/tabs/index.ts
index c595b3ec49..120f1051b7 100644
--- a/packages/frameworks/solid/src/tabs/index.ts
+++ b/packages/frameworks/solid/src/tabs/index.ts
@@ -9,13 +9,7 @@ import { TabTrigger, type TabTriggerProps } from './tab-trigger'
 import { useTabsContext, type TabsContext } from './tabs-context'
 import { TabsRoot, type TabsRootProps } from './tabs-root'
 
-export const Tabs = {
-  Root: TabsRoot,
-  Content: TabContent,
-  Indicator: TabIndicator,
-  List: TabList,
-  Trigger: TabTrigger,
-}
+export * as Tabs from './tabs'
 
 export { TabContent, TabIndicator, TabList, TabTrigger, TabsRoot, useTabsContext }
 
diff --git a/packages/frameworks/solid/src/tabs/tabs.tsx b/packages/frameworks/solid/src/tabs/tabs.tsx
new file mode 100644
index 0000000000..93a72cbe9c
--- /dev/null
+++ b/packages/frameworks/solid/src/tabs/tabs.tsx
@@ -0,0 +1,7 @@
+import { TabContent as Content } from './tab-content'
+import { TabIndicator as Indicator } from './tab-indicator'
+import { TabList as List } from './tab-list'
+import { TabTrigger as Trigger } from './tab-trigger'
+import { TabsRoot as Root } from './tabs-root'
+
+export { Content, Indicator, List, Root, Trigger }
diff --git a/packages/frameworks/solid/src/tags-input/index.ts b/packages/frameworks/solid/src/tags-input/index.ts
index 2c68252dda..392aeace65 100644
--- a/packages/frameworks/solid/src/tags-input/index.ts
+++ b/packages/frameworks/solid/src/tags-input/index.ts
@@ -19,18 +19,7 @@ import { TagsInputItemText, type TagsInputItemTextProps } from './tags-input-ite
 import { TagsInputLabel, type TagsInputLabelProps } from './tags-input-label'
 import { TagsInputRoot, type TagsInputRootProps } from './tags-input-root'
 
-export const TagsInput = {
-  Root: TagsInputRoot,
-  ClearTrigger: TagsInputClearTrigger,
-  Control: TagsInputControl,
-  Input: TagsInputInput,
-  Item: TagsInputItem,
-  ItemPreview: TagsInputItemPreview,
-  ItemDeleteTrigger: TagsInputItemDeleteTrigger,
-  ItemInput: TagsInputItemInput,
-  ItemText: TagsInputItemText,
-  Label: TagsInputLabel,
-}
+export * as TagsInput from './tags-input'
 
 export {
   TagsInputClearTrigger,
diff --git a/packages/frameworks/solid/src/tags-input/tags-input.tsx b/packages/frameworks/solid/src/tags-input/tags-input.tsx
new file mode 100644
index 0000000000..d5c068934c
--- /dev/null
+++ b/packages/frameworks/solid/src/tags-input/tags-input.tsx
@@ -0,0 +1,23 @@
+import { TagsInputClearTrigger as ClearTrigger } from './tags-input-clear-trigger'
+import { TagsInputControl as Control } from './tags-input-control'
+import { TagsInputInput as Input } from './tags-input-input'
+import { TagsInputItem as Item } from './tags-input-item'
+import { TagsInputItemDeleteTrigger as ItemDeleteTrigger } from './tags-input-item-delete-trigger'
+import { TagsInputItemInput as ItemInput } from './tags-input-item-input'
+import { TagsInputItemPreview as ItemPreview } from './tags-input-item-preview'
+import { TagsInputItemText as ItemText } from './tags-input-item-text'
+import { TagsInputLabel as Label } from './tags-input-label'
+import { TagsInputRoot as Root } from './tags-input-root'
+
+export {
+  ClearTrigger,
+  Control,
+  Input,
+  Item,
+  ItemDeleteTrigger,
+  ItemInput,
+  ItemPreview,
+  ItemText,
+  Label,
+  Root,
+}
diff --git a/packages/frameworks/solid/src/toast/index.ts b/packages/frameworks/solid/src/toast/index.ts
index 253443c9e2..1bdde60256 100644
--- a/packages/frameworks/solid/src/toast/index.ts
+++ b/packages/frameworks/solid/src/toast/index.ts
@@ -5,13 +5,7 @@ import { ToastGroup, type ToastGroupProps } from './toast-group'
 import { ToastRoot, type ToastRootProps } from './toast-root'
 import { ToastTitle, type ToastTitleProps } from './toast-title'
 
-export const Toast = {
-  Root: ToastRoot,
-  CloseTrigger: ToastCloseTrigger,
-  Description: ToastDescription,
-  Group: ToastGroup,
-  Title: ToastTitle,
-}
+export * as Toast from './toast'
 
 export { createToaster, ToastCloseTrigger, ToastDescription, ToastGroup, ToastRoot, ToastTitle }
 
diff --git a/packages/frameworks/solid/src/toast/toast.tsx b/packages/frameworks/solid/src/toast/toast.tsx
new file mode 100644
index 0000000000..93371ee040
--- /dev/null
+++ b/packages/frameworks/solid/src/toast/toast.tsx
@@ -0,0 +1,7 @@
+import { ToastCloseTrigger as CloseTrigger } from './toast-close-trigger'
+import { ToastDescription as Description } from './toast-description'
+import { ToastGroup as Group } from './toast-group'
+import { ToastRoot as Root } from './toast-root'
+import { ToastTitle as Title } from './toast-title'
+
+export { CloseTrigger, Description, Group, Root, Title }
diff --git a/packages/frameworks/solid/src/toggle-group/index.ts b/packages/frameworks/solid/src/toggle-group/index.ts
index 25a0115e20..a7fcf19ae5 100644
--- a/packages/frameworks/solid/src/toggle-group/index.ts
+++ b/packages/frameworks/solid/src/toggle-group/index.ts
@@ -3,10 +3,7 @@ import { useToggleGroupContext, type ToggleGroupContext } from './toggle-group-c
 import { ToggleGroupItem, type ToggleGroupItemProps } from './toggle-group-item'
 import { ToggleGroupRoot, type ToggleGroupRootProps } from './toggle-group-root'
 
-export const ToggleGroup = {
-  Root: ToggleGroupRoot,
-  Item: ToggleGroupItem,
-}
+export * as ToggleGroup from './toggle-group'
 
 export { ToggleGroupItem, ToggleGroupRoot, useToggleGroupContext }
 
diff --git a/packages/frameworks/solid/src/toggle-group/toggle-group.tsx b/packages/frameworks/solid/src/toggle-group/toggle-group.tsx
new file mode 100644
index 0000000000..836365f3d0
--- /dev/null
+++ b/packages/frameworks/solid/src/toggle-group/toggle-group.tsx
@@ -0,0 +1,4 @@
+import { ToggleGroupItem as Item } from './toggle-group-item'
+import { ToggleGroupRoot as Root } from './toggle-group-root'
+
+export { Item, Root }
diff --git a/packages/frameworks/solid/src/tooltip/index.ts b/packages/frameworks/solid/src/tooltip/index.ts
index 586d9f3ddd..0cec176cfb 100644
--- a/packages/frameworks/solid/src/tooltip/index.ts
+++ b/packages/frameworks/solid/src/tooltip/index.ts
@@ -7,14 +7,7 @@ import { TooltipPositioner, type TooltipPositionerProps } from './tooltip-positi
 import { TooltipRoot, type TooltipRootProps } from './tooltip-root'
 import { TooltipTrigger, type TooltipTriggerProps } from './tooltip-trigger'
 
-export const Tooltip = {
-  Root: TooltipRoot,
-  Arrow: TooltipArrow,
-  ArrowTip: TooltipArrowTip,
-  Content: TooltipContent,
-  Positioner: TooltipPositioner,
-  Trigger: TooltipTrigger,
-}
+export * as Tooltip from './tooltip'
 
 export {
   TooltipArrow,
diff --git a/packages/frameworks/solid/src/tooltip/tooltip.tsx b/packages/frameworks/solid/src/tooltip/tooltip.tsx
new file mode 100644
index 0000000000..19de9826c2
--- /dev/null
+++ b/packages/frameworks/solid/src/tooltip/tooltip.tsx
@@ -0,0 +1,8 @@
+import { TooltipArrow as Arrow } from './tooltip-arrow'
+import { TooltipArrowTip as ArrowTip } from './tooltip-arrow-tip'
+import { TooltipContent as Content } from './tooltip-content'
+import { TooltipPositioner as Positioner } from './tooltip-positioner'
+import { TooltipRoot as Root } from './tooltip-root'
+import { TooltipTrigger as Trigger } from './tooltip-trigger'
+
+export { Arrow, ArrowTip, Content, Positioner, Root, Trigger }
diff --git a/packages/frameworks/solid/src/tree-view/index.ts b/packages/frameworks/solid/src/tree-view/index.ts
index fc58fbd9e8..46330ac5d4 100644
--- a/packages/frameworks/solid/src/tree-view/index.ts
+++ b/packages/frameworks/solid/src/tree-view/index.ts
@@ -19,19 +19,7 @@ import { TreeViewLabel, type TreeViewLabelProps } from './tree-view-label'
 import { TreeViewRoot, type TreeViewRootProps } from './tree-view-root'
 import { TreeViewTree, type TreeViewTreeProps } from './tree-view-tree'
 
-export const TreeView = {
-  Root: TreeViewRoot,
-  Label: TreeViewLabel,
-  Tree: TreeViewTree,
-  Branch: TreeViewBranch,
-  Item: TreeViewItem,
-  ItemText: TreeViewItemText,
-  BranchContent: TreeViewBranchContent,
-  BranchControl: TreeViewBranchControl,
-  BranchTrigger: TreeViewBranchTrigger,
-  BranchIndicator: TreeViewBranchIndicator,
-  BranchText: TreeViewBranchText,
-}
+export * as TreeView from './tree-view'
 
 export {
   TreeViewBranch,
diff --git a/packages/frameworks/solid/src/tree-view/tree-view.tsx b/packages/frameworks/solid/src/tree-view/tree-view.tsx
new file mode 100644
index 0000000000..409f5c79b6
--- /dev/null
+++ b/packages/frameworks/solid/src/tree-view/tree-view.tsx
@@ -0,0 +1,25 @@
+import { TreeViewBranch as Branch } from './tree-view-branch'
+import { TreeViewBranchContent as BranchContent } from './tree-view-branch-content'
+import { TreeViewBranchControl as BranchControl } from './tree-view-branch-control'
+import { TreeViewBranchIndicator as BranchIndicator } from './tree-view-branch-indicator'
+import { TreeViewBranchText as BranchText } from './tree-view-branch-text'
+import { TreeViewBranchTrigger as BranchTrigger } from './tree-view-branch-trigger'
+import { TreeViewItem as Item } from './tree-view-item'
+import { TreeViewItemText as ItemText } from './tree-view-item-text'
+import { TreeViewLabel as Label } from './tree-view-label'
+import { TreeViewRoot as Root } from './tree-view-root'
+import { TreeViewTree as Tree } from './tree-view-tree'
+
+export {
+  Branch,
+  BranchContent,
+  BranchControl,
+  BranchIndicator,
+  BranchText,
+  BranchTrigger,
+  Item,
+  ItemText,
+  Label,
+  Root,
+  Tree,
+}
diff --git a/packages/frameworks/vue/src/accordion/accordion.tsx b/packages/frameworks/vue/src/accordion/accordion.tsx
new file mode 100644
index 0000000000..747d52084f
--- /dev/null
+++ b/packages/frameworks/vue/src/accordion/accordion.tsx
@@ -0,0 +1,7 @@
+import { AccordionItem as Item } from './accordion-item'
+import { AccordionItemContent as ItemContent } from './accordion-item-content'
+import { AccordionItemIndicator as ItemIndicator } from './accordion-item-indicator'
+import { AccordionItemTrigger as ItemTrigger } from './accordion-item-trigger'
+import { AccordionRoot as Root } from './accordion-root'
+
+export { Item, ItemContent, ItemIndicator, ItemTrigger, Root }
diff --git a/packages/frameworks/vue/src/accordion/index.ts b/packages/frameworks/vue/src/accordion/index.ts
index a41171f135..80346584f7 100644
--- a/packages/frameworks/vue/src/accordion/index.ts
+++ b/packages/frameworks/vue/src/accordion/index.ts
@@ -13,13 +13,7 @@ import {
 import { AccordionItemTrigger, type AccordionItemTriggerProps } from './accordion-item-trigger'
 import { AccordionRoot, type AccordionRootProps } from './accordion-root'
 
-export const Accordion = {
-  Root: AccordionRoot,
-  Item: AccordionItem,
-  ItemContent: AccordionItemContent,
-  ItemIndicator: AccordionItemIndicator,
-  ItemTrigger: AccordionItemTrigger,
-}
+export * as Accordion from './accordion'
 
 export {
   AccordionItem,
@@ -30,6 +24,7 @@ export {
   useAccordionContext,
   useAccordionItemContext,
 }
+
 export type {
   AccordionContext,
   AccordionFocusChangeDetails,
diff --git a/packages/frameworks/vue/src/avatar/avatar.tsx b/packages/frameworks/vue/src/avatar/avatar.tsx
new file mode 100644
index 0000000000..c8cef7167f
--- /dev/null
+++ b/packages/frameworks/vue/src/avatar/avatar.tsx
@@ -0,0 +1,5 @@
+import { AvatarFallback as Fallback } from './avatar-fallback'
+import { AvatarImage as Image } from './avatar-image'
+import { AvatarRoot as Root } from './avatar-root'
+
+export { Fallback, Image, Root }
diff --git a/packages/frameworks/vue/src/avatar/index.ts b/packages/frameworks/vue/src/avatar/index.ts
index 890086d96e..efcec63ca1 100644
--- a/packages/frameworks/vue/src/avatar/index.ts
+++ b/packages/frameworks/vue/src/avatar/index.ts
@@ -4,13 +4,10 @@ import { AvatarFallback, type AvatarFallbackProps } from './avatar-fallback'
 import { AvatarImage, type AvatarImageProps } from './avatar-image'
 import { AvatarRoot, type AvatarRootProps } from './avatar-root'
 
-export const Avatar = {
-  Root: AvatarRoot,
-  Fallback: AvatarFallback,
-  Image: AvatarImage,
-}
+export * as Avatar from './avatar'
 
 export { AvatarFallback, AvatarImage, AvatarRoot, useAvatarContext }
+
 export type {
   AvatarContext,
   AvatarFallbackProps,
diff --git a/packages/frameworks/vue/src/carousel/carousel.tsx b/packages/frameworks/vue/src/carousel/carousel.tsx
new file mode 100644
index 0000000000..53f1d864cb
--- /dev/null
+++ b/packages/frameworks/vue/src/carousel/carousel.tsx
@@ -0,0 +1,21 @@
+import { CarouselControl as Control } from './carousel-control'
+import { CarouselIndicator as Indicator } from './carousel-indicator'
+import { CarouselIndicatorGroup as IndicatorGroup } from './carousel-indicator-group'
+import { CarouselItem as Item } from './carousel-item'
+import { CarouselItemGroup as ItemGroup } from './carousel-item-group'
+import { CarouselNextTrigger as NextTrigger } from './carousel-next-trigger'
+import { CarouselPrevTrigger as PrevTrigger } from './carousel-prev-trigger'
+import { CarouselRoot as Root } from './carousel-root'
+import { CarouselViewport as Viewport } from './carousel-viewport'
+
+export {
+  Control,
+  Indicator,
+  IndicatorGroup,
+  Item,
+  ItemGroup,
+  NextTrigger,
+  PrevTrigger,
+  Root,
+  Viewport,
+}
diff --git a/packages/frameworks/vue/src/carousel/index.ts b/packages/frameworks/vue/src/carousel/index.ts
index 9396abcd26..200e01dfd2 100644
--- a/packages/frameworks/vue/src/carousel/index.ts
+++ b/packages/frameworks/vue/src/carousel/index.ts
@@ -13,17 +13,7 @@ import { CarouselPrevTrigger, type CarouselPrevTriggerProps } from './carousel-p
 import { CarouselRoot, type CarouselRootProps } from './carousel-root'
 import { CarouselViewport, type CarouselViewportProps } from './carousel-viewport'
 
-export const Carousel = {
-  Root: CarouselRoot,
-  Control: CarouselControl,
-  Indicator: CarouselIndicator,
-  IndicatorGroup: CarouselIndicatorGroup,
-  NextTrigger: CarouselNextTrigger,
-  PrevTrigger: CarouselPrevTrigger,
-  Item: CarouselItem,
-  ItemGroup: CarouselItemGroup,
-  Viewport: CarouselViewport,
-}
+export * as Carousel from './carousel'
 
 export {
   CarouselControl,
@@ -37,7 +27,6 @@ export {
   CarouselViewport,
   useCarouselContext,
 }
-
 export type {
   CarouselContext,
   CarouselControlProps,
diff --git a/packages/frameworks/vue/src/checkbox/checkbox.tsx b/packages/frameworks/vue/src/checkbox/checkbox.tsx
new file mode 100644
index 0000000000..fd6fb1725e
--- /dev/null
+++ b/packages/frameworks/vue/src/checkbox/checkbox.tsx
@@ -0,0 +1,6 @@
+import { CheckboxControl as Control } from './checkbox-control'
+import { CheckboxIndicator as Indicator } from './checkbox-indicator'
+import { CheckboxLabel as Label } from './checkbox-label'
+import { CheckboxRoot as Root } from './checkbox-root'
+
+export { Control, Indicator, Label, Root }
diff --git a/packages/frameworks/vue/src/checkbox/index.ts b/packages/frameworks/vue/src/checkbox/index.ts
index 9e7734423d..994f271cb4 100644
--- a/packages/frameworks/vue/src/checkbox/index.ts
+++ b/packages/frameworks/vue/src/checkbox/index.ts
@@ -1,6 +1,6 @@
 import type {
   CheckedChangeDetails as CheckboxCheckedChangeDetails,
-  CheckedState,
+  CheckedState as CheckboxState,
 } from '@zag-js/checkbox'
 import { useCheckboxContext, type CheckboxContext } from './checkbox-context'
 import { CheckboxControl, type CheckboxControlProps } from './checkbox-control'
@@ -8,14 +8,10 @@ import { CheckboxIndicator, type CheckboxIndicatorProps } from './checkbox-indic
 import { CheckboxLabel, type CheckboxLabelProps } from './checkbox-label'
 import { CheckboxRoot, type CheckboxRootProps } from './checkbox-root'
 
-export const Checkbox = {
-  Root: CheckboxRoot,
-  Control: CheckboxControl,
-  Label: CheckboxLabel,
-  Indicator: CheckboxIndicator,
-}
+export * as Checkbox from './checkbox'
 
 export { CheckboxControl, CheckboxIndicator, CheckboxLabel, CheckboxRoot, useCheckboxContext }
+
 export type {
   CheckboxCheckedChangeDetails,
   CheckboxContext,
@@ -23,5 +19,5 @@ export type {
   CheckboxIndicatorProps,
   CheckboxLabelProps,
   CheckboxRootProps,
-  CheckedState,
+  CheckboxState,
 }
diff --git a/packages/frameworks/vue/src/color-picker/color-picker.tsx b/packages/frameworks/vue/src/color-picker/color-picker.tsx
new file mode 100644
index 0000000000..4f8ec479fc
--- /dev/null
+++ b/packages/frameworks/vue/src/color-picker/color-picker.tsx
@@ -0,0 +1,49 @@
+import { ColorPickerArea as Area } from './color-picker-area'
+import { ColorPickerAreaBackground as AreaBackground } from './color-picker-area-background'
+import { ColorPickerAreaThumb as AreaThumb } from './color-picker-area-thumb'
+import { ColorPickerChannelInput as ChannelInput } from './color-picker-channel-input'
+import { ColorPickerChannelSlider as ChannelSlider } from './color-picker-channel-slider'
+import { ColorPickerChannelSliderThumb as ChannelSliderThumb } from './color-picker-channel-slider-thumb'
+import { ColorPickerChannelSliderTrack as ChannelSliderTrack } from './color-picker-channel-slider-track'
+import { ColorPickerContent as Content } from './color-picker-content'
+import { ColorPickerControl as Control } from './color-picker-control'
+import { ColorPickerEyeDropperTrigger as EyeDropperTrigger } from './color-picker-eye-dropper-trigger'
+import { ColorPickerFormatSelect as FormatSelect } from './color-picker-format-select'
+import { ColorPickerFormatTrigger as FormatTrigger } from './color-picker-format-trigger'
+import { ColorPickerLabel as Label } from './color-picker-label'
+import { ColorPickerPositioner as Positioner } from './color-picker-positioner'
+import { ColorPickerRoot as Root } from './color-picker-root'
+import { ColorPickerSwatch as Swatch } from './color-picker-swatch'
+import { ColorPickerSwatchGroup as SwatchGroup } from './color-picker-swatch-group'
+import { ColorPickerSwatchIndicator as SwatchIndicator } from './color-picker-swatch-indicator'
+import { ColorPickerSwatchTrigger as SwatchTrigger } from './color-picker-swatch-trigger'
+import { ColorPickerTransparencyGrid as TransparencyGrid } from './color-picker-transparency-grid'
+import { ColorPickerTrigger as Trigger } from './color-picker-trigger'
+import { ColorPickerValueText as ValueText } from './color-picker-value-text'
+import { ColorPickerView as View } from './color-picker-view'
+
+export {
+  Area,
+  AreaBackground,
+  AreaThumb,
+  ChannelInput,
+  ChannelSlider,
+  ChannelSliderThumb,
+  ChannelSliderTrack,
+  Content,
+  Control,
+  EyeDropperTrigger,
+  FormatSelect,
+  FormatTrigger,
+  Label,
+  Positioner,
+  Root,
+  Swatch,
+  SwatchGroup,
+  SwatchIndicator,
+  SwatchTrigger,
+  TransparencyGrid,
+  Trigger,
+  ValueText,
+  View,
+}
diff --git a/packages/frameworks/vue/src/color-picker/index.ts b/packages/frameworks/vue/src/color-picker/index.ts
index 574e9b77f6..ab0db29cf1 100644
--- a/packages/frameworks/vue/src/color-picker/index.ts
+++ b/packages/frameworks/vue/src/color-picker/index.ts
@@ -70,31 +70,8 @@ import { ColorPickerTrigger, type ColorPickerTriggerProps } from './color-picker
 import { ColorPickerValueText, type ColorPickerValueTextProps } from './color-picker-value-text'
 import { ColorPickerView, type ColorPickerViewProps } from './color-picker-view'
 
-export const ColorPicker = {
-  Root: ColorPickerRoot,
-  Area: ColorPickerArea,
-  AreaBackground: ColorPickerAreaBackground,
-  AreaThumb: ColorPickerAreaThumb,
-  ChannelInput: ColorPickerChannelInput,
-  ChannelSlider: ColorPickerChannelSlider,
-  ChannelSliderThumb: ColorPickerChannelSliderThumb,
-  ChannelSliderTrack: ColorPickerChannelSliderTrack,
-  Content: ColorPickerContent,
-  Control: ColorPickerControl,
-  EyeDropperTrigger: ColorPickerEyeDropperTrigger,
-  FormatTrigger: ColorPickerFormatTrigger,
-  FormatSelect: ColorPickerFormatSelect,
-  Label: ColorPickerLabel,
-  Positioner: ColorPickerPositioner,
-  Swatch: ColorPickerSwatch,
-  SwatchGroup: ColorPickerSwatchGroup,
-  SwatchIndicator: ColorPickerSwatchIndicator,
-  SwatchTrigger: ColorPickerSwatchTrigger,
-  TransparencyGrid: ColorPickerTransparencyGrid,
-  Trigger: ColorPickerTrigger,
-  ValueText: ColorPickerValueText,
-  View: ColorPickerView,
-}
+export * as ColorPicker from './color-picker'
+
 export {
   ColorPickerArea,
   ColorPickerAreaBackground,
diff --git a/packages/frameworks/vue/src/combobox/combobox.tsx b/packages/frameworks/vue/src/combobox/combobox.tsx
new file mode 100644
index 0000000000..c9d29be1d9
--- /dev/null
+++ b/packages/frameworks/vue/src/combobox/combobox.tsx
@@ -0,0 +1,29 @@
+import { ComboboxClearTrigger as ClearTrigger } from './combobox-clear-trigger'
+import { ComboboxContent as Content } from './combobox-content'
+import { ComboboxControl as Control } from './combobox-control'
+import { ComboboxInput as Input } from './combobox-input'
+import { ComboboxItem as Item } from './combobox-item'
+import { ComboboxItemGroup as ItemGroup } from './combobox-item-group'
+import { ComboboxItemGroupLabel as ItemGroupLabel } from './combobox-item-group-label'
+import { ComboboxItemIndicator as ItemIndicator } from './combobox-item-indicator'
+import { ComboboxItemText as ItemText } from './combobox-item-text'
+import { ComboboxLabel as Label } from './combobox-label'
+import { ComboboxPositioner as Positioner } from './combobox-positioner'
+import { ComboboxRoot as Root } from './combobox-root'
+import { ComboboxTrigger as Trigger } from './combobox-trigger'
+
+export {
+  ClearTrigger,
+  Content,
+  Control,
+  Input,
+  Item,
+  ItemGroup,
+  ItemGroupLabel,
+  ItemIndicator,
+  ItemText,
+  Label,
+  Positioner,
+  Root,
+  Trigger,
+}
diff --git a/packages/frameworks/vue/src/combobox/index.ts b/packages/frameworks/vue/src/combobox/index.ts
index 3f495750d8..1793c37921 100644
--- a/packages/frameworks/vue/src/combobox/index.ts
+++ b/packages/frameworks/vue/src/combobox/index.ts
@@ -23,21 +23,7 @@ import { ComboboxPositioner, type ComboboxPositionerProps } from './combobox-pos
 import { ComboboxRoot, type ComboboxRootProps } from './combobox-root'
 import { ComboboxTrigger, type ComboboxTriggerProps } from './combobox-trigger'
 
-export const Combobox = {
-  Root: ComboboxRoot,
-  ClearTrigger: ComboboxClearTrigger,
-  Content: ComboboxContent,
-  Control: ComboboxControl,
-  Input: ComboboxInput,
-  Item: ComboboxItem,
-  ItemGroup: ComboboxItemGroup,
-  ItemGroupLabel: ComboboxItemGroupLabel,
-  ItemIndicator: ComboboxItemIndicator,
-  ItemText: ComboboxItemText,
-  Label: ComboboxLabel,
-  Positioner: ComboboxPositioner,
-  Trigger: ComboboxTrigger,
-}
+export * as Combobox from './combobox'
 
 export {
   ComboboxClearTrigger,
diff --git a/packages/frameworks/vue/src/date-picker/date-picker.tsx b/packages/frameworks/vue/src/date-picker/date-picker.tsx
new file mode 100644
index 0000000000..75fa854b3f
--- /dev/null
+++ b/packages/frameworks/vue/src/date-picker/date-picker.tsx
@@ -0,0 +1,49 @@
+import { DatePickerClearTrigger as ClearTrigger } from './date-picker-clear-trigger'
+import { DatePickerContent as Content } from './date-picker-content'
+import { DatePickerControl as Control } from './date-picker-control'
+import { DatePickerInput as Input } from './date-picker-input'
+import { DatePickerLabel as Label } from './date-picker-label'
+import { DatePickerMonthSelect as MonthSelect } from './date-picker-month-select'
+import { DatePickerNextTrigger as NextTrigger } from './date-picker-next-trigger'
+import { DatePickerPositioner as Positioner } from './date-picker-positioner'
+import { DatePickerPrevTrigger as PrevTrigger } from './date-picker-prev-trigger'
+import { DatePickerRangeText as RangeText } from './date-picker-range-text'
+import { DatePickerRoot as Root } from './date-picker-root'
+import { DatePickerTable as Table } from './date-picker-table'
+import { DatePickerTableBody as TableBody } from './date-picker-table-body'
+import { DatePickerTableCell as TableCell } from './date-picker-table-cell'
+import { DatePickerTableCellTrigger as TableCellTrigger } from './date-picker-table-cell-trigger'
+import { DatePickerTableHead as TableHead } from './date-picker-table-head'
+import { DatePickerTableHeader as TableHeader } from './date-picker-table-header'
+import { DatePickerTableRow as TableRow } from './date-picker-table-row'
+import { DatePickerTrigger as Trigger } from './date-picker-trigger'
+import { DatePickerView as View } from './date-picker-view'
+import { DatePickerViewControl as ViewControl } from './date-picker-view-control'
+import { DatePickerViewTrigger as ViewTrigger } from './date-picker-view-trigger'
+import { DatePickerYearSelect as YearSelect } from './date-picker-year-select'
+
+export {
+  ClearTrigger,
+  Content,
+  Control,
+  Input,
+  Label,
+  MonthSelect,
+  NextTrigger,
+  Positioner,
+  PrevTrigger,
+  RangeText,
+  Root,
+  Table,
+  TableBody,
+  TableCell,
+  TableCellTrigger,
+  TableHead,
+  TableHeader,
+  TableRow,
+  Trigger,
+  View,
+  ViewControl,
+  ViewTrigger,
+  YearSelect,
+}
diff --git a/packages/frameworks/vue/src/date-picker/index.ts b/packages/frameworks/vue/src/date-picker/index.ts
index 38cb2eea1c..2c9cbbd3f5 100644
--- a/packages/frameworks/vue/src/date-picker/index.ts
+++ b/packages/frameworks/vue/src/date-picker/index.ts
@@ -41,31 +41,7 @@ import { DatePickerViewControl, type DatePickerViewControlProps } from './date-p
 import { DatePickerViewTrigger, type DatePickerViewTriggerProps } from './date-picker-view-trigger'
 import { DatePickerYearSelect, type DatePickerYearSelectProps } from './date-picker-year-select'
 
-export const DatePicker = {
-  Root: DatePickerRoot,
-  ClearTrigger: DatePickerClearTrigger,
-  Content: DatePickerContent,
-  Control: DatePickerControl,
-  Input: DatePickerInput,
-  Label: DatePickerLabel,
-  MonthSelect: DatePickerMonthSelect,
-  NextTrigger: DatePickerNextTrigger,
-  Positioner: DatePickerPositioner,
-  PrevTrigger: DatePickerPrevTrigger,
-  RangeText: DatePickerRangeText,
-  Table: DatePickerTable,
-  TableBody: DatePickerTableBody,
-  TableCell: DatePickerTableCell,
-  TableCellTrigger: DatePickerTableCellTrigger,
-  TableHead: DatePickerTableHead,
-  TableHeader: DatePickerTableHeader,
-  TableRow: DatePickerTableRow,
-  Trigger: DatePickerTrigger,
-  View: DatePickerView,
-  ViewControl: DatePickerViewControl,
-  ViewTrigger: DatePickerViewTrigger,
-  YearSelect: DatePickerYearSelect,
-}
+export * as DatePicker from './date-picker'
 
 export {
   DatePickerClearTrigger,
diff --git a/packages/frameworks/vue/src/dialog/dialog.tsx b/packages/frameworks/vue/src/dialog/dialog.tsx
new file mode 100644
index 0000000000..c206dbf5fa
--- /dev/null
+++ b/packages/frameworks/vue/src/dialog/dialog.tsx
@@ -0,0 +1,10 @@
+import { DialogBackdrop as Backdrop } from './dialog-backdrop'
+import { DialogCloseTrigger as CloseTrigger } from './dialog-close-trigger'
+import { DialogContent as Content } from './dialog-content'
+import { DialogDescription as Description } from './dialog-description'
+import { DialogPositioner as Positioner } from './dialog-positioner'
+import { DialogRoot as Root } from './dialog-root'
+import { DialogTitle as Title } from './dialog-title'
+import { DialogTrigger as Trigger } from './dialog-trigger'
+
+export { Backdrop, CloseTrigger, Content, Description, Positioner, Root, Title, Trigger }
diff --git a/packages/frameworks/vue/src/dialog/index.ts b/packages/frameworks/vue/src/dialog/index.ts
index 720ace9d0b..93da988526 100644
--- a/packages/frameworks/vue/src/dialog/index.ts
+++ b/packages/frameworks/vue/src/dialog/index.ts
@@ -9,16 +9,7 @@ import { DialogRoot, type DialogRootProps } from './dialog-root'
 import { DialogTitle, type DialogTitleProps } from './dialog-title'
 import { DialogTrigger, type DialogTriggerProps } from './dialog-trigger'
 
-export const Dialog = {
-  Root: DialogRoot,
-  Backdrop: DialogBackdrop,
-  CloseTrigger: DialogCloseTrigger,
-  Positioner: DialogPositioner,
-  Content: DialogContent,
-  Description: DialogDescription,
-  Title: DialogTitle,
-  Trigger: DialogTrigger,
-}
+export * as Dialog from './dialog'
 
 export {
   DialogBackdrop,
diff --git a/packages/frameworks/vue/src/editable/editable.tsx b/packages/frameworks/vue/src/editable/editable.tsx
new file mode 100644
index 0000000000..877ab8ad3e
--- /dev/null
+++ b/packages/frameworks/vue/src/editable/editable.tsx
@@ -0,0 +1,11 @@
+import { EditableArea as Area } from './editable-area'
+import { EditableCancelTrigger as CancelTrigger } from './editable-cancel-trigger'
+import { EditableControl as Control } from './editable-control'
+import { EditableEditTrigger as EditTrigger } from './editable-edit-trigger'
+import { EditableInput as Input } from './editable-input'
+import { EditableLabel as Label } from './editable-label'
+import { EditablePreview as Preview } from './editable-preview'
+import { EditableRoot as Root } from './editable-root'
+import { EditableSubmitTrigger as SubmitTrigger } from './editable-submit-trigger'
+
+export { Area, CancelTrigger, Control, EditTrigger, Input, Label, Preview, Root, SubmitTrigger }
diff --git a/packages/frameworks/vue/src/editable/index.ts b/packages/frameworks/vue/src/editable/index.ts
index 6d1e373fb3..94322cd1ee 100644
--- a/packages/frameworks/vue/src/editable/index.ts
+++ b/packages/frameworks/vue/src/editable/index.ts
@@ -10,17 +10,7 @@ import { EditablePreview, type EditablePreviewProps } from './editable-preview'
 import { EditableRoot, type EditableRootProps } from './editable-root'
 import { EditableSubmitTrigger, type EditableSubmitTriggerProps } from './editable-submit-trigger'
 
-export const Editable = {
-  Root: EditableRoot,
-  Area: EditableArea,
-  CancelTrigger: EditableCancelTrigger,
-  Control: EditableControl,
-  EditTrigger: EditableEditTrigger,
-  Input: EditableInput,
-  Label: EditableLabel,
-  Preview: EditablePreview,
-  SubmitTrigger: EditableSubmitTrigger,
-}
+export * as Editable from './editable'
 
 export {
   EditableArea,
diff --git a/packages/frameworks/vue/src/file-upload/file-upload.tsx b/packages/frameworks/vue/src/file-upload/file-upload.tsx
new file mode 100644
index 0000000000..9e8d9f907f
--- /dev/null
+++ b/packages/frameworks/vue/src/file-upload/file-upload.tsx
@@ -0,0 +1,25 @@
+import { FileUploadDropzone as Dropzone } from './file-upload-dropzone'
+import { FileUploadItem as Item } from './file-upload-item'
+import { FileUploadItemDeleteTrigger as ItemDeleteTrigger } from './file-upload-item-delete-trigger'
+import { FileUploadItemGroup as ItemGroup } from './file-upload-item-group'
+import { FileUploadItemName as ItemName } from './file-upload-item-name'
+import { FileUploadItemPreview as ItemPreview } from './file-upload-item-preview'
+import { FileUploadItemPreviewImage as ItemPreviewImage } from './file-upload-item-preview-image'
+import { FileUploadItemSizeText as ItemSizeText } from './file-upload-item-size-text'
+import { FileUploadLabel as Label } from './file-upload-label'
+import { FileUploadRoot as Root } from './file-upload-root'
+import { FileUploadTrigger as Trigger } from './file-upload-trigger'
+
+export {
+  Dropzone,
+  Item,
+  ItemDeleteTrigger,
+  ItemGroup,
+  ItemName,
+  ItemPreview,
+  ItemPreviewImage,
+  ItemSizeText,
+  Label,
+  Root,
+  Trigger,
+}
diff --git a/packages/frameworks/vue/src/file-upload/index.ts b/packages/frameworks/vue/src/file-upload/index.ts
index b25528d43a..17331b5410 100644
--- a/packages/frameworks/vue/src/file-upload/index.ts
+++ b/packages/frameworks/vue/src/file-upload/index.ts
@@ -25,19 +25,7 @@ import { FileUploadLabel, type FileUploadLabelProps } from './file-upload-label'
 import { FileUploadRoot, type FileUploadRootProps } from './file-upload-root'
 import { FileUploadTrigger, type FileUploadTriggerProps } from './file-upload-trigger'
 
-export const FileUpload = {
-  Root: FileUploadRoot,
-  Dropzone: FileUploadDropzone,
-  Item: FileUploadItem,
-  ItemDeleteTrigger: FileUploadItemDeleteTrigger,
-  ItemGroup: FileUploadItemGroup,
-  ItemName: FileUploadItemName,
-  ItemPreview: FileUploadItemPreview,
-  ItemPreviewImage: FileUploadItemPreviewImage,
-  ItemSizeText: FileUploadItemSizeText,
-  Label: FileUploadLabel,
-  Trigger: FileUploadTrigger,
-}
+export * as FileUpload from './file-upload'
 
 export {
   FileUploadDropzone,
@@ -45,6 +33,7 @@ export {
   FileUploadItemDeleteTrigger,
   FileUploadItemGroup,
   FileUploadItemName,
+  FileUploadItemPreview,
   FileUploadItemPreviewImage,
   FileUploadItemSizeText,
   FileUploadLabel,
diff --git a/packages/frameworks/vue/src/hover-card/hover-card.tsx b/packages/frameworks/vue/src/hover-card/hover-card.tsx
new file mode 100644
index 0000000000..bad637252b
--- /dev/null
+++ b/packages/frameworks/vue/src/hover-card/hover-card.tsx
@@ -0,0 +1,8 @@
+import { HoverCardArrow as Arrow } from './hover-card-arrow'
+import { HoverCardArrowTip as ArrowTip } from './hover-card-arrow-tip'
+import { HoverCardContent as Content } from './hover-card-content'
+import { HoverCardPositioner as Positioner } from './hover-card-positioner'
+import { HoverCardRoot as Root } from './hover-card-root'
+import { HoverCardTrigger as Trigger } from './hover-card-trigger'
+
+export { Arrow, ArrowTip, Content, Positioner, Root, Trigger }
diff --git a/packages/frameworks/vue/src/hover-card/index.ts b/packages/frameworks/vue/src/hover-card/index.ts
index 0d21975453..031cf43916 100644
--- a/packages/frameworks/vue/src/hover-card/index.ts
+++ b/packages/frameworks/vue/src/hover-card/index.ts
@@ -1,4 +1,4 @@
-import type { OpenChangeDetails as HoverCardOpenChangeDetails } from '@zag-js/color-picker'
+import type { OpenChangeDetails as HoverCardOpenChangeDetails } from '@zag-js/hover-card'
 import { HoverCardArrow, type HoverCardArrowProps } from './hover-card-arrow'
 import { HoverCardArrowTip, type HoverCardArrowTipProps } from './hover-card-arrow-tip'
 import { HoverCardContent, type HoverCardContentProps } from './hover-card-content'
@@ -7,14 +7,7 @@ import { HoverCardPositioner, type HoverCardPositionerProps } from './hover-card
 import { HoverCardRoot, type HoverCardRootProps } from './hover-card-root'
 import { HoverCardTrigger, type HoverCardTriggerProps } from './hover-card-trigger'
 
-export const HoverCard = {
-  Root: HoverCardRoot,
-  Arrow: HoverCardArrow,
-  ArrowTip: HoverCardArrowTip,
-  Content: HoverCardContent,
-  Positioner: HoverCardPositioner,
-  Trigger: HoverCardTrigger,
-}
+export * as HoverCard from './hover-card'
 
 export {
   HoverCardArrow,
diff --git a/packages/frameworks/vue/src/index.ts b/packages/frameworks/vue/src/index.ts
index 58cd734e06..4713eb79ce 100644
--- a/packages/frameworks/vue/src/index.ts
+++ b/packages/frameworks/vue/src/index.ts
@@ -8,6 +8,7 @@ export * from './date-picker'
 export * from './dialog'
 export * from './editable'
 export * from './environment'
+export * from './factory'
 export * from './file-upload'
 export * from './hover-card'
 export * from './menu'
diff --git a/packages/frameworks/vue/src/menu/index.ts b/packages/frameworks/vue/src/menu/index.ts
index d23b091da1..ac6c819c2c 100644
--- a/packages/frameworks/vue/src/menu/index.ts
+++ b/packages/frameworks/vue/src/menu/index.ts
@@ -17,21 +17,7 @@ import { MenuSeparator, type MenuSeparatorProps } from './menu-separator'
 import { MenuTrigger, type MenuTriggerProps } from './menu-trigger'
 import { MenuTriggerItem, type MenuTriggerItemProps } from './menu-trigger-item'
 
-export const Menu = {
-  Root: MenuRoot,
-  Arrow: MenuArrow,
-  ArrowTip: MenuArrowTip,
-  Content: MenuContent,
-  ContextTrigger: MenuContextTrigger,
-  Item: MenuItem,
-  ItemGroup: MenuItemGroup,
-  ItemGroupLabel: MenuItemGroupLabel,
-  OptionItem: MenuOptionItem,
-  Positioner: MenuPositioner,
-  Separator: MenuSeparator,
-  Trigger: MenuTrigger,
-  TriggerItem: MenuTriggerItem,
-}
+export * as Menu from './menu'
 
 export {
   MenuArrow,
diff --git a/packages/frameworks/vue/src/menu/menu.tsx b/packages/frameworks/vue/src/menu/menu.tsx
new file mode 100644
index 0000000000..9b78f748f3
--- /dev/null
+++ b/packages/frameworks/vue/src/menu/menu.tsx
@@ -0,0 +1,29 @@
+import { MenuArrow as Arrow } from './menu-arrow'
+import { MenuArrowTip as ArrowTip } from './menu-arrow-tip'
+import { MenuContent as Content } from './menu-content'
+import { MenuContextTrigger as ContextTrigger } from './menu-context-trigger'
+import { MenuItem as Item } from './menu-item'
+import { MenuItemGroup as ItemGroup } from './menu-item-group'
+import { MenuItemGroupLabel as ItemGroupLabel } from './menu-item-group-label'
+import { MenuOptionItem as OptionItem } from './menu-option-item'
+import { MenuPositioner as Positioner } from './menu-positioner'
+import { MenuRoot as Root } from './menu-root'
+import { MenuSeparator as Separator } from './menu-separator'
+import { MenuTrigger as Trigger } from './menu-trigger'
+import { MenuTriggerItem as TriggerItem } from './menu-trigger-item'
+
+export {
+  Arrow,
+  ArrowTip,
+  Content,
+  ContextTrigger,
+  Item,
+  ItemGroup,
+  ItemGroupLabel,
+  OptionItem,
+  Positioner,
+  Root,
+  Separator,
+  Trigger,
+  TriggerItem,
+}
diff --git a/packages/frameworks/vue/src/number-input/index.ts b/packages/frameworks/vue/src/number-input/index.ts
index db78ef0baa..9a997ca073 100644
--- a/packages/frameworks/vue/src/number-input/index.ts
+++ b/packages/frameworks/vue/src/number-input/index.ts
@@ -18,15 +18,7 @@ import { NumberInputLabel, type NumberInputLabelProps } from './number-input-lab
 import { NumberInputRoot, type NumberInputRootProps } from './number-input-root'
 import { NumberInputScrubber, type NumberInputScrubberProps } from './number-input-scrubber'
 
-export const NumberInput = {
-  Root: NumberInputRoot,
-  Control: NumberInputControl,
-  DecrementTrigger: NumberInputDecrementTrigger,
-  Input: NumberInputInput,
-  IncrementTrigger: NumberInputIncrementTrigger,
-  Label: NumberInputLabel,
-  Scrubber: NumberInputScrubber,
-}
+export * as NumberInput from './number-input'
 
 export {
   NumberInputControl,
diff --git a/packages/frameworks/vue/src/number-input/number-input.tsx b/packages/frameworks/vue/src/number-input/number-input.tsx
new file mode 100644
index 0000000000..fd5140ad1d
--- /dev/null
+++ b/packages/frameworks/vue/src/number-input/number-input.tsx
@@ -0,0 +1,9 @@
+import { NumberInputControl as Control } from './number-input-control'
+import { NumberInputDecrementTrigger as DecrementTrigger } from './number-input-decrement-trigger'
+import { NumberInputIncrementTrigger as IncrementTrigger } from './number-input-increment-trigger'
+import { NumberInputInput as Input } from './number-input-input'
+import { NumberInputLabel as Label } from './number-input-label'
+import { NumberInputRoot as Root } from './number-input-root'
+import { NumberInputScrubber as Scrubber } from './number-input-scrubber'
+
+export { Control, DecrementTrigger, IncrementTrigger, Input, Label, Root, Scrubber }
diff --git a/packages/frameworks/vue/src/pagination/index.ts b/packages/frameworks/vue/src/pagination/index.ts
index 1d3941aa02..de5b13174a 100644
--- a/packages/frameworks/vue/src/pagination/index.ts
+++ b/packages/frameworks/vue/src/pagination/index.ts
@@ -9,13 +9,7 @@ import { PaginationNextTrigger, type PaginationNextTriggerProps } from './pagina
 import { PaginationPrevTrigger, type PaginationPrevTriggerProps } from './pagination-prev-trigger'
 import { PaginationRoot, type PaginationRootProps } from './pagination-root'
 
-export const Pagination = {
-  Root: PaginationRoot,
-  Ellipsis: PaginationEllipsis,
-  Item: PaginationItem,
-  NextTrigger: PaginationNextTrigger,
-  PrevTrigger: PaginationPrevTrigger,
-}
+export * as Pagination from './pagination'
 
 export {
   PaginationEllipsis,
diff --git a/packages/frameworks/vue/src/pagination/pagination.tsx b/packages/frameworks/vue/src/pagination/pagination.tsx
new file mode 100644
index 0000000000..48575b4c7b
--- /dev/null
+++ b/packages/frameworks/vue/src/pagination/pagination.tsx
@@ -0,0 +1,7 @@
+import { PaginationEllipsis as Ellipsis } from './pagination-ellipsis'
+import { PaginationItem as Item } from './pagination-item'
+import { PaginationNextTrigger as NextTrigger } from './pagination-next-trigger'
+import { PaginationPrevTrigger as PrevTrigger } from './pagination-prev-trigger'
+import { PaginationRoot as Root } from './pagination-root'
+
+export { Ellipsis, Item, NextTrigger, PrevTrigger, Root }
diff --git a/packages/frameworks/vue/src/pin-input/index.ts b/packages/frameworks/vue/src/pin-input/index.ts
index d3f5763313..f5ce11d52d 100644
--- a/packages/frameworks/vue/src/pin-input/index.ts
+++ b/packages/frameworks/vue/src/pin-input/index.ts
@@ -8,12 +8,7 @@ import { PinInputInput, type PinInputInputProps } from './pin-input-input'
 import { PinInputLabel, type PinInputLabelProps } from './pin-input-label'
 import { PinInputRoot, type PinInputRootProps } from './pin-input-root'
 
-export const PinInput = {
-  Root: PinInputRoot,
-  Control: PinInputControl,
-  Input: PinInputInput,
-  Label: PinInputLabel,
-}
+export * as PinInput from './pin-input'
 
 export { PinInputControl, PinInputInput, PinInputLabel, PinInputRoot, usePinInputContext }
 
diff --git a/packages/frameworks/vue/src/pin-input/pin-input.tsx b/packages/frameworks/vue/src/pin-input/pin-input.tsx
new file mode 100644
index 0000000000..3dca21afc8
--- /dev/null
+++ b/packages/frameworks/vue/src/pin-input/pin-input.tsx
@@ -0,0 +1,6 @@
+import { PinInputControl as Control } from './pin-input-control'
+import { PinInputInput as Input } from './pin-input-input'
+import { PinInputLabel as Label } from './pin-input-label'
+import { PinInputRoot as Root } from './pin-input-root'
+
+export { Control, Input, Label, Root }
diff --git a/packages/frameworks/vue/src/popover/index.ts b/packages/frameworks/vue/src/popover/index.ts
index 93b331aaff..fc682051d7 100644
--- a/packages/frameworks/vue/src/popover/index.ts
+++ b/packages/frameworks/vue/src/popover/index.ts
@@ -12,19 +12,7 @@ import { PopoverRoot, type PopoverRootProps } from './popover-root'
 import { PopoverTitle, type PopoverTitleProps } from './popover-title'
 import { PopoverTrigger, type PopoverTriggerProps } from './popover-trigger'
 
-export const Popover = {
-  Root: PopoverRoot,
-  Anchor: PopoverAnchor,
-  Arrow: PopoverArrow,
-  ArrowTip: PopoverArrowTip,
-  CloseTrigger: PopoverCloseTrigger,
-  Content: PopoverContent,
-  Description: PopoverDescription,
-  Indicator: PopoverIndicator,
-  Positioner: PopoverPositioner,
-  Title: PopoverTitle,
-  Trigger: PopoverTrigger,
-}
+export * as Popover from './popover'
 
 export {
   PopoverAnchor,
diff --git a/packages/frameworks/vue/src/popover/popover.tsx b/packages/frameworks/vue/src/popover/popover.tsx
new file mode 100644
index 0000000000..096de278b2
--- /dev/null
+++ b/packages/frameworks/vue/src/popover/popover.tsx
@@ -0,0 +1,25 @@
+import { PopoverAnchor as Anchor } from './popover-anchor'
+import { PopoverArrow as Arrow } from './popover-arrow'
+import { PopoverArrowTip as ArrowTip } from './popover-arrow-tip'
+import { PopoverCloseTrigger as CloseTrigger } from './popover-close-trigger'
+import { PopoverContent as Content } from './popover-content'
+import { PopoverDescription as Description } from './popover-description'
+import { PopoverIndicator as Indicator } from './popover-indicator'
+import { PopoverPositioner as Positioner } from './popover-positioner'
+import { PopoverRoot as Root } from './popover-root'
+import { PopoverTitle as Title } from './popover-title'
+import { PopoverTrigger as Trigger } from './popover-trigger'
+
+export {
+  Anchor,
+  Arrow,
+  ArrowTip,
+  CloseTrigger,
+  Content,
+  Description,
+  Indicator,
+  Positioner,
+  Root,
+  Title,
+  Trigger,
+}
diff --git a/packages/frameworks/vue/src/progress/index.ts b/packages/frameworks/vue/src/progress/index.ts
index 0ffd55f130..e1bd019759 100644
--- a/packages/frameworks/vue/src/progress/index.ts
+++ b/packages/frameworks/vue/src/progress/index.ts
@@ -9,17 +9,7 @@ import { ProgressTrack, type ProgressTrackProps } from './progress-track'
 import { ProgressValueText, type ProgressValueTextProps } from './progress-value-text'
 import { ProgressView, type ProgressViewProps } from './progress-view'
 
-export const Progress = {
-  Root: ProgressRoot,
-  Label: ProgressLabel,
-  Track: ProgressTrack,
-  Range: ProgressRange,
-  ValueText: ProgressValueText,
-  View: ProgressView,
-  Circle: ProgressCircle,
-  CircleTrack: ProgressCircleTrack,
-  CircleRange: ProgressCircleRange,
-}
+export * as Progress from './progress'
 
 export {
   ProgressCircle,
diff --git a/packages/frameworks/vue/src/progress/progress.tsx b/packages/frameworks/vue/src/progress/progress.tsx
new file mode 100644
index 0000000000..15341a0c61
--- /dev/null
+++ b/packages/frameworks/vue/src/progress/progress.tsx
@@ -0,0 +1,11 @@
+import { ProgressCircle as Circle } from './progress-circle'
+import { ProgressCircleRange as CircleRange } from './progress-circle-range'
+import { ProgressCircleTrack as CircleTrack } from './progress-circle-track'
+import { ProgressLabel as Label } from './progress-label'
+import { ProgressRange as Range } from './progress-range'
+import { ProgressRoot as Root } from './progress-root'
+import { ProgressTrack as Track } from './progress-track'
+import { ProgressValueText as ValueText } from './progress-value-text'
+import { ProgressView as View } from './progress-view'
+
+export { Circle, CircleRange, CircleTrack, Label, Range, Root, Track, ValueText, View }
diff --git a/packages/frameworks/vue/src/radio-group/index.ts b/packages/frameworks/vue/src/radio-group/index.ts
index d2e7b147d0..2c1ad1511f 100644
--- a/packages/frameworks/vue/src/radio-group/index.ts
+++ b/packages/frameworks/vue/src/radio-group/index.ts
@@ -8,16 +8,10 @@ import { RadioGroupItemText, type RadioGroupItemTextProps } from './radio-group-
 import { RadioGroupLabel, type RadioGroupLabelProps } from './radio-group-label'
 import { RadioGroupRoot, type RadioGroupRootProps } from './radio-group-root'
 
-export const RadioGroup = {
-  Root: RadioGroupRoot,
-  Indicator: RadioGroupIndicator,
-  Item: RadioGroupItem,
-  ItemControl: RadioGroupItemControl,
-  ItemText: RadioGroupItemText,
-  Label: RadioGroupLabel,
-}
+export * as RadioGroup from './radio-group'
 
 export {
+  RadioGroupIndicator,
   RadioGroupItem,
   RadioGroupItemControl,
   RadioGroupItemText,
diff --git a/packages/frameworks/vue/src/radio-group/radio-group.tsx b/packages/frameworks/vue/src/radio-group/radio-group.tsx
new file mode 100644
index 0000000000..a901d9b6e4
--- /dev/null
+++ b/packages/frameworks/vue/src/radio-group/radio-group.tsx
@@ -0,0 +1,8 @@
+import { RadioGroupIndicator as Indicator } from './radio-group-indicator'
+import { RadioGroupItem as Item } from './radio-group-item'
+import { RadioGroupItemControl as ItemControl } from './radio-group-item-control'
+import { RadioGroupItemText as ItemText } from './radio-group-item-text'
+import { RadioGroupLabel as Label } from './radio-group-label'
+import { RadioGroupRoot as Root } from './radio-group-root'
+
+export { Indicator, Item, ItemControl, ItemText, Label, Root }
diff --git a/packages/frameworks/vue/src/rating-group/index.ts b/packages/frameworks/vue/src/rating-group/index.ts
index 25bd04c70c..ec448a1a2a 100644
--- a/packages/frameworks/vue/src/rating-group/index.ts
+++ b/packages/frameworks/vue/src/rating-group/index.ts
@@ -9,12 +9,7 @@ import { useRatingGroupItemContext, type RatingGroupItemContext } from './rating
 import { RatingGroupLabel, type RatingGroupLabelProps } from './rating-group-label'
 import { RatingGroupRoot, type RatingGroupRootProps } from './rating-group-root'
 
-export const RatingGroup = {
-  Root: RatingGroupRoot,
-  Control: RatingGroupControl,
-  Label: RatingGroupLabel,
-  Item: RatingGroupItem,
-}
+export * as RatingGroup from './rating-group'
 
 export {
   RatingGroupControl,
diff --git a/packages/frameworks/vue/src/rating-group/rating-group.tsx b/packages/frameworks/vue/src/rating-group/rating-group.tsx
new file mode 100644
index 0000000000..dac5b7e22c
--- /dev/null
+++ b/packages/frameworks/vue/src/rating-group/rating-group.tsx
@@ -0,0 +1,6 @@
+import { RatingGroupControl as Control } from './rating-group-control'
+import { RatingGroupItem as Item } from './rating-group-item'
+import { RatingGroupLabel as Label } from './rating-group-label'
+import { RatingGroupRoot as Root } from './rating-group-root'
+
+export { Control, Item, Label, Root }
diff --git a/packages/frameworks/vue/src/segment-group/index.ts b/packages/frameworks/vue/src/segment-group/index.ts
index aeca3d3a61..1c68d2d403 100644
--- a/packages/frameworks/vue/src/segment-group/index.ts
+++ b/packages/frameworks/vue/src/segment-group/index.ts
@@ -1,5 +1,4 @@
 import type { ValueChangeDetails as SegmentGroupValueChangeDetails } from '@zag-js/radio-group'
-import { SegmentGroupRoot, type SegmentGroupRootProps } from './segment-group'
 import { useSegmentGroupContext, type SegmentGroupContext } from './segment-group-context'
 import { SegmentGroupIndicator, type SegmentGroupIndicatorProps } from './segment-group-indicator'
 import { SegmentGroupItem, type SegmentGroupItemProps } from './segment-group-item'
@@ -13,15 +12,9 @@ import {
 } from './segment-group-item-control'
 import { SegmentGroupItemText, type SegmentGroupItemTextProps } from './segment-group-item-text'
 import { SegmentGroupLabel, type SegmentGroupLabelProps } from './segment-group-label'
+import { SegmentGroupRoot, type SegmentGroupRootProps } from './segment-group-root'
 
-export const SegmentGroup = {
-  Root: SegmentGroupRoot,
-  Indicator: SegmentGroupIndicator,
-  Item: SegmentGroupItem,
-  ItemControl: SegmentGroupItemControl,
-  ItemText: SegmentGroupItemText,
-  Label: SegmentGroupLabel,
-}
+export * as SegmentGroup from './segment-group'
 
 export {
   SegmentGroupIndicator,
diff --git a/packages/frameworks/vue/src/segment-group/segment-group-root.tsx b/packages/frameworks/vue/src/segment-group/segment-group-root.tsx
new file mode 100644
index 0000000000..a237165492
--- /dev/null
+++ b/packages/frameworks/vue/src/segment-group/segment-group-root.tsx
@@ -0,0 +1,27 @@
+import { segmentGroupAnatomy } from '@ark-ui/anatomy'
+import { defineComponent } from 'vue'
+import { ark, type HTMLArkProps } from '../factory'
+import { type Assign } from '../types'
+import { SegmentGroupProvider } from './segment-group-context'
+import { emits, props } from './segment-group.props'
+import { useSegmentGroup, type UseSegmentGroupProps } from './use-segment-group'
+
+export interface SegmentGroupRootProps extends Assign<HTMLArkProps<'div'>, UseSegmentGroupProps> {}
+
+export const SegmentGroupRoot = defineComponent<SegmentGroupRootProps>(
+  (props, { slots, attrs, emit }) => {
+    const api = useSegmentGroup(props, emit)
+    SegmentGroupProvider(api)
+
+    return () => (
+      <ark.div {...api.value.rootProps} {...segmentGroupAnatomy.build().root.attrs} {...attrs}>
+        {slots.default?.()}
+      </ark.div>
+    )
+  },
+  {
+    name: 'SegmentGroupRoot',
+    props,
+    emits,
+  },
+)
diff --git a/packages/frameworks/vue/src/segment-group/segment-group.tsx b/packages/frameworks/vue/src/segment-group/segment-group.tsx
index a237165492..c730ebe81a 100644
--- a/packages/frameworks/vue/src/segment-group/segment-group.tsx
+++ b/packages/frameworks/vue/src/segment-group/segment-group.tsx
@@ -1,27 +1,8 @@
-import { segmentGroupAnatomy } from '@ark-ui/anatomy'
-import { defineComponent } from 'vue'
-import { ark, type HTMLArkProps } from '../factory'
-import { type Assign } from '../types'
-import { SegmentGroupProvider } from './segment-group-context'
-import { emits, props } from './segment-group.props'
-import { useSegmentGroup, type UseSegmentGroupProps } from './use-segment-group'
+import { SegmentGroupIndicator as Indicator } from './segment-group-indicator'
+import { SegmentGroupItem as Item } from './segment-group-item'
+import { SegmentGroupItemControl as ItemControl } from './segment-group-item-control'
+import { SegmentGroupItemText as ItemText } from './segment-group-item-text'
+import { SegmentGroupLabel as Label } from './segment-group-label'
+import { SegmentGroupRoot as Root } from './segment-group-root'
 
-export interface SegmentGroupRootProps extends Assign<HTMLArkProps<'div'>, UseSegmentGroupProps> {}
-
-export const SegmentGroupRoot = defineComponent<SegmentGroupRootProps>(
-  (props, { slots, attrs, emit }) => {
-    const api = useSegmentGroup(props, emit)
-    SegmentGroupProvider(api)
-
-    return () => (
-      <ark.div {...api.value.rootProps} {...segmentGroupAnatomy.build().root.attrs} {...attrs}>
-        {slots.default?.()}
-      </ark.div>
-    )
-  },
-  {
-    name: 'SegmentGroupRoot',
-    props,
-    emits,
-  },
-)
+export { Indicator, Item, ItemControl, ItemText, Label, Root }
diff --git a/packages/frameworks/vue/src/select/index.ts b/packages/frameworks/vue/src/select/index.ts
index 3dc29192b3..a60123b734 100644
--- a/packages/frameworks/vue/src/select/index.ts
+++ b/packages/frameworks/vue/src/select/index.ts
@@ -21,22 +21,7 @@ import { SelectRoot, type SelectRootProps } from './select-root'
 import { SelectTrigger, type SelectTriggerProps } from './select-trigger'
 import { SelectValueText, type SelectValueTextProps } from './select-value-text'
 
-export const Select = {
-  Root: SelectRoot,
-  ClearTrigger: SelectClearTrigger,
-  Content: SelectContent,
-  Control: SelectControl,
-  Indicator: SelectIndicator,
-  Item: SelectItem,
-  ItemGroup: SelectItemGroup,
-  ItemGroupLabel: SelectItemGroupLabel,
-  ItemIndicator: SelectItemIndicator,
-  ItemText: SelectItemText,
-  Label: SelectLabel,
-  Positioner: SelectPositioner,
-  Trigger: SelectTrigger,
-  ValueText: SelectValueText,
-}
+export * as Select from './select'
 
 export {
   SelectClearTrigger,
diff --git a/packages/frameworks/vue/src/select/select.tsx b/packages/frameworks/vue/src/select/select.tsx
new file mode 100644
index 0000000000..f7968cca73
--- /dev/null
+++ b/packages/frameworks/vue/src/select/select.tsx
@@ -0,0 +1,31 @@
+import { SelectClearTrigger as ClearTrigger } from './select-clear-trigger'
+import { SelectContent as Content } from './select-content'
+import { SelectControl as Control } from './select-control'
+import { SelectIndicator as Indicator } from './select-indicator'
+import { SelectItem as Item } from './select-item'
+import { SelectItemGroup as ItemGroup } from './select-item-group'
+import { SelectItemGroupLabel as ItemGroupLabel } from './select-item-group-label'
+import { SelectItemIndicator as ItemIndicator } from './select-item-indicator'
+import { SelectItemText as ItemText } from './select-item-text'
+import { SelectLabel as Label } from './select-label'
+import { SelectPositioner as Positioner } from './select-positioner'
+import { SelectRoot as Root } from './select-root'
+import { SelectTrigger as Trigger } from './select-trigger'
+import { SelectValueText as ValueText } from './select-value-text'
+
+export {
+  ClearTrigger,
+  Content,
+  Control,
+  Indicator,
+  Item,
+  ItemGroup,
+  ItemGroupLabel,
+  ItemIndicator,
+  ItemText,
+  Label,
+  Positioner,
+  Root,
+  Trigger,
+  ValueText,
+}
diff --git a/packages/frameworks/vue/src/slider/index.ts b/packages/frameworks/vue/src/slider/index.ts
index c673b16c9e..13312836f1 100644
--- a/packages/frameworks/vue/src/slider/index.ts
+++ b/packages/frameworks/vue/src/slider/index.ts
@@ -13,17 +13,7 @@ import { SliderThumb, type SliderThumbProps } from './slider-thumb'
 import { SliderTrack, type SliderTrackProps } from './slider-track'
 import { SliderValueText, type SliderValueTextProps } from './slider-value-text'
 
-export const Slider = {
-  Root: SliderRoot,
-  Control: SliderControl,
-  Label: SliderLabel,
-  Marker: SliderMarker,
-  MarkerGroup: SliderMarkerGroup,
-  Range: SliderRange,
-  Thumb: SliderThumb,
-  Track: SliderTrack,
-  ValueText: SliderValueText,
-}
+export * as Slider from './slider'
 
 export {
   SliderControl,
diff --git a/packages/frameworks/vue/src/slider/slider.tsx b/packages/frameworks/vue/src/slider/slider.tsx
new file mode 100644
index 0000000000..e21e712c33
--- /dev/null
+++ b/packages/frameworks/vue/src/slider/slider.tsx
@@ -0,0 +1,11 @@
+import { SliderControl as Control } from './slider-control'
+import { SliderLabel as Label } from './slider-label'
+import { SliderMarker as Marker } from './slider-marker'
+import { SliderMarkerGroup as MarkerGroup } from './slider-marker-group'
+import { SliderRange as Range } from './slider-range'
+import { SliderRoot as Root } from './slider-root'
+import { SliderThumb as Thumb } from './slider-thumb'
+import { SliderTrack as Track } from './slider-track'
+import { SliderValueText as ValueText } from './slider-value-text'
+
+export { Control, Label, Marker, MarkerGroup, Range, Root, Thumb, Track, ValueText }
diff --git a/packages/frameworks/vue/src/splitter/index.ts b/packages/frameworks/vue/src/splitter/index.ts
index ec0ad92ac7..00801c21b9 100644
--- a/packages/frameworks/vue/src/splitter/index.ts
+++ b/packages/frameworks/vue/src/splitter/index.ts
@@ -4,13 +4,10 @@ import { SplitterPanel, type SplitterPanelProps } from './splitter-panel'
 import { SplitterResizeTrigger, type SplitterResizeTriggerProps } from './splitter-resize-trigger'
 import { SplitterRoot, type SplitterRootProps } from './splitter-root'
 
-export const Splitter = {
-  Root: SplitterRoot,
-  Panel: SplitterPanel,
-  ResizeTrigger: SplitterResizeTrigger,
-}
+export * as Splitter from './splitter'
 
 export { SplitterPanel, SplitterResizeTrigger, SplitterRoot, useSplitterContext }
+
 export type {
   SplitterContext,
   SplitterPanelProps,
diff --git a/packages/frameworks/vue/src/splitter/splitter.tsx b/packages/frameworks/vue/src/splitter/splitter.tsx
new file mode 100644
index 0000000000..a29f3ec40b
--- /dev/null
+++ b/packages/frameworks/vue/src/splitter/splitter.tsx
@@ -0,0 +1,5 @@
+import { SplitterPanel as Panel } from './splitter-panel'
+import { SplitterResizeTrigger as ResizeTrigger } from './splitter-resize-trigger'
+import { SplitterRoot as Root } from './splitter-root'
+
+export { Panel, ResizeTrigger, Root }
diff --git a/packages/frameworks/vue/src/switch/index.ts b/packages/frameworks/vue/src/switch/index.ts
index c3cf957872..f48727b5b7 100644
--- a/packages/frameworks/vue/src/switch/index.ts
+++ b/packages/frameworks/vue/src/switch/index.ts
@@ -5,12 +5,7 @@ import { SwitchLabel, type SwitchLabelProps } from './switch-label'
 import { SwitchRoot, type SwitchRootProps } from './switch-root'
 import { SwitchThumb, type SwitchThumbProps } from './switch-thumb'
 
-export const Switch = {
-  Root: SwitchRoot,
-  Control: SwitchControl,
-  Label: SwitchLabel,
-  Thumb: SwitchThumb,
-}
+export * as Switch from './switch'
 
 export { SwitchControl, SwitchLabel, SwitchRoot, SwitchThumb, useSwitchContext }
 
diff --git a/packages/frameworks/vue/src/switch/switch.tsx b/packages/frameworks/vue/src/switch/switch.tsx
new file mode 100644
index 0000000000..2fb3ee16c2
--- /dev/null
+++ b/packages/frameworks/vue/src/switch/switch.tsx
@@ -0,0 +1,6 @@
+import { SwitchControl as Control } from './switch-control'
+import { SwitchLabel as Label } from './switch-label'
+import { SwitchRoot as Root } from './switch-root'
+import { SwitchThumb as Thumb } from './switch-thumb'
+
+export { Control, Label, Root, Thumb }
diff --git a/packages/frameworks/vue/src/tabs/index.ts b/packages/frameworks/vue/src/tabs/index.ts
index c595b3ec49..120f1051b7 100644
--- a/packages/frameworks/vue/src/tabs/index.ts
+++ b/packages/frameworks/vue/src/tabs/index.ts
@@ -9,13 +9,7 @@ import { TabTrigger, type TabTriggerProps } from './tab-trigger'
 import { useTabsContext, type TabsContext } from './tabs-context'
 import { TabsRoot, type TabsRootProps } from './tabs-root'
 
-export const Tabs = {
-  Root: TabsRoot,
-  Content: TabContent,
-  Indicator: TabIndicator,
-  List: TabList,
-  Trigger: TabTrigger,
-}
+export * as Tabs from './tabs'
 
 export { TabContent, TabIndicator, TabList, TabTrigger, TabsRoot, useTabsContext }
 
diff --git a/packages/frameworks/vue/src/tabs/tabs.tsx b/packages/frameworks/vue/src/tabs/tabs.tsx
new file mode 100644
index 0000000000..93a72cbe9c
--- /dev/null
+++ b/packages/frameworks/vue/src/tabs/tabs.tsx
@@ -0,0 +1,7 @@
+import { TabContent as Content } from './tab-content'
+import { TabIndicator as Indicator } from './tab-indicator'
+import { TabList as List } from './tab-list'
+import { TabTrigger as Trigger } from './tab-trigger'
+import { TabsRoot as Root } from './tabs-root'
+
+export { Content, Indicator, List, Root, Trigger }
diff --git a/packages/frameworks/vue/src/tags-input/index.ts b/packages/frameworks/vue/src/tags-input/index.ts
index 2c68252dda..392aeace65 100644
--- a/packages/frameworks/vue/src/tags-input/index.ts
+++ b/packages/frameworks/vue/src/tags-input/index.ts
@@ -19,18 +19,7 @@ import { TagsInputItemText, type TagsInputItemTextProps } from './tags-input-ite
 import { TagsInputLabel, type TagsInputLabelProps } from './tags-input-label'
 import { TagsInputRoot, type TagsInputRootProps } from './tags-input-root'
 
-export const TagsInput = {
-  Root: TagsInputRoot,
-  ClearTrigger: TagsInputClearTrigger,
-  Control: TagsInputControl,
-  Input: TagsInputInput,
-  Item: TagsInputItem,
-  ItemPreview: TagsInputItemPreview,
-  ItemDeleteTrigger: TagsInputItemDeleteTrigger,
-  ItemInput: TagsInputItemInput,
-  ItemText: TagsInputItemText,
-  Label: TagsInputLabel,
-}
+export * as TagsInput from './tags-input'
 
 export {
   TagsInputClearTrigger,
diff --git a/packages/frameworks/vue/src/tags-input/tags-input.tsx b/packages/frameworks/vue/src/tags-input/tags-input.tsx
new file mode 100644
index 0000000000..d5c068934c
--- /dev/null
+++ b/packages/frameworks/vue/src/tags-input/tags-input.tsx
@@ -0,0 +1,23 @@
+import { TagsInputClearTrigger as ClearTrigger } from './tags-input-clear-trigger'
+import { TagsInputControl as Control } from './tags-input-control'
+import { TagsInputInput as Input } from './tags-input-input'
+import { TagsInputItem as Item } from './tags-input-item'
+import { TagsInputItemDeleteTrigger as ItemDeleteTrigger } from './tags-input-item-delete-trigger'
+import { TagsInputItemInput as ItemInput } from './tags-input-item-input'
+import { TagsInputItemPreview as ItemPreview } from './tags-input-item-preview'
+import { TagsInputItemText as ItemText } from './tags-input-item-text'
+import { TagsInputLabel as Label } from './tags-input-label'
+import { TagsInputRoot as Root } from './tags-input-root'
+
+export {
+  ClearTrigger,
+  Control,
+  Input,
+  Item,
+  ItemDeleteTrigger,
+  ItemInput,
+  ItemPreview,
+  ItemText,
+  Label,
+  Root,
+}
diff --git a/packages/frameworks/vue/src/toast/index.ts b/packages/frameworks/vue/src/toast/index.ts
index 253443c9e2..1bdde60256 100644
--- a/packages/frameworks/vue/src/toast/index.ts
+++ b/packages/frameworks/vue/src/toast/index.ts
@@ -5,13 +5,7 @@ import { ToastGroup, type ToastGroupProps } from './toast-group'
 import { ToastRoot, type ToastRootProps } from './toast-root'
 import { ToastTitle, type ToastTitleProps } from './toast-title'
 
-export const Toast = {
-  Root: ToastRoot,
-  CloseTrigger: ToastCloseTrigger,
-  Description: ToastDescription,
-  Group: ToastGroup,
-  Title: ToastTitle,
-}
+export * as Toast from './toast'
 
 export { createToaster, ToastCloseTrigger, ToastDescription, ToastGroup, ToastRoot, ToastTitle }
 
diff --git a/packages/frameworks/vue/src/toast/toast.tsx b/packages/frameworks/vue/src/toast/toast.tsx
new file mode 100644
index 0000000000..93371ee040
--- /dev/null
+++ b/packages/frameworks/vue/src/toast/toast.tsx
@@ -0,0 +1,7 @@
+import { ToastCloseTrigger as CloseTrigger } from './toast-close-trigger'
+import { ToastDescription as Description } from './toast-description'
+import { ToastGroup as Group } from './toast-group'
+import { ToastRoot as Root } from './toast-root'
+import { ToastTitle as Title } from './toast-title'
+
+export { CloseTrigger, Description, Group, Root, Title }
diff --git a/packages/frameworks/vue/src/toggle-group/index.ts b/packages/frameworks/vue/src/toggle-group/index.ts
index 25a0115e20..a7fcf19ae5 100644
--- a/packages/frameworks/vue/src/toggle-group/index.ts
+++ b/packages/frameworks/vue/src/toggle-group/index.ts
@@ -3,10 +3,7 @@ import { useToggleGroupContext, type ToggleGroupContext } from './toggle-group-c
 import { ToggleGroupItem, type ToggleGroupItemProps } from './toggle-group-item'
 import { ToggleGroupRoot, type ToggleGroupRootProps } from './toggle-group-root'
 
-export const ToggleGroup = {
-  Root: ToggleGroupRoot,
-  Item: ToggleGroupItem,
-}
+export * as ToggleGroup from './toggle-group'
 
 export { ToggleGroupItem, ToggleGroupRoot, useToggleGroupContext }
 
diff --git a/packages/frameworks/vue/src/toggle-group/toggle-group.tsx b/packages/frameworks/vue/src/toggle-group/toggle-group.tsx
new file mode 100644
index 0000000000..836365f3d0
--- /dev/null
+++ b/packages/frameworks/vue/src/toggle-group/toggle-group.tsx
@@ -0,0 +1,4 @@
+import { ToggleGroupItem as Item } from './toggle-group-item'
+import { ToggleGroupRoot as Root } from './toggle-group-root'
+
+export { Item, Root }
diff --git a/packages/frameworks/vue/src/tooltip/index.ts b/packages/frameworks/vue/src/tooltip/index.ts
index 586d9f3ddd..0cec176cfb 100644
--- a/packages/frameworks/vue/src/tooltip/index.ts
+++ b/packages/frameworks/vue/src/tooltip/index.ts
@@ -7,14 +7,7 @@ import { TooltipPositioner, type TooltipPositionerProps } from './tooltip-positi
 import { TooltipRoot, type TooltipRootProps } from './tooltip-root'
 import { TooltipTrigger, type TooltipTriggerProps } from './tooltip-trigger'
 
-export const Tooltip = {
-  Root: TooltipRoot,
-  Arrow: TooltipArrow,
-  ArrowTip: TooltipArrowTip,
-  Content: TooltipContent,
-  Positioner: TooltipPositioner,
-  Trigger: TooltipTrigger,
-}
+export * as Tooltip from './tooltip'
 
 export {
   TooltipArrow,
diff --git a/packages/frameworks/vue/src/tooltip/tooltip.tsx b/packages/frameworks/vue/src/tooltip/tooltip.tsx
new file mode 100644
index 0000000000..19de9826c2
--- /dev/null
+++ b/packages/frameworks/vue/src/tooltip/tooltip.tsx
@@ -0,0 +1,8 @@
+import { TooltipArrow as Arrow } from './tooltip-arrow'
+import { TooltipArrowTip as ArrowTip } from './tooltip-arrow-tip'
+import { TooltipContent as Content } from './tooltip-content'
+import { TooltipPositioner as Positioner } from './tooltip-positioner'
+import { TooltipRoot as Root } from './tooltip-root'
+import { TooltipTrigger as Trigger } from './tooltip-trigger'
+
+export { Arrow, ArrowTip, Content, Positioner, Root, Trigger }
diff --git a/packages/frameworks/vue/src/tree-view/index.ts b/packages/frameworks/vue/src/tree-view/index.ts
index fc58fbd9e8..46330ac5d4 100644
--- a/packages/frameworks/vue/src/tree-view/index.ts
+++ b/packages/frameworks/vue/src/tree-view/index.ts
@@ -19,19 +19,7 @@ import { TreeViewLabel, type TreeViewLabelProps } from './tree-view-label'
 import { TreeViewRoot, type TreeViewRootProps } from './tree-view-root'
 import { TreeViewTree, type TreeViewTreeProps } from './tree-view-tree'
 
-export const TreeView = {
-  Root: TreeViewRoot,
-  Label: TreeViewLabel,
-  Tree: TreeViewTree,
-  Branch: TreeViewBranch,
-  Item: TreeViewItem,
-  ItemText: TreeViewItemText,
-  BranchContent: TreeViewBranchContent,
-  BranchControl: TreeViewBranchControl,
-  BranchTrigger: TreeViewBranchTrigger,
-  BranchIndicator: TreeViewBranchIndicator,
-  BranchText: TreeViewBranchText,
-}
+export * as TreeView from './tree-view'
 
 export {
   TreeViewBranch,
diff --git a/packages/frameworks/vue/src/tree-view/tree-view.tsx b/packages/frameworks/vue/src/tree-view/tree-view.tsx
new file mode 100644
index 0000000000..409f5c79b6
--- /dev/null
+++ b/packages/frameworks/vue/src/tree-view/tree-view.tsx
@@ -0,0 +1,25 @@
+import { TreeViewBranch as Branch } from './tree-view-branch'
+import { TreeViewBranchContent as BranchContent } from './tree-view-branch-content'
+import { TreeViewBranchControl as BranchControl } from './tree-view-branch-control'
+import { TreeViewBranchIndicator as BranchIndicator } from './tree-view-branch-indicator'
+import { TreeViewBranchText as BranchText } from './tree-view-branch-text'
+import { TreeViewBranchTrigger as BranchTrigger } from './tree-view-branch-trigger'
+import { TreeViewItem as Item } from './tree-view-item'
+import { TreeViewItemText as ItemText } from './tree-view-item-text'
+import { TreeViewLabel as Label } from './tree-view-label'
+import { TreeViewRoot as Root } from './tree-view-root'
+import { TreeViewTree as Tree } from './tree-view-tree'
+
+export {
+  Branch,
+  BranchContent,
+  BranchControl,
+  BranchIndicator,
+  BranchText,
+  BranchTrigger,
+  Item,
+  ItemText,
+  Label,
+  Root,
+  Tree,
+}