diff --git a/src/lib/client/AlbumClientState.svelte.ts b/src/lib/client/pakubiiti/AlbumClientState.svelte.ts
similarity index 100%
rename from src/lib/client/AlbumClientState.svelte.ts
rename to src/lib/client/pakubiiti/AlbumClientState.svelte.ts
diff --git a/src/lib/server/AlbumState.svelte.ts b/src/lib/server/pakubiiti/AlbumState.svelte.ts
similarity index 100%
rename from src/lib/server/AlbumState.svelte.ts
rename to src/lib/server/pakubiiti/AlbumState.svelte.ts
diff --git a/src/lib/server/PlayerState.svelte.ts b/src/lib/server/pakubiiti/PlayerState.svelte.ts
similarity index 100%
rename from src/lib/server/PlayerState.svelte.ts
rename to src/lib/server/pakubiiti/PlayerState.svelte.ts
diff --git a/src/lib/server/Spotify.svelte.ts b/src/lib/server/pakubiiti/Spotify.svelte.ts
similarity index 100%
rename from src/lib/server/Spotify.svelte.ts
rename to src/lib/server/pakubiiti/Spotify.svelte.ts
diff --git a/src/routes/api/pakubiiti/getAlbums/[count]/+server.ts b/src/routes/api/pakubiiti/getAlbums/[count]/+server.ts
index f09c3cf..f68f10d 100644
--- a/src/routes/api/pakubiiti/getAlbums/[count]/+server.ts
+++ b/src/routes/api/pakubiiti/getAlbums/[count]/+server.ts
@@ -1,5 +1,5 @@
-import { albumState } from '$lib/server/AlbumState.svelte';
-import { spotifyAPI } from '$lib/server/Spotify.svelte';
+import { albumState } from '$lib/server/pakubiiti/AlbumState.svelte';
+import { spotifyAPI } from '$lib/server/pakubiiti/Spotify.svelte';
 import type { AlbumSolveState } from '$lib/types';
 import { error, json } from '@sveltejs/kit';
 
diff --git a/src/routes/vinge/pakubiiti/+page.server.ts b/src/routes/vinge/pakubiiti/+page.server.ts
index b227152..2a60081 100644
--- a/src/routes/vinge/pakubiiti/+page.server.ts
+++ b/src/routes/vinge/pakubiiti/+page.server.ts
@@ -2,8 +2,8 @@ import { shuffleArray } from '$lib/utils';
 import { nanoid } from 'nanoid';
 import type { PageServerLoad } from './$types';
 import type { AlbumSolveState } from '$lib/types';
-import { albumState } from '$lib/server/AlbumState.svelte';
-import { playerState } from '$lib/server/PlayerState.svelte';
+import { albumState } from '$lib/server/pakubiiti/AlbumState.svelte';
+import { playerState } from '$lib/server/pakubiiti/PlayerState.svelte';
 
 const count = 3;
 
diff --git a/src/routes/vinge/pakubiiti/+page.svelte b/src/routes/vinge/pakubiiti/+page.svelte
index c4c255d..28fb70f 100644
--- a/src/routes/vinge/pakubiiti/+page.svelte
+++ b/src/routes/vinge/pakubiiti/+page.svelte
@@ -10,7 +10,7 @@
 	import type { AlbumData } from '$lib/types';
 	import { fade } from 'svelte/transition';
 	import { expoIn, expoOut } from 'svelte/easing';
-	import { getAlbumClientState } from '$lib/client/AlbumClientState.svelte';
+	import { getAlbumClientState } from '$lib/client/pakubiiti/AlbumClientState.svelte';
 
 	let { data }: { data: PageData; form: FormData } = $props();