refactor(anilist): move to data module

59 files changed, 74 insertions, 74 deletions

diff --git a/src/lib/AniList/activity.ts b/src/lib/Data/AniList/activity.ts
index fb15521e..fb15521e 100644
--- a/src/lib/AniList/activity.ts
+++ b/src/lib/Data/AniList/activity.ts
diff --git a/src/lib/AniList/character.ts b/src/lib/Data/AniList/character.ts
index 082af47a..082af47a 100644
--- a/src/lib/AniList/character.ts
+++ b/src/lib/Data/AniList/character.ts
diff --git a/src/lib/AniList/follow.ts b/src/lib/Data/AniList/follow.ts
index 3601d510..3601d510 100644
--- a/src/lib/AniList/follow.ts
+++ b/src/lib/Data/AniList/follow.ts
diff --git a/src/lib/AniList/following.ts b/src/lib/Data/AniList/following.ts
index 1bba66b9..1bba66b9 100644
--- a/src/lib/AniList/following.ts
+++ b/src/lib/Data/AniList/following.ts
diff --git a/src/lib/AniList/forum.ts b/src/lib/Data/AniList/forum.ts
index 5a1bfc25..5a1bfc25 100644
--- a/src/lib/AniList/forum.ts
+++ b/src/lib/Data/AniList/forum.ts
diff --git a/src/lib/AniList/identity.ts b/src/lib/Data/AniList/identity.ts
index 7214ffa4..7214ffa4 100644
--- a/src/lib/AniList/identity.ts
+++ b/src/lib/Data/AniList/identity.ts
diff --git a/src/lib/AniList/media.ts b/src/lib/Data/AniList/media.ts
index b9d511bc..ea6d79d3 100644
--- a/src/lib/AniList/media.ts
+++ b/src/lib/Data/AniList/media.ts
@@ -1,4 +1,4 @@
-import type { AniListAuthorisation } from '$lib/AniList/identity';
+import type { AniListAuthorisation } from '$lib/Data/AniList/identity';
 import type { UserIdentity } from './identity';
 import anime from '$stores/anime';
 import manga from '$stores/manga';
diff --git a/src/lib/AniList/notifications.ts b/src/lib/Data/AniList/notifications.ts
index bebf1b42..bebf1b42 100644
--- a/src/lib/AniList/notifications.ts
+++ b/src/lib/Data/AniList/notifications.ts
diff --git a/src/lib/AniList/prequels.ts b/src/lib/Data/AniList/prequels.ts
index 3009e9ba..3009e9ba 100644
--- a/src/lib/AniList/prequels.ts
+++ b/src/lib/Data/AniList/prequels.ts
diff --git a/src/lib/AniList/schedule.ts b/src/lib/Data/AniList/schedule.ts
index 0db130ec..0db130ec 100644
--- a/src/lib/AniList/schedule.ts
+++ b/src/lib/Data/AniList/schedule.ts
diff --git a/src/lib/AniList/user.ts b/src/lib/Data/AniList/user.ts
index d2f06354..d2f06354 100644
--- a/src/lib/AniList/user.ts
+++ b/src/lib/Data/AniList/user.ts
diff --git a/src/lib/AniList/wrapped.ts b/src/lib/Data/AniList/wrapped.ts
index 72c81cd8..72c81cd8 100644
--- a/src/lib/AniList/wrapped.ts
+++ b/src/lib/Data/AniList/wrapped.ts
diff --git a/src/lib/Database/activities.ts b/src/lib/Database/activities.ts
index f3d4a8a4..6a505ff3 100644
--- a/src/lib/Database/activities.ts
+++ b/src/lib/Database/activities.ts
@@ -1,4 +1,4 @@
-import type { ActivitiesPage } from '$lib/AniList/activity';
+import type { ActivitiesPage } from '$lib/Data/AniList/activity';
 import Dexie, { type Table } from 'dexie';
 
 export interface ActivityPage {
diff --git a/src/lib/Home/LastActivity.svelte b/src/lib/Home/LastActivity.svelte
index edb293d3..9d4bdf6e 100644
--- a/src/lib/Home/LastActivity.svelte
+++ b/src/lib/Home/LastActivity.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 	import userIdentity from '$stores/identity';
 	import { onMount } from 'svelte';
-	import type { AniListAuthorisation } from '$lib/AniList/identity';
-	import { lastActivityDate } from '../AniList/activity';
+	import type { AniListAuthorisation } from '$lib/Data/AniList/identity';
+	import { lastActivityDate } from '../Data/AniList/activity';
 	import settings from '$stores/settings';
 
 	export let user: AniListAuthorisation;
diff --git a/src/lib/Landing.svelte b/src/lib/Landing.svelte
index 7d063ac3..2dfc09cd 100644
--- a/src/lib/Landing.svelte
+++ b/src/lib/Landing.svelte
@@ -14,7 +14,7 @@
 	} from './Media/Cover/hoverCover';
 	import HoverCover from './Media/Cover/HoverCover.svelte';
 	import root from './Utility/root';
