From 0da7169b005e37f77b9220579c8e0e0639cc6983 Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Tue, 14 Oct 2025 09:30:52 +0200
Subject: [PATCH] Move schemas to separate module

---
 .idea/workspace.xml                           | 85 ++++++++++++-------
 package.json                                  |  1 +
 scripts/schema.js                             |  2 +-
 src/{util => }/schemas/AckBulkSchema.ts       |  0
 src/{util => }/schemas/ActivitySchema.ts      |  0
 .../schemas/ApplicationAuthorizeSchema.ts     |  0
 .../schemas/ApplicationCreateSchema.ts        |  0
 .../schemas/ApplicationModifySchema.ts        |  0
 src/{util => }/schemas/AutomodRuleSchema.ts   |  0
 .../schemas/BackupCodesChallengeSchema.ts     |  0
 src/{util => }/schemas/BanCreateSchema.ts     |  0
 src/{util => }/schemas/BanModeratorSchema.ts  |  0
 src/{util => }/schemas/BanRegistrySchema.ts   |  0
 src/{util => }/schemas/BotModifySchema.ts     |  0
 src/{util => }/schemas/BulkBanSchema.ts       |  0
 src/{util => }/schemas/BulkDeleteSchema.ts    |  0
 src/{util => }/schemas/ChannelModifySchema.ts |  0
 .../ChannelPermissionOverwriteSchema.ts       |  0
 .../schemas/ChannelReorderSchema.ts           |  0
 .../schemas/CodesVerificationSchema.ts        |  0
 .../schemas/ConnectedAccountSchema.ts         |  2 +-
 .../schemas/ConnectionCallbackSchema.ts       |  0
 .../schemas/ConnectionUpdateSchema.ts         |  0
 .../schemas/DmChannelCreateSchema.ts          |  0
 .../schemas/EmailDomainLookupSchema.ts        |  0
 .../EmailDomainLookupVerifyCodeSchema.ts      |  0
 src/{util => }/schemas/EmojiCreateSchema.ts   |  0
 src/{util => }/schemas/EmojiModifySchema.ts   |  0
 .../schemas/ForgotPasswordSchema.ts           |  0
 src/{util => }/schemas/GatewayBotResponse.ts  |  0
 .../schemas/GatewayPayloadSchema.ts           |  2 +-
 src/{util => }/schemas/GatewayResponse.ts     |  0
 src/{util => }/schemas/GreetRequestSchema.ts  |  0
 src/{util => }/schemas/GuildCreateSchema.ts   |  2 +-
 .../schemas/GuildSubscriptionsBulkSchema.ts   |  0
 .../schemas/GuildTemplateCreateSchema.ts      |  0
 src/{util => }/schemas/GuildUpdateSchema.ts   |  0
 .../schemas/GuildUpdateWelcomeScreenSchema.ts |  0
 .../schemas/HubWaitlistSignupSchema.ts        |  0
 src/{util => }/schemas/IdentifySchema.ts      |  0
 src/{util => }/schemas/InviteCreateSchema.ts  |  0
 src/{util => }/schemas/LazyRequestSchema.ts   |  0
 src/{util => }/schemas/LoginResponse.ts       |  0
 src/{util => }/schemas/LoginSchema.ts         |  0
 .../schemas/MemberChangeProfileSchema.ts      |  0
 src/{util => }/schemas/MemberChangeSchema.ts  |  0
 .../schemas/MemberNickChangeSchema.ts         |  0
 .../schemas/MessageAcknowledgeSchema.ts       |  0
 src/{util => }/schemas/MessageCreateSchema.ts |  0
 src/{util => }/schemas/MessageEditSchema.ts   |  0
 src/{util => }/schemas/MfaCodesSchema.ts      |  0
 .../schemas/ModifyGuildStickerSchema.ts       |  0
 src/{util => }/schemas/PasswordResetSchema.ts |  0
 .../schemas/PreloadMessagesRequestSchema.ts   |  0
 src/{util => }/schemas/PruneSchema.ts         |  0
 src/{util => }/schemas/PurgeSchema.ts         |  0
 .../schemas/RefreshUrlsRequestSchema.ts       |  0
 src/{util => }/schemas/RegisterSchema.ts      |  0
 .../schemas/RelationshipPostSchema.ts         |  0
 .../schemas/RelationshipPutSchema.ts          |  0
 .../schemas/RequestGuildMembersSchema.ts      |  0
 src/{util => }/schemas/RoleModifySchema.ts    |  0
 .../schemas/RolePositionUpdateSchema.ts       |  0
 .../schemas/SelectProtocolSchema.ts           |  0
 .../schemas/SettingsProtoUpdateSchema.ts      |  0
 src/{util => }/schemas/StreamCreateSchema.ts  |  0
 src/{util => }/schemas/StreamDeleteSchema.ts  |  0
 src/{util => }/schemas/StreamWatchSchema.ts   |  0
 src/{util => }/schemas/TeamCreateSchema.ts    |  0
 .../schemas/TemplateCreateSchema.ts           |  0
 .../schemas/TemplateModifySchema.ts           |  0
 src/{util => }/schemas/TotpDisableSchema.ts   |  0
 src/{util => }/schemas/TotpEnableSchema.ts    |  0
 src/{util => }/schemas/TotpSchema.ts          |  0
 .../schemas/UploadAttachmentRequestSchema.ts  |  0
 src/{util => }/schemas/UserDeleteSchema.ts    |  0
 .../schemas/UserGuildSettingsSchema.ts        |  0
 src/{util => }/schemas/UserModifySchema.ts    |  0
 .../schemas/UserNoteUpdateSchema.ts           |  0
 .../schemas/UserProfileModifySchema.ts        |  0
 src/{util => }/schemas/UserSettingsSchema.ts  |  0
 src/{util => }/schemas/Validator.ts           |  1 -
 src/{util => }/schemas/VanityUrlSchema.ts     |  0
 src/{util => }/schemas/VerifyEmailSchema.ts   |  0
 src/{util => }/schemas/VoiceIdentifySchema.ts |  0
 .../schemas/VoiceStateUpdateSchema.ts         |  0
 src/{util => }/schemas/VoiceVideoSchema.ts    |  0
 src/{util => }/schemas/WebAuthnSchema.ts      |  0
 src/{util => }/schemas/WebhookCreateSchema.ts |  0
 .../schemas/WebhookExecuteSchema.ts           |  2 +-
 src/{util => }/schemas/WebhookUpdateSchema.ts |  0
 src/{util => }/schemas/WidgetModifySchema.ts  |  0
 src/{util => }/schemas/index.ts               |  0
 .../responses/APIErrorOrCaptchaResponse.ts    |  0
 .../schemas/responses/APIErrorResponse.ts     |  0
 .../responses/AccountStandingResponse.ts      |  2 +-
 .../responses/BackupCodesChallengeResponse.ts |  0
 .../responses/CaptchaRequiredResponse.ts      |  0
 .../CollectiblesCategoriesResponse.ts         |  2 +-
 .../CollectiblesMarketingResponse.ts          |  0
 .../responses/CollectiblesShopResponse.ts     |  0
 .../responses/DiscoverableGuildsResponse.ts   |  2 +-
 .../responses/DmMessagesResponseSchema.ts     |  0
 .../responses/EmailDomainLookupResponse.ts    |  0
 .../EmailDomainLookupVerifyCodeResponse.ts    |  2 +-
 .../schemas/responses/EmojiSourceResponse.ts  |  0
 .../schemas/responses/GatewayBotResponse.ts   |  0
 .../schemas/responses/GatewayResponse.ts      |  0
 .../GenerateRegistrationTokensResponse.ts     |  0
 .../schemas/responses/GuildBansResponse.ts    |  0
 .../schemas/responses/GuildCreateResponse.ts  |  0
 .../responses/GuildDiscoveryRequirements.ts   |  0
 .../responses/GuildMessagesSearchResponse.ts  |  2 +-
 .../schemas/responses/GuildProfileResponse.ts |  0
 .../schemas/responses/GuildPruneResponse.ts   |  0
 .../responses/GuildRecommendationsResponse.ts |  2 +-
 .../schemas/responses/GuildVanityUrl.ts       |  0
 .../responses/GuildVoiceRegionsResponse.ts    |  0
 .../responses/GuildWidgetJsonResponse.ts      |  0
 .../responses/GuildWidgetSettingsResponse.ts  |  0
 .../responses/HubDirectoryEntriesResponse.ts  |  2 +-
 .../responses/HubWaitlistSignupResponse.ts    |  0
 .../responses/InstanceDomainsResponse.ts      |  0
 .../schemas/responses/InstancePingResponse.ts |  0
 .../responses/InstanceStatsResponse.ts        |  0
 .../responses/LocationMetadataResponse.ts     |  0
 .../responses/MemberJoinGuildResponse.ts      |  2 +-
 .../responses/OAuthAuthorizeResponse.ts       |  0
 .../PreloadMessagesResponseSchema.ts          |  0
 .../schemas/responses/RefreshUrlsResponse.ts  |  0
 .../responses/SettingsProtoUpdateResponse.ts  |  0
 .../schemas/responses/TeamListResponse.ts     |  0
 src/{util => }/schemas/responses/Tenor.ts     |  0
 .../schemas/responses/TokenResponse.ts        |  2 +-
 .../schemas/responses/TypedResponses.ts       |  6 +-
 .../schemas/responses/UpdatesResponse.ts      |  0
 .../UploadAttachmentResponseSchema.ts         |  0
 .../schemas/responses/UserNoteResponse.ts     |  0
 .../schemas/responses/UserProfileResponse.ts  |  0
 .../responses/UserRelationsResponse.ts        |  0
 .../responses/UserRelationshipsResponse.ts    |  2 +-
 .../responses/WebAuthnCreateResponse.ts       |  0
 .../responses/WebhookCreateResponse.ts        |  2 +-
 src/{util => }/schemas/responses/index.ts     |  0
 src/util/connections/Connection.ts            |  2 +-
 src/util/index.ts                             |  2 +-
 tsconfig.json                                 |  1 +
 147 files changed, 78 insertions(+), 52 deletions(-)
 rename src/{util => }/schemas/AckBulkSchema.ts (100%)
 rename src/{util => }/schemas/ActivitySchema.ts (100%)
 rename src/{util => }/schemas/ApplicationAuthorizeSchema.ts (100%)
 rename src/{util => }/schemas/ApplicationCreateSchema.ts (100%)
 rename src/{util => }/schemas/ApplicationModifySchema.ts (100%)
 rename src/{util => }/schemas/AutomodRuleSchema.ts (100%)
 rename src/{util => }/schemas/BackupCodesChallengeSchema.ts (100%)
 rename src/{util => }/schemas/BanCreateSchema.ts (100%)
 rename src/{util => }/schemas/BanModeratorSchema.ts (100%)
 rename src/{util => }/schemas/BanRegistrySchema.ts (100%)
 rename src/{util => }/schemas/BotModifySchema.ts (100%)
 rename src/{util => }/schemas/BulkBanSchema.ts (100%)
 rename src/{util => }/schemas/BulkDeleteSchema.ts (100%)
 rename src/{util => }/schemas/ChannelModifySchema.ts (100%)
 rename src/{util => }/schemas/ChannelPermissionOverwriteSchema.ts (100%)
 rename src/{util => }/schemas/ChannelReorderSchema.ts (100%)
 rename src/{util => }/schemas/CodesVerificationSchema.ts (100%)
 rename src/{util => }/schemas/ConnectedAccountSchema.ts (94%)
 rename src/{util => }/schemas/ConnectionCallbackSchema.ts (100%)
 rename src/{util => }/schemas/ConnectionUpdateSchema.ts (100%)
 rename src/{util => }/schemas/DmChannelCreateSchema.ts (100%)
 rename src/{util => }/schemas/EmailDomainLookupSchema.ts (100%)
 rename src/{util => }/schemas/EmailDomainLookupVerifyCodeSchema.ts (100%)
 rename src/{util => }/schemas/EmojiCreateSchema.ts (100%)
 rename src/{util => }/schemas/EmojiModifySchema.ts (100%)
 rename src/{util => }/schemas/ForgotPasswordSchema.ts (100%)
 rename src/{util => }/schemas/GatewayBotResponse.ts (100%)
 rename src/{util => }/schemas/GatewayPayloadSchema.ts (95%)
 rename src/{util => }/schemas/GatewayResponse.ts (100%)
 rename src/{util => }/schemas/GreetRequestSchema.ts (100%)
 rename src/{util => }/schemas/GuildCreateSchema.ts (95%)
 rename src/{util => }/schemas/GuildSubscriptionsBulkSchema.ts (100%)
 rename src/{util => }/schemas/GuildTemplateCreateSchema.ts (100%)
 rename src/{util => }/schemas/GuildUpdateSchema.ts (100%)
 rename src/{util => }/schemas/GuildUpdateWelcomeScreenSchema.ts (100%)
 rename src/{util => }/schemas/HubWaitlistSignupSchema.ts (100%)
 rename src/{util => }/schemas/IdentifySchema.ts (100%)
 rename src/{util => }/schemas/InviteCreateSchema.ts (100%)
 rename src/{util => }/schemas/LazyRequestSchema.ts (100%)
 rename src/{util => }/schemas/LoginResponse.ts (100%)
 rename src/{util => }/schemas/LoginSchema.ts (100%)
 rename src/{util => }/schemas/MemberChangeProfileSchema.ts (100%)
 rename src/{util => }/schemas/MemberChangeSchema.ts (100%)
 rename src/{util => }/schemas/MemberNickChangeSchema.ts (100%)
 rename src/{util => }/schemas/MessageAcknowledgeSchema.ts (100%)
 rename src/{util => }/schemas/MessageCreateSchema.ts (100%)
 rename src/{util => }/schemas/MessageEditSchema.ts (100%)
 rename src/{util => }/schemas/MfaCodesSchema.ts (100%)
 rename src/{util => }/schemas/ModifyGuildStickerSchema.ts (100%)
 rename src/{util => }/schemas/PasswordResetSchema.ts (100%)
 rename src/{util => }/schemas/PreloadMessagesRequestSchema.ts (100%)
 rename src/{util => }/schemas/PruneSchema.ts (100%)
 rename src/{util => }/schemas/PurgeSchema.ts (100%)
 rename src/{util => }/schemas/RefreshUrlsRequestSchema.ts (100%)
 rename src/{util => }/schemas/RegisterSchema.ts (100%)
 rename src/{util => }/schemas/RelationshipPostSchema.ts (100%)
 rename src/{util => }/schemas/RelationshipPutSchema.ts (100%)
 rename src/{util => }/schemas/RequestGuildMembersSchema.ts (100%)
 rename src/{util => }/schemas/RoleModifySchema.ts (100%)
 rename src/{util => }/schemas/RolePositionUpdateSchema.ts (100%)
 rename src/{util => }/schemas/SelectProtocolSchema.ts (100%)
 rename src/{util => }/schemas/SettingsProtoUpdateSchema.ts (100%)
 rename src/{util => }/schemas/StreamCreateSchema.ts (100%)
 rename src/{util => }/schemas/StreamDeleteSchema.ts (100%)
 rename src/{util => }/schemas/StreamWatchSchema.ts (100%)
 rename src/{util => }/schemas/TeamCreateSchema.ts (100%)
 rename src/{util => }/schemas/TemplateCreateSchema.ts (100%)
 rename src/{util => }/schemas/TemplateModifySchema.ts (100%)
 rename src/{util => }/schemas/TotpDisableSchema.ts (100%)
 rename src/{util => }/schemas/TotpEnableSchema.ts (100%)
 rename src/{util => }/schemas/TotpSchema.ts (100%)
 rename src/{util => }/schemas/UploadAttachmentRequestSchema.ts (100%)
 rename src/{util => }/schemas/UserDeleteSchema.ts (100%)
 rename src/{util => }/schemas/UserGuildSettingsSchema.ts (100%)
 rename src/{util => }/schemas/UserModifySchema.ts (100%)
 rename src/{util => }/schemas/UserNoteUpdateSchema.ts (100%)
 rename src/{util => }/schemas/UserProfileModifySchema.ts (100%)
 rename src/{util => }/schemas/UserSettingsSchema.ts (100%)
 rename src/{util => }/schemas/Validator.ts (99%)
 rename src/{util => }/schemas/VanityUrlSchema.ts (100%)
 rename src/{util => }/schemas/VerifyEmailSchema.ts (100%)
 rename src/{util => }/schemas/VoiceIdentifySchema.ts (100%)
 rename src/{util => }/schemas/VoiceStateUpdateSchema.ts (100%)
 rename src/{util => }/schemas/VoiceVideoSchema.ts (100%)
 rename src/{util => }/schemas/WebAuthnSchema.ts (100%)
 rename src/{util => }/schemas/WebhookCreateSchema.ts (100%)
 rename src/{util => }/schemas/WebhookExecuteSchema.ts (97%)
 rename src/{util => }/schemas/WebhookUpdateSchema.ts (100%)
 rename src/{util => }/schemas/WidgetModifySchema.ts (100%)
 rename src/{util => }/schemas/index.ts (100%)
 rename src/{util => }/schemas/responses/APIErrorOrCaptchaResponse.ts (100%)
 rename src/{util => }/schemas/responses/APIErrorResponse.ts (100%)
 rename src/{util => }/schemas/responses/AccountStandingResponse.ts (98%)
 rename src/{util => }/schemas/responses/BackupCodesChallengeResponse.ts (100%)
 rename src/{util => }/schemas/responses/CaptchaRequiredResponse.ts (100%)
 rename src/{util => }/schemas/responses/CollectiblesCategoriesResponse.ts (98%)
 rename src/{util => }/schemas/responses/CollectiblesMarketingResponse.ts (100%)
 rename src/{util => }/schemas/responses/CollectiblesShopResponse.ts (100%)
 rename src/{util => }/schemas/responses/DiscoverableGuildsResponse.ts (95%)
 rename src/{util => }/schemas/responses/DmMessagesResponseSchema.ts (100%)
 rename src/{util => }/schemas/responses/EmailDomainLookupResponse.ts (100%)
 rename src/{util => }/schemas/responses/EmailDomainLookupVerifyCodeResponse.ts (95%)
 rename src/{util => }/schemas/responses/EmojiSourceResponse.ts (100%)
 rename src/{util => }/schemas/responses/GatewayBotResponse.ts (100%)
 rename src/{util => }/schemas/responses/GatewayResponse.ts (100%)
 rename src/{util => }/schemas/responses/GenerateRegistrationTokensResponse.ts (100%)
 rename src/{util => }/schemas/responses/GuildBansResponse.ts (100%)
 rename src/{util => }/schemas/responses/GuildCreateResponse.ts (100%)
 rename src/{util => }/schemas/responses/GuildDiscoveryRequirements.ts (100%)
 rename src/{util => }/schemas/responses/GuildMessagesSearchResponse.ts (97%)
 rename src/{util => }/schemas/responses/GuildProfileResponse.ts (100%)
 rename src/{util => }/schemas/responses/GuildPruneResponse.ts (100%)
 rename src/{util => }/schemas/responses/GuildRecommendationsResponse.ts (95%)
 rename src/{util => }/schemas/responses/GuildVanityUrl.ts (100%)
 rename src/{util => }/schemas/responses/GuildVoiceRegionsResponse.ts (100%)
 rename src/{util => }/schemas/responses/GuildWidgetJsonResponse.ts (100%)
 rename src/{util => }/schemas/responses/GuildWidgetSettingsResponse.ts (100%)
 rename src/{util => }/schemas/responses/HubDirectoryEntriesResponse.ts (96%)
 rename src/{util => }/schemas/responses/HubWaitlistSignupResponse.ts (100%)
 rename src/{util => }/schemas/responses/InstanceDomainsResponse.ts (100%)
 rename src/{util => }/schemas/responses/InstancePingResponse.ts (100%)
 rename src/{util => }/schemas/responses/InstanceStatsResponse.ts (100%)
 rename src/{util => }/schemas/responses/LocationMetadataResponse.ts (100%)
 rename src/{util => }/schemas/responses/MemberJoinGuildResponse.ts (94%)
 rename src/{util => }/schemas/responses/OAuthAuthorizeResponse.ts (100%)
 rename src/{util => }/schemas/responses/PreloadMessagesResponseSchema.ts (100%)
 rename src/{util => }/schemas/responses/RefreshUrlsResponse.ts (100%)
 rename src/{util => }/schemas/responses/SettingsProtoUpdateResponse.ts (100%)
 rename src/{util => }/schemas/responses/TeamListResponse.ts (100%)
 rename src/{util => }/schemas/responses/Tenor.ts (100%)
 rename src/{util => }/schemas/responses/TokenResponse.ts (94%)
 rename src/{util => }/schemas/responses/TypedResponses.ts (96%)
 rename src/{util => }/schemas/responses/UpdatesResponse.ts (100%)
 rename src/{util => }/schemas/responses/UploadAttachmentResponseSchema.ts (100%)
 rename src/{util => }/schemas/responses/UserNoteResponse.ts (100%)
 rename src/{util => }/schemas/responses/UserProfileResponse.ts (100%)
 rename src/{util => }/schemas/responses/UserRelationsResponse.ts (100%)
 rename src/{util => }/schemas/responses/UserRelationshipsResponse.ts (93%)
 rename src/{util => }/schemas/responses/WebAuthnCreateResponse.ts (100%)
 rename src/{util => }/schemas/responses/WebhookCreateResponse.ts (94%)
 rename src/{util => }/schemas/responses/index.ts (100%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f771c1a7..162ce935 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,12 +4,21 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="bf10e7c6-8c33-4385-b571-3e96ac86a389" name="Changes" comment="" />
+    <list default="true" id="bf10e7c6-8c33-4385-b571-3e96ac86a389" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/extra/admin-api/Spacebar.AdminAPI/Program.cs" beforeDir="false" afterPath="$PROJECT_DIR$/extra/admin-api/Spacebar.AdminAPI/Program.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/extra/admin-api/Spacebar.AdminAPI/Services/AuthenticationService.cs" beforeDir="false" afterPath="$PROJECT_DIR$/extra/admin-api/Spacebar.AdminAPI/Services/AuthenticationService.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/extra/admin-api/Spacebar.AdminApi.Models/UserModel.cs" beforeDir="false" afterPath="$PROJECT_DIR$/extra/admin-api/Spacebar.AdminApi.Models/UserModel.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/extra/admin-api/Utilities/Spacebar.AdminAPI.TestClient/Layout/NavMenu.razor" beforeDir="false" afterPath="$PROJECT_DIR$/extra/admin-api/Utilities/Spacebar.AdminAPI.TestClient/Layout/NavMenu.razor" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
   <component name="HighlightingSettingsPerFile">
     <setting file="file://$USER_HOME$/.cache/JetBrains/WebStorm2024.3/javascript/typings/node/20.17.10/node_modules/@types/node/crypto.d.ts" root0="SKIP_INSPECTION" />
     <setting file="file://$PROJECT_DIR$/node_modules/@types/amqplib/index.d.ts" root0="SKIP_INSPECTION" />
@@ -30,41 +39,54 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "NIXITCH_NIXPKGS_CONFIG": "/etc/nix/nixpkgs-config.nix",
-    "NIXITCH_NIX_CONF_DIR": "",
-    "NIXITCH_NIX_OTHER_STORES": "",
-    "NIXITCH_NIX_PATH": "/home/Rory/.nix-defexpr/channels:nixpkgs=/nix/store/wb6agba4kfsxpbnb5hzlq58vkjzvbsk6-source",
-    "NIXITCH_NIX_PROFILES": "/run/current-system/sw /nix/var/nix/profiles/default /etc/profiles/per-user/Rory /home/Rory/.local/state/nix/profile /nix/profile /home/Rory/.nix-profile",
-    "NIXITCH_NIX_REMOTE": "",
-    "NIXITCH_NIX_USER_PROFILE_DIR": "/nix/var/nix/profiles/per-user/Rory",
-    "Node.js.Server.ts.executor": "Debug",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "javascript.nodejs.core.library.configured.version": "20.17.0",
-    "javascript.nodejs.core.library.typings.version": "20.17.10",
-    "last_opened_file_path": "/home/Rory/git/spacebar/server/src/admin-api/routes/v0",
-    "node.js.detected.package.eslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_interpreter_path": "/nix/store/dcdc33kdjdhjnzg6rkmd0cx4kpwl8cac-nodejs-20.17.0/bin/node",
-    "nodejs_package_manager_path": "npm",
-    "npm.Start API.executor": "Run",
-    "npm.Start CDN.executor": "Run",
-    "npm.Start Gateway.executor": "Run",
-    "npm.build.executor": "Run",
-    "npm.start.executor": "Debug",
-    "prettierjs.PrettierConfiguration.Package": "/home/Rory/git/spacebar/server/node_modules/prettier",
-    "settings.editor.selected.configurable": "preferences.pluginManager",
-    "ts.external.directory.path": "/home/Rory/git/spacebar/server/node_modules/typescript/lib"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;NIXITCH_NIXPKGS_CONFIG&quot;: &quot;/etc/nix/nixpkgs-config.nix&quot;,
+    &quot;NIXITCH_NIX_CONF_DIR&quot;: &quot;&quot;,
+    &quot;NIXITCH_NIX_OTHER_STORES&quot;: &quot;&quot;,
+    &quot;NIXITCH_NIX_PATH&quot;: &quot;/home/Rory/.nix-defexpr/channels:nixpkgs=/nix/store/wb6agba4kfsxpbnb5hzlq58vkjzvbsk6-source&quot;,
+    &quot;NIXITCH_NIX_PROFILES&quot;: &quot;/run/current-system/sw /nix/var/nix/profiles/default /etc/profiles/per-user/Rory /home/Rory/.local/state/nix/profile /nix/profile /home/Rory/.nix-profile&quot;,
+    &quot;NIXITCH_NIX_REMOTE&quot;: &quot;&quot;,
+    &quot;NIXITCH_NIX_USER_PROFILE_DIR&quot;: &quot;/nix/var/nix/profiles/per-user/Rory&quot;,
+    &quot;Node.js.Server.ts.executor&quot;: &quot;Debug&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
+    &quot;javascript.nodejs.core.library.configured.version&quot;: &quot;24.8.0&quot;,
+    &quot;javascript.nodejs.core.library.typings.version&quot;: &quot;24.7.0&quot;,
+    &quot;last_opened_file_path&quot;: &quot;/home/Rory/git/spacebar/server/src/admin-api/routes/v0&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_interpreter_path&quot;: &quot;node&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;npm.Start API.executor&quot;: &quot;Run&quot;,
+    &quot;npm.Start CDN.executor&quot;: &quot;Run&quot;,
+    &quot;npm.Start Gateway.executor&quot;: &quot;Run&quot;,
+    &quot;npm.build.executor&quot;: &quot;Run&quot;,
+    &quot;npm.start.executor&quot;: &quot;Debug&quot;,
+    &quot;prettierjs.PrettierConfiguration.Package&quot;: &quot;/home/Rory/git/spacebar/server/node_modules/prettier&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
+    &quot;ts.external.directory.path&quot;: &quot;/home/Rory/git/spacebar/server-master/node_modules/typescript/lib&quot;
+  },
+  &quot;keyToStringList&quot;: {
+    &quot;GitStage.ChangesTree.GroupingKeys&quot;: [
+      &quot;directory&quot;,
+      &quot;module&quot;,
+      &quot;repository&quot;
+    ]
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/src/admin-api/routes/v0" />
       <recent name="$PROJECT_DIR$/src" />
       <recent name="$PROJECT_DIR$/src/api/routes/channels/#channel_id/messages" />
     </key>
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/src" />
+      <recent name="$PROJECT_DIR$/src/api/routes/store/published-listings/applications/#application_id" />
+      <recent name="$PROJECT_DIR$/src/api/routes/store/published-listings/skus/#sku_id" />
+    </key>
   </component>
   <component name="RunDashboard">
     <option name="configurationTypes">
@@ -85,7 +107,7 @@
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-js-predefined-d6986cc7102b-deb605915726-JavaScript-WS-243.22562.112" />
+        <option value="bundled-js-predefined-d6986cc7102b-9c94529fcfe0-JavaScript-WS-252.26199.162" />
       </set>
     </attachedChunks>
   </component>
@@ -108,6 +130,9 @@
       <workItem from="1735256039333" duration="390000" />
       <workItem from="1735256441657" duration="58156000" />
       <workItem from="1735848116134" duration="80763000" />
+      <workItem from="1759868659577" duration="8847000" />
+      <workItem from="1760044946282" duration="43683000" />
+      <workItem from="1760402350251" duration="18740000" />
     </task>
     <servers />
   </component>
diff --git a/package.json b/package.json
index c847f552..13a41028 100644
--- a/package.json
+++ b/package.json
@@ -120,6 +120,7 @@
 		"@spacebar/gateway": "dist/gateway",
 		"@spacebar/util": "dist/util",
 		"@spacebar/webrtc": "dist/webrtc",
+		"@spacebar/schemas": "dist/schemas",
 		"lambert-server": "dist/util/util/lambert-server"
 	},
 	"optionalDependencies": {
diff --git a/scripts/schema.js b/scripts/schema.js
index 32af357f..77205831 100644
--- a/scripts/schema.js
+++ b/scripts/schema.js
@@ -94,7 +94,7 @@ const Excluded = [
 function main() {
 	const program = TJS.programFromConfig(
 		path.join(__dirname, "..", "tsconfig.json"),
-		walk(path.join(__dirname, "..", "src", "util", "schemas")),
+		walk(path.join(__dirname, "..", "src", "schemas")),
 	);
 	const generator = TJS.buildGenerator(program, settings);
 	if (!generator || !program) return;
diff --git a/src/util/schemas/AckBulkSchema.ts b/src/schemas/AckBulkSchema.ts
similarity index 100%
rename from src/util/schemas/AckBulkSchema.ts
rename to src/schemas/AckBulkSchema.ts
diff --git a/src/util/schemas/ActivitySchema.ts b/src/schemas/ActivitySchema.ts
similarity index 100%
rename from src/util/schemas/ActivitySchema.ts
rename to src/schemas/ActivitySchema.ts
diff --git a/src/util/schemas/ApplicationAuthorizeSchema.ts b/src/schemas/ApplicationAuthorizeSchema.ts
similarity index 100%
rename from src/util/schemas/ApplicationAuthorizeSchema.ts
rename to src/schemas/ApplicationAuthorizeSchema.ts
diff --git a/src/util/schemas/ApplicationCreateSchema.ts b/src/schemas/ApplicationCreateSchema.ts
similarity index 100%
rename from src/util/schemas/ApplicationCreateSchema.ts
rename to src/schemas/ApplicationCreateSchema.ts
diff --git a/src/util/schemas/ApplicationModifySchema.ts b/src/schemas/ApplicationModifySchema.ts
similarity index 100%
rename from src/util/schemas/ApplicationModifySchema.ts
rename to src/schemas/ApplicationModifySchema.ts
diff --git a/src/util/schemas/AutomodRuleSchema.ts b/src/schemas/AutomodRuleSchema.ts
similarity index 100%
rename from src/util/schemas/AutomodRuleSchema.ts
rename to src/schemas/AutomodRuleSchema.ts
diff --git a/src/util/schemas/BackupCodesChallengeSchema.ts b/src/schemas/BackupCodesChallengeSchema.ts
similarity index 100%
rename from src/util/schemas/BackupCodesChallengeSchema.ts
rename to src/schemas/BackupCodesChallengeSchema.ts
diff --git a/src/util/schemas/BanCreateSchema.ts b/src/schemas/BanCreateSchema.ts
similarity index 100%
rename from src/util/schemas/BanCreateSchema.ts
rename to src/schemas/BanCreateSchema.ts
diff --git a/src/util/schemas/BanModeratorSchema.ts b/src/schemas/BanModeratorSchema.ts
similarity index 100%
rename from src/util/schemas/BanModeratorSchema.ts
rename to src/schemas/BanModeratorSchema.ts
diff --git a/src/util/schemas/BanRegistrySchema.ts b/src/schemas/BanRegistrySchema.ts
similarity index 100%
rename from src/util/schemas/BanRegistrySchema.ts
rename to src/schemas/BanRegistrySchema.ts
diff --git a/src/util/schemas/BotModifySchema.ts b/src/schemas/BotModifySchema.ts
similarity index 100%
rename from src/util/schemas/BotModifySchema.ts
rename to src/schemas/BotModifySchema.ts
diff --git a/src/util/schemas/BulkBanSchema.ts b/src/schemas/BulkBanSchema.ts
similarity index 100%
rename from src/util/schemas/BulkBanSchema.ts
rename to src/schemas/BulkBanSchema.ts
diff --git a/src/util/schemas/BulkDeleteSchema.ts b/src/schemas/BulkDeleteSchema.ts
similarity index 100%
rename from src/util/schemas/BulkDeleteSchema.ts
rename to src/schemas/BulkDeleteSchema.ts
diff --git a/src/util/schemas/ChannelModifySchema.ts b/src/schemas/ChannelModifySchema.ts
similarity index 100%
rename from src/util/schemas/ChannelModifySchema.ts
rename to src/schemas/ChannelModifySchema.ts
diff --git a/src/util/schemas/ChannelPermissionOverwriteSchema.ts b/src/schemas/ChannelPermissionOverwriteSchema.ts
similarity index 100%
rename from src/util/schemas/ChannelPermissionOverwriteSchema.ts
rename to src/schemas/ChannelPermissionOverwriteSchema.ts
diff --git a/src/util/schemas/ChannelReorderSchema.ts b/src/schemas/ChannelReorderSchema.ts
similarity index 100%
rename from src/util/schemas/ChannelReorderSchema.ts
rename to src/schemas/ChannelReorderSchema.ts
diff --git a/src/util/schemas/CodesVerificationSchema.ts b/src/schemas/CodesVerificationSchema.ts
similarity index 100%
rename from src/util/schemas/CodesVerificationSchema.ts
rename to src/schemas/CodesVerificationSchema.ts
diff --git a/src/util/schemas/ConnectedAccountSchema.ts b/src/schemas/ConnectedAccountSchema.ts
similarity index 94%
rename from src/util/schemas/ConnectedAccountSchema.ts
rename to src/schemas/ConnectedAccountSchema.ts
index 5fd05b71..3c3e76ec 100644
--- a/src/util/schemas/ConnectedAccountSchema.ts
+++ b/src/schemas/ConnectedAccountSchema.ts
@@ -16,7 +16,7 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { ConnectedAccountTokenData } from "../interfaces";
+import { ConnectedAccountTokenData } from "../util/interfaces";
 
 export interface ConnectedAccountSchema {
 	external_id: string;
diff --git a/src/util/schemas/ConnectionCallbackSchema.ts b/src/schemas/ConnectionCallbackSchema.ts
similarity index 100%
rename from src/util/schemas/ConnectionCallbackSchema.ts
rename to src/schemas/ConnectionCallbackSchema.ts
diff --git a/src/util/schemas/ConnectionUpdateSchema.ts b/src/schemas/ConnectionUpdateSchema.ts
similarity index 100%
rename from src/util/schemas/ConnectionUpdateSchema.ts
rename to src/schemas/ConnectionUpdateSchema.ts
diff --git a/src/util/schemas/DmChannelCreateSchema.ts b/src/schemas/DmChannelCreateSchema.ts
similarity index 100%
rename from src/util/schemas/DmChannelCreateSchema.ts
rename to src/schemas/DmChannelCreateSchema.ts
diff --git a/src/util/schemas/EmailDomainLookupSchema.ts b/src/schemas/EmailDomainLookupSchema.ts
similarity index 100%
rename from src/util/schemas/EmailDomainLookupSchema.ts
rename to src/schemas/EmailDomainLookupSchema.ts
diff --git a/src/util/schemas/EmailDomainLookupVerifyCodeSchema.ts b/src/schemas/EmailDomainLookupVerifyCodeSchema.ts
similarity index 100%
rename from src/util/schemas/EmailDomainLookupVerifyCodeSchema.ts
rename to src/schemas/EmailDomainLookupVerifyCodeSchema.ts
diff --git a/src/util/schemas/EmojiCreateSchema.ts b/src/schemas/EmojiCreateSchema.ts
similarity index 100%
rename from src/util/schemas/EmojiCreateSchema.ts
rename to src/schemas/EmojiCreateSchema.ts
diff --git a/src/util/schemas/EmojiModifySchema.ts b/src/schemas/EmojiModifySchema.ts
similarity index 100%
rename from src/util/schemas/EmojiModifySchema.ts
rename to src/schemas/EmojiModifySchema.ts
diff --git a/src/util/schemas/ForgotPasswordSchema.ts b/src/schemas/ForgotPasswordSchema.ts
similarity index 100%
rename from src/util/schemas/ForgotPasswordSchema.ts
rename to src/schemas/ForgotPasswordSchema.ts
diff --git a/src/util/schemas/GatewayBotResponse.ts b/src/schemas/GatewayBotResponse.ts
similarity index 100%
rename from src/util/schemas/GatewayBotResponse.ts
rename to src/schemas/GatewayBotResponse.ts
diff --git a/src/util/schemas/GatewayPayloadSchema.ts b/src/schemas/GatewayPayloadSchema.ts
similarity index 95%
rename from src/util/schemas/GatewayPayloadSchema.ts
rename to src/schemas/GatewayPayloadSchema.ts
index 306f2c03..cb01f161 100644
--- a/src/util/schemas/GatewayPayloadSchema.ts
+++ b/src/schemas/GatewayPayloadSchema.ts
@@ -16,7 +16,7 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Tuple } from "lambert-server";
+import { Tuple } from "lambert-server*";
 
 export const PayloadSchema = {
 	op: Number,
diff --git a/src/util/schemas/GatewayResponse.ts b/src/schemas/GatewayResponse.ts
similarity index 100%
rename from src/util/schemas/GatewayResponse.ts
rename to src/schemas/GatewayResponse.ts
diff --git a/src/util/schemas/GreetRequestSchema.ts b/src/schemas/GreetRequestSchema.ts
similarity index 100%
rename from src/util/schemas/GreetRequestSchema.ts
rename to src/schemas/GreetRequestSchema.ts
diff --git a/src/util/schemas/GuildCreateSchema.ts b/src/schemas/GuildCreateSchema.ts
similarity index 95%
rename from src/util/schemas/GuildCreateSchema.ts
rename to src/schemas/GuildCreateSchema.ts
index c293aa8f..278a759c 100644
--- a/src/util/schemas/GuildCreateSchema.ts
+++ b/src/schemas/GuildCreateSchema.ts
@@ -16,7 +16,7 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { ChannelModifySchema } from ".";
+import { ChannelModifySchema } from "./index";
 
 export interface GuildCreateSchema {
 	/**
diff --git a/src/util/schemas/GuildSubscriptionsBulkSchema.ts b/src/schemas/GuildSubscriptionsBulkSchema.ts
similarity index 100%
rename from src/util/schemas/GuildSubscriptionsBulkSchema.ts
rename to src/schemas/GuildSubscriptionsBulkSchema.ts
diff --git a/src/util/schemas/GuildTemplateCreateSchema.ts b/src/schemas/GuildTemplateCreateSchema.ts
similarity index 100%
rename from src/util/schemas/GuildTemplateCreateSchema.ts
rename to src/schemas/GuildTemplateCreateSchema.ts
diff --git a/src/util/schemas/GuildUpdateSchema.ts b/src/schemas/GuildUpdateSchema.ts
similarity index 100%
rename from src/util/schemas/GuildUpdateSchema.ts
rename to src/schemas/GuildUpdateSchema.ts
diff --git a/src/util/schemas/GuildUpdateWelcomeScreenSchema.ts b/src/schemas/GuildUpdateWelcomeScreenSchema.ts
similarity index 100%
rename from src/util/schemas/GuildUpdateWelcomeScreenSchema.ts
rename to src/schemas/GuildUpdateWelcomeScreenSchema.ts
diff --git a/src/util/schemas/HubWaitlistSignupSchema.ts b/src/schemas/HubWaitlistSignupSchema.ts
similarity index 100%
rename from src/util/schemas/HubWaitlistSignupSchema.ts
rename to src/schemas/HubWaitlistSignupSchema.ts
diff --git a/src/util/schemas/IdentifySchema.ts b/src/schemas/IdentifySchema.ts
similarity index 100%
rename from src/util/schemas/IdentifySchema.ts
rename to src/schemas/IdentifySchema.ts
diff --git a/src/util/schemas/InviteCreateSchema.ts b/src/schemas/InviteCreateSchema.ts
similarity index 100%
rename from src/util/schemas/InviteCreateSchema.ts
rename to src/schemas/InviteCreateSchema.ts
diff --git a/src/util/schemas/LazyRequestSchema.ts b/src/schemas/LazyRequestSchema.ts
similarity index 100%
rename from src/util/schemas/LazyRequestSchema.ts
rename to src/schemas/LazyRequestSchema.ts
diff --git a/src/util/schemas/LoginResponse.ts b/src/schemas/LoginResponse.ts
similarity index 100%
rename from src/util/schemas/LoginResponse.ts
rename to src/schemas/LoginResponse.ts
diff --git a/src/util/schemas/LoginSchema.ts b/src/schemas/LoginSchema.ts
similarity index 100%
rename from src/util/schemas/LoginSchema.ts
rename to src/schemas/LoginSchema.ts
diff --git a/src/util/schemas/MemberChangeProfileSchema.ts b/src/schemas/MemberChangeProfileSchema.ts
similarity index 100%
rename from src/util/schemas/MemberChangeProfileSchema.ts
rename to src/schemas/MemberChangeProfileSchema.ts
diff --git a/src/util/schemas/MemberChangeSchema.ts b/src/schemas/MemberChangeSchema.ts
similarity index 100%
rename from src/util/schemas/MemberChangeSchema.ts
rename to src/schemas/MemberChangeSchema.ts
diff --git a/src/util/schemas/MemberNickChangeSchema.ts b/src/schemas/MemberNickChangeSchema.ts
similarity index 100%
rename from src/util/schemas/MemberNickChangeSchema.ts
rename to src/schemas/MemberNickChangeSchema.ts
diff --git a/src/util/schemas/MessageAcknowledgeSchema.ts b/src/schemas/MessageAcknowledgeSchema.ts
similarity index 100%
rename from src/util/schemas/MessageAcknowledgeSchema.ts
rename to src/schemas/MessageAcknowledgeSchema.ts
diff --git a/src/util/schemas/MessageCreateSchema.ts b/src/schemas/MessageCreateSchema.ts
similarity index 100%
rename from src/util/schemas/MessageCreateSchema.ts
rename to src/schemas/MessageCreateSchema.ts
diff --git a/src/util/schemas/MessageEditSchema.ts b/src/schemas/MessageEditSchema.ts
similarity index 100%
rename from src/util/schemas/MessageEditSchema.ts
rename to src/schemas/MessageEditSchema.ts
diff --git a/src/util/schemas/MfaCodesSchema.ts b/src/schemas/MfaCodesSchema.ts
similarity index 100%
rename from src/util/schemas/MfaCodesSchema.ts
rename to src/schemas/MfaCodesSchema.ts
diff --git a/src/util/schemas/ModifyGuildStickerSchema.ts b/src/schemas/ModifyGuildStickerSchema.ts
similarity index 100%
rename from src/util/schemas/ModifyGuildStickerSchema.ts
rename to src/schemas/ModifyGuildStickerSchema.ts
diff --git a/src/util/schemas/PasswordResetSchema.ts b/src/schemas/PasswordResetSchema.ts
similarity index 100%
rename from src/util/schemas/PasswordResetSchema.ts
rename to src/schemas/PasswordResetSchema.ts
diff --git a/src/util/schemas/PreloadMessagesRequestSchema.ts b/src/schemas/PreloadMessagesRequestSchema.ts
similarity index 100%
rename from src/util/schemas/PreloadMessagesRequestSchema.ts
rename to src/schemas/PreloadMessagesRequestSchema.ts
diff --git a/src/util/schemas/PruneSchema.ts b/src/schemas/PruneSchema.ts
similarity index 100%
rename from src/util/schemas/PruneSchema.ts
rename to src/schemas/PruneSchema.ts
diff --git a/src/util/schemas/PurgeSchema.ts b/src/schemas/PurgeSchema.ts
similarity index 100%
rename from src/util/schemas/PurgeSchema.ts
rename to src/schemas/PurgeSchema.ts
diff --git a/src/util/schemas/RefreshUrlsRequestSchema.ts b/src/schemas/RefreshUrlsRequestSchema.ts
similarity index 100%
rename from src/util/schemas/RefreshUrlsRequestSchema.ts
rename to src/schemas/RefreshUrlsRequestSchema.ts
diff --git a/src/util/schemas/RegisterSchema.ts b/src/schemas/RegisterSchema.ts
similarity index 100%
rename from src/util/schemas/RegisterSchema.ts
rename to src/schemas/RegisterSchema.ts
diff --git a/src/util/schemas/RelationshipPostSchema.ts b/src/schemas/RelationshipPostSchema.ts
similarity index 100%
rename from src/util/schemas/RelationshipPostSchema.ts
rename to src/schemas/RelationshipPostSchema.ts
diff --git a/src/util/schemas/RelationshipPutSchema.ts b/src/schemas/RelationshipPutSchema.ts
similarity index 100%
rename from src/util/schemas/RelationshipPutSchema.ts
rename to src/schemas/RelationshipPutSchema.ts
diff --git a/src/util/schemas/RequestGuildMembersSchema.ts b/src/schemas/RequestGuildMembersSchema.ts
similarity index 100%
rename from src/util/schemas/RequestGuildMembersSchema.ts
rename to src/schemas/RequestGuildMembersSchema.ts
diff --git a/src/util/schemas/RoleModifySchema.ts b/src/schemas/RoleModifySchema.ts
similarity index 100%
rename from src/util/schemas/RoleModifySchema.ts
rename to src/schemas/RoleModifySchema.ts
diff --git a/src/util/schemas/RolePositionUpdateSchema.ts b/src/schemas/RolePositionUpdateSchema.ts
similarity index 100%
rename from src/util/schemas/RolePositionUpdateSchema.ts
rename to src/schemas/RolePositionUpdateSchema.ts
diff --git a/src/util/schemas/SelectProtocolSchema.ts b/src/schemas/SelectProtocolSchema.ts
similarity index 100%
rename from src/util/schemas/SelectProtocolSchema.ts
rename to src/schemas/SelectProtocolSchema.ts
diff --git a/src/util/schemas/SettingsProtoUpdateSchema.ts b/src/schemas/SettingsProtoUpdateSchema.ts
similarity index 100%
rename from src/util/schemas/SettingsProtoUpdateSchema.ts
rename to src/schemas/SettingsProtoUpdateSchema.ts
diff --git a/src/util/schemas/StreamCreateSchema.ts b/src/schemas/StreamCreateSchema.ts
similarity index 100%
rename from src/util/schemas/StreamCreateSchema.ts
rename to src/schemas/StreamCreateSchema.ts
diff --git a/src/util/schemas/StreamDeleteSchema.ts b/src/schemas/StreamDeleteSchema.ts
similarity index 100%
rename from src/util/schemas/StreamDeleteSchema.ts
rename to src/schemas/StreamDeleteSchema.ts
diff --git a/src/util/schemas/StreamWatchSchema.ts b/src/schemas/StreamWatchSchema.ts
similarity index 100%
rename from src/util/schemas/StreamWatchSchema.ts
rename to src/schemas/StreamWatchSchema.ts
diff --git a/src/util/schemas/TeamCreateSchema.ts b/src/schemas/TeamCreateSchema.ts
similarity index 100%
rename from src/util/schemas/TeamCreateSchema.ts
rename to src/schemas/TeamCreateSchema.ts
diff --git a/src/util/schemas/TemplateCreateSchema.ts b/src/schemas/TemplateCreateSchema.ts
similarity index 100%
rename from src/util/schemas/TemplateCreateSchema.ts
rename to src/schemas/TemplateCreateSchema.ts
diff --git a/src/util/schemas/TemplateModifySchema.ts b/src/schemas/TemplateModifySchema.ts
similarity index 100%
rename from src/util/schemas/TemplateModifySchema.ts
rename to src/schemas/TemplateModifySchema.ts
diff --git a/src/util/schemas/TotpDisableSchema.ts b/src/schemas/TotpDisableSchema.ts
similarity index 100%
rename from src/util/schemas/TotpDisableSchema.ts
rename to src/schemas/TotpDisableSchema.ts
diff --git a/src/util/schemas/TotpEnableSchema.ts b/src/schemas/TotpEnableSchema.ts
similarity index 100%
rename from src/util/schemas/TotpEnableSchema.ts
rename to src/schemas/TotpEnableSchema.ts
diff --git a/src/util/schemas/TotpSchema.ts b/src/schemas/TotpSchema.ts
similarity index 100%
rename from src/util/schemas/TotpSchema.ts
rename to src/schemas/TotpSchema.ts
diff --git a/src/util/schemas/UploadAttachmentRequestSchema.ts b/src/schemas/UploadAttachmentRequestSchema.ts
similarity index 100%
rename from src/util/schemas/UploadAttachmentRequestSchema.ts
rename to src/schemas/UploadAttachmentRequestSchema.ts
diff --git a/src/util/schemas/UserDeleteSchema.ts b/src/schemas/UserDeleteSchema.ts
similarity index 100%
rename from src/util/schemas/UserDeleteSchema.ts
rename to src/schemas/UserDeleteSchema.ts
diff --git a/src/util/schemas/UserGuildSettingsSchema.ts b/src/schemas/UserGuildSettingsSchema.ts
similarity index 100%
rename from src/util/schemas/UserGuildSettingsSchema.ts
rename to src/schemas/UserGuildSettingsSchema.ts
diff --git a/src/util/schemas/UserModifySchema.ts b/src/schemas/UserModifySchema.ts
similarity index 100%
rename from src/util/schemas/UserModifySchema.ts
rename to src/schemas/UserModifySchema.ts
diff --git a/src/util/schemas/UserNoteUpdateSchema.ts b/src/schemas/UserNoteUpdateSchema.ts
similarity index 100%
rename from src/util/schemas/UserNoteUpdateSchema.ts
rename to src/schemas/UserNoteUpdateSchema.ts
diff --git a/src/util/schemas/UserProfileModifySchema.ts b/src/schemas/UserProfileModifySchema.ts
similarity index 100%
rename from src/util/schemas/UserProfileModifySchema.ts
rename to src/schemas/UserProfileModifySchema.ts
diff --git a/src/util/schemas/UserSettingsSchema.ts b/src/schemas/UserSettingsSchema.ts
similarity index 100%
rename from src/util/schemas/UserSettingsSchema.ts
rename to src/schemas/UserSettingsSchema.ts
diff --git a/src/util/schemas/Validator.ts b/src/schemas/Validator.ts
similarity index 99%
rename from src/util/schemas/Validator.ts
rename to src/schemas/Validator.ts
index 1d9daf2c..04608603 100644
--- a/src/util/schemas/Validator.ts
+++ b/src/schemas/Validator.ts
@@ -25,7 +25,6 @@ const SchemaPath = path.join(
 	__dirname,
 	"..",
 	"..",
-	"..",
 	"assets",
 	"schemas.json",
 );
diff --git a/src/util/schemas/VanityUrlSchema.ts b/src/schemas/VanityUrlSchema.ts
similarity index 100%
rename from src/util/schemas/VanityUrlSchema.ts
rename to src/schemas/VanityUrlSchema.ts
diff --git a/src/util/schemas/VerifyEmailSchema.ts b/src/schemas/VerifyEmailSchema.ts
similarity index 100%
rename from src/util/schemas/VerifyEmailSchema.ts
rename to src/schemas/VerifyEmailSchema.ts
diff --git a/src/util/schemas/VoiceIdentifySchema.ts b/src/schemas/VoiceIdentifySchema.ts
similarity index 100%
rename from src/util/schemas/VoiceIdentifySchema.ts
rename to src/schemas/VoiceIdentifySchema.ts
diff --git a/src/util/schemas/VoiceStateUpdateSchema.ts b/src/schemas/VoiceStateUpdateSchema.ts
similarity index 100%
rename from src/util/schemas/VoiceStateUpdateSchema.ts
rename to src/schemas/VoiceStateUpdateSchema.ts
diff --git a/src/util/schemas/VoiceVideoSchema.ts b/src/schemas/VoiceVideoSchema.ts
similarity index 100%
rename from src/util/schemas/VoiceVideoSchema.ts
rename to src/schemas/VoiceVideoSchema.ts
diff --git a/src/util/schemas/WebAuthnSchema.ts b/src/schemas/WebAuthnSchema.ts
similarity index 100%
rename from src/util/schemas/WebAuthnSchema.ts
rename to src/schemas/WebAuthnSchema.ts
diff --git a/src/util/schemas/WebhookCreateSchema.ts b/src/schemas/WebhookCreateSchema.ts
similarity index 100%
rename from src/util/schemas/WebhookCreateSchema.ts
rename to src/schemas/WebhookCreateSchema.ts
diff --git a/src/util/schemas/WebhookExecuteSchema.ts b/src/schemas/WebhookExecuteSchema.ts
similarity index 97%
rename from src/util/schemas/WebhookExecuteSchema.ts
rename to src/schemas/WebhookExecuteSchema.ts
index c2617d12..b50a4cf6 100644
--- a/src/util/schemas/WebhookExecuteSchema.ts
+++ b/src/schemas/WebhookExecuteSchema.ts
@@ -16,7 +16,7 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Embed } from "../entities";
+import { Embed } from "../util/entities";
 import {
 	MessageCreateAttachment,
 	PollCreationSchema,
diff --git a/src/util/schemas/WebhookUpdateSchema.ts b/src/schemas/WebhookUpdateSchema.ts
similarity index 100%
rename from src/util/schemas/WebhookUpdateSchema.ts
rename to src/schemas/WebhookUpdateSchema.ts
diff --git a/src/util/schemas/WidgetModifySchema.ts b/src/schemas/WidgetModifySchema.ts
similarity index 100%
rename from src/util/schemas/WidgetModifySchema.ts
rename to src/schemas/WidgetModifySchema.ts
diff --git a/src/util/schemas/index.ts b/src/schemas/index.ts
similarity index 100%
rename from src/util/schemas/index.ts
rename to src/schemas/index.ts
diff --git a/src/util/schemas/responses/APIErrorOrCaptchaResponse.ts b/src/schemas/responses/APIErrorOrCaptchaResponse.ts
similarity index 100%
rename from src/util/schemas/responses/APIErrorOrCaptchaResponse.ts
rename to src/schemas/responses/APIErrorOrCaptchaResponse.ts
diff --git a/src/util/schemas/responses/APIErrorResponse.ts b/src/schemas/responses/APIErrorResponse.ts
similarity index 100%
rename from src/util/schemas/responses/APIErrorResponse.ts
rename to src/schemas/responses/APIErrorResponse.ts
diff --git a/src/util/schemas/responses/AccountStandingResponse.ts b/src/schemas/responses/AccountStandingResponse.ts
similarity index 98%
rename from src/util/schemas/responses/AccountStandingResponse.ts
rename to src/schemas/responses/AccountStandingResponse.ts
index 9315a32a..b2992c74 100644
--- a/src/util/schemas/responses/AccountStandingResponse.ts
+++ b/src/schemas/responses/AccountStandingResponse.ts
@@ -16,7 +16,7 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Attachment } from "../../entities";
+import { Attachment } from "../../util/entities";
 
 export enum AccountStandingState {
 	ALL_GOOD = 100,
diff --git a/src/util/schemas/responses/BackupCodesChallengeResponse.ts b/src/schemas/responses/BackupCodesChallengeResponse.ts
similarity index 100%
rename from src/util/schemas/responses/BackupCodesChallengeResponse.ts
rename to src/schemas/responses/BackupCodesChallengeResponse.ts
diff --git a/src/util/schemas/responses/CaptchaRequiredResponse.ts b/src/schemas/responses/CaptchaRequiredResponse.ts
similarity index 100%
rename from src/util/schemas/responses/CaptchaRequiredResponse.ts
rename to src/schemas/responses/CaptchaRequiredResponse.ts
diff --git a/src/util/schemas/responses/CollectiblesCategoriesResponse.ts b/src/schemas/responses/CollectiblesCategoriesResponse.ts
similarity index 98%
rename from src/util/schemas/responses/CollectiblesCategoriesResponse.ts
rename to src/schemas/responses/CollectiblesCategoriesResponse.ts
index 57dbf47a..8a26d897 100644
--- a/src/util/schemas/responses/CollectiblesCategoriesResponse.ts
+++ b/src/schemas/responses/CollectiblesCategoriesResponse.ts
@@ -16,7 +16,7 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { StringStringDictionary } from "../../util";
+import { StringStringDictionary } from "../../util/util";
 
 // TODO: Clean up
 export type CollectiblesCategoriesResponse = CollectiblesCategoryItem[];
diff --git a/src/util/schemas/responses/CollectiblesMarketingResponse.ts b/src/schemas/responses/CollectiblesMarketingResponse.ts
similarity index 100%
rename from src/util/schemas/responses/CollectiblesMarketingResponse.ts
rename to src/schemas/responses/CollectiblesMarketingResponse.ts
diff --git a/src/util/schemas/responses/CollectiblesShopResponse.ts b/src/schemas/responses/CollectiblesShopResponse.ts
similarity index 100%
rename from src/util/schemas/responses/CollectiblesShopResponse.ts
rename to src/schemas/responses/CollectiblesShopResponse.ts
diff --git a/src/util/schemas/responses/DiscoverableGuildsResponse.ts b/src/schemas/responses/DiscoverableGuildsResponse.ts
similarity index 95%
rename from src/util/schemas/responses/DiscoverableGuildsResponse.ts
rename to src/schemas/responses/DiscoverableGuildsResponse.ts
index dc475902..9785c04c 100644
--- a/src/util/schemas/responses/DiscoverableGuildsResponse.ts
+++ b/src/schemas/responses/DiscoverableGuildsResponse.ts
@@ -16,7 +16,7 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Guild } from "../../entities";
+import { Guild } from "../../util/entities";
 
 export interface DiscoverableGuildsResponse {
 	total: number;
diff --git a/src/util/schemas/responses/DmMessagesResponseSchema.ts b/src/schemas/responses/DmMessagesResponseSchema.ts
similarity index 100%
rename from src/util/schemas/responses/DmMessagesResponseSchema.ts
rename to src/schemas/responses/DmMessagesResponseSchema.ts
diff --git a/src/util/schemas/responses/EmailDomainLookupResponse.ts b/src/schemas/responses/EmailDomainLookupResponse.ts
similarity index 100%
rename from src/util/schemas/responses/EmailDomainLookupResponse.ts
rename to src/schemas/responses/EmailDomainLookupResponse.ts
diff --git a/src/util/schemas/responses/EmailDomainLookupVerifyCodeResponse.ts b/src/schemas/responses/EmailDomainLookupVerifyCodeResponse.ts
similarity index 95%
rename from src/util/schemas/responses/EmailDomainLookupVerifyCodeResponse.ts
rename to src/schemas/responses/EmailDomainLookupVerifyCodeResponse.ts
index 1fcfba34..3e29c70d 100644
--- a/src/util/schemas/responses/EmailDomainLookupVerifyCodeResponse.ts
+++ b/src/schemas/responses/EmailDomainLookupVerifyCodeResponse.ts
@@ -16,7 +16,7 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Guild } from "../../entities";
+import { Guild } from "../../util/entities";
 
 export interface EmailDomainLookupVerifyCodeResponse {
 	guild: Guild;
diff --git a/src/util/schemas/responses/EmojiSourceResponse.ts b/src/schemas/responses/EmojiSourceResponse.ts
similarity index 100%
rename from src/util/schemas/responses/EmojiSourceResponse.ts
rename to src/schemas/responses/EmojiSourceResponse.ts
diff --git a/src/util/schemas/responses/GatewayBotResponse.ts b/src/schemas/responses/GatewayBotResponse.ts
similarity index 100%
rename from src/util/schemas/responses/GatewayBotResponse.ts
rename to src/schemas/responses/GatewayBotResponse.ts
diff --git a/src/util/schemas/responses/GatewayResponse.ts b/src/schemas/responses/GatewayResponse.ts
similarity index 100%
rename from src/util/schemas/responses/GatewayResponse.ts
rename to src/schemas/responses/GatewayResponse.ts
diff --git a/src/util/schemas/responses/GenerateRegistrationTokensResponse.ts b/src/schemas/responses/GenerateRegistrationTokensResponse.ts
similarity index 100%
rename from src/util/schemas/responses/GenerateRegistrationTokensResponse.ts
rename to src/schemas/responses/GenerateRegistrationTokensResponse.ts
diff --git a/src/util/schemas/responses/GuildBansResponse.ts b/src/schemas/responses/GuildBansResponse.ts
similarity index 100%
rename from src/util/schemas/responses/GuildBansResponse.ts
rename to src/schemas/responses/GuildBansResponse.ts
diff --git a/src/util/schemas/responses/GuildCreateResponse.ts b/src/schemas/responses/GuildCreateResponse.ts
similarity index 100%
rename from src/util/schemas/responses/GuildCreateResponse.ts
rename to src/schemas/responses/GuildCreateResponse.ts
diff --git a/src/util/schemas/responses/GuildDiscoveryRequirements.ts b/src/schemas/responses/GuildDiscoveryRequirements.ts
similarity index 100%
rename from src/util/schemas/responses/GuildDiscoveryRequirements.ts
rename to src/schemas/responses/GuildDiscoveryRequirements.ts
diff --git a/src/util/schemas/responses/GuildMessagesSearchResponse.ts b/src/schemas/responses/GuildMessagesSearchResponse.ts
similarity index 97%
rename from src/util/schemas/responses/GuildMessagesSearchResponse.ts
rename to src/schemas/responses/GuildMessagesSearchResponse.ts
index ec41965b..376b684e 100644
--- a/src/util/schemas/responses/GuildMessagesSearchResponse.ts
+++ b/src/schemas/responses/GuildMessagesSearchResponse.ts
@@ -24,7 +24,7 @@ import {
 	Poll,
 	PublicUser,
 	Role,
-} from "../../entities";
+} from "../../util/entities";
 
 export interface GuildMessagesSearchMessage {
 	id: string;
diff --git a/src/util/schemas/responses/GuildProfileResponse.ts b/src/schemas/responses/GuildProfileResponse.ts
similarity index 100%
rename from src/util/schemas/responses/GuildProfileResponse.ts
rename to src/schemas/responses/GuildProfileResponse.ts
diff --git a/src/util/schemas/responses/GuildPruneResponse.ts b/src/schemas/responses/GuildPruneResponse.ts
similarity index 100%
rename from src/util/schemas/responses/GuildPruneResponse.ts
rename to src/schemas/responses/GuildPruneResponse.ts
diff --git a/src/util/schemas/responses/GuildRecommendationsResponse.ts b/src/schemas/responses/GuildRecommendationsResponse.ts
similarity index 95%
rename from src/util/schemas/responses/GuildRecommendationsResponse.ts
rename to src/schemas/responses/GuildRecommendationsResponse.ts
index db67ff67..2f7bb776 100644
--- a/src/util/schemas/responses/GuildRecommendationsResponse.ts
+++ b/src/schemas/responses/GuildRecommendationsResponse.ts
@@ -16,7 +16,7 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Guild } from "../../entities";
+import { Guild } from "../../util/entities";
 
 export interface GuildRecommendationsResponse {
 	recommended_guilds: Guild[];
diff --git a/src/util/schemas/responses/GuildVanityUrl.ts b/src/schemas/responses/GuildVanityUrl.ts
similarity index 100%
rename from src/util/schemas/responses/GuildVanityUrl.ts
rename to src/schemas/responses/GuildVanityUrl.ts
diff --git a/src/util/schemas/responses/GuildVoiceRegionsResponse.ts b/src/schemas/responses/GuildVoiceRegionsResponse.ts
similarity index 100%
rename from src/util/schemas/responses/GuildVoiceRegionsResponse.ts
rename to src/schemas/responses/GuildVoiceRegionsResponse.ts
diff --git a/src/util/schemas/responses/GuildWidgetJsonResponse.ts b/src/schemas/responses/GuildWidgetJsonResponse.ts
similarity index 100%
rename from src/util/schemas/responses/GuildWidgetJsonResponse.ts
rename to src/schemas/responses/GuildWidgetJsonResponse.ts
diff --git a/src/util/schemas/responses/GuildWidgetSettingsResponse.ts b/src/schemas/responses/GuildWidgetSettingsResponse.ts
similarity index 100%
rename from src/util/schemas/responses/GuildWidgetSettingsResponse.ts
rename to src/schemas/responses/GuildWidgetSettingsResponse.ts
diff --git a/src/util/schemas/responses/HubDirectoryEntriesResponse.ts b/src/schemas/responses/HubDirectoryEntriesResponse.ts
similarity index 96%
rename from src/util/schemas/responses/HubDirectoryEntriesResponse.ts
rename to src/schemas/responses/HubDirectoryEntriesResponse.ts
index 9aaadfed..9efa90c7 100644
--- a/src/util/schemas/responses/HubDirectoryEntriesResponse.ts
+++ b/src/schemas/responses/HubDirectoryEntriesResponse.ts
@@ -16,7 +16,7 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Guild } from "../../entities";
+import { Guild } from "../../util/entities";
 
 export interface HubDirectoryEntry {
 	author_id: string;
diff --git a/src/util/schemas/responses/HubWaitlistSignupResponse.ts b/src/schemas/responses/HubWaitlistSignupResponse.ts
similarity index 100%
rename from src/util/schemas/responses/HubWaitlistSignupResponse.ts
rename to src/schemas/responses/HubWaitlistSignupResponse.ts
diff --git a/src/util/schemas/responses/InstanceDomainsResponse.ts b/src/schemas/responses/InstanceDomainsResponse.ts
similarity index 100%
rename from src/util/schemas/responses/InstanceDomainsResponse.ts
rename to src/schemas/responses/InstanceDomainsResponse.ts
diff --git a/src/util/schemas/responses/InstancePingResponse.ts b/src/schemas/responses/InstancePingResponse.ts
similarity index 100%
rename from src/util/schemas/responses/InstancePingResponse.ts
rename to src/schemas/responses/InstancePingResponse.ts
diff --git a/src/util/schemas/responses/InstanceStatsResponse.ts b/src/schemas/responses/InstanceStatsResponse.ts
similarity index 100%
rename from src/util/schemas/responses/InstanceStatsResponse.ts
rename to src/schemas/responses/InstanceStatsResponse.ts
diff --git a/src/util/schemas/responses/LocationMetadataResponse.ts b/src/schemas/responses/LocationMetadataResponse.ts
similarity index 100%
rename from src/util/schemas/responses/LocationMetadataResponse.ts
rename to src/schemas/responses/LocationMetadataResponse.ts
diff --git a/src/util/schemas/responses/MemberJoinGuildResponse.ts b/src/schemas/responses/MemberJoinGuildResponse.ts
similarity index 94%
rename from src/util/schemas/responses/MemberJoinGuildResponse.ts
rename to src/schemas/responses/MemberJoinGuildResponse.ts
index 67d2de01..40002e11 100644
--- a/src/util/schemas/responses/MemberJoinGuildResponse.ts
+++ b/src/schemas/responses/MemberJoinGuildResponse.ts
@@ -17,7 +17,7 @@
 */
 
 import { GuildCreateResponse } from "@spacebar/util";
-import { Emoji, Role, Sticker } from "../../entities";
+import { Emoji, Role, Sticker } from "../../util/entities";
 
 export interface MemberJoinGuildResponse {
 	guild: GuildCreateResponse;
diff --git a/src/util/schemas/responses/OAuthAuthorizeResponse.ts b/src/schemas/responses/OAuthAuthorizeResponse.ts
similarity index 100%
rename from src/util/schemas/responses/OAuthAuthorizeResponse.ts
rename to src/schemas/responses/OAuthAuthorizeResponse.ts
diff --git a/src/util/schemas/responses/PreloadMessagesResponseSchema.ts b/src/schemas/responses/PreloadMessagesResponseSchema.ts
similarity index 100%
rename from src/util/schemas/responses/PreloadMessagesResponseSchema.ts
rename to src/schemas/responses/PreloadMessagesResponseSchema.ts
diff --git a/src/util/schemas/responses/RefreshUrlsResponse.ts b/src/schemas/responses/RefreshUrlsResponse.ts
similarity index 100%
rename from src/util/schemas/responses/RefreshUrlsResponse.ts
rename to src/schemas/responses/RefreshUrlsResponse.ts
diff --git a/src/util/schemas/responses/SettingsProtoUpdateResponse.ts b/src/schemas/responses/SettingsProtoUpdateResponse.ts
similarity index 100%
rename from src/util/schemas/responses/SettingsProtoUpdateResponse.ts
rename to src/schemas/responses/SettingsProtoUpdateResponse.ts
diff --git a/src/util/schemas/responses/TeamListResponse.ts b/src/schemas/responses/TeamListResponse.ts
similarity index 100%
rename from src/util/schemas/responses/TeamListResponse.ts
rename to src/schemas/responses/TeamListResponse.ts
diff --git a/src/util/schemas/responses/Tenor.ts b/src/schemas/responses/Tenor.ts
similarity index 100%
rename from src/util/schemas/responses/Tenor.ts
rename to src/schemas/responses/Tenor.ts
diff --git a/src/util/schemas/responses/TokenResponse.ts b/src/schemas/responses/TokenResponse.ts
similarity index 94%
rename from src/util/schemas/responses/TokenResponse.ts
rename to src/schemas/responses/TokenResponse.ts
index bc136051..c0f1346c 100644
--- a/src/util/schemas/responses/TokenResponse.ts
+++ b/src/schemas/responses/TokenResponse.ts
@@ -16,7 +16,7 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { BackupCode, UserSettings } from "../../entities";
+import { BackupCode, UserSettings } from "../../util/entities";
 
 export interface TokenResponse {
 	token: string;
diff --git a/src/util/schemas/responses/TypedResponses.ts b/src/schemas/responses/TypedResponses.ts
similarity index 96%
rename from src/util/schemas/responses/TypedResponses.ts
rename to src/schemas/responses/TypedResponses.ts
index bc204502..86d0849e 100644
--- a/src/util/schemas/responses/TypedResponses.ts
+++ b/src/schemas/responses/TypedResponses.ts
@@ -17,8 +17,8 @@
 */
 
 import { GuildBansResponse, GuildCreateResponse } from "@spacebar/util";
-import { GeneralConfiguration, LimitsConfiguration } from "../../config";
-import { DmChannelDTO } from "../../dtos";
+import { GeneralConfiguration, LimitsConfiguration } from "../../util/config";
+import { DmChannelDTO } from "../../util/dtos";
 import {
 	Application,
 	BackupCode,
@@ -37,7 +37,7 @@ import {
 	StickerPack,
 	Template,
 	Webhook,
-} from "../../entities";
+} from "../../util/entities";
 import { GuildVoiceRegion } from "./GuildVoiceRegionsResponse";
 
 // removes internal properties from the guild class
diff --git a/src/util/schemas/responses/UpdatesResponse.ts b/src/schemas/responses/UpdatesResponse.ts
similarity index 100%
rename from src/util/schemas/responses/UpdatesResponse.ts
rename to src/schemas/responses/UpdatesResponse.ts
diff --git a/src/util/schemas/responses/UploadAttachmentResponseSchema.ts b/src/schemas/responses/UploadAttachmentResponseSchema.ts
similarity index 100%
rename from src/util/schemas/responses/UploadAttachmentResponseSchema.ts
rename to src/schemas/responses/UploadAttachmentResponseSchema.ts
diff --git a/src/util/schemas/responses/UserNoteResponse.ts b/src/schemas/responses/UserNoteResponse.ts
similarity index 100%
rename from src/util/schemas/responses/UserNoteResponse.ts
rename to src/schemas/responses/UserNoteResponse.ts
diff --git a/src/util/schemas/responses/UserProfileResponse.ts b/src/schemas/responses/UserProfileResponse.ts
similarity index 100%
rename from src/util/schemas/responses/UserProfileResponse.ts
rename to src/schemas/responses/UserProfileResponse.ts
diff --git a/src/util/schemas/responses/UserRelationsResponse.ts b/src/schemas/responses/UserRelationsResponse.ts
similarity index 100%
rename from src/util/schemas/responses/UserRelationsResponse.ts
rename to src/schemas/responses/UserRelationsResponse.ts
diff --git a/src/util/schemas/responses/UserRelationshipsResponse.ts b/src/schemas/responses/UserRelationshipsResponse.ts
similarity index 93%
rename from src/util/schemas/responses/UserRelationshipsResponse.ts
rename to src/schemas/responses/UserRelationshipsResponse.ts
index 115c45ae..1a3341f1 100644
--- a/src/util/schemas/responses/UserRelationshipsResponse.ts
+++ b/src/schemas/responses/UserRelationshipsResponse.ts
@@ -15,7 +15,7 @@
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-import { PublicUser, RelationshipType } from "../../entities";
+import { PublicUser, RelationshipType } from "../../util/entities";
 
 export interface UserRelationshipsResponse {
 	id: string;
diff --git a/src/util/schemas/responses/WebAuthnCreateResponse.ts b/src/schemas/responses/WebAuthnCreateResponse.ts
similarity index 100%
rename from src/util/schemas/responses/WebAuthnCreateResponse.ts
rename to src/schemas/responses/WebAuthnCreateResponse.ts
diff --git a/src/util/schemas/responses/WebhookCreateResponse.ts b/src/schemas/responses/WebhookCreateResponse.ts
similarity index 94%
rename from src/util/schemas/responses/WebhookCreateResponse.ts
rename to src/schemas/responses/WebhookCreateResponse.ts
index 7226e617..6f1cd241 100644
--- a/src/util/schemas/responses/WebhookCreateResponse.ts
+++ b/src/schemas/responses/WebhookCreateResponse.ts
@@ -16,7 +16,7 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { User, Webhook } from "../../entities";
+import { User, Webhook } from "../../util/entities";
 
 export interface WebhookCreateResponse {
 	user: User;
diff --git a/src/util/schemas/responses/index.ts b/src/schemas/responses/index.ts
similarity index 100%
rename from src/util/schemas/responses/index.ts
rename to src/schemas/responses/index.ts
diff --git a/src/util/connections/Connection.ts b/src/util/connections/Connection.ts
index 638dde2c..32ef6351 100644
--- a/src/util/connections/Connection.ts
+++ b/src/util/connections/Connection.ts
@@ -18,7 +18,7 @@
 
 import crypto from "crypto";
 import { ConnectedAccount } from "../entities";
-import { ConnectedAccountSchema, ConnectionCallbackSchema } from "../schemas";
+import { ConnectedAccountSchema, ConnectionCallbackSchema } from "@spacebar/schemas*";
 import { Config, DiscordApiErrors } from "../util";
 
 /**
diff --git a/src/util/index.ts b/src/util/index.ts
index 9a84d1af..f2b526e0 100644
--- a/src/util/index.ts
+++ b/src/util/index.ts
@@ -24,7 +24,7 @@ export * from "./util/index";
 export * from "./interfaces/index";
 export * from "./entities/index";
 export * from "./dtos/index";
-export * from "./schemas";
+export * from "@spacebar/schemas*";
 export * from "./imports";
 export * from "./config";
 export * from "./connections";
diff --git a/tsconfig.json b/tsconfig.json
index f3501339..c72ac351 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -39,6 +39,7 @@
 			"@spacebar/cdn*": ["./src/cdn"],
 			"@spacebar/util*": ["./src/util"],
 			"@spacebar/webrtc*": ["./src/webrtc"],
+			"@spacebar/schemas*": ["./src/schemas"],
             "lambert-server*": ["./src/util/util/lambert-server"]
 		} /* Specify a set of entries that re-map imports to additional lookup locations. */,
 		// "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */