From 96d1dada986e538bafe10a184fa186ab3abc6b90 Mon Sep 17 00:00:00 2001
From: Jonathan Staab <shtaab@gmail.com>
Date: Thu, 23 Feb 2023 14:43:11 -0600
Subject: [PATCH] Organizing files a bit

---
 src/App.svelte                                | 68 +++++++++----------
 src/partials/EnsureData.svelte                |  8 +--
 src/{routes => views}/Bech32Entity.svelte     |  4 +-
 src/{routes => views}/Debug.svelte            |  0
 src/{routes => views}/Keys.svelte             |  0
 src/{partials => views}/NavItem.svelte        |  0
 src/{routes => views}/NotFound.svelte         |  0
 src/{routes => views}/Profile.svelte          |  0
 src/{routes => views}/Settings.svelte         |  0
 src/{partials => views}/SideNav.svelte        |  0
 src/{partials => views}/Toast.svelte          |  0
 src/{partials => views}/TopNav.svelte         |  0
 src/{partials => views/alerts}/Alert.svelte   |  0
 src/{routes => views/alerts}/Alerts.svelte    |  2 +-
 src/{routes => views/chat}/ChatDetail.svelte  |  0
 src/views/{ => chat}/ChatEdit.svelte          |  0
 src/{routes => views/chat}/ChatList.svelte    |  2 +-
 .../chat}/ChatListItem.svelte                 |  0
 src/views/{ => login}/ConnectUser.svelte      |  2 +-
 src/{routes => views/login}/Login.svelte      |  0
 src/{routes => views/login}/Logout.svelte     |  0
 src/views/{ => login}/PrivKeyLogin.svelte     |  0
 src/views/{ => login}/PubKeyLogin.svelte      |  0
 src/views/{ => login}/SignUp.svelte           |  0
 .../messages}/MessagesDetail.svelte           |  0
 .../messages}/MessagesList.svelte             |  4 +-
 .../messages}/MessagesListItem.svelte         |  1 -
 .../Notes.svelte => views/notes/Feed.svelte}  |  2 +-
 src/views/notes/Follows.svelte                |  2 +-
 src/views/notes/Network.svelte                |  2 +-
 .../notes}/NewNoteButton.svelte               |  0
 src/{partials => views/notes}/Note.svelte     |  0
 src/views/{ => notes}/NoteCreate.svelte       |  2 +-
 src/views/{ => notes}/NoteDetail.svelte       |  2 +-
 .../notes/NotesList.svelte}                   |  2 +-
 src/views/person/Likes.svelte                 |  2 +-
 src/views/person/Notes.svelte                 |  2 +-
 .../person/PersonDetail.svelte}               |  2 +-
 .../person}/PersonInfo.svelte                 |  0
 src/views/{ => person}/PersonList.svelte      |  2 +-
 src/views/{ => person}/PersonSettings.svelte  |  0
 src/views/{ => person}/PersonShare.svelte     |  0
 src/views/person/Relays.svelte                |  2 +-
 src/{routes => views/relays}/AddRelay.svelte  |  0
 .../relays}/RelayCard.svelte                  |  0
 .../relays}/RelayCardSimple.svelte            |  0
 src/{routes => views/relays}/RelayList.svelte |  4 +-
 .../relays}/RelaySearch.svelte                |  2 +-
 src/views/{ => search}/Scan.svelte            |  0
 src/{routes => views/search}/Search.svelte    |  4 +-
 src/views/{ => search}/SearchPeople.svelte    |  2 +-
 51 files changed, 62 insertions(+), 63 deletions(-)
 rename src/{routes => views}/Bech32Entity.svelte (89%)
 rename src/{routes => views}/Debug.svelte (100%)
 rename src/{routes => views}/Keys.svelte (100%)
 rename src/{partials => views}/NavItem.svelte (100%)
 rename src/{routes => views}/NotFound.svelte (100%)
 rename src/{routes => views}/Profile.svelte (100%)
 rename src/{routes => views}/Settings.svelte (100%)
 rename src/{partials => views}/SideNav.svelte (100%)
 rename src/{partials => views}/Toast.svelte (100%)
 rename src/{partials => views}/TopNav.svelte (100%)
 rename src/{partials => views/alerts}/Alert.svelte (100%)
 rename src/{routes => views/alerts}/Alerts.svelte (97%)
 rename src/{routes => views/chat}/ChatDetail.svelte (100%)
 rename src/views/{ => chat}/ChatEdit.svelte (100%)
 rename src/{routes => views/chat}/ChatList.svelte (97%)
 rename src/{partials => views/chat}/ChatListItem.svelte (100%)
 rename src/views/{ => login}/ConnectUser.svelte (98%)
 rename src/{routes => views/login}/Login.svelte (100%)
 rename src/{routes => views/login}/Logout.svelte (100%)
 rename src/views/{ => login}/PrivKeyLogin.svelte (100%)
 rename src/views/{ => login}/PubKeyLogin.svelte (100%)
 rename src/views/{ => login}/SignUp.svelte (100%)
 rename src/{routes => views/messages}/MessagesDetail.svelte (100%)
 rename src/{routes => views/messages}/MessagesList.svelte (92%)
 rename src/{partials => views/messages}/MessagesListItem.svelte (96%)
 rename src/{partials/Notes.svelte => views/notes/Feed.svelte} (98%)
 rename src/{partials => views/notes}/NewNoteButton.svelte (100%)
 rename src/{partials => views/notes}/Note.svelte (100%)
 rename src/views/{ => notes}/NoteCreate.svelte (98%)
 rename src/views/{ => notes}/NoteDetail.svelte (96%)
 rename src/{routes/Notes.svelte => views/notes/NotesList.svelte} (92%)
 rename src/{routes/Person.svelte => views/person/PersonDetail.svelte} (98%)
 rename src/{partials => views/person}/PersonInfo.svelte (100%)
 rename src/views/{ => person}/PersonList.svelte (87%)
 rename src/views/{ => person}/PersonSettings.svelte (100%)
 rename src/views/{ => person}/PersonShare.svelte (100%)
 rename src/{routes => views/relays}/AddRelay.svelte (100%)
 rename src/{partials => views/relays}/RelayCard.svelte (100%)
 rename src/{partials => views/relays}/RelayCardSimple.svelte (100%)
 rename src/{routes => views/relays}/RelayList.svelte (93%)
 rename src/{partials => views/relays}/RelaySearch.svelte (93%)
 rename src/views/{ => search}/Scan.svelte (100%)
 rename src/{routes => views/search}/Search.svelte (79%)
 rename src/views/{ => search}/SearchPeople.svelte (94%)

