diff --git a/README.md b/README.md
index 4649e8fe..d6f63bd7 100644
--- a/README.md
+++ b/README.md
@@ -3,8 +3,29 @@
 Vue port of shadcn-ui.
 This project is in active development by [radix vue](github.com/radix-vue/radix-vue) team. We are working on this while porting radix to vue, simultaneously.
 
+## Installation
+
+Coming soon
+
+
+## Usage
+Examples can see at [App.vue](./packages/shadcn-vue/src/App.vue)
+
+## Contributors
+
 We welcome contributors to both [radix vue](github.com/radix-vue/radix-vue) and [shadcn vue](github.com/radix-vue/shadcn-vue). We are actively looking someone that can lead the shadcn vue project based on radix-vue. Please [join our discord](https://discord.gg/dpf7BZY3) and we will get you up and running with the project, lets build them together!
 
 If you want to get notified when we release the initial version, please give it a star! Hopefully we will get them done by this month!
 
-Sincerely, radix-vue team.
+## Community
+
+- [Join us on discord!](https://discord.gg/dpf7BZY3)
+
+## Authors
+
+- @khairulhaaziq
+- @mujahidfa
+- @zernonia
+
+## License
+- MIT License
diff --git a/packages/shadcn-vue/src/App.vue b/packages/shadcn-vue/src/App.vue
index 3692c94f..30c4ba69 100644
--- a/packages/shadcn-vue/src/App.vue
+++ b/packages/shadcn-vue/src/App.vue
@@ -1,50 +1,50 @@
 <script setup lang="ts">
 import { ref } from "vue";
 import {
-	Accordion,
-	AccordionTrigger,
-	AccordionItem,
-	AccordionContent,
-} from "./components/Accordion";
-import { Alert, AlertDescription, AlertTitle } from "./components/Alert";
+  Accordion,
+  AccordionTrigger,
+  AccordionItem,
+  AccordionContent,
+} from "./components/ui/Accordion";
+import { Alert, AlertDescription, AlertTitle } from "./components/ui/Alert";
 import { Card as InternalCard } from "./components/Internal/Docs/Card";
 import { TransitionExpand } from "@morev/vue-transitions";
 import { Icon } from "@iconify/vue";
-import { Button } from "./components/Button";
+import { Button } from "./components/ui/Button";
 import {
-	AlertDialog,
-	AlertDialogTitle,
-	AlertDialogHeader,
-	AlertDialogDescription,
-	AlertDialogFooter,
-} from "./components/AlertDialog";
+  AlertDialog,
+  AlertDialogTitle,
+  AlertDialogHeader,
+  AlertDialogDescription,
+  AlertDialogFooter,
+} from "./components/ui/AlertDialog";
 import {
-	Dialog,
-	DialogTitle,
-	DialogHeader,
-	DialogDescription,
-	DialogFooter,
-} from "./components/Dialog";
-import { Avatar, AvatarFallback, AvatarImage } from "./components/Avatar";
-import { Badge } from "./components/Badge";
-import { Checkbox } from "./components/Checkbox";
-import { Label } from "./components/Label";
-import { Input } from "./components/Input";
-import { Textarea } from "./components/Textarea";
-import { Switch } from "./components/Switch";
-import { Toggle } from "./components/Toggle";
-import { Card } from "./components/Demos";
-import { AspectRatio, Image } from "./components/AspectRatio";
+  Dialog,
+  DialogTitle,
+  DialogHeader,
+  DialogDescription,
+  DialogFooter,
+} from "./components/ui/Dialog";
+import { Avatar, AvatarFallback, AvatarImage } from "./components/ui/Avatar";
+import { Badge } from "./components/ui/Badge";
+import { Checkbox } from "./components/ui/Checkbox";
+import { Label } from "./components/ui/Label";
+import { Input } from "./components/ui/Input";
+import { Textarea } from "./components/ui/Textarea";
+import { Switch } from "./components/ui/Switch";
+import { Toggle } from "./components/ui/Toggle";
+import { Card } from "./components/ui/Demos";
+import { AspectRatio, Image } from "./components/ui/AspectRatio";
 import {
-	Collapsible,
-	CollapsibleTrigger,
-	CollapsibleContent,
-} from "./components/Collapsible";
-import { Select, SelectContent, SelectItem, SelectLabel, SelectTrigger } from "./components/Select";
-import { Popover, PopoverContent, PopoverTrigger } from "./components/Popover";
-import { Separator } from "./components/Separator";
-import { Tooltip, TooltipTrigger } from "./components/Tooltip";
-import { RadioGroup, RadioGroupItem } from "./components/RadioGroup";
+  Collapsible,
+  CollapsibleTrigger,
+  CollapsibleContent,
+} from "./components/ui/Collapsible";
+import { Select, SelectContent, SelectItem, SelectLabel, SelectTrigger } from "./components/ui/Select";
+import { Popover, PopoverContent, PopoverTrigger } from "./components/ui/Popover";
+import { Separator } from "./components/ui/Separator";
+import { Tooltip, TooltipTrigger } from "./components/ui/Tooltip";
+import { RadioGroup, RadioGroupItem } from "./components/ui/RadioGroup";
 
 const alertDialogIsOpen = ref(false);
 const dialogIsOpen = ref(false);
@@ -54,333 +54,333 @@ const checkboxEnabled2 = ref(false);
 const toggleEnabled = ref(false);
 
 const people = [
-	{ id: 1, name: "Durward Reynolds", unavailable: false },
-	{ id: 2, name: "Kenton Towne", unavailable: false },
-	{ id: 3, name: "Therese Wunsch", unavailable: false },
-	{ id: 4, name: "Benedict Kessler", unavailable: true },
-	{ id: 5, name: "Katelyn Rohan", unavailable: false },
+  { id: 1, name: "Durward Reynolds", unavailable: false },
+  { id: 2, name: "Kenton Towne", unavailable: false },
+  { id: 3, name: "Therese Wunsch", unavailable: false },
+  { id: 4, name: "Benedict Kessler", unavailable: true },
+  { id: 5, name: "Katelyn Rohan", unavailable: false },
 ];
 const selectedPerson = ref(people[0]);
 
 const radioOptions = [
-	"Default",
-	"Comfortable",
-	"Compact",
+  "Default",
+  "Comfortable",
+  "Compact",
 ];
 
 const radioValue = ref(radioOptions[0]);
 
 const components = [
-	"Accordion",
-	"Alert",
-	"Alert Dialog",
-	"Aspect Ratio",
-	"Avatar",
-	"Badge",
-	"Button",
-	"Calendar",
-	"Card",
-	"Checkbox",
-	"Collapsible",
-	"Combobox",
-	"Command",
-	"Context Menu",
-	"Data Table",
-	"Date Picker",
-	"Dialog",
-	"Dropdown Menu",
-	"Form",
-	"Hover Card",
-	"Input",
-	"Label",
-	"Menubar",
-	"Navigation Menu",
-	"Popover",
-	"Progress",
-	"Radio Group",
-	"Scroll Area",
-	"Select",
-	"Separator",
-	"Sheet",
-	"Skeleton",
-	"Slider",
-	"Switch",
-	"Table",
-	"Tabs",
-	"Textarea",
-	"Toast",
-	"Toggle",
-	"Tooltip",
+  "Accordion",
+  "Alert",
+  "Alert Dialog",
+  "Aspect Ratio",
+  "Avatar",
+  "Badge",
+  "Button",
+  "Calendar",
+  "Card",
+  "Checkbox",
+  "Collapsible",
+  "Combobox",
+  "Command",
+  "Context Menu",
+  "Data Table",
+  "Date Picker",
+  "Dialog",
+  "Dropdown Menu",
+  "Form",
+  "Hover Card",
+  "Input",
+  "Label",
+  "Menubar",
+  "Navigation Menu",
+  "Popover",
+  "Progress",
+  "Radio Group",
+  "Scroll Area",
+  "Select",
+  "Separator",
+  "Sheet",
+  "Skeleton",
+  "Slider",
+  "Switch",
+  "Table",
+  "Tabs",
+  "Textarea",
+  "Toast",
+  "Toggle",
+  "Tooltip",
 ];
 </script>
 
 <template>
