diff --git a/ohmg/conf/http.py b/ohmg/conf/http.py
index 0dc3ba6f..128d8d30 100644
--- a/ohmg/conf/http.py
+++ b/ohmg/conf/http.py
@@ -39,7 +39,6 @@ def user_info_from_request(request):
         user_info["is_authenticated"] = True
         user_info["is_staff"] = user.is_staff
         user_info["perms"] = list(user.get_all_permissions())
-        print(json.dumps(user_info, indent=1))
     else:
         user_info = {
             "is_authenticated": False,
diff --git a/ohmg/core/views.py b/ohmg/core/views.py
index 36950987..baf30225 100644
--- a/ohmg/core/views.py
+++ b/ohmg/core/views.py
@@ -459,7 +459,7 @@ def post(self, request):
                     logger.warning(f"{self} | improper GeoJSON in mask")
                     errors.append((lyr_slug, e))
             if errors:
-                return JsonResponseFail("; ".join([f"\n-- {i[0]}: {i[1]}" for i in errors]))
+                return JsonResponseFail("<br/>".join([f"{i[0]}: {i[1]}" for i in errors]))
 
             for layer in layerset.get_layers():
                 # if there is no mask to set and the layer doesn't need a mask removed, skip
diff --git a/ohmg/frontend/svelte_components/rollup.config.js b/ohmg/frontend/svelte_components/rollup.config.js
index 28b031fb..fadb672f 100644
--- a/ohmg/frontend/svelte_components/rollup.config.js
+++ b/ohmg/frontend/svelte_components/rollup.config.js
@@ -77,7 +77,6 @@ export default (cliArgs) => {
     'LatestBlogPosts',
     'MapBrowse',
     'MapShowcase',
-    'Participants',
     'Place',
     'Browse',
   ];
diff --git a/ohmg/frontend/svelte_components/src/browse.js b/ohmg/frontend/svelte_components/src/browse.js
index 2d04efad..041dc728 100644
--- a/ohmg/frontend/svelte_components/src/browse.js
+++ b/ohmg/frontend/svelte_components/src/browse.js
@@ -1,4 +1,4 @@
-import Browse from './components/overviews/Browse.svelte';
+import Browse from './components/search/Browse.svelte';
 
 export default new Browse({
   target: document.getElementById('browse-target'),
diff --git a/ohmg/frontend/svelte_components/src/components/Viewer.svelte b/ohmg/frontend/svelte_components/src/components/Viewer.svelte
index fffcf884..66be4383 100644
--- a/ohmg/frontend/svelte_components/src/components/Viewer.svelte
+++ b/ohmg/frontend/svelte_components/src/components/Viewer.svelte
@@ -36,7 +36,7 @@
   import LayerGroup from 'ol/layer/Group';
 
   import { MapViewer } from '../lib/viewers';
-  import Modal, { getModal } from './base/Modal.svelte';
+  import Modal, { openModal } from './base/Modal.svelte';
   import Link from './base/Link.svelte';
   import MapboxLogoLink from './interfaces/widgets/MapboxLogoLink.svelte';
 
@@ -514,7 +514,7 @@
         <button
           title="About this viewer"
           on:click={() => {
-            getModal('modal-about').open();
+            openModal('modal-about');
           }}>info</button
         >
       </div>
diff --git a/ohmg/frontend/svelte_components/src/components/base/ExpandableSection.svelte b/ohmg/frontend/svelte_components/src/components/base/ExpandableSection.svelte
index 0245a85d..61ed4972 100644
--- a/ohmg/frontend/svelte_components/src/components/base/ExpandableSection.svelte
+++ b/ohmg/frontend/svelte_components/src/components/base/ExpandableSection.svelte
@@ -2,8 +2,8 @@
     import { slide } from 'svelte/transition';
     import {slugify} from '../../lib/utils';
 
-    import InfoModalButton from "../buttons/InfoModalButton.svelte";
-    import ConditionalDoubleChevron from "../buttons/ConditionalDoubleChevron.svelte";
+    import InfoModalButton from "../shared/buttons/InfoModalButton.svelte";
+    import ConditionalDoubleChevron from "../shared/buttons/ConditionalDoubleChevron.svelte";
 
     export let TITLE;
     export let EXPANDED = false;
diff --git a/ohmg/frontend/svelte_components/src/components/base/Modal.svelte b/ohmg/frontend/svelte_components/src/components/base/Modal.svelte
index 31d4b11e..96112bbb 100644
--- a/ohmg/frontend/svelte_components/src/components/base/Modal.svelte
+++ b/ohmg/frontend/svelte_components/src/components/base/Modal.svelte
@@ -6,6 +6,14 @@
   export function getModal(id = '') {
     return modals[id];
   }
+
+  export function openModal(id = '') {
+    getModal(id).open()
+  }
+
+  export function closeModal(id = '') {
+    getModal(id).close()
+  }
 </script>
 
 <script lang="ts">
@@ -63,6 +71,9 @@
     delete modals[id];
     window.removeEventListener('keydown', keyPress);
   });
+
+  let className = "content"
+  if (full) {className += " full-modal-content"}
 </script>
 
 <!-- this modal works fine with keyboard interaction, disabling a11y warnings -->
@@ -80,7 +91,7 @@
 >
   <!-- svelte-ignore a11y-click-events-have-key-events -->
   <!-- svelte-ignore a11y-no-static-element-interactions -->
-  <div id="modal" class={full ? 'full-modal' : ''} on:click|stopPropagation={() => {}}>
+  <div id="modal" class={full ? 'full-modal' : 'content'} on:click|stopPropagation={() => {}}>
     <!-- svelte-ignore a11y-click-events-have-key-events -->
     <!-- svelte-ignore a11y-no-static-element-interactions -->
     {#if closable}
@@ -90,7 +101,7 @@
         <line x1="9" y1="3" x2="3" y2="9" />
       </svg>
     {/if}
-    <div id="modal-content" class={full ? 'full-modal-content' : ''}>
+    <div id="modal-content" class={className}>
       {#if mdContent}
         <SvelteMarkdown source={mdContent} />
       {:else}
diff --git a/ohmg/frontend/svelte_components/src/components/modals/ConfirmModal.svelte b/ohmg/frontend/svelte_components/src/components/base/ModalConfirm.svelte
similarity index 82%
rename from ohmg/frontend/svelte_components/src/components/modals/ConfirmModal.svelte
rename to ohmg/frontend/svelte_components/src/components/base/ModalConfirm.svelte
index d130c282..59fb0270 100644
--- a/ohmg/frontend/svelte_components/src/components/modals/ConfirmModal.svelte
+++ b/ohmg/frontend/svelte_components/src/components/base/ModalConfirm.svelte
@@ -1,5 +1,5 @@
 <script>
-  import Modal, { getModal } from '../base/Modal.svelte';
+  import Modal, { closeModal } from './Modal.svelte';
 
   export let id;
   export let yesButtonText = "Yes"
@@ -18,7 +18,7 @@
     title={yesButtonText}
     on:click={() => {
       yesAction();
-      getModal(id).close();
+      closeModal(id);
     }}>{yesButtonText}</button
   >
   <button
@@ -26,7 +26,7 @@
     title={noButtonText}
     on:click={() => {
       noAction()
-      getModal(id).close();
+      closeModal(id);
     }}>{noButtonText}</button
   >
 </Modal>
diff --git a/ohmg/frontend/svelte_components/src/components/lists/LatestAdditions.svelte b/ohmg/frontend/svelte_components/src/components/home/LatestAdditions.svelte
similarity index 83%
rename from ohmg/frontend/svelte_components/src/components/lists/LatestAdditions.svelte
rename to ohmg/frontend/svelte_components/src/components/home/LatestAdditions.svelte
index c939dbd1..9efa5be7 100644
--- a/ohmg/frontend/svelte_components/src/components/lists/LatestAdditions.svelte
+++ b/ohmg/frontend/svelte_components/src/components/home/LatestAdditions.svelte
@@ -1,7 +1,7 @@
 <script>
-  import LoadingEllipsis from '../common/LoadingEllipsis.svelte';
+  import LoadingEllipsis from '../shared/LoadingEllipsis.svelte';
 
-  import MapItem from '../cards/MapItem.svelte';
+  import MapItem from '../shared/cards/MapItem.svelte';
 
   import { getFromAPI } from '../../lib/requests';
 
diff --git a/ohmg/frontend/svelte_components/src/components/overviews/sections/LatestBlogPosts.svelte b/ohmg/frontend/svelte_components/src/components/home/LatestBlogPosts.svelte
similarity index 97%
rename from ohmg/frontend/svelte_components/src/components/overviews/sections/LatestBlogPosts.svelte
rename to ohmg/frontend/svelte_components/src/components/home/LatestBlogPosts.svelte
index 167cf54c..b120f958 100644
--- a/ohmg/frontend/svelte_components/src/components/overviews/sections/LatestBlogPosts.svelte
+++ b/ohmg/frontend/svelte_components/src/components/home/LatestBlogPosts.svelte
@@ -1,5 +1,5 @@
 <script>
-  import Link from '../../base/Link.svelte';
+  import Link from '../base/Link.svelte';
 
   $: blogItems = [];
 
diff --git a/ohmg/frontend/svelte_components/src/components/MapShowcase.svelte b/ohmg/frontend/svelte_components/src/components/home/MapShowcase.svelte
similarity index 93%
rename from ohmg/frontend/svelte_components/src/components/MapShowcase.svelte
rename to ohmg/frontend/svelte_components/src/components/home/MapShowcase.svelte
index 568cabde..4d892d95 100644
--- a/ohmg/frontend/svelte_components/src/components/MapShowcase.svelte
+++ b/ohmg/frontend/svelte_components/src/components/home/MapShowcase.svelte
@@ -1,9 +1,9 @@
 <script>
-  import Link from './base/Link.svelte';
+  import Link from '../base/Link.svelte';
 
-  import MapItem from './cards/MapItem.svelte';
+  import MapItem from '../shared/cards/MapItem.svelte';
 
-  import LatestAdditions from './lists/LatestAdditions.svelte';
+  import LatestAdditions from './LatestAdditions.svelte';
 
   export let CONTEXT;
   export let FEATURED_MAPS = [];
diff --git a/ohmg/frontend/svelte_components/src/components/Georeferencer.svelte b/ohmg/frontend/svelte_components/src/components/interfaces/Georeferencer.svelte
similarity index 95%
rename from ohmg/frontend/svelte_components/src/components/Georeferencer.svelte
rename to ohmg/frontend/svelte_components/src/components/interfaces/Georeferencer.svelte
index 3b6d3340..73a53141 100644
--- a/ohmg/frontend/svelte_components/src/components/Georeferencer.svelte
+++ b/ohmg/frontend/svelte_components/src/components/interfaces/Georeferencer.svelte
@@ -27,7 +27,7 @@
   import Draw from 'ol/interaction/Draw';
   import Modify from 'ol/interaction/Modify';
 
-  import { gcpStyles, parcelStyles, emptyStyle } from '../lib/ol-styles';
+  import { gcpStyles, parcelStyles, emptyStyle } from '../../lib/ol-styles';
   import {
     makeLayerGroupFromLayerSet,
     makeTitilerXYZUrl,
@@ -38,23 +38,23 @@
     extentFromImageSize,
     projectionFromImageExtent,
     usaExtent,
-  } from '../lib/utils';
-  import { submitPostRequest } from '../lib/requests';
-  import { makeImageLayer, makePmTilesLayer } from '../lib/layers';
-  import { DocMousePosition, LyrMousePosition, MapScaleLine } from '../lib/controls';
-  import { MapViewer } from '../lib/viewers';
+  } from '../../lib/utils';
+  import { submitPostRequest } from '../../lib/requests';
+  import { makeImageLayer, makePmTilesLayer } from '../../lib/layers';
+  import { DocMousePosition, LyrMousePosition, MapScaleLine } from '../../lib/controls';
+  import { MapViewer } from '../../lib/viewers';
 
-  import Modal, { getModal } from './base/Modal.svelte';
-  import LoadingEllipsis from './common/LoadingEllipsis.svelte';
-  import Link from './base/Link.svelte';
-  import ToolUIButton from './interfaces/widgets/ToolUIButton.svelte';
+  import Modal, { openModal } from '../base/Modal.svelte';
+  import LoadingEllipsis from '../shared/LoadingEllipsis.svelte';
+  import Link from '../base/Link.svelte';
+  import ToolUIButton from './widgets/ToolUIButton.svelte';
 
-  import ExpandElement from './interfaces/widgets/ExpandElement.svelte';
-  import ExtendSessionModal from './modals/ExtendSessionModal.svelte';
-  import InfoModalButton from './buttons/InfoModalButton.svelte';
-  import SigninReminder from './common/SigninReminder.svelte';
+  import ExpandElement from './widgets/ExpandElement.svelte';
+  import ExtendSessionModal from '../shared/modals/ExtendSessionModal.svelte';
+  import InfoModalButton from '../shared/buttons/InfoModalButton.svelte';
+  import SigninReminder from '../shared/SigninReminder.svelte';
 
-  import ConfirmModal from './modals/ConfirmModal.svelte';
+  import ModalConfirm from '../base/ModalConfirm.svelte';
 
   export let CONTEXT;
   export let REGION;
@@ -140,7 +140,7 @@
   let autoRedirect;
   function promptRefresh() {
     if (!leaveOkay) {
-      getModal('modal-extend-session').open();
+      openModal('modal-extend-session');
       leaveOkay = true;
       autoRedirect = setTimeout(cancelSession, 10000);
       timer = setInterval(() => {
@@ -472,7 +472,7 @@
     setPreviewVisibility(previewMode);
     loadIncomingGCPs();
     if (!CONTEXT.user.is_authenticated) {
-      getModal('modal-anonymous').open();
+      openModal('modal-anonymous');
     }
   });
 
@@ -908,33 +908,21 @@
   >
 </div>
 
-<ConfirmModal id="modal-submit-helmert" yesAction={submitSession}>
+<ModalConfirm id="modal-submit-helmert" yesAction={submitSession}>
   <p>
     You have only two GCPs, but it is highly advisable to have three or more.
     Please add more, unless you are unable to do so.
   </p>
-</ConfirmModal>
+</ModalConfirm>
+<ModalConfirm id="modal-cancel"
+  yesButtonText="Yes - return to overview"
+  yesAction={cancelSession}
+  noButtonText="No - keep working">
+  <p>Are you sure you want to cancel this session?</p>
+</ModalConfirm>
 <Modal id="modal-anonymous">
   <SigninReminder next={CONTEXT.path} msg="Without an account you can experiment with the interface, but cannot submit your work."/>
 </Modal>
-<Modal id="modal-cancel">
-  <p>Are you sure you want to cancel this session?</p>
-  <button
-    class="button is-success"
-    title="Cancel session and return to map overview"
-    on:click={() => {
-      cancelSession();
-      getModal('modal-cancel').close();
-    }}>Yes - return to overview</button
-  >
-  <button
-    class="button is-danger"
-    title="Continue working"
-    on:click={() => {
-      getModal('modal-cancel').close();
-    }}>No - keep working</button
-  >
-</Modal>
 <Modal id="modal-parcels">
   <p>It can be helpful to use modern-day property lines when georeferencing historical maps.</p>
   <p>When you are zoomed in far enough, you will be able to add the parcels layer.</p>
@@ -991,14 +979,14 @@
     <div class="control-btn-group">
       <ToolUIButton action={() => {
         if (gcpList.length == 2) {
-          getModal('modal-submit-helmert').open()
+          openModal('modal-submit-helmert')
         } else {
           submitSession()
         }
       }} title="Save control points" disabled={!enableSave}><Check /></ToolUIButton>
       <ToolUIButton
         action={() => {
-          getModal('modal-cancel').open();
+          openModal('modal-cancel');
         }}
         title="Cancel georeferencing"
         disabled={!enableButtons}><X /></ToolUIButton
diff --git a/ohmg/frontend/svelte_components/src/components/interfaces/MapPreview.svelte b/ohmg/frontend/svelte_components/src/components/interfaces/MapPreview.svelte
index 6aecf878..feec2e7e 100644
--- a/ohmg/frontend/svelte_components/src/components/interfaces/MapPreview.svelte
+++ b/ohmg/frontend/svelte_components/src/components/interfaces/MapPreview.svelte
@@ -16,8 +16,8 @@
   import ToolUIButton from './widgets/ToolUIButton.svelte';
   import MapboxLogoLink from './widgets/MapboxLogoLink.svelte';
 
-  import { getModal } from '../base/Modal.svelte';
-  import LegendModal from '../modals/LegendModal.svelte';
+  import { openModal } from '../base/Modal.svelte';
+  import LegendModal from '../shared/modals/LegendModal.svelte';
 
   import { makeLayerGroupFromLayerSet } from '../../lib/utils';
   import { LyrMousePosition } from '../../lib/controls';
@@ -152,7 +152,7 @@
     <div class="layer-section-header" style="border-top-width: 1px;">
       <ToolUIButton
         action={() => {
-          getModal('modal-legend').open();
+          openModal('modal-legend');
         }}
         title="Show map key"
       >
diff --git a/ohmg/frontend/svelte_components/src/components/interfaces/MultiMask.svelte b/ohmg/frontend/svelte_components/src/components/interfaces/MultiMask.svelte
index 92081dec..ec255bc0 100644
--- a/ohmg/frontend/svelte_components/src/components/interfaces/MultiMask.svelte
+++ b/ohmg/frontend/svelte_components/src/components/interfaces/MultiMask.svelte
@@ -34,6 +34,9 @@
   import ToolUIButton from './widgets/ToolUIButton.svelte';
   import ExpandElement from './widgets/ExpandElement.svelte';
 
+  import Modal, { openModal } from '../base/Modal.svelte';
+  import ModalConfirm from '../base/ModalConfirm.svelte';
+
   import { usaExtent } from '../../lib/utils';
   import { MapViewer } from '../../lib/viewers';
   import { LyrMousePosition } from '../../lib/controls';
@@ -48,6 +51,9 @@
 
   let currentLayer = null;
 
+  let layerToRemove;
+  let layerToGeoreference;
+
   let layerLookup = {};
   let layerLookupMaskedArr = [];
   let layerLookupUnmaskedArr = [];
@@ -202,7 +208,8 @@
 
   function resetInterface() {
     layerLookupArr.forEach(function (layer) {
-      layerRemoveMask(layer, true);
+      layerToRemove = layer
+      layerRemoveMask();
     });
     addIncomingMasks();
     dirty = false;
@@ -303,7 +310,7 @@
 
   function submitMultiMask() {
     if (DISABLED) {
-      window.alert('You do not have edit permissions for this multimask.');
+      openModal('modal-no-permission')
       return;
     }
     const outGeoJSON = { type: 'FeatureCollection', features: [] };
@@ -393,20 +400,15 @@
     dirty = true;
   }
 
-  function layerRemoveMask(layer, confirm) {
-    if (confirm != true) {
-      confirm = window.confirm('Remove this mask?');
-    }
-    if (confirm) {
-      if (layer.crop) {
-        layer.crop.set('active', false);
-      }
-      trimShapeSource.removeFeature(layer.feature);
-      layer.crop = null;
-      layer.feature = null;
-      updateLayerArr();
-      dirty = true;
+  function layerRemoveMask() {
+    if (layerToRemove.crop) {
+      layerToRemove.crop.set('active', false);
     }
+    trimShapeSource.removeFeature(layerToRemove.feature);
+    layerToRemove.crop = null;
+    layerToRemove.feature = null;
+    updateLayerArr();
+    dirty = true;
   }
 
   function handleKeydown(e) {
@@ -430,6 +432,33 @@
 </script>
 
 <svelte:window on:keydown={handleKeydown} on:keyup={handleKeyup} />
+<Modal id="modal-no-permission">
+  <p>You do not have edit permissions for this multimask.</p>
+</Modal>
+<ModalConfirm id="modal-confirm-remove-mask"
+  yesAction={layerRemoveMask}
+>
+  <p>Remove this layer's mask?</p>
+</ModalConfirm>
+<ModalConfirm id="modal-confirm-reset"
+  yesAction={resetInterface}
+>
+  <p>Reset the interface? All work will be undone up to the last time you saved the multimask,
+    or up to the state of the multimask when you loaded this page if you haven't yet saved.
+  </p>
+</ModalConfirm>
+<ModalConfirm id="modal-confirm-leave-to-georeference"
+  yesAction={() => {
+    window.location.href = layerToGeoreference.georeferenceUrl;
+  }}
+>
+  <p>Update georeferencing for this layer? You will be taken to the georeferencing interface for this layer.
+  </p>
+  <ul>
+    <li>You will lose any unsaved work here, so make sure to save before you go!</li>
+    <li>Editing a layer's GCPs does not change its mask (if it already has a mask).</li>
+  </ul>
+</ModalConfirm>
 <div id="mm-container" class="svelte-component-main">
   <div id="map-container" class="map-container" style="height: calc(100%-35px);">
     <div id="map-viewer" class="map-item rounded-bottom"></div>
@@ -461,7 +490,8 @@
                 <ToolUIButton
                   title="edit georeferencing for this layer"
                   action={() => {
-                    window.location.href = layer.georeferenceUrl;
+                    layerToGeoreference = layer;
+                    openModal('modal-confirm-leave-to-georeference');
                   }}
                   disabled={DISABLED}
                 >
@@ -489,14 +519,21 @@
         <div class="layer-section-subheader" style="overflow-y:auto">
           {#each layerLookupMaskedArr as layer}
             <div style="display:flex;">
-              <ToolUIButton action={() => layerRemoveMask(layer)} title="remove this layer's mask" disabled={DISABLED}>
+              <ToolUIButton
+                action={() => {
+                  layerToRemove = layer;
+                  openModal('modal-confirm-remove-mask')
+                }}
+                title="remove this layer's mask" disabled={DISABLED}
+              >
                 <Trash />
               </ToolUIButton>
               {#if CONTEXT.user.is_authenticated}
                 <ToolUIButton
                   title="Edit georeferencing for this layer"
                   action={() => {
-                    window.location.href = layer.georeferenceUrl;
+                    layerToGeoreference = layer;
+                    openModal('modal-confirm-leave-to-georeference');
                   }}
                 >
                   <MapPin />
@@ -519,7 +556,9 @@
         </div>
       </div>
       <div class="layer-section-header">
-        <ToolUIButton action={resetInterface} title="Cancel (reset)" disabled={!dirty || DISABLED}>
+        <ToolUIButton action={() => {
+              openModal('modal-confirm-reset');
+            }} title="Cancel (reset)" disabled={!dirty || DISABLED}>
           <X />
         </ToolUIButton>
         <ToolUIButton action={submitMultiMask} title="Submit" disabled={!dirty || DISABLED}>
diff --git a/ohmg/frontend/svelte_components/src/components/Splitter.svelte b/ohmg/frontend/svelte_components/src/components/interfaces/Splitter.svelte
similarity index 84%
rename from ohmg/frontend/svelte_components/src/components/Splitter.svelte
rename to ohmg/frontend/svelte_components/src/components/interfaces/Splitter.svelte
index 4696c54d..a8d65c57 100644
--- a/ohmg/frontend/svelte_components/src/components/Splitter.svelte
+++ b/ohmg/frontend/svelte_components/src/components/interfaces/Splitter.svelte
@@ -22,28 +22,28 @@
   import Snap from 'ol/interaction/Snap';
   import LineString from 'ol/geom/LineString';
 
-  import { splitStyles } from '../lib/ol-styles';
-  import { submitPostRequest } from '../lib/requests';
-  import { MapViewer } from '../lib/viewers';
-  import { makeImageLayer } from '../lib/layers';
-  import { DocMousePosition } from '../lib/controls';
+  import { splitStyles } from '../../lib/ol-styles';
+  import { submitPostRequest } from '../../lib/requests';
+  import { MapViewer } from '../../lib/viewers';
+  import { makeImageLayer } from '../../lib/layers';
+  import { DocMousePosition } from '../../lib/controls';
 
-  import Link from './base/Link.svelte';
-  import ExpandElement from './interfaces/widgets/ExpandElement.svelte';
+  import Link from '../base/Link.svelte';
+  import Modal, { openModal } from '../base/Modal.svelte';
+  import ModalConfirm from '../base/ModalConfirm.svelte';
 
-  import Modal, { getModal } from './base/Modal.svelte';
-  import ConfirmNoSplitModal from './modals/ConfirmNoSplitModal.svelte';
+  import SigninReminder from '../shared/SigninReminder.svelte';
+  import ExtendSessionModal from '../shared/modals/ExtendSessionModal.svelte';
 
-  import ToolUIButton from './interfaces/widgets/ToolUIButton.svelte';
-  import ExtendSessionModal from './modals/ExtendSessionModal.svelte';
-
-  import SigninReminder from './common/SigninReminder.svelte';
+  import ExpandElement from './widgets/ExpandElement.svelte';
+  import ToolUIButton from './widgets/ToolUIButton.svelte';
 
   export let CONTEXT;
   export let DOCUMENT;
 
   let viewer;
   let showPreview = true;
+  let errMsg;
 
   let cutLines = [];
   let divisions = [];
@@ -80,7 +80,7 @@
   let autoRedirect;
   function promptRefresh() {
     if (!leaveOkay) {
-      getModal('modal-extend-session').open();
+      openModal('modal-extend-session');
       leaveOkay = true;
       autoRedirect = setTimeout(cancelSplit, 10000);
       timer = setInterval(() => {
@@ -239,7 +239,7 @@
 
     // resetInterface();
     if (!CONTEXT.user.is_authenticated) {
-      getModal('modal-anonymous').open();
+      openModal('modal-anonymous');
     }
   });
 
@@ -300,7 +300,8 @@
         if (result.success) {
           window.location.href = `/map/${DOCUMENT.map}`;
         } else {
-          alert(result.message);
+          errMsg = result.message;
+          openModal("modal-error")
         }
       },
     );
@@ -323,7 +324,8 @@
         if (result.success) {
           window.location.href = `/map/${DOCUMENT.map}`;
         } else {
-          alert(result.message);
+          errMsg = result.message;
+          openModal("modal-error")
         }
       },
     );
@@ -366,7 +368,6 @@
     clearTimeout(autoRedirect);
     setTimeout(promptRefresh, CONTEXT.session_length * 1000 - 10000);
   }
-  console.log(CONTEXT)
 </script>
 
 <svelte:window
@@ -380,40 +381,39 @@
 />
 
 <ExtendSessionModal {CONTEXT} {sessionId} callback={handleExtendSession} bind:countdown />
+
+<Modal id="modal-error">
+  <p>Error!</p>
+  <p>{errMsg}</p>
+</Modal>
 <Modal id="modal-anonymous">
   <SigninReminder next={CONTEXT.path} msg="Without an account you can experiment with the interface, but cannot submit your work."/>
 </Modal>
-
 <Modal id="modal-finished">
   <p>This document has already been prepared!</p>
 </Modal>
-<Modal id="modal-cancel">
-  <p>Are you sure you want to cancel this session?</p>
-  <button
-    class="button is-success"
-    title="Cancel and redirect"
-    on:click={() => {
-      cancelSplit();
-      getModal('modal-cancel').close();
-    }}>Yes</button
-  >
-  <button
-    class="button is-danger"
-    title="Continue session"
-    on:click={() => {
-      getModal('modal-cancel').close();
-    }}>No - keep working</button
-  >
-</Modal>
-<ConfirmNoSplitModal
-  documentId={DOCUMENT.id}
-  {CONTEXT}
-  {sessionId}
-  callback={() => {
-    leaveOkay = true;
-    window.location.href = `/map/${DOCUMENT.map}`;
-  }}
-/>
+<ModalConfirm id="modal-cancel"
+  yesButtonText="Yes - return to overview"
+  yesAction={cancelSplit}
+  noButtonText="No - keep working">
+  <p>Do you want to cancel this session? If this document does not need to be split,
+    you can choose <strong>no split needed</strong> from the map overview.
+  </p>
+</ModalConfirm>
+<ModalConfirm id="modal-confirm-split"
+  yesButtonText={`Yes - split into ${divisions.length} pieces`}
+  yesAction={submitSplit}
+  noButtonText="No - keep working"
+>
+  <p>
+    Is this document ready to be split? Each section should be clearly defined with no slivers or unecessary pieces.
+  </p>
+</ModalConfirm>
+<ModalConfirm id="modal-confirm-reset"
+  yesAction={resetInterface}
+>
+  <p>Reset cutlines to start over?</p>
+</ModalConfirm>
 <div style="height:25px">
   {currentTxt}
   <Link href="https://about.oldinsurancemaps.net/guides/preparation/" external={true}>Learn more</Link>
@@ -450,28 +450,30 @@
       </label>
     </div>
     <div class="control-btn-group">
-      <ToolUIButton action={submitSplit} title="Run split operation" disabled={divisions.length <= 1 || !enableButtons}>
-        <Scissors />
-      </ToolUIButton>
-      <ToolUIButton
-        action={() => {
-          getModal('modal-confirm-no-split').open();
+      <ToolUIButton action={() => {
+          openModal('modal-confirm-split');
         }}
-        title="No split needed"
-        disabled={divisions.length > 0 || !enableButtons}
+        title="Run split operation"
+        disabled={divisions.length <= 1 || !enableButtons}
       >
-        <CheckSquareOffset />
+        <Scissors />
       </ToolUIButton>
       <ToolUIButton
         action={() => {
-          getModal('modal-cancel').open();
+          openModal('modal-cancel');
         }}
         title="Cancel this preparation"
         disabled={sessionId == null || !enableButtons}
       >
         <X />
       </ToolUIButton>
-      <ToolUIButton action={resetInterface} title="Reset interface" disabled={unchanged}>
+      <ToolUIButton 
+        action={() => {
+          openModal('modal-confirm-reset');
+        }}
+        title="Reset interface"
+        disabled={unchanged}
+      >
         <ArrowCounterClockwise />
       </ToolUIButton>
       <ExpandElement elementId="map-container" />
diff --git a/ohmg/frontend/svelte_components/src/components/interfaces/widgets/RefreshMapButton.svelte b/ohmg/frontend/svelte_components/src/components/interfaces/widgets/RefreshMapButton.svelte
index c0914200..6460ffff 100644
--- a/ohmg/frontend/svelte_components/src/components/interfaces/widgets/RefreshMapButton.svelte
+++ b/ohmg/frontend/svelte_components/src/components/interfaces/widgets/RefreshMapButton.svelte
@@ -1,5 +1,5 @@
 <script>
-  import LoadingEllipsis from '../../common/LoadingEllipsis.svelte';
+  import LoadingEllipsis from '../../shared/LoadingEllipsis.svelte';
 
   export let handleRefresh;
   export let label = 'click to refresh content';
diff --git a/ohmg/frontend/svelte_components/src/components/lists/Participants.svelte b/ohmg/frontend/svelte_components/src/components/lists/Participants.svelte
deleted file mode 100644
index 1459435a..00000000
--- a/ohmg/frontend/svelte_components/src/components/lists/Participants.svelte
+++ /dev/null
@@ -1,125 +0,0 @@
-<script>
-  import { TableSort } from 'svelte-tablesort';
-
-  import Link from '../base/Link.svelte';
-  import LoadingEllipsis from '../common/LoadingEllipsis.svelte';
-
-  import { getFromAPI } from '../../lib/requests';
-
-  export let CONTEXT;
-
-  let all_participants = [];
-  let items = [];
-
-  getFromAPI('/api/beta2/users/', CONTEXT.ohmg_api_headers, (result) => {
-    all_participants = result;
-    items = result;
-  });
-
-  function updateFilteredList(filterText) {
-    if (filterText && filterText.length > 0) {
-      items = [];
-      all_participants.forEach(function (p) {
-        const name = p.username.toUpperCase();
-        const filterBy = filterText.toUpperCase();
-        if (name.indexOf(filterBy) > -1) {
-          items.push(p);
-        }
-      });
-    } else {
-      items = all_participants;
-    }
-  }
-  let filterInput;
-  $: updateFilteredList(filterInput);
-
-  function toggleList(userId) {
-    const listEl = document.getElementById(userId);
-    listEl.style.display = listEl.style.display == 'flex' ? 'none' : 'flex';
-    const listBtnEl = document.getElementById(userId + '-btn');
-    listBtnEl.innerText = listBtnEl.innerText == 'show all' ? 'hide all' : 'show all';
-  }
-</script>
-
-<input type="text" id="filterInput" placeholder="Filter by username..." bind:value={filterInput} />
-<div style="overflow-x:auto;">
-  <TableSort {items}>
-    <tr slot="thead">
-      <th data-sort="username" style="max-width:300px;"></th>
-      <th data-sort="username" style="max-width:300px;" title="Name of mapped location">Username</th>
-      <th data-sort="load_ct" title="Maps loaded by this user">Loaded Maps</th>
-      <th
-        data-sort="psesh_ct"
-        style="width:25px; text-align:center; border-left: 1px solid gray;"
-        title="Number of prep sessions">Prep Sessions</th
-      >
-      <th data-sort="gsesh_ct" style="width:25px; text-align:center;" title="Number of georeferencing sessions"
-        >Georef. Sessions</th
-      >
-      <th
-        data-sort="total_ct"
-        style="width:25px; text-align:center; border-left:1px solid gray;"
-        title="Percent complete - G/(U+P+G)">Total Sessions</th
-      >
-      <th
-        data-sort="gcp_ct"
-        style="width:25px; text-align:center; border-left:1px solid gray;"
-        title="Ground control points created">GCPs</th
-      >
-    </tr>
-    <tr slot="tbody" let:item={p} style="height:38px;">
-      <td>
-        <img style="height:30px; width:30px; border-radius:5px;" src={p.image_url} alt={p.username} />
-      </td>
-      <td>
-        <Link href={p.profile_url} title="Profile for {p.username}">
-          {p.username}
-        </Link>
-      </td>
-      <td style="">
-        <div>
-          {p.load_ct}{#if p.maps.length > 0}&nbsp;&mdash;{/if}
-          <!-- {#each p.maps as v, n}
-					{#if n <= 2}
-					<Link href={`/map/${v.identifier}`}>{v.title}</Link>{#if n != p.maps.length - 1},&nbsp;{/if}
-					{/if}
-				{/each} -->
-          {#if p.maps.length > 0}
-            <button id="{p.username}-btn" title="Show loaded maps" on:click={() => toggleList(p.username)}
-              >show list</button
-            >
-          {/if}
-        </div>
-        {#if p.maps.length > 0}
-          <div id={p.username} class="full-volume-list">
-            <ul>
-              {#each p.maps as v}
-                <li><Link href={`/map/${v.identifier}`}>{v.title}</Link></li>
-              {/each}
-            </ul>
-          </div>
-        {/if}
-      </td>
-      <td style="text-align:center; border-left:1px solid gray;">{p.psesh_ct}</td>
-      <td style="text-align:center;">{p.gsesh_ct}</td>
-      <td style="text-align:center; border-left:1px solid gray;">{p.total_ct}</td>
-      <td style="text-align:center; border-left:1px solid gray;">{p.gcp_ct}</td>
-    </tr>
-  </TableSort>
-  {#if all_participants.length === 0}
-    <LoadingEllipsis />
-  {/if}
-</div>
-
-<style>
-  .full-volume-list {
-    display: none;
-  }
-
-  tr th {
-    vertical-align: top;
-  }
-  tr td {
-    vertical-align: top;
-  }
-</style>
diff --git a/ohmg/frontend/svelte_components/src/components/breadcrumbs/MapBreadcrumbs.svelte b/ohmg/frontend/svelte_components/src/components/map/Breadcrumbs.svelte
similarity index 100%
rename from ohmg/frontend/svelte_components/src/components/breadcrumbs/MapBreadcrumbs.svelte
rename to ohmg/frontend/svelte_components/src/components/map/Breadcrumbs.svelte
diff --git a/ohmg/frontend/svelte_components/src/components/Map.svelte b/ohmg/frontend/svelte_components/src/components/map/Map.svelte
similarity index 71%
rename from ohmg/frontend/svelte_components/src/components/Map.svelte
rename to ohmg/frontend/svelte_components/src/components/map/Map.svelte
index 8d5f7108..72dcbff5 100644
--- a/ohmg/frontend/svelte_components/src/components/Map.svelte
+++ b/ohmg/frontend/svelte_components/src/components/map/Map.svelte
@@ -2,48 +2,46 @@
 
   import Wrench from 'phosphor-svelte/lib/Wrench';
 
-  import InfoModalButton from './buttons/InfoModalButton.svelte';
+  import InfoModalButton from '../shared/buttons/InfoModalButton.svelte';
 
-  import ExpandableSection from './base/ExpandableSection.svelte';
-  import TabbedSection from './base/TabbedSection.svelte';
-  import Modal, { getModal } from './base/Modal.svelte';
+  import ExpandableSection from '../base/ExpandableSection.svelte';
+  import TabbedSection from '../base/TabbedSection.svelte';
+  import Modal, { openModal } from '../base/Modal.svelte';
+  import ModalConfirm from '../base/ModalConfirm.svelte';
 
-  import GeoreferenceOverviewModal from './modals/GeoreferenceOverviewModal.svelte';
-  import UnpreparedSectionModal from './modals/UnpreparedSectionModal.svelte';
-  import PreparedSectionModal from './modals/PreparedSectionModal.svelte';
-  import GeoreferencedSectionModal from './modals/GeoreferencedSectionModal.svelte';
-  import MultiMaskModal from './modals/MultiMaskModal.svelte';
-  import NonMapContentModal from './modals/NonMapContentModal.svelte';
-  import GeoreferencePermissionsModal from './modals/GeoreferencePermissionsModal.svelte';
-  import ConfirmNoSplitModal from './modals/ConfirmNoSplitModal.svelte';
-  import ConfirmBulkNoSplitModal from './modals/ConfirmBulkNoSplitModal.svelte';
-  import ConfirmUngeoreferenceModal from './modals/ConfirmUngeoreferenceModal.svelte';
+  import GeoreferenceOverviewModal from '../shared/modals/GeoreferenceOverviewModal.svelte';
+  import UnpreparedSectionModal from '../shared/modals/UnpreparedSectionModal.svelte';
+  import PreparedSectionModal from '../shared/modals/PreparedSectionModal.svelte';
+  import GeoreferencedSectionModal from '../shared/modals/GeoreferencedSectionModal.svelte';
+  import MultiMaskModal from '../shared/modals/MultiMaskModal.svelte';
+  import NonMapContentModal from '../shared/modals/NonMapContentModal.svelte';
+  import GeoreferencePermissionsModal from '../shared/modals/GeoreferencePermissionsModal.svelte';
 
-  import MapPreview from './interfaces/MapPreview.svelte';
-  import BasicDocViewer from './interfaces/BasicDocViewer.svelte';
-  import BasicLayerViewer from './interfaces/BasicLayerViewer.svelte';
+  import MapPreview from '../interfaces/MapPreview.svelte';
+  import BasicDocViewer from '../interfaces/BasicDocViewer.svelte';
+  import BasicLayerViewer from '../interfaces/BasicLayerViewer.svelte';
 
-  import SigninReminder from './common/SigninReminder.svelte';
-  import LoadingEllipsis from './common/LoadingEllipsis.svelte';
-  import LoadingMask from './common/LoadingMask.svelte';
+  import SigninReminder from '../shared/SigninReminder.svelte';
+  import LoadingEllipsis from '../shared/LoadingEllipsis.svelte';
+  import LoadingMask from '../shared/LoadingMask.svelte';
 
-  import MultimaskSection from './map/MultimaskSection.svelte'
-  import MosaicDownload from './map/MosaicDownload.svelte';
-  import Details from './map/Details.svelte';
+  import MultimaskSection from './MultimaskSection.svelte'
+  import MosaicDownload from './MosaicDownload.svelte';
+  import Details from './Details.svelte';
 
-  import MapContributors from './tables/MapContributors.svelte';
-  import Sessions from './tables/Sessions.svelte';
+  import MapContributors from '../tables/MapContributors.svelte';
+  import Sessions from '../tables/Sessions.svelte';
 
-  import MapBreadcrumbs from './breadcrumbs/MapBreadcrumbs.svelte';
+  import Breadcrumbs from './Breadcrumbs.svelte';
 
-  import UnpreparedCard from './cards/UnpreparedCard.svelte';
-  import PreparedCard from './cards/PreparedCard.svelte';
-  import LayerCard from './cards/LayerCard.svelte';
-  import SkippedCard from './cards/SkippedCard.svelte';
-  import NonMapCard from './cards/NonMapCard.svelte';
+  import UnpreparedCard from '../shared/cards/UnpreparedCard.svelte';
+  import PreparedCard from '../shared/cards/PreparedCard.svelte';
+  import LayerCard from '../shared/cards/LayerCard.svelte';
+  import SkippedCard from '../shared/cards/SkippedCard.svelte';
+  import NonMapCard from '../shared/cards/NonMapCard.svelte';
 
-  import { getFromAPI, submitPostRequest } from '../lib/requests';
-  import SkippedSectionHelpModal from './modals/SkippedSectionHelpModal.svelte';
+  import { getFromAPI, submitPostRequest } from '../../lib/requests';
+  import SkippedSectionHelpModal from '../shared/modals/SkippedSectionHelpModal.svelte';
 
   export let CONTEXT;
   export let MAP;
@@ -174,6 +172,12 @@
       }
       MAP = result;
       processing = false;
+      // force close any sections that have been emptied
+      if (MAP.item_lookup.unprepared.length == 0) {sectionVis['unprepared'] = false}
+      if (MAP.item_lookup.prepared.length == 0) {sectionVis['prepared'] = false}
+      if (MAP.item_lookup.georeferenced.length == 0) {sectionVis['georeferenced'] = false}
+      if (MAP.item_lookup.skipped.length == 0) {sectionVis['skipped'] = false}
+      if (MAP.item_lookup.nonmaps.length == 0) {sectionVis['nonmaps'] = false}
     });
   }
 
@@ -211,14 +215,21 @@
     if (response.success) {
       pollMapSummary();
     } else {
-      alert(response.message);
+      errMsg = response.message;
+      openModal("modal-error")
     }
     processing = false;
     bulkPrepareList = [];
   }
-  function postDocumentUnprepare(documentId) {
+  function postDocumentUnprepare() {
     processing = true;
-    submitPostRequest(`/document/${documentId}`, CONTEXT.ohmg_post_headers, 'unprepare', {}, pollMapSummaryIfSuccess);
+    submitPostRequest(
+      `/document/${documentToUnprepare}`,
+      CONTEXT.ohmg_post_headers,
+      'unprepare',
+      {},
+      pollMapSummaryIfSuccess
+    );
   }
   function postLoadDocument(documentId) {
     documentsLoading = true;
@@ -236,13 +247,13 @@
     );
   }
 
-  function postSkipRegion(regionId, setTo) {
+  function postSkipRegion(setSkipped) {
     processing = true;
     submitPostRequest(
-      `/region/${regionId}`,
+      `/region/${regionToSkip}`,
       CONTEXT.ohmg_post_headers,
       'set-skip',
-      { skipped: setTo },
+      { skipped: setSkipped },
       pollMapSummaryIfSuccess,
     );
   }
@@ -259,7 +270,8 @@
       },
       (response) => {
         if (!response.success) {
-          alert(response.message);
+          errMsg = response.message;
+          openModal("modal-error")
         }
         previewRefreshable = true;
         processing = false;
@@ -267,6 +279,43 @@
     );
   }
 
+  function postBulkNoSplit() {
+    processing = true;
+    submitPostRequest(
+      `/split/`,
+      CONTEXT.ohmg_post_headers,
+      'bulk-no-split',
+      {
+        bulkNoSplitIds: bulkPrepareList,
+      },
+      pollMapSummaryIfSuccess,
+    );
+  }
+
+  function postNoSplit() {
+    processing = true;
+    submitPostRequest(
+      `/split/${documentToNoSplit}/`,
+      CONTEXT.ohmg_post_headers,
+      'no-split',
+      {},
+      pollMapSummaryIfSuccess,
+    );
+  }
+
+  function postUngeoreference() {
+    processing = true;
+    submitPostRequest(
+      `/layer/${undoGeorefLayerId}`,
+      CONTEXT.ohmg_post_headers,
+      'ungeoreference',
+      {},
+      pollMapSummaryIfSuccess,
+    );
+  }
+
+  let errMsg;
+
   let classifyingLayers = false;
   let bulkPreparing = false;
   let bulkPrepareList = [];
@@ -277,7 +326,12 @@
   let modalLyrUrl = '';
   let modalExtent = [];
 
-  let splitDocumentId;
+  let documentToNoSplit;
+  let documentToUnprepare;
+  let regionToSetAsNonMap;
+  let regionToSetAsMap;
+  let regionToSkip;
+  let regionToUnskip;
   let undoGeorefLayerId;
 
   let processing = false;
@@ -295,6 +349,110 @@
     });
   }}
 />
+<Modal id="modal-error">
+  <p>Error!</p>
+  <p>{errMsg}</p>
+</Modal>
+
+<ModalConfirm id="modal-confirm-no-split"
+  yesAction={postNoSplit}
+>
+  <p>Are you sure this document does not need to be split?</p>
+</ModalConfirm>
+<ModalConfirm
+  id="modal-confirm-bulk-no-split"
+  yesButtonText="Yes - each one only contains one map"}
+  yesAction={postBulkNoSplit}
+>
+  <p>
+    Are you sure these documents do not need to be split?
+    ({bulkPrepareList.length} selected)
+  </p>
+</ModalConfirm>
+<ModalConfirm
+  id="modal-confirm-unprepare"
+  yesAction={postDocumentUnprepare}
+>
+  <p>
+    Are you sure you want to unprepare this document?
+  </p>
+  <p>If it has been split into multiple pieces, and any of those pieces have been georeferenced,
+    you will not be able to proceed&mdash;you must <strong>ungeoreference</strong> each piece first.
+  </p>
+</ModalConfirm>
+<ModalConfirm
+  id="modal-confirm-set-nonmap"
+  yesAction={() => {
+    postRegionCategory(regionToSetAsNonMap, 'non-map');
+  }}
+>
+  <p>
+    Are you sure you want to set this as a "non-map"? Use this for non-cartographic
+    content like title pages and text index pages.
+  </p>
+  <p>This action will move the piece to the "non-map" section. It can easily be undone
+    by clicking <strong>this <em>is</em> a map</strong>.
+  </p>
+</ModalConfirm>
+<ModalConfirm
+  id="modal-confirm-skip-region"
+  yesAction={() => {
+    postSkipRegion(true);
+  }}
+>
+  <p>
+    Are you sure you want to skip this piece?
+  </p>
+  <p>Skipping a piece will remove it from the overall georeferencing workflow, so
+    it will not contribute to completion percentages or progress calculations. This 
+    is appropriate for small pieces that are exceedingly difficult, or impossible,
+    to georeference with the current tools available.
+  </p>
+</ModalConfirm>
+<ModalConfirm
+  id="modal-confirm-unprepare"
+  yesAction={postDocumentUnprepare}
+>
+  <p>
+    Are you sure you want to unprepare this document?
+  </p>
+  <p>If it has been split into multiple pieces, and any of those pieces have been georeferenced,
+    you will not be able to proceed&mdash;you must <strong>ungeoreference</strong> each piece first.
+  </p>
+</ModalConfirm>
+<ModalConfirm id="modal-confirm-ungeoreference"
+  yesAction={postUngeoreference}>
+  <p>
+    Are you sure you want to remove all georeferencing information for this layer? This operation cannot be reversed,
+    and is only necessary if the preparation step for this document needs to be redone.
+  </p>
+  <p>
+    If you only need to improve the ground control points for this layer, click <strong>edit georeferencing</strong>.
+  </p>
+</ModalConfirm>
+<ModalConfirm
+  id="modal-confirm-set-map"
+  yesAction={() => {
+    postRegionCategory(regionToSetAsMap, 'map');
+  }}
+>
+  <p>
+    Set this piece as a map? Doing so will move it back into the <strong>Prepared</strong> section
+    where it can be georeferenced.
+  </p>
+</ModalConfirm>
+<ModalConfirm
+  id="modal-confirm-unskip-region"
+  yesAction={() => {
+    postSkipRegion(false);
+  }}
+>
+  <p>
+    Are you sure you want to unskip this piece? Doing so will move it back into the
+    <strong>Prepared</strong> section where it can be georeferenced.
+  </p>
+</ModalConfirm>
+
 <GeoreferenceOverviewModal id={'modal-georeference-overview'} />
 <UnpreparedSectionModal id={'modal-unprepared'} />
 <PreparedSectionModal id={'modal-prepared'} />
@@ -312,14 +470,11 @@
     {/if}
   {/each}
 </Modal>
-<ConfirmNoSplitModal bind:processing {CONTEXT} documentId={splitDocumentId} callback={pollMapSummaryIfSuccess} />
-<ConfirmBulkNoSplitModal bind:processing {CONTEXT} bind:bulkPrepareList callback={pollMapSummaryIfSuccess} />
-<ConfirmUngeoreferenceModal bind:processing {CONTEXT} layerId={undoGeorefLayerId} callback={pollMapSummaryIfSuccess} />
 {#if processing}
   <LoadingMask />
 {/if}
 <main>
-  <MapBreadcrumbs {LOCALE} {MAP} />
+  <Breadcrumbs {LOCALE} {MAP} />
   <ExpandableSection TITLE="Summary" bind:EXPANDED={sectionVis['summary']}>
     <TabbedSection tabs={[
       {id: "details", title: "Details"},
@@ -455,7 +610,7 @@
           disabled={bulkPrepareList.length === 0}
           title="Submit documents for bulk preparation"
           on:click={() => {
-            getModal('modal-confirm-bulk-no-split').open();
+            openModal('modal-confirm-bulk-no-split');
             bulkPreparing = false;
           }}>Submit</button
         >
@@ -483,9 +638,9 @@
           bind:reinitModalMap
           {postLoadDocument}
           bind:documentsLoading
-          bind:splitDocumentId
           bind:bulkPreparing
           bind:bulkPrepareList
+          bind:documentToNoSplit
         />
       {/each}
     </div>
@@ -508,9 +663,9 @@
             bind:modalExtent
             bind:modalIsGeospatial
             bind:reinitModalMap
-            {postDocumentUnprepare}
-            {postRegionCategory}
-            {postSkipRegion}
+            bind:documentToUnprepare
+            bind:regionToSetAsNonMap
+            bind:regionToSkip
           />
         {/each}
       </div>
@@ -596,7 +751,7 @@
             bind:modalExtent
             bind:modalIsGeospatial
             bind:reinitModalMap
-            {postSkipRegion}
+            bind:regionToUnskip
           />
         {/each}
       </div>
@@ -618,7 +773,7 @@
             bind:modalExtent
             bind:modalIsGeospatial
             bind:reinitModalMap
-            {postRegionCategory}
+            bind:regionToSetAsMap
           />
         {/each}
       </div>
diff --git a/ohmg/frontend/svelte_components/src/components/map/MultimaskSection.svelte b/ohmg/frontend/svelte_components/src/components/map/MultimaskSection.svelte
index ab402007..dcc69206 100644
--- a/ohmg/frontend/svelte_components/src/components/map/MultimaskSection.svelte
+++ b/ohmg/frontend/svelte_components/src/components/map/MultimaskSection.svelte
@@ -1,4 +1,5 @@
 <script>
+    import Modal, { openModal } from "../base/Modal.svelte";
     import { getFromAPI } from "../../lib/requests";
     import { submitPostRequest } from "../../lib/requests";
     import MultiMask from "../interfaces/MultiMask.svelte";
@@ -11,6 +12,8 @@
 
     let dirty = false;
 
+    let errMsg;
+
     let currentLayerSetId = "main-content";
     let layerSetLookup = {};
     $: currentLayerSet = layerSetLookup[currentLayerSetId]
@@ -27,13 +30,12 @@
 
     function handleMultimaskSubmitResponse(response) {
         if (response.success) {
-            window.alert('Masks saved successfully.');
+            openModal("modal-save-success")
             dirty = false;
             initLayersets();
         } else {
-            let errMsg = 'Error! MultiMask not saved. You must remove and remake the following masks:\n';
-            errMsg += response.message;
-            alert(errMsg);
+            errMsg = response.message;
+            openModal("modal-save-error");
         }
     }
 
@@ -51,6 +53,16 @@
         );
     }
 </script>
+<Modal id="modal-save-success">
+    <p>Masks saved successfully.</p>
+</Modal>
+<Modal id="modal-save-error">
+    <p>Error! MultiMask not saved. The following layers have errors:</p>
+    <p>{@html errMsg}</p>
+    <p>You must fix these errors before you can save your work. Keep in mind it is
+        sometimes easier to remove and recreate a mask than track down and fix
+        specific issues.</p>
+</Modal>
 <p>
     <span>
         Select which multimask to work on:
diff --git a/ohmg/frontend/svelte_components/src/components/modals/ConfirmBulkNoSplitModal.svelte b/ohmg/frontend/svelte_components/src/components/modals/ConfirmBulkNoSplitModal.svelte
deleted file mode 100644
index 3ed38ab9..00000000
--- a/ohmg/frontend/svelte_components/src/components/modals/ConfirmBulkNoSplitModal.svelte
+++ /dev/null
@@ -1,44 +0,0 @@
-<script>
-  import Modal, { getModal } from '../base/Modal.svelte';
-  import { submitPostRequest } from '../../lib/requests';
-
-  export let CONTEXT;
-  export let bulkPrepareList;
-  export let processing;
-  export let callback = null;
-
-  function postBulkNoSplit() {
-    processing = true;
-    submitPostRequest(
-      `/split/`,
-      CONTEXT.ohmg_post_headers,
-      'bulk-no-split',
-      {
-        bulkNoSplitIds: bulkPrepareList,
-      },
-      callback,
-    );
-  }
-</script>
-
-<Modal id="modal-confirm-bulk-no-split">
-  <p>
-    Are you sure {bulkPrepareList.length > 1 ? `these ${bulkPrepareList.length} documents do` : 'this document does'} not
-    need to be split?
-  </p>
-  <button
-    class="button is-success"
-    title="Confirm preparation"
-    on:click={() => {
-      postBulkNoSplit();
-      getModal('modal-confirm-bulk-no-split').close();
-    }}>Yes - {bulkPrepareList.length > 1 ? `each one only contains` : 'it only contains'} one map</button
-  >
-  <button
-    class="button is-danger"
-    title="Cancel preparation"
-    on:click={() => {
-      getModal('modal-confirm-bulk-no-split').close();
-    }}>Cancel</button
-  >
-</Modal>
diff --git a/ohmg/frontend/svelte_components/src/components/modals/ConfirmNoSplitModal.svelte b/ohmg/frontend/svelte_components/src/components/modals/ConfirmNoSplitModal.svelte
deleted file mode 100644
index ffd6db41..00000000
--- a/ohmg/frontend/svelte_components/src/components/modals/ConfirmNoSplitModal.svelte
+++ /dev/null
@@ -1,42 +0,0 @@
-<script>
-  import Modal, { getModal } from '../base/Modal.svelte';
-  import { submitPostRequest } from '../../lib/requests';
-
-  export let CONTEXT;
-  export let documentId;
-  export let sessionId = null;
-  export let processing;
-  export let callback = null;
-
-  function postNoSplit() {
-    processing = true;
-    submitPostRequest(
-      `/split/${documentId}/`,
-      CONTEXT.ohmg_post_headers,
-      'no-split',
-      {
-        sessionId: sessionId,
-      },
-      callback,
-    );
-  }
-</script>
-
-<Modal id="modal-confirm-no-split">
-  <p>Are you sure this document does not need to be split?</p>
-  <button
-    class="button is-success"
-    title="Confirm no split needed"
-    on:click={() => {
-      postNoSplit();
-      getModal('modal-confirm-no-split').close();
-    }}>Yes - it only contains one map</button
-  >
-  <button
-    class="button is-danger"
-    title="Cancel preparation"
-    on:click={() => {
-      getModal('modal-confirm-no-split').close();
-    }}>Cancel</button
-  >
-</Modal>
diff --git a/ohmg/frontend/svelte_components/src/components/modals/ItemDownloadSectionModal.svelte b/ohmg/frontend/svelte_components/src/components/modals/ItemDownloadSectionModal.svelte
deleted file mode 100644
index 60d6bdf0..00000000
--- a/ohmg/frontend/svelte_components/src/components/modals/ItemDownloadSectionModal.svelte
+++ /dev/null
@@ -1,16 +0,0 @@
-<script>
-  import Modal from '../base/Modal.svelte';
-  import HowToUseXyz from '../overviews/sections/HowToUseXYZ.svelte';
-
-  export let id;
-</script>
-
-<Modal {id}>
-  <h3>Download & Web Services</h3>
-  <p>
-    After multiple pages have been georeferenced and a multimask has been created, a single mosaic can be generated from
-    all of this item's layers. Once created, the mosaic can be downloaded as a GeoTIFF, or integrated as a web service
-    into any common GIS or web GIS software via the <strong>XYZ tiles URL</strong>.
-  </p>
-  <HowToUseXyz />
-</Modal>
diff --git a/ohmg/frontend/svelte_components/src/components/modals/ResourceDownloadSectionModal.svelte b/ohmg/frontend/svelte_components/src/components/modals/ResourceDownloadSectionModal.svelte
deleted file mode 100644
index 3b959eb9..00000000
--- a/ohmg/frontend/svelte_components/src/components/modals/ResourceDownloadSectionModal.svelte
+++ /dev/null
@@ -1,11 +0,0 @@
-<script>
-  import Modal from '../base/Modal.svelte';
-  import HowToUseXyz from '../overviews/sections/HowToUseXYZ.svelte';
-
-  export let id;
-</script>
-
-<Modal {id}>
-  <h3>Download & Web Services</h3>
-  <HowToUseXyz />
-</Modal>
diff --git a/ohmg/frontend/svelte_components/src/components/overviews/sections/HowToUseXYZ.svelte b/ohmg/frontend/svelte_components/src/components/overviews/sections/HowToUseXYZ.svelte
deleted file mode 100644
index 351bc92c..00000000
--- a/ohmg/frontend/svelte_components/src/components/overviews/sections/HowToUseXYZ.svelte
+++ /dev/null
@@ -1,36 +0,0 @@
-<script>
-  import Link from '../../base/Link.svelte';
-</script>
-
-<h4>How to use XYZ tiles in desktop software</h4>
-<ul>
-  <li>
-    <Link
-      href="https://docs.qgis.org/3.22/en/docs/user_manual/managing_data_source/opening_data.html#using-xyz-tile-services"
-      external="true">QGIS</Link
-    >
-  </li>
-  <li>
-    <Link href="https://esribelux.com/2021/04/16/xyz-tile-layers-in-arcgis-platform/" external="true">ArcGIS</Link>
-  </li>
-</ul>
-<h4>How to use XYZ tiles on the web</h4>
-<ul>
-  <li><Link href="https://leafletjs.com/reference.html#tilelayer" external="true">Leaflet</Link></li>
-  <li><Link href="https://openlayers.org/en/latest/examples/xyz.html" external="true">OpenLayers</Link></li>
-  <li>
-    <Link href="https://maplibre.org/maplibre-gl-js-docs/example/map-tiles/" external="true">Mapbox/MapLibre GL JS</Link
-    >
-  </li>
-  <li>
-    <Link
-      href="https://doc.arcgis.com/en/arcgis-online/create-maps/add-layers-from-url.htm#ESRI_SECTION1_13A68145A4F94A338AB2002AD5F9844D"
-      external="true">ArcGIS Online</Link
-    >
-  </li>
-  <li>
-    <Link href="https://learnosm.org/en/beginner/id-editor/#configuring-the-background-layer" external="true"
-      >OpenHistoricalMap (iD Editor)</Link
-    >
-  </li>
-</ul>
diff --git a/ohmg/frontend/svelte_components/src/components/breadcrumbs/PlaceBreadcrumbsSelect.svelte b/ohmg/frontend/svelte_components/src/components/place/Breadcrumbs.svelte
similarity index 100%
rename from ohmg/frontend/svelte_components/src/components/breadcrumbs/PlaceBreadcrumbsSelect.svelte
rename to ohmg/frontend/svelte_components/src/components/place/Breadcrumbs.svelte
diff --git a/ohmg/frontend/svelte_components/src/components/overviews/Place.svelte b/ohmg/frontend/svelte_components/src/components/place/Place.svelte
similarity index 96%
rename from ohmg/frontend/svelte_components/src/components/overviews/Place.svelte
rename to ohmg/frontend/svelte_components/src/components/place/Place.svelte
index 4140871a..f1a1b6db 100644
--- a/ohmg/frontend/svelte_components/src/components/overviews/Place.svelte
+++ b/ohmg/frontend/svelte_components/src/components/place/Place.svelte
@@ -1,5 +1,5 @@
 <script>
-  import PlaceBreadcrumbsSelect from '../breadcrumbs/PlaceBreadcrumbsSelect.svelte';
+  import Breadcrumbs from './Breadcrumbs.svelte';
   import Maps from '../tables/Maps.svelte';
 
   export let CONTEXT;
@@ -27,7 +27,7 @@
   }
 </script>
 
-<PlaceBreadcrumbsSelect bind:PLACE {update} />
+<Breadcrumbs bind:PLACE {update} />
 
 <div style="display:flex;">
   <div id="sub-locale-panel" style="margin-right:15px; min-width:250px;">
diff --git a/ohmg/frontend/svelte_components/src/components/breadcrumbs/ResourceBreadcrumbs.svelte b/ohmg/frontend/svelte_components/src/components/resource/Breadcrumbs.svelte
similarity index 100%
rename from ohmg/frontend/svelte_components/src/components/breadcrumbs/ResourceBreadcrumbs.svelte
rename to ohmg/frontend/svelte_components/src/components/resource/Breadcrumbs.svelte
diff --git a/ohmg/frontend/svelte_components/src/components/resource/Details.svelte b/ohmg/frontend/svelte_components/src/components/resource/Details.svelte
index e5581adf..e0aff92f 100644
--- a/ohmg/frontend/svelte_components/src/components/resource/Details.svelte
+++ b/ohmg/frontend/svelte_components/src/components/resource/Details.svelte
@@ -4,10 +4,10 @@
   import { Download } from "phosphor-svelte";
 
   import Link from '../base/Link.svelte';
-  import ResourceDownloadSectionModal from '../modals/ResourceDownloadSectionModal.svelte';
+  import ResourceDownloadSectionModal from '../shared/modals/ResourceDownloadSectionModal.svelte';
 
   import { makeTitilerXYZUrl } from '../../lib/utils';
-  import InfoModalButton from '../buttons/InfoModalButton.svelte';
+  import InfoModalButton from '../shared/buttons/InfoModalButton.svelte';
 
   export let CONTEXT;
   export let RESOURCE;
diff --git a/ohmg/frontend/svelte_components/src/components/Resource.svelte b/ohmg/frontend/svelte_components/src/components/resource/Resource.svelte
similarity index 95%
rename from ohmg/frontend/svelte_components/src/components/Resource.svelte
rename to ohmg/frontend/svelte_components/src/components/resource/Resource.svelte
index 56d5b305..e1d5b93b 100644
--- a/ohmg/frontend/svelte_components/src/components/Resource.svelte
+++ b/ohmg/frontend/svelte_components/src/components/resource/Resource.svelte
@@ -5,18 +5,18 @@
 
   import { getCenter } from 'ol/extent';
 
-  import Link from './base/Link.svelte';
-  import Sessions from './tables/Sessions.svelte';
-  import BasicDocViewer from './interfaces/BasicDocViewer.svelte';
-  import BasicLayerViewer from './interfaces/BasicLayerViewer.svelte';
-  import ConditionalDoubleChevron from './buttons/ConditionalDoubleChevron.svelte';
-  import ToolUIButton from './interfaces/widgets/ToolUIButton.svelte';
+  import Link from '../base/Link.svelte';
+  import Sessions from '../tables/Sessions.svelte';
+  import BasicDocViewer from '../interfaces/BasicDocViewer.svelte';
+  import BasicLayerViewer from '../interfaces/BasicLayerViewer.svelte';
+  import ConditionalDoubleChevron from '../shared/buttons/ConditionalDoubleChevron.svelte';
+  import ToolUIButton from '../interfaces/widgets/ToolUIButton.svelte';
 
-  import Details from './resource/Details.svelte';
+  import Details from './Details.svelte';
 
-  import ResourceBreadcrumbs from './breadcrumbs/ResourceBreadcrumbs.svelte';
+  import ResourceBreadcrumbs from './Breadcrumbs.svelte';
 
-  import { makeTitilerXYZUrl } from '../lib/utils';
+  import { makeTitilerXYZUrl } from '../../lib/utils';
 
   export let CONTEXT;
   export let RESOURCE;
diff --git a/ohmg/frontend/svelte_components/src/components/overviews/Browse.svelte b/ohmg/frontend/svelte_components/src/components/search/Browse.svelte
similarity index 95%
rename from ohmg/frontend/svelte_components/src/components/overviews/Browse.svelte
rename to ohmg/frontend/svelte_components/src/components/search/Browse.svelte
index 1df59a6d..efdeae70 100644
--- a/ohmg/frontend/svelte_components/src/components/overviews/Browse.svelte
+++ b/ohmg/frontend/svelte_components/src/components/search/Browse.svelte
@@ -1,7 +1,7 @@
 <script>
   import Maps from '../tables/Maps.svelte';
-  import Places from '../lists/Places.svelte';
-  import MapBrowse from '../interfaces/MapBrowse.svelte';
+  import Places from '../tables/Places.svelte';
+  import MapBrowse from './MapBrowse.svelte';
 
   export let CONTEXT;
   export let PLACES_CT;
diff --git a/ohmg/frontend/svelte_components/src/components/interfaces/MapBrowse.svelte b/ohmg/frontend/svelte_components/src/components/search/MapBrowse.svelte
similarity index 100%
rename from ohmg/frontend/svelte_components/src/components/interfaces/MapBrowse.svelte
rename to ohmg/frontend/svelte_components/src/components/search/MapBrowse.svelte
diff --git a/ohmg/frontend/svelte_components/src/components/common/LoadingEllipsis.svelte b/ohmg/frontend/svelte_components/src/components/shared/LoadingEllipsis.svelte
similarity index 100%
rename from ohmg/frontend/svelte_components/src/components/common/LoadingEllipsis.svelte
rename to ohmg/frontend/svelte_components/src/components/shared/LoadingEllipsis.svelte
diff --git a/ohmg/frontend/svelte_components/src/components/common/LoadingMask.svelte b/ohmg/frontend/svelte_components/src/components/shared/LoadingMask.svelte
similarity index 100%
rename from ohmg/frontend/svelte_components/src/components/common/LoadingMask.svelte
rename to ohmg/frontend/svelte_components/src/components/shared/LoadingMask.svelte
diff --git a/ohmg/frontend/svelte_components/src/components/common/SigninReminder.svelte b/ohmg/frontend/svelte_components/src/components/shared/SigninReminder.svelte
similarity index 100%
rename from ohmg/frontend/svelte_components/src/components/common/SigninReminder.svelte
rename to ohmg/frontend/svelte_components/src/components/shared/SigninReminder.svelte
diff --git a/ohmg/frontend/svelte_components/src/components/buttons/ConditionalDoubleChevron.svelte b/ohmg/frontend/svelte_components/src/components/shared/buttons/ConditionalDoubleChevron.svelte
similarity index 100%
rename from ohmg/frontend/svelte_components/src/components/buttons/ConditionalDoubleChevron.svelte
rename to ohmg/frontend/svelte_components/src/components/shared/buttons/ConditionalDoubleChevron.svelte
diff --git a/ohmg/frontend/svelte_components/src/components/buttons/InfoModalButton.svelte b/ohmg/frontend/svelte_components/src/components/shared/buttons/InfoModalButton.svelte
similarity index 76%
rename from ohmg/frontend/svelte_components/src/components/buttons/InfoModalButton.svelte
rename to ohmg/frontend/svelte_components/src/components/shared/buttons/InfoModalButton.svelte
index 07ff75ad..9d0230c3 100644
--- a/ohmg/frontend/svelte_components/src/components/buttons/InfoModalButton.svelte
+++ b/ohmg/frontend/svelte_components/src/components/shared/buttons/InfoModalButton.svelte
@@ -1,7 +1,7 @@
 <script>
   import Question from 'phosphor-svelte/lib/Question';
 
-  import { getModal } from '../base/Modal.svelte';
+  import { openModal } from '../../base/Modal.svelte';
 
   export let modalId;
   export let size = '1em';
@@ -12,7 +12,7 @@
   {title}
   class="is-icon-link"
   on:click={() => {
-    getModal(modalId).open();
+    openModal(modalId);
   }}
   ><Question {size} />
 </button>
diff --git a/ohmg/frontend/svelte_components/src/components/cards/LayerCard.svelte b/ohmg/frontend/svelte_components/src/components/shared/cards/LayerCard.svelte
similarity index 95%
rename from ohmg/frontend/svelte_components/src/components/cards/LayerCard.svelte
rename to ohmg/frontend/svelte_components/src/components/shared/cards/LayerCard.svelte
index 1b1c0550..84f15a61 100644
--- a/ohmg/frontend/svelte_components/src/components/cards/LayerCard.svelte
+++ b/ohmg/frontend/svelte_components/src/components/shared/cards/LayerCard.svelte
@@ -4,13 +4,11 @@
   import DownloadSimple from 'phosphor-svelte/lib/DownloadSimple';
   import MapPin from 'phosphor-svelte/lib/MapPin';
 
-  import { getModal } from '../base/Modal.svelte';
+  import { openModal } from '../../base/Modal.svelte';
+  import Link from '../../base/Link.svelte';
+  import BaseCard from '../../base/Card.svelte';
 
-  import Link from '../base/Link.svelte';
-
-  import BaseCard from '../base/Card.svelte';
-
-  import { copyToClipboard } from '../../lib/utils';
+  import { copyToClipboard } from '../../../lib/utils';
 
   export let CONTEXT;
   export let LAYERSET_CATEGORIES;
@@ -40,7 +38,7 @@
         modalLyrUrl = layer.urls.cog;
         modalExtent = layer.extent;
         modalIsGeospatial = true;
-        getModal('modal-simple-viewer').open();
+        openModal('modal-simple-viewer');
         reinitModalMap = [{}];
       }}
     >
@@ -70,7 +68,7 @@
                 : 'Undo georeferencing for this layer'}
               on:click={() => {
                 undoGeorefLayerId = layer.id;
-                getModal('modal-confirm-ungeoreference').open();
+                openModal('modal-confirm-ungeoreference');
               }}
             >
               <ArrowCounterClockwise /> ungeoreference
diff --git a/ohmg/frontend/svelte_components/src/components/cards/MapItem.svelte b/ohmg/frontend/svelte_components/src/components/shared/cards/MapItem.svelte
similarity index 94%
rename from ohmg/frontend/svelte_components/src/components/cards/MapItem.svelte
rename to ohmg/frontend/svelte_components/src/components/shared/cards/MapItem.svelte
index 3b94eaef..a83b011c 100644
--- a/ohmg/frontend/svelte_components/src/components/cards/MapItem.svelte
+++ b/ohmg/frontend/svelte_components/src/components/shared/cards/MapItem.svelte
@@ -1,5 +1,5 @@
 <script>
-  import Link from '../base/Link.svelte';
+  import Link from '../../base/Link.svelte';
 
   export let MAP;
 </script>
diff --git a/ohmg/frontend/svelte_components/src/components/cards/NonMapCard.svelte b/ohmg/frontend/svelte_components/src/components/shared/cards/NonMapCard.svelte
similarity index 81%
rename from ohmg/frontend/svelte_components/src/components/cards/NonMapCard.svelte
rename to ohmg/frontend/svelte_components/src/components/shared/cards/NonMapCard.svelte
index d9f1b077..6717d535 100644
--- a/ohmg/frontend/svelte_components/src/components/cards/NonMapCard.svelte
+++ b/ohmg/frontend/svelte_components/src/components/shared/cards/NonMapCard.svelte
@@ -1,11 +1,9 @@
 <script>
   import MapTrifold from 'phosphor-svelte/lib/MapTrifold';
 
-  import { getModal } from '../base/Modal.svelte';
-
-  import Link from '../base/Link.svelte';
-
-  import BaseCard from '../base/Card.svelte';
+  import { openModal } from '../../base/Modal.svelte';
+  import Link from '../../base/Link.svelte';
+  import BaseCard from '../../base/Card.svelte';
 
   export let nonmap;
   export let userCanEdit;
@@ -13,7 +11,7 @@
   export let modalExtent;
   export let modalIsGeospatial;
   export let reinitModalMap;
-  export let postRegionCategory;
+  export let regionToSetAsMap;
 </script>
 
 <BaseCard>
@@ -28,7 +26,7 @@
         modalLyrUrl = nonmap.urls.image;
         modalExtent = [0, -nonmap.image_size[1], nonmap.image_size[0], 0];
         modalIsGeospatial = false;
-        getModal('modal-simple-viewer').open();
+        openModal('modal-simple-viewer');
         reinitModalMap = [{}];
       }}
     >
@@ -43,7 +41,8 @@
             <button
               class="is-text-link"
               on:click={() => {
-                postRegionCategory(nonmap.id, 'map');
+                regionToSetAsMap = nonmap.id;
+                openModal('modal-confirm-set-map')
               }}
               title="click to set this document back to 'prepared' so it can be georeferenced"
             >
diff --git a/ohmg/frontend/svelte_components/src/components/cards/PreparedCard.svelte b/ohmg/frontend/svelte_components/src/components/shared/cards/PreparedCard.svelte
similarity index 82%
rename from ohmg/frontend/svelte_components/src/components/cards/PreparedCard.svelte
rename to ohmg/frontend/svelte_components/src/components/shared/cards/PreparedCard.svelte
index 9c442fc2..383af58b 100644
--- a/ohmg/frontend/svelte_components/src/components/cards/PreparedCard.svelte
+++ b/ohmg/frontend/svelte_components/src/components/shared/cards/PreparedCard.svelte
@@ -4,11 +4,9 @@
   import FileText from 'phosphor-svelte/lib/FileText';
   import MapPin from 'phosphor-svelte/lib/MapPin';
 
-  import { getModal } from '../base/Modal.svelte';
-
-  import Link from '../base/Link.svelte';
-
-  import BaseCard from '../base/Card.svelte';
+  import { openModal } from '../../base/Modal.svelte';
+  import Link from '../../base/Link.svelte';
+  import BaseCard from '../../base/Card.svelte';
 
   export let CONTEXT;
   export let region;
@@ -18,9 +16,9 @@
   export let modalExtent;
   export let modalIsGeospatial;
   export let reinitModalMap;
-  export let postDocumentUnprepare;
-  export let postRegionCategory;
-  export let postSkipRegion;
+  export let documentToUnprepare;
+  export let regionToSetAsNonMap;
+  export let regionToSkip;
 </script>
 
 <BaseCard>
@@ -35,7 +33,7 @@
         modalLyrUrl = region.urls.image;
         modalExtent = [0, -region.image_size[1], region.image_size[0], 0];
         modalIsGeospatial = false;
-        getModal('modal-simple-viewer').open();
+        openModal('modal-simple-viewer');
         reinitModalMap = [{}];
       }}
     >