-	import type { Media } from './AniList/media';
+	import type { Media } from './Data/AniList/media';
 	import { env } from '$env/dynamic/public';
 	import tooltip from './Tooltip/tooltip';
 
diff --git a/src/lib/List/Anime/AnimeListTemplate.svelte b/src/lib/List/Anime/AnimeListTemplate.svelte
index ca58fb34..e60a8a8b 100644
--- a/src/lib/List/Anime/AnimeListTemplate.svelte
+++ b/src/lib/List/Anime/AnimeListTemplate.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 	/* eslint svelte/no-at-html-tags: "off" */
 
-	import type { AniListAuthorisation } from '$lib/AniList/identity';
-	import type { Media } from '$lib/AniList/media';
+	import type { AniListAuthorisation } from '$lib/Data/AniList/identity';
+	import type { Media } from '$lib/Data/AniList/media';
 	import Error from '$lib/Error/RateLimited.svelte';
 	import settings from '$stores/settings';
 	import CleanAnimeList from './CleanAnimeList.svelte';
diff --git a/src/lib/List/Anime/CleanAnimeList.svelte b/src/lib/List/Anime/CleanAnimeList.svelte
index 5eb6de1c..b8315a3f 100644
--- a/src/lib/List/Anime/CleanAnimeList.svelte
+++ b/src/lib/List/Anime/CleanAnimeList.svelte
@@ -2,10 +2,10 @@
 	/* eslint svelte/no-at-html-tags: "off" */
 
 	import settings from '$stores/settings';
-	import type { Media } from '$lib/AniList/media';
+	import type { Media } from '$lib/Data/AniList/media';
 	import { cleanCache, incrementMediaProgress } from '$lib/Media/Anime/cache';
 	import { totalEpisodes } from '$lib/Media/Anime/episodes';
-	import type { AniListAuthorisation } from '$lib/AniList/identity';
+	import type { AniListAuthorisation } from '$lib/Data/AniList/identity';
 	import ListTitle from '../ListTitle.svelte';
 	import MediaTitle from '../MediaTitleDisplay.svelte';
 	import { outboundLink } from '$lib/Media/links';
diff --git a/src/lib/List/Anime/CompletedAnimeList.svelte b/src/lib/List/Anime/CompletedAnimeList.svelte
index ef1b103a..70dae576 100644
--- a/src/lib/List/Anime/CompletedAnimeList.svelte
+++ b/src/lib/List/Anime/CompletedAnimeList.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import { mediaListCollection, Type, type Media } from '$lib/AniList/media';
-	import type { AniListAuthorisation } from '$lib/AniList/identity';
+	import { mediaListCollection, Type, type Media } from '$lib/Data/AniList/media';
+	import type { AniListAuthorisation } from '$lib/Data/AniList/identity';
 	import { onMount } from 'svelte';
 	import anime from '$stores/anime';
 	import lastPruneTimes from '$stores/lastPruneTimes';
diff --git a/src/lib/List/Anime/DueAnimeList.svelte b/src/lib/List/Anime/DueAnimeList.svelte
index 90871a82..5e9db234 100644
--- a/src/lib/List/Anime/DueAnimeList.svelte
+++ b/src/lib/List/Anime/DueAnimeList.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import { mediaListCollection, Type, type Media } from '$lib/AniList/media';
-	import type { AniListAuthorisation } from '$lib/AniList/identity';
+	import { mediaListCollection, Type, type Media } from '$lib/Data/AniList/media';
+	import type { AniListAuthorisation } from '$lib/Data/AniList/identity';
 	import { onDestroy, onMount } from 'svelte';
 	import anime from '$stores/anime';
 	import settings from '$stores/settings';
diff --git a/src/lib/List/Anime/UpcomingAnimeList.svelte b/src/lib/List/Anime/UpcomingAnimeList.svelte
index 012631f7..c58e7ad0 100644
--- a/src/lib/List/Anime/UpcomingAnimeList.svelte
+++ b/src/lib/List/Anime/UpcomingAnimeList.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import { mediaListCollection, Type, type Media } from '$lib/AniList/media';
-	import type { AniListAuthorisation } from '$lib/AniList/identity';
+	import { mediaListCollection, Type, type Media } from '$lib/Data/AniList/media';
+	import type { AniListAuthorisation } from '$lib/Data/AniList/identity';
 	import { onMount } from 'svelte';
 	import anime from '$stores/anime';
 	import lastPruneTimes from '$stores/lastPruneTimes';
