diff --git a/resources/js/Components/Common/Reporting/ReportingRoundingControls.vue b/resources/js/Components/Common/Reporting/ReportingRoundingControls.vue
index 46820659..2efe0c4e 100644
--- a/resources/js/Components/Common/Reporting/ReportingRoundingControls.vue
+++ b/resources/js/Components/Common/Reporting/ReportingRoundingControls.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { Switch } from '@/Components/ui/switch';
-import { Popover, PopoverContent, PopoverTrigger } from '@/Components/ui/popover';
+import { Popover, PopoverContent, PopoverTrigger } from '@/packages/ui/src';
 import { Button } from '@/packages/ui/src';
 import {
     Select,
diff --git a/resources/js/Components/ui/calendar/CalendarDateInput.vue b/resources/js/Components/ui/calendar/CalendarDateInput.vue
index f801ecae..ce093aa0 100644
--- a/resources/js/Components/ui/calendar/CalendarDateInput.vue
+++ b/resources/js/Components/ui/calendar/CalendarDateInput.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { Popover, PopoverContent, PopoverTrigger } from '@/Components/ui/popover';
+import { Popover, PopoverContent, PopoverTrigger } from '@/packages/ui/src';
 import { Button } from '@/packages/ui/src';
 import { Calendar } from '@/Components/ui/calendar';
 import { CalendarIcon, XIcon } from 'lucide-vue-next';
diff --git a/resources/js/packages/ui/src/Input/DateRangePicker.vue b/resources/js/packages/ui/src/Input/DateRangePicker.vue
index 65befd63..5c607056 100644
--- a/resources/js/packages/ui/src/Input/DateRangePicker.vue
+++ b/resources/js/packages/ui/src/Input/DateRangePicker.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import { Popover, PopoverContent, PopoverTrigger } from '@/Components/ui/popover';
+import { Popover, PopoverContent, PopoverTrigger } from '../popover';
 import Button from '../Buttons/Button.vue';
-import { RangeCalendar } from '@/Components/ui/range-calendar';
+import { RangeCalendar } from '../range-calendar';
 import { CalendarDate } from '@internationalized/date';
 import { CalendarIcon } from 'lucide-vue-next';
 import { computed, ref, inject, type ComputedRef, watch } from 'vue';
diff --git a/resources/js/packages/ui/src/Input/Dropdown.vue b/resources/js/packages/ui/src/Input/Dropdown.vue
index 2aa44bc7..003d9c46 100644
--- a/resources/js/packages/ui/src/Input/Dropdown.vue
+++ b/resources/js/packages/ui/src/Input/Dropdown.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { Popover, PopoverContent, PopoverTrigger } from '@/Components/ui/popover';
+import { Popover, PopoverContent, PopoverTrigger } from '../popover';
 import { watch } from 'vue';
 
 const props = withDefaults(
diff --git a/resources/js/Components/ui/accordion/Accordion.vue b/resources/js/packages/ui/src/accordion/Accordion.vue
similarity index 100%
rename from resources/js/Components/ui/accordion/Accordion.vue
rename to resources/js/packages/ui/src/accordion/Accordion.vue
diff --git a/resources/js/Components/ui/accordion/AccordionContent.vue b/resources/js/packages/ui/src/accordion/AccordionContent.vue
similarity index 95%
rename from resources/js/Components/ui/accordion/AccordionContent.vue
rename to resources/js/packages/ui/src/accordion/AccordionContent.vue
index 545e5e8e..bec39e37 100644
--- a/resources/js/Components/ui/accordion/AccordionContent.vue
+++ b/resources/js/packages/ui/src/accordion/AccordionContent.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { cn } from '@/lib/utils';
+import { cn } from '../utils/cn';
 import { AccordionContent, type AccordionContentProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
 
diff --git a/resources/js/Components/ui/accordion/AccordionItem.vue b/resources/js/packages/ui/src/accordion/AccordionItem.vue
similarity index 94%
rename from resources/js/Components/ui/accordion/AccordionItem.vue
rename to resources/js/packages/ui/src/accordion/AccordionItem.vue
index 168693f8..978bf171 100644
--- a/resources/js/Components/ui/accordion/AccordionItem.vue
+++ b/resources/js/packages/ui/src/accordion/AccordionItem.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { cn } from '@/lib/utils';
+import { cn } from '../utils/cn';
 import { AccordionItem, type AccordionItemProps, useForwardProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
 
diff --git a/resources/js/Components/ui/accordion/AccordionTrigger.vue b/resources/js/packages/ui/src/accordion/AccordionTrigger.vue
similarity index 96%
rename from resources/js/Components/ui/accordion/AccordionTrigger.vue
rename to resources/js/packages/ui/src/accordion/AccordionTrigger.vue
index 2f7c70d2..4f25e6ca 100644
--- a/resources/js/Components/ui/accordion/AccordionTrigger.vue
+++ b/resources/js/packages/ui/src/accordion/AccordionTrigger.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { cn } from '@/lib/utils';
+import { cn } from '../utils/cn';
 import { ChevronDown } from 'lucide-vue-next';
 import { AccordionHeader, AccordionTrigger, type AccordionTriggerProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
diff --git a/resources/js/Components/ui/accordion/index.ts b/resources/js/packages/ui/src/accordion/index.ts
similarity index 100%
rename from resources/js/Components/ui/accordion/index.ts
rename to resources/js/packages/ui/src/accordion/index.ts
diff --git a/resources/js/packages/ui/src/index.ts b/resources/js/packages/ui/src/index.ts
index 246ec592..9ef17a62 100644
--- a/resources/js/packages/ui/src/index.ts
+++ b/resources/js/packages/ui/src/index.ts
@@ -37,7 +37,11 @@ import MoreOptionsDropdown from './MoreOptionsDropdown.vue';
 import FullCalendarEventContent from './FullCalendar/FullCalendarEventContent.vue';
 import FullCalendarDayHeader from './FullCalendar/FullCalendarDayHeader.vue';
 import TimeEntryCalendar from './FullCalendar/TimeEntryCalendar.vue';
+import DateRangePicker from './Input/DateRangePicker.vue';
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from './tooltip/index';
+import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from './accordion/index';
+import { Popover, PopoverContent, PopoverTrigger, PopoverAnchor } from './popover/index';
+import { RangeCalendar } from './range-calendar/index';
 export type { ActivityPeriod } from './FullCalendar/idleStatusPlugin';
 
 export {
@@ -69,8 +73,18 @@ export {
     FullCalendarEventContent,
     FullCalendarDayHeader,
     TimeEntryCalendar,
+    DateRangePicker,
     Tooltip,
     TooltipContent,
     TooltipProvider,
     TooltipTrigger,
+    Accordion,
+    AccordionContent,
+    AccordionItem,
+    AccordionTrigger,
+    Popover,
+    PopoverContent,
+    PopoverTrigger,
+    PopoverAnchor,
+    RangeCalendar,
 };
diff --git a/resources/js/Components/ui/popover/Popover.vue b/resources/js/packages/ui/src/popover/Popover.vue
similarity index 100%
rename from resources/js/Components/ui/popover/Popover.vue
rename to resources/js/packages/ui/src/popover/Popover.vue
diff --git a/resources/js/Components/ui/popover/PopoverContent.vue b/resources/js/packages/ui/src/popover/PopoverContent.vue
similarity index 100%
rename from resources/js/Components/ui/popover/PopoverContent.vue
rename to resources/js/packages/ui/src/popover/PopoverContent.vue
diff --git a/resources/js/Components/ui/popover/PopoverTrigger.vue b/resources/js/packages/ui/src/popover/PopoverTrigger.vue
similarity index 100%
rename from resources/js/Components/ui/popover/PopoverTrigger.vue
rename to resources/js/packages/ui/src/popover/PopoverTrigger.vue
diff --git a/resources/js/Components/ui/popover/index.ts b/resources/js/packages/ui/src/popover/index.ts
similarity index 100%
rename from resources/js/Components/ui/popover/index.ts
rename to resources/js/packages/ui/src/popover/index.ts
diff --git a/resources/js/Components/ui/range-calendar/RangeCalendar.vue b/resources/js/packages/ui/src/range-calendar/RangeCalendar.vue
similarity index 100%
rename from resources/js/Components/ui/range-calendar/RangeCalendar.vue
rename to resources/js/packages/ui/src/range-calendar/RangeCalendar.vue
diff --git a/resources/js/Components/ui/range-calendar/RangeCalendarCell.vue b/resources/js/packages/ui/src/range-calendar/RangeCalendarCell.vue
similarity index 100%
rename from resources/js/Components/ui/range-calendar/RangeCalendarCell.vue
rename to resources/js/packages/ui/src/range-calendar/RangeCalendarCell.vue
diff --git a/resources/js/Components/ui/range-calendar/RangeCalendarCellTrigger.vue b/resources/js/packages/ui/src/range-calendar/RangeCalendarCellTrigger.vue
similarity index 100%
rename from resources/js/Components/ui/range-calendar/RangeCalendarCellTrigger.vue
rename to resources/js/packages/ui/src/range-calendar/RangeCalendarCellTrigger.vue
diff --git a/resources/js/Components/ui/range-calendar/RangeCalendarGrid.vue b/resources/js/packages/ui/src/range-calendar/RangeCalendarGrid.vue
similarity index 100%
rename from resources/js/Components/ui/range-calendar/RangeCalendarGrid.vue
rename to resources/js/packages/ui/src/range-calendar/RangeCalendarGrid.vue
diff --git a/resources/js/Components/ui/range-calendar/RangeCalendarGridBody.vue b/resources/js/packages/ui/src/range-calendar/RangeCalendarGridBody.vue
similarity index 100%
rename from resources/js/Components/ui/range-calendar/RangeCalendarGridBody.vue
rename to resources/js/packages/ui/src/range-calendar/RangeCalendarGridBody.vue
diff --git a/resources/js/Components/ui/range-calendar/RangeCalendarGridHead.vue b/resources/js/packages/ui/src/range-calendar/RangeCalendarGridHead.vue
similarity index 100%
rename from resources/js/Components/ui/range-calendar/RangeCalendarGridHead.vue
rename to resources/js/packages/ui/src/range-calendar/RangeCalendarGridHead.vue
diff --git a/resources/js/Components/ui/range-calendar/RangeCalendarGridRow.vue b/resources/js/packages/ui/src/range-calendar/RangeCalendarGridRow.vue
similarity index 100%
rename from resources/js/Components/ui/range-calendar/RangeCalendarGridRow.vue
rename to resources/js/packages/ui/src/range-calendar/RangeCalendarGridRow.vue
diff --git a/resources/js/Components/ui/range-calendar/RangeCalendarHeadCell.vue b/resources/js/packages/ui/src/range-calendar/RangeCalendarHeadCell.vue
similarity index 100%
rename from resources/js/Components/ui/range-calendar/RangeCalendarHeadCell.vue
rename to resources/js/packages/ui/src/range-calendar/RangeCalendarHeadCell.vue
diff --git a/resources/js/Components/ui/range-calendar/RangeCalendarHeader.vue b/resources/js/packages/ui/src/range-calendar/RangeCalendarHeader.vue
similarity index 100%
rename from resources/js/Components/ui/range-calendar/RangeCalendarHeader.vue
rename to resources/js/packages/ui/src/range-calendar/RangeCalendarHeader.vue
diff --git a/resources/js/Components/ui/range-calendar/RangeCalendarHeading.vue b/resources/js/packages/ui/src/range-calendar/RangeCalendarHeading.vue
similarity index 100%
rename from resources/js/Components/ui/range-calendar/RangeCalendarHeading.vue
rename to resources/js/packages/ui/src/range-calendar/RangeCalendarHeading.vue
diff --git a/resources/js/Components/ui/range-calendar/RangeCalendarNextButton.vue b/resources/js/packages/ui/src/range-calendar/RangeCalendarNextButton.vue
similarity index 100%
rename from resources/js/Components/ui/range-calendar/RangeCalendarNextButton.vue
rename to resources/js/packages/ui/src/range-calendar/RangeCalendarNextButton.vue
diff --git a/resources/js/Components/ui/range-calendar/RangeCalendarPrevButton.vue b/resources/js/packages/ui/src/range-calendar/RangeCalendarPrevButton.vue
similarity index 100%
rename from resources/js/Components/ui/range-calendar/RangeCalendarPrevButton.vue
rename to resources/js/packages/ui/src/range-calendar/RangeCalendarPrevButton.vue
diff --git a/resources/js/Components/ui/range-calendar/index.ts b/resources/js/packages/ui/src/range-calendar/index.ts
similarity index 100%
rename from resources/js/Components/ui/range-calendar/index.ts
rename to resources/js/packages/ui/src/range-calendar/index.ts