diff --git a/components/CardEvent.vue b/components/CardEvent.vue
index 80a5f2f..1558298 100644
--- a/components/CardEvent.vue
+++ b/components/CardEvent.vue
@@ -41,7 +41,7 @@
 </template>
 
 <script lang="ts" setup>
-import { DateTime } from 'luxon';
+import { DateTime } from '~/shared/utils/luxon';
 
 defineProps<{
 	event: ClientScheduleEvent
diff --git a/components/TableScheduleEventSlots.vue b/components/TableScheduleEventSlots.vue
index fffc718..303b00d 100644
--- a/components/TableScheduleEventSlots.vue
+++ b/components/TableScheduleEventSlots.vue
@@ -196,7 +196,7 @@
 </template>
 
 <script lang="ts" setup>
-import { DateTime, Duration } from 'luxon';
+import { DateTime, Duration } from '~/shared/utils/luxon';
 import type { Id } from '~/shared/types/common';
 import { enumerate, pairs, toId } from '~/shared/utils/functions';
 
diff --git a/components/TableScheduleShifts.vue b/components/TableScheduleShifts.vue
index 6aafeaa..160373d 100644
--- a/components/TableScheduleShifts.vue
+++ b/components/TableScheduleShifts.vue
@@ -118,8 +118,7 @@
 </template>
 
 <script lang="ts" setup>
-import { DateTime } from 'luxon';
-import type { ApiSchedule, ApiScheduleShift } from '~/shared/types/api';
+import { DateTime } from '~/shared/utils/luxon';
 import type { Id } from '~/shared/types/common';
 import { toId } from '~/shared/utils/functions';
 
diff --git a/components/TableUsers.vue b/components/TableUsers.vue
index 78c33d4..6b20287 100644
--- a/components/TableUsers.vue
+++ b/components/TableUsers.vue
@@ -49,8 +49,6 @@
 </template>
 
 <script lang="ts" setup>
-import { DateTime } from 'luxon';
-
 useEventSource();
 const usersStore = useUsersStore();
 await usersStore.fetch();
diff --git a/components/Timetable.vue b/components/Timetable.vue
index 21a5a15..e93291a 100644
--- a/components/Timetable.vue
+++ b/components/Timetable.vue
@@ -122,7 +122,7 @@
 </template>
 
 <script setup lang="ts">
-import { DateTime } from "luxon";
+import { DateTime } from "~/shared/utils/luxon";
 import type { Id } from "~/shared/types/common";
 import { pairs, setEquals } from "~/shared/utils/functions";
 
diff --git a/server/api/admin/user.patch.ts b/server/api/admin/user.patch.ts
index dd3691d..717358a 100644
--- a/server/api/admin/user.patch.ts
+++ b/server/api/admin/user.patch.ts
@@ -1,5 +1,5 @@
-import { readUsers, ServerUser, writeUsers } from "~/server/database";
-import { ApiUser, apiUserPatchSchema } from "~/shared/types/api";
+import { readUsers, type ServerUser, writeUsers } from "~/server/database";
+import { type ApiUser, apiUserPatchSchema } from "~/shared/types/api";
 import { z } from "zod/v4-mini";
 import { broadcastEvent } from "~/server/streams";
 
diff --git a/server/api/auth/account.delete.ts b/server/api/auth/account.delete.ts
index da335bd..77bbd0f 100644
--- a/server/api/auth/account.delete.ts
+++ b/server/api/auth/account.delete.ts
@@ -1,7 +1,7 @@
 import {
 	readUsers, readSessions, readSubscriptions,
 	writeUsers, writeSessions, writeSubscriptions,
- } from "~/server/database";
+} from "~/server/database";
 import { broadcastEvent, cancelAccountStreams } from "~/server/streams";
 
 export default defineEventHandler(async (event) => {
diff --git a/server/api/events.ts b/server/api/events.ts
index b82d660..798c634 100644
--- a/server/api/events.ts
+++ b/server/api/events.ts
@@ -1,6 +1,5 @@
 import { pipeline } from "node:stream";
 import { addStream, deleteStream } from "~/server/streams";
-import { readUsers } from "~/server/database";
 
 export default defineEventHandler(async (event) => {
 	const session = await getServerSession(event);
diff --git a/server/api/schedule.patch.ts b/server/api/schedule.patch.ts
index f0a74e8..2484ec4 100644
--- a/server/api/schedule.patch.ts
+++ b/server/api/schedule.patch.ts
@@ -1,5 +1,5 @@
 import { z } from "zod/v4-mini";
-import { readUsers, readSchedule, writeSchedule } from "~/server/database";
+import { readSchedule, writeSchedule } from "~/server/database";
 import { broadcastEvent } from "~/server/streams";
 import { apiScheduleSchema } from "~/shared/types/api";
 import { applyUpdatesToArray } from "~/shared/utils/update";
diff --git a/server/api/schedule.ts b/server/api/schedule.ts
index 8079fa2..1f08700 100644
--- a/server/api/schedule.ts
+++ b/server/api/schedule.ts
@@ -1,6 +1,4 @@
-import { readUsers, readSchedule } from "~/server/database";
-import type { ApiAccount } from "~/shared/types/api";
-import { canSeeCrew } from "../utils/schedule";
+import { readSchedule } from "~/server/database";
 
 export default defineEventHandler(async (event) => {
 	const session = await getServerSession(event);
diff --git a/server/database.ts b/server/database.ts
index e586204..117e3ea 100644
--- a/server/database.ts
+++ b/server/database.ts
@@ -1,6 +1,6 @@
 import { readFile, unlink, writeFile } from "node:fs/promises";
 import type { ApiSchedule, ApiSubscription, ApiUserType } from "~/shared/types/api";
-import { generateDemoSchedule, generateDemoAccounts } from "./generate-demo-schedule";
+import { generateDemoSchedule, generateDemoAccounts } from "~/server/generate-demo-schedule";
 import type { Id } from "~/shared/types/common";
 
 export interface ServerSession {
diff --git a/server/streams.ts b/server/streams.ts
index 9ef7c32..9823e1b 100644
--- a/server/streams.ts
+++ b/server/streams.ts
@@ -1,5 +1,4 @@
 import { readUsers } from "~/server/database";
-import { canSeeCrew } from "./utils/schedule";
 import type { ApiAccount, ApiEvent } from "~/shared/types/api";
 
 function sendMessage(
diff --git a/server/utils/schedule.ts b/server/utils/schedule.ts
index a96d768..1c60d70 100644
--- a/server/utils/schedule.ts
+++ b/server/utils/schedule.ts
@@ -1,6 +1,6 @@
-import { readSchedule, ServerUser, writeSchedule } from '~/server/database';
+import { readSchedule, type ServerUser, writeSchedule } from '~/server/database';
 import { broadcastEvent } from '~/server/streams';
-import type { ApiAccount, ApiSchedule } from '~/shared/types/api';
+import type { ApiSchedule } from '~/shared/types/api';
 
 export async function updateScheduleInterestedCounts(users: ServerUser[]) {
 	const eventCounts = new Map<number, number>();
diff --git a/utils/client-schedule.nuxt.test.ts b/utils/client-schedule.nuxt.test.ts
index 971382c..eca7a78 100644
--- a/utils/client-schedule.nuxt.test.ts
+++ b/utils/client-schedule.nuxt.test.ts
@@ -1,4 +1,4 @@
-import { ClientEntity, ClientSchedule, ClientScheduleEventSlot, ClientScheduleLocation, ClientScheduleShiftSlot, toIso } from "./client-schedule";
+import { ClientEntity, ClientSchedule, ClientScheduleEventSlot, ClientScheduleLocation, ClientScheduleShiftSlot, toIso } from "~/utils/client-schedule";
 import { describe, expect, test } from "vitest";
 import type { ApiSchedule } from "~/shared/types/api";
 import type { Id, Living } from "~/shared/types/common";