diff --git a/src/lib/List/Manga/CleanMangaList.svelte b/src/lib/List/Manga/CleanMangaList.svelte
index 7384011d..774a5232 100644
--- a/src/lib/List/Manga/CleanMangaList.svelte
+++ b/src/lib/List/Manga/CleanMangaList.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import type { Media } from '$lib/AniList/media';
+	import type { Media } from '$lib/Data/AniList/media';
 	import Error from '$lib/Error/RateLimited.svelte';
 	import { volumeCount } from '$lib/Media/Manga/volumes';
 	import { outboundLink } from '$lib/Media/links';
diff --git a/src/lib/List/Manga/MangaListTemplate.svelte b/src/lib/List/Manga/MangaListTemplate.svelte
index 48abdc12..40702879 100644
--- a/src/lib/List/Manga/MangaListTemplate.svelte
+++ b/src/lib/List/Manga/MangaListTemplate.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import { mediaListCollection, Type, type Media } from '$lib/AniList/media';
-	import type { AniListAuthorisation } from '$lib/AniList/identity';
+	import { mediaListCollection, Type, type Media } from '$lib/Data/AniList/media';
+	import type { AniListAuthorisation } from '$lib/Data/AniList/identity';
 	import { onDestroy, onMount } from 'svelte';
 	import { chapterCount } from '$lib/Media/Manga/chapters';
 	import { pruneAllManga } from '$lib/Media/Manga/cache';
diff --git a/src/lib/List/MediaTitleDisplay.svelte b/src/lib/List/MediaTitleDisplay.svelte
index 172ebfec..932e5c1e 100644
--- a/src/lib/List/MediaTitleDisplay.svelte
+++ b/src/lib/List/MediaTitleDisplay.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import type { MediaTitle } from '$lib/AniList/media';
+	import type { MediaTitle } from '$lib/Data/AniList/media';
 	import * as tooltipper from '$lib/Tooltip/tooltip';
 	import { abbreviate as abbreviated } from '$lib/Utility/string';
 	import settings from '$stores/settings';
diff --git a/src/lib/List/mediaTitle.ts b/src/lib/List/mediaTitle.ts
index 2d14ca4c..0aa340af 100644
--- a/src/lib/List/mediaTitle.ts
+++ b/src/lib/List/mediaTitle.ts
@@ -1,4 +1,4 @@
-import type { Media } from '$lib/AniList/media';
+import type { Media } from '$lib/Data/AniList/media';
 import settings from '$stores/settings';
 import { get } from 'svelte/store';
 
diff --git a/src/lib/Media/Anime/Airing/AiringTime.svelte b/src/lib/Media/Anime/Airing/AiringTime.svelte
index 9a9a1726..9b29c835 100644
--- a/src/lib/Media/Anime/Airing/AiringTime.svelte
+++ b/src/lib/Media/Anime/Airing/AiringTime.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-	import type { Media } from '$lib/AniList/media';
+	import type { Media } from '$lib/Data/AniList/media';
 	import settings from '$stores/settings';
 	import { onDestroy, onMount } from 'svelte';
 	import type { SubsPlease } from './Subtitled/subsPlease';
-	import type { MediaPrequel } from '$lib/AniList/prequels';
+	import type { MediaPrequel } from '$lib/Data/AniList/prequels';
 	import { injectAiringTime } from './Subtitled/match';
 	import tooltip from '$lib/Tooltip/tooltip';
 	import locale from '$stores/locale';
diff --git a/src/lib/Media/Anime/Airing/Subtitled/match.ts b/src/lib/Media/Anime/Airing/Subtitled/match.ts
index 25bce372..1d1f9d76 100644
--- a/src/lib/Media/Anime/Airing/Subtitled/match.ts
+++ b/src/lib/Media/Anime/Airing/Subtitled/match.ts
@@ -1,5 +1,5 @@
 import { get } from 'svelte/store';
-import type { Media } from '../../../../AniList/media';
+import type { Media } from '../../../../Data/AniList/media';
 import settings from '$stores/settings';
 import type { SubsPlease } from '$lib/Media/Anime/Airing/Subtitled/subsPlease';
 import stringSimilarity from 'string-similarity';