-	<div class="flex flex-col items-center px-6 pb-6">
-		<div class="mt-32 mb-16 w-full max-w-6xl flex flex-col items-center">
-			<h1 class="text-7xl font-bold mb-2">shadcn vue</h1>
-			<p class="text-md text-neutral-700">
-				This is a description of easy UI that has been remade over 10000 times.
-			</p>
-		</div>
-		<div class="flex max-w-6xl">
-			<div class="w-[200px] pr-4">
-				<nav class="gap-0.5 flex flex-col text-sm sticky top-0 max-h-screen overflow-scroll">
-					<button v-for="(link, index) of components" :key="index"
-						:class="` group relative flex items-center gap-2.5 px-3 py-1.5 rounded-md text-gray-600 hover:text-black hover:bg-gray-200`">
-						<span :class="`truncate relative`">{{ link }}</span>
-					</button>
-				</nav>
-			</div>
-			<div class="flex-grow grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4">
-				<InternalCard title="Accordion">
-					<div class="w-full max-w-[400px]">
-						<Accordion>
-							<AccordionItem>
-								<AccordionTrigger> Is it accessible? </AccordionTrigger>
-								<transition-expand>
-									<AccordionContent>
-										Yes. It adheres to the WAI-ARIA design pattern.
-									</AccordionContent>
-								</transition-expand>
-							</AccordionItem>
-							<AccordionItem>
-								<AccordionTrigger> Is it styled? </AccordionTrigger>
-								<transition-expand>
-									<AccordionContent>
-										Yes. It comes with default styles that matches the other components'
-										aesthetic.
-									</AccordionContent>
-								</transition-expand>
-							</AccordionItem>
-							<AccordionItem>
-								<AccordionTrigger> Is it animated? </AccordionTrigger>
-								<transition-expand>
-									<AccordionContent>
-										Yes. It's animated by default, but you can disable it if you prefer.
-									</AccordionContent>
-								</transition-expand>
-							</AccordionItem>
-						</Accordion>
-					</div>
-				</InternalCard>
-				<InternalCard title="Alert">
-					<div class="max-w-[400px]">
-						<Alert>
-							<Icon icon="lucide:terminal" class="h-4 w-4" />
-							<AlertTitle>Heads up!</AlertTitle>
-							<AlertDescription>
-								You can add components to your app using the cli.
-							</AlertDescription>
-						</Alert>
-					</div>
-				</InternalCard>
-				<InternalCard title="Alert Dialog">
-					<Button label="Open" @click="alertDialogIsOpen = true">Show Dialog</Button>
-					<AlertDialog v-model="alertDialogIsOpen">
-						<AlertDialogHeader>
-							<AlertDialogTitle>Title</AlertDialogTitle>
-							<AlertDialogDescription>
-								This action cannot be undone. This will permanently delete your account
-								and remove your data from our servers.
-							</AlertDialogDescription>
-						</AlertDialogHeader>
-						<AlertDialogFooter><Button variant="outline"
-								@click="alertDialogIsOpen = false">Cancel</Button><Button>CTA Button</Button>
-						</AlertDialogFooter>
-					</AlertDialog>
-				</InternalCard>
-				<InternalCard title="Aspect Ratio">
-					<AspectRatio :ratio="16 / 9" class="bg-muted">
-						<Image src="https://images.unsplash.com/photo-1588345921523-c2dcdb7f1dcd?w=800&dpr=2&q=80"
-							alt="Photo by Drew Beamer" fill class="rounded-md object-cover" />
-					</AspectRatio>
-				</InternalCard>
-				<InternalCard title="Avatar">
-					<Avatar>
-						<AvatarImage src="https://github.com/shadcn.png" alt="@shadcn" />
-						<AvatarFallback>CN</AvatarFallback>
-					</Avatar>
-				</InternalCard>
-				<InternalCard title="Badge">
-					<Badge>Badge</Badge>
-				</InternalCard>
-				<InternalCard title="Button">
-					<Button>Button</Button>
-				</InternalCard>
-				<InternalCard title="Calendar"></InternalCard>
-				<InternalCard title="Card">
-					<Card />
-				</InternalCard>
-				<InternalCard title="Checkbox">
-					<div class="flex items-center space-x-2">
-						<Checkbox id="terms" v-model="checkboxEnabled" />
-						<label htmlFor="terms"
-							class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70">
-							Accept terms and conditions
-						</label>
-					</div>
-				</InternalCard>
-				<InternalCard title="Collapsible">
-					<Collapsible class="w-[350px] space-y-2" v-slot="{ open }">
-						<div class="flex items-center justify-between space-x-4 px-4">
-							<h4 class="text-sm font-semibold">@peduarte starred 3 repositories</h4>
-							<CollapsibleTrigger>
-								<Button variant="outline" class="w-9 p-0 aspect-square">
-									<span>
-										<Icon v-show="!open" icon="lucide:chevrons-up-down" class="h-4 w-4 text-black" />
-										<Icon v-show="open" icon="lucide:x" class="h-4 w-4 text-black" />
-									</span>
-								</Button>
-							</CollapsibleTrigger>
-						</div>
-						<div class="rounded-md border px-4 py-3 font-mono text-sm">
-							@radix-ui/primitives
-						</div>
-						<CollapsibleContent class="space-y-2">
-							<div class="rounded-md border px-4 py-3 font-mono text-sm">
-								@radix-ui/colors
-							</div>
-							<div class="rounded-md border px-4 py-3 font-mono text-sm">
-								@stitches/react
-							</div>
-						</CollapsibleContent>
-					</Collapsible>
-				</InternalCard>
-				<InternalCard title="Combobox"></InternalCard>
-				<InternalCard title="Command"></InternalCard>
-				<InternalCard title="Context Menu"></InternalCard>
-				<InternalCard title="Data Table"></InternalCard>
-				<InternalCard title="Date Picker"></InternalCard>
-				<InternalCard title="Dialog">
-					<Button label="Open" @click="dialogIsOpen = true">Show Dialog</Button>
-					<Dialog v-model="dialogIsOpen">
-						<DialogHeader>
-							<DialogTitle>Title</DialogTitle>
-							<DialogDescription>
-								This action cannot be undone. This will permanently delete your account
-								and remove your data from our servers.
-							</DialogDescription>
-						</DialogHeader>
-						<DialogFooter><Button variant="outline" @click="dialogIsOpen = false">Cancel</Button><Button>CTA
-								Button</Button>
-						</DialogFooter>
-					</Dialog>
-				</InternalCard>
-				<InternalCard title="Dropdown Menu"></InternalCard>
-				<InternalCard title="Hover Card"></InternalCard>
-				<InternalCard title="Input">
-					<Input type="email" placeholder="Email" />
-				</InternalCard>
-				<InternalCard title="Label">
-					<div class="flex items-center space-x-2">
-						<Checkbox id="terms2" v-model="checkboxEnabled2" />
-						<Label htmlFor="terms2">Accept terms and conditions</Label>
-					</div>
-				</InternalCard>
-				<InternalCard title="Menubar"></InternalCard>
-				<InternalCard title="Navigation Menu"></InternalCard>
-				<InternalCard title="Popover">
-					<Popover>
-						<PopoverTrigger><Button variant="outline">Open popover</Button></PopoverTrigger>
-						<PopoverContent class="w-80">
-							<div class="grid gap-4">
-								<div class="space-y-2">
-									<h4 class="font-medium leading-none">Dimensions</h4>
-									<p class="text-sm text-muted-foreground">
-										Set the dimensions for the layer.
-									</p>
-								</div>
-								<div class="grid gap-2">
-									<div class="grid grid-cols-3 items-center gap-4">
-										<Label htmlFor="width">Width</Label>
-										<Input id="width" defaultValue="100%" class="col-span-2 h-8" />
-									</div>
-									<div class="grid grid-cols-3 items-center gap-4">
-										<Label htmlFor="maxWidth">Max. width</Label>
-										<Input id="maxWidth" defaultValue="300px" class="col-span-2 h-8" />
-									</div>
-									<div class="grid grid-cols-3 items-center gap-4">
-										<Label htmlFor="height">Height</Label>
-										<Input id="height" defaultValue="25px" class="col-span-2 h-8" />
-									</div>
-									<div class="grid grid-cols-3 items-center gap-4">
-										<Label htmlFor="maxHeight">Max. height</Label>
-										<Input id="maxHeight" defaultValue="none" class="col-span-2 h-8" />
-									</div>
-								</div>
-							</div>
-						</PopoverContent>
-					</Popover>
-				</InternalCard>
-				<InternalCard title="Progress"></InternalCard>
-				<InternalCard title="Radio Group">
-					<RadioGroup v-model="radioValue">
-						<RadioGroupItem v-for="option in radioOptions" :value="option" :id="option">
-							<Label :for="option">{{ option }}</Label>
-						</RadioGroupItem>
-					</RadioGroup>
-				</InternalCard>
-				<InternalCard title="Scroll Area"></InternalCard>
-				<InternalCard title="Select">
-					<Select v-model="selectedPerson.id">
-						<SelectTrigger class="w-[210px]">
-							{{ selectedPerson.name }}
-						</SelectTrigger>
-						<SelectContent>
-							<SelectLabel>Fruits</SelectLabel>
-							<SelectItem v-for="person in people" :key="person.id" :value="person.id"
-								:disabled="person.unavailable">{{ person.name }}</SelectItem>
-						</SelectContent>
-					</Select>
-				</InternalCard>
-				<InternalCard title="Separator">
-					<div>
-						<div className="space-y-1">
-							<h4 className="text-sm font-medium leading-none">Radix Primitives</h4>
-							<p className="text-sm text-muted-foreground">
-								An open-source UI component library.
-							</p>
-						</div>
-						<Separator class="my-4" />
-						<div className="flex h-5 items-center space-x-4 text-sm">
-							<div>Blog</div>
-							<Separator orientation="vertical" />
-							<div>Docs</div>
-							<Separator orientation="vertical" />
-							<div>Source</div>
-						</div>
-					</div>
-				</InternalCard>
-				<InternalCard title="Sheet"></InternalCard>
-				<InternalCard title="Skeleton"></InternalCard>
-				<InternalCard title="Slider"></InternalCard>
-				<InternalCard title="Switch">
-					<div class="flex items-center space-x-2">
-						<Switch id="airplane-mode" v-model="enabled" />
-						<Label htmlFor="airplane-mode">Airplane Mode</Label>
-					</div>
-				</InternalCard>
-				<InternalCard title="Table"></InternalCard>
-				<InternalCard title="Tabs"></InternalCard>
-				<InternalCard title="Textarea"><Textarea placeholder="Type your message here." /></InternalCard>
-				<InternalCard title="Toast"></InternalCard>
-				<InternalCard title="Toggle">
-					<Toggle aria-label="Toggle italic" v-model="toggleEnabled">
-						<Icon icon="lucide:bold" class="h-4 w-4" />
-					</Toggle>
-				</InternalCard>
-				<InternalCard title="Tooltip">
-					<Tooltip>
-						<TooltipTrigger>Hover</TooltipTrigger>
-					</Tooltip>
-				</InternalCard>
-			</div>
-		</div>
-	</div>
+  <div class="flex flex-col items-center px-6 pb-6">
+    <div class="mt-32 mb-16 w-full max-w-6xl flex flex-col items-center">
+      <h1 class="text-7xl font-bold mb-2">shadcn vue</h1>
+      <p class="text-md text-neutral-700">
+        This is a description of easy UI that has been remade over 10000 times.
+      </p>
+    </div>
+    <div class="flex max-w-6xl">
+      <div class="w-[200px] pr-4">
+        <nav class="gap-0.5 flex flex-col text-sm sticky top-0 max-h-screen overflow-scroll">
+          <button v-for="(link, index) of components" :key="index"
+            :class="` group relative flex items-center gap-2.5 px-3 py-1.5 rounded-md text-gray-600 hover:text-black hover:bg-gray-200`">
+            <span :class="`truncate relative`">{{ link }}</span>
+          </button>
+        </nav>
+      </div>
+      <div class="flex-grow grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4">
+        <InternalCard title="Accordion">
+          <div class="w-full max-w-[400px]">
+            <Accordion>
+              <AccordionItem>
+                <AccordionTrigger> Is it accessible? </AccordionTrigger>
+                <transition-expand>
+                  <AccordionContent>
+                    Yes. It adheres to the WAI-ARIA design pattern.
+                  </AccordionContent>
+                </transition-expand>
+              </AccordionItem>
+              <AccordionItem>
+                <AccordionTrigger> Is it styled? </AccordionTrigger>
+                <transition-expand>
+                  <AccordionContent>
+                    Yes. It comes with default styles that matches the other components'
+                    aesthetic.
+                  </AccordionContent>
+                </transition-expand>
+              </AccordionItem>
+              <AccordionItem>
+                <AccordionTrigger> Is it animated? </AccordionTrigger>
+                <transition-expand>
+                  <AccordionContent>
+                    Yes. It's animated by default, but you can disable it if you prefer.
+                  </AccordionContent>
+                </transition-expand>
+              </AccordionItem>
+            </Accordion>
+          </div>
+        </InternalCard>
+        <InternalCard title="Alert">
+          <div class="max-w-[400px]">
+            <Alert>
+              <Icon icon="lucide:terminal" class="h-4 w-4" />
+              <AlertTitle>Heads up!</AlertTitle>
+              <AlertDescription>
+                You can add components to your app using the cli.
+              </AlertDescription>
+            </Alert>
+          </div>
+        </InternalCard>
+        <InternalCard title="Alert Dialog">
+          <Button label="Open" @click="alertDialogIsOpen = true">Show Dialog</Button>
+          <AlertDialog v-model="alertDialogIsOpen">
+            <AlertDialogHeader>
+              <AlertDialogTitle>Title</AlertDialogTitle>
+              <AlertDialogDescription>
+                This action cannot be undone. This will permanently delete your account
+                and remove your data from our servers.
+              </AlertDialogDescription>
+            </AlertDialogHeader>
+            <AlertDialogFooter><Button variant="outline" @click="alertDialogIsOpen = false">Cancel</Button><Button>CTA
+                Button</Button>
+            </AlertDialogFooter>
+          </AlertDialog>
+        </InternalCard>
+        <InternalCard title="Aspect Ratio">
+          <AspectRatio :ratio="16 / 9" class="bg-muted">
+            <Image src="https://images.unsplash.com/photo-1588345921523-c2dcdb7f1dcd?w=800&dpr=2&q=80"
+              alt="Photo by Drew Beamer" fill class="rounded-md object-cover" />
+          </AspectRatio>
+        </InternalCard>
+        <InternalCard title="Avatar">
+          <Avatar>
+            <AvatarImage src="https://github.com/shadcn.png" alt="@shadcn" />
+            <AvatarFallback>CN</AvatarFallback>
+          </Avatar>
+        </InternalCard>
+        <InternalCard title="Badge">
+          <Badge>Badge</Badge>
+        </InternalCard>
+        <InternalCard title="Button">
+          <Button>Button</Button>
+        </InternalCard>
+        <InternalCard title="Calendar"></InternalCard>
+        <InternalCard title="Card">
+          <Card />
+        </InternalCard>
+        <InternalCard title="Checkbox">
+          <div class="flex items-center space-x-2">
+            <Checkbox id="terms" v-model="checkboxEnabled" />
+            <label htmlFor="terms"
+              class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70">
+              Accept terms and conditions
+            </label>
+          </div>
+        </InternalCard>
+        <InternalCard title="Collapsible">
+          <Collapsible class="w-[350px] space-y-2" v-slot="{ open }">
+            <div class="flex items-center justify-between space-x-4 px-4">
+              <h4 class="text-sm font-semibold">@peduarte starred 3 repositories</h4>
+              <CollapsibleTrigger>
+                <Button variant="outline" class="w-9 p-0 aspect-square">
+                  <span>
+                    <Icon v-show="!open" icon="lucide:chevrons-up-down" class="h-4 w-4 text-black" />
+                    <Icon v-show="open" icon="lucide:x" class="h-4 w-4 text-black" />
+                  </span>
+                </Button>
+              </CollapsibleTrigger>
+            </div>
+            <div class="rounded-md border px-4 py-3 font-mono text-sm">
+              @radix-ui/primitives
+            </div>
+            <CollapsibleContent class="space-y-2">
+              <div class="rounded-md border px-4 py-3 font-mono text-sm">
+                @radix-ui/colors
+              </div>
+              <div class="rounded-md border px-4 py-3 font-mono text-sm">
+                @stitches/react
+              </div>
+            </CollapsibleContent>
+          </Collapsible>
+        </InternalCard>
+        <InternalCard title="Combobox"></InternalCard>
+        <InternalCard title="Command"></InternalCard>
+        <InternalCard title="Context Menu"></InternalCard>
+        <InternalCard title="Data Table"></InternalCard>
+        <InternalCard title="Date Picker"></InternalCard>
+        <InternalCard title="Dialog">
+          <Button label="Open" @click="dialogIsOpen = true">Show Dialog</Button>
+          <Dialog v-model="dialogIsOpen">
+            <DialogHeader>
+              <DialogTitle>Title</DialogTitle>
+              <DialogDescription>
+                This action cannot be undone. This will permanently delete your account
+                and remove your data from our servers.
+              </DialogDescription>
+            </DialogHeader>
+            <DialogFooter><Button variant="outline" @click="dialogIsOpen = false">Cancel</Button><Button>CTA
+                Button</Button>
+            </DialogFooter>
+          </Dialog>
+        </InternalCard>
+        <InternalCard title="Dropdown Menu"></InternalCard>
+        <InternalCard title="Hover Card"></InternalCard>
+        <InternalCard title="Input">
+          <Input type="email" placeholder="Email" />
+        </InternalCard>
+        <InternalCard title="Label">
+          <div class="flex items-center space-x-2">
+            <Checkbox id="terms2" v-model="checkboxEnabled2" />
+            <Label htmlFor="terms2">Accept terms and conditions</Label>
+          </div>
+        </InternalCard>
+        <InternalCard title="Menubar"></InternalCard>
+        <InternalCard title="Navigation Menu"></InternalCard>
+        <InternalCard title="Popover">
+          <Popover>
+            <PopoverTrigger><Button variant="outline">Open popover</Button></PopoverTrigger>
+            <PopoverContent class="w-80">
+              <div class="grid gap-4">
+                <div class="space-y-2">
+                  <h4 class="font-medium leading-none">Dimensions</h4>
+                  <p class="text-sm text-muted-foreground">
+                    Set the dimensions for the layer.
+                  </p>
+                </div>
+                <div class="grid gap-2">
+                  <div class="grid grid-cols-3 items-center gap-4">
+                    <Label htmlFor="width">Width</Label>
+                    <Input id="width" defaultValue="100%" class="col-span-2 h-8" />
+                  </div>
+                  <div class="grid grid-cols-3 items-center gap-4">
+                    <Label htmlFor="maxWidth">Max. width</Label>
+                    <Input id="maxWidth" defaultValue="300px" class="col-span-2 h-8" />
+                  </div>
+                  <div class="grid grid-cols-3 items-center gap-4">
+                    <Label htmlFor="height">Height</Label>
+                    <Input id="height" defaultValue="25px" class="col-span-2 h-8" />
+                  </div>
+                  <div class="grid grid-cols-3 items-center gap-4">
+                    <Label htmlFor="maxHeight">Max. height</Label>
+                    <Input id="maxHeight" defaultValue="none" class="col-span-2 h-8" />
+                  </div>
+                </div>
+              </div>
+            </PopoverContent>
+          </Popover>
+        </InternalCard>
+        <InternalCard title="Progress"></InternalCard>
+        <InternalCard title="Radio Group">
+          <RadioGroup v-model="radioValue">
+            <RadioGroupItem v-for="option in radioOptions" :value="option" :id="option">
+              <Label :for="option">{{ option }}</Label>
+            </RadioGroupItem>
+          </RadioGroup>
+        </InternalCard>
+        <InternalCard title="Scroll Area"></InternalCard>
+        <InternalCard title="Select">
+          <Select v-model="selectedPerson.id">
+            <SelectTrigger class="w-[210px]">
+              {{ selectedPerson.name }}
+            </SelectTrigger>
+            <SelectContent>
+              <SelectLabel>Fruits</SelectLabel>
+              <SelectItem v-for="person in people" :key="person.id" :value="person.id" :disabled="person.unavailable">{{
+                person.name }}</SelectItem>
+            </SelectContent>
+          </Select>
+        </InternalCard>
+        <InternalCard title="Separator">
+          <div>
+            <div className="space-y-1">
+              <h4 className="text-sm font-medium leading-none">Radix Primitives</h4>
+              <p className="text-sm text-muted-foreground">
+                An open-source UI component library.
+              </p>
+            </div>
+            <Separator class="my-4" />
+            <div className="flex h-5 items-center space-x-4 text-sm">
+              <div>Blog</div>
+              <Separator orientation="vertical" />
+              <div>Docs</div>
+              <Separator orientation="vertical" />
+              <div>Source</div>
+            </div>
+          </div>
+        </InternalCard>
+        <InternalCard title="Sheet"></InternalCard>
+        <InternalCard title="Skeleton"></InternalCard>
+        <InternalCard title="Slider"></InternalCard>
+        <InternalCard title="Switch">
+          <div class="flex items-center space-x-2">
+            <Switch id="airplane-mode" v-model="enabled" />
+            <Label htmlFor="airplane-mode">Airplane Mode</Label>
+          </div>
+        </InternalCard>
+        <InternalCard title="Table"></InternalCard>
+        <InternalCard title="Tabs"></InternalCard>
+        <InternalCard title="Textarea"><Textarea placeholder="Type your message here." /></InternalCard>
+        <InternalCard title="Toast"></InternalCard>
+        <InternalCard title="Toggle">
+          <Toggle aria-label="Toggle italic" v-model="toggleEnabled">
+            <Icon icon="lucide:bold" class="h-4 w-4" />
+          </Toggle>
+        </InternalCard>
+        <InternalCard title="Tooltip">
+          <Tooltip>
+            <TooltipTrigger>Hover</TooltipTrigger>
+          </Tooltip>
+        </InternalCard>
+      </div>
+    </div>
+  </div>
 </template>
 
 <style>
 body {
-	@apply bg-neutral-100;
+  @apply bg-neutral-100;
 }
 </style>
