From caa83db4808a52a5206e29935e8d7beed43677ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C5=ABdolfs=20O=C5=A1i=C5=86=C5=A1?= <rudolfs@osins.org>
Date: Wed, 21 Dec 2022 17:22:04 +0100
Subject: [PATCH] Organise files more consistently
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rūdolfs Ošiņš <rudolfs@osins.org>
---
 src/App.svelte                                | 35 +++----
 src/{ => App}/ColorPalette.svelte             |  0
 src/{ => App}/Header.svelte                   | 37 ++++----
 src/{ => App/Header}/Logo.svelte              |  0
 src/{ => App/Header}/Search.svelte            | 20 ++--
 .../Modal => App/Header}/SearchResults.svelte | 14 +--
 .../Header}/SettingsDropdown.svelte           | 10 +-
 src/App/Header/ThemeToggle.svelte             | 29 ++++++
 src/ThemeToggle.svelte                        | 50 ----------
 src/base/orgs/Org.ts                          | 59 ------------
 src/base/users/User.ts                        | 26 ------
 src/{ => components}/Address.svelte           | 13 +--
 src/{ => components}/Async.svelte             |  2 +-
 src/{ => components}/Authorship.svelte        | 12 ++-
 src/{ => components}/Avatar.svelte            |  4 +-
 src/{ => components}/Badge.svelte             |  0
 src/{ => components}/Button.svelte            |  0
 src/{ => components}/Clipboard.svelte         |  5 +-
 src/{ => components}/Comment.svelte           | 22 +++--
 .../Comment}/ReactionSelector.svelte          |  4 +-
 src/{ => components/Comment}/Reactions.svelte |  2 +-
 src/{ => components}/Connect.svelte           | 15 +--
 .../{Modal => Connect}/ConnectWallet.svelte   | 10 +-
 src/{ => components}/Dropdown.svelte          |  5 +-
 src/{ => components}/ErrorModal.svelte        | 10 +-
 src/{ => components}/Floating.svelte          |  0
 src/{ => components}/Form.svelte              | 10 +-
 src/{ => components}/Icon.svelte              |  2 +-
 src/{router => components}/Link.svelte        |  5 +-
 src/{ => components}/List.svelte              |  5 +-
 src/{ => components}/Loading.svelte           |  0
 src/{ => components}/Markdown.svelte          | 15 +--
 src/{ => components}/Message.svelte           |  0
 src/{ => components}/Modal.svelte             |  0
 src/{ => components}/NotFound.svelte          |  8 +-
 src/{ => components}/Placeholder.svelte       |  2 +-
 src/{router => components}/ProjectLink.svelte |  4 +-
 src/{ => components}/RadicleUrn.svelte        |  4 +-
 src/{ => components}/SeedAddress.svelte       |  9 +-
 src/{ => components}/TextInput.svelte         |  2 +-
 src/{ => components}/Toggle.svelte            |  0
 src/{ => components}/ToggleButton.svelte      |  2 +-
 src/global.d.ts                               |  2 +-
 src/index.ts                                  |  4 +-
 src/{ => lib}/api.ts                          |  0
 src/{ => lib}/appearance.ts                   | 17 ++++
 src/{ => lib}/blockies.ts                     |  0
 src/{ => lib}/cache.ts                        |  0
 src/{ => lib}/cobs.ts                         |  2 +-
 src/{ => lib}/commit.ts                       |  8 +-
 src/{ => lib}/config.ts                       |  0
 src/{ => lib}/diff.ts                         |  0
 src/{ => lib}/e2eTestStubs.ts                 |  0
 src/{ => lib}/emojis.ts                       |  0
 src/{ => lib}/error.ts                        |  0
 src/{ => lib}/ethereum/contractAbis.json      |  0
 src/{ => lib}/ethereum/networks/goerli.json   |  0
 .../ethereum/networks/homestead.json          |  0
 src/{base/faucet/lib.ts => lib/faucet.ts}     | 15 +--
 src/{ => lib}/issue.ts                        |  4 +-
 src/{ => lib}/patch.ts                        | 15 +--
 src/{ => lib}/profile.ts                      | 93 +++++++++++++++++--
 src/{ => lib}/project.ts                      | 13 +--
 src/{base/registrations => lib}/registrar.ts  | 22 +++--
 src/{base/registrations => lib}/resolver.ts   |  9 +-
 src/{router/index.ts => lib/router.ts}        |  4 +-
 src/{ => lib}/router/definitions.ts           |  2 +-
 src/{base/seeds/Seed.ts => lib/seed.ts}       | 12 ++-
 src/{ => lib}/session.ts                      | 12 ++-
 src/{syntax/index.ts => lib/syntax.ts}        |  0
 src/{ => lib}/utils.ts                        | 28 +++---
 src/{base/vesting => lib}/vesting.ts          | 10 +-
 src/{ => lib}/wallet.ts                       | 12 +--
 .../walletConnectSigner.ts}                   | 11 ++-
 src/{base => views}/faucet/Form.svelte        | 14 +--
 src/{base => views}/faucet/Routes.svelte      |  8 +-
 src/{base => views}/faucet/Withdraw.svelte    | 22 ++---
 src/{base => views}/home/Index.svelte         | 18 ++--
 src/{ => views/profiles}/Profile.svelte       | 45 +++++----
 src/{ens => views/profiles}/SetName.svelte    | 18 ++--
 src/{base => views}/projects/Blob.svelte      | 18 ++--
 .../projects/BranchSelector.svelte            | 10 +-
 src/{base => views}/projects/Browser.svelte   | 14 +--
 .../projects/CloneButton.svelte               |  8 +-
 src/{base => views}/projects/Commit.svelte    | 12 +--
 .../projects/Commit/CommitAuthorship.svelte   |  6 +-
 .../projects/Commit/CommitTeaser.svelte       |  6 +-
 .../Commit/CommitVerifiedBadge.svelte         |  4 +-
 src/{ => views/projects}/Diagram.svelte       |  2 +-
 src/{base => views}/projects/Header.svelte    | 18 ++--
 .../projects/HeaderToggleLabel.svelte         |  0
 src/{base => views}/projects/History.svelte   | 10 +-
 src/{base => views}/projects/Issue.svelte     | 14 +--
 .../projects/Issue/IssueTeaser.svelte         | 12 +--
 src/{base => views}/projects/Issues.svelte    | 18 ++--
 src/{base => views}/projects/Patch.svelte     | 16 ++--
 .../projects/Patch/PatchSideBar.svelte        |  2 +-
 .../projects/Patch/PatchTabBar.svelte         | 14 +--
 .../projects/Patch/PatchTeaser.svelte         | 12 +--
 .../projects/Patch/PatchTimeline.svelte       | 16 ++--
 src/{ => views/projects/Patch}/Review.svelte  | 14 +--
 src/{base => views}/projects/Patches.svelte   | 16 ++--
 .../projects/PeerSelector.svelte              | 12 +--
 .../projects/ProjectMeta.svelte               | 12 +--
 src/{base => views}/projects/Readme.svelte    |  6 +-
 .../projects/SourceBrowser/Changeset.svelte   |  6 +-
 .../projects/SourceBrowser/FileDiff.svelte    |  8 +-
 src/{base => views}/projects/Tree.svelte      |  5 +-
 src/{base => views}/projects/Tree/File.svelte |  2 +-
 .../projects/Tree/Folder.svelte               |  6 +-
 src/{base => views}/projects/View.svelte      | 22 ++---
 src/{base => views}/projects/Widget.svelte    | 12 +--
 .../registrations}/BlockTimer.svelte          |  0
 .../registrations/Index.svelte                |  8 +-
 src/{base => views}/registrations/New.svelte  | 20 ++--
 .../registrations/Routes.svelte               | 20 ++--
 .../registrations/Submit.svelte               | 24 ++---
 .../registrations/Update.svelte               | 20 ++--
 src/{base => views}/registrations/View.svelte | 32 +++----
 src/{base => views}/seeds/Routes.svelte       |  2 +-
 src/{base => views}/seeds/View.svelte         | 24 ++---
 .../seeds/View/Projects.svelte                | 14 +--
 src/{base => views}/vesting/Form.svelte       | 12 +--
 src/{base => views}/vesting/Routes.svelte     | 10 +-
 src/{base => views}/vesting/View.svelte       | 22 ++---
 tests/unit/cache.test.ts                      |  2 +-
 tests/unit/router.test.ts                     |  4 +-
 tests/unit/utils.test.ts                      |  4 +-
 tsconfig.json                                 |  2 +-
 vite.config.ts                                |  2 +-
 130 files changed, 720 insertions(+), 707 deletions(-)
 rename src/{ => App}/ColorPalette.svelte (100%)
 rename src/{ => App}/Header.svelte (85%)
 rename src/{ => App/Header}/Logo.svelte (100%)
 rename src/{ => App/Header}/Search.svelte (92%)
 rename src/{components/Modal => App/Header}/SearchResults.svelte (86%)
 rename src/{components => App/Header}/SettingsDropdown.svelte (91%)
 create mode 100644 src/App/Header/ThemeToggle.svelte
 delete mode 100644 src/ThemeToggle.svelte
 delete mode 100644 src/base/orgs/Org.ts
 delete mode 100644 src/base/users/User.ts
 rename src/{ => components}/Address.svelte (91%)
 rename src/{ => components}/Async.svelte (91%)
 rename src/{ => components}/Authorship.svelte (82%)
 rename src/{ => components}/Avatar.svelte (90%)
 rename src/{ => components}/Badge.svelte (100%)
 rename src/{ => components}/Button.svelte (100%)
 rename src/{ => components}/Clipboard.svelte (90%)
 rename src/{ => components}/Comment.svelte (83%)
 rename src/{ => components/Comment}/ReactionSelector.svelte (94%)
 rename src/{ => components/Comment}/Reactions.svelte (92%)
 rename src/{ => components}/Connect.svelte (77%)
 rename src/components/{Modal => Connect}/ConnectWallet.svelte (88%)
 rename src/{ => components}/Dropdown.svelte (93%)
 rename src/{ => components}/ErrorModal.svelte (83%)
 rename src/{ => components}/Floating.svelte (100%)
 rename src/{ => components}/Form.svelte (96%)
 rename src/{ => components}/Icon.svelte (99%)
 rename src/{router => components}/Link.svelte (79%)
 rename src/{ => components}/List.svelte (91%)
 rename src/{ => components}/Loading.svelte (100%)
 rename src/{ => components}/Markdown.svelte (97%)
 rename src/{ => components}/Message.svelte (100%)
 rename src/{ => components}/Modal.svelte (100%)
 rename src/{ => components}/NotFound.svelte (67%)
 rename src/{ => components}/Placeholder.svelte (93%)
 rename src/{router => components}/ProjectLink.svelte (66%)
 rename src/{ => components}/RadicleUrn.svelte (87%)
 rename src/{ => components}/SeedAddress.svelte (89%)
 rename src/{ => components}/TextInput.svelte (98%)
 rename src/{ => components}/Toggle.svelte (100%)
 rename src/{ => components}/ToggleButton.svelte (97%)
 rename src/{ => lib}/api.ts (100%)
 rename src/{ => lib}/appearance.ts (66%)
 rename src/{ => lib}/blockies.ts (100%)
 rename src/{ => lib}/cache.ts (100%)
 rename src/{ => lib}/cobs.ts (90%)
 rename src/{ => lib}/commit.ts (95%)
 rename src/{ => lib}/config.ts (100%)
 rename src/{ => lib}/diff.ts (100%)
 rename src/{ => lib}/e2eTestStubs.ts (100%)
 rename src/{ => lib}/emojis.ts (100%)
 rename src/{ => lib}/error.ts (100%)
 rename src/{ => lib}/ethereum/contractAbis.json (100%)
 rename src/{ => lib}/ethereum/networks/goerli.json (100%)
 rename src/{ => lib}/ethereum/networks/homestead.json (100%)
 rename src/{base/faucet/lib.ts => lib/faucet.ts} (85%)
 rename src/{ => lib}/issue.ts (95%)
 rename src/{ => lib}/patch.ts (92%)
 rename src/{ => lib}/profile.ts (63%)
 rename src/{ => lib}/project.ts (96%)
 rename src/{base/registrations => lib}/registrar.ts (96%)
 rename src/{base/registrations => lib}/resolver.ts (90%)
 rename src/{router/index.ts => lib/router.ts} (99%)
 rename src/{ => lib}/router/definitions.ts (96%)
 rename src/{base/seeds/Seed.ts => lib/seed.ts} (93%)
 rename src/{ => lib}/session.ts (98%)
 rename src/{syntax/index.ts => lib/syntax.ts} (100%)
 rename src/{ => lib}/utils.ts (96%)
 rename src/{base/vesting => lib}/vesting.ts (88%)
 rename src/{ => lib}/wallet.ts (95%)
 rename src/{WalletConnectSigner.ts => lib/walletConnectSigner.ts} (99%)
 rename src/{base => views}/faucet/Form.svelte (91%)
 rename src/{base => views}/faucet/Routes.svelte (57%)
 rename src/{base => views}/faucet/Withdraw.svelte (79%)
 rename src/{base => views}/home/Index.svelte (85%)
 rename src/{ => views/profiles}/Profile.svelte (85%)
 rename src/{ens => views/profiles}/SetName.svelte (90%)
 rename src/{base => views}/projects/Blob.svelte (92%)
 rename src/{base => views}/projects/BranchSelector.svelte (92%)
 rename src/{base => views}/projects/Browser.svelte (94%)
 rename src/{base => views}/projects/CloneButton.svelte (93%)
 rename src/{base => views}/projects/Commit.svelte (79%)
 rename src/{base => views}/projects/Commit/CommitAuthorship.svelte (93%)
 rename src/{base => views}/projects/Commit/CommitTeaser.svelte (93%)
 rename src/{base => views}/projects/Commit/CommitVerifiedBadge.svelte (94%)
 rename src/{ => views/projects}/Diagram.svelte (98%)
 rename src/{base => views}/projects/Header.svelte (85%)
 rename src/{base => views}/projects/HeaderToggleLabel.svelte (100%)
 rename src/{base => views}/projects/History.svelte (90%)
 rename src/{base => views}/projects/Issue.svelte (91%)
 rename src/{base => views}/projects/Issue/IssueTeaser.svelte (89%)
 rename src/{base => views}/projects/Issues.svelte (78%)
 rename src/{base => views}/projects/Patch.svelte (89%)
 rename src/{base => views}/projects/Patch/PatchSideBar.svelte (96%)
 rename src/{base => views}/projects/Patch/PatchTabBar.svelte (83%)
 rename src/{base => views}/projects/Patch/PatchTeaser.svelte (89%)
 rename src/{base => views}/projects/Patch/PatchTimeline.svelte (83%)
 rename src/{ => views/projects/Patch}/Review.svelte (68%)
 rename src/{base => views}/projects/Patches.svelte (81%)
 rename src/{base => views}/projects/PeerSelector.svelte (89%)
 rename src/{base => views}/projects/ProjectMeta.svelte (88%)
 rename src/{base => views}/projects/Readme.svelte (74%)
 rename src/{base => views}/projects/SourceBrowser/Changeset.svelte (87%)
 rename src/{base => views}/projects/SourceBrowser/FileDiff.svelte (95%)
 rename src/{base => views}/projects/Tree.svelte (89%)
 rename src/{base => views}/projects/Tree/File.svelte (95%)
 rename src/{base => views}/projects/Tree/Folder.svelte (93%)
 rename src/{base => views}/projects/View.svelte (91%)
 rename src/{base => views}/projects/Widget.svelte (92%)
 rename src/{ => views/registrations}/BlockTimer.svelte (100%)
 rename src/{base => views}/registrations/Index.svelte (92%)
 rename src/{base => views}/registrations/New.svelte (84%)
 rename src/{base => views}/registrations/Routes.svelte (66%)
 rename src/{base => views}/registrations/Submit.svelte (85%)
 rename src/{base => views}/registrations/Update.svelte (79%)
 rename src/{base => views}/registrations/View.svelte (90%)
 rename src/{base => views}/seeds/Routes.svelte (76%)
 rename src/{base => views}/seeds/View.svelte (80%)
 rename src/{base => views}/seeds/View/Projects.svelte (83%)
 rename src/{base => views}/vesting/Form.svelte (85%)
 rename src/{base => views}/vesting/Routes.svelte (61%)
 rename src/{base => views}/vesting/View.svelte (86%)

diff --git a/src/App.svelte b/src/App.svelte
index 79d873add..e51f0dbfb 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -1,22 +1,25 @@
 <script lang="ts">
-  import { Connection, state, session } from "@app/session";
-  import { getWallet } from "@app/wallet";
-  import { initialize, activeRouteStore } from "@app/router";
-  import { twemoji, unreachable } from "@app/utils";
   import Plausible from "plausible-tracker";
 
