diff --git a/packages/@core/ui-kit/menu-ui/src/components/index.ts b/packages/@core/ui-kit/menu-ui/src/components/index.ts
index 3d6dfce2..7c697dc1 100644
--- a/packages/@core/ui-kit/menu-ui/src/components/index.ts
+++ b/packages/@core/ui-kit/menu-ui/src/components/index.ts
@@ -1,3 +1,4 @@
 export { default as Menu } from './menu.vue';
+export { default as MenuBadge } from './menu-badge.vue';
 export { default as MenuItem } from './menu-item.vue';
 export { default as SubMenu } from './sub-menu.vue';
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/menu-badge/menu-badge-dot.vue b/packages/@core/ui-kit/menu-ui/src/components/menu-badge-dot.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/menu-badge/menu-badge-dot.vue
rename to packages/@core/ui-kit/menu-ui/src/components/menu-badge-dot.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/menu-badge/menu-badge.vue b/packages/@core/ui-kit/menu-ui/src/components/menu-badge.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/menu-badge/menu-badge.vue
rename to packages/@core/ui-kit/menu-ui/src/components/menu-badge.vue
diff --git a/packages/@core/ui-kit/menu-ui/src/components/menu-item.vue b/packages/@core/ui-kit/menu-ui/src/components/menu-item.vue
index 53152661..691c25cd 100644
--- a/packages/@core/ui-kit/menu-ui/src/components/menu-item.vue
+++ b/packages/@core/ui-kit/menu-ui/src/components/menu-item.vue
@@ -4,8 +4,9 @@ import type { MenuItemProps, MenuItemRegistered } from '../types';
 import { computed, onBeforeUnmount, onMounted, reactive, useSlots } from 'vue';
 
 import { useNamespace } from '@vben-core/composables';
-import { VbenIcon, VbenMenuBadge, VbenTooltip } from '@vben-core/shadcn-ui';
+import { VbenIcon, VbenTooltip } from '@vben-core/shadcn-ui';
 
+import { MenuBadge } from '../components';
 import { useMenu, useMenuContext, useSubMenuContext } from '../hooks';
 
 interface Props extends MenuItemProps {}