@@ -64,7 +62,8 @@
               : 'Undo preparation'}
             style="display:flex; align-items:center;"
             on:click={() => {
-              postDocumentUnprepare(region.document_id);
+              documentToUnprepare = region.document_id;
+              openModal('modal-confirm-unprepare')
             }}
           >
             <ArrowCounterClockwise /> unprepare</button
@@ -75,7 +74,8 @@
             class="is-text-link"
             title="Move to Non-map section"
             on:click={() => {
-              postRegionCategory(region.id, 'non-map');
+              regionToSetAsNonMap = region.id;
+              openModal('modal-confirm-set-nonmap')
             }}
           >
             <FileText /> set as non-map</button
@@ -86,7 +86,8 @@
             class="is-text-link"
             title="Skip this piece (for now)"
             on:click={() => {
-              postSkipRegion(region.id, true);
+              regionToSkip = region.id;
+              openModal("modal-confirm-skip-region")
             }}
           >
             <Broom /> skip this piece</button
diff --git a/ohmg/frontend/svelte_components/src/components/cards/SkippedCard.svelte b/ohmg/frontend/svelte_components/src/components/shared/cards/SkippedCard.svelte
similarity index 83%
rename from ohmg/frontend/svelte_components/src/components/cards/SkippedCard.svelte
rename to ohmg/frontend/svelte_components/src/components/shared/cards/SkippedCard.svelte
index cc3cfa43..bc680750 100644
--- a/ohmg/frontend/svelte_components/src/components/cards/SkippedCard.svelte
+++ b/ohmg/frontend/svelte_components/src/components/shared/cards/SkippedCard.svelte
@@ -1,11 +1,9 @@
 <script>
   import Broom from 'phosphor-svelte/lib/Broom';
 