diff --git a/src/lib/Media/Anime/Airing/time.ts b/src/lib/Media/Anime/Airing/time.ts
index 83642687..cfa2ace4 100644
--- a/src/lib/Media/Anime/Airing/time.ts
+++ b/src/lib/Media/Anime/Airing/time.ts
@@ -1,5 +1,5 @@
-import type { Media } from '$lib/AniList/media';
-import type { MediaPrequel } from '$lib/AniList/prequels';
+import type { Media } from '$lib/Data/AniList/media';
+import type { MediaPrequel } from '$lib/Data/AniList/prequels';
 import type { SubsPlease } from '$lib/Media/Anime/Airing/Subtitled/subsPlease';
 import settings from '$stores/settings';
 import { injectAiringTime } from './Subtitled/match';
diff --git a/src/lib/Media/Anime/cache.ts b/src/lib/Media/Anime/cache.ts
index f5dff12a..a47a655e 100644
--- a/src/lib/Media/Anime/cache.ts
+++ b/src/lib/Media/Anime/cache.ts
@@ -1,8 +1,8 @@
 import { get } from 'svelte/store';
 import anime from '$stores/anime';
-import { mediaListCollection, Type } from '../../AniList/media';
+import { mediaListCollection, Type } from '../../Data/AniList/media';
 import lastPruneTimes from '$stores/lastPruneTimes';
-import type { AniListAuthorisation, UserIdentity } from '../../AniList/identity';
+import type { AniListAuthorisation, UserIdentity } from '../../Data/AniList/identity';
 
 export const cleanCache = (user: AniListAuthorisation, identity: UserIdentity) =>
 	mediaListCollection(user, identity, Type.Anime, get(anime), get(lastPruneTimes).anime, {
diff --git a/src/lib/Media/Anime/episodes.ts b/src/lib/Media/Anime/episodes.ts
index cbcfb7ad..3cdbdb98 100644
--- a/src/lib/Media/Anime/episodes.ts
+++ b/src/lib/Media/Anime/episodes.ts
@@ -1,4 +1,4 @@
-import type { Media } from '$lib/AniList/media';
+import type { Media } from '$lib/Data/AniList/media';
 
 export const totalEpisodes = (anime: Media) =>
 	anime.episodes === null ? '' : `<span class="opaque">/${anime.episodes}</span>`;
diff --git a/src/lib/Media/Cover/hoverCover.ts b/src/lib/Media/Cover/hoverCover.ts
index 2e483120..c2b6697c 100644
--- a/src/lib/Media/Cover/hoverCover.ts
+++ b/src/lib/Media/Cover/hoverCover.ts
@@ -1,4 +1,4 @@
-import type { Media } from '$lib/AniList/media';
+import type { Media } from '$lib/Data/AniList/media';
 import { get } from 'svelte/store';
 import type { SubsPleaseEpisode } from '../Anime/Airing/Subtitled/subsPlease';
 import settings from '$stores/settings';
diff --git a/src/lib/Media/Manga/chapters.ts b/src/lib/Media/Manga/chapters.ts
index b44c44c4..7d774006 100644
--- a/src/lib/Media/Manga/chapters.ts
+++ b/src/lib/Media/Manga/chapters.ts
@@ -1,7 +1,7 @@
-import { recentMediaActivities, type Media } from '$lib/AniList/media';
+import { recentMediaActivities, type Media } from '$lib/Data/AniList/media';
 import proxy from '$lib/Utility/proxy';
 import settings from '$stores/settings';
-import type { UserIdentity } from '../../AniList/identity';
+import type { UserIdentity } from '../../Data/AniList/identity';
 import { database } from '../../Database/chapters';
 
 const getManga = async (
diff --git a/src/lib/Media/Manga/volumes.ts b/src/lib/Media/Manga/volumes.ts
index 41dff1d4..bc73bbf4 100644
--- a/src/lib/Media/Manga/volumes.ts
+++ b/src/lib/Media/Manga/volumes.ts
@@ -1,4 +1,4 @@
-import type { Media } from '$lib/AniList/media';
+import type { Media } from '$lib/Data/AniList/media';
 import { database } from '../../Database/chapters';
 
 export const volumeCount = async (manga: Media): Promise<number | null> =>
diff --git a/src/lib/Media/links.ts b/src/lib/Media/links.ts
index 146bd6a8..2d0a4a9a 100644
--- a/src/lib/Media/links.ts
+++ b/src/lib/Media/links.ts
@@ -1,4 +1,4 @@
-import type { Media } from '$lib/AniList/media';
+import type { Media } from '$lib/Data/AniList/media';
 
 export const outboundLink = (
 	media: Media | null,
diff --git a/src/lib/Schedule/CoverBypass.svelte b/src/lib/Schedule/CoverBypass.svelte
index 6aa47701..925f7cc6 100644
--- a/src/lib/Schedule/CoverBypass.svelte
+++ b/src/lib/Schedule/CoverBypass.svelte
@@ -1,5 +1,5 @@
 <script lang="ts" ts>
-	import type { Media } from '$lib/AniList/media';
+	import type { Media } from '$lib/Data/AniList/media';
 	import MediaTitleDisplay from '$lib/List/MediaTitleDisplay.svelte';
 	import type { SubsPleaseEpisode } from '$lib/Media/Anime/Airing/Subtitled/subsPlease';
 	import HoverCover from '$lib/Media/Cover/HoverCover.svelte';
diff --git a/src/lib/Schedule/Days.svelte b/src/lib/Schedule/Days.svelte
index 4a7af63d..5c83c37c 100644
--- a/src/lib/Schedule/Days.svelte
+++ b/src/lib/Schedule/Days.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { browser } from '$app/environment';
-	import type { Media } from '$lib/AniList/media';
+	import type { Media } from '$lib/Data/AniList/media';
 	import { findClosestMedia } from '$lib/Media/Anime/Airing/Subtitled/match';
 	import type { SubsPlease, SubsPleaseEpisode } from '$lib/Media/Anime/Airing/Subtitled/subsPlease';
 	import { outboundLink } from '$lib/Media/links';
diff --git a/src/lib/Tools/ActivityHistory/Grid.svelte b/src/lib/Tools/ActivityHistory/Grid.svelte
index 27402061..fb99d4ae 100644
--- a/src/lib/Tools/ActivityHistory/Grid.svelte
+++ b/src/lib/Tools/ActivityHistory/Grid.svelte
@@ -3,10 +3,10 @@
 		fillMissingDays,
 		type ActivityHistoryEntry,
 		activityHistory
-	} from '$lib/AniList/activity';
+	} from '$lib/Data/AniList/activity';
 	import { onMount } from 'svelte';
 	import userIdentity from '$stores/identity';
-	import type { AniListAuthorisation } from '$lib/AniList/identity';
+	import type { AniListAuthorisation } from '$lib/Data/AniList/identity';
 	import { clearAllParameters } from '../../Utility/parameters';
 	import Skeleton from '$lib/Loading/Skeleton.svelte';
 	import tooltip from '$lib/Tooltip/tooltip';
diff --git a/src/lib/Tools/ActivityHistory/Tool.svelte b/src/lib/Tools/ActivityHistory/Tool.svelte
index 5de98065..09aea266 100644
--- a/src/lib/Tools/ActivityHistory/Tool.svelte
+++ b/src/lib/Tools/ActivityHistory/Tool.svelte
@@ -3,10 +3,10 @@
 		activityHistory,
 		fillMissingDays,
 		type ActivityHistoryEntry
-	} from '$lib/AniList/activity';
+	} from '$lib/Data/AniList/activity';
 	import { onMount } from 'svelte';
 	import userIdentity from '$stores/identity';