@@ -108,7 +109,7 @@ onBeforeUnmount(() => {
       <slot name="title"></slot>
     </VbenTooltip>
     <div v-show="!showTooltip" :class="[e('content')]">
-      <VbenMenuBadge
+      <MenuBadge
         v-if="rootMenu.props.mode !== 'horizontal'"
         class="right-2"
         v-bind="props"
diff --git a/packages/@core/ui-kit/menu-ui/src/sub-menu.vue b/packages/@core/ui-kit/menu-ui/src/sub-menu.vue
index b0108dc9..8fd9a9b2 100644
--- a/packages/@core/ui-kit/menu-ui/src/sub-menu.vue
+++ b/packages/@core/ui-kit/menu-ui/src/sub-menu.vue
@@ -3,9 +3,7 @@ import type { MenuRecordRaw } from '@vben-core/typings';
 
 import { computed } from 'vue';
 
-import { VbenMenuBadge } from '@vben-core/shadcn-ui';
-
-import { MenuItem, SubMenu as SubMenuComp } from './components';
+import { MenuBadge, MenuItem, SubMenu as SubMenuComp } from './components';
 // eslint-disable-next-line import/no-self-import
 import SubMenu from './sub-menu.vue';
 
@@ -54,7 +52,7 @@ const hasChildren = computed(() => {
     :path="menu.path"
   >
     <template #content>
-      <VbenMenuBadge
+      <MenuBadge
         :badge="menu.badge"
         :badge-type="menu.badgeType"
         :badge-variants="menu.badgeVariants"
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/avatar/avatar.vue b/packages/@core/ui-kit/shadcn-ui/src/components/avatar/avatar.vue
index 1c310c44..d89ad791 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/components/avatar/avatar.vue
+++ b/packages/@core/ui-kit/shadcn-ui/src/components/avatar/avatar.vue
@@ -7,7 +7,7 @@ import type {
 
 import { computed } from 'vue';
 
-import { Avatar, AvatarFallback, AvatarImage } from '../ui/avatar';
+import { Avatar, AvatarFallback, AvatarImage } from '../../ui';
 
 interface Props extends AvatarRootProps, AvatarFallbackProps, AvatarImageProps {
   alt?: string;
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/breadcrumb/breadcrumb.vue b/packages/@core/ui-kit/shadcn-ui/src/components/breadcrumb/breadcrumb.vue
index 7d256202..db2ce654 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/components/breadcrumb/breadcrumb.vue
+++ b/packages/@core/ui-kit/shadcn-ui/src/components/breadcrumb/breadcrumb.vue
@@ -3,7 +3,6 @@ import type { BreadcrumbProps } from './types';
 
 import { ChevronDown } from '@vben-core/icons';
 
-import { VbenIcon } from '../icon';
 import {
   Breadcrumb,
   BreadcrumbItem,
@@ -11,13 +10,12 @@ import {
   BreadcrumbList,
   BreadcrumbPage,
   BreadcrumbSeparator,
-} from '../ui/breadcrumb';
-import {
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuItem,
   DropdownMenuTrigger,
-} from '../ui/dropdown-menu';
+} from '../../ui';
+import { VbenIcon } from '../icon';
 
 interface Props extends BreadcrumbProps {}
 
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/button/button.ts b/packages/@core/ui-kit/shadcn-ui/src/components/button/button.ts
index 20fb42a3..88397423 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/components/button/button.ts
+++ b/packages/@core/ui-kit/shadcn-ui/src/components/button/button.ts
@@ -1,6 +1,6 @@
 import type { AsTag } from 'radix-vue';
 
-import type { ButtonVariants, ButtonVariantSize } from '../ui/button';
+import type { ButtonVariants, ButtonVariantSize } from '../../ui';
 
 import type { Component } from 'vue';
 
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/button/button.vue b/packages/@core/ui-kit/shadcn-ui/src/components/button/button.vue
index eedff519..cb9b3e57 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/components/button/button.vue
+++ b/packages/@core/ui-kit/shadcn-ui/src/components/button/button.vue
@@ -8,7 +8,7 @@ import { cn } from '@vben-core/shared/utils';
 
 import { Primitive } from 'radix-vue';
 
-import { buttonVariants } from '../ui/button';
+import { buttonVariants } from '../../ui';
 
 interface Props extends VbenButtonProps {}
 
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/button/icon-button.vue b/packages/@core/ui-kit/shadcn-ui/src/components/button/icon-button.vue
index bd44c81c..7c123a91 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/components/button/icon-button.vue
+++ b/packages/@core/ui-kit/shadcn-ui/src/components/button/icon-button.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { ButtonVariants } from '../ui/button';
+import type { ButtonVariants } from '../../ui';
 import type { VbenButtonProps } from './button';
 
 import { computed, useSlots } from 'vue';
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/checkbox/checkbox.vue b/packages/@core/ui-kit/shadcn-ui/src/components/checkbox/checkbox.vue
index 6278b656..3c2e9da2 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/components/checkbox/checkbox.vue
+++ b/packages/@core/ui-kit/shadcn-ui/src/components/checkbox/checkbox.vue
@@ -5,7 +5,7 @@ import { useId } from 'vue';
 
 import { useForwardPropsEmits } from 'radix-vue';
 
-import { Checkbox } from '../ui/checkbox';
+import { Checkbox } from '../../ui/checkbox';
 
 const props = defineProps<CheckboxRootProps>();
 
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/context-menu/context-menu.vue b/packages/@core/ui-kit/shadcn-ui/src/components/context-menu/context-menu.vue
index 66e08ec9..5d3dd299 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/components/context-menu/context-menu.vue
+++ b/packages/@core/ui-kit/shadcn-ui/src/components/context-menu/context-menu.vue
@@ -18,7 +18,7 @@ import {
   ContextMenuSeparator,
   ContextMenuShortcut,
   ContextMenuTrigger,
-} from '../ui/context-menu';
+} from '../../ui/context-menu';
 
 const props = defineProps<
   {
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/dropdown-menu/dropdown-menu.vue b/packages/@core/ui-kit/shadcn-ui/src/components/dropdown-menu/dropdown-menu.vue
index f098add9..f1bbdee9 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/components/dropdown-menu/dropdown-menu.vue
+++ b/packages/@core/ui-kit/shadcn-ui/src/components/dropdown-menu/dropdown-menu.vue
@@ -11,7 +11,7 @@ import {
   DropdownMenuItem,
   DropdownMenuSeparator,
   DropdownMenuTrigger,
-} from '../ui/dropdown-menu';
+} from '../../ui';
 
 interface Props extends DropdownMenuProps {}
 
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/dropdown-menu/dropdown-radio-menu.vue b/packages/@core/ui-kit/shadcn-ui/src/components/dropdown-menu/dropdown-radio-menu.vue
index f71b2332..c0e23c87 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/components/dropdown-menu/dropdown-radio-menu.vue
+++ b/packages/@core/ui-kit/shadcn-ui/src/components/dropdown-menu/dropdown-radio-menu.vue
@@ -7,7 +7,7 @@ import {
   DropdownMenuGroup,
   DropdownMenuItem,
   DropdownMenuTrigger,
-} from '../ui/dropdown-menu';
+} from '../../ui';
 
 interface Props extends DropdownMenuProps {}
 
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/hover-card/hover-card.vue b/packages/@core/ui-kit/shadcn-ui/src/components/hover-card/hover-card.vue
index 5bd57824..eff92fe1 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/components/hover-card/hover-card.vue
+++ b/packages/@core/ui-kit/shadcn-ui/src/components/hover-card/hover-card.vue
@@ -9,11 +9,7 @@ import { computed } from 'vue';
 
 import { useForwardPropsEmits } from 'radix-vue';
 
-import {
-  HoverCard,
-  HoverCardContent,
-  HoverCardTrigger,
-} from '../ui/hover-card';
+import { HoverCard, HoverCardContent, HoverCardTrigger } from '../../ui';
 
 interface Props extends HoverCardRootProps {
   class?: any;
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/index.ts b/packages/@core/ui-kit/shadcn-ui/src/components/index.ts
index c6a3e680..6b2c7fc1 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/components/index.ts
+++ b/packages/@core/ui-kit/shadcn-ui/src/components/index.ts
@@ -11,10 +11,7 @@ export * from './full-screen';
 export * from './hover-card';
 export * from './icon';
 export * from './input-password';
-export * from './link';
 export * from './logo';
-export * from './menu-badge';
-export * from './pagination';
 export * from './pin-input';
 export * from './popover';
 export * from './render-content';
@@ -23,34 +20,4 @@ export * from './segmented';
 export * from './select';
 export * from './spine-text';
 export * from './spinner';
-export * from './swap';
 export * from './tooltip';
-export * from './ui/accordion';
-export * from './ui/avatar';
-export * from './ui/badge';
-export * from './ui/breadcrumb';
-export * from './ui/button';
-export * from './ui/card';
-export * from './ui/checkbox';
-export * from './ui/dialog';
-export * from './ui/dropdown-menu';
-export * from './ui/form';
-export * from './ui/hover-card';
-export * from './ui/input';
-export * from './ui/label';
-export * from './ui/number-field';
-export * from './ui/pagination';
-export * from './ui/pin-input';
-export * from './ui/popover';
-export * from './ui/radio-group';
-export * from './ui/scroll-area';
-export * from './ui/select';
-export * from './ui/separator';
-export * from './ui/sheet';
-export * from './ui/switch';
-export * from './ui/tabs';
-export * from './ui/textarea';
-export * from './ui/toast';
-export * from './ui/toggle';
-export * from './ui/toggle-group';
-export * from './ui/tooltip';
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/input-password/input-password.vue b/packages/@core/ui-kit/shadcn-ui/src/components/input-password/input-password.vue
index 16e2312d..be79862a 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/components/input-password/input-password.vue
+++ b/packages/@core/ui-kit/shadcn-ui/src/components/input-password/input-password.vue
@@ -4,7 +4,7 @@ import { ref, useSlots } from 'vue';
 import { Eye, EyeOff } from '@vben-core/icons';
 import { cn } from '@vben-core/shared/utils';
 
-import { Input } from '../ui/input';
+import { Input } from '../../ui';
 import PasswordStrength from './password-strength.vue';
 
 interface Props {
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/link/index.ts b/packages/@core/ui-kit/shadcn-ui/src/components/link/index.ts
deleted file mode 100644
index 438a557b..00000000
--- a/packages/@core/ui-kit/shadcn-ui/src/components/link/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as VbenLink } from './link.vue';
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/link/link.vue b/packages/@core/ui-kit/shadcn-ui/src/components/link/link.vue
deleted file mode 100644
index a56a0110..00000000
--- a/packages/@core/ui-kit/shadcn-ui/src/components/link/link.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-<script setup lang="ts">
-import { cn } from '@vben-core/shared/utils';
-
-import { Primitive, type PrimitiveProps } from 'radix-vue';
-
-interface Props extends PrimitiveProps {
-  class?: any;
-  href: string;
-}
-
-const props = withDefaults(defineProps<Props>(), {
-  as: 'a',
-  class: '',
-  href: '',
-});
-</script>
-
-<template>
-  <Primitive
-    :as="as"
-    :as-child="asChild"
-    :class="cn('text-primary hover:text-primary-hover', props.class)"
-    :href="href"
-    target="_blank"
-  >
-    <slot></slot>
-  </Primitive>
-</template>
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/menu-badge/index.ts b/packages/@core/ui-kit/shadcn-ui/src/components/menu-badge/index.ts
deleted file mode 100644
index 6f8271d6..00000000
--- a/packages/@core/ui-kit/shadcn-ui/src/components/menu-badge/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as VbenMenuBadge } from './menu-badge.vue';
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/pagination/index.ts b/packages/@core/ui-kit/shadcn-ui/src/components/pagination/index.ts
deleted file mode 100644
index 5b875294..00000000
--- a/packages/@core/ui-kit/shadcn-ui/src/components/pagination/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export type { PaginationProps as VbenPaginationProps } from './pagination';
-export { default as VbenPagination } from './pagination.vue';
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/pagination/pagination.ts b/packages/@core/ui-kit/shadcn-ui/src/components/pagination/pagination.ts
deleted file mode 100644
index a14d3867..00000000
--- a/packages/@core/ui-kit/shadcn-ui/src/components/pagination/pagination.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-export interface PaginationProps {
-  /**
-   * 是否禁用
-   */
-  disabled?: boolean;
-  /**
-   * 每页记录数选项
-   */
-  pageSizeOptions?: number[];
-  /**
-   * 当 时true，始终显示第一页、最后一页和省略号
-   */
-  showEdges?: boolean;
-  /**
-   * 显示当前页选择下拉框
-   */
-  showRowsPerPage?: boolean;
-  /**
-   * 显示总条数文本
-   */
-  showTotalText?: boolean;
-  /**
-   * 当前页面周围应显示的兄弟页面数量
-   */
-  siblingCount?: number;
-  /**
-   * 组件尺寸
-   */
-  size?: 'default' | 'large' | 'small';
-
-  /**
-   * 总条数
-   */
-  total?: number;
-}
-
-export const SIZE_CLASS_MAP = {
-  default: 'size-8',
-  large: 'size-9',
-  small: 'size-7',
-};
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/pagination/pagination.vue b/packages/@core/ui-kit/shadcn-ui/src/components/pagination/pagination.vue
deleted file mode 100644
index cf0092b7..00000000
--- a/packages/@core/ui-kit/shadcn-ui/src/components/pagination/pagination.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-<script setup lang="ts">
-import { computed, watch } from 'vue';
-
-import { cn } from '@vben-core/shared/utils';
-
-import { Button } from '../ui/button';
-import {
-  Pagination,
-  PaginationEllipsis,
-  PaginationFirst,
-  PaginationLast,
-  PaginationList,
-  PaginationListItem,
-  PaginationNext,
-  PaginationPrev,
-} from '../ui/pagination';
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from '../ui/select';
-import { type PaginationProps, SIZE_CLASS_MAP } from './pagination';
-
-interface Props extends PaginationProps {}
-
-const {
-  disabled = false,
-  pageSizeOptions = [10, 20, 30, 50, 100, 200],
-  showEdges = true,
-  showRowsPerPage = true,
-  showTotalText = true,
-  siblingCount = 1,
-  size = 'small',
-  total = 500,
-} = defineProps<Props>();
-
-const emit = defineEmits<{
-  pageChange: [currentPage: number, pageSize: number];
-}>();
-const currentPage = defineModel<number>('currentPage', { default: 1 });
-const itemPerPage = defineModel<number>('itemPerPage', { default: 20 });
-
-const itemSize = computed(() => {
-  return SIZE_CLASS_MAP[size];
-});
-
-const options = computed(() => {
-  return pageSizeOptions.map((item) => ({
-    label: `${item} 条/页`,
-    value: `${item}`,
-  }));
-});
-
-function handleUpdateModelValue(value: string) {
-  itemPerPage.value = Number(value);
-}
-
-watch(
-  [() => itemPerPage.value, () => currentPage.value],
-  ([itemPerPage, currentPage]) => {
-    emit('pageChange', currentPage, itemPerPage);
-  },
-);
-</script>
-
-<template>
-  <Pagination
-    v-model:page="currentPage"
-    :disabled="disabled"
-    :items-per-page="itemPerPage"
-    :show-edges="showEdges"
-    :sibling-count="siblingCount"
-    :total="total"
-  >
-    <PaginationList
-      v-slot="{ items }"
-      class="flex w-full items-center justify-end gap-1"
-    >
-      <span v-if="showTotalText" class="mr-2">共 {{ total }} 条</span>
-
-      <Select
-        v-if="showRowsPerPage"
-        :model-value="`${itemPerPage}`"
-        @update:model-value="handleUpdateModelValue"
-      >
-        <SelectTrigger class="w-30 mr-auto h-8">
-          <SelectValue />
-        </SelectTrigger>
-        <SelectContent>
-          <template v-for="item in options" :key="item.value">
-            <SelectItem :value="item.value"> {{ item.label }} </SelectItem>
-          </template>
-        </SelectContent>
-      </Select>
-
-      <PaginationFirst :class="cn('size-8', itemSize)" />
-      <PaginationPrev :class="cn('size-8', itemSize)" />
-      <template v-for="(item, index) in items">
-        <PaginationListItem
-          v-if="item.type === 'page'"
-          :key="index"
-          :value="item.value"
-          as-child
-        >
-          <Button
-            :class="cn('size-8 p-0 shadow-none', itemSize)"
-            :variant="item.value === currentPage ? 'default' : 'outline'"
-          >
-            {{ item.value }}
-          </Button>
-        </PaginationListItem>
-        <PaginationEllipsis v-else :key="item.type" :index="index" />
-      </template>
-
-      <PaginationNext :class="cn('size-8', itemSize)" />
-      <PaginationLast :class="cn('size-8', itemSize)" />
-    </PaginationList>
-  </Pagination>
-</template>
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/pin-input/input.vue b/packages/@core/ui-kit/shadcn-ui/src/components/pin-input/input.vue
index c7c8ada0..d55fa7e1 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/components/pin-input/input.vue
+++ b/packages/@core/ui-kit/shadcn-ui/src/components/pin-input/input.vue
@@ -3,8 +3,8 @@ import type { PinInputProps } from './types';
 
 import { computed, onBeforeUnmount, ref, useId, watch } from 'vue';
 
+import { PinInput, PinInputGroup, PinInputInput } from '../../ui';
 import { VbenButton } from '../button';
-import { PinInput, PinInputGroup, PinInputInput } from '../ui/pin-input';
 
 defineOptions({
   inheritAttrs: false,
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/popover/popover.vue b/packages/@core/ui-kit/shadcn-ui/src/components/popover/popover.vue
index a725652e..40c5ccf8 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/components/popover/popover.vue
+++ b/packages/@core/ui-kit/shadcn-ui/src/components/popover/popover.vue
@@ -13,7 +13,7 @@ import {
   PopoverContent,
   Popover as PopoverRoot,
   PopoverTrigger,
-} from '../ui/popover';
+} from '../../ui';
 
 interface Props extends PopoverRootProps {
   class?: any;
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/scrollbar/scrollbar.vue b/packages/@core/ui-kit/shadcn-ui/src/components/scrollbar/scrollbar.vue
index 68e2ab15..e5f56178 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/components/scrollbar/scrollbar.vue
+++ b/packages/@core/ui-kit/shadcn-ui/src/components/scrollbar/scrollbar.vue
@@ -3,7 +3,7 @@ import { computed, ref } from 'vue';
 
 import { cn } from '@vben-core/shared/utils';
 
-import { ScrollArea, ScrollBar } from '../ui/scroll-area';
+import { ScrollArea, ScrollBar } from '../../ui';
 
 interface Props {
   class?: any;
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/segmented/segmented.vue b/packages/@core/ui-kit/shadcn-ui/src/components/segmented/segmented.vue
index 645faa21..f1a8e570 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/components/segmented/segmented.vue
+++ b/packages/@core/ui-kit/shadcn-ui/src/components/segmented/segmented.vue
@@ -5,7 +5,7 @@ import { computed } from 'vue';
 
 import { TabsTrigger } from 'radix-vue';
 
-import { Tabs, TabsContent, TabsList } from '../ui/tabs';
+import { Tabs, TabsContent, TabsList } from '../../ui';
 import TabsIndicator from './tabs-indicator.vue';
 
 interface Props {
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/select/select.vue b/packages/@core/ui-kit/shadcn-ui/src/components/select/select.vue
index 6c80e0fb..e19836be 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/components/select/select.vue
+++ b/packages/@core/ui-kit/shadcn-ui/src/components/select/select.vue
@@ -5,7 +5,7 @@ import {
   SelectItem,
   SelectTrigger,
   SelectValue,
-} from '../ui/select';
+} from '../../ui';
 
 interface Props {
   class?: any;
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/swap/index.ts b/packages/@core/ui-kit/shadcn-ui/src/components/swap/index.ts
deleted file mode 100644
index 14752d71..00000000
--- a/packages/@core/ui-kit/shadcn-ui/src/components/swap/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as VbenSwap } from './swap.vue';
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/swap/swap.vue b/packages/@core/ui-kit/shadcn-ui/src/components/swap/swap.vue
deleted file mode 100644
index feaf8db9..00000000
--- a/packages/@core/ui-kit/shadcn-ui/src/components/swap/swap.vue
+++ /dev/null
@@ -1,126 +0,0 @@
-<script lang="ts" setup>
-interface Props {
-  /**
-   * @zh_CN 交换模式
-   */
-  mode?: 'flip' | 'rotate';
-  /**
-   * @zh_CN 开启时的样式
-   */
-  offClass?: string;
-  /**
-   * @zh_CN 关闭时的样式
-   */
-  onClass?: string;
-}
-
-defineOptions({
-  name: 'Swap',
-});
-
-withDefaults(defineProps<Props>(), {
-  mode: 'rotate',
-  onClass: '',
-});
-</script>
-
-<template>
-  <label
-    :class="{
-      'swap-flip': mode === 'flip',
-      'swap-rotate': mode === 'rotate',
-    }"
-    class="swap"
-  >
-    <input class="hidden" type="checkbox" />
-
-    <div :class="onClass" class="swap-on">
-      <slot name="swap-on"></slot>
-    </div>
-
-    <div :class="offClass" class="swap-off">
-      <slot name="swap-off"></slot>
-    </div>
-  </label>
-</template>
-
-<style scoped>
-.swap {
-  @apply relative inline-grid cursor-pointer select-none place-content-center;
-}
-
-.swap > * {
-  @apply col-start-1 row-start-1 duration-300 ease-out;
-
-  transition-property: transform, opacity;
-}
-
-.swap-rotate .swap-on,
-.swap-rotate .swap-indeterminate,
-.swap-rotate input:indeterminate ~ .swap-on {
-  @apply rotate-45;
-}
-
-.swap-rotate input:checked ~ .swap-off,
-.swap-active:where(.swap-rotate) .swap-off,
-.swap-rotate input:indeterminate ~ .swap-off {
-  @apply -rotate-45;
-}
-
-.swap-rotate input:checked ~ .swap-on,
-.swap-active:where(.swap-rotate) .swap-on,
-.swap-rotate input:indeterminate ~ .swap-indeterminate {
-  @apply rotate-0;
-}
-
-.swap-flip {
-  transform-style: preserve-3d;
-  perspective: 16em;
-}
-
-.swap-flip .swap-on,
-.swap-flip .swap-indeterminate,
-.swap-flip input:indeterminate ~ .swap-on {
-  @apply opacity-100;
-
-  transform: rotateY(180deg);
-  backface-visibility: hidden;
-}
-
-.swap-flip input:checked ~ .swap-off,
-.swap-active:where(.swap-flip) .swap-off,
-.swap-flip input:indeterminate ~ .swap-off {
-  @apply opacity-100;
-
-  transform: rotateY(-180deg);
-  backface-visibility: hidden;
-}
-
-.swap-flip input:checked ~ .swap-on,
-.swap-active:where(.swap-flip) .swap-on,
-.swap-flip input:indeterminate ~ .swap-indeterminate {
-  transform: rotateY(0deg);
-}
-
-.swap input {
-  @apply appearance-none;
-}
-
-.swap .swap-on,
-.swap .swap-indeterminate,
-.swap input:indeterminate ~ .swap-on {
-  @apply opacity-0;
-}
-
-.swap input:checked ~ .swap-off,
-.swap-active .swap-off,
-.swap input:indeterminate ~ .swap-off {
-  @apply opacity-0;
-}
-
-.swap input:checked ~ .swap-on,
-.swap-active .swap-on,
-.swap input:indeterminate ~ .swap-indeterminate {
-  @apply opacity-100;
-}
-</style>
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/tooltip/tooltip.vue b/packages/@core/ui-kit/shadcn-ui/src/components/tooltip/tooltip.vue
index 2cd11c88..047ef63d 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/components/tooltip/tooltip.vue
+++ b/packages/@core/ui-kit/shadcn-ui/src/components/tooltip/tooltip.vue
@@ -8,7 +8,7 @@ import {
   TooltipContent,
   TooltipProvider,
   TooltipTrigger,
-} from '../ui/tooltip';
+} from '../../ui';
 
 interface Props {
   contentClass?: any;
diff --git a/packages/@core/ui-kit/shadcn-ui/src/index.ts b/packages/@core/ui-kit/shadcn-ui/src/index.ts
index c95f605d..00e1b990 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/index.ts
+++ b/packages/@core/ui-kit/shadcn-ui/src/index.ts
@@ -1,2 +1,3 @@
 export * from './components';
+export * from './ui';
 export { createContext, Slot, VisuallyHidden } from 'radix-vue';
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/accordion/Accordion.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/accordion/Accordion.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/accordion/Accordion.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/accordion/Accordion.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/accordion/AccordionContent.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/accordion/AccordionContent.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/accordion/AccordionContent.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/accordion/AccordionContent.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/accordion/AccordionItem.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/accordion/AccordionItem.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/accordion/AccordionItem.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/accordion/AccordionItem.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/accordion/AccordionTrigger.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/accordion/AccordionTrigger.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/accordion/AccordionTrigger.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/accordion/AccordionTrigger.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/accordion/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/accordion/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/accordion/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/accordion/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/avatar/Avatar.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/avatar/Avatar.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/avatar/Avatar.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/avatar/Avatar.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/avatar/AvatarFallback.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/avatar/AvatarFallback.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/avatar/AvatarFallback.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/avatar/AvatarFallback.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/avatar/AvatarImage.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/avatar/AvatarImage.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/avatar/AvatarImage.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/avatar/AvatarImage.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/avatar/avatar.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/avatar/avatar.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/avatar/avatar.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/avatar/avatar.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/avatar/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/avatar/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/avatar/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/avatar/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/badge/Badge.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/badge/Badge.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/badge/Badge.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/badge/Badge.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/badge/badge.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/badge/badge.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/badge/badge.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/badge/badge.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/badge/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/badge/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/badge/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/badge/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/breadcrumb/Breadcrumb.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/breadcrumb/Breadcrumb.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/breadcrumb/Breadcrumb.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/breadcrumb/Breadcrumb.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/breadcrumb/BreadcrumbEllipsis.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/breadcrumb/BreadcrumbEllipsis.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/breadcrumb/BreadcrumbEllipsis.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/breadcrumb/BreadcrumbEllipsis.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/breadcrumb/BreadcrumbItem.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/breadcrumb/BreadcrumbItem.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/breadcrumb/BreadcrumbItem.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/breadcrumb/BreadcrumbItem.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/breadcrumb/BreadcrumbLink.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/breadcrumb/BreadcrumbLink.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/breadcrumb/BreadcrumbLink.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/breadcrumb/BreadcrumbLink.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/breadcrumb/BreadcrumbList.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/breadcrumb/BreadcrumbList.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/breadcrumb/BreadcrumbList.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/breadcrumb/BreadcrumbList.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/breadcrumb/BreadcrumbPage.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/breadcrumb/BreadcrumbPage.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/breadcrumb/BreadcrumbPage.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/breadcrumb/BreadcrumbPage.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/breadcrumb/BreadcrumbSeparator.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/breadcrumb/BreadcrumbSeparator.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/breadcrumb/BreadcrumbSeparator.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/breadcrumb/BreadcrumbSeparator.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/breadcrumb/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/breadcrumb/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/breadcrumb/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/breadcrumb/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/button/Button.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/button/Button.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/button/Button.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/button/Button.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/button/button.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/button/button.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/button/button.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/button/button.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/button/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/button/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/button/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/button/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/button/types.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/button/types.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/button/types.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/button/types.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/card/Card.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/card/Card.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/card/Card.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/card/Card.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/card/CardContent.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/card/CardContent.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/card/CardContent.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/card/CardContent.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/card/CardDescription.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/card/CardDescription.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/card/CardDescription.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/card/CardDescription.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/card/CardFooter.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/card/CardFooter.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/card/CardFooter.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/card/CardFooter.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/card/CardHeader.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/card/CardHeader.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/card/CardHeader.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/card/CardHeader.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/card/CardTitle.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/card/CardTitle.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/card/CardTitle.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/card/CardTitle.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/card/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/card/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/card/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/card/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/checkbox/Checkbox.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/checkbox/Checkbox.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/checkbox/Checkbox.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/checkbox/Checkbox.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/checkbox/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/checkbox/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/checkbox/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/checkbox/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenu.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenu.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenu.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenu.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenuCheckboxItem.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuCheckboxItem.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenuCheckboxItem.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuCheckboxItem.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenuContent.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuContent.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenuContent.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuContent.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenuGroup.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuGroup.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenuGroup.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuGroup.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenuItem.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuItem.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenuItem.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuItem.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenuLabel.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuLabel.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenuLabel.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuLabel.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenuPortal.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuPortal.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenuPortal.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuPortal.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenuRadioGroup.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuRadioGroup.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenuRadioGroup.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuRadioGroup.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenuRadioItem.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuRadioItem.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenuRadioItem.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuRadioItem.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenuSeparator.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuSeparator.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenuSeparator.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuSeparator.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenuShortcut.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuShortcut.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenuShortcut.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuShortcut.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenuSub.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuSub.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenuSub.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuSub.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenuSubContent.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuSubContent.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenuSubContent.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuSubContent.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenuSubTrigger.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuSubTrigger.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenuSubTrigger.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuSubTrigger.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenuTrigger.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuTrigger.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/ContextMenuTrigger.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/ContextMenuTrigger.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/context-menu/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/context-menu/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/dialog/Dialog.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/Dialog.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/dialog/Dialog.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/dialog/Dialog.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/dialog/DialogClose.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogClose.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/dialog/DialogClose.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogClose.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/dialog/DialogContent.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogContent.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/dialog/DialogContent.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogContent.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/dialog/DialogDescription.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogDescription.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/dialog/DialogDescription.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogDescription.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/dialog/DialogFooter.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogFooter.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/dialog/DialogFooter.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogFooter.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/dialog/DialogHeader.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogHeader.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/dialog/DialogHeader.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogHeader.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/dialog/DialogOverlay.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogOverlay.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/dialog/DialogOverlay.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogOverlay.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/dialog/DialogScrollContent.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogScrollContent.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/dialog/DialogScrollContent.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogScrollContent.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/dialog/DialogTitle.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogTitle.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/dialog/DialogTitle.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogTitle.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/dialog/DialogTrigger.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogTrigger.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/dialog/DialogTrigger.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/dialog/DialogTrigger.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/dialog/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/dialog/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/dialog/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/dialog/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenu.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenu.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenu.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenu.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuCheckboxItem.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuCheckboxItem.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuCheckboxItem.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuCheckboxItem.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuContent.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuContent.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuContent.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuContent.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuGroup.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuGroup.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuGroup.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuGroup.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuItem.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuItem.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuItem.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuItem.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuLabel.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuLabel.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuLabel.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuLabel.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuRadioGroup.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuRadioGroup.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuRadioGroup.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuRadioGroup.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuRadioItem.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuRadioItem.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuRadioItem.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuRadioItem.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuSeparator.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuSeparator.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuSeparator.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuSeparator.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuShortcut.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuShortcut.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuShortcut.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuShortcut.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuSub.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuSub.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuSub.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuSub.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuSubContent.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuSubContent.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuSubContent.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuSubContent.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuSubTrigger.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuSubTrigger.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuSubTrigger.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuSubTrigger.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuTrigger.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuTrigger.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuTrigger.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/DropdownMenuTrigger.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/dropdown-menu/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/dropdown-menu/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/form/FormControl.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/form/FormControl.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/form/FormControl.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/form/FormControl.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/form/FormDescription.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/form/FormDescription.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/form/FormDescription.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/form/FormDescription.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/form/FormItem.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/form/FormItem.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/form/FormItem.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/form/FormItem.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/form/FormLabel.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/form/FormLabel.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/form/FormLabel.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/form/FormLabel.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/form/FormMessage.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/form/FormMessage.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/form/FormMessage.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/form/FormMessage.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/form/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/form/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/form/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/form/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/form/injectionKeys.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/form/injectionKeys.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/form/injectionKeys.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/form/injectionKeys.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/form/useFormField.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/form/useFormField.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/form/useFormField.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/form/useFormField.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/hover-card/HoverCard.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/hover-card/HoverCard.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/hover-card/HoverCard.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/hover-card/HoverCard.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/hover-card/HoverCardContent.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/hover-card/HoverCardContent.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/hover-card/HoverCardContent.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/hover-card/HoverCardContent.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/hover-card/HoverCardTrigger.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/hover-card/HoverCardTrigger.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/hover-card/HoverCardTrigger.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/hover-card/HoverCardTrigger.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/hover-card/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/hover-card/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/hover-card/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/hover-card/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/ui/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/index.ts
new file mode 100644
index 00000000..d9fca452
--- /dev/null
+++ b/packages/@core/ui-kit/shadcn-ui/src/ui/index.ts
@@ -0,0 +1,29 @@
+export * from './accordion';
+export * from './avatar';
+export * from './badge';
+export * from './breadcrumb';
+export * from './button';
+export * from './card';
+export * from './checkbox';
+export * from './dialog';
+export * from './dropdown-menu';
+export * from './form';
+export * from './hover-card';
+export * from './input';
+export * from './label';
+export * from './number-field';
+export * from './pagination';
+export * from './pin-input';
+export * from './popover';
+export * from './radio-group';
+export * from './scroll-area';
+export * from './select';
+export * from './separator';
+export * from './sheet';
+export * from './switch';
+export * from './tabs';
+export * from './textarea';
+export * from './toast';
+export * from './toggle';
+export * from './toggle-group';
+export * from './tooltip';
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/input/Input.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/input/Input.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/input/Input.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/input/Input.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/input/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/input/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/input/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/input/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/label/Label.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/label/Label.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/label/Label.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/label/Label.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/label/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/label/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/label/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/label/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/number-field/NumberField.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/number-field/NumberField.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/number-field/NumberField.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/number-field/NumberField.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/number-field/NumberFieldContent.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/number-field/NumberFieldContent.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/number-field/NumberFieldContent.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/number-field/NumberFieldContent.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/number-field/NumberFieldDecrement.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/number-field/NumberFieldDecrement.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/number-field/NumberFieldDecrement.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/number-field/NumberFieldDecrement.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/number-field/NumberFieldIncrement.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/number-field/NumberFieldIncrement.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/number-field/NumberFieldIncrement.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/number-field/NumberFieldIncrement.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/number-field/NumberFieldInput.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/number-field/NumberFieldInput.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/number-field/NumberFieldInput.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/number-field/NumberFieldInput.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/number-field/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/number-field/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/number-field/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/number-field/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/pagination/PaginationEllipsis.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/pagination/PaginationEllipsis.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/pagination/PaginationEllipsis.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/pagination/PaginationEllipsis.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/pagination/PaginationFirst.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/pagination/PaginationFirst.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/pagination/PaginationFirst.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/pagination/PaginationFirst.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/pagination/PaginationLast.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/pagination/PaginationLast.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/pagination/PaginationLast.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/pagination/PaginationLast.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/pagination/PaginationNext.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/pagination/PaginationNext.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/pagination/PaginationNext.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/pagination/PaginationNext.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/pagination/PaginationPrev.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/pagination/PaginationPrev.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/pagination/PaginationPrev.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/pagination/PaginationPrev.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/pagination/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/pagination/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/pagination/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/pagination/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/pin-input/PinInput.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/pin-input/PinInput.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/pin-input/PinInput.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/pin-input/PinInput.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/pin-input/PinInputGroup.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/pin-input/PinInputGroup.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/pin-input/PinInputGroup.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/pin-input/PinInputGroup.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/pin-input/PinInputInput.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/pin-input/PinInputInput.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/pin-input/PinInputInput.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/pin-input/PinInputInput.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/pin-input/PinInputSeparator.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/pin-input/PinInputSeparator.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/pin-input/PinInputSeparator.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/pin-input/PinInputSeparator.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/pin-input/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/pin-input/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/pin-input/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/pin-input/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/popover/Popover.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/popover/Popover.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/popover/Popover.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/popover/Popover.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/popover/PopoverContent.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/popover/PopoverContent.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/popover/PopoverContent.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/popover/PopoverContent.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/popover/PopoverTrigger.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/popover/PopoverTrigger.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/popover/PopoverTrigger.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/popover/PopoverTrigger.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/popover/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/popover/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/popover/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/popover/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/radio-group/RadioGroup.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/radio-group/RadioGroup.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/radio-group/RadioGroup.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/radio-group/RadioGroup.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/radio-group/RadioGroupItem.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/radio-group/RadioGroupItem.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/radio-group/RadioGroupItem.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/radio-group/RadioGroupItem.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/radio-group/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/radio-group/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/radio-group/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/radio-group/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/scroll-area/ScrollArea.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/scroll-area/ScrollArea.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/scroll-area/ScrollArea.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/scroll-area/ScrollArea.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/scroll-area/ScrollBar.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/scroll-area/ScrollBar.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/scroll-area/ScrollBar.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/scroll-area/ScrollBar.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/scroll-area/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/scroll-area/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/scroll-area/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/scroll-area/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/select/Select.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/select/Select.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/select/Select.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/select/Select.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/select/SelectContent.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectContent.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/select/SelectContent.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectContent.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/select/SelectGroup.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectGroup.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/select/SelectGroup.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectGroup.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/select/SelectItem.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectItem.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/select/SelectItem.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectItem.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/select/SelectItemText.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectItemText.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/select/SelectItemText.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectItemText.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/select/SelectLabel.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectLabel.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/select/SelectLabel.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectLabel.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/select/SelectScrollDownButton.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectScrollDownButton.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/select/SelectScrollDownButton.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectScrollDownButton.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/select/SelectScrollUpButton.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectScrollUpButton.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/select/SelectScrollUpButton.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectScrollUpButton.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/select/SelectSeparator.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectSeparator.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/select/SelectSeparator.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectSeparator.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/select/SelectTrigger.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectTrigger.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/select/SelectTrigger.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectTrigger.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/select/SelectValue.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectValue.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/select/SelectValue.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/select/SelectValue.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/select/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/select/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/select/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/select/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/separator/Separator.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/separator/Separator.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/separator/Separator.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/separator/Separator.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/separator/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/separator/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/separator/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/separator/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/sheet/Sheet.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/Sheet.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/sheet/Sheet.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/sheet/Sheet.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/sheet/SheetClose.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetClose.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/sheet/SheetClose.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetClose.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/sheet/SheetContent.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetContent.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/sheet/SheetContent.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetContent.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/sheet/SheetDescription.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetDescription.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/sheet/SheetDescription.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetDescription.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/sheet/SheetFooter.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetFooter.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/sheet/SheetFooter.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetFooter.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/sheet/SheetHeader.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetHeader.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/sheet/SheetHeader.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetHeader.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/sheet/SheetOverlay.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetOverlay.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/sheet/SheetOverlay.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetOverlay.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/sheet/SheetTitle.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetTitle.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/sheet/SheetTitle.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetTitle.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/sheet/SheetTrigger.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetTrigger.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/sheet/SheetTrigger.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/sheet/SheetTrigger.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/sheet/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/sheet/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/sheet/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/sheet/sheet.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/sheet/sheet.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/sheet/sheet.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/sheet/sheet.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/switch/Switch.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/switch/Switch.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/switch/Switch.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/switch/Switch.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/switch/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/switch/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/switch/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/switch/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/tabs/Tabs.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/tabs/Tabs.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/tabs/Tabs.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/tabs/Tabs.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/tabs/TabsContent.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/tabs/TabsContent.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/tabs/TabsContent.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/tabs/TabsContent.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/tabs/TabsList.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/tabs/TabsList.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/tabs/TabsList.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/tabs/TabsList.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/tabs/TabsTrigger.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/tabs/TabsTrigger.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/tabs/TabsTrigger.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/tabs/TabsTrigger.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/tabs/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/tabs/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/tabs/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/tabs/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/textarea/Textarea.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/textarea/Textarea.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/textarea/Textarea.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/textarea/Textarea.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/textarea/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/textarea/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/textarea/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/textarea/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/Toast.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/toast/Toast.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/Toast.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/toast/Toast.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/ToastAction.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/toast/ToastAction.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/ToastAction.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/toast/ToastAction.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/ToastClose.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/toast/ToastClose.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/ToastClose.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/toast/ToastClose.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/ToastDescription.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/toast/ToastDescription.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/ToastDescription.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/toast/ToastDescription.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/ToastProvider.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/toast/ToastProvider.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/ToastProvider.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/toast/ToastProvider.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/ToastTitle.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/toast/ToastTitle.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/ToastTitle.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/toast/ToastTitle.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/ToastViewport.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/toast/ToastViewport.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/ToastViewport.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/toast/ToastViewport.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/Toaster.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/toast/Toaster.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/Toaster.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/toast/Toaster.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/toast/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/toast/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/toast.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/toast/toast.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/toast.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/toast/toast.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/use-toast.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/toast/use-toast.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/use-toast.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/toast/use-toast.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/toggle-group/ToggleGroup.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/toggle-group/ToggleGroup.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/toggle-group/ToggleGroup.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/toggle-group/ToggleGroup.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/toggle-group/ToggleGroupItem.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/toggle-group/ToggleGroupItem.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/toggle-group/ToggleGroupItem.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/toggle-group/ToggleGroupItem.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/toggle-group/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/toggle-group/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/toggle-group/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/toggle-group/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/toggle/Toggle.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/toggle/Toggle.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/toggle/Toggle.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/toggle/Toggle.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/toggle/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/toggle/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/toggle/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/toggle/index.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/toggle/toggle.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/toggle/toggle.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/toggle/toggle.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/toggle/toggle.ts
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/tooltip/Tooltip.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/tooltip/Tooltip.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/tooltip/Tooltip.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/tooltip/Tooltip.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/tooltip/TooltipContent.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/tooltip/TooltipContent.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/tooltip/TooltipContent.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/tooltip/TooltipContent.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/tooltip/TooltipProvider.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/tooltip/TooltipProvider.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/tooltip/TooltipProvider.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/tooltip/TooltipProvider.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/tooltip/TooltipTrigger.vue b/packages/@core/ui-kit/shadcn-ui/src/ui/tooltip/TooltipTrigger.vue
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/tooltip/TooltipTrigger.vue
rename to packages/@core/ui-kit/shadcn-ui/src/ui/tooltip/TooltipTrigger.vue
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/tooltip/index.ts b/packages/@core/ui-kit/shadcn-ui/src/ui/tooltip/index.ts
similarity index 100%
rename from packages/@core/ui-kit/shadcn-ui/src/components/ui/tooltip/index.ts
rename to packages/@core/ui-kit/shadcn-ui/src/ui/tooltip/index.ts
diff --git a/packages/effects/common-ui/src/ui/about/about.vue b/packages/effects/common-ui/src/ui/about/about.vue
index 41189c17..a7aee39c 100644
--- a/packages/effects/common-ui/src/ui/about/about.vue
+++ b/packages/effects/common-ui/src/ui/about/about.vue
@@ -8,7 +8,7 @@ import {
   VBEN_GITHUB_URL,
   VBEN_PREVIEW_URL,
 } from '@vben/constants';
-import { VbenLink, VbenRenderContent } from '@vben-core/shadcn-ui';
+import { VbenRenderContent } from '@vben-core/shadcn-ui';
 
 import { Page } from '../../components';
 
@@ -41,6 +41,13 @@ declare global {
   };
 }
 
+const renderLink = (href: string, text: string) =>
+  h(
+    'a',
+    { href, target: '_blank', class: 'text-primary hover:text-primary-hover' },
+    { default: () => text },
+  );
+
 const {
   authorEmail,
   authorName,
@@ -68,41 +75,25 @@ const vbenDescriptionItems: DescriptionItem[] = [
     title: '最后构建时间',
   },
   {
-    content: h(VbenLink, { href: homepage }, { default: () => '点击查看' }),
+    content: renderLink(homepage, '点击查看'),
     title: '主页',
   },
   {
-    content: h(VbenLink, { href: VBEN_DOC_URL }, { default: () => '点击查看' }),
+    content: renderLink(VBEN_DOC_URL, '点击查看'),
     title: '文档地址',
   },
   {
-    content: h(
-      VbenLink,
-      { href: VBEN_PREVIEW_URL },
-      { default: () => '点击查看' },
-    ),
+    content: renderLink(VBEN_PREVIEW_URL, '点击查看'),
     title: '预览地址',
   },
   {
-    content: h(
-      VbenLink,
-      { href: VBEN_GITHUB_URL },
-      { default: () => '点击查看' },
-    ),
+    content: renderLink(VBEN_GITHUB_URL, '点击查看'),
     title: 'Github',
   },
   {
     content: h('div', [
-      h(
-        VbenLink,
-        { class: 'mr-2', href: authorUrl },
-        { default: () => authorName },
-      ),
-      h(
-        VbenLink,
-        { href: `mailto:${authorEmail}` },
-        { default: () => authorEmail },
-      ),
+      renderLink(authorUrl, `${authorName}  `),
+      renderLink(`mailto:${authorEmail}`, authorEmail),
     ]),
     title: '作者',
   },
@@ -123,9 +114,13 @@ const devDependenciesItems = Object.keys(devDependencies).map((key) => ({
   <Page :title="title">
     <template #description>
       <p class="text-foreground mt-3 text-sm leading-6">
-        <VbenLink :href="VBEN_GITHUB_URL">
+        <a
+          :href="VBEN_GITHUB_URL"
+          class="text-primary hover:text-primary-hover"
+          target="_blank"
+        >
           {{ name }}
-        </VbenLink>
+        </a>
         {{ description }}
       </p>
     </template>
diff --git a/playground/package.json b/playground/package.json
index a7603b38..a32f819c 100644
--- a/playground/package.json
+++ b/playground/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vben/playground",
-  "version": "5.3.1",
+  "version": "5.3.2",
   "homepage": "https://vben.pro",
   "bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
   "repository": {