diff --git a/src/app/LanguageContext.tsx b/src/app/LanguageContext.tsx
index 77fd615..a35dac3 100644
--- a/src/app/LanguageContext.tsx
+++ b/src/app/LanguageContext.tsx
@@ -1,7 +1,7 @@
 "use client";
 import React, { createContext, useContext, useSyncExternalStore } from "react";
 
-type Language = "en" | "no";
+export type Language = "en" | "no";
 
 const LanguageContext = createContext<{
   language: Language;
diff --git a/src/app/api/guess/route.ts b/src/app/api/guess/route.ts
index 593732c..a66e6f9 100644
--- a/src/app/api/guess/route.ts
+++ b/src/app/api/guess/route.ts
@@ -1,8 +1,8 @@
 import { authOptions } from "@/lib/auth";
+import { findDiscordMember } from "@/lib/members";
 import type { Match } from "@/types";
 import { getServerSession } from "next-auth/next";
 import { NextResponse } from "next/server";
-import { findDiscordMember } from "./dataProvider";
 
 export async function POST(request: Request) {
   const session = await getServerSession(authOptions);
diff --git a/src/app/api/members/count/route.ts b/src/app/api/members/count/route.ts
index a826ecd..fa069ff 100644
--- a/src/app/api/members/count/route.ts
+++ b/src/app/api/members/count/route.ts
@@ -1,7 +1,7 @@
 import { authOptions } from "@/lib/auth";
+import { getPayingMemberCount } from "@/lib/members";
 import { getServerSession } from "next-auth/next";
 import { NextResponse } from "next/server";
-import { getPayingMemberCount } from "../../guess/dataProvider";
 
 export const dynamic = "force-dynamic";
 
diff --git a/src/app/components/LanguageMenu.tsx b/src/app/components/LanguageMenu.tsx
index 3586a44..da9fdec 100644
--- a/src/app/components/LanguageMenu.tsx
+++ b/src/app/components/LanguageMenu.tsx
@@ -1,13 +1,9 @@
 "use client";
 
-import { useLanguage } from "@/LanguageContext";
+import { type Language, useLanguage } from "@/LanguageContext";
 import { Menu, MenuButton, MenuItem, MenuItems } from "@headlessui/react";
 import { IoLanguage } from "react-icons/io5";
 
-// Language type from context
-type Language = "en" | "no";
-
-// Language options configuration
 const LANGUAGE_OPTIONS: Array<{ code: Language; label: string }> = [
   { code: "en", label: "English" },
   { code: "no", label: "Norsk" },
diff --git a/src/app/lib/discord.ts b/src/app/lib/discord.ts
index 3d2a49b..0eb7dd9 100644
--- a/src/app/lib/discord.ts
+++ b/src/app/lib/discord.ts
@@ -1,13 +1,4 @@
-interface DiscordGuildMember {
-  user: {
-    id: string;
-    username: string;
-    discriminator: string;
-    avatar: string | null;
-  };
-  roles: string[];
-  joined_at: string;
-}
+import type { DiscordGuildMember } from "@/types";
 
 export async function verifyUserRole(userId: string): Promise<boolean> {
   const guildId = process.env.DISCORD_GUILD_ID;
diff --git a/src/app/api/guess/dataProvider.ts b/src/app/lib/members.ts
similarity index 100%
rename from src/app/api/guess/dataProvider.ts
rename to src/app/lib/members.ts