-	import type { AniListAuthorisation } from '$lib/AniList/identity';
+	import type { AniListAuthorisation } from '$lib/Data/AniList/identity';
 	import { clearAllParameters } from '../../Utility/parameters';
 	import { domToBlob } from 'modern-screenshot';
 	import ActivityHistoryGrid from './Grid.svelte';
diff --git a/src/lib/Tools/DumpProfile.svelte b/src/lib/Tools/DumpProfile.svelte
index c9a18dd8..a6adba6d 100644
--- a/src/lib/Tools/DumpProfile.svelte
+++ b/src/lib/Tools/DumpProfile.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { dumpUser } from '$lib/AniList/user';
+	import { dumpUser } from '$lib/Data/AniList/user';
 	import RateLimited from '$lib/Error/RateLimited.svelte';
 	import Skeleton from '$lib/Loading/Skeleton.svelte';
 	import InputTemplate from './InputTemplate.svelte';
diff --git a/src/lib/Tools/EpisodeDiscussionCollector.svelte b/src/lib/Tools/EpisodeDiscussionCollector.svelte
index e4855856..cebea553 100644
--- a/src/lib/Tools/EpisodeDiscussionCollector.svelte
+++ b/src/lib/Tools/EpisodeDiscussionCollector.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { threads } from '$lib/AniList/forum';
+	import { threads } from '$lib/Data/AniList/forum';
 	import { onMount } from 'svelte';
 	import { clearAllParameters } from '../Utility/parameters';
 	import HoverCover from '$lib/Media/Cover/HoverCover.svelte';
