diff --git a/src/App.svelte b/src/App.svelte
index d11d98b8..92771e9d 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -26,7 +26,6 @@
import {modal, routes, menuIsOpen, logUsage} from "src/app/ui"
import Anchor from "src/partials/Anchor.svelte"
import Content from "src/partials/Content.svelte"
- import EnsureData from "src/partials/EnsureData.svelte"
import Modal from "src/partials/Modal.svelte"
import Spinner from "src/partials/Spinner.svelte"
import Alerts from "src/routes/Alerts.svelte"
@@ -46,6 +45,7 @@
import Scan from "src/routes/Scan.svelte"
import RelayDetail from "src/routes/RelayDetail.svelte"
import RelayList from "src/routes/RelayList.svelte"
+ import EnsureData from "src/views/EnsureData.svelte"
import Profile from "src/views/Profile.svelte"
import Settings from "src/views/Settings.svelte"
import SideNav from "src/views/SideNav.svelte"
diff --git a/src/routes/Feeds.svelte b/src/routes/Feeds.svelte
index 3065e42e..8ff0691b 100644
--- a/src/routes/Feeds.svelte
+++ b/src/routes/Feeds.svelte
@@ -5,8 +5,8 @@
import Content from "src/partials/Content.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 Follows from "src/views/feed/Follows.svelte"
+ import Network from "src/views/feed/Network.svelte"
import user from 'src/agent/user'
export let activeTab
diff --git a/src/routes/RelayDetail.svelte b/src/routes/RelayDetail.svelte
index fca8db92..b80be340 100644
--- a/src/routes/RelayDetail.svelte
+++ b/src/routes/RelayDetail.svelte
@@ -6,7 +6,7 @@
import {between} from 'hurdak/lib/hurdak'
import Content from "src/partials/Content.svelte"
import Anchor from "src/partials/Anchor.svelte"
- import Feed from "src/views/notes/Feed.svelte"
+ import Feed from "src/views/feed/Feed.svelte"
import database from 'src/agent/database'
import pool from 'src/agent/pool'
import user from "src/agent/user"
diff --git a/src/routes/Search.svelte b/src/routes/Search.svelte
index a2c78fa7..b003a322 100644
--- a/src/routes/Search.svelte
+++ b/src/routes/Search.svelte
@@ -1,49 +1,8 @@
-
-
-
- {#each results as person (person.pubkey)}
- {#if person.pubkey !== user.getPubkey() && !(hideFollowing && $petnamePubkeys.includes(person.pubkey))}
-
- {/if}
- {:else}
-
- {/each}
+
diff --git a/src/partials/EnsureData.svelte b/src/views/EnsureData.svelte
similarity index 96%
rename from src/partials/EnsureData.svelte
rename to src/views/EnsureData.svelte
index ca8b4757..3e7c8546 100644
--- a/src/partials/EnsureData.svelte
+++ b/src/views/EnsureData.svelte
@@ -5,7 +5,7 @@
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 Search from "src/routes/Search.svelte"
+ import PersonSearch from "src/views/person/PersonSearch.svelte"
import database from 'src/agent/database'
import user from 'src/agent/user'
@@ -76,8 +76,8 @@
{/each}
+
-
{:else if needsPeople()}
diff --git a/src/views/notes/Feed.svelte b/src/views/feed/Feed.svelte
similarity index 100%
rename from src/views/notes/Feed.svelte
rename to src/views/feed/Feed.svelte
diff --git a/src/views/notes/Follows.svelte b/src/views/feed/Follows.svelte
similarity index 87%
rename from src/views/notes/Follows.svelte
rename to src/views/feed/Follows.svelte
index a74eb9d9..de01e9a8 100644
--- a/src/views/notes/Follows.svelte
+++ b/src/views/feed/Follows.svelte
@@ -1,6 +1,6 @@
-
+
diff --git a/src/views/notes/Network.svelte b/src/views/feed/Network.svelte
similarity index 90%
rename from src/views/notes/Network.svelte
rename to src/views/feed/Network.svelte
index 059bf9bc..3b946488 100644
--- a/src/views/notes/Network.svelte
+++ b/src/views/feed/Network.svelte
@@ -1,6 +1,6 @@
-
+
diff --git a/src/views/person/Likes.svelte b/src/views/person/Likes.svelte
index 87bb4402..fdd93d91 100644
--- a/src/views/person/Likes.svelte
+++ b/src/views/person/Likes.svelte
@@ -1,5 +1,5 @@
+
+
+
+
+{#each results as person (person.pubkey)}
+ {#if person.pubkey !== user.getPubkey() && !(hideFollowing && $petnamePubkeys.includes(person.pubkey))}
+
+ {/if}
+{:else}
+
+{/each}