diff --git a/src/components/ui/shadcn/calendar.tsx b/src/components/ui/shadcn/calendar.tsx
index 3be5789..3b7d5b5 100644
--- a/src/components/ui/shadcn/calendar.tsx
+++ b/src/components/ui/shadcn/calendar.tsx
@@ -3,7 +3,7 @@ import * as React from "react"
 import { ChevronLeft, ChevronRight } from "lucide-react"
 import { DayPicker } from "react-day-picker"
 import { cn } from "~/lib/utils"
-import { buttonVariants } from "~/components/ui/button"
+import { buttonVariants } from "~/components/ui/shadcn/button"
 
 export type CalendarProps = React.ComponentProps<typeof DayPicker>
 
diff --git a/src/components/ui/shadcn/checkbox.tsx b/src/components/ui/shadcn/checkbox.tsx
index e0e6bf1..a9334b2 100644
--- a/src/components/ui/shadcn/checkbox.tsx
+++ b/src/components/ui/shadcn/checkbox.tsx
@@ -1,9 +1,7 @@
 "use client"
-
 import * as React from "react"
 import * as CheckboxPrimitive from "@radix-ui/react-checkbox"
 import { Check } from "lucide-react"
-
 import { cn } from "~/lib/utils"
 
 const Checkbox = React.forwardRef<
diff --git a/src/components/ui/shadcn/combobox.tsx b/src/components/ui/shadcn/combobox.tsx
index 1929d4e..f19a153 100644
--- a/src/components/ui/shadcn/combobox.tsx
+++ b/src/components/ui/shadcn/combobox.tsx
@@ -2,7 +2,7 @@
 import * as React from "react"
 import { Check, ChevronsUpDown } from "lucide-react"
 import { cn } from "~/lib/utils"
-import { Button } from "~/components/ui/button"
+import { Button } from "~/components/ui/shadcn/button"
 import {
   Command,
   CommandEmpty,
@@ -10,12 +10,12 @@ import {
   CommandInput,
   CommandItem,
   CommandList,
-} from "~/components/ui/command"
+} from "~/components/ui/shadcn/command"
 import {
   Popover,
   PopoverContent,
   PopoverTrigger,
-} from "~/components/ui/popover"
+} from "~/components/ui/shadcn/popover"
 
 // Define the type correctly as an array of objects
 type ListItem = {
diff --git a/src/components/ui/shadcn/command.tsx b/src/components/ui/shadcn/command.tsx
index 15d8b27..abf68c8 100644
--- a/src/components/ui/shadcn/command.tsx
+++ b/src/components/ui/shadcn/command.tsx
@@ -4,7 +4,7 @@ import { type DialogProps } from "@radix-ui/react-dialog"
 import { Command as CommandPrimitive } from "cmdk"
 import { Search } from "lucide-react"
 import { cn } from "~/lib/utils"
-import { Dialog, DialogContent } from "~/components/ui/dialog"
+import { Dialog, DialogContent } from "~/components/ui/shadcn/dialog"
 
 const Command = React.forwardRef<
   React.ElementRef<typeof CommandPrimitive>,
diff --git a/src/components/ui/shadcn/date-picker.tsx b/src/components/ui/shadcn/date-picker.tsx
index cb3ef1a..67aa290 100644
--- a/src/components/ui/shadcn/date-picker.tsx
+++ b/src/components/ui/shadcn/date-picker.tsx
@@ -3,13 +3,13 @@ import * as React from "react"
 import { format } from "date-fns"
 import { Calendar as CalendarIcon } from "lucide-react"
 import { cn } from "~/lib/utils"
-import { Button } from "~/components/ui/button"
-import { Calendar } from "~/components/ui/calendar"
+import { Button } from "~/components/ui/shadcn/button"
+import { Calendar } from "~/components/ui/shadcn/calendar"
 import {
   Popover,
   PopoverContent,
   PopoverTrigger,
-} from "~/components/ui/popover"
+} from "~/components/ui/shadcn/popover"
 
 export function DatePickerDemo() {
   const [date, setDate] = React.useState<Date>()
diff --git a/src/components/ui/shadcn/form.tsx b/src/components/ui/shadcn/form.tsx
index 3793079..10c0a79 100644
--- a/src/components/ui/shadcn/form.tsx
+++ b/src/components/ui/shadcn/form.tsx
@@ -1,19 +1,19 @@
 "use client"
-
 import * as React from "react"
-import * as LabelPrimitive from "@radix-ui/react-label"
+import type * as LabelPrimitive from "@radix-ui/react-label"
 import { Slot } from "@radix-ui/react-slot"
-import {
-  Controller,
+import type {
   ControllerProps,
   FieldPath,
   FieldValues,
+} from "react-hook-form"
+import {
+  Controller,
   FormProvider,
   useFormContext,
 } from "react-hook-form"
-
 import { cn } from "~/lib/utils"
-import { Label } from "~/components/ui/label"
+import { Label } from "~/components/ui/shadcn/label"
 
 const Form = FormProvider
 
diff --git a/src/components/ui/shadcn/pagination.tsx b/src/components/ui/shadcn/pagination.tsx
index 3ff7d81..aa86b4e 100644
--- a/src/components/ui/shadcn/pagination.tsx
+++ b/src/components/ui/shadcn/pagination.tsx
@@ -2,7 +2,8 @@ import * as React from "react"
 import { ChevronLeft, ChevronRight, MoreHorizontal } from "lucide-react"
 
 import { cn } from "~/lib/utils"
-import { ButtonProps, buttonVariants } from "~/components/ui/button"
+import { buttonVariants } from "~/components/ui/shadcn/button"
+import type { ButtonProps } from "~/components/ui/shadcn/button"
 
 const Pagination = ({ className, ...props }: React.ComponentProps<"nav">) => (
   <nav
diff --git a/src/components/ui/shadcn/toggle-group.tsx b/src/components/ui/shadcn/toggle-group.tsx
index 79874ea..0fc7d7d 100644
--- a/src/components/ui/shadcn/toggle-group.tsx
+++ b/src/components/ui/shadcn/toggle-group.tsx
@@ -3,7 +3,7 @@ import * as React from "react"
 import * as ToggleGroupPrimitive from "@radix-ui/react-toggle-group"
 import { type VariantProps } from "class-variance-authority"
 import { cn } from "~/lib/utils"
-import { toggleVariants } from "~/components/ui/toggle"
+import { toggleVariants } from "~/components/ui/shadcn/toggle"
 
 const ToggleGroupContext = React.createContext<
   VariantProps<typeof toggleVariants>
diff --git a/src/components/ui/shadcn/toggle.tsx b/src/components/ui/shadcn/toggle.tsx
index 1ee332b..5bcc0b0 100644
--- a/src/components/ui/shadcn/toggle.tsx
+++ b/src/components/ui/shadcn/toggle.tsx
@@ -1,9 +1,7 @@
 "use client"
-
 import * as React from "react"
 import * as TogglePrimitive from "@radix-ui/react-toggle"
 import { cva, type VariantProps } from "class-variance-authority"
-
 import { cn } from "~/lib/utils"
 
 const toggleVariants = cva(