-  import ColorPalette from "@app/ColorPalette.svelte";
-  import Faucet from "@app/base/faucet/Routes.svelte";
-  import Header from "@app/Header.svelte";
-  import Home from "@app/base/home/Index.svelte";
-  import Loading from "@app/Loading.svelte";
-  import Modal from "@app/Modal.svelte";
-  import NotFound from "@app/NotFound.svelte";
-  import Profile from "@app/Profile.svelte";
-  import Projects from "@app/base/projects/View.svelte";
-  import Registrations from "@app/base/registrations/Routes.svelte";
-  import Seeds from "@app/base/seeds/Routes.svelte";
-  import Vesting from "@app/base/vesting/Routes.svelte";
+  import { Connection, state, session } from "@app/lib/session";
+  import { getWallet } from "@app/lib/wallet";
+  import { initialize, activeRouteStore } from "@app/lib/router";
+  import { twemoji, unreachable } from "@app/lib/utils";
+
+  import ColorPalette from "./App/ColorPalette.svelte";
+  import Header from "./App/Header.svelte";
+
+  import Loading from "@app/components/Loading.svelte";
+  import Modal from "@app/components/Modal.svelte";
+  import NotFound from "@app/components/NotFound.svelte";
+
+  import Faucet from "@app/views/faucet/Routes.svelte";
+  import Home from "@app/views/home/Index.svelte";
+  import Profile from "@app/views/profiles/Profile.svelte";
+  import Projects from "@app/views/projects/View.svelte";
+  import Registrations from "@app/views/registrations/Routes.svelte";
+  import Seeds from "@app/views/seeds/Routes.svelte";
+  import Vesting from "@app/views/vesting/Routes.svelte";
 
   initialize();
 
diff --git a/src/ColorPalette.svelte b/src/App/ColorPalette.svelte
similarity index 100%
rename from src/ColorPalette.svelte
rename to src/App/ColorPalette.svelte
diff --git a/src/Header.svelte b/src/App/Header.svelte
similarity index 85%
rename from src/Header.svelte
rename to src/App/Header.svelte
index c7c1cd4fa..ff94198d1 100644
--- a/src/Header.svelte
+++ b/src/App/Header.svelte
@@ -1,24 +1,25 @@
 <script lang="ts">
-  import type { Wallet } from "@app/wallet";
-  import type { ProjectsAndProfiles } from "@app/Search.svelte";
-  import type { Session } from "@app/session";
+  import type { Wallet } from "@app/lib/wallet";
+  import type { ProjectsAndProfiles } from "./Header/Search.svelte";
+  import type { Session } from "@app/lib/session";
 
-  import Avatar from "@app/Avatar.svelte";
-  import Button from "@app/Button.svelte";
-  import Connect from "@app/Connect.svelte";
-  import Floating from "@app/Floating.svelte";
-  import Icon from "@app/Icon.svelte";
-  import Link from "@app/router/Link.svelte";
-  import Loading from "@app/Loading.svelte";
-  import Logo from "@app/Logo.svelte";
-  import Search from "@app/Search.svelte";
-  import SearchResults from "@app/components/Modal/SearchResults.svelte";
-  import SettingsDropdown from "@app/components/SettingsDropdown.svelte";
+  import Avatar from "@app/components/Avatar.svelte";
+  import Button from "@app/components/Button.svelte";
+  import Connect from "@app/components/Connect.svelte";
+  import Floating from "@app/components/Floating.svelte";
+  import Icon from "@app/components/Icon.svelte";
+  import Link from "@app/components/Link.svelte";
+  import Loading from "@app/components/Loading.svelte";
+  import SettingsDropdown from "./Header/SettingsDropdown.svelte";
 
-  import { Profile, ProfileType } from "@app/profile";
-  import { closeFocused } from "@app/Floating.svelte";
-  import { disconnectWallet } from "@app/session";
-  import { formatAddress, formatBalance } from "@app/utils";
+  import Logo from "./Header/Logo.svelte";
+  import Search from "./Header/Search.svelte";
+  import SearchResults from "./Header/SearchResults.svelte";
+
+  import { Profile, ProfileType } from "@app/lib/profile";
+  import { closeFocused } from "@app/components/Floating.svelte";
+  import { disconnectWallet } from "@app/lib/session";
+  import { formatAddress, formatBalance } from "@app/lib/utils";
 
   export let session: Session | null;
   export let wallet: Wallet;
diff --git a/src/Logo.svelte b/src/App/Header/Logo.svelte
similarity index 100%
rename from src/Logo.svelte
rename to src/App/Header/Logo.svelte
diff --git a/src/Search.svelte b/src/App/Header/Search.svelte
similarity index 92%
rename from src/Search.svelte
rename to src/App/Header/Search.svelte
index 3ddaa7d3a..898cbc5f1 100644
--- a/src/Search.svelte
+++ b/src/App/Header/Search.svelte
@@ -1,13 +1,13 @@
 <script lang="ts" context="module">
-  import type { Host } from "@app/api";
-  import type { ProjectInfo } from "@app/project";
+  import type { Host } from "@app/lib/api";
+  import type { ProjectInfo } from "@app/lib/project";
 
   import { ethers } from "ethers";
 
-  import * as utils from "@app/utils";
-  import { Profile } from "@app/profile";
-  import { Project } from "@app/project";
-  import { config } from "@app/config";
+  import * as utils from "@app/lib/utils";
+  import { Profile } from "@app/lib/profile";
+  import { Project } from "@app/lib/project";
+  import { config } from "@app/lib/config";
 
   export interface ProjectsAndProfiles {
     projects: { info: ProjectInfo; seed: Host }[];
@@ -125,14 +125,14 @@
 </script>
 
 <script lang="ts" strictEvents>
-  import type { Wallet } from "@app/wallet";
+  import type { Wallet } from "@app/lib/wallet";
 
   import debounce from "lodash/debounce";
   import { createEventDispatcher } from "svelte";
-  import * as router from "@app/router";
+  import * as router from "@app/lib/router";
 
-  import TextInput from "@app/TextInput.svelte";
-  import { unreachable } from "@app/utils";
+  import TextInput from "@app/components/TextInput.svelte";
+  import { unreachable } from "@app/lib/utils";
 
   export let wallet: Wallet;
 
diff --git a/src/components/Modal/SearchResults.svelte b/src/App/Header/SearchResults.svelte
similarity index 86%
rename from src/components/Modal/SearchResults.svelte
rename to src/App/Header/SearchResults.svelte
index f4e1f9f13..35b2ddda6 100644
--- a/src/components/Modal/SearchResults.svelte
+++ b/src/App/Header/SearchResults.svelte
@@ -1,12 +1,12 @@
 <script lang="ts" strictEvents>
-  import Modal from "@app/Modal.svelte";
-  import { formatRadicleUrn, getSeedEmoji, twemoji } from "@app/utils";
-  import type { Wallet } from "@app/wallet";
-  import Address from "@app/Address.svelte";
-  import Button from "@app/Button.svelte";
+  import Modal from "@app/components/Modal.svelte";
+  import { formatRadicleUrn, getSeedEmoji, twemoji } from "@app/lib/utils";
+  import type { Wallet } from "@app/lib/wallet";
+  import Address from "@app/components/Address.svelte";
+  import Button from "@app/components/Button.svelte";
   import { createEventDispatcher } from "svelte";
-  import type { ProjectsAndProfiles } from "@app/Search.svelte";
-  import Link from "@app/router/Link.svelte";
+  import type { ProjectsAndProfiles } from "./Search.svelte";
+  import Link from "@app/components/Link.svelte";
 
   export let query: string;
   export let results: ProjectsAndProfiles;
diff --git a/src/components/SettingsDropdown.svelte b/src/App/Header/SettingsDropdown.svelte
similarity index 91%
rename from src/components/SettingsDropdown.svelte
rename to src/App/Header/SettingsDropdown.svelte
index e65640439..5071b6f51 100644
--- a/src/components/SettingsDropdown.svelte
+++ b/src/App/Header/SettingsDropdown.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-  import type { CodeFont } from "@app/appearance";
+  import type { CodeFont } from "@app/lib/appearance";
 
-  import Icon from "@app/Icon.svelte";
-  import ThemeToggle from "@app/ThemeToggle.svelte";
-  import { codeFont, storeCodeFont } from "@app/appearance";
-  import { codeFonts } from "@app/appearance";
+  import Icon from "@app/components/Icon.svelte";
+  import ThemeToggle from "./ThemeToggle.svelte";
+  import { codeFont, storeCodeFont } from "@app/lib/appearance";
+  import { codeFonts } from "@app/lib/appearance";
   import { quadIn } from "svelte/easing";
   import { slide } from "svelte/transition";
 
diff --git a/src/App/Header/ThemeToggle.svelte b/src/App/Header/ThemeToggle.svelte
new file mode 100644
index 000000000..bbdf72ab8
--- /dev/null
+++ b/src/App/Header/ThemeToggle.svelte
@@ -0,0 +1,29 @@
+<script lang="ts">
+  import Icon from "@app/components/Icon.svelte";
+  import Toggle from "@app/components/Toggle.svelte";
+  import { theme, storeTheme } from "@app/lib/appearance";
+
+  $: document.documentElement.setAttribute("data-theme", $theme);
+</script>
+
+<style>
+  .theme {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    user-select: none;
+    gap: 0.5rem;
+    cursor: pointer;
+  }
+</style>
+
+<div class="theme">
+  <Icon name="sun" on:click={() => theme.set("light")} />
+  <Toggle
+    checked={$theme === "dark"}
+    on:change={() => {
+      theme.set($theme === "dark" ? "light" : "dark");
+      storeTheme($theme);
+    }} />
+  <Icon name="moon" on:click={() => theme.set("dark")} />
+</div>
diff --git a/src/ThemeToggle.svelte b/src/ThemeToggle.svelte
deleted file mode 100644
index 6cbd6eeb3..000000000
--- a/src/ThemeToggle.svelte
+++ /dev/null
@@ -1,50 +0,0 @@
-<script lang="ts" context="module">
-  export type Theme = "dark" | "light";
-
-  import { writable } from "svelte/store";
-
-  export const theme = writable<Theme>(loadTheme());
-
-  function storeTheme(theme: Theme): void {
-    window.localStorage.setItem("theme", theme);
-  }
-
-  function loadTheme(): Theme {
-    const storedTheme = window.localStorage.getItem("theme");
-
-    if (storedTheme === null) {
-      return "dark";
-    } else {
-      return storedTheme as Theme;
-    }
-  }
-</script>
-
-<script lang="ts">
-  import Icon from "@app/Icon.svelte";
-  import Toggle from "@app/Toggle.svelte";
-
-  $: document.documentElement.setAttribute("data-theme", $theme);
-</script>
-
-<style>
-  .theme {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    user-select: none;
-    gap: 0.5rem;
-    cursor: pointer;
-  }
-</style>
-
-<div class="theme">
-  <Icon name="sun" on:click={() => theme.set("light")} />
-  <Toggle
-    checked={$theme === "dark"}
-    on:change={() => {
-      theme.set($theme === "dark" ? "light" : "dark");
-      storeTheme($theme);
-    }} />
-  <Icon name="moon" on:click={() => theme.set("dark")} />
-</div>
diff --git a/src/base/orgs/Org.ts b/src/base/orgs/Org.ts
deleted file mode 100644
index 39e85a84c..000000000
--- a/src/base/orgs/Org.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import type { Wallet } from "@app/wallet";
-
-import * as ethers from "ethers";
-
-import * as cache from "@app/cache";
-import * as utils from "@app/utils";
-import { assert } from "@app/error";
-import ethereumContractAbis from "@app/ethereum/contractAbis.json";
-
-export class Org {
-  address: string;
-  owner: string;
-  name?: string | null;
-
-  constructor(address: string, owner: string, name?: string | null) {
-    assert(ethers.utils.isAddress(address), "address must be valid");
-
-    this.address = address.toLowerCase(); // Don't store address checksum.
-    this.owner = owner;
-    this.name = name;
-  }
-
-  static async get(addressOrName: string, wallet: Wallet): Promise<Org | null> {
-    const org = await getOrgContract(addressOrName, wallet);
-
-    try {
-      const [owner, resolved] = await resolveOrgOwner(org);
-
-      // If what is resolved is not the same as the input, it's because we
-      // were given a name.
-      if (utils.isAddressEqual(addressOrName, resolved)) {
-        return new Org(resolved, owner, null);
-      } else {
-        return new Org(resolved, owner, addressOrName);
-      }
-    } catch (e) {
-      console.error(e);
-      return null;
-    }
-  }
-}
-
-export const getOrgContract = cache.cached(
-  async (addressOrName: string, wallet: Wallet) => {
-    return new ethers.Contract(
-      addressOrName,
-      ethereumContractAbis.org,
-      wallet.provider,
-    );
-  },
-  addressOrName => addressOrName,
-);
-
-export const resolveOrgOwner = cache.cached(
-  async (org: ethers.Contract) => {
-    return await Promise.all([org.owner(), org.resolvedAddress]);
-  },
-  org => org.address,
-);
diff --git a/src/base/users/User.ts b/src/base/users/User.ts
deleted file mode 100644
index 384bedb27..000000000
--- a/src/base/users/User.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import * as ethers from "ethers";
-import type { Wallet } from "@app/wallet";
-import { assert } from "@app/error";
-import type { TransactionResponse } from "@ethersproject/providers";
-import ethereumContractAbis from "@app/ethereum/contractAbis.json";
-
-export class User {
-  address: string;
-
-  constructor(address: string) {
-    assert(ethers.utils.isAddress(address), "address must be valid");
-
-    this.address = address.toLowerCase(); // Don't store address checksum.
-  }
-
-  async setName(name: string, wallet: Wallet): Promise<TransactionResponse> {
-    assert(wallet.signer);
-
-    const reverseRegistrar = new ethers.Contract(
-      wallet.reverseRegistrar.address,
-      ethereumContractAbis.reverseRegistrar,
-      wallet.signer,
-    );
-    return reverseRegistrar.setName(name);
-  }
-}
diff --git a/src/Address.svelte b/src/components/Address.svelte
similarity index 91%
rename from src/Address.svelte
rename to src/components/Address.svelte
index acaceb22f..ac7f4cb3b 100644
--- a/src/Address.svelte
+++ b/src/components/Address.svelte
@@ -1,19 +1,20 @@
 <script lang="ts">
-  import type { Wallet } from "@app/wallet";
+  import type { Wallet } from "@app/lib/wallet";
 
   import { onMount } from "svelte";
   import { ethers } from "ethers";
+
+  import Avatar from "@app/components/Avatar.svelte";
+  import Badge from "@app/components/Badge.svelte";
+  import Link from "@app/components/Link.svelte";
   import {
     AddressType,
     explorerLink,
     formatAddress,
     identifyAddress,
     parseEnsLabel,
-  } from "@app/utils";
-  import { Profile, ProfileType } from "@app/profile";
-  import Avatar from "@app/Avatar.svelte";
-  import Badge from "@app/Badge.svelte";
-  import Link from "@app/router/Link.svelte";
+  } from "@app/lib/utils";
+  import { Profile, ProfileType } from "@app/lib/profile";
 
   export let address: string;
   export let wallet: Wallet;
diff --git a/src/Async.svelte b/src/components/Async.svelte
similarity index 91%
rename from src/Async.svelte
rename to src/components/Async.svelte
index 590f028f6..f2112fe0b 100644
--- a/src/Async.svelte
+++ b/src/components/Async.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Loading from "@app/Loading.svelte";
+  import Loading from "@app/components/Loading.svelte";
 
   type T = $$Generic;
 
diff --git a/src/Authorship.svelte b/src/components/Authorship.svelte
similarity index 82%
rename from src/Authorship.svelte
rename to src/components/Authorship.svelte
index 6f3107ccf..34d3c9a90 100644
--- a/src/Authorship.svelte
+++ b/src/components/Authorship.svelte
@@ -1,10 +1,12 @@
 <script lang="ts">
-  import type { Wallet } from "@app/wallet";
-  import { formatRadicleUrn, formatTimestamp } from "@app/utils";
-  import Address from "@app/Address.svelte";
-  import { Profile, ProfileType } from "@app/profile";
+  import type { Author } from "@app/lib/cobs";
+  import type { Wallet } from "@app/lib/wallet";
+
   import { onMount } from "svelte";
-  import type { Author } from "@app/cobs";
+
+  import Address from "@app/components/Address.svelte";
+  import { Profile, ProfileType } from "@app/lib/profile";
+  import { formatRadicleUrn, formatTimestamp } from "@app/lib/utils";
 
   export let noAvatar = false;
   export let author: Author;
diff --git a/src/Avatar.svelte b/src/components/Avatar.svelte
similarity index 90%
rename from src/Avatar.svelte
rename to src/components/Avatar.svelte
index 71cba42d7..dbe8a0c5f 100644
--- a/src/Avatar.svelte
+++ b/src/components/Avatar.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import { createIcon } from "@app/blockies";
-  import { isAddress, isPeerId, isRadicleId } from "@app/utils";
+  import { createIcon } from "@app/lib/blockies";
+  import { isAddress, isPeerId, isRadicleId } from "@app/lib/utils";
 
   export let title: string;
   export let source: string;
diff --git a/src/Badge.svelte b/src/components/Badge.svelte
similarity index 100%
rename from src/Badge.svelte
rename to src/components/Badge.svelte
diff --git a/src/Button.svelte b/src/components/Button.svelte
similarity index 100%
rename from src/Button.svelte
rename to src/components/Button.svelte
diff --git a/src/Clipboard.svelte b/src/components/Clipboard.svelte
similarity index 90%
rename from src/Clipboard.svelte
rename to src/components/Clipboard.svelte
index bbf301caf..172a69f0e 100644
--- a/src/Clipboard.svelte
+++ b/src/components/Clipboard.svelte
@@ -1,8 +1,9 @@
 <script lang="ts" strictEvents>
