diff --git a/src/lib/google/sheets/server.ts b/src/lib/google/sheets/server.ts
index 57a7268..eaba378 100644
--- a/src/lib/google/sheets/server.ts
+++ b/src/lib/google/sheets/server.ts
@@ -1,16 +1,6 @@
 import { google } from 'googleapis';
 import { getAuthenticatedClient } from '../auth/server.js';
-
-export interface GoogleSheet {
-  id: string;
-  name: string;
-  modifiedTime: string;
-  webViewLink: string;
-}
-
-export interface SheetData {
-  values: string[][];
-}
+import { GoogleSheet } from './types.ts'
 
 /**
  * Get a list of recent Google Sheets
diff --git a/src/lib/google/sheets/types.ts b/src/lib/google/sheets/types.ts
new file mode 100644
index 0000000..d88de8a
--- /dev/null
+++ b/src/lib/google/sheets/types.ts
@@ -0,0 +1,10 @@
+export interface GoogleSheet {
+  id: string;
+  name: string;
+  modifiedTime: string;
+  webViewLink: string;
+}
+
+export interface SheetData {
+  values: string[][];
+}
diff --git a/src/routes/api/sheets/[sheetId]/data/+server.ts b/src/routes/api/sheets/[sheetId]/data/+server.ts
index e87c1ff..9e9b4b0 100644
--- a/src/routes/api/sheets/[sheetId]/data/+server.ts
+++ b/src/routes/api/sheets/[sheetId]/data/+server.ts
@@ -1,6 +1,6 @@
 import { json } from '@sveltejs/kit';
 import type { RequestHandler } from './$types';
-import { sheets } from '$lib/google/index.js';
+import { googleSheetsServer } from '$lib/google/sheets/server';
 
 export const GET: RequestHandler = async ({ params, request }) => {
 	try {
@@ -12,7 +12,7 @@ export const GET: RequestHandler = async ({ params, request }) => {
 		}
 
 		const refreshToken = authHeader.slice(7);
-		const sheetData = await sheets.getSpreadsheetData(refreshToken, sheetId, 'A1:Z10');
+		const sheetData = await googleSheetsServer.getSpreadsheetData(refreshToken, sheetId, 'A1:Z10');
 
 		return json(sheetData);
 	} catch (error) {
diff --git a/src/routes/api/sheets/recent/+server.ts b/src/routes/api/sheets/recent/+server.ts
index ed01813..d3eba61 100644
--- a/src/routes/api/sheets/recent/+server.ts
+++ b/src/routes/api/sheets/recent/+server.ts
@@ -1,6 +1,6 @@
 import { json } from '@sveltejs/kit';
 import type { RequestHandler } from './$types';
-import { sheets } from '$lib/google/index.js';
+import { googleSheetsServer } from '$lib/google/sheets/server';
 
 export const GET: RequestHandler = async ({ request }) => {
 	try {
@@ -10,7 +10,7 @@ export const GET: RequestHandler = async ({ request }) => {
 		}
 
 		const refreshToken = authHeader.slice(7);
-		const spreadsheets = await sheets.getRecentSpreadsheets(refreshToken, 20);
+		const spreadsheets = await googleSheetsServer.getRecentSpreadsheets(refreshToken, 20);
 
 		return json(spreadsheets);
 	} catch (error) {
diff --git a/src/routes/private/api/google/sheets/[sheetId]/data/+server.ts b/src/routes/private/api/google/sheets/[sheetId]/data/+server.ts
index e87c1ff..e35f495 100644
--- a/src/routes/private/api/google/sheets/[sheetId]/data/+server.ts
+++ b/src/routes/private/api/google/sheets/[sheetId]/data/+server.ts
@@ -1,6 +1,6 @@
 import { json } from '@sveltejs/kit';
 import type { RequestHandler } from './$types';
-import { sheets } from '$lib/google/index.js';
+import { googleSheetsServer } from '$lib/google/server.ts';
 
 export const GET: RequestHandler = async ({ params, request }) => {
 	try {
@@ -12,7 +12,7 @@ export const GET: RequestHandler = async ({ params, request }) => {
 		}
 
 		const refreshToken = authHeader.slice(7);
-		const sheetData = await sheets.getSpreadsheetData(refreshToken, sheetId, 'A1:Z10');
+		const sheetData = await googleSheetsServer.getSpreadsheetData(refreshToken, sheetId, 'A1:Z10');
 
 		return json(sheetData);
 	} catch (error) {
diff --git a/src/routes/private/api/google/sheets/recent/+server.ts b/src/routes/private/api/google/sheets/recent/+server.ts
index ed01813..78d9129 100644
--- a/src/routes/private/api/google/sheets/recent/+server.ts
+++ b/src/routes/private/api/google/sheets/recent/+server.ts
@@ -1,6 +1,6 @@
 import { json } from '@sveltejs/kit';
 import type { RequestHandler } from './$types';
-import { sheets } from '$lib/google/index.js';
+import { googleSheetsServer } from '$lib/google/server.ts';
 
 export const GET: RequestHandler = async ({ request }) => {
 	try {
@@ -10,7 +10,7 @@ export const GET: RequestHandler = async ({ request }) => {
 		}
 
 		const refreshToken = authHeader.slice(7);
-		const spreadsheets = await sheets.getRecentSpreadsheets(refreshToken, 20);
+		const spreadsheets = await googleSheetsServer.getRecentSpreadsheets(refreshToken, 20);
 
 		return json(spreadsheets);
 	} catch (error) {
diff --git a/src/routes/private/events/event/new/components/GoogleSheetsStep.svelte b/src/routes/private/events/event/new/components/GoogleSheetsStep.svelte
index 0389757..5831568 100644
--- a/src/routes/private/events/event/new/components/GoogleSheetsStep.svelte
+++ b/src/routes/private/events/event/new/components/GoogleSheetsStep.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import type { GoogleSheet } from '$lib/google/sheets';
+	import type { GoogleSheet } from '$lib/google/google/types.tsient/types.js';
 	
 	// Props
 	let { sheetsData, errors, loadRecentSheets, selectSheet, toggleSheetList } = $props<{