diff --git a/src/lib/Tools/FollowFix.svelte b/src/lib/Tools/FollowFix.svelte
index ef87c1dc..c02ca698 100644
--- a/src/lib/Tools/FollowFix.svelte
+++ b/src/lib/Tools/FollowFix.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import { toggleFollow } from '$lib/AniList/follow';
-	import type { AniListAuthorisation } from '$lib/AniList/identity';
+	import { toggleFollow } from '$lib/Data/AniList/follow';
+	import type { AniListAuthorisation } from '$lib/Data/AniList/identity';
 
 	export let user: AniListAuthorisation;
 
diff --git a/src/lib/Tools/Likes.svelte b/src/lib/Tools/Likes.svelte
index 2c26b4bb..25da23d0 100644
--- a/src/lib/Tools/Likes.svelte
+++ b/src/lib/Tools/Likes.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import { activityLikes } from '$lib/AniList/activity';
-	import { threadLikes } from '$lib/AniList/forum';
+	import { activityLikes } from '$lib/Data/AniList/activity';
+	import { threadLikes } from '$lib/Data/AniList/forum';
 	import RateLimited from '$lib/Error/RateLimited.svelte';
 	import Skeleton from '$lib/Loading/Skeleton.svelte';
 	import HoverCover from '$lib/Media/Cover/HoverCover.svelte';
diff --git a/src/lib/Tools/RandomFollower.svelte b/src/lib/Tools/RandomFollower.svelte
index e1fed5c0..0bf4d76e 100644
--- a/src/lib/Tools/RandomFollower.svelte
+++ b/src/lib/Tools/RandomFollower.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { followers } from '$lib/AniList/following';
+	import { followers } from '$lib/Data/AniList/following';
 	import RateLimited from '$lib/Error/RateLimited.svelte';
 	import Skeleton from '$lib/Loading/Skeleton.svelte';
 	import InputTemplate from './InputTemplate.svelte';
diff --git a/src/lib/Tools/SequelSpy.svelte b/src/lib/Tools/SequelSpy.svelte
index 16e41f81..4a8d7b12 100644
--- a/src/lib/Tools/SequelSpy.svelte
+++ b/src/lib/Tools/SequelSpy.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
-	import type { AniListAuthorisation } from '$lib/AniList/identity';
-	import { prequels, type MediaPrequel } from '$lib/AniList/prequels';
+	import type { AniListAuthorisation } from '$lib/Data/AniList/identity';
+	import { prequels, type MediaPrequel } from '$lib/Data/AniList/prequels';
 	import MediaTitle from '$lib/List/MediaTitleDisplay.svelte';
 	import { onMount } from 'svelte';
 	import { clearAllParameters, parseOrDefault } from '../Utility/parameters';
 	import { airingTime } from '$lib/Media/Anime/Airing/time';
-	import type { Media } from '$lib/AniList/media';
+	import type { Media } from '$lib/Data/AniList/media';
 	import { page } from '$app/stores';
 	import { browser } from '$app/environment';
 	import { season as getSeason } from '$lib/Media/Anime/season';
diff --git a/src/lib/Tools/Wrapped/ActivityHistory.svelte b/src/lib/Tools/Wrapped/ActivityHistory.svelte
index 7c972eb9..194f5951 100644
--- a/src/lib/Tools/Wrapped/ActivityHistory.svelte
+++ b/src/lib/Tools/Wrapped/ActivityHistory.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import type { ActivityHistoryEntry } from '$lib/AniList/activity';
-	import type { AniListAuthorisation } from '$lib/AniList/identity';
+	import type { ActivityHistoryEntry } from '$lib/Data/AniList/activity';
+	import type { AniListAuthorisation } from '$lib/Data/AniList/identity';
 	import ActivityHistoryGrid from '../ActivityHistory/Grid.svelte';
 
 	export let user: AniListAuthorisation;
diff --git a/src/lib/Tools/Wrapped/Media.svelte b/src/lib/Tools/Wrapped/Media.svelte
index 927cbfd4..f5184bc4 100644
--- a/src/lib/Tools/Wrapped/Media.svelte
+++ b/src/lib/Tools/Wrapped/Media.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import type { Media } from '$lib/AniList/media';
-	import type { Wrapped } from '$lib/AniList/wrapped';
+	import type { Media } from '$lib/Data/AniList/media';
+	import type { Wrapped } from '$lib/Data/AniList/wrapped';
 	import MediaTitleDisplay from '$lib/List/MediaTitleDisplay.svelte';
 	import proxy from '$lib/Utility/proxy';
 
diff --git a/src/lib/Tools/Wrapped/MediaExtras.svelte b/src/lib/Tools/Wrapped/MediaExtras.svelte
index 00417c54..9ef8cb65 100644
--- a/src/lib/Tools/Wrapped/MediaExtras.svelte
+++ b/src/lib/Tools/Wrapped/MediaExtras.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import type { TopMedia } from '$lib/AniList/wrapped';
+	import type { TopMedia } from '$lib/Data/AniList/wrapped';
 	import proxy from '$lib/Utility/proxy';
 
 	export let topMedia: TopMedia;
