diff --git a/ROADMAP.md b/ROADMAP.md
index 9cfbc008..a3f1fe3f 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -2,7 +2,7 @@
 
 - [ ] Refactor
   - Move global modals to child components?
-  - Combine app/agent, rename app2
+  - Combine app/agent, rename app
 - [ ] Improve topic suggestions and rendering
 - [ ] Add topic search
 - [ ] Relays bounty
diff --git a/src/app2/App.svelte b/src/app/App.svelte
similarity index 91%
rename from src/app2/App.svelte
rename to src/app/App.svelte
index 98c290a1..54688546 100644
--- a/src/app2/App.svelte
+++ b/src/app/App.svelte
@@ -18,15 +18,15 @@
   import sync from "src/agent/sync"
   import * as db from "src/agent/db"
   import user from "src/agent/user"
-  import {loadAppData} from "src/app2/state"
+  import {loadAppData} from "src/app/state"
   import {theme, getThemeVariables, modal, openModals} from "src/partials/state"
-  import {logUsage} from "src/app2/state"
-  import SideNav from "src/app2/SideNav.svelte"
-  import Routes from "src/app2/Routes.svelte"
-  import Toast from "src/app2/Toast.svelte"
-  import TopNav from "src/app2/TopNav.svelte"
-  import Modal from "src/app2/Modal.svelte"
-  import ForegroundButtons from "src/app2/ForegroundButtons.svelte"
+  import {logUsage} from "src/app/state"
+  import SideNav from "src/app/SideNav.svelte"
+  import Routes from "src/app/Routes.svelte"
+  import Toast from "src/app/Toast.svelte"
+  import TopNav from "src/app/TopNav.svelte"
+  import Modal from "src/app/Modal.svelte"
+  import ForegroundButtons from "src/app/ForegroundButtons.svelte"
 
   Object.assign(window, {cmd, user, keys, network, pool, sync, db, bech32ToHex, hexToBech32})
 
diff --git a/src/app2/EnsureData.svelte b/src/app/EnsureData.svelte
similarity index 91%
rename from src/app2/EnsureData.svelte
rename to src/app/EnsureData.svelte
index fc28a354..5009d339 100644
--- a/src/app2/EnsureData.svelte
+++ b/src/app/EnsureData.svelte
@@ -2,10 +2,10 @@
   import Anchor from "src/partials/Anchor.svelte"
   import Content from "src/partials/Content.svelte"
   import Modal from "src/partials/Modal.svelte"
-  import PersonInfo from "src/app2/shared/PersonInfo.svelte"
-  import RelaySearch from "src/app2/shared/RelaySearch.svelte"
-  import RelayCard from "src/app2/shared/RelayCard.svelte"
-  import PersonSearch from "src/app2/shared/PersonSearch.svelte"
+  import PersonInfo from "src/app/shared/PersonInfo.svelte"
+  import RelaySearch from "src/app/shared/RelaySearch.svelte"
+  import RelayCard from "src/app/shared/RelayCard.svelte"
+  import PersonSearch from "src/app/shared/PersonSearch.svelte"
   import {getPersonWithFallback} from "src/agent/db"
   import user from "src/agent/user"
 
diff --git a/src/app2/ForegroundButtons.svelte b/src/app/ForegroundButtons.svelte
similarity index 100%
rename from src/app2/ForegroundButtons.svelte
rename to src/app/ForegroundButtons.svelte
diff --git a/src/app2/Modal.svelte b/src/app/Modal.svelte
similarity index 70%
rename from src/app2/Modal.svelte
rename to src/app/Modal.svelte
index 830dbcc6..cbdacfc9 100644
--- a/src/app2/Modal.svelte
+++ b/src/app/Modal.svelte
@@ -1,20 +1,20 @@
 <script lang="ts">
-  import {menuIsOpen} from "src/app2/state"
+  import {menuIsOpen} from "src/app/state"
   import {modal} from "src/partials/state"
   import Modal from "src/partials/Modal.svelte"
   import Content from "src/partials/Content.svelte"
   import Spinner from "src/partials/Spinner.svelte"