diff --git a/src/App.svelte b/src/App.svelte
index a3f3219b..04a61487 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -24,43 +24,43 @@
   import {loadAppData} from "src/app"
   import alerts from "src/app/alerts"
   import {modal, routes, menuIsOpen, logUsage} from "src/app/ui"
-  import RelayCard from "src/partials/RelayCard.svelte"
+  import AddRelay from "src/views/relays/AddRelay.svelte"
+  import Alerts from "src/views/alerts/Alerts.svelte"
   import Anchor from 'src/partials/Anchor.svelte'
+  import Bech32Entity from "src/views/Bech32Entity.svelte"
+  import ChatDetail from "src/views/chat/ChatDetail.svelte"
+  import ChatEdit from "src/views/chat/ChatEdit.svelte"
+  import ChatList from "src/views/chat/ChatList.svelte"
+  import ConnectUser from "src/views/login/ConnectUser.svelte"
   import Content from 'src/partials/Content.svelte'
+  import Debug from "src/views/Debug.svelte"
   import EnsureData from 'src/partials/EnsureData.svelte'
+  import Keys from "src/views/Keys.svelte"
+  import Login from "src/views/login/Login.svelte"
+  import Logout from "src/views/login/Logout.svelte"
+  import MessagesDetail from "src/views/messages/MessagesDetail.svelte"
+  import MessagesList from "src/views/messages/MessagesList.svelte"
   import Modal from 'src/partials/Modal.svelte'