-  import Icon from "@app/Icon.svelte";
-  import { toClipboard } from "@app/utils";
   import { createEventDispatcher } from "svelte";
 
+  import Icon from "@app/components/Icon.svelte";
+  import { toClipboard } from "@app/lib/utils";
+
   const dispatch = createEventDispatcher<{ copied: never }>();
 
   const copy = () => {
diff --git a/src/Comment.svelte b/src/components/Comment.svelte
similarity index 83%
rename from src/Comment.svelte
rename to src/components/Comment.svelte
index 9e6efd7eb..bef90d2da 100644
--- a/src/Comment.svelte
+++ b/src/components/Comment.svelte
@@ -1,15 +1,17 @@
 <script lang="ts">
-  import { onMount } from "svelte";
-  import type { Wallet } from "@app/wallet";
-  import type { Comment, Thread } from "@app/issue";
-  import Avatar from "@app/Avatar.svelte";
-  import Markdown from "@app/Markdown.svelte";
-  import ReactionSelector from "@app/ReactionSelector.svelte";
-  import type { Blob } from "@app/project";
-  import { Profile, ProfileType } from "@app/profile";
+  import type { Blob } from "@app/lib/project";
+  import type { Comment, Thread } from "@app/lib/issue";
+  import type { Wallet } from "@app/lib/wallet";
 
-  import Authorship from "@app/Authorship.svelte";
-  import Reactions from "@app/Reactions.svelte";
+  import { onMount } from "svelte";
+
+  import Authorship from "@app/components/Authorship.svelte";
+  import Avatar from "@app/components/Avatar.svelte";
+  import Markdown from "@app/components/Markdown.svelte";
+  import ReactionSelector from "./Comment/ReactionSelector.svelte";
+  import Reactions from "./Comment/Reactions.svelte";
+
+  import { Profile, ProfileType } from "@app/lib/profile";
 
   export let comment: Comment | Thread;
   export let wallet: Wallet;
diff --git a/src/ReactionSelector.svelte b/src/components/Comment/ReactionSelector.svelte
similarity index 94%
rename from src/ReactionSelector.svelte
rename to src/components/Comment/ReactionSelector.svelte
index 2fb7e8a56..229cad319 100644
--- a/src/ReactionSelector.svelte
+++ b/src/components/Comment/ReactionSelector.svelte
@@ -1,8 +1,8 @@
 <!-- TODO: Once we are able to add reactions, we should allow people to interact with the reaction handler -->
 <script lang="ts" strictEvents>
   import { createEventDispatcher } from "svelte";
-  import Icon from "@app/Icon.svelte";
-  import { config } from "@app/config";
+  import Icon from "@app/components/Icon.svelte";
+  import { config } from "@app/lib/config";
 
   const showReactions = false;
 
diff --git a/src/Reactions.svelte b/src/components/Comment/Reactions.svelte
similarity index 92%
rename from src/Reactions.svelte
rename to src/components/Comment/Reactions.svelte
index 366736f05..ac4255bf3 100644
--- a/src/Reactions.svelte
+++ b/src/components/Comment/Reactions.svelte
@@ -1,6 +1,6 @@
 <script lang="ts" strictEvents>
   import { createEventDispatcher } from "svelte";
-  import Button from "@app/Button.svelte";
+  import Button from "@app/components/Button.svelte";
 
   export let reactions: Record<string, number> | null = null;
 
diff --git a/src/Connect.svelte b/src/components/Connect.svelte
similarity index 77%
rename from src/Connect.svelte
rename to src/components/Connect.svelte
index baf9b61ff..d00944003 100644
--- a/src/Connect.svelte
+++ b/src/components/Connect.svelte
@@ -1,11 +1,14 @@
 <script lang="ts">
+  import type { Err } from "@app/lib/error";
+  import type { Wallet } from "@app/lib/wallet";
+
   import { get } from "svelte/store";
-  import { Connection, state } from "@app/session";
-  import type { Err } from "@app/error";
-  import ErrorModal from "@app/ErrorModal.svelte";
-  import type { Wallet } from "@app/wallet";
-  import ConnectWallet from "@app/components/Modal/ConnectWallet.svelte";
-  import Button from "@app/Button.svelte";
+
+  import Button from "@app/components/Button.svelte";
+  import ConnectWallet from "@app/components/Connect/ConnectWallet.svelte";
+  import ErrorModal from "@app/components/ErrorModal.svelte";
+
+  import { Connection, state } from "@app/lib/session";
 
   export let caption = "Connect";
   export let wallet: Wallet;
diff --git a/src/components/Modal/ConnectWallet.svelte b/src/components/Connect/ConnectWallet.svelte
similarity index 88%
rename from src/components/Modal/ConnectWallet.svelte
rename to src/components/Connect/ConnectWallet.svelte
index da1e8e86d..36cd2dbc4 100644
--- a/src/components/Modal/ConnectWallet.svelte
+++ b/src/components/Connect/ConnectWallet.svelte
@@ -1,13 +1,13 @@
 <script lang="ts" strictEvents>
-  import type { Wallet } from "@app/wallet";
+  import type { Wallet } from "@app/lib/wallet";
 
   import { createEventDispatcher } from "svelte";
   import { qrcode } from "pure-svg-code";
 
-  import Button from "@app/Button.svelte";
-  import Modal from "@app/Modal.svelte";
-  import { state } from "@app/session";
-  import { twemoji } from "@app/utils";
+  import Button from "@app/components/Button.svelte";
+  import Modal from "@app/components/Modal.svelte";
+  import { state } from "@app/lib/session";
+  import { twemoji } from "@app/lib/utils";
 
   export let uri: string;
   export let wallet: Wallet;
diff --git a/src/Dropdown.svelte b/src/components/Dropdown.svelte
similarity index 93%
rename from src/Dropdown.svelte
rename to src/components/Dropdown.svelte
index 41391b0f1..fe61bcdd4 100644
--- a/src/Dropdown.svelte
+++ b/src/components/Dropdown.svelte
@@ -1,7 +1,8 @@
 <script lang="ts" strictEvents>
   import { createEventDispatcher } from "svelte";
-  import Badge from "@app/Badge.svelte";
-  import { twemoji } from "@app/utils";
+  import { twemoji } from "@app/lib/utils";
+
+  import Badge from "@app/components/Badge.svelte";
 
   export let items: {
     key: string;
diff --git a/src/ErrorModal.svelte b/src/components/ErrorModal.svelte
similarity index 83%
rename from src/ErrorModal.svelte
rename to src/components/ErrorModal.svelte
index 8284507ac..1d6ee3752 100644
--- a/src/ErrorModal.svelte
+++ b/src/components/ErrorModal.svelte
@@ -1,10 +1,12 @@
 <script lang="ts" strictEvents>
-  import type { Err } from "@app/error";
+  import type { Err } from "@app/lib/error";
 
-  import Button from "@app/Button.svelte";
-  import Modal from "@app/Modal.svelte";
   import { createEventDispatcher } from "svelte";
-  import { twemoji } from "@app/utils";
+
+  import Button from "@app/components/Button.svelte";
+  import Modal from "@app/components/Modal.svelte";
+
+  import { twemoji } from "@app/lib/utils";
 
   const dispatch = createEventDispatcher<{ close: never }>();
 
diff --git a/src/Floating.svelte b/src/components/Floating.svelte
similarity index 100%
rename from src/Floating.svelte
rename to src/components/Floating.svelte
diff --git a/src/Form.svelte b/src/components/Form.svelte
similarity index 96%
rename from src/Form.svelte
rename to src/components/Form.svelte
index 96ef864b1..35188d436 100644
--- a/src/Form.svelte
+++ b/src/components/Form.svelte
@@ -49,7 +49,7 @@
 </script>
 
 <script lang="ts" strictEvents>
-  import type { Wallet } from "@app/wallet";
+  import type { Wallet } from "@app/lib/wallet";
 
   import cloneDeep from "lodash/cloneDeep";
   import { createEventDispatcher } from "svelte";
@@ -60,11 +60,11 @@
     isUrl,
     isAddress,
     formatSeedId,
-  } from "@app/utils";
+  } from "@app/lib/utils";
 
-  import Address from "@app/Address.svelte";
-  import Button from "@app/Button.svelte";
-  import TextInput from "@app/TextInput.svelte";
+  import Address from "@app/components/Address.svelte";
+  import Button from "@app/components/Button.svelte";
+  import TextInput from "@app/components/TextInput.svelte";
 
   export let fields: Field[];
   export let editable = false;
diff --git a/src/Icon.svelte b/src/components/Icon.svelte
similarity index 99%
rename from src/Icon.svelte
rename to src/components/Icon.svelte
index cc1f4000a..376e8ec07 100644
--- a/src/Icon.svelte
+++ b/src/components/Icon.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { unreachable } from "@app/utils";
+  import { unreachable } from "@app/lib/utils";
 
   export let name:
     | "browse"
diff --git a/src/router/Link.svelte b/src/components/Link.svelte
similarity index 79%
rename from src/router/Link.svelte
rename to src/components/Link.svelte
index 0158b3e84..9ac1378c8 100644
--- a/src/router/Link.svelte
+++ b/src/components/Link.svelte
@@ -1,7 +1,8 @@
 <script lang="ts" strictEvents>
+  import type { Route } from "@app/lib/router/definitions";
+
   import { createEventDispatcher } from "svelte";
-  import type { Route } from "./definitions";
-  import { push, routeToPath } from "./index";
+  import { push, routeToPath } from "@app/lib/router";
 
   export let route: Route;
   export let title: string | null = null;
diff --git a/src/List.svelte b/src/components/List.svelte
similarity index 91%
rename from src/List.svelte
rename to src/components/List.svelte
index 515c62344..cfd12c7ef 100644
--- a/src/List.svelte
+++ b/src/components/List.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
-  import Button from "@app/Button.svelte";
-  import Loading from "@app/Loading.svelte";
   import { fade } from "svelte/transition";
 
+  import Button from "@app/components/Button.svelte";
+  import Loading from "@app/components/Loading.svelte";
+
   type Item = $$Generic;
 
   export let complete = false;
diff --git a/src/Loading.svelte b/src/components/Loading.svelte
similarity index 100%
rename from src/Loading.svelte
rename to src/components/Loading.svelte
diff --git a/src/Markdown.svelte b/src/components/Markdown.svelte
similarity index 97%
rename from src/Markdown.svelte
rename to src/components/Markdown.svelte
index b1058e876..bc47739b0 100644
--- a/src/Markdown.svelte
+++ b/src/components/Markdown.svelte
@@ -1,10 +1,14 @@
 <script lang="ts">
-  import type * as proj from "@app/project";
+  import type * as proj from "@app/lib/project";
 
   import dompurify from "dompurify";
   import matter from "@radicle/gray-matter";
-  import { base } from "@app/router";
-  import { highlight } from "@app/syntax";
+  import { marked } from "marked";
+  import { onMount } from "svelte";
+  import { toDom } from "hast-util-to-dom";
+
+  import { base } from "@app/lib/router";
+  import { highlight } from "@app/lib/syntax";
   import {
     markdownExtensions as extensions,
     renderer,
@@ -12,10 +16,7 @@
     isUrl,
     twemoji,
     scrollIntoView,
-  } from "@app/utils";
-  import { marked } from "marked";
-  import { onMount } from "svelte";
-  import { toDom } from "hast-util-to-dom";
+  } from "@app/lib/utils";
 
   export let content: string;
   export let doc = matter(content);
diff --git a/src/Message.svelte b/src/components/Message.svelte
similarity index 100%
rename from src/Message.svelte
rename to src/components/Message.svelte
diff --git a/src/Modal.svelte b/src/components/Modal.svelte
similarity index 100%
rename from src/Modal.svelte
rename to src/components/Modal.svelte
diff --git a/src/NotFound.svelte b/src/components/NotFound.svelte
similarity index 67%
rename from src/NotFound.svelte
rename to src/components/NotFound.svelte
index 4d3d63d25..ca1a71015 100644
--- a/src/NotFound.svelte
+++ b/src/components/NotFound.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-  import * as router from "@app/router";
-  import { twemoji } from "@app/utils";
+  import * as router from "@app/lib/router";
+  import { twemoji } from "@app/lib/utils";
 
-  import Button from "@app/Button.svelte";
-  import Modal from "@app/Modal.svelte";
+  import Button from "@app/components/Button.svelte";
+  import Modal from "@app/components/Modal.svelte";
 
   export let title = "";
   export let subtitle = "";
diff --git a/src/Placeholder.svelte b/src/components/Placeholder.svelte
similarity index 93%
rename from src/Placeholder.svelte
rename to src/components/Placeholder.svelte
index bacbbcaf2..122f23309 100644
--- a/src/Placeholder.svelte
+++ b/src/components/Placeholder.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { twemoji } from "@app/utils";
+  import { twemoji } from "@app/lib/utils";
 
   export let emoji: string;
 </script>
diff --git a/src/router/ProjectLink.svelte b/src/components/ProjectLink.svelte
similarity index 66%
rename from src/router/ProjectLink.svelte
rename to src/components/ProjectLink.svelte
index 864d2effc..7f45c7f9a 100644
--- a/src/router/ProjectLink.svelte
+++ b/src/components/ProjectLink.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import type { ProjectsParams } from "./definitions";
-  import { updateProjectRoute, projectLinkHref } from "./index";
+  import type { ProjectsParams } from "@app/lib/router/definitions";
+  import { updateProjectRoute, projectLinkHref } from "@app/lib/router";
 
   export let projectParams: Partial<ProjectsParams>;
   export let id: string | undefined = undefined;
diff --git a/src/RadicleUrn.svelte b/src/components/RadicleUrn.svelte
similarity index 87%
rename from src/RadicleUrn.svelte
rename to src/components/RadicleUrn.svelte
index f73c25caa..e04babd6e 100644
--- a/src/RadicleUrn.svelte
+++ b/src/components/RadicleUrn.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import { parseRadicleId, toClipboard, twemoji } from "@app/utils";
-  import Button from "@app/Button.svelte";
+  import { parseRadicleId, toClipboard, twemoji } from "@app/lib/utils";
+  import Button from "@app/components/Button.svelte";
 
   export let urn: string;
 
diff --git a/src/SeedAddress.svelte b/src/components/SeedAddress.svelte
similarity index 89%
rename from src/SeedAddress.svelte
rename to src/components/SeedAddress.svelte
index 9045b9b69..efaae530a 100644
--- a/src/SeedAddress.svelte
+++ b/src/components/SeedAddress.svelte
@@ -1,13 +1,14 @@
 <script lang="ts">
+  import type { Seed } from "@app/lib/seed";
+
+  import Clipboard from "@app/components/Clipboard.svelte";
+  import Link from "@app/components/Link.svelte";
   import {
     formatSeedAddress,
     formatSeedId,
     formatSeedHost,
     twemoji,
-  } from "@app/utils";
-  import type { Seed } from "@app/base/seeds/Seed";
-  import Clipboard from "@app/Clipboard.svelte";
-  import Link from "@app/router/Link.svelte";
+  } from "@app/lib/utils";
 
   export let seed: Seed;
   export let port: number;
diff --git a/src/TextInput.svelte b/src/components/TextInput.svelte
similarity index 98%
rename from src/TextInput.svelte
rename to src/components/TextInput.svelte
index 815ed5d31..f0af1d5fe 100644
--- a/src/TextInput.svelte
+++ b/src/components/TextInput.svelte
@@ -2,7 +2,7 @@
   import { createEventDispatcher } from "svelte";
   import { onMount } from "svelte";
 
-  import Loading from "@app/Loading.svelte";
+  import Loading from "@app/components/Loading.svelte";
 
   export let name: string | undefined = undefined;
   export let placeholder: string | undefined = undefined;
diff --git a/src/Toggle.svelte b/src/components/Toggle.svelte
similarity index 100%
rename from src/Toggle.svelte
rename to src/components/Toggle.svelte
diff --git a/src/ToggleButton.svelte b/src/components/ToggleButton.svelte
similarity index 97%
rename from src/ToggleButton.svelte
rename to src/components/ToggleButton.svelte
index e211ae6f1..351cd2960 100644
--- a/src/ToggleButton.svelte
+++ b/src/components/ToggleButton.svelte
@@ -10,7 +10,7 @@
   type T = $$Generic;
 
   import { createEventDispatcher } from "svelte";
-  import { capitalize } from "@app/utils";
+  import { capitalize } from "@app/lib/utils";
 
   export let options: ToggleButtonOption<T>[];
   export let active: T;
