diff --git a/src/lib/BuilderNavbar.svelte b/src/components/BuilderNavbar.svelte
similarity index 93%
rename from src/lib/BuilderNavbar.svelte
rename to src/components/BuilderNavbar.svelte
index 777a144a..65a8c62d 100644
--- a/src/lib/BuilderNavbar.svelte
+++ b/src/components/BuilderNavbar.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
   import { createEventDispatcher, onMount } from "svelte";
-  import { getSchemas } from "./editor/actions";
-  import DocLoader from "../components/DocLoader.svelte";
+  import { getSchemas } from "../lib/editor/actions";
+  import DocLoader from "./DocLoader.svelte";
   import logo from "../static/logo-name.svg";
-  import type { ListOption } from "./types/ui";
-  import type { State } from "./types/editor";
-  import SelectSchemas from "./SelectSchemas.svelte";
+  import type { ListOption } from "../lib/types/ui";
+  import type { State } from "../lib/types/editor";
+  import SelectSchemas from "../lib/editor/form/SelectSchemas.svelte";
   import BuilderNavbarOptions from "./BuilderNavbarOptions.svelte";
   import BuilderNavbarActions from "./BuilderNavbarActions.svelte";
   import BuilderNavbarEnvelopeMeta from "./BuilderNavbarEnvelopeMeta.svelte";
diff --git a/src/lib/BuilderNavbarActions.svelte b/src/components/BuilderNavbarActions.svelte
similarity index 93%
rename from src/lib/BuilderNavbarActions.svelte
rename to src/components/BuilderNavbarActions.svelte
index 74e047e3..1f1a0af2 100644
--- a/src/lib/BuilderNavbarActions.svelte
+++ b/src/components/BuilderNavbarActions.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import { iconButtonClasses } from "./ui/iconButtonClasses";
-  import type { State } from "./types/editor";
+  import { iconButtonClasses } from "./iconButtonClasses";
+  import type { State } from "../lib/types/editor";
   import { Icon } from "@steeze-ui/svelte-icon";
   import { Calculator, Erase, Sign, SquareCheck } from "@invopop/ui-icons";
   import { createEventDispatcher } from "svelte";
diff --git a/src/lib/BuilderNavbarDownload.svelte b/src/components/BuilderNavbarDownload.svelte
similarity index 93%
rename from src/lib/BuilderNavbarDownload.svelte
rename to src/components/BuilderNavbarDownload.svelte
index cf74e4b1..8c1bf52d 100644
--- a/src/lib/BuilderNavbarDownload.svelte
+++ b/src/components/BuilderNavbarDownload.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { Icon } from "@steeze-ui/svelte-icon";
-  import { iconButtonClasses } from "./ui/iconButtonClasses";
+  import { iconButtonClasses } from "./iconButtonClasses";
   import { DocumentText, Download } from "@invopop/ui-icons";
-  import LoadingIcon from "./ui/LoadingIcon.svelte";
+  import LoadingIcon from "../lib/ui/icons/LoadingIcon.svelte";
   import { createEventDispatcher } from "svelte";
   import { toasts } from "svelte-toasts";
 
diff --git a/src/lib/BuilderNavbarEnvelopeMeta.svelte b/src/components/BuilderNavbarEnvelopeMeta.svelte
similarity index 94%
rename from src/lib/BuilderNavbarEnvelopeMeta.svelte
rename to src/components/BuilderNavbarEnvelopeMeta.svelte
index 11b6f4b3..61fd7440 100644
--- a/src/lib/BuilderNavbarEnvelopeMeta.svelte
+++ b/src/components/BuilderNavbarEnvelopeMeta.svelte
@@ -2,7 +2,7 @@
   import { createEventDispatcher } from "svelte";
   import { Icon } from "@steeze-ui/svelte-icon";
   import { Header, Signature } from "@invopop/ui-icons";