-  import { getModal } from '../base/Modal.svelte';
-
-  import Link from '../base/Link.svelte';
-
-  import BaseCard from '../base/Card.svelte';
+  import { openModal } from '../../base/Modal.svelte';
+  import Link from '../../base/Link.svelte';
+  import BaseCard from '../../base/Card.svelte';
 
   export let region;
   export let sessionLocks;
@@ -14,7 +12,7 @@
   export let modalExtent;
   export let modalIsGeospatial;
   export let reinitModalMap;
-  export let postSkipRegion;
+  export let regionToUnskip;
 </script>
 
 <BaseCard>
@@ -29,7 +27,7 @@
         modalLyrUrl = region.urls.image;
         modalExtent = [0, -region.image_size[1], region.image_size[0], 0];
         modalIsGeospatial = false;
-        getModal('modal-simple-viewer').open();
+        openModal('modal-simple-viewer');
         reinitModalMap = [{}];
       }}
     >
@@ -49,7 +47,8 @@
             class="is-text-link"
             title="Move to the Prepared section"
             on:click={() => {
-              postSkipRegion(region.id, false);
+              regionToUnskip = region.id
+              openModal('modal-confirm-unskip-region')
             }}
           >
             <Broom /> unskip this piece</button
diff --git a/ohmg/frontend/svelte_components/src/components/cards/UnpreparedCard.svelte b/ohmg/frontend/svelte_components/src/components/shared/cards/UnpreparedCard.svelte
similarity index 79%
rename from ohmg/frontend/svelte_components/src/components/cards/UnpreparedCard.svelte
rename to ohmg/frontend/svelte_components/src/components/shared/cards/UnpreparedCard.svelte
index ac6641ca..86058281 100644
--- a/ohmg/frontend/svelte_components/src/components/cards/UnpreparedCard.svelte
+++ b/ohmg/frontend/svelte_components/src/components/shared/cards/UnpreparedCard.svelte
@@ -5,12 +5,11 @@
   import CheckSquareOffset from 'phosphor-svelte/lib/CheckSquareOffset';
   import ArrowClockwise from 'phosphor-svelte/lib/ArrowClockwise';
 