-  import SideNav from 'src/partials/SideNav.svelte'
+  import NotFound from "src/views/NotFound.svelte"
+  import NoteCreate from "src/views/notes/NoteCreate.svelte"
+  import NoteDetail from "src/views/notes/NoteDetail.svelte"
+  import NotesList from "src/views/notes/NotesList.svelte"
+  import PersonDetail from "src/views/person/PersonDetail.svelte"
+  import PersonList from "src/views/person/PersonList.svelte"
+  import PersonSettings from "src/views/person/PersonSettings.svelte"
+  import PersonShare from "src/views/person/PersonShare.svelte"
+  import PrivKeyLogin from "src/views/login/PrivKeyLogin.svelte"
+  import Profile from "src/views/Profile.svelte"
+  import PubKeyLogin from "src/views/login/PubKeyLogin.svelte"
+  import RelayCard from "src/views/relays/RelayCard.svelte"
+  import RelayList from "src/views/relays/RelayList.svelte"
+  import Search from "src/views/search/Search.svelte"
+  import Settings from "src/views/Settings.svelte"
+  import SideNav from 'src/views/SideNav.svelte'
+  import SignUp from "src/views/login/SignUp.svelte"
   import Spinner from 'src/partials/Spinner.svelte'
-  import Toast from 'src/partials/Toast.svelte'
-  import TopNav from 'src/partials/TopNav.svelte'
-  import ChatEdit from "src/views/ChatEdit.svelte"
-  import NoteCreate from "src/views/NoteCreate.svelte"
-  import NoteDetail from "src/views/NoteDetail.svelte"
-  import PersonList from "src/views/PersonList.svelte"
-  import PersonSettings from "src/views/PersonSettings.svelte"
-  import PersonShare from "src/views/PersonShare.svelte"
-  import PrivKeyLogin from "src/views/PrivKeyLogin.svelte"
-  import PubKeyLogin from "src/views/PubKeyLogin.svelte"
-  import ConnectUser from "src/views/ConnectUser.svelte"
-  import SignUp from "src/views/SignUp.svelte"
-  import AddRelay from "src/routes/AddRelay.svelte"
-  import Alerts from "src/routes/Alerts.svelte"
-  import Bech32Entity from "src/routes/Bech32Entity.svelte"
-  import ChatList from "src/routes/ChatList.svelte"
-  import ChatDetail from "src/routes/ChatDetail.svelte"
-  import MessagesList from "src/routes/MessagesList.svelte"
-  import MessagesDetail from "src/routes/MessagesDetail.svelte"
-  import Debug from "src/routes/Debug.svelte"
-  import Keys from "src/routes/Keys.svelte"
-  import Login from "src/routes/Login.svelte"
-  import Logout from "src/routes/Logout.svelte"
-  import NotFound from "src/routes/NotFound.svelte"
-  import Notes from "src/routes/Notes.svelte"
-  import Person from "src/routes/Person.svelte"
-  import Profile from "src/routes/Profile.svelte"
-  import RelayList from "src/routes/RelayList.svelte"
-  import Search from "src/routes/Search.svelte"
-  import Settings from "src/routes/Settings.svelte"
+  import Toast from 'src/views/Toast.svelte'
+  import TopNav from 'src/views/TopNav.svelte'
 
   Object.assign(window, {cmd, database, user, keys, network, pool, sync})
 
@@ -179,12 +179,12 @@
       </Route>
       <Route path="/notes/:activeTab" let:params>
         <EnsureData>