-  import ChatEdit from "src/app2/views/ChatEdit.svelte"
-  import LoginConnect from "src/app2/views/LoginConnect.svelte"
-  import LoginPrivKey from "src/app2/views/LoginPrivKey.svelte"
-  import LoginPubKey from "src/app2/views/LoginPubKey.svelte"
-  import Onboarding from "src/app2/views/Onboarding.svelte"
-  import NoteCreate from "src/app2/views/NoteCreate.svelte"
-  import NoteDetail from "src/app2/views/NoteDetail.svelte"
-  import PersonList from "src/app2/shared/PersonList.svelte"
-  import PersonProfileInfo from "src/app2/views/PersonProfileInfo.svelte"
-  import PersonShare from "src/app2/views/PersonShare.svelte"
-  import AddRelay from "src/app2/views/RelayAdd.svelte"
+  import ChatEdit from "src/app/views/ChatEdit.svelte"
+  import LoginConnect from "src/app/views/LoginConnect.svelte"
+  import LoginPrivKey from "src/app/views/LoginPrivKey.svelte"
+  import LoginPubKey from "src/app/views/LoginPubKey.svelte"
+  import Onboarding from "src/app/views/Onboarding.svelte"
+  import NoteCreate from "src/app/views/NoteCreate.svelte"
+  import NoteDetail from "src/app/views/NoteDetail.svelte"
+  import PersonList from "src/app/shared/PersonList.svelte"
+  import PersonProfileInfo from "src/app/views/PersonProfileInfo.svelte"
+  import PersonShare from "src/app/views/PersonShare.svelte"
+  import AddRelay from "src/app/views/RelayAdd.svelte"
 
   const closeModal = async () => {
     modal.clear()
diff --git a/src/app2/Routes.svelte b/src/app/Routes.svelte
similarity index 63%
rename from src/app2/Routes.svelte
rename to src/app/Routes.svelte
index 8a5a6958..26042e91 100644
--- a/src/app2/Routes.svelte
+++ b/src/app/Routes.svelte
@@ -1,25 +1,25 @@
 <script lang="ts">
   import {Route} from "svelte-routing"
   import {onReady} from "src/agent/db"
-  import EnsureData from "src/app2/EnsureData.svelte"
-  import Notifications from "src/app2/views/Notifications.svelte"
-  import Bech32Entity from "src/app2/views/Bech32Entity.svelte"
-  import ChatDetail from "src/app2/views/ChatDetail.svelte"
-  import ChatList from "src/app2/views/ChatList.svelte"
-  import Feeds from "src/app2/views/Feeds.svelte"
-  import UserKeys from "src/app2/views/UserKeys.svelte"
-  import Login from "src/app2/views/Login.svelte"
-  import Logout from "src/app2/views/Logout.svelte"
-  import MessagesDetail from "src/app2/views/MessagesDetail.svelte"
-  import MessagesList from "src/app2/views/MessagesList.svelte"
-  import NotFound from "src/app2/views/NotFound.svelte"
-  import PersonDetail from "src/app2/views/PersonDetail.svelte"
-  import Search from "src/app2/views/Search.svelte"
-  import Scan from "src/app2/views/Scan.svelte"
-  import RelayDetail from "src/app2/views/RelayDetail.svelte"
-  import RelayList from "src/app2/views/RelayList.svelte"
-  import UserProfile from "src/app2/views/UserProfile.svelte"
-  import UserSettings from "src/app2/views/UserSettings.svelte"
+  import EnsureData from "src/app/EnsureData.svelte"
+  import Notifications from "src/app/views/Notifications.svelte"
+  import Bech32Entity from "src/app/views/Bech32Entity.svelte"
+  import ChatDetail from "src/app/views/ChatDetail.svelte"
+  import ChatList from "src/app/views/ChatList.svelte"
+  import Feeds from "src/app/views/Feeds.svelte"
+  import UserKeys from "src/app/views/UserKeys.svelte"
+  import Login from "src/app/views/Login.svelte"
+  import Logout from "src/app/views/Logout.svelte"
+  import MessagesDetail from "src/app/views/MessagesDetail.svelte"
+  import MessagesList from "src/app/views/MessagesList.svelte"
+  import NotFound from "src/app/views/NotFound.svelte"
+  import PersonDetail from "src/app/views/PersonDetail.svelte"
+  import Search from "src/app/views/Search.svelte"
+  import Scan from "src/app/views/Scan.svelte"
+  import RelayDetail from "src/app/views/RelayDetail.svelte"
+  import RelayList from "src/app/views/RelayList.svelte"
+  import UserProfile from "src/app/views/UserProfile.svelte"
+  import UserSettings from "src/app/views/UserSettings.svelte"
 
   let ready = false
 
diff --git a/src/app2/SideNav.svelte b/src/app/SideNav.svelte
similarity index 96%
rename from src/app2/SideNav.svelte
rename to src/app/SideNav.svelte
index 10857a67..e0b8eb93 100644
--- a/src/app2/SideNav.svelte
+++ b/src/app/SideNav.svelte
@@ -4,10 +4,10 @@
   import {installPrompt} from "src/partials/state"
   import user from "src/agent/user"
   import pool from "src/agent/pool"
-  import {routes, menuIsOpen} from "src/app2/state"
-  import {newNotifications, newDirectMessages, newChatMessages} from "src/app2/state"
-  import {slowConnections} from "src/app2/state"
-  import PersonCircle from "src/app2/shared/PersonCircle.svelte"
+  import {routes, menuIsOpen} from "src/app/state"
+  import {newNotifications, newDirectMessages, newChatMessages} from "src/app/state"
+  import {slowConnections} from "src/app/state"
+  import PersonCircle from "src/app/shared/PersonCircle.svelte"
 
   const {profile, canPublish} = user
 
diff --git a/src/app2/Toast.svelte b/src/app/Toast.svelte
similarity index 100%
rename from src/app2/Toast.svelte
rename to src/app/Toast.svelte
diff --git a/src/app2/TopNav.svelte b/src/app/TopNav.svelte
similarity index 92%
rename from src/app2/TopNav.svelte
rename to src/app/TopNav.svelte
index 3b12f01f..1c12c6e8 100644
--- a/src/app2/TopNav.svelte
+++ b/src/app/TopNav.svelte
@@ -2,8 +2,8 @@
   import {onMount} from "svelte"
   import {theme} from "src/partials/state"
   import Anchor from "src/partials/Anchor.svelte"
-  import {menuIsOpen} from "src/app2/state"
-  import {newNotifications} from "src/app2/state"
+  import {menuIsOpen} from "src/app/state"
+  import {newNotifications} from "src/app/state"
 
   const toggleMenu = () => menuIsOpen.update(x => !x)
   const toggleTheme = () => theme.update(t => (t === "dark" ? "light" : "dark"))
diff --git a/src/app2/shared/Feed.svelte b/src/app/shared/Feed.svelte
similarity index 96%
rename from src/app2/shared/Feed.svelte
rename to src/app/shared/Feed.svelte
index a3f8ef3f..aa3f658e 100644
--- a/src/app2/shared/Feed.svelte
+++ b/src/app/shared/Feed.svelte
@@ -9,11 +9,11 @@
   import Spinner from "src/partials/Spinner.svelte"
   import Modal from "src/partials/Modal.svelte"
   import Content from "src/partials/Content.svelte"
-  import RelayFeed from "src/app2/shared/RelayFeed.svelte"
-  import Note from "src/app2/shared/Note.svelte"
+  import RelayFeed from "src/app/shared/RelayFeed.svelte"
+  import Note from "src/app/shared/Note.svelte"
   import user from "src/agent/user"
   import network from "src/agent/network"
-  import {mergeParents} from "src/app2/state"
+  import {mergeParents} from "src/app/state"
 
   export let filter
   export let relays = []
diff --git a/src/app2/shared/Note.svelte b/src/app/shared/Note.svelte
similarity index 95%
rename from src/app2/shared/Note.svelte
rename to src/app/shared/Note.svelte
index 2449d332..610ad7bc 100644
--- a/src/app2/shared/Note.svelte
+++ b/src/app/shared/Note.svelte
@@ -9,17 +9,17 @@
   import {modal} from "src/partials/state"
   import Popover from "src/partials/Popover.svelte"
   import Anchor from "src/partials/Anchor.svelte"
-  import PersonCircle from "src/app2/shared/PersonCircle.svelte"
-  import PersonSummary from "src/app2/shared/PersonSummary.svelte"
-  import NoteReply from "src/app2/shared/NoteReply.svelte"
-  import NoteActions from "src/app2/shared/NoteActions.svelte"
+  import PersonCircle from "src/app/shared/PersonCircle.svelte"
+  import PersonSummary from "src/app/shared/PersonSummary.svelte"
+  import NoteReply from "src/app/shared/NoteReply.svelte"
+  import NoteActions from "src/app/shared/NoteActions.svelte"
   import Card from "src/partials/Card.svelte"
   import user from "src/agent/user"
   import {getRelaysForEventParent} from "src/agent/relays"
   import {getPersonWithFallback} from "src/agent/db"
   import {watch} from "src/agent/db"
-  import {routes} from "src/app2/state"
-  import NoteContent from "src/app2/shared/NoteContent.svelte"
+  import {routes} from "src/app/state"
+  import NoteContent from "src/app/shared/NoteContent.svelte"
 
   export let note
   export let feedRelay
diff --git a/src/app2/shared/NoteActions.svelte b/src/app/shared/NoteActions.svelte
similarity index 98%
rename from src/app2/shared/NoteActions.svelte
rename to src/app/shared/NoteActions.svelte
index 671a529a..22328103 100644
--- a/src/app2/shared/NoteActions.svelte
+++ b/src/app/shared/NoteActions.svelte
@@ -16,10 +16,10 @@
   import Anchor from "src/partials/Anchor.svelte"
   import OverflowMenu from "src/partials/OverflowMenu.svelte"
   import CopyValue from "src/partials/CopyValue.svelte"
-  import PersonBadge from "src/app2/shared/PersonBadge.svelte"
+  import PersonBadge from "src/app/shared/PersonBadge.svelte"
   import Input from "src/partials/Input.svelte"
   import Textarea from "src/partials/Textarea.svelte"
-  import RelayCard from "src/app2/shared/RelayCard.svelte"
+  import RelayCard from "src/app/shared/RelayCard.svelte"
   import {getEventPublishRelays} from "src/agent/relays"
   import {getPersonWithFallback} from "src/agent/db"
   import network from "src/agent/network"
diff --git a/src/app2/shared/NoteContent.svelte b/src/app/shared/NoteContent.svelte
similarity index 97%
rename from src/app2/shared/NoteContent.svelte
rename to src/app/shared/NoteContent.svelte
index 43935d98..c13971c1 100644
--- a/src/app2/shared/NoteContent.svelte
+++ b/src/app/shared/NoteContent.svelte
@@ -10,12 +10,12 @@
   import Card from "src/partials/Card.svelte"
   import Spinner from "src/partials/Spinner.svelte"
   import Anchor from "src/partials/Anchor.svelte"
-  import PersonCircle from "src/app2/shared/PersonCircle.svelte"
+  import PersonCircle from "src/app/shared/PersonCircle.svelte"
   import {sampleRelays} from "src/agent/relays"
   import user from "src/agent/user"
   import network from "src/agent/network"
   import {getPersonWithFallback} from "src/agent/db"
-  import {routes} from "src/app2/state"
+  import {routes} from "src/app/state"
 
   export let note
   export let maxLength = 700
@@ -132,7 +132,7 @@
       {:else}
         {value}
       {/if}
-      {' '}
+      {" "}
     {/each}
   </p>
   {#if showMedia && links.length > 0}
diff --git a/src/app2/shared/NoteReply.svelte b/src/app/shared/NoteReply.svelte
similarity index 98%
rename from src/app2/shared/NoteReply.svelte
rename to src/app/shared/NoteReply.svelte
index 0411c6f4..ed7af2ce 100644
--- a/src/app2/shared/NoteReply.svelte
+++ b/src/app/shared/NoteReply.svelte
@@ -12,7 +12,7 @@
   import {getEventPublishRelays} from "src/agent/relays"
   import user from "src/agent/user"
   import cmd from "src/agent/cmd"
-  import {publishWithToast} from "src/app2/state"
+  import {publishWithToast} from "src/app/state"
 
   export let note
   export let borderColor
diff --git a/src/app2/shared/PersonAbout.svelte b/src/app/shared/PersonAbout.svelte
similarity index 100%
rename from src/app2/shared/PersonAbout.svelte
rename to src/app/shared/PersonAbout.svelte
diff --git a/src/app2/shared/PersonBadge.svelte b/src/app/shared/PersonBadge.svelte
similarity index 85%
rename from src/app2/shared/PersonBadge.svelte
rename to src/app/shared/PersonBadge.svelte
index b063ec4d..8aa1aa47 100644
--- a/src/app2/shared/PersonBadge.svelte
+++ b/src/app/shared/PersonBadge.svelte
@@ -2,8 +2,8 @@
   import {Link} from "svelte-routing"
   import {killEvent} from "src/util/html"
   import {displayPerson} from "src/util/nostr"
-  import {routes} from "src/app2/state"
-  import PersonCircle from "src/app2/shared/PersonCircle.svelte"
+  import {routes} from "src/app/state"
+  import PersonCircle from "src/app/shared/PersonCircle.svelte"
 
   export let person
   export let inert = false
diff --git a/src/app2/shared/PersonCircle.svelte b/src/app/shared/PersonCircle.svelte
similarity index 100%
rename from src/app2/shared/PersonCircle.svelte
rename to src/app/shared/PersonCircle.svelte
diff --git a/src/app2/shared/PersonInfo.svelte b/src/app/shared/PersonInfo.svelte
similarity index 91%
rename from src/app2/shared/PersonInfo.svelte
rename to src/app/shared/PersonInfo.svelte
index e64cbc11..ce839836 100644
--- a/src/app2/shared/PersonInfo.svelte
+++ b/src/app/shared/PersonInfo.svelte
@@ -4,11 +4,11 @@
   import {noEvent} from "src/util/html"
   import {displayPerson} from "src/util/nostr"
   import Anchor from "src/partials/Anchor.svelte"
-  import PersonCircle from "src/app2/shared/PersonCircle.svelte"
-  import PersonAbout from "src/app2/shared/PersonAbout.svelte"
+  import PersonCircle from "src/app/shared/PersonCircle.svelte"
+  import PersonAbout from "src/app/shared/PersonAbout.svelte"
   import {getPubkeyWriteRelays, sampleRelays} from "src/agent/relays"
   import user from "src/agent/user"
-  import {routes} from "src/app2/state"
+  import {routes} from "src/app/state"
 
   export let person
 
diff --git a/src/app2/shared/PersonList.svelte b/src/app/shared/PersonList.svelte
similarity index 95%
rename from src/app2/shared/PersonList.svelte
rename to src/app/shared/PersonList.svelte
index 146ec380..19f09446 100644
--- a/src/app2/shared/PersonList.svelte
+++ b/src/app/shared/PersonList.svelte
@@ -4,7 +4,7 @@
   import {Tags} from "src/util/nostr"
   import Content from "src/partials/Content.svelte"
   import Spinner from "src/partials/Spinner.svelte"
-  import PersonInfo from "src/app2/shared/PersonInfo.svelte"
+  import PersonInfo from "src/app/shared/PersonInfo.svelte"
   import {sampleRelays, getPubkeyWriteRelays} from "src/agent/relays"
   import {getPersonWithFallback} from "src/agent/db"
   import {watch} from "src/agent/db"
diff --git a/src/app2/shared/PersonSearch.svelte b/src/app/shared/PersonSearch.svelte
similarity index 95%
rename from src/app2/shared/PersonSearch.svelte
rename to src/app/shared/PersonSearch.svelte
index 325f97e5..a8e0fee7 100644
--- a/src/app2/shared/PersonSearch.svelte
+++ b/src/app/shared/PersonSearch.svelte
@@ -3,7 +3,7 @@
   import {personKinds} from "src/util/nostr"
   import Input from "src/partials/Input.svelte"
   import Spinner from "src/partials/Spinner.svelte"
-  import PersonInfo from "src/app2/shared/PersonInfo.svelte"
+  import PersonInfo from "src/app/shared/PersonInfo.svelte"
   import {getUserReadRelays} from "src/agent/relays"
   import {watch} from "src/agent/db"
   import network from "src/agent/network"
diff --git a/src/app2/shared/PersonSummary.svelte b/src/app/shared/PersonSummary.svelte
similarity index 93%
rename from src/app2/shared/PersonSummary.svelte
rename to src/app/shared/PersonSummary.svelte
index eb6e3ed6..579c92a7 100644
--- a/src/app2/shared/PersonSummary.svelte
+++ b/src/app/shared/PersonSummary.svelte
@@ -7,9 +7,9 @@
   import {sampleRelays, getPubkeyWriteRelays} from "src/agent/relays"
   import {getPersonWithFallback} from "src/agent/db"
   import {watch} from "src/agent/db"
-  import {routes} from "src/app2/state"
-  import PersonCircle from "src/app2/shared/PersonCircle.svelte"
-  import PersonAbout from "src/app2/shared/PersonAbout.svelte"
+  import {routes} from "src/app/state"
+  import PersonCircle from "src/app/shared/PersonCircle.svelte"
+  import PersonAbout from "src/app/shared/PersonAbout.svelte"
 
   export let pubkey
 
diff --git a/src/app2/shared/RelayActions.svelte b/src/app/shared/RelayActions.svelte
similarity index 100%
rename from src/app2/shared/RelayActions.svelte
rename to src/app/shared/RelayActions.svelte
diff --git a/src/app2/shared/RelayCard.svelte b/src/app/shared/RelayCard.svelte
similarity index 98%
rename from src/app2/shared/RelayCard.svelte
rename to src/app/shared/RelayCard.svelte
index 7e315dd4..41606ec6 100644
--- a/src/app2/shared/RelayCard.svelte
+++ b/src/app/shared/RelayCard.svelte
@@ -9,7 +9,7 @@
   import Anchor from "src/partials/Anchor.svelte"
   import pool from "src/agent/pool"
   import user from "src/agent/user"
-  import {loadAppData} from "src/app2/state"
+  import {loadAppData} from "src/app/state"
 
   export let relay
   export let theme = "gray-8"
diff --git a/src/app2/shared/RelayFeed.svelte b/src/app/shared/RelayFeed.svelte
similarity index 86%
rename from src/app2/shared/RelayFeed.svelte
rename to src/app/shared/RelayFeed.svelte
index cada7f6a..e60b7799 100644
--- a/src/app2/shared/RelayFeed.svelte
+++ b/src/app/shared/RelayFeed.svelte
@@ -2,9 +2,9 @@
   import {displayRelay} from "src/util/nostr"
   import Content from "src/partials/Content.svelte"
   import Spinner from "src/partials/Spinner.svelte"
-  import RelayTitle from "src/app2/shared/RelayTitle.svelte"
-  import RelayActions from "src/app2/shared/RelayActions.svelte"
-  import Note from "src/app2/shared/Note.svelte"
+  import RelayTitle from "src/app/shared/RelayTitle.svelte"
+  import RelayActions from "src/app/shared/RelayActions.svelte"
+  import Note from "src/app/shared/Note.svelte"
 
   export let depth
   export let showContext = false
diff --git a/src/app2/shared/RelaySearch.svelte b/src/app/shared/RelaySearch.svelte
similarity index 95%
rename from src/app2/shared/RelaySearch.svelte
rename to src/app/shared/RelaySearch.svelte
index ca495858..08941c35 100644
--- a/src/app2/shared/RelaySearch.svelte
+++ b/src/app/shared/RelaySearch.svelte
@@ -2,7 +2,7 @@
   import {pluck} from "ramda"
   import {fuzzy} from "src/util/misc"
   import Input from "src/partials/Input.svelte"
-  import RelayCard from "src/app2/shared/RelayCard.svelte"
+  import RelayCard from "src/app/shared/RelayCard.svelte"
   import {watch} from "src/agent/db"
   import user from "src/agent/user"
 
diff --git a/src/app2/shared/RelayTitle.svelte b/src/app/shared/RelayTitle.svelte
similarity index 100%
rename from src/app2/shared/RelayTitle.svelte
rename to src/app/shared/RelayTitle.svelte
diff --git a/src/app2/state.ts b/src/app/state.ts
similarity index 100%
rename from src/app2/state.ts
rename to src/app/state.ts
diff --git a/src/app2/views/Bech32Entity.svelte b/src/app/views/Bech32Entity.svelte
similarity index 89%
rename from src/app2/views/Bech32Entity.svelte
rename to src/app/views/Bech32Entity.svelte
index 7b6b0d61..3493e63b 100644
--- a/src/app2/views/Bech32Entity.svelte
+++ b/src/app/views/Bech32Entity.svelte
@@ -4,8 +4,8 @@
   import {nip19} from "nostr-tools"
   import {warn} from "src/util/logger"
   import Content from "src/partials/Content.svelte"
-  import NoteDetail from "src/app2/views/NoteDetail.svelte"
-  import PersonDetail from "src/app2/views/PersonDetail.svelte"
+  import NoteDetail from "src/app/views/NoteDetail.svelte"
+  import PersonDetail from "src/app/views/PersonDetail.svelte"
   import {sampleRelays} from "src/agent/relays"
 
   export let entity
diff --git a/src/app2/views/ChatDetail.svelte b/src/app/views/ChatDetail.svelte
similarity index 94%
rename from src/app2/views/ChatDetail.svelte
rename to src/app/views/ChatDetail.svelte
index cd76364f..6950ff78 100644
--- a/src/app2/views/ChatDetail.svelte
+++ b/src/app/views/ChatDetail.svelte
@@ -6,14 +6,14 @@
   import {modal} from "src/partials/state"
   import Channel from "src/partials/Channel.svelte"
   import Anchor from "src/partials/Anchor.svelte"
-  import PersonBadge from "src/app2/shared/PersonBadge.svelte"
-  import NoteContent from "src/app2/shared/NoteContent.svelte"
+  import PersonBadge from "src/app/shared/PersonBadge.svelte"
+  import NoteContent from "src/app/shared/NoteContent.svelte"
   import user from "src/agent/user"
   import {getRelaysForEventChildren, sampleRelays} from "src/agent/relays"
   import network from "src/agent/network"
   import {watch} from "src/agent/db"
   import cmd from "src/agent/cmd"
-  import {lastChecked} from "src/app2/state"
+  import {lastChecked} from "src/app/state"
 
   export let entity
 
diff --git a/src/app2/views/ChatEdit.svelte b/src/app/views/ChatEdit.svelte
similarity index 98%
rename from src/app2/views/ChatEdit.svelte
rename to src/app/views/ChatEdit.svelte
index 5e2bb913..3639c2b3 100644
--- a/src/app2/views/ChatEdit.svelte
+++ b/src/app/views/ChatEdit.svelte
@@ -11,7 +11,7 @@
   import {getUserWriteRelays} from "src/agent/relays"
   import {rooms} from "src/agent/db"
   import cmd from "src/agent/cmd"
-  import {publishWithToast} from "src/app2/state"
+  import {publishWithToast} from "src/app/state"
 
   export let room = {name: null, id: null, about: null, picture: null}
 
diff --git a/src/app2/views/ChatList.svelte b/src/app/views/ChatList.svelte
similarity index 97%
rename from src/app2/views/ChatList.svelte
rename to src/app/views/ChatList.svelte
index 9854aa49..13daea44 100644
--- a/src/app2/views/ChatList.svelte
+++ b/src/app/views/ChatList.svelte
@@ -4,7 +4,7 @@
   import Input from "src/partials/Input.svelte"
   import Content from "src/partials/Content.svelte"
   import Anchor from "src/partials/Anchor.svelte"
-  import ChatListItem from "src/app2/views/ChatListItem.svelte"
+  import ChatListItem from "src/app/views/ChatListItem.svelte"
   import {watch} from "src/agent/db"
   import network from "src/agent/network"
   import {getUserReadRelays} from "src/agent/relays"
diff --git a/src/app2/views/ChatListItem.svelte b/src/app/views/ChatListItem.svelte
similarity index 100%
rename from src/app2/views/ChatListItem.svelte
rename to src/app/views/ChatListItem.svelte
diff --git a/src/app2/views/Feeds.svelte b/src/app/views/Feeds.svelte
similarity index 87%
rename from src/app2/views/Feeds.svelte
rename to src/app/views/Feeds.svelte
index 7b90016a..3142bbf8 100644
--- a/src/app2/views/Feeds.svelte
+++ b/src/app/views/Feeds.svelte
@@ -4,8 +4,8 @@
   import Anchor from "src/partials/Anchor.svelte"
   import Content from "src/partials/Content.svelte"
   import Tabs from "src/partials/Tabs.svelte"
-  import FeedsFollows from "src/app2/views/FeedsFollows.svelte"
-  import FeedsNetwork from "src/app2/views/FeedsNetwork.svelte"
+  import FeedsFollows from "src/app/views/FeedsFollows.svelte"
+  import FeedsNetwork from "src/app/views/FeedsNetwork.svelte"
   import user from "src/agent/user"
 
   export let activeTab
diff --git a/src/app2/views/FeedsFollows.svelte b/src/app/views/FeedsFollows.svelte
similarity index 92%
rename from src/app2/views/FeedsFollows.svelte
rename to src/app/views/FeedsFollows.svelte
index c95a1de9..9ffaac00 100644
--- a/src/app2/views/FeedsFollows.svelte
+++ b/src/app/views/FeedsFollows.svelte
@@ -1,6 +1,6 @@
 <script>
   import {shuffle} from "src/util/misc"
-  import Feed from "src/app2/shared/Feed.svelte"
+  import Feed from "src/app/shared/Feed.svelte"
   import {getUserFollows} from "src/agent/social"
   import {sampleRelays, getAllPubkeyWriteRelays} from "src/agent/relays"
 
diff --git a/src/app2/views/FeedsNetwork.svelte b/src/app/views/FeedsNetwork.svelte
similarity index 93%
rename from src/app2/views/FeedsNetwork.svelte
rename to src/app/views/FeedsNetwork.svelte
index 719d602a..cd666d22 100644
--- a/src/app2/views/FeedsNetwork.svelte
+++ b/src/app/views/FeedsNetwork.svelte
@@ -1,6 +1,6 @@
 <script>
   import {shuffle} from "src/util/misc"
-  import Feed from "src/app2/shared/Feed.svelte"
+  import Feed from "src/app/shared/Feed.svelte"
   import {getUserNetwork} from "src/agent/social"
   import {sampleRelays, getAllPubkeyWriteRelays} from "src/agent/relays"
 
diff --git a/src/app2/views/Login.svelte b/src/app/views/Login.svelte
similarity index 97%
rename from src/app2/views/Login.svelte
rename to src/app/views/Login.svelte
index 6cbca0d2..bbf89902 100644
--- a/src/app2/views/Login.svelte
+++ b/src/app/views/Login.svelte
@@ -6,7 +6,7 @@
   import Content from "src/partials/Content.svelte"
   import Heading from "src/partials/Heading.svelte"
   import user from "src/agent/user"
-  import {login} from "src/app2/state"
+  import {login} from "src/app/state"
 
   const nip07 = "https://github.com/nostr-protocol/nips/blob/master/07.md"
 
diff --git a/src/app2/views/LoginConnect.svelte b/src/app/views/LoginConnect.svelte
similarity index 97%
rename from src/app2/views/LoginConnect.svelte
rename to src/app/views/LoginConnect.svelte
index 915a1d4e..af737586 100644
--- a/src/app2/views/LoginConnect.svelte
+++ b/src/app/views/LoginConnect.svelte
@@ -12,12 +12,12 @@
   import Heading from "src/partials/Heading.svelte"
   import Anchor from "src/partials/Anchor.svelte"
   import Modal from "src/partials/Modal.svelte"
-  import RelayCard from "src/app2/shared/RelayCard.svelte"
+  import RelayCard from "src/app/shared/RelayCard.svelte"
   import {watch} from "src/agent/db"
   import network from "src/agent/network"
   import user from "src/agent/user"
   import pool from "src/agent/pool"
-  import {loadAppData} from "src/app2/state"
+  import {loadAppData} from "src/app/state"
 
   let modal = null
   let customRelayUrl = null
diff --git a/src/app2/views/LoginPrivKey.svelte b/src/app/views/LoginPrivKey.svelte
similarity index 97%
rename from src/app2/views/LoginPrivKey.svelte
rename to src/app/views/LoginPrivKey.svelte
index 9fdf8c5a..8218b985 100644
--- a/src/app2/views/LoginPrivKey.svelte
+++ b/src/app/views/LoginPrivKey.svelte
@@ -6,7 +6,7 @@
   import Content from "src/partials/Content.svelte"
   import Heading from "src/partials/Heading.svelte"
   import keys from "src/agent/keys"
-  import {login} from "src/app2/state"
+  import {login} from "src/app/state"
 
   let nsec = ""
   const nip07 = "https://github.com/nostr-protocol/nips/blob/master/07.md"
diff --git a/src/app2/views/LoginPubKey.svelte b/src/app/views/LoginPubKey.svelte
similarity index 96%
rename from src/app2/views/LoginPubKey.svelte
rename to src/app/views/LoginPubKey.svelte
index 810ae375..775a31a9 100644
--- a/src/app2/views/LoginPubKey.svelte
+++ b/src/app/views/LoginPubKey.svelte
@@ -6,7 +6,7 @@
   import Heading from "src/partials/Heading.svelte"
   import keys from "src/agent/keys"
   import {toast} from "src/partials/state"
-  import {login} from "src/app2/state"
+  import {login} from "src/app/state"
 
   let npub = ""
 
diff --git a/src/app2/views/Logout.svelte b/src/app/views/Logout.svelte
similarity index 100%
rename from src/app2/views/Logout.svelte
rename to src/app/views/Logout.svelte
diff --git a/src/app2/views/MessagesDetail.svelte b/src/app/views/MessagesDetail.svelte
similarity index 93%
rename from src/app2/views/MessagesDetail.svelte
rename to src/app/views/MessagesDetail.svelte
index 21ca06fe..ee670b68 100644
--- a/src/app2/views/MessagesDetail.svelte
+++ b/src/app/views/MessagesDetail.svelte
@@ -6,7 +6,7 @@
   import {Tags} from "src/util/nostr"
   import Channel from "src/partials/Channel.svelte"
   import Anchor from "src/partials/Anchor.svelte"
-  import NoteContent from "src/app2/shared/NoteContent.svelte"
+  import NoteContent from "src/app/shared/NoteContent.svelte"
   import {getAllPubkeyRelays, sampleRelays} from "src/agent/relays"
   import {getPersonWithFallback} from "src/agent/db"
   import {watch} from "src/agent/db"
@@ -14,10 +14,10 @@
   import keys from "src/agent/keys"
   import user from "src/agent/user"
   import cmd from "src/agent/cmd"
-  import {routes} from "src/app2/state"
-  import {lastChecked} from "src/app2/state"
-  import PersonCircle from "src/app2/shared/PersonCircle.svelte"
-  import PersonAbout from "src/app2/shared/PersonAbout.svelte"
+  import {routes} from "src/app/state"
+  import {lastChecked} from "src/app/state"
+  import PersonCircle from "src/app/shared/PersonCircle.svelte"
+  import PersonAbout from "src/app/shared/PersonAbout.svelte"
 
   export let entity
 
diff --git a/src/app2/views/MessagesList.svelte b/src/app/views/MessagesList.svelte
similarity index 94%
rename from src/app2/views/MessagesList.svelte
rename to src/app/views/MessagesList.svelte
index d6b49087..336d94ab 100644
--- a/src/app2/views/MessagesList.svelte
+++ b/src/app/views/MessagesList.svelte
@@ -3,7 +3,7 @@
   import {toTitle} from "hurdak/lib/hurdak"
   import Tabs from "src/partials/Tabs.svelte"
   import Content from "src/partials/Content.svelte"
-  import MessagesListItem from "src/app2/views/MessagesListItem.svelte"
+  import MessagesListItem from "src/app/views/MessagesListItem.svelte"
   import {watch} from "src/agent/db"
 
   let activeTab = "messages"
diff --git a/src/app2/views/MessagesListItem.svelte b/src/app/views/MessagesListItem.svelte
similarity index 92%
rename from src/app2/views/MessagesListItem.svelte
rename to src/app/views/MessagesListItem.svelte
index 226bce8f..56e77f0d 100644
--- a/src/app2/views/MessagesListItem.svelte
+++ b/src/app/views/MessagesListItem.svelte
@@ -4,8 +4,8 @@
   import {ellipsize} from "hurdak/lib/hurdak"
   import {displayPerson} from "src/util/nostr"
   import {getPersonWithFallback} from "src/agent/db"
-  import {lastChecked} from "src/app2/state"
-  import PersonCircle from "src/app2/shared/PersonCircle.svelte"
+  import {lastChecked} from "src/app/state"
+  import PersonCircle from "src/app/shared/PersonCircle.svelte"
   import Card from "src/partials/Card.svelte"
 
   export let contact
diff --git a/src/app2/views/NotFound.svelte b/src/app/views/NotFound.svelte
similarity index 100%
rename from src/app2/views/NotFound.svelte
rename to src/app/views/NotFound.svelte
diff --git a/src/app2/views/NoteCreate.svelte b/src/app/views/NoteCreate.svelte
similarity index 96%
rename from src/app2/views/NoteCreate.svelte
rename to src/app/views/NoteCreate.svelte
index 2184438e..6aa70f1d 100644
--- a/src/app2/views/NoteCreate.svelte
+++ b/src/app/views/NoteCreate.svelte
@@ -14,14 +14,14 @@
   import Content from "src/partials/Content.svelte"
   import Modal from "src/partials/Modal.svelte"
   import Heading from "src/partials/Heading.svelte"
-  import RelayCard from "src/app2/shared/RelayCard.svelte"
-  import RelaySearch from "src/app2/shared/RelaySearch.svelte"
+  import RelayCard from "src/app/shared/RelayCard.svelte"
+  import RelaySearch from "src/app/shared/RelaySearch.svelte"
   import {getUserWriteRelays} from "src/agent/relays"
   import {getPersonWithFallback} from "src/agent/db"
   import cmd from "src/agent/cmd"
   import user from "src/agent/user"
   import {toast, modal} from "src/partials/state"
-  import {publishWithToast} from "src/app2/state"
+  import {publishWithToast} from "src/app/state"
 
   export let pubkey = null
   export let nevent = null
diff --git a/src/app2/views/NoteDetail.svelte b/src/app/views/NoteDetail.svelte
similarity index 94%
rename from src/app2/views/NoteDetail.svelte
rename to src/app/views/NoteDetail.svelte
index a07bb3e6..64186493 100644
--- a/src/app2/views/NoteDetail.svelte
+++ b/src/app/views/NoteDetail.svelte
@@ -6,10 +6,10 @@
   import {log} from "src/util/logger"
   import {asDisplayEvent} from "src/util/nostr"
   import Content from "src/partials/Content.svelte"
-  import RelayFeed from "src/app2/shared/RelayFeed.svelte"
+  import RelayFeed from "src/app/shared/RelayFeed.svelte"
   import Modal from "src/partials/Modal.svelte"
   import Spinner from "src/partials/Spinner.svelte"
-  import Note from "src/app2/shared/Note.svelte"
+  import Note from "src/app/shared/Note.svelte"
   import user from "src/agent/user"
   import network from "src/agent/network"
   import {sampleRelays} from "src/agent/relays"
diff --git a/src/app2/views/Notification.svelte b/src/app/views/Notification.svelte
similarity index 93%
rename from src/app2/views/Notification.svelte
rename to src/app/views/Notification.svelte
index 4b045d33..7fe7a251 100644
--- a/src/app2/views/Notification.svelte
+++ b/src/app/views/Notification.svelte
@@ -3,11 +3,11 @@
   import {closure, quantify} from "hurdak/lib/hurdak"
   import {formatTimestamp, tryJson} from "src/util/misc"
   import {Tags} from "src/util/nostr"
-  import PersonBadge from "src/app2/shared/PersonBadge.svelte"
+  import PersonBadge from "src/app/shared/PersonBadge.svelte"
   import Card from "src/partials/Card.svelte"
   import Popover from "src/partials/Popover.svelte"
-  import NoteContent from "src/app2/shared/NoteContent.svelte"
-  import NotificationSection from "src/app2/views/NotificationSection.svelte"
+  import NoteContent from "src/app/shared/NoteContent.svelte"
+  import NotificationSection from "src/app/views/NotificationSection.svelte"
   import {getPersonWithFallback, userEvents} from "src/agent/db"
   import {modal} from "src/partials/state"
 
diff --git a/src/app2/views/NotificationSection.svelte b/src/app/views/NotificationSection.svelte
similarity index 82%
rename from src/app2/views/NotificationSection.svelte
rename to src/app/views/NotificationSection.svelte
index 6f200349..977e5c1b 100644
--- a/src/app2/views/NotificationSection.svelte
+++ b/src/app/views/NotificationSection.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import PersonBadge from "src/app2/shared/PersonBadge.svelte"
+  import PersonBadge from "src/app/shared/PersonBadge.svelte"
   import {getPersonWithFallback} from "src/agent/db"
 
   export let pubkeys
diff --git a/src/app2/views/Notifications.svelte b/src/app/views/Notifications.svelte
similarity index 95%
rename from src/app2/views/Notifications.svelte
rename to src/app/views/Notifications.svelte
index 8b8db070..c9e3b1b4 100644
--- a/src/app2/views/Notifications.svelte
+++ b/src/app/views/Notifications.svelte
@@ -6,11 +6,11 @@
   import {findReplyId} from "src/util/nostr"
   import Spinner from "src/partials/Spinner.svelte"
   import Content from "src/partials/Content.svelte"
-  import Notification from "src/app2/views/Notification.svelte"
+  import Notification from "src/app/views/Notification.svelte"
   import {watch} from "src/agent/db"
   import user from "src/agent/user"
   import {userEvents} from "src/agent/db"
-  import {lastChecked} from "src/app2/state"
+  import {lastChecked} from "src/app/state"
 
   let limit = 0
   let events = null
diff --git a/src/app2/views/Onboarding.svelte b/src/app/views/Onboarding.svelte
similarity index 87%
rename from src/app2/views/Onboarding.svelte
rename to src/app/views/Onboarding.svelte
index 8ded0f98..9f280b96 100644
--- a/src/app2/views/Onboarding.svelte
+++ b/src/app/views/Onboarding.svelte
@@ -6,11 +6,11 @@
   import {navigate} from "svelte-routing"
   import {shuffle} from "src/util/misc"
   import {displayPerson} from "src/util/nostr"
-  import OnboardingIntro from "src/app2/views/OnboardingIntro.svelte"
-  import OnboardingKey from "src/app2/views/OnboardingKey.svelte"
-  import OnboardingRelays from "src/app2/views/OnboardingRelays.svelte"
-  import OnboardingFollows from "src/app2/views/OnboardingFollows.svelte"
-  import OnboardingComplete from "src/app2/views/OnboardingComplete.svelte"
+  import OnboardingIntro from "src/app/views/OnboardingIntro.svelte"
+  import OnboardingKey from "src/app/views/OnboardingKey.svelte"
+  import OnboardingRelays from "src/app/views/OnboardingRelays.svelte"
+  import OnboardingFollows from "src/app/views/OnboardingFollows.svelte"
+  import OnboardingComplete from "src/app/views/OnboardingComplete.svelte"
   import {getFollows} from "src/agent/social"
   import {getPubkeyWriteRelays, sampleRelays} from "src/agent/relays"
   import {getPersonWithFallback} from "src/agent/db"
@@ -18,7 +18,7 @@
   import pool from "src/agent/pool"
   import user from "src/agent/user"
   import keys from "src/agent/keys"
-  import {loadAppData} from "src/app2/state"
+  import {loadAppData} from "src/app/state"
   import {modal} from "src/partials/state"
 
   export let stage
diff --git a/src/app2/views/OnboardingComplete.svelte b/src/app/views/OnboardingComplete.svelte
similarity index 100%
rename from src/app2/views/OnboardingComplete.svelte
rename to src/app/views/OnboardingComplete.svelte
diff --git a/src/app2/views/OnboardingFollows.svelte b/src/app/views/OnboardingFollows.svelte
similarity index 97%
rename from src/app2/views/OnboardingFollows.svelte
rename to src/app/views/OnboardingFollows.svelte
index bdb6ecc1..e0d14d14 100644
--- a/src/app2/views/OnboardingFollows.svelte
+++ b/src/app/views/OnboardingFollows.svelte
@@ -5,7 +5,7 @@
   import Anchor from "src/partials/Anchor.svelte"
   import Heading from "src/partials/Heading.svelte"
   import Content from "src/partials/Content.svelte"
-  import PersonInfo from "src/app2/shared/PersonInfo.svelte"
+  import PersonInfo from "src/app/shared/PersonInfo.svelte"
   import {getPersonWithFallback} from "src/agent/db"
   import {watch} from "src/agent/db"
   import {modal} from "src/partials/state"
diff --git a/src/app2/views/OnboardingIntro.svelte b/src/app/views/OnboardingIntro.svelte
similarity index 100%
rename from src/app2/views/OnboardingIntro.svelte
rename to src/app/views/OnboardingIntro.svelte
diff --git a/src/app2/views/OnboardingKey.svelte b/src/app/views/OnboardingKey.svelte
similarity index 100%
rename from src/app2/views/OnboardingKey.svelte
rename to src/app/views/OnboardingKey.svelte
diff --git a/src/app2/views/OnboardingRelays.svelte b/src/app/views/OnboardingRelays.svelte
similarity index 97%
rename from src/app2/views/OnboardingRelays.svelte
rename to src/app/views/OnboardingRelays.svelte
index 9f017871..33a58158 100644
--- a/src/app2/views/OnboardingRelays.svelte
+++ b/src/app/views/OnboardingRelays.svelte
@@ -6,7 +6,7 @@
   import Anchor from "src/partials/Anchor.svelte"
   import Heading from "src/partials/Heading.svelte"
   import Content from "src/partials/Content.svelte"
-  import RelayCard from "src/app2/shared/RelayCard.svelte"
+  import RelayCard from "src/app/shared/RelayCard.svelte"
   import {watch} from "src/agent/db"
 
   export let relays
diff --git a/src/app2/views/PersonDetail.svelte b/src/app/views/PersonDetail.svelte
similarity index 94%
rename from src/app2/views/PersonDetail.svelte
rename to src/app/views/PersonDetail.svelte
index 229d4c0a..80259d8e 100644
--- a/src/app2/views/PersonDetail.svelte
+++ b/src/app/views/PersonDetail.svelte
@@ -13,17 +13,17 @@
   import Content from "src/partials/Content.svelte"
   import OverflowMenu from "src/partials/OverflowMenu.svelte"
   import Spinner from "src/partials/Spinner.svelte"
-  import Notes from "src/app2/views/PersonNotes.svelte"
-  import Likes from "src/app2/views/PersonLikes.svelte"
-  import Relays from "src/app2/views/PersonRelays.svelte"
+  import Notes from "src/app/views/PersonNotes.svelte"
+  import Likes from "src/app/views/PersonLikes.svelte"
+  import Relays from "src/app/views/PersonRelays.svelte"
   import user from "src/agent/user"
   import pool from "src/agent/pool"
   import {sampleRelays, getPubkeyWriteRelays} from "src/agent/relays"
   import network from "src/agent/network"
   import {getPersonWithFallback, watch} from "src/agent/db"
-  import {routes} from "src/app2/state"
-  import PersonCircle from "src/app2/shared/PersonCircle.svelte"
-  import PersonAbout from "src/app2/shared/PersonAbout.svelte"
+  import {routes} from "src/app/state"
+  import PersonCircle from "src/app/shared/PersonCircle.svelte"
+  import PersonAbout from "src/app/shared/PersonAbout.svelte"
 
   export let npub
   export let activeTab
diff --git a/src/app2/views/PersonLikes.svelte b/src/app/views/PersonLikes.svelte
similarity index 87%
rename from src/app2/views/PersonLikes.svelte
rename to src/app/views/PersonLikes.svelte
index b9053b05..fd67cda4 100644
--- a/src/app2/views/PersonLikes.svelte
+++ b/src/app/views/PersonLikes.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Feed from "src/app2/shared/Feed.svelte"
+  import Feed from "src/app/shared/Feed.svelte"
   import {isLike} from "src/util/nostr"
   import {timedelta} from "src/util/misc"
 
diff --git a/src/app2/views/PersonNotes.svelte b/src/app/views/PersonNotes.svelte
similarity index 83%
rename from src/app2/views/PersonNotes.svelte
rename to src/app/views/PersonNotes.svelte
index ec853525..9023e6a3 100644
--- a/src/app2/views/PersonNotes.svelte
+++ b/src/app/views/PersonNotes.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import {timedelta} from "src/util/misc"
-  import Feed from "src/app2/shared/Feed.svelte"
+  import Feed from "src/app/shared/Feed.svelte"
 
   export let pubkey
   export let relays
diff --git a/src/app2/views/PersonProfileInfo.svelte b/src/app/views/PersonProfileInfo.svelte
similarity index 97%
rename from src/app2/views/PersonProfileInfo.svelte
rename to src/app/views/PersonProfileInfo.svelte
index b276d147..121ef1f1 100644
--- a/src/app2/views/PersonProfileInfo.svelte
+++ b/src/app/views/PersonProfileInfo.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import {nip05, nip19} from "nostr-tools"
   import Content from "src/partials/Content.svelte"
-  import RelayCard from "src/app2/shared/RelayCard.svelte"
+  import RelayCard from "src/app/shared/RelayCard.svelte"
   import CopyValue from "src/partials/CopyValue.svelte"
   import {onMount} from "svelte"
   import {fly} from "svelte/transition"
diff --git a/src/app2/views/PersonRelays.svelte b/src/app/views/PersonRelays.svelte
similarity index 90%
rename from src/app2/views/PersonRelays.svelte
rename to src/app/views/PersonRelays.svelte
index b8b437d5..374ad682 100644
--- a/src/app2/views/PersonRelays.svelte
+++ b/src/app/views/PersonRelays.svelte
@@ -1,7 +1,7 @@
 <script>
   import {fly} from "svelte/transition"
   import Content from "src/partials/Content.svelte"
-  import RelayCard from "src/app2/shared/RelayCard.svelte"
+  import RelayCard from "src/app/shared/RelayCard.svelte"
 
   export let relays
 </script>
diff --git a/src/app2/views/PersonShare.svelte b/src/app/views/PersonShare.svelte
similarity index 100%
rename from src/app2/views/PersonShare.svelte
rename to src/app/views/PersonShare.svelte
diff --git a/src/app2/views/RelayAdd.svelte b/src/app/views/RelayAdd.svelte
similarity index 97%
rename from src/app2/views/RelayAdd.svelte
rename to src/app/views/RelayAdd.svelte
index 4035e79b..cc028d57 100644
--- a/src/app2/views/RelayAdd.svelte
+++ b/src/app/views/RelayAdd.svelte
@@ -6,7 +6,7 @@
   import Button from "src/partials/Button.svelte"
   import user from "src/agent/user"
   import {toast, modal} from "src/partials/state"
-  import {loadAppData} from "src/app2/state"
+  import {loadAppData} from "src/app/state"
 
   let url = $modal.url
 
diff --git a/src/app2/views/RelayDetail.svelte b/src/app/views/RelayDetail.svelte
similarity index 77%
rename from src/app2/views/RelayDetail.svelte
rename to src/app/views/RelayDetail.svelte
index 9c77eab1..59c21f7f 100644
--- a/src/app2/views/RelayDetail.svelte
+++ b/src/app/views/RelayDetail.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import {displayRelay} from "src/util/nostr"
   import Content from "src/partials/Content.svelte"
-  import Feed from "src/app2/shared/Feed.svelte"
-  import RelayTitle from "src/app2/shared/RelayTitle.svelte"
-  import RelayActions from "src/app2/shared/RelayActions.svelte"
+  import Feed from "src/app/shared/Feed.svelte"
+  import RelayTitle from "src/app/shared/RelayTitle.svelte"
+  import RelayActions from "src/app/shared/RelayActions.svelte"
   import {relays} from "src/agent/db"
 
   export let url
diff --git a/src/app2/views/RelayList.svelte b/src/app/views/RelayList.svelte
similarity index 93%
rename from src/app2/views/RelayList.svelte
rename to src/app/views/RelayList.svelte
index c7e0632d..dc16aaed 100644
--- a/src/app2/views/RelayList.svelte
+++ b/src/app/views/RelayList.svelte
@@ -2,8 +2,8 @@
   import {fly} from "svelte/transition"
   import Anchor from "src/partials/Anchor.svelte"
   import Content from "src/partials/Content.svelte"
-  import RelaySearch from "src/app2/shared/RelaySearch.svelte"
-  import RelayCard from "src/app2/shared/RelayCard.svelte"
+  import RelaySearch from "src/app/shared/RelaySearch.svelte"
+  import RelayCard from "src/app/shared/RelayCard.svelte"
   import user from "src/agent/user"
   import {modal} from "src/partials/state"
 
diff --git a/src/app2/views/Scan.svelte b/src/app/views/Scan.svelte
similarity index 100%
rename from src/app2/views/Scan.svelte
rename to src/app/views/Scan.svelte
diff --git a/src/app2/views/Search.svelte b/src/app/views/Search.svelte
similarity index 86%
rename from src/app2/views/Search.svelte
rename to src/app/views/Search.svelte
index bc41e72f..d8006cda 100644
--- a/src/app2/views/Search.svelte
+++ b/src/app/views/Search.svelte
@@ -1,7 +1,7 @@
 <script>
   import Heading from "src/partials/Heading.svelte"
   import Content from "src/partials/Content.svelte"
-  import PersonSearch from "src/app2/shared/PersonSearch.svelte"
+  import PersonSearch from "src/app/shared/PersonSearch.svelte"
 </script>
 
 <Content>
diff --git a/src/app2/views/UserKeys.svelte b/src/app/views/UserKeys.svelte
similarity index 100%
rename from src/app2/views/UserKeys.svelte
rename to src/app/views/UserKeys.svelte
diff --git a/src/app2/views/UserProfile.svelte b/src/app/views/UserProfile.svelte
similarity index 97%
rename from src/app2/views/UserProfile.svelte
rename to src/app/views/UserProfile.svelte
index 885e549d..baeaa856 100644
--- a/src/app2/views/UserProfile.svelte
+++ b/src/app/views/UserProfile.svelte
@@ -12,8 +12,8 @@
   import user from "src/agent/user"
   import {getUserWriteRelays} from "src/agent/relays"
   import cmd from "src/agent/cmd"
-  import {routes} from "src/app2/state"
-  import {publishWithToast} from "src/app2/state"
+  import {routes} from "src/app/state"
+  import {publishWithToast} from "src/app/state"
 
   let values = user.getProfile().kind0 || {}
 
diff --git a/src/app2/views/UserSettings.svelte b/src/app/views/UserSettings.svelte
similarity index 100%
rename from src/app2/views/UserSettings.svelte
rename to src/app/views/UserSettings.svelte
diff --git a/src/main.js b/src/main.js
index 3e0ebc59..63753df4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,7 +1,7 @@
 import "src/app.css"
 
 import Bugsnag from "@bugsnag/js"
-import App from "src/app2/App.svelte"
+import App from "src/app/App.svelte"
 import {installPrompt} from "src/partials/state"
 
 Bugsnag.start({
diff --git a/src/partials/Compose.svelte b/src/partials/Compose.svelte
index f711582e..d8264ea3 100644
--- a/src/partials/Compose.svelte
+++ b/src/partials/Compose.svelte
@@ -3,7 +3,7 @@
   import {last, pluck, propEq} from "ramda"
   import {fuzzy} from "src/util/misc"
   import {displayPerson} from "src/util/nostr"
-  import PersonBadge from "src/app2/shared/PersonBadge.svelte"
+  import PersonBadge from "src/app/shared/PersonBadge.svelte"
   import ContentEditable from "src/partials/ContentEditable.svelte"
   import Suggestions from "src/partials/Suggestions.svelte"
   import {watch} from "src/agent/db"