-  import { getModal } from '../base/Modal.svelte';
+  import { openModal } from '../../base/Modal.svelte';
+  import BaseCard from '../../base/Card.svelte';
+  import Link from '../../base/Link.svelte';
 
-  import Link from '../base/Link.svelte';
-  import LoadingEllipsis from '../common/LoadingEllipsis.svelte';
-
-  import BaseCard from '../base/Card.svelte';
+  import LoadingEllipsis from '../LoadingEllipsis.svelte';
 
   export let CONTEXT;
   export let document;
@@ -21,7 +20,7 @@
   export let modalIsGeospatial;
   export let reinitModalMap;
   export let postLoadDocument;
-  export let splitDocumentId;
+  export let documentToNoSplit;
   export let documentsLoading;
   export let bulkPreparing;
   export let bulkPrepareList;
@@ -54,7 +53,7 @@
           modalLyrUrl = document.urls.image;
           modalExtent = [0, -document.image_size[1], document.image_size[0], 0];
           modalIsGeospatial = false;
-          getModal('modal-simple-viewer').open();
+          openModal('modal-simple-viewer');
           reinitModalMap = [{}];
         }}
       >
@@ -114,28 +113,29 @@
       </ul>
     {:else if userCanEdit}
       <ul>
+        {#if bulkPreparing}
         <li>
-          {#if bulkPreparing}
-            <button class="is-text-link" title="This document does not need to be split" on:click={handleChange}>
-              {#if bulkPrepare}
-                <CheckSquare />
-              {:else}
-                <Square />
-              {/if}
-              no split needed
-            </button>
-          {:else}
-            <button
-              class="is-text-link"
-              title="This document does not need to be split"
-              on:click={() => {
-                splitDocumentId = document.id;
-                getModal('modal-confirm-no-split').open();
-              }}
-            >
-              <CheckSquareOffset /> no split needed
-            </button>
-          {/if}
+          <button class="is-text-link" title="This document does not need to be split" on:click={handleChange}>
+            {#if bulkPrepare}
+              <CheckSquare />
+            {:else}
+              <Square />
+            {/if}
+            no split needed
+          </button>
+        </li>
+        {:else}
+        <li>
+          <button
+            class="is-text-link"
+            title="This document does not need to be split"
+            on:click={() => {
+              documentToNoSplit = document.id;
+              openModal('modal-confirm-no-split');
+            }}
+          >
+            <CheckSquareOffset /> no split needed
+          </button>
         </li>
         <li>
           <Link href={`/split/${document.id}`} title="Split this document">
@@ -157,6 +157,7 @@
             </button>
           </li>
         {/if}
+        {/if}
       </ul>
     {/if}
   </div>
diff --git a/ohmg/frontend/svelte_components/src/components/modals/ConfirmUngeoreferenceModal.svelte b/ohmg/frontend/svelte_components/src/components/shared/modals/ConfirmUngeoreferenceModal.svelte
similarity index 52%
rename from ohmg/frontend/svelte_components/src/components/modals/ConfirmUngeoreferenceModal.svelte
rename to ohmg/frontend/svelte_components/src/components/shared/modals/ConfirmUngeoreferenceModal.svelte
index e5e82e69..971671db 100644
--- a/ohmg/frontend/svelte_components/src/components/modals/ConfirmUngeoreferenceModal.svelte
+++ b/ohmg/frontend/svelte_components/src/components/shared/modals/ConfirmUngeoreferenceModal.svelte
@@ -1,7 +1,8 @@
 <script>
-  import Modal, { getModal } from '../base/Modal.svelte';
-  import { submitPostRequest } from '../../lib/requests';
+  import ModalConfirm from '../../base/ModalConfirm.svelte';
+  import { submitPostRequest } from '../../../lib/requests';
 
+  export let id;
   export let CONTEXT;
   export let layerId;
   export let processing;
@@ -13,7 +14,8 @@
   }
 </script>
 
-<Modal id="modal-confirm-ungeoreference">
+<ModalConfirm {id}
+  yesAction={postUngeoreference}>
   <p>
     Are you sure you want to remove all georeferencing information for this layer? This operation cannot be reversed,
     and is only necessary if the preparation step for this document needs to be redone.
@@ -21,19 +23,4 @@
   <p>
     If you only need to improve the ground control points for this layer, click <strong>edit georeferencing</strong>.
   </p>
-  <button
-    class="button is-success"
-    title="Confirm removal of georeferencing information for this layer"
-    on:click={() => {
-      postUngeoreference();
-      getModal('modal-confirm-ungeoreference').close();
-    }}>Yes</button
-  >
-  <button
-    class="button is-danger"
-    title="Cancel"
-    on:click={() => {
-      getModal('modal-confirm-ungeoreference').close();
-    }}>Cancel</button
-  >
-</Modal>
+</ModalConfirm>
diff --git a/ohmg/frontend/svelte_components/src/components/modals/ExtendSessionModal.svelte b/ohmg/frontend/svelte_components/src/components/shared/modals/ExtendSessionModal.svelte
similarity index 81%
rename from ohmg/frontend/svelte_components/src/components/modals/ExtendSessionModal.svelte
rename to ohmg/frontend/svelte_components/src/components/shared/modals/ExtendSessionModal.svelte
index e5d1fbf3..688943af 100644
--- a/ohmg/frontend/svelte_components/src/components/modals/ExtendSessionModal.svelte
+++ b/ohmg/frontend/svelte_components/src/components/shared/modals/ExtendSessionModal.svelte
@@ -1,6 +1,6 @@
 <script>
-  import Modal, { getModal } from '../base/Modal.svelte';
-  import { submitPostRequest } from '../../lib/requests';
+  import Modal, { closeModal } from '../../base/Modal.svelte';
+  import { submitPostRequest } from '../../../lib/requests';
 
   export let CONTEXT;
   export let sessionId;
@@ -20,7 +20,7 @@
       title="Extend this session"
       on:click={() => {
         postExtendSession();
-        getModal('modal-extend-session').close();
+        closeModal('modal-extend-session');
       }}>Give me more time!</button
     >
     <span style="margin-left: 10px;"><em>Redirecting in {countdown}...</em></span>
diff --git a/ohmg/frontend/svelte_components/src/components/modals/GeoreferenceOverviewModal.svelte b/ohmg/frontend/svelte_components/src/components/shared/modals/GeoreferenceOverviewModal.svelte
similarity index 88%
rename from ohmg/frontend/svelte_components/src/components/modals/GeoreferenceOverviewModal.svelte
rename to ohmg/frontend/svelte_components/src/components/shared/modals/GeoreferenceOverviewModal.svelte
index 7909b66f..5a77d496 100644
--- a/ohmg/frontend/svelte_components/src/components/modals/GeoreferenceOverviewModal.svelte
+++ b/ohmg/frontend/svelte_components/src/components/shared/modals/GeoreferenceOverviewModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import Modal from '../base/Modal.svelte';
+  import Modal from '../../base/Modal.svelte';
   export let id;
 </script>
 
diff --git a/ohmg/frontend/svelte_components/src/components/modals/GeoreferencePermissionsModal.svelte b/ohmg/frontend/svelte_components/src/components/shared/modals/GeoreferencePermissionsModal.svelte
similarity index 92%
rename from ohmg/frontend/svelte_components/src/components/modals/GeoreferencePermissionsModal.svelte
rename to ohmg/frontend/svelte_components/src/components/shared/modals/GeoreferencePermissionsModal.svelte
index 6c2c6d51..bf014da7 100644
--- a/ohmg/frontend/svelte_components/src/components/modals/GeoreferencePermissionsModal.svelte
+++ b/ohmg/frontend/svelte_components/src/components/shared/modals/GeoreferencePermissionsModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import Modal from '../base/Modal.svelte';
+  import Modal from '../../base/Modal.svelte';
   export let id;
   export let user;
   export let userCanEdit;
diff --git a/ohmg/frontend/svelte_components/src/components/modals/GeoreferencedSectionModal.svelte b/ohmg/frontend/svelte_components/src/components/shared/modals/GeoreferencedSectionModal.svelte
similarity index 91%
rename from ohmg/frontend/svelte_components/src/components/modals/GeoreferencedSectionModal.svelte
rename to ohmg/frontend/svelte_components/src/components/shared/modals/GeoreferencedSectionModal.svelte
index fbe21a6f..6c6b86aa 100644
--- a/ohmg/frontend/svelte_components/src/components/modals/GeoreferencedSectionModal.svelte
+++ b/ohmg/frontend/svelte_components/src/components/shared/modals/GeoreferencedSectionModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import Modal from '../base/Modal.svelte';
+  import Modal from '../../base/Modal.svelte';
   export let id;
 </script>
 
diff --git a/ohmg/frontend/svelte_components/src/components/modals/LegendModal.svelte b/ohmg/frontend/svelte_components/src/components/shared/modals/LegendModal.svelte
similarity index 77%
rename from ohmg/frontend/svelte_components/src/components/modals/LegendModal.svelte
rename to ohmg/frontend/svelte_components/src/components/shared/modals/LegendModal.svelte
index 9ae8ae3c..1c1c6ce6 100644
--- a/ohmg/frontend/svelte_components/src/components/modals/LegendModal.svelte
+++ b/ohmg/frontend/svelte_components/src/components/shared/modals/LegendModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import Modal from '../base/Modal.svelte';
+  import Modal from '../../base/Modal.svelte';
 
   export let id;
   export let legendUrl;
diff --git a/ohmg/frontend/svelte_components/src/components/modals/MultiMaskModal.svelte b/ohmg/frontend/svelte_components/src/components/shared/modals/MultiMaskModal.svelte
similarity index 96%
rename from ohmg/frontend/svelte_components/src/components/modals/MultiMaskModal.svelte
rename to ohmg/frontend/svelte_components/src/components/shared/modals/MultiMaskModal.svelte
index d7921464..df6e69d5 100644
--- a/ohmg/frontend/svelte_components/src/components/modals/MultiMaskModal.svelte
+++ b/ohmg/frontend/svelte_components/src/components/shared/modals/MultiMaskModal.svelte
@@ -4,7 +4,7 @@
   import CropIcon from 'phosphor-svelte/lib/Crop';
   import Trash from 'phosphor-svelte/lib/Trash';
 
-  import Modal from '../base/Modal.svelte';
+  import Modal from '../../base/Modal.svelte';
   export let id;
 </script>
 
diff --git a/ohmg/frontend/svelte_components/src/components/modals/NonMapContentModal.svelte b/ohmg/frontend/svelte_components/src/components/shared/modals/NonMapContentModal.svelte
similarity index 83%
rename from ohmg/frontend/svelte_components/src/components/modals/NonMapContentModal.svelte
rename to ohmg/frontend/svelte_components/src/components/shared/modals/NonMapContentModal.svelte
index 8d96326f..a0da0a09 100644
--- a/ohmg/frontend/svelte_components/src/components/modals/NonMapContentModal.svelte
+++ b/ohmg/frontend/svelte_components/src/components/shared/modals/NonMapContentModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import Modal from '../base/Modal.svelte';
+  import Modal from '../../base/Modal.svelte';
   export let id;
 </script>
 
diff --git a/ohmg/frontend/svelte_components/src/components/modals/PreparedSectionModal.svelte b/ohmg/frontend/svelte_components/src/components/shared/modals/PreparedSectionModal.svelte
similarity index 89%
rename from ohmg/frontend/svelte_components/src/components/modals/PreparedSectionModal.svelte
rename to ohmg/frontend/svelte_components/src/components/shared/modals/PreparedSectionModal.svelte
index f33758d1..556fd024 100644
--- a/ohmg/frontend/svelte_components/src/components/modals/PreparedSectionModal.svelte
+++ b/ohmg/frontend/svelte_components/src/components/shared/modals/PreparedSectionModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import Modal from '../base/Modal.svelte';
+  import Modal from '../../base/Modal.svelte';
   export let id;
 </script>
 
diff --git a/ohmg/frontend/svelte_components/src/components/shared/modals/ResourceDownloadSectionModal.svelte b/ohmg/frontend/svelte_components/src/components/shared/modals/ResourceDownloadSectionModal.svelte
new file mode 100644
index 00000000..b14b5326
--- /dev/null
+++ b/ohmg/frontend/svelte_components/src/components/shared/modals/ResourceDownloadSectionModal.svelte
@@ -0,0 +1,41 @@
+<script>
+  import Modal from '../../base/Modal.svelte';
+  import Link from '../../base/Link.svelte';
+  export let id;
+</script>
+
+<Modal {id}>
+  <h3>Download & Web Services</h3>
+  <h4>How to use XYZ tiles in desktop software</h4>
+  <ul>
+    <li>
+      <Link
+        href="https://docs.qgis.org/3.22/en/docs/user_manual/managing_data_source/opening_data.html#using-xyz-tile-services"
+        external="true">QGIS</Link
+      >
+    </li>
+    <li>
+      <Link href="https://esribelux.com/2021/04/16/xyz-tile-layers-in-arcgis-platform/" external="true">ArcGIS</Link>
+    </li>
+  </ul>
+  <h4>How to use XYZ tiles on the web</h4>
+  <ul>
+    <li><Link href="https://leafletjs.com/reference.html#tilelayer" external="true">Leaflet</Link></li>
+    <li><Link href="https://openlayers.org/en/latest/examples/xyz.html" external="true">OpenLayers</Link></li>
+    <li>
+      <Link href="https://maplibre.org/maplibre-gl-js-docs/example/map-tiles/" external="true">Mapbox/MapLibre GL JS</Link
+      >
+    </li>
+    <li>
+      <Link
+        href="https://doc.arcgis.com/en/arcgis-online/create-maps/add-layers-from-url.htm#ESRI_SECTION1_13A68145A4F94A338AB2002AD5F9844D"
+        external="true">ArcGIS Online</Link
+      >
+    </li>
+    <li>
+      <Link href="https://learnosm.org/en/beginner/id-editor/#configuring-the-background-layer" external="true"
+        >OpenHistoricalMap (iD Editor)</Link
+      >
+    </li>
+  </ul>
+</Modal>
diff --git a/ohmg/frontend/svelte_components/src/components/modals/SessionListModal.svelte b/ohmg/frontend/svelte_components/src/components/shared/modals/SessionListModal.svelte
similarity index 95%
rename from ohmg/frontend/svelte_components/src/components/modals/SessionListModal.svelte
rename to ohmg/frontend/svelte_components/src/components/shared/modals/SessionListModal.svelte
index 5b22f5a0..c4344061 100644
--- a/ohmg/frontend/svelte_components/src/components/modals/SessionListModal.svelte
+++ b/ohmg/frontend/svelte_components/src/components/shared/modals/SessionListModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import Modal from '../base/Modal.svelte';
+  import Modal from '../../base/Modal.svelte';
 
   export let id;
 
diff --git a/ohmg/frontend/svelte_components/src/components/modals/SkippedSectionHelpModal.svelte b/ohmg/frontend/svelte_components/src/components/shared/modals/SkippedSectionHelpModal.svelte
similarity index 92%
rename from ohmg/frontend/svelte_components/src/components/modals/SkippedSectionHelpModal.svelte
rename to ohmg/frontend/svelte_components/src/components/shared/modals/SkippedSectionHelpModal.svelte
index 63b857c6..050db029 100644
--- a/ohmg/frontend/svelte_components/src/components/modals/SkippedSectionHelpModal.svelte
+++ b/ohmg/frontend/svelte_components/src/components/shared/modals/SkippedSectionHelpModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import Modal from '../base/Modal.svelte';
+  import Modal from '../../base/Modal.svelte';
   export let id;
 </script>
 
diff --git a/ohmg/frontend/svelte_components/src/components/modals/UnpreparedSectionModal.svelte b/ohmg/frontend/svelte_components/src/components/shared/modals/UnpreparedSectionModal.svelte
similarity index 84%
rename from ohmg/frontend/svelte_components/src/components/modals/UnpreparedSectionModal.svelte
rename to ohmg/frontend/svelte_components/src/components/shared/modals/UnpreparedSectionModal.svelte
index fc889ba9..2a3b728e 100644
--- a/ohmg/frontend/svelte_components/src/components/modals/UnpreparedSectionModal.svelte
+++ b/ohmg/frontend/svelte_components/src/components/shared/modals/UnpreparedSectionModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import Modal from '../base/Modal.svelte';
+  import Modal from '../../base/Modal.svelte';
   export let id;
 </script>
 
diff --git a/ohmg/frontend/svelte_components/src/components/tables/MapContributors.svelte b/ohmg/frontend/svelte_components/src/components/tables/MapContributors.svelte
index 50df8b76..e812fc5a 100644
--- a/ohmg/frontend/svelte_components/src/components/tables/MapContributors.svelte
+++ b/ohmg/frontend/svelte_components/src/components/tables/MapContributors.svelte
@@ -1,8 +1,9 @@
 <script>
+  import { getFromAPI } from '../../lib/requests';
+
   import Link from '../base/Link.svelte';
-  import SessionListModal from '../modals/SessionListModal.svelte';
+  import SessionListModal from '../shared/modals/SessionListModal.svelte';
 
-  import { getFromAPI } from '../../lib/requests';
   import SortableHeader from './widgets/SortableHeader.svelte';
   import RefreshButton from './widgets/RefreshButton.svelte';
 
diff --git a/ohmg/frontend/svelte_components/src/components/tables/Maps.svelte b/ohmg/frontend/svelte_components/src/components/tables/Maps.svelte
index be2403a3..1fead088 100644
--- a/ohmg/frontend/svelte_components/src/components/tables/Maps.svelte
+++ b/ohmg/frontend/svelte_components/src/components/tables/Maps.svelte
@@ -3,13 +3,14 @@
 
   import Faders from 'phosphor-svelte/lib/Faders';
 
+  import { getFromAPI } from '../../lib/requests';
+
   import Link from '../base/Link.svelte';
-  import SessionListModal from '../modals/SessionListModal.svelte';
 
-  import PaginationButtons from './widgets/PaginationButtons.svelte';
+  import InfoModalButton from '../shared/buttons/InfoModalButton.svelte';
+  import SessionListModal from '../shared/modals/SessionListModal.svelte';
 
-  import { getFromAPI } from '../../lib/requests';
-  import InfoModalButton from '../buttons/InfoModalButton.svelte';
+  import PaginationButtons from './widgets/PaginationButtons.svelte';
   import SortableHeader from './widgets/SortableHeader.svelte';
   import FacetFilterSelect from './widgets/FacetFilterSelect.svelte';
   import LimitSelect from './widgets/LimitSelect.svelte';
diff --git a/ohmg/frontend/svelte_components/src/components/lists/Places.svelte b/ohmg/frontend/svelte_components/src/components/tables/Places.svelte
similarity index 97%
rename from ohmg/frontend/svelte_components/src/components/lists/Places.svelte
rename to ohmg/frontend/svelte_components/src/components/tables/Places.svelte
index 0330dabf..4688b5cd 100644
--- a/ohmg/frontend/svelte_components/src/components/lists/Places.svelte
+++ b/ohmg/frontend/svelte_components/src/components/tables/Places.svelte
@@ -1,7 +1,7 @@
 <script>
   import { TableSort } from 'svelte-tablesort';
   import Link from '../base/Link.svelte';
-  import LoadingEllipsis from '../common/LoadingEllipsis.svelte';
+  import LoadingEllipsis from '../shared/LoadingEllipsis.svelte';
 
   import { getFromAPI } from '../../lib/requests';
 
diff --git a/ohmg/frontend/svelte_components/src/components/tables/Profiles.svelte b/ohmg/frontend/svelte_components/src/components/tables/Profiles.svelte
index 5ef92cdb..65cbe993 100644
--- a/ohmg/frontend/svelte_components/src/components/tables/Profiles.svelte
+++ b/ohmg/frontend/svelte_components/src/components/tables/Profiles.svelte
@@ -4,12 +4,12 @@
   import Faders from 'phosphor-svelte/lib/Faders';
 
   import Link from '../base/Link.svelte';
-  import SessionListModal from '../modals/SessionListModal.svelte';
+  import SessionListModal from '../shared/modals/SessionListModal.svelte';
 
   import PaginationButtons from './widgets/PaginationButtons.svelte';
 
   import { getFromAPI } from '../../lib/requests';
-  import InfoModalButton from '../buttons/InfoModalButton.svelte';
+  import InfoModalButton from '../shared/buttons/InfoModalButton.svelte';
   import LimitSelect from './widgets/LimitSelect.svelte';
   import SortableHeader from './widgets/SortableHeader.svelte';
   import RefreshButton from './widgets/RefreshButton.svelte';
diff --git a/ohmg/frontend/svelte_components/src/components/tables/Sessions.svelte b/ohmg/frontend/svelte_components/src/components/tables/Sessions.svelte
index a3946a5d..4c3286c6 100644
--- a/ohmg/frontend/svelte_components/src/components/tables/Sessions.svelte
+++ b/ohmg/frontend/svelte_components/src/components/tables/Sessions.svelte
@@ -2,11 +2,10 @@
   import { slide } from 'svelte/transition';
   import { format } from 'date-fns';
 
-  import ArrowsClockwise from 'phosphor-svelte/lib/ArrowsClockwise';
   import Faders from 'phosphor-svelte/lib/Faders';
 
   import Link from '../base/Link.svelte';
-  import SessionListModal from '../modals/SessionListModal.svelte';
+  import SessionListModal from '../shared/modals/SessionListModal.svelte';
 
   import DatePicker from './widgets/DatePicker.svelte';
   import PaginationButtons from './widgets/PaginationButtons.svelte';
@@ -16,7 +15,7 @@
   import RefreshButton from './widgets/RefreshButton.svelte';
 
   import { getFromAPI } from '../../lib/requests';
-  import InfoModalButton from '../buttons/InfoModalButton.svelte';
+  import InfoModalButton from '../shared/buttons/InfoModalButton.svelte';
 
   export let CONTEXT;
   export let FILTER_PARAM = '';
diff --git a/ohmg/frontend/svelte_components/src/georeference.js b/ohmg/frontend/svelte_components/src/georeference.js
index 822e2b0c..f3059edf 100644
--- a/ohmg/frontend/svelte_components/src/georeference.js
+++ b/ohmg/frontend/svelte_components/src/georeference.js
@@ -1,4 +1,4 @@
-import Georeferencer from './components/Georeferencer.svelte';
+import Georeferencer from './components/interfaces/Georeferencer.svelte';
 
 export default new Georeferencer({
   target: document.getElementById('georeference-target'),
diff --git a/ohmg/frontend/svelte_components/src/latestblogposts.js b/ohmg/frontend/svelte_components/src/latestblogposts.js
index 6c5ae8e1..346f48c3 100644
--- a/ohmg/frontend/svelte_components/src/latestblogposts.js
+++ b/ohmg/frontend/svelte_components/src/latestblogposts.js
@@ -1,4 +1,4 @@
-import LatestBlogPosts from './components/overviews/sections/LatestBlogPosts.svelte';
+import LatestBlogPosts from './components/home/LatestBlogPosts.svelte';
 
 export default new LatestBlogPosts({
   target: document.getElementById('latestblogposts-target'),
diff --git a/ohmg/frontend/svelte_components/src/map.js b/ohmg/frontend/svelte_components/src/map.js
index 08cf55e9..84fbbd92 100644
--- a/ohmg/frontend/svelte_components/src/map.js
+++ b/ohmg/frontend/svelte_components/src/map.js
@@ -1,4 +1,4 @@
-import Map from './components/Map.svelte';
+import Map from './components/map/Map.svelte';
 
 export default new Map({
   target: document.getElementById('map-target'),
diff --git a/ohmg/frontend/svelte_components/src/mapbrowse.js b/ohmg/frontend/svelte_components/src/mapbrowse.js
index 1f2cfa54..5f1e9956 100644
--- a/ohmg/frontend/svelte_components/src/mapbrowse.js
+++ b/ohmg/frontend/svelte_components/src/mapbrowse.js
@@ -1,4 +1,4 @@
-import MapBrowse from './components/interfaces/MapBrowse.svelte';
+import MapBrowse from './components/search/MapBrowse.svelte';
 
 export default new MapBrowse({
   target: document.getElementById('mapbrowse-target'),
diff --git a/ohmg/frontend/svelte_components/src/mapshowcase.js b/ohmg/frontend/svelte_components/src/mapshowcase.js
index c340f768..28a7f461 100644
--- a/ohmg/frontend/svelte_components/src/mapshowcase.js
+++ b/ohmg/frontend/svelte_components/src/mapshowcase.js
@@ -1,4 +1,4 @@
-import MapShowcase from './components/MapShowcase.svelte';
+import MapShowcase from './components/home/MapShowcase.svelte';
 
 export default new MapShowcase({
   target: document.getElementById('mapshowcase-target'),
diff --git a/ohmg/frontend/svelte_components/src/participants.js b/ohmg/frontend/svelte_components/src/participants.js
deleted file mode 100644
index ef6c4940..00000000
--- a/ohmg/frontend/svelte_components/src/participants.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import Participants from './components/lists/Participants.svelte';
-
-export default new Participants({
-  target: document.getElementById('participants-target'),
-  props: JSON.parse(document.getElementById('participants-props').textContent),
-});
diff --git a/ohmg/frontend/svelte_components/src/place.js b/ohmg/frontend/svelte_components/src/place.js
index 7248fb3d..e2ed12b2 100644
--- a/ohmg/frontend/svelte_components/src/place.js
+++ b/ohmg/frontend/svelte_components/src/place.js
@@ -1,4 +1,4 @@
-import Place from './components/overviews/Place.svelte';
+import Place from './components/place/Place.svelte';
 
 export default new Place({
   target: document.getElementById('place-target'),
diff --git a/ohmg/frontend/svelte_components/src/resource.js b/ohmg/frontend/svelte_components/src/resource.js
index b74ddc95..7498aa4d 100644
--- a/ohmg/frontend/svelte_components/src/resource.js
+++ b/ohmg/frontend/svelte_components/src/resource.js
@@ -1,4 +1,4 @@
-import Resource from './components/Resource.svelte';
+import Resource from './components/resource/Resource.svelte';
 
 export default new Resource({
   target: document.getElementById('resource-target'),
diff --git a/ohmg/frontend/svelte_components/src/split.js b/ohmg/frontend/svelte_components/src/split.js
index c53a65d2..c9687852 100644
--- a/ohmg/frontend/svelte_components/src/split.js
+++ b/ohmg/frontend/svelte_components/src/split.js
@@ -1,4 +1,4 @@
-import Splitter from './components/Splitter.svelte';
+import Splitter from './components/interfaces/Splitter.svelte';
 
 export default new Splitter({
   target: document.getElementById('split-target'),