diff --git a/src/lib/Tools/Wrapped/Tool.svelte b/src/lib/Tools/Wrapped/Tool.svelte
index f1de9f5d..8a3063fa 100644
--- a/src/lib/Tools/Wrapped/Tool.svelte
+++ b/src/lib/Tools/Wrapped/Tool.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
 	import userIdentity from '$stores/identity';
-	import type { AniListAuthorisation } from '$lib/AniList/identity';
+	import type { AniListAuthorisation } from '$lib/Data/AniList/identity';
 	import { onMount } from 'svelte';
-	import { tops, wrapped, type TopMedia, SortOptions } from '$lib/AniList/wrapped';
+	import { tops, wrapped, type TopMedia, SortOptions } from '$lib/Data/AniList/wrapped';
 	import {
 		fullActivityHistory,
 		activityHistory as getActivityHistory
-	} from '$lib/AniList/activity';
-	import { Type, mediaListCollection, type Media } from '$lib/AniList/media';
+	} from '$lib/Data/AniList/activity';
+	import { Type, mediaListCollection, type Media } from '$lib/Data/AniList/media';
 	import anime from '$stores/anime';
 	import lastPruneTimes from '$stores/lastPruneTimes';
 	import manga from '$stores/manga';
diff --git a/src/lib/Tools/Wrapped/Top/Activity.svelte b/src/lib/Tools/Wrapped/Top/Activity.svelte
index dab431c3..03f15b5d 100644
--- a/src/lib/Tools/Wrapped/Top/Activity.svelte
+++ b/src/lib/Tools/Wrapped/Top/Activity.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-	import type { ActivityHistoryEntry } from '$lib/AniList/activity';
+	import type { ActivityHistoryEntry } from '$lib/Data/AniList/activity';
 	import identity from '$stores/identity';
-	import type { Wrapped } from '$lib/AniList/wrapped';
+	import type { Wrapped } from '$lib/Data/AniList/wrapped';
 	import proxy from '$lib/Utility/proxy';
 
 	export let wrapped: Wrapped;
diff --git a/src/lib/Tools/Wrapped/Top/Anime.svelte b/src/lib/Tools/Wrapped/Top/Anime.svelte
index 8ea1277f..b33a8c08 100644
--- a/src/lib/Tools/Wrapped/Top/Anime.svelte
+++ b/src/lib/Tools/Wrapped/Top/Anime.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import type { Media } from '$lib/AniList/media';
+	import type { Media } from '$lib/Data/AniList/media';
 
 	export let minutesWatched: number;
 	export let animeList: Media[] | undefined;
diff --git a/src/lib/Tools/Wrapped/Top/Manga.svelte b/src/lib/Tools/Wrapped/Top/Manga.svelte
index b0d78b6e..6c505df2 100644
--- a/src/lib/Tools/Wrapped/Top/Manga.svelte
+++ b/src/lib/Tools/Wrapped/Top/Manga.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import type { Media } from '$lib/AniList/media';
+	import type { Media } from '$lib/Data/AniList/media';
 	import { estimatedDayReading } from '$lib/Media/Manga/time';
 
 	export let mangaList: Media[] | undefined;
diff --git a/src/lib/websocket.ts b/src/lib/websocket.ts
index fe689884..feaf546f 100644
--- a/src/lib/websocket.ts
+++ b/src/lib/websocket.ts
@@ -1,7 +1,7 @@
 import type { ViteDevServer } from 'vite';
 import { Server } from 'socket.io';
 import { getUserBadges } from '$lib/Database/badges';