-  import type { State } from "./types/editor";
+  import type { State } from "../lib/types/editor";
 
   const dispatch = createEventDispatcher();
 
diff --git a/src/lib/BuilderNavbarOptions.svelte b/src/components/BuilderNavbarOptions.svelte
similarity index 100%
rename from src/lib/BuilderNavbarOptions.svelte
rename to src/components/BuilderNavbarOptions.svelte
diff --git a/src/lib/BuilderNavbarSeparator.svelte b/src/components/BuilderNavbarSeparator.svelte
similarity index 100%
rename from src/lib/BuilderNavbarSeparator.svelte
rename to src/components/BuilderNavbarSeparator.svelte
diff --git a/src/lib/BuilderNavbarView.svelte b/src/components/BuilderNavbarView.svelte
similarity index 100%
rename from src/lib/BuilderNavbarView.svelte
rename to src/components/BuilderNavbarView.svelte
diff --git a/src/lib/ui/iconButtonClasses.ts b/src/components/iconButtonClasses.ts
similarity index 100%
rename from src/lib/ui/iconButtonClasses.ts
rename to src/components/iconButtonClasses.ts
diff --git a/src/lib/EnvelopeEditor.svelte b/src/lib/EnvelopeEditor.svelte
index 3674f5cf..23484e9b 100644
--- a/src/lib/EnvelopeEditor.svelte
+++ b/src/lib/EnvelopeEditor.svelte
@@ -10,7 +10,7 @@
   import { problemSeverityMap, type EditorProblem } from "./editor/EditorProblem.js";
   import * as actions from "./editor/actions";
   import type { DocumentHeader, State } from "./types/editor";
-  import { displayAllErrors, showErrorToast } from "./helpers";
+  import { displayAllErrors, showErrorToast } from "./helpers/notification";
   import { generateCorrectOptionsModel } from "./editor/form/utils/model";
   import fileSaver from "file-saver";
   import type { Envelope, EnvelopeHeader } from "./types/envelope";
diff --git a/src/lib/actions/Redo.svelte b/src/lib/actions/Redo.svelte
deleted file mode 100644
index bb85a8d0..00000000
--- a/src/lib/actions/Redo.svelte
+++ /dev/null
@@ -1,23 +0,0 @@
-<script lang="ts">
-  import { createEventDispatcher } from "svelte";
-  import { iconButtonClasses } from "$lib/ui/iconButtonClasses.js";
-  import RedoIcon from "$lib/ui/icons/RedoIcon.svelte";
-  import { getBuilderContext } from "$lib/store/builder";
-
-  const dispatch = createEventDispatcher();
-
-  const { redoAvailable } = getBuilderContext();
-
-  function handleRedo() {
-    dispatch("redo");
-    document.dispatchEvent(new Event("redoButtonClick"));
-  }
-</script>
-
-<button
-  title="Redo the last undone change in the editor."
-  on:click={handleRedo}
-  class={iconButtonClasses($redoAvailable === false)}
->
-  <RedoIcon />
-</button>
diff --git a/src/lib/actions/Undo.svelte b/src/lib/actions/Undo.svelte
deleted file mode 100644
index 6d2dd173..00000000
--- a/src/lib/actions/Undo.svelte
+++ /dev/null
@@ -1,23 +0,0 @@
-<script lang="ts">
-  import { createEventDispatcher } from "svelte";
-  import { iconButtonClasses } from "$lib/ui/iconButtonClasses.js";
-  import UndoIcon from "$lib/ui/icons/UndoIcon.svelte";
-  import { getBuilderContext } from "$lib/store/builder";
-
-  const dispatch = createEventDispatcher();
-
-  const { undoAvailable } = getBuilderContext();
-
-  function handleUndo() {
-    dispatch("undo");
-    document.dispatchEvent(new Event("undoButtonClick"));
-  }
-</script>
-
-<button
-  title="Undo the last change in the editor."
-  on:click={handleUndo}
-  class={iconButtonClasses($undoAvailable === false)}
->
-  <UndoIcon />
-</button>
diff --git a/src/lib/clickOutside.ts b/src/lib/actions/clickOutside.ts
similarity index 100%
rename from src/lib/clickOutside.ts
rename to src/lib/actions/clickOutside.ts
diff --git a/src/lib/editor/form/action/hover.ts b/src/lib/actions/hover.ts
similarity index 100%
rename from src/lib/editor/form/action/hover.ts
rename to src/lib/actions/hover.ts
diff --git a/src/lib/editor/actions.ts b/src/lib/editor/actions.ts
index 5341e53b..9c8b3b6a 100644
--- a/src/lib/editor/actions.ts
+++ b/src/lib/editor/actions.ts
@@ -1,9 +1,14 @@
 import { get } from "svelte/store";
 import * as GOBL from "@invopop/gobl-worker";
