diff --git a/package.json b/package.json
index 3d2aa640..ad2dd653 100644
--- a/package.json
+++ b/package.json
@@ -1,4 +1,5 @@
 {
+    "name": "solidtime",
     "private": true,
     "type": "module",
     "workspaces": [
diff --git a/resources/js/Components/CommandPalette/CommandPaletteProvider.vue b/resources/js/Components/CommandPalette/CommandPaletteProvider.vue
index f9e5fb7e..e5b7a4f6 100644
--- a/resources/js/Components/CommandPalette/CommandPaletteProvider.vue
+++ b/resources/js/Components/CommandPalette/CommandPaletteProvider.vue
@@ -9,6 +9,8 @@ import { useTagsStore } from '@/utils/useTags';
 import { useTimeEntriesMutations } from '@/utils/useTimeEntriesMutations';
 import { getOrganizationCurrencyString } from '@/utils/money';
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
+import { useOrganizationQuery } from '@/utils/useOrganizationQuery';
+import { getCurrentOrganizationId } from '@/utils/useUser';
 import { canCreateProjects } from '@/utils/permissions';
 import type {
     CreateClientBody,
@@ -37,6 +39,8 @@ import TagDropdown from '@/packages/ui/src/Tag/TagDropdown.vue';
 import DialogModal from '@/packages/ui/src/DialogModal.vue';
 import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
 
+const { organization } = useOrganizationQuery(getCurrentOrganizationId()!);
+
 const {
     isOpen,
     searchTerm,
@@ -162,6 +166,7 @@ const firstProjectId = computed(() => projects.value[0]?.id ?? '');
         :create-client="createClient"
         :clients="activeClients"
         :currency="getOrganizationCurrencyString()"
+        :organization-billable-rate="organization?.billable_rate ?? null"
         :enable-estimated-time="isAllowedToPerformPremiumAction()" />
 
     <!-- Client Create Modal -->
@@ -192,7 +197,8 @@ const firstProjectId = computed(() => projects.value[0]?.id ?? '');
         :clients="activeClients"
         :currency="getOrganizationCurrencyString()"
         :enable-estimated-time="isAllowedToPerformPremiumAction()"
-        :can-create-project="canCreateProjects()" />
+        :can-create-project="canCreateProjects()"
+        :organization-billable-rate="organization?.billable_rate ?? null" />
 
     <!-- Project Selector Dialog for Active Timer -->
     <DialogModal :show="showProjectSelector" closeable @close="showProjectSelector = false">
@@ -210,6 +216,7 @@ const firstProjectId = computed(() => projects.value[0]?.id ?? '');
                 :can-create-project="canCreateProjects()"
                 :currency="getOrganizationCurrencyString()"
                 :enable-estimated-time="isAllowedToPerformPremiumAction()"
+                :organization-billable-rate="organization?.billable_rate ?? null"
                 class="w-full" />
         </template>
         <template #footer>
@@ -234,6 +241,7 @@ const firstProjectId = computed(() => projects.value[0]?.id ?? '');
                 :can-create-project="canCreateProjects()"
                 :currency="getOrganizationCurrencyString()"
                 :enable-estimated-time="isAllowedToPerformPremiumAction()"
+                :organization-billable-rate="organization?.billable_rate ?? null"
                 class="w-full" />
         </template>
         <template #footer>
diff --git a/resources/js/Components/Common/Project/ProjectDropdown.vue b/resources/js/Components/Common/Project/ProjectDropdown.vue
index 28c78853..00f8058a 100644
--- a/resources/js/Components/Common/Project/ProjectDropdown.vue
+++ b/resources/js/Components/Common/Project/ProjectDropdown.vue
@@ -20,7 +20,10 @@ import { useClientsQuery } from '@/utils/useClientsQuery';
 import { getOrganizationCurrencyString } from '@/utils/money';
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
 import { canCreateProjects } from '@/utils/permissions';
+import { useOrganizationQuery } from '@/utils/useOrganizationQuery';
+import { getCurrentOrganizationId } from '@/utils/useUser';
 
+const { organization } = useOrganizationQuery(getCurrentOrganizationId()!);
 const searchValue = ref('');
 const searchInput = ref<HTMLElement | null>(null);
 const model = defineModel<string | null>({
@@ -156,6 +159,7 @@ function updateValue(project: Project) {
         :create-client="handleCreateClient"
         :clients="activeClients"
         :currency="getOrganizationCurrencyString()"
+        :organization-billable-rate="organization?.billable_rate ?? null"
         :enable-estimated-time="isAllowedToPerformPremiumAction()" />
 </template>
 
diff --git a/resources/js/Components/Common/Project/ProjectEditModal.vue b/resources/js/Components/Common/Project/ProjectEditModal.vue
index 725bc2e4..d9b53e28 100644
--- a/resources/js/Components/Common/Project/ProjectEditModal.vue
+++ b/resources/js/Components/Common/Project/ProjectEditModal.vue
@@ -20,9 +20,12 @@ import ProjectBillableRateModal from '@/packages/ui/src/Project/ProjectBillableR
 import { getOrganizationCurrencyString } from '@/utils/money';
 import ProjectEditBillableSection from '@/packages/ui/src/Project/ProjectEditBillableSection.vue';
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
+import { useOrganizationQuery } from '@/utils/useOrganizationQuery';
+import { getCurrentOrganizationId } from '@/utils/useUser';
 
 const { updateProject } = useProjectsStore();
 const { clients } = useClientsQuery();
+const { organization } = useOrganizationQuery(getCurrentOrganizationId()!);
 const show = defineModel('show', { default: false });
 const saving = ref(false);
 const showBillableRateModal = ref(false);
@@ -117,6 +120,7 @@ async function submitBillableRate() {
                     v-model:is-billable="project.is_billable"
                     v-model:billable-rate="project.billable_rate"
                     :currency="getOrganizationCurrencyString()"
+                    :organization-billable-rate="organization?.billable_rate ?? null"
                     @submit="submit"></ProjectEditBillableSection>
                 <EstimatedTimeSection
                     v-if="isAllowedToPerformPremiumAction()"
diff --git a/resources/js/Components/Common/Project/ProjectTable.vue b/resources/js/Components/Common/Project/ProjectTable.vue
index 684d1e7b..3137a8db 100644
--- a/resources/js/Components/Common/Project/ProjectTable.vue
+++ b/resources/js/Components/Common/Project/ProjectTable.vue
@@ -22,6 +22,8 @@ import { useClientsStore } from '@/utils/useClients';
 import { useClientsQuery } from '@/utils/useClientsQuery';
 import { getOrganizationCurrencyString } from '@/utils/money';
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
+import { useOrganizationQuery } from '@/utils/useOrganizationQuery';
+import { getCurrentOrganizationId } from '@/utils/useUser';
 import {
     useVueTable,
     getCoreRowModel,
@@ -29,6 +31,8 @@ import {
     type SortingState,
 } from '@tanstack/vue-table';
 
+const { organization } = useOrganizationQuery(getCurrentOrganizationId()!);
+
 const props = defineProps<{
     projects: Project[];
     showBillableRate: boolean;
@@ -155,6 +159,7 @@ const gridTemplate = computed(() => {
         :create-project
         :create-client
         :currency="getOrganizationCurrencyString()"
+        :organization-billable-rate="organization?.billable_rate ?? null"
         :clients="clients"
         :enable-estimated-time="isAllowedToPerformPremiumAction()"></ProjectCreateModal>
     <div class="flow-root max-w-[100vw] overflow-x-auto">
diff --git a/resources/js/Components/Common/Reporting/ReportingTabNavbar.vue b/resources/js/Components/Common/Reporting/ReportingTabNavbar.vue
index 46a0ee66..bb03b73d 100644
--- a/resources/js/Components/Common/Reporting/ReportingTabNavbar.vue
+++ b/resources/js/Components/Common/Reporting/ReportingTabNavbar.vue
@@ -2,8 +2,7 @@
 import { router } from '@inertiajs/vue3';
 import { canViewReport } from '@/utils/permissions';
 import { computed } from 'vue';
-import TabBar from '@/Components/Common/TabBar/TabBar.vue';
-import TabBarItem from '@/Components/Common/TabBar/TabBarItem.vue';
+import { TabBar, TabBarItem } from '@/packages/ui/src';
 
 const props = defineProps<{
     active: 'reporting' | 'detailed' | 'shared';
diff --git a/resources/js/Components/TimeTracker.vue b/resources/js/Components/TimeTracker.vue
index 270b5806..8779b01c 100644
--- a/resources/js/Components/TimeTracker.vue
+++ b/resources/js/Components/TimeTracker.vue
@@ -11,6 +11,7 @@ import duration from 'dayjs/plugin/duration';
 import { useCurrentTimeEntryStore } from '@/utils/useCurrentTimeEntry';
 import { storeToRefs } from 'pinia';
 import { getCurrentOrganizationId } from '@/utils/useUser';
+import { useOrganizationQuery } from '@/utils/useOrganizationQuery';
 import { switchOrganization } from '@/utils/useOrganization';
 import { useProjectsQuery } from '@/utils/useProjectsQuery';
 import { useTasksQuery } from '@/utils/useTasksQuery';
@@ -47,6 +48,8 @@ dayjs.extend(duration);
 
 dayjs.extend(utc);
 
+const { organization } = useOrganizationQuery(getCurrentOrganizationId()!);
+
 const currentTimeEntryStore = useCurrentTimeEntryStore();
 const { currentTimeEntry, isActive, now } = storeToRefs(currentTimeEntryStore);
 const { startLiveTimer, stopLiveTimer, setActiveState } = currentTimeEntryStore;
@@ -152,6 +155,7 @@ const { tags } = useTagsQuery();
         :create-time-entry="createTimeEntry"
         :currency="getOrganizationCurrencyString()"
         :can-create-project="canCreateProjects()"
+        :organization-billable-rate="organization?.billable_rate ?? null"
         :projects
         :tasks
         :tags
@@ -173,6 +177,7 @@ const { tags } = useTagsQuery();
                         :create-project
                         :enable-estimated-time="isAllowedToPerformPremiumAction()"
                         :can-create-project="canCreateProjects()"
+                        :organization-billable-rate="organization?.billable_rate ?? null"
                         :create-client
                         :clients
                         :tags
diff --git a/resources/js/Pages/Calendar.vue b/resources/js/Pages/Calendar.vue
index b457776c..3d85ef3e 100644
--- a/resources/js/Pages/Calendar.vue
+++ b/resources/js/Pages/Calendar.vue
@@ -23,7 +23,10 @@ import { useClientsStore } from '@/utils/useClients';
 import { getOrganizationCurrencyString } from '@/utils/money';
 import { canCreateProjects } from '@/utils/permissions';
 import { useCurrentTimeEntryStore } from '@/utils/useCurrentTimeEntry';
+import { useOrganizationQuery } from '@/utils/useOrganizationQuery';
+import { getCurrentOrganizationId } from '@/utils/useUser';
 
+const { organization } = useOrganizationQuery(getCurrentOrganizationId()!);
 const calendarStart = ref<Date | undefined>(undefined);
 const calendarEnd = ref<Date | undefined>(undefined);
 
@@ -124,6 +127,7 @@ function onRefresh() {
             :enable-estimated-time="isAllowedToPerformPremiumAction()"
             :currency="getOrganizationCurrencyString()"
             :can-create-project="canCreateProjects()"
+            :organization-billable-rate="organization?.billable_rate ?? null"
             :create-time-entry="createTimeEntry"
             :update-time-entry="updateTimeEntry"
             :delete-time-entry="deleteTimeEntry"
diff --git a/resources/js/Pages/Clients.vue b/resources/js/Pages/Clients.vue
index a6304954..206599f4 100644
--- a/resources/js/Pages/Clients.vue
+++ b/resources/js/Pages/Clients.vue
@@ -10,8 +10,7 @@ import ClientTable from '@/Components/Common/Client/ClientTable.vue';
 import ClientCreateModal from '@/Components/Common/Client/ClientCreateModal.vue';
 import PageTitle from '@/Components/Common/PageTitle.vue';
 import { canCreateClients } from '@/utils/permissions';
-import TabBarItem from '@/Components/Common/TabBar/TabBarItem.vue';
-import TabBar from '@/Components/Common/TabBar/TabBar.vue';
+import { TabBar, TabBarItem } from '@/packages/ui/src';
 import { useStorage } from '@vueuse/core';
 import type { SortColumn, SortDirection } from '@/Components/Common/Client/ClientTable.vue';
 
diff --git a/resources/js/Pages/Members.vue b/resources/js/Pages/Members.vue
index 03d323d7..f01872b0 100644
--- a/resources/js/Pages/Members.vue
+++ b/resources/js/Pages/Members.vue
@@ -4,8 +4,7 @@ import AppLayout from '@/Layouts/AppLayout.vue';
 import { PlusIcon } from '@heroicons/vue/16/solid';
 import { UserGroupIcon } from '@heroicons/vue/20/solid';
 import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
-import TabBar from '@/Components/Common/TabBar/TabBar.vue';
-import TabBarItem from '@/Components/Common/TabBar/TabBarItem.vue';
+import { TabBar, TabBarItem } from '@/packages/ui/src';
 import { ref } from 'vue';
 import MemberTable from '@/Components/Common/Member/MemberTable.vue';
 import MemberInviteModal from '@/Components/Common/Member/MemberInviteModal.vue';
diff --git a/resources/js/Pages/ProjectShow.vue b/resources/js/Pages/ProjectShow.vue
index cd271737..0675ae94 100644
--- a/resources/js/Pages/ProjectShow.vue
+++ b/resources/js/Pages/ProjectShow.vue
@@ -21,8 +21,7 @@ import ProjectMemberTable from '@/Components/Common/ProjectMember/ProjectMemberT
 import ProjectMemberCreateModal from '@/Components/Common/ProjectMember/ProjectMemberCreateModal.vue';
 import { useProjectMembersQuery } from '@/utils/useProjectMembersQuery';
 import { canCreateProjects, canCreateTasks, canViewProjectMembers } from '@/utils/permissions';
-import TabBarItem from '@/Components/Common/TabBar/TabBarItem.vue';
-import TabBar from '@/Components/Common/TabBar/TabBar.vue';
+import { TabBar, TabBarItem } from '@/packages/ui/src';
 import { useTasksQuery } from '@/utils/useTasksQuery';
 import ProjectEditModal from '@/Components/Common/Project/ProjectEditModal.vue';
 import { Badge } from '@/packages/ui/src';
diff --git a/resources/js/Pages/Projects.vue b/resources/js/Pages/Projects.vue
index 9cf8829b..f096032b 100644
--- a/resources/js/Pages/Projects.vue
+++ b/resources/js/Pages/Projects.vue
@@ -131,6 +131,7 @@ const showBillableRate = computed(() => {
                 :enable-estimated-time="isAllowedToPerformPremiumAction()"
                 :create-client
                 :currency="getOrganizationCurrencyString()"
+                :organization-billable-rate="organization?.billable_rate ?? null"
                 :clients="clients"
                 @submit="createProject"></ProjectCreateModal>
         </MainContainer>
diff --git a/resources/js/Pages/ReportingDetailed.vue b/resources/js/Pages/ReportingDetailed.vue
index bfa3e8ec..90580375 100644
--- a/resources/js/Pages/ReportingDetailed.vue
+++ b/resources/js/Pages/ReportingDetailed.vue
@@ -66,6 +66,7 @@ import ReportingExportModal from '@/Components/Common/Reporting/ReportingExportM
 import ReportingFilterBar from '@/Components/Common/Reporting/ReportingFilterBar.vue';
 import { useTimeEntriesReportQuery } from '@/utils/useTimeEntriesReportQuery';
 import { useTimeEntriesMutations } from '@/utils/useTimeEntriesMutations';
+import { useOrganizationQuery } from '@/utils/useOrganizationQuery';
 
 // TimeEntryRoundingType is now defined in ReportingRoundingControls component
 type TimeEntryRoundingType = 'up' | 'down' | 'nearest';
@@ -89,6 +90,7 @@ const roundingType = ref<TimeEntryRoundingType>('nearest');
 const roundingMinutes = ref<number>(15);
 
 const { members } = useMembersQuery();
+const { organization } = useOrganizationQuery(getCurrentOrganizationId()!);
 const pageLimit = 15;
 
 // Watch rounding enabled state to trigger updates
@@ -353,6 +355,7 @@ async function downloadExport(format: ExportFormat) {
             :tags="tags"
             :currency="getOrganizationCurrencyString()"
             :clients="clients"
+            :organization-billable-rate="organization?.billable_rate ?? null"
             class="border-b border-default-background-separator"
             :update-time-entries="
                 (args) =>
@@ -384,6 +387,7 @@ async function downloadExport(format: ExportFormat) {
                     :on-start-stop-click="() => startTimeEntryFromExisting(entry)"
                     :delete-time-entry="() => deleteTimeEntries([entry])"
                     :currency="getOrganizationCurrencyString()"
+                    :organization-billable-rate="organization?.billable_rate ?? null"
                     :duplicate-time-entry="() => createTimeEntry(entry)"
                     :members="members"
                     show-date
diff --git a/resources/js/Pages/Time.vue b/resources/js/Pages/Time.vue
index cdfb2a65..7d772682 100644
--- a/resources/js/Pages/Time.vue
+++ b/resources/js/Pages/Time.vue
@@ -26,6 +26,8 @@ import TimeEntryMassActionRow from '@/packages/ui/src/TimeEntry/TimeEntryMassAct
 import type { UpdateMultipleTimeEntriesChangeset } from '@/packages/api/src';
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
 import { canCreateProjects } from '@/utils/permissions';
+import { useOrganizationQuery } from '@/utils/useOrganizationQuery';
+import { getCurrentOrganizationId } from '@/utils/useUser';
 import { useTagsStore } from '@/utils/useTags';
 import { useProjectsStore } from '@/utils/useProjects';
 import { useClientsStore } from '@/utils/useClients';
@@ -87,6 +89,8 @@ async function createClient(body: CreateClientBody): Promise<Client | undefined>
     return await useClientsStore().createClient(body);
 }
 
+const { organization } = useOrganizationQuery(getCurrentOrganizationId()!);
+
 const selectedTimeEntries = ref([] as TimeEntry[]);
 
 async function clearSelectionAndState() {
@@ -115,6 +119,7 @@ function deleteSelected() {
             :tags="tags"
             :currency="getOrganizationCurrencyString()"
             :clients="clients"
+            :organization-billable-rate="organization?.billable_rate ?? null"
             class="border-t border-default-background-separator hidden sm:block"
             :update-time-entries="
                 (args) =>
@@ -134,6 +139,7 @@ function deleteSelected() {
             :create-project
             :enable-estimated-time="isAllowedToPerformPremiumAction()"
             :can-create-project="canCreateProjects()"
+            :organization-billable-rate="organization?.billable_rate ?? null"
             :clients
             :create-client
             :update-time-entry
diff --git a/resources/js/packages/ui/src/FullCalendar/CalendarToolbar.vue b/resources/js/packages/ui/src/FullCalendar/CalendarToolbar.vue
index de855855..2412ad37 100644
--- a/resources/js/packages/ui/src/FullCalendar/CalendarToolbar.vue
+++ b/resources/js/packages/ui/src/FullCalendar/CalendarToolbar.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { Button } from '..';
 import { ChevronLeft, ChevronRight } from 'lucide-vue-next';
-import { Tabs, TabsList } from '@/Components/ui/tabs';
-import TabBarItem from '@/Components/Common/TabBar/TabBarItem.vue';
+import { Tabs, TabsList } from '../tabs';
+import TabBarItem from '../TabBar/TabBarItem.vue';
 import CalendarSettingsPopover from './CalendarSettingsPopover.vue';
 import type { CalendarSettings } from './calendarSettings';
 
diff --git a/resources/js/packages/ui/src/FullCalendar/TimeEntryCalendar.vue b/resources/js/packages/ui/src/FullCalendar/TimeEntryCalendar.vue
index 0b4bf057..120d585f 100644
--- a/resources/js/packages/ui/src/FullCalendar/TimeEntryCalendar.vue
+++ b/resources/js/packages/ui/src/FullCalendar/TimeEntryCalendar.vue
@@ -73,6 +73,7 @@ const props = defineProps<{
     enableEstimatedTime: boolean;
     currency: string;
     canCreateProject: boolean;
+    organizationBillableRate: number | null;
 
     createTimeEntry: (
         entry: Omit<TimeEntry, 'id' | 'organization_id' | 'user_id'>
@@ -417,6 +418,7 @@ function getEventDurationSeconds(dayEvent: DayEvent, dayStr: string): number {
             :create-tag="createTag"
             :currency="currency"
             :can-create-project="canCreateProject"
+            :organization-billable-rate="organizationBillableRate"
             :tags="tags as any"
             :projects="projects"
             :tasks="tasks"
@@ -438,7 +440,8 @@ function getEventDurationSeconds(dayEvent: DayEvent, dayStr: string): number {
             :tasks="tasks"
             :clients="clients"
             :currency="currency"
-            :can-create-project="canCreateProject" />
+            :can-create-project="canCreateProject"
+            :organization-billable-rate="organizationBillableRate" />
 
         <template v-if="!loading">
             <CalendarToolbar
diff --git a/resources/js/packages/ui/src/Project/ProjectCreateModal.vue b/resources/js/packages/ui/src/Project/ProjectCreateModal.vue
index da3338a6..6a3882c5 100644
--- a/resources/js/packages/ui/src/Project/ProjectCreateModal.vue
+++ b/resources/js/packages/ui/src/Project/ProjectCreateModal.vue
@@ -26,6 +26,7 @@ const props = defineProps<{
     createClient: (client: CreateClientBody) => Promise<Client | undefined>;
     currency: string;
     enableEstimatedTime: boolean;
+    organizationBillableRate: number | null;
 }>();
 
 const activeClients = computed(() => {
@@ -113,7 +114,10 @@ const currentClientName = computed(() => {
                 <ProjectEditBillableSection
                     v-model:is-billable="project.is_billable"
                     v-model:billable-rate="project.billable_rate"
-                    :currency="currency"></ProjectEditBillableSection>
+                    :currency="currency"
+                    :organization-billable-rate="
+                        organizationBillableRate
+                    "></ProjectEditBillableSection>
                 <EstimatedTimeSection
                     v-if="enableEstimatedTime"
                     v-model="project.estimated_time"
diff --git a/resources/js/packages/ui/src/Project/ProjectEditBillableSection.vue b/resources/js/packages/ui/src/Project/ProjectEditBillableSection.vue
index 634bd6ab..5d5c432c 100644
--- a/resources/js/packages/ui/src/Project/ProjectEditBillableSection.vue
+++ b/resources/js/packages/ui/src/Project/ProjectEditBillableSection.vue
@@ -10,15 +10,12 @@ import {
 } from '@/packages/ui/src/tooltip';
 import { computed, onMounted, ref, watch } from 'vue';
 import BillableIcon from '@/packages/ui/src/Icons/BillableIcon.vue';
-import { useOrganizationQuery } from '@/utils/useOrganizationQuery';
-import { getCurrentOrganizationId } from '@/utils/useUser';
 
-defineProps<{
+const props = defineProps<{
     currency: string;
+    organizationBillableRate: number | null;
 }>();
 
-const { organization } = useOrganizationQuery(getCurrentOrganizationId()!);
-
 type RateType = 'default-rate' | 'custom-rate';
 
 const billableDefault = ref<'billable' | 'non-billable'>('non-billable');
@@ -49,7 +46,7 @@ watch(rateType, () => {
         billableDefault.value = 'billable';
         isBillable.value = true;
         if (!billableRate.value) {
-            billableRate.value = organization.value?.billable_rate ?? null;
+            billableRate.value = props.organizationBillableRate ?? null;
         }
     }
 });
@@ -57,7 +54,7 @@ watch(rateType, () => {
 const displayedRate = computed({
     get() {
         if (rateType.value === 'default-rate') {
-            return organization.value?.billable_rate ?? null;
+            return props.organizationBillableRate ?? null;
         }
         return billableRate.value;
     },
diff --git a/resources/js/Components/Common/TabBar/TabBar.vue b/resources/js/packages/ui/src/TabBar/TabBar.vue
similarity index 85%
rename from resources/js/Components/Common/TabBar/TabBar.vue
rename to resources/js/packages/ui/src/TabBar/TabBar.vue
index 8cd92da7..d81c2073 100644
--- a/resources/js/Components/Common/TabBar/TabBar.vue
+++ b/resources/js/packages/ui/src/TabBar/TabBar.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { Tabs, TabsList } from '@/Components/ui/tabs';
+import { Tabs, TabsList } from '../tabs';
 
 defineProps<{
     defaultValue?: string;
diff --git a/resources/js/Components/Common/TabBar/TabBarItem.vue b/resources/js/packages/ui/src/TabBar/TabBarItem.vue
similarity index 93%
rename from resources/js/Components/Common/TabBar/TabBarItem.vue
rename to resources/js/packages/ui/src/TabBar/TabBarItem.vue
index 7bb839b6..ad2262a8 100644
--- a/resources/js/Components/Common/TabBar/TabBarItem.vue
+++ b/resources/js/packages/ui/src/TabBar/TabBarItem.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { TabsTrigger } from '@/Components/ui/tabs';
+import { TabsTrigger } from '../tabs';
 import { twMerge } from 'tailwind-merge';
 import type { Component } from 'vue';
 
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryAggregateRow.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryAggregateRow.vue
index 2408a364..f323f2d3 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryAggregateRow.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryAggregateRow.vue
@@ -46,6 +46,7 @@ const props = defineProps<{
     updateTimeEntry: (timeEntry: TimeEntry) => void;
     deleteTimeEntries: (timeEntries: TimeEntry[]) => void;
     currency: string;
+    organizationBillableRate: number | null;
     selectedTimeEntries: TimeEntry[];
     enableEstimatedTime: boolean;
     canCreateProject: boolean;
@@ -136,6 +137,7 @@ function onSelectChange(checked: boolean) {
                                     :project="timeEntry.project_id"
                                     :enable-estimated-time
                                     :currency="currency"
+                                    :organization-billable-rate="organizationBillableRate"
                                     :task="timeEntry.task_id"
                                     @changed="
                                         updateProjectAndTask
@@ -240,6 +242,7 @@ function onSelectChange(checked: boolean) {
                                     :project="timeEntry.project_id"
                                     :enable-estimated-time
                                     :currency="currency"
+                                    :organization-billable-rate="organizationBillableRate"
                                     :task="timeEntry.task_id"
                                     @changed="
                                         updateProjectAndTask
@@ -291,6 +294,7 @@ function onSelectChange(checked: boolean) {
                         :create-client
                         :clients
                         :create-project
+                        :organization-billable-rate="organizationBillableRate"
                         :tags="tags"
                         indent
                         :update-time-entry="(timeEntry: TimeEntry) => updateTimeEntry(timeEntry)"
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryCreateModal.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryCreateModal.vue
index 6d5d92f4..4fa9bbc1 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryCreateModal.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryCreateModal.vue
@@ -42,6 +42,7 @@ const props = defineProps<{
     start?: string;
     end?: string;
     currency: string;
+    organizationBillableRate: number | null;
     canCreateProject: boolean;
 }>();
 
@@ -165,6 +166,7 @@ const billableProxy = computed({
                         :create-client
                         :can-create-project
                         :currency
+                        :organization-billable-rate="organizationBillableRate"
                         :projects="projects"
                         :tasks="tasks"
                         :enable-estimated-time="enableEstimatedTime" />
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryEditModal.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryEditModal.vue
index 60d8a912..c798e46d 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryEditModal.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryEditModal.vue
@@ -43,6 +43,7 @@ const props = defineProps<{
     tasks: Task[];
     clients: Client[];
     currency: string;
+    organizationBillableRate: number | null;
     canCreateProject: boolean;
 }>();
 
@@ -172,6 +173,7 @@ const billableProxy = computed({
                             :create-client
                             :can-create-project="canCreateProject"
                             :currency="currency"
+                            :organization-billable-rate="organizationBillableRate"
                             :projects="projects"
                             :tasks="tasks"
                             :enable-estimated-time="enableEstimatedTime" />
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryGroupedTable.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryGroupedTable.vue
index 76b117d7..e19fdbf8 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryGroupedTable.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryGroupedTable.vue
@@ -34,6 +34,7 @@ const props = defineProps<{
     createProject: (project: CreateProjectBody) => Promise<Project | undefined>;
     createClient: (client: CreateClientBody) => Promise<Client | undefined>;
     currency: string;
+    organizationBillableRate: number | null;
     enableEstimatedTime: boolean;
     canCreateProject: boolean;
 }>();
@@ -163,6 +164,7 @@ function unselectAllTimeEntries(value: TimeEntriesGroupedByType[]) {
                     :delete-time-entries
                     :create-tag
                     :currency="currency"
+                    :organization-billable-rate="organizationBillableRate"
                     :time-entry="entry"
                     @selected="
                         (timeEntries: TimeEntry[]) => {
@@ -195,6 +197,7 @@ function unselectAllTimeEntries(value: TimeEntriesGroupedByType[]) {
                     :tags="tags"
                     :clients
                     :create-tag
+                    :organization-billable-rate="organizationBillableRate"
                     :update-time-entry
                     :on-start-stop-click="() => startTimeEntryFromExisting(entry)"
                     :delete-time-entry="() => deleteTimeEntries([entry])"
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryMassActionRow.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryMassActionRow.vue
index bb016b60..ba2394be 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryMassActionRow.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryMassActionRow.vue
@@ -33,6 +33,7 @@ const props = defineProps<{
     currency: string;
     enableEstimatedTime: boolean;
     canCreateProject: boolean;
+    organizationBillableRate: number | null;
 }>();
 
 const emit = defineEmits<{
@@ -58,6 +59,7 @@ const showMassUpdateModal = ref(false);
         :enable-estimated-time
         :can-create-project
         :currency
+        :organization-billable-rate="organizationBillableRate"
         :time-entries="selectedTimeEntries"
         @submit="emit('submit')"></TimeEntryMassUpdateModal>
     <MainContainer
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryMassUpdateModal.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryMassUpdateModal.vue
index a31e780e..73a748dc 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryMassUpdateModal.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryMassUpdateModal.vue
@@ -35,6 +35,7 @@ const props = defineProps<{
     createTag: (name: string) => Promise<Tag | undefined>;
     updateTimeEntries: (changeset: UpdateMultipleTimeEntriesChangeset) => Promise<void>;
     currency: string;
+    organizationBillableRate: number | null;
     enableEstimatedTime: boolean;
     canCreateProject: boolean;
 }>();
@@ -162,6 +163,7 @@ watch(removeAllTags, () => {
                         :create-project
                         :create-client
                         :currency="currency"
+                        :organization-billable-rate="organizationBillableRate"
                         :can-create-project
                         empty-placeholder="Select project..."
                         allow-reset
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryRow.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryRow.vue
index c72d5d1d..0700bcea 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryRow.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryRow.vue
@@ -46,6 +46,7 @@ const props = defineProps<{
     duplicateTimeEntry?: () => void;
     updateTimeEntry: (timeEntry: TimeEntry) => void;
     currency: string;
+    organizationBillableRate: number | null;
     showMember?: boolean;
     showDate?: boolean;
     selected?: boolean;
@@ -142,6 +143,7 @@ async function handleDeleteTimeEntry() {
                                 :tasks="tasks"
                                 :project="timeEntry.project_id"
                                 :currency="currency"
+                                :organization-billable-rate="organizationBillableRate"
                                 :enable-estimated-time
                                 :task="timeEntry.task_id"
                                 @changed="updateProjectAndTask"></TimeTrackerProjectTaskDropdown>
@@ -209,6 +211,7 @@ async function handleDeleteTimeEntry() {
                                     :tasks="tasks"
                                     :project="timeEntry.project_id"
                                     :currency="currency"
+                                    :organization-billable-rate="organizationBillableRate"
                                     :enable-estimated-time
                                     :task="timeEntry.task_id"
                                     @changed="
@@ -277,6 +280,7 @@ async function handleDeleteTimeEntry() {
         :tasks="tasks"
         :clients="clients"
         :currency="currency"
+        :organization-billable-rate="organizationBillableRate"
         :can-create-project="canCreateProject" />
 </template>
 
diff --git a/resources/js/packages/ui/src/TimeTracker/TimeTrackerControls.vue b/resources/js/packages/ui/src/TimeTracker/TimeTrackerControls.vue
index be3ec5a8..8f9ecc0b 100644
--- a/resources/js/packages/ui/src/TimeTracker/TimeTrackerControls.vue
+++ b/resources/js/packages/ui/src/TimeTracker/TimeTrackerControls.vue
@@ -38,6 +38,7 @@ const props = defineProps<{
     createClient: (client: CreateClientBody) => Promise<Client | undefined>;
     isActive: boolean;
     currency: string;
+    organizationBillableRate: number | null;
     enableEstimatedTime: boolean;
     canCreateProject: boolean;
 }>();
@@ -262,6 +263,7 @@ useSelectEvents(
                         :clients
                         :create-project
                         :currency="currency"
+                        :organization-billable-rate="organizationBillableRate"
                         :projects="projects"
                         :tasks="tasks"
                         :enable-estimated-time="enableEstimatedTime"
diff --git a/resources/js/packages/ui/src/TimeTracker/TimeTrackerProjectTaskDropdown.vue b/resources/js/packages/ui/src/TimeTracker/TimeTrackerProjectTaskDropdown.vue
index 6c17ec2d..940e988b 100644
--- a/resources/js/packages/ui/src/TimeTracker/TimeTrackerProjectTaskDropdown.vue
+++ b/resources/js/packages/ui/src/TimeTracker/TimeTrackerProjectTaskDropdown.vue
@@ -58,6 +58,7 @@ const props = withDefaults(
         emptyPlaceholder?: string;
         allowReset?: boolean;
         enableEstimatedTime: boolean;
+        organizationBillableRate: number | null;
         canCreateProject: boolean;
         class?: string;
         variant?: 'input' | 'ghost' | 'outline';
@@ -660,6 +661,7 @@ const showCreateProject = ref(false);
         v-model:show="showCreateProject"
         :create-client
         :enable-estimated-time="enableEstimatedTime"
+        :organization-billable-rate="organizationBillableRate"
         :currency="currency"
         :clients="clients"
         :create-project></ProjectCreateModal>
diff --git a/resources/js/packages/ui/src/index.ts b/resources/js/packages/ui/src/index.ts
index 9dcc9fa9..aa538d89 100644
--- a/resources/js/packages/ui/src/index.ts
+++ b/resources/js/packages/ui/src/index.ts
@@ -145,6 +145,9 @@ import {
     SelectValue,
 } from './select/index';
 import { Separator } from './separator/index';
+import { Tabs, TabsContent, TabsList, TabsTrigger } from './tabs/index';
+import TabBar from './TabBar/TabBar.vue';
+import TabBarItem from './TabBar/TabBarItem.vue';
 import TimezoneMismatchModal from './TimezoneMismatchModal.vue';
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from './tooltip/index';
 
@@ -257,6 +260,12 @@ export {
     SelectTrigger,
     SelectValue,
     Separator,
+    TabBar,
+    TabBarItem,
+    Tabs,
+    TabsContent,
+    TabsList,
+    TabsTrigger,
     TextInput,
     time,
     TimeEntryCalendar,
diff --git a/resources/js/Components/ui/tabs/Tabs.vue b/resources/js/packages/ui/src/tabs/Tabs.vue
similarity index 100%
rename from resources/js/Components/ui/tabs/Tabs.vue
rename to resources/js/packages/ui/src/tabs/Tabs.vue
diff --git a/resources/js/Components/ui/tabs/TabsContent.vue b/resources/js/packages/ui/src/tabs/TabsContent.vue
similarity index 95%
rename from resources/js/Components/ui/tabs/TabsContent.vue
rename to resources/js/packages/ui/src/tabs/TabsContent.vue
index f795f5c1..05966a43 100644
--- a/resources/js/Components/ui/tabs/TabsContent.vue
+++ b/resources/js/packages/ui/src/tabs/TabsContent.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { cn } from '@/lib/utils';
+import { cn } from '../utils/cn';
 import { TabsContent, type TabsContentProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
 
diff --git a/resources/js/Components/ui/tabs/TabsList.vue b/resources/js/packages/ui/src/tabs/TabsList.vue
similarity index 94%
rename from resources/js/Components/ui/tabs/TabsList.vue
rename to resources/js/packages/ui/src/tabs/TabsList.vue
index 47e4adb5..3a3fe999 100644
--- a/resources/js/Components/ui/tabs/TabsList.vue
+++ b/resources/js/packages/ui/src/tabs/TabsList.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { cn } from '@/lib/utils';
+import { cn } from '../utils/cn';
 import { TabsList, type TabsListProps } from 'reka-ui';
 import { computed, type HTMLAttributes } from 'vue';
 
diff --git a/resources/js/Components/ui/tabs/TabsTrigger.vue b/resources/js/packages/ui/src/tabs/TabsTrigger.vue
similarity index 97%
rename from resources/js/Components/ui/tabs/TabsTrigger.vue
rename to resources/js/packages/ui/src/tabs/TabsTrigger.vue
index 2ff7287f..72aa8a38 100644
--- a/resources/js/Components/ui/tabs/TabsTrigger.vue
+++ b/resources/js/packages/ui/src/tabs/TabsTrigger.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { cn } from '@/lib/utils';
+import { cn } from '../utils/cn';
 import { TabsTrigger, type TabsTriggerProps, useForwardProps } from 'reka-ui';
 import { computed, type HTMLAttributes, type Component } from 'vue';
 
diff --git a/resources/js/packages/ui/src/tabs/index.ts b/resources/js/packages/ui/src/tabs/index.ts
new file mode 100644
index 00000000..8f5f7445
--- /dev/null
+++ b/resources/js/packages/ui/src/tabs/index.ts
@@ -0,0 +1,4 @@
+export { default as Tabs } from './Tabs.vue';
+export { default as TabsContent } from './TabsContent.vue';
+export { default as TabsList } from './TabsList.vue';
+export { default as TabsTrigger } from './TabsTrigger.vue';