From ea6b63de534e62aa685a5b88a7753d22d91101c0 Mon Sep 17 00:00:00 2001
From: Jon Staab <jstaab@protonmail.com>
Date: Mon, 8 Jun 2026 14:14:40 -0700
Subject: [PATCH] Rename app utils

---
 .gitignore                                    |  1 +
 src/app/{util => }/analytics.ts               |  0
 src/app/call/video.ts                         |  2 +-
 src/app/call/voice.ts                         |  2 +-
 src/app/components/AppContainer.svelte        |  2 +-
 src/app/components/BunkerConnect.svelte       |  2 +-
 src/app/components/BunkerUrl.svelte           |  4 ++--
 .../components/CalendarEventActions.svelte    |  4 ++--
 src/app/components/CalendarEventForm.svelte   |  4 ++--
 src/app/components/CalendarEventItem.svelte   |  2 +-
 src/app/components/Chat.svelte                |  6 ++---
 src/app/components/ChatCompose.svelte         |  2 +-
 src/app/components/ChatEnable.svelte          |  2 +-
 src/app/components/ChatItem.svelte            |  4 ++--
 src/app/components/ChatMenu.svelte            |  2 +-
 src/app/components/ChatMessage.svelte         |  2 +-
 src/app/components/ChatMessageMenu.svelte     |  2 +-
 .../components/ChatMessageMenuMobile.svelte   |  4 ++--
 src/app/components/ChatStart.svelte           |  2 +-
 src/app/components/ClassifiedActions.svelte   |  4 ++--
 src/app/components/ClassifiedForm.svelte      |  4 ++--
 src/app/components/ClassifiedItem.svelte      |  2 +-
 src/app/components/CommentActions.svelte      |  2 +-
 src/app/components/ComposeMenu.svelte         |  2 +-
 src/app/components/ContentLinkBlock.svelte    |  2 +-
 src/app/components/ContentLinkInline.svelte   |  2 +-
 src/app/components/ContentLinkUrl.svelte      |  2 +-
 src/app/components/ContentMention.svelte      |  2 +-
 src/app/components/ContentQuote.svelte        |  2 +-
 src/app/components/ContentToken.svelte        |  2 +-
 src/app/components/EventActivity.svelte       |  2 +-
 src/app/components/EventDeleteConfirm.svelte  |  2 +-
 src/app/components/EventInfo.svelte           |  2 +-
 src/app/components/EventMenu.svelte           |  6 ++---
 src/app/components/EventReply.svelte          |  4 ++--
 src/app/components/EventShare.svelte          |  2 +-
 src/app/components/GoalActions.svelte         |  2 +-
 src/app/components/GoalCreate.svelte          |  4 ++--
 src/app/components/GoalItem.svelte            |  2 +-
 src/app/components/InfoKeys.svelte            |  2 +-
 src/app/components/KeyDownload.svelte         |  2 +-
 src/app/components/KeyRecoveryConfirm.svelte  |  4 ++--
 src/app/components/KeyRecoveryRequest.svelte  |  2 +-
 src/app/components/Landing.svelte             |  2 +-
 src/app/components/LogIn.svelte               |  6 ++---
 src/app/components/LogInBunker.svelte         |  8 +++----
 src/app/components/LogInEmail.svelte          | 10 ++++-----
 src/app/components/LogInKey.svelte            |  6 ++---
 src/app/components/LogInOTP.svelte            |  6 ++---
 src/app/components/LogInOTPConfirm.svelte     | 10 ++++-----
 src/app/components/LogInSelect.svelte         | 10 ++++-----
 src/app/components/LogOut.svelte              |  2 +-
 src/app/components/MenuSettings.svelte        |  4 ++--
 src/app/components/ModalContainer.svelte      |  2 +-
 .../components/NewNotificationSound.svelte    |  2 +-
 src/app/components/NoteCard.svelte            |  2 +-
 .../components/NoteContentMinimalPoll.svelte  |  2 +-
 src/app/components/PasswordReset.svelte       |  6 ++---
 .../components/PasswordResetConfirm.svelte    |  6 ++---
 src/app/components/PeopleItem.svelte          |  2 +-
 src/app/components/PollCreate.svelte          |  6 ++---
 src/app/components/PollItem.svelte            |  2 +-
 src/app/components/PollOption.svelte          |  2 +-
 src/app/components/PollVotes.svelte           |  4 ++--
 src/app/components/PomadeSessions.svelte      |  6 ++---
 src/app/components/PrimaryNav.svelte          |  6 ++---
 src/app/components/PrimaryNavItemSpace.svelte |  4 ++--
 src/app/components/PrimaryNavSpaces.svelte    |  2 +-
 src/app/components/Profile.svelte             |  4 ++--
 src/app/components/ProfileBadges.svelte       |  4 ++--
 src/app/components/ProfileDelete.svelte       |  4 ++--
 src/app/components/ProfileDetail.svelte       |  6 ++---
 src/app/components/ProfileEdit.svelte         |  4 ++--
 src/app/components/ProfileEditForm.svelte     |  2 +-
 src/app/components/ProfileLink.svelte         |  2 +-
 src/app/components/ProfileMultiSelect.svelte  |  2 +-
 src/app/components/ProfileSpaces.svelte       |  2 +-
 src/app/components/QRCode.svelte              |  2 +-
 src/app/components/ReactionSummary.svelte     |  2 +-
 src/app/components/RecentConversation.svelte  |  2 +-
 src/app/components/RelayAdd.svelte            |  2 +-
 src/app/components/RelayList.svelte           |  4 ++--
 .../RelaySettingsHealthCheck.svelte           |  4 ++--
 .../RelaySettingsHealthChecks.svelte          |  2 +-
 src/app/components/RelaySettingsItem.svelte   |  2 +-
 src/app/components/Report.svelte              |  2 +-
 src/app/components/ReportItem.svelte          |  4 ++--
 src/app/components/ReportMenu.svelte          |  4 ++--
 src/app/components/RoomCompose.svelte         |  2 +-
 src/app/components/RoomCreate.svelte          |  2 +-
 src/app/components/RoomDetail.svelte          |  6 ++---
 src/app/components/RoomEdit.svelte            |  2 +-
 src/app/components/RoomForm.svelte            |  2 +-
 src/app/components/RoomItem.svelte            |  4 ++--
 src/app/components/RoomItemContent.svelte     |  2 +-
 src/app/components/RoomItemMenu.svelte        |  4 ++--
 src/app/components/RoomItemMenuMobile.svelte  |  4 ++--
 src/app/components/RoomJoinItem.svelte        |  4 ++--
 src/app/components/RoomLink.svelte            |  2 +-
 src/app/components/RoomMembers.svelte         |  4 ++--
 src/app/components/RoomMembersAdd.svelte      |  4 ++--
 src/app/components/SignUp.svelte              |  6 ++---
 src/app/components/SignUpEmail.svelte         |  4 ++--
 src/app/components/SignerStatus.svelte        |  2 +-
 src/app/components/SpaceAccessRequest.svelte  |  2 +-
 src/app/components/SpaceAdd.svelte            |  2 +-
 src/app/components/SpaceAuthError.svelte      |  2 +-
 src/app/components/SpaceBar.svelte            |  2 +-
 src/app/components/SpaceDetail.svelte         |  2 +-
 src/app/components/SpaceEdit.svelte           |  4 ++--
 src/app/components/SpaceInvite.svelte         |  2 +-
 src/app/components/SpaceInviteAccept.svelte   |  6 ++---
 src/app/components/SpaceJoin.svelte           |  8 +++----
 src/app/components/SpaceMembers.svelte        |  4 ++--
 src/app/components/SpaceMembersAdd.svelte     |  2 +-
 src/app/components/SpaceMembersBanned.svelte  |  2 +-
 src/app/components/SpaceMenu.svelte           |  6 ++---
 src/app/components/SpaceMenuRoomItem.svelte   |  4 ++--
 src/app/components/SpaceSearch.svelte         |  2 +-
 src/app/components/SpaceTrustRelay.svelte     |  2 +-
 src/app/components/ThreadActions.svelte       |  2 +-
 src/app/components/ThreadCreate.svelte        |  4 ++--
 src/app/components/ThreadItem.svelte          |  2 +-
 src/app/components/ThunkFailure.svelte        |  2 +-
 src/app/components/ThunkToast.svelte          |  4 ++--
 src/app/components/Toast.svelte               |  2 +-
 .../VoiceCallAudioSettingsDialog.svelte       |  2 +-
 src/app/components/VoiceRoomItem.svelte       |  4 ++--
 src/app/components/VoiceRoomJoinDialog.svelte |  4 ++--
 src/app/components/VoiceWidget.svelte         |  6 ++---
 .../WalletAsReceivingAddress.svelte           |  4 ++--
 src/app/components/WalletConnect.svelte       |  4 ++--
 src/app/components/WalletDisconnect.svelte    |  2 +-
 src/app/components/WalletPay.svelte           |  4 ++--
 src/app/components/WalletReceive.svelte       |  2 +-
 .../WalletUpdateReceivingAddress.svelte       |  2 +-
 src/app/components/Zap.svelte                 |  2 +-
 src/app/components/ZapButton.svelte           |  2 +-
 src/app/components/ZapInvoice.svelte          |  4 ++--
 src/app/{util => }/drafts.ts                  |  0
 src/app/editor/index.ts                       |  2 +-
 src/app/{util/health.ts => healthChecks.ts}   |  0
 src/app/{util => }/keyboard.ts                |  0
 src/app/{util => }/modal.ts                   |  0
 src/app/{util => }/nip46.ts                   |  2 +-
 src/app/{util => }/notifications.ts           |  2 +-
 src/app/{util => }/policies.ts                |  0
 src/app/{util => }/polls.ts                   |  0
 src/app/{util => }/pomade.ts                  | 12 ++++++++++
 src/app/{util => }/push/adapters/android.ts   |  4 ++--
 src/app/{util => }/push/adapters/capacitor.ts |  4 ++--
 src/app/{util => }/push/adapters/common.ts    |  2 +-
 src/app/{util => }/push/adapters/web.ts       |  6 ++---
 src/app/{util => }/push/index.ts              | 10 ++++-----
 src/app/{util => }/routes.ts                  | 20 +++++++++++++++--
 src/app/{util/logout.ts => session.ts}        |  4 ++--
 src/app/{util => }/storage.ts                 |  0
 src/app/{util => }/theme.ts                   |  0
 src/app/{util => }/title.ts                   |  0
 src/app/{util => }/toast.ts                   |  0
 src/app/util/history.ts                       | 15 -------------
 src/app/util/pomadeErrors.ts                  | 11 ----------
 src/lib/components/IconPickerButton.svelte    |  2 +-
 src/routes/+layout.svelte                     | 22 +++++++++----------
 src/routes/+page.svelte                       |  2 +-
 src/routes/[bech32]/+page.svelte              |  2 +-
 src/routes/chat/+layout.svelte                |  2 +-
 src/routes/chat/+page.svelte                  |  2 +-
 src/routes/chat/[chat]/+page.svelte           |  4 ++--
 src/routes/home/+page.svelte                  |  2 +-
 src/routes/settings/+layout.svelte            |  4 ++--
 src/routes/settings/about/+page.svelte        |  2 +-
 src/routes/settings/alerts/+page.svelte       |  6 ++---
 src/routes/settings/content/+page.svelte      |  2 +-
 src/routes/settings/privacy/+page.svelte      |  2 +-
 src/routes/settings/profile/+page.svelte      |  6 ++---
 src/routes/settings/wallet/+page.svelte       |  2 +-
 src/routes/spaces/+page.svelte                |  6 ++---
 src/routes/spaces/[relay]/+layout.svelte      |  4 ++--
 src/routes/spaces/[relay]/+page.svelte        |  2 +-
 src/routes/spaces/[relay]/[h]/+page.svelte    |  8 +++----
 .../spaces/[relay]/calendar/+page.svelte      |  2 +-
 src/routes/spaces/[relay]/chat/+page.svelte   |  4 ++--
 .../spaces/[relay]/classifieds/+page.svelte   |  2 +-
 src/routes/spaces/[relay]/goals/+page.svelte  |  2 +-
 src/routes/spaces/[relay]/polls/+page.svelte  |  2 +-
 src/routes/spaces/[relay]/recent/+page.svelte |  2 +-
 .../spaces/[relay]/threads/+page.svelte       |  2 +-
 188 files changed, 324 insertions(+), 321 deletions(-)
 rename src/app/{util => }/analytics.ts (100%)
 rename src/app/{util => }/drafts.ts (100%)
 rename src/app/{util/health.ts => healthChecks.ts} (100%)
 rename src/app/{util => }/keyboard.ts (100%)
 rename src/app/{util => }/modal.ts (100%)
 rename src/app/{util => }/nip46.ts (98%)
 rename src/app/{util => }/notifications.ts (99%)
 rename src/app/{util => }/policies.ts (100%)
 rename src/app/{util => }/polls.ts (100%)
 rename src/app/{util => }/pomade.ts (86%)
 rename src/app/{util => }/push/adapters/android.ts (93%)
 rename src/app/{util => }/push/adapters/capacitor.ts (98%)
 rename src/app/{util => }/push/adapters/common.ts (98%)
 rename src/app/{util => }/push/adapters/web.ts (92%)
 rename src/app/{util => }/push/index.ts (79%)
 rename src/app/{util => }/routes.ts (93%)
 rename src/app/{util/logout.ts => session.ts} (72%)
 rename src/app/{util => }/storage.ts (100%)
 rename src/app/{util => }/theme.ts (100%)
 rename src/app/{util => }/title.ts (100%)
 rename src/app/{util => }/toast.ts (100%)
 delete mode 100644 src/app/util/history.ts
 delete mode 100644 src/app/util/pomadeErrors.ts

diff --git a/.gitignore b/.gitignore
index 9e7642de..6dc1c723 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,6 +73,7 @@ GoogleService-Info.plist
 .idea/
 .vscode/
 .claude/
+.local/
 
 # OS generated
 .DS_Store
diff --git a/src/app/util/analytics.ts b/src/app/analytics.ts
similarity index 100%
rename from src/app/util/analytics.ts
rename to src/app/analytics.ts
diff --git a/src/app/call/video.ts b/src/app/call/video.ts
index eccd4397..96e735c3 100644
--- a/src/app/call/video.ts
+++ b/src/app/call/video.ts
@@ -2,7 +2,7 @@ import {Track} from "livekit-client"
 import {MediaQuery} from "svelte/reactivity"
 import {derived, get, writable} from "svelte/store"
 import {currentVoiceSession, VoiceState, type VoiceSession, voiceState} from "@app/call/stores"