-import { encodeUTF8ToBase64 } from "$lib/encodeUTF8ToBase64.js";
 import { toasts } from "svelte-toasts";
 import { envelopeGOBLSchema } from "$lib/helpers/envelope";
 import type { BuilderContext } from "$lib/types/editor";
+import utf8 from "utf8";
+import base64 from "base-64";
+
+export function encodeUTF8ToBase64(value: string): string {
+  return base64.encode(utf8.encode(value));
+}
 
 // Send a request to the GOBL worker to run the "build" operation using the current
 // editor window contents and update with the results.
diff --git a/src/lib/editor/code/EditorCode.svelte b/src/lib/editor/code/EditorCode.svelte
index d715d4cf..3ba8c448 100644
--- a/src/lib/editor/code/EditorCode.svelte
+++ b/src/lib/editor/code/EditorCode.svelte
@@ -13,7 +13,7 @@
   import SuccessIcon from "$lib/ui/icons/SuccessIcon.svelte";
   import LightbulbIcon from "$lib/ui/icons/LightbulbIcon.svelte";
   import { getBuilderContext } from "$lib/store/builder.js";
-  import { getErrorString } from "$lib/helpers";
+  import { getErrorString } from "$lib/helpers/notification";
 
   let monaco: typeof Monaco;
 
diff --git a/src/lib/editor/form/AbstractField.svelte b/src/lib/editor/form/AbstractField.svelte
index 6ff930c4..fbe517ab 100644
--- a/src/lib/editor/form/AbstractField.svelte
+++ b/src/lib/editor/form/AbstractField.svelte
@@ -5,7 +5,7 @@
   import StringField from "./StringField.svelte";
   import FallbackField from "./FallbackField.svelte";
   import FieldContextMenu from "./FieldContextMenu.svelte";
-  import hover from "./action/hover.js";
+  import hover from "../../actions/hover.js";
   import IntegerField from "./IntegerField.svelte";
   import type { UIModelField } from "./utils/model.js";
   import AddFieldMenu from "./AddFieldMenu.svelte";
diff --git a/src/lib/editor/form/AddFieldMenu.svelte b/src/lib/editor/form/AddFieldMenu.svelte
index 7ff4b854..58817933 100644
--- a/src/lib/editor/form/AddFieldMenu.svelte
+++ b/src/lib/editor/form/AddFieldMenu.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
   import { fade } from "svelte/transition";
-  import hover from "./action/hover.js";
+  import hover from "$lib/actions/hover.js";
   import { createEventDispatcher } from "svelte";
   import { sleep } from "./utils/sleep.js";
   import type { SchemaOption, UIModelField } from "./utils/model.js";
-  import clickOutside from "$lib/clickOutside.js";
+  import clickOutside from "$lib/actions/clickOutside.js";
   import { Icon } from "svelte-hero-icons";
   import { Search } from "@invopop/ui-icons";
 