diff --git a/src/global.d.ts b/src/global.d.ts
index 2dc53dea2..744f264ac 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import type { Config } from "@app/config";
+import type { Config } from "@app/lib/config";
 import type { FakeTimers } from "@sinonjs/fake-timers";
 
 declare global {
diff --git a/src/index.ts b/src/index.ts
index a80163e73..b61b6cdc7 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,5 +1,5 @@
-if (window.PLAYWRIGHT) import("./e2eTestStubs");
-import App from "./App.svelte";
+if (window.PLAYWRIGHT) import("@app/lib/e2eTestStubs");
+import App from "@app/App.svelte";
 
 const app = new App({
   target: document.body,
diff --git a/src/api.ts b/src/lib/api.ts
similarity index 100%
rename from src/api.ts
rename to src/lib/api.ts
diff --git a/src/appearance.ts b/src/lib/appearance.ts
similarity index 66%
rename from src/appearance.ts
rename to src/lib/appearance.ts
index e36642a61..437570a57 100644
--- a/src/appearance.ts
+++ b/src/lib/appearance.ts
@@ -1,5 +1,8 @@
 import { writable } from "svelte/store";
 
+export type Theme = "dark" | "light";
+export const theme = writable<Theme>(loadTheme());
+
 export type CodeFont = "jetbrains" | "system";
 export const codeFont = writable<CodeFont>(loadCodeFont());
 
@@ -29,3 +32,17 @@ export const codeFonts: {
   },
   { storedName: "system", fontFamily: "monospace", displayName: "System" },
 ];
+
+function loadTheme(): Theme {
+  const storedTheme = window.localStorage.getItem("theme");
+
+  if (storedTheme === null) {
+    return "dark";
+  } else {
+    return storedTheme as Theme;
+  }
+}
+
+export function storeTheme(theme: Theme): void {
+  window.localStorage.setItem("theme", theme);
+}
diff --git a/src/blockies.ts b/src/lib/blockies.ts
similarity index 100%
rename from src/blockies.ts
rename to src/lib/blockies.ts
diff --git a/src/cache.ts b/src/lib/cache.ts
similarity index 100%
rename from src/cache.ts
rename to src/lib/cache.ts
diff --git a/src/cobs.ts b/src/lib/cobs.ts
similarity index 90%
rename from src/cobs.ts
rename to src/lib/cobs.ts
index a54963232..b9120a13d 100644
--- a/src/cobs.ts
+++ b/src/lib/cobs.ts
@@ -1,4 +1,4 @@
-import type { PeerId } from "@app/project";
+import type { PeerId } from "@app/lib/project";
 
 export interface Author {
   peer: PeerId;
diff --git a/src/commit.ts b/src/lib/commit.ts
similarity index 95%
rename from src/commit.ts
rename to src/lib/commit.ts
index a439bab41..fc5a08550 100644
--- a/src/commit.ts
+++ b/src/lib/commit.ts
@@ -1,7 +1,7 @@
-import type { Stats, Person } from "@app/project";
-import type { Diff } from "@app/diff";
-import { ApiError } from "@app/api";
-import { getDaysPassed } from "@app/utils";
+import type { Stats, Person } from "@app/lib/project";
+import type { Diff } from "@app/lib/diff";
+import { ApiError } from "@app/lib/api";
+import { getDaysPassed } from "@app/lib/utils";
 
 export interface CommitsHistory {
   headers: CommitMetadata[];
diff --git a/src/config.ts b/src/lib/config.ts
similarity index 100%
rename from src/config.ts
rename to src/lib/config.ts
diff --git a/src/diff.ts b/src/lib/diff.ts
similarity index 100%
rename from src/diff.ts
rename to src/lib/diff.ts
diff --git a/src/e2eTestStubs.ts b/src/lib/e2eTestStubs.ts
similarity index 100%
rename from src/e2eTestStubs.ts
rename to src/lib/e2eTestStubs.ts
diff --git a/src/emojis.ts b/src/lib/emojis.ts
similarity index 100%
rename from src/emojis.ts
rename to src/lib/emojis.ts
diff --git a/src/error.ts b/src/lib/error.ts
similarity index 100%
rename from src/error.ts
rename to src/lib/error.ts
diff --git a/src/ethereum/contractAbis.json b/src/lib/ethereum/contractAbis.json
similarity index 100%
rename from src/ethereum/contractAbis.json
rename to src/lib/ethereum/contractAbis.json
diff --git a/src/ethereum/networks/goerli.json b/src/lib/ethereum/networks/goerli.json
similarity index 100%
rename from src/ethereum/networks/goerli.json
rename to src/lib/ethereum/networks/goerli.json
diff --git a/src/ethereum/networks/homestead.json b/src/lib/ethereum/networks/homestead.json
similarity index 100%
rename from src/ethereum/networks/homestead.json
rename to src/lib/ethereum/networks/homestead.json
diff --git a/src/base/faucet/lib.ts b/src/lib/faucet.ts
similarity index 85%
rename from src/base/faucet/lib.ts
rename to src/lib/faucet.ts
index 8087e88e5..1f3864459 100644
--- a/src/base/faucet/lib.ts
+++ b/src/lib/faucet.ts
@@ -1,12 +1,13 @@
+import type { TransactionResponse } from "@ethersproject/providers";
+import type { TypedDataSigner } from "@ethersproject/abstract-signer";
+import type { Wallet } from "@app/lib/wallet";
+import type { WalletConnectSigner } from "@app/lib/walletConnectSigner";
+
 import * as ethers from "ethers";
 
-import type { Wallet } from "@app/wallet";
-import { assert } from "@app/error";
-import type { TransactionResponse } from "@ethersproject/providers";
-import { toWei } from "@app/utils";
-import type { WalletConnectSigner } from "@app/WalletConnectSigner";
-import type { TypedDataSigner } from "@ethersproject/abstract-signer";
-import ethereumContractAbis from "@app/ethereum/contractAbis.json";
+import ethereumContractAbis from "@app/lib/ethereum/contractAbis.json";
+import { assert } from "@app/lib/error";
+import { toWei } from "@app/lib/utils";
 
 type Signer = (ethers.Signer & TypedDataSigner) | WalletConnectSigner | null;
 
diff --git a/src/issue.ts b/src/lib/issue.ts
similarity index 95%
rename from src/issue.ts
rename to src/lib/issue.ts
index 0eabbbfb7..243ed9e36 100644
--- a/src/issue.ts
+++ b/src/lib/issue.ts
@@ -1,5 +1,5 @@
-import { type Host, Request } from "@app/api";
-import type { Author } from "@app/cobs";
+import { type Host, Request } from "@app/lib/api";
+import type { Author } from "@app/lib/cobs";
 
 export interface TimelineItem {
   person: Author;
diff --git a/src/patch.ts b/src/lib/patch.ts
similarity index 92%
rename from src/patch.ts
rename to src/lib/patch.ts
index 74115972a..93cc70113 100644
--- a/src/patch.ts
+++ b/src/lib/patch.ts
@@ -1,10 +1,11 @@
-import type { PeerId, Urn } from "@app/project";
-import type { Host } from "@app/api";
-import { Request } from "@app/api";
-import type { Comment, Thread } from "@app/issue";
-import type { Author, PeerInfo } from "@app/cobs";
-import type { Diff } from "@app/diff";
-import type { Commit, DiffStats } from "@app/commit";
+import type { Author, PeerInfo } from "@app/lib/cobs";
+import type { Comment, Thread } from "@app/lib/issue";
+import type { Commit, DiffStats } from "@app/lib/commit";
+import type { Diff } from "@app/lib/diff";
+import type { Host } from "@app/lib/api";
+import type { PeerId, Urn } from "@app/lib/project";
+
+import { Request } from "@app/lib/api";
 
 export interface IPatch {
   id: string;
diff --git a/src/profile.ts b/src/lib/profile.ts
similarity index 63%
rename from src/profile.ts
rename to src/lib/profile.ts
index 0258331d9..71ec0355e 100644
--- a/src/profile.ts
+++ b/src/lib/profile.ts
@@ -1,4 +1,16 @@
-import type { EnsProfile } from "@app/base/registrations/registrar";
+import type { EnsProfile } from "@app/lib/registrar";
+import type { Seed, InvalidSeed } from "@app/lib/seed";
+import type { TransactionResponse } from "@ethersproject/providers";
+import type { Wallet } from "@app/lib/wallet";
+
+import * as ethers from "ethers";
+
+import * as cache from "@app/lib/cache";
+import * as utils from "@app/lib/utils";
+import ethereumContractAbis from "@app/lib/ethereum/contractAbis.json";
+import { NotFoundError, MissingReverseRecord } from "@app/lib/error";
+import { assert } from "@app/lib/error";
+import { cached } from "@app/lib/cache";
 import {
   isAddress,
   resolveEnsProfile,
@@ -6,12 +18,79 @@ import {
   AddressType,
   identifyAddress,
   isFulfilled,
-} from "@app/utils";
-import type { Wallet } from "@app/wallet";
-import { cached } from "@app/cache";
-import type { Seed, InvalidSeed } from "@app/base/seeds/Seed";
-import { Org } from "@app/base/orgs/Org";
-import { NotFoundError, MissingReverseRecord } from "@app/error";
+} from "@app/lib/utils";
+
+class Org {
+  address: string;
+  owner: string;
+  name?: string | null;
+
+  constructor(address: string, owner: string, name?: string | null) {
+    assert(ethers.utils.isAddress(address), "address must be valid");
+
+    this.address = address.toLowerCase(); // Don't store address checksum.
+    this.owner = owner;
+    this.name = name;
+  }
+
+  static async get(addressOrName: string, wallet: Wallet): Promise<Org | null> {
+    const org = await getOrgContract(addressOrName, wallet);
+
+    try {
+      const [owner, resolved] = await resolveOrgOwner(org);
+
+      // If what is resolved is not the same as the input, it's because we
+      // were given a name.
+      if (utils.isAddressEqual(addressOrName, resolved)) {
+        return new Org(resolved, owner, null);
+      } else {
+        return new Org(resolved, owner, addressOrName);
+      }
+    } catch (e) {
+      console.error(e);
+      return null;
+    }
+  }
+}
+
+export class User {
+  address: string;
+
+  constructor(address: string) {
+    assert(ethers.utils.isAddress(address), "address must be valid");
+
+    this.address = address.toLowerCase(); // Don't store address checksum.
+  }
+
+  async setName(name: string, wallet: Wallet): Promise<TransactionResponse> {
+    assert(wallet.signer);
+
+    const reverseRegistrar = new ethers.Contract(
+      wallet.reverseRegistrar.address,
+      ethereumContractAbis.reverseRegistrar,
+      wallet.signer,
+    );
+    return reverseRegistrar.setName(name);
+  }
+}
+
+const getOrgContract = cache.cached(
+  async (addressOrName: string, wallet: Wallet) => {
+    return new ethers.Contract(
+      addressOrName,
+      ethereumContractAbis.org,
+      wallet.provider,
+    );
+  },
+  addressOrName => addressOrName,
+);
+
+const resolveOrgOwner = cache.cached(
+  async (org: ethers.Contract) => {
+    return await Promise.all([org.owner(), org.resolvedAddress]);
+  },
+  org => org.address,
+);
 
 export interface IProfile {
   address: string;
diff --git a/src/project.ts b/src/lib/project.ts
similarity index 96%
rename from src/project.ts
rename to src/lib/project.ts
index 0ce661d98..c0cecb74b 100644
--- a/src/project.ts
+++ b/src/lib/project.ts
@@ -1,9 +1,10 @@
-import { type Host, Request } from "@app/api";
-import type { Commit, CommitHeader, CommitsHistory } from "@app/commit";
-import { isFulfilled, isOid, isRadicleId } from "@app/utils";
-import { Profile, ProfileType } from "@app/profile";
-import { Seed } from "@app/base/seeds/Seed";
-import type { Wallet } from "@app/wallet";
+import type { Commit, CommitHeader, CommitsHistory } from "@app/lib/commit";
+import type { Wallet } from "@app/lib/wallet";
+import { type Host, Request } from "@app/lib/api";
+
+import { Profile, ProfileType } from "@app/lib/profile";
+import { Seed } from "@app/lib/seed";
+import { isFulfilled, isOid, isRadicleId } from "@app/lib/utils";
 
 export type Urn = string;
 export type PeerId = string;
diff --git a/src/base/registrations/registrar.ts b/src/lib/registrar.ts
similarity index 96%
rename from src/base/registrations/registrar.ts
rename to src/lib/registrar.ts
index ea2fba8f9..06151ecc4 100644
--- a/src/base/registrations/registrar.ts
+++ b/src/lib/registrar.ts
@@ -1,16 +1,18 @@
-import { ethers } from "ethers";
-import { writable } from "svelte/store";
 import type { BigNumber } from "ethers";
 import type { EnsResolver } from "@ethersproject/providers";
 import type { TypedDataSigner } from "@ethersproject/abstract-signer";
-import * as session from "@app/session";
-import { Failure } from "@app/error";
-import type { Wallet } from "@app/wallet";
-import { isFulfilled, unixTime } from "@app/utils";
-import { assert } from "@app/error";
-import { Seed, InvalidSeed } from "@app/base/seeds/Seed";
-import * as cache from "@app/cache";
-import ethereumContractAbis from "@app/ethereum/contractAbis.json";
+import type { Wallet } from "@app/lib/wallet";
+
+import { ethers } from "ethers";
+import { writable } from "svelte/store";
+
+import * as cache from "@app/lib/cache";
+import * as session from "@app/lib/session";
+import ethereumContractAbis from "@app/lib/ethereum/contractAbis.json";
+import { Failure } from "@app/lib/error";
+import { Seed, InvalidSeed } from "@app/lib/seed";
+import { assert } from "@app/lib/error";
+import { isFulfilled, unixTime } from "@app/lib/utils";
 
 export interface Registration {
   profile: EnsProfile;
diff --git a/src/base/registrations/resolver.ts b/src/lib/resolver.ts
similarity index 90%
rename from src/base/registrations/resolver.ts
rename to src/lib/resolver.ts
index 14994101a..770c4caca 100644
--- a/src/base/registrations/resolver.ts
+++ b/src/lib/resolver.ts
@@ -1,9 +1,10 @@
-import type { TransactionResponse } from "@ethersproject/providers";
 import type { EnsResolver } from "@ethersproject/providers";
+import type { TransactionResponse } from "@ethersproject/providers";
+import type { Wallet } from "@app/lib/wallet";
+
+import ethereumContractAbis from "@app/lib/ethereum/contractAbis.json";
+import { assert } from "@app/lib/error";
 import { ethers } from "ethers";
-import type { Wallet } from "@app/wallet";
-import { assert } from "@app/error";
-import ethereumContractAbis from "@app/ethereum/contractAbis.json";
 
 export type EnsRecord = { name: string; value: string };
 
diff --git a/src/router/index.ts b/src/lib/router.ts
similarity index 99%
rename from src/router/index.ts
rename to src/lib/router.ts
index 78036f28c..1bf10deee 100644
--- a/src/router/index.ts
+++ b/src/lib/router.ts
@@ -1,8 +1,8 @@
-import type { ProjectsParams, Route, ProjectRoute } from "./definitions";
+import type { ProjectsParams, Route, ProjectRoute } from "./router/definitions";
 import type { Readable } from "svelte/store";
 
 import { get, writable, derived } from "svelte/store";
-import { unreachable } from "@app/utils";
+import { unreachable } from "@app/lib/utils";
 
 // This is only respected by Safari.
 const documentTitle = "Radicle Interface";
diff --git a/src/router/definitions.ts b/src/lib/router/definitions.ts
similarity index 96%
rename from src/router/definitions.ts
rename to src/lib/router/definitions.ts
index 34fe41a06..b230a65da 100644
--- a/src/router/definitions.ts
+++ b/src/lib/router/definitions.ts
@@ -1,4 +1,4 @@
-import type { VestingInfo } from "@app/base/vesting/vesting";
+import type { VestingInfo } from "@app/lib/vesting";
 
 export type Route =
   | FaucetRoute
diff --git a/src/base/seeds/Seed.ts b/src/lib/seed.ts
similarity index 93%
rename from src/base/seeds/Seed.ts
rename to src/lib/seed.ts
index c53bf005f..35d442219 100644
--- a/src/base/seeds/Seed.ts
+++ b/src/lib/seed.ts
@@ -1,8 +1,10 @@
-import { Request, type Host } from "@app/api";
-import * as proj from "@app/project";
-import { isDomain } from "@app/utils";
-import { assert } from "@app/error";
-import { getSeedEmoji } from "@app/utils";
+import type { Host } from "@app/lib/api";
+
+import * as proj from "@app/lib/project";
+import { Request } from "@app/lib/api";
+import { assert } from "@app/lib/error";
+import { getSeedEmoji } from "@app/lib/utils";
+import { isDomain } from "@app/lib/utils";
 
 export interface Stats {
   projects: { count: number };
diff --git a/src/session.ts b/src/lib/session.ts
similarity index 98%
rename from src/session.ts
rename to src/lib/session.ts
index a9bfcba4d..4bf0af520 100644
--- a/src/session.ts
+++ b/src/lib/session.ts
@@ -1,15 +1,17 @@
-import { get, writable, derived } from "svelte/store";
-import type { Readable } from "svelte/store";
 import type { BigNumber } from "ethers";
+import type { Readable } from "svelte/store";
 import type {
   TransactionReceipt,
   TransactionResponse,
 } from "@ethersproject/providers";
-import { Wallet, getWallet } from "@app/wallet";
-import { Unreachable, assert, assertEq } from "@app/error";
 import type { TypedDataSigner } from "@ethersproject/abstract-signer";
-import type { WalletConnectSigner } from "./WalletConnectSigner";
+import type { WalletConnectSigner } from "@app/lib/walletConnectSigner";
+
 import * as ethers from "ethers";
+import { get, writable, derived } from "svelte/store";
+
+import { Unreachable, assert, assertEq } from "@app/lib/error";
+import { Wallet, getWallet } from "@app/lib/wallet";
 
 export enum Connection {
   Disconnected,
diff --git a/src/syntax/index.ts b/src/lib/syntax.ts
similarity index 100%
rename from src/syntax/index.ts
rename to src/lib/syntax.ts
diff --git a/src/utils.ts b/src/lib/utils.ts
similarity index 96%
rename from src/utils.ts
rename to src/lib/utils.ts
index df3b33fe0..a529a989f 100644
--- a/src/utils.ts
+++ b/src/lib/utils.ts
@@ -1,26 +1,22 @@
-import type { EnsProfile } from "@app/base/registrations/registrar";
-import type { Wallet } from "@app/wallet";
+import type { EnsProfile } from "@app/lib/registrar";
+import type { Wallet } from "@app/lib/wallet";
 import type { marked } from "marked";
 
-import * as cache from "@app/cache";
-import emojis from "@app/emojis";
 import katex from "katex";
 import md5 from "md5";
 import twemojiModule from "twemoji";
-import { BigNumber } from "ethers";
-import { ProfileType } from "@app/profile";
-import { assert } from "@app/error";
-import { base } from "@app/router";
-import { config } from "@app/config";
-import { ethers } from "ethers";
-import { getAddress, getResolver } from "@app/base/registrations/registrar";
-import {
-  getAvatar,
-  getSeed,
-  getRegistration,
-} from "@app/base/registrations/registrar";
+import { BigNumber, ethers } from "ethers";
 import { parseUnits } from "@ethersproject/units";
 
+import * as cache from "@app/lib/cache";
+import emojis from "@app/lib/emojis";
+import { ProfileType } from "@app/lib/profile";
+import { assert } from "@app/lib/error";
+import { base } from "@app/lib/router";
+import { config } from "@app/lib/config";
+import { getAddress, getResolver } from "@app/lib/registrar";
+import { getAvatar, getSeed, getRegistration } from "@app/lib/registrar";
+
 export enum AddressType {
   Contract,
   Org,
diff --git a/src/base/vesting/vesting.ts b/src/lib/vesting.ts
similarity index 88%
rename from src/base/vesting/vesting.ts
rename to src/lib/vesting.ts
index 40952d835..d0115142d 100644
--- a/src/base/vesting/vesting.ts
+++ b/src/lib/vesting.ts
@@ -1,12 +1,12 @@
-import type { Wallet } from "@app/wallet";
+import type { Wallet } from "@app/lib/wallet";
 
 import { ethers } from "ethers";
-import { assert } from "@app/error";
 import { writable } from "svelte/store";
 
-import * as session from "@app/session";
-import * as utils from "@app/utils";
-import ethereumContractAbis from "@app/ethereum/contractAbis.json";
+import * as session from "@app/lib/session";
+import * as utils from "@app/lib/utils";
+import ethereumContractAbis from "@app/lib/ethereum/contractAbis.json";
+import { assert } from "@app/lib/error";
 
 export interface VestingInfo {
   token: string;
diff --git a/src/wallet.ts b/src/lib/wallet.ts
similarity index 95%
rename from src/wallet.ts
rename to src/lib/wallet.ts
index 68e910338..9d6aa4b7b 100644
--- a/src/wallet.ts
+++ b/src/lib/wallet.ts
@@ -5,12 +5,12 @@ import WalletConnect from "@walletconnect/client";
 import { ethers } from "ethers";
 import { get, writable } from "svelte/store";
 
-import { WalletConnectSigner } from "@app/WalletConnectSigner";
-import { capitalize } from "@app/utils";
-import ethereumContractAbis from "@app/ethereum/contractAbis.json";
-import homestead from "@app/ethereum/networks/homestead.json";
-import goerli from "@app/ethereum/networks/goerli.json";
-import { config } from "@app/config";
+import ethereumContractAbis from "@app/lib/ethereum/contractAbis.json";
+import goerli from "@app/lib/ethereum/networks/goerli.json";
+import homestead from "@app/lib/ethereum/networks/homestead.json";
+import { WalletConnectSigner } from "@app/lib/walletConnectSigner";
+import { capitalize } from "@app/lib/utils";
+import { config } from "@app/lib/config";
 
 interface NetworkConfig {
   name: string;
diff --git a/src/WalletConnectSigner.ts b/src/lib/walletConnectSigner.ts
similarity index 99%
rename from src/WalletConnectSigner.ts
rename to src/lib/walletConnectSigner.ts
index 1c9434d4a..cfb0d0cbe 100644
--- a/src/WalletConnectSigner.ts
+++ b/src/lib/walletConnectSigner.ts
@@ -1,18 +1,19 @@
 import type WalletConnect from "@walletconnect/client";
-import * as ethers from "ethers";
-import * as ethersBytes from "@ethersproject/bytes";
+import type { Deferrable } from "@ethersproject/properties";
 import type {
   TransactionRequest,
   TransactionResponse,
 } from "@ethersproject/abstract-provider";
-import { resolveProperties } from "@ethersproject/properties";
-import type { Deferrable } from "@ethersproject/properties";
-import { _TypedDataEncoder } from "ethers/lib/utils";
 import type {
   TypedDataDomain,
   TypedDataField,
 } from "@ethersproject/abstract-signer";
 
+import * as ethers from "ethers";
+import * as ethersBytes from "@ethersproject/bytes";
+import { _TypedDataEncoder } from "ethers/lib/utils";
+import { resolveProperties } from "@ethersproject/properties";
+
 export class WalletConnectSigner extends ethers.Signer {
   public walletConnect: WalletConnect;
   public readonly provider: ethers.providers.JsonRpcProvider;
diff --git a/src/base/faucet/Form.svelte b/src/views/faucet/Form.svelte
similarity index 91%
rename from src/base/faucet/Form.svelte
rename to src/views/faucet/Form.svelte
index ee17b47fc..db74616b1 100644
--- a/src/base/faucet/Form.svelte
+++ b/src/views/faucet/Form.svelte
@@ -1,18 +1,18 @@
 <script lang="ts">
-  import type { Wallet } from "@app/wallet";
+  import type { Wallet } from "@app/lib/wallet";
 
   import { formatEther } from "@ethersproject/units";
 
-  import * as router from "@app/router";
-  import Button from "@app/Button.svelte";
-  import TextInput from "@app/TextInput.svelte";
+  import * as router from "@app/lib/router";
+  import Button from "@app/components/Button.svelte";
+  import TextInput from "@app/components/TextInput.svelte";
   import {
     calculateTimeLock,
     getMaxWithdrawAmount,
     lastWithdrawalByUser,
-  } from "./lib";
-  import { session } from "@app/session";
-  import { setOpenGraphMetaTag, toWei, capitalize } from "@app/utils";
+  } from "@app/lib/faucet";
+  import { session } from "@app/lib/session";
+  import { setOpenGraphMetaTag, toWei, capitalize } from "@app/lib/utils";
 
   export let wallet: Wallet;
 
diff --git a/src/base/faucet/Routes.svelte b/src/views/faucet/Routes.svelte
similarity index 57%
rename from src/base/faucet/Routes.svelte
rename to src/views/faucet/Routes.svelte
index d83149323..f17fe8cac 100644
--- a/src/base/faucet/Routes.svelte
+++ b/src/views/faucet/Routes.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-  import type { Wallet } from "@app/wallet";
-  import type { FaucetRoute } from "@app/router/definitions";
+  import type { Wallet } from "@app/lib/wallet";
+  import type { FaucetRoute } from "@app/lib/router/definitions";
 
-  import Form from "@app/base/faucet/Form.svelte";
-  import Withdraw from "@app/base/faucet/Withdraw.svelte";
+  import Form from "@app/views/faucet/Form.svelte";
+  import Withdraw from "@app/views/faucet/Withdraw.svelte";
 
   export let activeRoute: FaucetRoute;
   export let wallet: Wallet;
diff --git a/src/base/faucet/Withdraw.svelte b/src/views/faucet/Withdraw.svelte
similarity index 79%
rename from src/base/faucet/Withdraw.svelte
rename to src/views/faucet/Withdraw.svelte
index ab6c45570..fb1ebeb2e 100644
--- a/src/base/faucet/Withdraw.svelte
+++ b/src/views/faucet/Withdraw.svelte
@@ -1,18 +1,18 @@
 <script lang="ts">
-  import type { State } from "@app/utils";
-  import type { Wallet } from "@app/wallet";
+  import type { State } from "@app/lib/utils";
+  import type { Wallet } from "@app/lib/wallet";
 
   import { onMount } from "svelte";
-  import { twemoji } from "@app/utils";
+  import { twemoji } from "@app/lib/utils";
 
-  import * as router from "@app/router";
-  import Button from "@app/Button.svelte";
-  import ErrorModal from "@app/ErrorModal.svelte";
-  import Loading from "@app/Loading.svelte";
-  import Modal from "@app/Modal.svelte";
-  import { Status } from "@app/utils";
-  import { session } from "@app/session";
-  import { withdraw } from "./lib";
+  import * as router from "@app/lib/router";
+  import Button from "@app/components/Button.svelte";
+  import ErrorModal from "@app/components/ErrorModal.svelte";
+  import Loading from "@app/components/Loading.svelte";
+  import Modal from "@app/components/Modal.svelte";
+  import { Status } from "@app/lib/utils";
+  import { session } from "@app/lib/session";
+  import { withdraw } from "@app/lib/faucet";
 
   export let wallet: Wallet;
   export let amount: string | null;
diff --git a/src/base/home/Index.svelte b/src/views/home/Index.svelte
similarity index 85%
rename from src/base/home/Index.svelte
rename to src/views/home/Index.svelte
index 3303c5219..3f2d7157d 100644
--- a/src/base/home/Index.svelte
+++ b/src/views/home/Index.svelte
@@ -1,14 +1,14 @@
 <script lang="ts">
-  import type { Host } from "@app/api";
-  import type { ProjectInfo } from "@app/project";
+  import type { Host } from "@app/lib/api";
+  import type { ProjectInfo } from "@app/lib/project";
 
-  import * as router from "@app/router";
-  import Loading from "@app/Loading.svelte";
-  import Message from "@app/Message.svelte";
-  import Widget from "@app/base/projects/Widget.svelte";
-  import { config } from "@app/config";
-  import { Project } from "@app/project";
-  import { setOpenGraphMetaTag, twemoji } from "@app/utils";
+  import * as router from "@app/lib/router";
+  import Loading from "@app/components/Loading.svelte";
+  import Message from "@app/components/Message.svelte";
+  import Widget from "@app/views/projects/Widget.svelte";
+  import { config } from "@app/lib/config";
+  import { Project } from "@app/lib/project";
+  import { setOpenGraphMetaTag, twemoji } from "@app/lib/utils";
 
   setOpenGraphMetaTag([
     { prop: "og:title", content: "Radicle Interface" },
diff --git a/src/Profile.svelte b/src/views/profiles/Profile.svelte
similarity index 85%
rename from src/Profile.svelte
rename to src/views/profiles/Profile.svelte
index 4cb1e4a0d..32330d12a 100644
--- a/src/Profile.svelte
+++ b/src/views/profiles/Profile.svelte
@@ -1,28 +1,27 @@
 <script lang="ts">
   import type { SvelteComponent } from "svelte";
-  import type { Wallet } from "@app/wallet";
-  import type { Seed, Stats } from "@app/base/seeds/Seed";
-  import type { ProjectInfo } from "@app/project";
-  import * as utils from "@app/utils";
-  import Address from "@app/Address.svelte";
-  import Async from "@app/Async.svelte";
-  import Avatar from "@app/Avatar.svelte";
-  import Badge from "@app/Badge.svelte";
-  import Button from "@app/Button.svelte";
-  import ErrorModal from "@app/ErrorModal.svelte";
-  import Icon from "@app/Icon.svelte";
-  import Link from "@app/router/Link.svelte";
-  import Loading from "@app/Loading.svelte";
-  import NotFound from "@app/NotFound.svelte";
-  import Projects from "@app/base/seeds/View/Projects.svelte";
-  import RadicleUrn from "@app/RadicleUrn.svelte";
-  import SeedAddress from "@app/SeedAddress.svelte";
-  import SetName from "@app/ens/SetName.svelte";
-  import { MissingReverseRecord, NotFoundError } from "@app/error";
-  import { Profile, ProfileType } from "@app/profile";
-  import { User } from "@app/base/users/User";
-  import { defaultLinkPort } from "@app/base/seeds/Seed";
-  import { session } from "@app/session";
+  import type { Wallet } from "@app/lib/wallet";
+  import type { Seed, Stats } from "@app/lib/seed";
+  import type { ProjectInfo } from "@app/lib/project";
+  import * as utils from "@app/lib/utils";
+  import Address from "@app/components/Address.svelte";
+  import Async from "@app/components/Async.svelte";
+  import Avatar from "@app/components/Avatar.svelte";
+  import Badge from "@app/components/Badge.svelte";
+  import Button from "@app/components/Button.svelte";
+  import ErrorModal from "@app/components/ErrorModal.svelte";
+  import Icon from "@app/components/Icon.svelte";
+  import Link from "@app/components/Link.svelte";
+  import Loading from "@app/components/Loading.svelte";
+  import NotFound from "@app/components/NotFound.svelte";
+  import Projects from "@app/views/seeds/View/Projects.svelte";
+  import RadicleUrn from "@app/components/RadicleUrn.svelte";
+  import SeedAddress from "@app/components/SeedAddress.svelte";
+  import SetName from "./SetName.svelte";
+  import { MissingReverseRecord, NotFoundError } from "@app/lib/error";
+  import { User, Profile, ProfileType } from "@app/lib/profile";
+  import { defaultLinkPort } from "@app/lib/seed";
+  import { session } from "@app/lib/session";
 
   export let wallet: Wallet;
   export let addressOrName: string;
diff --git a/src/ens/SetName.svelte b/src/views/profiles/SetName.svelte
similarity index 90%
rename from src/ens/SetName.svelte
rename to src/views/profiles/SetName.svelte
index f3d7026aa..27c947420 100644
--- a/src/ens/SetName.svelte
+++ b/src/views/profiles/SetName.svelte
@@ -1,16 +1,16 @@
 <script lang="ts" strictEvents>
-  import type { Wallet } from "@app/wallet";
-  import type { User } from "@app/base/users/User";
+  import type { Wallet } from "@app/lib/wallet";
+  import type { User } from "@app/lib/profile";
 
   import { createEventDispatcher } from "svelte";
 
-  import * as router from "@app/router";
-  import Button from "@app/Button.svelte";
-  import ErrorModal from "@app/ErrorModal.svelte";
-  import Loading from "@app/Loading.svelte";
-  import Modal from "@app/Modal.svelte";
-  import TextInput from "@app/TextInput.svelte";
-  import { formatAddress, isAddressEqual, twemoji } from "@app/utils";
+  import * as router from "@app/lib/router";
+  import Button from "@app/components/Button.svelte";
+  import ErrorModal from "@app/components/ErrorModal.svelte";
+  import Loading from "@app/components/Loading.svelte";
+  import Modal from "@app/components/Modal.svelte";
+  import TextInput from "@app/components/TextInput.svelte";
+  import { formatAddress, isAddressEqual, twemoji } from "@app/lib/utils";
 
   const dispatch = createEventDispatcher<{ close: never }>();
 
diff --git a/src/base/projects/Blob.svelte b/src/views/projects/Blob.svelte
similarity index 92%
rename from src/base/projects/Blob.svelte
rename to src/views/projects/Blob.svelte
index ee5ff7be5..f460afab0 100644
--- a/src/base/projects/Blob.svelte
+++ b/src/views/projects/Blob.svelte
@@ -1,16 +1,16 @@
 <script lang="ts">
-  import type { MaybeBlob, Blob } from "@app/project";
-  import type { MaybeHighlighted } from "@app/syntax";
-  import type { ProjectRoute } from "@app/router/definitions";
+  import type { MaybeBlob, Blob } from "@app/lib/project";
+  import type { MaybeHighlighted } from "@app/lib/syntax";
+  import type { ProjectRoute } from "@app/lib/router/definitions";
 
-  import HeaderToggleLabel from "@app/base/projects/HeaderToggleLabel.svelte";
-  import Readme from "@app/base/projects/Readme.svelte";
+  import HeaderToggleLabel from "@app/views/projects/HeaderToggleLabel.svelte";
+  import Readme from "@app/views/projects/Readme.svelte";
   import { afterUpdate, beforeUpdate, onMount } from "svelte";
-  import { highlight } from "@app/syntax";
-  import { isMarkdownPath, scrollIntoView, twemoji } from "@app/utils";
-  import { lineNumbersGutter } from "@app/syntax";
+  import { highlight } from "@app/lib/syntax";
+  import { isMarkdownPath, scrollIntoView, twemoji } from "@app/lib/utils";
+  import { lineNumbersGutter } from "@app/lib/syntax";
   import { toHtml } from "hast-util-to-html";
-  import { updateProjectRoute } from "@app/router";
+  import { updateProjectRoute } from "@app/lib/router";
 
   export let activeRoute: ProjectRoute;
   export let blob: Blob;
diff --git a/src/base/projects/BranchSelector.svelte b/src/views/projects/BranchSelector.svelte
similarity index 92%
rename from src/base/projects/BranchSelector.svelte
rename to src/views/projects/BranchSelector.svelte
index e6c0ef9ee..e0a2622f5 100644
--- a/src/base/projects/BranchSelector.svelte
+++ b/src/views/projects/BranchSelector.svelte
@@ -1,10 +1,10 @@
 <script lang="ts" strictEvents>
   import { createEventDispatcher } from "svelte";
-  import type { ProjectInfo, Branches } from "@app/project";
-  import { getOid } from "@app/project";
-  import { formatCommit } from "@app/utils";
-  import Dropdown from "@app/Dropdown.svelte";
-  import Floating from "@app/Floating.svelte";
+  import type { ProjectInfo, Branches } from "@app/lib/project";
+  import { getOid } from "@app/lib/project";
+  import { formatCommit } from "@app/lib/utils";
+  import Dropdown from "@app/components/Dropdown.svelte";
+  import Floating from "@app/components/Floating.svelte";
 
   export let branches: Branches;
   export let project: ProjectInfo;
diff --git a/src/base/projects/Browser.svelte b/src/views/projects/Browser.svelte
similarity index 94%
rename from src/base/projects/Browser.svelte
rename to src/views/projects/Browser.svelte
index 97ee02be2..28506bb3b 100644
--- a/src/base/projects/Browser.svelte
+++ b/src/views/projects/Browser.svelte
@@ -7,14 +7,14 @@
 </script>
 
 <script lang="ts">
-  import type * as proj from "@app/project";
-  import type { ProjectRoute } from "@app/router/definitions";
+  import type * as proj from "@app/lib/project";
+  import type { ProjectRoute } from "@app/lib/router/definitions";
 
-  import * as router from "@app/router";
-  import * as utils from "@app/utils";
-  import Button from "@app/Button.svelte";
-  import Loading from "@app/Loading.svelte";
-  import Placeholder from "@app/Placeholder.svelte";
+  import * as router from "@app/lib/router";
+  import * as utils from "@app/lib/utils";
+  import Button from "@app/components/Button.svelte";
+  import Loading from "@app/components/Loading.svelte";
+  import Placeholder from "@app/components/Placeholder.svelte";
   import { onMount } from "svelte";
 
   import Tree from "./Tree.svelte";
diff --git a/src/base/projects/CloneButton.svelte b/src/views/projects/CloneButton.svelte
similarity index 93%
rename from src/base/projects/CloneButton.svelte
rename to src/views/projects/CloneButton.svelte
index 159b67090..c8ccfeb43 100644
--- a/src/base/projects/CloneButton.svelte
+++ b/src/views/projects/CloneButton.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-  import * as utils from "@app/utils";
-  import Clipboard from "@app/Clipboard.svelte";
-  import Floating from "@app/Floating.svelte";
-  import { closeFocused } from "@app/Floating.svelte";
+  import * as utils from "@app/lib/utils";
+  import Clipboard from "@app/components/Clipboard.svelte";
+  import Floating from "@app/components/Floating.svelte";
+  import { closeFocused } from "@app/components/Floating.svelte";
 
   export let seedHost: string;
   export let urn: string;
diff --git a/src/base/projects/Commit.svelte b/src/views/projects/Commit.svelte
similarity index 79%
rename from src/base/projects/Commit.svelte
rename to src/views/projects/Commit.svelte
index 7110059f7..870b04802 100644
--- a/src/base/projects/Commit.svelte
+++ b/src/views/projects/Commit.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
-  import type { Commit } from "@app/commit";
+  import type { Commit } from "@app/lib/commit";
 
-  import { formatCommit, twemoji } from "@app/utils";
+  import { formatCommit, twemoji } from "@app/lib/utils";
 
-  import Changeset from "@app/base/projects/SourceBrowser/Changeset.svelte";
-  import CommitAuthorship from "@app/base/projects/Commit/CommitAuthorship.svelte";
-  import CommitVerifiedBadge from "@app/base/projects/Commit/CommitVerifiedBadge.svelte";
-  import * as router from "@app/router";
+  import Changeset from "@app/views/projects/SourceBrowser/Changeset.svelte";
+  import CommitAuthorship from "@app/views/projects/Commit/CommitAuthorship.svelte";
+  import CommitVerifiedBadge from "@app/views/projects/Commit/CommitVerifiedBadge.svelte";
+  import * as router from "@app/lib/router";
 
   export let commit: Commit;
 
diff --git a/src/base/projects/Commit/CommitAuthorship.svelte b/src/views/projects/Commit/CommitAuthorship.svelte
similarity index 93%
rename from src/base/projects/Commit/CommitAuthorship.svelte
rename to src/views/projects/Commit/CommitAuthorship.svelte
index 170cb07da..a2d5744fe 100644
--- a/src/base/projects/Commit/CommitAuthorship.svelte
+++ b/src/views/projects/Commit/CommitAuthorship.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-  import type { CommitMetadata } from "@app/commit";
+  import type { CommitMetadata } from "@app/lib/commit";
 
-  import Badge from "@app/Badge.svelte";
-  import { formatTimestamp, gravatarURL } from "@app/utils";
+  import Badge from "@app/components/Badge.svelte";
+  import { formatTimestamp, gravatarURL } from "@app/lib/utils";
 
   export let commit: CommitMetadata;
   export let noTime = false;
diff --git a/src/base/projects/Commit/CommitTeaser.svelte b/src/views/projects/Commit/CommitTeaser.svelte
similarity index 93%
rename from src/base/projects/Commit/CommitTeaser.svelte
rename to src/views/projects/Commit/CommitTeaser.svelte
index 9c5542d4e..6ef01ae51 100644
--- a/src/base/projects/Commit/CommitTeaser.svelte
+++ b/src/views/projects/Commit/CommitTeaser.svelte
@@ -1,9 +1,9 @@
 <script lang="ts" strictEvents>
-  import type { CommitMetadata } from "@app/commit";
-  import { formatCommit, twemoji } from "@app/utils";
+  import type { CommitMetadata } from "@app/lib/commit";
+  import { formatCommit, twemoji } from "@app/lib/utils";
   import { createEventDispatcher } from "svelte";
 
-  import Icon from "@app/Icon.svelte";
+  import Icon from "@app/components/Icon.svelte";
   import CommitAuthorship from "./CommitAuthorship.svelte";
   import CommitVerifiedBadge from "./CommitVerifiedBadge.svelte";
 
diff --git a/src/base/projects/Commit/CommitVerifiedBadge.svelte b/src/views/projects/Commit/CommitVerifiedBadge.svelte
similarity index 94%
rename from src/base/projects/Commit/CommitVerifiedBadge.svelte
rename to src/views/projects/Commit/CommitVerifiedBadge.svelte
index 0f0f08042..f1d5e4b35 100644
--- a/src/base/projects/Commit/CommitVerifiedBadge.svelte
+++ b/src/views/projects/Commit/CommitVerifiedBadge.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-  import type { CommitMetadata } from "@app/commit";
+  import type { CommitMetadata } from "@app/lib/commit";
 
   import debounce from "lodash/debounce";
 
-  import Badge from "@app/Badge.svelte";
+  import Badge from "@app/components/Badge.svelte";
   import CommitAuthorship from "./CommitAuthorship.svelte";
 
   export let commit: CommitMetadata;
diff --git a/src/Diagram.svelte b/src/views/projects/Diagram.svelte
similarity index 98%
rename from src/Diagram.svelte
rename to src/views/projects/Diagram.svelte
index 9b045e11c..33dac3448 100644
--- a/src/Diagram.svelte
+++ b/src/views/projects/Diagram.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { onMount } from "svelte";
-  import type { WeeklyActivity } from "./commit";
+  import type { WeeklyActivity } from "@app/lib/commit";
 
   export let strokeWidth: number;
   export let points: WeeklyActivity[];
diff --git a/src/base/projects/Header.svelte b/src/views/projects/Header.svelte
similarity index 85%
rename from src/base/projects/Header.svelte
rename to src/views/projects/Header.svelte
index b7e4b66b0..61579c083 100644
--- a/src/base/projects/Header.svelte
+++ b/src/views/projects/Header.svelte
@@ -1,14 +1,14 @@
 <script lang="ts">
-  import type { Project } from "@app/project";
-  import type { Tree } from "@app/project";
-  import type { ProjectRoute } from "@app/router/definitions";
+  import type { Project } from "@app/lib/project";
+  import type { Tree } from "@app/lib/project";
+  import type { ProjectRoute } from "@app/lib/router/definitions";
 
-  import * as router from "@app/router";
-  import BranchSelector from "@app/base/projects/BranchSelector.svelte";
-  import CloneButton from "@app/base/projects/CloneButton.svelte";
-  import PeerSelector from "@app/base/projects/PeerSelector.svelte";
-  import { closeFocused } from "@app/Floating.svelte";
-  import HeaderToggleLabel from "@app/base/projects/HeaderToggleLabel.svelte";
+  import * as router from "@app/lib/router";
+  import BranchSelector from "@app/views/projects/BranchSelector.svelte";
+  import CloneButton from "@app/views/projects/CloneButton.svelte";
+  import PeerSelector from "@app/views/projects/PeerSelector.svelte";
+  import { closeFocused } from "@app/components/Floating.svelte";
+  import HeaderToggleLabel from "@app/views/projects/HeaderToggleLabel.svelte";
 
   export let activeRoute: ProjectRoute;
   export let project: Project;
diff --git a/src/base/projects/HeaderToggleLabel.svelte b/src/views/projects/HeaderToggleLabel.svelte
similarity index 100%
rename from src/base/projects/HeaderToggleLabel.svelte
rename to src/views/projects/HeaderToggleLabel.svelte
diff --git a/src/base/projects/History.svelte b/src/views/projects/History.svelte
similarity index 90%
rename from src/base/projects/History.svelte
rename to src/views/projects/History.svelte
index 445ae7053..fd75899e4 100644
--- a/src/base/projects/History.svelte
+++ b/src/views/projects/History.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
-  import type { CommitMetadata, CommitsHistory } from "@app/commit";
+  import type { CommitMetadata, CommitsHistory } from "@app/lib/commit";
 
   import CommitTeaser from "./Commit/CommitTeaser.svelte";
-  import { Project } from "@app/project";
-  import { groupCommits } from "@app/commit";
-  import List from "@app/List.svelte";
-  import * as router from "@app/router";
+  import { Project } from "@app/lib/project";
+  import { groupCommits } from "@app/lib/commit";
+  import List from "@app/components/List.svelte";
+  import * as router from "@app/lib/router";
 
   export let project: Project;
   export let history: CommitsHistory;
diff --git a/src/base/projects/Issue.svelte b/src/views/projects/Issue.svelte
similarity index 91%
rename from src/base/projects/Issue.svelte
rename to src/views/projects/Issue.svelte
index dff409f42..21fca59b8 100644
--- a/src/base/projects/Issue.svelte
+++ b/src/views/projects/Issue.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
-  import type { Wallet } from "@app/wallet";
-  import type { Blob, Project } from "@app/project";
-  import { canonicalize, capitalize } from "@app/utils";
-  import { formatObjectId } from "@app/cobs";
-  import Comment from "@app/Comment.svelte";
-  import type { Issue } from "@app/issue";
-  import Authorship from "@app/Authorship.svelte";
+  import type { Wallet } from "@app/lib/wallet";
+  import type { Blob, Project } from "@app/lib/project";
+  import { canonicalize, capitalize } from "@app/lib/utils";
+  import { formatObjectId } from "@app/lib/cobs";
+  import Comment from "@app/components/Comment.svelte";
+  import type { Issue } from "@app/lib/issue";
+  import Authorship from "@app/components/Authorship.svelte";
 
   export let issue: Issue;
   export let project: Project;
diff --git a/src/base/projects/Issue/IssueTeaser.svelte b/src/views/projects/Issue/IssueTeaser.svelte
similarity index 89%
rename from src/base/projects/Issue/IssueTeaser.svelte
rename to src/views/projects/Issue/IssueTeaser.svelte
index b8dc07964..5f51bc7ee 100644
--- a/src/base/projects/Issue/IssueTeaser.svelte
+++ b/src/views/projects/Issue/IssueTeaser.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
-  import type { Issue } from "@app/issue";
-  import type { Wallet } from "@app/wallet";
+  import type { Issue } from "@app/lib/issue";
+  import type { Wallet } from "@app/lib/wallet";
 
-  import { Profile, ProfileType } from "@app/profile";
-  import { formatObjectId } from "@app/cobs";
+  import { Profile, ProfileType } from "@app/lib/profile";
+  import { formatObjectId } from "@app/lib/cobs";
   import { onMount } from "svelte";
-  import { twemoji } from "@app/utils";
+  import { twemoji } from "@app/lib/utils";
 
-  import Authorship from "@app/Authorship.svelte";
+  import Authorship from "@app/components/Authorship.svelte";
 
   export let issue: Issue;
   export let wallet: Wallet;
diff --git a/src/base/projects/Issues.svelte b/src/views/projects/Issues.svelte
similarity index 78%
rename from src/base/projects/Issues.svelte
rename to src/views/projects/Issues.svelte
index ddd2042e9..4dfc7f7d7 100644
--- a/src/base/projects/Issues.svelte
+++ b/src/views/projects/Issues.svelte
@@ -3,17 +3,17 @@
 </script>
 
 <script lang="ts">
-  import type { Wallet } from "@app/wallet";
-  import type { Issue } from "@app/issue";
-  import type { ToggleButtonOption } from "@app/ToggleButton.svelte";
+  import type { Wallet } from "@app/lib/wallet";
+  import type { Issue } from "@app/lib/issue";
+  import type { ToggleButtonOption } from "@app/components/ToggleButton.svelte";
 
-  import { capitalize } from "@app/utils";
-  import { groupIssues } from "@app/issue";
-  import * as router from "@app/router";
+  import { capitalize } from "@app/lib/utils";
+  import { groupIssues } from "@app/lib/issue";
+  import * as router from "@app/lib/router";
 
-  import IssueTeaser from "@app/base/projects/Issue/IssueTeaser.svelte";
-  import Placeholder from "@app/Placeholder.svelte";
-  import ToggleButton from "@app/ToggleButton.svelte";
+  import IssueTeaser from "@app/views/projects/Issue/IssueTeaser.svelte";
+  import Placeholder from "@app/components/Placeholder.svelte";
+  import ToggleButton from "@app/components/ToggleButton.svelte";
 
   export let wallet: Wallet;
   export let issues: Issue[];
diff --git a/src/base/projects/Patch.svelte b/src/views/projects/Patch.svelte
similarity index 89%
rename from src/base/projects/Patch.svelte
rename to src/views/projects/Patch.svelte
index 5fe460017..7b960916d 100644
--- a/src/base/projects/Patch.svelte
+++ b/src/views/projects/Patch.svelte
@@ -1,18 +1,18 @@
 <script lang="ts">
-  import type { Wallet } from "@app/wallet";
-  import type { Project } from "@app/project";
+  import type { Wallet } from "@app/lib/wallet";
+  import type { Project } from "@app/lib/project";
 
-  import { capitalize } from "@app/utils";
-  import { Patch, PatchTab } from "@app/patch";
-  import { formatObjectId } from "@app/cobs";
-  import Authorship from "@app/Authorship.svelte";
+  import { capitalize } from "@app/lib/utils";
+  import { Patch, PatchTab } from "@app/lib/patch";
+  import { formatObjectId } from "@app/lib/cobs";
+  import Authorship from "@app/components/Authorship.svelte";
 
   import Changeset from "./SourceBrowser/Changeset.svelte";
   import PatchSideBar from "./Patch/PatchSideBar.svelte";
   import PatchTabBar from "./Patch/PatchTabBar.svelte";
   import PatchTimeline from "./Patch/PatchTimeline.svelte";
-  import Placeholder from "@app/Placeholder.svelte";
-  import * as router from "@app/router";
+  import Placeholder from "@app/components/Placeholder.svelte";
+  import * as router from "@app/lib/router";
 
   export let patch: Patch;
   export let project: Project;
diff --git a/src/base/projects/Patch/PatchSideBar.svelte b/src/views/projects/Patch/PatchSideBar.svelte
similarity index 96%
rename from src/base/projects/Patch/PatchSideBar.svelte
rename to src/views/projects/Patch/PatchSideBar.svelte
index 474b11f2e..9e9ded115 100644
--- a/src/base/projects/Patch/PatchSideBar.svelte
+++ b/src/views/projects/Patch/PatchSideBar.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { Patch } from "@app/patch";
+  import type { Patch } from "@app/lib/patch";
 
   export let patch: Patch;
 </script>
diff --git a/src/base/projects/Patch/PatchTabBar.svelte b/src/views/projects/Patch/PatchTabBar.svelte
similarity index 83%
rename from src/base/projects/Patch/PatchTabBar.svelte
rename to src/views/projects/Patch/PatchTabBar.svelte
index 7bbc60592..0a02c27f3 100644
--- a/src/base/projects/Patch/PatchTabBar.svelte
+++ b/src/views/projects/Patch/PatchTabBar.svelte
@@ -1,13 +1,13 @@
 <script lang="ts" strictEvents>
-  import type { ToggleButtonOption } from "@app/ToggleButton.svelte";
+  import type { ToggleButtonOption } from "@app/components/ToggleButton.svelte";
 
-  import Dropdown from "@app/Dropdown.svelte";
-  import Floating, { closeFocused } from "@app/Floating.svelte";
-  import ToggleButton from "@app/ToggleButton.svelte";
+  import Dropdown from "@app/components/Dropdown.svelte";
+  import Floating, { closeFocused } from "@app/components/Floating.svelte";
+  import ToggleButton from "@app/components/ToggleButton.svelte";
 
-  import type { Revision } from "@app/patch";
-  import { PatchTab } from "@app/patch";
-  import { formatCommit, formatTimestamp } from "@app/utils";
+  import type { Revision } from "@app/lib/patch";
+  import { PatchTab } from "@app/lib/patch";
+  import { formatCommit, formatTimestamp } from "@app/lib/utils";
   import { createEventDispatcher } from "svelte";
 
   export let revisions: Revision[];
diff --git a/src/base/projects/Patch/PatchTeaser.svelte b/src/views/projects/Patch/PatchTeaser.svelte
similarity index 89%
rename from src/base/projects/Patch/PatchTeaser.svelte
rename to src/views/projects/Patch/PatchTeaser.svelte
index 23f151b98..dc2bf2292 100644
--- a/src/base/projects/Patch/PatchTeaser.svelte
+++ b/src/views/projects/Patch/PatchTeaser.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
-  import type { Patch } from "@app/patch";
-  import type { Wallet } from "@app/wallet";
+  import type { Patch } from "@app/lib/patch";
+  import type { Wallet } from "@app/lib/wallet";
 
-  import { Profile, ProfileType } from "@app/profile";
-  import { formatObjectId } from "@app/cobs";
+  import { Profile, ProfileType } from "@app/lib/profile";
+  import { formatObjectId } from "@app/lib/cobs";
   import { onMount } from "svelte";
-  import { twemoji } from "@app/utils";
+  import { twemoji } from "@app/lib/utils";
 
-  import Authorship from "@app/Authorship.svelte";
+  import Authorship from "@app/components/Authorship.svelte";
 
   export let patch: Patch;
   export let wallet: Wallet;
diff --git a/src/base/projects/Patch/PatchTimeline.svelte b/src/views/projects/Patch/PatchTimeline.svelte
similarity index 83%
rename from src/base/projects/Patch/PatchTimeline.svelte
rename to src/views/projects/Patch/PatchTimeline.svelte
index 158a1da54..272d5cee9 100644
--- a/src/base/projects/Patch/PatchTimeline.svelte
+++ b/src/views/projects/Patch/PatchTimeline.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
-  import type { Wallet } from "@app/wallet";
-  import { type Patch, TimelineType } from "@app/patch";
-  import { formatSeedId } from "@app/utils";
-  import { canonicalize } from "@app/utils";
-  import Comment from "@app/Comment.svelte";
-  import type { Blob, Project } from "@app/project";
-  import Authorship from "@app/Authorship.svelte";
-  import Review from "@app/Review.svelte";
+  import type { Wallet } from "@app/lib/wallet";
+  import { type Patch, TimelineType } from "@app/lib/patch";
+  import { formatSeedId } from "@app/lib/utils";
+  import { canonicalize } from "@app/lib/utils";
+  import Comment from "@app/components/Comment.svelte";
+  import type { Blob, Project } from "@app/lib/project";
+  import Authorship from "@app/components/Authorship.svelte";
+  import Review from "@app/views/projects/Patch/Review.svelte";
 
   export let patch: Patch;
   export let revisionNumber: number;
diff --git a/src/Review.svelte b/src/views/projects/Patch/Review.svelte
similarity index 68%
rename from src/Review.svelte
rename to src/views/projects/Patch/Review.svelte
index 70c81e5e0..49f44440c 100644
--- a/src/Review.svelte
+++ b/src/views/projects/Patch/Review.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
   import { onMount } from "svelte";
-  import type { Wallet } from "@app/wallet";
-  import type { Review } from "@app/patch";
-  import { formatVerdict } from "@app/patch";
-  import type { Blob } from "@app/project";
-  import { Profile, ProfileType } from "@app/profile";
-  import Authorship from "@app/Authorship.svelte";
+  import type { Wallet } from "@app/lib/wallet";
+  import type { Review } from "@app/lib/patch";
+  import { formatVerdict } from "@app/lib/patch";
+  import type { Blob } from "@app/lib/project";
+  import { Profile, ProfileType } from "@app/lib/profile";
+  import Authorship from "@app/components/Authorship.svelte";
 
-  import Comment from "@app/Comment.svelte";
+  import Comment from "@app/components/Comment.svelte";
 
   export let review: Review;
   export let wallet: Wallet;
diff --git a/src/base/projects/Patches.svelte b/src/views/projects/Patches.svelte
similarity index 81%
rename from src/base/projects/Patches.svelte
rename to src/views/projects/Patches.svelte
index f7a5f2d22..a9c20eac7 100644
--- a/src/base/projects/Patches.svelte
+++ b/src/views/projects/Patches.svelte
@@ -3,17 +3,17 @@
 </script>
 
 <script lang="ts">
-  import type { Wallet } from "@app/wallet";
-  import type { Patch } from "@app/patch";
-  import type { ToggleButtonOption } from "@app/ToggleButton.svelte";
+  import type { Wallet } from "@app/lib/wallet";
+  import type { Patch } from "@app/lib/patch";
+  import type { ToggleButtonOption } from "@app/components/ToggleButton.svelte";
 
   import PatchTeaser from "./Patch/PatchTeaser.svelte";
-  import Placeholder from "@app/Placeholder.svelte";
-  import ToggleButton from "@app/ToggleButton.svelte";
+  import Placeholder from "@app/components/Placeholder.svelte";
+  import ToggleButton from "@app/components/ToggleButton.svelte";
 
-  import { capitalize } from "@app/utils";
-  import { groupPatches } from "@app/patch";
-  import * as router from "@app/router";
+  import { capitalize } from "@app/lib/utils";
+  import { groupPatches } from "@app/lib/patch";
+  import * as router from "@app/lib/router";
 
   export let state: State;
   export let wallet: Wallet;
diff --git a/src/base/projects/PeerSelector.svelte b/src/views/projects/PeerSelector.svelte
similarity index 89%
rename from src/base/projects/PeerSelector.svelte
rename to src/views/projects/PeerSelector.svelte
index 64118fc36..6d6cbb5cd 100644
--- a/src/base/projects/PeerSelector.svelte
+++ b/src/views/projects/PeerSelector.svelte
@@ -1,11 +1,11 @@
 <script lang="ts" strictEvents>
   import { createEventDispatcher, onMount } from "svelte";
-  import Icon from "@app/Icon.svelte";
-  import Dropdown from "@app/Dropdown.svelte";
-  import { formatSeedId } from "@app/utils";
-  import type { Peer } from "@app/project";
-  import Floating from "@app/Floating.svelte";
-  import Badge from "@app/Badge.svelte";
+  import Icon from "@app/components/Icon.svelte";
+  import Dropdown from "@app/components/Dropdown.svelte";
+  import { formatSeedId } from "@app/lib/utils";
+  import type { Peer } from "@app/lib/project";
+  import Floating from "@app/components/Floating.svelte";
+  import Badge from "@app/components/Badge.svelte";
 
   export let peer: string | null = null;
   export let peers: Peer[];
diff --git a/src/base/projects/ProjectMeta.svelte b/src/views/projects/ProjectMeta.svelte
similarity index 88%
rename from src/base/projects/ProjectMeta.svelte
rename to src/views/projects/ProjectMeta.svelte
index a1757e115..fdb1d9576 100644
--- a/src/base/projects/ProjectMeta.svelte
+++ b/src/views/projects/ProjectMeta.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
-  import type { PeerId, Project } from "@app/project";
+  import type { PeerId, Project } from "@app/lib/project";
 
-  import Avatar from "@app/Avatar.svelte";
-  import Clipboard from "@app/Clipboard.svelte";
-  import Link from "@app/router/Link.svelte";
-  import ProjectLink from "@app/router/ProjectLink.svelte";
-  import { formatSeedId } from "@app/utils";
+  import Avatar from "@app/components/Avatar.svelte";
+  import Clipboard from "@app/components/Clipboard.svelte";
+  import Link from "@app/components/Link.svelte";
+  import ProjectLink from "@app/components/ProjectLink.svelte";
+  import { formatSeedId } from "@app/lib/utils";
 
   export let project: Project;
   export let peer: PeerId | null = null;
diff --git a/src/base/projects/Readme.svelte b/src/views/projects/Readme.svelte
similarity index 74%
rename from src/base/projects/Readme.svelte
rename to src/views/projects/Readme.svelte
index 2c0ba57b6..06896d447 100644
--- a/src/base/projects/Readme.svelte
+++ b/src/views/projects/Readme.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-  import type * as proj from "@app/project";
-  import type { ProjectRoute } from "@app/router/definitions";
+  import type * as proj from "@app/lib/project";
+  import type { ProjectRoute } from "@app/lib/router/definitions";
 
-  import Markdown from "@app/Markdown.svelte";
+  import Markdown from "@app/components/Markdown.svelte";
 
   export let content: string;
   export let getImage: (path: string) => Promise<proj.MaybeBlob>;
diff --git a/src/base/projects/SourceBrowser/Changeset.svelte b/src/views/projects/SourceBrowser/Changeset.svelte
similarity index 87%
rename from src/base/projects/SourceBrowser/Changeset.svelte
rename to src/views/projects/SourceBrowser/Changeset.svelte
index 884d7068a..7d3f30870 100644
--- a/src/base/projects/SourceBrowser/Changeset.svelte
+++ b/src/views/projects/SourceBrowser/Changeset.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-  import type { DiffStats } from "@app/commit";
-  import type { Diff } from "@app/diff";
-  import FileDiff from "@app/base/projects/SourceBrowser/FileDiff.svelte";
+  import type { DiffStats } from "@app/lib/commit";
+  import type { Diff } from "@app/lib/diff";
+  import FileDiff from "@app/views/projects/SourceBrowser/FileDiff.svelte";
 
   export let diff: Diff;
   export let stats: DiffStats;
diff --git a/src/base/projects/SourceBrowser/FileDiff.svelte b/src/views/projects/SourceBrowser/FileDiff.svelte
similarity index 95%
rename from src/base/projects/SourceBrowser/FileDiff.svelte
rename to src/views/projects/SourceBrowser/FileDiff.svelte
index e106d17b0..6050f54a9 100644
--- a/src/base/projects/SourceBrowser/FileDiff.svelte
+++ b/src/views/projects/SourceBrowser/FileDiff.svelte
@@ -1,9 +1,9 @@
 <script lang="ts" strictEvents>
   import { createEventDispatcher } from "svelte";
-  import Icon from "@app/Icon.svelte";
-  import { lineNumberL, lineNumberR, lineSign } from "@app/diff";
-  import type { FileDiff } from "@app/diff";
-  import Badge from "@app/Badge.svelte";
+  import Icon from "@app/components/Icon.svelte";
+  import { lineNumberL, lineNumberR, lineSign } from "@app/lib/diff";
+  import type { FileDiff } from "@app/lib/diff";
+  import Badge from "@app/components/Badge.svelte";
 
   const dispatch = createEventDispatcher<{ browse: string }>();
 
diff --git a/src/base/projects/Tree.svelte b/src/views/projects/Tree.svelte
similarity index 89%
rename from src/base/projects/Tree.svelte
rename to src/views/projects/Tree.svelte
index f7642851d..1f86d6c42 100644
--- a/src/base/projects/Tree.svelte
+++ b/src/views/projects/Tree.svelte
@@ -1,8 +1,9 @@
 <script lang="ts" strictEvents>
+  import type { MaybeTree, Tree } from "@app/lib/project";
+
   import { createEventDispatcher } from "svelte";
 
-  import type { MaybeTree, Tree } from "@app/project";
-  import { ObjectType } from "@app/project";
+  import { ObjectType } from "@app/lib/project";
 
   import File from "./Tree/File.svelte";
   import Folder from "./Tree/Folder.svelte";
diff --git a/src/base/projects/Tree/File.svelte b/src/views/projects/Tree/File.svelte
similarity index 95%
rename from src/base/projects/Tree/File.svelte
rename to src/views/projects/Tree/File.svelte
index 504a07675..d91f703f9 100644
--- a/src/base/projects/Tree/File.svelte
+++ b/src/views/projects/Tree/File.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Loading from "@app/Loading.svelte";
+  import Loading from "@app/components/Loading.svelte";
 
   export let active: boolean;
   export let loading: boolean;
diff --git a/src/base/projects/Tree/Folder.svelte b/src/views/projects/Tree/Folder.svelte
similarity index 93%
rename from src/base/projects/Tree/Folder.svelte
rename to src/views/projects/Tree/Folder.svelte
index 15190be6e..e13889437 100644
--- a/src/base/projects/Tree/Folder.svelte
+++ b/src/views/projects/Tree/Folder.svelte
@@ -1,8 +1,8 @@
 <script lang="ts" strictEvents>
-  import type { MaybeTree } from "@app/project";
+  import type { MaybeTree } from "@app/lib/project";
 
-  import Loading from "@app/Loading.svelte";
-  import { ObjectType } from "@app/project";
+  import Loading from "@app/components/Loading.svelte";
+  import { ObjectType } from "@app/lib/project";
   import { createEventDispatcher } from "svelte";
 
   import File from "./File.svelte";
diff --git a/src/base/projects/View.svelte b/src/views/projects/View.svelte
similarity index 91%
rename from src/base/projects/View.svelte
rename to src/views/projects/View.svelte
index 8ad197d29..ba73884a8 100644
--- a/src/base/projects/View.svelte
+++ b/src/views/projects/View.svelte
@@ -1,16 +1,16 @@
 <script lang="ts">
-  import type { Wallet } from "@app/wallet";
-  import type { ProjectRoute } from "@app/router/definitions";
+  import type { Wallet } from "@app/lib/wallet";
+  import type { ProjectRoute } from "@app/lib/router/definitions";
   import type { State as IssueState } from "./Issues.svelte";
   import type { State as PatchState } from "./Patches.svelte";
 
-  import * as issue from "@app/issue";
-  import * as patch from "@app/patch";
-  import * as proj from "@app/project";
-  import * as router from "@app/router";
-  import Loading from "@app/Loading.svelte";
-  import NotFound from "@app/NotFound.svelte";
-  import { formatSeedId, unreachable } from "@app/utils";
+  import * as issue from "@app/lib/issue";
+  import * as patch from "@app/lib/patch";
+  import * as proj from "@app/lib/project";
+  import * as router from "@app/lib/router";
+  import Loading from "@app/components/Loading.svelte";
+  import NotFound from "@app/components/NotFound.svelte";
+  import { formatSeedId, unreachable } from "@app/lib/utils";
 
   import Header from "./Header.svelte";
   import Browser from "./Browser.svelte";
@@ -21,8 +21,8 @@
   import Patches from "./Patches.svelte";
   import Patch from "./Patch.svelte";
   import ProjectMeta from "./ProjectMeta.svelte";
-  import Message from "@app/Message.svelte";
-  import Placeholder from "@app/Placeholder.svelte";
+  import Message from "@app/components/Message.svelte";
+  import Placeholder from "@app/components/Placeholder.svelte";
 
   export let wallet: Wallet;
   export let activeRoute: ProjectRoute;
diff --git a/src/base/projects/Widget.svelte b/src/views/projects/Widget.svelte
similarity index 92%
rename from src/base/projects/Widget.svelte
rename to src/views/projects/Widget.svelte
index 4f671a5c1..816d566dd 100644
--- a/src/base/projects/Widget.svelte
+++ b/src/views/projects/Widget.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-  import type * as proj from "@app/project";
-  import Diagram from "@app/Diagram.svelte";
-  import { groupCommitsByWeek } from "@app/commit";
-  import type { Host } from "@app/api";
-  import { Project } from "@app/project";
-  import { formatCommit } from "@app/utils";
+  import type * as proj from "@app/lib/project";
+  import Diagram from "@app/views/projects/Diagram.svelte";
+  import { groupCommitsByWeek } from "@app/lib/commit";
+  import type { Host } from "@app/lib/api";
+  import { Project } from "@app/lib/project";
+  import { formatCommit } from "@app/lib/utils";
 
   export let project: proj.ProjectInfo;
   export let seed: { api: Host };
diff --git a/src/BlockTimer.svelte b/src/views/registrations/BlockTimer.svelte
similarity index 100%
rename from src/BlockTimer.svelte
rename to src/views/registrations/BlockTimer.svelte
diff --git a/src/base/registrations/Index.svelte b/src/views/registrations/Index.svelte
similarity index 92%
rename from src/base/registrations/Index.svelte
rename to src/views/registrations/Index.svelte
index 0b7d3ec02..88064aad2 100644
--- a/src/base/registrations/Index.svelte
+++ b/src/views/registrations/Index.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-  import type { Wallet } from "@app/wallet";
+  import type { Wallet } from "@app/lib/wallet";
 
-  import * as router from "@app/router";
+  import * as router from "@app/lib/router";
 
-  import Button from "@app/Button.svelte";
-  import TextInput from "@app/TextInput.svelte";
+  import Button from "@app/components/Button.svelte";
+  import TextInput from "@app/components/TextInput.svelte";
 
   export let wallet: Wallet;
 
diff --git a/src/base/registrations/New.svelte b/src/views/registrations/New.svelte
similarity index 84%
rename from src/base/registrations/New.svelte
rename to src/views/registrations/New.svelte
index af2fb8a22..1ae2a573e 100644
--- a/src/base/registrations/New.svelte
+++ b/src/views/registrations/New.svelte
@@ -1,17 +1,17 @@
 <script lang="ts">
-  import type { Wallet } from "@app/wallet";
+  import type { Wallet } from "@app/lib/wallet";
 
   import { onMount } from "svelte";
 
-  import * as router from "@app/router";
-  import Button from "@app/Button.svelte";
-  import Connect from "@app/Connect.svelte";
-  import Loading from "@app/Loading.svelte";
-  import Message from "@app/Message.svelte";
-  import Modal from "@app/Modal.svelte";
-  import { formatAddress, twemoji } from "@app/utils";
-  import { registrar } from "./registrar";
-  import { session } from "@app/session";
+  import * as router from "@app/lib/router";
+  import Button from "@app/components/Button.svelte";
+  import Connect from "@app/components/Connect.svelte";
+  import Loading from "@app/components/Loading.svelte";
+  import Message from "@app/components/Message.svelte";
+  import Modal from "@app/components/Modal.svelte";
+  import { formatAddress, twemoji } from "@app/lib/utils";
+  import { registrar } from "@app/lib/registrar";
+  import { session } from "@app/lib/session";
 
   enum State {
     CheckingAvailability,
diff --git a/src/base/registrations/Routes.svelte b/src/views/registrations/Routes.svelte
similarity index 66%
rename from src/base/registrations/Routes.svelte
rename to src/views/registrations/Routes.svelte
index 09797913e..5dde3edf4 100644
--- a/src/base/registrations/Routes.svelte
+++ b/src/views/registrations/Routes.svelte
@@ -1,16 +1,16 @@
 <script lang="ts">
-  import type { RegistrationRoute } from "@app/router/definitions";
-  import type { Session } from "@app/session";
-  import { unreachable } from "@app/utils";
-  import type { Wallet } from "@app/wallet";
+  import type { RegistrationRoute } from "@app/lib/router/definitions";
+  import type { Session } from "@app/lib/session";
+  import { unreachable } from "@app/lib/utils";
+  import type { Wallet } from "@app/lib/wallet";
 
-  import * as router from "@app/router";
+  import * as router from "@app/lib/router";
 
-  import New from "@app/base/registrations/New.svelte";
-  import Submit from "@app/base/registrations/Submit.svelte";
-  import Index from "@app/base/registrations/Index.svelte";
-  import View from "@app/base/registrations/View.svelte";
-  import ErrorModal from "@app/ErrorModal.svelte";
+  import New from "@app/views/registrations/New.svelte";
+  import Submit from "@app/views/registrations/Submit.svelte";
+  import Index from "@app/views/registrations/Index.svelte";
+  import View from "@app/views/registrations/View.svelte";
+  import ErrorModal from "@app/components/ErrorModal.svelte";
 
   export let wallet: Wallet;
   export let activeRoute: RegistrationRoute;
diff --git a/src/base/registrations/Submit.svelte b/src/views/registrations/Submit.svelte
similarity index 85%
rename from src/base/registrations/Submit.svelte
rename to src/views/registrations/Submit.svelte
index 20c3486d2..804f88b32 100644
--- a/src/base/registrations/Submit.svelte
+++ b/src/views/registrations/Submit.svelte
@@ -1,21 +1,17 @@
 <script lang="ts">
-  import type { Session } from "@app/session";
-  import type { Wallet } from "@app/wallet";
+  import type { Session } from "@app/lib/session";
+  import type { Wallet } from "@app/lib/wallet";
 
   import { onMount } from "svelte";
 
-  import * as router from "@app/router";
-  import BlockTimer from "@app/BlockTimer.svelte";
-  import Button from "@app/Button.svelte";
-  import ErrorModal from "@app/ErrorModal.svelte";
-  import Loading from "@app/Loading.svelte";
-  import Modal from "@app/Modal.svelte";
-  import {
-    registerName,
-    State,
-    state,
-  } from "@app/base/registrations/registrar";
-  import { twemoji } from "@app/utils";
+  import * as router from "@app/lib/router";
+  import BlockTimer from "@app/views/registrations/BlockTimer.svelte";
+  import Button from "@app/components/Button.svelte";
+  import ErrorModal from "@app/components/ErrorModal.svelte";
+  import Loading from "@app/components/Loading.svelte";
+  import Modal from "@app/components/Modal.svelte";
+  import { registerName, State, state } from "@app/lib/registrar";
+  import { twemoji } from "@app/lib/utils";
 
   export let wallet: Wallet;
   export let name: string;
diff --git a/src/base/registrations/Update.svelte b/src/views/registrations/Update.svelte
similarity index 79%
rename from src/base/registrations/Update.svelte
rename to src/views/registrations/Update.svelte
index 018d37fc6..4f0e736c5 100644
--- a/src/base/registrations/Update.svelte
+++ b/src/views/registrations/Update.svelte
@@ -1,16 +1,16 @@
 <script lang="ts" strictEvents>
-  import type { EnsRecord } from "./resolver";
-  import type { Registration } from "./registrar";
-  import type { Wallet } from "@app/wallet";
-  import type { State } from "@app/utils";
+  import type { EnsRecord } from "@app/lib/resolver";
+  import type { Registration } from "@app/lib/registrar";
+  import type { Wallet } from "@app/lib/wallet";
+  import type { State } from "@app/lib/utils";
 
-  import Button from "@app/Button.svelte";
-  import Loading from "@app/Loading.svelte";
-  import Modal from "@app/Modal.svelte";
-  import { Status } from "@app/utils";
+  import Button from "@app/components/Button.svelte";
+  import Loading from "@app/components/Loading.svelte";
+  import Modal from "@app/components/Modal.svelte";
+  import { Status } from "@app/lib/utils";
   import { onMount, createEventDispatcher } from "svelte";
-  import { setRecords } from "./resolver";
-  import { twemoji } from "@app/utils";
+  import { setRecords } from "@app/lib/resolver";
+  import { twemoji } from "@app/lib/utils";
 
   export let domain: string;
   export let wallet: Wallet;
diff --git a/src/base/registrations/View.svelte b/src/views/registrations/View.svelte
similarity index 90%
rename from src/base/registrations/View.svelte
rename to src/views/registrations/View.svelte
index 3f15abdf5..2e4d9f633 100644
--- a/src/base/registrations/View.svelte
+++ b/src/views/registrations/View.svelte
@@ -1,25 +1,25 @@
 <script lang="ts">
-  import type { EnsRecord } from "./resolver";
-  import type { Field, RegistrationRecord } from "@app/Form.svelte";
-  import type { Registration } from "./registrar";
-  import type { Wallet } from "@app/wallet";
+  import type { EnsRecord } from "@app/lib/resolver";
+  import type { Field, RegistrationRecord } from "@app/components/Form.svelte";
+  import type { Registration } from "@app/lib/registrar";
+  import type { Wallet } from "@app/lib/wallet";
   import type { ethers } from "ethers";
 
   import { onMount } from "svelte";
 
-  import * as router from "@app/router";
-  import Button from "@app/Button.svelte";
-  import ErrorModal from "@app/ErrorModal.svelte";
-  import Form from "@app/Form.svelte";
-  import Link from "@app/router/Link.svelte";
-  import Loading from "@app/Loading.svelte";
-  import Modal from "@app/Modal.svelte";
+  import * as router from "@app/lib/router";
+  import Button from "@app/components/Button.svelte";
+  import ErrorModal from "@app/components/ErrorModal.svelte";
+  import Form from "@app/components/Form.svelte";
+  import Link from "@app/components/Link.svelte";
+  import Loading from "@app/components/Loading.svelte";
+  import Modal from "@app/components/Modal.svelte";
   import Update from "./Update.svelte";
-  import { assert } from "@app/error";
-  import { defaultHttpApiPort } from "@app/base/seeds/Seed";
-  import { getRegistration, getOwner } from "./registrar";
-  import { isAddressEqual, isReverseRecordSet, twemoji } from "@app/utils";
-  import { session } from "@app/session";
+  import { assert } from "@app/lib/error";
+  import { defaultHttpApiPort } from "@app/lib/seed";
+  import { getRegistration, getOwner } from "@app/lib/registrar";
+  import { isAddressEqual, isReverseRecordSet, twemoji } from "@app/lib/utils";
+  import { session } from "@app/lib/session";
 
   enum Status {
     Loading,
diff --git a/src/base/seeds/Routes.svelte b/src/views/seeds/Routes.svelte
similarity index 76%
rename from src/base/seeds/Routes.svelte
rename to src/views/seeds/Routes.svelte
index b9f461964..de0a9dbe8 100644
--- a/src/base/seeds/Routes.svelte
+++ b/src/views/seeds/Routes.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import View from "@app/base/seeds/View.svelte";
+  import View from "@app/views/seeds/View.svelte";
 
   export let host: string;
 </script>
diff --git a/src/base/seeds/View.svelte b/src/views/seeds/View.svelte
similarity index 80%
rename from src/base/seeds/View.svelte
rename to src/views/seeds/View.svelte
index 2ab0f11c1..640193694 100644
--- a/src/base/seeds/View.svelte
+++ b/src/views/seeds/View.svelte
@@ -1,16 +1,16 @@
 <script lang="ts">
-  import type { Stats } from "@app/base/seeds/Seed";
-  import type { ProjectInfo } from "@app/project";
-  import { formatSeedId, formatSeedHost, twemoji } from "@app/utils";
-  import { Seed } from "@app/base/seeds/Seed";
-  import Loading from "@app/Loading.svelte";
-  import SeedAddress from "@app/SeedAddress.svelte";
-  import NotFound from "@app/NotFound.svelte";
-  import Clipboard from "@app/Clipboard.svelte";
-  import Projects from "@app/base/seeds/View/Projects.svelte";
-  import Async from "@app/Async.svelte";
-  import { Project } from "@app/project";
-  import type { Host } from "@app/api";
+  import type { Stats } from "@app/lib/seed";
+  import type { ProjectInfo } from "@app/lib/project";
+  import { formatSeedId, formatSeedHost, twemoji } from "@app/lib/utils";
+  import { Seed } from "@app/lib/seed";
+  import Loading from "@app/components/Loading.svelte";
+  import SeedAddress from "@app/components/SeedAddress.svelte";
+  import NotFound from "@app/components/NotFound.svelte";
+  import Clipboard from "@app/components/Clipboard.svelte";
+  import Projects from "@app/views/seeds/View/Projects.svelte";
+  import Async from "@app/components/Async.svelte";
+  import { Project } from "@app/lib/project";
+  import type { Host } from "@app/lib/api";
 
   export let hostAndPort: string;
 
diff --git a/src/base/seeds/View/Projects.svelte b/src/views/seeds/View/Projects.svelte
similarity index 83%
rename from src/base/seeds/View/Projects.svelte
rename to src/views/seeds/View/Projects.svelte
index 3d68a8f29..45bbb70e0 100644
--- a/src/base/seeds/View/Projects.svelte
+++ b/src/views/seeds/View/Projects.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
-  import type { Profile } from "@app/profile";
-  import type { ProjectInfo } from "@app/project";
-  import type { Seed, Stats } from "@app/base/seeds/Seed";
+  import type { Profile } from "@app/lib/profile";
+  import type { ProjectInfo } from "@app/lib/project";
+  import type { Seed, Stats } from "@app/lib/seed";
 
-  import * as proj from "@app/project";
-  import * as router from "@app/router";
-  import List from "@app/List.svelte";
-  import Widget from "@app/base/projects/Widget.svelte";
+  import * as proj from "@app/lib/project";
+  import * as router from "@app/lib/router";
+  import List from "@app/components/List.svelte";
+  import Widget from "@app/views/projects/Widget.svelte";
 
   export let seed: Seed;
   export let profile: Profile | null = null;
diff --git a/src/base/vesting/Form.svelte b/src/views/vesting/Form.svelte
similarity index 85%
rename from src/base/vesting/Form.svelte
rename to src/views/vesting/Form.svelte
index 063e240cd..2ec754948 100644
--- a/src/base/vesting/Form.svelte
+++ b/src/views/vesting/Form.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
-  import type { Wallet } from "@app/wallet";
+  import type { Wallet } from "@app/lib/wallet";
 
-  import * as utils from "@app/utils";
-  import * as router from "@app/router";
-  import Button from "@app/Button.svelte";
-  import TextInput from "@app/TextInput.svelte";
-  import { state, getInfo } from "./vesting";
+  import * as utils from "@app/lib/utils";
+  import * as router from "@app/lib/router";
+  import Button from "@app/components/Button.svelte";
+  import TextInput from "@app/components/TextInput.svelte";
+  import { state, getInfo } from "@app/lib/vesting";
 
   export let wallet: Wallet;
 
diff --git a/src/base/vesting/Routes.svelte b/src/views/vesting/Routes.svelte
similarity index 61%
rename from src/base/vesting/Routes.svelte
rename to src/views/vesting/Routes.svelte
index 68b9edb4b..0735f133c 100644
--- a/src/base/vesting/Routes.svelte
+++ b/src/views/vesting/Routes.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-  import type { Wallet } from "@app/wallet";
-  import type { VestingRoute } from "@app/router/definitions";
-  import type { Session } from "@app/session";
+  import type { Wallet } from "@app/lib/wallet";
+  import type { VestingRoute } from "@app/lib/router/definitions";
+  import type { Session } from "@app/lib/session";
 
-  import Form from "@app/base/vesting/Form.svelte";
-  import View from "@app/base/vesting/View.svelte";
+  import Form from "./Form.svelte";
+  import View from "./View.svelte";
 
   export let activeRoute: VestingRoute;
   export let wallet: Wallet;
diff --git a/src/base/vesting/View.svelte b/src/views/vesting/View.svelte
similarity index 86%
rename from src/base/vesting/View.svelte
rename to src/views/vesting/View.svelte
index da0e3cd9c..75979112e 100644
--- a/src/base/vesting/View.svelte
+++ b/src/views/vesting/View.svelte
@@ -1,17 +1,17 @@
 <script lang="ts">
-  import type { Session } from "@app/session";
-  import type { Wallet } from "@app/wallet";
-  import type { VestingInfo } from "./vesting";
+  import type { Session } from "@app/lib/session";
+  import type { Wallet } from "@app/lib/wallet";
+  import type { VestingInfo } from "@app/lib/vesting";
 
-  import * as router from "@app/router";
-  import * as utils from "@app/utils";
-  import Address from "@app/Address.svelte";
-  import Button from "@app/Button.svelte";
-  import Modal from "@app/Modal.svelte";
-  import { state, getInfo, withdrawVested } from "./vesting";
+  import * as router from "@app/lib/router";
+  import * as utils from "@app/lib/utils";
+  import Address from "@app/components/Address.svelte";
+  import Button from "@app/components/Button.svelte";
+  import Modal from "@app/components/Modal.svelte";
+  import { state, getInfo, withdrawVested } from "@app/lib/vesting";
   import { onMount } from "svelte";
-  import ErrorModal from "@app/ErrorModal.svelte";
-  import Loading from "@app/Loading.svelte";
+  import ErrorModal from "@app/components/ErrorModal.svelte";
+  import Loading from "@app/components/Loading.svelte";
 
   export let contractAddress: string;
   export let info: VestingInfo | null = null;
diff --git a/tests/unit/cache.test.ts b/tests/unit/cache.test.ts
index 988acc141..a62959f62 100644
--- a/tests/unit/cache.test.ts
+++ b/tests/unit/cache.test.ts
@@ -1,4 +1,4 @@
-import { cached } from "@app/cache";
+import { cached } from "@app/lib/cache";
 import { expect, test, vi } from "vitest";
 
 test("it caches undefined return values", async () => {
diff --git a/tests/unit/router.test.ts b/tests/unit/router.test.ts
index 87b9f13fe..d5629f51c 100644
--- a/tests/unit/router.test.ts
+++ b/tests/unit/router.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, test } from "vitest";
-import { routeToPath } from "@app/router/index";
-import { testExports } from "@app/router/index";
+import { routeToPath } from "@app/lib/router";
+import { testExports } from "@app/lib/router";
 
 // Defining the window.origin value, since vitest doesn't provide one.
 window.origin = "http://localhost:3000";
diff --git a/tests/unit/utils.test.ts b/tests/unit/utils.test.ts
index ee8a1e9e7..96527f9ac 100644
--- a/tests/unit/utils.test.ts
+++ b/tests/unit/utils.test.ts
@@ -1,8 +1,8 @@
-import type { Wallet } from "@app/wallet";
+import type { Wallet } from "@app/lib/wallet";
 
 import { BigNumber } from "ethers";
 import { describe, expect, test } from "vitest";
-import * as utils from "@app/utils";
+import * as utils from "@app/lib/utils";
 
 describe("Conversions", () => {
   test("toWei", () => {
diff --git a/tsconfig.json b/tsconfig.json
index 69429cfcf..a68f92aa1 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -17,8 +17,8 @@
     "importsNotUsedAsValues": "error",
     "skipLibCheck": true,
     "paths": {
-      "@public/*": ["./public/*"],
       "@app/*": ["./src/*"],
+      "@public/*": ["./public/*"],
       "@tests/*": ["./tests/*"]
     }
   },
diff --git a/vite.config.ts b/vite.config.ts
index d4446ee2f..389b123a7 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -54,8 +54,8 @@ export default defineConfig({
   },
   resolve: {
     alias: {
-      "@public": path.resolve("./public"),
       "@app": path.resolve("./src"),
+      "@public": path.resolve("./public"),
     },
   },
   build: {