diff --git a/src/lib/auth.svelte.ts b/src/lib/auth.svelte.ts
index 43f1ea97..fae67371 100644
--- a/src/lib/auth.svelte.ts
+++ b/src/lib/auth.svelte.ts
@@ -5,7 +5,7 @@ import {
isAdmin,
} from '$lib/components/lemmy/moderation/moderation.js'
import { DEFAULT_INSTANCE_URL } from '$lib/instance.svelte.js'
-import { client, getClient } from '$lib/lemmy.svelte.js'
+import { client, getClient } from '$lib/client/lemmy.svelte'
import { instanceToURL, moveItem } from '$lib/util.svelte'
import { MINIMUM_VERSION, versionIsSupported } from '$lib/version.js'
import {
diff --git a/src/lib/client/README b/src/lib/client/README
index fe092b44..e69de29b 100644
--- a/src/lib/client/README
+++ b/src/lib/client/README
@@ -1 +0,0 @@
-A lot of the code in here was either inspired or modified from https://github.com/aeharding/threadiverse, which is licensed under the AGPL 3.0.
\ No newline at end of file
diff --git a/src/lib/lemmy.svelte.ts b/src/lib/client/lemmy.svelte.ts
similarity index 100%
rename from src/lib/lemmy.svelte.ts
rename to src/lib/client/lemmy.svelte.ts
diff --git a/src/lib/components/lemmy/ObjectAutocomplete.svelte b/src/lib/components/lemmy/ObjectAutocomplete.svelte
index 133ce007..59114958 100644
--- a/src/lib/components/lemmy/ObjectAutocomplete.svelte
+++ b/src/lib/components/lemmy/ObjectAutocomplete.svelte
@@ -1,6 +1,6 @@
diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte
index 4584cf85..90d81ca2 100644
--- a/src/routes/login/+page.svelte
+++ b/src/routes/login/+page.svelte
@@ -13,7 +13,7 @@
DEFAULT_INSTANCE_URL,
LINKED_INSTANCE_URL,
} from '$lib/instance.svelte.js'
- import { getClient, mayBeIncompatible, site } from '$lib/lemmy.svelte.js'
+ import { getClient, mayBeIncompatible, site } from '$lib/client/lemmy.svelte'
import { errorMessage } from '$lib/lemmy/error'
import { DOMAIN_REGEX_FORMS } from '$lib/util.svelte.js'
import { MINIMUM_VERSION } from '$lib/version.js'
diff --git a/src/routes/login/guest/+page.svelte b/src/routes/login/guest/+page.svelte
index cf66f90c..fde24737 100644
--- a/src/routes/login/guest/+page.svelte
+++ b/src/routes/login/guest/+page.svelte
@@ -6,8 +6,8 @@
import Header from '$lib/components/ui/layout/pages/Header.svelte'
import { t } from '$lib/i18n/translations'
import { LINKED_INSTANCE_URL } from '$lib/instance.svelte'
- import { mayBeIncompatible } from '$lib/lemmy.svelte'
- import { site, validateInstance } from '$lib/lemmy.svelte.js'
+ import { mayBeIncompatible } from '$lib/client/lemmy.svelte'
+ import { site, validateInstance } from '$lib/client/lemmy.svelte'
import { DOMAIN_REGEX_FORMS } from '$lib/util.svelte'
import { MINIMUM_VERSION } from '$lib/version'
import { Button, Note, TextInput, toast } from 'mono-svelte'
diff --git a/src/routes/login_reset/+page.svelte b/src/routes/login_reset/+page.svelte
index 62e4a066..3d2e7aeb 100644
--- a/src/routes/login_reset/+page.svelte
+++ b/src/routes/login_reset/+page.svelte
@@ -7,7 +7,7 @@
LINKED_INSTANCE_URL,
instance as currentInstance,
} from '$lib/instance.svelte.js'
- import { getClient, validateInstance } from '$lib/lemmy.svelte.js'
+ import { getClient, validateInstance } from '$lib/client/lemmy.svelte'
import { t } from '$lib/i18n/translations'
import { Button, TextInput, toast } from 'mono-svelte'
import { errorMessage } from '$lib/lemmy/error'
diff --git a/src/routes/moderation/+page.svelte b/src/routes/moderation/+page.svelte
index 5b0a56f9..ae222185 100644
--- a/src/routes/moderation/+page.svelte
+++ b/src/routes/moderation/+page.svelte
@@ -8,7 +8,7 @@
import Placeholder from '$lib/components/ui/Placeholder.svelte'
import ProgressBar from '$lib/components/ui/ProgressBar.svelte'
import { t } from '$lib/i18n/translations'
- import { client } from '$lib/lemmy.svelte'
+ import { client } from '$lib/client/lemmy.svelte'
import { searchParam } from '$lib/util.svelte.js'
import { Button, Material, Select, Spinner, toast } from 'mono-svelte'
import Option from 'mono-svelte/forms/select/Option.svelte'
diff --git a/src/routes/moderation/+page.ts b/src/routes/moderation/+page.ts
index 1cf9d67b..d4a38f02 100644
--- a/src/routes/moderation/+page.ts
+++ b/src/routes/moderation/+page.ts
@@ -1,6 +1,6 @@
import { profile } from '$lib/auth.svelte'
import { isAdmin } from '$lib/components/lemmy/moderation/moderation.js'
-import { getClient } from '$lib/lemmy.svelte.js'
+import { getClient } from '$lib/client/lemmy.svelte'
import { isCommentView, isPostView } from '$lib/lemmy/item'
import {
generalizeCommentReport,
diff --git a/src/routes/moderation/Report.svelte b/src/routes/moderation/Report.svelte
index 2c242ce9..462d5986 100644
--- a/src/routes/moderation/Report.svelte
+++ b/src/routes/moderation/Report.svelte
@@ -7,7 +7,7 @@
import Avatar from '$lib/components/ui/Avatar.svelte'
import SectionTitle from '$lib/components/ui/SectionTitle.svelte'
import { t } from '$lib/i18n/translations'
- import { getClient } from '$lib/lemmy.svelte.js'
+ import { getClient } from '$lib/client/lemmy.svelte'
import { errorMessage } from '$lib/lemmy/error'
import type { ReportView } from '$lib/lemmy/report.js'
import { Badge, Button, Material, Modal, toast } from 'mono-svelte'
diff --git a/src/routes/moderation/c/[id=integer]/+page.ts b/src/routes/moderation/c/[id=integer]/+page.ts
index f1d58e43..2dce1274 100644
--- a/src/routes/moderation/c/[id=integer]/+page.ts
+++ b/src/routes/moderation/c/[id=integer]/+page.ts
@@ -1,4 +1,4 @@
-import { client } from '$lib/lemmy.svelte.js'
+import { client } from '$lib/client/lemmy.svelte'
import { _toModLog } from '../../../modlog/+page.js'
export async function load({ params, fetch }) {
diff --git a/src/routes/modlog/+page.svelte b/src/routes/modlog/+page.svelte
index 08ad6bf1..970aa881 100644
--- a/src/routes/modlog/+page.svelte
+++ b/src/routes/modlog/+page.svelte
@@ -24,7 +24,7 @@
import ModlogItemTable from './item/ModlogItemTable.svelte'
import Header from '$lib/components/ui/layout/pages/Header.svelte'
import { t } from '$lib/i18n/translations'
- import { client } from '$lib/lemmy.svelte'
+ import { client } from '$lib/client/lemmy.svelte'
import Spinner from 'mono-svelte/loader/Spinner.svelte'
import CommunityLink from '$lib/components/lemmy/community/CommunityLink.svelte'
import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
diff --git a/src/routes/modlog/+page.ts b/src/routes/modlog/+page.ts
index 0a639f04..0ab06d8b 100644
--- a/src/routes/modlog/+page.ts
+++ b/src/routes/modlog/+page.ts
@@ -1,5 +1,5 @@
import { publishedToDate } from '$lib/components/util/date.js'
-import { getClient } from '$lib/lemmy.svelte.js'
+import { getClient } from '$lib/client/lemmy.svelte'
import type {
AdminPurgeCommentView,
AdminPurgeCommunityView,
diff --git a/src/routes/password_change/[token]/+page.svelte b/src/routes/password_change/[token]/+page.svelte
index 6675fa68..1d1f72fa 100644
--- a/src/routes/password_change/[token]/+page.svelte
+++ b/src/routes/password_change/[token]/+page.svelte
@@ -8,7 +8,7 @@
LINKED_INSTANCE_URL,
instance as currentInstance,
} from '$lib/instance.svelte.js'
- import { getClient, validateInstance } from '$lib/lemmy.svelte.js'
+ import { getClient, validateInstance } from '$lib/client/lemmy.svelte'
import { t } from '$lib/i18n/translations'
import { Button, TextInput, toast } from 'mono-svelte'
import { errorMessage } from '$lib/lemmy/error'
diff --git a/src/routes/post/[instance]/[id=integer]/+page.svelte b/src/routes/post/[instance]/[id=integer]/+page.svelte
index 0b94ee58..b013f489 100644
--- a/src/routes/post/[instance]/[id=integer]/+page.svelte
+++ b/src/routes/post/[instance]/[id=integer]/+page.svelte
@@ -15,7 +15,7 @@
import { publishedToDate } from '$lib/components/util/date.js'
import FormattedNumber from '$lib/components/util/FormattedNumber.svelte'
import { t } from '$lib/i18n/translations.js'
- import { client } from '$lib/lemmy.svelte.js'
+ import { client } from '$lib/client/lemmy.svelte'
import { resumables } from '$lib/lemmy/item.js'
import { postFeeds } from '$lib/lemmy/postfeed.svelte'
import { ReactiveState } from '$lib/promise.svelte'
diff --git a/src/routes/post/[instance]/[id=integer]/+page.ts b/src/routes/post/[instance]/[id=integer]/+page.ts
index 7ca9b91b..f37ff99f 100644
--- a/src/routes/post/[instance]/[id=integer]/+page.ts
+++ b/src/routes/post/[instance]/[id=integer]/+page.ts
@@ -1,7 +1,7 @@
import { resolveRoute } from '$app/paths'
import { profile } from '$lib/auth.svelte.js'
import CommunityCard from '$lib/components/lemmy/community/CommunityCard.svelte'
-import { client } from '$lib/lemmy.svelte.js'
+import { client } from '$lib/client/lemmy.svelte'
import { postFeeds } from '$lib/lemmy/postfeed.svelte.js'
import { ReactiveState, awaitIfServer } from '$lib/promise.svelte.js'
import { settings } from '$lib/settings.svelte'
diff --git a/src/routes/post/[instance]/[id=integer]/confirm/+page.svelte b/src/routes/post/[instance]/[id=integer]/confirm/+page.svelte
index 38e47f12..eda27349 100644
--- a/src/routes/post/[instance]/[id=integer]/confirm/+page.svelte
+++ b/src/routes/post/[instance]/[id=integer]/confirm/+page.svelte
@@ -7,7 +7,7 @@
import ProfileButton from '$lib/components/ui/sidebar/ProfileButton.svelte'
import SidebarButton from '$lib/components/ui/sidebar/SidebarButton.svelte'
import { t } from '$lib/i18n/translations'
- import { client } from '$lib/lemmy.svelte'
+ import { client } from '$lib/client/lemmy.svelte'
import { errorMessage } from '$lib/lemmy/error'
import { toast } from 'mono-svelte'
import Button from 'mono-svelte/button/Button.svelte'
diff --git a/src/routes/profile/(local_user)/blocks/+page.svelte b/src/routes/profile/(local_user)/blocks/+page.svelte
index 6b6caed7..3b6f54fb 100644
--- a/src/routes/profile/(local_user)/blocks/+page.svelte
+++ b/src/routes/profile/(local_user)/blocks/+page.svelte
@@ -8,7 +8,7 @@
import Header from '$lib/components/ui/layout/pages/Header.svelte'
import Placeholder from '$lib/components/ui/Placeholder.svelte'
import { t } from '$lib/i18n/translations.js'
- import { getClient } from '$lib/lemmy.svelte.js'
+ import { getClient } from '$lib/client/lemmy.svelte'
import type {
CommunityBlockView,
InstanceBlockView,
diff --git a/src/routes/profile/(local_user)/password/2fa/+page.svelte b/src/routes/profile/(local_user)/password/2fa/+page.svelte
index 1bb9e5e0..0627bcbe 100644
--- a/src/routes/profile/(local_user)/password/2fa/+page.svelte
+++ b/src/routes/profile/(local_user)/password/2fa/+page.svelte
@@ -1,7 +1,7 @@