diff --git a/src/lib/editor/form/EditableTextField.svelte b/src/lib/editor/form/EditableTextField.svelte
index 3e78d398..260d00e8 100644
--- a/src/lib/editor/form/EditableTextField.svelte
+++ b/src/lib/editor/form/EditableTextField.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import SelectSchemas from "$lib/SelectSchemas.svelte";
+  import SelectSchemas from "$lib/editor/form/SelectSchemas.svelte";
   import type { UIModelField } from "$lib/editor/form/utils/model.js";
   import { getBuilderContext } from "$lib/store/builder";
   import clsx from "clsx";
diff --git a/src/lib/editor/form/EditorForm.svelte b/src/lib/editor/form/EditorForm.svelte
index 024d030a..ec49c29a 100644
--- a/src/lib/editor/form/EditorForm.svelte
+++ b/src/lib/editor/form/EditorForm.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import LoadingIcon from "$lib/ui/LoadingIcon.svelte";
+  import LoadingIcon from "$lib/ui/icons/LoadingIcon.svelte";
   import { build, getSchemas } from "../actions.js";
   import DynamicForm from "./DynamicForm.svelte";
   import { createEventDispatcher, setContext } from "svelte";
diff --git a/src/lib/editor/form/SchemaField.svelte b/src/lib/editor/form/SchemaField.svelte
index d6acc441..9eb62011 100644
--- a/src/lib/editor/form/SchemaField.svelte
+++ b/src/lib/editor/form/SchemaField.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import SelectSchemas from "$lib/SelectSchemas.svelte";
+  import SelectSchemas from "$lib/editor/form/SelectSchemas.svelte";
   import { getBuilderContext } from "$lib/store/builder";
 
   const { jsonSchema, updateSchema } = getBuilderContext();
diff --git a/src/lib/SelectSchemas.svelte b/src/lib/editor/form/SelectSchemas.svelte
similarity index 95%
rename from src/lib/SelectSchemas.svelte
rename to src/lib/editor/form/SelectSchemas.svelte
index ce0004a7..3bc28c0e 100644
--- a/src/lib/SelectSchemas.svelte
+++ b/src/lib/editor/form/SelectSchemas.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import Select from "svelte-select";
   import { createEventDispatcher, onMount } from "svelte";
-  import { getSchemas } from "./editor/actions";
-  import type { ListOption } from "./types/ui";
+  import { getSchemas } from "../actions";
+  import type { ListOption } from "../../types/ui";
 
   const dispatch = createEventDispatcher();
 
diff --git a/src/lib/editor/form/action/portal.ts b/src/lib/editor/form/action/portal.ts
deleted file mode 100644
index d1afb36b..00000000
--- a/src/lib/editor/form/action/portal.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { tick } from "svelte";
-
-const portalHosts = new Map();
-
-export function createPortal(node: HTMLElement, id = "default") {
-  const key = `$$portal.${id}`;
-
-  if (portalHosts.has(key)) throw `duplicate portal key "${id}"`;
-  else portalHosts.set(key, node);
-
-  return { destroy: portalHosts.delete.bind(portalHosts, key) };
-}
-
-function mount(node: HTMLElement, key: string) {
-  if (!portalHosts.has(key)) throw `unknown portal ${key}`;
-
-  const host = portalHosts.get(key);
-  host.insertBefore(node, null);
-
-  return () => host.contains(node) && host.removeChild(node);
-}
-
-export function portal(node: HTMLElement, id = "default") {
-  let destroy: () => void;
-
-  const key = `$$portal.${id}`;
-
-  if (!portalHosts.has(key))
-    tick().then(() => {
-      destroy = mount(node, key);
-    });
-  else destroy = mount(node, key);
-
-  return { destroy: () => destroy?.() };
-}
diff --git a/src/lib/encodeUTF8ToBase64.ts b/src/lib/encodeUTF8ToBase64.ts
deleted file mode 100644
index 24323276..00000000
--- a/src/lib/encodeUTF8ToBase64.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import utf8 from "utf8";
-import base64 from "base-64";
-
-export function encodeUTF8ToBase64(value: string): string {
-  return base64.encode(utf8.encode(value));
-}
diff --git a/src/lib/helpers.ts b/src/lib/helpers/notification.ts
similarity index 100%
rename from src/lib/helpers.ts
rename to src/lib/helpers/notification.ts
diff --git a/src/lib/store/builder.ts b/src/lib/store/builder.ts
index 4a7e9245..b2db6f7c 100644
--- a/src/lib/store/builder.ts
+++ b/src/lib/store/builder.ts
@@ -3,7 +3,7 @@ import type { GOBLError } from "@invopop/gobl-worker";
 import { getContext, setContext } from "svelte";
 import { derived, get, writable, type Writable } from "svelte/store";
 import type * as monaco from "monaco-editor";
