diff --git a/src/modules/timesheets/components/timesheet/timesheet-save-payload.vue b/src/modules/timesheets/components/timesheet/timesheet-save-payload.vue
index a2f3c2a..b359c64 100644
--- a/src/modules/timesheets/components/timesheet/timesheet-save-payload.vue
+++ b/src/modules/timesheets/components/timesheet/timesheet-save-payload.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 /* eslint-disable */
 import { computed } from 'vue';
-import { CreateShiftPayload } from '../../types/timesheet-shifts-payload-interface';
-import { Shift } from '../../types/timesheet-shift-interface';
+import type { CreateShiftPayload } from '../../types/timesheet-shifts-payload-interface';
+import type { Shift } from '../../types/timesheet-shift-interface';
 
 
 const props = defineProps<{
diff --git a/src/modules/timesheets/components/timesheet/timesheet-shift-form.vue b/src/modules/timesheets/components/timesheet/timesheet-shift-form.vue
index d624df9..17a9dbf 100644
--- a/src/modules/timesheets/components/timesheet/timesheet-shift-form.vue
+++ b/src/modules/timesheets/components/timesheet/timesheet-shift-form.vue
@@ -5,8 +5,8 @@ import { useI18n } from 'vue-i18n';
 import { useTimesheetStore } from 'src/stores/timesheet-store';
 import TimesheetShiftComment from '../shift/timesheet-shift-comment.vue';
 import TimesheetSavePayload from './timesheet-save-payload.vue';
-import { Shift } from '../../types/timesheet-shift-interface';
-import { CreateShiftPayload } from '../../types/timesheet-shifts-payload-interface';
+import type { Shift } from '../../types/timesheet-shift-interface';
+import type { CreateShiftPayload } from '../../types/timesheet-shifts-payload-interface';
 
 const timesheet_store = useTimesheetStore();
 
diff --git a/src/modules/timesheets/composables/use-timesheet-api.ts b/src/modules/timesheets/composables/use-timesheet-api.ts
index da4840c..25e5fb1 100644
--- a/src/modules/timesheets/composables/use-timesheet-api.ts
+++ b/src/modules/timesheets/composables/use-timesheet-api.ts
@@ -2,7 +2,7 @@ import { useAuthStore } from "src/stores/auth-store";
 import { useTimesheetStore } from "src/stores/timesheet-store"
 import { ref } from "vue";
 import { timesheetTempService } from "../services/timesheet-services";
-import { CreateShiftPayload } from "../types/timesheet-shifts-payload-interface";
+import type { CreateShiftPayload } from "../types/timesheet-shifts-payload-interface";
 
 
 export const useTimesheetApi = () => {
diff --git a/src/modules/timesheets/pages/timesheet-temp-page.vue b/src/modules/timesheets/pages/timesheet-temp-page.vue
index 8c3c2df..5210d78 100644
--- a/src/modules/timesheets/pages/timesheet-temp-page.vue
+++ b/src/modules/timesheets/pages/timesheet-temp-page.vue
@@ -6,7 +6,7 @@ import { useI18n } from 'vue-i18n';
 import TimesheetShiftForm from '../components/timesheet/timesheet-shift-form.vue';
 import TimesheetNavigation from '../components/timesheet/timesheet-navigation.vue';
 import { date as qdate } from 'quasar';
-import { CreateShiftPayload } from '../types/timesheet-shifts-payload-interface';
+import type { CreateShiftPayload } from '../types/timesheet-shifts-payload-interface';
 
 const { locale } = useI18n();
 const timesheet_store = useTimesheetStore();
diff --git a/src/modules/timesheets/services/timesheet-services.ts b/src/modules/timesheets/services/timesheet-services.ts
index d96bef5..f9d14d5 100644
--- a/src/modules/timesheets/services/timesheet-services.ts
+++ b/src/modules/timesheets/services/timesheet-services.ts
@@ -1,6 +1,6 @@
 import { api } from "src/boot/axios";
 import type  {Timesheet}  from "src/modules/timesheets/types/timesheet-interface";
-import type { CreateShiftPayload, CreateWeekShiftPayload } from "../types/timesheet-shift-interface";
+import type { CreateShiftPayload, CreateWeekShiftPayload } from "../types/timesheet-shifts-payload-interface";
 
 export const timesheetTempService = {
     //GET
diff --git a/src/stores/timesheet-store.ts b/src/stores/timesheet-store.ts
index 72b48d8..faba525 100644
--- a/src/stores/timesheet-store.ts
+++ b/src/stores/timesheet-store.ts
@@ -2,12 +2,12 @@ import { defineStore } from 'pinia';
 import { ref } from 'vue';
 import { timesheetApprovalService } from 'src/modules/timesheet-approval/services/services-timesheet-approval';
 import { timesheetTempService } from 'src/modules/timesheets/services/timesheet-services';
+import { default_pay_period_employee_details, type PayPeriodEmployeeDetails } from 'src/modules/timesheet-approval/types/timesheet-approval-pay-period-employee-details-interface';
 import type { PayPeriod } from 'src/modules/shared/types/pay-period-interface';
 import type { PayPeriodOverviewEmployee } from "src/modules/timesheet-approval/types/timesheet-approval-pay-period-overview-employee-interface";
-import { default_pay_period_employee_details, type PayPeriodEmployeeDetails } from 'src/modules/timesheet-approval/types/timesheet-approval-pay-period-employee-details-interface';
 import type { PayPeriodReportFilters } from 'src/modules/timesheet-approval/types/timesheet-approval-pay-period-report-interface';
 import type { Timesheet } from 'src/modules/timesheets/types/timesheet-interface';
-import type { CreateShiftPayload } from 'src/modules/timesheets/types/timesheet-shift-interface';
+import type{ CreateShiftPayload } from 'src/modules/timesheets/types/timesheet-shifts-payload-interface';
 
 const default_pay_period: PayPeriod = { 
     pay_period_no: -1,