-import {pushToast} from "@app/util/toast"
+import {pushToast} from "@app/toast"
 
 export enum VideoCallLayout {
   Chat = "chat",
diff --git a/src/app/call/voice.ts b/src/app/call/voice.ts
index 145c8168..7eafbe39 100644
--- a/src/app/call/voice.ts
+++ b/src/app/call/voice.ts
@@ -37,7 +37,7 @@ import {
 } from "@app/call/stores"
 import {resetVideoCallLayout, triggerVideoFeedCount, videoPrimaryTileKey} from "@app/call/video"
 import {deriveLatestEventForUrl, deriveRoom, makeRoomId} from "@app/core/state"
-import {pushToast} from "@app/util/toast"
+import {pushToast} from "@app/toast"
 
 export const LIVEKIT_PARTICIPANTS = 39004
 
diff --git a/src/app/components/AppContainer.svelte b/src/app/components/AppContainer.svelte
index 7956a8cb..6b2992cd 100644
--- a/src/app/components/AppContainer.svelte
+++ b/src/app/components/AppContainer.svelte
@@ -5,7 +5,7 @@
   import Landing from "@app/components/Landing.svelte"
   import Toast from "@app/components/Toast.svelte"
   import PrimaryNav from "@app/components/PrimaryNav.svelte"
-  import {modal} from "@app/util/modal"
+  import {modal} from "@app/modal"
 
   interface Props {
     children: Snippet
diff --git a/src/app/components/BunkerConnect.svelte b/src/app/components/BunkerConnect.svelte
index 8755c61a..179b3cb5 100644
--- a/src/app/components/BunkerConnect.svelte
+++ b/src/app/components/BunkerConnect.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import Spinner from "@lib/components/Spinner.svelte"
   import QRCode from "@app/components/QRCode.svelte"
-  import type {Nip46Controller} from "@app/util/nip46"
+  import type {Nip46Controller} from "@app/nip46"
 
   type Props = {
     controller: Nip46Controller
diff --git a/src/app/components/BunkerUrl.svelte b/src/app/components/BunkerUrl.svelte
index 984e3950..fce640bf 100644
--- a/src/app/components/BunkerUrl.svelte
+++ b/src/app/components/BunkerUrl.svelte
@@ -7,8 +7,8 @@
   import QrCode from "@assets/icons/qr-code.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
   import InfoBunker from "@app/components/InfoBunker.svelte"
-  import type {Nip46Controller} from "@app/util/nip46"
-  import {pushModal} from "@app/util/modal"
+  import type {Nip46Controller} from "@app/nip46"
+  import {pushModal} from "@app/modal"
 
   type Props = {
     controller: Nip46Controller
diff --git a/src/app/components/CalendarEventActions.svelte b/src/app/components/CalendarEventActions.svelte
index 864fe35f..6908083b 100644
--- a/src/app/components/CalendarEventActions.svelte
+++ b/src/app/components/CalendarEventActions.svelte
@@ -13,8 +13,8 @@
   import EventActions from "@app/components/EventActions.svelte"
   import CalendarEventEdit from "@app/components/CalendarEventEdit.svelte"
   import {publishDelete, publishReaction, canEnforceNip70} from "@app/core/commands"
-  import {makeCalendarPath, makeSpacePath} from "@app/util/routes"
-  import {pushModal} from "@app/util/modal"
+  import {makeCalendarPath, makeSpacePath} from "@app/routes"
+  import {pushModal} from "@app/modal"
 
   type Props = {
     url: string
diff --git a/src/app/components/CalendarEventForm.svelte b/src/app/components/CalendarEventForm.svelte
index 1f57c8c0..71bfeacf 100644
--- a/src/app/components/CalendarEventForm.svelte
+++ b/src/app/components/CalendarEventForm.svelte
@@ -20,8 +20,8 @@
   import EditorContent from "@app/editor/EditorContent.svelte"
   import {PROTECTED} from "@app/core/state"
   import {makeEditor} from "@app/editor"
-  import {DraftKey} from "@app/util/drafts"
-  import {pushToast} from "@app/util/toast"
+  import {DraftKey} from "@app/drafts"
+  import {pushToast} from "@app/toast"
   import {canEnforceNip70, publishRoomQuote} from "@app/core/commands"
 
   type Values = {
diff --git a/src/app/components/CalendarEventItem.svelte b/src/app/components/CalendarEventItem.svelte
index 945a6d58..01e89143 100644
--- a/src/app/components/CalendarEventItem.svelte
+++ b/src/app/components/CalendarEventItem.svelte
@@ -6,7 +6,7 @@
   import CalendarEventHeader from "@app/components/CalendarEventHeader.svelte"
   import ProfileLink from "@app/components/ProfileLink.svelte"
   import RoomLink from "@app/components/RoomLink.svelte"
-  import {makeCalendarPath} from "@app/util/routes"
+  import {makeCalendarPath} from "@app/routes"
 
   type Props = {
     url: string
diff --git a/src/app/components/Chat.svelte b/src/app/components/Chat.svelte
index d5eb969e..70f7bb62 100644
--- a/src/app/components/Chat.svelte
+++ b/src/app/components/Chat.svelte
@@ -54,10 +54,10 @@
   import ChatComposeParent from "@app/components/ChatComposeParent.svelte"
   import ThunkToast from "@app/components/ThunkToast.svelte"
   import {userSettingsValues, deriveChat, makeChatId} from "@app/core/state"
-  import {pushModal} from "@app/util/modal"
-  import {DraftKey} from "@app/util/drafts"
+  import {pushModal} from "@app/modal"
+  import {DraftKey} from "@app/drafts"
   import {makeDelete, prependParent} from "@app/core/commands"
-  import {pushToast} from "@app/util/toast"
+  import {pushToast} from "@app/toast"
 
   type Props = {
     pubkeys: string[]
diff --git a/src/app/components/ChatCompose.svelte b/src/app/components/ChatCompose.svelte
index f5bba8a4..a38a2336 100644
--- a/src/app/components/ChatCompose.svelte
+++ b/src/app/components/ChatCompose.svelte
@@ -10,7 +10,7 @@
   import Button from "@lib/components/Button.svelte"
   import EditorContent from "@app/editor/EditorContent.svelte"
   import {makeEditor} from "@app/editor"
-  import {type DraftKey} from "@app/util/drafts"
+  import {type DraftKey} from "@app/drafts"
 
   type Values = {
     content?: string | object
diff --git a/src/app/components/ChatEnable.svelte b/src/app/components/ChatEnable.svelte
index 8025b97d..0da9c80b 100644
--- a/src/app/components/ChatEnable.svelte
+++ b/src/app/components/ChatEnable.svelte
@@ -13,7 +13,7 @@
   import ModalTitle from "@lib/components/ModalTitle.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import {DEFAULT_RELAYS, DEFAULT_MESSAGING_RELAYS} from "@app/core/state"
-  import {pushToast} from "@app/util/toast"
+  import {pushToast} from "@app/toast"
 
   type Props = {
     next: () => void
diff --git a/src/app/components/ChatItem.svelte b/src/app/components/ChatItem.svelte
index 74829c66..6a09b4a0 100644
--- a/src/app/components/ChatItem.svelte
+++ b/src/app/components/ChatItem.svelte
@@ -9,8 +9,8 @@
   import ProfileName from "@app/components/ProfileName.svelte"
   import ProfileCircle from "@app/components/ProfileCircle.svelte"
   import ProfileCircles from "@app/components/ProfileCircles.svelte"
-  import {makeChatPath, goToChat} from "@app/util/routes"
-  import {notifications} from "@app/util/notifications"
+  import {makeChatPath, goToChat} from "@app/routes"
+  import {notifications} from "@app/notifications"
 
   interface Props {
     id: string
diff --git a/src/app/components/ChatMenu.svelte b/src/app/components/ChatMenu.svelte
index 17d8d301..e4381bc8 100644
--- a/src/app/components/ChatMenu.svelte
+++ b/src/app/components/ChatMenu.svelte
@@ -7,7 +7,7 @@
   import Button from "@lib/components/Button.svelte"
   import Modal from "@lib/components/Modal.svelte"
   import ModalBody from "@lib/components/ModalBody.svelte"
-  import {setChecked} from "@app/util/notifications"
+  import {setChecked} from "@app/notifications"
   import {notificationSettings} from "@app/core/state"
 
   const markAsRead = () => {
diff --git a/src/app/components/ChatMessage.svelte b/src/app/components/ChatMessage.svelte
index c54249b1..8b9823d5 100644
--- a/src/app/components/ChatMessage.svelte
+++ b/src/app/components/ChatMessage.svelte
@@ -18,7 +18,7 @@
   import ChatMessageMenuMobile from "@app/components/ChatMessageMenuMobile.svelte"
   import {colors} from "@app/core/state"
   import {makeDelete, makeReaction} from "@app/core/commands"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
 
   interface Props {
     event: TrustedEvent
diff --git a/src/app/components/ChatMessageMenu.svelte b/src/app/components/ChatMessageMenu.svelte
index 60691daa..c16040b4 100644
--- a/src/app/components/ChatMessageMenu.svelte
+++ b/src/app/components/ChatMessageMenu.svelte
@@ -3,7 +3,7 @@
   import Button from "@lib/components/Button.svelte"
   import ChatMessageEmojiButton from "@app/components/ChatMessageEmojiButton.svelte"
   import EventInfo from "@app/components/EventInfo.svelte"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
   import Pen from "@assets/icons/pen.svg?dataurl"
   import Reply from "@assets/icons/reply-2.svg?dataurl"
   import Code2 from "@assets/icons/code-2.svg?dataurl"
diff --git a/src/app/components/ChatMessageMenuMobile.svelte b/src/app/components/ChatMessageMenuMobile.svelte
index 279a8d8a..e9a84ef5 100644
--- a/src/app/components/ChatMessageMenuMobile.svelte
+++ b/src/app/components/ChatMessageMenuMobile.svelte
@@ -14,8 +14,8 @@
   import EmojiPicker from "@lib/components/EmojiPicker.svelte"
   import EventInfo from "@app/components/EventInfo.svelte"
   import {makeReaction} from "@app/core/commands"
-  import {pushModal} from "@app/util/modal"
-  import {clip} from "@app/util/toast"
+  import {pushModal} from "@app/modal"
+  import {clip} from "@app/toast"
 
   type Props = {
     pubkeys: string[]
diff --git a/src/app/components/ChatStart.svelte b/src/app/components/ChatStart.svelte
index 37c6dd15..173ab14a 100644
--- a/src/app/components/ChatStart.svelte
+++ b/src/app/components/ChatStart.svelte
@@ -18,7 +18,7 @@
   import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import ProfileMultiSelect from "@app/components/ProfileMultiSelect.svelte"
-  import {goToChat} from "@app/util/routes"
+  import {goToChat} from "@app/routes"
 
   const back = () => history.back()
 
diff --git a/src/app/components/ClassifiedActions.svelte b/src/app/components/ClassifiedActions.svelte
index dcd46dfc..e79ab04f 100644
--- a/src/app/components/ClassifiedActions.svelte
+++ b/src/app/components/ClassifiedActions.svelte
@@ -16,8 +16,8 @@
   import EventActions from "@app/components/EventActions.svelte"
   import ClassifiedEdit from "@app/components/ClassifiedEdit.svelte"
   import {publishDelete, publishReaction, canEnforceNip70} from "@app/core/commands"
-  import {makeClassifiedPath, makeSpacePath} from "@app/util/routes"
-  import {pushModal} from "@app/util/modal"
+  import {makeClassifiedPath, makeSpacePath} from "@app/routes"
+  import {pushModal} from "@app/modal"
 
   interface Props {
     url: string
diff --git a/src/app/components/ClassifiedForm.svelte b/src/app/components/ClassifiedForm.svelte
index 961fbd77..3b26d317 100644
--- a/src/app/components/ClassifiedForm.svelte
+++ b/src/app/components/ClassifiedForm.svelte
@@ -17,10 +17,10 @@
   import CurrencyInput from "@app/components/CurrencyInput.svelte"
   import TopicMultiSelect from "@app/components/TopicMultiSelect.svelte"
   import EditorContent from "@app/editor/EditorContent.svelte"
-  import {pushToast} from "@app/util/toast"
+  import {pushToast} from "@app/toast"
   import {PROTECTED} from "@app/core/state"
   import {makeEditor} from "@app/editor"
-  import {DraftKey} from "@app/util/drafts"
+  import {DraftKey} from "@app/drafts"
   import {canEnforceNip70, publishRoomQuote, uploadFile} from "@app/core/commands"
 
   type Values = {
diff --git a/src/app/components/ClassifiedItem.svelte b/src/app/components/ClassifiedItem.svelte
index ebfe24c1..84ba53c1 100644
--- a/src/app/components/ClassifiedItem.svelte
+++ b/src/app/components/ClassifiedItem.svelte
@@ -9,7 +9,7 @@
   import ProfileLink from "@app/components/ProfileLink.svelte"
   import ClassifiedActions from "@app/components/ClassifiedActions.svelte"
   import RoomLink from "@app/components/RoomLink.svelte"
-  import {makeClassifiedPath} from "@app/util/routes"
+  import {makeClassifiedPath} from "@app/routes"
 
   type Props = {
     url: string
diff --git a/src/app/components/CommentActions.svelte b/src/app/components/CommentActions.svelte
index 348f36b0..380e6eb9 100644
--- a/src/app/components/CommentActions.svelte
+++ b/src/app/components/CommentActions.svelte
@@ -5,7 +5,7 @@
   import EventActivity from "@app/components/EventActivity.svelte"
   import EventActions from "@app/components/EventActions.svelte"
   import {publishDelete, publishReaction, canEnforceNip70} from "@app/core/commands"
-  import {makeSpacePath} from "@app/util/routes"
+  import {makeSpacePath} from "@app/routes"
 
   interface Props {
     url: string
diff --git a/src/app/components/ComposeMenu.svelte b/src/app/components/ComposeMenu.svelte
index 408f3f95..d5fa95ca 100644
--- a/src/app/components/ComposeMenu.svelte
+++ b/src/app/components/ComposeMenu.svelte
@@ -7,7 +7,7 @@
   import Revote from "@assets/icons/revote.svg?dataurl"
   import Button from "@lib/components/Button.svelte"
   import Icon from "@lib/components/Icon.svelte"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
   import CalendarEventCreate from "@app/components/CalendarEventCreate.svelte"
   import ThreadCreate from "@app/components/ThreadCreate.svelte"
   import ClassifiedCreate from "@app/components/ClassifiedCreate.svelte"
diff --git a/src/app/components/ContentLinkBlock.svelte b/src/app/components/ContentLinkBlock.svelte
index fec50b30..319510a1 100644
--- a/src/app/components/ContentLinkBlock.svelte
+++ b/src/app/components/ContentLinkBlock.svelte
@@ -7,7 +7,7 @@
   import ContentLinkDetail from "@app/components/ContentLinkDetail.svelte"
   import ContentLinkUrl from "@app/components/ContentLinkUrl.svelte"
   import ContentLinkBlockImage from "@app/components/ContentLinkBlockImage.svelte"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
   import {
     dufflepud,
     IMAGE_CONTENT_TYPES,
diff --git a/src/app/components/ContentLinkInline.svelte b/src/app/components/ContentLinkInline.svelte
index fec1055c..b894f1ce 100644
--- a/src/app/components/ContentLinkInline.svelte
+++ b/src/app/components/ContentLinkInline.svelte
@@ -6,7 +6,7 @@
   import Icon from "@lib/components/Icon.svelte"
   import ContentLinkDetail from "@app/components/ContentLinkDetail.svelte"
   import ContentLinkUrl from "@app/components/ContentLinkUrl.svelte"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
   import {IMAGE_CONTENT_TYPES} from "@app/core/state"
 
   const {value, event} = $props()
diff --git a/src/app/components/ContentLinkUrl.svelte b/src/app/components/ContentLinkUrl.svelte
index 38a25e12..ec46636e 100644
--- a/src/app/components/ContentLinkUrl.svelte
+++ b/src/app/components/ContentLinkUrl.svelte
@@ -5,7 +5,7 @@
   import Icon from "@lib/components/Icon.svelte"
   import Link from "@lib/components/Link.svelte"
   import {PLATFORM_URL, displayRoom, isRoomId, splitRoomId} from "@app/core/state"
-  import {makeRoomPath, makeSpacePath} from "@app/util/routes"
+  import {makeRoomPath, makeSpacePath} from "@app/routes"
 
   const {
     url,
diff --git a/src/app/components/ContentMention.svelte b/src/app/components/ContentMention.svelte
index 82ad87a0..17512e77 100644
--- a/src/app/components/ContentMention.svelte
+++ b/src/app/components/ContentMention.svelte
@@ -4,7 +4,7 @@
   import {deriveProfileDisplay} from "@welshman/app"
   import Button from "@lib/components/Button.svelte"
   import ProfileDetail from "@app/components/ProfileDetail.svelte"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
 
   type Props = {
     value: ProfilePointer
diff --git a/src/app/components/ContentQuote.svelte b/src/app/components/ContentQuote.svelte
index f36993f8..23e82d66 100644
--- a/src/app/components/ContentQuote.svelte
+++ b/src/app/components/ContentQuote.svelte
@@ -8,7 +8,7 @@
   import NoteCard from "@app/components/NoteCard.svelte"
   import NoteContentMinimal from "@app/components/NoteContentMinimal.svelte"
   import {deriveEvent, entityLink} from "@app/core/state"
-  import {goToEvent} from "@app/util/routes"
+  import {goToEvent} from "@app/routes"
 
   type Props = {
     value: any
diff --git a/src/app/components/ContentToken.svelte b/src/app/components/ContentToken.svelte
index f188cdea..e4a0a643 100644
--- a/src/app/components/ContentToken.svelte
+++ b/src/app/components/ContentToken.svelte
@@ -2,7 +2,7 @@
   import Bolt from "@assets/icons/bolt.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
-  import {clip} from "@app/util/toast"
+  import {clip} from "@app/toast"
 
   const {value} = $props()
 
diff --git a/src/app/components/EventActivity.svelte b/src/app/components/EventActivity.svelte
index 9457a473..3f2dac4d 100644
--- a/src/app/components/EventActivity.svelte
+++ b/src/app/components/EventActivity.svelte
@@ -6,7 +6,7 @@
   import {deriveArray, deriveEventsById} from "@welshman/store"
   import type {TrustedEvent} from "@welshman/util"
   import {repository} from "@welshman/app"
-  import {deriveChecked} from "@app/util/notifications"
+  import {deriveChecked} from "@app/notifications"
   import Reply from "@assets/icons/reply-2.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
 
diff --git a/src/app/components/EventDeleteConfirm.svelte b/src/app/components/EventDeleteConfirm.svelte
index b9186b8a..e9e1931c 100644
--- a/src/app/components/EventDeleteConfirm.svelte
+++ b/src/app/components/EventDeleteConfirm.svelte
@@ -2,7 +2,7 @@
   import type {TrustedEvent} from "@welshman/util"
   import Confirm from "@lib/components/Confirm.svelte"
   import {publishDelete, canEnforceNip70} from "@app/core/commands"
-  import {clearModals} from "@app/util/modal"
+  import {clearModals} from "@app/modal"
 
   type Props = {
     url: string
diff --git a/src/app/components/EventInfo.svelte b/src/app/components/EventInfo.svelte
index 3acbe579..212577d6 100644
--- a/src/app/components/EventInfo.svelte
+++ b/src/app/components/EventInfo.svelte
@@ -17,7 +17,7 @@
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import ModalTitle from "@lib/components/ModalTitle.svelte"
   import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
-  import {clip} from "@app/util/toast"
+  import {clip} from "@app/toast"
 
   type Props = {
     url?: string
diff --git a/src/app/components/EventMenu.svelte b/src/app/components/EventMenu.svelte
index 174a28b5..145b318c 100644
--- a/src/app/components/EventMenu.svelte
+++ b/src/app/components/EventMenu.svelte
@@ -18,9 +18,9 @@
   import EventShare from "@app/components/EventShare.svelte"
   import EventDeleteConfirm from "@app/components/EventDeleteConfirm.svelte"
   import {hasNip29, deriveUserIsSpaceAdmin} from "@app/core/state"
-  import {pushModal} from "@app/util/modal"
-  import {pushToast} from "@app/util/toast"
-  import {makeSpaceChatPath} from "@app/util/routes"
+  import {pushModal} from "@app/modal"
+  import {pushToast} from "@app/toast"
+  import {makeSpaceChatPath} from "@app/routes"
 
   type Props = {
     url: string
diff --git a/src/app/components/EventReply.svelte b/src/app/components/EventReply.svelte
index d7377826..ba72d07b 100644
--- a/src/app/components/EventReply.svelte
+++ b/src/app/components/EventReply.svelte
@@ -10,8 +10,8 @@
   import {publishComment, canEnforceNip70} from "@app/core/commands"
   import {PROTECTED} from "@app/core/state"
   import {makeEditor} from "@app/editor"
-  import {DraftKey} from "@app/util/drafts"
-  import {pushToast} from "@app/util/toast"
+  import {DraftKey} from "@app/drafts"
+  import {pushToast} from "@app/toast"
 
   type Values = {
     content?: string | object
diff --git a/src/app/components/EventShare.svelte b/src/app/components/EventShare.svelte
index 61b745db..e1e3130f 100644
--- a/src/app/components/EventShare.svelte
+++ b/src/app/components/EventShare.svelte
@@ -15,7 +15,7 @@
   import ModalBody from "@lib/components/ModalBody.svelte"
   import RoomName from "@app/components/RoomName.svelte"
   import {roomsByUrl} from "@app/core/state"
-  import {makeRoomPath} from "@app/util/routes"
+  import {makeRoomPath} from "@app/routes"
 
   const {url, noun, event}: {url: string; noun: string; event: TrustedEvent} = $props()
 
diff --git a/src/app/components/GoalActions.svelte b/src/app/components/GoalActions.svelte
index b4cd0c8c..819fe0af 100644
--- a/src/app/components/GoalActions.svelte
+++ b/src/app/components/GoalActions.svelte
@@ -8,7 +8,7 @@
   import EventActions from "@app/components/EventActions.svelte"
   import RoomName from "@app/components/RoomName.svelte"
   import {publishDelete, publishReaction, canEnforceNip70} from "@app/core/commands"
-  import {makeGoalPath, makeSpacePath} from "@app/util/routes"
+  import {makeGoalPath, makeSpacePath} from "@app/routes"
 
   interface Props {
     url: string
diff --git a/src/app/components/GoalCreate.svelte b/src/app/components/GoalCreate.svelte
index 3359f007..d4f1234c 100644
--- a/src/app/components/GoalCreate.svelte
+++ b/src/app/components/GoalCreate.svelte
@@ -18,10 +18,10 @@
   import Modal from "@lib/components/Modal.svelte"
   import ModalBody from "@lib/components/ModalBody.svelte"
   import EditorContent from "@app/editor/EditorContent.svelte"
-  import {pushToast} from "@app/util/toast"
+  import {pushToast} from "@app/toast"
   import {PROTECTED} from "@app/core/state"
   import {makeEditor} from "@app/editor"
-  import {DraftKey} from "@app/util/drafts"
+  import {DraftKey} from "@app/drafts"
   import {canEnforceNip70, publishRoomQuote} from "@app/core/commands"
 
   type Values = {
diff --git a/src/app/components/GoalItem.svelte b/src/app/components/GoalItem.svelte
index 11d697b0..0c3c62bb 100644
--- a/src/app/components/GoalItem.svelte
+++ b/src/app/components/GoalItem.svelte
@@ -7,7 +7,7 @@
   import GoalActions from "@app/components/GoalActions.svelte"
   import GoalSummary from "@app/components/GoalSummary.svelte"
   import RoomLink from "@app/components/RoomLink.svelte"
-  import {makeGoalPath} from "@app/util/routes"
+  import {makeGoalPath} from "@app/routes"
 
   type Props = {
     url: string
diff --git a/src/app/components/InfoKeys.svelte b/src/app/components/InfoKeys.svelte
index 4809f9c6..4ba90efe 100644
--- a/src/app/components/InfoKeys.svelte
+++ b/src/app/components/InfoKeys.svelte
@@ -12,7 +12,7 @@
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import KeyRecoveryRequest from "@app/components/KeyRecoveryRequest.svelte"
   import {PLATFORM_NAME} from "@app/core/state"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
 
   const back = () => history.back()
 
diff --git a/src/app/components/KeyDownload.svelte b/src/app/components/KeyDownload.svelte
index 87ce677f..4eae1df8 100644
--- a/src/app/components/KeyDownload.svelte
+++ b/src/app/components/KeyDownload.svelte
@@ -16,7 +16,7 @@
   import ModalTitle from "@lib/components/ModalTitle.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import ProgressBar from "@app/components/ProgressBar.svelte"
-  import {pushToast} from "@app/util/toast"
+  import {pushToast} from "@app/toast"
   import {PLATFORM_NAME} from "@app/core/state"
 
   type Props = {
diff --git a/src/app/components/KeyRecoveryConfirm.svelte b/src/app/components/KeyRecoveryConfirm.svelte
index d263e157..5b98d555 100644
--- a/src/app/components/KeyRecoveryConfirm.svelte
+++ b/src/app/components/KeyRecoveryConfirm.svelte
@@ -17,8 +17,8 @@
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import StringMultiInput from "@lib/components/StringMultiInput.svelte"
   import KeyDownload from "@app/components/KeyDownload.svelte"
-  import {pushToast} from "@app/util/toast"
-  import {pushModal, clearModals} from "@app/util/modal"
+  import {pushToast} from "@app/toast"
+  import {pushModal, clearModals} from "@app/modal"
 
   type Props = {
     peersByPrefix: Map<string, string>
diff --git a/src/app/components/KeyRecoveryRequest.svelte b/src/app/components/KeyRecoveryRequest.svelte
index 82bde83f..0d29c85b 100644
--- a/src/app/components/KeyRecoveryRequest.svelte
+++ b/src/app/components/KeyRecoveryRequest.svelte
@@ -14,7 +14,7 @@
   import ModalTitle from "@lib/components/ModalTitle.svelte"
   import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
   import KeyRecoveryConfirm from "@app/components/KeyRecoveryConfirm.svelte"
 
   const {
diff --git a/src/app/components/Landing.svelte b/src/app/components/Landing.svelte
index 8e2962ec..c2a4098f 100644
--- a/src/app/components/Landing.svelte
+++ b/src/app/components/Landing.svelte
@@ -10,7 +10,7 @@
   import LogIn from "@app/components/LogIn.svelte"
   import SignUp from "@app/components/SignUp.svelte"
   import {PLATFORM_TERMS, PLATFORM_PRIVACY, PLATFORM_NAME} from "@app/core/state"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
 
   const logIn = () => pushModal(LogIn)
 
diff --git a/src/app/components/LogIn.svelte b/src/app/components/LogIn.svelte
index 7bdd2ccd..e2458840 100644
--- a/src/app/components/LogIn.svelte
+++ b/src/app/components/LogIn.svelte
@@ -18,10 +18,10 @@
   import LogInBunker from "@app/components/LogInBunker.svelte"
   import LogInEmail from "@app/components/LogInEmail.svelte"
   import LogInKey from "@app/components/LogInKey.svelte"
-  import {pushModal, clearModals} from "@app/util/modal"
+  import {pushModal, clearModals} from "@app/modal"
   import {PLATFORM_NAME, POMADE_SIGNERS} from "@app/core/state"
-  import {pushToast} from "@app/util/toast"
-  import {setChecked} from "@app/util/notifications"
+  import {pushToast} from "@app/toast"
+  import {setChecked} from "@app/notifications"
 
   let signers: any[] = $state([])
   let loading: string | undefined = $state()
diff --git a/src/app/components/LogInBunker.svelte b/src/app/components/LogInBunker.svelte
index c5fc17de..8c538def 100644
--- a/src/app/components/LogInBunker.svelte
+++ b/src/app/components/LogInBunker.svelte
@@ -19,10 +19,10 @@
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import BunkerConnect from "@app/components/BunkerConnect.svelte"
   import BunkerUrl from "@app/components/BunkerUrl.svelte"
-  import {Nip46Controller} from "@app/util/nip46"
-  import {clearModals} from "@app/util/modal"
-  import {setChecked} from "@app/util/notifications"
-  import {pushToast} from "@app/util/toast"
+  import {Nip46Controller} from "@app/nip46"
+  import {clearModals} from "@app/modal"
+  import {setChecked} from "@app/notifications"
+  import {pushToast} from "@app/toast"
   import {SIGNER_RELAYS, NIP46_PERMS} from "@app/core/state"
 
   const back = () => {
diff --git a/src/app/components/LogInEmail.svelte b/src/app/components/LogInEmail.svelte
index eecc9042..af968a7f 100644
--- a/src/app/components/LogInEmail.svelte
+++ b/src/app/components/LogInEmail.svelte
@@ -18,11 +18,11 @@
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import LogInOTP from "@app/components/LogInOTP.svelte"
   import LogInSelect from "@app/components/LogInSelect.svelte"
-  import {deleteDeactivatedPomadeSessions, loginWithPomade} from "@app/util/pomade"
-  import {getPomadeLoginFailureMessage, POMADE_NETWORK_ERROR_MESSAGE} from "@app/util/pomadeErrors"
-  import {pushModal, clearModals} from "@app/util/modal"
-  import {setChecked} from "@app/util/notifications"
-  import {pushToast} from "@app/util/toast"
+  import {deleteDeactivatedPomadeSessions, loginWithPomade} from "@app/pomade"
+  import {getPomadeLoginFailureMessage, POMADE_NETWORK_ERROR_MESSAGE} from "@app/pomade"
+  import {pushModal, clearModals} from "@app/modal"
+  import {setChecked} from "@app/notifications"
+  import {pushToast} from "@app/toast"
 
   interface Props {
     email?: string
diff --git a/src/app/components/LogInKey.svelte b/src/app/components/LogInKey.svelte
index 3a31e58d..dd8c2ee6 100644
--- a/src/app/components/LogInKey.svelte
+++ b/src/app/components/LogInKey.svelte
@@ -19,9 +19,9 @@
   import ModalTitle from "@lib/components/ModalTitle.svelte"
   import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
-  import {clearModals} from "@app/util/modal"
-  import {setChecked} from "@app/util/notifications"
-  import {pushToast} from "@app/util/toast"
+  import {clearModals} from "@app/modal"
+  import {setChecked} from "@app/notifications"
+  import {pushToast} from "@app/toast"
 
   let loading = $state(false)
   let keyInput = $state("")
diff --git a/src/app/components/LogInOTP.svelte b/src/app/components/LogInOTP.svelte
index a5658e5d..74467f2a 100644
--- a/src/app/components/LogInOTP.svelte
+++ b/src/app/components/LogInOTP.svelte
@@ -15,9 +15,9 @@
   import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import LogInOTPConfirm from "@app/components/LogInOTPConfirm.svelte"
-  import {POMADE_NETWORK_ERROR_MESSAGE} from "@app/util/pomadeErrors"
-  import {pushModal} from "@app/util/modal"
-  import {pushToast} from "@app/util/toast"
+  import {POMADE_NETWORK_ERROR_MESSAGE} from "@app/pomade"
+  import {pushModal} from "@app/modal"
+  import {pushToast} from "@app/toast"
 
   interface Props {
     email?: string
diff --git a/src/app/components/LogInOTPConfirm.svelte b/src/app/components/LogInOTPConfirm.svelte
index 4b16a49f..8572d4c9 100644
--- a/src/app/components/LogInOTPConfirm.svelte
+++ b/src/app/components/LogInOTPConfirm.svelte
@@ -15,11 +15,11 @@
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import StringMultiInput from "@lib/components/StringMultiInput.svelte"
   import LogInSelect from "@app/components/LogInSelect.svelte"
-  import {pushModal, clearModals} from "@app/util/modal"
-  import {setChecked} from "@app/util/notifications"
-  import {deleteDeactivatedPomadeSessions, loginWithPomade} from "@app/util/pomade"
-  import {getPomadeLoginFailureMessage, POMADE_NETWORK_ERROR_MESSAGE} from "@app/util/pomadeErrors"
-  import {pushToast} from "@app/util/toast"
+  import {pushModal, clearModals} from "@app/modal"
+  import {setChecked} from "@app/notifications"
+  import {deleteDeactivatedPomadeSessions, loginWithPomade} from "@app/pomade"
+  import {getPomadeLoginFailureMessage, POMADE_NETWORK_ERROR_MESSAGE} from "@app/pomade"
+  import {pushToast} from "@app/toast"
 
   type Props = {
     email: string
diff --git a/src/app/components/LogInSelect.svelte b/src/app/components/LogInSelect.svelte
index 8d416afd..bc9f8023 100644
--- a/src/app/components/LogInSelect.svelte
+++ b/src/app/components/LogInSelect.svelte
@@ -13,11 +13,11 @@
   import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import Profile from "@app/components/Profile.svelte"
-  import {deleteDeactivatedPomadeSessions, loginWithPomade} from "@app/util/pomade"
-  import {getPomadeLoginFailureMessage, POMADE_NETWORK_ERROR_MESSAGE} from "@app/util/pomadeErrors"
-  import {setChecked} from "@app/util/notifications"
-  import {clearModals} from "@app/util/modal"
-  import {pushToast} from "@app/util/toast"
+  import {deleteDeactivatedPomadeSessions, loginWithPomade} from "@app/pomade"
+  import {getPomadeLoginFailureMessage, POMADE_NETWORK_ERROR_MESSAGE} from "@app/pomade"
+  import {setChecked} from "@app/notifications"
+  import {clearModals} from "@app/modal"
+  import {pushToast} from "@app/toast"
 
   interface Props {
     email: string
diff --git a/src/app/components/LogOut.svelte b/src/app/components/LogOut.svelte
index 762f9107..60baa1f7 100644
--- a/src/app/components/LogOut.svelte
+++ b/src/app/components/LogOut.svelte
@@ -9,7 +9,7 @@
   import ModalHeader from "@lib/components/ModalHeader.svelte"
   import ModalTitle from "@lib/components/ModalTitle.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
-  import {logout} from "@app/util/logout"
+  import {logout} from "@app/session"
 
   const back = () => history.back()
 
diff --git a/src/app/components/MenuSettings.svelte b/src/app/components/MenuSettings.svelte
index a26484f2..201c7372 100644
--- a/src/app/components/MenuSettings.svelte
+++ b/src/app/components/MenuSettings.svelte
@@ -13,8 +13,8 @@
   import ModalBody from "@lib/components/ModalBody.svelte"
   import Profile from "@app/components/Profile.svelte"
   import LogOut from "@app/components/LogOut.svelte"
-  import {pushModal} from "@app/util/modal"
-  import {theme} from "@app/util/theme"
+  import {pushModal} from "@app/modal"
+  import {theme} from "@app/theme"
 
   const logout = () => pushModal(LogOut)
   const toggleTheme = () => theme.set($theme === "dark" ? "light" : "dark")
diff --git a/src/app/components/ModalContainer.svelte b/src/app/components/ModalContainer.svelte
index fd261b3c..53d58c8d 100644
--- a/src/app/components/ModalContainer.svelte
+++ b/src/app/components/ModalContainer.svelte
@@ -2,7 +2,7 @@
   import {onMount, mount, unmount} from "svelte"
   import Drawer from "@lib/components/Drawer.svelte"
   import Dialog from "@lib/components/Dialog.svelte"
-  import {modal, modalStack, popModal} from "@app/util/modal"
+  import {modal, modalStack, popModal} from "@app/modal"
 
   const closeModal = () => {
     if ($modal && !$modal.options.noEscape) {
diff --git a/src/app/components/NewNotificationSound.svelte b/src/app/components/NewNotificationSound.svelte
index c5345b48..d0d6a803 100644
--- a/src/app/components/NewNotificationSound.svelte
+++ b/src/app/components/NewNotificationSound.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import {onMount} from "svelte"
   import {notificationSettings} from "@app/core/state"
-  import {onNotification} from "@app/util/push"
+  import {onNotification} from "@app/push"
 
   let audioElement: HTMLAudioElement
 
diff --git a/src/app/components/NoteCard.svelte b/src/app/components/NoteCard.svelte
index b3203a27..c6694a86 100644
--- a/src/app/components/NoteCard.svelte
+++ b/src/app/components/NoteCard.svelte
@@ -8,7 +8,7 @@
   import Button from "@lib/components/Button.svelte"
   import Profile from "@app/components/Profile.svelte"
   import ProfileName from "@app/components/ProfileName.svelte"
-  import {goToEvent} from "@app/util/routes"
+  import {goToEvent} from "@app/routes"
   import {isEventMuted} from "@app/core/state"
 
   const {
diff --git a/src/app/components/NoteContentMinimalPoll.svelte b/src/app/components/NoteContentMinimalPoll.svelte
index 25b5a622..9b7a6ebd 100644
--- a/src/app/components/NoteContentMinimalPoll.svelte
+++ b/src/app/components/NoteContentMinimalPoll.svelte
@@ -4,7 +4,7 @@
   import {POLL_RESPONSE} from "@welshman/util"
   import ContentMinimal from "@app/components/ContentMinimal.svelte"
   import {deriveEvents} from "@app/core/state"
-  import {getPollResults} from "@app/util/polls"
+  import {getPollResults} from "@app/polls"
 
   const props: ComponentProps<typeof ContentMinimal> = $props()
 
diff --git a/src/app/components/PasswordReset.svelte b/src/app/components/PasswordReset.svelte
index 2e21f0b9..4fe3c64e 100644
--- a/src/app/components/PasswordReset.svelte
+++ b/src/app/components/PasswordReset.svelte
@@ -16,9 +16,9 @@
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import StringMultiInput from "@lib/components/StringMultiInput.svelte"
   import PasswordResetConfirm from "@app/components/PasswordResetConfirm.svelte"
-  import {pushToast} from "@app/util/toast"
-  import {pushModal} from "@app/util/modal"
-  import {getPomadeClient} from "@app/util/pomade"
+  import {pushToast} from "@app/toast"
+  import {pushModal} from "@app/modal"
+  import {getPomadeClient} from "@app/pomade"
 
   type Props = {
     peersByPrefix: Map<string, string>
diff --git a/src/app/components/PasswordResetConfirm.svelte b/src/app/components/PasswordResetConfirm.svelte
index 076144d1..d8c9f9a5 100644
--- a/src/app/components/PasswordResetConfirm.svelte
+++ b/src/app/components/PasswordResetConfirm.svelte
@@ -16,9 +16,9 @@
   import ModalTitle from "@lib/components/ModalTitle.svelte"
   import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
-  import {loginWithPomade, deleteCurrentPomadeSession} from "@app/util/pomade"
-  import {clearModals} from "@app/util/modal"
-  import {pushToast} from "@app/util/toast"
+  import {loginWithPomade, deleteCurrentPomadeSession} from "@app/pomade"
+  import {clearModals} from "@app/modal"
+  import {pushToast} from "@app/toast"
 
   type Props = {
     userSecret: string
diff --git a/src/app/components/PeopleItem.svelte b/src/app/components/PeopleItem.svelte
index 34b7ef09..af4c0057 100644
--- a/src/app/components/PeopleItem.svelte
+++ b/src/app/components/PeopleItem.svelte
@@ -6,7 +6,7 @@
   import ProfileInfo from "@app/components/ProfileInfo.svelte"
   import ProfileBadges from "@app/components/ProfileBadges.svelte"
   import ProfileDetail from "@app/components/ProfileDetail.svelte"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
 
   type Props = {
     pubkey: string
diff --git a/src/app/components/PollCreate.svelte b/src/app/components/PollCreate.svelte
index 576a7034..c0bdcad7 100644
--- a/src/app/components/PollCreate.svelte
+++ b/src/app/components/PollCreate.svelte
@@ -19,11 +19,11 @@
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import Modal from "@lib/components/Modal.svelte"
   import ModalBody from "@lib/components/ModalBody.svelte"
-  import {pushToast} from "@app/util/toast"
+  import {pushToast} from "@app/toast"
   import {PROTECTED} from "@app/core/state"
   import {canEnforceNip70, publishRoomQuote} from "@app/core/commands"
-  import {DraftKey} from "@app/util/drafts"
-  import type {PollType} from "@app/util/polls"
+  import {DraftKey} from "@app/drafts"
+  import type {PollType} from "@app/polls"
 
   type Option = {
     id: string
diff --git a/src/app/components/PollItem.svelte b/src/app/components/PollItem.svelte
index 1f96e96a..c7cb5582 100644
--- a/src/app/components/PollItem.svelte
+++ b/src/app/components/PollItem.svelte
@@ -6,7 +6,7 @@
   import CommentActions from "@app/components/CommentActions.svelte"
   import RoomLink from "@app/components/RoomLink.svelte"
   import ProfileLink from "@app/components/ProfileLink.svelte"
-  import {makePollPath} from "@app/util/routes"
+  import {makePollPath} from "@app/routes"
 
   type Props = {
     url: string
diff --git a/src/app/components/PollOption.svelte b/src/app/components/PollOption.svelte
index b6146943..6bb7a531 100644
--- a/src/app/components/PollOption.svelte
+++ b/src/app/components/PollOption.svelte
@@ -3,7 +3,7 @@
   import type {TrustedEvent} from "@welshman/util"
   import {noop} from "@welshman/lib"
   import {stopPropagation} from "@lib/html"
-  import {getPollType, isPollClosed} from "@app/util/polls"
+  import {getPollType, isPollClosed} from "@app/polls"
 
   type Props = {
     event: TrustedEvent
diff --git a/src/app/components/PollVotes.svelte b/src/app/components/PollVotes.svelte
index ea7b3462..cd02c718 100644
--- a/src/app/components/PollVotes.svelte
+++ b/src/app/components/PollVotes.svelte
@@ -5,7 +5,7 @@
   import {pubkey, publishThunk, abortThunk} from "@welshman/app"
   import {formatTimestampRelative} from "@welshman/lib"
   import {deriveEvents} from "@app/core/state"
-  import {pushToast} from "@app/util/toast"
+  import {pushToast} from "@app/toast"
   import {makePollResponse} from "@app/core/commands"
   import PollOption from "@app/components/PollOption.svelte"
   import {
@@ -15,7 +15,7 @@
     getPollResults,
     getPollType,
     isPollClosed,
-  } from "@app/util/polls"
+  } from "@app/polls"
 
   type Props = {
     url: string
diff --git a/src/app/components/PomadeSessions.svelte b/src/app/components/PomadeSessions.svelte
index 50edee52..76b162dc 100644
--- a/src/app/components/PomadeSessions.svelte
+++ b/src/app/components/PomadeSessions.svelte
@@ -8,9 +8,9 @@
   import Button from "@lib/components/Button.svelte"
   import Popover from "@lib/components/Popover.svelte"
   import TrashBin2 from "@assets/icons/trash-bin-2.svg?dataurl"
-  import {pushToast} from "@app/util/toast"
-  import {loadOtherPomadeSessions} from "@app/util/pomade"
-  import type {PomadeSessionWithPeers} from "@app/util/pomade"
+  import {pushToast} from "@app/toast"
+  import {loadOtherPomadeSessions} from "@app/pomade"
+  import type {PomadeSessionWithPeers} from "@app/pomade"
 
   const toggleMenu = (client: string) => {
     menuClient = menuClient === client ? "" : client
diff --git a/src/app/components/PrimaryNav.svelte b/src/app/components/PrimaryNav.svelte
index 96208aee..89d297bd 100644
--- a/src/app/components/PrimaryNav.svelte
+++ b/src/app/components/PrimaryNav.svelte
@@ -12,9 +12,9 @@
   import PrimaryNavItem from "@lib/components/PrimaryNavItem.svelte"
   import PrimaryNavSpaces from "@app/components/PrimaryNavSpaces.svelte"
   import {userSpaceUrls, PLATFORM_RELAYS} from "@app/core/state"
-  import {pushModal} from "@app/util/modal"
-  import {notifications} from "@app/util/notifications"
-  import {goToChat, makeSpacePath} from "@app/util/routes"
+  import {pushModal} from "@app/modal"
+  import {notifications} from "@app/notifications"
+  import {goToChat, makeSpacePath} from "@app/routes"
 
   type Props = {
     children?: Snippet
diff --git a/src/app/components/PrimaryNavItemSpace.svelte b/src/app/components/PrimaryNavItemSpace.svelte
index 75e0851c..2c60dc10 100644
--- a/src/app/components/PrimaryNavItemSpace.svelte
+++ b/src/app/components/PrimaryNavItemSpace.svelte
@@ -2,8 +2,8 @@
   import {deriveRelayDisplay} from "@welshman/app"
   import PrimaryNavItem from "@lib/components/PrimaryNavItem.svelte"
   import RelayIcon from "@app/components/RelayIcon.svelte"
-  import {makeSpacePath, goToSpace} from "@app/util/routes"
-  import {notifications} from "@app/util/notifications"
+  import {makeSpacePath, goToSpace} from "@app/routes"
+  import {notifications} from "@app/notifications"
 
   type Props = {
     url: string
diff --git a/src/app/components/PrimaryNavSpaces.svelte b/src/app/components/PrimaryNavSpaces.svelte
index 60390360..68edc743 100644
--- a/src/app/components/PrimaryNavSpaces.svelte
+++ b/src/app/components/PrimaryNavSpaces.svelte
@@ -6,7 +6,7 @@
   import PrimaryNavItem from "@lib/components/PrimaryNavItem.svelte"
   import PrimaryNavItemSpace from "@app/components/PrimaryNavItemSpace.svelte"
   import {userSpaceUrls, PLATFORM_RELAYS, PLATFORM_LOGO} from "@app/core/state"
-  import {notifications} from "@app/util/notifications"
+  import {notifications} from "@app/notifications"
 
   let windowHeight = $state(0)
 
diff --git a/src/app/components/Profile.svelte b/src/app/components/Profile.svelte
index a144cf15..8b4cbe54 100644
--- a/src/app/components/Profile.svelte
+++ b/src/app/components/Profile.svelte
@@ -8,8 +8,8 @@
   import ProfileCircle from "@app/components/ProfileCircle.svelte"
   import WotScore from "@app/components/WotScore.svelte"
   import ProfileDetail from "@app/components/ProfileDetail.svelte"
-  import {pushModal} from "@app/util/modal"
-  import {clip} from "@app/util/toast"
+  import {pushModal} from "@app/modal"
+  import {clip} from "@app/toast"
   import Copy from "@assets/icons/copy.svg?dataurl"
 
   type Props = {
diff --git a/src/app/components/ProfileBadges.svelte b/src/app/components/ProfileBadges.svelte
index 65878879..09908156 100644
--- a/src/app/components/ProfileBadges.svelte
+++ b/src/app/components/ProfileBadges.svelte
@@ -10,8 +10,8 @@
   import Button from "@lib/components/Button.svelte"
   import ProfileSpaces from "@app/components/ProfileSpaces.svelte"
   import {deriveGroupList, getSpaceUrlsFromGroupList} from "@app/core/state"
-  import {goToEvent} from "@app/util/routes"
-  import {pushModal} from "@app/util/modal"
+  import {goToEvent} from "@app/routes"
+  import {pushModal} from "@app/modal"
 
   type Props = {
     pubkey: string
diff --git a/src/app/components/ProfileDelete.svelte b/src/app/components/ProfileDelete.svelte
index 282fb0d5..a51ed343 100644
--- a/src/app/components/ProfileDelete.svelte
+++ b/src/app/components/ProfileDelete.svelte
@@ -23,8 +23,8 @@
   import Modal from "@lib/components/Modal.svelte"
   import ModalBody from "@lib/components/ModalBody.svelte"
   import {INDEXER_RELAYS, PLATFORM_NAME, userSpaceUrls} from "@app/core/state"
-  import {pushToast} from "@app/util/toast"
-  import {logout} from "@app/util/logout"
+  import {pushToast} from "@app/toast"
+  import {logout} from "@app/session"
 
   let progress: number | undefined = $state(undefined)
   let confirmText = $state("")
diff --git a/src/app/components/ProfileDetail.svelte b/src/app/components/ProfileDetail.svelte
index 9580f8df..5561153c 100644
--- a/src/app/components/ProfileDetail.svelte
+++ b/src/app/components/ProfileDetail.svelte
@@ -30,9 +30,9 @@
   import ProfileBadges from "@app/components/ProfileBadges.svelte"
   import {pubkeyLink, deriveUserIsSpaceAdmin, deriveSpaceBannedPubkeyItems} from "@app/core/state"
   import {addSpaceMembers} from "@app/core/commands"
-  import {pushModal} from "@app/util/modal"
-  import {pushToast} from "@app/util/toast"
-  import {goToChat} from "@app/util/routes"
+  import {pushModal} from "@app/modal"
+  import {pushToast} from "@app/toast"
+  import {goToChat} from "@app/routes"
 
   export type Props = {
     pubkey: string
diff --git a/src/app/components/ProfileEdit.svelte b/src/app/components/ProfileEdit.svelte
index 7acbab14..e51a3cec 100644
--- a/src/app/components/ProfileEdit.svelte
+++ b/src/app/components/ProfileEdit.svelte
@@ -8,8 +8,8 @@
   import Button from "@lib/components/Button.svelte"
   import Spinner from "@lib/components/Spinner.svelte"
   import ProfileEditForm from "@app/components/ProfileEditForm.svelte"
-  import {clearModals} from "@app/util/modal"
-  import {pushToast} from "@app/util/toast"
+  import {clearModals} from "@app/modal"
+  import {pushToast} from "@app/toast"
   import {updateProfile} from "@app/core/commands"
 
   const profile = $profilesByPubkey.get($pubkey!) || makeProfile()
diff --git a/src/app/components/ProfileEditForm.svelte b/src/app/components/ProfileEditForm.svelte
index 16d88183..c44f6640 100644
--- a/src/app/components/ProfileEditForm.svelte
+++ b/src/app/components/ProfileEditForm.svelte
@@ -12,7 +12,7 @@
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import InputProfilePicture from "@app/components/InputProfilePicture.svelte"
   import InfoHandle from "@app/components/InfoHandle.svelte"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
 
   type Values = {
     profile: Profile
diff --git a/src/app/components/ProfileLink.svelte b/src/app/components/ProfileLink.svelte
index a844a4e8..c6053ad3 100644
--- a/src/app/components/ProfileLink.svelte
+++ b/src/app/components/ProfileLink.svelte
@@ -4,7 +4,7 @@
   import Button from "@lib/components/Button.svelte"
   import ProfileName from "@app/components/ProfileName.svelte"
   import ProfileDetail from "@app/components/ProfileDetail.svelte"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
 
   type Props = {
     pubkey: string
diff --git a/src/app/components/ProfileMultiSelect.svelte b/src/app/components/ProfileMultiSelect.svelte
index e5154bf6..e0b51151 100644
--- a/src/app/components/ProfileMultiSelect.svelte
+++ b/src/app/components/ProfileMultiSelect.svelte
@@ -14,7 +14,7 @@
   import ProfileSuggestion from "@app/editor/ProfileSuggestion.svelte"
   import ProfileName from "@app/components/ProfileName.svelte"
   import ProfileDetail from "@app/components/ProfileDetail.svelte"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
 
   interface Props {
     value: string[]
diff --git a/src/app/components/ProfileSpaces.svelte b/src/app/components/ProfileSpaces.svelte
index b1c2826c..7f2e566b 100644
--- a/src/app/components/ProfileSpaces.svelte
+++ b/src/app/components/ProfileSpaces.svelte
@@ -7,7 +7,7 @@
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import RelayIcon from "@app/components/RelayIcon.svelte"
   import RelayName from "@app/components/RelayName.svelte"
-  import {makeSpacePath} from "@app/util/routes"
+  import {makeSpacePath} from "@app/routes"
   import {deriveGroupList, getSpaceUrlsFromGroupList} from "@app/core/state"
 
   type Props = {
diff --git a/src/app/components/QRCode.svelte b/src/app/components/QRCode.svelte
index c1fb408f..b1f8f9cd 100644
--- a/src/app/components/QRCode.svelte
+++ b/src/app/components/QRCode.svelte
@@ -2,7 +2,7 @@
   import QRCode from "qrcode"
   import {onMount} from "svelte"
   import Button from "@lib/components/Button.svelte"
-  import {clip} from "@app/util/toast"
+  import {clip} from "@app/toast"
 
   const {code, ...props} = $props()
 
diff --git a/src/app/components/ReactionSummary.svelte b/src/app/components/ReactionSummary.svelte
index 812dc3d8..b7a6f3f2 100644
--- a/src/app/components/ReactionSummary.svelte
+++ b/src/app/components/ReactionSummary.svelte
@@ -24,7 +24,7 @@
   import Reaction from "@app/components/Reaction.svelte"
   import ReportDetails from "@app/components/ReportDetails.svelte"
   import {REACTION_KINDS, deriveUserIsSpaceAdmin} from "@app/core/state"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
 
   interface Props {
     event: TrustedEvent
diff --git a/src/app/components/RecentConversation.svelte b/src/app/components/RecentConversation.svelte
index 71eb5291..4ae6a510 100644
--- a/src/app/components/RecentConversation.svelte
+++ b/src/app/components/RecentConversation.svelte
@@ -10,7 +10,7 @@
   import NoteContentMinimal from "@app/components/NoteContentMinimal.svelte"
   import ProfileCircle from "@app/components/ProfileCircle.svelte"
   import RoomNameWithImage from "@app/components/RoomNameWithImage.svelte"
-  import {makeRoomPath, makeSpaceChatPath} from "@app/util/routes"
+  import {makeRoomPath, makeSpaceChatPath} from "@app/routes"
 
   type Props = {
     url: string
diff --git a/src/app/components/RelayAdd.svelte b/src/app/components/RelayAdd.svelte
index 232dc152..342a3a23 100644
--- a/src/app/components/RelayAdd.svelte
+++ b/src/app/components/RelayAdd.svelte
@@ -16,7 +16,7 @@
   import ModalBody from "@lib/components/ModalBody.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import RelayItem from "@app/components/RelayItem.svelte"
-  import {pushToast} from "@app/util/toast"
+  import {pushToast} from "@app/toast"
 
   interface Props {
     relays: Readable<string[]>
diff --git a/src/app/components/RelayList.svelte b/src/app/components/RelayList.svelte
index 2450ada9..985375c4 100644
--- a/src/app/components/RelayList.svelte
+++ b/src/app/components/RelayList.svelte
@@ -15,8 +15,8 @@
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import RelayAdd from "@app/components/RelayAdd.svelte"
   import RelayItem from "@app/components/RelayItem.svelte"
-  import {pushModal} from "@app/util/modal"
-  import {pushToast} from "@app/util/toast"
+  import {pushModal} from "@app/modal"
+  import {pushToast} from "@app/toast"
 
   interface Props {
     title: string
diff --git a/src/app/components/RelaySettingsHealthCheck.svelte b/src/app/components/RelaySettingsHealthCheck.svelte
index f562b226..83fcecb1 100644
--- a/src/app/components/RelaySettingsHealthCheck.svelte
+++ b/src/app/components/RelaySettingsHealthCheck.svelte
@@ -2,8 +2,8 @@
   import Stars from "@assets/icons/stars.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
-  import type {HealthCheck} from "@app/util/health"
-  import {applyHealthCheck} from "@app/util/health"
+  import type {HealthCheck} from "@app/healthChecks"
+  import {applyHealthCheck} from "@app/healthChecks"
 
   type Props = {
     healthCheck: HealthCheck
diff --git a/src/app/components/RelaySettingsHealthChecks.svelte b/src/app/components/RelaySettingsHealthChecks.svelte
index aca78b0e..2cb19bd4 100644
--- a/src/app/components/RelaySettingsHealthChecks.svelte
+++ b/src/app/components/RelaySettingsHealthChecks.svelte
@@ -7,7 +7,7 @@
   import Button from "@lib/components/Button.svelte"
   import RelaySettingsHealthCheck from "@app/components/RelaySettingsHealthCheck.svelte"
   import {PLATFORM_NAME} from "@app/core/state"
-  import {pendingHealthChecks, applyHealthCheck} from "@app/util/health"
+  import {pendingHealthChecks, applyHealthCheck} from "@app/healthChecks"
 
   const applyAll = () => {
     for (const healthCheck of $pendingHealthChecks) {
diff --git a/src/app/components/RelaySettingsItem.svelte b/src/app/components/RelaySettingsItem.svelte
index 70641930..f5e0b448 100644
--- a/src/app/components/RelaySettingsItem.svelte
+++ b/src/app/components/RelaySettingsItem.svelte
@@ -4,7 +4,7 @@
   import DangerTriangle from "@assets/icons/danger-triangle.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
   import RelayList from "@app/components/RelayList.svelte"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
 
   interface Props {
     icon: string
diff --git a/src/app/components/Report.svelte b/src/app/components/Report.svelte
index de70295e..682e6549 100644
--- a/src/app/components/Report.svelte
+++ b/src/app/components/Report.svelte
@@ -12,7 +12,7 @@
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import Modal from "@lib/components/Modal.svelte"
   import ModalBody from "@lib/components/ModalBody.svelte"
-  import {pushToast} from "@app/util/toast"
+  import {pushToast} from "@app/toast"
   import {publishReport} from "@app/core/commands"
 
   const {url, event} = $props()
diff --git a/src/app/components/ReportItem.svelte b/src/app/components/ReportItem.svelte
index 8d8a9a57..740b29f6 100644
--- a/src/app/components/ReportItem.svelte
+++ b/src/app/components/ReportItem.svelte
@@ -9,8 +9,8 @@
   import ProfileDetail from "@app/components/ProfileDetail.svelte"
   import NoteContent from "@app/components/NoteContent.svelte"
   import ReportMenu from "@app/components/ReportMenu.svelte"
-  import {pushModal} from "@app/util/modal"
-  import {goToEvent} from "@app/util/routes"
+  import {pushModal} from "@app/modal"
+  import {goToEvent} from "@app/routes"
 
   type Props = {
     url: string
diff --git a/src/app/components/ReportMenu.svelte b/src/app/components/ReportMenu.svelte
index 912aba64..929283ed 100644
--- a/src/app/components/ReportMenu.svelte
+++ b/src/app/components/ReportMenu.svelte
@@ -14,8 +14,8 @@
   import Confirm from "@lib/components/Confirm.svelte"
   import {deriveUserIsSpaceAdmin} from "@app/core/state"
   import {publishDelete, canEnforceNip70} from "@app/core/commands"
-  import {pushToast} from "@app/util/toast"
-  import {pushModal} from "@app/util/modal"
+  import {pushToast} from "@app/toast"
+  import {pushModal} from "@app/modal"
 
   type Props = {
     url: string
diff --git a/src/app/components/RoomCompose.svelte b/src/app/components/RoomCompose.svelte
index ee82dd10..494f79ea 100644
--- a/src/app/components/RoomCompose.svelte
+++ b/src/app/components/RoomCompose.svelte
@@ -12,7 +12,7 @@
   import ComposeMenu from "@app/components/ComposeMenu.svelte"
   import EditorContent from "@app/editor/EditorContent.svelte"
   import {makeEditor} from "@app/editor"
-  import {DraftKey} from "@app/util/drafts"
+  import {DraftKey} from "@app/drafts"
   import {onDestroy, onMount} from "svelte"
 
   type Values = {
diff --git a/src/app/components/RoomCreate.svelte b/src/app/components/RoomCreate.svelte
index ac14cd90..14266dc7 100644
--- a/src/app/components/RoomCreate.svelte
+++ b/src/app/components/RoomCreate.svelte
@@ -12,7 +12,7 @@
   import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import RoomForm from "@app/components/RoomForm.svelte"
-  import {makeSpacePath} from "@app/util/routes"
+  import {makeSpacePath} from "@app/routes"
 
   const {url} = $props()
 
diff --git a/src/app/components/RoomDetail.svelte b/src/app/components/RoomDetail.svelte
index 03378fd5..eee2731f 100644
--- a/src/app/components/RoomDetail.svelte
+++ b/src/app/components/RoomDetail.svelte
@@ -45,9 +45,9 @@
     removeRoomMembership,
     toggleRoomNotifications,
   } from "@app/core/commands"
-  import {makeSpacePath} from "@app/util/routes"
-  import {pushModal} from "@app/util/modal"
-  import {pushToast} from "@app/util/toast"
+  import {makeSpacePath} from "@app/routes"
+  import {pushModal} from "@app/modal"
+  import {pushToast} from "@app/toast"
 
   type Props = {
     url: string
diff --git a/src/app/components/RoomEdit.svelte b/src/app/components/RoomEdit.svelte
index c6a8aba5..e70a0247 100644
--- a/src/app/components/RoomEdit.svelte
+++ b/src/app/components/RoomEdit.svelte
@@ -12,7 +12,7 @@
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import RoomForm from "@app/components/RoomForm.svelte"
   import {deriveRoom} from "@app/core/state"
-  import {makeSpacePath} from "@app/util/routes"
+  import {makeSpacePath} from "@app/routes"
 
   type Props = {
     url: string
diff --git a/src/app/components/RoomForm.svelte b/src/app/components/RoomForm.svelte
index 9aaf77f5..1ff19782 100644
--- a/src/app/components/RoomForm.svelte
+++ b/src/app/components/RoomForm.svelte
@@ -14,7 +14,7 @@
   import IconPickerButton from "@lib/components/IconPickerButton.svelte"
   import Modal from "@lib/components/Modal.svelte"
   import ModalBody from "@lib/components/ModalBody.svelte"
-  import {pushToast} from "@app/util/toast"
+  import {pushToast} from "@app/toast"
   import {uploadFile} from "@app/core/commands"
   import {deriveHasLivekit, getRoomType, RoomType} from "@app/core/state"
 
diff --git a/src/app/components/RoomItem.svelte b/src/app/components/RoomItem.svelte
index ee031138..0d13542f 100644
--- a/src/app/components/RoomItem.svelte
+++ b/src/app/components/RoomItem.svelte
@@ -37,8 +37,8 @@
   import RoomItemContent from "@app/components/RoomItemContent.svelte"
   import {colors, ENABLE_ZAPS, deriveEventsForUrl, deriveEvent} from "@app/core/state"
   import {publishDelete, publishReaction, canEnforceNip70} from "@app/core/commands"
-  import {getRoomItemPath} from "@app/util/routes"
-  import {pushModal} from "@app/util/modal"
+  import {getRoomItemPath} from "@app/routes"
+  import {pushModal} from "@app/modal"
 
   interface Props {
     url: string
diff --git a/src/app/components/RoomItemContent.svelte b/src/app/components/RoomItemContent.svelte
index dc787b44..7bfb2f42 100644
--- a/src/app/components/RoomItemContent.svelte
+++ b/src/app/components/RoomItemContent.svelte
@@ -5,7 +5,7 @@
   import {isMobile} from "@lib/html"
   import Link from "@lib/components/Link.svelte"
   import NoteContent from "@app/components/NoteContent.svelte"
-  import {getRoomItemPath} from "@app/util/routes"
+  import {getRoomItemPath} from "@app/routes"
 
   const props: ComponentProps<typeof NoteContent> = $props()
   const path = getRoomItemPath(props.url!, props.event)
diff --git a/src/app/components/RoomItemMenu.svelte b/src/app/components/RoomItemMenu.svelte
index e03e47c8..d6b0318a 100644
--- a/src/app/components/RoomItemMenu.svelte
+++ b/src/app/components/RoomItemMenu.svelte
@@ -11,8 +11,8 @@
   import EventInfo from "@app/components/EventInfo.svelte"
   import Report from "@app/components/Report.svelte"
   import EventDeleteConfirm from "@app/components/EventDeleteConfirm.svelte"
-  import {pushModal} from "@app/util/modal"
-  import {pushToast} from "@app/util/toast"
+  import {pushModal} from "@app/modal"
+  import {pushToast} from "@app/toast"
   import {deriveUserIsSpaceAdmin} from "@app/core/state"
 
   type Props = {
diff --git a/src/app/components/RoomItemMenuMobile.svelte b/src/app/components/RoomItemMenuMobile.svelte
index b15d47cf..5090f239 100644
--- a/src/app/components/RoomItemMenuMobile.svelte
+++ b/src/app/components/RoomItemMenuMobile.svelte
@@ -19,8 +19,8 @@
   import EventDeleteConfirm from "@app/components/EventDeleteConfirm.svelte"
   import {ENABLE_ZAPS} from "@app/core/state"
   import {publishReaction, canEnforceNip70} from "@app/core/commands"
-  import {getRoomItemPath} from "@app/util/routes"
-  import {pushModal} from "@app/util/modal"
+  import {getRoomItemPath} from "@app/routes"
+  import {pushModal} from "@app/modal"
 
   type Props = {
     url: string
diff --git a/src/app/components/RoomJoinItem.svelte b/src/app/components/RoomJoinItem.svelte
index 5e7885ff..baf63856 100644
--- a/src/app/components/RoomJoinItem.svelte
+++ b/src/app/components/RoomJoinItem.svelte
@@ -6,8 +6,8 @@
   import ProfileName from "@app/components/ProfileName.svelte"
   import ProfileDetail from "@app/components/ProfileDetail.svelte"
   import RoomName from "@app/components/RoomName.svelte"
-  import {pushModal} from "@app/util/modal"
-  import {pushToast} from "@app/util/toast"
+  import {pushModal} from "@app/modal"
+  import {pushToast} from "@app/toast"
   import {deriveRoom} from "@app/core/state"
   import {addRoomMembers} from "@app/core/commands"
 
diff --git a/src/app/components/RoomLink.svelte b/src/app/components/RoomLink.svelte
index ce283d34..4e96c282 100644
--- a/src/app/components/RoomLink.svelte
+++ b/src/app/components/RoomLink.svelte
@@ -2,7 +2,7 @@
   import cx from "classnames"
   import Link from "@lib/components/Link.svelte"
   import RoomName from "@app/components/RoomName.svelte"
-  import {makeSpacePath} from "@app/util/routes"
+  import {makeSpacePath} from "@app/routes"
 
   type Props = {
     h: string
diff --git a/src/app/components/RoomMembers.svelte b/src/app/components/RoomMembers.svelte
index 8ff478b9..71e7cb97 100644
--- a/src/app/components/RoomMembers.svelte
+++ b/src/app/components/RoomMembers.svelte
@@ -19,8 +19,8 @@
   import RoomName from "@app/components/RoomName.svelte"
   import RoomMembersAdd from "@app/components/RoomMembersAdd.svelte"
   import {deriveRoom, deriveRoomMembers, deriveUserIsRoomAdmin} from "@app/core/state"
-  import {pushModal} from "@app/util/modal"
-  import {pushToast} from "@app/util/toast"
+  import {pushModal} from "@app/modal"
+  import {pushToast} from "@app/toast"
 
   interface Props {
     url: string
diff --git a/src/app/components/RoomMembersAdd.svelte b/src/app/components/RoomMembersAdd.svelte
index e02954ad..c3d6a34c 100644
--- a/src/app/components/RoomMembersAdd.svelte
+++ b/src/app/components/RoomMembersAdd.svelte
@@ -18,8 +18,8 @@
   import Confirm from "@lib/components/Confirm.svelte"
   import RoomName from "@app/components/RoomName.svelte"
   import ProfileMultiSelect from "@app/components/ProfileMultiSelect.svelte"
-  import {pushToast} from "@app/util/toast"
-  import {pushModal} from "@app/util/modal"
+  import {pushToast} from "@app/toast"
+  import {pushModal} from "@app/modal"
   import {deriveRoom, deriveSpaceMembers} from "@app/core/state"
   import {addRoomMembers} from "@app/core/commands"
 
diff --git a/src/app/components/SignUp.svelte b/src/app/components/SignUp.svelte
index 90a5f23d..1ca19c7c 100644
--- a/src/app/components/SignUp.svelte
+++ b/src/app/components/SignUp.svelte
@@ -23,9 +23,9 @@
     DEFAULT_RELAYS,
     DEFAULT_MESSAGING_RELAYS,
   } from "@app/core/state"
-  import {setChecked} from "@app/util/notifications"
-  import {loginWithPomade} from "@app/util/pomade"
-  import {pushModal, clearModals} from "@app/util/modal"
+  import {setChecked} from "@app/notifications"
+  import {loginWithPomade} from "@app/pomade"
+  import {pushModal, clearModals} from "@app/modal"
 
   setKey("signup.email", "")
   setKey("signup.secret", makeSecret())
diff --git a/src/app/components/SignUpEmail.svelte b/src/app/components/SignUpEmail.svelte
index 62961820..c48f8ba2 100644
--- a/src/app/components/SignUpEmail.svelte
+++ b/src/app/components/SignUpEmail.svelte
@@ -19,8 +19,8 @@
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import SignUpEmailConfirm from "@app/components/SignUpEmailConfirm.svelte"
   import ProgressBar from "@app/components/ProgressBar.svelte"
-  import {pushToast, popToast} from "@app/util/toast"
-  import {pushModal} from "@app/util/modal"
+  import {pushToast, popToast} from "@app/toast"
+  import {pushModal} from "@app/modal"
 
   type Props = {
     next: () => void
diff --git a/src/app/components/SignerStatus.svelte b/src/app/components/SignerStatus.svelte
index a6f6f18b..e2974566 100644
--- a/src/app/components/SignerStatus.svelte
+++ b/src/app/components/SignerStatus.svelte
@@ -8,7 +8,7 @@
   import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
   import LogOut from "@app/components/LogOut.svelte"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
   import PomadeSessions from "@app/components/PomadeSessions.svelte"
 
   const finished = $derived($signerLog.filter(x => x.finished_at))
diff --git a/src/app/components/SpaceAccessRequest.svelte b/src/app/components/SpaceAccessRequest.svelte
index 386303cd..8c15edbc 100644
--- a/src/app/components/SpaceAccessRequest.svelte
+++ b/src/app/components/SpaceAccessRequest.svelte
@@ -14,7 +14,7 @@
   import ModalTitle from "@lib/components/ModalTitle.svelte"
   import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
-  import {pushToast} from "@app/util/toast"
+  import {pushToast} from "@app/toast"
   import {attemptRelayAccess} from "@app/core/commands"
   import {parseInviteLink} from "@app/core/state"
 
diff --git a/src/app/components/SpaceAdd.svelte b/src/app/components/SpaceAdd.svelte
index 0445a93b..6742937a 100644
--- a/src/app/components/SpaceAdd.svelte
+++ b/src/app/components/SpaceAdd.svelte
@@ -11,7 +11,7 @@
   import ModalTitle from "@lib/components/ModalTitle.svelte"
   import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
   import SpaceInviteAccept from "@app/components/SpaceInviteAccept.svelte"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
 
   const startJoin = () => pushModal(SpaceInviteAccept)
 </script>
diff --git a/src/app/components/SpaceAuthError.svelte b/src/app/components/SpaceAuthError.svelte
index 08954f18..84d01146 100644
--- a/src/app/components/SpaceAuthError.svelte
+++ b/src/app/components/SpaceAuthError.svelte
@@ -15,7 +15,7 @@
   import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import SpaceAccessRequest from "@app/components/SpaceAccessRequest.svelte"
-  import {pushModal, clearModals} from "@app/util/modal"
+  import {pushModal, clearModals} from "@app/modal"
   import {removeSpaceMembership, publishLeaveRequest, removeTrustedRelay} from "@app/core/commands"
 
   const {url, error} = $props()
diff --git a/src/app/components/SpaceBar.svelte b/src/app/components/SpaceBar.svelte
index 38861ad5..a1174699 100644
--- a/src/app/components/SpaceBar.svelte
+++ b/src/app/components/SpaceBar.svelte
@@ -9,7 +9,7 @@
   import PageBar from "@lib/components/PageBar.svelte"
   import RelayIcon from "@app/components/RelayIcon.svelte"
   import {decodeRelay} from "@app/core/state"
-  import {makeSpacePath} from "@app/util/routes"
+  import {makeSpacePath} from "@app/routes"
 
   interface Props {
     back?: () => unknown
diff --git a/src/app/components/SpaceDetail.svelte b/src/app/components/SpaceDetail.svelte
index 7d23f447..bfd06ff3 100644
--- a/src/app/components/SpaceDetail.svelte
+++ b/src/app/components/SpaceDetail.svelte
@@ -19,7 +19,7 @@
   import RelayDescription from "@app/components/RelayDescription.svelte"
   import ProfileLatest from "@app/components/ProfileLatest.svelte"
   import {deriveUserIsSpaceAdmin} from "@app/core/state"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
 
   type Props = {
     url: string
diff --git a/src/app/components/SpaceEdit.svelte b/src/app/components/SpaceEdit.svelte
index 8739d470..5173fd21 100644
--- a/src/app/components/SpaceEdit.svelte
+++ b/src/app/components/SpaceEdit.svelte
@@ -19,8 +19,8 @@
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import ImageIcon from "@lib/components/ImageIcon.svelte"
   import IconPickerButton from "@lib/components/IconPickerButton.svelte"
-  import {pushToast} from "@app/util/toast"
-  import {clearModals} from "@app/util/modal"
+  import {pushToast} from "@app/toast"
+  import {clearModals} from "@app/modal"
   import {uploadFile} from "@app/core/commands"
 
   type Props = {
diff --git a/src/app/components/SpaceInvite.svelte b/src/app/components/SpaceInvite.svelte
index f28c22c7..8f296ab8 100644
--- a/src/app/components/SpaceInvite.svelte
+++ b/src/app/components/SpaceInvite.svelte
@@ -18,7 +18,7 @@
   import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import QRCode from "@app/components/QRCode.svelte"
-  import {clip} from "@app/util/toast"
+  import {clip} from "@app/toast"
   import {PLATFORM_URL} from "@app/core/state"
   import {deriveRelayAuthError} from "@app/core/commands"
 
diff --git a/src/app/components/SpaceInviteAccept.svelte b/src/app/components/SpaceInviteAccept.svelte
index 228e2441..16fe5fba 100644
--- a/src/app/components/SpaceInviteAccept.svelte
+++ b/src/app/components/SpaceInviteAccept.svelte
@@ -21,10 +21,10 @@
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import RelaySummary from "@app/components/RelaySummary.svelte"
   import SpaceJoinSettings from "@app/components/SpaceJoinSettings.svelte"
-  import {pushToast} from "@app/util/toast"
-  import {makeSpacePath} from "@app/util/routes"
+  import {pushToast} from "@app/toast"
+  import {makeSpacePath} from "@app/routes"
   import {relaysMostlyRestricted, notificationSettings, parseInviteLink} from "@app/core/state"
-  import {Push} from "@app/util/push"
+  import {Push} from "@app/push"
   import {
     attemptRelayAccess,
     addSpaceMembership,
diff --git a/src/app/components/SpaceJoin.svelte b/src/app/components/SpaceJoin.svelte
index 54e53147..36756365 100644
--- a/src/app/components/SpaceJoin.svelte
+++ b/src/app/components/SpaceJoin.svelte
@@ -21,10 +21,10 @@
     setSpaceNotifications,
   } from "@app/core/commands"
   import {relaysMostlyRestricted, notificationSettings} from "@app/core/state"
-  import {pushModal} from "@app/util/modal"
-  import {pushToast} from "@app/util/toast"
-  import {makeSpacePath} from "@app/util/routes"
-  import {Push} from "@app/util/push"
+  import {pushModal} from "@app/modal"
+  import {pushToast} from "@app/toast"
+  import {makeSpacePath} from "@app/routes"
+  import {Push} from "@app/push"
 
   type Props = {
     url: string
diff --git a/src/app/components/SpaceMembers.svelte b/src/app/components/SpaceMembers.svelte
index d8b311b6..8ffa26cd 100644
--- a/src/app/components/SpaceMembers.svelte
+++ b/src/app/components/SpaceMembers.svelte
@@ -27,8 +27,8 @@
     deriveUserIsSpaceAdmin,
     deriveSupportedMethods,
   } from "@app/core/state"
-  import {pushModal} from "@app/util/modal"
-  import {pushToast} from "@app/util/toast"
+  import {pushModal} from "@app/modal"
+  import {pushToast} from "@app/toast"
 
   interface Props {
     url: string
diff --git a/src/app/components/SpaceMembersAdd.svelte b/src/app/components/SpaceMembersAdd.svelte
index 4df724c9..9fbc5122 100644
--- a/src/app/components/SpaceMembersAdd.svelte
+++ b/src/app/components/SpaceMembersAdd.svelte
@@ -13,7 +13,7 @@
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import ProfileMultiSelect from "@app/components/ProfileMultiSelect.svelte"
   import {addSpaceMembers} from "@app/core/commands"
-  import {pushToast} from "@app/util/toast"
+  import {pushToast} from "@app/toast"
 
   interface Props {
     url: string
diff --git a/src/app/components/SpaceMembersBanned.svelte b/src/app/components/SpaceMembersBanned.svelte
index 135ce86e..843210f4 100644
--- a/src/app/components/SpaceMembersBanned.svelte
+++ b/src/app/components/SpaceMembersBanned.svelte
@@ -18,7 +18,7 @@
   import Profile from "@app/components/Profile.svelte"
   import {deriveSpaceBannedPubkeyItems, deriveSupportedMethods} from "@app/core/state"
   import {addSpaceMembers} from "@app/core/commands"
-  import {pushToast} from "@app/util/toast"
+  import {pushToast} from "@app/toast"
 
   interface Props {
     url: string
diff --git a/src/app/components/SpaceMenu.svelte b/src/app/components/SpaceMenu.svelte
index 20796ea4..9bdf8e2f 100644
--- a/src/app/components/SpaceMenu.svelte
+++ b/src/app/components/SpaceMenu.svelte
@@ -58,9 +58,9 @@
     displayRoom,
   } from "@app/core/state"
   import {setSpaceNotifications} from "@app/core/commands"
-  import {pushModal} from "@app/util/modal"
-  import {makeSpacePath, goToChat} from "@app/util/routes"
-  import {notifications} from "@app/util/notifications"
+  import {pushModal} from "@app/modal"
+  import {makeSpacePath, goToChat} from "@app/routes"
+  import {notifications} from "@app/notifications"
 
   const {url} = $props()
 
diff --git a/src/app/components/SpaceMenuRoomItem.svelte b/src/app/components/SpaceMenuRoomItem.svelte
index 96a88c3c..19ab2451 100644
--- a/src/app/components/SpaceMenuRoomItem.svelte
+++ b/src/app/components/SpaceMenuRoomItem.svelte
@@ -6,8 +6,8 @@
   import RoomNameWithImage from "@app/components/RoomNameWithImage.svelte"
   import VoiceRoomItem from "@app/components/VoiceRoomItem.svelte"
   import {deriveRoom, deriveShouldNotify, getRoomType, RoomType} from "@app/core/state"
-  import {notifications} from "@app/util/notifications"
-  import {makeRoomPath} from "@app/util/routes"
+  import {notifications} from "@app/notifications"
+  import {makeRoomPath} from "@app/routes"
 
   interface Props {
     url: any
diff --git a/src/app/components/SpaceSearch.svelte b/src/app/components/SpaceSearch.svelte
index ae32bcee..bf5e7505 100644
--- a/src/app/components/SpaceSearch.svelte
+++ b/src/app/components/SpaceSearch.svelte
@@ -12,7 +12,7 @@
   import Button from "@lib/components/Button.svelte"
   import Icon from "@lib/components/Icon.svelte"
   import {CONTENT_KINDS} from "@app/core/state"
-  import {goToEvent} from "@app/util/routes"
+  import {goToEvent} from "@app/routes"
 
   type Props = {
     url: string
diff --git a/src/app/components/SpaceTrustRelay.svelte b/src/app/components/SpaceTrustRelay.svelte
index 6b8ec8c5..e01e637d 100644
--- a/src/app/components/SpaceTrustRelay.svelte
+++ b/src/app/components/SpaceTrustRelay.svelte
@@ -17,7 +17,7 @@
   import InfoSignatures from "@app/components/InfoSignatures.svelte"
   import {relaysPendingTrust} from "@app/core/state"
   import {removeSpaceMembership, addTrustedRelay, removeTrustedRelay} from "@app/core/commands"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
 
   type Props = {
     url: string
diff --git a/src/app/components/ThreadActions.svelte b/src/app/components/ThreadActions.svelte
index d34dedea..fee30726 100644
--- a/src/app/components/ThreadActions.svelte
+++ b/src/app/components/ThreadActions.svelte
@@ -8,7 +8,7 @@
   import EventActivity from "@app/components/EventActivity.svelte"
   import EventActions from "@app/components/EventActions.svelte"
   import {publishDelete, publishReaction, canEnforceNip70} from "@app/core/commands"
-  import {makeThreadPath, makeSpacePath} from "@app/util/routes"
+  import {makeThreadPath, makeSpacePath} from "@app/routes"
 
   interface Props {
     url: string
diff --git a/src/app/components/ThreadCreate.svelte b/src/app/components/ThreadCreate.svelte
index fc68a95e..18e4d909 100644
--- a/src/app/components/ThreadCreate.svelte
+++ b/src/app/components/ThreadCreate.svelte
@@ -16,10 +16,10 @@
   import Modal from "@lib/components/Modal.svelte"
   import ModalBody from "@lib/components/ModalBody.svelte"
   import EditorContent from "@app/editor/EditorContent.svelte"
-  import {pushToast} from "@app/util/toast"
+  import {pushToast} from "@app/toast"
   import {PROTECTED} from "@app/core/state"
   import {makeEditor} from "@app/editor"
-  import {DraftKey} from "@app/util/drafts"
+  import {DraftKey} from "@app/drafts"
   import {canEnforceNip70, publishRoomQuote} from "@app/core/commands"
 
   type Values = {
diff --git a/src/app/components/ThreadItem.svelte b/src/app/components/ThreadItem.svelte
index e1e8cd14..405fdfbe 100644
--- a/src/app/components/ThreadItem.svelte
+++ b/src/app/components/ThreadItem.svelte
@@ -7,7 +7,7 @@
   import ProfileLink from "@app/components/ProfileLink.svelte"
   import ThreadActions from "@app/components/ThreadActions.svelte"
   import RoomLink from "@app/components/RoomLink.svelte"
-  import {makeThreadPath} from "@app/util/routes"
+  import {makeThreadPath} from "@app/routes"
 
   type Props = {
     url: string
diff --git a/src/app/components/ThunkFailure.svelte b/src/app/components/ThunkFailure.svelte
index cc367242..2e2a744b 100644
--- a/src/app/components/ThunkFailure.svelte
+++ b/src/app/components/ThunkFailure.svelte
@@ -8,7 +8,7 @@
   import Tippy from "@lib/components/Tippy.svelte"
   import ThunkToast from "@app/components/ThunkToast.svelte"
   import ThunkStatusDetail from "@app/components/ThunkStatusDetail.svelte"
-  import {pushToast} from "@app/util/toast"
+  import {pushToast} from "@app/toast"
 
   interface Props {
     thunk: AbstractThunk
diff --git a/src/app/components/ThunkToast.svelte b/src/app/components/ThunkToast.svelte
index 086f1c6f..d8fd74d9 100644
--- a/src/app/components/ThunkToast.svelte
+++ b/src/app/components/ThunkToast.svelte
@@ -3,8 +3,8 @@
   import {thunkHasStatus, thunkIsComplete} from "@welshman/app"
   import {PublishStatus} from "@welshman/net"
   import ThunkPending from "@app/components/ThunkPending.svelte"
-  import type {Toast} from "@app/util/toast"
-  import {popToast} from "@app/util/toast"
+  import type {Toast} from "@app/toast"
+  import {popToast} from "@app/toast"
 
   type Props = {
     toast: Toast
diff --git a/src/app/components/Toast.svelte b/src/app/components/Toast.svelte
index f7dd6720..e2071732 100644
--- a/src/app/components/Toast.svelte
+++ b/src/app/components/Toast.svelte
@@ -4,7 +4,7 @@
   import {fly} from "@lib/transition"
   import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
-  import {toast, popToast} from "@app/util/toast"
+  import {toast, popToast} from "@app/toast"
 
   let touchStartY = 0
   let touchStartTime = 0
diff --git a/src/app/components/VoiceCallAudioSettingsDialog.svelte b/src/app/components/VoiceCallAudioSettingsDialog.svelte
index a5fab918..2e48a18a 100644
--- a/src/app/components/VoiceCallAudioSettingsDialog.svelte
+++ b/src/app/components/VoiceCallAudioSettingsDialog.svelte
@@ -9,7 +9,7 @@
   import ModalTitle from "@lib/components/ModalTitle.svelte"
   import {currentVoiceSession, type VoiceSession} from "@app/call/stores"
   import {DeviceKind, supportsAudioOutputSelection, switchVoiceActiveDevice} from "@app/call/voice"
-  import {popModal} from "@app/util/modal"
+  import {popModal} from "@app/modal"
 
   const selectValueForActiveDevice = (session: VoiceSession, kind: DeviceKind): string => {
     const livekitDeviceId = session.room.getActiveDevice(kind)
diff --git a/src/app/components/VoiceRoomItem.svelte b/src/app/components/VoiceRoomItem.svelte
index 6145687a..762ca311 100644
--- a/src/app/components/VoiceRoomItem.svelte
+++ b/src/app/components/VoiceRoomItem.svelte
@@ -7,8 +7,8 @@
   import ProfileCircles from "@app/components/ProfileCircles.svelte"
   import RoomImage from "@app/components/RoomImage.svelte"
   import RoomName from "@app/components/RoomName.svelte"
-  import {makeRoomPath} from "@app/util/routes"
-  import {pushModal} from "@app/util/modal"
+  import {makeRoomPath} from "@app/routes"
+  import {pushModal} from "@app/modal"
   import VoiceRoomJoinDialog from "@app/components/VoiceRoomJoinDialog.svelte"
   import VoiceParticipantMediaBadges from "@app/components/VoiceParticipantMediaBadges.svelte"
   import {makeRoomId} from "@app/core/state"
diff --git a/src/app/components/VoiceRoomJoinDialog.svelte b/src/app/components/VoiceRoomJoinDialog.svelte
index 35ac5282..d58f8621 100644
--- a/src/app/components/VoiceRoomJoinDialog.svelte
+++ b/src/app/components/VoiceRoomJoinDialog.svelte
@@ -16,8 +16,8 @@
   import ProfileCircles from "@app/components/ProfileCircles.svelte"
   import {displayRoom} from "@app/core/state"
   import {deriveVoiceParticipants, joinVoiceRoom, loadVoiceParticipants} from "@app/call/voice"
-  import {popModal} from "@app/util/modal"
-  import {pushToast} from "@app/util/toast"
+  import {popModal} from "@app/modal"
+  import {pushToast} from "@app/toast"
 
   type Props = {
     url: string
diff --git a/src/app/components/VoiceWidget.svelte b/src/app/components/VoiceWidget.svelte
index 195b36be..2058a1c3 100644
--- a/src/app/components/VoiceWidget.svelte
+++ b/src/app/components/VoiceWidget.svelte
@@ -27,9 +27,9 @@
     RoomType,
     type Room,
   } from "@app/core/state"
-  import {pushModal} from "@app/util/modal"
-  import {notifications} from "@app/util/notifications"
-  import {makeRoomPath} from "@app/util/routes"
+  import {pushModal} from "@app/modal"
+  import {notifications} from "@app/notifications"
+  import {makeRoomPath} from "@app/routes"
   import {
     VideoCallLayout,
     isDesktopLayout,
diff --git a/src/app/components/WalletAsReceivingAddress.svelte b/src/app/components/WalletAsReceivingAddress.svelte
index e85e65c2..f2f9aced 100644
--- a/src/app/components/WalletAsReceivingAddress.svelte
+++ b/src/app/components/WalletAsReceivingAddress.svelte
@@ -11,8 +11,8 @@
   import ModalTitle from "@lib/components/ModalTitle.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import {updateProfile} from "@app/core/commands"
-  import {clearModals} from "@app/util/modal"
-  import {pushToast} from "@app/util/toast"
+  import {clearModals} from "@app/modal"
+  import {pushToast} from "@app/toast"
 
   const lud16 = getWalletAddress($session!.wallet!)
 
diff --git a/src/app/components/WalletConnect.svelte b/src/app/components/WalletConnect.svelte
index 99c87201..1beb3883 100644
--- a/src/app/components/WalletConnect.svelte
+++ b/src/app/components/WalletConnect.svelte
@@ -22,8 +22,8 @@
   import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import {getWebLn} from "@app/core/commands"
-  import {pushToast} from "@app/util/toast"
-  import {pushModal} from "@app/util/modal"
+  import {pushToast} from "@app/toast"
+  import {pushModal} from "@app/modal"
   import WalletAsReceivingAddress from "@app/components/WalletAsReceivingAddress.svelte"
   import Divider from "@lib/components/Divider.svelte"
 
diff --git a/src/app/components/WalletDisconnect.svelte b/src/app/components/WalletDisconnect.svelte
index abbf6772..78fa979d 100644
--- a/src/app/components/WalletDisconnect.svelte
+++ b/src/app/components/WalletDisconnect.svelte
@@ -2,7 +2,7 @@
   import {dissoc} from "@welshman/lib"
   import {pubkey, updateSession} from "@welshman/app"
   import Confirm from "@lib/components/Confirm.svelte"
-  import {clearModals} from "@app/util/modal"
+  import {clearModals} from "@app/modal"
 
   const confirm = async () => {
     updateSession($pubkey!, dissoc("wallet"))
diff --git a/src/app/components/WalletPay.svelte b/src/app/components/WalletPay.svelte
index 16dc02e4..5ec404f4 100644
--- a/src/app/components/WalletPay.svelte
+++ b/src/app/components/WalletPay.svelte
@@ -16,8 +16,8 @@
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import {errorMessage} from "@lib/util"
   import {payInvoice} from "@app/core/commands"
-  import {pushToast} from "@app/util/toast"
-  import {clearModals} from "@app/util/modal"
+  import {pushToast} from "@app/toast"
+  import {clearModals} from "@app/modal"
 
   const back = () => history.back()
 
diff --git a/src/app/components/WalletReceive.svelte b/src/app/components/WalletReceive.svelte
index db19506d..0533dadd 100644
--- a/src/app/components/WalletReceive.svelte
+++ b/src/app/components/WalletReceive.svelte
@@ -15,7 +15,7 @@
   import {errorMessage} from "@lib/util"
   import QRCode from "@app/components/QRCode.svelte"
   import {createInvoice} from "@app/core/commands"
-  import {pushToast} from "@app/util/toast"
+  import {pushToast} from "@app/toast"
 
   const back = () => history.back()
 
diff --git a/src/app/components/WalletUpdateReceivingAddress.svelte b/src/app/components/WalletUpdateReceivingAddress.svelte
index 2fbde508..dee8e4f6 100644
--- a/src/app/components/WalletUpdateReceivingAddress.svelte
+++ b/src/app/components/WalletUpdateReceivingAddress.svelte
@@ -13,7 +13,7 @@
   import Wallet from "@assets/icons/wallet.svg?dataurl"
   import CheckCircle from "@assets/icons/check-circle.svg?dataurl"
   import {updateProfile} from "@app/core/commands"
-  import {pushToast} from "@app/util/toast"
+  import {pushToast} from "@app/toast"
 
   const back = () => history.back()
 
diff --git a/src/app/components/Zap.svelte b/src/app/components/Zap.svelte
index 700775e1..7d85585f 100644
--- a/src/app/components/Zap.svelte
+++ b/src/app/components/Zap.svelte
@@ -20,7 +20,7 @@
   import {errorMessage} from "@lib/util"
   import ProfileLink from "@app/components/ProfileLink.svelte"
   import {payInvoice} from "@app/core/commands"
-  import {pushToast} from "@app/util/toast"
+  import {pushToast} from "@app/toast"
 
   type Props = {
     url: string
diff --git a/src/app/components/ZapButton.svelte b/src/app/components/ZapButton.svelte
index d4b1aa9c..03f9cf31 100644
--- a/src/app/components/ZapButton.svelte
+++ b/src/app/components/ZapButton.svelte
@@ -6,7 +6,7 @@
   import Zap from "@app/components/Zap.svelte"
   import ZapInvoice from "@app/components/ZapInvoice.svelte"
   import InfoZapperError from "@app/components/InfoZapperError.svelte"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
 
   type Props = {
     url?: string
diff --git a/src/app/components/ZapInvoice.svelte b/src/app/components/ZapInvoice.svelte
index a3f7624f..f11f71c0 100644
--- a/src/app/components/ZapInvoice.svelte
+++ b/src/app/components/ZapInvoice.svelte
@@ -23,8 +23,8 @@
   import ProfileLink from "@app/components/ProfileLink.svelte"
   import QRCode from "@app/components/QRCode.svelte"
   import WalletConnect from "@app/components/WalletConnect.svelte"
-  import {pushModal} from "@app/util/modal"
-  import {clip, pushToast} from "@app/util/toast"
+  import {pushModal} from "@app/modal"
+  import {clip, pushToast} from "@app/toast"
 
   type Props = {
     url: string
diff --git a/src/app/util/drafts.ts b/src/app/drafts.ts
similarity index 100%
rename from src/app/util/drafts.ts
rename to src/app/drafts.ts
diff --git a/src/app/editor/index.ts b/src/app/editor/index.ts
index 9a787c4b..ef068772 100644
--- a/src/app/editor/index.ts
+++ b/src/app/editor/index.ts
@@ -35,7 +35,7 @@ import {
   userSpaceUrls,
   roomsByUrl,
 } from "@app/core/state"
-import {pushToast} from "@app/util/toast"
+import {pushToast} from "@app/toast"
 
 export const makeEditor = async ({
   encryptFiles = false,
diff --git a/src/app/util/health.ts b/src/app/healthChecks.ts
similarity index 100%
rename from src/app/util/health.ts
rename to src/app/healthChecks.ts
diff --git a/src/app/util/keyboard.ts b/src/app/keyboard.ts
similarity index 100%
rename from src/app/util/keyboard.ts
rename to src/app/keyboard.ts
diff --git a/src/app/util/modal.ts b/src/app/modal.ts
similarity index 100%
rename from src/app/util/modal.ts
rename to src/app/modal.ts
diff --git a/src/app/util/nip46.ts b/src/app/nip46.ts
similarity index 98%
rename from src/app/util/nip46.ts
rename to src/app/nip46.ts
index 62297f3f..16aa3723 100644
--- a/src/app/util/nip46.ts
+++ b/src/app/nip46.ts
@@ -9,7 +9,7 @@ import {
   SIGNER_RELAYS,
   NIP46_PERMS,
 } from "@app/core/state"
-import {pushToast} from "@app/util/toast"
+import {pushToast} from "@app/toast"
 
 const APP_SCHEME = "social.flotilla"
 
diff --git a/src/app/util/notifications.ts b/src/app/notifications.ts
similarity index 99%
rename from src/app/util/notifications.ts
rename to src/app/notifications.ts
index ad596ae8..2a61b8b0 100644
--- a/src/app/util/notifications.ts
+++ b/src/app/notifications.ts
@@ -12,7 +12,7 @@ import {
   makeHttpAuth,
   makeHttpAuthHeader,
 } from "@welshman/util"
-import {makeSpacePath, makeRoomPath, makeSpaceChatPath, makeChatPath} from "@app/util/routes"
+import {makeSpacePath, makeRoomPath, makeSpaceChatPath, makeChatPath} from "@app/routes"
 import {
   CONTENT_KINDS,
   notificationSettings,
diff --git a/src/app/util/policies.ts b/src/app/policies.ts
similarity index 100%
rename from src/app/util/policies.ts
rename to src/app/policies.ts
diff --git a/src/app/util/polls.ts b/src/app/polls.ts
similarity index 100%
rename from src/app/util/polls.ts
rename to src/app/polls.ts
diff --git a/src/app/util/pomade.ts b/src/app/pomade.ts
similarity index 86%
rename from src/app/util/pomade.ts
rename to src/app/pomade.ts
index fb4d8a00..3709a60e 100644
--- a/src/app/util/pomade.ts
+++ b/src/app/pomade.ts
@@ -76,3 +76,15 @@ export const deleteDeactivatedPomadeSessions = async () => {
 
 export const loginWithPomade = (clientOptions: ClientOptions, email: string) =>
   _loginWithPomade(clientOptions.group.group_pk.slice(2), email, clientOptions)
+
+export const POMADE_INVALID_LOGIN_MESSAGE = "Invalid login information"
+export const POMADE_NETWORK_ERROR_MESSAGE = "Network error, please try again"
+
+type PomadeMessage = {
+  res?: unknown
+}
+
+export const getPomadeLoginFailureMessage = (messages: PomadeMessage[]) =>
+  messages.some(message => message.res !== undefined)
+    ? POMADE_INVALID_LOGIN_MESSAGE
+    : POMADE_NETWORK_ERROR_MESSAGE
diff --git a/src/app/util/push/adapters/android.ts b/src/app/push/adapters/android.ts
similarity index 93%
rename from src/app/util/push/adapters/android.ts
rename to src/app/push/adapters/android.ts
index 60cac12d..e9a310ce 100644
--- a/src/app/util/push/adapters/android.ts
+++ b/src/app/push/adapters/android.ts
@@ -6,8 +6,8 @@ import type {Session} from "@welshman/app"
 import {maybe, now} from "@welshman/lib"
 import type {Filter} from "@welshman/util"
 import {pushState} from "@app/core/state"
-import type {IPushAdapter} from "@app/util/push/adapters/common"
-import {requestPermissions, syncRelaySubscriptions} from "@app/util/push/adapters/common"
+import type {IPushAdapter} from "@app/push/adapters/common"
+import {requestPermissions, syncRelaySubscriptions} from "@app/push/adapters/common"
 
 type AndroidFallbackSubscription = {
   relay: string
diff --git a/src/app/util/push/adapters/capacitor.ts b/src/app/push/adapters/capacitor.ts
similarity index 98%
rename from src/app/util/push/adapters/capacitor.ts
rename to src/app/push/adapters/capacitor.ts
index 807c4577..f3950ea6 100644
--- a/src/app/util/push/adapters/capacitor.ts
+++ b/src/app/push/adapters/capacitor.ts
@@ -13,13 +13,13 @@ import type {Filter} from "@welshman/util"
 import {DELETE, getRelaysFromList, makeEvent, Address} from "@welshman/util"
 import {buildUrl} from "@lib/util"
 import {PUSH_BRIDGE, PUSH_SERVER, pushState, userSpaceUrls, device} from "@app/core/state"
-import type {IPushAdapter} from "@app/util/push/adapters/common"
+import type {IPushAdapter} from "@app/push/adapters/common"
 import {
   onPushNotificationAction,
   syncRelaySubscriptions,
   requestPermissions,
   requestToken,
-} from "@app/util/push/adapters/common"
+} from "@app/push/adapters/common"
 
 export class CapacitorNotifications implements IPushAdapter {
   _controller = maybe<AbortController>()
diff --git a/src/app/util/push/adapters/common.ts b/src/app/push/adapters/common.ts
similarity index 98%
rename from src/app/util/push/adapters/common.ts
rename to src/app/push/adapters/common.ts
index c9cfdbbc..5a5ea5d3 100644
--- a/src/app/util/push/adapters/common.ts
+++ b/src/app/push/adapters/common.ts
@@ -31,7 +31,7 @@ import {
   userSettingsValues,
   makeCommentFilter,
 } from "@app/core/state"
-import {makeSpacePath, getEventPath} from "@app/util/routes"
+import {makeSpacePath, getEventPath} from "@app/routes"
 
 export interface IPushAdapter {
   request: (prompt?: boolean) => Promise<string>
diff --git a/src/app/util/push/adapters/web.ts b/src/app/push/adapters/web.ts
similarity index 92%
rename from src/app/util/push/adapters/web.ts
rename to src/app/push/adapters/web.ts
index 72926f89..9baadc3e 100644
--- a/src/app/util/push/adapters/web.ts
+++ b/src/app/push/adapters/web.ts
@@ -3,9 +3,9 @@ import {maybe} from "@welshman/lib"
 import type {Unsubscriber} from "svelte/store"
 import {getPubkeyTagValues, matchFilter, type TrustedEvent} from "@welshman/util"
 import {DM_KINDS, notificationSettings} from "@app/core/state"
-import type {IPushAdapter} from "@app/util/push/adapters/common"
-import {onNotification} from "@app/util/push/adapters/common"
-import {goToEvent} from "@app/util/routes"
+import type {IPushAdapter} from "@app/push/adapters/common"
+import {onNotification} from "@app/push/adapters/common"
+import {goToEvent} from "@app/routes"
 
 export class WebNotifications implements IPushAdapter {
   _unsubscriber = maybe<Unsubscriber>()
diff --git a/src/app/util/push/index.ts b/src/app/push/index.ts
similarity index 79%
rename from src/app/util/push/index.ts
rename to src/app/push/index.ts
index 0d01e0ef..810bdd98 100644
--- a/src/app/util/push/index.ts
+++ b/src/app/push/index.ts
@@ -1,11 +1,11 @@
 import {Capacitor} from "@capacitor/core"
 import {notificationSettings, pushState} from "@app/core/state"
-import {WebNotifications} from "@app/util/push/adapters/web"
-import {CapacitorNotifications} from "@app/util/push/adapters/capacitor"
-import {AndroidFallbackNotifications} from "@app/util/push/adapters/android"
-import type {IPushAdapter} from "@app/util/push/adapters/common"
+import {WebNotifications} from "@app/push/adapters/web"
+import {CapacitorNotifications} from "@app/push/adapters/capacitor"
+import {AndroidFallbackNotifications} from "@app/push/adapters/android"
+import type {IPushAdapter} from "@app/push/adapters/common"
 
-export {onNotification} from "@app/util/push/adapters/common"
+export {onNotification} from "@app/push/adapters/common"
 
 export class Push {
   static _adapter: IPushAdapter | undefined
diff --git a/src/app/util/routes.ts b/src/app/routes.ts
similarity index 93%
rename from src/app/util/routes.ts
rename to src/app/routes.ts
index 59756806..1d323b75 100644
--- a/src/app/util/routes.ts
+++ b/src/app/routes.ts
@@ -20,10 +20,26 @@ import {
   getRelaysFromList,
 } from "@welshman/util"
 import {makeChatId, entityLink, encodeRelay, DM_KINDS, ROOM} from "@app/core/state"
-import {pushModal} from "@app/util/modal"
-import {lastPageBySpaceUrl, lastChatUrl} from "@app/util/history"
+import {pushModal} from "@app/modal"
 import ChatEnable from "@app/components/ChatEnable.svelte"
 
+// State
+
+export let lastChatUrl: string | undefined = undefined
+
+export const lastPageBySpaceUrl = new Map<string, string>()
+
+export const setupHistory = () =>
+  page.subscribe($page => {
+    if ($page.params.relay) {
+      lastPageBySpaceUrl.set($page.params.relay, $page.url.pathname)
+    }
+
+    if ($page.params.chat) {
+      lastChatUrl = $page.url.pathname
+    }
+  })
+
 // Chat
 
 export const makeChatPath = (pubkeys: string[]) => `/chat/${makeChatId(pubkeys)}`
diff --git a/src/app/util/logout.ts b/src/app/session.ts
similarity index 72%
rename from src/app/util/logout.ts
rename to src/app/session.ts
index b1548298..4630d81d 100644
--- a/src/app/util/logout.ts
+++ b/src/app/session.ts
@@ -1,6 +1,6 @@
 import {db, kv, ss} from "@app/core/storage"
-import {deactivateCurrentPomadeSession} from "@app/util/pomade"
-import {Push} from "@app/util/push"
+import {deactivateCurrentPomadeSession} from "@app/pomade"
+import {Push} from "@app/push"
 
 export const logout = async () => {
   await deactivateCurrentPomadeSession()
diff --git a/src/app/util/storage.ts b/src/app/storage.ts
similarity index 100%
rename from src/app/util/storage.ts
rename to src/app/storage.ts
diff --git a/src/app/util/theme.ts b/src/app/theme.ts
similarity index 100%
rename from src/app/util/theme.ts
rename to src/app/theme.ts
diff --git a/src/app/util/title.ts b/src/app/title.ts
similarity index 100%
rename from src/app/util/title.ts
rename to src/app/title.ts
diff --git a/src/app/util/toast.ts b/src/app/toast.ts
similarity index 100%
rename from src/app/util/toast.ts
rename to src/app/toast.ts
diff --git a/src/app/util/history.ts b/src/app/util/history.ts
deleted file mode 100644
index e7ee6f68..00000000
--- a/src/app/util/history.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import {page} from "$app/stores"
-
-export const lastPageBySpaceUrl = new Map<string, string>()
-export let lastChatUrl: string | undefined = undefined
-
-export const setupHistory = () =>
-  page.subscribe($page => {
-    if ($page.params.relay) {
-      lastPageBySpaceUrl.set($page.params.relay, $page.url.pathname)
-    }
-
-    if ($page.params.chat) {
-      lastChatUrl = $page.url.pathname
-    }
-  })
diff --git a/src/app/util/pomadeErrors.ts b/src/app/util/pomadeErrors.ts
deleted file mode 100644
index 595e1b73..00000000
--- a/src/app/util/pomadeErrors.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export const POMADE_INVALID_LOGIN_MESSAGE = "Invalid login information"
-export const POMADE_NETWORK_ERROR_MESSAGE = "Network error, please try again"
-
-type PomadeMessage = {
-  res?: unknown
-}
-
-export const getPomadeLoginFailureMessage = (messages: PomadeMessage[]) =>
-  messages.some(message => message.res !== undefined)
-    ? POMADE_INVALID_LOGIN_MESSAGE
-    : POMADE_NETWORK_ERROR_MESSAGE
diff --git a/src/lib/components/IconPickerButton.svelte b/src/lib/components/IconPickerButton.svelte
index bed538c7..e393ecd9 100644
--- a/src/lib/components/IconPickerButton.svelte
+++ b/src/lib/components/IconPickerButton.svelte
@@ -6,7 +6,7 @@
   import Tippy from "@lib/components/Tippy.svelte"
   import IconPickerModal from "@app/components/IconPickerModal.svelte"
   import IconPickerPopover from "@app/components/IconPickerPopover.svelte"
-  import {pushModal, popModal} from "@app/util/modal"
+  import {pushModal, popModal} from "@app/modal"
 
   const {...props} = $props()
 
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 9b6150f4..af10ee67 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -26,23 +26,23 @@
   import {maybeInstallRelayMocks} from "@lib/test/relayMocks"
   import AppContainer from "@app/components/AppContainer.svelte"
   import ModalContainer from "@app/components/ModalContainer.svelte"
-  import {setupHistory} from "@app/util/history"
-  import {setupAnalytics} from "@app/util/analytics"
-  import {authPolicy, blockPolicy, trustPolicy, mostlyRestrictedPolicy} from "@app/util/policies"
+  import {setupHistory} from "@app/routes"
+  import {setupAnalytics} from "@app/analytics"
+  import {authPolicy, blockPolicy, trustPolicy, mostlyRestrictedPolicy} from "@app/policies"
   import {db, kv, ss} from "@app/core/storage"
   import {device, userSettingsValues, notificationSettings, pushState} from "@app/core/state"
   import {syncApplicationData} from "@app/core/sync"
   import * as commands from "@app/core/commands"
   import * as requests from "@app/core/requests"
   import * as appState from "@app/core/state"
-  import {theme} from "@app/util/theme"
-  import {toast, pushToast} from "@app/util/toast"
-  import * as notifications from "@app/util/notifications"
-  import {Push} from "@app/util/push"
-  import {onPushNotificationAction} from "@app/util/push/adapters/common"
-  import * as storage from "@app/util/storage"
-  import {syncKeyboard} from "@app/util/keyboard"
-  import {getPageTitle} from "@app/util/title"
+  import {theme} from "@app/theme"
+  import {toast, pushToast} from "@app/toast"
+  import * as notifications from "@app/notifications"
+  import {Push} from "@app/push"
+  import {onPushNotificationAction} from "@app/push/adapters/common"
+  import * as storage from "@app/storage"
+  import {syncKeyboard} from "@app/keyboard"
+  import {getPageTitle} from "@app/title"
   import NewNotificationSound from "@src/app/components/NewNotificationSound.svelte"
 
   const {children} = $props()
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index e07f6adc..42128a56 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import {onMount} from "svelte"
   import {goto} from "$app/navigation"
-  import {goToSpace} from "@app/util/routes"
+  import {goToSpace} from "@app/routes"
   import {PLATFORM_RELAYS} from "@app/core/state"
 
   onMount(async () => {
diff --git a/src/routes/[bech32]/+page.svelte b/src/routes/[bech32]/+page.svelte
index af15a035..7d875ee0 100644
--- a/src/routes/[bech32]/+page.svelte
+++ b/src/routes/[bech32]/+page.svelte
@@ -8,7 +8,7 @@
   import {page} from "$app/stores"
   import {goto} from "$app/navigation"
   import Spinner from "@lib/components/Spinner.svelte"
-  import {goToEvent} from "@app/util/routes"
+  import {goToEvent} from "@app/routes"
 
   const {bech32} = $page.params as MakeNonOptional<typeof $page.params>
 
diff --git a/src/routes/chat/+layout.svelte b/src/routes/chat/+layout.svelte
index 6a6d234a..4d104251 100644
--- a/src/routes/chat/+layout.svelte
+++ b/src/routes/chat/+layout.svelte
@@ -19,7 +19,7 @@
   import ChatStart from "@app/components/ChatStart.svelte"
   import ChatItem from "@app/components/ChatItem.svelte"
   import {chatSearch} from "@app/core/state"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
 
   type Props = {
     children?: Snippet
diff --git a/src/routes/chat/+page.svelte b/src/routes/chat/+page.svelte
index 35ffbbca..41f145c1 100644
--- a/src/routes/chat/+page.svelte
+++ b/src/routes/chat/+page.svelte
@@ -10,7 +10,7 @@
   import ChatStart from "@app/components/ChatStart.svelte"
   import ChatMenu from "@app/components/ChatMenu.svelte"
   import {chatSearch} from "@app/core/state"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
 
   let term = $state("")
 
diff --git a/src/routes/chat/[chat]/+page.svelte b/src/routes/chat/[chat]/+page.svelte
index 8af5dd3d..b6f27633 100644
--- a/src/routes/chat/[chat]/+page.svelte
+++ b/src/routes/chat/[chat]/+page.svelte
@@ -18,8 +18,8 @@
   import Chat from "@app/components/Chat.svelte"
   import {splitChatId} from "@app/core/state"
   import {notificationSettings} from "@app/core/state"
-  import {pushToast} from "@app/util/toast"
-  import {Push} from "@app/util/push"
+  import {pushToast} from "@app/toast"
+  import {Push} from "@app/push"
 
   const {chat} = $page.params as MakeNonOptional<typeof $page.params>
   const pubkeys = uniq(append($pubkey!, splitChatId(chat)))
diff --git a/src/routes/home/+page.svelte b/src/routes/home/+page.svelte
index fad1b55f..876603b0 100644
--- a/src/routes/home/+page.svelte
+++ b/src/routes/home/+page.svelte
@@ -7,7 +7,7 @@
   import Link from "@lib/components/Link.svelte"
   import Button from "@lib/components/Button.svelte"
   import CardButton from "@lib/components/CardButton.svelte"
-  import {goToSpace} from "@app/util/routes"
+  import {goToSpace} from "@app/routes"
   import {PLATFORM_NAME, PLATFORM_RELAYS} from "@app/core/state"
 
   const openChat = () => goto("/chat")
diff --git a/src/routes/settings/+layout.svelte b/src/routes/settings/+layout.svelte
index cfc8da34..7baecde0 100644
--- a/src/routes/settings/+layout.svelte
+++ b/src/routes/settings/+layout.svelte
@@ -17,8 +17,8 @@
   import SecondaryNavItem from "@lib/components/SecondaryNavItem.svelte"
   import SecondaryNavSection from "@lib/components/SecondaryNavSection.svelte"
   import LogOut from "@app/components/LogOut.svelte"
-  import {pushModal} from "@app/util/modal"
-  import {theme} from "@app/util/theme"
+  import {pushModal} from "@app/modal"
+  import {theme} from "@app/theme"
 
   type Props = {
     children?: Snippet
diff --git a/src/routes/settings/about/+page.svelte b/src/routes/settings/about/+page.svelte
index c8583e85..f9fa3181 100644
--- a/src/routes/settings/about/+page.svelte
+++ b/src/routes/settings/about/+page.svelte
@@ -5,7 +5,7 @@
   import Icon from "@lib/components/Icon.svelte"
   import ProfileDetail from "@app/components/ProfileDetail.svelte"
   import {PLATFORM_NAME} from "@app/core/state"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
   import Code from "@assets/icons/code-2.svg?dataurl"
   import Global from "@assets/icons/global.svg?dataurl"
   import Pen from "@assets/icons/pen.svg?dataurl"
diff --git a/src/routes/settings/alerts/+page.svelte b/src/routes/settings/alerts/+page.svelte
index b614be7c..8dd63aae 100644
--- a/src/routes/settings/alerts/+page.svelte
+++ b/src/routes/settings/alerts/+page.svelte
@@ -9,9 +9,9 @@
   import Spinner from "@lib/components/Spinner.svelte"
   import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
-  import {pushToast} from "@app/util/toast"
-  import {clearBadges} from "@app/util/notifications"
-  import {Push} from "@app/util/push"
+  import {pushToast} from "@app/toast"
+  import {clearBadges} from "@app/notifications"
+  import {Push} from "@app/push"
   import {notificationSettings} from "@app/core/state"
 
   const reset = () => {
diff --git a/src/routes/settings/content/+page.svelte b/src/routes/settings/content/+page.svelte
index ee7a5d56..f1138341 100644
--- a/src/routes/settings/content/+page.svelte
+++ b/src/routes/settings/content/+page.svelte
@@ -19,7 +19,7 @@
   import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
   import ProfileMultiSelect from "@app/components/ProfileMultiSelect.svelte"
-  import {pushToast} from "@app/util/toast"
+  import {pushToast} from "@app/toast"
   import {PLATFORM_NAME, userSettingsValues} from "@app/core/state"
   import {publishSettings} from "@app/core/commands"
 
diff --git a/src/routes/settings/privacy/+page.svelte b/src/routes/settings/privacy/+page.svelte
index a8249b13..8f6de5d5 100644
--- a/src/routes/settings/privacy/+page.svelte
+++ b/src/routes/settings/privacy/+page.svelte
@@ -4,7 +4,7 @@
   import FieldInline from "@lib/components/FieldInline.svelte"
   import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
-  import {pushToast} from "@app/util/toast"
+  import {pushToast} from "@app/toast"
   import {PLATFORM_NAME, RelayAuthMode, userSettingsValues} from "@app/core/state"
   import {publishSettings} from "@app/core/commands"
 
diff --git a/src/routes/settings/profile/+page.svelte b/src/routes/settings/profile/+page.svelte
index 79c49087..5950e397 100644
--- a/src/routes/settings/profile/+page.svelte
+++ b/src/routes/settings/profile/+page.svelte
@@ -26,9 +26,9 @@
   import SignerStatus from "@app/components/SignerStatus.svelte"
   import PasswordReset from "@app/components/PasswordReset.svelte"
   import InfoKeys from "@app/components/InfoKeys.svelte"
-  import {pushModal} from "@app/util/modal"
-  import {POMADE_NETWORK_ERROR_MESSAGE} from "@app/util/pomadeErrors"
-  import {clip, pushToast} from "@app/util/toast"
+  import {pushModal} from "@app/modal"
+  import {POMADE_NETWORK_ERROR_MESSAGE} from "@app/pomade"
+  import {clip, pushToast} from "@app/toast"
 
   const npub = nip19.npubEncode($pubkey!)
   const profile = deriveProfile($pubkey!)
diff --git a/src/routes/settings/wallet/+page.svelte b/src/routes/settings/wallet/+page.svelte
index e9089a83..9c116885 100644
--- a/src/routes/settings/wallet/+page.svelte
+++ b/src/routes/settings/wallet/+page.svelte
@@ -12,7 +12,7 @@
   import WalletConnect from "@app/components/WalletConnect.svelte"
   import WalletDisconnect from "@app/components/WalletDisconnect.svelte"
   import WalletUpdateReceivingAddress from "@app/components/WalletUpdateReceivingAddress.svelte"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
   import {getNwcClient, getWebLn} from "@app/core/commands"
   import Wallet2 from "@assets/icons/wallet.svg?dataurl"
   import CheckCircle from "@assets/icons/check-circle.svg?dataurl"
diff --git a/src/routes/spaces/+page.svelte b/src/routes/spaces/+page.svelte
index 18aaccbd..078afe2f 100644
--- a/src/routes/spaces/+page.svelte
+++ b/src/routes/spaces/+page.svelte
@@ -36,9 +36,9 @@
     parseInviteLink,
   } from "@app/core/state"
   import {setSpaceMembershipOrder} from "@app/core/commands"
-  import {pushModal} from "@app/util/modal"
-  import {goToSpace, makeSpacePath} from "@app/util/routes"
-  import {notifications} from "@app/util/notifications"
+  import {pushModal} from "@app/modal"
+  import {goToSpace, makeSpacePath} from "@app/routes"
+  import {notifications} from "@app/notifications"
 
   const addSpace = () => pushModal(SpaceAdd)
 
diff --git a/src/routes/spaces/[relay]/+layout.svelte b/src/routes/spaces/[relay]/+layout.svelte
index d597814d..16d13ea1 100644
--- a/src/routes/spaces/[relay]/+layout.svelte
+++ b/src/routes/spaces/[relay]/+layout.svelte
@@ -13,8 +13,8 @@
   import SpaceAuthError from "@app/components/SpaceAuthError.svelte"
   import SpaceTrustRelay from "@app/components/SpaceTrustRelay.svelte"
   import SpaceJoin from "@app/components/SpaceJoin.svelte"
-  import {pushModal} from "@app/util/modal"
-  import {makeSpacePath} from "@app/util/routes"
+  import {pushModal} from "@app/modal"
+  import {makeSpacePath} from "@app/routes"
   import {decodeRelay, userGroupList, relaysPendingTrust, userSpaceUrls} from "@app/core/state"
   import {deriveRelayAuthError} from "@app/core/commands"
 
diff --git a/src/routes/spaces/[relay]/+page.svelte b/src/routes/spaces/[relay]/+page.svelte
index c5545a8c..85fc2a53 100644
--- a/src/routes/spaces/[relay]/+page.svelte
+++ b/src/routes/spaces/[relay]/+page.svelte
@@ -3,7 +3,7 @@
   import theme from "tailwindcss/defaultTheme"
   import SecondaryNav from "@lib/components/SecondaryNav.svelte"
   import {decodeRelay} from "@app/core/state"
-  import {goToSpace} from "@app/util/routes"
+  import {goToSpace} from "@app/routes"
   import PrimaryNavSpaces from "@app/components/PrimaryNavSpaces.svelte"
   import SpaceMenu from "@app/components/SpaceMenu.svelte"
 
diff --git a/src/routes/spaces/[relay]/[h]/+page.svelte b/src/routes/spaces/[relay]/[h]/+page.svelte
index 66578315..5b43b523 100644
--- a/src/routes/spaces/[relay]/[h]/+page.svelte
+++ b/src/routes/spaces/[relay]/[h]/+page.svelte
@@ -49,10 +49,10 @@
   import {VideoCallLayout, videoCallLayout, videoTileCount} from "@app/call/video"
   import {makeFeed} from "@app/core/requests"
   import {popKey} from "@lib/implicit"
-  import {checked, deferredRoomPath, setChecked} from "@app/util/notifications"
-  import {makeRoomPath} from "@app/util/routes"
-  import {pushModal} from "@app/util/modal"
-  import {pushToast} from "@app/util/toast"
+  import {checked, deferredRoomPath, setChecked} from "@app/notifications"
+  import {makeRoomPath} from "@app/routes"
+  import {pushModal} from "@app/modal"
+  import {pushToast} from "@app/toast"
 
   const {h, relay} = $page.params as MakeNonOptional<typeof $page.params>
   const mounted = now()
diff --git a/src/routes/spaces/[relay]/calendar/+page.svelte b/src/routes/spaces/[relay]/calendar/+page.svelte
index 4df95a73..161b4988 100644
--- a/src/routes/spaces/[relay]/calendar/+page.svelte
+++ b/src/routes/spaces/[relay]/calendar/+page.svelte
@@ -17,7 +17,7 @@
   import SpaceBar from "@app/components/SpaceBar.svelte"
   import CalendarEventItem from "@app/components/CalendarEventItem.svelte"
   import CalendarEventCreate from "@app/components/CalendarEventCreate.svelte"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
   import {decodeRelay, makeCommentFilter} from "@app/core/state"
   import {makeCalendarFeed} from "@app/core/requests"
 
diff --git a/src/routes/spaces/[relay]/chat/+page.svelte b/src/routes/spaces/[relay]/chat/+page.svelte
index 0bd1d2ae..1e446e2a 100644
--- a/src/routes/spaces/[relay]/chat/+page.svelte
+++ b/src/routes/spaces/[relay]/chat/+page.svelte
@@ -28,8 +28,8 @@
   import RoomComposeParent from "@app/components/RoomComposeParent.svelte"
   import {userSettingsValues, decodeRelay, PROTECTED} from "@app/core/state"
   import {prependParent, canEnforceNip70, publishDelete} from "@app/core/commands"
-  import {checked} from "@app/util/notifications"
-  import {pushToast} from "@app/util/toast"
+  import {checked} from "@app/notifications"
+  import {pushToast} from "@app/toast"
   import {makeFeed} from "@app/core/requests"
   import {popKey} from "@lib/implicit"
 
diff --git a/src/routes/spaces/[relay]/classifieds/+page.svelte b/src/routes/spaces/[relay]/classifieds/+page.svelte
index b86ce8bc..f9e7b5b7 100644
--- a/src/routes/spaces/[relay]/classifieds/+page.svelte
+++ b/src/routes/spaces/[relay]/classifieds/+page.svelte
@@ -19,7 +19,7 @@
   import {decodeRelay} from "@app/core/state"
   import {makeCommentFilter} from "@app/core/state"
   import {makeFeed} from "@app/core/requests"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
 
   const url = decodeRelay($page.params.relay!)
 
diff --git a/src/routes/spaces/[relay]/goals/+page.svelte b/src/routes/spaces/[relay]/goals/+page.svelte
index e2370257..4322b947 100644
--- a/src/routes/spaces/[relay]/goals/+page.svelte
+++ b/src/routes/spaces/[relay]/goals/+page.svelte
@@ -18,7 +18,7 @@
   import GoalCreate from "@app/components/GoalCreate.svelte"
   import {decodeRelay, makeCommentFilter} from "@app/core/state"
   import {makeFeed} from "@app/core/requests"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
 
   const url = decodeRelay($page.params.relay!)
 
diff --git a/src/routes/spaces/[relay]/polls/+page.svelte b/src/routes/spaces/[relay]/polls/+page.svelte
index 5faa9fac..66ef4291 100644
--- a/src/routes/spaces/[relay]/polls/+page.svelte
+++ b/src/routes/spaces/[relay]/polls/+page.svelte
@@ -18,7 +18,7 @@
   import PollCreate from "@app/components/PollCreate.svelte"
   import {decodeRelay, makeCommentFilter} from "@app/core/state"
   import {makeFeed} from "@app/core/requests"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
 
   const url = decodeRelay($page.params.relay!)
 
diff --git a/src/routes/spaces/[relay]/recent/+page.svelte b/src/routes/spaces/[relay]/recent/+page.svelte
index f69fd88a..16afce33 100644
--- a/src/routes/spaces/[relay]/recent/+page.svelte
+++ b/src/routes/spaces/[relay]/recent/+page.svelte
@@ -50,7 +50,7 @@
   import PollItem from "@app/components/PollItem.svelte"
   import RecentConversation from "@app/components/RecentConversation.svelte"
   import {decodeRelay, deriveEventsForUrl, CONTENT_KINDS} from "@app/core/state"
-  import {goToEvent} from "@app/util/routes"
+  import {goToEvent} from "@app/routes"
 
   const url = decodeRelay($page.params.relay!)
   const since = ago(3, MONTH)
diff --git a/src/routes/spaces/[relay]/threads/+page.svelte b/src/routes/spaces/[relay]/threads/+page.svelte
index 7d48ecbb..00e2c9e4 100644
--- a/src/routes/spaces/[relay]/threads/+page.svelte
+++ b/src/routes/spaces/[relay]/threads/+page.svelte
@@ -19,7 +19,7 @@
   import {decodeRelay} from "@app/core/state"
   import {makeCommentFilter} from "@app/core/state"
   import {makeFeed} from "@app/core/requests"
-  import {pushModal} from "@app/util/modal"
+  import {pushModal} from "@app/modal"
 
   const url = decodeRelay($page.params.relay!)