-import { objectHasEmptyProperties } from "$lib/helpers";
+import { objectHasEmptyProperties } from "$lib/helpers/notification";
 import { writableDerived } from "./writableDerived";
 import { getUIModel, type UIModelRootField } from "$lib/editor/form/utils/model";
 import { getDebouncedFunction } from "$lib/editor/form/utils/debounce";
diff --git a/src/lib/ui/BuilderNavbarItem.svelte b/src/lib/ui/BuilderNavbarItem.svelte
deleted file mode 100644
index 2bbd8ada..00000000
--- a/src/lib/ui/BuilderNavbarItem.svelte
+++ /dev/null
@@ -1,29 +0,0 @@
-<script lang="ts">
-  import type { ListOption } from "$lib/types/ui";
-  import { createEventDispatcher } from "svelte";
-  import { Icon } from "svelte-hero-icons";
-  import { Tick } from "@invopop/ui-icons";
-
-  const dispatch = createEventDispatcher();
-
-  export let isActive = false;
-  export let option: ListOption;
-  export let disabled = false;
-</script>
-
-<li class="navbar-item">
-  <button
-    {disabled}
-    class:font-bold={isActive}
-    class:opacity-30={disabled}
-    class="flex items-center space-x-3"
-    on:click={() => {
-      dispatch("click", option);
-    }}
-  >
-    <span>{option.label}</span>
-    {#if isActive}
-      <Icon src={Tick} class="h-5 w-5 text-positive-500" />
-    {/if}
-  </button>
-</li>
diff --git a/src/lib/ui/EditorViewButton.svelte b/src/lib/ui/EditorViewButton.svelte
deleted file mode 100644
index 9c14087d..00000000
--- a/src/lib/ui/EditorViewButton.svelte
+++ /dev/null
@@ -1,25 +0,0 @@
-<script lang="ts">
-  import { clsx } from "clsx";
-
-  export let active = false;
-  export let disabled = false;
-  export let right = false;
-  export let label: string | undefined = "";
-
-  function editorViewButtonClasses(active: boolean, right: boolean): string {
-    return clsx("py-2 px-6 rounded text-sm flex items-center justify-center gap-1", {
-      "text-grey-5 font-medium": !active,
-      "text-grey-4 bg-white shadow-right cursor-default font-medium": active,
-      "shadow-right": !right && active,
-      "shadow-left": right && active,
-    });
-  }
-</script>
-
-<button
-  title={label}
-  {disabled}
-  class:cursor-not-allowed={disabled}
-  on:click
-  class={editorViewButtonClasses(active, right)}><slot /></button
->
diff --git a/src/lib/ui/Modal.svelte b/src/lib/ui/Modal.svelte
index a0c8b0ed..e3f3b583 100644
--- a/src/lib/ui/Modal.svelte
+++ b/src/lib/ui/Modal.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import clickOutside from "$lib/clickOutside.js";
+  import clickOutside from "$lib/actions/clickOutside.js";
   import { createEventDispatcher } from "svelte";
   import BaseButton from "./BaseButton.svelte";
   import type { IconSource } from "@steeze-ui/svelte-icon";
diff --git a/src/lib/ui/icons/CalculatedIcon.svelte b/src/lib/ui/icons/CalculatedIcon.svelte
deleted file mode 100644
index d697e632..00000000
--- a/src/lib/ui/icons/CalculatedIcon.svelte
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg
-  xmlns="http://www.w3.org/2000/svg"
-  fill="none"
-  viewBox="0 0 24 24"
-  stroke-width="1.5"
-  stroke="currentColor"
-  class="w-5 h-5"
->
-  <path
-    stroke-linecap="round"
-    stroke-linejoin="round"
-    d="M15.75 15.75V18m-7.5-6.75h.008v.008H8.25v-.008zm0 2.25h.008v.008H8.25V13.5zm0 2.25h.008v.008H8.25v-.008zm0 2.25h.008v.008H8.25V18zm2.498-6.75h.007v.008h-.007v-.008zm0 2.25h.007v.008h-.007V13.5zm0 2.25h.007v.008h-.007v-.008zm0 2.25h.007v.008h-.007V18zm2.504-6.75h.008v.008h-.008v-.008zm0 2.25h.008v.008h-.008V13.5zm0 2.25h.008v.008h-.008v-.008zm0 2.25h.008v.008h-.008V18zm2.498-6.75h.008v.008h-.008v-.008zm0 2.25h.008v.008h-.008V13.5zM8.25 6h7.5v2.25h-7.5V6zM12 2.25c-1.892 0-3.758.11-5.593.322C5.307 2.7 4.5 3.65 4.5 4.757V19.5a2.25 2.25 0 002.25 2.25h10.5a2.25 2.25 0 002.25-2.25V4.757c0-1.108-.806-2.057-1.907-2.185A48.507 48.507 0 0012 2.25z"
-  />
-</svg>
diff --git a/src/lib/ui/icons/ClearIcon.svelte b/src/lib/ui/icons/ClearIcon.svelte
deleted file mode 100644
index a3a4f96a..00000000
--- a/src/lib/ui/icons/ClearIcon.svelte
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg
-  xmlns="http://www.w3.org/2000/svg"
-  fill="none"
-  viewBox="0 0 24 24"
-  stroke-width="1.5"
-  stroke="currentColor"
-  class="w-5 h-5"
->
-  <path
-    stroke-linecap="round"
-    stroke-linejoin="round"
-    d="M9.75 9.75l4.5 4.5m0-4.5l-4.5 4.5M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
-  />
-</svg>
diff --git a/src/lib/ui/icons/DraftIcon.svelte b/src/lib/ui/icons/DraftIcon.svelte
deleted file mode 100644
index dac0a094..00000000
--- a/src/lib/ui/icons/DraftIcon.svelte
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg
-  xmlns="http://www.w3.org/2000/svg"
-  fill="none"
-  viewBox="0 0 24 24"
-  stroke-width="1.5"
-  stroke="currentColor"
-  class="w-4 h-4"
->
-  <path
-    stroke-linecap="round"
-    stroke-linejoin="round"
-    d="M16.862 4.487l1.687-1.688a1.875 1.875 0 112.652 2.652L10.582 16.07a4.5 4.5 0 01-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 011.13-1.897l8.932-8.931zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0115.75 21H5.25A2.25 2.25 0 013 18.75V8.25A2.25 2.25 0 015.25 6H10"
-  />
-</svg>
diff --git a/src/lib/ui/LoadingIcon.svelte b/src/lib/ui/icons/LoadingIcon.svelte
similarity index 100%
rename from src/lib/ui/LoadingIcon.svelte
rename to src/lib/ui/icons/LoadingIcon.svelte
diff --git a/src/lib/ui/icons/RedoIcon.svelte b/src/lib/ui/icons/RedoIcon.svelte
deleted file mode 100644
index 30737595..00000000
--- a/src/lib/ui/icons/RedoIcon.svelte
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg
-  xmlns="http://www.w3.org/2000/svg"
-  fill="none"
-  viewBox="0 0 24 24"
-  stroke-width="1.5"
-  stroke="currentColor"
-  class="w-5 h-5"
->
-  <path stroke-linecap="round" stroke-linejoin="round" d="M15 15l6-6m0 0l-6-6m6 6H9a6 6 0 000 12h3" />
-</svg>
diff --git a/src/lib/ui/icons/SignedIcon.svelte b/src/lib/ui/icons/SignedIcon.svelte
deleted file mode 100644
index 7fc7b386..00000000
--- a/src/lib/ui/icons/SignedIcon.svelte
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg
-  xmlns="http://www.w3.org/2000/svg"
-  fill="none"
-  viewBox="0 0 24 24"
-  stroke-width="1.5"
-  stroke="currentColor"
-  class="w-4 h-4"
->
-  <path
-    stroke-linecap="round"
-    stroke-linejoin="round"
-    d="M16.5 10.5V6.75a4.5 4.5 0 10-9 0v3.75m-.75 11.25h10.5a2.25 2.25 0 002.25-2.25v-6.75a2.25 2.25 0 00-2.25-2.25H6.75a2.25 2.25 0 00-2.25 2.25v6.75a2.25 2.25 0 002.25 2.25z"
-  />
-</svg>
diff --git a/src/lib/ui/icons/UndoIcon.svelte b/src/lib/ui/icons/UndoIcon.svelte
deleted file mode 100644
index 82230e13..00000000
--- a/src/lib/ui/icons/UndoIcon.svelte
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg
-  xmlns="http://www.w3.org/2000/svg"
-  fill="none"
-  viewBox="0 0 24 24"
-  stroke-width="1.5"
-  stroke="currentColor"
-  class="w-5 h-5"
->
-  <path stroke-linecap="round" stroke-linejoin="round" d="M9 15L3 9m0 0l6-6M3 9h12a6 6 0 010 12h-3" />
-</svg>
diff --git a/src/lib/ui/icons/schemaIconMap.svelte b/src/lib/ui/icons/schemaIconMap.svelte
deleted file mode 100644
index c5011966..00000000
--- a/src/lib/ui/icons/schemaIconMap.svelte
+++ /dev/null
@@ -1,19 +0,0 @@
-<script context="module" lang="ts">
-  import type { SvelteComponent } from "svelte";
-
-  import InvoiceIcon from "./InvoiceIcon.svelte";
-  import MessageIcon from "./MessageIcon.svelte";
-
-  export const schemaIconMap = new Map<string, typeof SvelteComponent>([
-    ["https://gobl.org/draft-0/bill/invoice", InvoiceIcon],
-    ["https://gobl.org/draft-0/note/message", MessageIcon],
-  ] as [string, typeof SvelteComponent][]);
-
-  export const schemaIconFor = (schema: string): typeof SvelteComponent => {
-    const icon = schemaIconMap.get(schema);
-    if (!icon) {
-      return MessageIcon as typeof SvelteComponent; // default
-    }
-    return icon;
-  };
-</script>
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index da40cd12..f2f6a641 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -2,7 +2,7 @@
   import type { EditorProblem } from "$lib/editor/EditorProblem.js";
   import EnvelopeEditor from "$lib/EnvelopeEditor.svelte";
   import type { State } from "$lib/types/editor";
-  import BuilderNavbar from "$lib/BuilderNavbar.svelte";
+  import BuilderNavbar from "../components/BuilderNavbar.svelte";
   import type { EnvelopeHeader, GOBLDocument } from "$lib/types/envelope";
   import EditorFormModalSignatures from "$lib/editor/form/modals/EditorFormModalSignatures.svelte";
   import EditorFormModalHeaders from "$lib/editor/form/modals/EditorFormModalHeaders.svelte";