diff --git a/packages/shadcn-vue/src/components/Accordion/Accordion.vue b/packages/shadcn-vue/src/components/ui/Accordion/Accordion.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Accordion/Accordion.vue
rename to packages/shadcn-vue/src/components/ui/Accordion/Accordion.vue
diff --git a/packages/shadcn-vue/src/components/Accordion/AccordionContent.vue b/packages/shadcn-vue/src/components/ui/Accordion/AccordionContent.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Accordion/AccordionContent.vue
rename to packages/shadcn-vue/src/components/ui/Accordion/AccordionContent.vue
diff --git a/packages/shadcn-vue/src/components/Accordion/AccordionItem.vue b/packages/shadcn-vue/src/components/ui/Accordion/AccordionItem.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Accordion/AccordionItem.vue
rename to packages/shadcn-vue/src/components/ui/Accordion/AccordionItem.vue
diff --git a/packages/shadcn-vue/src/components/Accordion/AccordionTrigger.vue b/packages/shadcn-vue/src/components/ui/Accordion/AccordionTrigger.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Accordion/AccordionTrigger.vue
rename to packages/shadcn-vue/src/components/ui/Accordion/AccordionTrigger.vue
diff --git a/packages/shadcn-vue/src/components/Accordion/index.ts b/packages/shadcn-vue/src/components/ui/Accordion/index.ts
similarity index 100%
rename from packages/shadcn-vue/src/components/Accordion/index.ts
rename to packages/shadcn-vue/src/components/ui/Accordion/index.ts
diff --git a/packages/shadcn-vue/src/components/Alert/Alert.vue b/packages/shadcn-vue/src/components/ui/Alert/Alert.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Alert/Alert.vue
rename to packages/shadcn-vue/src/components/ui/Alert/Alert.vue
diff --git a/packages/shadcn-vue/src/components/Alert/AlertDescription.vue b/packages/shadcn-vue/src/components/ui/Alert/AlertDescription.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Alert/AlertDescription.vue
rename to packages/shadcn-vue/src/components/ui/Alert/AlertDescription.vue
diff --git a/packages/shadcn-vue/src/components/Alert/AlertTitle.vue b/packages/shadcn-vue/src/components/ui/Alert/AlertTitle.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Alert/AlertTitle.vue
rename to packages/shadcn-vue/src/components/ui/Alert/AlertTitle.vue
diff --git a/packages/shadcn-vue/src/components/Alert/index.ts b/packages/shadcn-vue/src/components/ui/Alert/index.ts
similarity index 100%
rename from packages/shadcn-vue/src/components/Alert/index.ts
rename to packages/shadcn-vue/src/components/ui/Alert/index.ts
diff --git a/packages/shadcn-vue/src/components/AlertDialog/AlertDialog.vue b/packages/shadcn-vue/src/components/ui/AlertDialog/AlertDialog.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/AlertDialog/AlertDialog.vue
rename to packages/shadcn-vue/src/components/ui/AlertDialog/AlertDialog.vue
diff --git a/packages/shadcn-vue/src/components/AlertDialog/AlertDialogDescription.vue b/packages/shadcn-vue/src/components/ui/AlertDialog/AlertDialogDescription.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/AlertDialog/AlertDialogDescription.vue
rename to packages/shadcn-vue/src/components/ui/AlertDialog/AlertDialogDescription.vue
diff --git a/packages/shadcn-vue/src/components/AlertDialog/AlertDialogFooter.vue b/packages/shadcn-vue/src/components/ui/AlertDialog/AlertDialogFooter.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/AlertDialog/AlertDialogFooter.vue
rename to packages/shadcn-vue/src/components/ui/AlertDialog/AlertDialogFooter.vue
diff --git a/packages/shadcn-vue/src/components/AlertDialog/AlertDialogHeader.vue b/packages/shadcn-vue/src/components/ui/AlertDialog/AlertDialogHeader.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/AlertDialog/AlertDialogHeader.vue
rename to packages/shadcn-vue/src/components/ui/AlertDialog/AlertDialogHeader.vue
diff --git a/packages/shadcn-vue/src/components/AlertDialog/AlertDialogTitle.vue b/packages/shadcn-vue/src/components/ui/AlertDialog/AlertDialogTitle.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/AlertDialog/AlertDialogTitle.vue
rename to packages/shadcn-vue/src/components/ui/AlertDialog/AlertDialogTitle.vue
diff --git a/packages/shadcn-vue/src/components/AlertDialog/AlertDialogTrigger.vue b/packages/shadcn-vue/src/components/ui/AlertDialog/AlertDialogTrigger.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/AlertDialog/AlertDialogTrigger.vue
rename to packages/shadcn-vue/src/components/ui/AlertDialog/AlertDialogTrigger.vue
diff --git a/packages/shadcn-vue/src/components/AlertDialog/index.ts b/packages/shadcn-vue/src/components/ui/AlertDialog/index.ts
similarity index 100%
rename from packages/shadcn-vue/src/components/AlertDialog/index.ts
rename to packages/shadcn-vue/src/components/ui/AlertDialog/index.ts
diff --git a/packages/shadcn-vue/src/components/AspectRatio/AspectRatio.vue b/packages/shadcn-vue/src/components/ui/AspectRatio/AspectRatio.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/AspectRatio/AspectRatio.vue
rename to packages/shadcn-vue/src/components/ui/AspectRatio/AspectRatio.vue
diff --git a/packages/shadcn-vue/src/components/AspectRatio/Image.vue b/packages/shadcn-vue/src/components/ui/AspectRatio/Image.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/AspectRatio/Image.vue
rename to packages/shadcn-vue/src/components/ui/AspectRatio/Image.vue
diff --git a/packages/shadcn-vue/src/components/AspectRatio/index.ts b/packages/shadcn-vue/src/components/ui/AspectRatio/index.ts
similarity index 100%
rename from packages/shadcn-vue/src/components/AspectRatio/index.ts
rename to packages/shadcn-vue/src/components/ui/AspectRatio/index.ts
diff --git a/packages/shadcn-vue/src/components/Avatar/Avatar.vue b/packages/shadcn-vue/src/components/ui/Avatar/Avatar.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Avatar/Avatar.vue
rename to packages/shadcn-vue/src/components/ui/Avatar/Avatar.vue
diff --git a/packages/shadcn-vue/src/components/Avatar/AvatarFallback.vue b/packages/shadcn-vue/src/components/ui/Avatar/AvatarFallback.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Avatar/AvatarFallback.vue
rename to packages/shadcn-vue/src/components/ui/Avatar/AvatarFallback.vue
diff --git a/packages/shadcn-vue/src/components/Avatar/AvatarImage.vue b/packages/shadcn-vue/src/components/ui/Avatar/AvatarImage.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Avatar/AvatarImage.vue
rename to packages/shadcn-vue/src/components/ui/Avatar/AvatarImage.vue
diff --git a/packages/shadcn-vue/src/components/Avatar/index.ts b/packages/shadcn-vue/src/components/ui/Avatar/index.ts
similarity index 100%
rename from packages/shadcn-vue/src/components/Avatar/index.ts
rename to packages/shadcn-vue/src/components/ui/Avatar/index.ts
diff --git a/packages/shadcn-vue/src/components/Badge/Badge.vue b/packages/shadcn-vue/src/components/ui/Badge/Badge.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Badge/Badge.vue
rename to packages/shadcn-vue/src/components/ui/Badge/Badge.vue
diff --git a/packages/shadcn-vue/src/components/Badge/index.ts b/packages/shadcn-vue/src/components/ui/Badge/index.ts
similarity index 100%
rename from packages/shadcn-vue/src/components/Badge/index.ts
rename to packages/shadcn-vue/src/components/ui/Badge/index.ts
diff --git a/packages/shadcn-vue/src/components/Button/Button.vue b/packages/shadcn-vue/src/components/ui/Button/Button.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Button/Button.vue
rename to packages/shadcn-vue/src/components/ui/Button/Button.vue
diff --git a/packages/shadcn-vue/src/components/Button/index.ts b/packages/shadcn-vue/src/components/ui/Button/index.ts
similarity index 100%
rename from packages/shadcn-vue/src/components/Button/index.ts
rename to packages/shadcn-vue/src/components/ui/Button/index.ts
diff --git a/packages/shadcn-vue/src/components/Card/Card.vue b/packages/shadcn-vue/src/components/ui/Card/Card.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Card/Card.vue
rename to packages/shadcn-vue/src/components/ui/Card/Card.vue
diff --git a/packages/shadcn-vue/src/components/Card/CardContent.vue b/packages/shadcn-vue/src/components/ui/Card/CardContent.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Card/CardContent.vue
rename to packages/shadcn-vue/src/components/ui/Card/CardContent.vue
diff --git a/packages/shadcn-vue/src/components/Card/CardDescription.vue b/packages/shadcn-vue/src/components/ui/Card/CardDescription.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Card/CardDescription.vue
rename to packages/shadcn-vue/src/components/ui/Card/CardDescription.vue
diff --git a/packages/shadcn-vue/src/components/Card/CardFooter.vue b/packages/shadcn-vue/src/components/ui/Card/CardFooter.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Card/CardFooter.vue
rename to packages/shadcn-vue/src/components/ui/Card/CardFooter.vue
diff --git a/packages/shadcn-vue/src/components/Card/CardHeader.vue b/packages/shadcn-vue/src/components/ui/Card/CardHeader.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Card/CardHeader.vue
rename to packages/shadcn-vue/src/components/ui/Card/CardHeader.vue
diff --git a/packages/shadcn-vue/src/components/Card/CardTitle.vue b/packages/shadcn-vue/src/components/ui/Card/CardTitle.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Card/CardTitle.vue
rename to packages/shadcn-vue/src/components/ui/Card/CardTitle.vue
diff --git a/packages/shadcn-vue/src/components/Card/index.ts b/packages/shadcn-vue/src/components/ui/Card/index.ts
similarity index 100%
rename from packages/shadcn-vue/src/components/Card/index.ts
rename to packages/shadcn-vue/src/components/ui/Card/index.ts
diff --git a/packages/shadcn-vue/src/components/Checkbox/Checkbox.vue b/packages/shadcn-vue/src/components/ui/Checkbox/Checkbox.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Checkbox/Checkbox.vue
rename to packages/shadcn-vue/src/components/ui/Checkbox/Checkbox.vue
diff --git a/packages/shadcn-vue/src/components/Checkbox/index.ts b/packages/shadcn-vue/src/components/ui/Checkbox/index.ts
similarity index 100%
rename from packages/shadcn-vue/src/components/Checkbox/index.ts
rename to packages/shadcn-vue/src/components/ui/Checkbox/index.ts
diff --git a/packages/shadcn-vue/src/components/Collapsible/Collapsible.vue b/packages/shadcn-vue/src/components/ui/Collapsible/Collapsible.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Collapsible/Collapsible.vue
rename to packages/shadcn-vue/src/components/ui/Collapsible/Collapsible.vue
diff --git a/packages/shadcn-vue/src/components/Collapsible/CollapsibleContent.vue b/packages/shadcn-vue/src/components/ui/Collapsible/CollapsibleContent.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Collapsible/CollapsibleContent.vue
rename to packages/shadcn-vue/src/components/ui/Collapsible/CollapsibleContent.vue
diff --git a/packages/shadcn-vue/src/components/Collapsible/CollapsibleTrigger.vue b/packages/shadcn-vue/src/components/ui/Collapsible/CollapsibleTrigger.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Collapsible/CollapsibleTrigger.vue
rename to packages/shadcn-vue/src/components/ui/Collapsible/CollapsibleTrigger.vue
diff --git a/packages/shadcn-vue/src/components/Collapsible/index.ts b/packages/shadcn-vue/src/components/ui/Collapsible/index.ts
similarity index 100%
rename from packages/shadcn-vue/src/components/Collapsible/index.ts
rename to packages/shadcn-vue/src/components/ui/Collapsible/index.ts
diff --git a/packages/shadcn-vue/src/components/Combobox/Combobox.vue b/packages/shadcn-vue/src/components/ui/Combobox/Combobox.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Combobox/Combobox.vue
rename to packages/shadcn-vue/src/components/ui/Combobox/Combobox.vue
diff --git a/packages/shadcn-vue/src/components/Combobox/ComboboxInput.vue b/packages/shadcn-vue/src/components/ui/Combobox/ComboboxInput.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Combobox/ComboboxInput.vue
rename to packages/shadcn-vue/src/components/ui/Combobox/ComboboxInput.vue
diff --git a/packages/shadcn-vue/src/components/Combobox/ComboboxOption.vue b/packages/shadcn-vue/src/components/ui/Combobox/ComboboxOption.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Combobox/ComboboxOption.vue
rename to packages/shadcn-vue/src/components/ui/Combobox/ComboboxOption.vue
diff --git a/packages/shadcn-vue/src/components/Combobox/ComboboxOptions.vue b/packages/shadcn-vue/src/components/ui/Combobox/ComboboxOptions.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Combobox/ComboboxOptions.vue
rename to packages/shadcn-vue/src/components/ui/Combobox/ComboboxOptions.vue
diff --git a/packages/shadcn-vue/src/components/Combobox/index.ts b/packages/shadcn-vue/src/components/ui/Combobox/index.ts
similarity index 100%
rename from packages/shadcn-vue/src/components/Combobox/index.ts
rename to packages/shadcn-vue/src/components/ui/Combobox/index.ts
diff --git a/packages/shadcn-vue/src/components/Demos/Card.vue b/packages/shadcn-vue/src/components/ui/Demos/Card.vue
similarity index 94%
rename from packages/shadcn-vue/src/components/Demos/Card.vue
rename to packages/shadcn-vue/src/components/ui/Demos/Card.vue
index 874b02e3..b30e4387 100644
--- a/packages/shadcn-vue/src/components/Demos/Card.vue
+++ b/packages/shadcn-vue/src/components/ui/Demos/Card.vue
@@ -1,7 +1,7 @@
 
 <script setup>
 import { Icon } from "@iconify/vue";