-import { userIdentity } from '$lib/AniList/identity';
+import { userIdentity } from '$lib/Data/AniList/identity';
 
 export const webSocketServer = {
 	name: 'webSocketServer',
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index e6b2177e..bb612257 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { env } from '$env/dynamic/public';
-	import { userIdentity as getUserIdentity } from '$lib/AniList/identity';
+	import { userIdentity as getUserIdentity } from '$lib/Data/AniList/identity';
 	import { onMount } from 'svelte';
 	import userIdentity from '$stores/identity';
 	import settings from '$stores/settings';
diff --git a/src/routes/api/badges/+server.ts b/src/routes/api/badges/+server.ts
index c1e2afc8..353a158b 100644
--- a/src/routes/api/badges/+server.ts
+++ b/src/routes/api/badges/+server.ts
@@ -1,4 +1,4 @@
-import { userIdentity } from '$lib/AniList/identity';
+import { userIdentity } from '$lib/Data/AniList/identity';
 import {
 	removeAllUserBadges,
 	removeUserBadge,
diff --git a/src/routes/feeds/activity-notifications/+server.ts b/src/routes/feeds/activity-notifications/+server.ts
index 2b6bfad1..d3c12182 100644
--- a/src/routes/feeds/activity-notifications/+server.ts
+++ b/src/routes/feeds/activity-notifications/+server.ts
@@ -1,4 +1,4 @@
-import { notifications, type Notification } from '$lib/AniList/notifications';
+import { notifications, type Notification } from '$lib/Data/AniList/notifications';
 
 const htmlEncode = (input: string) => {
 	return input.replace(/[\u00A0-\u9999<>&]/g, (i) => '&#' + i.charCodeAt(0) + ';');
diff --git a/src/routes/schedule/+page.svelte b/src/routes/schedule/+page.svelte
index f057751a..7459821b 100644
--- a/src/routes/schedule/+page.svelte
+++ b/src/routes/schedule/+page.svelte
@@ -3,8 +3,8 @@
 	import { onMount } from 'svelte';
 	import { parseOrDefault } from '$lib/Utility/parameters';
 	import { browser } from '$app/environment';
-	import type { Media } from '$lib/AniList/media';
-	import { scheduleMediaListCollection } from '$lib/AniList/schedule';
+	import type { Media } from '$lib/Data/AniList/media';
+	import { scheduleMediaListCollection } from '$lib/Data/AniList/schedule';
 	import { season } from '$lib/Media/Anime/season';
 	import HeadTitle from '$lib/Home/HeadTitle.svelte';
 	import Crunchyroll from '$lib/Schedule/Crunchyroll.svelte';
diff --git a/src/routes/user/+page.svelte b/src/routes/user/+page.svelte
index 5ffccddd..98065942 100644
--- a/src/routes/user/+page.svelte
+++ b/src/routes/user/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { browser } from '$app/environment';
 	import { goto } from '$app/navigation';
-	import type { UserIdentity } from '$lib/AniList/identity';
+	import type { UserIdentity } from '$lib/Data/AniList/identity';
 	import { onMount } from 'svelte';
 	import { env } from '$env/dynamic/public';
 	import HeadTitle from '$lib/Home/HeadTitle.svelte';
diff --git a/src/routes/user/[user]/+page.svelte b/src/routes/user/[user]/+page.svelte
index cd2d367b..4103b7de 100644
--- a/src/routes/user/[user]/+page.svelte
+++ b/src/routes/user/[user]/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { user, type User } from '$lib/AniList/user';
+	import { user, type User } from '$lib/Data/AniList/user';
 	import HeadTitle from '$lib/Home/HeadTitle.svelte';
 	import Message from '$lib/Loading/Message.svelte';
 	import { estimatedDayReading } from '$lib/Media/Manga/time';
diff --git a/src/routes/user/[user]/badges/+page.svelte b/src/routes/user/[user]/badges/+page.svelte
index 00c675f2..0f06a8d1 100644
--- a/src/routes/user/[user]/badges/+page.svelte
+++ b/src/routes/user/[user]/badges/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import { userIdentity } from '$lib/AniList/identity';
-	import { user } from '$lib/AniList/user';
+	import { userIdentity } from '$lib/Data/AniList/identity';
+	import { user } from '$lib/Data/AniList/user';
 	import type { Badge } from '$lib/Database/badges';
 	// import { domToBlob } from 'modern-screenshot';
 	import { onMount } from 'svelte';
@@ -15,7 +15,7 @@
 	import Message from '$lib/Loading/Message.svelte';
 	import Dropdown from '$lib/Dropdown.svelte';
 	import AnimeRateLimited from '$lib/Error/AnimeRateLimited.svelte';
-	import { activityText } from '$lib/AniList/activity.js';
+	import { activityText } from '$lib/Data/AniList/activity.js';
 	import SettingHint from '$lib/Settings/SettingHint.svelte';
 	import Popup from '$lib/Popup.svelte';
 	// import { io } from 'socket.io-client';
diff --git a/src/stores/identity.ts b/src/stores/identity.ts
index 37f8084d..c89df97b 100644
--- a/src/stores/identity.ts
+++ b/src/stores/identity.ts
@@ -1,5 +1,5 @@
 import { browser } from '$app/environment';
-import type { UserIdentity } from '$lib/AniList/identity';
+import type { UserIdentity } from '$lib/Data/AniList/identity';
 import { writable } from 'svelte/store';
 
 export const defaultIdentity: UserIdentity = {