-          <Notes activeTab={params.activeTab} />
+          <NotesList activeTab={params.activeTab} />
         </EnsureData>
       </Route>
       <Route path="/people/:npub/:activeTab" let:params>
         {#key params.npub}
-        <Person npub={params.npub} activeTab={params.activeTab} />
+        <PersonDetail npub={params.npub} activeTab={params.activeTab} />
         {/key}
       </Route>
       <Route path="/chat" component={ChatList} />
diff --git a/src/partials/EnsureData.svelte b/src/partials/EnsureData.svelte
index 9d49264d..1d0d1c98 100644
--- a/src/partials/EnsureData.svelte
+++ b/src/partials/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 RelayCard from "src/partials/RelayCard.svelte"
-  import PersonInfo from "src/partials/PersonInfo.svelte"
-  import RelaySearch from "src/partials/RelaySearch.svelte"
-  import SearchPeople from "src/views/SearchPeople.svelte"
+  import PersonInfo from "src/views/person/PersonInfo.svelte"
+  import RelaySearch from "src/views/relays/RelaySearch.svelte"
+  import RelayCard from "src/views/relays/RelayCard.svelte"
+  import SearchPeople from "src/views/search/SearchPeople.svelte"
   import database from 'src/agent/database'
   import user from 'src/agent/user'
 
diff --git a/src/routes/Bech32Entity.svelte b/src/views/Bech32Entity.svelte
similarity index 89%
rename from src/routes/Bech32Entity.svelte
rename to src/views/Bech32Entity.svelte
index ff151e18..24b4b09f 100644
--- a/src/routes/Bech32Entity.svelte
+++ b/src/views/Bech32Entity.svelte
@@ -3,8 +3,8 @@
   import {onMount} from 'svelte'
   import {nip19} from 'nostr-tools'
   import Content from 'src/partials/Content.svelte'
-  import NoteDetail from 'src/views/NoteDetail.svelte'
-  import Person from 'src/routes/Person.svelte'
+  import NoteDetail from 'src/views/notes/NoteDetail.svelte'
+  import Person from 'src/views/person/PersonDetail.svelte'
   import {getUserReadRelays} from 'src/agent/relays'
 
   export let entity
diff --git a/src/routes/Debug.svelte b/src/views/Debug.svelte
similarity index 100%
rename from src/routes/Debug.svelte
rename to src/views/Debug.svelte
diff --git a/src/routes/Keys.svelte b/src/views/Keys.svelte
similarity index 100%
rename from src/routes/Keys.svelte
rename to src/views/Keys.svelte
diff --git a/src/partials/NavItem.svelte b/src/views/NavItem.svelte
similarity index 100%
rename from src/partials/NavItem.svelte
rename to src/views/NavItem.svelte
diff --git a/src/routes/NotFound.svelte b/src/views/NotFound.svelte
similarity index 100%
rename from src/routes/NotFound.svelte
rename to src/views/NotFound.svelte
diff --git a/src/routes/Profile.svelte b/src/views/Profile.svelte
similarity index 100%
rename from src/routes/Profile.svelte
rename to src/views/Profile.svelte
diff --git a/src/routes/Settings.svelte b/src/views/Settings.svelte
similarity index 100%
rename from src/routes/Settings.svelte
rename to src/views/Settings.svelte
diff --git a/src/partials/SideNav.svelte b/src/views/SideNav.svelte
similarity index 100%
rename from src/partials/SideNav.svelte
rename to src/views/SideNav.svelte
diff --git a/src/partials/Toast.svelte b/src/views/Toast.svelte
similarity index 100%
rename from src/partials/Toast.svelte
rename to src/views/Toast.svelte
diff --git a/src/partials/TopNav.svelte b/src/views/TopNav.svelte
similarity index 100%
rename from src/partials/TopNav.svelte
rename to src/views/TopNav.svelte
diff --git a/src/partials/Alert.svelte b/src/views/alerts/Alert.svelte
similarity index 100%
rename from src/partials/Alert.svelte
rename to src/views/alerts/Alert.svelte
diff --git a/src/routes/Alerts.svelte b/src/views/alerts/Alerts.svelte
similarity index 97%
rename from src/routes/Alerts.svelte
rename to src/views/alerts/Alerts.svelte
index f089c46e..4d8fd057 100644
--- a/src/routes/Alerts.svelte
+++ b/src/views/alerts/Alerts.svelte
@@ -9,7 +9,7 @@
   import Content from 'src/partials/Content.svelte'
   import Anchor from 'src/partials/Anchor.svelte'
   import ImageCircle from "src/partials/ImageCircle.svelte"
-  import Alert from 'src/partials/Alert.svelte'
+  import Alert from 'src/views/alerts/Alert.svelte'
   import database from 'src/agent/database'
   import {lastChecked} from 'src/app/alerts'
   import {modal, routes} from 'src/app/ui'
diff --git a/src/routes/ChatDetail.svelte b/src/views/chat/ChatDetail.svelte
similarity index 100%
rename from src/routes/ChatDetail.svelte
rename to src/views/chat/ChatDetail.svelte
diff --git a/src/views/ChatEdit.svelte b/src/views/chat/ChatEdit.svelte
similarity index 100%
rename from src/views/ChatEdit.svelte
rename to src/views/chat/ChatEdit.svelte
diff --git a/src/routes/ChatList.svelte b/src/views/chat/ChatList.svelte
similarity index 97%
rename from src/routes/ChatList.svelte
rename to src/views/chat/ChatList.svelte
index e3bc68d1..4b72ca05 100644
--- a/src/routes/ChatList.svelte
+++ b/src/views/chat/ChatList.svelte
@@ -1,10 +1,10 @@
 <script>
   import {onMount} from 'svelte'
   import {fuzzy} from "src/util/misc"
-  import ChatListItem from "src/partials/ChatListItem.svelte"
   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/views/chat/ChatListItem.svelte"
   import database from 'src/agent/database'
   import network from 'src/agent/network'
   import {getUserReadRelays} from 'src/agent/relays'
diff --git a/src/partials/ChatListItem.svelte b/src/views/chat/ChatListItem.svelte
similarity index 100%
rename from src/partials/ChatListItem.svelte
rename to src/views/chat/ChatListItem.svelte
diff --git a/src/views/ConnectUser.svelte b/src/views/login/ConnectUser.svelte
similarity index 98%
rename from src/views/ConnectUser.svelte
rename to src/views/login/ConnectUser.svelte
index da86d6a1..70ed95e7 100644
--- a/src/views/ConnectUser.svelte
+++ b/src/views/login/ConnectUser.svelte
@@ -9,7 +9,7 @@
   import Spinner from 'src/partials/Spinner.svelte'
   import Input from 'src/partials/Input.svelte'
   import Heading from 'src/partials/Heading.svelte'
-  import RelayCardSimple from 'src/partials/RelayCardSimple.svelte'
+  import RelayCardSimple from 'src/views/relays/RelayCardSimple.svelte'
   import Anchor from 'src/partials/Anchor.svelte'
   import Modal from 'src/partials/Modal.svelte'
   import {getUserReadRelays} from 'src/agent/relays'
diff --git a/src/routes/Login.svelte b/src/views/login/Login.svelte
similarity index 100%
rename from src/routes/Login.svelte
rename to src/views/login/Login.svelte
diff --git a/src/routes/Logout.svelte b/src/views/login/Logout.svelte
similarity index 100%
rename from src/routes/Logout.svelte
rename to src/views/login/Logout.svelte
diff --git a/src/views/PrivKeyLogin.svelte b/src/views/login/PrivKeyLogin.svelte
similarity index 100%
rename from src/views/PrivKeyLogin.svelte
rename to src/views/login/PrivKeyLogin.svelte
diff --git a/src/views/PubKeyLogin.svelte b/src/views/login/PubKeyLogin.svelte
similarity index 100%
rename from src/views/PubKeyLogin.svelte
rename to src/views/login/PubKeyLogin.svelte
diff --git a/src/views/SignUp.svelte b/src/views/login/SignUp.svelte
similarity index 100%
rename from src/views/SignUp.svelte
rename to src/views/login/SignUp.svelte
diff --git a/src/routes/MessagesDetail.svelte b/src/views/messages/MessagesDetail.svelte
similarity index 100%
rename from src/routes/MessagesDetail.svelte
rename to src/views/messages/MessagesDetail.svelte
diff --git a/src/routes/MessagesList.svelte b/src/views/messages/MessagesList.svelte
similarity index 92%
rename from src/routes/MessagesList.svelte
rename to src/views/messages/MessagesList.svelte
index 6d70be04..d55176f0 100644
--- a/src/routes/MessagesList.svelte
+++ b/src/views/messages/MessagesList.svelte
@@ -1,9 +1,9 @@
 <script>
   import {sortBy} from 'ramda'
   import {toTitle} from 'hurdak/lib/hurdak'
-  import Content from "src/partials/Content.svelte"
-  import MessagesListItem from "src/partials/MessagesListItem.svelte"
   import Tabs from "src/partials/Tabs.svelte"
+  import Content from "src/partials/Content.svelte"
+  import MessagesListItem from "src/views/messages/MessagesListItem.svelte"
   import database from 'src/agent/database'
 
   let activeTab = 'messages'
diff --git a/src/partials/MessagesListItem.svelte b/src/views/messages/MessagesListItem.svelte
similarity index 96%
rename from src/partials/MessagesListItem.svelte
rename to src/views/messages/MessagesListItem.svelte
index 92f8dcb6..2e62fa04 100644
--- a/src/partials/MessagesListItem.svelte
+++ b/src/views/messages/MessagesListItem.svelte
@@ -9,7 +9,6 @@
 
   export let contact
 
-  console.log(contact, $lastChecked[contact.pubkey])
   const newMessages = contact.lastMessage > $lastChecked[contact.pubkey]
   const person = database.getPersonWithFallback(contact.pubkey)
   const enter = () => navigate(`/messages/${nip19.npubEncode(contact.pubkey)}`)
diff --git a/src/partials/Notes.svelte b/src/views/notes/Feed.svelte
similarity index 98%
rename from src/partials/Notes.svelte
rename to src/views/notes/Feed.svelte
index 9e4942bc..a603fbc9 100644
--- a/src/partials/Notes.svelte
+++ b/src/views/notes/Feed.svelte
@@ -7,7 +7,7 @@
   import {asDisplayEvent, Tags} from 'src/util/nostr'
   import Spinner from 'src/partials/Spinner.svelte'
   import Content from 'src/partials/Content.svelte'
-  import Note from "src/partials/Note.svelte"
+  import Note from "src/views/notes/Note.svelte"
   import user from 'src/agent/user'
   import network from 'src/agent/network'
   import {modal} from "src/app/ui"
diff --git a/src/views/notes/Follows.svelte b/src/views/notes/Follows.svelte
index d6b05746..929f0ae8 100644
--- a/src/views/notes/Follows.svelte
+++ b/src/views/notes/Follows.svelte
@@ -1,6 +1,6 @@
 <script>
   import {shuffle} from 'src/util/misc'
-  import Notes from "src/partials/Notes.svelte"
+  import Notes from "src/views/notes/Feed.svelte"
   import {getUserFollows} from 'src/agent/social'
   import {sampleRelays, getAllPubkeyWriteRelays} from 'src/agent/relays'
 
diff --git a/src/views/notes/Network.svelte b/src/views/notes/Network.svelte
index 3f2ccdaa..5f56a2c4 100644
--- a/src/views/notes/Network.svelte
+++ b/src/views/notes/Network.svelte
@@ -1,6 +1,6 @@
 <script>
   import {shuffle} from 'src/util/misc'
-  import Notes from "src/partials/Notes.svelte"
+  import Notes from "src/views/notes/Feed.svelte"
   import {getUserNetwork} from 'src/agent/social'
   import {sampleRelays, getAllPubkeyWriteRelays} from 'src/agent/relays'
 
diff --git a/src/partials/NewNoteButton.svelte b/src/views/notes/NewNoteButton.svelte
similarity index 100%
rename from src/partials/NewNoteButton.svelte
rename to src/views/notes/NewNoteButton.svelte
diff --git a/src/partials/Note.svelte b/src/views/notes/Note.svelte
similarity index 100%
rename from src/partials/Note.svelte
rename to src/views/notes/Note.svelte
diff --git a/src/views/NoteCreate.svelte b/src/views/notes/NoteCreate.svelte
similarity index 98%
rename from src/views/NoteCreate.svelte
rename to src/views/notes/NoteCreate.svelte
index b222dff7..5269d5c1 100644
--- a/src/views/NoteCreate.svelte
+++ b/src/views/notes/NoteCreate.svelte
@@ -9,7 +9,7 @@
   import Button from "src/partials/Button.svelte"
   import Compose from "src/partials/Compose.svelte"
   import Input from "src/partials/Input.svelte"
-  import RelayCardSimple from "src/partials/RelayCardSimple.svelte"
+  import RelayCardSimple from "src/views/relays/RelayCardSimple.svelte"
   import Content from "src/partials/Content.svelte"
   import Modal from "src/partials/Modal.svelte"
   import Heading from 'src/partials/Heading.svelte'
diff --git a/src/views/NoteDetail.svelte b/src/views/notes/NoteDetail.svelte
similarity index 96%
rename from src/views/NoteDetail.svelte
rename to src/views/notes/NoteDetail.svelte
index 6595239c..6e6ce652 100644
--- a/src/views/NoteDetail.svelte
+++ b/src/views/notes/NoteDetail.svelte
@@ -5,9 +5,9 @@
   import {first} from 'hurdak/lib/hurdak'
   import {log} from 'src/util/logger'
   import {asDisplayEvent} from 'src/util/nostr'
-  import Note from 'src/partials/Note.svelte'
   import Content from 'src/partials/Content.svelte'
   import Spinner from 'src/partials/Spinner.svelte'
+  import Note from 'src/views/notes/Note.svelte'
   import network from 'src/agent/network'
   import {sampleRelays} from 'src/agent/relays'
 
diff --git a/src/routes/Notes.svelte b/src/views/notes/NotesList.svelte
similarity index 92%
rename from src/routes/Notes.svelte
rename to src/views/notes/NotesList.svelte
index d0f9d2e2..562063f8 100644
--- a/src/routes/Notes.svelte
+++ b/src/views/notes/NotesList.svelte
@@ -2,8 +2,8 @@
   import {navigate} from 'svelte-routing'
   import Anchor from "src/partials/Anchor.svelte"
   import Content from "src/partials/Content.svelte"
-  import NewNoteButton from "src/partials/NewNoteButton.svelte"
   import Tabs from "src/partials/Tabs.svelte"
+  import NewNoteButton from "src/views/notes/NewNoteButton.svelte"
   import Follows from "src/views/notes/Follows.svelte"
   import Network from "src/views/notes/Network.svelte"
   import user from 'src/agent/user'
diff --git a/src/views/person/Likes.svelte b/src/views/person/Likes.svelte
index eaed16bc..b3e7ac49 100644
--- a/src/views/person/Likes.svelte
+++ b/src/views/person/Likes.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Notes from "src/partials/Notes.svelte"
+  import Notes from "src/views/notes/Feed.svelte"
   import {sampleRelays, getPubkeyWriteRelays} from 'src/agent/relays'
 
   export let pubkey
diff --git a/src/views/person/Notes.svelte b/src/views/person/Notes.svelte
index e0ca27b7..1c5bbc4b 100644
--- a/src/views/person/Notes.svelte
+++ b/src/views/person/Notes.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Notes from "src/partials/Notes.svelte"
+  import Notes from "src/views/notes/Feed.svelte"
   import {sampleRelays, getPubkeyWriteRelays} from 'src/agent/relays'
 
   export let pubkey
diff --git a/src/routes/Person.svelte b/src/views/person/PersonDetail.svelte
similarity index 98%
rename from src/routes/Person.svelte
rename to src/views/person/PersonDetail.svelte
index 1956e658..b923b3e7 100644
--- a/src/routes/Person.svelte
+++ b/src/views/person/PersonDetail.svelte
@@ -9,9 +9,9 @@
   import {displayPerson, Tags, toHex} from 'src/util/nostr'
   import Tabs from "src/partials/Tabs.svelte"
   import Content from "src/partials/Content.svelte"
-  import NewNoteButton from "src/partials/NewNoteButton.svelte"
   import Anchor from "src/partials/Anchor.svelte"
   import Spinner from "src/partials/Spinner.svelte"
+  import NewNoteButton from "src/views/notes/NewNoteButton.svelte"
   import Notes from "src/views/person/Notes.svelte"
   import Likes from "src/views/person/Likes.svelte"
   import Relays from "src/views/person/Relays.svelte"
diff --git a/src/partials/PersonInfo.svelte b/src/views/person/PersonInfo.svelte
similarity index 100%
rename from src/partials/PersonInfo.svelte
rename to src/views/person/PersonInfo.svelte
diff --git a/src/views/PersonList.svelte b/src/views/person/PersonList.svelte
similarity index 87%
rename from src/views/PersonList.svelte
rename to src/views/person/PersonList.svelte
index 46ca85e5..d02ffbaf 100644
--- a/src/views/PersonList.svelte
+++ b/src/views/person/PersonList.svelte
@@ -1,6 +1,6 @@
 <script type="ts">
   import Content from 'src/partials/Content.svelte'
-  import PersonInfo from 'src/partials/PersonInfo.svelte'
+  import PersonInfo from 'src/views/person/PersonInfo.svelte'
   import database from 'src/agent/database'
   import network from 'src/agent/network'
 
diff --git a/src/views/PersonSettings.svelte b/src/views/person/PersonSettings.svelte
similarity index 100%
rename from src/views/PersonSettings.svelte
rename to src/views/person/PersonSettings.svelte
diff --git a/src/views/PersonShare.svelte b/src/views/person/PersonShare.svelte
similarity index 100%
rename from src/views/PersonShare.svelte
rename to src/views/person/PersonShare.svelte
diff --git a/src/views/person/Relays.svelte b/src/views/person/Relays.svelte
index 5f3d0606..e0c96f27 100644
--- a/src/views/person/Relays.svelte
+++ b/src/views/person/Relays.svelte
@@ -1,7 +1,7 @@
 <script>
   import {fly} from 'svelte/transition'
   import Content from "src/partials/Content.svelte"
-  import RelayCard from "src/partials/RelayCard.svelte"
+  import RelayCard from "src/views/relays/RelayCard.svelte"
 
   export let person
 </script>
diff --git a/src/routes/AddRelay.svelte b/src/views/relays/AddRelay.svelte
similarity index 100%
rename from src/routes/AddRelay.svelte
rename to src/views/relays/AddRelay.svelte
diff --git a/src/partials/RelayCard.svelte b/src/views/relays/RelayCard.svelte
similarity index 100%
rename from src/partials/RelayCard.svelte
rename to src/views/relays/RelayCard.svelte
diff --git a/src/partials/RelayCardSimple.svelte b/src/views/relays/RelayCardSimple.svelte
similarity index 100%
rename from src/partials/RelayCardSimple.svelte
rename to src/views/relays/RelayCardSimple.svelte
diff --git a/src/routes/RelayList.svelte b/src/views/relays/RelayList.svelte
similarity index 93%
rename from src/routes/RelayList.svelte
rename to src/views/relays/RelayList.svelte
index 5878a25f..1bb03a21 100644
--- a/src/routes/RelayList.svelte
+++ b/src/views/relays/RelayList.svelte
@@ -1,9 +1,9 @@
 <script>
   import {fly} from 'svelte/transition'
   import Anchor from "src/partials/Anchor.svelte"
-  import RelaySearch from "src/partials/RelaySearch.svelte"
   import Content from "src/partials/Content.svelte"
-  import RelayCard from "src/partials/RelayCard.svelte"
+  import RelaySearch from "src/views/relays/RelaySearch.svelte"
+  import RelayCard from "src/views/relays/RelayCard.svelte"
   import user from "src/agent/user"
   import {modal} from "src/app/ui"
 
diff --git a/src/partials/RelaySearch.svelte b/src/views/relays/RelaySearch.svelte
similarity index 93%
rename from src/partials/RelaySearch.svelte
rename to src/views/relays/RelaySearch.svelte
index 41117531..baebed5d 100644
--- a/src/partials/RelaySearch.svelte
+++ b/src/views/relays/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/partials/RelayCard.svelte"
+  import RelayCard from "src/views/relays/RelayCard.svelte"
   import database from 'src/agent/database'
   import user from "src/agent/user"
 
diff --git a/src/views/Scan.svelte b/src/views/search/Scan.svelte
similarity index 100%
rename from src/views/Scan.svelte
rename to src/views/search/Scan.svelte
diff --git a/src/routes/Search.svelte b/src/views/search/Search.svelte
similarity index 79%
rename from src/routes/Search.svelte
rename to src/views/search/Search.svelte
index c8e65d1e..2e93d775 100644
--- a/src/routes/Search.svelte
+++ b/src/views/search/Search.svelte
@@ -2,8 +2,8 @@
   import {navigate} from 'svelte-routing'
   import Content from 'src/partials/Content.svelte'
   import Tabs from 'src/partials/Tabs.svelte'
-  import SearchPeople from 'src/views/SearchPeople.svelte'
-  import Scan from 'src/views/Scan.svelte'
+  import SearchPeople from 'src/views/search/SearchPeople.svelte'
+  import Scan from 'src/views/search/Scan.svelte'
 
   export let activeTab
 
diff --git a/src/views/SearchPeople.svelte b/src/views/search/SearchPeople.svelte
similarity index 94%
rename from src/views/SearchPeople.svelte
rename to src/views/search/SearchPeople.svelte
index 061dedd2..1a0ec8c3 100644
--- a/src/views/SearchPeople.svelte
+++ b/src/views/search/SearchPeople.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/partials/PersonInfo.svelte'
+  import PersonInfo from 'src/views/person/PersonInfo.svelte'
   import {getUserReadRelays} from 'src/agent/relays'
   import database from 'src/agent/database'
   import network from 'src/agent/network'