-import { Button } from "@/src/components/Button"
+import { Button } from "@/src/components/ui/Button"
 import {
 	Card,
 	CardContent,
@@ -9,7 +9,7 @@ import {
 	CardFooter,
 	CardHeader,
 	CardTitle,
-} from "@/src/components/Card"
+} from "@/src/components/ui/Card"
 
 const notifications = [
 	{
diff --git a/packages/shadcn-vue/src/components/Demos/index.ts b/packages/shadcn-vue/src/components/ui/Demos/index.ts
similarity index 100%
rename from packages/shadcn-vue/src/components/Demos/index.ts
rename to packages/shadcn-vue/src/components/ui/Demos/index.ts
diff --git a/packages/shadcn-vue/src/components/Dialog/Dialog.vue b/packages/shadcn-vue/src/components/ui/Dialog/Dialog.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Dialog/Dialog.vue
rename to packages/shadcn-vue/src/components/ui/Dialog/Dialog.vue
diff --git a/packages/shadcn-vue/src/components/Dialog/DialogDescription.vue b/packages/shadcn-vue/src/components/ui/Dialog/DialogDescription.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Dialog/DialogDescription.vue
rename to packages/shadcn-vue/src/components/ui/Dialog/DialogDescription.vue
diff --git a/packages/shadcn-vue/src/components/Dialog/DialogFooter.vue b/packages/shadcn-vue/src/components/ui/Dialog/DialogFooter.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Dialog/DialogFooter.vue
rename to packages/shadcn-vue/src/components/ui/Dialog/DialogFooter.vue
diff --git a/packages/shadcn-vue/src/components/Dialog/DialogHeader.vue b/packages/shadcn-vue/src/components/ui/Dialog/DialogHeader.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Dialog/DialogHeader.vue
rename to packages/shadcn-vue/src/components/ui/Dialog/DialogHeader.vue
diff --git a/packages/shadcn-vue/src/components/Dialog/DialogTitle.vue b/packages/shadcn-vue/src/components/ui/Dialog/DialogTitle.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Dialog/DialogTitle.vue
rename to packages/shadcn-vue/src/components/ui/Dialog/DialogTitle.vue
diff --git a/packages/shadcn-vue/src/components/Dialog/DialogTrigger.vue b/packages/shadcn-vue/src/components/ui/Dialog/DialogTrigger.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Dialog/DialogTrigger.vue
rename to packages/shadcn-vue/src/components/ui/Dialog/DialogTrigger.vue
diff --git a/packages/shadcn-vue/src/components/Dialog/index.ts b/packages/shadcn-vue/src/components/ui/Dialog/index.ts
similarity index 100%
rename from packages/shadcn-vue/src/components/Dialog/index.ts
rename to packages/shadcn-vue/src/components/ui/Dialog/index.ts
diff --git a/packages/shadcn-vue/src/components/Input/Input.vue b/packages/shadcn-vue/src/components/ui/Input/Input.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Input/Input.vue
rename to packages/shadcn-vue/src/components/ui/Input/Input.vue
diff --git a/packages/shadcn-vue/src/components/Input/index.ts b/packages/shadcn-vue/src/components/ui/Input/index.ts
similarity index 100%
rename from packages/shadcn-vue/src/components/Input/index.ts
rename to packages/shadcn-vue/src/components/ui/Input/index.ts
diff --git a/packages/shadcn-vue/src/components/Label/Label.vue b/packages/shadcn-vue/src/components/ui/Label/Label.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Label/Label.vue
rename to packages/shadcn-vue/src/components/ui/Label/Label.vue
diff --git a/packages/shadcn-vue/src/components/Label/index.ts b/packages/shadcn-vue/src/components/ui/Label/index.ts
similarity index 100%
rename from packages/shadcn-vue/src/components/Label/index.ts
rename to packages/shadcn-vue/src/components/ui/Label/index.ts
diff --git a/packages/shadcn-vue/src/components/Popover/Popover.vue b/packages/shadcn-vue/src/components/ui/Popover/Popover.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Popover/Popover.vue
rename to packages/shadcn-vue/src/components/ui/Popover/Popover.vue
diff --git a/packages/shadcn-vue/src/components/Popover/PopoverContent.vue b/packages/shadcn-vue/src/components/ui/Popover/PopoverContent.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Popover/PopoverContent.vue
rename to packages/shadcn-vue/src/components/ui/Popover/PopoverContent.vue
diff --git a/packages/shadcn-vue/src/components/Popover/PopoverTrigger.vue b/packages/shadcn-vue/src/components/ui/Popover/PopoverTrigger.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Popover/PopoverTrigger.vue
rename to packages/shadcn-vue/src/components/ui/Popover/PopoverTrigger.vue
diff --git a/packages/shadcn-vue/src/components/Popover/index.ts b/packages/shadcn-vue/src/components/ui/Popover/index.ts
similarity index 100%
rename from packages/shadcn-vue/src/components/Popover/index.ts
rename to packages/shadcn-vue/src/components/ui/Popover/index.ts
diff --git a/packages/shadcn-vue/src/components/RadioGroup/RadioGroup.vue b/packages/shadcn-vue/src/components/ui/RadioGroup/RadioGroup.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/RadioGroup/RadioGroup.vue
rename to packages/shadcn-vue/src/components/ui/RadioGroup/RadioGroup.vue
diff --git a/packages/shadcn-vue/src/components/RadioGroup/RadioGroupItem.vue b/packages/shadcn-vue/src/components/ui/RadioGroup/RadioGroupItem.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/RadioGroup/RadioGroupItem.vue
rename to packages/shadcn-vue/src/components/ui/RadioGroup/RadioGroupItem.vue
diff --git a/packages/shadcn-vue/src/components/RadioGroup/index.ts b/packages/shadcn-vue/src/components/ui/RadioGroup/index.ts
similarity index 100%
rename from packages/shadcn-vue/src/components/RadioGroup/index.ts
rename to packages/shadcn-vue/src/components/ui/RadioGroup/index.ts
diff --git a/packages/shadcn-vue/src/components/Select/Select.vue b/packages/shadcn-vue/src/components/ui/Select/Select.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Select/Select.vue
rename to packages/shadcn-vue/src/components/ui/Select/Select.vue
diff --git a/packages/shadcn-vue/src/components/Select/SelectContent.vue b/packages/shadcn-vue/src/components/ui/Select/SelectContent.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Select/SelectContent.vue
rename to packages/shadcn-vue/src/components/ui/Select/SelectContent.vue
diff --git a/packages/shadcn-vue/src/components/Select/SelectItem.vue b/packages/shadcn-vue/src/components/ui/Select/SelectItem.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Select/SelectItem.vue
rename to packages/shadcn-vue/src/components/ui/Select/SelectItem.vue
diff --git a/packages/shadcn-vue/src/components/Select/SelectLabel.vue b/packages/shadcn-vue/src/components/ui/Select/SelectLabel.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Select/SelectLabel.vue
rename to packages/shadcn-vue/src/components/ui/Select/SelectLabel.vue
diff --git a/packages/shadcn-vue/src/components/Select/SelectTrigger.vue b/packages/shadcn-vue/src/components/ui/Select/SelectTrigger.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Select/SelectTrigger.vue
rename to packages/shadcn-vue/src/components/ui/Select/SelectTrigger.vue
diff --git a/packages/shadcn-vue/src/components/Select/index.ts b/packages/shadcn-vue/src/components/ui/Select/index.ts
similarity index 100%
rename from packages/shadcn-vue/src/components/Select/index.ts
rename to packages/shadcn-vue/src/components/ui/Select/index.ts
diff --git a/packages/shadcn-vue/src/components/Separator/Separator.vue b/packages/shadcn-vue/src/components/ui/Separator/Separator.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Separator/Separator.vue
rename to packages/shadcn-vue/src/components/ui/Separator/Separator.vue
diff --git a/packages/shadcn-vue/src/components/Separator/index.ts b/packages/shadcn-vue/src/components/ui/Separator/index.ts
similarity index 100%
rename from packages/shadcn-vue/src/components/Separator/index.ts
rename to packages/shadcn-vue/src/components/ui/Separator/index.ts
diff --git a/packages/shadcn-vue/src/components/Switch/Switch.vue b/packages/shadcn-vue/src/components/ui/Switch/Switch.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Switch/Switch.vue
rename to packages/shadcn-vue/src/components/ui/Switch/Switch.vue
diff --git a/packages/shadcn-vue/src/components/Switch/index.ts b/packages/shadcn-vue/src/components/ui/Switch/index.ts
similarity index 100%
rename from packages/shadcn-vue/src/components/Switch/index.ts
rename to packages/shadcn-vue/src/components/ui/Switch/index.ts
diff --git a/packages/shadcn-vue/src/components/Tabs/Tabs.vue b/packages/shadcn-vue/src/components/ui/Tabs/Tabs.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Tabs/Tabs.vue
rename to packages/shadcn-vue/src/components/ui/Tabs/Tabs.vue
diff --git a/packages/shadcn-vue/src/components/Tabs/TabsContent.vue b/packages/shadcn-vue/src/components/ui/Tabs/TabsContent.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Tabs/TabsContent.vue
rename to packages/shadcn-vue/src/components/ui/Tabs/TabsContent.vue
diff --git a/packages/shadcn-vue/src/components/Tabs/TabsList.vue b/packages/shadcn-vue/src/components/ui/Tabs/TabsList.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Tabs/TabsList.vue
rename to packages/shadcn-vue/src/components/ui/Tabs/TabsList.vue
diff --git a/packages/shadcn-vue/src/components/Tabs/TabsTrigger.vue b/packages/shadcn-vue/src/components/ui/Tabs/TabsTrigger.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Tabs/TabsTrigger.vue
rename to packages/shadcn-vue/src/components/ui/Tabs/TabsTrigger.vue
diff --git a/packages/shadcn-vue/src/components/Tabs/index.ts b/packages/shadcn-vue/src/components/ui/Tabs/index.ts
similarity index 100%
rename from packages/shadcn-vue/src/components/Tabs/index.ts
rename to packages/shadcn-vue/src/components/ui/Tabs/index.ts
diff --git a/packages/shadcn-vue/src/components/Textarea/Textarea.vue b/packages/shadcn-vue/src/components/ui/Textarea/Textarea.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Textarea/Textarea.vue
rename to packages/shadcn-vue/src/components/ui/Textarea/Textarea.vue
diff --git a/packages/shadcn-vue/src/components/Textarea/index.ts b/packages/shadcn-vue/src/components/ui/Textarea/index.ts
similarity index 100%
rename from packages/shadcn-vue/src/components/Textarea/index.ts
rename to packages/shadcn-vue/src/components/ui/Textarea/index.ts
diff --git a/packages/shadcn-vue/src/components/Toggle/Toggle.vue b/packages/shadcn-vue/src/components/ui/Toggle/Toggle.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Toggle/Toggle.vue
rename to packages/shadcn-vue/src/components/ui/Toggle/Toggle.vue
diff --git a/packages/shadcn-vue/src/components/Toggle/index.ts b/packages/shadcn-vue/src/components/ui/Toggle/index.ts
similarity index 100%
rename from packages/shadcn-vue/src/components/Toggle/index.ts
rename to packages/shadcn-vue/src/components/ui/Toggle/index.ts
diff --git a/packages/shadcn-vue/src/components/Tooltip/Tooltip.vue b/packages/shadcn-vue/src/components/ui/Tooltip/Tooltip.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Tooltip/Tooltip.vue
rename to packages/shadcn-vue/src/components/ui/Tooltip/Tooltip.vue
diff --git a/packages/shadcn-vue/src/components/Tooltip/TooltipContent.vue b/packages/shadcn-vue/src/components/ui/Tooltip/TooltipContent.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Tooltip/TooltipContent.vue
rename to packages/shadcn-vue/src/components/ui/Tooltip/TooltipContent.vue
diff --git a/packages/shadcn-vue/src/components/Tooltip/TooltipTrigger.vue b/packages/shadcn-vue/src/components/ui/Tooltip/TooltipTrigger.vue
similarity index 100%
rename from packages/shadcn-vue/src/components/Tooltip/TooltipTrigger.vue
rename to packages/shadcn-vue/src/components/ui/Tooltip/TooltipTrigger.vue
diff --git a/packages/shadcn-vue/src/components/Tooltip/index.ts b/packages/shadcn-vue/src/components/ui/Tooltip/index.ts
similarity index 100%
rename from packages/shadcn-vue/src/components/Tooltip/index.ts
rename to packages/shadcn-vue/src/components/ui/Tooltip/index.ts